diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 3a19bc34edf..ccd774cdaa8 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -21,8 +21,8 @@ rust_g.dll @AffectedArc07 ### Fox-McCloud -/code/ATMOSPHERICS/ @Fox-McCloud /code/controllers/subsystem/air.dm @Fox-McCloud /code/controllers/subsystem/garbage.dm @Fox-McCloud +/code/modules/atmospherics/ @Fox-McCloud /code/modules/reagents/chemistry/holder.dm @Fox-McCloud /code/modules/reagents/chemistry/reagents.dm @Fox-McCloud diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index e2d924314cd..b96dee5c47b 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -354,12 +354,11 @@ This prevents nesting levels from getting deeper then they need to be. #### Spacing * Operators that should be separated by spaces * Boolean and logic operators like &&, || <, >, ==, etc (but not !) - * Bitwise AND & + * Bitwise AND & and OR | * Argument separator operators like , (and ; when used in a forloop) * Assignment operators like = or += or the like * Math operators like +, -, /, or \* * Operators that should not be separated by spaces - * Bitwise OR | * Access operators like . and : * Parentheses () * logical not ! diff --git a/.github/DOWNLOADING.md b/.github/DOWNLOADING.md index 83fa6a42a9c..eaad0dee7f9 100644 --- a/.github/DOWNLOADING.md +++ b/.github/DOWNLOADING.md @@ -1,7 +1,9 @@ # Info + This document contains all the relevant information for downloading and running your own ParaCode server. -### GETTING THE CODE +## GETTING THE CODE + The simplest way to obtain the code is using the github .zip feature. Click [here](https://github.com/ParadiseSS13/Paradise/archive/master.zip) to get the latest code as a .zip file, then unzip it to wherever you want. @@ -11,13 +13,15 @@ You'll need to download git or some client from [here](http://git-scm.com/). When that's installed, right click in any folder and click on "Git Bash". When that opens, type in: +```sh git clone https://github.com/ParadiseSS13/Paradise.git +``` (hint: hold down ctrl and press insert to paste into git bash) -This will take a while to download, but it provides an easier method for updating. +This will take a while to download (it is the entire repo + history, not just a snapshot), but it provides an easier method for updating. -### INSTALLATION +## INSTALLATION First-time installation should be fairly straightforward. First, you'll need BYOND installed. We're going to assume you already did this @@ -27,18 +31,19 @@ Open paradise.dme by double-clicking it, open the Build menu, and click compile. This'll take a little while, and if everything's done right, you'll get a message like this: +```sh saving paradise.dmb (DEBUG mode) - paradise.dmb - 0 errors, 0 warnings +``` If you see any errors or warnings, something has gone wrong - possibly a corrupt download or the files extracted wrong, -or a code issue on the main repo. Ask on Dscord. +or a code issue on the main repo. Feel free to ask on Discord. Once that's done, open up the config folder. Firstly, you will want to copy everything from the example folder into the regular config folder. EG: Move `config/example/config.txt` to `config/config.txt`, and do the same for all the other files. -You'll want to edit config.txt to set your server location, +You'll want to edit `config.txt` to set your server location, so that all your players don't get disconnected at the end of each round. It's recommended you don't turn on the gamemodes with probability 0, as they have various issues and aren't currently being tested, @@ -49,7 +54,9 @@ If you are connecting from localhost to your own test server, you should automat "Host" is the highest level of access, and the other recommended admin levels for now are "Game Admin" and "Moderator". The format is: +```cfg byondkey - Rank +``` where the BYOND key must be in lowercase and the admin rank must be properly capitalised. There are a bunch more admin ranks, but these two should be enough for most servers, @@ -61,38 +68,34 @@ Make sure to set the port to the one you specified in the config.txt, and set the Security box to 'Trusted'. Then press GO and the server should start up and be ready to join. -### Installation (Linux) +## Installation (Linux) -The code is fully able to run on linux, however windows is the recommended platform. The code requires 2 libraries, with dependencies below +The code is fully able to run on linux, however windows is still the recommended platform. The library we use for external functions (RUSTG) requires some extra dependencies. -For MySQL, run the following: `apt-get install libmysqlclient-dev:i386` +For debian, please download the latest RUSTG release from [https://github.com/ParadiseSS13/rust-g](https://github.com/ParadiseSS13/rust-g), run the following: `apt-get install libssl-dev:i386 pkg-config:i386 zlib1g-dev:i386`. -For RustG please download the latest relase from [https://github.com/ParadiseSS13/rust-g](https://github.com/ParadiseSS13/rust-g), run the following: `apt-get install libssl-dev:i386 pkg-config:i386 zlib1g-dev:i386`. +After installing these packages, RUSTG should function as intended. We assume that if you are hosting on linux, you know what you are doing. -After installing these packages, these libraries should function as intended. We assume that if you are hosting on linux, you know what you are doing. - ---- - -### UPDATING +## UPDATING If you used the zip method, you'll need to download the zip file again and unzip it somewhere else, -and then copy the /config and /data folders over. +and then copy the `config` and `data` folders over. If you used the git method, you simply need to type this in to git bash: +```sh git pull +``` -When you have done this, you'll need to recompile the code, but then it should work fine. +When you have done this, you'll need to recompile the code, but then it should work fine and be up to date with the live server. ---- - -### SQL Setup +## SQL Setup The SQL backend is required for storing character saves, preferences, administrative data, and many other things. -We recommend running a database if your server is going to be used as more than juts a local test server -Your server details go in /config/dbconfig.txt, -and the SQL schema is in /SQL/paradise_schema.sql or /SQL/paradise_schema_prefix.sql, +We recommend running a database if your server is going to be used as more than just a local test server. +Your SQL server details go in `config/dbconfig.txt`, +and the SQL schema is in `SQL/paradise_schema.sql` or `SQL/paradise_schema_prefix.sql`, depending on if you want table prefixes. More detailed setup instructions are located on our wiki: https://www.paradisestation.org/wiki/index.php/Setting_up_the_Database diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 526be3bcaf0..71fe793c3cc 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -14,15 +14,15 @@ :cl: add: Added new things del: Removed old things -tweak: tweaked a few things -fix: fixed a few things -wip: added a few works in progress -soundadd: added a new sound thingy -sounddel: removed an old sound thingy -imageadd: added some icons and images -imagedel: deleted some icons and images -spellcheck: fixed a few typos -experiment: added an experimental thingy +tweak: Tweaked a few things +fix: Fixed a few things +wip: Added a few works in progress +soundadd: Added a new sound thingy +sounddel: Removed an old sound thingy +imageadd: Added some icons and images +imagedel: Deleted some icons and images +spellcheck: Fixed a few typos +experiment: Added an experimental thingy /:cl: diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 65d388e70df..88eec1aece6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,7 +10,7 @@ on: jobs: run_linters: name: Run Linters - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v2 - name: Setup Cache @@ -37,7 +37,7 @@ jobs: compile_all_maps: name: Compile All Maps - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v2 - name: Setup Cache @@ -54,7 +54,7 @@ jobs: unit_tests_and_sql: name: Unit Tests + SQL Validation - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 services: mariadb: image: mariadb:latest @@ -80,6 +80,7 @@ jobs: sudo dpkg --add-architecture i386 sudo apt update || true sudo apt install libssl1.1:i386 + ldd librust_g.so - name: Compile & Run Unit Tests run: | tools/ci/install_byond.sh @@ -87,3 +88,13 @@ jobs: tools/ci/dm.sh -DCIBUILDING paradise.dme tools/ci/run_server.sh + windows_dll_tests: + name: Windows RUSTG Validation + runs-on: windows-2016 + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-python@v2 + with: + python-version: '3.8.2' # Script was made for 3.8.2 + architecture: 'x86' # This MUST be x86 + - run: python tools/ci/validate_rustg_windows.py diff --git a/.github/workflows/render_nanomaps.yml b/.github/workflows/render_nanomaps.yml index 32bde6d350a..403bc8dc77d 100644 --- a/.github/workflows/render_nanomaps.yml +++ b/.github/workflows/render_nanomaps.yml @@ -5,10 +5,9 @@ # -aa name: 'Render Nanomaps' on: - push: - branches: master - paths: - - '_maps/map_files/**' + schedule: + - cron: "0 0 * * *" + workflow_dispatch: jobs: generate_maps: @@ -17,8 +16,13 @@ jobs: steps: - name: 'Update Branch' uses: actions/checkout@v2 - with: - fetch-depth: 1 + + - name: Branch + run: | + git fetch origin + git branch -f nanomap-render + git checkout nanomap-render + git reset --hard origin/master - name: 'Generate Maps' run: './tools/github-actions/nanomap-renderer-invoker.sh' @@ -29,7 +33,15 @@ jobs: git config --local user.name "NanoMap Generation" git pull origin master git commit -m "NanoMap Auto-Update (`date`)" -a || true - - name: 'Push Maps' - uses: ad-m/github-push-action@master + git push -f -u origin nanomap-render + + - name: Create Pull Request + uses: repo-sync/pull-request@v2 with: + source_branch: "nanomap-render" + destination_branch: "master" + pr_title: "Automatic NanoMap Update" + pr_body: "This pull request updates the server NanoMaps. Please review the diff images before merging." + pr_label: "NanoMaps" + pr_allow_empty: false github_token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 00000000000..5547f1b61f6 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,8 @@ +{ + "workbench.editorAssociations": [ + { + "filenamePattern": "*.dmi", + "viewType": "imagePreview.previewEditor" + } + ] +} diff --git a/SQL/paradise_schema.sql b/SQL/paradise_schema.sql index 7da1473b4c3..8917d28d6bb 100644 --- a/SQL/paradise_schema.sql +++ b/SQL/paradise_schema.sql @@ -159,7 +159,7 @@ DROP TABLE IF EXISTS `admin`; CREATE TABLE `admin` ( `id` int(11) NOT NULL AUTO_INCREMENT, `ckey` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL, - `rank` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'Administrator', + `admin_rank` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'Administrator', `level` int(2) NOT NULL DEFAULT '0', `flags` int(16) NOT NULL DEFAULT '0', PRIMARY KEY (`id`), @@ -195,6 +195,7 @@ DROP TABLE IF EXISTS `ban`; CREATE TABLE `ban` ( `id` int(11) NOT NULL AUTO_INCREMENT, `bantime` datetime NOT NULL, + `ban_round_id` INT(11) NULL DEFAULT NULL, `serverip` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL, `bantype` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL, `reason` mediumtext COLLATE utf8mb4_unicode_ci NOT NULL, @@ -213,6 +214,7 @@ CREATE TABLE `ban` ( `edits` mediumtext COLLATE utf8mb4_unicode_ci DEFAULT NULL, `unbanned` tinyint(1) DEFAULT NULL, `unbanned_datetime` datetime DEFAULT NULL, + `unbanned_round_id` INT(11) NULL DEFAULT NULL, `unbanned_ckey` varchar(32) COLLATE utf8mb4_unicode_ci DEFAULT NULL, `unbanned_computerid` varchar(32) COLLATE utf8mb4_unicode_ci DEFAULT NULL, `unbanned_ip` varchar(32) COLLATE utf8mb4_unicode_ci DEFAULT NULL, @@ -266,7 +268,7 @@ CREATE TABLE `player` ( `toggles` int(11) DEFAULT NULL, `toggles_2` int(11) DEFAULT '0', `sound` mediumint(8) DEFAULT '31', - `volume` smallint(4) DEFAULT '100', + `volume_mixer` longtext COLLATE utf8mb4_unicode_ci DEFAULT NULL, `lastchangelog` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '0', `exp` longtext COLLATE utf8mb4_unicode_ci DEFAULT NULL, `clientfps` smallint(4) DEFAULT '0', @@ -433,11 +435,13 @@ CREATE TABLE `notes` ( `ckey` varchar(32) NOT NULL, `notetext` text NOT NULL, `timestamp` datetime NOT NULL, + `round_id` INT(11) NULL DEFAULT NULL, `adminckey` varchar(32) NOT NULL, `last_editor` varchar(32), `edits` text, `server` varchar(50) NOT NULL, `crew_playtime` mediumint(8) UNSIGNED DEFAULT '0', + `automated` TINYINT(3) UNSIGNED NULL DEFAULT '0', PRIMARY KEY (`id`), KEY `ckey` (`ckey`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; @@ -527,6 +531,7 @@ CREATE TABLE `connection_log` ( `ckey` varchar(32) NOT NULL, `ip` varchar(32) NOT NULL, `computerid` varchar(32) NOT NULL, + `result` ENUM('ESTABLISHED','DROPPED - IPINTEL','DROPPED - BANNED','DROPPED - INVALID') NOT NULL DEFAULT 'ESTABLISHED' COLLATE 'utf8mb4_general_ci', PRIMARY KEY (`id`), KEY `ckey` (`ckey`), KEY `ip` (`ip`), diff --git a/SQL/paradise_schema_prefixed.sql b/SQL/paradise_schema_prefixed.sql index 4f6898eeee7..b3c8f1f7643 100644 --- a/SQL/paradise_schema_prefixed.sql +++ b/SQL/paradise_schema_prefixed.sql @@ -158,7 +158,7 @@ DROP TABLE IF EXISTS `SS13_admin`; CREATE TABLE `SS13_admin` ( `id` int(11) NOT NULL AUTO_INCREMENT, `ckey` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL, - `rank` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'Administrator', + `admin_rank` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'Administrator', `level` int(2) NOT NULL DEFAULT '0', `flags` int(16) NOT NULL DEFAULT '0', PRIMARY KEY (`id`), @@ -194,6 +194,7 @@ DROP TABLE IF EXISTS `SS13_ban`; CREATE TABLE `SS13_ban` ( `id` int(11) NOT NULL AUTO_INCREMENT, `bantime` datetime NOT NULL, + `ban_round_id` INT(11) NULL DEFAULT NULL, `serverip` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL, `bantype` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL, `reason` mediumtext COLLATE utf8mb4_unicode_ci NOT NULL, @@ -212,6 +213,7 @@ CREATE TABLE `SS13_ban` ( `edits` mediumtext COLLATE utf8mb4_unicode_ci DEFAULT NULL, `unbanned` tinyint(1) DEFAULT NULL, `unbanned_datetime` datetime DEFAULT NULL, + `unbanned_round_id` INT(11) NULL DEFAULT NULL, `unbanned_ckey` varchar(32) COLLATE utf8mb4_unicode_ci DEFAULT NULL, `unbanned_computerid` varchar(32) COLLATE utf8mb4_unicode_ci DEFAULT NULL, `unbanned_ip` varchar(32) COLLATE utf8mb4_unicode_ci DEFAULT NULL, @@ -265,7 +267,7 @@ CREATE TABLE `SS13_player` ( `toggles` int(11) DEFAULT NULL, `toggles_2` int(11) DEFAULT '0', `sound` mediumint(8) DEFAULT '31', - `volume` smallint(4) DEFAULT '100', + `volume_mixer` longtext COLLATE utf8mb4_unicode_ci DEFAULT NULL, `lastchangelog` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '0', `exp` longtext COLLATE utf8mb4_unicode_ci DEFAULT NULL, `clientfps` smallint(4) DEFAULT '0', @@ -432,11 +434,13 @@ CREATE TABLE `SS13_notes` ( `ckey` varchar(32) NOT NULL, `notetext` text NOT NULL, `timestamp` datetime NOT NULL, + `round_id` INT(11) NULL DEFAULT NULL, `adminckey` varchar(32) NOT NULL, `last_editor` varchar(32), `edits` text, `server` varchar(50) NOT NULL, `crew_playtime` mediumint(8) UNSIGNED DEFAULT '0', + `automated` TINYINT(3) UNSIGNED NULL DEFAULT '0', PRIMARY KEY (`id`), KEY `ckey` (`ckey`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; @@ -524,6 +528,7 @@ CREATE TABLE `SS13_connection_log` ( `ckey` varchar(32) NOT NULL, `ip` varchar(32) NOT NULL, `computerid` varchar(32) NOT NULL, + `result` ENUM('ESTABLISHED','DROPPED - IPINTEL','DROPPED - BANNED','DROPPED - INVALID') NOT NULL DEFAULT 'ESTABLISHED' COLLATE 'utf8mb4_general_ci', PRIMARY KEY (`id`), KEY `ckey` (`ckey`), KEY `ip` (`ip`), diff --git a/SQL/updates/19-20.sql b/SQL/updates/19-20.sql new file mode 100644 index 00000000000..16eac5e7b68 --- /dev/null +++ b/SQL/updates/19-20.sql @@ -0,0 +1,14 @@ +# Updating DB from 19-20, -AffectedArc07 +# Tracks round IDs in notes and bans, as well as other admin tweaks + +# Add new columns to ban +ALTER TABLE `ban` ADD COLUMN `ban_round_id` INT NULL DEFAULT NULL AFTER `bantime`; +ALTER TABLE `ban` ADD COLUMN `unbanned_round_id` INT NULL DEFAULT NULL AFTER `unbanned_datetime`; + + +# Add new columns to notes +ALTER TABLE `notes` ADD COLUMN `round_id` INT NULL DEFAULT NULL AFTER `timestamp`; +ALTER TABLE `notes` ADD COLUMN `automated` TINYINT UNSIGNED NULL DEFAULT '0' AFTER `crew_playtime`; + +# Add new column to connection_log +ALTER TABLE `connection_log` ADD COLUMN `result` ENUM('ESTABLISHED','DROPPED - IPINTEL', 'DROPPED - BANNED', 'DROPPED - INVALID') NOT NULL DEFAULT 'ESTABLISHED' AFTER `computerid`; diff --git a/SQL/updates/20-21.sql b/SQL/updates/20-21.sql new file mode 100644 index 00000000000..5882b786ff6 --- /dev/null +++ b/SQL/updates/20-21.sql @@ -0,0 +1,8 @@ +# Updating DB from 20-21 +# Replaces volume (number) column by volume_mixer (text) ~dearmochi + +# Add column to player +ALTER TABLE `player` ADD COLUMN `volume_mixer` longtext COLLATE utf8mb4_unicode_ci DEFAULT NULL AFTER `volume`; + +# Remove column from player +ALTER TABLE `player` DROP COLUMN `volume`; diff --git a/SQL/updates/21-22.sql b/SQL/updates/21-22.sql new file mode 100644 index 00000000000..24ef6fd9f25 --- /dev/null +++ b/SQL/updates/21-22.sql @@ -0,0 +1,4 @@ +# Updating DB from 21-22, -AffectedArc07 +# Changes `rank` to `admin_rank` to remove use of reserved keyword + +ALTER TABLE `admin` CHANGE COLUMN `rank` `admin_rank` VARCHAR(32) NOT NULL DEFAULT 'Administrator' COLLATE 'utf8mb4_unicode_ci' AFTER `ckey`; diff --git a/SpacemanDMM.toml b/SpacemanDMM.toml index 81aff0d5576..b1c71c30062 100644 --- a/SpacemanDMM.toml +++ b/SpacemanDMM.toml @@ -7,3 +7,6 @@ disallow_relative_proc_definitions = true [dmdoc] use_typepath_names = true + +[debugger] +engine = "auxtools" diff --git a/_maps/cyberiad.dm b/_maps/cyberiad.dm index 3652328e8f4..ebdcba2a08e 100644 --- a/_maps/cyberiad.dm +++ b/_maps/cyberiad.dm @@ -3,21 +3,21 @@ 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 = station -z2 = centcomm -z3 = engineering stuff (called Z4, dont question it) -z4 = lavaland +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\cyberiad\z2.dmm" #include "map_files\generic\Lavaland.dmm" #define MAP_TRANSITION_CONFIG list(\ -DECLARE_LEVEL(MAIN_STATION, CROSSLINKED, list(STATION_LEVEL, STATION_CONTACT, REACHABLE, AI_OK)),\ 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) diff --git a/_maps/delta.dm b/_maps/delta.dm index f944092131b..89540207d8d 100644 --- a/_maps/delta.dm +++ b/_maps/delta.dm @@ -3,25 +3,22 @@ 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 = station -z2 = centcomm -z3 = space (empty) -z4 = lavaland +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\cyberiad\z2.dmm" #include "map_files\generic\Lavaland.dmm" - #define MAP_FILE "delta.dmm" - #define MAP_NAME "Kerberos" #define MAP_TRANSITION_CONFIG list(\ -DECLARE_LEVEL(MAIN_STATION, CROSSLINKED, list(STATION_LEVEL, STATION_CONTACT, REACHABLE, AI_OK)),\ 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 diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm index 5728da47548..4be798f308c 100644 --- a/_maps/map_files/Delta/delta.dmm +++ b/_maps/map_files/Delta/delta.dmm @@ -16,81 +16,6 @@ /obj/structure/lattice, /turf/space, /area/space/nearstation) -"abp" = ( -/obj/machinery/porta_turret/syndicate, -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 8; - icon_state = "diagonalWall3" - }, -/area/shuttle/syndicate) -"abq" = ( -/turf/simulated/shuttle/wall{ - icon_state = "wall3" - }, -/area/shuttle/syndicate) -"abr" = ( -/obj/machinery/door/poddoor/shutters{ - density = 0; - dir = 2; - icon_state = "shutter0"; - id_tag = "syndieshutters"; - name = "Blast Shutters"; - opacity = 0 - }, -/obj/structure/grille, -/obj/structure/shuttle/window{ - tag = "icon-window5_end"; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "window5_end"; - dir = 2 - }, -/turf/simulated/shuttle/plating, -/area/shuttle/syndicate) -"abs" = ( -/obj/machinery/door/poddoor/shutters{ - density = 0; - dir = 2; - icon_state = "shutter0"; - id_tag = "syndieshutters"; - name = "Blast Shutters"; - opacity = 0 - }, -/obj/structure/grille, -/obj/structure/shuttle/window{ - tag = "icon-window5_mid"; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "window5_mid"; - dir = 2 - }, -/turf/simulated/shuttle/plating, -/area/shuttle/syndicate) -"abt" = ( -/obj/machinery/door/poddoor/shutters{ - density = 0; - dir = 2; - icon_state = "shutter0"; - id_tag = "syndieshutters"; - name = "Blast Shutters"; - opacity = 0 - }, -/obj/structure/grille, -/obj/structure/shuttle/window{ - tag = "icon-window5_end (NORTH)"; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "window5_end"; - dir = 1 - }, -/turf/simulated/shuttle/plating, -/area/shuttle/syndicate) -"abu" = ( -/obj/machinery/porta_turret/syndicate, -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 1; - icon_state = "diagonalWall3" - }, -/area/shuttle/syndicate) "abv" = ( /obj/machinery/power/tracker, /obj/structure/cable{ @@ -102,57 +27,6 @@ icon_state = "solarpanel" }, /area/maintenance/auxsolarstarboard) -"abz" = ( -/turf/simulated/shuttle/wall{ - dir = 4; - icon_state = "wall3" - }, -/area/shuttle/syndicate) -"abA" = ( -/obj/structure/table, -/obj/machinery/kitchen_machine/microwave, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"abB" = ( -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"abC" = ( -/obj/structure/table, -/obj/item/flashlight/lamp{ - pixel_x = 4; - pixel_y = 1 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"abD" = ( -/obj/machinery/computer/shuttle/syndicate, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"abE" = ( -/obj/structure/table, -/obj/machinery/door_control{ - id = "syndieshutters"; - name = "remote shutter control"; - req_access_txt = "150" - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"abF" = ( -/obj/structure/computerframe, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) "abG" = ( /obj/structure/cable{ d1 = 1; @@ -163,61 +37,6 @@ /obj/structure/lattice/catwalk, /turf/space, /area/maintenance/auxsolarstarboard) -"abN" = ( -/obj/structure/table, -/obj/item/storage/box/syndidonkpockets, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"abO" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 1 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"abP" = ( -/obj/machinery/light/spot{ - tag = "icon-tube1 (EAST)"; - icon_state = "tube1"; - dir = 4 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"abS" = ( -/obj/structure/table, -/obj/item/stack/sheet/glass{ - amount = 10 - }, -/obj/item/multitool, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"abT" = ( -/obj/machinery/light/spot, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"abU" = ( -/obj/item/radio/intercom/syndicate{ - pixel_y = -28 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"abV" = ( -/obj/structure/closet/syndicate/personal, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) "abW" = ( /obj/machinery/power/solar{ name = "Aft Starboard Solar Panel" @@ -231,29 +50,6 @@ icon_state = "solarpanel" }, /area/maintenance/auxsolarstarboard) -"acb" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - icon_state = "diagonalWall3" - }, -/area/shuttle/syndicate) -"acc" = ( -/obj/machinery/door/window{ - dir = 2; - name = "Cockpit"; - req_access_txt = "150" - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"acd" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 4; - icon_state = "diagonalWall3" - }, -/area/shuttle/syndicate) "ace" = ( /obj/structure/cable{ d1 = 1; @@ -306,8 +102,8 @@ /area/maintenance/auxsolarstarboard) "aci" = ( /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/structure/lattice/catwalk, /turf/space, @@ -332,21 +128,6 @@ /obj/structure/lattice/catwalk, /turf/space, /area/maintenance/auxsolarstarboard) -"acm" = ( -/obj/structure/table, -/obj/item/stack/cable_coil, -/obj/item/crowbar/red, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"acn" = ( -/obj/structure/table, -/obj/item/storage/box/zipties, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) "aco" = ( /obj/machinery/power/solar{ name = "Aft Starboard Solar Panel" @@ -360,78 +141,6 @@ /obj/structure/lattice/catwalk, /turf/space, /area/maintenance/auxsolarstarboard) -"acs" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 4 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"act" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 8 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"acu" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 8; - icon_state = "diagonalWall3" - }, -/area/shuttle/syndicate) -"acv" = ( -/obj/machinery/porta_turret/syndicate, -/turf/simulated/shuttle/wall{ - dir = 4; - icon_state = "wall3" - }, -/area/shuttle/syndicate) -"acw" = ( -/obj/structure/shuttle/engine/propulsion{ - tag = "icon-propulsion_r (NORTH)"; - icon_state = "propulsion_r"; - dir = 1 - }, -/turf/simulated/shuttle/plating, -/area/shuttle/syndicate_elite) -"acx" = ( -/obj/structure/closet/syndicate/suits, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"acy" = ( -/obj/structure/closet/syndicate/nuclear, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"acz" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 8; - icon_state = "diagonalWall3" - }, -/area/shuttle/administration) -"acA" = ( -/obj/structure/shuttle/engine/propulsion{ - tag = "icon-propulsion (NORTH)"; - icon_state = "propulsion"; - dir = 1 - }, -/turf/simulated/shuttle/plating, -/area/shuttle/administration) -"acB" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 1; - icon_state = "diagonalWall3" - }, -/area/shuttle/administration) "acC" = ( /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, @@ -465,59 +174,13 @@ /area/space/nearstation) "acG" = ( /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/structure/lattice/catwalk, /turf/space, /area/space/nearstation) -"acH" = ( -/obj/structure/chair/stool, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"acI" = ( -/obj/structure/table, -/obj/item/aicard, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) "acJ" = ( -/obj/machinery/door/airlock/external{ - frequency = 1331; - icon_state = "door_locked"; - id_tag = "synd_outer"; - locked = 0; - name = "Ship External Access"; - req_access = null; - req_access_txt = "150" - }, -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "pdoor0"; - id_tag = "smindicate"; - name = "Outer Airlock"; - opacity = 0 - }, -/obj/machinery/door_control{ - id = "smindicate"; - name = "External Door Control"; - pixel_x = -26; - pixel_y = -2; - req_access_txt = "150" - }, -/obj/docking_port/mobile{ - dheight = 9; - dir = 2; - dwidth = 5; - height = 22; - id = "syndicate"; - name = "syndicate infiltrator"; - roundstart_move = "syndicate_away"; - width = 18 - }, /obj/docking_port/stationary{ dheight = 9; dir = 2; @@ -527,45 +190,8 @@ name = "northwest of station"; width = 18 }, -/turf/simulated/shuttle/plating, -/area/shuttle/syndicate) -"acK" = ( -/obj/structure/sign/securearea{ - desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; - icon_state = "space"; - layer = 4; - name = "EXTERNAL AIRLOCK"; - pixel_x = 0 - }, -/turf/simulated/shuttle/wall{ - icon_state = "wall3" - }, -/area/shuttle/syndicate) -"acL" = ( /turf/space, -/turf/simulated/shuttle/wall{ - dir = 1; - icon_state = "diagonalWall3" - }, -/area/shuttle/syndicate) -"acM" = ( -/turf/simulated/shuttle/wall{ - icon_state = "wall3" - }, -/area/shuttle/administration) -"acN" = ( -/obj/structure/shuttle/engine/heater{ - tag = "icon-heater (NORTH)"; - icon_state = "heater"; - dir = 1 - }, -/obj/structure/window/plasmareinforced{ - color = "#d70000" - }, -/turf/simulated/shuttle/wall{ - icon_state = "wall3" - }, -/area/shuttle/administration) +/area/space) "acO" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 2; @@ -594,91 +220,6 @@ }, /turf/simulated/floor/plating, /area/hallway/secondary/entry) -"acP" = ( -/obj/structure/closet/syndicate/suits, -/obj/machinery/light/spot{ - tag = "icon-tube1 (WEST)"; - icon_state = "tube1"; - dir = 8 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"acQ" = ( -/obj/structure/table, -/obj/item/grenade/plastic/c4{ - pixel_x = 2; - pixel_y = 1 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"acR" = ( -/obj/machinery/light/spot{ - tag = "icon-tube1 (WEST)"; - icon_state = "tube1"; - dir = 8 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"acS" = ( -/obj/machinery/atmospherics/unary/tank/air{ - dir = 2 - }, -/turf/simulated/shuttle/wall{ - dir = 4; - icon_state = "wall3" - }, -/area/shuttle/syndicate) -"acT" = ( -/obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 2; - frequency = 1331; - id_tag = "synd_pump" - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"acU" = ( -/obj/machinery/bodyscanner, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, -/area/shuttle/administration) -"acW" = ( -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, -/area/shuttle/administration) -"acX" = ( -/obj/machinery/dna_scannernew/upgraded, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, -/area/shuttle/administration) -"acY" = ( -/obj/machinery/vending/snack, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) -"acZ" = ( -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) -"ada" = ( -/obj/structure/table, -/obj/machinery/kitchen_machine/microwave/upgraded, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) "adb" = ( /turf/simulated/wall, /area/hallway/secondary/entry) @@ -690,152 +231,19 @@ /turf/simulated/floor/plating, /area/hallway/secondary/entry) "add" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f6"; - dir = 2 - }, +/turf/simulated/wall/mineral/titanium, /area/shuttle/pod_1) "ade" = ( -/obj/structure/window/full/shuttle, -/obj/structure/grille, -/turf/simulated/shuttle/plating, -/area/shuttle/pod_1) -"adf" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f10"; - dir = 2 - }, +/obj/effect/spawner/window/shuttle, +/turf/simulated/floor/plating, /area/shuttle/pod_1) "adg" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f6"; - dir = 2 - }, +/turf/simulated/wall/mineral/titanium, /area/shuttle/pod_2) "adh" = ( -/obj/structure/window/full/shuttle, -/obj/structure/grille, -/turf/simulated/shuttle/plating, +/obj/effect/spawner/window/shuttle, +/turf/simulated/floor/plating, /area/shuttle/pod_2) -"adi" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f10"; - dir = 2 - }, -/area/shuttle/pod_2) -"adj" = ( -/obj/machinery/door/window{ - dir = 4; - name = "Equipment Room"; - req_access_txt = "150" - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"adk" = ( -/obj/machinery/access_button{ - command = "cycle_interior"; - frequency = 1331; - master_tag = "synd_airlock"; - name = "interior access button"; - pixel_x = 25; - pixel_y = 25; - req_access_txt = "0" - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"adl" = ( -/obj/machinery/door/airlock/external{ - frequency = 1331; - icon_state = "door_locked"; - id_tag = "synd_inner"; - locked = 1; - name = "Ship External Access"; - req_access = null; - req_access_txt = "150" - }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5; - icon_state = "intact" - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"adm" = ( -/obj/machinery/atmospherics/pipe/manifold4w/hidden, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"adn" = ( -/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ - frequency = 1331; - id_tag = "synd_airlock"; - pixel_x = 25; - req_access_txt = "150"; - tag_airpump = "synd_pump"; - tag_chamber_sensor = "synd_sensor"; - tag_exterior_door = "synd_outer"; - tag_interior_door = "synd_inner" - }, -/obj/machinery/airlock_sensor{ - frequency = 1331; - id_tag = "synd_sensor"; - pixel_x = 25; - pixel_y = 12; - req_access_txt = "150" - }, -/obj/machinery/light{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 4 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"ado" = ( -/obj/machinery/iv_drip, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, -/area/shuttle/administration) -"adp" = ( -/obj/machinery/computer/cloning, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, -/area/shuttle/administration) -"adq" = ( -/obj/machinery/vending/cola, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) -"adr" = ( -/obj/machinery/door/window/northright{ - dir = 4; - name = "bar" - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) -"ads" = ( -/obj/machinery/vending/boozeomat, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) "adt" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 5; @@ -864,12 +272,6 @@ /obj/effect/decal/warning_stripes/northwest, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry) -"adw" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall3"; - dir = 2 - }, -/area/shuttle/pod_1) "adx" = ( /obj/machinery/status_display{ density = 0; @@ -884,14 +286,8 @@ /obj/structure/chair/comfy/shuttle{ dir = 1 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/pod_1) -"ady" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall3"; - dir = 2 - }, -/area/shuttle/pod_2) "adz" = ( /obj/machinery/status_display{ density = 0; @@ -906,105 +302,8 @@ /obj/structure/chair/comfy/shuttle{ dir = 1 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/pod_2) -"adA" = ( -/obj/machinery/door/window{ - base_state = "right"; - dir = 4; - icon_state = "right"; - name = "Equipment Room"; - req_access_txt = "150" - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"adB" = ( -/obj/effect/spawner/window/reinforced, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"adC" = ( -/obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 1; - frequency = 1331; - id_tag = "synd_pump" - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"adD" = ( -/obj/structure/rack, -/obj/item/clothing/suit/space/syndicate/black/red, -/obj/item/clothing/head/helmet/space/syndicate/black/red, -/obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 1; - frequency = 1331; - id_tag = "synd_pump" - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"adE" = ( -/obj/structure/table, -/obj/item/bonegel, -/obj/item/bonesetter, -/obj/item/hemostat, -/obj/item/cautery, -/obj/item/surgicaldrill, -/obj/item/circular_saw, -/obj/item/scalpel, -/obj/item/retractor, -/obj/item/FixOVein, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, -/area/shuttle/administration) -"adF" = ( -/obj/machinery/clonepod/upgraded, -/obj/machinery/light/spot{ - tag = "icon-tube1 (EAST)"; - icon_state = "tube1"; - dir = 4 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, -/area/shuttle/administration) -"adG" = ( -/obj/machinery/vending/coffee, -/obj/machinery/light/spot{ - tag = "icon-tube1 (WEST)"; - icon_state = "tube1"; - dir = 8 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) -"adH" = ( -/obj/structure/chair/stool, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) -"adI" = ( -/obj/structure/table, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) -"adJ" = ( -/obj/structure/table/reinforced, -/obj/machinery/chem_dispenser/beer, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) "adK" = ( /obj/machinery/light/small{ dir = 4 @@ -1014,19 +313,7 @@ /area/hallway/secondary/entry) "adL" = ( /obj/structure/shuttle/engine/propulsion/burst, -/turf/simulated/floor/plating, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f5"; - dir = 2 - }, -/area/shuttle/pod_1) -"adM" = ( -/obj/structure/shuttle/engine/propulsion/burst, -/turf/simulated/floor/plating, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f9"; - dir = 2 - }, +/turf/simulated/wall/mineral/titanium, /area/shuttle/pod_1) "adN" = ( /turf/simulated/wall/r_wall, @@ -1040,7 +327,7 @@ /obj/structure/chair/comfy/shuttle{ dir = 1 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/pod_1) "adP" = ( /obj/item/radio/intercom{ @@ -1051,32 +338,12 @@ /obj/structure/chair/comfy/shuttle{ dir = 1 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/pod_2) "adQ" = ( /obj/structure/shuttle/engine/propulsion/burst, -/turf/simulated/floor/plating, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f5"; - dir = 2 - }, +/turf/simulated/wall/mineral/titanium, /area/shuttle/pod_2) -"adR" = ( -/obj/structure/shuttle/engine/propulsion/burst, -/turf/simulated/floor/plating, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f9"; - dir = 2 - }, -/area/shuttle/pod_2) -"adS" = ( -/obj/item/radio/intercom/syndicate{ - pixel_x = -28 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) "adT" = ( /obj/docking_port/stationary{ dir = 2; @@ -1088,38 +355,6 @@ }, /turf/space, /area/space) -"adU" = ( -/obj/machinery/optable, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, -/area/shuttle/administration) -"adV" = ( -/obj/machinery/chem_master, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, -/area/shuttle/administration) -"adW" = ( -/obj/machinery/vending/cigarette, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) -"adX" = ( -/obj/structure/table, -/obj/item/ashtray/glass, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) -"adY" = ( -/obj/structure/table/reinforced, -/obj/item/storage/box/drinkingglasses, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) "adZ" = ( /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel, @@ -1152,23 +387,24 @@ id = "pod1"; name = "escape pod 1" }, -/obj/machinery/door/airlock/shuttle{ +/obj/machinery/door/airlock/titanium{ id_tag = "s_docking_airlock"; name = "Escape Pod Hatch" }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/pod_1) "aee" = ( /obj/structure/shuttle/engine/propulsion{ - tag = "icon-propulsion (NORTH)"; + dir = 1; icon_state = "propulsion"; - dir = 1 + tag = "icon-propulsion (NORTH)" }, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/shuttle/arrival/station) "aef" = ( /obj/machinery/door/airlock/external{ - id_tag = "admin_home" + id_tag = "admin_home"; + locked = 1 }, /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel, @@ -1178,156 +414,12 @@ id = "pod2"; name = "escape pod 2" }, -/obj/machinery/door/airlock/shuttle{ +/obj/machinery/door/airlock/titanium{ id_tag = "s_docking_airlock"; name = "Escape Pod Hatch" }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/pod_2) -"aeh" = ( -/obj/structure/shuttle/engine/propulsion{ - tag = "icon-propulsion (NORTH)"; - icon_state = "propulsion"; - dir = 1 - }, -/turf/space, -/turf/simulated/shuttle/wall/interior{ - tag = "icon-swall_f6"; - icon_state = "swall_f6" - }, -/area/shuttle/transport) -"aei" = ( -/obj/machinery/recharge_station/upgraded, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"aej" = ( -/obj/machinery/portable_atmospherics/canister/oxygen, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"aek" = ( -/obj/structure/table, -/obj/machinery/cell_charger, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"ael" = ( -/obj/structure/table, -/obj/machinery/recharger{ - pixel_y = 0 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"aem" = ( -/obj/machinery/vending/wallmed/syndicate{ - pixel_x = -30 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"aen" = ( -/obj/structure/table, -/obj/item/stock_parts/cell/high{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/stock_parts/cell/high, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"aeo" = ( -/obj/structure/table, -/obj/item/screwdriver{ - pixel_y = 9 - }, -/obj/item/assembly/voice{ - pixel_y = 3 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"aep" = ( -/obj/structure/table, -/obj/item/wrench, -/obj/item/assembly/infra, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"aeq" = ( -/obj/structure/table, -/obj/item/assembly/prox_sensor{ - pixel_x = -8; - pixel_y = 4 - }, -/obj/item/assembly/prox_sensor{ - pixel_x = -8; - pixel_y = 4 - }, -/obj/item/assembly/signaler, -/obj/item/assembly/signaler, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"aer" = ( -/obj/structure/table, -/obj/item/weldingtool/largetank, -/obj/item/multitool, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"aes" = ( -/obj/machinery/vending/medical, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, -/area/shuttle/administration) -"aet" = ( -/obj/machinery/chem_dispenser, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, -/area/shuttle/administration) -"aeu" = ( -/obj/machinery/computer/scan_consolenew, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, -/area/shuttle/administration) -"aev" = ( -/obj/structure/table, -/obj/item/storage/fancy/cigarettes/dromedaryco, -/obj/item/lighter/zippo{ - pixel_x = 5 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) -"aew" = ( -/obj/machinery/light/spot, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) -"aex" = ( -/obj/structure/table/reinforced, -/obj/machinery/chem_dispenser/soda, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) "aey" = ( /obj/machinery/light/small{ dir = 8 @@ -1354,60 +446,6 @@ /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/maintenance/auxsolarstarboard) -"aeD" = ( -/obj/machinery/door/window{ - dir = 4; - name = "Infirmary"; - req_access_txt = "150" - }, -/obj/machinery/light/spot{ - tag = "icon-tube1 (NORTH)"; - icon_state = "tube1"; - dir = 1 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"aeE" = ( -/obj/machinery/door/window/westright{ - name = "Tool Storage"; - req_access_txt = "150" - }, -/obj/machinery/light/spot{ - tag = "icon-tube1 (NORTH)"; - icon_state = "tube1"; - dir = 1 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"aeF" = ( -/obj/structure/table, -/obj/item/storage/toolbox/syndicate, -/obj/item/crowbar/red, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"aeG" = ( -/obj/machinery/door/airlock/centcom{ - id_tag = "adminshuttle"; - name = "Medbay"; - opacity = 1; - req_access_txt = "103" - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) -"aeH" = ( -/obj/machinery/door/airlock/glass, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) "aeI" = ( /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, @@ -1471,116 +509,6 @@ /obj/effect/decal/warning_stripes/northeast, /turf/simulated/floor/plating, /area/maintenance/auxsolarstarboard) -"aeR" = ( -/obj/machinery/light/spot{ - tag = "icon-tube1 (WEST)"; - icon_state = "tube1"; - dir = 8 - }, -/obj/machinery/sleeper/syndie{ - dir = 4 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"aeS" = ( -/obj/machinery/door/window{ - base_state = "right"; - dir = 4; - icon_state = "right"; - name = "Infirmary"; - req_access_txt = "150" - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"aeT" = ( -/obj/machinery/door/window{ - dir = 8; - name = "Tool Storage"; - req_access_txt = "150" - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"aeU" = ( -/obj/structure/closet/crate/internals, -/obj/item/tank/oxygen/red, -/obj/item/clothing/mask/gas, -/obj/item/tank/oxygen/red, -/obj/item/clothing/mask/gas, -/obj/item/tank/oxygen/red, -/obj/item/clothing/mask/gas, -/obj/item/tank/oxygen/red, -/obj/item/clothing/mask/gas, -/obj/item/tank/oxygen/red, -/obj/item/clothing/mask/gas, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"aeV" = ( -/obj/machinery/light/spot{ - tag = "icon-tube1 (NORTH)"; - icon_state = "tube1"; - dir = 1 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) -"aeW" = ( -/obj/machinery/door_control{ - id = "adminshuttleblast"; - name = "blast door control"; - pixel_x = 0; - pixel_y = 30; - req_access_txt = "106" - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) -"aeX" = ( -/obj/machinery/door/airlock/centcom{ - id_tag = "adminshuttle"; - name = "General Access"; - opacity = 1; - req_access_txt = "101" - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) -"aeY" = ( -/obj/machinery/light{ - dir = 1; - in_use = 1 - }, -/obj/machinery/door_control{ - id = "adminshuttleblast"; - name = "blast door control"; - pixel_x = 0; - pixel_y = 30; - req_access_txt = "106" - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) -"aeZ" = ( -/obj/machinery/door/airlock/external{ - id_tag = "s_docking_airlock"; - name = "Shuttle Hatch"; - req_access_txt = "106" - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) "afa" = ( /obj/structure/cable{ d1 = 1; @@ -1678,12 +606,12 @@ /area/hallway/secondary/entry) "afi" = ( /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/machinery/power/terminal{ - icon_state = "term"; - dir = 1 + dir = 1; + icon_state = "term" }, /turf/simulated/floor/plating, /area/maintenance/auxsolarstarboard) @@ -1790,102 +718,7 @@ }, /turf/simulated/floor/plasteel, /area/maintenance/auxsolarstarboard) -"afo" = ( -/obj/machinery/sleeper/syndie{ - dir = 4 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"afp" = ( -/obj/structure/table, -/obj/item/gun/syringe, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"afq" = ( -/obj/structure/table, -/obj/item/reagent_containers/syringe/charcoal, -/obj/item/reagent_containers/syringe/charcoal{ - pixel_y = 2 - }, -/obj/item/reagent_containers/syringe/charcoal{ - pixel_y = 4 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"afr" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"afs" = ( -/obj/machinery/door/window{ - dir = 1; - name = "Secure Storage"; - req_access_txt = "150" - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"aft" = ( -/obj/structure/table, -/obj/item/radio/beacon/syndicate/bomb{ - pixel_y = 5 - }, -/obj/item/radio/beacon/syndicate/bomb, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"afu" = ( -/obj/structure/table, -/obj/item/grenade/syndieminibomb{ - pixel_x = 4; - pixel_y = 2; - pixel_z = 0 - }, -/obj/item/grenade/syndieminibomb{ - pixel_x = -1 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"afv" = ( -/obj/machinery/light{ - dir = 8 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) "afw" = ( -/obj/machinery/door/airlock/external{ - id_tag = "s_docking_airlock"; - name = "Shuttle Hatch"; - req_access_txt = "106" - }, -/obj/docking_port/mobile{ - dir = 8; - dwidth = 8; - height = 15; - id = "admin"; - name = "administration shuttle"; - roundstart_move = "admin_away"; - width = 18 - }, /obj/docking_port/stationary{ dir = 8; dwidth = 8; @@ -1894,16 +727,14 @@ name = "port bay 1"; width = 18 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) +/turf/space, +/area/space) "afx" = ( /obj/structure/table/reinforced, /obj/item/clipboard, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/machinery/camera{ c_tag = "Starboard Arrivals Storage"; @@ -1960,62 +791,6 @@ /obj/effect/decal/warning_stripes/southeast, /turf/simulated/floor/plating, /area/maintenance/auxsolarstarboard) -"afD" = ( -/obj/structure/mirror{ - pixel_x = 28 - }, -/obj/structure/sink{ - dir = 4; - icon_state = "sink"; - pixel_x = 11; - pixel_y = 0 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"afE" = ( -/obj/effect/landmark{ - name = "Nuclear-Bomb" - }, -/obj/machinery/light/spot, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"afG" = ( -/obj/machinery/door/airlock/centcom{ - id_tag = "adminshuttle"; - name = "Holding Cell"; - opacity = 1; - req_access_txt = "104" - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) -"afH" = ( -/obj/machinery/door/airlock/centcom{ - id_tag = "adminshuttle"; - name = "Bridge"; - opacity = 1; - req_access_txt = "106" - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) -"afI" = ( -/obj/machinery/door/airlock/centcom{ - id_tag = "adminshuttle"; - name = "Workshop"; - opacity = 1; - req_access_txt = "105" - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) "afJ" = ( /obj/machinery/status_display{ layer = 4; @@ -2034,22 +809,8 @@ /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry) -"afL" = ( -/obj/structure/shuttle/engine/propulsion{ - tag = "icon-propulsion (NORTH)"; - icon_state = "propulsion"; - dir = 1 - }, -/turf/space, -/turf/simulated/shuttle/wall/interior{ - tag = "icon-swall_f10"; - icon_state = "swall_f10" - }, -/area/shuttle/transport) "afM" = ( -/turf/simulated/shuttle/wall{ - icon_state = "wall3" - }, +/turf/simulated/wall/mineral/plastitanium, /area/shuttle/arrival/station) "afN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -2098,108 +859,18 @@ }, /area/hallway/secondary/entry) "afR" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "brown" }, /area/hallway/secondary/entry) -"afS" = ( -/obj/structure/table, -/obj/item/bonegel, -/obj/item/bonesetter, -/obj/item/hemostat, -/obj/item/cautery, -/obj/item/surgicaldrill, -/obj/item/circular_saw, -/obj/item/scalpel, -/obj/item/retractor, -/obj/item/FixOVein, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"afT" = ( -/obj/machinery/optable, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"afU" = ( -/obj/structure/closet/crate/medical, -/obj/item/reagent_containers/glass/bottle/morphine, -/obj/item/storage/box/beakers, -/obj/item/robot_parts/l_arm, -/obj/item/robot_parts/r_arm, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"afV" = ( -/obj/structure/shuttle/engine/heater, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/shuttle/plating, -/area/shuttle/syndicate) -"afW" = ( -/obj/structure/computerframe, -/obj/item/paper/synditele, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"afX" = ( -/obj/machinery/teleport/station, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"afY" = ( -/obj/machinery/teleport/hub/upgraded, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"afZ" = ( -/obj/structure/table, -/obj/item/storage/lockbox/mindshield, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) -"aga" = ( -/obj/structure/table, -/obj/machinery/light/spot{ - tag = "icon-tube1 (NORTH)"; - icon_state = "tube1"; - dir = 1 - }, -/obj/item/storage/box/handcuffs, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) -"agb" = ( -/obj/structure/reagent_dispensers/fueltank, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) -"agc" = ( -/obj/structure/table, -/obj/machinery/cell_charger, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) "agd" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel, @@ -2219,8 +890,8 @@ dir = 10 }, /obj/machinery/light{ - icon_state = "tube1"; - dir = 4 + dir = 4; + icon_state = "tube1" }, /obj/machinery/camera{ c_tag = "Arrivals Port Fore"; @@ -2237,8 +908,8 @@ pixel_y = 0 }, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel, @@ -2250,8 +921,8 @@ pixel_y = 0 }, /obj/machinery/light{ - icon_state = "tube1"; - dir = 4 + dir = 4; + icon_state = "tube1" }, /obj/machinery/camera{ c_tag = "Arrivals Center Fore"; @@ -2261,40 +932,20 @@ /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry) -"agi" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f6"; - dir = 2 - }, -/area/shuttle/arrival/station) -"agj" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall12"; - dir = 2 - }, -/area/shuttle/arrival/station) "agk" = ( /obj/structure/window/reinforced, /obj/structure/shuttle/engine/heater{ - tag = "icon-heater (NORTH)"; + dir = 1; icon_state = "heater"; - dir = 1 + tag = "icon-heater (NORTH)" }, /obj/effect/decal/warning_stripes/north, -/turf/simulated/shuttle/plating, -/area/shuttle/arrival/station) -"agl" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f10"; - dir = 2 - }, +/turf/simulated/floor/plating/airless, /area/shuttle/arrival/station) "agm" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/machinery/camera{ c_tag = "Arrivals Fore Starboard"; @@ -2312,8 +963,8 @@ /area/hallway/secondary/entry) "agn" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 4 + dir = 4; + icon_state = "tube1" }, /obj/machinery/status_display{ layer = 4; @@ -2354,77 +1005,6 @@ icon_state = "brown" }, /area/hallway/secondary/entry) -"agr" = ( -/obj/structure/shuttle/engine/propulsion{ - tag = "icon-propulsion_l"; - icon_state = "propulsion_l" - }, -/turf/simulated/shuttle/plating, -/area/shuttle/syndicate) -"ags" = ( -/obj/structure/shuttle/engine/propulsion, -/turf/simulated/shuttle/plating, -/area/shuttle/syndicate) -"agt" = ( -/obj/structure/shuttle/engine/propulsion{ - tag = "icon-propulsion_r"; - icon_state = "propulsion_r" - }, -/turf/simulated/shuttle/plating, -/area/shuttle/syndicate) -"agu" = ( -/obj/structure/table, -/obj/item/storage/box/chemimp{ - pixel_x = 4; - pixel_y = 3 - }, -/obj/item/storage/box/trackimp, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) -"agv" = ( -/obj/structure/table/reinforced, -/obj/machinery/door_control{ - id = "adminshuttleshutters"; - name = "remote shutter control"; - req_access_txt = "106" - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) -"agw" = ( -/obj/structure/chair/comfy/shuttle, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) -"agx" = ( -/obj/structure/table/reinforced, -/obj/machinery/light/spot{ - tag = "icon-tube1 (EAST)"; - icon_state = "tube1"; - dir = 4 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) -"agy" = ( -/obj/structure/reagent_dispensers/watertank, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) -"agz" = ( -/obj/structure/table, -/obj/item/storage/toolbox/mechanical, -/obj/item/multitool, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) "agA" = ( /obj/structure/sign/vacuum{ pixel_x = -32 @@ -2445,29 +1025,15 @@ /turf/simulated/floor/plasteel, /area/hallway/secondary/entry) "agD" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall7"; - dir = 2 - }, +/turf/simulated/wall/mineral/titanium/nodiagonal, /area/shuttle/arrival/station) "agE" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall12"; - icon_state = "swall12"; - dir = 2 - }, +/turf/simulated/wall/mineral/titanium, /area/shuttle/arrival/station) "agF" = ( -/obj/structure/shuttle/window, -/obj/structure/grille, +/obj/effect/spawner/window/shuttle, /turf/simulated/floor/plating, /area/shuttle/arrival/station) -"agG" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall11"; - dir = 2 - }, -/area/shuttle/arrival/station) "agH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/warning_stripes/east, @@ -2497,78 +1063,36 @@ }, /turf/simulated/wall/r_wall, /area/engine/mechanic_workshop/hanger) -"agM" = ( -/obj/machinery/computer/card/centcom, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) -"agN" = ( -/obj/machinery/computer/shuttle/admin, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) -"agO" = ( -/obj/machinery/computer/communications, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) -"agP" = ( -/obj/machinery/recharge_station/upgraded, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) -"agQ" = ( -/obj/structure/table, -/obj/machinery/recharger{ - pixel_y = 4 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) -"agR" = ( -/turf/space, -/area/hallway/secondary/entry) -"agS" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall3"; - dir = 2 - }, -/area/shuttle/arrival/station) "agT" = ( /obj/item/clothing/suit/storage/hazardvest, /obj/item/clothing/suit/storage/hazardvest, -/obj/item/tank/emergency_oxygen/double, -/obj/item/tank/emergency_oxygen/double, +/obj/item/tank/internals/emergency_oxygen/double, +/obj/item/tank/internals/emergency_oxygen/double, /obj/item/clothing/mask/breath, /obj/item/clothing/mask/breath, /obj/item/clothing/head/hardhat/orange, /obj/item/clothing/head/hardhat/orange, /obj/structure/closet/crate/internals, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) "agU" = ( /obj/structure/closet/wardrobe/mixed, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) "agV" = ( /obj/structure/table/reinforced, /obj/item/storage/toolbox/emergency, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) "agW" = ( /obj/structure/table/reinforced, /obj/item/storage/firstaid/regular, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) "agX" = ( /obj/structure/table/reinforced, /obj/machinery/cell_charger, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) "agY" = ( /obj/structure/table/reinforced, @@ -2662,7 +1186,7 @@ /area/security/podbay) "ahc" = ( /obj/structure/rack, -/obj/item/tank/oxygen, +/obj/item/tank/internals/oxygen, /obj/item/clothing/suit/space/hardsuit/security, /obj/item/clothing/mask/breath, /obj/item/clothing/shoes/magboots, @@ -2735,114 +1259,6 @@ }, /turf/simulated/floor/engine/vacuum, /area/engine/mechanic_workshop/hanger) -"ahm" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - icon_state = "diagonalWall3" - }, -/area/shuttle/administration) -"ahn" = ( -/obj/structure/window/plasmareinforced{ - color = "#d70000"; - dir = 1 - }, -/obj/structure/chair/comfy/shuttle{ - dir = 4 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) -"aho" = ( -/obj/machinery/door/window/northleft{ - color = "#d70000"; - req_access_txt = "104" - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) -"ahp" = ( -/obj/structure/window/plasmareinforced{ - color = "#d70000"; - dir = 1 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) -"ahq" = ( -/obj/machinery/door/poddoor/shutters{ - density = 0; - dir = 4; - icon_state = "shutter0"; - id_tag = "adminshuttleshutters"; - name = "Blast Shutters"; - opacity = 0 - }, -/obj/structure/grille, -/obj/structure/shuttle/window{ - tag = "icon-window5_end"; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "window5_end"; - dir = 2 - }, -/turf/simulated/floor/plating, -/area/shuttle/administration) -"ahr" = ( -/obj/machinery/door/poddoor/shutters{ - density = 0; - dir = 4; - icon_state = "shutter0"; - id_tag = "adminshuttleshutters"; - name = "Blast Shutters"; - opacity = 0 - }, -/obj/structure/grille, -/obj/structure/shuttle/window{ - tag = "icon-window5_mid"; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "window5_mid"; - dir = 2 - }, -/turf/simulated/floor/plating, -/area/shuttle/administration) -"ahs" = ( -/obj/machinery/door/poddoor/shutters{ - density = 0; - dir = 4; - icon_state = "shutter0"; - id_tag = "adminshuttleshutters"; - name = "Blast Shutters"; - opacity = 0 - }, -/obj/structure/grille, -/obj/structure/shuttle/window{ - tag = "icon-window5_end (NORTH)"; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "window5_end"; - dir = 1 - }, -/turf/simulated/floor/plating, -/area/shuttle/administration) -"aht" = ( -/obj/structure/table, -/obj/item/stack/sheet/metal, -/obj/item/stack/sheet/glass{ - pixel_x = 4; - pixel_y = 4 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) -"ahu" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 4; - icon_state = "diagonalWall3" - }, -/area/shuttle/administration) "ahv" = ( /obj/structure/lattice, /turf/space, @@ -2856,12 +1272,6 @@ }, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry) -"ahx" = ( -/obj/machinery/door/airlock/shuttle{ - id_tag = "s_docking_airlock" - }, -/turf/space, -/area/shuttle/transport) "ahy" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock/glass{ @@ -2883,23 +1293,23 @@ /turf/simulated/floor/plasteel, /area/hallway/secondary/entry) "ahB" = ( -/obj/machinery/door/airlock/shuttle{ +/obj/machinery/door/airlock/titanium{ id_tag = "s_docking_airlock" }, /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel, /area/shuttle/arrival/station) "ahC" = ( -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) "ahD" = ( /obj/effect/landmark{ name = "HONKsquad" }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) "ahE" = ( -/obj/machinery/door/airlock/shuttle{ +/obj/machinery/door/airlock/titanium{ id_tag = "s_docking_airlock" }, /obj/effect/decal/warning_stripes/west, @@ -2964,9 +1374,8 @@ /turf/simulated/floor/engine, /area/engine/mechanic_workshop/hanger) "ahL" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/engine, /area/engine/mechanic_workshop/hanger) @@ -2974,45 +1383,6 @@ /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/engine/vacuum, /area/engine/mechanic_workshop/hanger) -"ahN" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 4 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) -"ahO" = ( -/obj/machinery/autolathe/upgraded{ - hacked = 1 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) -"ahP" = ( -/obj/machinery/mecha_part_fabricator/upgraded, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) -"ahQ" = ( -/turf/simulated/shuttle/floor, -/turf/simulated/shuttle/wall/interior{ - tag = "icon-swall_f9"; - icon_state = "swall_f9" - }, -/area/shuttle/transport) -"ahR" = ( -/turf/simulated/shuttle/floor, -/area/shuttle/transport) -"ahS" = ( -/turf/simulated/shuttle/floor, -/turf/simulated/shuttle/wall/interior{ - tag = "icon-swall_f5"; - icon_state = "swall_f5" - }, -/area/shuttle/transport) "ahT" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8; @@ -3036,12 +1406,12 @@ /area/hallway/secondary/entry) "ahV" = ( /obj/item/twohanded/required/kirbyplants, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) "ahW" = ( /obj/machinery/hologram/holopad, /obj/machinery/light, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) "ahX" = ( /obj/structure/closet/secure_closet/security, @@ -3074,11 +1444,8 @@ /obj/effect/landmark/start{ name = "Security Pod Pilot" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -3096,29 +1463,6 @@ icon_state = "dark" }, /area/security/podbay) -"aic" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 1 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) -"aid" = ( -/obj/machinery/light/spot, -/obj/structure/chair/comfy/shuttle{ - dir = 1 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) -"aie" = ( -/obj/structure/dispenser, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) "aif" = ( /obj/machinery/door/airlock/security/glass{ name = "Security Pods"; @@ -3137,30 +1481,6 @@ /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry) -"aih" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall3"; - dir = 2 - }, -/area/shuttle/transport) -"aii" = ( -/obj/machinery/light/spot{ - tag = "icon-tube1 (WEST)"; - icon_state = "tube1"; - dir = 8 - }, -/obj/structure/closet/crate, -/turf/simulated/shuttle/floor, -/area/shuttle/transport) -"aij" = ( -/obj/machinery/light/spot{ - tag = "icon-tube1 (EAST)"; - icon_state = "tube1"; - dir = 4 - }, -/obj/structure/chair/comfy/shuttle, -/turf/simulated/shuttle/floor, -/area/shuttle/transport) "aik" = ( /obj/machinery/light{ dir = 1 @@ -3176,7 +1496,7 @@ /obj/structure/chair/comfy/shuttle{ dir = 4 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) "aim" = ( /obj/effect/landmark{ @@ -3185,14 +1505,7 @@ /obj/structure/chair/comfy/shuttle{ dir = 8 }, -/turf/simulated/shuttle/floor, -/area/shuttle/arrival/station) -"ain" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall2"; - icon_state = "swall2"; - dir = 2 - }, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) "aio" = ( /obj/machinery/light{ @@ -3337,14 +1650,6 @@ /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, /area/security/podbay) -"aiC" = ( -/obj/structure/closet/crate, -/turf/simulated/shuttle/floor, -/area/shuttle/transport) -"aiD" = ( -/obj/machinery/computer/shuttle/ferry/request, -/turf/simulated/shuttle/floor, -/area/shuttle/transport) "aiE" = ( /obj/structure/closet/emcloset, /obj/effect/decal/warning_stripes/yellow, @@ -3364,8 +1669,8 @@ /obj/structure/flora/ausbushes/lavendergrass, /obj/structure/flora/ausbushes/ppflowers, /obj/structure/flora/ausbushes/stalkybush, -/obj/structure/shuttle/window, -/turf/simulated/floor/plating, +/obj/structure/window/full/shuttle, +/turf/simulated/floor/grass, /area/shuttle/arrival/station) "aiH" = ( /obj/structure/chair{ @@ -3427,23 +1732,6 @@ /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/engine, /area/engine/mechanic_workshop/hanger) -"aiQ" = ( -/obj/structure/grille, -/obj/structure/shuttle/window, -/turf/simulated/shuttle/plating, -/area/shuttle/transport) -"aiR" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 4 - }, -/turf/simulated/shuttle/floor, -/area/shuttle/transport) -"aiS" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 8 - }, -/turf/simulated/shuttle/floor, -/area/shuttle/transport) "aiT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4; @@ -3460,7 +1748,7 @@ /obj/structure/chair/comfy/shuttle{ dir = 4 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) "aiV" = ( /obj/effect/landmark{ @@ -3469,7 +1757,7 @@ /obj/structure/chair/comfy/shuttle{ dir = 8 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) "aiW" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -3517,35 +1805,6 @@ }, /turf/simulated/floor/engine, /area/security/podbay) -"aiZ" = ( -/obj/structure/shuttle/engine/propulsion{ - dir = 8; - icon_state = "burst_l" - }, -/turf/simulated/shuttle/plating, -/area/shuttle/specops) -"aja" = ( -/turf/simulated/shuttle/wall{ - icon_state = "wall3" - }, -/area/shuttle/specops) -"ajb" = ( -/obj/machinery/door/airlock/external{ - id_tag = "s_docking_airlock"; - name = "Shuttle Hatch"; - req_access_txt = "109" - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/specops) -"ajc" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 1; - icon_state = "diagonalWall3" - }, -/area/shuttle/specops) "ajd" = ( /obj/item/radio/beacon, /obj/effect/decal/warning_stripes/yellow, @@ -3594,159 +1853,6 @@ }, /turf/simulated/floor/engine, /area/engine/mechanic_workshop/hanger) -"ajj" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 8; - icon_state = "diagonalWall3" - }, -/area/shuttle/vox) -"ajk" = ( -/obj/machinery/access_button{ - command = "cycle_exterior"; - frequency = 1331; - master_tag = "vox_west_control"; - req_one_access_txt = "152" - }, -/turf/simulated/shuttle/wall{ - icon_state = "wall3" - }, -/area/shuttle/vox) -"ajl" = ( -/obj/machinery/door/airlock/hatch{ - frequency = 1331; - icon_state = "door_locked"; - id_tag = "vox_northwest_lock"; - locked = 1; - req_access_txt = "152"; - req_one_access = null; - req_one_access_txt = "0" - }, -/turf/simulated/shuttle/plating/vox, -/area/shuttle/vox) -"ajm" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 1; - icon_state = "diagonalWall3" - }, -/area/shuttle/vox) -"ajn" = ( -/obj/machinery/door/airlock/hatch{ - frequency = 1331; - icon_state = "door_locked"; - id_tag = "vox_northeast_lock"; - locked = 1; - req_access_txt = "152"; - req_one_access = null; - req_one_access_txt = "0" - }, -/obj/docking_port/mobile{ - dir = 2; - dwidth = 2; - height = 18; - id = "skipjack"; - name = "Vox Skipjack"; - roundstart_move = "skipjack_away"; - width = 19 - }, -/obj/docking_port/stationary{ - dir = 2; - dwidth = 2; - height = 18; - id = "skipjack_ne"; - name = "northeast of SS13"; - width = 19 - }, -/turf/simulated/shuttle/plating/vox, -/area/shuttle/vox) -"ajo" = ( -/obj/machinery/access_button{ - command = "cycle_exterior"; - frequency = 1331; - master_tag = "vox_east_control"; - req_access_txt = "152" - }, -/turf/simulated/shuttle/wall{ - icon_state = "wall3" - }, -/area/shuttle/vox) -"ajp" = ( -/obj/structure/shuttle/engine/propulsion{ - dir = 8; - icon_state = "propulsion" - }, -/turf/simulated/shuttle/plating, -/area/shuttle/specops) -"ajq" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/shuttle/engine/heater{ - icon_state = "heater"; - dir = 8 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/specops) -"ajr" = ( -/obj/machinery/computer/security/telescreen{ - desc = "Used for watching the Special Ops team."; - name = "Spec Ops Monitor"; - network = list("ERT"); - pixel_y = 30 - }, -/obj/machinery/computer/shuttle/ert, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/specops) -"ajs" = ( -/obj/structure/chair/comfy/shuttle, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/specops) -"ajt" = ( -/obj/machinery/camera{ - c_tag = "CentComm Special Ops. Shuttle"; - dir = 2; - network = list("ERT","CentComm") - }, -/obj/structure/chair/comfy/shuttle, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/specops) -"aju" = ( -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/specops) -"ajv" = ( -/obj/machinery/recharger/wallcharger{ - pixel_x = 4; - pixel_y = 32 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/specops) -"ajw" = ( -/obj/machinery/recharger/wallcharger{ - pixel_x = 4; - pixel_y = 32 - }, -/obj/machinery/light/spot{ - tag = "icon-tube1 (NORTH)"; - icon_state = "tube1"; - dir = 1 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/specops) "ajx" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -3761,32 +1867,9 @@ /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry) -"ajz" = ( -/obj/machinery/light/spot{ - tag = "icon-tube1 (WEST)"; - icon_state = "tube1"; - dir = 8 - }, -/obj/structure/chair/comfy/shuttle{ - dir = 4 - }, -/turf/simulated/shuttle/floor, -/area/shuttle/transport) -"ajA" = ( -/obj/machinery/light/spot{ - tag = "icon-tube1 (EAST)"; - icon_state = "tube1"; - dir = 4 - }, -/obj/structure/chair/comfy/shuttle{ - dir = 8 - }, -/turf/simulated/shuttle/floor, -/area/shuttle/transport) "ajB" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -3803,25 +1886,18 @@ /obj/structure/table/reinforced, /obj/item/clipboard, /obj/item/toy/figure/assistant, -/turf/simulated/shuttle/floor, -/area/shuttle/arrival/station) -"ajE" = ( -/turf/simulated/shuttle/wall{ - dir = 3; - icon_state = "swall1" - }, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) "ajF" = ( /obj/structure/table/reinforced, /obj/item/folder, /obj/item/storage/pill_bottle/dice, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) "ajG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel, @@ -3858,136 +1934,7 @@ /obj/effect/decal/warning_stripes/southwestcorner, /turf/simulated/floor/engine, /area/engine/mechanic_workshop/hanger) -"ajO" = ( -/turf/simulated/shuttle/wall{ - dir = 4; - icon_state = "wall3" - }, -/area/shuttle/vox) -"ajP" = ( -/obj/machinery/atmospherics/unary/vent_pump/high_volume{ - frequency = 1331; - id_tag = "vox_west_vent" - }, -/turf/simulated/shuttle/plating/vox, -/area/shuttle/vox) -"ajQ" = ( -/obj/machinery/airlock_sensor{ - frequency = 1331; - id_tag = "vox_west_sensor"; - pixel_x = 25; - req_access_txt = "152" - }, -/obj/machinery/light/spot{ - tag = "icon-tube1 (EAST)"; - icon_state = "tube1"; - dir = 4 - }, -/turf/simulated/shuttle/plating/vox, -/area/shuttle/vox) -"ajR" = ( -/obj/machinery/door/poddoor/shutters{ - density = 0; - dir = 2; - icon_state = "shutter0"; - id_tag = "voxshutters"; - name = "Blast Shutters"; - opacity = 0 - }, -/obj/structure/grille, -/obj/structure/shuttle/window{ - tag = "icon-window5_end"; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "window5_end"; - dir = 2 - }, -/turf/simulated/shuttle/plating/vox, -/area/shuttle/vox) -"ajS" = ( -/obj/machinery/door/poddoor/shutters{ - density = 0; - dir = 2; - icon_state = "shutter0"; - id_tag = "voxshutters"; - name = "Blast Shutters"; - opacity = 0 - }, -/obj/structure/grille, -/obj/structure/shuttle/window{ - tag = "icon-window5_mid"; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "window5_mid"; - dir = 2 - }, -/turf/simulated/shuttle/plating/vox, -/area/shuttle/vox) -"ajT" = ( -/obj/machinery/door/poddoor/shutters{ - density = 0; - dir = 2; - icon_state = "shutter0"; - id_tag = "voxshutters"; - name = "Blast Shutters"; - opacity = 0 - }, -/obj/structure/grille, -/obj/structure/shuttle/window{ - tag = "icon-window5_end (NORTH)"; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "window5_end"; - dir = 1 - }, -/turf/simulated/shuttle/plating/vox, -/area/shuttle/vox) -"ajU" = ( -/obj/machinery/airlock_sensor{ - frequency = 1331; - id_tag = "vox_east_sensor"; - pixel_x = -25; - req_access_txt = "152" - }, -/obj/machinery/light/spot{ - tag = "icon-tube1 (WEST)"; - icon_state = "tube1"; - dir = 8 - }, -/turf/simulated/shuttle/plating/vox, -/area/shuttle/vox) -"ajV" = ( -/obj/machinery/atmospherics/unary/vent_pump/high_volume{ - frequency = 1331; - id_tag = "vox_east_vent" - }, -/turf/simulated/shuttle/plating/vox, -/area/shuttle/vox) -"ajW" = ( -/obj/machinery/light/spot{ - tag = "icon-tube1 (WEST)"; - icon_state = "tube1"; - dir = 8 - }, -/obj/structure/chair/comfy/shuttle{ - dir = 4 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/specops) "ajX" = ( -/obj/machinery/door/airlock/external{ - id_tag = "s_docking_airlock"; - name = "Shuttle Hatch"; - req_access_txt = "109" - }, -/obj/docking_port/mobile{ - dir = 8; - dwidth = 2; - height = 11; - id = "specops"; - name = "ert shuttle"; - roundstart_move = "specops_away"; - width = 5 - }, /obj/docking_port/stationary{ dir = 8; dwidth = 2; @@ -3996,8 +1943,8 @@ name = "port bay 2"; width = 5 }, -/turf/simulated/shuttle/plating, -/area/shuttle/specops) +/turf/space, +/area/space) "ajY" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -4017,7 +1964,7 @@ dir = 1; in_use = 1 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) "akb" = ( /obj/machinery/status_display{ @@ -4049,9 +1996,8 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /obj/machinery/camera{ c_tag = "Mechanic's Office"; @@ -4143,125 +2089,28 @@ }, /turf/simulated/floor/engine, /area/engine/mechanic_workshop/hanger) -"akk" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 8 - }, -/turf/simulated/shuttle/plating/vox, -/area/shuttle/vox) -"akl" = ( -/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ - frequency = 1331; - id_tag = "vox_west_control"; - pixel_x = 24; - req_access_txt = "152"; - tag_airpump = "vox_west_vent"; - tag_chamber_sensor = "vox_west_sensor"; - tag_exterior_door = "vox_northwest_lock"; - tag_interior_door = "vox_southwest_lock" - }, -/obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 8; - frequency = 1331; - id_tag = "vox_west_vent" - }, -/turf/simulated/shuttle/plating/vox, -/area/shuttle/vox) -"akm" = ( -/turf/simulated/shuttle/wall{ - icon_state = "wall3" - }, -/area/shuttle/vox) -"akn" = ( -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"ako" = ( -/obj/machinery/computer/station_alert, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"akp" = ( -/obj/machinery/computer/shuttle/vox, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"akq" = ( -/obj/structure/table, -/obj/machinery/door_control{ - id = "voxshutters"; - name = "remote shutter control"; - req_access_txt = "152" - }, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"akr" = ( -/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ - frequency = 1331; - id_tag = "vox_east_control"; - pixel_x = -24; - req_access_txt = "152"; - tag_airpump = "vox_east_vent"; - tag_chamber_sensor = "vox_east_sensor"; - tag_exterior_door = "vox_northeast_lock"; - tag_interior_door = "vox_southeast_lock" - }, -/obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 4; - frequency = 1331; - id_tag = "vox_east_vent" - }, -/turf/simulated/shuttle/plating/vox, -/area/shuttle/vox) -"aks" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 4 - }, -/turf/simulated/shuttle/plating/vox, -/area/shuttle/vox) -"akt" = ( -/obj/machinery/computer/communications, -/obj/item/radio/intercom/specops{ - pixel_y = -28 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/specops) -"aku" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 1 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/specops) -"akv" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 4; - icon_state = "diagonalWall3" - }, -/area/shuttle/specops) "akw" = ( /obj/structure/table/reinforced, /obj/item/paper_bin, /obj/item/pen, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) "akx" = ( /obj/structure/closet/wardrobe/black, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) "aky" = ( /obj/structure/closet/wardrobe/grey, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) "akz" = ( /obj/structure/closet/wardrobe/yellow, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) "akA" = ( /obj/structure/table/reinforced, /obj/item/storage/secure/briefcase, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) "akB" = ( /turf/simulated/wall, @@ -4346,125 +2195,10 @@ }, /turf/simulated/floor/engine, /area/engine/mechanic_workshop/hanger) -"akJ" = ( -/obj/machinery/door/airlock/hatch{ - frequency = 1331; - icon_state = "door_locked"; - id_tag = "vox_southwest_lock"; - locked = 1; - req_access_txt = "152"; - req_one_access = null; - req_one_access_txt = "0" - }, -/obj/machinery/atmospherics/pipe/simple/hidden, -/turf/simulated/shuttle/plating/vox, -/area/shuttle/vox) -"akK" = ( -/obj/machinery/access_button{ - command = "cycle_interior"; - frequency = 1331; - master_tag = "vox_west_control"; - req_one_access_txt = "152" - }, -/turf/simulated/shuttle/wall{ - icon_state = "wall3" - }, -/area/shuttle/vox) -"akL" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 4; - icon_state = "diagonalWall3" - }, -/area/shuttle/vox) -"akM" = ( -/obj/machinery/door/poddoor/shutters{ - density = 0; - dir = 8; - icon_state = "shutter0"; - id_tag = "voxshutters"; - name = "Blast Shutters"; - opacity = 0 - }, -/obj/structure/grille, -/obj/structure/shuttle/window{ - tag = "icon-window5_end (WEST)"; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "window5_end"; - dir = 8 - }, -/turf/simulated/shuttle/plating/vox, -/area/shuttle/vox) -"akN" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 4 - }, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"akO" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 1 - }, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"akP" = ( -/obj/machinery/door/poddoor/shutters{ - density = 0; - dir = 4; - icon_state = "shutter0"; - id_tag = "voxshutters"; - name = "Blast Shutters"; - opacity = 0 - }, -/obj/structure/grille, -/obj/structure/shuttle/window{ - tag = "icon-window5_end (WEST)"; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "window5_end"; - dir = 8 - }, -/turf/simulated/shuttle/plating/vox, -/area/shuttle/vox) -"akQ" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - icon_state = "diagonalWall3" - }, -/area/shuttle/vox) -"akR" = ( -/obj/machinery/access_button{ - command = "cycle_interior"; - frequency = 1331; - master_tag = "vox_east_control"; - req_one_access_txt = "152" - }, -/turf/simulated/shuttle/wall{ - icon_state = "wall3" - }, -/area/shuttle/vox) -"akS" = ( -/obj/machinery/door/airlock/hatch{ - frequency = 1331; - icon_state = "door_locked"; - id_tag = "vox_southeast_lock"; - locked = 1; - req_access_txt = "152"; - req_one_access = null; - req_one_access_txt = "0" - }, -/obj/machinery/atmospherics/pipe/simple/hidden, -/turf/simulated/shuttle/plating/vox, -/area/shuttle/vox) -"akT" = ( -/obj/structure/shuttle/engine/propulsion{ - dir = 8; - icon_state = "burst_r" - }, -/turf/simulated/shuttle/plating, -/area/shuttle/specops) "akU" = ( /obj/machinery/door/airlock/external{ - id_tag = "specops_home" + id_tag = "specops_home"; + locked = 1 }, /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel, @@ -4482,47 +2216,19 @@ /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel, /area/engine/mechanic_workshop) -"akW" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f5"; - dir = 2 - }, -/area/shuttle/arrival/station) -"akX" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall14"; - dir = 2 - }, -/area/shuttle/arrival/station) "akY" = ( /obj/machinery/status_display, -/turf/simulated/shuttle/wall{ - tag = "icon-swall12"; - icon_state = "swall12"; - dir = 2 - }, +/turf/simulated/wall/mineral/titanium, /area/shuttle/arrival/station) "akZ" = ( -/obj/machinery/door/airlock/shuttle{ +/obj/machinery/door/airlock/titanium{ id_tag = "s_docking_airlock" }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) "ala" = ( /obj/machinery/ai_status_display, -/turf/simulated/shuttle/wall{ - tag = "icon-swall12"; - icon_state = "swall12"; - dir = 2 - }, -/area/shuttle/arrival/station) -"alb" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f9"; - dir = 2 - }, +/turf/simulated/wall/mineral/titanium, /area/shuttle/arrival/station) "alc" = ( /obj/machinery/door/firedoor, @@ -4649,57 +2355,6 @@ /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/engine, /area/engine/mechanic_workshop/hanger) -"aln" = ( -/obj/machinery/atmospherics/pipe/simple/hidden, -/turf/simulated/shuttle/plating/vox, -/area/shuttle/vox) -"alo" = ( -/obj/machinery/door/poddoor/shutters{ - density = 0; - dir = 8; - icon_state = "shutter0"; - id_tag = "voxshutters"; - name = "Blast Shutters"; - opacity = 0 - }, -/obj/structure/grille, -/obj/structure/shuttle/window{ - tag = "icon-window5_end (EAST)"; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "window5_end"; - dir = 4 - }, -/turf/simulated/shuttle/plating/vox, -/area/shuttle/vox) -"alp" = ( -/obj/machinery/light/spot, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"alq" = ( -/obj/item/clothing/head/collectable/petehat{ - desc = "It smells faintly of reptile."; - name = "fancy leader hat" - }, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"alr" = ( -/obj/machinery/door/poddoor/shutters{ - density = 0; - dir = 4; - icon_state = "shutter0"; - id_tag = "voxshutters"; - name = "Blast Shutters"; - opacity = 0 - }, -/obj/structure/grille, -/obj/structure/shuttle/window{ - tag = "icon-window5_end (EAST)"; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "window5_end"; - dir = 4 - }, -/turf/simulated/shuttle/plating/vox, -/area/shuttle/vox) "als" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/sign/vacuum{ @@ -4729,8 +2384,8 @@ network = list("SS13") }, /obj/machinery/light{ - icon_state = "tube1"; - dir = 4 + dir = 4; + icon_state = "tube1" }, /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel, @@ -4739,11 +2394,11 @@ /obj/machinery/light/small{ dir = 1 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) "alw" = ( /obj/structure/chair/comfy/shuttle, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) "alx" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -4766,8 +2421,8 @@ pixel_y = 0 }, /obj/machinery/light{ - icon_state = "tube1"; - dir = 4 + dir = 4; + icon_state = "tube1" }, /obj/machinery/camera{ c_tag = "Arrivals Center Aft"; @@ -4794,37 +2449,7 @@ "alA" = ( /turf/simulated/wall/r_wall, /area/engine/mechanic_workshop) -"alB" = ( -/obj/machinery/door/airlock/hatch{ - req_access_txt = "152" - }, -/turf/simulated/shuttle/plating/vox, -/area/shuttle/vox) -"alC" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f5"; - dir = 2 - }, -/area/shuttle/transport) -"alD" = ( -/obj/structure/shuttle/window, -/obj/structure/grille, -/turf/simulated/floor/plating, -/area/shuttle/transport) "alE" = ( -/obj/machinery/door/airlock/shuttle{ - id_tag = "s_docking_airlock" - }, -/obj/docking_port/mobile{ - dir = 1; - dwidth = 2; - height = 12; - id = "ferry"; - name = "ferry shuttle"; - roundstart_move = "ferry_away"; - width = 5 - }, /obj/docking_port/stationary{ dir = 1; dwidth = 2; @@ -4833,15 +2458,8 @@ name = "port bay 3"; width = 5 }, -/turf/simulated/floor/plating, -/area/shuttle/transport) -"alF" = ( /turf/space, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f9"; - dir = 2 - }, -/area/shuttle/transport) +/area/space) "alG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/status_display{ @@ -4863,7 +2481,7 @@ /area/hallway/secondary/entry) "alH" = ( /obj/structure/computerframe, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) "alI" = ( /turf/simulated/wall, @@ -4880,8 +2498,8 @@ pixel_y = 0 }, /obj/machinery/light{ - icon_state = "tube1"; - dir = 4 + dir = 4; + icon_state = "tube1" }, /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel, @@ -4967,16 +2585,6 @@ icon_state = "dark" }, /area/maintenance/fsmaint) -"alU" = ( -/turf/simulated/shuttle/plating/vox, -/area/shuttle/vox) -"alV" = ( -/obj/machinery/light{ - dir = 4; - icon_state = "tube1" - }, -/turf/simulated/shuttle/plating/vox, -/area/shuttle/vox) "alW" = ( /obj/structure/lattice, /obj/structure/lattice, @@ -4998,7 +2606,8 @@ /area/maintenance/fsmaint) "alY" = ( /obj/machinery/door/airlock/external{ - id_tag = "ferry_home" + id_tag = "ferry_home"; + locked = 1 }, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry) @@ -5054,127 +2663,6 @@ /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/maintenance/fsmaint) -"amj" = ( -/obj/machinery/door/poddoor/shutters{ - density = 0; - dir = 8; - icon_state = "shutter0"; - id_tag = "voxshutters"; - name = "Blast Shutters"; - opacity = 0 - }, -/obj/structure/grille, -/obj/structure/shuttle/window{ - dir = 4; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "window5_mid"; - tag = "icon-window5 (EAST)" - }, -/turf/simulated/shuttle/plating/vox, -/area/shuttle/vox) -"amk" = ( -/obj/machinery/atmospherics/pipe/simple/hidden, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"aml" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/table, -/obj/machinery/recharger{ - pixel_y = 0 - }, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"amm" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/table, -/obj/machinery/cell_charger, -/obj/item/weed_extract, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"amn" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/table, -/mob/living/simple_animal/bot/floorbot{ - on = 0 - }, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"amo" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/table, -/obj/item/broken_device, -/obj/item/robot_parts/chest, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"amp" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/table, -/obj/item/pickaxe, -/obj/item/storage/firstaid/toxin, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"amq" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/table, -/obj/item/scalpel, -/obj/item/stack/cable_coil, -/obj/item/storage/firstaid/regular, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"amr" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/table, -/obj/item/circular_saw, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"ams" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/optable, -/obj/item/organ/internal/brain, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"amt" = ( -/obj/machinery/door/poddoor/shutters{ - density = 0; - dir = 4; - icon_state = "shutter0"; - id_tag = "voxshutters"; - name = "Blast Shutters"; - opacity = 0 - }, -/obj/structure/grille, -/obj/structure/shuttle/window{ - dir = 4; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "window5_mid"; - tag = "icon-window5 (EAST)" - }, -/turf/simulated/shuttle/plating/vox, -/area/shuttle/vox) -"amu" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = -28; - pixel_y = 0 - }, -/obj/effect/decal/warning_stripes/southwest, -/turf/simulated/floor/plasteel, -/area/hallway/secondary/entry) "amv" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/warning_stripes/south, @@ -5297,14 +2785,6 @@ icon_state = "redyellowfull" }, /area/maintenance/fsmaint) -"amJ" = ( -/obj/item/storage/toolbox/syndicate, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"amK" = ( -/obj/item/skeleton/r_arm, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) "amL" = ( /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, @@ -5379,83 +2859,16 @@ icon_state = "redyellowfull" }, /area/maintenance/fsmaint) -"amW" = ( -/obj/machinery/atmospherics/unary/tank/nitrogen{ - dir = 1 - }, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"amX" = ( -/obj/machinery/portable_atmospherics/canister/toxins, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"amY" = ( -/obj/machinery/portable_atmospherics/canister/nitrogen, -/obj/machinery/light/spot, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"amZ" = ( -/obj/structure/rack, -/obj/item/rcd, -/obj/item/rcd_ammo, -/obj/item/rcd_ammo, -/obj/item/rcd_ammo, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"ana" = ( -/obj/structure/rack, -/obj/item/tank/nitrogen, -/obj/item/tank/nitrogen, -/obj/item/tank/nitrogen, -/obj/item/tank/nitrogen, -/obj/item/tank/nitrogen, -/obj/item/tank/nitrogen, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"anb" = ( -/obj/structure/rack, -/obj/item/clothing/accessory/storage/black_vest, -/obj/item/clothing/suit/space/vox/carapace, -/obj/item/clothing/head/helmet/space/vox/carapace, -/obj/item/clothing/mask/breath, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"anc" = ( -/obj/structure/rack, -/obj/item/gun/dartgun/vox/raider, -/obj/item/gun/dartgun/vox/medical, -/obj/item/dart_cartridge, -/obj/item/dart_cartridge, -/obj/item/dart_cartridge, -/obj/item/dart_cartridge, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"and" = ( -/obj/machinery/sleeper/upgraded{ - dir = 4 - }, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"ane" = ( -/obj/machinery/bodyscanner, -/obj/machinery/light/spot, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) "ang" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry) -"anh" = ( -/turf/simulated/floor/plasteel{ - dir = 9; - icon_state = "arrival" - }, -/area/hallway/secondary/entry) "ani" = ( +/obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/plasteel{ - dir = 1; + dir = 8; icon_state = "arrival" }, /area/hallway/secondary/entry) @@ -5473,8 +2886,8 @@ level = 1 }, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "arrival" + dir = 4; + icon_state = "whitecorner" }, /area/hallway/secondary/entry) "anl" = ( @@ -5492,9 +2905,7 @@ dir = 4; level = 1 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - on = 1 - }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "arrival" @@ -5525,8 +2936,8 @@ /area/hallway/secondary/entry) "anp" = ( /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4; @@ -5606,15 +3017,10 @@ /area/hallway/secondary/entry) "anv" = ( /turf/simulated/floor/plasteel{ - icon_state = "arrival"; - dir = 5 + dir = 5; + icon_state = "arrival" }, /area/hallway/secondary/entry) -"anw" = ( -/obj/structure/table, -/obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, -/area/hallway/secondary/entry) "anx" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, @@ -5651,45 +3057,21 @@ /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, /area/maintenance/fsmaint) -"anD" = ( -/obj/structure/shuttle/engine/heater, -/obj/structure/window/reinforced{ +"anH" = ( +/obj/structure/sign/securearea{ + desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; + icon_state = "space"; + layer = 4; + name = "EXTERNAL AIRLOCK"; + pixel_x = 0; + pixel_y = -32 + }, +/obj/machinery/atmospherics/unary/portables_connector{ dir = 1 }, -/turf/simulated/shuttle/plating, -/area/shuttle/vox) -"anE" = ( -/obj/structure/rack, -/obj/item/clothing/accessory/storage/black_vest, -/obj/item/clothing/suit/space/vox/medic, -/obj/item/clothing/head/helmet/space/vox/medic, -/obj/item/clothing/mask/breath, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"anF" = ( -/obj/structure/rack, -/obj/item/pneumatic_cannon, -/obj/item/harpoon, -/obj/item/harpoon, -/obj/item/harpoon, -/obj/item/harpoon, -/obj/item/tank/nitrogen, -/obj/machinery/light/spot{ - tag = "icon-tube1 (EAST)"; - icon_state = "tube1"; - dir = 4 - }, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"anG" = ( +/obj/machinery/portable_atmospherics/canister/air, /turf/simulated/floor/plasteel{ - icon_state = "arrival"; - dir = 10 - }, -/area/hallway/secondary/entry) -"anH" = ( -/turf/simulated/floor/plasteel{ - dir = 2; + dir = 10; icon_state = "arrival" }, /area/hallway/secondary/entry) @@ -5976,32 +3358,6 @@ icon_state = "whitehall" }, /area/maintenance/fsmaint) -"aoj" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 8; - icon_state = "diagonalWall3" - }, -/area/shuttle/syndicate_elite) -"aok" = ( -/obj/structure/shuttle/engine/propulsion{ - tag = "icon-propulsion_l"; - icon_state = "propulsion_l" - }, -/turf/simulated/shuttle/plating, -/area/shuttle/vox) -"aol" = ( -/obj/structure/rack, -/obj/item/clothing/accessory/storage/black_vest, -/obj/item/clothing/suit/space/vox/pressure, -/obj/item/clothing/head/helmet/space/vox/pressure, -/obj/item/clothing/mask/breath, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"aom" = ( -/obj/structure/rack, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) "aon" = ( /obj/structure/cable{ d1 = 1; @@ -6057,8 +3413,8 @@ "aou" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - icon_state = "arrival"; - dir = 8 + dir = 8; + icon_state = "arrival" }, /area/hallway/secondary/entry) "aov" = ( @@ -6071,8 +3427,8 @@ "aow" = ( /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/hallway/secondary/entry) "aox" = ( @@ -6238,14 +3594,6 @@ tag = "icon-redfull (NORTHWEST)" }, /area/maintenance/fsmaint) -"aoO" = ( -/obj/structure/shuttle/engine/propulsion{ - tag = "icon-propulsion_l (NORTH)"; - icon_state = "propulsion_l"; - dir = 1 - }, -/turf/simulated/shuttle/plating, -/area/shuttle/syndicate_elite) "aoP" = ( /obj/docking_port/stationary{ dir = 2; @@ -6257,14 +3605,6 @@ }, /turf/space, /area/space) -"aoQ" = ( -/obj/structure/rack, -/obj/item/clothing/accessory/storage/black_vest, -/obj/item/clothing/suit/space/vox/stealth, -/obj/item/clothing/head/helmet/space/vox/stealth, -/obj/item/clothing/mask/breath, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) "aoR" = ( /obj/machinery/light/small{ dir = 8 @@ -6461,8 +3801,8 @@ pixel_y = 32 }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 9 + dir = 9; + icon_state = "red" }, /area/security/checkpoint2) "apm" = ( @@ -6476,8 +3816,8 @@ /obj/item/crowbar, /obj/item/restraints/handcuffs, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 1 + dir = 1; + icon_state = "red" }, /area/security/checkpoint2) "apn" = ( @@ -6628,41 +3968,6 @@ icon_state = "whitehall" }, /area/maintenance/fsmaint) -"apB" = ( -/obj/structure/shuttle/engine/propulsion{ - tag = "icon-propulsion (NORTH)"; - icon_state = "propulsion"; - dir = 1 - }, -/turf/simulated/shuttle/plating, -/area/shuttle/syndicate_elite) -"apC" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 1; - icon_state = "diagonalWall3" - }, -/area/shuttle/syndicate_elite) -"apD" = ( -/obj/structure/grille, -/obj/structure/shuttle/window{ - tag = "icon-window5_end"; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "window5_end"; - dir = 2 - }, -/turf/simulated/shuttle/plating/vox, -/area/shuttle/vox) -"apE" = ( -/obj/structure/grille, -/obj/structure/shuttle/window{ - tag = "icon-window5_end (NORTH)"; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "window5_end"; - dir = 1 - }, -/turf/simulated/shuttle/plating/vox, -/area/shuttle/vox) "apF" = ( /obj/machinery/power/tracker, /obj/structure/cable{ @@ -6717,9 +4022,8 @@ }, /area/security/vacantoffice) "apN" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -6791,12 +4095,11 @@ /area/maintenance/fsmaint) "apV" = ( /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /obj/machinery/power/apc{ dir = 8; @@ -6940,8 +4243,8 @@ pixel_y = 26 }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 8 + dir = 8; + icon_state = "red" }, /area/security/checkpoint2) "aqi" = ( @@ -6960,9 +4263,8 @@ d2 = 8; icon_state = "0-8" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /obj/machinery/power/apc{ dir = 4; @@ -6970,8 +4272,8 @@ pixel_x = 24 }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 4 + dir = 4; + icon_state = "red" }, /area/security/checkpoint2) "aqk" = ( @@ -7021,24 +4323,6 @@ /obj/effect/decal/cleanable/fungus, /turf/simulated/wall, /area/maintenance/fsmaint) -"aqq" = ( -/obj/item/broken_bottle, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"aqr" = ( -/obj/machinery/portable_atmospherics/canister/oxygen, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"aqs" = ( -/obj/item/tank/emergency_oxygen, -/obj/item/clothing/mask/breath, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"aqt" = ( -/obj/item/clothing/head/bearpelt, -/obj/item/xenos_claw, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) "aqu" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -7286,9 +4570,8 @@ /turf/simulated/floor/carpet, /area/hallway/secondary/entry) "aqX" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/carpet, /area/hallway/secondary/entry) @@ -7317,8 +4600,8 @@ /obj/structure/table/reinforced, /obj/machinery/recharger, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 8 + dir = 8; + icon_state = "red" }, /area/security/checkpoint2) "arb" = ( @@ -7409,31 +4692,6 @@ icon_state = "redyellowfull" }, /area/maintenance/fsmaint) -"ark" = ( -/obj/structure/chair{ - dir = 4 - }, -/obj/item/clothing/mask/breath, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"arl" = ( -/obj/item/clothing/head/collectable/xenom, -/obj/item/clothing/head/chicken, -/obj/item/aiModule/syndicate, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"arm" = ( -/obj/item/stack/spacecash/c1000, -/obj/item/stack/spacecash/c500, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"arn" = ( -/obj/item/stack/spacecash/c50, -/obj/structure/chair/comfy/shuttle{ - dir = 8 - }, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) "aro" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -7512,9 +4770,8 @@ }, /area/maintenance/electrical_shop) "arx" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/wood{ broken = 1; @@ -7624,8 +4881,8 @@ "arI" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/manifold/hidden/cyan{ - icon_state = "map"; - dir = 8 + dir = 8; + icon_state = "map" }, /turf/simulated/floor/plasteel{ dir = 8; @@ -7640,8 +4897,8 @@ pixel_y = -22 }, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/item/radio/intercom{ pixel_x = -28; @@ -7760,8 +5017,8 @@ req_access_txt = "63" }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 8 + dir = 8; + icon_state = "red" }, /area/security/checkpoint2) "arS" = ( @@ -7786,8 +5043,8 @@ /area/security/checkpoint2) "arT" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 4 + dir = 4; + icon_state = "tube1" }, /obj/item/radio/intercom{ dir = 1; @@ -7892,23 +5149,6 @@ "asd" = ( /turf/simulated/wall, /area/maintenance/disposal) -"ase" = ( -/obj/structure/AIcore, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"asf" = ( -/obj/item/stack/spacecash/c200, -/obj/item/stack/spacecash/c50, -/obj/machinery/light/spot, -/obj/structure/chair/comfy/shuttle{ - dir = 1 - }, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"asg" = ( -/obj/item/storage/box/zipties, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) "ash" = ( /obj/machinery/power/solar{ name = "Aft Starboard Solar Panel" @@ -8152,8 +5392,8 @@ /obj/item/paper_bin, /obj/item/pen, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 8 + dir = 8; + icon_state = "red" }, /area/security/checkpoint2) "asH" = ( @@ -8706,8 +5946,8 @@ /area/maintenance/fsmaint) "atK" = ( /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/structure/lattice/catwalk, /turf/space, @@ -8907,8 +6147,8 @@ "aua" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/engine/controlroom) "aub" = ( @@ -8943,9 +6183,7 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - on = 1 - }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "dark" @@ -8962,8 +6200,8 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/reagent_dispensers/fueltank, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/engine/controlroom) "auh" = ( @@ -9162,9 +6400,9 @@ /obj/structure/table/wood, /obj/item/toy/AI, /obj/machinery/light/small{ - tag = "icon-bulb1 (EAST)"; + dir = 4; icon_state = "bulb1"; - dir = 4 + tag = "icon-bulb1 (EAST)" }, /turf/simulated/floor/plating, /area/maintenance/fsmaint) @@ -9417,8 +6655,8 @@ "avb" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /turf/simulated/floor/plasteel{ dir = 8; @@ -9428,8 +6666,8 @@ "avc" = ( /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 4 + dir = 4; + icon_state = "neutralcorner" }, /area/hallway/secondary/entry) "avd" = ( @@ -9496,12 +6734,12 @@ "avh" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/light{ - icon_state = "tube1"; - dir = 4 + dir = 4; + icon_state = "tube1" }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/hallway/secondary/entry) "avi" = ( @@ -9765,8 +7003,8 @@ /area/engine/controlroom) "avK" = ( /obj/structure/table/reinforced, -/obj/item/tank/emergency_oxygen/engi, -/obj/item/tank/emergency_oxygen/engi, +/obj/item/tank/internals/emergency_oxygen/engi, +/obj/item/tank/internals/emergency_oxygen/engi, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, /area/engine/controlroom) @@ -10179,8 +7417,8 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/hallway/secondary/entry) "awq" = ( @@ -10415,9 +7653,8 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -10601,9 +7838,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small{ - tag = "icon-bulb1 (EAST)"; + dir = 4; icon_state = "bulb1"; - dir = 4 + tag = "icon-bulb1 (EAST)" }, /turf/simulated/floor/plating, /area/maintenance/fsmaint) @@ -10662,8 +7899,8 @@ /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/hallway/secondary/entry) "axj" = ( @@ -10690,16 +7927,16 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/hallway/secondary/entry) "axl" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/hallway/secondary/entry) "axm" = ( @@ -11454,8 +8691,8 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/hallway/secondary/entry) "ayz" = ( @@ -11554,9 +8791,6 @@ "ayM" = ( /turf/simulated/wall/r_wall, /area/engine/supermatter) -"ayN" = ( -/turf/simulated/wall/r_wall/coated, -/area/engine/supermatter) "ayO" = ( /obj/structure/grille, /obj/structure/window/plasmareinforced, @@ -11662,14 +8896,13 @@ }, /area/maintenance/fsmaint) "aza" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - icon_state = "cafeteria"; - dir = 2 + dir = 2; + icon_state = "cafeteria" }, /area/maintenance/fsmaint) "azb" = ( @@ -11788,18 +9021,17 @@ }, /area/janitor) "azl" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/start{ name = "Janitor" }, /turf/simulated/floor/plasteel{ - tag = "icon-whitegreen (NORTHEAST)"; + dir = 5; icon_state = "whitegreen"; - dir = 5 + tag = "icon-whitegreen (NORTHEAST)" }, /area/janitor) "azm" = ( @@ -11825,8 +9057,8 @@ pixel_y = 3 }, /obj/structure/sink{ - icon_state = "sink"; dir = 8; + icon_state = "sink"; pixel_x = -12; pixel_y = 2 }, @@ -11903,8 +9135,8 @@ network = list("SS13") }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 4 + dir = 4; + icon_state = "neutralcorner" }, /area/hallway/primary/fore) "azx" = ( @@ -12166,10 +9398,8 @@ /turf/simulated/floor/plating, /area/engine/supermatter) "azZ" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/engine, /area/engine/supermatter) @@ -12203,8 +9433,8 @@ /area/engine/supermatter) "aAd" = ( /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/machinery/power/rad_collector, /turf/simulated/floor/greengrid, @@ -12218,9 +9448,8 @@ /area/space/nearstation) "aAf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/unary/heat_reservoir/heater{ - dir = 4; - on = 1 +/obj/machinery/atmospherics/unary/thermomachine/heater/on{ + dir = 4 }, /obj/machinery/camera{ c_tag = "Supermatter West"; @@ -12298,8 +9527,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/dresser, /turf/simulated/floor/plasteel{ - icon_state = "cafeteria"; - dir = 2 + dir = 2; + icon_state = "cafeteria" }, /area/maintenance/fsmaint) "aAo" = ( @@ -12348,9 +9577,9 @@ on = 1 }, /turf/simulated/floor/plasteel{ - tag = "icon-whitegreen (WEST)"; + dir = 8; icon_state = "whitegreen"; - dir = 8 + tag = "icon-whitegreen (WEST)" }, /area/janitor) "aAu" = ( @@ -12420,8 +9649,8 @@ /area/crew_quarters/toilet) "aAD" = ( /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/machinery/power/apc{ dir = 2; @@ -12482,9 +9711,9 @@ tag = "" }, /obj/structure/disposalpipe/junction{ - tag = "icon-pipe-j1 (EAST)"; + dir = 4; icon_state = "pipe-j1"; - dir = 4 + tag = "icon-pipe-j1 (EAST)" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8; @@ -12492,8 +9721,8 @@ level = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 4 + dir = 4; + icon_state = "neutralcorner" }, /area/hallway/primary/fore) "aAI" = ( @@ -12681,29 +9910,6 @@ }, /turf/simulated/floor/plating, /area/quartermaster/storage) -"aBc" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - tag = "icon-swall_f6"; - icon_state = "swall_f6"; - dir = 2 - }, -/area/shuttle/supply) -"aBd" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall12"; - icon_state = "swall12"; - dir = 2 - }, -/area/shuttle/supply) -"aBe" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - tag = "icon-swall_f10"; - icon_state = "swall_f10"; - dir = 2 - }, -/area/shuttle/supply) "aBf" = ( /obj/structure/cable{ d1 = 4; @@ -12731,7 +9937,7 @@ /area/maintenance/fsmaint) "aBh" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/unary/cold_sink/freezer{ +/obj/machinery/atmospherics/unary/thermomachine/freezer{ dir = 4 }, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -12788,9 +9994,8 @@ /turf/simulated/floor/plasteel, /area/engine/controlroom) "aBm" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/visible, /turf/simulated/floor/plasteel{ @@ -12800,12 +10005,12 @@ /area/engine/controlroom) "aBn" = ( /obj/effect/decal/warning_stripes/arrow{ - icon_state = "4"; - dir = 8 + dir = 8; + icon_state = "4" }, /obj/effect/decal/warning_stripes/yellow/partial{ - icon_state = "3"; - dir = 8 + dir = 8; + icon_state = "3" }, /turf/simulated/floor/plasteel{ dir = 4; @@ -12847,8 +10052,8 @@ /obj/effect/landmark/costume/random, /obj/effect/spawner/lootdrop/maintenance, /turf/simulated/floor/plasteel{ - icon_state = "cafeteria"; - dir = 2 + dir = 2; + icon_state = "cafeteria" }, /area/maintenance/fsmaint) "aBs" = ( @@ -12871,8 +10076,8 @@ pixel_y = -32 }, /turf/simulated/floor/plasteel{ - icon_state = "cafeteria"; - dir = 2 + dir = 2; + icon_state = "cafeteria" }, /area/maintenance/fsmaint) "aBt" = ( @@ -12889,8 +10094,8 @@ pixel_y = 3 }, /obj/structure/sink{ - icon_state = "sink"; dir = 8; + icon_state = "sink"; pixel_x = -12; pixel_y = 2 }, @@ -12921,8 +10126,8 @@ pixel_y = -28 }, /obj/structure/sink{ - icon_state = "sink"; dir = 8; + icon_state = "sink"; pixel_x = -12; pixel_y = 2 }, @@ -12961,9 +10166,9 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ - tag = "icon-whitegreen (SOUTHEAST)"; + dir = 6; icon_state = "whitegreen"; - dir = 6 + tag = "icon-whitegreen (SOUTHEAST)" }, /area/janitor) "aBA" = ( @@ -13020,8 +10225,8 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 4 + dir = 4; + icon_state = "neutralcorner" }, /area/hallway/primary/fore) "aBF" = ( @@ -13169,8 +10374,8 @@ /obj/effect/decal/warning_stripes/yellow, /obj/machinery/door/airlock/public/glass, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 4 + dir = 4; + icon_state = "neutralcorner" }, /area/hallway/primary/fore) "aBV" = ( @@ -13193,7 +10398,7 @@ /turf/simulated/floor/plasteel, /area/engine/controlroom) "aBX" = ( -/obj/machinery/power/supermatter_shard{ +/obj/machinery/power/supermatter_crystal{ anchored = 1 }, /turf/simulated/floor/engine, @@ -13221,24 +10426,6 @@ }, /turf/simulated/floor/plating, /area/quartermaster/storage) -"aCa" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall3"; - icon_state = "swall3"; - dir = 2 - }, -/area/shuttle/supply) -"aCb" = ( -/turf/simulated/shuttle/floor, -/area/shuttle/supply) -"aCc" = ( -/obj/machinery/light/spot{ - tag = "icon-tube1 (NORTH)"; - icon_state = "tube1"; - dir = 1 - }, -/turf/simulated/shuttle/floor, -/area/shuttle/supply) "aCd" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -13435,8 +10622,8 @@ "aCz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 4 + dir = 4; + icon_state = "neutralcorner" }, /area/hallway/primary/fore) "aCA" = ( @@ -13511,9 +10698,8 @@ }, /area/quartermaster/sorting) "aCG" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -13549,12 +10735,12 @@ layer = 2.9 }, /obj/effect/decal/warning_stripes/arrow{ - icon_state = "4"; - dir = 4 + dir = 4; + icon_state = "4" }, /obj/effect/decal/warning_stripes/yellow/partial{ - icon_state = "3"; - dir = 4 + dir = 4; + icon_state = "3" }, /turf/simulated/floor/plasteel, /area/quartermaster/storage) @@ -13607,8 +10793,8 @@ tag = "90Curve" }, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /turf/simulated/floor/plating, /area/quartermaster/storage) @@ -13621,8 +10807,8 @@ tag = "" }, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/structure/sign/securearea{ desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; @@ -13708,14 +10894,14 @@ /obj/machinery/atmospherics/pipe/simple/visible{ dir = 5 }, -/turf/simulated/wall/r_wall/coated, +/turf/simulated/wall/r_wall, /area/engine/supermatter) "aCY" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 10 }, /obj/machinery/meter, -/turf/simulated/wall/r_wall/coated, +/turf/simulated/wall/r_wall, /area/engine/supermatter) "aCZ" = ( /obj/machinery/door/airlock/atmos/glass{ @@ -13731,13 +10917,13 @@ level = 1 }, /obj/machinery/meter, -/turf/simulated/wall/r_wall/coated, +/turf/simulated/wall/r_wall, /area/engine/supermatter) "aDb" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 9 }, -/turf/simulated/wall/r_wall/coated, +/turf/simulated/wall/r_wall, /area/engine/supermatter) "aDc" = ( /obj/machinery/atmospherics/unary/portables_connector, @@ -14312,12 +11498,12 @@ "aDW" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes/arrow{ - icon_state = "4"; - dir = 4 + dir = 4; + icon_state = "4" }, /obj/effect/decal/warning_stripes/yellow/partial{ - icon_state = "3"; - dir = 4 + dir = 4; + icon_state = "3" }, /turf/simulated/floor/plasteel, /area/quartermaster/storage) @@ -14349,8 +11535,8 @@ /area/space/nearstation) "aEb" = ( /obj/structure/cable{ - icon_state = "0-2"; - d2 = 2 + d2 = 2; + icon_state = "0-2" }, /obj/structure/lattice/catwalk, /turf/space, @@ -14487,9 +11673,8 @@ /turf/simulated/floor/plasteel, /area/hydroponics/abandoned_garden) "aEs" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/plasteel, /area/hydroponics/abandoned_garden) @@ -14662,8 +11847,8 @@ level = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 4 + dir = 4; + icon_state = "neutralcorner" }, /area/hallway/primary/fore) "aEG" = ( @@ -14882,9 +12067,8 @@ }, /area/quartermaster/storage) "aEV" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -14928,13 +12112,16 @@ /turf/simulated/floor/plasteel, /area/quartermaster/storage) "aFb" = ( -/obj/machinery/door/airlock/external{ - id_tag = "s_docking_airlock"; - name = "Shuttle Hatch"; - req_access_txt = "31" +/obj/docking_port/stationary{ + dir = 4; + dwidth = 5; + height = 7; + id = "supply_home"; + name = "supply bay"; + width = 12 }, -/turf/simulated/shuttle/floor, -/area/shuttle/supply) +/turf/space, +/area/space) "aFc" = ( /obj/machinery/atmospherics/binary/pump{ dir = 1; @@ -15136,8 +12323,8 @@ "aFB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /turf/simulated/floor/plasteel{ dir = 1; @@ -15151,8 +12338,8 @@ pixel_y = 0 }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 4 + dir = 4; + icon_state = "neutralcorner" }, /area/hallway/primary/fore) "aFD" = ( @@ -15232,6 +12419,7 @@ "aFN" = ( /obj/machinery/door/airlock/external{ id_tag = "supply_home"; + locked = 1; name = "Cargo Docking Hatch"; req_access_txt = "31" }, @@ -15251,6 +12439,7 @@ }, /obj/machinery/door/airlock/external{ id_tag = "supply_home"; + locked = 1; name = "Cargo Docking Hatch"; req_access_txt = "31" }, @@ -15282,38 +12471,6 @@ }, /turf/simulated/wall, /area/quartermaster/storage) -"aFT" = ( -/obj/machinery/light/spot{ - tag = "icon-tube1 (WEST)"; - icon_state = "tube1"; - dir = 8 - }, -/obj/machinery/door_control{ - id = "QMLoaddoor"; - layer = 3; - name = "Loading Doors"; - pixel_x = -24; - pixel_y = -8; - req_access_txt = "0" - }, -/obj/machinery/door_control{ - id = "QMLoaddoor2"; - layer = 3; - name = "Loading Doors"; - pixel_x = -24; - pixel_y = 8; - req_access_txt = "0" - }, -/turf/simulated/shuttle/floor, -/area/shuttle/supply) -"aFU" = ( -/obj/machinery/light/spot{ - tag = "icon-tube1 (EAST)"; - icon_state = "tube1"; - dir = 4 - }, -/turf/simulated/shuttle/floor, -/area/shuttle/supply) "aFV" = ( /obj/structure/cable{ d1 = 1; @@ -15366,8 +12523,8 @@ pixel_y = 24 }, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel, @@ -15444,14 +12601,14 @@ pixel_x = -28; pixel_y = 0 }, -/obj/item/tank/plasma, +/obj/item/tank/internals/plasma, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, /area/engine/controlroom) "aGe" = ( /obj/structure/sink{ - icon_state = "sink"; dir = 8; + icon_state = "sink"; pixel_x = -12; pixel_y = 2 }, @@ -15671,9 +12828,7 @@ }, /area/crew_quarters/bar) "aGx" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - on = 1 - }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/structure/sink/kitchen{ pixel_y = 28 }, @@ -15758,8 +12913,8 @@ /obj/structure/table/wood, /obj/machinery/requests_console{ department = "Bar"; - name = "Bar Requests Console"; departmentType = 2; + name = "Bar Requests Console"; pixel_x = 0; pixel_y = 30 }, @@ -15816,8 +12971,8 @@ /area/crew_quarters/bar) "aGH" = ( /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/power/apc{ @@ -15857,8 +13012,8 @@ pixel_y = 0 }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 4 + dir = 4; + icon_state = "neutralcorner" }, /area/hallway/primary/fore) "aGK" = ( @@ -15899,12 +13054,12 @@ "aGQ" = ( /obj/structure/window/reinforced, /obj/effect/decal/warning_stripes/arrow{ - icon_state = "4"; - dir = 4 + dir = 4; + icon_state = "4" }, /obj/effect/decal/warning_stripes/yellow/partial{ - icon_state = "3"; - dir = 4 + dir = 4; + icon_state = "3" }, /turf/simulated/floor/plasteel, /area/quartermaster/storage) @@ -15916,22 +13071,6 @@ icon_state = "neutralfull" }, /area/quartermaster/storage) -"aGS" = ( -/obj/docking_port/mobile/supply, -/obj/docking_port/stationary{ - dir = 8; - dwidth = 5; - height = 7; - id = "supply_home"; - name = "supply bay"; - width = 12 - }, -/turf/simulated/shuttle/wall{ - tag = "icon-swall3"; - icon_state = "swall3"; - dir = 2 - }, -/area/shuttle/supply) "aGT" = ( /turf/simulated/wall/r_wall, /area/security/prison) @@ -16238,9 +13377,8 @@ }, /area/crew_quarters/sleep) "aHD" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -16404,9 +13542,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 5; @@ -16473,13 +13610,6 @@ }, /turf/simulated/floor/plating, /area/quartermaster/office) -"aHV" = ( -/obj/structure/plasticflaps/mining, -/obj/machinery/conveyor/west{ - id = "QMLoad2" - }, -/turf/simulated/shuttle/plating, -/area/shuttle/supply) "aHW" = ( /obj/structure/cable{ d1 = 4; @@ -16545,8 +13675,8 @@ pixel_y = 32 }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 9 + dir = 9; + icon_state = "red" }, /area/security/checkpoint/supply) "aIb" = ( @@ -16560,8 +13690,8 @@ }, /obj/machinery/recharger, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 1 + dir = 1; + icon_state = "red" }, /area/security/checkpoint/supply) "aIc" = ( @@ -16748,8 +13878,8 @@ /area/maintenance/auxsolarport) "aIr" = ( /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/machinery/power/smes, /obj/machinery/light/small{ @@ -16930,9 +14060,8 @@ dir = 4; level = 1 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /obj/machinery/light, /obj/machinery/status_display{ @@ -17142,9 +14271,8 @@ tag = "" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /obj/machinery/light/small{ dir = 4 @@ -17219,8 +14347,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 4 + dir = 4; + icon_state = "neutralcorner" }, /area/hallway/primary/fore) "aJd" = ( @@ -17306,8 +14434,8 @@ level = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 4 + dir = 4; + icon_state = "red" }, /area/security/checkpoint/supply) "aJm" = ( @@ -17324,8 +14452,8 @@ level = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 8 + dir = 8; + icon_state = "red" }, /area/quartermaster/storage) "aJo" = ( @@ -17370,13 +14498,6 @@ icon_state = "neutralfull" }, /area/quartermaster/storage) -"aJr" = ( -/obj/structure/plasticflaps/mining, -/obj/machinery/conveyor/east{ - id = "QMLoad" - }, -/turf/simulated/shuttle/plating, -/area/shuttle/supply) "aJs" = ( /obj/structure/cable{ d1 = 1; @@ -17441,8 +14562,8 @@ "aJw" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /turf/simulated/floor/plating, /area/security/prison) @@ -17548,8 +14669,8 @@ icon_state = "0-8" }, /obj/machinery/power/terminal{ - icon_state = "term"; - dir = 1 + dir = 1; + icon_state = "term" }, /obj/effect/landmark{ name = "blobstart" @@ -17563,9 +14684,7 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - on = 1 - }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/security/prison) @@ -17699,8 +14818,8 @@ icon_state = "0-8" }, /obj/machinery/power/terminal{ - icon_state = "term"; - dir = 1 + dir = 1; + icon_state = "term" }, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel, @@ -18032,9 +15151,8 @@ tag = "" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /obj/effect/landmark{ name = "lightsout" @@ -18061,8 +15179,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 4 + dir = 4; + icon_state = "neutralcorner" }, /area/hallway/primary/fore) "aKx" = ( @@ -18096,8 +15214,8 @@ "aKA" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/structure/cable{ d1 = 2; @@ -18155,8 +15273,8 @@ tag = "" }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 4 + dir = 4; + icon_state = "red" }, /area/security/checkpoint/supply) "aKE" = ( @@ -18170,14 +15288,13 @@ "aKF" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 8 + dir = 8; + icon_state = "red" }, /area/quartermaster/storage) "aKG" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -18219,38 +15336,6 @@ icon_state = "neutralfull" }, /area/quartermaster/storage) -"aKM" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall7"; - icon_state = "swall7"; - dir = 2 - }, -/area/shuttle/supply) -"aKN" = ( -/turf/simulated/shuttle/floor, -/turf/simulated/shuttle/wall/interior{ - tag = "icon-swall_f10"; - icon_state = "swall_f10" - }, -/area/shuttle/supply) -"aKO" = ( -/obj/machinery/light/spot, -/turf/simulated/shuttle/floor, -/area/shuttle/supply) -"aKP" = ( -/turf/simulated/shuttle/floor, -/turf/simulated/shuttle/wall/interior{ - tag = "icon-swall_f6"; - icon_state = "swall_f6" - }, -/area/shuttle/supply) -"aKQ" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall11"; - icon_state = "swall11"; - dir = 2 - }, -/area/shuttle/supply) "aKR" = ( /obj/machinery/hydroponics/constructable, /obj/item/seeds/glowshroom, @@ -18337,7 +15422,7 @@ /obj/structure/rack, /obj/item/storage/toolbox/emergency, /obj/item/wrench, -/obj/item/tank/emergency_oxygen/engi, +/obj/item/tank/internals/emergency_oxygen/engi, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "caution" @@ -18573,9 +15658,8 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, @@ -18881,9 +15965,8 @@ }, /area/quartermaster/office) "aLX" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -18963,8 +16046,8 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 4 + dir = 4; + icon_state = "red" }, /area/security/checkpoint/supply) "aMf" = ( @@ -18981,8 +16064,8 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 8 + dir = 8; + icon_state = "red" }, /area/quartermaster/storage) "aMh" = ( @@ -19041,44 +16124,14 @@ icon_state = "neutralfull" }, /area/quartermaster/storage) -"aMm" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - tag = "icon-swall_f5"; - icon_state = "swall_f5"; - dir = 2 - }, -/area/shuttle/supply) -"aMn" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall15"; - icon_state = "swall15"; - dir = 2 - }, -/area/shuttle/supply) -"aMo" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/shuttle/engine/heater, -/turf/simulated/shuttle/plating, -/area/shuttle/supply) -"aMp" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - tag = "icon-swall_f9"; - icon_state = "swall_f9"; - dir = 2 - }, -/area/shuttle/supply) "aMq" = ( /turf/simulated/wall, /area/security/prison) "aMr" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, @@ -19157,12 +16210,9 @@ /obj/effect/decal/warning_stripes/southeast, /turf/simulated/floor/plasteel, /area/engine/controlroom) -"aMy" = ( -/turf/simulated/wall/r_wall/coated, -/area/maintenance/incinerator) "aMz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/wall/r_wall/coated, +/turf/simulated/wall/r_wall, /area/maintenance/incinerator) "aMA" = ( /obj/machinery/atmospherics/unary/portables_connector, @@ -19189,9 +16239,7 @@ /turf/simulated/floor/plasteel, /area/maintenance/incinerator) "aMD" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - on = 1 - }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 }, @@ -19273,8 +16321,8 @@ "aMO" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/maintenance/incinerator) "aMP" = ( @@ -19400,9 +16448,8 @@ }, /area/crew_quarters/sleep) "aNb" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "wood" @@ -19470,8 +16517,8 @@ /area/crew_quarters/sleep) "aNh" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/structure/extinguisher_cabinet{ pixel_x = -28; @@ -19556,8 +16603,8 @@ /area/quartermaster/office) "aNq" = ( /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/machinery/power/apc{ dir = 8; @@ -19589,9 +16636,8 @@ icon_state = "2-8"; tag = "" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 0; @@ -19600,8 +16646,8 @@ /area/security/checkpoint/supply) "aNs" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 4 + dir = 4; + icon_state = "tube1" }, /obj/item/twohanded/required/kirbyplants, /obj/machinery/alarm{ @@ -19698,32 +16744,14 @@ /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel, /area/quartermaster/office) -"aNz" = ( -/obj/structure/shuttle/engine/propulsion{ - tag = "icon-burst_l"; - icon_state = "burst_l" - }, -/turf/simulated/shuttle/plating, -/area/shuttle/supply) -"aNA" = ( -/obj/structure/shuttle/engine/propulsion, -/turf/simulated/shuttle/plating, -/area/shuttle/supply) -"aNB" = ( -/obj/structure/shuttle/engine/propulsion{ - tag = "icon-burst_r"; - icon_state = "burst_r" - }, -/turf/simulated/shuttle/plating, -/area/shuttle/supply) "aNC" = ( /obj/machinery/atmospherics/unary/vent_pump{ on = 1 }, /obj/item/soap/nanotrasen, /obj/machinery/shower{ - icon_state = "shower"; - dir = 4 + dir = 4; + icon_state = "shower" }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, @@ -19905,14 +16933,14 @@ }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/security/execution) "aNR" = ( /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/security/execution) "aNS" = ( @@ -19921,13 +16949,13 @@ pixel_y = 0 }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/security/execution) "aNT" = ( /obj/structure/sign/fire, -/turf/simulated/wall/r_wall/coated, +/turf/simulated/wall/r_wall, /area/maintenance/incinerator) "aNU" = ( /obj/machinery/atmospherics/unary/vent_pump{ @@ -19940,7 +16968,7 @@ /obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 }, -/turf/simulated/wall/r_wall/coated, +/turf/simulated/wall/r_wall, /area/maintenance/incinerator) "aNW" = ( /obj/machinery/atmospherics/binary/pump{ @@ -19972,7 +17000,7 @@ /obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 }, -/turf/simulated/wall/r_wall/coated, +/turf/simulated/wall/r_wall, /area/maintenance/incinerator) "aNY" = ( /obj/machinery/atmospherics/pipe/manifold/visible, @@ -20276,8 +17304,8 @@ pixel_x = 28 }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 4 + dir = 4; + icon_state = "neutralcorner" }, /area/hallway/primary/fore) "aOJ" = ( @@ -20320,8 +17348,8 @@ "aOO" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /turf/simulated/floor/plating, /area/security/checkpoint/supply) @@ -20464,9 +17492,7 @@ dir = 4; level = 1 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - on = 1 - }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/effect/decal/cleanable/dirt, /mob/living/simple_animal/mouse, /turf/simulated/floor/plasteel, @@ -20487,8 +17513,8 @@ pressure_checks = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "redcorner"; - dir = 4 + dir = 4; + icon_state = "redcorner" }, /area/security/prison) "aPe" = ( @@ -20505,9 +17531,7 @@ /turf/simulated/floor/plating, /area/security/prison) "aPg" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - on = 1 - }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/machinery/sparker{ pixel_x = -18 }, @@ -20519,8 +17543,8 @@ "aPh" = ( /obj/structure/chair, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/security/execution) "aPi" = ( @@ -20548,8 +17572,8 @@ /area/maintenance/incinerator) "aPl" = ( /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/machinery/power/turbine{ dir = 8; @@ -20562,8 +17586,8 @@ /area/maintenance/incinerator) "aPm" = ( /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/structure/cable{ d2 = 8; @@ -20653,8 +17677,8 @@ level = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/maintenance/incinerator) "aPs" = ( @@ -20873,9 +17897,8 @@ }, /area/maintenance/gambling_den) "aPM" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/wood{ broken = 1; @@ -21060,8 +18083,8 @@ /area/crew_quarters/bar/atrium) "aQe" = ( /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/structure/table, /obj/machinery/power/apc{ @@ -21144,8 +18167,8 @@ "aQj" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/structure/cable{ d1 = 2; @@ -21166,8 +18189,8 @@ id = "Cargo Cell" }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 9 + dir = 9; + icon_state = "red" }, /area/security/checkpoint/supply) "aQl" = ( @@ -21184,8 +18207,8 @@ tag = "" }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 1 + dir = 1; + icon_state = "red" }, /area/security/checkpoint/supply) "aQm" = ( @@ -21257,8 +18280,8 @@ /area/quartermaster/storage) "aQs" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 4 + dir = 4; + icon_state = "tube1" }, /obj/machinery/conveyor/northeast/ccw{ id = "QMLoad" @@ -21290,12 +18313,12 @@ /area/quartermaster/storage) "aQv" = ( /obj/effect/decal/warning_stripes/arrow{ - icon_state = "4"; - dir = 1 + dir = 1; + icon_state = "4" }, /obj/effect/decal/warning_stripes/yellow/partial{ - icon_state = "3"; - dir = 1 + dir = 1; + icon_state = "3" }, /turf/simulated/floor/plasteel, /area/quartermaster/storage) @@ -21415,7 +18438,7 @@ dir = 4 }, /obj/structure/sign/fire, -/turf/simulated/wall/r_wall/coated, +/turf/simulated/wall/r_wall, /area/maintenance/incinerator) "aQO" = ( /obj/machinery/atmospherics/binary/pump{ @@ -21593,8 +18616,8 @@ initialize_directions = 11; level = 1 }, -/obj/item/tank/emergency_oxygen, -/obj/item/tank/emergency_oxygen, +/obj/item/tank/internals/emergency_oxygen, +/obj/item/tank/internals/emergency_oxygen, /obj/item/clothing/mask/breath, /obj/item/clothing/mask/breath, /turf/simulated/floor/plasteel{ @@ -21605,8 +18628,8 @@ "aQZ" = ( /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/atmos) "aRa" = ( @@ -21662,16 +18685,16 @@ }, /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/atmos) "aRe" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/atmos) "aRf" = ( @@ -21724,8 +18747,8 @@ /area/atmos) "aRi" = ( /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/atmos) "aRj" = ( @@ -21959,8 +18982,8 @@ /obj/effect/decal/warning_stripes/arrow, /obj/effect/decal/warning_stripes/yellow/partial, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 4 + dir = 4; + icon_state = "neutralcorner" }, /area/hallway/primary/fore) "aRI" = ( @@ -22002,8 +19025,8 @@ icon_state = "tube1" }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 4 + dir = 4; + icon_state = "neutralcorner" }, /area/hallway/primary/fore) "aRL" = ( @@ -22182,8 +19205,8 @@ "aSc" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /turf/simulated/floor/plating, /area/quartermaster/qm) @@ -22477,8 +19500,8 @@ level = 2 }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/atmos) "aSL" = ( @@ -22585,9 +19608,7 @@ dir = 4; level = 1 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - on = 1 - }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "redblue" @@ -22826,8 +19847,8 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 4 + dir = 4; + icon_state = "neutralcorner" }, /area/hallway/primary/fore) "aTl" = ( @@ -22851,8 +19872,8 @@ "aTo" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -23003,8 +20024,8 @@ /area/quartermaster/qm) "aTE" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 4 + dir = 4; + icon_state = "tube1" }, /obj/structure/table/reinforced, /obj/item/stack/packageWrap, @@ -23551,8 +20572,8 @@ pixel_y = 3 }, /turf/simulated/floor/plasteel{ - icon_state = "cafeteria"; - dir = 2 + dir = 2; + icon_state = "cafeteria" }, /area/crew_quarters/theatre) "aUy" = ( @@ -23563,8 +20584,8 @@ name = "Mime" }, /turf/simulated/floor/plasteel{ - icon_state = "cafeteria"; - dir = 2 + dir = 2; + icon_state = "cafeteria" }, /area/crew_quarters/theatre) "aUz" = ( @@ -23572,8 +20593,8 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "cafeteria"; - dir = 2 + dir = 2; + icon_state = "cafeteria" }, /area/crew_quarters/theatre) "aUA" = ( @@ -23590,8 +20611,8 @@ }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ - icon_state = "cafeteria"; - dir = 2 + dir = 2; + icon_state = "cafeteria" }, /area/crew_quarters/theatre) "aUB" = ( @@ -23814,8 +20835,8 @@ /area/quartermaster/office) "aUW" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 4 + dir = 4; + icon_state = "tube1" }, /obj/item/twohanded/required/kirbyplants, /obj/structure/extinguisher_cabinet{ @@ -23983,9 +21004,7 @@ }, /area/security/prison) "aVl" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - on = 1 - }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitered" @@ -24092,8 +21111,8 @@ "aVu" = ( /obj/structure/table/reinforced, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/item/radio/electropack, /obj/item/assembly/signaler, @@ -24133,9 +21152,8 @@ }, /area/security/execution) "aVx" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/plasteel{ @@ -24169,8 +21187,8 @@ /area/security/execution) "aVA" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 4 + dir = 4; + icon_state = "tube1" }, /obj/machinery/atmospherics/pipe/manifold/visible{ dir = 4; @@ -24215,8 +21233,8 @@ dir = 6 }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/atmos) "aVE" = ( @@ -24453,16 +21471,16 @@ pixel_y = 0 }, /turf/simulated/floor/plasteel{ - icon_state = "cafeteria"; - dir = 2 + dir = 2; + icon_state = "cafeteria" }, /area/crew_quarters/theatre) "aVZ" = ( /obj/structure/table/wood, /obj/item/reagent_containers/food/snacks/baguette, /turf/simulated/floor/plasteel{ - icon_state = "cafeteria"; - dir = 2 + dir = 2; + icon_state = "cafeteria" }, /area/crew_quarters/theatre) "aWa" = ( @@ -24473,8 +21491,8 @@ }, /obj/machinery/vending/autodrobe, /turf/simulated/floor/plasteel{ - icon_state = "cafeteria"; - dir = 2 + dir = 2; + icon_state = "cafeteria" }, /area/crew_quarters/theatre) "aWb" = ( @@ -24482,15 +21500,15 @@ /obj/item/clipboard, /obj/item/toy/figure/mime, /turf/simulated/floor/plasteel{ - icon_state = "cafeteria"; - dir = 2 + dir = 2; + icon_state = "cafeteria" }, /area/crew_quarters/theatre) "aWc" = ( /obj/structure/dresser, /turf/simulated/floor/plasteel{ - icon_state = "cafeteria"; - dir = 2 + dir = 2; + icon_state = "cafeteria" }, /area/crew_quarters/theatre) "aWd" = ( @@ -24517,9 +21535,8 @@ }, /area/crew_quarters/bar/atrium) "aWf" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -24578,8 +21595,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 4 + dir = 4; + icon_state = "neutralcorner" }, /area/hallway/primary/fore) "aWm" = ( @@ -24979,9 +21996,7 @@ }, /area/security/prison) "aWM" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - on = 1 - }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/machinery/flasher{ id = "Cell 1"; pixel_x = -22 @@ -25013,9 +22028,7 @@ }, /area/security/prison) "aWP" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - on = 1 - }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/machinery/flasher{ id = "Cell 2"; pixel_x = -22 @@ -25033,8 +22046,8 @@ dir = 6 }, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 1 + dir = 1; + icon_state = "neutral" }, /area/security/prison) "aWR" = ( @@ -25261,9 +22274,8 @@ /turf/simulated/floor/plasteel, /area/atmos) "aXj" = ( -/obj/machinery/atmospherics/unary/heat_reservoir/heater{ - dir = 8; - on = 0 +/obj/machinery/atmospherics/unary/thermomachine/heater{ + dir = 8 }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ @@ -25414,8 +22426,8 @@ /area/maintenance/fsmaint) "aXz" = ( /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/machinery/atmospherics/unary/vent_pump{ dir = 4; @@ -25523,9 +22535,8 @@ }, /area/crew_quarters/bar/atrium) "aXI" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" @@ -25635,9 +22646,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - on = 1 - }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -25734,9 +22743,7 @@ }, /area/quartermaster/storage) "aYc" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - on = 1 - }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -25960,9 +22967,8 @@ /turf/simulated/floor/plasteel, /area/atmos) "aYz" = ( -/obj/machinery/atmospherics/unary/heat_reservoir/heater{ - dir = 4; - on = 1 +/obj/machinery/atmospherics/unary/thermomachine/heater/on{ + dir = 4 }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ @@ -25980,9 +22986,8 @@ }, /area/atmos) "aYB" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -26051,7 +23056,7 @@ pixel_x = 32; pixel_y = 0 }, -/obj/item/tank/emergency_oxygen/engi, +/obj/item/tank/internals/emergency_oxygen/engi, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ dir = 5; @@ -26097,8 +23102,8 @@ }, /obj/machinery/atmospherics/pipe/simple/visible/green, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/atmos) "aYN" = ( @@ -26298,8 +23303,8 @@ /area/crew_quarters/kitchen) "aZb" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/machinery/camera{ c_tag = "Atrium"; @@ -26465,9 +23470,7 @@ }, /area/quartermaster/storage) "aZr" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - on = 1 - }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/machinery/flasher{ id = "Cell 3"; pixel_x = -22 @@ -26573,9 +23576,8 @@ }, /area/quartermaster/qm) "aZA" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /obj/machinery/alarm{ dir = 1; @@ -26610,8 +23612,8 @@ /area/quartermaster/qm) "aZD" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 4 + dir = 4; + icon_state = "tube1" }, /obj/structure/bed/dogbed, /turf/simulated/floor/plasteel{ @@ -27017,18 +24019,7 @@ /turf/simulated/floor/plasteel, /area/security/prison) "bae" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall12"; - icon_state = "swall12"; - dir = 2 - }, -/area/shuttle/pod_3) -"baf" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f10"; - dir = 2 - }, +/turf/simulated/wall/mineral/titanium, /area/shuttle/pod_3) "bag" = ( /obj/machinery/atmospherics/unary/outlet_injector/on{ @@ -27136,9 +24127,8 @@ /area/atmos) "baq" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /obj/structure/closet/secure_closet/atmos_personal, /obj/effect/decal/warning_stripes/northeast, @@ -27260,8 +24250,8 @@ "baC" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/maintenance/fsmaint) "baD" = ( @@ -27369,8 +24359,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 1 + dir = 1; + icon_state = "neutral" }, /area/security/prison) "baQ" = ( @@ -27398,8 +24388,8 @@ }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 1 + dir = 1; + icon_state = "neutral" }, /area/security/prison) "baT" = ( @@ -27414,8 +24404,8 @@ "baU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/structure/extinguisher_cabinet{ pixel_x = -25; @@ -27507,8 +24497,8 @@ "bbd" = ( /obj/structure/table/reinforced, /obj/machinery/light{ - icon_state = "tube1"; - dir = 4 + dir = 4; + icon_state = "tube1" }, /obj/item/stamp/granted{ pixel_x = 3; @@ -27634,8 +24624,8 @@ "bbn" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/structure/cable{ d1 = 1; @@ -27758,9 +24748,8 @@ dir = 4; level = 1 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -27843,12 +24832,12 @@ /area/security/prison) "bbC" = ( /obj/effect/decal/warning_stripes/arrow{ - icon_state = "4"; - dir = 4 + dir = 4; + icon_state = "4" }, /obj/effect/decal/warning_stripes/yellow/partial{ - icon_state = "3"; - dir = 4 + dir = 4; + icon_state = "3" }, /turf/simulated/floor/plasteel{ dir = 1; @@ -27900,11 +24889,11 @@ id = "pod3"; name = "escape pod 3" }, -/obj/machinery/door/airlock/shuttle{ +/obj/machinery/door/airlock/titanium{ id_tag = "s_docking_airlock"; name = "Escape Pod Hatch" }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/pod_3) "bbJ" = ( /obj/item/radio/intercom{ @@ -27916,7 +24905,7 @@ /obj/structure/chair/comfy/shuttle{ dir = 4 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/pod_3) "bbK" = ( /obj/machinery/status_display{ @@ -27929,12 +24918,11 @@ /obj/structure/chair/comfy/shuttle{ dir = 4 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/pod_3) "bbL" = ( -/obj/structure/grille, -/obj/structure/window/full/shuttle, -/turf/simulated/shuttle/plating, +/obj/effect/spawner/window/shuttle, +/turf/simulated/floor/plating, /area/shuttle/pod_3) "bbM" = ( /obj/machinery/atmospherics/pipe/simple/visible/cyan, @@ -27955,8 +24943,8 @@ "bbN" = ( /obj/machinery/atmospherics/pipe/simple/visible/green, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/atmos) "bbO" = ( @@ -28179,12 +25167,12 @@ pixel_y = -22 }, /obj/effect/decal/warning_stripes/arrow{ - icon_state = "4"; - dir = 1 + dir = 1; + icon_state = "4" }, /obj/effect/decal/warning_stripes/yellow/partial{ - icon_state = "3"; - dir = 1 + dir = 1; + icon_state = "3" }, /turf/simulated/floor/plasteel, /area/crew_quarters/sleep) @@ -28220,9 +25208,8 @@ /turf/simulated/floor/plasteel, /area/crew_quarters/kitchen) "bcp" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" @@ -28484,32 +25471,6 @@ /obj/structure/cable, /turf/simulated/floor/plating, /area/quartermaster/miningdock) -"bcQ" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f6"; - dir = 2 - }, -/area/shuttle/mining) -"bcR" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall12"; - dir = 2 - }, -/area/shuttle/mining) -"bcS" = ( -/obj/structure/window/full/shuttle, -/obj/structure/grille, -/turf/simulated/shuttle/plating, -/area/shuttle/mining) -"bcT" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - tag = "icon-swall_f10"; - icon_state = "swall_f10"; - dir = 2 - }, -/area/shuttle/mining) "bcU" = ( /obj/structure/table/reinforced, /obj/item/folder/red, @@ -28651,13 +25612,6 @@ /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, /area/security/prison) -"bdj" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f9"; - dir = 2 - }, -/area/shuttle/pod_3) "bdk" = ( /turf/simulated/floor/engine/plasma, /area/atmos) @@ -29181,12 +26135,12 @@ level = 1 }, /obj/effect/decal/warning_stripes/arrow{ - icon_state = "4"; - dir = 1 + dir = 1; + icon_state = "4" }, /obj/effect/decal/warning_stripes/yellow/partial{ - icon_state = "3"; - dir = 1 + dir = 1; + icon_state = "3" }, /turf/simulated/floor/plasteel{ dir = 4; @@ -29353,31 +26307,6 @@ }, /turf/simulated/floor/plating, /area/quartermaster/miningdock) -"bet" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall3"; - dir = 2 - }, -/area/shuttle/mining) -"beu" = ( -/obj/structure/table, -/obj/machinery/light/small{ - dir = 8 - }, -/turf/simulated/shuttle/floor, -/area/shuttle/mining) -"bev" = ( -/obj/machinery/computer/shuttle/mining, -/turf/simulated/shuttle/floor, -/area/shuttle/mining) -"bew" = ( -/obj/structure/table, -/obj/machinery/light/small{ - dir = 4; - pixel_y = 0 - }, -/turf/simulated/shuttle/floor, -/area/shuttle/mining) "bex" = ( /turf/simulated/wall/r_wall, /area/security/medbay) @@ -29420,8 +26349,8 @@ /obj/structure/closet/bombcloset, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/security/prison) "beD" = ( @@ -29543,8 +26472,8 @@ }, /obj/machinery/atmospherics/pipe/simple/visible/green, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/atmos) "beR" = ( @@ -29583,9 +26512,8 @@ }, /area/hydroponics) "beV" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 2; @@ -29973,15 +26901,6 @@ /obj/structure/cable, /turf/simulated/floor/plating, /area/quartermaster/miningdock) -"bfP" = ( -/turf/simulated/shuttle/floor, -/area/shuttle/mining) -"bfQ" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 1 - }, -/turf/simulated/shuttle/floor, -/area/shuttle/mining) "bfR" = ( /obj/structure/cable{ d2 = 2; @@ -30111,8 +27030,8 @@ /obj/structure/closet/l3closet/security, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/security/prison) "bga" = ( @@ -30339,14 +27258,14 @@ /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 4 + dir = 4; + icon_state = "neutralcorner" }, /area/hallway/primary/fore) "bgy" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/structure/closet/secure_closet/freezer/kitchen, /obj/effect/decal/warning_stripes/yellow, @@ -30604,38 +27523,16 @@ }, /area/hallway/primary/central) "bgY" = ( -/obj/machinery/door/airlock/shuttle{ - id_tag = "s_docking_airlock"; - req_access_txt = "48" - }, -/obj/structure/fans/tiny, -/turf/simulated/shuttle/floor, -/area/shuttle/mining) -"bgZ" = ( -/obj/machinery/door/airlock/shuttle{ - id_tag = "s_docking_airlock"; - req_access_txt = "48" - }, -/obj/docking_port/mobile{ - dir = 8; - dwidth = 3; - height = 5; - id = "mining"; - name = "mining shuttle"; - rebuildable = 1; - width = 7 - }, /obj/docking_port/stationary{ - dir = 8; + dir = 4; dwidth = 3; height = 5; id = "mining_home"; name = "mining shuttle bay"; width = 7 }, -/obj/structure/fans/tiny, -/turf/simulated/shuttle/floor, -/area/shuttle/mining) +/turf/space, +/area/space) "bha" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable{ @@ -30664,9 +27561,7 @@ /obj/structure/sink{ pixel_y = 26 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - on = 1 - }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitered" @@ -30747,8 +27642,8 @@ /area/atmos) "bhl" = ( /obj/structure/cable{ - icon_state = "0-2"; - d2 = 2 + d2 = 2; + icon_state = "0-2" }, /obj/machinery/power/apc{ dir = 1; @@ -31092,12 +27987,12 @@ /area/hallway/primary/fore) "bhZ" = ( /obj/effect/decal/warning_stripes/arrow{ - icon_state = "4"; - dir = 1 + dir = 1; + icon_state = "4" }, /obj/effect/decal/warning_stripes/yellow/partial{ - icon_state = "3"; - dir = 1 + dir = 1; + icon_state = "3" }, /turf/simulated/floor/plasteel{ dir = 1; @@ -31156,12 +28051,12 @@ /area/quartermaster/miningdock) "bif" = ( /obj/effect/decal/warning_stripes/arrow{ - icon_state = "4"; - dir = 1 + dir = 1; + icon_state = "4" }, /obj/effect/decal/warning_stripes/yellow/partial{ - icon_state = "3"; - dir = 1 + dir = 1; + icon_state = "3" }, /turf/simulated/floor/plasteel{ dir = 1; @@ -31230,9 +28125,8 @@ }, /area/quartermaster/miningdock) "bik" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -31295,8 +28189,8 @@ icon_state = "1-4" }, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /turf/simulated/floor/plating, /area/security/medbay) @@ -31359,8 +28253,8 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 9 + dir = 9; + icon_state = "red" }, /area/security/brig) "biv" = ( @@ -31385,8 +28279,8 @@ level = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 5 + dir = 5; + icon_state = "red" }, /area/security/brig) "bix" = ( @@ -31396,8 +28290,8 @@ pixel_y = 0 }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 9 + dir = 9; + icon_state = "red" }, /area/security/main) "biy" = ( @@ -31503,8 +28397,8 @@ name = "Security Officer" }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 5 + dir = 5; + icon_state = "red" }, /area/security/main) "biF" = ( @@ -31519,8 +28413,8 @@ "biH" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /turf/simulated/floor/plating, /area/security/hos) @@ -31712,9 +28606,8 @@ }, /area/atmos) "biY" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel, @@ -31779,8 +28672,8 @@ /area/maintenance/fsmaint) "bje" = ( /obj/structure/sink{ - icon_state = "sink"; dir = 8; + icon_state = "sink"; pixel_x = -12; pixel_y = 2 }, @@ -31887,8 +28780,8 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "whitehall"; - dir = 4 + dir = 4; + icon_state = "whitehall" }, /area/crew_quarters/sleep) "bjp" = ( @@ -31911,8 +28804,8 @@ }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel{ - icon_state = "whitehall"; - dir = 4 + dir = 4; + icon_state = "whitehall" }, /area/crew_quarters/kitchen) "bjr" = ( @@ -31944,9 +28837,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 2; @@ -32058,9 +28950,8 @@ }, /area/hallway/primary/fore) "bjD" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -32101,9 +28992,8 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel, /area/quartermaster/miningdock) @@ -32280,33 +29170,6 @@ }, /turf/simulated/floor/plating, /area/quartermaster/miningdock) -"bjV" = ( -/obj/structure/closet/crate, -/obj/machinery/light/small{ - dir = 8 - }, -/turf/simulated/shuttle/floor, -/area/shuttle/mining) -"bjW" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/shuttle/engine/heater, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/shuttle/plating, -/area/shuttle/mining) -"bjX" = ( -/obj/structure/ore_box, -/obj/machinery/light/small{ - dir = 4 - }, -/turf/simulated/shuttle/floor, -/area/shuttle/mining) "bjY" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable, @@ -32511,8 +29374,8 @@ network = list("SS13","Security") }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 1 + dir = 1; + icon_state = "vault" }, /area/security/hos) "bkp" = ( @@ -32521,8 +29384,8 @@ department = "Head of Security's Office" }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 1 + dir = 1; + icon_state = "vault" }, /area/security/hos) "bkq" = ( @@ -32536,8 +29399,8 @@ /obj/item/taperecorder, /obj/item/flashlight/seclite, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 1 + dir = 1; + icon_state = "vault" }, /area/security/hos) "bkr" = ( @@ -32545,8 +29408,8 @@ /obj/item/storage/secure/briefcase, /obj/item/book/manual/security_space_law, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 1 + dir = 1; + icon_state = "vault" }, /area/security/hos) "bks" = ( @@ -32563,8 +29426,8 @@ pixel_y = 30 }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 1 + dir = 1; + icon_state = "vault" }, /area/security/hos) "bkt" = ( @@ -32791,8 +29654,8 @@ "bkO" = ( /obj/machinery/atmospherics/pipe/simple/visible/purple, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/atmos) "bkP" = ( @@ -33222,6 +30085,7 @@ /obj/machinery/door/firedoor, /obj/machinery/door/airlock/external{ id_tag = "mining_home"; + locked = 1; name = "Mining Dock Airlock"; req_access_txt = "48" }, @@ -33277,12 +30141,12 @@ "blN" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes/arrow{ - icon_state = "4"; - dir = 4 + dir = 4; + icon_state = "4" }, /obj/effect/decal/warning_stripes/yellow/partial{ - icon_state = "3"; - dir = 4 + dir = 4; + icon_state = "3" }, /turf/simulated/floor/plasteel, /area/quartermaster/miningdock) @@ -33296,24 +30160,6 @@ }, /turf/simulated/floor/plating, /area/quartermaster/miningdock) -"blP" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f5"; - dir = 2 - }, -/area/shuttle/mining) -"blQ" = ( -/obj/structure/shuttle/engine/propulsion/burst, -/turf/simulated/shuttle/plating, -/area/shuttle/mining) -"blR" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f9"; - dir = 2 - }, -/area/shuttle/mining) "blS" = ( /obj/structure/closet/secure_closet/brigdoc, /turf/simulated/floor/plasteel{ @@ -33493,8 +30339,8 @@ pixel_y = 10 }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 1 + dir = 1; + icon_state = "vault" }, /area/security/hos) "bmk" = ( @@ -33782,8 +30628,8 @@ dir = 9 }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/atmos) "bmM" = ( @@ -33823,8 +30669,8 @@ "bmQ" = ( /obj/machinery/hydroponics/constructable, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, @@ -33983,12 +30829,12 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes/arrow{ - icon_state = "4"; - dir = 8 + dir = 8; + icon_state = "4" }, /obj/effect/decal/warning_stripes/yellow/partial{ - icon_state = "3"; - dir = 8 + dir = 8; + icon_state = "3" }, /turf/simulated/floor/plasteel, /area/quartermaster/miningdock) @@ -34013,8 +30859,8 @@ "bnj" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /turf/simulated/floor/plating, /area/quartermaster/miningdock) @@ -34037,8 +30883,8 @@ tag = "" }, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /turf/simulated/floor/plating, /area/security/prisonershuttle) @@ -34116,8 +30962,8 @@ /area/security/main) "bnt" = ( /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -34183,8 +31029,8 @@ level = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 9 + dir = 9; + icon_state = "red" }, /area/security/main) "bnx" = ( @@ -34207,8 +31053,8 @@ }, /obj/item/lighter/zippo, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 9 + dir = 9; + icon_state = "red" }, /area/security/main) "bnz" = ( @@ -34218,8 +31064,8 @@ }, /obj/machinery/photocopier, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 5 + dir = 5; + icon_state = "red" }, /area/security/main) "bnA" = ( @@ -34321,8 +31167,8 @@ }, /obj/machinery/computer/card/minor/hos, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 1 + dir = 1; + icon_state = "vault" }, /area/security/hos) "bnJ" = ( @@ -34365,9 +31211,7 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - on = 1 - }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -34377,15 +31221,15 @@ dir = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/construction/hallway) "bnP" = ( /obj/machinery/hologram/holopad, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/construction/hallway) "bnQ" = ( @@ -34743,8 +31587,8 @@ level = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 4 + dir = 4; + icon_state = "neutralcorner" }, /area/hallway/primary/central) "boz" = ( @@ -34761,8 +31605,8 @@ dir = 2 }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 4 + dir = 4; + icon_state = "neutralcorner" }, /area/hallway/primary/central) "boA" = ( @@ -34789,8 +31633,8 @@ icon_state = "pipe-c" }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 4 + dir = 4; + icon_state = "neutralcorner" }, /area/hallway/primary/central) "boC" = ( @@ -34808,8 +31652,8 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 4 + dir = 4; + icon_state = "neutralcorner" }, /area/hallway/primary/central) "boD" = ( @@ -34889,8 +31733,8 @@ }, /obj/structure/filingcabinet/filingcabinet, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 9 + dir = 9; + icon_state = "red" }, /area/security/prisonershuttle) "boM" = ( @@ -34937,8 +31781,8 @@ }, /obj/item/storage/box/prisoner, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 5 + dir = 5; + icon_state = "red" }, /area/security/prisonershuttle) "boQ" = ( @@ -35182,8 +32026,8 @@ tag = "" }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 1 + dir = 1; + icon_state = "vault" }, /area/security/hos) "bpi" = ( @@ -35300,12 +32144,7 @@ /obj/structure/shuttle/engine/propulsion/burst{ dir = 8 }, -/turf/simulated/floor/plating, -/turf/simulated/shuttle/wall{ - tag = "icon-swall_f6"; - icon_state = "swall_f6"; - dir = 2 - }, +/turf/simulated/wall/mineral/titanium, /area/shuttle/pod_3) "bps" = ( /obj/structure/window/reinforced, @@ -35334,14 +32173,14 @@ /turf/space, /area/space/nearstation) "bpv" = ( -/turf/simulated/floor/engine/insulated/vacuum, +/turf/simulated/floor/engine/vacuum, /area/atmos) "bpw" = ( /obj/machinery/camera{ c_tag = "Atmospherics Gas Mix Tank"; network = list("SS13","Engineering") }, -/turf/simulated/floor/engine/insulated/vacuum, +/turf/simulated/floor/engine/vacuum, /area/atmos) "bpx" = ( /obj/machinery/atmospherics/unary/outlet_injector/on{ @@ -35349,7 +32188,7 @@ frequency = 1441; id = "mix_in" }, -/turf/simulated/floor/engine/insulated/vacuum, +/turf/simulated/floor/engine/vacuum, /area/atmos) "bpy" = ( /obj/machinery/atmospherics/pipe/simple/visible/cyan, @@ -35838,9 +32677,8 @@ dir = 4; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=hall3"; @@ -35859,9 +32697,9 @@ tag = "" }, /obj/structure/disposalpipe/junction{ - tag = "icon-pipe-j2 (EAST)"; + dir = 4; icon_state = "pipe-j2"; - dir = 4 + tag = "icon-pipe-j2 (EAST)" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ @@ -35955,9 +32793,7 @@ dir = 8; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - on = 1 - }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/effect/landmark{ name = "lightsout" }, @@ -36048,9 +32884,8 @@ icon_state = "2-8"; tag = "" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /obj/structure/disposalpipe/segment, /obj/machinery/navbeacon{ @@ -36065,8 +32900,8 @@ "bqA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 4 + dir = 4; + icon_state = "neutralcorner" }, /area/hallway/primary/central) "bqB" = ( @@ -36076,43 +32911,6 @@ "bqC" = ( /turf/simulated/wall/rust, /area/maintenance/starboard) -"bqD" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f6"; - dir = 2 - }, -/area/shuttle/siberia) -"bqE" = ( -/obj/structure/grille, -/obj/structure/window/full/shuttle{ - icon_state = "window4" - }, -/turf/simulated/floor/plating, -/area/shuttle/siberia) -"bqF" = ( -/obj/structure/grille, -/obj/structure/window/full/shuttle{ - dir = 10; - icon_state = "9" - }, -/turf/simulated/floor/plating, -/area/shuttle/siberia) -"bqG" = ( -/obj/structure/grille, -/obj/structure/window/full/shuttle{ - icon_state = "window8" - }, -/turf/simulated/floor/plating, -/area/shuttle/siberia) -"bqH" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - tag = "icon-swall_f10"; - icon_state = "swall_f10"; - dir = 2 - }, -/area/shuttle/siberia) "bqI" = ( /obj/structure/lattice, /obj/structure/sign/electricshock{ @@ -36437,8 +33235,8 @@ }, /obj/machinery/computer/prisoner, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 1 + dir = 1; + icon_state = "vault" }, /area/security/hos) "brk" = ( @@ -36523,9 +33321,8 @@ /turf/space, /area/space/nearstation) "bru" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, @@ -36554,14 +33351,14 @@ /obj/machinery/light/small{ dir = 8 }, -/turf/simulated/floor/engine/insulated/vacuum, +/turf/simulated/floor/engine/vacuum, /area/atmos) "bry" = ( /obj/machinery/air_sensor{ frequency = 1441; id_tag = "mix_sensor" }, -/turf/simulated/floor/engine/insulated/vacuum, +/turf/simulated/floor/engine/vacuum, /area/atmos) "brz" = ( /obj/structure/cable{ @@ -36839,9 +33636,8 @@ /turf/simulated/floor/plasteel, /area/hydroponics) "bsb" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -36901,8 +33697,8 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/hallway/primary/central) "bsg" = ( @@ -36914,8 +33710,8 @@ }, /obj/machinery/light, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/hallway/primary/central) "bsh" = ( @@ -36926,8 +33722,8 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/hallway/primary/central) "bsi" = ( @@ -36939,8 +33735,8 @@ }, /obj/machinery/light/small, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/hallway/primary/central) "bsj" = ( @@ -36956,8 +33752,8 @@ }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/hallway/primary/central) "bsk" = ( @@ -37096,50 +33892,18 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 4 + dir = 4; + icon_state = "neutralcorner" }, /area/hallway/primary/central) "bsv" = ( /turf/simulated/wall, /area/hallway/primary/central) -"bsw" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall3"; - dir = 2 - }, -/area/shuttle/siberia) -"bsx" = ( -/obj/machinery/computer/shuttle/labor, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/siberia) -"bsy" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 1 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/siberia) -"bsz" = ( -/obj/structure/table, -/obj/item/folder/red, -/obj/item/restraints/handcuffs, -/obj/machinery/light{ - dir = 4; - icon_state = "tube1" - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/siberia) "bsA" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /turf/simulated/floor/plating, /area/security/prisonershuttle) @@ -37152,8 +33916,8 @@ tag = "" }, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /turf/simulated/floor/plating, /area/security/prisonershuttle) @@ -37196,8 +33960,8 @@ }, /obj/structure/table/reinforced, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/security/prisonershuttle) "bsF" = ( @@ -37207,8 +33971,8 @@ /obj/structure/table/reinforced, /obj/item/phone, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/security/prisonershuttle) "bsG" = ( @@ -37515,9 +34279,8 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -37544,8 +34307,8 @@ }, /obj/machinery/computer/med_data/laptop, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 1 + dir = 1; + icon_state = "vault" }, /area/security/hos) "bsZ" = ( @@ -37566,9 +34329,8 @@ }, /area/security/hos) "btb" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /obj/machinery/status_display{ pixel_y = -32 @@ -37607,7 +34369,7 @@ pressure_checks_default = 2; pump_direction = 0 }, -/turf/simulated/floor/engine/insulated/vacuum, +/turf/simulated/floor/engine/vacuum, /area/atmos) "btg" = ( /obj/machinery/atmospherics/pipe/simple/visible/cyan, @@ -37656,9 +34418,7 @@ }, /area/atmos) "btk" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - on = 1 - }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -37726,9 +34486,7 @@ dir = 1; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - on = 1 - }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -37993,49 +34751,6 @@ "btL" = ( /turf/simulated/wall/r_wall, /area/security/nuke_storage) -"btM" = ( -/obj/structure/grille, -/obj/structure/window/full/shuttle, -/turf/simulated/floor/plating, -/area/shuttle/siberia) -"btN" = ( -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/siberia) -"btO" = ( -/obj/machinery/flasher_button{ - id = "gulagshuttleflasher"; - name = "Flash Control"; - pixel_x = 0; - pixel_y = -26; - req_access_txt = "1" - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/siberia) -"btP" = ( -/obj/machinery/mineral/labor_claim_console{ - machinedir = 2; - pixel_x = 30; - pixel_y = 30 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/siberia) -"btQ" = ( -/obj/machinery/door/airlock/shuttle{ - id_tag = "s_docking_airlock"; - name = "Labor Shuttle Airlock"; - req_access_txt = "2" - }, -/obj/structure/fans/tiny, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/siberia) "btR" = ( /obj/machinery/suit_storage_unit/security, /obj/item/radio/intercom{ @@ -38050,6 +34765,7 @@ "btS" = ( /obj/machinery/door/airlock/external{ id_tag = "laborcamp_home"; + locked = 1; name = "Labor Camp Airlock"; req_access_txt = "2" }, @@ -38180,8 +34896,8 @@ /area/security/main) "bud" = ( /turf/simulated/floor/plasteel{ - icon_state = "redcorner"; - dir = 4 + dir = 4; + icon_state = "redcorner" }, /area/security/main) "bue" = ( @@ -38203,9 +34919,8 @@ }, /area/security/main) "bug" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -38248,8 +34963,8 @@ pixel_x = -24 }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 1 + dir = 1; + icon_state = "vault" }, /area/security/hos) "buk" = ( @@ -38257,8 +34972,8 @@ /obj/item/clipboard, /obj/item/toy/figure/hos, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 1 + dir = 1; + icon_state = "vault" }, /area/security/hos) "bul" = ( @@ -38271,8 +34986,8 @@ /obj/structure/table/wood, /obj/item/storage/fancy/donut_box, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 1 + dir = 1; + icon_state = "vault" }, /area/security/hos) "bum" = ( @@ -38280,8 +34995,8 @@ /obj/item/paper_bin, /obj/item/pen, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 1 + dir = 1; + icon_state = "vault" }, /area/security/hos) "bun" = ( @@ -38295,8 +35010,8 @@ pixel_y = -25 }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 1 + dir = 1; + icon_state = "vault" }, /area/security/hos) "buo" = ( @@ -38335,7 +35050,7 @@ }, /area/atmos) "bur" = ( -/obj/machinery/atmospherics/unary/heat_reservoir/heater, +/obj/machinery/atmospherics/unary/thermomachine/heater, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ dir = 8; @@ -38344,7 +35059,7 @@ /area/atmos) "bus" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/unary/cold_sink/freezer{ +/obj/machinery/atmospherics/unary/thermomachine/freezer{ dir = 4 }, /obj/effect/decal/warning_stripes/yellow, @@ -38491,12 +35206,12 @@ dir = 4 }, /obj/effect/decal/warning_stripes/arrow{ - icon_state = "4"; - dir = 1 + dir = 1; + icon_state = "4" }, /obj/effect/decal/warning_stripes/yellow/partial{ - icon_state = "3"; - dir = 1 + dir = 1; + icon_state = "3" }, /turf/simulated/floor/plasteel, /area/atmos) @@ -38544,8 +35259,8 @@ }, /obj/machinery/portable_atmospherics/scrubber, /turf/simulated/floor/plasteel{ - icon_state = "escape"; - dir = 4 + dir = 4; + icon_state = "escape" }, /area/hallway/primary/port) "buL" = ( @@ -38555,8 +35270,8 @@ "buM" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /turf/simulated/floor/plating, /area/storage/tech) @@ -38590,8 +35305,8 @@ /area/storage/tech) "buP" = ( /obj/structure/sink{ - icon_state = "sink"; dir = 8; + icon_state = "sink"; pixel_x = -12; pixel_y = 2 }, @@ -38648,8 +35363,8 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/hallway/primary/central) "buX" = ( @@ -38699,14 +35414,14 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 4 + dir = 4; + icon_state = "neutralcorner" }, /area/hallway/primary/central) "bvc" = ( /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 1 + dir = 1; + icon_state = "vault" }, /area/security/nuke_storage) "bvd" = ( @@ -38720,20 +35435,18 @@ /obj/item/coin/silver, /obj/item/coin/silver, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 1 + dir = 1; + icon_state = "vault" }, /area/security/nuke_storage) "bve" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - on = 1 - }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/machinery/status_display{ pixel_y = 32 }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 1 + dir = 1; + icon_state = "vault" }, /area/security/nuke_storage) "bvf" = ( @@ -38745,15 +35458,15 @@ }, /obj/structure/table/reinforced, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 1 + dir = 1; + icon_state = "vault" }, /area/security/nuke_storage) "bvg" = ( /obj/structure/closet/secure_closet/freezer/money, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 1 + dir = 1; + icon_state = "vault" }, /area/security/nuke_storage) "bvh" = ( @@ -38761,29 +35474,6 @@ /obj/structure/grille, /turf/space, /area/space/nearstation) -"bvi" = ( -/obj/machinery/door/airlock/external{ - name = "Labor Shuttle Airlock"; - req_access_txt = "2" - }, -/turf/simulated/shuttle/floor{ - icon = 'icons/turf/floors.dmi'; - icon_state = "dark" - }, -/area/shuttle/siberia) -"bvj" = ( -/turf/simulated/shuttle/wall, -/area/shuttle/siberia) -"bvk" = ( -/obj/machinery/mineral/stacking_machine/laborstacker{ - input_dir = 2; - output_dir = 1 - }, -/turf/simulated/shuttle/floor{ - icon = 'icons/turf/floors.dmi'; - icon_state = "dark" - }, -/area/shuttle/siberia) "bvl" = ( /obj/structure/cable{ d1 = 2; @@ -38920,8 +35610,8 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - icon_state = "redcorner"; - dir = 4 + dir = 4; + icon_state = "redcorner" }, /area/security/main) "bvy" = ( @@ -38987,13 +35677,12 @@ }, /area/turret_protected/ai) "bvD" = ( -/obj/machinery/atmospherics/unary/heat_reservoir/heater{ - dir = 1; - on = 1 +/obj/machinery/atmospherics/unary/thermomachine/heater/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "arrival"; - dir = 10 + dir = 10; + icon_state = "arrival" }, /area/atmos) "bvE" = ( @@ -39108,9 +35797,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -39216,8 +35904,8 @@ sensors = list("mix_sensor" = "Tank") }, /turf/simulated/floor/plasteel{ - icon_state = "green"; - dir = 8 + dir = 8; + icon_state = "green" }, /area/atmos) "bvV" = ( @@ -39338,8 +36026,8 @@ tag = "" }, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /turf/simulated/floor/plating, /area/bridge) @@ -39352,8 +36040,8 @@ tag = "" }, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /turf/simulated/floor/plating, /area/bridge) @@ -39377,8 +36065,8 @@ "bwg" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /turf/simulated/floor/plating, /area/bridge) @@ -39485,8 +36173,8 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 4 + dir = 4; + icon_state = "neutralcorner" }, /area/hallway/primary/central) "bwp" = ( @@ -39536,17 +36224,6 @@ icon_state = "dark" }, /area/security/nuke_storage) -"bww" = ( -/turf/simulated/shuttle/floor, -/area/shuttle/siberia) -"bwx" = ( -/obj/machinery/mineral/labor_claim_console{ - machinedir = 1; - pixel_x = 30; - pixel_y = 0 - }, -/turf/simulated/shuttle/floor, -/area/shuttle/siberia) "bwy" = ( /obj/structure/cable{ d1 = 1; @@ -39606,8 +36283,8 @@ "bwC" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /turf/simulated/floor/plating, /area/security/main) @@ -39647,8 +36324,8 @@ /area/security/main) "bwF" = ( /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/structure/cable{ d2 = 8; @@ -39674,8 +36351,8 @@ dir = 8 }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/turret_protected/ai) "bwH" = ( @@ -39705,8 +36382,8 @@ /area/turret_protected/ai) "bwK" = ( /obj/machinery/power/terminal{ - icon_state = "term"; - dir = 1 + dir = 1; + icon_state = "term" }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -39737,17 +36414,6 @@ "bwN" = ( /turf/simulated/wall/r_wall, /area/engine/gravitygenerator) -"bwO" = ( -/obj/structure/shuttle/engine/propulsion/burst{ - dir = 8 - }, -/turf/simulated/floor/plating, -/turf/simulated/shuttle/wall{ - tag = "icon-swall_f5"; - icon_state = "swall_f5"; - dir = 2 - }, -/area/shuttle/pod_3) "bwP" = ( /turf/simulated/wall/r_wall, /area/engine/break_room) @@ -39889,9 +36555,8 @@ tag = "" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -40051,9 +36716,9 @@ "bxw" = ( /obj/machinery/computer/monitor, /obj/structure/cable{ + d2 = 2; icon_state = "0-2"; - pixel_y = 1; - d2 = 2 + pixel_y = 1 }, /turf/simulated/floor/plasteel{ dir = 5; @@ -40097,8 +36762,8 @@ level = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 4 + dir = 4; + icon_state = "neutralcorner" }, /area/hallway/primary/central) "bxA" = ( @@ -40200,26 +36865,6 @@ icon_state = "dark" }, /area/security/nuke_storage) -"bxH" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 4 - }, -/turf/simulated/shuttle/floor, -/area/shuttle/siberia) -"bxI" = ( -/obj/machinery/flasher{ - id = "gulagshuttleflasher"; - pixel_x = 25 - }, -/obj/machinery/light{ - dir = 4; - icon_state = "tube1" - }, -/obj/structure/chair/comfy/shuttle{ - dir = 8 - }, -/turf/simulated/shuttle/floor, -/area/shuttle/siberia) "bxJ" = ( /obj/structure/cable{ d1 = 4; @@ -40246,8 +36891,8 @@ }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 9 + dir = 9; + icon_state = "red" }, /area/security/prisonershuttle) "bxL" = ( @@ -40304,8 +36949,8 @@ }, /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 5 + dir = 5; + icon_state = "red" }, /area/security/prisonershuttle) "bxP" = ( @@ -40322,8 +36967,8 @@ "bxQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/light{ - icon_state = "tube1"; - dir = 4 + dir = 4; + icon_state = "tube1" }, /turf/simulated/floor/plasteel{ dir = 4; @@ -40341,8 +36986,8 @@ "bxT" = ( /obj/machinery/hologram/holopad, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/security/main) "bxU" = ( @@ -40543,9 +37188,9 @@ /area/engine/gravitygenerator) "byk" = ( /obj/machinery/light/small{ - tag = "icon-bulb1 (EAST)"; + dir = 4; icon_state = "bulb1"; - dir = 4 + tag = "icon-bulb1 (EAST)" }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, @@ -40956,8 +37601,8 @@ network = list("SS13") }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/hallway/primary/central) "byR" = ( @@ -40969,8 +37614,8 @@ pixel_x = -28 }, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /turf/simulated/floor/plasteel{ dir = 1; @@ -41042,8 +37687,8 @@ pixel_x = 28 }, /obj/machinery/light{ - icon_state = "tube1"; - dir = 4 + dir = 4; + icon_state = "tube1" }, /obj/structure/cable{ d1 = 1; @@ -41073,8 +37718,8 @@ "bza" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /turf/simulated/floor/plasteel{ dir = 8; @@ -41097,25 +37742,7 @@ }, /turf/simulated/floor/greengrid, /area/security/nuke_storage) -"bze" = ( -/obj/structure/closet/crate, -/turf/simulated/shuttle/floor, -/area/shuttle/siberia) "bzf" = ( -/obj/machinery/door/airlock/shuttle{ - id_tag = "s_docking_airlock"; - name = "Labor Shuttle Airlock"; - req_access_txt = "0" - }, -/obj/docking_port/mobile{ - dir = 8; - dwidth = 2; - height = 5; - id = "laborcamp"; - name = "labor camp shuttle"; - rebuildable = 1; - width = 9 - }, /obj/docking_port/stationary{ dir = 8; dwidth = 2; @@ -41124,9 +37751,8 @@ name = "fore bay 1"; width = 9 }, -/obj/structure/fans/tiny, -/turf/simulated/shuttle/floor, -/area/shuttle/siberia) +/turf/space, +/area/space) "bzg" = ( /obj/structure/cable{ d1 = 1; @@ -41247,14 +37873,12 @@ /obj/item/folder/red, /obj/item/pen, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/security/main) "bzq" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - on = 1 - }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/structure/chair/office/dark{ dir = 8 }, @@ -41393,11 +38017,8 @@ /turf/simulated/floor/greengrid, /area/turret_protected/ai) "bzC" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /obj/structure/chair/office/dark{ dir = 4 @@ -41638,8 +38259,8 @@ /area/atmos) "bAb" = ( /obj/structure/table/reinforced, -/obj/item/tank/emergency_oxygen, -/obj/item/tank/emergency_oxygen, +/obj/item/tank/internals/emergency_oxygen, +/obj/item/tank/internals/emergency_oxygen, /obj/item/clothing/mask/breath, /obj/item/clothing/mask/breath, /turf/simulated/floor/plasteel{ @@ -41801,8 +38422,8 @@ /area/bridge) "bAs" = ( /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/bridge) "bAt" = ( @@ -41875,9 +38496,7 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - on = 1 - }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -41958,8 +38577,8 @@ /obj/item/stack/sheet/mineral/gold, /obj/item/stack/sheet/mineral/gold, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 1 + dir = 1; + icon_state = "vault" }, /area/security/nuke_storage) "bAJ" = ( @@ -41968,8 +38587,8 @@ }, /obj/item/clothing/accessory/stethoscope, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 1 + dir = 1; + icon_state = "vault" }, /area/security/nuke_storage) "bAK" = ( @@ -41984,18 +38603,10 @@ amount = 100000 }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 1 + dir = 1; + icon_state = "vault" }, /area/security/nuke_storage) -"bAL" = ( -/obj/structure/shuttle/engine/heater, -/obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 - }, -/turf/simulated/shuttle/plating, -/area/shuttle/siberia) "bAM" = ( /obj/structure/cable{ d1 = 2; @@ -42022,9 +38633,8 @@ }, /area/security/prisonershuttle) "bAO" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -42117,8 +38727,8 @@ /obj/structure/table/reinforced, /obj/item/flashlight/lamp, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/security/main) "bAY" = ( @@ -42133,8 +38743,8 @@ "bAZ" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -42158,9 +38768,8 @@ }, /area/security/main) "bBb" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /obj/machinery/light/small, /turf/simulated/floor/plasteel{ @@ -42176,8 +38785,8 @@ /area/security/main) "bBd" = ( /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/turret_protected/ai) "bBe" = ( @@ -42216,14 +38825,14 @@ /area/turret_protected/ai) "bBi" = ( /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 1 + dir = 1; + icon_state = "vault" }, /area/engine/gravitygenerator) "bBj" = ( /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/engine/gravitygenerator) "bBk" = ( @@ -42350,8 +38959,8 @@ "bBv" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4; @@ -42385,8 +38994,8 @@ icon_state = "1-4" }, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plating, @@ -42480,8 +39089,8 @@ /area/engine/break_room) "bBF" = ( /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4; @@ -42647,8 +39256,8 @@ "bBQ" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 4 + dir = 4; + icon_state = "neutral" }, /area/storage/tech) "bBR" = ( @@ -42764,10 +39373,10 @@ /obj/item/clothing/suit/storage/hazardvest, /obj/item/clothing/suit/storage/hazardvest, /obj/item/clothing/suit/storage/hazardvest, -/obj/item/tank/emergency_oxygen/double, -/obj/item/tank/emergency_oxygen/double, -/obj/item/tank/emergency_oxygen/double, -/obj/item/tank/emergency_oxygen/double, +/obj/item/tank/internals/emergency_oxygen/double, +/obj/item/tank/internals/emergency_oxygen/double, +/obj/item/tank/internals/emergency_oxygen/double, +/obj/item/tank/internals/emergency_oxygen/double, /obj/item/clothing/mask/breath, /obj/item/clothing/mask/breath, /obj/item/clothing/mask/breath, @@ -42867,8 +39476,8 @@ req_access_txt = "19" }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/bridge) "bCi" = ( @@ -42903,8 +39512,8 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/bridge) "bCk" = ( @@ -42934,8 +39543,8 @@ req_access_txt = "19" }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/bridge) "bCl" = ( @@ -43271,8 +39880,8 @@ req_access_txt = "19" }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/bridge) "bCB" = ( @@ -43286,8 +39895,8 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/bridge) "bCC" = ( @@ -43333,28 +39942,10 @@ dir = 8 }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 4 + dir = 4; + icon_state = "neutralcorner" }, /area/hallway/primary/central) -"bCF" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f5"; - dir = 2 - }, -/area/shuttle/siberia) -"bCG" = ( -/obj/structure/shuttle/engine/propulsion, -/turf/simulated/shuttle/plating, -/area/shuttle/siberia) -"bCH" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f9"; - dir = 2 - }, -/area/shuttle/siberia) "bCI" = ( /obj/structure/sign/electricshock{ pixel_x = 32; @@ -43491,8 +40082,8 @@ "bCU" = ( /obj/machinery/hologram/holopad, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/turret_protected/ai) "bCV" = ( @@ -43969,8 +40560,8 @@ /area/storage/tech) "bDF" = ( /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 4 + dir = 4; + icon_state = "neutral" }, /area/storage/tech) "bDG" = ( @@ -43989,8 +40580,8 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/hallway/primary/central) "bDH" = ( @@ -44087,8 +40678,8 @@ /area/storage/primary) "bDP" = ( /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/structure/table/reinforced, /obj/item/stack/rods, @@ -44139,8 +40730,8 @@ req_access_txt = "19" }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/bridge) "bDU" = ( @@ -44164,8 +40755,8 @@ level = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/bridge) "bDW" = ( @@ -44188,8 +40779,8 @@ req_access_txt = "19" }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/bridge) "bDX" = ( @@ -44212,9 +40803,8 @@ dir = 4; level = 1 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -44396,8 +40986,8 @@ level = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/bridge) "bEo" = ( @@ -44435,15 +41025,15 @@ level = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 4 + dir = 4; + icon_state = "neutralcorner" }, /area/hallway/primary/central) "bEr" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, @@ -44506,8 +41096,8 @@ "bEy" = ( /obj/structure/closet/secure_closet, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/security/warden) "bEz" = ( @@ -44516,8 +41106,8 @@ dir = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/security/warden) "bEA" = ( @@ -44541,8 +41131,8 @@ "bEC" = ( /obj/machinery/suit_storage_unit/security, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/security/warden) "bED" = ( @@ -44597,22 +41187,19 @@ "bEG" = ( /obj/machinery/gravity_generator/main/station, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/engine/gravitygenerator) "bEH" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - on = 1 - }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/engine/gravitygenerator) "bEI" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -44728,9 +41315,8 @@ }, /area/engine/break_room) "bES" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 2; @@ -44888,8 +41474,8 @@ /obj/machinery/cell_charger, /obj/item/stock_parts/cell/high, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/storage/tech) "bFj" = ( @@ -44937,8 +41523,8 @@ pixel_x = 28 }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/storage/tech) "bFm" = ( @@ -45009,8 +41595,8 @@ level = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/hallway/primary/central) "bFu" = ( @@ -45037,8 +41623,8 @@ icon_state = "pipe-c" }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/bridge) "bFx" = ( @@ -45147,11 +41733,8 @@ /turf/simulated/floor/carpet, /area/bridge) "bFI" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/carpet, /area/bridge) @@ -45267,8 +41850,8 @@ "bFV" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /turf/simulated/floor/plating, /area/security/detectives_office) @@ -45301,15 +41884,15 @@ /obj/structure/disposalpipe/segment, /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ - icon_state = "redcorner"; - dir = 4 + dir = 4; + icon_state = "redcorner" }, /area/hallway/primary/starboard) "bGa" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /turf/simulated/floor/plating, /area/security/brig) @@ -45328,8 +41911,8 @@ name = "Cell 2 Locker" }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 9 + dir = 9; + icon_state = "red" }, /area/security/brig) "bGc" = ( @@ -45340,8 +41923,8 @@ pressure_checks = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 5 + dir = 5; + icon_state = "red" }, /area/security/brig) "bGd" = ( @@ -45533,8 +42116,8 @@ }, /obj/structure/dispenser/oxygen, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/security/warden) "bGp" = ( @@ -45974,8 +42557,8 @@ /area/hallway/primary/port) "bGS" = ( /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/structure/table/reinforced, /obj/machinery/power/apc{ @@ -45987,8 +42570,8 @@ /obj/item/folder/yellow, /obj/item/airlock_electronics, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/storage/tech) "bGT" = ( @@ -45998,13 +42581,12 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 4 + dir = 4; + icon_state = "neutral" }, /area/storage/tech) "bGU" = ( @@ -46078,8 +42660,8 @@ /obj/item/stock_parts/manipulator, /obj/item/stock_parts/capacitor, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/storage/tech) "bGZ" = ( @@ -46116,9 +42698,8 @@ }, /area/storage/primary) "bHd" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /obj/effect/landmark/start{ name = "Civilian" @@ -46178,8 +42759,8 @@ pixel_x = 24 }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/hallway/primary/central) "bHj" = ( @@ -46382,8 +42963,8 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 4 + dir = 4; + icon_state = "neutralcorner" }, /area/hallway/primary/central) "bHD" = ( @@ -46474,11 +43055,11 @@ /obj/structure/table/wood, /obj/item/book/manual/security_space_law, /obj/item/camera{ - name = "detectives camera"; desc = "A one use - polaroid camera. 30 photos left."; + name = "detectives camera"; + pictures_left = 30; pixel_x = 0; - pixel_y = 0; - pictures_left = 30 + pixel_y = 0 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -46579,8 +43160,8 @@ "bHU" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ - icon_state = "redcorner"; - dir = 4 + dir = 4; + icon_state = "redcorner" }, /area/hallway/primary/starboard) "bHV" = ( @@ -46694,8 +43275,8 @@ /obj/item/stack/packageWrap, /obj/item/hand_labeler, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/security/warden) "bIc" = ( @@ -46739,9 +43320,8 @@ /turf/simulated/floor/plasteel, /area/security/warden) "bIg" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /obj/structure/chair/office/dark{ dir = 8 @@ -46781,8 +43361,8 @@ pixel_y = 24 }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/turret_protected/ai) "bIk" = ( @@ -47041,9 +43621,8 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, @@ -47104,8 +43683,8 @@ /obj/item/airalarm_electronics, /obj/item/apc_electronics, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/storage/tech) "bIO" = ( @@ -47156,8 +43735,8 @@ /obj/item/stack/sheet/glass, /obj/item/stack/sheet/glass, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/storage/tech) "bIS" = ( @@ -47215,8 +43794,8 @@ "bIX" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/hallway/primary/central) "bIY" = ( @@ -47387,9 +43966,9 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - tag = "icon-cult"; + dir = 2; icon_state = "cult"; - dir = 2 + tag = "icon-cult" }, /area/crew_quarters/captain) "bJm" = ( @@ -47414,8 +43993,8 @@ pixel_y = 32 }, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/crew_quarters/captain) "bJp" = ( @@ -47423,8 +44002,8 @@ pixel_y = 32 }, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/crew_quarters/captain) "bJq" = ( @@ -47432,8 +44011,8 @@ pixel_y = 32 }, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/crew_quarters/captain) "bJr" = ( @@ -47581,8 +44160,8 @@ req_access_txt = "4" }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/security/detectives_office) "bJC" = ( @@ -47630,9 +44209,8 @@ d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /obj/machinery/flasher{ id = "Cell 4"; @@ -47668,9 +44246,8 @@ tag = "" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -47695,8 +44272,8 @@ "bJL" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /turf/simulated/floor/plating, /area/security/warden) @@ -47866,8 +44443,8 @@ "bJZ" = ( /obj/structure/closet/emcloset, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/engine/break_room) "bKa" = ( @@ -47915,8 +44492,8 @@ req_access_txt = "11" }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/engine/break_room) "bKd" = ( @@ -47933,8 +44510,8 @@ dir = 6 }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/crew_quarters/chief) "bKf" = ( @@ -48073,9 +44650,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -48154,8 +44730,8 @@ "bKt" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5; @@ -48269,8 +44845,8 @@ "bKE" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/machinery/door/poddoor/shutters{ density = 0; @@ -48319,9 +44895,8 @@ /turf/simulated/floor/carpet, /area/bridge/meeting_room) "bKI" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/carpet, /area/bridge/meeting_room) @@ -48437,9 +45012,9 @@ on = 1 }, /turf/simulated/floor/plasteel{ - tag = "icon-cult"; + dir = 2; icon_state = "cult"; - dir = 2 + tag = "icon-cult" }, /area/crew_quarters/captain) "bLa" = ( @@ -48459,16 +45034,16 @@ level = 1 }, /turf/simulated/floor/plasteel{ - tag = "icon-cult"; + dir = 2; icon_state = "cult"; - dir = 2 + tag = "icon-cult" }, /area/crew_quarters/captain) "bLb" = ( /turf/simulated/floor/plasteel{ - tag = "icon-cult"; + dir = 2; icon_state = "cult"; - dir = 2 + tag = "icon-cult" }, /area/crew_quarters/captain) "bLc" = ( @@ -48698,12 +45273,12 @@ "bLz" = ( /obj/structure/disposalpipe/segment, /obj/machinery/light{ - icon_state = "tube1"; - dir = 4 + dir = 4; + icon_state = "tube1" }, /turf/simulated/floor/plasteel{ - icon_state = "redcorner"; - dir = 4 + dir = 4; + icon_state = "redcorner" }, /area/hallway/primary/starboard) "bLA" = ( @@ -48740,8 +45315,8 @@ }, /obj/machinery/computer/crew, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 9 + dir = 9; + icon_state = "red" }, /area/security/warden) "bLF" = ( @@ -48774,15 +45349,15 @@ pixel_y = 0 }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 5 + dir = 5; + icon_state = "red" }, /area/security/warden) "bLH" = ( /obj/machinery/flasher/portable, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/security/armoury) "bLI" = ( @@ -48792,8 +45367,8 @@ /obj/item/grenade/barrier, /obj/item/grenade/barrier, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/security/armoury) "bLJ" = ( @@ -48805,16 +45380,16 @@ /obj/item/storage/box/trackimp, /obj/item/storage/lockbox/mindshield, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/security/armoury) "bLK" = ( /obj/item/grenade/barrier, /obj/item/grenade/barrier, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/security/armoury) "bLL" = ( @@ -48823,8 +45398,8 @@ /obj/item/storage/box/handcuffs, /obj/item/storage/box/flashbangs, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/security/armoury) "bLM" = ( @@ -48919,8 +45494,8 @@ layer = 2.9 }, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4; @@ -49096,9 +45671,9 @@ "bMf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/light/small{ - tag = "icon-bulb1 (EAST)"; + dir = 4; icon_state = "bulb1"; - dir = 4 + tag = "icon-bulb1 (EAST)" }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -49119,8 +45694,8 @@ on = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 4 + dir = 4; + icon_state = "neutral" }, /area/crew_quarters/chief) "bMi" = ( @@ -49262,8 +45837,8 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 9 + dir = 9; + icon_state = "red" }, /area/security/checkpoint/engineering) "bMz" = ( @@ -49274,9 +45849,9 @@ /area/security/checkpoint/engineering) "bMA" = ( /obj/machinery/light/small{ - tag = "icon-bulb1 (EAST)"; + dir = 4; icon_state = "bulb1"; - dir = 4 + tag = "icon-bulb1 (EAST)" }, /obj/structure/closet/secure_closet/brig{ id = "engcell" @@ -49520,8 +46095,8 @@ /area/bridge/meeting_room) "bMV" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 4 + dir = 4; + icon_state = "tube1" }, /obj/machinery/vending/cigarette, /turf/simulated/floor/plasteel{ @@ -49595,9 +46170,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/hologram/holopad, /turf/simulated/floor/plasteel{ - tag = "icon-cult"; + dir = 2; icon_state = "cult"; - dir = 2 + tag = "icon-cult" }, /area/crew_quarters/captain) "bNd" = ( @@ -49608,9 +46183,9 @@ tag = "" }, /turf/simulated/floor/plasteel{ - tag = "icon-cult"; + dir = 2; icon_state = "cult"; - dir = 2 + tag = "icon-cult" }, /area/crew_quarters/captain) "bNe" = ( @@ -49620,9 +46195,7 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - on = 1 - }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ icon_state = "wood" }, @@ -49691,9 +46264,7 @@ d2 = 4; icon_state = "1-4" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - on = 1 - }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -49742,8 +46313,8 @@ /obj/item/storage/box/bodybags, /obj/item/clothing/gloves/color/latex, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/security/detectives_office) "bNo" = ( @@ -49812,8 +46383,8 @@ /area/security/detectives_office) "bNu" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 4 + dir = 4; + icon_state = "tube1" }, /obj/machinery/status_display{ pixel_x = 32; @@ -49831,8 +46402,8 @@ /obj/item/folder/red, /obj/item/pen, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/security/detectives_office) "bNw" = ( @@ -49868,8 +46439,8 @@ name = "Cell 1 Locker" }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 9 + dir = 9; + icon_state = "red" }, /area/security/brig) "bNz" = ( @@ -49881,8 +46452,8 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 5 + dir = 5; + icon_state = "red" }, /area/security/brig) "bNA" = ( @@ -49995,12 +46566,12 @@ "bNK" = ( /obj/structure/closet/secure_closet, /obj/machinery/light{ - icon_state = "tube1"; - dir = 4 + dir = 4; + icon_state = "tube1" }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/security/armoury) "bNL" = ( @@ -50049,8 +46620,8 @@ req_access_txt = "75" }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/turret_protected/aisat) "bNQ" = ( @@ -50112,8 +46683,8 @@ network = list("SS13","Security") }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/security/warden) "bNW" = ( @@ -50122,8 +46693,8 @@ dir = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/engine/break_room) "bNX" = ( @@ -50135,8 +46706,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/engine/break_room) "bNZ" = ( @@ -50161,8 +46732,8 @@ /area/crew_quarters/chief) "bOa" = ( /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 4 + dir = 4; + icon_state = "neutral" }, /area/crew_quarters/chief) "bOb" = ( @@ -50433,8 +47004,8 @@ "bOD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /turf/simulated/floor/plasteel{ dir = 1; @@ -50560,9 +47131,8 @@ }, /area/turret_protected/ai_upload) "bOR" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/bluegrid, /area/turret_protected/ai_upload) @@ -50687,12 +47257,12 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/light{ - icon_state = "tube1"; - dir = 4 + dir = 4; + icon_state = "tube1" }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 4 + dir = 4; + icon_state = "neutralcorner" }, /area/hallway/primary/central) "bPd" = ( @@ -50748,16 +47318,16 @@ "bPi" = ( /obj/structure/morgue, /obj/machinery/light/small{ - tag = "icon-bulb1 (WEST)"; + dir = 8; icon_state = "bulb1"; - dir = 8 + tag = "icon-bulb1 (WEST)" }, /obj/effect/landmark{ name = "revenantspawn" }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/security/detectives_office) "bPj" = ( @@ -50779,9 +47349,8 @@ }, /area/security/detectives_office) "bPl" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -50844,9 +47413,8 @@ }, /area/security/detectives_office) "bPs" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ @@ -50948,9 +47516,7 @@ /turf/simulated/floor/plating, /area/security/armoury) "bPy" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - on = 1 - }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel, /area/security/armoury) @@ -50981,8 +47547,8 @@ /obj/item/clothing/head/helmet, /obj/item/clothing/head/helmet, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/security/armoury) "bPC" = ( @@ -51102,8 +47668,8 @@ dir = 8 }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/turret_protected/aisat) "bPJ" = ( @@ -51135,8 +47701,8 @@ /area/engine/gravitygenerator) "bPL" = ( /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/turret_protected/aisat) "bPM" = ( @@ -51148,8 +47714,8 @@ "bPN" = ( /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/turret_protected/aisat) "bPO" = ( @@ -51205,16 +47771,16 @@ /obj/structure/lattice, /obj/structure/window/reinforced, /obj/structure/transit_tube{ - tag = "icon-D-SE"; - icon_state = "D-SE" + icon_state = "D-SE"; + tag = "icon-D-SE" }, /turf/space, /area/space/nearstation) "bPU" = ( /obj/structure/lattice, /obj/structure/transit_tube{ - tag = "icon-E-SW"; - icon_state = "E-SW" + icon_state = "E-SW"; + tag = "icon-E-SW" }, /turf/space, /area/space/nearstation) @@ -51226,16 +47792,16 @@ "bPW" = ( /obj/structure/lattice, /obj/structure/transit_tube{ - tag = "icon-W-SE"; - icon_state = "W-SE" + icon_state = "W-SE"; + tag = "icon-W-SE" }, /turf/space, /area/space/nearstation) "bPX" = ( /obj/structure/lattice, /obj/structure/transit_tube{ - tag = "icon-D-SW"; - icon_state = "D-SW" + icon_state = "D-SW"; + tag = "icon-D-SW" }, /turf/space, /area/space/nearstation) @@ -51435,9 +48001,9 @@ /area/security/armoury) "bQp" = ( /obj/structure/disposalpipe/junction{ - tag = "icon-pipe-j2"; + dir = 2; icon_state = "pipe-j2"; - dir = 2 + tag = "icon-pipe-j2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/item/twohanded/required/kirbyplants, @@ -51482,8 +48048,8 @@ "bQt" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /turf/simulated/floor/plating, /area/security/checkpoint/engineering) @@ -51552,8 +48118,8 @@ /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 4 + dir = 4; + icon_state = "neutralcorner" }, /area/hallway/primary/starboard) "bQA" = ( @@ -51688,8 +48254,8 @@ /area/turret_protected/ai_upload) "bQL" = ( /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/turret_protected/ai_upload) "bQM" = ( @@ -51825,8 +48391,8 @@ "bQZ" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, @@ -51901,9 +48467,8 @@ d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /obj/machinery/flasher{ id = "Cell 5"; @@ -52011,8 +48576,8 @@ /obj/item/ammo_box/shotgun/rubbershot, /obj/item/ammo_box/shotgun/rubbershot, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/security/armoury) "bRo" = ( @@ -52041,8 +48606,8 @@ pixel_x = 32 }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/security/armoury) "bRq" = ( @@ -52328,8 +48893,8 @@ level = 1 }, /obj/structure/transit_tube{ - tag = "icon-S-NE"; - icon_state = "S-NE" + icon_state = "S-NE"; + tag = "icon-S-NE" }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -52340,15 +48905,15 @@ dir = 8 }, /obj/structure/transit_tube{ - tag = "icon-D-NW"; - icon_state = "D-NW" + icon_state = "D-NW"; + tag = "icon-D-NW" }, /turf/space, /area/space/nearstation) "bRP" = ( /obj/structure/transit_tube{ - tag = "icon-D-NE"; - icon_state = "D-NE" + icon_state = "D-NE"; + tag = "icon-D-NE" }, /turf/space, /area/space/nearstation) @@ -52361,8 +48926,8 @@ /area/space/nearstation) "bRR" = ( /obj/structure/transit_tube{ - tag = "icon-D-SW"; - icon_state = "D-SW" + icon_state = "D-SW"; + tag = "icon-D-SW" }, /turf/space, /area/space/nearstation) @@ -52393,9 +48958,7 @@ }, /area/engine/break_room) "bRU" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - on = 1 - }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -52447,9 +49010,8 @@ }, /area/crew_quarters/chief) "bRY" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -52639,8 +49201,8 @@ }, /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 9 + dir = 9; + icon_state = "red" }, /area/security/checkpoint/engineering) "bSl" = ( @@ -52873,8 +49435,8 @@ /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/hallway/primary/central) "bSA" = ( @@ -52938,8 +49500,8 @@ network = list("SS13") }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/hallway/primary/central) "bSE" = ( @@ -53124,8 +49686,8 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 4 + dir = 4; + icon_state = "neutralcorner" }, /area/hallway/primary/central) "bSV" = ( @@ -53134,8 +49696,8 @@ /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 4 + dir = 4; + icon_state = "neutralcorner" }, /area/hallway/primary/central) "bSW" = ( @@ -53208,18 +49770,18 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 4 + dir = 4; + icon_state = "neutralcorner" }, /area/hallway/primary/starboard) "bTc" = ( /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/machinery/power/terminal{ - icon_state = "term"; - dir = 1 + dir = 1; + icon_state = "term" }, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plating, @@ -53244,8 +49806,8 @@ }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 4 + dir = 4; + icon_state = "neutralcorner" }, /area/hallway/primary/starboard) "bTf" = ( @@ -53263,8 +49825,8 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 4 + dir = 4; + icon_state = "neutralcorner" }, /area/hallway/primary/starboard) "bTg" = ( @@ -53276,8 +49838,8 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "redcorner"; - dir = 4 + dir = 4; + icon_state = "redcorner" }, /area/hallway/primary/starboard) "bTh" = ( @@ -53290,8 +49852,8 @@ level = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "redcorner"; - dir = 4 + dir = 4; + icon_state = "redcorner" }, /area/hallway/primary/starboard) "bTi" = ( @@ -53302,8 +49864,8 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "redcorner"; - dir = 4 + dir = 4; + icon_state = "redcorner" }, /area/hallway/primary/starboard) "bTj" = ( @@ -53337,12 +49899,12 @@ level = 1 }, /obj/machinery/light{ - icon_state = "tube1"; - dir = 4 + dir = 4; + icon_state = "tube1" }, /turf/simulated/floor/plasteel{ - icon_state = "redcorner"; - dir = 4 + dir = 4; + icon_state = "redcorner" }, /area/hallway/primary/starboard) "bTm" = ( @@ -53379,8 +49941,8 @@ "bTp" = ( /obj/vehicle/secway, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/security/armoury) "bTq" = ( @@ -53409,14 +49971,14 @@ /obj/item/shield/riot, /obj/item/shield/riot, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/security/armoury) "bTs" = ( /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/construction/hallway) "bTt" = ( @@ -53426,8 +49988,8 @@ req_access_txt = "75" }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/turret_protected/aisat) "bTu" = ( @@ -53438,8 +50000,8 @@ tag = "" }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/turret_protected/aisat) "bTv" = ( @@ -53479,9 +50041,8 @@ }, /area/turret_protected/aisat) "bTx" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /obj/structure/cable{ d1 = 4; @@ -53506,8 +50067,8 @@ pixel_x = 0 }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/turret_protected/aisat) "bTz" = ( @@ -53527,8 +50088,8 @@ req_access_txt = "75" }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/turret_protected/aisat) "bTA" = ( @@ -53542,8 +50103,8 @@ pixel_x = 0 }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/turret_protected/aisat) "bTB" = ( @@ -53600,9 +50161,8 @@ }, /area/turret_protected/aisat) "bTF" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /obj/structure/cable{ d1 = 4; @@ -53622,8 +50182,8 @@ pixel_x = 0 }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/turret_protected/aisat) "bTH" = ( @@ -53639,8 +50199,8 @@ req_access_txt = "75" }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/turret_protected/aisat) "bTI" = ( @@ -53652,8 +50212,8 @@ pixel_x = 0 }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/turret_protected/aisat) "bTJ" = ( @@ -53679,14 +50239,13 @@ pixel_x = 0 }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/turret_protected/aisat) "bTL" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /obj/structure/cable{ d1 = 4; @@ -53711,8 +50270,8 @@ req_access_txt = "17;75" }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/turret_protected/aisat) "bTN" = ( @@ -53723,8 +50282,8 @@ pixel_x = 0 }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/construction/hallway) "bTO" = ( @@ -53779,8 +50338,8 @@ }, /obj/machinery/hologram/holopad, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/construction/hallway) "bTS" = ( @@ -53801,9 +50360,8 @@ icon_state = "2-8"; tag = "" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -53947,13 +50505,13 @@ pixel_y = 0 }, /obj/machinery/light/small{ - tag = "icon-bulb1 (EAST)"; + dir = 4; icon_state = "bulb1"; - dir = 4 + tag = "icon-bulb1 (EAST)" }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/engine/break_room) "bUg" = ( @@ -53968,14 +50526,14 @@ /area/crew_quarters/chief) "bUh" = ( /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 4 + dir = 4; + icon_state = "neutralcorner" }, /area/crew_quarters/chief) "bUi" = ( /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 1 + dir = 1; + icon_state = "neutral" }, /area/crew_quarters/chief) "bUj" = ( @@ -53986,8 +50544,8 @@ tag = "" }, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 1 + dir = 1; + icon_state = "neutral" }, /area/crew_quarters/chief) "bUk" = ( @@ -54071,9 +50629,8 @@ tag = "" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -54094,8 +50651,8 @@ "bUu" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/structure/cable{ d1 = 1; @@ -54129,9 +50686,7 @@ icon_state = "2-4"; tag = "" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - on = 1 - }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "red" @@ -54259,9 +50814,7 @@ }, /area/hallway/primary/port) "bUG" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - on = 1 - }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -54332,8 +50885,8 @@ icon_state = "tube1" }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/hallway/primary/central) "bUN" = ( @@ -54674,9 +51227,8 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -54784,8 +51336,8 @@ level = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/engine/break_room) "bVu" = ( @@ -54831,14 +51383,14 @@ /area/security/brig) "bVw" = ( /obj/structure/disposalpipe/junction{ - tag = "icon-pipe-j2"; + dir = 2; icon_state = "pipe-j2"; - dir = 2 + tag = "icon-pipe-j2" }, /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /turf/simulated/floor/plasteel{ - icon_state = "redcorner"; - dir = 4 + dir = 4; + icon_state = "redcorner" }, /area/security/brig) "bVx" = ( @@ -54933,8 +51485,8 @@ /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/hallway/primary/starboard) "bVE" = ( @@ -54978,8 +51530,8 @@ /obj/item/gun/energy/ionrifle, /obj/item/clothing/suit/armor/laserproof, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/security/armoury) "bVH" = ( @@ -55207,8 +51759,8 @@ dir = 4 }, /obj/structure/transit_tube{ - tag = "icon-N-SE"; - icon_state = "N-SE" + icon_state = "N-SE"; + tag = "icon-N-SE" }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -55219,15 +51771,15 @@ dir = 8 }, /obj/structure/transit_tube{ - tag = "icon-D-SW"; - icon_state = "D-SW" + icon_state = "D-SW"; + tag = "icon-D-SW" }, /turf/space, /area/space/nearstation) "bWa" = ( /obj/structure/transit_tube{ - tag = "icon-D-SE"; - icon_state = "D-SE" + icon_state = "D-SE"; + tag = "icon-D-SE" }, /turf/space, /area/space/nearstation) @@ -55240,16 +51792,16 @@ /area/space/nearstation) "bWc" = ( /obj/structure/transit_tube{ - tag = "icon-D-NW"; - icon_state = "D-NW" + icon_state = "D-NW"; + tag = "icon-D-NW" }, /turf/space, /area/space/nearstation) "bWd" = ( /obj/structure/lattice, /obj/structure/transit_tube{ - tag = "icon-D-NE"; - icon_state = "D-NE" + icon_state = "D-NE"; + tag = "icon-D-NE" }, /turf/space, /area/space/nearstation) @@ -55281,8 +51833,8 @@ dir = 8 }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/engine/break_room) "bWg" = ( @@ -55308,8 +51860,8 @@ network = list("SS13","Security") }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 5 + dir = 5; + icon_state = "red" }, /area/security/warden) "bWi" = ( @@ -55320,8 +51872,8 @@ }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/engine/break_room) "bWj" = ( @@ -55388,8 +51940,8 @@ "bWo" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/machinery/door/poddoor/shutters{ density = 0; @@ -55840,8 +52392,8 @@ level = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/hallway/primary/central) "bXb" = ( @@ -55882,8 +52434,8 @@ level = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/hallway/primary/starboard) "bXd" = ( @@ -55895,8 +52447,8 @@ level = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/hallway/primary/starboard) "bXe" = ( @@ -55905,8 +52457,8 @@ }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/hallway/primary/starboard) "bXf" = ( @@ -55920,8 +52472,8 @@ }, /obj/machinery/light, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/hallway/primary/starboard) "bXg" = ( @@ -55956,8 +52508,8 @@ level = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/hallway/primary/starboard) "bXi" = ( @@ -55970,15 +52522,15 @@ }, /obj/machinery/light, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/hallway/primary/starboard) "bXj" = ( /obj/structure/disposalpipe/junction{ - tag = "icon-pipe-j2 (EAST)"; + dir = 4; icon_state = "pipe-j2"; - dir = 4 + tag = "icon-pipe-j2 (EAST)" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4; @@ -55991,8 +52543,8 @@ }, /obj/structure/cable, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/hallway/primary/starboard) "bXk" = ( @@ -56225,8 +52777,8 @@ /obj/effect/decal/warning_stripes/yellow, /obj/machinery/door/airlock/public/glass, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 4 + dir = 4; + icon_state = "neutralcorner" }, /area/hallway/primary/starboard) "bXD" = ( @@ -56240,8 +52792,8 @@ c_tag = "Primary Security Hallway" }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 4 + dir = 4; + icon_state = "neutralcorner" }, /area/hallway/primary/starboard) "bXE" = ( @@ -56314,8 +52866,8 @@ icon_state = "1-2" }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/turret_protected/aisat) "bXK" = ( @@ -56340,8 +52892,8 @@ pixel_x = 24 }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/turret_protected/aisat) "bXM" = ( @@ -56352,8 +52904,8 @@ /obj/item/paper_bin, /obj/item/pen, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/turret_protected/aisat) "bXN" = ( @@ -56362,8 +52914,8 @@ /obj/item/clipboard, /obj/item/toy/figure/borg, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/turret_protected/aisat) "bXO" = ( @@ -56375,8 +52927,8 @@ /obj/item/folder/yellow, /obj/item/aicard, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/turret_protected/aisat) "bXP" = ( @@ -56386,8 +52938,8 @@ pixel_y = 0 }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/turret_protected/aisat) "bXQ" = ( @@ -56397,32 +52949,32 @@ layer = 2.9 }, /obj/structure/transit_tube{ - tag = "icon-D-NE"; - icon_state = "D-NE" + icon_state = "D-NE"; + tag = "icon-D-NE" }, /turf/space, /area/space/nearstation) "bXR" = ( /obj/structure/lattice, /obj/structure/transit_tube{ - tag = "icon-E-NW"; - icon_state = "E-NW" + icon_state = "E-NW"; + tag = "icon-E-NW" }, /turf/space, /area/space/nearstation) "bXS" = ( /obj/structure/lattice, /obj/structure/transit_tube{ - tag = "icon-W-NE"; - icon_state = "W-NE" + icon_state = "W-NE"; + tag = "icon-W-NE" }, /turf/space, /area/space/nearstation) "bXT" = ( /obj/structure/lattice, /obj/structure/transit_tube{ - tag = "icon-D-NW"; - icon_state = "D-NW" + icon_state = "D-NW"; + tag = "icon-D-NW" }, /turf/space, /area/space/nearstation) @@ -56611,8 +53163,8 @@ "bYp" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/machinery/door/poddoor{ density = 0; @@ -57027,8 +53579,8 @@ /obj/item/flashlight/seclite, /obj/item/flashlight/seclite, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/security/armoury) "bZh" = ( @@ -57048,8 +53600,8 @@ req_access_txt = "61" }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/turret_protected/aisat) "bZi" = ( @@ -57460,9 +54012,8 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -57486,8 +54037,8 @@ "bZX" = ( /obj/machinery/computer/secure_data, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /turf/simulated/floor/plasteel{ dir = 5; @@ -57712,8 +54263,8 @@ pixel_y = 0 }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/hallway/primary/central) "cav" = ( @@ -57756,8 +54307,8 @@ network = list("SS13") }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/hallway/primary/starboard) "caA" = ( @@ -57814,8 +54365,8 @@ /area/crew_quarters/courtroom) "caF" = ( /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 5 + dir = 5; + icon_state = "neutral" }, /area/crew_quarters/courtroom) "caG" = ( @@ -58028,8 +54579,8 @@ icon_state = "1-2" }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/tcommsat/chamber) "caY" = ( @@ -58199,9 +54750,8 @@ }, /area/engine/engineering) "cbm" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "yellowfull" @@ -58294,8 +54844,8 @@ icon_state = "0-2" }, /obj/machinery/power/terminal{ - icon_state = "term"; - dir = 1 + dir = 1; + icon_state = "term" }, /obj/effect/decal/warning_stripes/northwest, /turf/simulated/floor/plasteel, @@ -58309,8 +54859,8 @@ icon_state = "0-2" }, /obj/machinery/power/terminal{ - icon_state = "term"; - dir = 1 + dir = 1; + icon_state = "term" }, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel, @@ -58328,8 +54878,8 @@ icon_state = "0-2" }, /obj/machinery/power/terminal{ - icon_state = "term"; - dir = 1 + dir = 1; + icon_state = "term" }, /obj/effect/decal/warning_stripes/northeast, /turf/simulated/floor/plasteel, @@ -58392,8 +54942,8 @@ pixel_y = 8 }, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 4 + dir = 4; + icon_state = "neutral" }, /area/maintenance/fpmaint2) "cbF" = ( @@ -58628,9 +55178,7 @@ /obj/machinery/newscaster{ pixel_x = -32 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - on = 1 - }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "barber" @@ -58735,9 +55283,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - on = 1 - }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ icon_state = "wood" }, @@ -58840,15 +55386,15 @@ "ccr" = ( /obj/structure/chair, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 9 + dir = 9; + icon_state = "red" }, /area/crew_quarters/courtroom) "ccs" = ( /obj/structure/chair, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 5 + dir = 5; + icon_state = "red" }, /area/crew_quarters/courtroom) "cct" = ( @@ -58913,8 +55459,8 @@ level = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 4 + dir = 4; + icon_state = "neutral" }, /area/crew_quarters/courtroom) "ccx" = ( @@ -59021,8 +55567,8 @@ network = list("SS13","Mining Outpost") }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 9 + dir = 9; + icon_state = "red" }, /area/security/brig) "ccE" = ( @@ -59049,8 +55595,8 @@ }, /obj/machinery/computer/secure_data, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 5 + dir = 5; + icon_state = "red" }, /area/security/brig) "ccG" = ( @@ -59130,8 +55676,8 @@ level = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 9 + dir = 9; + icon_state = "red" }, /area/security/brig) "ccM" = ( @@ -59207,8 +55753,8 @@ "ccR" = ( /obj/structure/closet/secure_closet/security, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 5 + dir = 5; + icon_state = "red" }, /area/security/brig) "ccS" = ( @@ -59270,8 +55816,8 @@ /area/engine/engineering) "cde" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/machinery/status_display{ pixel_x = -32 @@ -59421,9 +55967,8 @@ /turf/simulated/floor/plasteel, /area/engine/engineering) "cdq" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /obj/structure/cable/yellow{ d1 = 1; @@ -59486,17 +56031,16 @@ "cdx" = ( /obj/item/twohanded/required/kirbyplants, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /turf/simulated/floor/plasteel{ icon_state = "wood" }, /area/library) "cdy" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "wood" @@ -59552,9 +56096,8 @@ tag = "" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -59610,12 +56153,10 @@ /turf/simulated/floor/carpet, /area/ntrep) "cdL" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - on = 1 - }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/machinery/light{ - icon_state = "tube1"; - dir = 4 + dir = 4; + icon_state = "tube1" }, /turf/simulated/floor/plasteel{ icon_state = "wood" @@ -59664,12 +56205,10 @@ }, /area/civilian/barber) "cdP" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - on = 1 - }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /turf/simulated/floor/plasteel{ icon_state = "wood" @@ -59858,8 +56397,8 @@ /obj/item/folder/red, /obj/item/pen, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 9 + dir = 9; + icon_state = "neutral" }, /area/crew_quarters/courtroom) "ceg" = ( @@ -60178,9 +56717,8 @@ d2 = 4; icon_state = "1-4" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /obj/effect/landmark/start{ name = "Security Officer" @@ -60255,9 +56793,8 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/bluegrid, /area/tcommsat/chamber) @@ -60487,8 +57024,8 @@ /area/maintenance/fpmaint2) "cfm" = ( /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 4 + dir = 4; + icon_state = "neutral" }, /area/maintenance/fpmaint2) "cfn" = ( @@ -60514,8 +57051,8 @@ }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 4 + dir = 4; + icon_state = "neutral" }, /area/maintenance/fpmaint2) "cfq" = ( @@ -60670,8 +57207,8 @@ /area/crew_quarters/heads/hop) "cfF" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /turf/simulated/floor/plasteel{ icon_state = "wood" @@ -60692,8 +57229,8 @@ /area/ntrep) "cfI" = ( /obj/structure/cable{ - icon_state = "0-2"; - d2 = 2 + d2 = 2; + icon_state = "0-2" }, /obj/machinery/power/apc{ cell_type = 25000; @@ -60740,8 +57277,8 @@ /area/civilian/barber) "cfM" = ( /obj/structure/cable{ - icon_state = "0-2"; - d2 = 2 + d2 = 2; + icon_state = "0-2" }, /obj/machinery/power/apc{ dir = 8; @@ -60777,8 +57314,8 @@ /area/blueshield) "cfP" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 4 + dir = 4; + icon_state = "tube1" }, /turf/simulated/floor/plasteel{ icon_state = "wood" @@ -60813,8 +57350,8 @@ pixel_x = 24 }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/hallway/primary/central) "cfT" = ( @@ -60895,9 +57432,8 @@ /area/crew_quarters/courtroom) "cga" = ( /obj/structure/cable, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /obj/structure/chair/office/dark{ dir = 4 @@ -60958,8 +57494,8 @@ network = list("SS13","Security") }, /turf/simulated/floor/plasteel{ - icon_state = "redcorner"; - dir = 4 + dir = 4; + icon_state = "redcorner" }, /area/security/brig) "cgf" = ( @@ -60970,9 +57506,9 @@ }, /obj/structure/table/reinforced, /obj/machinery/light/small{ - tag = "icon-bulb1 (WEST)"; + dir = 8; icon_state = "bulb1"; - dir = 8 + tag = "icon-bulb1 (WEST)" }, /obj/item/paper_bin, /obj/item/pen, @@ -61186,8 +57722,8 @@ pixel_y = -32 }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/engine/break_room) "cgE" = ( @@ -61201,12 +57737,12 @@ }, /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/arrow{ - icon_state = "4"; - dir = 8 + dir = 8; + icon_state = "4" }, /obj/effect/decal/warning_stripes/yellow/partial{ - icon_state = "3"; - dir = 8 + dir = 8; + icon_state = "3" }, /turf/simulated/floor/plasteel, /area/hallway/primary/central) @@ -61338,8 +57874,8 @@ tag = "" }, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 4 + dir = 4; + icon_state = "neutral" }, /area/maintenance/fpmaint2) "cgW" = ( @@ -61637,8 +58173,8 @@ level = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/hallway/primary/central) "chC" = ( @@ -61706,8 +58242,8 @@ pixel_y = 5 }, /turf/simulated/floor/plasteel{ - icon_state = "blue"; - dir = 8 + dir = 8; + icon_state = "blue" }, /area/crew_quarters/courtroom) "chJ" = ( @@ -61726,9 +58262,8 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /obj/machinery/camera{ c_tag = "Security Front Desk"; @@ -62045,7 +58580,7 @@ /obj/structure/rack, /obj/item/crowbar, /obj/item/wrench, -/obj/item/tank/emergency_oxygen/engi, +/obj/item/tank/internals/emergency_oxygen/engi, /turf/simulated/floor/plating, /area/maintenance/fpmaint2) "ciq" = ( @@ -62066,8 +58601,8 @@ "cis" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 4 + dir = 4; + icon_state = "neutral" }, /area/maintenance/fpmaint2) "cit" = ( @@ -62149,8 +58684,8 @@ /obj/effect/decal/warning_stripes/yellow, /obj/machinery/door/airlock/public/glass, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/hallway/primary/starboard) "ciB" = ( @@ -62441,8 +58976,8 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/hallway/primary/central) "ciX" = ( @@ -62460,8 +58995,8 @@ pixel_y = -28 }, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/machinery/computer/monitor{ name = "Grid Power Monitoring Computer" @@ -62609,12 +59144,12 @@ level = 1 }, /obj/structure/transit_tube{ - tag = "icon-D-NE"; - icon_state = "D-NE" + icon_state = "D-NE"; + tag = "icon-D-NE" }, /obj/structure/transit_tube{ - tag = "icon-D-SE"; - icon_state = "D-SE" + icon_state = "D-SE"; + tag = "icon-D-SE" }, /obj/structure/lattice/catwalk, /turf/space, @@ -62646,8 +59181,8 @@ "cjq" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - icon_state = "redcorner"; - dir = 4 + dir = 4; + icon_state = "redcorner" }, /area/maintenance/starboard) "cjr" = ( @@ -62655,9 +59190,9 @@ /area/security/range) "cjs" = ( /obj/machinery/light/small{ - tag = "icon-bulb1 (WEST)"; + dir = 8; icon_state = "bulb1"; - dir = 8 + tag = "icon-bulb1 (WEST)" }, /obj/structure/extinguisher_cabinet{ pixel_x = -28; @@ -62865,7 +59400,7 @@ /obj/structure/rack, /obj/item/crowbar, /obj/item/stack/cable_coil/yellow, -/obj/item/tank/emergency_oxygen/engi, +/obj/item/tank/internals/emergency_oxygen/engi, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, /area/engine/engineering) @@ -62882,8 +59417,8 @@ /obj/structure/rack, /obj/item/clothing/gloves/color/black, /obj/item/wrench, -/obj/item/clothing/glasses/meson, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/item/clothing/glasses/meson/engine, /turf/simulated/floor/plasteel, /area/engine/engineering) "cjT" = ( @@ -63106,8 +59641,8 @@ pixel_x = 26 }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/hallway/primary/central) "ckn" = ( @@ -63127,8 +59662,8 @@ /area/crew_quarters/heads/hop) "ckp" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/structure/extinguisher_cabinet{ pixel_x = -26 @@ -63361,14 +59896,13 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/hallway/primary/central) "ckK" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /obj/structure/chair{ dir = 4 @@ -63626,9 +60160,7 @@ dir = 4; level = 1 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - on = 1 - }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel, @@ -64202,9 +60734,9 @@ tag = "" }, /obj/structure/disposalpipe/junction{ - tag = "icon-pipe-j2 (EAST)"; + dir = 4; icon_state = "pipe-j2"; - dir = 4 + tag = "icon-pipe-j2 (EAST)" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4; @@ -64229,9 +60761,9 @@ tag = "" }, /obj/structure/disposalpipe/junction{ - tag = "icon-pipe-j2 (EAST)"; + dir = 4; icon_state = "pipe-j2"; - dir = 4 + tag = "icon-pipe-j2 (EAST)" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9; @@ -64271,8 +60803,8 @@ dir = 8 }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/hallway/primary/central) "cmf" = ( @@ -64320,9 +60852,8 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -64346,8 +60877,8 @@ /area/crew_quarters/courtroom) "cmm" = ( /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 4 + dir = 4; + icon_state = "neutral" }, /area/crew_quarters/courtroom) "cmn" = ( @@ -64439,8 +60970,8 @@ /area/turret_protected/aisat) "cmy" = ( /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/power/apc{ @@ -64497,9 +61028,8 @@ /turf/space, /area/engine/engineering) "cmD" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, @@ -64581,8 +61111,8 @@ "cmP" = ( /obj/structure/table/reinforced, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/item/storage/toolbox/mechanical, /obj/item/flashlight, @@ -64669,7 +61199,7 @@ /area/engine/engineering) "cmX" = ( /obj/structure/rack, -/obj/item/tank/oxygen, +/obj/item/tank/internals/oxygen, /obj/item/radio, /obj/machinery/firealarm{ dir = 1; @@ -64737,14 +61267,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 4 + dir = 4; + icon_state = "neutral" }, /area/maintenance/fpmaint2) "cnh" = ( /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/machinery/power/apc{ dir = 8; @@ -64985,9 +61515,8 @@ /turf/simulated/floor/plasteel, /area/teleporter) "cnD" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /obj/machinery/light, /obj/machinery/alarm{ @@ -65026,8 +61555,8 @@ level = 1 }, /obj/structure/transit_tube{ - tag = "icon-E-SW-NW"; - icon_state = "E-SW-NW" + icon_state = "E-SW-NW"; + tag = "icon-E-SW-NW" }, /obj/structure/lattice/catwalk, /turf/space, @@ -65292,8 +61821,8 @@ icon_state = "0-2" }, /obj/machinery/power/terminal{ - icon_state = "term"; - dir = 1 + dir = 1; + icon_state = "term" }, /obj/effect/decal/warning_stripes/northeast, /turf/simulated/floor/plasteel, @@ -65375,8 +61904,8 @@ "cow" = ( /obj/structure/bookcase, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /turf/simulated/floor/plasteel{ icon_state = "wood" @@ -65527,8 +62056,8 @@ "coK" = ( /obj/machinery/vending/cigarette, /obj/machinery/light{ - icon_state = "tube1"; - dir = 4 + dir = 4; + icon_state = "tube1" }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -65622,8 +62151,8 @@ name = "3maintenance loot spawner" }, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 9 + dir = 9; + icon_state = "neutral" }, /area/maintenance/starboard) "coV" = ( @@ -65644,8 +62173,8 @@ /obj/machinery/disposal, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/crew_quarters/locker) "coX" = ( @@ -65877,9 +62406,8 @@ }, /area/engine/engineering) "cpv" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /obj/structure/cable/yellow{ d1 = 1; @@ -65917,9 +62445,8 @@ }, /area/engine/engine_smes) "cpA" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -65998,8 +62525,8 @@ level = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 4 + dir = 4; + icon_state = "neutral" }, /area/maintenance/fpmaint2) "cpH" = ( @@ -66032,11 +62559,8 @@ }, /area/library) "cpK" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "wood" @@ -66150,8 +62674,8 @@ pixel_y = 24 }, /obj/structure/cable{ - icon_state = "0-2"; - d2 = 2 + d2 = 2; + icon_state = "0-2" }, /turf/simulated/floor/plasteel{ dir = 1; @@ -66269,8 +62793,8 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 4 + dir = 4; + icon_state = "neutralcorner" }, /area/bridge/meeting_room) "cqd" = ( @@ -66279,13 +62803,13 @@ level = 1 }, /obj/structure/disposalpipe/junction{ - tag = "icon-pipe-j2 (EAST)"; + dir = 4; icon_state = "pipe-j2"; - dir = 4 + tag = "icon-pipe-j2 (EAST)" }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 4 + dir = 4; + icon_state = "neutralcorner" }, /area/bridge/meeting_room) "cqe" = ( @@ -66300,8 +62824,8 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 4 + dir = 4; + icon_state = "neutralcorner" }, /area/bridge/meeting_room) "cqf" = ( @@ -66319,8 +62843,8 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 4 + dir = 4; + icon_state = "neutralcorner" }, /area/bridge/meeting_room) "cqg" = ( @@ -66338,8 +62862,8 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 4 + dir = 4; + icon_state = "neutralcorner" }, /area/bridge/meeting_room) "cqh" = ( @@ -66348,8 +62872,8 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 4 + dir = 4; + icon_state = "neutralcorner" }, /area/bridge/meeting_room) "cqi" = ( @@ -66366,8 +62890,8 @@ }, /obj/effect/decal/warning_stripes/northeastcorner, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 4 + dir = 4; + icon_state = "neutralcorner" }, /area/bridge/meeting_room) "cqk" = ( @@ -66375,16 +62899,14 @@ dir = 4; level = 1 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - on = 1 - }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 4 + dir = 4; + icon_state = "neutralcorner" }, /area/bridge/meeting_room) "cql" = ( @@ -66398,8 +62920,8 @@ }, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 4 + dir = 4; + icon_state = "neutralcorner" }, /area/bridge/meeting_room) "cqm" = ( @@ -66408,8 +62930,8 @@ /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/hallway/primary/central) "cqn" = ( @@ -66457,8 +62979,8 @@ tag = "icon-pipe-j2" }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/hallway/primary/central) "cqq" = ( @@ -66530,14 +63052,14 @@ pixel_y = 0 }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 1 + dir = 1; + icon_state = "neutralcorner" }, /area/crew_quarters/locker) "cqw" = ( /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 1 + dir = 1; + icon_state = "neutralcorner" }, /area/crew_quarters/locker) "cqx" = ( @@ -66565,8 +63087,8 @@ level = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 4 + dir = 4; + icon_state = "neutralcorner" }, /area/crew_quarters/locker) "cqz" = ( @@ -66575,8 +63097,8 @@ level = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 4 + dir = 4; + icon_state = "neutralcorner" }, /area/crew_quarters/locker) "cqA" = ( @@ -66586,8 +63108,8 @@ level = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 4 + dir = 4; + icon_state = "neutralcorner" }, /area/crew_quarters/locker) "cqB" = ( @@ -66598,8 +63120,8 @@ pixel_x = 32 }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 4 + dir = 4; + icon_state = "neutralcorner" }, /area/crew_quarters/locker) "cqC" = ( @@ -66698,17 +63220,16 @@ "cqL" = ( /obj/structure/chair, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/construction/hallway) "cqM" = ( /obj/structure/window/reinforced{ dir = 4 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -66852,8 +63373,8 @@ }, /obj/effect/decal/warning_stripes/northwestcorner, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 4 + dir = 4; + icon_state = "neutralcorner" }, /area/bridge/meeting_room) "crf" = ( @@ -66890,8 +63411,8 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 4 + dir = 4; + icon_state = "neutral" }, /area/maintenance/fpmaint2) "crk" = ( @@ -66992,8 +63513,8 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/hallway/primary/central) "crs" = ( @@ -67322,8 +63843,8 @@ pixel_y = -32 }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/bridge/meeting_room) "crJ" = ( @@ -67338,8 +63859,8 @@ }, /obj/machinery/light/small, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/bridge/meeting_room) "crK" = ( @@ -67364,8 +63885,8 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/bridge/meeting_room) "crL" = ( @@ -67379,8 +63900,8 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/bridge/meeting_room) "crM" = ( @@ -67396,8 +63917,8 @@ level = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/bridge/meeting_room) "crN" = ( @@ -67418,8 +63939,8 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/bridge/meeting_room) "crO" = ( @@ -67437,8 +63958,8 @@ network = list("SS13") }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/bridge/meeting_room) "crP" = ( @@ -67450,8 +63971,8 @@ }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/bridge/meeting_room) "crQ" = ( @@ -67465,8 +63986,8 @@ }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 4 + dir = 4; + icon_state = "neutralcorner" }, /area/bridge/meeting_room) "crR" = ( @@ -67516,8 +64037,8 @@ level = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/hallway/primary/central) "crU" = ( @@ -67575,8 +64096,8 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 4 + dir = 4; + icon_state = "neutral" }, /area/crew_quarters/locker) "csb" = ( @@ -67675,8 +64196,8 @@ /area/construction/hallway) "csm" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 4 + dir = 4; + icon_state = "tube1" }, /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plating, @@ -67777,8 +64298,8 @@ level = 1 }, /obj/structure/transit_tube{ - tag = "icon-W-SE"; - icon_state = "W-SE" + icon_state = "W-SE"; + tag = "icon-W-SE" }, /obj/structure/lattice/catwalk, /turf/space, @@ -67794,7 +64315,7 @@ /obj/structure/rack, /obj/item/crowbar/red, /obj/item/wrench, -/obj/item/tank/emergency_oxygen/engi, +/obj/item/tank/internals/emergency_oxygen/engi, /obj/item/stack/sheet/mineral/plasma{ amount = 5 }, @@ -67951,9 +64472,8 @@ }, /area/bridge/meeting_room) "csQ" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -68006,8 +64526,8 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/bridge/meeting_room) "csV" = ( @@ -68030,8 +64550,8 @@ /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/bridge/meeting_room) "csY" = ( @@ -68070,8 +64590,8 @@ level = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 4 + dir = 4; + icon_state = "neutralcorner" }, /area/hallway/primary/central) "ctc" = ( @@ -68092,8 +64612,8 @@ level = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 4 + dir = 4; + icon_state = "neutralcorner" }, /area/hallway/primary/central) "cte" = ( @@ -68102,8 +64622,8 @@ }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 4 + dir = 4; + icon_state = "neutralcorner" }, /area/hallway/primary/central) "ctf" = ( @@ -68305,22 +64825,22 @@ "ctw" = ( /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 1 + dir = 1; + icon_state = "neutralcorner" }, /area/crew_quarters/fitness) "ctx" = ( /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 1 + dir = 1; + icon_state = "neutralcorner" }, /area/crew_quarters/fitness) "cty" = ( /obj/structure/table, /obj/item/stack/sheet/cloth/ten, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 1 + dir = 1; + icon_state = "neutralcorner" }, /area/crew_quarters/fitness) "ctz" = ( @@ -68351,8 +64871,8 @@ /area/crew_quarters/fitness) "ctB" = ( /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 4 + dir = 4; + icon_state = "neutralcorner" }, /area/crew_quarters/fitness) "ctC" = ( @@ -68364,8 +64884,8 @@ "ctD" = ( /obj/structure/closet/masks, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 4 + dir = 4; + icon_state = "neutral" }, /area/crew_quarters/fitness) "ctE" = ( @@ -68379,12 +64899,12 @@ }, /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/arrow{ - icon_state = "4"; - dir = 4 + dir = 4; + icon_state = "4" }, /obj/effect/decal/warning_stripes/yellow/partial{ - icon_state = "3"; - dir = 4 + dir = 4; + icon_state = "3" }, /turf/simulated/floor/plasteel, /area/hallway/primary/central) @@ -68394,7 +64914,7 @@ pixel_x = -28; pixel_y = 0 }, -/obj/item/tank/plasma, +/obj/item/tank/internals/plasma, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ dir = 5; @@ -68421,8 +64941,8 @@ level = 1 }, /obj/structure/transit_tube{ - tag = "icon-D-SW"; - icon_state = "D-SW" + icon_state = "D-SW"; + tag = "icon-D-SW" }, /obj/structure/window/reinforced{ dir = 4 @@ -68432,8 +64952,8 @@ /area/space/nearstation) "ctJ" = ( /obj/structure/transit_tube{ - tag = "icon-E-NW"; - icon_state = "E-NW" + icon_state = "E-NW"; + tag = "icon-E-NW" }, /obj/structure/window/reinforced{ dir = 4 @@ -68490,8 +65010,8 @@ "ctQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/light{ - icon_state = "tube1"; - dir = 4 + dir = 4; + icon_state = "tube1" }, /obj/machinery/alarm{ dir = 8; @@ -68499,8 +65019,8 @@ pixel_x = 24 }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 4 + dir = 4; + icon_state = "neutralcorner" }, /area/hallway/primary/central) "ctR" = ( @@ -68548,8 +65068,8 @@ network = list("SS13") }, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 4 + dir = 4; + icon_state = "neutral" }, /area/crew_quarters/courtroom) "ctW" = ( @@ -68593,8 +65113,8 @@ "ctZ" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/structure/cable{ d1 = 2; @@ -68709,8 +65229,8 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/bridge/meeting_room) "cuh" = ( @@ -68807,9 +65327,7 @@ }, /area/hallway/primary/central) "cur" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - on = 1 - }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -68925,8 +65443,8 @@ }, /obj/structure/closet/wardrobe/black, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/crew_quarters/locker) "cuE" = ( @@ -69027,8 +65545,8 @@ level = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 1 + dir = 1; + icon_state = "neutralcorner" }, /area/crew_quarters/fitness) "cuL" = ( @@ -69063,8 +65581,8 @@ }, /obj/structure/closet/athletic_mixed, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 4 + dir = 4; + icon_state = "neutral" }, /area/crew_quarters/fitness) "cuO" = ( @@ -69146,8 +65664,8 @@ "cuW" = ( /obj/structure/table/reinforced, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/item/storage/toolbox/electrical, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -69239,8 +65757,8 @@ dir = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 4 + dir = 4; + icon_state = "neutral" }, /area/maintenance/fpmaint2) "cvf" = ( @@ -69325,9 +65843,8 @@ }, /area/library) "cvm" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -69354,9 +65871,7 @@ /obj/effect/landmark{ name = "revenantspawn" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - on = 1 - }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -69524,22 +66039,22 @@ /area/bridge/meeting_room) "cvG" = ( /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/bridge/meeting_room) "cvH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/bridge/meeting_room) "cvI" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /turf/simulated/floor/plating, /area/gateway) @@ -69653,8 +66168,8 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/light, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/hallway/primary/central) "cvU" = ( @@ -69663,8 +66178,8 @@ }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/hallway/primary/central) "cvV" = ( @@ -69803,8 +66318,8 @@ pixel_x = 32 }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/crew_quarters/locker) "cwg" = ( @@ -69860,8 +66375,8 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 1 + dir = 1; + icon_state = "neutralcorner" }, /area/crew_quarters/fitness) "cwn" = ( @@ -69919,15 +66434,15 @@ level = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 4 + dir = 4; + icon_state = "neutralcorner" }, /area/crew_quarters/fitness) "cws" = ( /obj/structure/closet/boxinggloves, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 4 + dir = 4; + icon_state = "neutral" }, /area/crew_quarters/fitness) "cwt" = ( @@ -69981,9 +66496,7 @@ }, /area/engine/engine_smes) "cwA" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - on = 1 - }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "yellow" @@ -70028,8 +66541,8 @@ }, /obj/machinery/disposal, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/machinery/camera{ c_tag = "Library Backroom"; @@ -70108,8 +66621,8 @@ "cwL" = ( /obj/machinery/photocopier, /obj/machinery/light{ - icon_state = "tube1"; - dir = 4 + dir = 4; + icon_state = "tube1" }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -70168,8 +66681,8 @@ pixel_x = 24 }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 4 + dir = 4; + icon_state = "neutralcorner" }, /area/hallway/primary/central) "cwR" = ( @@ -70351,9 +66864,8 @@ d2 = 4; icon_state = "1-4" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -70462,9 +66974,8 @@ }, /area/crew_quarters/locker) "cxq" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -70516,8 +67027,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/closet/wardrobe/green, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/crew_quarters/locker) "cxx" = ( @@ -70574,8 +67085,8 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 4 + dir = 4; + icon_state = "neutral" }, /area/crew_quarters/fitness) "cxC" = ( @@ -70590,8 +67101,8 @@ "cxD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 4 + dir = 4; + icon_state = "neutralcorner" }, /area/crew_quarters/fitness) "cxE" = ( @@ -70613,8 +67124,8 @@ /obj/structure/rack, /obj/item/clothing/gloves/color/black, /obj/item/wrench, -/obj/item/clothing/glasses/meson, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/item/clothing/glasses/meson/engine, /turf/simulated/floor/plasteel, /area/engine/engine_smes) "cxI" = ( @@ -70910,8 +67421,8 @@ pixel_y = 32 }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 10 + dir = 10; + icon_state = "vault" }, /area/assembly/showroom) "cyo" = ( @@ -71050,14 +67561,14 @@ pixel_x = 26 }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/hallway/primary/central) "cyB" = ( /obj/machinery/shower{ - icon_state = "shower"; - dir = 4 + dir = 4; + icon_state = "shower" }, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" @@ -71325,8 +67836,8 @@ }, /obj/structure/closet/wardrobe/pink, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/crew_quarters/locker) "cyT" = ( @@ -71470,13 +67981,12 @@ }, /area/crew_quarters/fitness) "czf" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 4 + dir = 4; + icon_state = "neutral" }, /area/crew_quarters/fitness) "czg" = ( @@ -71496,8 +68006,8 @@ icon_state = "tube1" }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 4 + dir = 4; + icon_state = "neutralcorner" }, /area/crew_quarters/fitness) "czi" = ( @@ -71665,8 +68175,8 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 4 + dir = 4; + icon_state = "neutralcorner" }, /area/maintenance/fpmaint2) "czy" = ( @@ -71779,8 +68289,8 @@ tag = "" }, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/structure/cable{ d1 = 1; @@ -71804,9 +68314,8 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "wood" @@ -72002,11 +68511,11 @@ /obj/item/clothing/suit/storage/hazardvest, /obj/item/clothing/suit/storage/hazardvest, /obj/item/clothing/suit/storage/hazardvest, -/obj/item/tank/emergency_oxygen/double, -/obj/item/tank/emergency_oxygen/double, -/obj/item/tank/emergency_oxygen/double, -/obj/item/tank/emergency_oxygen/double, -/obj/item/tank/emergency_oxygen/double, +/obj/item/tank/internals/emergency_oxygen/double, +/obj/item/tank/internals/emergency_oxygen/double, +/obj/item/tank/internals/emergency_oxygen/double, +/obj/item/tank/internals/emergency_oxygen/double, +/obj/item/tank/internals/emergency_oxygen/double, /obj/item/clothing/mask/breath, /obj/item/clothing/mask/breath, /obj/item/clothing/mask/breath, @@ -72122,9 +68631,7 @@ /turf/simulated/floor/plasteel, /area/crew_quarters/locker/locker_toilet) "cAi" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - on = 1 - }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel, /area/crew_quarters/locker/locker_toilet) "cAj" = ( @@ -72165,8 +68672,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/closet/wardrobe/mixed, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/crew_quarters/locker) "cAn" = ( @@ -72217,8 +68724,8 @@ /obj/item/paper_bin, /obj/item/pen, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 1 + dir = 1; + icon_state = "neutralcorner" }, /area/crew_quarters/fitness) "cAu" = ( @@ -72232,8 +68739,8 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 4 + dir = 4; + icon_state = "neutralcorner" }, /area/crew_quarters/fitness) "cAw" = ( @@ -72292,8 +68799,8 @@ /area/engine/engineering) "cAD" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/machinery/status_display{ pixel_x = -32 @@ -72599,8 +69106,8 @@ name = "2maintenance loot spawner" }, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 4 + dir = 4; + icon_state = "neutral" }, /area/maintenance/fpmaint2) "cBe" = ( @@ -72653,8 +69160,8 @@ /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 4 + dir = 4; + icon_state = "neutralcorner" }, /area/hallway/primary/central) "cBi" = ( @@ -72903,9 +69410,8 @@ /turf/simulated/floor/plasteel, /area/gateway) "cBE" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/plating, /area/crew_quarters/locker/locker_toilet) @@ -72924,9 +69430,8 @@ /turf/simulated/wall, /area/crew_quarters/locker/locker_toilet) "cBH" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel, @@ -73053,8 +69558,8 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/crew_quarters/locker) "cBS" = ( @@ -73070,8 +69575,8 @@ level = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/crew_quarters/locker) "cBT" = ( @@ -73080,8 +69585,8 @@ icon_state = "pipe-c" }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/crew_quarters/locker) "cBU" = ( @@ -73135,8 +69640,8 @@ /obj/structure/table, /obj/item/folder, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 1 + dir = 1; + icon_state = "neutralcorner" }, /area/crew_quarters/fitness) "cCa" = ( @@ -73286,9 +69791,7 @@ }, /area/engine/engineering) "cCn" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - on = 1 - }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ icon_state = "yellowfull" }, @@ -73443,9 +69946,8 @@ /turf/simulated/floor/plasteel, /area/ai_monitored/storage/eva) "cCE" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel, @@ -73593,8 +70095,8 @@ level = 1 }, /obj/structure/sink{ - icon_state = "sink"; dir = 8; + icon_state = "sink"; pixel_x = -12; pixel_y = 2 }, @@ -74101,8 +70603,8 @@ }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 4 + dir = 4; + icon_state = "neutral" }, /area/maintenance/fpmaint2) "cEb" = ( @@ -74141,8 +70643,8 @@ "cEg" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /turf/simulated/floor/plating, /area/assembly/showroom) @@ -74172,8 +70674,8 @@ "cEj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/sink{ - icon_state = "sink"; dir = 8; + icon_state = "sink"; pixel_x = -12; pixel_y = 2 }, @@ -74367,13 +70869,13 @@ dir = 6 }, /obj/machinery/light/small{ - tag = "icon-bulb1 (EAST)"; + dir = 4; icon_state = "bulb1"; - dir = 4 + tag = "icon-bulb1 (EAST)" }, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 4 + dir = 4; + icon_state = "neutral" }, /area/maintenance/fpmaint2) "cEJ" = ( @@ -74405,8 +70907,8 @@ "cEL" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 4 + dir = 4; + icon_state = "neutralcorner" }, /area/hallway/primary/central) "cEM" = ( @@ -74420,8 +70922,8 @@ pixel_y = 28 }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 4 + dir = 4; + icon_state = "neutralcorner" }, /area/hallway/primary/central) "cEN" = ( @@ -74481,8 +70983,8 @@ in_use = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 4 + dir = 4; + icon_state = "neutralcorner" }, /area/hallway/primary/central) "cET" = ( @@ -74494,8 +70996,8 @@ pixel_y = 24 }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 4 + dir = 4; + icon_state = "neutralcorner" }, /area/hallway/primary/central) "cEU" = ( @@ -74508,8 +71010,8 @@ pixel_y = 30 }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 4 + dir = 4; + icon_state = "neutralcorner" }, /area/hallway/primary/central) "cEV" = ( @@ -74525,8 +71027,8 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 4 + dir = 4; + icon_state = "neutralcorner" }, /area/hallway/primary/central) "cEW" = ( @@ -74608,8 +71110,8 @@ dir = 8 }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/hallway/primary/central) "cFd" = ( @@ -74666,8 +71168,8 @@ pixel_y = -22 }, /turf/simulated/floor/plasteel{ - icon_state = "arrival"; - dir = 8 + dir = 8; + icon_state = "arrival" }, /area/crew_quarters/sleep) "cFm" = ( @@ -74678,8 +71180,8 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 1 + dir = 1; + icon_state = "neutralcorner" }, /area/crew_quarters/sleep) "cFn" = ( @@ -74707,8 +71209,8 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 4 + dir = 4; + icon_state = "neutralcorner" }, /area/crew_quarters/sleep) "cFp" = ( @@ -74719,8 +71221,8 @@ /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 4 + dir = 4; + icon_state = "neutralcorner" }, /area/hallway/primary/central) "cFq" = ( @@ -74735,8 +71237,8 @@ level = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 1 + dir = 1; + icon_state = "neutralcorner" }, /area/crew_quarters/sleep) "cFr" = ( @@ -74757,8 +71259,8 @@ level = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 1 + dir = 1; + icon_state = "neutralcorner" }, /area/crew_quarters/sleep) "cFs" = ( @@ -74789,8 +71291,8 @@ level = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 4 + dir = 4; + icon_state = "neutralcorner" }, /area/crew_quarters/sleep) "cFu" = ( @@ -74808,8 +71310,8 @@ c_tag = "Dorm Hallway Starboard" }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 4 + dir = 4; + icon_state = "neutralcorner" }, /area/crew_quarters/sleep) "cFv" = ( @@ -74824,8 +71326,8 @@ level = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 4 + dir = 4; + icon_state = "neutralcorner" }, /area/crew_quarters/sleep) "cFw" = ( @@ -74856,8 +71358,8 @@ level = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 1 + dir = 1; + icon_state = "neutralcorner" }, /area/crew_quarters/fitness) "cFy" = ( @@ -74928,8 +71430,8 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 4 + dir = 4; + icon_state = "neutralcorner" }, /area/crew_quarters/fitness) "cFE" = ( @@ -75356,8 +71858,8 @@ level = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 4 + dir = 4; + icon_state = "neutral" }, /area/maintenance/fpmaint2) "cGk" = ( @@ -75613,9 +72115,8 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=hall6"; @@ -75651,9 +72152,7 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - on = 1 - }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=hall7"; location = "hall6" @@ -75709,9 +72208,8 @@ d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=hall10"; @@ -75740,8 +72238,8 @@ level = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/hallway/primary/central) "cGF" = ( @@ -75877,8 +72375,8 @@ dir = 8 }, /turf/simulated/floor/plasteel{ - icon_state = "arrival"; - dir = 8 + dir = 8; + icon_state = "arrival" }, /area/crew_quarters/sleep) "cGQ" = ( @@ -75901,8 +72399,8 @@ "cGS" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 4 + dir = 4; + icon_state = "neutral" }, /area/crew_quarters/sleep) "cGT" = ( @@ -75919,9 +72417,7 @@ }, /area/crew_quarters/sleep) "cGV" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - on = 1 - }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -75964,8 +72460,8 @@ }, /obj/effect/decal/warning_stripes/northeastcorner, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 4 + dir = 4; + icon_state = "neutralcorner" }, /area/hallway/primary/central) "cGZ" = ( @@ -75979,8 +72475,8 @@ "cHa" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 4 + dir = 4; + icon_state = "neutral" }, /area/crew_quarters/fitness) "cHb" = ( @@ -76178,8 +72674,8 @@ dir = 6 }, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 4 + dir = 4; + icon_state = "neutral" }, /area/maintenance/fpmaint2) "cHt" = ( @@ -76263,9 +72759,9 @@ /area/hallway/primary/central) "cHC" = ( /obj/structure/disposalpipe/junction{ - tag = "icon-pipe-j1 (EAST)"; + dir = 4; icon_state = "pipe-j1"; - dir = 4 + tag = "icon-pipe-j1 (EAST)" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -76283,8 +72779,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 4 + dir = 4; + icon_state = "neutralcorner" }, /area/hallway/primary/central) "cHE" = ( @@ -76433,14 +72929,14 @@ /area/hallway/primary/central) "cHP" = ( /obj/structure/disposalpipe/junction{ - tag = "icon-pipe-j1 (EAST)"; + dir = 4; icon_state = "pipe-j1"; - dir = 4 + tag = "icon-pipe-j1 (EAST)" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/hallway/primary/central) "cHQ" = ( @@ -76452,8 +72948,8 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/hallway/primary/central) "cHR" = ( @@ -76549,8 +73045,8 @@ "cIb" = ( /obj/machinery/washing_machine, /turf/simulated/floor/plasteel{ - icon_state = "arrival"; - dir = 8 + dir = 8; + icon_state = "arrival" }, /area/crew_quarters/sleep) "cIc" = ( @@ -76581,8 +73077,8 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/crew_quarters/sleep) "cIf" = ( @@ -76592,8 +73088,8 @@ }, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 4 + dir = 4; + icon_state = "neutralcorner" }, /area/hallway/primary/central) "cIg" = ( @@ -76665,8 +73161,8 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/crew_quarters/sleep) "cIl" = ( @@ -76678,8 +73174,8 @@ }, /obj/machinery/light, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/crew_quarters/sleep) "cIm" = ( @@ -76737,9 +73233,8 @@ }, /area/crew_quarters/fitness) "cIq" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -76866,8 +73361,8 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 4 + dir = 4; + icon_state = "neutral" }, /area/maintenance/fpmaint2) "cIH" = ( @@ -76950,8 +73445,8 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 4 + dir = 4; + icon_state = "neutralcorner" }, /area/hallway/primary/central) "cIU" = ( @@ -76961,8 +73456,8 @@ }, /obj/effect/decal/warning_stripes/northwestcorner, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 4 + dir = 4; + icon_state = "neutralcorner" }, /area/hallway/primary/central) "cIV" = ( @@ -77112,8 +73607,8 @@ "cJr" = ( /obj/machinery/vending/medical, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/medical/medbay2) "cJs" = ( @@ -77219,8 +73714,8 @@ level = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/crew_quarters/fitness) "cJE" = ( @@ -77268,9 +73763,8 @@ /turf/simulated/floor/plasteel, /area/crew_quarters/fitness) "cJJ" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /obj/machinery/status_display{ pixel_y = -32 @@ -77309,8 +73803,8 @@ pixel_y = 0 }, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 4 + dir = 4; + icon_state = "neutral" }, /area/maintenance/fpmaint2) "cJP" = ( @@ -77467,8 +73961,8 @@ }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 4 + dir = 4; + icon_state = "neutral" }, /area/maintenance/fpmaint2) "cKj" = ( @@ -77512,8 +74006,8 @@ }, /obj/effect/decal/warning_stripes/north, /obj/machinery/atmospherics/pipe/manifold/hidden/cyan{ - icon_state = "map"; - dir = 8 + dir = 8; + icon_state = "map" }, /turf/simulated/floor/plasteel, /area/toxins/xenobiology) @@ -77749,9 +74243,9 @@ dir = 1 }, /turf/simulated/floor/plasteel{ - tag = "icon-whiteblue (NORTH)"; + dir = 1; icon_state = "whiteblue"; - dir = 1 + tag = "icon-whiteblue (NORTH)" }, /area/medical/medbay) "cKS" = ( @@ -77834,8 +74328,8 @@ /area/maintenance/starboard) "cLd" = ( /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/machinery/power/apc{ dir = 8; @@ -77849,8 +74343,8 @@ network = list("SS13","Medical") }, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 4 + dir = 4; + icon_state = "neutral" }, /area/medical/medbay2) "cLe" = ( @@ -77866,14 +74360,13 @@ icon_state = "2-4"; tag = "" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/plasteel{ - tag = "icon-whiteblue (NORTH)"; + dir = 1; icon_state = "whiteblue"; - dir = 1 + tag = "icon-whiteblue (NORTH)" }, /area/medical/medbay2) "cLf" = ( @@ -77887,9 +74380,9 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - tag = "icon-whiteblue (NORTH)"; + dir = 1; icon_state = "whiteblue"; - dir = 1 + tag = "icon-whiteblue (NORTH)" }, /area/medical/medbay2) "cLg" = ( @@ -78084,8 +74577,8 @@ "cLv" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/crew_quarters/fitness) "cLw" = ( @@ -78101,8 +74594,8 @@ /area/maintenance/electrical) "cLy" = ( /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/machinery/power/apc{ dir = 8; @@ -78355,8 +74848,8 @@ }, /obj/structure/closet/secure_closet/security/science, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 9 + dir = 9; + icon_state = "red" }, /area/security/checkpoint/science) "cMb" = ( @@ -78482,8 +74975,8 @@ /area/medical/medbay) "cMp" = ( /turf/simulated/floor/plasteel{ - tag = "icon-whitebluefull"; - icon_state = "whitebluefull" + icon_state = "whitebluefull"; + tag = "icon-whitebluefull" }, /area/medical/medbay) "cMq" = ( @@ -78500,8 +74993,8 @@ "cMs" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ - tag = "icon-whitebluefull"; - icon_state = "whitebluefull" + icon_state = "whitebluefull"; + tag = "icon-whitebluefull" }, /area/medical/medbay) "cMt" = ( @@ -78530,9 +75023,9 @@ /obj/structure/bed/roller, /obj/machinery/iv_drip, /turf/simulated/floor/plasteel{ - tag = "icon-whiteblue (NORTH)"; + dir = 1; icon_state = "whiteblue"; - dir = 1 + tag = "icon-whiteblue (NORTH)" }, /area/medical/medbay) "cMw" = ( @@ -78556,12 +75049,12 @@ "cMA" = ( /obj/item/twohanded/required/kirbyplants, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 4 + dir = 4; + icon_state = "neutral" }, /area/medical/medbay2) "cMB" = ( @@ -78651,8 +75144,8 @@ }, /obj/machinery/space_heater, /turf/simulated/floor/plasteel{ - tag = "icon-whitebluefull"; - icon_state = "whitebluefull" + icon_state = "whitebluefull"; + tag = "icon-whitebluefull" }, /area/maintenance/starboard) "cMK" = ( @@ -78725,8 +75218,8 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/crew_quarters/fitness) "cMS" = ( @@ -78839,9 +75332,8 @@ }, /area/maintenance/electrical) "cNf" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel, @@ -78863,8 +75355,8 @@ "cNh" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 4 + dir = 4; + icon_state = "neutral" }, /area/maintenance/fpmaint2) "cNi" = ( @@ -78885,8 +75377,8 @@ /area/toxins/xenobiology) "cNk" = ( /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/machinery/shieldwallgen, /obj/effect/decal/warning_stripes/southeast, @@ -78954,8 +75446,8 @@ "cNp" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /turf/simulated/floor/plating, /area/toxins/xenobiology) @@ -79058,8 +75550,8 @@ "cNu" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/plating, @@ -79163,9 +75655,7 @@ dir = 1; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - on = 1 - }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "whitepurplecorner" @@ -79332,9 +75822,7 @@ dir = 4; level = 1 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - on = 1 - }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "whitebluecorner"; @@ -79376,9 +75864,9 @@ req_access_txt = "5" }, /turf/simulated/floor/plasteel{ - tag = "icon-whiteblue (NORTH)"; + dir = 1; icon_state = "whiteblue"; - dir = 1 + tag = "icon-whiteblue (NORTH)" }, /area/medical/medbay) "cNY" = ( @@ -79387,8 +75875,8 @@ level = 1 }, /turf/simulated/floor/plasteel{ - tag = "icon-whitebluefull"; - icon_state = "whitebluefull" + icon_state = "whitebluefull"; + tag = "icon-whitebluefull" }, /area/medical/medbay) "cNZ" = ( @@ -79419,8 +75907,8 @@ pixel_y = 25 }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 9 + dir = 9; + icon_state = "red" }, /area/security/checkpoint/medical) "cOb" = ( @@ -79453,8 +75941,8 @@ pixel_y = 30 }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 5 + dir = 5; + icon_state = "red" }, /area/security/checkpoint/medical) "cOd" = ( @@ -79486,9 +75974,9 @@ }, /obj/item/storage/box/beakers, /turf/simulated/floor/plasteel{ - tag = "icon-whiteblue (NORTH)"; + dir = 1; icon_state = "whiteblue"; - dir = 1 + tag = "icon-whiteblue (NORTH)" }, /area/medical/medbay) "cOf" = ( @@ -79519,8 +76007,8 @@ pixel_y = -3 }, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 4 + dir = 4; + icon_state = "neutral" }, /area/medical/medbay2) "cOi" = ( @@ -79542,8 +76030,8 @@ "cOk" = ( /obj/structure/table/glass, /obj/machinery/light{ - icon_state = "tube1"; - dir = 4 + dir = 4; + icon_state = "tube1" }, /obj/machinery/alarm{ dir = 8; @@ -79819,9 +76307,8 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, @@ -79865,11 +76352,8 @@ /turf/simulated/floor/plasteel, /area/toxins/xenobiology) "cOV" = ( -/obj/machinery/atmospherics/unary/cold_sink/freezer{ - current_temperature = 80; - dir = 1; - min_temperature = 80; - on = 1 +/obj/machinery/atmospherics/unary/thermomachine/freezer/on/server{ + dir = 1 }, /obj/structure/extinguisher_cabinet{ pixel_x = -26; @@ -80217,9 +76701,9 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - tag = "icon-whitebluecorner (WEST)"; + dir = 8; icon_state = "whitebluecorner"; - dir = 8 + tag = "icon-whitebluecorner (WEST)" }, /area/medical/medbay) "cPC" = ( @@ -80230,8 +76714,8 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - tag = "icon-whitebluefull"; - icon_state = "whitebluefull" + icon_state = "whitebluefull"; + tag = "icon-whitebluefull" }, /area/medical/medbay) "cPD" = ( @@ -80348,9 +76832,9 @@ dir = 10 }, /turf/simulated/floor/plasteel{ - tag = "icon-whitebluecorner (WEST)"; + dir = 8; icon_state = "whitebluecorner"; - dir = 8 + tag = "icon-whitebluecorner (WEST)" }, /area/medical/medbay) "cPM" = ( @@ -80381,8 +76865,8 @@ "cPO" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /turf/simulated/floor/plating, /area/security/checkpoint/medical) @@ -80400,9 +76884,8 @@ }, /area/security/checkpoint/medical) "cPQ" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -80457,8 +76940,8 @@ pixel_y = -3 }, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 4 + dir = 4; + icon_state = "neutral" }, /area/medical/medbay2) "cPV" = ( @@ -80548,8 +77031,8 @@ req_access_txt = "5" }, /turf/simulated/floor/plasteel{ - tag = "icon-whiteblue"; - icon_state = "whiteblue" + icon_state = "whiteblue"; + tag = "icon-whiteblue" }, /area/medical/medbay) "cQc" = ( @@ -80595,7 +77078,6 @@ /area/crew_quarters/sleep) "cQf" = ( /obj/structure/closet/secure_closet/personal/cabinet, -/obj/item/clothing/head/kitty, /obj/item/clothing/under/maid, /obj/item/clothing/suit/browntrenchcoat, /turf/simulated/floor/plasteel{ @@ -80678,8 +77160,8 @@ icon_state = "tube1" }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/crew_quarters/fitness) "cQp" = ( @@ -80808,8 +77290,8 @@ /area/maintenance/electrical) "cQC" = ( /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plating, @@ -81175,9 +77657,9 @@ }, /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ - tag = "icon-whitebluecorner (WEST)"; + dir = 8; icon_state = "whitebluecorner"; - dir = 8 + tag = "icon-whitebluecorner (WEST)" }, /area/medical/medbay) "cRk" = ( @@ -81194,8 +77676,8 @@ icon_state = "pipe-c" }, /turf/simulated/floor/plasteel{ - tag = "icon-whitebluefull"; - icon_state = "whitebluefull" + icon_state = "whitebluefull"; + tag = "icon-whitebluefull" }, /area/medical/medbay) "cRm" = ( @@ -81314,8 +77796,8 @@ pixel_x = -32 }, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 4 + dir = 4; + icon_state = "neutral" }, /area/medical/medbay2) "cRu" = ( @@ -81326,14 +77808,14 @@ tag = "" }, /turf/simulated/floor/plasteel{ - tag = "icon-whiteblue"; - icon_state = "whiteblue" + icon_state = "whiteblue"; + tag = "icon-whiteblue" }, /area/medical/medbay2) "cRv" = ( /turf/simulated/floor/plasteel{ - tag = "icon-whiteblue"; - icon_state = "whiteblue" + icon_state = "whiteblue"; + tag = "icon-whiteblue" }, /area/medical/medbay2) "cRw" = ( @@ -81384,8 +77866,8 @@ /area/maintenance/starboard) "cRA" = ( /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/machinery/power/apc{ dir = 8; @@ -81419,9 +77901,7 @@ }, /area/crew_quarters/fitness) "cRC" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - on = 1 - }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -81607,9 +78087,7 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - on = 1 - }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -81707,9 +78185,9 @@ tag = "" }, /turf/simulated/floor/plasteel{ - tag = "icon-whitepurple (WEST)"; + dir = 8; icon_state = "whitepurple"; - dir = 8 + tag = "icon-whitepurple (WEST)" }, /area/toxins/xenobiology) "cSe" = ( @@ -81764,13 +78242,12 @@ }, /area/toxins/xenobiology) "cSj" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/machinery/power/apc{ dir = 8; @@ -81919,8 +78396,8 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/hallway/primary/aft) "cSx" = ( @@ -81929,18 +78406,18 @@ /obj/item/pen, /obj/machinery/light, /turf/simulated/floor/plasteel{ - tag = "icon-whitebluecorner (WEST)"; + dir = 8; icon_state = "whitebluecorner"; - dir = 8 + tag = "icon-whitebluecorner (WEST)" }, /area/medical/medbay) "cSy" = ( /obj/structure/table, /obj/item/folder/white, /turf/simulated/floor/plasteel{ - tag = "icon-whitebluecorner (WEST)"; + dir = 8; icon_state = "whitebluecorner"; - dir = 8 + tag = "icon-whitebluecorner (WEST)" }, /area/medical/medbay) "cSz" = ( @@ -81949,25 +78426,25 @@ }, /obj/machinery/disposal, /turf/simulated/floor/plasteel{ - tag = "icon-whitebluecorner (WEST)"; + dir = 8; icon_state = "whitebluecorner"; - dir = 8 + tag = "icon-whitebluecorner (WEST)" }, /area/medical/medbay) "cSA" = ( /turf/simulated/floor/plasteel{ - tag = "icon-whitebluecorner (WEST)"; + dir = 8; icon_state = "whitebluecorner"; - dir = 8 + tag = "icon-whitebluecorner (WEST)" }, /area/medical/medbay) "cSB" = ( /obj/structure/disposalpipe/segment, /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ - tag = "icon-whitebluecorner (WEST)"; + dir = 8; icon_state = "whitebluecorner"; - dir = 8 + tag = "icon-whitebluecorner (WEST)" }, /area/medical/medbay) "cSC" = ( @@ -81988,8 +78465,8 @@ "cSD" = ( /obj/structure/bed/roller, /turf/simulated/floor/plasteel{ - tag = "icon-whiteblue"; - icon_state = "whiteblue" + icon_state = "whiteblue"; + tag = "icon-whiteblue" }, /area/medical/medbay) "cSE" = ( @@ -82123,8 +78600,8 @@ req_access_txt = "5" }, /turf/simulated/floor/plasteel{ - tag = "icon-whitebluefull"; - icon_state = "whitebluefull" + icon_state = "whitebluefull"; + tag = "icon-whitebluefull" }, /area/medical/medbay2) "cSR" = ( @@ -82155,8 +78632,8 @@ /area/medical/medbay3) "cST" = ( /obj/structure/sink{ - icon_state = "sink"; dir = 4; + icon_state = "sink"; pixel_x = 10; pixel_y = 0 }, @@ -82189,8 +78666,8 @@ req_access_txt = "5" }, /turf/simulated/floor/plasteel{ - tag = "icon-whitebluefull"; - icon_state = "whitebluefull" + icon_state = "whitebluefull"; + tag = "icon-whitebluefull" }, /area/medical/medbay2) "cSW" = ( @@ -82529,9 +79006,9 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - tag = "icon-whitepurple (WEST)"; + dir = 8; icon_state = "whitepurple"; - dir = 8 + tag = "icon-whitepurple (WEST)" }, /area/toxins/xenobiology) "cTE" = ( @@ -82603,8 +79080,8 @@ "cTI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /turf/simulated/floor/plasteel{ dir = 1; @@ -82614,8 +79091,8 @@ "cTJ" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /turf/simulated/floor/plating, /area/security/checkpoint/science) @@ -82720,8 +79197,8 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/structure/sign/poster/official/nanotrasen_logo{ pixel_x = -32 @@ -82738,8 +79215,8 @@ pixel_x = 28 }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/hallway/primary/aft) "cTX" = ( @@ -82833,8 +79310,8 @@ pixel_y = 0 }, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /turf/simulated/floor/plasteel{ dir = 1; @@ -82861,8 +79338,8 @@ on = 1 }, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/machinery/power/apc{ dir = 8; @@ -82910,8 +79387,8 @@ "cUi" = ( /obj/item/twohanded/required/kirbyplants, /obj/machinery/light{ - icon_state = "tube1"; - dir = 4 + dir = 4; + icon_state = "tube1" }, /obj/machinery/alarm{ dir = 8; @@ -82919,15 +79396,15 @@ pixel_x = 24 }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 6 + dir = 6; + icon_state = "red" }, /area/security/checkpoint/medical) "cUj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /turf/simulated/floor/plasteel{ dir = 1; @@ -82941,31 +79418,31 @@ on = 1 }, /turf/simulated/floor/plasteel{ - tag = "icon-whitebluefull"; - icon_state = "whitebluefull" + icon_state = "whitebluefull"; + tag = "icon-whitebluefull" }, /area/medical/medbay) "cUl" = ( /obj/structure/table/wood, /obj/machinery/kitchen_machine/microwave, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 1 + dir = 1; + icon_state = "neutralcorner" }, /area/medical/medbay3) "cUm" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/table/wood, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 1 + dir = 1; + icon_state = "neutralcorner" }, /area/medical/medbay3) "cUn" = ( /turf/simulated/floor/plasteel{ - tag = "icon-whiteblue (NORTH)"; + dir = 1; icon_state = "whiteblue"; - dir = 1 + tag = "icon-whiteblue (NORTH)" }, /area/medical/medbay) "cUo" = ( @@ -82981,8 +79458,8 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 4 + dir = 4; + icon_state = "neutralcorner" }, /area/medical/medbay3) "cUq" = ( @@ -82992,8 +79469,8 @@ /obj/machinery/disposal, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 4 + dir = 4; + icon_state = "neutralcorner" }, /area/medical/medbay3) "cUr" = ( @@ -83219,8 +79696,8 @@ }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 4 + dir = 4; + icon_state = "neutral" }, /area/maintenance/starboard) "cUD" = ( @@ -83251,9 +79728,9 @@ tag = "" }, /obj/structure/disposalpipe/junction{ - tag = "icon-pipe-j1 (EAST)"; + dir = 4; icon_state = "pipe-j1"; - dir = 4 + tag = "icon-pipe-j1 (EAST)" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4; @@ -83370,8 +79847,8 @@ dir = 9 }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/crew_quarters/fitness) "cUN" = ( @@ -83524,9 +80001,9 @@ /area/toxins/lab) "cVf" = ( /turf/simulated/floor/plasteel{ - tag = "icon-whitepurple (WEST)"; + dir = 8; icon_state = "whitepurple"; - dir = 8 + tag = "icon-whitepurple (WEST)" }, /area/toxins/xenobiology) "cVg" = ( @@ -83546,8 +80023,8 @@ /area/toxins/xenobiology) "cVh" = ( /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/machinery/shieldwallgen, /obj/effect/decal/warning_stripes/northeast, @@ -83556,8 +80033,8 @@ "cVi" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/structure/cable{ d1 = 2; @@ -83578,8 +80055,8 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 9 + dir = 9; + icon_state = "red" }, /area/security/checkpoint/science) "cVk" = ( @@ -83668,9 +80145,8 @@ /turf/simulated/floor/plasteel, /area/security/checkpoint/science) "cVq" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, @@ -83978,9 +80454,9 @@ tag = "" }, /turf/simulated/floor/plasteel{ - tag = "icon-whiteblue (NORTH)"; + dir = 1; icon_state = "whiteblue"; - dir = 1 + tag = "icon-whiteblue (NORTH)" }, /area/medical/medbay3) "cVT" = ( @@ -83996,9 +80472,9 @@ /area/medical/medbay) "cVU" = ( /turf/simulated/floor/plasteel{ - tag = "icon-whiteblue (NORTH)"; + dir = 1; icon_state = "whiteblue"; - dir = 1 + tag = "icon-whiteblue (NORTH)" }, /area/medical/medbay3) "cVV" = ( @@ -84010,17 +80486,16 @@ }, /area/medical/medbay3) "cVW" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /obj/machinery/newscaster{ pixel_x = -32; pixel_y = 0 }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 1 + dir = 1; + icon_state = "neutralcorner" }, /area/medical/medbay3) "cVX" = ( @@ -84096,8 +80571,8 @@ /area/crew_quarters/fitness) "cWh" = ( /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/crew_quarters/fitness) "cWi" = ( @@ -84110,8 +80585,8 @@ "cWj" = ( /obj/machinery/vending/coffee, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 4 + dir = 4; + icon_state = "neutralcorner" }, /area/medical/medbay3) "cWk" = ( @@ -84191,8 +80666,8 @@ /area/maintenance/fpmaint2) "cWs" = ( /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4; @@ -84236,8 +80711,8 @@ network = list("Research","SS13","Security") }, /obj/machinery/light{ - icon_state = "tube1"; - dir = 4 + dir = 4; + icon_state = "tube1" }, /turf/simulated/floor/plasteel{ dir = 6; @@ -84326,8 +80801,8 @@ "cWD" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, @@ -84455,9 +80930,8 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 2; @@ -84540,8 +81014,8 @@ }, /obj/machinery/r_n_d/protolathe, /obj/machinery/light{ - icon_state = "tube1"; - dir = 4 + dir = 4; + icon_state = "tube1" }, /obj/effect/decal/warning_stripes/northeast, /turf/simulated/floor/plasteel, @@ -84645,14 +81119,14 @@ /turf/simulated/wall/r_wall, /area/medical/chemistry) "cXf" = ( -/obj/machinery/status_display{ +/obj/structure/closet/secure_closet/reagents, +/obj/structure/disaster_counter/chemistry{ pixel_x = -32 }, -/obj/structure/closet/secure_closet/reagents, /turf/simulated/floor/plasteel{ - tag = "icon-whitegreen (WEST)"; + dir = 8; icon_state = "whitegreen"; - dir = 8 + tag = "icon-whitegreen (WEST)" }, /area/medical/chemistry) "cXg" = ( @@ -84717,9 +81191,9 @@ pixel_x = -28 }, /turf/simulated/floor/plasteel{ - tag = "icon-whiteblue (WEST)"; + dir = 8; icon_state = "whiteblue"; - dir = 8 + tag = "icon-whiteblue (WEST)" }, /area/medical/medbay) "cXn" = ( @@ -84739,9 +81213,8 @@ }, /area/medical/medbay) "cXp" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -84766,16 +81239,16 @@ req_access_txt = "5" }, /turf/simulated/floor/plasteel{ - tag = "icon-whiteblue (WEST)"; + dir = 8; icon_state = "whiteblue"; - dir = 8 + tag = "icon-whiteblue (WEST)" }, /area/medical/medbay) "cXs" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/structure/cable{ d1 = 2; @@ -84796,8 +81269,8 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 9 + dir = 9; + icon_state = "red" }, /area/security/checkpoint/medical) "cXu" = ( @@ -84823,8 +81296,8 @@ id = "medcell" }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 5 + dir = 5; + icon_state = "red" }, /area/security/checkpoint/medical) "cXw" = ( @@ -84843,8 +81316,8 @@ tag = "" }, /turf/simulated/floor/plasteel{ - tag = "icon-whitebluefull"; - icon_state = "whitebluefull" + icon_state = "whitebluefull"; + tag = "icon-whitebluefull" }, /area/medical/medbay) "cXy" = ( @@ -84877,8 +81350,8 @@ pixel_x = 0 }, /turf/simulated/floor/plasteel{ - tag = "icon-whitebluefull"; - icon_state = "whitebluefull" + icon_state = "whitebluefull"; + tag = "icon-whitebluefull" }, /area/medical/medbay3) "cXA" = ( @@ -84960,8 +81433,8 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 4 + dir = 4; + icon_state = "neutral" }, /area/medical/medbay3) "cXI" = ( @@ -84974,9 +81447,9 @@ /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ - tag = "icon-whitebluecorner (WEST)"; + dir = 8; icon_state = "whitebluecorner"; - dir = 8 + tag = "icon-whitebluecorner (WEST)" }, /area/medical/medbay3) "cXL" = ( @@ -85005,8 +81478,8 @@ "cXO" = ( /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/crew_quarters/fitness) "cXP" = ( @@ -85179,8 +81652,8 @@ }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 4 + dir = 4; + icon_state = "neutral" }, /area/maintenance/fpmaint2) "cYh" = ( @@ -85193,8 +81666,8 @@ icon_state = "yellow" }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/crew_quarters/locker) "cYi" = ( @@ -85333,9 +81806,9 @@ /area/toxins/lab) "cYx" = ( /turf/simulated/floor/plasteel{ - tag = "icon-whitepurple (NORTHWEST)"; + dir = 9; icon_state = "whitepurple"; - dir = 9 + tag = "icon-whitepurple (NORTHWEST)" }, /area/toxins/lab) "cYy" = ( @@ -85396,19 +81869,17 @@ /area/medical/chemistry) "cYF" = ( /turf/simulated/floor/plasteel{ - tag = "icon-whitegreen (NORTHWEST)"; + dir = 9; icon_state = "whitegreen"; - dir = 9 + tag = "icon-whitegreen (NORTHWEST)" }, /area/medical/chemistry) "cYG" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - on = 1 - }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ - tag = "icon-whitegreen (NORTHEAST)"; + dir = 5; icon_state = "whitegreen"; - dir = 5 + tag = "icon-whitegreen (NORTHEAST)" }, /area/medical/chemistry) "cYH" = ( @@ -85436,24 +81907,24 @@ network = list("Medical","SS13") }, /turf/simulated/floor/plasteel{ - tag = "icon-whitebluecorner (WEST)"; + dir = 8; icon_state = "whitebluecorner"; - dir = 8 + tag = "icon-whitebluecorner (WEST)" }, /area/medical/medbay) "cYK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - tag = "icon-whitebluecorner (WEST)"; + dir = 8; icon_state = "whitebluecorner"; - dir = 8 + tag = "icon-whitebluecorner (WEST)" }, /area/medical/medbay) "cYL" = ( /obj/structure/chair/office/light, /turf/simulated/floor/plasteel{ - tag = "icon-whiteblue"; - icon_state = "whiteblue" + icon_state = "whiteblue"; + tag = "icon-whiteblue" }, /area/medical/medbay) "cYM" = ( @@ -85479,9 +81950,8 @@ /area/medical/medbay) "cYO" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -85526,8 +81996,8 @@ tag = "" }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 6 + dir = 6; + icon_state = "red" }, /area/security/checkpoint/medical) "cYT" = ( @@ -85561,8 +82031,8 @@ tag = "" }, /turf/simulated/floor/plasteel{ - tag = "icon-whitebluefull"; - icon_state = "whitebluefull" + icon_state = "whitebluefull"; + tag = "icon-whitebluefull" }, /area/medical/medbay3) "cYW" = ( @@ -85609,8 +82079,8 @@ network = list("SS13","Medical") }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/medical/medbay3) "cZb" = ( @@ -85679,9 +82149,9 @@ /obj/item/stack/medical/bruise_pack, /obj/item/stack/medical/ointment, /turf/simulated/floor/plasteel{ - tag = "icon-whiteblue (NORTH)"; + dir = 1; icon_state = "whiteblue"; - dir = 1 + tag = "icon-whiteblue (NORTH)" }, /area/medical/surgery1) "cZh" = ( @@ -85772,9 +82242,9 @@ }, /obj/effect/decal/warning_stripes/northeast, /turf/simulated/floor/plasteel{ - tag = "icon-whitebluecorner (WEST)"; + dir = 8; icon_state = "whitebluecorner"; - dir = 8 + tag = "icon-whitebluecorner (WEST)" }, /area/medical/medbay3) "cZq" = ( @@ -85798,8 +82268,8 @@ /area/medical/research) "cZs" = ( /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/structure/table/reinforced, /obj/machinery/power/apc{ @@ -85892,9 +82362,9 @@ tag = "" }, /turf/simulated/floor/plasteel{ - tag = "icon-whitepurple (WEST)"; + dir = 8; icon_state = "whitepurple"; - dir = 8 + tag = "icon-whitepurple (WEST)" }, /area/toxins/lab) "cZB" = ( @@ -85908,9 +82378,9 @@ pixel_x = -16 }, /turf/simulated/floor/plasteel{ - tag = "icon-whitepurple (EAST)"; + dir = 4; icon_state = "whitepurple"; - dir = 4 + tag = "icon-whitepurple (EAST)" }, /area/toxins/lab) "cZC" = ( @@ -85933,8 +82403,8 @@ /area/toxins/xenobiology) "cZD" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/machinery/door_control{ id = "chemdesk2"; @@ -86066,9 +82536,9 @@ tag = "" }, /turf/simulated/floor/plasteel{ - tag = "icon-whitebluecorner (WEST)"; + dir = 8; icon_state = "whitebluecorner"; - dir = 8 + tag = "icon-whitebluecorner (WEST)" }, /area/medical/medbay3) "cZP" = ( @@ -86081,8 +82551,8 @@ /area/medical/medbay) "cZQ" = ( /turf/simulated/floor/plasteel{ - tag = "icon-whiteblue"; - icon_state = "whiteblue" + icon_state = "whiteblue"; + tag = "icon-whiteblue" }, /area/medical/medbay3) "cZR" = ( @@ -86121,8 +82591,8 @@ }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 4 + dir = 4; + icon_state = "neutral" }, /area/maintenance/starboard) "cZU" = ( @@ -86141,8 +82611,8 @@ /area/medical/medbay3) "cZW" = ( /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/medical/medbay3) "cZX" = ( @@ -86150,8 +82620,8 @@ /obj/item/paper_bin, /obj/item/pen, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/medical/medbay3) "cZY" = ( @@ -86164,8 +82634,8 @@ /area/medical/surgery1) "cZZ" = ( /turf/simulated/floor/plasteel{ - tag = "icon-whitebluefull"; - icon_state = "whitebluefull" + icon_state = "whitebluefull"; + tag = "icon-whitebluefull" }, /area/medical/medbay3) "daa" = ( @@ -86176,8 +82646,8 @@ "dab" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - tag = "icon-whitebluefull"; - icon_state = "whitebluefull" + icon_state = "whitebluefull"; + tag = "icon-whitebluefull" }, /area/medical/surgery1) "dac" = ( @@ -86190,8 +82660,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 4 + dir = 4; + icon_state = "neutral" }, /area/maintenance/starboard) "dae" = ( @@ -86339,8 +82809,8 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 4 + dir = 4; + icon_state = "neutral" }, /area/maintenance/fpmaint2) "dat" = ( @@ -86513,9 +82983,9 @@ /obj/item/clipboard, /obj/item/toy/figure/scientist, /turf/simulated/floor/plasteel{ - tag = "icon-whitepurple (SOUTHWEST)"; + dir = 10; icon_state = "whitepurple"; - dir = 10 + tag = "icon-whitepurple (SOUTHWEST)" }, /area/toxins/lab) "daL" = ( @@ -86599,8 +83069,8 @@ /obj/item/crowbar, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - tag = "icon-whitebluefull"; - icon_state = "whitebluefull" + icon_state = "whitebluefull"; + tag = "icon-whitebluefull" }, /area/medical/surgery1) "daS" = ( @@ -86609,9 +83079,9 @@ /area/medical/surgery1) "daT" = ( /turf/simulated/floor/plasteel{ - tag = "icon-whitegreen (SOUTHWEST)"; + dir = 10; icon_state = "whitegreen"; - dir = 10 + tag = "icon-whitegreen (SOUTHWEST)" }, /area/medical/chemistry) "daU" = ( @@ -86620,9 +83090,9 @@ level = 1 }, /turf/simulated/floor/plasteel{ - tag = "icon-whitegreen (SOUTHEAST)"; + dir = 6; icon_state = "whitegreen"; - dir = 6 + tag = "icon-whitegreen (SOUTHEAST)" }, /area/medical/chemistry) "daV" = ( @@ -86699,8 +83169,8 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - tag = "icon-whitebluefull"; - icon_state = "whitebluefull" + icon_state = "whitebluefull"; + tag = "icon-whitebluefull" }, /area/medical/medbay) "dbc" = ( @@ -86757,9 +83227,9 @@ level = 1 }, /turf/simulated/floor/plasteel{ - tag = "icon-whiteblue (NORTH)"; + dir = 1; icon_state = "whiteblue"; - dir = 1 + tag = "icon-whiteblue (NORTH)" }, /area/medical/medbay) "dbh" = ( @@ -86792,8 +83262,8 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - tag = "icon-whitebluefull"; - icon_state = "whitebluefull" + icon_state = "whitebluefull"; + tag = "icon-whitebluefull" }, /area/medical/medbay) "dbl" = ( @@ -86854,8 +83324,8 @@ }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 4 + dir = 4; + icon_state = "neutral" }, /area/maintenance/starboard) "dbr" = ( @@ -86885,9 +83355,9 @@ /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ - tag = "icon-whiteblue (NORTH)"; + dir = 1; icon_state = "whiteblue"; - dir = 1 + tag = "icon-whiteblue (NORTH)" }, /area/medical/medbay3) "dbv" = ( @@ -86915,8 +83385,8 @@ "dby" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 4 + dir = 4; + icon_state = "neutral" }, /area/maintenance/starboard) "dbz" = ( @@ -86992,9 +83462,9 @@ /obj/item/FixOVein, /obj/structure/table/tray, /turf/simulated/floor/plasteel{ - tag = "icon-whiteblue (NORTH)"; + dir = 1; icon_state = "whiteblue"; - dir = 1 + tag = "icon-whiteblue (NORTH)" }, /area/medical/surgery) "dbG" = ( @@ -87050,13 +83520,13 @@ /area/maintenance/fpmaint2) "dbO" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /turf/simulated/floor/plasteel{ - tag = "icon-whitepurple (WEST)"; + dir = 8; icon_state = "whitepurple"; - dir = 8 + tag = "icon-whitepurple (WEST)" }, /area/medical/research) "dbP" = ( @@ -87125,9 +83595,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - on = 1 - }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ icon_state = "purplefull" }, @@ -87154,9 +83622,9 @@ /area/medical/research) "dbY" = ( /turf/simulated/floor/plasteel{ - tag = "icon-whitepurple (EAST)"; + dir = 4; icon_state = "whitepurple"; - dir = 4 + tag = "icon-whitepurple (EAST)" }, /area/medical/research) "dbZ" = ( @@ -87183,9 +83651,7 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - on = 1 - }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/effect/landmark/start{ name = "Scientist" }, @@ -87302,9 +83768,9 @@ tag = "" }, /turf/simulated/floor/plasteel{ - tag = "icon-whitegreen (WEST)"; + dir = 8; icon_state = "whitegreen"; - dir = 8 + tag = "icon-whitegreen (WEST)" }, /area/medical/medbay) "dcn" = ( @@ -87316,8 +83782,8 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - tag = "icon-whitebluefull"; - icon_state = "whitebluefull" + icon_state = "whitebluefull"; + tag = "icon-whitebluefull" }, /area/medical/medbay) "dco" = ( @@ -87339,8 +83805,8 @@ tag = "" }, /turf/simulated/floor/plasteel{ - tag = "icon-whitebluefull"; - icon_state = "whitebluefull" + icon_state = "whitebluefull"; + tag = "icon-whitebluefull" }, /area/medical/medbay) "dcq" = ( @@ -87352,8 +83818,8 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - tag = "icon-whitebluefull"; - icon_state = "whitebluefull" + icon_state = "whitebluefull"; + tag = "icon-whitebluefull" }, /area/medical/medbay) "dcr" = ( @@ -87374,8 +83840,8 @@ name = "lightsout" }, /turf/simulated/floor/plasteel{ - tag = "icon-whitebluefull"; - icon_state = "whitebluefull" + icon_state = "whitebluefull"; + tag = "icon-whitebluefull" }, /area/medical/medbay) "dcs" = ( @@ -87397,8 +83863,8 @@ icon_state = "1-8" }, /turf/simulated/floor/plasteel{ - tag = "icon-whitebluefull"; - icon_state = "whitebluefull" + icon_state = "whitebluefull"; + tag = "icon-whitebluefull" }, /area/medical/medbay) "dcu" = ( @@ -87408,9 +83874,8 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -87430,8 +83895,8 @@ tag = "" }, /turf/simulated/floor/plasteel{ - tag = "icon-whitebluefull"; - icon_state = "whitebluefull" + icon_state = "whitebluefull"; + tag = "icon-whitebluefull" }, /area/medical/medbay) "dcw" = ( @@ -87457,13 +83922,12 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ - tag = "icon-whitebluefull"; - icon_state = "whitebluefull" + icon_state = "whitebluefull"; + tag = "icon-whitebluefull" }, /area/medical/medbay) "dcy" = ( @@ -87526,8 +83990,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 4 + dir = 4; + icon_state = "neutral" }, /area/maintenance/starboard) "dcD" = ( @@ -87542,9 +84006,9 @@ /area/medical/medbay3) "dcE" = ( /turf/simulated/floor/plasteel{ - tag = "icon-whitebluecorner (WEST)"; + dir = 8; icon_state = "whitebluecorner"; - dir = 8 + tag = "icon-whitebluecorner (WEST)" }, /area/medical/medbay3) "dcF" = ( @@ -87580,9 +84044,9 @@ }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - tag = "icon-whiteblue (WEST)"; + dir = 8; icon_state = "whiteblue"; - dir = 8 + tag = "icon-whiteblue (WEST)" }, /area/medical/surgery1) "dcH" = ( @@ -87600,8 +84064,8 @@ level = 1 }, /turf/simulated/floor/plasteel{ - tag = "icon-whitebluefull"; - icon_state = "whitebluefull" + icon_state = "whitebluefull"; + tag = "icon-whitebluefull" }, /area/medical/surgery1) "dcJ" = ( @@ -87636,9 +84100,8 @@ /turf/simulated/floor/plating, /area/maintenance/gambling_den) "dcN" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "wood" @@ -87843,8 +84306,8 @@ /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/hallway/primary/central) "ddl" = ( @@ -88231,9 +84694,9 @@ "ddT" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plasteel{ - tag = "icon-whitebluecorner (WEST)"; + dir = 8; icon_state = "whitebluecorner"; - dir = 8 + tag = "icon-whitebluecorner (WEST)" }, /area/medical/medbay) "ddU" = ( @@ -88242,16 +84705,16 @@ level = 1 }, /turf/simulated/floor/plasteel{ - tag = "icon-whitebluecorner (WEST)"; + dir = 8; icon_state = "whitebluecorner"; - dir = 8 + tag = "icon-whitebluecorner (WEST)" }, /area/medical/medbay) "ddV" = ( /obj/structure/table/glass, /obj/machinery/light{ - icon_state = "tube1"; - dir = 4 + dir = 4; + icon_state = "tube1" }, /obj/machinery/camera{ c_tag = "Chemistry"; @@ -88280,9 +84743,9 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - tag = "icon-whitebluecorner (WEST)"; + dir = 8; icon_state = "whitebluecorner"; - dir = 8 + tag = "icon-whitebluecorner (WEST)" }, /area/medical/medbay) "ddX" = ( @@ -88298,8 +84761,8 @@ level = 1 }, /turf/simulated/floor/plasteel{ - tag = "icon-whitebluefull"; - icon_state = "whitebluefull" + icon_state = "whitebluefull"; + tag = "icon-whitebluefull" }, /area/medical/medbay) "ddY" = ( @@ -88331,8 +84794,8 @@ level = 1 }, /turf/simulated/floor/plasteel{ - tag = "icon-whiteblue"; - icon_state = "whiteblue" + icon_state = "whiteblue"; + tag = "icon-whiteblue" }, /area/medical/medbay) "deb" = ( @@ -88374,8 +84837,8 @@ level = 1 }, /turf/simulated/floor/plasteel{ - tag = "icon-whitebluefull"; - icon_state = "whitebluefull" + icon_state = "whitebluefull"; + tag = "icon-whitebluefull" }, /area/medical/medbay) "dee" = ( @@ -88472,8 +84935,8 @@ /area/maintenance/starboard) "dem" = ( /turf/simulated/floor/plasteel{ - tag = "icon-whitebluefull"; - icon_state = "whitebluefull" + icon_state = "whitebluefull"; + tag = "icon-whitebluefull" }, /area/medical/surgery1) "den" = ( @@ -88511,14 +84974,14 @@ tag = "" }, /obj/machinery/shower{ - icon_state = "shower"; - dir = 4 + dir = 4; + icon_state = "shower" }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - tag = "icon-whitebluecorner (WEST)"; + dir = 8; icon_state = "whitebluecorner"; - dir = 8 + tag = "icon-whitebluecorner (WEST)" }, /area/medical/surgery1) "des" = ( @@ -88632,8 +85095,8 @@ tag = "" }, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/structure/grille, /obj/structure/window/reinforced{ @@ -88653,8 +85116,8 @@ tag = "" }, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/structure/grille, /obj/structure/window/reinforced{ @@ -88771,8 +85234,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 4 + dir = 4; + icon_state = "neutral" }, /area/maintenance/fpmaint2) "deQ" = ( @@ -88871,8 +85334,8 @@ "dfc" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /turf/simulated/floor/plating, /area/toxins/misc_lab) @@ -88917,8 +85380,8 @@ "dfi" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/machinery/door/poddoor/shutters{ density = 0; @@ -88939,8 +85402,8 @@ tag = "" }, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/machinery/door/poddoor/shutters{ density = 0; @@ -89147,8 +85610,8 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 4 + dir = 4; + icon_state = "neutral" }, /area/maintenance/starboard) "dfI" = ( @@ -89306,13 +85769,11 @@ /turf/simulated/floor/plasteel, /area/toxins/explab) "dgb" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - on = 1 - }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ - tag = "icon-whitepurple (WEST)"; + dir = 8; icon_state = "whitepurple"; - dir = 8 + tag = "icon-whitepurple (WEST)" }, /area/toxins/explab) "dgc" = ( @@ -89344,9 +85805,9 @@ /area/toxins/explab) "dgg" = ( /turf/simulated/floor/plasteel{ - tag = "icon-whitepurple (EAST)"; + dir = 4; icon_state = "whitepurple"; - dir = 4 + tag = "icon-whitepurple (EAST)" }, /area/toxins/explab) "dgh" = ( @@ -89381,9 +85842,8 @@ /turf/simulated/floor/plasteel, /area/toxins/explab) "dgl" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /obj/machinery/firealarm{ dir = 8; @@ -89424,8 +85884,8 @@ /area/medical/chemistry) "dgp" = ( /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/structure/table/reinforced, /obj/machinery/power/apc{ @@ -89536,8 +85996,8 @@ }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/hallway/primary/aft) "dgx" = ( @@ -89545,9 +86005,9 @@ /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ - tag = "icon-whitebluecorner (WEST)"; + dir = 8; icon_state = "whitebluecorner"; - dir = 8 + tag = "icon-whitebluecorner (WEST)" }, /area/medical/medbay) "dgy" = ( @@ -89601,8 +86061,8 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /turf/simulated/floor/plasteel{ dir = 8; @@ -89640,9 +86100,9 @@ dir = 1 }, /turf/simulated/floor/plasteel{ - tag = "icon-whiteblue (NORTH)"; + dir = 1; icon_state = "whiteblue"; - dir = 1 + tag = "icon-whiteblue (NORTH)" }, /area/medical/paramedic) "dgH" = ( @@ -89756,9 +86216,9 @@ "dgP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - tag = "icon-whitebluecorner (WEST)"; + dir = 8; icon_state = "whitebluecorner"; - dir = 8 + tag = "icon-whitebluecorner (WEST)" }, /area/medical/medbay) "dgQ" = ( @@ -89792,8 +86252,8 @@ "dgS" = ( /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ - tag = "icon-whitebluefull"; - icon_state = "whitebluefull" + icon_state = "whitebluefull"; + tag = "icon-whitebluefull" }, /area/medical/medbay) "dgT" = ( @@ -89834,9 +86294,9 @@ level = 1 }, /turf/simulated/floor/plasteel{ - tag = "icon-whitebluecorner (WEST)"; + dir = 8; icon_state = "whitebluecorner"; - dir = 8 + tag = "icon-whitebluecorner (WEST)" }, /area/medical/medbay) "dgX" = ( @@ -89890,9 +86350,8 @@ }, /area/medical/surgery) "dhd" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -89935,8 +86394,8 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 4 + dir = 4; + icon_state = "neutral" }, /area/maintenance/starboard) "dhi" = ( @@ -90178,8 +86637,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 4 + dir = 4; + icon_state = "neutral" }, /area/maintenance/fpmaint2) "dhI" = ( @@ -90266,9 +86725,7 @@ /turf/simulated/floor/plasteel, /area/crew_quarters/hor) "dhO" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - on = 1 - }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel, /area/crew_quarters/hor) @@ -90461,9 +86918,9 @@ tag = "" }, /obj/structure/disposalpipe/junction{ - tag = "icon-pipe-j2 (EAST)"; + dir = 4; icon_state = "pipe-j2"; - dir = 4 + tag = "icon-pipe-j2 (EAST)" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4; @@ -90571,8 +87028,8 @@ "dim" = ( /obj/structure/table, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/item/radio/intercom{ dir = 1; @@ -90651,8 +87108,8 @@ /obj/item/paper_bin, /obj/item/pen, /obj/machinery/light{ - icon_state = "tube1"; - dir = 4 + dir = 4; + icon_state = "tube1" }, /obj/structure/sign/nosmoking_2{ pixel_x = 32 @@ -90697,8 +87154,8 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/hallway/primary/aft) "dix" = ( @@ -90724,8 +87181,8 @@ }, /obj/machinery/hologram/holopad, /turf/simulated/floor/plasteel{ - tag = "icon-whitebluefull"; - icon_state = "whitebluefull" + icon_state = "whitebluefull"; + tag = "icon-whitebluefull" }, /area/medical/paramedic) "diz" = ( @@ -90749,8 +87206,8 @@ pixel_x = -27 }, /obj/machinery/shower{ - icon_state = "shower"; - dir = 4 + dir = 4; + icon_state = "shower" }, /obj/machinery/door/window/eastleft, /turf/simulated/floor/plasteel{ @@ -90851,8 +87308,8 @@ level = 1 }, /turf/simulated/floor/plasteel{ - tag = "icon-whitebluefull"; - icon_state = "whitebluefull" + icon_state = "whitebluefull"; + tag = "icon-whitebluefull" }, /area/medical/medbay) "diJ" = ( @@ -90915,8 +87372,8 @@ /area/medical/surgery) "diO" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 4 + dir = 4; + icon_state = "tube1" }, /obj/structure/chair, /turf/simulated/floor/plasteel{ @@ -91159,8 +87616,8 @@ level = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 4 + dir = 4; + icon_state = "neutral" }, /area/maintenance/fpmaint2) "djl" = ( @@ -91354,9 +87811,8 @@ icon_state = "2-4"; tag = "" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, @@ -91569,9 +88025,8 @@ /turf/simulated/floor/plasteel, /area/assembly/chargebay) "djU" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -91626,9 +88081,8 @@ }, /area/medical/genetics_cloning) "djZ" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -91687,9 +88141,9 @@ level = 1 }, /turf/simulated/floor/plasteel{ - tag = "icon-whitebluecorner (WEST)"; + dir = 8; icon_state = "whitebluecorner"; - dir = 8 + tag = "icon-whitebluecorner (WEST)" }, /area/medical/medbay) "dkg" = ( @@ -91723,8 +88177,8 @@ req_access_txt = "5" }, /turf/simulated/floor/plasteel{ - tag = "icon-whiteblue"; - icon_state = "whiteblue" + icon_state = "whiteblue"; + tag = "icon-whiteblue" }, /area/medical/genetics_cloning) "dkj" = ( @@ -91873,8 +88327,8 @@ "dkz" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 4 + dir = 4; + icon_state = "neutral" }, /area/medical/research) "dkA" = ( @@ -91968,9 +88422,9 @@ tag = "" }, /obj/structure/disposalpipe/junction{ - tag = "icon-pipe-j1 (EAST)"; + dir = 4; icon_state = "pipe-j1"; - dir = 4 + tag = "icon-pipe-j1 (EAST)" }, /obj/structure/cable{ d1 = 2; @@ -92083,8 +88537,8 @@ "dkV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /turf/simulated/floor/plasteel{ dir = 8; @@ -92139,14 +88593,13 @@ pixel_x = -24; pixel_y = -6 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ - tag = "icon-whitebluecorner (WEST)"; + dir = 8; icon_state = "whitebluecorner"; - dir = 8 + tag = "icon-whitebluecorner (WEST)" }, /area/medical/paramedic) "dla" = ( @@ -92190,8 +88643,8 @@ pixel_y = 0 }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/hallway/primary/aft) "dlf" = ( @@ -92199,8 +88652,8 @@ name = "Paramedic" }, /turf/simulated/floor/plasteel{ - tag = "icon-whitebluefull"; - icon_state = "whitebluefull" + icon_state = "whitebluefull"; + tag = "icon-whitebluefull" }, /area/medical/paramedic) "dlg" = ( @@ -92228,9 +88681,9 @@ network = list("Medical","SS13") }, /turf/simulated/floor/plasteel{ - tag = "icon-whitebluecorner (WEST)"; + dir = 8; icon_state = "whitebluecorner"; - dir = 8 + tag = "icon-whitebluecorner (WEST)" }, /area/medical/medbay) "dli" = ( @@ -92242,9 +88695,9 @@ /area/medical/genetics_cloning) "dlj" = ( /turf/simulated/floor/plasteel{ - tag = "icon-whitebluecorner (WEST)"; + dir = 8; icon_state = "whitebluecorner"; - dir = 8 + tag = "icon-whitebluecorner (WEST)" }, /area/medical/genetics_cloning) "dlk" = ( @@ -92293,8 +88746,8 @@ }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ - tag = "icon-whitebluefull"; - icon_state = "whitebluefull" + icon_state = "whitebluefull"; + tag = "icon-whitebluefull" }, /area/medical/medbay) "dlp" = ( @@ -92331,7 +88784,7 @@ }, /area/medical/medbay) "dls" = ( -/obj/machinery/atmospherics/unary/cold_sink/freezer{ +/obj/machinery/atmospherics/unary/thermomachine/freezer{ dir = 1 }, /obj/effect/decal/warning_stripes/south, @@ -92388,9 +88841,9 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - tag = "icon-whiteblue (NORTH)"; + dir = 1; icon_state = "whiteblue"; - dir = 1 + tag = "icon-whiteblue (NORTH)" }, /area/medical/surgery) "dly" = ( @@ -92606,9 +89059,9 @@ pixel_y = 0 }, /turf/simulated/floor/plasteel{ - tag = "icon-whitegreen (WEST)"; + dir = 8; icon_state = "whitegreen"; - dir = 8 + tag = "icon-whitegreen (WEST)" }, /area/medical/chemistry) "dlX" = ( @@ -92648,9 +89101,9 @@ tag = "" }, /turf/simulated/floor/plasteel{ - tag = "icon-whitepurple (WEST)"; + dir = 8; icon_state = "whitepurple"; - dir = 8 + tag = "icon-whitepurple (WEST)" }, /area/crew_quarters/hor) "dmb" = ( @@ -92683,9 +89136,9 @@ /obj/item/folder/white, /obj/item/stamp/rd, /turf/simulated/floor/plasteel{ - tag = "icon-whitepurple (EAST)"; + dir = 4; icon_state = "whitepurple"; - dir = 4 + tag = "icon-whitepurple (EAST)" }, /area/crew_quarters/hor) "dmd" = ( @@ -92725,8 +89178,8 @@ pixel_x = 28 }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/hallway/primary/aft) "dmi" = ( @@ -92764,8 +89217,8 @@ "dmm" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /turf/simulated/floor/plating, /area/medical/genetics) @@ -92784,8 +89237,8 @@ /area/medical/genetics) "dmp" = ( /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/power/apc{ @@ -92795,9 +89248,9 @@ shock_proof = 0 }, /turf/simulated/floor/plasteel{ - tag = "icon-whitebluecorner (WEST)"; + dir = 8; icon_state = "whitebluecorner"; - dir = 8 + tag = "icon-whitebluecorner (WEST)" }, /area/medical/medbay) "dmq" = ( @@ -92807,8 +89260,8 @@ "dmr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/light{ - icon_state = "tube1"; - dir = 4 + dir = 4; + icon_state = "tube1" }, /turf/simulated/floor/plasteel{ dir = 2; @@ -92830,13 +89283,13 @@ "dmv" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /turf/simulated/floor/plasteel{ - tag = "icon-whitebluecorner (WEST)"; + dir = 8; icon_state = "whitebluecorner"; - dir = 8 + tag = "icon-whitebluecorner (WEST)" }, /area/medical/medbay) "dmw" = ( @@ -92850,8 +89303,8 @@ /area/medical/surgery) "dmx" = ( /turf/simulated/floor/plasteel{ - tag = "icon-whitebluefull"; - icon_state = "whitebluefull" + icon_state = "whitebluefull"; + tag = "icon-whitebluefull" }, /area/medical/surgery) "dmy" = ( @@ -92883,13 +89336,12 @@ }, /area/medical/surgery) "dmB" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ - tag = "icon-whitebluefull"; - icon_state = "whitebluefull" + icon_state = "whitebluefull"; + tag = "icon-whitebluefull" }, /area/medical/surgery) "dmC" = ( @@ -92962,8 +89414,8 @@ }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 4 + dir = 4; + icon_state = "neutral" }, /area/maintenance/starboard) "dmK" = ( @@ -92988,8 +89440,8 @@ icon_state = "1-4" }, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/structure/grille, /obj/structure/window/reinforced, @@ -93006,8 +89458,8 @@ tag = "" }, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/structure/grille, /obj/structure/window/reinforced, @@ -93112,8 +89564,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 4 + dir = 4; + icon_state = "neutral" }, /area/maintenance/fpmaint2) "dnb" = ( @@ -93126,9 +89578,8 @@ }, /area/toxins/explab) "dnc" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -93205,8 +89656,8 @@ "dnl" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/structure/sign/securearea{ pixel_x = -32 @@ -93217,8 +89668,8 @@ "dnm" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/light{ - icon_state = "tube1"; - dir = 4 + dir = 4; + icon_state = "tube1" }, /turf/simulated/floor/plating, /area/toxins/misc_lab) @@ -93457,8 +89908,8 @@ "dnJ" = ( /obj/effect/decal/warning_stripes/northwestsouth, /obj/vehicle/ambulance{ - icon_state = "docwagon2"; - dir = 8 + dir = 8; + icon_state = "docwagon2" }, /obj/machinery/camera{ c_tag = "Paramedic's Office"; @@ -93466,9 +89917,9 @@ network = list("Medical","SS13") }, /turf/simulated/floor/plasteel{ - tag = "icon-whitebluecorner (WEST)"; + dir = 8; icon_state = "whitebluecorner"; - dir = 8 + tag = "icon-whitebluecorner (WEST)" }, /area/medical/paramedic) "dnK" = ( @@ -93529,9 +89980,9 @@ "dnO" = ( /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ - tag = "icon-whiteblue (WEST)"; + dir = 8; icon_state = "whiteblue"; - dir = 8 + tag = "icon-whiteblue (WEST)" }, /area/medical/genetics) "dnP" = ( @@ -93652,8 +90103,8 @@ level = 1 }, /turf/simulated/floor/plasteel{ - tag = "icon-whitebluefull"; - icon_state = "whitebluefull" + icon_state = "whitebluefull"; + tag = "icon-whitebluefull" }, /area/medical/medbay) "doa" = ( @@ -93694,9 +90145,9 @@ level = 1 }, /turf/simulated/floor/plasteel{ - tag = "icon-whiteblue (WEST)"; + dir = 8; icon_state = "whiteblue"; - dir = 8 + tag = "icon-whiteblue (WEST)" }, /area/medical/surgery) "dod" = ( @@ -93772,9 +90223,9 @@ req_access_txt = "45" }, /turf/simulated/floor/plasteel{ - tag = "icon-whiteblue (WEST)"; + dir = 8; icon_state = "whiteblue"; - dir = 8 + tag = "icon-whiteblue (WEST)" }, /area/medical/surgery) "doh" = ( @@ -93812,8 +90263,8 @@ }, /obj/machinery/optable, /turf/simulated/floor/plasteel{ - tag = "icon-whitebluefull"; - icon_state = "whitebluefull" + icon_state = "whitebluefull"; + tag = "icon-whitebluefull" }, /area/medical/surgery) "doj" = ( @@ -93861,8 +90312,8 @@ level = 1 }, /turf/simulated/floor/plasteel{ - tag = "icon-whitebluefull"; - icon_state = "whitebluefull" + icon_state = "whitebluefull"; + tag = "icon-whitebluefull" }, /area/medical/surgery) "dom" = ( @@ -93876,8 +90327,8 @@ level = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 4 + dir = 4; + icon_state = "neutral" }, /area/maintenance/starboard) "doo" = ( @@ -93942,9 +90393,8 @@ /turf/simulated/floor/plasteel, /area/medical/research) "dow" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "wood" @@ -93983,8 +90433,8 @@ name = "blobstart" }, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 4 + dir = 4; + icon_state = "neutral" }, /area/maintenance/fpmaint2) "doB" = ( @@ -94003,9 +90453,9 @@ pixel_y = 0 }, /turf/simulated/floor/plasteel{ - tag = "icon-whitegreen (EAST)"; + dir = 4; icon_state = "whitegreen"; - dir = 4 + tag = "icon-whitegreen (EAST)" }, /area/medical/chemistry) "doD" = ( @@ -94033,9 +90483,9 @@ network = list("Medical","SS13") }, /turf/simulated/floor/plasteel{ - tag = "icon-whitebluecorner (WEST)"; + dir = 8; icon_state = "whitebluecorner"; - dir = 8 + tag = "icon-whitebluecorner (WEST)" }, /area/medical/genetics_cloning) "doG" = ( @@ -94130,9 +90580,8 @@ }, /area/crew_quarters/hor) "doO" = ( -/obj/machinery/atmospherics/unary/heat_reservoir/heater{ - dir = 8; - on = 0 +/obj/machinery/atmospherics/unary/thermomachine/heater{ + dir = 8 }, /obj/effect/decal/warning_stripes/northwest, /turf/simulated/floor/plasteel, @@ -94210,9 +90659,8 @@ /turf/simulated/floor/plasteel, /area/assembly/chargebay) "doW" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /obj/effect/decal/warning_stripes/yellow/hollow, /obj/effect/landmark/start{ @@ -94319,13 +90767,13 @@ "dpf" = ( /obj/effect/decal/warning_stripes/northeastsouth, /obj/structure/bed/amb_trolley{ - icon_state = "ambulance"; - dir = 4 + dir = 4; + icon_state = "ambulance" }, /obj/machinery/light/small, /turf/simulated/floor/plasteel{ - tag = "icon-whiteblue"; - icon_state = "whiteblue" + icon_state = "whiteblue"; + tag = "icon-whiteblue" }, /area/medical/paramedic) "dpg" = ( @@ -94372,9 +90820,9 @@ name = "Geneticist" }, /turf/simulated/floor/plasteel{ - tag = "icon-whitepurple (NORTHWEST)"; + dir = 9; icon_state = "whitepurple"; - dir = 9 + tag = "icon-whitepurple (NORTHWEST)" }, /area/medical/genetics) "dpk" = ( @@ -94382,9 +90830,9 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - tag = "icon-whiteblue (NORTH)"; + dir = 1; icon_state = "whiteblue"; - dir = 1 + tag = "icon-whiteblue (NORTH)" }, /area/medical/genetics) "dpl" = ( @@ -94418,9 +90866,9 @@ level = 1 }, /turf/simulated/floor/plasteel{ - tag = "icon-whitepurple (EAST)"; + dir = 4; icon_state = "whitepurple"; - dir = 4 + tag = "icon-whitepurple (EAST)" }, /area/medical/genetics) "dpo" = ( @@ -94629,9 +91077,9 @@ level = 1 }, /turf/simulated/floor/plasteel{ - tag = "icon-whitebluecorner (WEST)"; + dir = 8; icon_state = "whitebluecorner"; - dir = 8 + tag = "icon-whitebluecorner (WEST)" }, /area/medical/medbay) "dpB" = ( @@ -94647,9 +91095,8 @@ icon_state = "2-8"; tag = "" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /obj/effect/landmark{ name = "lightsout" @@ -94672,9 +91119,9 @@ /area/medical/medbay) "dpD" = ( /turf/simulated/floor/plasteel{ - tag = "icon-whitebluecorner (WEST)"; + dir = 8; icon_state = "whitebluecorner"; - dir = 8 + tag = "icon-whitebluecorner (WEST)" }, /area/medical/surgery) "dpE" = ( @@ -94683,14 +91130,14 @@ on = 1 }, /turf/simulated/floor/plasteel{ - tag = "icon-whitebluefull"; - icon_state = "whitebluefull" + icon_state = "whitebluefull"; + tag = "icon-whitebluefull" }, /area/medical/surgery) "dpF" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 4 + dir = 4; + icon_state = "tube1" }, /turf/simulated/floor/plasteel{ dir = 2; @@ -94700,23 +91147,23 @@ /area/medical/surgery) "dpG" = ( /obj/structure/sink{ - icon_state = "sink"; dir = 8; + icon_state = "sink"; pixel_x = -12; pixel_y = 2 }, /turf/simulated/floor/plasteel{ - tag = "icon-whitebluecorner (WEST)"; + dir = 8; icon_state = "whitebluecorner"; - dir = 8 + tag = "icon-whitebluecorner (WEST)" }, /area/medical/surgery) "dpH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - tag = "icon-whitebluecorner (WEST)"; + dir = 8; icon_state = "whitebluecorner"; - dir = 8 + tag = "icon-whitebluecorner (WEST)" }, /area/medical/surgery) "dpI" = ( @@ -94727,8 +91174,8 @@ tag = "" }, /turf/simulated/floor/plasteel{ - tag = "icon-whiteblue"; - icon_state = "whiteblue" + icon_state = "whiteblue"; + tag = "icon-whiteblue" }, /area/medical/surgery) "dpJ" = ( @@ -94740,8 +91187,8 @@ /area/medical/surgery) "dpK" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 4 + dir = 4; + icon_state = "tube1" }, /obj/item/radio/intercom{ dir = 4; @@ -94871,8 +91318,8 @@ dir = 4 }, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/machinery/portable_atmospherics/scrubber, /obj/structure/sign/nosmoking_2{ @@ -94920,9 +91367,8 @@ /turf/simulated/floor/plasteel, /area/crew_quarters/hor) "dqd" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plating, /area/toxins/misc_lab) @@ -94938,8 +91384,8 @@ /area/crew_quarters/hor) "dqg" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 4 + dir = 4; + icon_state = "tube1" }, /obj/machinery/atmospherics/unary/portables_connector{ dir = 8 @@ -94980,8 +91426,8 @@ "dqj" = ( /obj/structure/table, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/structure/extinguisher_cabinet{ pixel_x = -28 @@ -95054,8 +91500,8 @@ pixel_y = 0 }, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/machinery/camera{ c_tag = "Medbay Genetics Office"; @@ -95064,9 +91510,9 @@ }, /obj/item/storage/box/disks, /turf/simulated/floor/plasteel{ - tag = "icon-whitepurple (WEST)"; + dir = 8; icon_state = "whitepurple"; - dir = 8 + tag = "icon-whitepurple (WEST)" }, /area/medical/genetics) "dqs" = ( @@ -95162,9 +91608,9 @@ level = 1 }, /turf/simulated/floor/plasteel{ - tag = "icon-whiteblue (WEST)"; + dir = 8; icon_state = "whiteblue"; - dir = 8 + tag = "icon-whiteblue (WEST)" }, /area/medical/genetics) "dqy" = ( @@ -95229,9 +91675,8 @@ dir = 2; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -95252,8 +91697,8 @@ "dqD" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/structure/cable{ d1 = 1; @@ -95299,13 +91744,12 @@ tag = "" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ - tag = "icon-whitebluefull"; - icon_state = "whitebluefull" + icon_state = "whitebluefull"; + tag = "icon-whitebluefull" }, /area/medical/medbay) "dqG" = ( @@ -95361,9 +91805,9 @@ pixel_y = -32 }, /turf/simulated/floor/plasteel{ - tag = "icon-whitebluecorner (WEST)"; + dir = 8; icon_state = "whitebluecorner"; - dir = 8 + tag = "icon-whitebluecorner (WEST)" }, /area/medical/surgery) "dqM" = ( @@ -95374,8 +91818,8 @@ }, /obj/machinery/computer/med_data, /turf/simulated/floor/plasteel{ - tag = "icon-whiteblue"; - icon_state = "whiteblue" + icon_state = "whiteblue"; + tag = "icon-whiteblue" }, /area/medical/surgery) "dqN" = ( @@ -95461,8 +91905,8 @@ /area/maintenance/starboard) "dqV" = ( /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/machinery/power/apc{ dir = 2; @@ -95794,8 +92238,8 @@ /area/assembly/chargebay) "drF" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 4 + dir = 4; + icon_state = "tube1" }, /obj/structure/reagent_dispensers/fueltank, /obj/machinery/firealarm{ @@ -95901,9 +92345,8 @@ }, /area/medical/research) "drO" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /obj/structure/chair/office/light{ dir = 8 @@ -95974,9 +92417,9 @@ name = "Geneticist" }, /turf/simulated/floor/plasteel{ - tag = "icon-whitepurple (SOUTHWEST)"; + dir = 10; icon_state = "whitepurple"; - dir = 10 + tag = "icon-whitepurple (SOUTHWEST)" }, /area/medical/genetics) "drV" = ( @@ -95985,8 +92428,8 @@ on = 1 }, /turf/simulated/floor/plasteel{ - tag = "icon-whiteblue"; - icon_state = "whiteblue" + icon_state = "whiteblue"; + tag = "icon-whiteblue" }, /area/medical/genetics) "drW" = ( @@ -96003,9 +92446,9 @@ "drY" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ - tag = "icon-whitepurple (EAST)"; + dir = 4; icon_state = "whitepurple"; - dir = 4 + tag = "icon-whitepurple (EAST)" }, /area/medical/genetics) "drZ" = ( @@ -96053,8 +92496,8 @@ /area/medical/medbay) "dsd" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/machinery/alarm{ dir = 4; @@ -96114,8 +92557,8 @@ pixel_x = 24 }, /obj/machinery/light{ - icon_state = "tube1"; - dir = 4 + dir = 4; + icon_state = "tube1" }, /obj/machinery/camera{ c_tag = "Chief Medical Officer's Office"; @@ -96338,9 +92781,8 @@ }, /area/crew_quarters/hor) "dsF" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -96348,8 +92790,8 @@ /area/crew_quarters/hor) "dsG" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 4 + dir = 4; + icon_state = "tube1" }, /obj/structure/bed, /obj/item/bedsheet/rd, @@ -96358,9 +92800,9 @@ pixel_y = 0 }, /turf/simulated/floor/plasteel{ - tag = "icon-whitepurple (EAST)"; + dir = 4; icon_state = "whitepurple"; - dir = 4 + tag = "icon-whitepurple (EAST)" }, /area/crew_quarters/hor) "dsH" = ( @@ -96444,8 +92886,8 @@ "dsN" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/machinery/door/poddoor/shutters{ density = 0; @@ -96571,9 +93013,9 @@ pixel_y = -22 }, /turf/simulated/floor/plasteel{ - tag = "icon-whiteblue (WEST)"; + dir = 8; icon_state = "whiteblue"; - dir = 8 + tag = "icon-whiteblue (WEST)" }, /area/medical/genetics) "dsX" = ( @@ -96642,8 +93084,8 @@ dir = 6 }, /turf/simulated/floor/plasteel{ - tag = "icon-whiteblue"; - icon_state = "whiteblue" + icon_state = "whiteblue"; + tag = "icon-whiteblue" }, /area/medical/medbay) "dtd" = ( @@ -96990,12 +93432,12 @@ /area/maintenance/auxsolarstarboard) "dtD" = ( /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/machinery/power/terminal{ - icon_state = "term"; - dir = 1 + dir = 1; + icon_state = "term" }, /obj/effect/landmark{ name = "blobstart" @@ -97041,8 +93483,8 @@ "dtH" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /turf/simulated/floor/plating, /area/medical/research) @@ -97098,8 +93540,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 4 + dir = 4; + icon_state = "neutral" }, /area/maintenance/fpmaint2) "dtQ" = ( @@ -97110,9 +93552,9 @@ "dtR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - tag = "icon-whitepurple (WEST)"; + dir = 8; icon_state = "whitepurple"; - dir = 8 + tag = "icon-whitepurple (WEST)" }, /area/toxins/mixing) "dtS" = ( @@ -97132,9 +93574,9 @@ /area/medical/research) "dtT" = ( /turf/simulated/floor/plasteel{ - tag = "icon-whitepurple (EAST)"; + dir = 4; icon_state = "whitepurple"; - dir = 4 + tag = "icon-whitepurple (EAST)" }, /area/toxins/mixing) "dtU" = ( @@ -97312,8 +93754,8 @@ "duj" = ( /obj/structure/table/reinforced, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/machinery/firealarm{ dir = 8; @@ -97406,10 +93848,8 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -97448,9 +93888,9 @@ network = list("SS13","MiniSat") }, /turf/simulated/floor/plasteel{ - tag = "icon-whitebluecorner (WEST)"; + dir = 8; icon_state = "whitebluecorner"; - dir = 8 + tag = "icon-whitebluecorner (WEST)" }, /area/medical/medbay) "dux" = ( @@ -97807,8 +94247,8 @@ /area/toxins/misc_lab) "dve" = ( /obj/machinery/atmospherics/pipe/simple/hidden/purple{ - icon_state = "intact"; - dir = 10 + dir = 10; + icon_state = "intact" }, /turf/simulated/floor/plasteel{ dir = 1; @@ -97838,8 +94278,8 @@ level = 1 }, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/item/radio/intercom{ dir = 8; @@ -97942,9 +94382,8 @@ }, /area/assembly/robotics) "dvq" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -97986,9 +94425,7 @@ }, /area/medical/morgue) "dvv" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - on = 1 - }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/machinery/light/small{ dir = 1 }, @@ -98013,8 +94450,8 @@ name = "revenantspawn" }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/medical/morgue) "dvy" = ( @@ -98143,9 +94580,8 @@ }, /area/medical/medbay) "dvM" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /obj/structure/mirror{ pixel_x = 0; @@ -98300,9 +94736,8 @@ tag = "" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "purplefull" @@ -98318,7 +94753,7 @@ }, /area/toxins/mixing) "dwc" = ( -/obj/machinery/atmospherics/unary/cold_sink/freezer{ +/obj/machinery/atmospherics/unary/thermomachine/freezer{ dir = 8 }, /obj/effect/decal/warning_stripes/northwest, @@ -98340,8 +94775,8 @@ /area/toxins/misc_lab) "dwe" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/purple{ - icon_state = "map"; - dir = 4 + dir = 4; + icon_state = "map" }, /turf/simulated/floor/plasteel{ dir = 1; @@ -98396,9 +94831,8 @@ }, /area/toxins/server) "dwk" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -98408,8 +94842,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/unary/cold_sink/freezer{ - current_temperature = 80; +/obj/machinery/atmospherics/unary/thermomachine/freezer/on/server{ on = 1 }, /turf/simulated/floor/plasteel{ @@ -98520,8 +94953,8 @@ dir = 8 }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/hallway/primary/aft) "dwv" = ( @@ -98609,8 +95042,8 @@ "dwH" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, @@ -98651,13 +95084,13 @@ pixel_y = 0 }, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /turf/simulated/floor/plasteel{ - tag = "icon-whitebluecorner (WEST)"; + dir = 8; icon_state = "whitebluecorner"; - dir = 8 + tag = "icon-whitebluecorner (WEST)" }, /area/medical/medbay) "dwL" = ( @@ -98670,8 +95103,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 4 + dir = 4; + icon_state = "neutral" }, /area/maintenance/starboard) "dwM" = ( @@ -98794,11 +95227,11 @@ /obj/item/book/manual/security_space_law, /obj/item/book/manual/detective, /obj/item/camera{ - name = "detectives camera"; desc = "A one use - polaroid camera. 30 photos left."; + name = "detectives camera"; + pictures_left = 30; pixel_x = 0; - pixel_y = 0; - pictures_left = 30 + pixel_y = 0 }, /turf/simulated/floor/wood{ broken = 1; @@ -98831,6 +95264,9 @@ network = list("Research Outpost") }, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/structure/disaster_counter/toxins{ + pixel_y = 32 + }, /turf/simulated/floor/plasteel, /area/toxins/mixing) "dxe" = ( @@ -98987,8 +95423,8 @@ /area/toxins/explab) "dxs" = ( /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/machinery/power/apc{ dir = 8; @@ -99188,8 +95624,8 @@ level = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/hallway/primary/aft) "dxG" = ( @@ -99290,8 +95726,8 @@ /obj/machinery/optable, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - tag = "icon-whitebluefull"; - icon_state = "whitebluefull" + icon_state = "whitebluefull"; + tag = "icon-whitebluefull" }, /area/medical/surgery1) "dxN" = ( @@ -99324,8 +95760,8 @@ /area/medical/morgue) "dxP" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 4 + dir = 4; + icon_state = "tube1" }, /obj/effect/decal/warning_stripes/yellow, /obj/machinery/alarm{ @@ -99464,8 +95900,8 @@ pressure_checks = 1 }, /turf/simulated/floor/plasteel{ - tag = "icon-whitebluefull"; - icon_state = "whitebluefull" + icon_state = "whitebluefull"; + tag = "icon-whitebluefull" }, /area/medical/medbay) "dya" = ( @@ -99728,8 +96164,8 @@ "dyI" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /turf/simulated/floor/plating, /area/toxins/server) @@ -99776,9 +96212,8 @@ tag = "" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "purplefull" @@ -99855,8 +96290,8 @@ pixel_x = -24 }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/medical/morgue) "dyV" = ( @@ -99901,8 +96336,8 @@ name = "revenantspawn" }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/medical/morgue) "dyZ" = ( @@ -99932,8 +96367,8 @@ /obj/structure/table, /obj/item/paper_bin, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/medical/morgue) "dzc" = ( @@ -100034,8 +96469,8 @@ /obj/structure/bed, /obj/item/bedsheet/cmo, /obj/machinery/light{ - icon_state = "tube1"; - dir = 4 + dir = 4; + icon_state = "tube1" }, /obj/machinery/status_display{ pixel_x = 32; @@ -100101,8 +96536,8 @@ /area/crew_quarters/theatre) "dzs" = ( /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/machinery/power/apc{ dir = 8; @@ -100194,8 +96629,8 @@ level = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 4 + dir = 4; + icon_state = "neutral" }, /area/toxins/mixing) "dzB" = ( @@ -100341,9 +96776,8 @@ /turf/simulated/floor/plasteel, /area/toxins/storage) "dzK" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, @@ -100512,8 +96946,8 @@ /area/medical/research) "dzV" = ( /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/structure/disposalpipe/trunk{ dir = 1 @@ -100635,9 +97069,8 @@ }, /area/medical/surgery) "dAh" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /obj/machinery/alarm{ dir = 1; @@ -100755,8 +97188,8 @@ tag = "" }, /turf/simulated/floor/plasteel{ - tag = "icon-whiteblue"; - icon_state = "whiteblue" + icon_state = "whiteblue"; + tag = "icon-whiteblue" }, /area/medical/medbay) "dAu" = ( @@ -100785,8 +97218,8 @@ level = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 4 + dir = 4; + icon_state = "neutral" }, /area/maintenance/starboard) "dAw" = ( @@ -100934,9 +97367,8 @@ /turf/simulated/floor/plasteel, /area/toxins/storage) "dAJ" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /obj/structure/sign/vacuum{ pixel_y = -32 @@ -101235,8 +97667,8 @@ tag = "" }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/hallway/primary/aft) "dBk" = ( @@ -101530,8 +97962,8 @@ tag = "" }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/hallway/primary/aft) "dBR" = ( @@ -101933,9 +98365,7 @@ /turf/simulated/floor/plating/airless, /area/engine/engineering) "dCy" = ( -/turf/simulated/shuttle/wall{ - icon_state = "wall3" - }, +/turf/simulated/wall/indestructible/riveted, /area/toxins/test_area) "dCz" = ( /obj/machinery/camera{ @@ -101943,8 +98373,7 @@ c_tag = "Bomb Test Site"; dir = 4; invuln = 1; - network = list("SS13,Toxins"); - use_power = 0 + network = list("SS13,Toxins") }, /obj/item/target, /turf/simulated/floor/plating/airless, @@ -102179,8 +98608,8 @@ "dCZ" = ( /obj/structure/rack, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/machinery/newscaster{ pixel_x = -32; @@ -102241,8 +98670,8 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/hallway/primary/aft) "dDe" = ( @@ -102426,9 +98855,9 @@ }, /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /turf/simulated/floor/plasteel{ - tag = "icon-whitegreen (WEST)"; + dir = 8; icon_state = "whitegreen"; - dir = 8 + tag = "icon-whitegreen (WEST)" }, /area/medical/medbay) "dDv" = ( @@ -102458,9 +98887,8 @@ dir = 4; level = 1 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -102479,9 +98907,9 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - tag = "icon-whitegreen (EAST)"; + dir = 4; icon_state = "whitegreen"; - dir = 4 + tag = "icon-whitegreen (EAST)" }, /area/medical/medbay) "dDx" = ( @@ -102729,8 +99157,8 @@ level = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 4 + dir = 4; + icon_state = "neutral" }, /area/maintenance/fpmaint2) "dEa" = ( @@ -102814,8 +99242,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/chair/stool, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 4 + dir = 4; + icon_state = "neutral" }, /area/medical/research) "dEi" = ( @@ -102877,17 +99305,17 @@ level = 1 }, /turf/simulated/floor/plasteel{ - tag = "icon-whitegreen (WEST)"; + dir = 8; icon_state = "whitegreen"; - dir = 8 + tag = "icon-whitegreen (WEST)" }, /area/medical/medbay) "dEs" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - tag = "icon-whitegreen (EAST)"; + dir = 4; icon_state = "whitegreen"; - dir = 4 + tag = "icon-whitegreen (EAST)" }, /area/medical/medbay) "dEt" = ( @@ -103067,8 +99495,8 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 4 + dir = 4; + icon_state = "neutral" }, /area/maintenance/fpmaint2) "dEK" = ( @@ -103090,8 +99518,8 @@ pixel_x = 24 }, /obj/structure/sink{ - icon_state = "sink"; dir = 8; + icon_state = "sink"; pixel_x = -12; pixel_y = 2 }, @@ -103182,8 +99610,8 @@ }, /obj/item/twohanded/required/kirbyplants, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/item/radio/intercom{ dir = 1; @@ -103357,9 +99785,8 @@ /turf/simulated/wall/r_wall, /area/toxins/storage) "dFn" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /obj/effect/decal/warning_stripes/west, /obj/effect/decal/warning_stripes/east, @@ -103381,9 +99808,8 @@ tag = "" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" @@ -103410,8 +99836,8 @@ /obj/item/clipboard, /obj/item/folder, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 4 + dir = 4; + icon_state = "neutral" }, /area/medical/research) "dFt" = ( @@ -103467,15 +99893,15 @@ /obj/item/stack/packageWrap, /obj/item/hand_labeler, /turf/simulated/floor/plasteel{ - icon_state = "blue"; - dir = 6 + dir = 6; + icon_state = "blue" }, /area/bridge) "dFy" = ( /obj/structure/table/reinforced, /obj/machinery/light{ - icon_state = "tube1"; - dir = 4 + dir = 4; + icon_state = "tube1" }, /obj/machinery/ai_status_display{ pixel_x = 32 @@ -103523,8 +99949,8 @@ /obj/structure/table/glass, /obj/machinery/cell_charger, /turf/simulated/floor/plasteel{ - tag = "icon-whitebluefull"; - icon_state = "whitebluefull" + icon_state = "whitebluefull"; + tag = "icon-whitebluefull" }, /area/medical/medbay) "dFF" = ( @@ -103546,8 +99972,8 @@ "dFI" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /turf/simulated/floor/plating, /area/medical/virology) @@ -103699,8 +100125,8 @@ "dGa" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -103769,8 +100195,8 @@ /area/maintenance/fpmaint2) "dGh" = ( /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/machinery/power/apc{ dir = 8; @@ -104231,11 +100657,6 @@ tag = "icon-whitebluecorner" }, /area/medical/surgery1) -"dGW" = ( -/turf/simulated/shuttle/wall{ - icon_state = "wall3" - }, -/area/shuttle/escape) "dGX" = ( /obj/structure/cable{ d1 = 4; @@ -104847,8 +101268,8 @@ /obj/item/radio, /obj/item/crowbar, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /turf/simulated/floor/plasteel{ dir = 10; @@ -104870,9 +101291,8 @@ }, /area/bridge) "dHP" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 0; @@ -104887,8 +101307,8 @@ /obj/structure/closet/secure_closet, /obj/item/storage/secure/briefcase, /turf/simulated/floor/plasteel{ - icon_state = "blue"; - dir = 6 + dir = 6; + icon_state = "blue" }, /area/bridge) "dHR" = ( @@ -104907,9 +101327,9 @@ /area/assembly/robotics) "dHS" = ( /obj/structure/disposalpipe/junction{ - tag = "icon-pipe-j2"; + dir = 2; icon_state = "pipe-j2"; - dir = 2 + tag = "icon-pipe-j2" }, /turf/simulated/floor/plasteel{ dir = 2; @@ -104946,13 +101366,6 @@ /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, /area/hallway/primary/aft) -"dHW" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f6"; - dir = 2 - }, -/area/shuttle/escape) "dHX" = ( /obj/structure/cable{ d1 = 1; @@ -104964,21 +101377,14 @@ pixel_x = -32 }, /obj/structure/sink{ - icon_state = "sink"; dir = 8; + icon_state = "sink"; pixel_x = -12; pixel_y = 2 }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/medical/surgery1) -"dHY" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f10"; - dir = 2 - }, -/area/shuttle/escape) "dHZ" = ( /obj/structure/chair/office/dark{ dir = 4 @@ -105159,9 +101565,8 @@ icon_state = "2-8"; tag = "" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -105169,8 +101574,8 @@ /area/medical/virology) "dIo" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 4 + dir = 4; + icon_state = "tube1" }, /obj/machinery/status_display{ pixel_x = 32; @@ -105404,49 +101809,6 @@ /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/hallway/secondary/exit) -"dIP" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall7"; - dir = 2 - }, -/area/shuttle/escape) -"dIQ" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall12"; - dir = 2 - }, -/area/shuttle/escape) -"dIR" = ( -/obj/structure/grille, -/obj/structure/window/full/shuttle{ - icon_state = "14" - }, -/turf/simulated/floor/plating, -/area/shuttle/escape) -"dIS" = ( -/obj/structure/grille, -/obj/structure/window/full/shuttle{ - icon_state = "17" - }, -/turf/simulated/floor/plating, -/area/shuttle/escape) -"dIT" = ( -/obj/structure/grille, -/obj/structure/window/full/shuttle, -/turf/simulated/floor/plating, -/area/shuttle/escape) -"dIU" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall14"; - dir = 2 - }, -/area/shuttle/escape) -"dIV" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall11"; - dir = 2 - }, -/area/shuttle/escape) "dIW" = ( /obj/structure/sign/biohazard, /turf/simulated/wall/r_wall, @@ -105529,9 +101891,8 @@ icon_state = "2-8"; tag = "" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4; @@ -105623,8 +101984,8 @@ /area/maintenance/auxsolarstarboard) "dJl" = ( /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/machinery/power/apc{ dir = 8; @@ -105797,8 +102158,8 @@ }, /obj/item/reagent_containers/dropper, /turf/simulated/floor/plasteel{ - tag = "icon-whitebluefull"; - icon_state = "whitebluefull" + icon_state = "whitebluefull"; + tag = "icon-whitebluefull" }, /area/medical/medbay) "dJF" = ( @@ -105815,37 +102176,6 @@ /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit) -"dJI" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall3"; - dir = 2 - }, -/area/shuttle/escape) -"dJJ" = ( -/obj/machinery/door/airlock/medical/glass{ - id_tag = null; - name = "Escape Shuttle Infirmary"; - req_access_txt = "0" - }, -/obj/effect/decal/warning_stripes/south, -/turf/simulated/floor/plasteel, -/area/shuttle/escape) -"dJK" = ( -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "neutral" - }, -/area/shuttle/escape) -"dJL" = ( -/obj/machinery/light{ - dir = 1; - on = 1 - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "neutral" - }, -/area/shuttle/escape) "dJM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -105861,17 +102191,11 @@ tag = "icon-whitebluecorner" }, /area/medical/surgery) -"dJN" = ( -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "cmo" - }, -/area/shuttle/escape) "dJO" = ( /turf/simulated/floor/plasteel{ - tag = "icon-whitebluecorner (WEST)"; + dir = 8; icon_state = "whitebluecorner"; - dir = 8 + tag = "icon-whitebluecorner (WEST)" }, /area/medical/surgery1) "dJP" = ( @@ -106012,8 +102336,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/item/twohanded/required/kirbyplants, /obj/machinery/light{ - icon_state = "tube1"; - dir = 4 + dir = 4; + icon_state = "tube1" }, /obj/machinery/firealarm{ dir = 4; @@ -106148,35 +102472,6 @@ /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit) -"dKt" = ( -/obj/item/twohanded/required/kirbyplants, -/obj/machinery/light{ - icon_state = "tube1"; - dir = 8 - }, -/turf/simulated/floor/plasteel, -/area/shuttle/escape) -"dKu" = ( -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/shuttle/escape) -"dKv" = ( -/obj/item/twohanded/required/kirbyplants, -/obj/machinery/light{ - icon_state = "tube1"; - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/shuttle/escape) -"dKw" = ( -/obj/machinery/status_display, -/turf/simulated/shuttle/wall{ - icon_state = "swall3"; - dir = 2 - }, -/area/shuttle/escape) "dKx" = ( /obj/structure/cable{ d1 = 4; @@ -106195,18 +102490,11 @@ /obj/structure/lattice/catwalk, /turf/space, /area/maintenance/auxsolarstarboard) -"dKy" = ( -/obj/structure/grille, -/obj/structure/window/full/shuttle{ - icon_state = "16" - }, -/turf/simulated/floor/plating, -/area/shuttle/escape) "dKz" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/structure/cable{ d1 = 2; @@ -106258,8 +102546,8 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/light{ - icon_state = "tube1"; - dir = 4 + dir = 4; + icon_state = "tube1" }, /obj/machinery/power/apc{ dir = 4; @@ -106373,54 +102661,14 @@ /area/hallway/secondary/exit) "dKQ" = ( /obj/machinery/door/airlock/external{ - aiControlDisabled = 0; hackProof = 1; id_tag = "emergency_home"; + locked = 1; name = "Escape Airlock" }, /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit) -"dKR" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = -28 - }, -/obj/machinery/shieldgen, -/obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, -/area/shuttle/escape) -"dKS" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/obj/structure/rack, -/obj/item/storage/toolbox/electrical{ - pixel_x = -4; - pixel_y = 4 - }, -/obj/item/storage/toolbox/emergency, -/obj/item/storage/toolbox/mechanical{ - pixel_x = 4; - pixel_y = -4 - }, -/obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, -/area/shuttle/escape) -"dKT" = ( -/obj/structure/flora/ausbushes/grassybush, -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/ausbushes/ywflowers, -/obj/structure/flora/ausbushes/fernybush, -/obj/structure/window/full/shuttle, -/turf/simulated/floor/grass, -/area/shuttle/escape) -"dKU" = ( -/turf/simulated/floor/plasteel{ - tag = "icon-whiteblue (NORTH)"; - icon_state = "whiteblue"; - dir = 1 - }, -/area/shuttle/escape) "dKV" = ( /obj/structure/cable{ d1 = 1; @@ -106442,13 +102690,6 @@ icon_state = "white" }, /area/medical/medbay) -"dKW" = ( -/obj/structure/grille, -/obj/structure/window/full/shuttle{ - icon_state = "8" - }, -/turf/simulated/floor/plating, -/area/shuttle/escape) "dKX" = ( /obj/structure/cable{ d1 = 4; @@ -106513,8 +102754,8 @@ pixel_x = -24 }, /obj/structure/sink{ - icon_state = "sink"; dir = 8; + icon_state = "sink"; pixel_x = -12; pixel_y = 2 }, @@ -106549,13 +102790,12 @@ /turf/simulated/floor/plasteel, /area/medical/virology) "dLd" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /obj/structure/sink{ - icon_state = "sink"; dir = 8; + icon_state = "sink"; pixel_x = -12; pixel_y = 2 }, @@ -106568,9 +102808,9 @@ "dLe" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - tag = "icon-whitegreen (WEST)"; + dir = 8; icon_state = "whitegreen"; - dir = 8 + tag = "icon-whitegreen (WEST)" }, /area/medical/virology) "dLf" = ( @@ -106599,9 +102839,9 @@ dir = 8 }, /turf/simulated/floor/plasteel{ - tag = "icon-whitegreen (EAST)"; + dir = 4; icon_state = "whitegreen"; - dir = 4 + tag = "icon-whitegreen (EAST)" }, /area/medical/virology) "dLh" = ( @@ -106630,9 +102870,7 @@ }, /area/medical/virology) "dLk" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - on = 1 - }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/machinery/light/small{ dir = 1 }, @@ -106757,9 +102995,8 @@ }, /area/chapel/main) "dLw" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -106803,16 +103040,6 @@ /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit) -"dLB" = ( -/obj/machinery/door/airlock/shuttle{ - aiControlDisabled = 1; - hackProof = 1; - id_tag = "s_docking_airlock"; - name = "Shuttle Hatch" - }, -/obj/effect/decal/warning_stripes/west, -/turf/simulated/floor/plasteel, -/area/shuttle/escape) "dLC" = ( /obj/structure/cable{ d1 = 4; @@ -106823,9 +103050,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - on = 1 - }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -106927,51 +103152,6 @@ /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit) -"dLL" = ( -/obj/structure/grille, -/obj/structure/window/full/shuttle{ - icon_state = "15" - }, -/turf/simulated/floor/plating, -/area/shuttle/escape) -"dLM" = ( -/obj/machinery/ai_status_display, -/turf/simulated/shuttle/wall{ - icon_state = "swall3"; - dir = 2 - }, -/area/shuttle/escape) -"dLN" = ( -/obj/structure/reagent_dispensers/fueltank, -/obj/item/radio/intercom{ - dir = 8; - name = "station intercom (General)"; - pixel_x = -28 - }, -/obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, -/area/shuttle/escape) -"dLO" = ( -/obj/structure/closet/crate/internals, -/obj/item/clothing/suit/storage/hazardvest, -/obj/item/clothing/suit/storage/hazardvest, -/obj/item/clothing/suit/storage/hazardvest, -/obj/item/clothing/suit/storage/hazardvest, -/obj/item/tank/emergency_oxygen/double, -/obj/item/tank/emergency_oxygen/double, -/obj/item/tank/emergency_oxygen/double, -/obj/item/tank/emergency_oxygen/double, -/obj/item/clothing/mask/breath, -/obj/item/clothing/mask/breath, -/obj/item/clothing/mask/breath, -/obj/item/clothing/mask/breath, -/obj/item/clothing/head/hardhat/orange, -/obj/item/clothing/head/hardhat/orange, -/obj/item/clothing/head/hardhat/orange, -/obj/item/clothing/head/hardhat/orange, -/obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, -/area/shuttle/escape) "dLP" = ( /obj/structure/cable, /obj/machinery/power/apc{ @@ -107262,14 +103442,6 @@ icon_state = "neutralfull" }, /area/hallway/secondary/exit) -"dMt" = ( -/obj/structure/flora/ausbushes/grassybush, -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/ausbushes/sunnybush, -/obj/structure/window/full/shuttle, -/turf/simulated/floor/grass, -/area/shuttle/escape) "dMu" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, @@ -107287,9 +103459,9 @@ tag = "" }, /turf/simulated/floor/plasteel{ - tag = "icon-whitegreen (WEST)"; + dir = 8; icon_state = "whitegreen"; - dir = 8 + tag = "icon-whitegreen (WEST)" }, /area/medical/virology) "dMx" = ( @@ -107357,9 +103529,9 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - tag = "icon-whitegreen (EAST)"; + dir = 4; icon_state = "whitegreen"; - dir = 4 + tag = "icon-whitegreen (EAST)" }, /area/medical/virology) "dMA" = ( @@ -107466,8 +103638,8 @@ "dMF" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, @@ -107590,9 +103762,8 @@ tag = "" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /obj/effect/landmark{ name = "blobstart" @@ -107613,8 +103784,8 @@ pixel_y = 0 }, /obj/machinery/light{ - icon_state = "tube1"; - dir = 4 + dir = 4; + icon_state = "tube1" }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -107710,37 +103881,6 @@ icon_state = "neutralfull" }, /area/hallway/secondary/exit) -"dNe" = ( -/obj/item/twohanded/required/kirbyplants, -/turf/simulated/floor/plasteel, -/area/shuttle/escape) -"dNf" = ( -/obj/structure/extinguisher_cabinet, -/turf/simulated/shuttle/wall{ - icon_state = "swall3"; - dir = 2 - }, -/area/shuttle/escape) -"dNg" = ( -/turf/simulated/floor/plasteel{ - tag = "icon-whiteblue"; - icon_state = "whiteblue" - }, -/area/shuttle/escape) -"dNh" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = 28 - }, -/obj/machinery/light/small{ - dir = 4; - pixel_y = 8 - }, -/turf/simulated/floor/plasteel{ - tag = "icon-whiteblue (SOUTHEAST)"; - icon_state = "whiteblue"; - dir = 6 - }, -/area/shuttle/escape) "dNi" = ( /obj/structure/cable{ d1 = 1; @@ -107821,9 +103961,8 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ @@ -107843,8 +103982,8 @@ /area/medical/virology) "dNs" = ( /obj/structure/sink{ - icon_state = "sink"; dir = 8; + icon_state = "sink"; pixel_x = -12; pixel_y = 2 }, @@ -108043,17 +104182,7 @@ /obj/machinery/ai_status_display, /turf/simulated/wall, /area/hallway/secondary/exit) -"dNR" = ( -/obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, -/area/shuttle/escape) "dNS" = ( -/obj/docking_port/mobile/emergency{ - dir = 4; - dwidth = 11; - height = 18; - width = 29 - }, /obj/docking_port/stationary{ dir = 4; dwidth = 11; @@ -108062,38 +104191,8 @@ name = "emergency evac bay"; width = 29 }, -/obj/machinery/door/airlock/shuttle{ - aiControlDisabled = 1; - hackProof = 1; - id_tag = "s_docking_airlock"; - name = "Shuttle Hatch" - }, -/obj/effect/decal/warning_stripes/west, -/turf/simulated/floor/plasteel, -/area/shuttle/escape) -"dNT" = ( -/obj/structure/sign/greencross, -/turf/simulated/shuttle/wall{ - icon_state = "swall3"; - dir = 2 - }, -/area/shuttle/escape) -"dNU" = ( -/obj/machinery/sleeper{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "cmo" - }, -/area/shuttle/escape) -"dNV" = ( -/obj/machinery/sleeper, -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "cmo" - }, -/area/shuttle/escape) +/turf/space, +/area/space) "dNW" = ( /obj/structure/filingcabinet/chestdrawer, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -108125,30 +104224,17 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - on = 1 - }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, /area/medical/virology) "dNZ" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - tag = "icon-whiteblue"; - icon_state = "whiteblue" + icon_state = "whiteblue"; + tag = "icon-whiteblue" }, /area/medical/surgery1) -"dOa" = ( -/obj/machinery/door/airlock/medical/glass{ - id_tag = null; - name = "Escape Shuttle Infirmary"; - req_access_txt = "0" - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/shuttle/escape) "dOb" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -108242,9 +104328,9 @@ level = 1 }, /turf/simulated/floor/plasteel{ - tag = "icon-whitegreen (WEST)"; + dir = 8; icon_state = "whitegreen"; - dir = 8 + tag = "icon-whitegreen (WEST)" }, /area/medical/virology) "dOi" = ( @@ -108317,9 +104403,9 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - tag = "icon-whitegreen (EAST)"; + dir = 4; icon_state = "whitegreen"; - dir = 4 + tag = "icon-whitegreen (EAST)" }, /area/medical/virology) "dOm" = ( @@ -108367,8 +104453,8 @@ "dOq" = ( /obj/structure/chair/wood, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /turf/simulated/floor/plasteel{ dir = 8; @@ -108390,8 +104476,8 @@ "dOt" = ( /obj/structure/chair/wood, /obj/machinery/light{ - icon_state = "tube1"; - dir = 4 + dir = 4; + icon_state = "tube1" }, /obj/machinery/newscaster{ pixel_x = 32; @@ -108415,8 +104501,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/item/twohanded/required/kirbyplants, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, @@ -108439,43 +104525,11 @@ icon_state = "neutralfull" }, /area/hallway/secondary/exit) -"dOy" = ( -/obj/effect/decal/warning_stripes/yellow/hollow, -/obj/structure/chair/comfy/shuttle{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/shuttle/escape) -"dOz" = ( -/obj/effect/decal/warning_stripes/yellow/hollow, -/obj/structure/chair/comfy/shuttle{ - dir = 8 - }, -/turf/simulated/floor/plasteel, -/area/shuttle/escape) -"dOA" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall7"; - icon_state = "swall7"; - dir = 2 - }, -/area/shuttle/escape) -"dOB" = ( -/obj/effect/decal/warning_stripes/northwest, -/turf/simulated/floor/plasteel, -/area/shuttle/escape) -"dOC" = ( -/obj/structure/sign/greencross, -/turf/simulated/shuttle/wall{ - icon_state = "swall12"; - dir = 2 - }, -/area/shuttle/escape) "dOD" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/structure/cable{ d1 = 1; @@ -108512,8 +104566,8 @@ level = 1 }, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /turf/simulated/floor/plasteel{ dir = 8; @@ -108557,8 +104611,8 @@ level = 1 }, /obj/structure/sink{ - icon_state = "sink"; dir = 8; + icon_state = "sink"; pixel_x = -12; pixel_y = 2 }, @@ -108691,8 +104745,8 @@ /area/chapel/office) "dOV" = ( /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/machinery/power/apc{ dir = 8; @@ -108822,24 +104876,6 @@ /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, /area/medical/virology) -"dPh" = ( -/obj/effect/decal/warning_stripes/northeast, -/turf/simulated/floor/plasteel, -/area/shuttle/escape) -"dPi" = ( -/obj/structure/closet/crate/medical, -/obj/item/storage/firstaid/regular, -/obj/item/storage/firstaid/o2{ - pixel_x = 2; - pixel_y = -2 - }, -/obj/item/storage/firstaid/toxin{ - pixel_x = -2; - pixel_y = 4 - }, -/obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, -/area/shuttle/escape) "dPj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5; @@ -109177,31 +105213,6 @@ icon_state = "neutralfull" }, /area/hallway/secondary/exit) -"dPO" = ( -/obj/structure/reagent_dispensers/watertank, -/obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, -/area/shuttle/escape) -"dPP" = ( -/obj/effect/decal/warning_stripes/west, -/turf/simulated/floor/plasteel, -/area/shuttle/escape) -"dPQ" = ( -/obj/effect/decal/warning_stripes/east, -/turf/simulated/floor/plasteel, -/area/shuttle/escape) -"dPR" = ( -/obj/structure/closet/crate, -/obj/item/storage/toolbox/emergency, -/obj/item/storage/toolbox/emergency, -/obj/item/flashlight/flare, -/obj/item/flashlight/flare, -/obj/item/crowbar, -/obj/item/wrench, -/obj/item/radio, -/obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, -/area/shuttle/escape) "dPS" = ( /turf/simulated/wall/r_wall/rust, /area/medical/virology) @@ -109217,9 +105228,9 @@ /obj/structure/bed, /obj/item/bedsheet/medical, /turf/simulated/floor/plasteel{ - tag = "icon-whitegreen (NORTHWEST)"; + dir = 9; icon_state = "whitegreen"; - dir = 9 + tag = "icon-whitegreen (NORTHWEST)" }, /area/medical/virology) "dPV" = ( @@ -109228,9 +105239,9 @@ on = 1 }, /turf/simulated/floor/plasteel{ - tag = "icon-whitegreen (NORTHEAST)"; + dir = 5; icon_state = "whitegreen"; - dir = 5 + tag = "icon-whitegreen (NORTHEAST)" }, /area/medical/virology) "dPW" = ( @@ -109239,9 +105250,9 @@ on = 1 }, /turf/simulated/floor/plasteel{ - tag = "icon-whitegreen (NORTHWEST)"; + dir = 9; icon_state = "whitegreen"; - dir = 9 + tag = "icon-whitegreen (NORTHWEST)" }, /area/medical/virology) "dPX" = ( @@ -109249,9 +105260,9 @@ /obj/structure/bed, /obj/item/bedsheet/medical, /turf/simulated/floor/plasteel{ - tag = "icon-whitegreen (NORTHEAST)"; + dir = 5; icon_state = "whitegreen"; - dir = 5 + tag = "icon-whitegreen (NORTHEAST)" }, /area/medical/virology) "dPY" = ( @@ -109268,8 +105279,8 @@ /area/maintenance/portsolar) "dQa" = ( /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/machinery/power/smes, /obj/machinery/light/small{ @@ -109367,8 +105378,8 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/light{ - icon_state = "tube1"; - dir = 4 + dir = 4; + icon_state = "tube1" }, /obj/machinery/camera{ c_tag = "Cremator"; @@ -109465,8 +105476,8 @@ pixel_y = 0 }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/hallway/primary/aft) "dQs" = ( @@ -109482,15 +105493,6 @@ /obj/machinery/door/airlock/maintenance, /turf/simulated/floor/plasteel, /area/hallway/primary/aft) -"dQt" = ( -/obj/machinery/door/airlock/shuttle{ - aiControlDisabled = 1; - hackProof = 1; - id_tag = null; - name = "Shuttle Cargo Hatch" - }, -/turf/simulated/floor/plasteel, -/area/shuttle/escape) "dQu" = ( /obj/structure/table, /obj/item/reagent_containers/iv_bag/blood/random, @@ -109539,15 +105541,14 @@ /turf/simulated/floor/plasteel, /area/medical/virology) "dQx" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /obj/machinery/iv_drip, /turf/simulated/floor/plasteel{ - tag = "icon-whitegreen (SOUTHWEST)"; + dir = 10; icon_state = "whitegreen"; - dir = 10 + tag = "icon-whitegreen (SOUTHWEST)" }, /area/medical/virology) "dQy" = ( @@ -109556,9 +105557,9 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - tag = "icon-whitegreen (SOUTHEAST)"; + dir = 6; icon_state = "whitegreen"; - dir = 6 + tag = "icon-whitegreen (SOUTHEAST)" }, /area/medical/virology) "dQz" = ( @@ -109567,21 +105568,20 @@ dir = 8 }, /turf/simulated/floor/plasteel{ - tag = "icon-whitegreen (SOUTHWEST)"; + dir = 10; icon_state = "whitegreen"; - dir = 10 + tag = "icon-whitegreen (SOUTHWEST)" }, /area/medical/virology) "dQA" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /obj/machinery/iv_drip, /turf/simulated/floor/plasteel{ - tag = "icon-whitegreen (SOUTHEAST)"; + dir = 6; icon_state = "whitegreen"; - dir = 6 + tag = "icon-whitegreen (SOUTHEAST)" }, /area/medical/virology) "dQB" = ( @@ -109649,9 +105649,9 @@ /area/medical/virology) "dQI" = ( /obj/machinery/door/airlock/external{ - aiControlDisabled = 0; hackProof = 1; id_tag = "emergency_home"; + locked = 1; name = "Escape Airlock" }, /obj/effect/decal/warning_stripes/west, @@ -109663,8 +105663,8 @@ icon_state = "0-8" }, /obj/machinery/power/terminal{ - icon_state = "term"; - dir = 1 + dir = 1; + icon_state = "term" }, /obj/effect/landmark{ name = "blobstart" @@ -109703,15 +105703,15 @@ id_tag = "robotics_solar_pump" }, /obj/machinery/embedded_controller/radio/airlock/airlock_controller{ - tag_airpump = "robotics_solar_pump"; - tag_exterior_door = "robotics_solar_outer"; frequency = 1379; id_tag = "robotics_solar_airlock"; - tag_interior_door = "robotics_solar_inner"; pixel_x = 0; pixel_y = -25; req_access_txt = "13"; - tag_chamber_sensor = "robotics_solar_sensor" + tag_airpump = "robotics_solar_pump"; + tag_chamber_sensor = "robotics_solar_sensor"; + tag_exterior_door = "robotics_solar_outer"; + tag_interior_door = "robotics_solar_inner" }, /obj/machinery/airlock_sensor{ frequency = 1379; @@ -109827,9 +105827,8 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -109837,8 +105836,8 @@ /area/chapel/office) "dQV" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/structure/extinguisher_cabinet{ pixel_x = -28 @@ -109849,9 +105848,8 @@ }, /area/chapel/main) "dQW" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "chapel" @@ -109886,8 +105884,8 @@ "dRa" = ( /obj/item/twohanded/required/kirbyplants, /obj/machinery/light{ - icon_state = "tube1"; - dir = 4 + dir = 4; + icon_state = "tube1" }, /turf/simulated/floor/plasteel{ icon_state = "chapel" @@ -109937,23 +105935,6 @@ /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel, /area/maintenance/portsolar) -"dRd" = ( -/obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, -/area/shuttle/escape) -"dRe" = ( -/obj/machinery/light{ - icon_state = "tube1"; - dir = 8 - }, -/obj/structure/rack, -/obj/item/clothing/suit/fire/firefighter, -/obj/item/tank/oxygen/red, -/obj/item/clothing/mask/gas, -/obj/item/clothing/head/hardhat/red, -/obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, -/area/shuttle/escape) "dRf" = ( /obj/structure/cable{ d1 = 1; @@ -110337,31 +106318,14 @@ }, /area/hallway/secondary/exit) "dRV" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/hallway/secondary/exit) -"dRW" = ( -/obj/effect/decal/warning_stripes/southwest, -/turf/simulated/floor/plasteel, -/area/shuttle/escape) -"dRX" = ( -/obj/effect/decal/warning_stripes/southeast, -/turf/simulated/floor/plasteel, -/area/shuttle/escape) -"dRY" = ( -/obj/structure/table, -/obj/item/clipboard, -/obj/item/folder/yellow, -/obj/item/pen, -/obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, -/area/shuttle/escape) "dRZ" = ( /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel, @@ -110372,10 +106336,10 @@ /obj/item/clothing/suit/storage/hazardvest, /obj/item/clothing/suit/storage/hazardvest, /obj/item/clothing/suit/storage/hazardvest, -/obj/item/tank/emergency_oxygen/double, -/obj/item/tank/emergency_oxygen/double, -/obj/item/tank/emergency_oxygen/double, -/obj/item/tank/emergency_oxygen/double, +/obj/item/tank/internals/emergency_oxygen/double, +/obj/item/tank/internals/emergency_oxygen/double, +/obj/item/tank/internals/emergency_oxygen/double, +/obj/item/tank/internals/emergency_oxygen/double, /obj/item/clothing/mask/breath, /obj/item/clothing/mask/breath, /obj/item/clothing/mask/breath, @@ -110396,7 +106360,7 @@ tag = "" }, /obj/structure/rack, -/obj/item/tank/oxygen, +/obj/item/tank/internals/oxygen, /obj/item/radio, /obj/item/clothing/mask/breath, /turf/simulated/floor/plating, @@ -110409,7 +106373,7 @@ tag = "" }, /obj/structure/rack, -/obj/item/tank/oxygen, +/obj/item/tank/internals/oxygen, /obj/item/radio, /obj/item/clothing/mask/breath, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -110496,9 +106460,8 @@ }, /area/chapel/office) "dSk" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /obj/machinery/alarm{ pixel_y = 23 @@ -110550,8 +106513,8 @@ /obj/structure/closet/firecloset, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 4 + dir = 4; + icon_state = "neutral" }, /area/maintenance/fpmaint2) "dSq" = ( @@ -110600,39 +106563,6 @@ /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit) -"dSv" = ( -/turf/simulated/floor/plasteel{ - icon_state = "neutral" - }, -/area/shuttle/escape) -"dSw" = ( -/obj/machinery/light, -/turf/simulated/floor/plasteel{ - icon_state = "neutral" - }, -/area/shuttle/escape) -"dSx" = ( -/obj/machinery/recharge_station, -/obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, -/area/shuttle/escape) -"dSy" = ( -/obj/structure/table, -/obj/machinery/cell_charger, -/obj/item/stock_parts/cell/high, -/obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, -/area/shuttle/escape) -"dSz" = ( -/obj/machinery/door/airlock/command/glass{ - name = "Escape Shuttle Cockpit"; - req_access_txt = "19" - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/shuttle/escape) "dSA" = ( /obj/structure/table/reinforced, /obj/item/stack/sheet/metal/fifty{ @@ -110799,8 +106729,8 @@ "dSR" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /turf/simulated/floor/plating, /area/security/checkpoint) @@ -110842,8 +106772,8 @@ tag = "" }, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, @@ -110899,27 +106829,6 @@ /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/security/checkpoint) -"dTb" = ( -/obj/machinery/door/airlock/security/glass{ - name = "Escape Shuttle Cell"; - req_access_txt = "2" - }, -/turf/simulated/shuttle/floor4, -/area/shuttle/escape) -"dTc" = ( -/obj/item/clipboard, -/obj/structure/table, -/obj/item/toy/figure/ninja, -/obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, -/area/shuttle/escape) -"dTd" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall13"; - icon_state = "swall13"; - dir = 2 - }, -/area/shuttle/escape) "dTe" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -110983,8 +106892,8 @@ /area/security/checkpoint) "dTj" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/structure/reagent_dispensers/watertank, /turf/simulated/floor/plating, @@ -111188,15 +107097,6 @@ }, /turf/simulated/wall, /area/security/checkpoint) -"dTz" = ( -/obj/structure/table/reinforced, -/obj/item/storage/backpack/medic, -/obj/item/storage/belt/medical, -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "cmo" - }, -/area/shuttle/escape) "dTA" = ( /obj/structure/cable{ d1 = 1; @@ -111206,8 +107106,8 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 1 + dir = 1; + icon_state = "red" }, /area/security/checkpoint) "dTB" = ( @@ -111245,8 +107145,8 @@ /obj/structure/table/reinforced, /obj/item/storage/fancy/donut_box, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 9 + dir = 9; + icon_state = "red" }, /area/security/checkpoint) "dTE" = ( @@ -111259,16 +107159,16 @@ "dTF" = ( /obj/structure/chair, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 9 + dir = 9; + icon_state = "red" }, /area/security/checkpoint) "dTG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/chair, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 1 + dir = 1; + icon_state = "red" }, /area/security/checkpoint) "dTH" = ( @@ -111279,15 +107179,15 @@ tag = "" }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 1 + dir = 1; + icon_state = "red" }, /area/security/checkpoint) "dTI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 1 + dir = 1; + icon_state = "red" }, /area/security/checkpoint) "dTJ" = ( @@ -111300,58 +107200,6 @@ /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, /area/security/checkpoint) -"dTL" = ( -/obj/machinery/light{ - icon_state = "tube1"; - dir = 8 - }, -/obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, -/area/shuttle/escape) -"dTM" = ( -/turf/simulated/shuttle/floor4, -/area/shuttle/escape) -"dTN" = ( -/obj/structure/chair/comfy/shuttle, -/turf/simulated/shuttle/floor4, -/area/shuttle/escape) -"dTO" = ( -/obj/structure/table/reinforced, -/obj/machinery/recharger, -/turf/simulated/shuttle/floor4, -/area/shuttle/escape) -"dTP" = ( -/obj/item/twohanded/required/kirbyplants, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "redcorner" - }, -/area/shuttle/escape) -"dTQ" = ( -/obj/item/twohanded/required/kirbyplants, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "neutralcorner" - }, -/area/shuttle/escape) -"dTR" = ( -/obj/effect/decal/warning_stripes/yellow/hollow, -/obj/structure/chair/comfy/shuttle, -/turf/simulated/floor/plasteel, -/area/shuttle/escape) -"dTS" = ( -/obj/machinery/status_display{ - pixel_y = 32 - }, -/obj/effect/decal/warning_stripes/yellow/hollow, -/obj/structure/chair/comfy/shuttle, -/turf/simulated/floor/plasteel, -/area/shuttle/escape) -"dTT" = ( -/obj/machinery/door/airlock/external, -/obj/effect/decal/warning_stripes/west, -/turf/simulated/floor/plasteel, -/area/shuttle/escape) "dTV" = ( /obj/machinery/power/solar{ name = "Aft Starboard Solar Panel" @@ -111478,13 +107326,13 @@ /area/maintenance/fpmaint2) "dUj" = ( /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/structure/table/reinforced, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/machinery/power/apc{ dir = 8; @@ -111496,8 +107344,8 @@ /obj/item/wrench, /obj/item/radio, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 8 + dir = 8; + icon_state = "red" }, /area/security/checkpoint) "dUk" = ( @@ -111511,9 +107359,8 @@ d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -111574,8 +107421,8 @@ tag = "" }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 4 + dir = 4; + icon_state = "red" }, /area/security/checkpoint) "dUp" = ( @@ -111599,13 +107446,12 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 8 + dir = 8; + icon_state = "red" }, /area/security/checkpoint) "dUr" = ( @@ -111655,8 +107501,8 @@ dir = 8 }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 4 + dir = 4; + icon_state = "red" }, /area/security/checkpoint) "dUv" = ( @@ -111667,49 +107513,6 @@ }, /turf/simulated/floor/plating, /area/security/checkpoint) -"dUw" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 4 - }, -/turf/simulated/shuttle/floor4, -/area/shuttle/escape) -"dUx" = ( -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "redcorner" - }, -/area/shuttle/escape) -"dUy" = ( -/obj/machinery/light{ - icon_state = "tube1"; - dir = 4 - }, -/obj/structure/extinguisher_cabinet{ - pixel_x = 28 - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "neutralcorner" - }, -/area/shuttle/escape) -"dUz" = ( -/turf/simulated/floor/plasteel, -/area/shuttle/escape) -"dUA" = ( -/obj/machinery/light, -/turf/simulated/floor/plasteel, -/area/shuttle/escape) -"dUB" = ( -/turf/simulated/floor/plasteel{ - icon_state = "neutralcorner" - }, -/area/shuttle/escape) -"dUC" = ( -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralcorner" - }, -/area/shuttle/escape) "dUD" = ( /obj/structure/closet/secure_closet/CMO, /obj/effect/decal/warning_stripes/northeast, @@ -111854,8 +107657,8 @@ pixel_y = 0 }, /obj/machinery/light{ - icon_state = "tube1"; - dir = 4 + dir = 4; + icon_state = "tube1" }, /obj/item/storage/fancy/candle_box{ pixel_x = 2; @@ -111880,8 +107683,8 @@ "dUS" = ( /obj/structure/reagent_dispensers/fueltank, /obj/machinery/light{ - icon_state = "tube1"; - dir = 4 + dir = 4; + icon_state = "tube1" }, /obj/effect/decal/warning_stripes/southeast, /turf/simulated/floor/plasteel, @@ -111929,8 +107732,8 @@ }, /obj/machinery/computer/prisoner, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 6 + dir = 6; + icon_state = "red" }, /area/security/checkpoint) "dUW" = ( @@ -111965,8 +107768,8 @@ pixel_y = -25 }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 6 + dir = 6; + icon_state = "red" }, /area/security/checkpoint) "dUZ" = ( @@ -112083,33 +107886,6 @@ }, /turf/simulated/floor/plating, /area/security/checkpoint) -"dVf" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 8 - }, -/turf/simulated/shuttle/floor4, -/area/shuttle/escape) -"dVg" = ( -/obj/structure/table/reinforced, -/turf/simulated/shuttle/floor4, -/area/shuttle/escape) -"dVh" = ( -/obj/structure/table/reinforced, -/obj/machinery/recharger, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "redcorner" - }, -/area/shuttle/escape) -"dVi" = ( -/obj/structure/closet/fireaxecabinet{ - pixel_x = 32; - pixel_y = 0 - }, -/turf/simulated/floor/plasteel{ - icon_state = "neutralcorner" - }, -/area/shuttle/escape) "dVj" = ( /obj/structure/cable{ d1 = 4; @@ -112124,23 +107900,6 @@ /obj/machinery/door/airlock/maintenance, /turf/simulated/floor/plasteel, /area/hallway/primary/aft) -"dVk" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swallc1" - }, -/area/shuttle/escape) -"dVl" = ( -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "neutralcorner" - }, -/area/shuttle/escape) -"dVm" = ( -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "neutralcorner" - }, -/area/shuttle/escape) "dVn" = ( /obj/machinery/power/solar{ name = "Aft Starboard Solar Panel" @@ -112169,44 +107928,16 @@ /obj/structure/cable, /turf/simulated/floor/plating, /area/security/checkpoint) -"dVr" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 1 - }, -/turf/simulated/shuttle/floor4, -/area/shuttle/escape) -"dVs" = ( -/obj/machinery/light, -/obj/structure/chair/comfy/shuttle{ - dir = 1 - }, -/turf/simulated/shuttle/floor4, -/area/shuttle/escape) -"dVt" = ( -/obj/structure/table/reinforced, -/obj/item/paper_bin, -/obj/item/pen, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "redcorner" - }, -/area/shuttle/escape) -"dVu" = ( -/turf/simulated/floor/plasteel{ - icon_state = "blue" - }, -/area/shuttle/escape) "dVv" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/machinery/ai_status_display{ pixel_x = -32 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel{ @@ -112237,217 +107968,6 @@ /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plating/airless, /area/engine/engineering) -"dVz" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f5"; - dir = 2 - }, -/area/shuttle/escape) -"dVA" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall13"; - dir = 2 - }, -/area/shuttle/escape) -"dVB" = ( -/obj/machinery/status_display, -/turf/simulated/shuttle/wall{ - icon_state = "swall12"; - dir = 2 - }, -/area/shuttle/escape) -"dVC" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall15"; - icon_state = "swall15"; - dir = 2 - }, -/area/shuttle/escape) -"dVD" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f9"; - dir = 2 - }, -/area/shuttle/escape) -"dVE" = ( -/obj/structure/table/reinforced, -/obj/machinery/recharger, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "vault" - }, -/area/shuttle/escape) -"dVF" = ( -/obj/item/twohanded/required/kirbyplants, -/obj/machinery/light{ - dir = 1; - on = 1 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/shuttle/escape) -"dVG" = ( -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/shuttle/escape) -"dVH" = ( -/obj/structure/table/reinforced, -/obj/item/storage/fancy/donut_box, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "vault" - }, -/area/shuttle/escape) -"dVI" = ( -/obj/machinery/computer/security{ - network = list("SS13","Research Outpost","Mining Outpost","Telecomms") - }, -/obj/structure/sign/poster/official/nanotrasen_logo{ - pixel_x = -32; - pixel_y = 0 - }, -/turf/simulated/floor/plasteel{ - dir = 9; - icon_state = "darkred" - }, -/area/shuttle/escape) -"dVJ" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 8 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/shuttle/escape) -"dVK" = ( -/obj/item/radio/intercom{ - dir = 4; - name = "Station Intercom (General)"; - pixel_x = 29; - pixel_y = 54 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/shuttle/escape) -"dVL" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/shuttle/escape) -"dVM" = ( -/obj/machinery/computer/station_alert, -/obj/structure/sign/poster/official/nanotrasen_logo{ - pixel_x = 32; - pixel_y = 0 - }, -/turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "darkyellow" - }, -/area/shuttle/escape) -"dVN" = ( -/obj/machinery/computer/secure_data, -/turf/simulated/floor/plasteel{ - dir = 10; - icon_state = "darkred" - }, -/area/shuttle/escape) -"dVO" = ( -/obj/structure/chair/comfy/shuttle, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/shuttle/escape) -"dVP" = ( -/obj/structure/table/reinforced, -/obj/item/storage/firstaid/regular, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/shuttle/escape) -"dVQ" = ( -/obj/structure/table/reinforced, -/obj/item/folder/blue, -/obj/item/pen, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/shuttle/escape) -"dVR" = ( -/obj/machinery/computer/atmos_alert, -/turf/simulated/floor/plasteel{ - dir = 6; - icon_state = "darkyellow" - }, -/area/shuttle/escape) -"dVS" = ( -/obj/structure/table/reinforced, -/obj/item/paper_bin, -/obj/item/pen, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "vault" - }, -/area/shuttle/escape) -"dVT" = ( -/obj/structure/table/reinforced, -/obj/item/folder/red, -/obj/item/restraints/handcuffs, -/obj/item/flash, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/shuttle/escape) -"dVU" = ( -/obj/machinery/computer/crew, -/turf/simulated/floor/plasteel{ - icon_state = "darkblue" - }, -/area/shuttle/escape) -"dVV" = ( -/obj/machinery/computer/med_data, -/turf/simulated/floor/plasteel{ - dir = 6; - icon_state = "darkblue" - }, -/area/shuttle/escape) -"dVW" = ( -/obj/machinery/computer/emergency_shuttle, -/turf/simulated/floor/plasteel{ - dir = 10; - icon_state = "darkblue" - }, -/area/shuttle/escape) -"dVX" = ( -/obj/machinery/computer/communications, -/turf/simulated/floor/plasteel{ - icon_state = "darkblue" - }, -/area/shuttle/escape) -"dVY" = ( -/obj/structure/table/reinforced, -/obj/item/storage/toolbox/mechanical, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/shuttle/escape) -"dVZ" = ( -/obj/structure/table/reinforced, -/obj/machinery/cell_charger, -/obj/item/stock_parts/cell/high, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "vault" - }, -/area/shuttle/escape) "dWa" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ @@ -112801,40 +108321,6 @@ icon_state = "neutralfull" }, /area/security/checkpoint) -"dWB" = ( -/obj/machinery/light{ - icon_state = "tube1"; - dir = 4 - }, -/obj/effect/decal/warning_stripes/yellow/hollow, -/obj/structure/chair/comfy/shuttle{ - dir = 8 - }, -/turf/simulated/floor/plasteel, -/area/shuttle/escape) -"dWC" = ( -/obj/machinery/door/airlock/external, -/obj/effect/decal/warning_stripes/south, -/turf/simulated/floor/plasteel, -/area/shuttle/escape) -"dWD" = ( -/obj/machinery/door/airlock/command/glass{ - name = "Emergency Recovery Airlock"; - req_access_txt = "19" - }, -/obj/effect/decal/warning_stripes/west, -/turf/simulated/floor/plasteel, -/area/shuttle/escape) -"dWE" = ( -/obj/machinery/light/small, -/obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, -/area/shuttle/escape) -"dWF" = ( -/obj/machinery/suit_storage_unit/standard_unit, -/obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, -/area/shuttle/escape) "dWG" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 1; @@ -112882,14 +108368,6 @@ /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, /area/hallway/primary/aft) -"dWJ" = ( -/obj/machinery/door/airlock/command/glass{ - name = "Escape Shuttle Cockpit"; - req_access_txt = "19" - }, -/obj/effect/decal/warning_stripes/south, -/turf/simulated/floor/plasteel, -/area/shuttle/escape) "dWK" = ( /obj/machinery/hologram/holopad, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -112899,10 +108377,7 @@ }, /area/hallway/primary/aft) "dWL" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1 - }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/structure/closet/emcloset, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, @@ -112929,8 +108404,8 @@ /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 2 + dir = 2; + icon_state = "neutralcorner" }, /area/hallway/primary/central) "dWP" = ( @@ -113069,8 +108544,8 @@ /area/medical/virology) "dXc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - icon_state = "intact"; - dir = 10 + dir = 10; + icon_state = "intact" }, /turf/simulated/floor/plasteel{ dir = 8; @@ -113148,8 +108623,8 @@ on = 1 }, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/machinery/ai_status_display{ pixel_x = -32 @@ -113247,19 +108722,10 @@ icon_state = "neutral" }, /area/maintenance/fpmaint2) -"dXt" = ( -/obj/structure/table/reinforced, -/obj/item/clothing/gloves/color/latex/nitrile, -/obj/item/clothing/mask/breath, -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "cmo" - }, -/area/shuttle/escape) "dXu" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 4 + dir = 4; + icon_state = "tube1" }, /obj/machinery/atmospherics/unary/portables_connector{ dir = 8 @@ -113331,8 +108797,8 @@ network = list("Research","SS13") }, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 4 + dir = 4; + icon_state = "neutral" }, /area/medical/research) "dXz" = ( @@ -113359,18 +108825,6 @@ /obj/effect/decal/cleanable/fungus, /turf/simulated/wall/r_wall, /area/toxins/mixing) -"dXB" = ( -/obj/structure/table/reinforced, -/obj/machinery/light{ - 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) "dXC" = ( /obj/structure/cable{ d2 = 2; @@ -113490,56 +108944,10 @@ network = list("SS13","Security") }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 9 + dir = 9; + icon_state = "red" }, /area/security/checkpoint) -"dXL" = ( -/obj/item/flag/med, -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "cmo" - }, -/area/shuttle/escape) -"dXM" = ( -/obj/structure/table/reinforced, -/obj/item/storage/firstaid/o2{ - pixel_x = -3; - pixel_y = -3 - }, -/obj/item/storage/firstaid/regular, -/turf/simulated/floor/plasteel{ - tag = "icon-whiteblue (NORTHEAST)"; - icon_state = "whiteblue"; - dir = 5 - }, -/area/shuttle/escape) -"dXN" = ( -/obj/effect/decal/warning_stripes/blue/partial, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/shuttle/escape) -"dXO" = ( -/obj/structure/table/reinforced, -/obj/item/reagent_containers/iv_bag/blood/random, -/obj/item/reagent_containers/iv_bag/blood/random, -/obj/item/reagent_containers/iv_bag/blood/random, -/turf/simulated/floor/plasteel{ - tag = "icon-whiteblue (EAST)"; - icon_state = "whiteblue"; - dir = 4 - }, -/area/shuttle/escape) -"dXP" = ( -/obj/effect/decal/warning_stripes/blue/partial{ - icon_state = "16"; - dir = 1 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/shuttle/escape) "dXQ" = ( /obj/structure/cable{ d1 = 4; @@ -113562,19 +108970,10 @@ network = list("SS13","Security") }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 6 + dir = 6; + icon_state = "red" }, /area/security/checkpoint) -"dXR" = ( -/obj/structure/bed/roller, -/obj/machinery/iv_drip, -/turf/simulated/floor/plasteel{ - tag = "icon-whiteblue (EAST)"; - icon_state = "whiteblue"; - dir = 4 - }, -/area/shuttle/escape) "dXS" = ( /obj/structure/cable, /obj/machinery/power/apc{ @@ -113703,43 +109102,6 @@ icon_state = "whitepurplecorner" }, /area/medical/genetics) -"dYe" = ( -/obj/structure/shuttle/engine/propulsion{ - tag = "icon-propulsion (NORTH)"; - icon_state = "propulsion"; - dir = 1 - }, -/turf/simulated/shuttle/plating, -/area/shuttle/escape) -"dYf" = ( -/obj/structure/window/reinforced, -/obj/structure/shuttle/engine/heater{ - tag = "icon-heater (NORTH)"; - icon_state = "heater"; - dir = 1 - }, -/turf/simulated/shuttle/plating, -/area/shuttle/escape) -"dYg" = ( -/obj/structure/bed/roller, -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "cmo" - }, -/area/shuttle/escape) -"dYh" = ( -/obj/item/radio/intercom{ - dir = 4; - name = "Station Intercom (General)"; - pixel_x = 29; - pixel_y = 22 - }, -/obj/structure/bed/roller, -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "cmo" - }, -/area/shuttle/escape) "dYi" = ( /obj/structure/cable{ d1 = 4; @@ -113811,9 +109173,9 @@ }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plasteel{ - tag = "icon-whitepurple (EAST)"; + dir = 4; icon_state = "whitepurple"; - dir = 4 + tag = "icon-whitepurple (EAST)" }, /area/medical/genetics) "dYm" = ( @@ -113952,12 +109314,12 @@ req_access_txt = "39" }, /obj/effect/decal/warning_stripes/yellow/partial{ - icon_state = "3"; - dir = 1 + dir = 1; + icon_state = "3" }, /obj/effect/decal/warning_stripes/arrow{ - icon_state = "4"; - dir = 1 + dir = 1; + icon_state = "4" }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -113980,8 +109342,8 @@ /area/medical/research) "dYI" = ( /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/structure/lattice/catwalk, /turf/space, @@ -114185,119 +109547,7 @@ tag = "icon-redfull (NORTHWEST)" }, /area/security/warden) -"dYX" = ( -/obj/structure/window/reinforced, -/obj/structure/shuttle/engine/heater{ - tag = "icon-heater (NORTH)"; - icon_state = "heater"; - dir = 1 - }, -/turf/simulated/shuttle/plating, -/area/shuttle/syndicate_elite) -"dYY" = ( -/turf/simulated/shuttle/wall{ - dir = 4; - icon_state = "wall3" - }, -/area/shuttle/syndicate_elite) -"dYZ" = ( -/obj/machinery/sleeper/syndie{ - dir = 4 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate_elite) -"dZa" = ( -/obj/machinery/sleeper/syndie, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate_elite) -"dZb" = ( -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate_elite) -"dZc" = ( -/obj/machinery/light/spot{ - tag = "icon-tube1 (WEST)"; - icon_state = "tube1"; - dir = 8 - }, -/obj/structure/chair/comfy/shuttle{ - dir = 4 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate_elite) -"dZd" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 8 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate_elite) -"dZe" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 4 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate_elite) -"dZf" = ( -/obj/docking_port/stationary{ - dir = 1; - dwidth = 2; - height = 11; - id = "trade_dock"; - name = "port bay 4 at Kerberos"; - width = 5 - }, -/turf/space, -/area/space) -"dZg" = ( -/obj/machinery/light/spot{ - tag = "icon-tube1 (WEST)"; - icon_state = "tube1"; - dir = 8 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate_elite) -"dZh" = ( -/obj/machinery/portable_atmospherics/canister/oxygen, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate_elite) "dZi" = ( -/obj/machinery/door/airlock/external{ - id_tag = "s_docking_airlock"; - name = "Shuttle Airlock"; - req_access_txt = "150" - }, -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "open"; - id_tag = "syndicate_elite"; - name = "Side Hull Door"; - opacity = 0; - req_access_txt = "150" - }, -/obj/docking_port/mobile{ - dir = 4; - dwidth = 7; - height = 5; - id = "sst"; - name = "SST shuttle"; - roundstart_move = "sst_away"; - width = 11 - }, /obj/docking_port/stationary{ dir = 4; dwidth = 7; @@ -114306,218 +109556,9 @@ name = "Near Kerberos Arrivals"; width = 11 }, -/obj/structure/fans/tiny, -/turf/simulated/shuttle/plating, -/area/shuttle/syndicate_elite) -"dZj" = ( -/obj/structure/chair/comfy/shuttle, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate_elite) -"dZk" = ( -/obj/machinery/computer/shuttle/sst, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate_elite) -"dZl" = ( -/turf/simulated/shuttle/wall{ - icon_state = "wall3" - }, -/area/shuttle/syndicate_elite) -"dZm" = ( /turf/space, -/turf/simulated/shuttle/wall{ - icon_state = "diagonalWall3" - }, -/area/shuttle/syndicate_elite) -"dZn" = ( -/obj/machinery/door/airlock/external{ - id_tag = "s_docking_airlock"; - name = "Shuttle Airlock"; - req_access_txt = "150" - }, -/obj/machinery/door_control{ - id = "syndicate_elite"; - name = "Blast Doors"; - pixel_x = -25; - pixel_y = 0; - req_access_txt = "150" - }, -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "open"; - id_tag = "syndicate_elite"; - name = "Front Hull Door"; - opacity = 0; - req_access_txt = "150" - }, -/obj/structure/fans/tiny, -/turf/simulated/shuttle/plating, -/area/shuttle/syndicate_elite) -"dZo" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 4; - icon_state = "diagonalWall3" - }, -/area/shuttle/syndicate_elite) -"dZp" = ( -/turf/simulated/floor/plating/airless, -/area/shuttle/syndicate_elite) -"dZq" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 8; - icon_state = "diagonalWall3" - }, -/area/shuttle/syndicate_sit) -"dZr" = ( -/obj/structure/shuttle/engine/propulsion{ - tag = "icon-propulsion (NORTH)"; - icon_state = "propulsion"; - dir = 1 - }, -/turf/simulated/shuttle/plating, -/area/shuttle/syndicate_sit) -"dZs" = ( -/obj/structure/shuttle/engine/propulsion{ - tag = "icon-propulsion_r (NORTH)"; - icon_state = "propulsion_r"; - dir = 1 - }, -/turf/simulated/shuttle/plating, -/area/shuttle/syndicate_sit) -"dZt" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 1; - icon_state = "diagonalWall3" - }, -/area/shuttle/syndicate_sit) -"dZu" = ( -/obj/structure/shuttle/engine/propulsion{ - tag = "icon-propulsion_l (NORTH)"; - icon_state = "propulsion_l"; - dir = 1 - }, -/turf/simulated/shuttle/plating, -/area/shuttle/syndicate_sit) -"dZv" = ( -/turf/simulated/shuttle/wall{ - dir = 4; - icon_state = "wall3" - }, -/area/shuttle/syndicate_sit) -"dZw" = ( -/obj/structure/window/reinforced, -/obj/structure/shuttle/engine/heater{ - tag = "icon-heater (NORTH)"; - icon_state = "heater"; - dir = 1 - }, -/turf/simulated/shuttle/plating, -/area/shuttle/syndicate_sit) -"dZx" = ( -/obj/effect/decal/remains/human, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate_sit) -"dZy" = ( -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate_sit) -"dZz" = ( -/obj/structure/window/reinforced, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate_sit) -"dZA" = ( -/obj/machinery/light/spot{ - tag = "icon-tube1 (WEST)"; - icon_state = "tube1"; - dir = 8 - }, -/obj/structure/window/reinforced, -/obj/structure/chair/comfy/shuttle{ - dir = 4 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate_sit) -"dZB" = ( -/obj/machinery/door/window/brigdoor{ - dir = 2; - name = "Cell Door"; - req_access_txt = "150" - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate_sit) -"dZC" = ( -/obj/structure/table, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate_sit) -"dZD" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 4 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate_sit) -"dZE" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 8 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate_sit) -"dZF" = ( -/obj/machinery/light/spot{ - tag = "icon-tube1 (WEST)"; - icon_state = "tube1"; - dir = 8 - }, -/obj/structure/chair/comfy/shuttle{ - dir = 4 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate_sit) +/area/space) "dZG" = ( -/obj/machinery/door/airlock/external{ - id_tag = "s_docking_airlock"; - name = "Shuttle Airlock"; - req_access_txt = "150" - }, -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "open"; - id_tag = "syndicate_sit_1"; - name = "Side Hull Door"; - opacity = 0; - req_access_txt = "150" - }, -/obj/docking_port/mobile{ - dir = 8; - dwidth = 3; - height = 5; - id = "sit"; - name = "SIT shuttle"; - roundstart_move = "sit_away"; - width = 11 - }, /obj/docking_port/stationary{ dir = 8; dwidth = 3; @@ -114526,79 +109567,8 @@ name = "Arrivals Maintenance"; width = 11 }, -/obj/structure/fans/tiny, -/obj/machinery/door_control{ - id = "syndicate_sit_1"; - name = "Blast Doors"; - pixel_x = 0; - pixel_y = -23; - req_access_txt = "150" - }, -/turf/simulated/shuttle/plating, -/area/shuttle/syndicate_sit) -"dZH" = ( -/obj/structure/table, -/obj/item/stack/sheet/metal, -/obj/item/clothing/glasses/welding, -/obj/item/weldingtool, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate_sit) -"dZI" = ( -/obj/structure/chair/comfy/shuttle, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate_sit) -"dZJ" = ( -/turf/simulated/shuttle/wall{ - icon_state = "wall3" - }, -/area/shuttle/syndicate_sit) -"dZK" = ( -/obj/machinery/computer/shuttle/sit, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate_sit) -"dZL" = ( /turf/space, -/turf/simulated/shuttle/wall{ - icon_state = "diagonalWall3" - }, -/area/shuttle/syndicate_sit) -"dZM" = ( -/obj/machinery/door/airlock/external{ - id_tag = "s_docking_airlock"; - name = "Shuttle Airlock"; - req_access_txt = "150" - }, -/obj/machinery/door_control{ - id = "syndicate_sit_1"; - name = "Blast Doors"; - pixel_x = -25; - pixel_y = 0; - req_access_txt = "150" - }, -/obj/structure/fans/tiny, -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "open"; - id_tag = "syndicate_sit_1"; - name = "Front Hull Door"; - opacity = 0; - req_access_txt = "150" - }, -/turf/simulated/shuttle/plating, -/area/shuttle/syndicate_sit) -"dZN" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 4; - icon_state = "diagonalWall3" - }, -/area/shuttle/syndicate_sit) +/area/space) "dZO" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -114669,6 +109639,11 @@ /obj/machinery/blackbox_recorder, /turf/simulated/floor/bluegrid, /area/tcommsat/chamber) +"eYL" = ( +/obj/effect/decal/warning_stripes/west, +/obj/effect/decal/warning_stripes/south, +/turf/simulated/floor/plasteel, +/area/hallway/secondary/entry) "fBl" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4; @@ -114690,6 +109665,44 @@ icon_state = "dark" }, /area/tcommsat/chamber) +"gyp" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/warning_stripes/north, +/obj/machinery/light, +/turf/simulated/floor/plasteel, +/area/quartermaster/storage) +"gHn" = ( +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 4; + frequency = 1379; + 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"; + tag_interior_door = "sol_inner" + }, +/turf/simulated/floor/plating, +/area/hallway/secondary/entry) +"gYw" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plasteel{ + dir = 5; + icon_state = "arrival" + }, +/area/hallway/secondary/entry) "hng" = ( /obj/machinery/message_server, /turf/simulated/floor/bluegrid, @@ -114705,6 +109718,28 @@ }, /turf/space, /area/space) +"hHr" = ( +/obj/effect/decal/warning_stripes/south, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/plasteel, +/area/quartermaster/storage) +"kpH" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/machinery/door/airlock/external{ + frequency = 1379; + icon_state = "door_locked"; + id_tag = "sol_inner"; + locked = 1; + name = "Arrivals External Access"; + req_access = null; + req_access_txt = "0" + }, +/turf/simulated/floor/plating, +/area/hallway/secondary/entry) "lVO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/turretid/lethal{ @@ -114716,22 +109751,77 @@ icon_state = "dark" }, /area/turret_protected/aisat) +"mWj" = ( +/obj/machinery/door/airlock/external{ + frequency = 1379; + icon_state = "door_locked"; + id_tag = "sol_outer"; + locked = 1; + name = "Arrivals External Access"; + req_access = null; + req_access_txt = "0" + }, +/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" + }, +/turf/simulated/floor/plating, +/area/hallway/secondary/entry) +"qcA" = ( +/obj/docking_port/stationary{ + dwidth = 4; + height = 11; + id = "trade_dock"; + name = "port bay 4 at Kerberos"; + width = 9 + }, +/turf/space, +/area/space) "qrT" = ( /turf/simulated/wall/r_wall, /area/tcommsat/chamber) +"qHs" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 10; + initialize_directions = 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" + }, +/turf/simulated/floor/plasteel{ + dir = 9; + icon_state = "arrival" + }, +/area/hallway/secondary/entry) "rSI" = ( /turf/simulated/floor/bluegrid, /area/tcommsat/chamber) -"udT" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 8 +"siv" = ( +/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 }, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) +/turf/simulated/floor/plating, +/area/hallway/secondary/entry) "vzz" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 4 + dir = 4; + icon_state = "tube1" }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -114755,6 +109845,10 @@ icon_state = "dark" }, /area/tcommsat/chamber) +"wvH" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel, +/area/hallway/secondary/entry) (1,1,1) = {" aaa @@ -120446,15 +115540,15 @@ aaa aaa aaa aaa -acu -abz -abz -abz -abz -abz -abz -abz -acb +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -120697,21 +115791,21 @@ aaa aaa aaa aaa -acu -abz -abz -abz -abz -abz -abq -aei -abB -aeR -afo -abB -afS -afV -agr +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -120954,21 +116048,21 @@ aaa aaa aaa aaa -abq -acx -acx -acP -acx -acx -abq -aei -abB -abB -abB -abB -afT -afV -ags +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -121211,21 +116305,21 @@ aaa aaa aaa aaa -abq -abB -abB -abB -abB -abB -abq -aej -abB -abB -abB -afD -afU -afV -agt +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -121461,28 +116555,28 @@ aaa aaa aaa aaa -abp -abz -abz -abz -acb aaa aaa -abq -abB -acH -abB -abB -abB -abq -aek -acH -abB -afp -abz -abz -abz -acd +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -121718,25 +116812,25 @@ aaa aaa aaa aaa -abq -abA -abN -abS -abq aaa aaa -abq -acy -acI -acQ -abB -abB -abq -ael -abB -abB -afq -abq +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -121975,27 +117069,27 @@ aaa aaa aaa aaa -abr -abB -abB -abT -abq -abz -abz -abz -abz -abz -abz -adj -adA -abq -abz -aeD -aeS -abz -abz -abz -acb +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -122232,27 +117326,27 @@ aaa aaa aaa aaa -abs -abC -abB -abB -abq -acm -acs -acs -acs -acs -acR -abB -abB -adS -aem -abB -abB -afr -abB -afV -agr +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -122489,27 +117583,27 @@ aaa aaa aaa aaa -abs -abD -abO -abB -acc -abB -abB -abB -abB -abB -abB -abB -abB -abB -abB -abB -abB -afs -afE -afV -ags +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -122746,27 +117840,27 @@ aaa aaa aaa aaa -abs -abE -abB -abU -abq -acn -act -act -act -act -abP -adk -abB -abB -abB -abB -abB -afr -abB -afV -agt +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -123003,27 +118097,27 @@ aaa aaa aaa aaa -abt -abF -abB -abB -abq -abz -abz -acv -abz -abz -acS -adl -adB -abq -abz -aeE -aeT -abz -abz -abz -acd +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -123260,25 +118354,25 @@ aaa aaa aaa aaa -abq -abF -abP -abV -abq aaa aaa aaa aaa -abq -acT -adm -adC -abq -aen -abB -abB -aft -abq +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -123517,28 +118611,28 @@ aaa aaa aaa aaa -abu -abz -abz -abz -acd +aaa +aaa +aaa +aaa +aaa aaa aaa aaa aaa acJ -acT -adm -adC -abq -aeo -acH -abB -afu -abz -abz -abz -acb +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -123783,19 +118877,19 @@ aaa aaa aaa aaa -acK -acT -adn -adD -abq -aep -abB -abB -abB -abB -afW -afV -agr +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -124040,19 +119134,19 @@ aaa aaa aaa aaa -acL -abz -abz -abz -abq -aeq -acH -abB -abB -abB -afX -afV -ags +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -124301,15 +119395,15 @@ aaa aaa aaa aaa -abq -aer -aeF -aeU -abB -abB -afY -afV -agt +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -124558,15 +119652,15 @@ aaa aaa aaa aaa -acL -abz -abz -abz -abz -abz -abz -abz -acd +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -135403,9 +130497,9 @@ aGX aJL aGX acF -aMy +aGZ aPl -aMy +aGZ aSx aTS aaa @@ -135659,11 +130753,11 @@ aGX aGX aKo aGX -aMy -aMy +aGZ +aGZ aPm -aMy -aMy +aGZ +aGZ aZY abi abi @@ -135916,7 +131010,7 @@ aGY aIq aLl aKY -aMy +aGZ aNU aPn aQM @@ -136173,11 +131267,11 @@ aGY aIr aJI aKZ -aMy +aGZ aNV aPo aQN -aMy +aGZ aZY aSN aSN @@ -136430,11 +131524,11 @@ aGY aIs aJM aLc -aMy +aGZ aNW aPp aQO -aMy +aGZ aTU aSN aXa @@ -136691,7 +131785,7 @@ aMz aNX aPq aQN -aMy +aGZ aZY aSN aXb @@ -140787,7 +135881,7 @@ auH avD awH axO -ayN +ayM azY aBi aCg @@ -141044,7 +136138,7 @@ auI avE awN axP -ayN +ayM azZ azZ azZ @@ -141558,7 +136652,7 @@ auI avG awP axR -ayN +ayM aAb aAb aAb @@ -141815,7 +136909,7 @@ auJ avH awQ axS -ayN +ayM aAc aBk aCh @@ -143060,18 +138154,18 @@ aaa aaa aaa aaa -acz -acM -acM -acM -acM -acM -acM -acM -acM -acM -acM -ahm +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -143316,21 +138410,21 @@ aaa aaa aaa aaa -acz -acM -adE -adU -aes -acM -acZ -afv -acM -afZ -agu -acZ -acM -acM -ahm +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -143572,23 +138666,23 @@ aaa aaa aaa aaa -acz -acM -ado -acW -acW -acW -acM -acZ -acZ -acM -aga -acZ -acZ -ahn -ahN -acM -ahm +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -143828,24 +138922,24 @@ aaa aaa aaa aaa -acz -acM -acU -acW -acW -adV -aet -acM -acZ -acZ -afG -acZ -acZ -acZ -aho -acZ -aic -acM +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -144085,30 +139179,30 @@ aaa aaa aaa aaa -acA -acN -acW -acW -acW -acW -acW -acM -acZ -acZ -acM -acZ -acZ -acZ -ahp -acZ -aid -acM aaa -aiZ -ajp -ajp -ajp -akT +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -144342,30 +139436,30 @@ aaa aaa aaa aaa -acA -acN -acW -acW -acW -acW -acW -aeG -acZ -acZ -acM -acM -acM -acM -acM -acM -acM -ahu aaa -aja -ajq -ajq -ajq -aja +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -144599,34 +139693,34 @@ aaa aaa aaa aaa -acB -acM -acX -adp -adF -acX -aeu -acM -acZ -acZ -acM -acZ -agv -agM -ahq aaa aaa aaa aaa -aja -ajr -ajW -akt -aja aaa aaa aaa -aaZ +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -144857,29 +139951,29 @@ aaa aaa aaa aaa -acM -acM -acM -acM -acM -acM -acM -aeV -acZ -afH -acZ -agw -agN -ahr aaa aaa aaa aaa -aja -ajs -aju -aku -aja +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -145113,30 +140207,30 @@ aaa aaa aaa aaa -acz -acM -acY -adq -adG -adW -acZ -acM -acZ -acZ -acM -acZ -agx -agO -ahs aaa aaa aaa aaa -aja -ajt -aju -aku -aja +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -145370,30 +140464,30 @@ aaa aaa aaa aaa -acA -acN -acZ -acZ -acZ -acZ -acZ -aeH -acZ -acZ -acM -acM -acM -acM -acM -acM -acM -ahm aaa -ajb -aju -aju -aju -aja +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -145627,30 +140721,30 @@ aaa aaa aaa aaa -acA -acN -acZ -acZ -adH -adH -adH -acM -acZ -acZ -acM -agb -agy -agP -acZ -ahO -aie -acM aaa -ajb -aju -aju -aku -aja +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -145884,30 +140978,30 @@ aaa aaa aaa aaa -acB -acM -ada -adr -adI -adX -aev -acM -aeW -acZ -afI -acZ -acZ -acZ -acZ -acZ -aew -acM aaa -aja -ajv -aju -aku -aja +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -146142,29 +141236,29 @@ aaa aaa aaa aaa -acB -acM -acZ -acZ -acZ -aew -acM -aeX -aeX -acM -aeV -acZ -acZ -aht -ahP -acM -ahu aaa -aja -ajw -aju -aku -aja +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -146400,28 +141494,28 @@ aaa aaa aaa aaa -acB -ads -adJ -adY -aex -acM -aeY -acZ -acM -agc -agz -agQ -acM -acM -ahu aaa aaa -ajc -aja -aju -aja -akv +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -146658,32 +141752,32 @@ aaa aaa aaa aaa -acB -acM -acM -acM -acM -aeZ +aaa +aaa +aaa +aaa +aaa +aaa afw -acM -acM -acM -acM -ahu aaa aaa aaa aaa aaa -ajc +aaa +aaa +aaa +aaa +aaa +aaa ajX -akv aaa aaa aaa aaa aaa aaa +qcA aaa aaa aaa @@ -146923,7 +142017,7 @@ acC aef aef acC -aaa +abj abj abj abj @@ -146939,11 +142033,11 @@ abj abj abj abj -abj -acC -acC -acC acC +mWj +siv +aaa +aaa aaa apH aqE @@ -147182,7 +142276,7 @@ afb acC aaa aaa -agR +aaa ahv acC acC @@ -147196,11 +142290,11 @@ aaa abj aaa aaa +acC +gHn +acC +aaa aaa -acC -anw -ajy -acC aaa apH apH @@ -147452,12 +142546,12 @@ acC acC adb acC +adN +acC +kpH acC adb adb -anh -anG -adb abj abj abj @@ -147709,9 +142803,9 @@ adZ agA agg adZ -adZ -amu +eYL amL +qHs ani anH adb @@ -147939,7 +143033,7 @@ aaa aaa aaa aaa -dZf +aaa acD acO adc @@ -147966,10 +143060,10 @@ ajZ ajZ ajZ ajZ -ajZ amv amM anj +wvH anI adb aor @@ -148223,9 +143317,9 @@ agB agB alu agB -agB amw ang +gYw ank anJ ahw @@ -148480,7 +143574,7 @@ acC acC adb acC -acC +adb adb adb anl @@ -149476,16 +144570,16 @@ aaa aaa aaa aaa -aoj -dYY -dYY -dYY -dYY -dYY -dYY +aaa +aaa +aaa +aaa +aaa +aaa +aaa dZi -dYY -dZm +aaa +aaa aaa acF aaa @@ -149497,17 +144591,17 @@ aaa aaa aaa aaa -aeh -aih -aih -aiQ -aih -aih -aih -aiQ -aih -aih -alC +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa abj amx ajy @@ -149733,17 +144827,17 @@ aaa aaa aaa aaa -acw -dYX -dYZ -dZc -dZe -dZe -dZg -dZb -dZb -dZl -dZm +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa acF aaa abj @@ -149753,18 +144847,18 @@ aaa aaa aaa aaa -aeh -ahQ -aii -aiC -aiR -aiR -ajz -aiR -aiR -aiR -ajz -alD +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa acC acC acC @@ -149990,17 +145084,17 @@ aaa aaa aaa aaa -apB -dYX -dZb -dZb -dZb -dZb -dZb -dZb -dZb -dZn -dZp +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa acF abj abj @@ -150010,17 +145104,17 @@ aaa aaa aaa aaa -ahx -ahR -ahR -ahR -ahR -ahR -ahR -ahR -ahR -ahR -ahR +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa alE alY afb @@ -150247,17 +145341,17 @@ aaa aaa aaa aaa -aoO -dYX -dZa -dZd -dZd -dZd -dZh -dZj -dZk -dZl -dZo +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa acF aaa abj @@ -150267,18 +145361,18 @@ aaa aaa aaa aaa -afL -ahS -aij -aiD -aiS -aiS -ajA -aiS -aiS -aiS -ajA -alD +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa acC acC acC @@ -150504,16 +145598,16 @@ aaa aaa aaa aaa -apC -dYY -dYY -dYY -dYY -dYY -dYY -dYY -dYY -dZo +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa acF aaa @@ -150525,17 +145619,17 @@ aaa aaa aaa aaa -afL -aih -aih -aiQ -aih -aih -aih -aiQ -aih -aih -alF +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa abj amy ajf @@ -151798,8 +146892,8 @@ aaa aaa aaa add -adw -adw +add +add adL aey acC @@ -152311,10 +147405,10 @@ aaa aaa aaa aaa -adf -adw -adw -adM +add +add +add +adL aeA acC afj @@ -153348,19 +148442,19 @@ aaa abj aaa aaa -agi +afM agD -agS +agE ahB -agS +agE agF agF agF agF -agS +agE ahB -agS -akW +agE +agE aaa aaa aaa @@ -153605,7 +148699,7 @@ aaa abj aaa aee -agj +afM agE agT ahC @@ -153874,10 +148968,10 @@ ahC ahC ahD akx -akX -agS +agE +agE agF -akW +agE aaa acC anm @@ -154377,15 +149471,15 @@ abj aaa afM afM -agE +agD agW ahC ahW -ain +agD aiG aiG aiG -ajE +agD aka ahC akZ @@ -154902,10 +149996,10 @@ ahC ahC ahD akz -akX -agS +agE +agE agF -alb +agE aaa acC anl @@ -155147,7 +150241,7 @@ aaa abj aaa aee -agj +afM agE agT ahC @@ -155404,19 +150498,19 @@ aaa abj aaa aaa -agl -agG -agS +afM +agD +agE ahE -agS +agE agF agF agF agF -agS +agE ahE -agS -alb +agE +agE aaa aaa aaa @@ -156323,29 +151417,29 @@ aaa aaa aaa aaa -dHW -dIP -dJI -dJI -dKy -dLL -dJI -dJI -dLB -dJI +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa dNS -dJI -dKy -dKW -dLL -dJI -dLB -dOA -dLB -dJI -dJI -dJI -dVz +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -156424,8 +151518,8 @@ aaa aaa aaa adg -ady -ady +adg +adg adQ aey acC @@ -156579,30 +151673,30 @@ dEq abj aaa aaa -dYe -dYf -dIQ -dLO -dKt -dOy -dOy -dOy -dNe -dNR -dTL -dNR -dNe -dOy -dOy -dOy -dKt -dNR -dIQ -dTM -dUw -dUw -dVr -dIQ +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -156836,30 +151930,30 @@ dEo aaa aaa aaa -dYe -dYf -dIR -dJK -dKu -dKu -dKu -dKu -dKu -dKu -dKu -dKu -dKu -dKu -dKu -dKu -dKu -dSv -dTb -dTM -dTM -dTM -dVr -dIT +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -156937,10 +152031,10 @@ aaa aaa aaa aaa -adi -ady -ady -adR +adg +adg +adg +adQ aeA acC afj @@ -157093,31 +152187,31 @@ dEo aaa aaa aaa -dYe -dYf -dIS -dJK -dKu -dOz -dOz -dOz -dOz -dOz -dKu -dOz -dOz -dOz -dOz -dOz -dKu -dSv -dIR -dTN -dTM -dTM -dVs -dIU -dVz +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -157350,35 +152444,35 @@ dEq abj aaa aaa -dGW -dGW -dIQ -dJK -dKu -dKT -dLM -dMt -dNf -dKT -dKu -dMt -dNf -dKT -dKw -dMt -dKu -dSv -dIS -dTN -dTM -dVf -dVr -dIU -dIV -dJI -dIT -dJI -dVz +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -157607,35 +152701,35 @@ dEo aaa aaa aaa -dYe -dYf -dIQ -dJL -dKu -dOy -dOy -dOy -dOy -dOy -dKu -dOy -dOy -dOy -dOy -dOy -dKu -dSv -dIQ -dTO -dTM -dVg -dVg -dIQ -dVE -dVI -dVN -dVS -dIQ +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -157864,35 +152958,35 @@ dEo aaa aaa aaa -dYe -dYf -dIT -dJK -dKu -dKu -dKu -dKu -dKu -dKu -dKu -dKu -dKu -dKu -dKu -dKu -dKu -dSw -dIU -dJI -dTb -dIT -dJI -dVA -dVF -dVJ -dVJ -dVT -dIT +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -158121,35 +153215,35 @@ dEq abj aaa aaa -dGW -dGW -dIQ -dJL -dKu -dOz -dOz -dOz -dOz -dOz -dKu -dOz -dOz -dOz -dOz -dOz -dKu -dSv -dIT -dTP -dUx -dVh -dVt -dVB -dVG -dVG -dVO -dVU -dIT +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -158378,35 +153472,35 @@ dEo aaa aaa aaa -dYe -dYf -dIR -dJK -dKu -dKT -dKw -dMt -dNf -dKT -dKu -dMt -dLM -dKT -dJI -dMt -dKu -dSv -dSz -dJK -dKu -dKu -dVu -dWJ -dVG -dVG -dVP -dVV -dIT +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -158635,35 +153729,35 @@ dEo aaa aaa aaa -dYe -dYf -dIS -dJK -dKu -dOy -dOy -dOy -dOy -dOy -dKu -dOy -dOy -dOy -dOy -dOy -dKu -dSv -dSz -dJK -dKu -dKu -dVu -dWJ -dVG -dVG -dVQ -dVW -dIT +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -158892,35 +153986,35 @@ dEq abj aaa aaa -dGW -dGW -dIQ -dJK -dKu -dKu -dKu -dKu -dKu -dKu -dKu -dKu -dKu -dKu -dKu -dKu -dKu -dSv -dIT -dTQ -dUy -dVi -dUB -dVB -dVG -dVK -dVO -dVX -dIT +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -159149,35 +154243,35 @@ dEo aaa aaa aaa -dYe -dYf -dIT -dLO -dKv -dOz -dKu -dKu -dOz -dOz -dWB -dOz -dOz -dOz -dNR -dNR -dKv -dLO -dIU -dJI -dJI -dOA -dWD -dTd -dVF -dVL -dVL -dVY -dIT +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -159406,35 +154500,35 @@ dEo aaa aaa aaa -dYe -dYf -dIU -dJI -dKw -dIT -dOa -dOa -dIT -dNT -dOA -dJI -dJI -dJI -dQt -dQt -dJI -dJI -dTd -dTc -dUz -dWC -dWE -dIQ -dVH -dVM -dVR -dVZ -dIQ +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -159663,35 +154757,35 @@ dEq abj aaa aaa -dGW -dGW -dIQ -dTz -dXB -dKU -dXN -dXP -dNg -dNU -dIQ -dKR -dLN -dPO -dNR -dNR -dRe -dRY -dIQ -dTR -dUA -dVk -dJI -dVC -dOA -dJI -dIT -dJI -dVD +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -159920,31 +155014,31 @@ dEo aaa aaa aaa -dYe -dYf -dIR -dYg -dJN -dKU -dXN -dXP -dNg -dJN -dJJ -dNR -dOB -dPP -dPP -dPP -dRW -dSx -dIQ -dTS -dUB -dVl -dWF -dIU -dVD +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -160177,30 +155271,30 @@ dEo aaa aaa aaa -dYe -dYf -dIS -dYh -dJN -dKU -dXN -dXP -dNg -dJN -dJJ -dNR -dPh -dPQ -dPQ -dPQ -dRX -dSx -dIQ -dTR -dSv -dJK -dWF -dIT +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -160434,30 +155528,30 @@ dEq aaa aaa aaa -dYe -dYf -dIQ -dXt -dXL -dXM -dXO -dXR -dNh -dNV -dOC -dKS -dPi -dPR -dRd -dRd -dLO -dSy -dIQ -dLO -dUC -dVm -dWF -dIQ +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -160692,29 +155786,29 @@ aaa aaa aaa aaa -dHY -dIV -dJI -dKy -dKW -dKW -dLL -dJI -dJI -dIV -dJI -dKy -dKW -dKW -dKW -dLL -dJI -dIV -dIT -dTT -dTT -dIT -dVD +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -161065,17 +156159,17 @@ ahM ahM aiz agL -dZq -dZv -dZv -dZv -dZv -dZv -dZv -dZv -dZv -dZJ -dZL +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa alI aoi aoN @@ -161322,17 +156416,17 @@ aaa aaa aaa aaa -dZs -dZw -dZy -dZA -dZC -dZD -dZD -dZF -dZH -dZy -dZJ +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa alI dZP dZR @@ -161579,17 +156673,17 @@ aaa aaa aaa aaa -dZr -dZw -dZx -dZz -dZy -dZy -dZy -dZy -dZy -dZy -dZM +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa alI dZO dZQ @@ -161609,9 +156703,9 @@ abj abj aCQ aGf -aFO +gyp aFS -aKK +hHr aIj aJu abj @@ -161836,17 +156930,17 @@ aaa aaa aaa aaa -dZu -dZw -dZy -dZB -dZy -dZE -dZE -dZy -dZI -dZK -dZJ +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa alI alI alI @@ -162093,17 +157187,17 @@ aaa aaa aaa aaa -dZt -dZv -dZv -dZv -dZv -dZv -dZv +aaa +aaa +aaa +aaa +aaa +aaa +aaa dZG -dZv -dZJ -dZN +aaa +aaa +aaa abj aaa abi @@ -162119,17 +157213,17 @@ ayH axy asc aaa -aBc -aCa -aCa -aHV +aaa +aaa +aaa +aaa aFb -aCa -aFb -aJr -aCa -aKM -aMm +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa abj @@ -162376,18 +157470,18 @@ azS axD asc aaa -aBd -aCb -aCb -aCb -aCb -aFT -aCb -aCb -aCb -aKN -aMn -aNz +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa abj aSb @@ -162633,18 +157727,18 @@ awF axE asd aaa -aBd -aCb -aCb -aCb -aCb -aCb -aCb -aCb -aCb -aCb -aMo -aNA +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa abj aSf @@ -162663,15 +157757,15 @@ bjU aaa aaa aaa -bqD -bsw -btM -bsw -bsw -btM -bsw -bsw -bCF +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa bFS bHM @@ -162890,18 +157984,18 @@ asc asd asd aaa -aBd -aCc -aCb -aCb -aCb -aCb -aCb -aCb -aCb -aKO -aMo -aNA +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa abj aSg @@ -162911,24 +158005,24 @@ aSf aSg aSg abj -bcQ -bet -bcS +aaa +aaa +aaa bgY -bcS -bet -blP aaa aaa -bqE -bsx -btN -bvi -bww -bxH -bze -bAL -bCG +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa bFV bHN @@ -163147,18 +158241,18 @@ abj abj aaa aaa -aBd -aCb -aCb -aCb -aCb -aCb -aCb -aCb -aCb -aCb -aMo -aNA +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa abj aSg @@ -163168,24 +158262,24 @@ aSg aSg aSg abj -bcR -beu -bfP -bfP -bfQ -bjV -bcR aaa aaa -bqF -bsy -btO -bvj -bww -bww -bww -bAL -bCG +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa bFW bHO @@ -163404,18 +158498,18 @@ abi aaa aaa aaa -aBd -aCb -aCb -aCb -aCb -aFU -aCb -aCb -aCb -aKP -aMn -aNB +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa abj aSg @@ -163425,24 +158519,24 @@ aSf aSg aSg abj -bcS -bev -bfQ -bfP -bfQ -bjW -blQ aaa aaa -bqG -bsz -btP -bvk -bwx -bxI -bww -bAL -bCG +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa bFS bHP @@ -163661,17 +158755,17 @@ aaa aaa aaa aaa -aBe -aCa -aCa -aCa -aCa -aCa -aGS -aCa -aCa -aKQ -aMp +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa abj @@ -163682,24 +158776,24 @@ aaa abj abj abj -bcR -bew -bfP -bfP -bfQ -bjX -bcR aaa aaa -bqH -bsw -btQ -bsw -bsw -bsw +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa bzf -bsw -bCH +aaa +aaa aaa bFS bFS @@ -163939,13 +159033,13 @@ abj abj aaa aaa -bcT -bet -bcS -bgZ -bcS -bet -blR +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -171603,18 +166697,18 @@ aaa aaa aaa aaa -ajj -ajO -ajO -ajO -akm -akm -akM -amj -alo -ajO -ajO -akQ +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -171860,18 +166954,18 @@ aaa aaa aaa aaa -ajk -ajP -akk -akJ -aln -aln -aln -amk -amk -amW -anD -aok +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -172117,18 +167211,18 @@ aaa aaa aaa aaa -ajl -ajQ -akl -akK -akm -akm -alU -aml -akn -amX -anD -aok +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -172374,18 +167468,18 @@ aaa aaa aaa aaa -ajm -ajO -ajO -akL aaa -akm -alU -amm -akn -amY -akm -akL +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -172636,12 +167730,12 @@ aaa aaa aaa aaa -akm -alU -amn -akn -amZ -akm +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -172890,15 +167984,15 @@ aaa aaa aaa aaa -ajj -akM -alo -akm -alU -amo -amJ -ana -akm +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -173146,22 +168240,22 @@ aaa aaa aaa aaa -ajj -akm -akN -akN -akm -alU -ajO -ajO -ajO -ajO -ajO -ajO -ajO -ajO -ajO -akQ +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -173402,24 +168496,24 @@ aaa aaa aaa aaa -ajj -ajO -akn -akn -akn -akm -alU -alB -akn -anb -anE -aol -aoQ -apD -aqq -ark -akm -akQ +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -173660,23 +168754,23 @@ aaa aaa aaa aaa -ajR -ako -akn -alp -akm -ajO -akm -akn -akn -akn -akn -akn -apE -aqr -arl -ase -akm +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -173705,7 +168799,7 @@ abj aMq bpr bbI -bwO +bpr aMq abj abj @@ -173917,23 +169011,23 @@ aaa aaa aaa aaa -ajS -akp -akO -alq -alB -alV -alB -akn -akn -akn -akn -akn -alB -akn -akn -asf -akm +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -174174,23 +169268,23 @@ aaa aaa aaa aaa -ajT -akq -akn -akn -akm -ajO -akm -akn -akn -akn -akn -akn -apD -aqs -arm -asg -akm +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -174430,24 +169524,6 @@ aaa aaa aaa aaa -ajm -ajO -akn -akn -akn -akm -alU -alB -akn -anc -anF -aom -aom -apE -aqt -arn -akm -akL aaa aaa aaa @@ -174474,9 +169550,27 @@ aaa aaa aaa aaa -baf +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +bae bbL -bdj +bae aaa aaa aaa @@ -174688,22 +169782,22 @@ aaa aaa aaa aaa -ajm -akm -udT -udT -akm -alU -ajO -ajO -ajO -ajO -ajO -ajO -ajO -ajO -ajO -akL +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -174946,15 +170040,15 @@ aaa aaa aaa aaa -ajm -akP -alr -akm -alU -amp -akn -and -akm +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -175206,12 +170300,12 @@ aaa aaa aaa aaa -akm -alU -amq -akn -akn -akm +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -175458,18 +170552,18 @@ aaa aaa aaa aaa -ajj -ajO -ajO -akQ aaa -akm -alU -amr -amK -ane -akm -akQ +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -175715,18 +170809,18 @@ aaa aaa aaa aaa -ajn -ajU -akr -akR -akm -akm -alU -ams -akn -akn -anD -aok +aoP +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -175972,18 +171066,18 @@ aaa aaa aaa aaa -ajo -ajV -aks -akS -aln -aln -aln -amk -amk -amW -anD -aok +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -176229,18 +171323,18 @@ aaa aaa aaa aaa -ajm -ajO -ajO -ajO -akm -akm -akP -amt -alr -ajO -ajO -akL +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa diff --git a/_maps/map_files/MetaStation/MetaStation.v41A.II.dmm b/_maps/map_files/MetaStation/MetaStation.dmm similarity index 92% rename from _maps/map_files/MetaStation/MetaStation.v41A.II.dmm rename to _maps/map_files/MetaStation/MetaStation.dmm index 38a22222a39..0eed170f63f 100644 --- a/_maps/map_files/MetaStation/MetaStation.v41A.II.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -14,322 +14,13 @@ }, /turf/space, /area/space/nearstation) -"aac" = ( -/obj/machinery/porta_turret/syndicate, -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 8; - icon_state = "diagonalWall3" - }, -/area/shuttle/syndicate) -"aad" = ( -/turf/simulated/shuttle/wall{ - icon_state = "wall3" - }, -/area/shuttle/syndicate) -"aae" = ( -/obj/machinery/door/poddoor/shutters{ - density = 0; - dir = 2; - icon_state = "open"; - id_tag = "syndieshutters"; - name = "Blast Shutters"; - opacity = 0 - }, -/obj/structure/grille, -/obj/structure/shuttle/window{ - tag = "icon-window5_end"; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "window5_end"; - dir = 2 - }, -/turf/simulated/shuttle/plating, -/area/shuttle/syndicate) -"aaf" = ( -/obj/machinery/door/poddoor/shutters{ - density = 0; - dir = 2; - icon_state = "open"; - id_tag = "syndieshutters"; - name = "Blast Shutters"; - opacity = 0 - }, -/obj/structure/grille, -/obj/structure/shuttle/window{ - tag = "icon-window5_mid"; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "window5_mid"; - dir = 2 - }, -/turf/simulated/shuttle/plating, -/area/shuttle/syndicate) -"aag" = ( -/obj/machinery/door/poddoor/shutters{ - density = 0; - dir = 2; - icon_state = "open"; - id_tag = "syndieshutters"; - name = "Blast Shutters"; - opacity = 0 - }, -/obj/structure/grille, -/obj/structure/shuttle/window{ - tag = "icon-window5_end (NORTH)"; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "window5_end"; - dir = 1 - }, -/turf/simulated/shuttle/plating, -/area/shuttle/syndicate) -"aah" = ( -/obj/machinery/porta_turret/syndicate, -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 1; - icon_state = "diagonalWall3" - }, -/area/shuttle/syndicate) -"aai" = ( -/turf/simulated/shuttle/wall{ - dir = 4; - icon_state = "wall3" - }, -/area/shuttle/syndicate) -"aaj" = ( -/obj/structure/table, -/obj/machinery/kitchen_machine/microwave, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"aak" = ( -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"aal" = ( -/obj/structure/table, -/obj/item/flashlight/lamp{ - pixel_x = 4; - pixel_y = 1 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"aam" = ( -/obj/machinery/computer/shuttle/syndicate, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"aan" = ( -/obj/structure/table, -/obj/machinery/door_control{ - id = "syndieshutters"; - name = "remote shutter control"; - req_access_txt = "150" - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"aao" = ( -/obj/structure/computerframe, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"aap" = ( -/obj/structure/table, -/obj/item/storage/box/syndidonkpockets, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"aaq" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 1 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"aar" = ( -/obj/machinery/light/spot{ - tag = "icon-tube1 (EAST)"; - icon_state = "tube1"; - dir = 4 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"aas" = ( -/obj/structure/table, -/obj/item/stack/sheet/glass{ - amount = 10 - }, -/obj/item/multitool, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"aat" = ( -/obj/machinery/light/spot, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"aau" = ( -/obj/item/radio/intercom/syndicate{ - pixel_y = -28 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"aav" = ( -/obj/structure/closet/syndicate/personal, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"aaw" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - icon_state = "diagonalWall3" - }, -/area/shuttle/syndicate) -"aax" = ( -/obj/machinery/door/window{ - dir = 2; - name = "Cockpit"; - req_access_txt = "150" - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"aay" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 4; - icon_state = "diagonalWall3" - }, -/area/shuttle/syndicate) -"aaz" = ( -/obj/structure/table, -/obj/item/stack/cable_coil, -/obj/item/crowbar/red, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"aaA" = ( -/obj/structure/table, -/obj/item/storage/box/zipties, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"aaB" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 4 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"aaC" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 8 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) "aaD" = ( /obj/effect/landmark{ name = "carpspawn" }, /turf/space, /area/space) -"aaE" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 8; - icon_state = "diagonalWall3" - }, -/area/shuttle/syndicate) -"aaF" = ( -/obj/machinery/porta_turret/syndicate, -/turf/simulated/shuttle/wall{ - dir = 4; - icon_state = "wall3" - }, -/area/shuttle/syndicate) -"aaG" = ( -/obj/structure/closet/syndicate/suits, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"aaH" = ( -/obj/structure/closet/syndicate/nuclear, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"aaI" = ( -/obj/structure/chair/stool{ - pixel_y = 8 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"aaJ" = ( -/obj/structure/table, -/obj/item/aicard, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) "aaK" = ( -/obj/machinery/door/airlock/external{ - frequency = 1331; - icon_state = "door_locked"; - id_tag = "synd_outer"; - locked = 0; - name = "Ship External Access"; - req_access = null; - req_access_txt = "150" - }, -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "open"; - id_tag = "smindicate"; - name = "Outer Airlock"; - opacity = 0 - }, -/obj/machinery/door_control{ - id = "smindicate"; - name = "External Door Control"; - pixel_x = -26; - pixel_y = -2; - req_access_txt = "150" - }, -/obj/docking_port/mobile{ - dheight = 9; - dir = 2; - dwidth = 5; - height = 22; - id = "syndicate"; - name = "syndicate infiltrator"; - roundstart_move = "syndicate_away"; - width = 18 - }, /obj/docking_port/stationary{ dheight = 9; dir = 2; @@ -339,152 +30,8 @@ name = "northwest of station"; width = 18 }, -/turf/simulated/shuttle/plating, -/area/shuttle/syndicate) -"aaL" = ( -/obj/structure/sign/securearea{ - desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; - icon_state = "space"; - layer = 4; - name = "EXTERNAL AIRLOCK" - }, -/turf/simulated/shuttle/wall{ - icon_state = "wall3" - }, -/area/shuttle/syndicate) -"aaM" = ( /turf/space, -/turf/simulated/shuttle/wall{ - dir = 1; - icon_state = "diagonalWall3" - }, -/area/shuttle/syndicate) -"aaN" = ( -/obj/structure/closet/syndicate/suits, -/obj/machinery/light/spot{ - tag = "icon-tube1 (WEST)"; - icon_state = "tube1"; - dir = 8 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"aaO" = ( -/obj/structure/table, -/obj/item/grenade/plastic/c4{ - pixel_x = 2; - pixel_y = 1 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"aaP" = ( -/obj/machinery/light/spot{ - tag = "icon-tube1 (WEST)"; - icon_state = "tube1"; - dir = 8 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"aaQ" = ( -/obj/machinery/atmospherics/unary/tank/air{ - dir = 1 - }, -/turf/simulated/shuttle/wall{ - dir = 4; - icon_state = "wall3" - }, -/area/shuttle/syndicate) -"aaR" = ( -/obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 2; - frequency = 1331; - id_tag = "synd_pump" - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"aaS" = ( -/obj/machinery/door/window{ - dir = 4; - name = "Equipment Room"; - req_access_txt = "150" - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"aaT" = ( -/obj/machinery/access_button{ - command = "cycle_interior"; - frequency = 1331; - master_tag = "synd_airlock"; - name = "interior access button"; - pixel_x = 25; - pixel_y = 25; - req_access_txt = "0" - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"aaU" = ( -/obj/machinery/door/airlock/external{ - frequency = 1331; - icon_state = "door_locked"; - id_tag = "synd_inner"; - locked = 1; - name = "Ship External Access"; - req_access = null; - req_access_txt = "150" - }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5; - icon_state = "intact" - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"aaV" = ( -/obj/machinery/atmospherics/pipe/manifold4w/hidden, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"aaW" = ( -/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ - frequency = 1331; - id_tag = "synd_airlock"; - pixel_x = 25; - req_access_txt = "150"; - tag_airpump = "synd_pump"; - tag_chamber_sensor = "synd_sensor"; - tag_exterior_door = "synd_outer"; - tag_interior_door = "synd_inner" - }, -/obj/machinery/airlock_sensor{ - frequency = 1331; - id_tag = "synd_sensor"; - pixel_x = 25; - pixel_y = 12; - req_access_txt = "150" - }, -/obj/machinery/light{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 4 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) +/area/space) "aaX" = ( /obj/docking_port/stationary{ dheight = 9; @@ -497,55 +44,6 @@ }, /turf/space, /area/space) -"aaY" = ( -/obj/machinery/door/window{ - base_state = "right"; - dir = 4; - icon_state = "right"; - name = "Equipment Room"; - req_access_txt = "150" - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"aaZ" = ( -/obj/effect/spawner/window/reinforced, -/turf/unsimulated/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"aba" = ( -/obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 1; - frequency = 1331; - id_tag = "synd_pump" - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"abb" = ( -/obj/structure/rack, -/obj/item/clothing/suit/space/syndicate/black/red, -/obj/item/clothing/head/helmet/space/syndicate/black/red, -/obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 1; - frequency = 1331; - id_tag = "synd_pump" - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"abc" = ( -/obj/item/radio/intercom/syndicate{ - pixel_x = -28 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) "abd" = ( /obj/structure/grille, /turf/space, @@ -560,205 +58,18 @@ /obj/structure/lattice, /turf/space, /area/space/nearstation) -"abg" = ( -/obj/machinery/recharge_station/upgraded, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"abh" = ( -/obj/machinery/portable_atmospherics/canister/oxygen, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"abi" = ( -/obj/structure/table, -/obj/machinery/cell_charger, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"abj" = ( -/obj/structure/table, -/obj/machinery/recharger{ - pixel_y = 0 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"abk" = ( -/obj/machinery/vending/wallmed/syndicate{ - pixel_x = -30 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"abl" = ( -/obj/structure/table, -/obj/item/stock_parts/cell/high{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/stock_parts/cell/high, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"abm" = ( -/obj/structure/table, -/obj/item/screwdriver{ - pixel_y = 9 - }, -/obj/item/assembly/voice{ - pixel_y = 3 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"abn" = ( -/obj/structure/table, -/obj/item/wrench, -/obj/item/assembly/infra, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"abo" = ( -/obj/structure/table, -/obj/item/assembly/prox_sensor{ - pixel_x = -8; - pixel_y = 4 - }, -/obj/item/assembly/prox_sensor{ - pixel_x = -8; - pixel_y = 4 - }, -/obj/item/assembly/signaler, -/obj/item/assembly/signaler, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"abp" = ( -/obj/structure/table, -/obj/item/weldingtool/largetank, -/obj/item/multitool, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) "abq" = ( /obj/structure/lattice, /turf/space, /area/space/nearstation) -"abr" = ( -/obj/machinery/door/window{ - dir = 4; - name = "Infirmary"; - req_access_txt = "150" - }, -/obj/machinery/light/spot{ - tag = "icon-tube1 (NORTH)"; - icon_state = "tube1"; - dir = 1 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"abs" = ( -/obj/machinery/door/window/westright{ - name = "Tool Storage"; - req_access_txt = "150" - }, -/obj/machinery/light/spot{ - tag = "icon-tube1 (NORTH)"; - icon_state = "tube1"; - dir = 1 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"abt" = ( -/obj/structure/table, -/obj/item/storage/toolbox/syndicate, -/obj/item/crowbar/red, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) "abu" = ( /obj/structure/cable{ - icon_state = "0-2"; - d2 = 2 + d2 = 2; + icon_state = "0-2" }, /obj/machinery/power/tracker, /turf/simulated/floor/plating/airless, /area/solar/auxport) -"abv" = ( -/obj/machinery/light/spot{ - tag = "icon-tube1 (WEST)"; - icon_state = "tube1"; - dir = 8 - }, -/obj/machinery/sleeper/syndie{ - dir = 4 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"abw" = ( -/obj/machinery/sleeper/syndie{ - dir = 4 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"abx" = ( -/obj/machinery/door/window{ - base_state = "right"; - dir = 4; - icon_state = "right"; - name = "Infirmary"; - req_access_txt = "150" - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"aby" = ( -/obj/machinery/door/window{ - dir = 8; - name = "Tool Storage"; - req_access_txt = "150" - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"abz" = ( -/obj/structure/closet/crate/internals, -/obj/item/tank/oxygen/red, -/obj/item/clothing/mask/gas, -/obj/item/tank/oxygen/red, -/obj/item/clothing/mask/gas, -/obj/item/tank/oxygen/red, -/obj/item/clothing/mask/gas, -/obj/item/tank/oxygen/red, -/obj/item/clothing/mask/gas, -/obj/item/tank/oxygen/red, -/obj/item/clothing/mask/gas, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) "abA" = ( /obj/structure/cable{ d1 = 1; @@ -771,75 +82,10 @@ "abB" = ( /turf/simulated/wall/r_wall, /area/security/permabrig) -"abC" = ( -/obj/structure/table, -/obj/item/gun/syringe, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"abD" = ( -/obj/structure/table, -/obj/item/reagent_containers/syringe/charcoal, -/obj/item/reagent_containers/syringe/charcoal{ - pixel_y = 2 - }, -/obj/item/reagent_containers/syringe/charcoal{ - pixel_y = 4 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"abE" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"abF" = ( -/obj/machinery/door/window{ - dir = 1; - name = "Secure Storage"; - req_access_txt = "150" - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"abG" = ( -/obj/structure/table, -/obj/item/radio/beacon/syndicate/bomb{ - pixel_y = 5 - }, -/obj/item/radio/beacon/syndicate/bomb, -/turf/unsimulated/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"abH" = ( -/obj/structure/table, -/obj/item/grenade/syndieminibomb{ - pixel_x = 4; - pixel_y = 2; - pixel_z = 0 - }, -/obj/item/grenade/syndieminibomb{ - pixel_x = -1 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) "abI" = ( /obj/structure/cable{ - icon_state = "0-2"; - d2 = 2 + d2 = 2; + icon_state = "0-2" }, /obj/machinery/power/solar{ id = "foreport"; @@ -849,23 +95,9 @@ icon_state = "solarpanel" }, /area/solar/auxport) -"abJ" = ( -/obj/effect/landmark{ - name = "Nuclear-Bomb" - }, -/obj/machinery/light/spot, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) "abK" = ( /obj/structure/shuttle/engine/propulsion/burst, -/turf/simulated/floor/plating, -/turf/simulated/shuttle/wall{ - tag = "icon-swall_f5"; - icon_state = "swall_f5"; - dir = 2 - }, +/turf/simulated/wall/mineral/titanium, /area/shuttle/pod_2) "abL" = ( /obj/structure/cable, @@ -886,63 +118,6 @@ /obj/structure/lattice/catwalk, /turf/space, /area/solar/auxport) -"abN" = ( -/obj/structure/table, -/obj/item/bonegel, -/obj/item/bonesetter, -/obj/item/hemostat, -/obj/item/cautery, -/obj/item/surgicaldrill, -/obj/item/circular_saw, -/obj/item/scalpel, -/obj/item/retractor, -/obj/item/FixOVein, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"abO" = ( -/obj/machinery/optable, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"abP" = ( -/obj/structure/closet/crate/medical, -/obj/item/reagent_containers/glass/bottle/morphine, -/obj/item/storage/box/beakers, -/obj/item/robot_parts/l_arm, -/obj/item/robot_parts/r_arm, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"abQ" = ( -/obj/structure/shuttle/engine/heater, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/shuttle/plating, -/area/shuttle/syndicate) -"abR" = ( -/obj/structure/computerframe, -/obj/item/paper/synditele, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"abS" = ( -/obj/machinery/teleport/station, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"abT" = ( -/obj/machinery/teleport/hub/upgraded, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) "abU" = ( /obj/structure/cable{ d1 = 4; @@ -976,8 +151,8 @@ /area/solar/auxport) "abX" = ( /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/structure/lattice/catwalk, /turf/space, @@ -1026,24 +201,6 @@ icon_state = "floorgrime" }, /area/security/permabrig) -"acb" = ( -/obj/structure/shuttle/engine/propulsion{ - tag = "icon-propulsion_l"; - icon_state = "propulsion_l" - }, -/turf/simulated/shuttle/plating, -/area/shuttle/syndicate) -"acc" = ( -/obj/structure/shuttle/engine/propulsion, -/turf/simulated/shuttle/plating, -/area/shuttle/syndicate) -"acd" = ( -/obj/structure/shuttle/engine/propulsion{ - tag = "icon-propulsion_r"; - icon_state = "propulsion_r" - }, -/turf/simulated/shuttle/plating, -/area/shuttle/syndicate) "ace" = ( /obj/structure/cable, /obj/machinery/power/solar{ @@ -1112,19 +269,6 @@ icon_state = "floorgrime" }, /area/security/permabrig) -"acl" = ( -/obj/structure/mirror{ - pixel_x = 28 - }, -/obj/structure/sink{ - dir = 4; - icon_state = "sink"; - pixel_x = 11 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) "acm" = ( /obj/item/seeds/ambrosia, /obj/structure/cable/yellow{ @@ -1171,11 +315,7 @@ d2 = 4; icon_state = "2-4" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 - }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -1228,28 +368,16 @@ }, /area/security/permabrig) "acu" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f6"; - dir = 2 - }, +/turf/simulated/wall/mineral/titanium, /area/shuttle/pod_2) "acv" = ( -/obj/structure/window/full/shuttle, -/obj/structure/grille, -/turf/simulated/shuttle/plating, -/area/shuttle/pod_2) -"acw" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f10"; - dir = 2 - }, +/obj/effect/spawner/window/shuttle, +/turf/simulated/floor/plating, /area/shuttle/pod_2) "acx" = ( /obj/structure/cable{ - icon_state = "0-2"; - d2 = 2 + d2 = 2; + icon_state = "0-2" }, /obj/machinery/power/tracker, /turf/simulated/floor/plating/airless, @@ -1319,20 +447,6 @@ icon_state = "floorgrime" }, /area/security/permabrig) -"acG" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 8; - icon_state = "diagonalWall3" - }, -/area/space/nearstation) -"acH" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall3"; - icon_state = "swall3"; - dir = 2 - }, -/area/shuttle/pod_2) "acI" = ( /obj/machinery/status_display{ density = 0; @@ -1345,15 +459,8 @@ /obj/structure/chair/comfy/shuttle{ dir = 1 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/pod_2) -"acJ" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 1; - icon_state = "diagonalWall3" - }, -/area/space/nearstation) "acK" = ( /obj/item/beach_ball/holoball, /obj/structure/holohoop{ @@ -1401,7 +508,7 @@ /obj/structure/chair/comfy/shuttle{ dir = 1 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/pod_2) "acQ" = ( /obj/item/soap/nanotrasen, @@ -1425,8 +532,8 @@ icon_state = "4-8" }, /obj/item/twohanded/required/kirbyplants{ - tag = "icon-plant-13"; - icon_state = "plant-13" + icon_state = "plant-13"; + tag = "icon-plant-13" }, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" @@ -1519,15 +626,6 @@ icon_state = "floorgrime" }, /area/security/permabrig) -"acY" = ( -/obj/structure/shuttle/engine/propulsion/burst, -/turf/simulated/floor/plating, -/turf/simulated/shuttle/wall{ - tag = "icon-swall_f9"; - icon_state = "swall_f9"; - dir = 2 - }, -/area/shuttle/pod_2) "acZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/yellow{ @@ -1568,22 +666,19 @@ on = 1 }, /turf/simulated/floor/plasteel{ - tag = "icon-warndark (NORTHWEST)"; + dir = 9; icon_state = "warndark"; - dir = 9 + tag = "icon-warndark (NORTHWEST)" }, /area/security/permabrig) "add" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ - tag = "icon-warndark (NORTHEAST)"; + dir = 5; icon_state = "warndark"; - dir = 5 + tag = "icon-warndark (NORTHEAST)" }, /area/security/permabrig) "ade" = ( @@ -1591,9 +686,9 @@ dir = 6 }, /turf/simulated/floor/plasteel{ - tag = "icon-warndark (NORTH)"; + dir = 1; icon_state = "warndark"; - dir = 1 + tag = "icon-warndark (NORTH)" }, /area/security/permabrig) "adf" = ( @@ -1622,19 +717,19 @@ }, /area/security/hos) "adh" = ( -/obj/machinery/door/airlock/shuttle{ +/obj/machinery/door/airlock/titanium{ name = "Escape Pod Airlock" }, /obj/docking_port/mobile/pod{ id = "pod2"; name = "escape pod 2" }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/pod_2) "adi" = ( /obj/structure/cable{ - icon_state = "0-2"; - d2 = 2 + d2 = 2; + icon_state = "0-2" }, /obj/structure/lattice/catwalk, /turf/space, @@ -1779,9 +874,9 @@ pixel_x = -25 }, /turf/simulated/floor/plasteel{ - tag = "icon-warndark (WEST)"; + dir = 8; icon_state = "warndark"; - dir = 8 + tag = "icon-warndark (WEST)" }, /area/security/permabrig) "ady" = ( @@ -1791,9 +886,9 @@ pixel_x = 28 }, /turf/simulated/floor/plasteel{ - tag = "icon-warndark (EAST)"; + dir = 4; icon_state = "warndark"; - dir = 4 + tag = "icon-warndark (EAST)" }, /area/security/permabrig) "adz" = ( @@ -1848,14 +943,14 @@ /turf/simulated/floor/plating, /area/security/permabrig) "adE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, /obj/item/radio/intercom/locked/prison{ dir = 2; name = "Prison Intercom (General)"; pixel_y = -28 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -1872,8 +967,8 @@ /area/security/podbay) "adG" = ( /obj/structure/cable{ - icon_state = "0-2"; - d2 = 2 + d2 = 2; + icon_state = "0-2" }, /obj/machinery/power/solar{ id = "forestarboard"; @@ -1915,62 +1010,7 @@ icon_state = "whitered" }, /area/security/permabrig) -"adJ" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 8; - icon_state = "diagonalWall3" - }, -/area/shuttle/vox) -"adK" = ( -/obj/machinery/access_button{ - command = "cycle_exterior"; - frequency = 1331; - master_tag = "vox_west_control"; - req_one_access_txt = "152" - }, -/turf/simulated/shuttle/wall{ - icon_state = "wall3" - }, -/area/shuttle/vox) -"adL" = ( -/obj/machinery/door/airlock/hatch{ - frequency = 1331; - icon_state = "door_locked"; - id_tag = "vox_northwest_lock"; - locked = 1; - req_access_txt = "152"; - req_one_access = null; - req_one_access_txt = "0" - }, -/turf/simulated/shuttle/plating/vox, -/area/shuttle/vox) -"adM" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 1; - icon_state = "diagonalWall3" - }, -/area/shuttle/vox) "adN" = ( -/obj/machinery/door/airlock/hatch{ - frequency = 1331; - icon_state = "door_locked"; - id_tag = "vox_northeast_lock"; - locked = 1; - req_access_txt = "152"; - req_one_access = null; - req_one_access_txt = "0" - }, -/obj/docking_port/mobile{ - dir = 2; - dwidth = 2; - height = 18; - id = "skipjack"; - name = "Vox Skipjack"; - roundstart_move = "skipjack_away"; - width = 19 - }, /obj/docking_port/stationary{ dir = 2; dwidth = 2; @@ -1979,19 +1019,8 @@ name = "northeast of SS13"; width = 19 }, -/turf/simulated/shuttle/plating/vox, -/area/shuttle/vox) -"adO" = ( -/obj/machinery/access_button{ - command = "cycle_exterior"; - frequency = 1331; - master_tag = "vox_east_control"; - req_access_txt = "152" - }, -/turf/simulated/shuttle/wall{ - icon_state = "wall3" - }, -/area/shuttle/vox) +/turf/space, +/area/space) "adP" = ( /obj/structure/cable, /obj/structure/lattice/catwalk, @@ -2076,17 +1105,14 @@ }, /area/security/podbay) "aea" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - tag = "icon-warndark (SOUTHWEST)"; + dir = 10; icon_state = "warndark"; - dir = 10 + tag = "icon-warndark (SOUTHWEST)" }, /area/security/permabrig) "aeb" = ( @@ -2095,9 +1121,9 @@ name = "justice injector" }, /turf/simulated/floor/plasteel{ - tag = "icon-warndark (SOUTHEAST)"; + dir = 6; icon_state = "warndark"; - dir = 6 + tag = "icon-warndark (SOUTHEAST)" }, /area/security/permabrig) "aec" = ( @@ -2106,9 +1132,9 @@ initialize_directions = 11 }, /turf/simulated/floor/plasteel{ - tag = "icon-warndark"; + dir = 2; icon_state = "warndark"; - dir = 2 + tag = "icon-warndark" }, /area/security/permabrig) "aed" = ( @@ -2144,108 +1170,6 @@ /obj/structure/lattice/catwalk, /turf/space, /area/solar/auxstarboard) -"aeh" = ( -/turf/simulated/shuttle/wall{ - dir = 4; - icon_state = "wall3" - }, -/area/shuttle/vox) -"aei" = ( -/obj/machinery/atmospherics/unary/vent_pump/high_volume{ - frequency = 1331; - id_tag = "vox_west_vent" - }, -/turf/simulated/shuttle/plating/vox, -/area/shuttle/vox) -"aej" = ( -/obj/machinery/airlock_sensor{ - frequency = 1331; - id_tag = "vox_west_sensor"; - pixel_x = 25; - req_access_txt = "152" - }, -/obj/machinery/light/spot{ - tag = "icon-tube1 (EAST)"; - icon_state = "tube1"; - dir = 4 - }, -/turf/simulated/shuttle/plating/vox, -/area/shuttle/vox) -"aek" = ( -/obj/machinery/door/poddoor/shutters{ - density = 0; - dir = 2; - icon_state = "open"; - id_tag = "voxshutters"; - name = "Blast Shutters"; - opacity = 0 - }, -/obj/structure/grille, -/obj/structure/shuttle/window{ - tag = "icon-window5_end"; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "window5_end"; - dir = 2 - }, -/turf/simulated/shuttle/plating/vox, -/area/shuttle/vox) -"ael" = ( -/obj/machinery/door/poddoor/shutters{ - density = 0; - dir = 2; - icon_state = "open"; - id_tag = "voxshutters"; - name = "Blast Shutters"; - opacity = 0 - }, -/obj/structure/grille, -/obj/structure/shuttle/window{ - tag = "icon-window5_mid"; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "window5_mid"; - dir = 2 - }, -/turf/simulated/shuttle/plating/vox, -/area/shuttle/vox) -"aem" = ( -/obj/machinery/door/poddoor/shutters{ - density = 0; - dir = 2; - icon_state = "open"; - id_tag = "voxshutters"; - name = "Blast Shutters"; - opacity = 0 - }, -/obj/structure/grille, -/obj/structure/shuttle/window{ - tag = "icon-window5_end (NORTH)"; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "window5_end"; - dir = 1 - }, -/turf/simulated/shuttle/plating/vox, -/area/shuttle/vox) -"aen" = ( -/obj/machinery/airlock_sensor{ - frequency = 1331; - id_tag = "vox_east_sensor"; - pixel_x = -25; - req_access_txt = "152" - }, -/obj/machinery/light/spot{ - tag = "icon-tube1 (WEST)"; - icon_state = "tube1"; - dir = 8 - }, -/turf/simulated/shuttle/plating/vox, -/area/shuttle/vox) -"aeo" = ( -/obj/machinery/atmospherics/unary/vent_pump/high_volume{ - frequency = 1331; - id_tag = "vox_east_vent" - }, -/turf/simulated/shuttle/plating/vox, -/area/shuttle/vox) "aep" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -2260,9 +1184,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, /turf/simulated/floor/plasteel, /area/security/permabrig) "aer" = ( @@ -2292,9 +1213,7 @@ d2 = 8; icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -2360,11 +1279,8 @@ req_access_txt = "3" }, /obj/machinery/atmospherics/pipe/simple/hidden, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /obj/structure/window/reinforced{ dir = 8 @@ -2429,11 +1345,8 @@ /turf/space, /area/solar/auxstarboard) "aeB" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /obj/machinery/light, /turf/simulated/floor/plasteel, @@ -2452,79 +1365,6 @@ icon_state = "white" }, /area/security/permabrig) -"aeD" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 8 - }, -/turf/simulated/shuttle/plating/vox, -/area/shuttle/vox) -"aeE" = ( -/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ - frequency = 1331; - id_tag = "vox_west_control"; - pixel_x = 24; - req_access_txt = "152"; - tag_airpump = "vox_west_vent"; - tag_chamber_sensor = "vox_west_sensor"; - tag_exterior_door = "vox_northwest_lock"; - tag_interior_door = "vox_southwest_lock" - }, -/obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 8; - frequency = 1331; - id_tag = "vox_west_vent" - }, -/turf/simulated/shuttle/plating/vox, -/area/shuttle/vox) -"aeF" = ( -/turf/simulated/shuttle/wall{ - icon_state = "wall3" - }, -/area/shuttle/vox) -"aeG" = ( -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"aeH" = ( -/obj/machinery/computer/station_alert, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"aeI" = ( -/obj/machinery/computer/shuttle/vox, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"aeJ" = ( -/obj/structure/table, -/obj/machinery/door_control{ - id = "voxshutters"; - name = "remote shutter control"; - req_access_txt = "152" - }, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"aeK" = ( -/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ - frequency = 1331; - id_tag = "vox_east_control"; - pixel_x = -24; - req_access_txt = "152"; - tag_airpump = "vox_east_vent"; - tag_chamber_sensor = "vox_east_sensor"; - tag_exterior_door = "vox_northeast_lock"; - tag_interior_door = "vox_southeast_lock" - }, -/obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 4; - frequency = 1331; - id_tag = "vox_east_vent" - }, -/turf/simulated/shuttle/plating/vox, -/area/shuttle/vox) -"aeL" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 4 - }, -/turf/simulated/shuttle/plating/vox, -/area/shuttle/vox) "aeM" = ( /obj/structure/grille, /obj/structure/sign/securearea{ @@ -2540,9 +1380,8 @@ name = "\improper Recreation Area" }) "aeO" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" @@ -2563,6 +1402,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4; + initialize_directions = 11 + }, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -2720,9 +1563,6 @@ }, /area/security/permabrig) "aeZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/power/apc{ cell_type = 2500; dir = 1; @@ -2737,6 +1577,9 @@ name = "educational injections"; pixel_x = 2 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -2750,11 +1593,8 @@ name = "old sink"; pixel_y = 28 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -2765,12 +1605,6 @@ /area/crew_quarters/fitness{ name = "\improper Recreation Area" }) -"afc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/turf/simulated/wall/r_wall, -/area/security/permabrig) "afd" = ( /obj/machinery/door/poddoor{ density = 0; @@ -2787,115 +1621,6 @@ icon_state = "floorgrime" }, /area/security/permabrig) -"afe" = ( -/obj/machinery/door/airlock/hatch{ - frequency = 1331; - icon_state = "door_locked"; - id_tag = "vox_southwest_lock"; - locked = 1; - req_access_txt = "152"; - req_one_access = null; - req_one_access_txt = "0" - }, -/obj/machinery/atmospherics/pipe/simple/hidden, -/turf/simulated/shuttle/plating/vox, -/area/shuttle/vox) -"aff" = ( -/obj/machinery/access_button{ - command = "cycle_interior"; - frequency = 1331; - master_tag = "vox_west_control"; - req_one_access_txt = "152" - }, -/turf/simulated/shuttle/wall{ - icon_state = "wall3" - }, -/area/shuttle/vox) -"afg" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 4; - icon_state = "diagonalWall3" - }, -/area/shuttle/vox) -"afh" = ( -/obj/machinery/door/poddoor/shutters{ - density = 0; - dir = 8; - icon_state = "open"; - id_tag = "voxshutters"; - name = "Blast Shutters"; - opacity = 0 - }, -/obj/structure/grille, -/obj/structure/shuttle/window{ - tag = "icon-window5_end (WEST)"; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "window5_end"; - dir = 8 - }, -/turf/simulated/shuttle/plating/vox, -/area/shuttle/vox) -"afi" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 4 - }, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"afj" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 1 - }, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"afk" = ( -/obj/machinery/door/poddoor/shutters{ - density = 0; - dir = 4; - icon_state = "open"; - id_tag = "voxshutters"; - name = "Blast Shutters"; - opacity = 0 - }, -/obj/structure/grille, -/obj/structure/shuttle/window{ - tag = "icon-window5_end (WEST)"; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "window5_end"; - dir = 8 - }, -/turf/simulated/shuttle/plating/vox, -/area/shuttle/vox) -"afl" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - icon_state = "diagonalWall3" - }, -/area/shuttle/vox) -"afm" = ( -/obj/machinery/access_button{ - command = "cycle_interior"; - frequency = 1331; - master_tag = "vox_east_control"; - req_one_access_txt = "152" - }, -/turf/simulated/shuttle/wall{ - icon_state = "wall3" - }, -/area/shuttle/vox) -"afn" = ( -/obj/machinery/door/airlock/hatch{ - frequency = 1331; - icon_state = "door_locked"; - id_tag = "vox_southeast_lock"; - locked = 1; - req_access_txt = "152"; - req_one_access = null; - req_one_access_txt = "0" - }, -/obj/machinery/atmospherics/pipe/simple/hidden, -/turf/simulated/shuttle/plating/vox, -/area/shuttle/vox) "afo" = ( /obj/structure/cable{ d2 = 8; @@ -2923,26 +1648,16 @@ /area/security/permabrig) "afq" = ( /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/structure/lattice/catwalk, /turf/space, /area/solar/auxstarboard) "afr" = ( /obj/effect/spawner/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/security/podbay) -"afs" = ( -/obj/effect/spawner/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plating, -/area/security/podbay) -"aft" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/wall, -/area/security/permabrig) "afu" = ( /obj/machinery/door/poddoor{ density = 0; @@ -2961,6 +1676,7 @@ 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" }, @@ -3000,6 +1716,9 @@ req_access_txt = "0"; specialfunctions = 4 }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -3046,11 +1765,8 @@ }, /area/security/permabrig) "afB" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /obj/machinery/light{ dir = 8 @@ -3103,6 +1819,7 @@ /obj/machinery/light{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -3136,69 +1853,8 @@ /turf/space, /area/solar/auxstarboard) "afH" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall12"; - dir = 2 - }, +/turf/simulated/wall/mineral/titanium, /area/shuttle/pod_3) -"afI" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f10"; - dir = 2 - }, -/area/shuttle/pod_3) -"afJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden, -/turf/simulated/shuttle/plating/vox, -/area/shuttle/vox) -"afK" = ( -/obj/machinery/door/poddoor/shutters{ - density = 0; - dir = 8; - icon_state = "open"; - id_tag = "voxshutters"; - name = "Blast Shutters"; - opacity = 0 - }, -/obj/structure/grille, -/obj/structure/shuttle/window{ - tag = "icon-window5_end (EAST)"; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "window5_end"; - dir = 4 - }, -/turf/simulated/shuttle/plating/vox, -/area/shuttle/vox) -"afL" = ( -/obj/machinery/light/spot, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"afM" = ( -/obj/item/clothing/head/collectable/petehat{ - desc = "It smells faintly of reptile."; - name = "fancy leader hat" - }, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"afN" = ( -/obj/machinery/door/poddoor/shutters{ - density = 0; - dir = 4; - icon_state = "open"; - id_tag = "voxshutters"; - name = "Blast Shutters"; - opacity = 0 - }, -/obj/structure/grille, -/obj/structure/shuttle/window{ - tag = "icon-window5_end (EAST)"; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "window5_end"; - dir = 4 - }, -/turf/simulated/shuttle/plating/vox, -/area/shuttle/vox) "afO" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 2; @@ -3218,10 +1874,6 @@ icon_state = "floorgrime" }, /area/security/permabrig) -"afQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/wall/r_wall, -/area/security/permabrig) "afR" = ( /obj/effect/decal/warning_stripes/north, /obj/machinery/door_control{ @@ -3271,6 +1923,10 @@ icon_state = "1-2" }, /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" }, @@ -3295,6 +1951,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -3408,7 +2065,7 @@ name = "\improper Recreation Area" }) "agh" = ( -/obj/machinery/door/airlock/shuttle{ +/obj/machinery/door/airlock/titanium{ name = "Escape Pod Airlock" }, /obj/docking_port/mobile/pod{ @@ -3416,7 +2073,7 @@ id = "pod3"; name = "escape pod 3" }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/pod_3) "agi" = ( /obj/item/radio/intercom{ @@ -3425,7 +2082,7 @@ /obj/structure/chair/comfy/shuttle{ dir = 4 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/pod_3) "agj" = ( /obj/machinery/door/firedoor, @@ -3438,16 +2095,9 @@ }, /area/security/podbay) "agk" = ( -/obj/structure/grille, -/obj/structure/window/full/shuttle, -/turf/simulated/shuttle/plating, +/obj/effect/spawner/window/shuttle, +/turf/simulated/floor/plating, /area/shuttle/pod_3) -"agl" = ( -/obj/machinery/door/airlock/hatch{ - req_access_txt = "152" - }, -/turf/simulated/shuttle/plating/vox, -/area/shuttle/vox) "agm" = ( /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -3455,9 +2105,9 @@ /area/security/permabrig) "agn" = ( /obj/structure/cable{ + d2 = 2; icon_state = "0-2"; - pixel_y = 1; - d2 = 2 + pixel_y = 1 }, /obj/structure/lattice/catwalk, /turf/space, @@ -3473,13 +2123,15 @@ }, /area/solar/auxstarboard) "agp" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - on = 1 - }, /obj/machinery/flasher{ id = "PCell 3"; pixel_x = -28 }, +/obj/machinery/atmospherics/unary/vent_pump{ + dir = 4; + layer = 2.4; + on = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -3491,11 +2143,8 @@ pixel_x = -3; pixel_y = 5 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" @@ -3533,13 +2182,6 @@ icon_state = "floorgrime" }, /area/security/permabrig) -"agt" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 - }, -/turf/simulated/wall, -/area/security/permabrig) "agu" = ( /obj/structure/table, /obj/item/paper, @@ -3547,11 +2189,6 @@ pixel_x = -3; pixel_y = 5 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 - }, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -3565,18 +2202,21 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, /area/security/permabrig) "agw" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - on = 1 - }, /obj/machinery/flasher{ id = "PCell 1"; pixel_x = -28 }, +/obj/machinery/atmospherics/unary/vent_pump{ + dir = 4; + layer = 2.4; + on = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -3587,8 +2227,10 @@ pixel_x = -3; pixel_y = 5 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/table/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "whitered" @@ -3598,8 +2240,10 @@ /obj/structure/bed/roller, /obj/structure/bed/roller, /obj/machinery/iv_drip, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/iv_drip, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "whitered" @@ -3611,6 +2255,12 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "whitered" @@ -3675,23 +2325,6 @@ /obj/structure/lattice/catwalk, /turf/space, /area/solar/auxstarboard) -"agI" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f9"; - dir = 2 - }, -/area/shuttle/pod_3) -"agJ" = ( -/turf/simulated/shuttle/plating/vox, -/area/shuttle/vox) -"agK" = ( -/obj/machinery/light{ - dir = 4; - icon_state = "tube1" - }, -/turf/simulated/shuttle/plating/vox, -/area/shuttle/vox) "agL" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable/yellow{ @@ -3779,20 +2412,19 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 1 - }, -/area/security/permabrig) -"agR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/wall, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "red" + }, /area/security/permabrig) "agS" = ( /obj/machinery/door/airlock/security/glass{ 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" }, @@ -3808,6 +2440,7 @@ 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" }, @@ -3817,6 +2450,8 @@ 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" }, @@ -3832,9 +2467,11 @@ 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"; - dir = 1 + dir = 1; + icon_state = "red" }, /area/security/permabrig) "agW" = ( @@ -3883,8 +2520,13 @@ }, /area/security/armoury) "agZ" = ( -/obj/machinery/atmospherics/unary/vent_pump, /obj/machinery/space_heater, +/obj/machinery/atmospherics/unary/vent_pump{ + dir = 4; + external_pressure_bound = 101.325; + on = 1; + pressure_checks = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -3913,7 +2555,6 @@ }, /area/security/hos) "ahd" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -3948,9 +2589,9 @@ req_access_txt = "3" }, /turf/simulated/floor/plasteel{ - tag = "icon-vault (WEST)"; + dir = 8; icon_state = "vault"; - dir = 8 + tag = "icon-vault (WEST)" }, /area/security/armoury) "ahf" = ( @@ -3965,9 +2606,9 @@ on = 1 }, /turf/simulated/floor/plasteel{ - tag = "icon-vault (WEST)"; + dir = 8; icon_state = "vault"; - dir = 8 + tag = "icon-vault (WEST)" }, /area/security/armoury) "ahg" = ( @@ -3975,14 +2616,6 @@ name = "Escape Pod Three" }, /turf/simulated/floor/plating, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) -"ahh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/turf/simulated/wall, /area/crew_quarters/fitness{ name = "\improper Recreation Area" }) @@ -3992,27 +2625,15 @@ }, /obj/machinery/portable_atmospherics/canister/sleeping_agent, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/security/permabrig) -"ahj" = ( -/obj/effect/spawner/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) "ahk" = ( /obj/effect/spawner/window/reinforced, /obj/effect/landmark{ name = "Syndicate Breach Area" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plating, /area/crew_quarters/fitness{ name = "\improper Recreation Area" @@ -4029,119 +2650,6 @@ icon_state = "dark" }, /area/security/podbay) -"ahm" = ( -/obj/machinery/door/poddoor/shutters{ - density = 0; - dir = 8; - icon_state = "open"; - id_tag = "voxshutters"; - name = "Blast Shutters"; - opacity = 0 - }, -/obj/structure/grille, -/obj/structure/shuttle/window{ - dir = 4; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "window5_mid"; - tag = "icon-window5 (EAST)" - }, -/turf/simulated/shuttle/plating/vox, -/area/shuttle/vox) -"ahn" = ( -/obj/machinery/atmospherics/pipe/simple/hidden, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"aho" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/table, -/obj/machinery/recharger{ - pixel_y = 0 - }, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"ahp" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/table, -/obj/machinery/cell_charger, -/obj/item/weed_extract, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"ahq" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/table, -/mob/living/simple_animal/bot/floorbot{ - on = 0 - }, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"ahr" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/table, -/obj/item/broken_device, -/obj/item/robot_parts/chest, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"ahs" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/table, -/obj/item/pickaxe, -/obj/item/storage/firstaid/toxin, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"aht" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/table, -/obj/item/scalpel, -/obj/item/stack/cable_coil, -/obj/item/storage/firstaid/regular, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"ahu" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/table, -/obj/item/circular_saw, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"ahv" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/optable, -/obj/item/organ/internal/brain, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"ahw" = ( -/obj/machinery/door/poddoor/shutters{ - density = 0; - dir = 4; - icon_state = "open"; - id_tag = "voxshutters"; - name = "Blast Shutters"; - opacity = 0 - }, -/obj/structure/grille, -/obj/structure/shuttle/window{ - dir = 4; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "window5_mid"; - tag = "icon-window5 (EAST)" - }, -/turf/simulated/shuttle/plating/vox, -/area/shuttle/vox) "ahx" = ( /obj/structure/cable/yellow{ d1 = 4; @@ -4167,35 +2675,26 @@ icon_state = "redcorner" }, /area/security/permabrig) -"ahy" = ( -/obj/effect/spawner/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/turf/simulated/floor/plating, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) "ahz" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 9 }, /obj/machinery/space_heater, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/security/permabrig) "ahA" = ( -/obj/item/tank/oxygen{ +/obj/item/tank/internals/oxygen{ pixel_x = -4; pixel_y = -1 }, -/obj/item/tank/oxygen{ +/obj/item/tank/internals/oxygen{ pixel_x = 4; pixel_y = -1 }, -/obj/item/tank/anesthetic{ +/obj/item/tank/internals/anesthetic{ pixel_x = 2 }, /obj/item/storage/toolbox/mechanical, @@ -4208,8 +2707,8 @@ /obj/machinery/atmospherics/pipe/manifold/visible, /obj/item/wrench, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/security/permabrig) "ahB" = ( @@ -4219,18 +2718,10 @@ d2 = 4; icon_state = "1-4" }, -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "redcorner" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5; + level = 1 }, -/area/security/permabrig) -"ahC" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "redcorner" @@ -4242,14 +2733,14 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, /obj/structure/sign/securearea{ desc = "A warning sign which reads 'WARNING: Do Not Enter When Red Light Shows', detailing the penalties that any NanoTrasen employee or silicon will suffer if violating this rule."; name = "WARNING: Do Not Enter When Red Light Shows"; pixel_y = 32 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "redcorner" @@ -4263,9 +2754,6 @@ pixel_y = 25; req_access_txt = "2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/flasher_button{ id = "PCell 3"; pixel_x = 6; @@ -4276,20 +2764,22 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "redcorner" }, /area/security/permabrig) "ahF" = ( -/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, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "redcorner" @@ -4313,11 +2803,7 @@ /obj/structure/shuttle/engine/propulsion/burst{ dir = 8 }, -/turf/simulated/floor/plating, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f6"; - dir = 2 - }, +/turf/simulated/wall/mineral/titanium, /area/shuttle/pod_3) "ahI" = ( /obj/machinery/door_control{ @@ -4327,7 +2813,6 @@ pixel_y = 25; req_access_txt = "2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -4357,6 +2842,7 @@ d2 = 4; icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plasteel{ dir = 2; @@ -4364,7 +2850,6 @@ }, /area/security/permabrig) "ahK" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -4373,25 +2858,25 @@ /obj/machinery/light{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "redcorner" }, /area/security/permabrig) "ahL" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/newscaster/security_unit{ pixel_y = -30 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 2; + initialize_directions = 11 + }, /turf/simulated/floor/plasteel{ - icon_state = "redcorner"; - dir = 1 + dir = 1; + icon_state = "redcorner" }, /area/security/permabrig) "ahM" = ( @@ -4402,7 +2887,6 @@ pixel_y = 25; req_access_txt = "2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -4422,14 +2906,13 @@ }, /area/security/permabrig) "ahN" = ( -/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/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "redcorner" @@ -4470,7 +2953,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -4483,6 +2965,10 @@ d2 = 8; icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6; + level = 1 + }, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "redcorner" @@ -4521,9 +3007,8 @@ name = "WARNING: Criminally Insane Inmates"; pixel_y = 32 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 }, /turf/simulated/floor/plasteel, /area/security/permabrig) @@ -4538,9 +3023,10 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "redcorner" @@ -4607,20 +3093,12 @@ pixel_x = -32; pixel_y = 32 }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - external_pressure_bound = 101.325; - on = 1; - pressure_checks = 1 - }, +/obj/machinery/atmospherics/unary/vent_pump, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/security/hos) "ahY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -4632,9 +3110,6 @@ }, /area/security/hos) "aia" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 4; @@ -4651,12 +3126,7 @@ pixel_x = 32; pixel_y = 32 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 - }, +/obj/machinery/atmospherics/unary/vent_scrubber, /obj/structure/cable/yellow{ d1 = 2; d2 = 8; @@ -4667,15 +3137,16 @@ }, /area/security/hos) "aic" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/extinguisher_cabinet{ pixel_y = -30 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 2; + initialize_directions = 11 + }, /turf/simulated/floor/plasteel{ - icon_state = "redcorner"; - dir = 1 + dir = 1; + icon_state = "redcorner" }, /area/security/permabrig) "aid" = ( @@ -4694,9 +3165,9 @@ /area/security/podbay) "aig" = ( /obj/machinery/shower{ - tag = "icon-shower (EAST)"; + dir = 4; icon_state = "shower"; - dir = 4 + tag = "icon-shower (EAST)" }, /obj/machinery/door/window/eastright{ base_state = "left"; @@ -4713,8 +3184,8 @@ "aih" = ( /obj/structure/reagent_dispensers/water_cooler, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/crew_quarters/fitness{ name = "\improper Recreation Area" @@ -4739,8 +3210,8 @@ pixel_y = 3 }, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/crew_quarters/fitness{ name = "\improper Recreation Area" @@ -4759,8 +3230,8 @@ "ail" = ( /obj/structure/closet/athletic_mixed, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/crew_quarters/fitness{ name = "\improper Recreation Area" @@ -4768,8 +3239,8 @@ "aim" = ( /obj/structure/closet/boxinggloves, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/crew_quarters/fitness{ name = "\improper Recreation Area" @@ -4780,16 +3251,16 @@ pixel_y = 30 }, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/crew_quarters/fitness{ name = "\improper Recreation Area" }) "aio" = ( /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/crew_quarters/fitness{ name = "\improper Recreation Area" @@ -4803,9 +3274,9 @@ /obj/item/grenade/barrier, /obj/item/grenade/barrier, /turf/simulated/floor/plasteel{ - tag = "icon-vault (WEST)"; + dir = 8; icon_state = "vault"; - dir = 8 + tag = "icon-vault (WEST)" }, /area/security/armoury) "aiq" = ( @@ -4821,14 +3292,6 @@ name = "Holodeck Projector Floor" }, /area/holodeck/alphadeck) -"ais" = ( -/obj/item/storage/toolbox/syndicate, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"ait" = ( -/obj/item/skeleton/r_arm, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) "aiu" = ( /obj/structure/rack, /obj/item/shield/riot{ @@ -4849,19 +3312,9 @@ icon_state = "dark" }, /area/security/armoury) -"aiv" = ( -/obj/effect/spawner/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plating, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) "aiw" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /obj/machinery/light/small{ dir = 1 @@ -4891,18 +3344,8 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "redcorner"; - dir = 1 - }, -/area/security/permabrig) -"aiz" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2; - initialize_directions = 11 - }, -/turf/simulated/floor/plasteel{ - icon_state = "redcorner"; - dir = 1 + dir = 1; + icon_state = "redcorner" }, /area/security/permabrig) "aiA" = ( @@ -4927,25 +3370,24 @@ }, /area/security/hos) "aiB" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2; - initialize_directions = 11 - }, /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{ - icon_state = "redcorner"; - dir = 1 + dir = 1; + icon_state = "redcorner" }, /area/security/permabrig) "aiC" = ( /obj/effect/decal/warning_stripes/yellow/hollow, /obj/machinery/light_switch{ - name = "light switch "; dir = 2; + name = "light switch "; pixel_y = -22 }, /obj/structure/reagent_dispensers/fueltank, @@ -4963,8 +3405,8 @@ icon_state = "1-2" }, /turf/simulated/floor/plasteel{ - icon_state = "redcorner"; - dir = 1 + dir = 1; + icon_state = "redcorner" }, /area/security/permabrig) "aiE" = ( @@ -4978,34 +3420,34 @@ }, /obj/machinery/light, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/security/permabrig) "aiF" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2; - initialize_directions = 11 - }, /obj/effect/landmark{ name = "lightsout" }, -/turf/simulated/floor/plasteel{ - icon_state = "redcorner"; - dir = 1 - }, -/area/security/permabrig) -"aiG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "redcorner" + }, +/area/security/permabrig) +"aiG" = ( /obj/machinery/alarm{ dir = 1; pixel_y = -22 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 2; + initialize_directions = 11 + }, /turf/simulated/floor/plasteel{ - icon_state = "redcorner"; - dir = 1 + dir = 1; + icon_state = "redcorner" }, /area/security/permabrig) "aiH" = ( @@ -5017,27 +3459,24 @@ }, /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /turf/simulated/floor/plasteel{ - icon_state = "redcorner"; - dir = 1 + dir = 1; + icon_state = "redcorner" }, /area/security/permabrig) "aiI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - icon_state = "redcorner"; - dir = 1 + dir = 1; + icon_state = "redcorner" }, /area/security/permabrig) "aiJ" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ - icon_state = "redcorner"; - dir = 1 + dir = 1; + icon_state = "redcorner" }, /area/security/permabrig) "aiK" = ( @@ -5070,9 +3509,9 @@ pixel_y = -3 }, /turf/simulated/floor/plasteel{ - tag = "icon-vault (NORTH)"; + dir = 1; icon_state = "vault"; - dir = 1 + tag = "icon-vault (NORTH)" }, /area/security/armoury) "aiN" = ( @@ -5094,9 +3533,9 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - tag = "icon-vault (EAST)"; + dir = 4; icon_state = "vault"; - dir = 4 + tag = "icon-vault (EAST)" }, /area/security/armoury) "aiP" = ( @@ -5132,8 +3571,8 @@ pixel_y = -24 }, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/security/permabrig) "aiT" = ( @@ -5148,8 +3587,8 @@ }, /obj/item/storage/box/prisoner, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/security/permabrig) "aiU" = ( @@ -5162,8 +3601,8 @@ icon_state = "1-2" }, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/security/permabrig) "aiV" = ( @@ -5188,6 +3627,7 @@ d2 = 8; icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -5195,7 +3635,6 @@ "aiX" = ( /obj/structure/table/wood, /obj/item/flashlight/lamp, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/carpet, /area/security/hos) "aiY" = ( @@ -5214,7 +3653,6 @@ pixel_y = -1 }, /obj/structure/table/wood, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/carpet, /area/security/hos) "aja" = ( @@ -5228,6 +3666,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -5235,8 +3674,8 @@ "ajb" = ( /obj/structure/closet/firecloset, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/crew_quarters/fitness{ name = "\improper Recreation Area" @@ -5263,8 +3702,8 @@ pixel_y = -30 }, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/security/permabrig) "aje" = ( @@ -5277,8 +3716,8 @@ icon_state = "1-2" }, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/security/permabrig) "ajf" = ( @@ -5306,9 +3745,9 @@ /obj/structure/rack, /obj/item/storage/fancy, /turf/simulated/floor/plasteel{ - tag = "icon-vault (NORTH)"; + dir = 1; icon_state = "vault"; - dir = 1 + tag = "icon-vault (NORTH)" }, /area/security/armoury) "aji" = ( @@ -5354,6 +3793,9 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -5384,12 +3826,6 @@ /area/crew_quarters/fitness{ name = "\improper Recreation Area" }) -"ajq" = ( -/obj/machinery/atmospherics/unary/tank/nitrogen{ - dir = 1 - }, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) "ajr" = ( /obj/structure/window/reinforced, /obj/structure/table, @@ -5401,40 +3837,9 @@ tag = "icon-whitehall (WEST)" }, /area/security/brig) -"ajs" = ( -/obj/structure/shuttle/engine/propulsion/burst{ - dir = 8 - }, -/turf/simulated/floor/plating, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f5"; - dir = 2 - }, -/area/shuttle/pod_3) -"ajt" = ( -/obj/structure/rack, -/obj/item/rcd, -/obj/item/rcd_ammo, -/obj/item/rcd_ammo, -/obj/item/rcd_ammo, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"aju" = ( -/obj/structure/rack, -/obj/item/tank/nitrogen, -/obj/item/tank/nitrogen, -/obj/item/tank/nitrogen, -/obj/item/tank/nitrogen, -/obj/item/tank/nitrogen, -/obj/item/tank/nitrogen, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) "ajv" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -5449,8 +3854,8 @@ /obj/item/clothing/suit/space/hardsuit/security, /obj/item/clothing/mask/gas/sechailer, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 4 + dir = 4; + icon_state = "vault" }, /area/security/permabrig) "ajx" = ( @@ -5474,8 +3879,8 @@ pixel_y = -30 }, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/security/hos) "ajy" = ( @@ -5508,22 +3913,15 @@ pixel_y = -32 }, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/security/hos) "ajA" = ( /obj/structure/shuttle/engine/propulsion/burst{ dir = 8 }, -/turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 5 - }, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f6"; - dir = 2 - }, +/turf/simulated/wall/mineral/titanium, /area/shuttle/pod_4) "ajB" = ( /turf/simulated/wall/r_wall, @@ -5535,8 +3933,8 @@ track = 0 }, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /turf/simulated/floor/plating, /area/maintenance/auxsolarport) @@ -5550,7 +3948,7 @@ /obj/structure/chair/comfy/shuttle{ dir = 4 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/pod_3) "ajE" = ( /obj/machinery/power/apc{ @@ -5601,8 +3999,8 @@ req_access_txt = "2" }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 1 + dir = 1; + icon_state = "red" }, /area/security/permabrig) "ajK" = ( @@ -5620,9 +4018,9 @@ pixel_y = -1 }, /turf/simulated/floor/plasteel{ - tag = "icon-vault (NORTH)"; + dir = 1; icon_state = "vault"; - dir = 1 + tag = "icon-vault (NORTH)" }, /area/security/armoury) "ajL" = ( @@ -5638,17 +4036,17 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - tag = "icon-vault (EAST)"; + dir = 4; icon_state = "vault"; - dir = 4 + tag = "icon-vault (EAST)" }, /area/security/armoury) "ajM" = ( /obj/machinery/hologram/holopad, /turf/simulated/floor/plasteel{ - tag = "icon-vault (WEST)"; + dir = 8; icon_state = "vault"; - dir = 8 + tag = "icon-vault (WEST)" }, /area/security/armoury) "ajN" = ( @@ -5660,7 +4058,6 @@ /turf/simulated/floor/plating, /area/maintenance/auxsolarport) "ajO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/bed/dogbed, /turf/simulated/floor/carpet, /area/security/hos) @@ -5670,8 +4067,8 @@ /obj/item/clothing/suit/space/hardsuit/security, /obj/item/clothing/mask/gas/sechailer, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 1 + dir = 1; + icon_state = "vault" }, /area/security/permabrig) "ajQ" = ( @@ -5689,16 +4086,16 @@ "ajR" = ( /obj/structure/dispenser/oxygen, /turf/simulated/floor/plasteel{ - tag = "icon-vault (WEST)"; + dir = 8; icon_state = "vault"; - dir = 8 + tag = "icon-vault (WEST)" }, /area/security/permabrig) "ajS" = ( /obj/effect/decal/warning_stripes/yellow/hollow, /obj/machinery/suit_storage_unit/engine/secure, /turf/simulated/floor/plasteel, -/area/engine/engineering) +/area/engine/equipmentstorage) "ajT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/yellow{ @@ -5739,9 +4136,9 @@ /obj/structure/rack, /obj/item/storage/box/teargas, /turf/simulated/floor/plasteel{ - tag = "icon-vault (NORTH)"; + dir = 1; icon_state = "vault"; - dir = 1 + tag = "icon-vault (NORTH)" }, /area/security/armoury) "ajX" = ( @@ -5757,14 +4154,18 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/security/hos) "ajZ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/security/armoury) "aka" = ( @@ -5778,27 +4179,31 @@ /turf/simulated/floor/carpet, /area/security/hos) "akb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/carpet, /area/security/hos) "akc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - tag = "icon-vault (SOUTHEAST)"; - icon_state = "vault"; +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, +/turf/simulated/floor/plasteel{ + dir = 6; + icon_state = "vault"; + tag = "icon-vault (SOUTHEAST)" + }, /area/security/armoury) "akd" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/yellow{ d1 = 2; d2 = 8; icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/security/armoury) "ake" = ( @@ -5836,9 +4241,12 @@ d2 = 4; icon_state = "0-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/security/armoury) "akh" = ( @@ -5870,6 +4278,9 @@ }) "akl" = ( /obj/structure/chair, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" @@ -5887,7 +4298,7 @@ }) "akn" = ( /obj/machinery/atmospherics/unary/vent_pump{ - dir = 2; + dir = 8; on = 1 }, /turf/simulated/floor/plasteel, @@ -5905,21 +4316,6 @@ /area/crew_quarters/fitness{ name = "\improper Recreation Area" }) -"akp" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = "0" - }, -/turf/simulated/wall, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) -"akq" = ( -/obj/structure/shuttle/engine/heater, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/shuttle/plating, -/area/shuttle/vox) "akr" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security{ @@ -5928,6 +4324,7 @@ 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" = ( @@ -5951,9 +4348,9 @@ /obj/item/clothing/head/helmet/riot, /obj/item/clothing/head/helmet/riot, /turf/simulated/floor/plasteel{ - tag = "icon-vault (WEST)"; + dir = 8; icon_state = "vault"; - dir = 8 + tag = "icon-vault (WEST)" }, /area/security/armoury) "akv" = ( @@ -6021,13 +4418,12 @@ /area/security/hos) "akA" = ( /turf/simulated/floor/plasteel{ - tag = "icon-vault (SOUTHWEST)"; + dir = 10; icon_state = "vault"; - dir = 10 + tag = "icon-vault (SOUTHWEST)" }, /area/security/armoury) "akB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -6036,21 +4432,23 @@ 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{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/item/clothing/head/beret/sec, /obj/item/clothing/suit/jacket/pilot, /obj/machinery/alarm{ pixel_y = 24 }, -/obj/machinery/atmospherics/unary/vent_scrubber, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -6065,9 +4463,9 @@ icon_state = "4-8" }, /turf/simulated/floor/plasteel{ - tag = "icon-vault (WEST)"; + dir = 8; icon_state = "vault"; - dir = 8 + tag = "icon-vault (WEST)" }, /area/security/permabrig) "akF" = ( @@ -6083,9 +4481,9 @@ network = list("SS13") }, /turf/simulated/floor/plasteel{ - tag = "icon-vault (WEST)"; + dir = 8; icon_state = "vault"; - dir = 8 + tag = "icon-vault (WEST)" }, /area/security/permabrig) "akG" = ( @@ -6101,8 +4499,8 @@ icon_state = "2-8" }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 1 + dir = 1; + icon_state = "red" }, /area/security/permabrig) "akH" = ( @@ -6131,14 +4529,14 @@ pixel_y = 30 }, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/security/main) "akK" = ( /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 1 + dir = 1; + icon_state = "red" }, /area/security/permabrig) "akL" = ( @@ -6164,25 +4562,18 @@ dir = 2; id_tag = "armoryshutter" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, /turf/simulated/floor/plasteel{ - tag = "icon-vault (WEST)"; + dir = 8; icon_state = "vault"; - dir = 8 + tag = "icon-vault (WEST)" }, /area/security/armoury) "akO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11; - level = 1 - }, /obj/machinery/firealarm{ dir = 8; pixel_x = -26; @@ -6193,6 +4584,12 @@ 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" }, @@ -6206,7 +4603,7 @@ /obj/effect/decal/warning_stripes/yellow/hollow, /obj/machinery/suit_storage_unit/engine/secure, /turf/simulated/floor/plasteel, -/area/engine/engineering) +/area/engine/equipmentstorage) "akQ" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -6216,9 +4613,12 @@ d2 = 4; icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/security/hos) "akR" = ( @@ -6252,6 +4652,12 @@ 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" = ( @@ -6276,9 +4682,12 @@ d2 = 8; icon_state = "1-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/security/hos) "akV" = ( @@ -6317,7 +4726,6 @@ d2 = 8; icon_state = "0-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/poddoor{ density = 0; icon_state = "open"; @@ -6336,17 +4744,14 @@ name = "Station Intercom (General)"; pixel_y = 26 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 1 + dir = 1; + icon_state = "red" }, /area/security/main) "ala" = ( @@ -6400,41 +4805,7 @@ /area/crew_quarters/fitness{ name = "\improper Recreation Area" }) -"alf" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/plasteel, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) -"alg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "neutralcorner" - }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) "alh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/public/glass{ - name = "Holodeck Door" - }, -/turf/simulated/floor/plasteel, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) -"ali" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ name = "Holodeck Door" @@ -6444,9 +4815,6 @@ name = "\improper Recreation Area" }) "alj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/light/small{ dir = 1 }, @@ -6461,21 +4829,11 @@ /obj/machinery/alarm{ pixel_y = 24 }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - on = 1 - }, +/obj/machinery/atmospherics/unary/vent_pump, /turf/simulated/floor/plasteel, /area/crew_quarters/fitness{ name = "\improper Recreation Area" }) -"all" = ( -/obj/structure/shuttle/engine/propulsion{ - tag = "icon-propulsion_l"; - icon_state = "propulsion_l" - }, -/turf/simulated/shuttle/plating, -/area/shuttle/vox) "alm" = ( /obj/structure/closet/l3closet/security, /obj/structure/cable/yellow{ @@ -6509,6 +4867,9 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/plasteel, /area/security/armoury) "alo" = ( @@ -6570,7 +4931,6 @@ d2 = 4; icon_state = "0-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/poddoor{ density = 0; icon_state = "open"; @@ -6662,16 +5022,17 @@ name = "Port Maintenance" }) "alA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /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/security/hos) "alB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -6699,8 +5060,8 @@ /area/security/main) "alE" = ( /obj/machinery/light_switch{ - name = "light switch "; dir = 2; + name = "light switch "; pixel_y = -22 }, /obj/structure/table/reinforced, @@ -6711,8 +5072,8 @@ /area/security/podbay) "alF" = ( /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 1 + dir = 1; + icon_state = "red" }, /area/security/brig) "alG" = ( @@ -6783,15 +5144,15 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 9 + dir = 9; + icon_state = "red" }, /area/security/brig) "alO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 5 + dir = 5; + icon_state = "red" }, /area/security/brig) "alP" = ( @@ -6803,15 +5164,13 @@ /turf/simulated/floor/plating, /area/security/main) "alQ" = ( -/obj/effect/decal/warning_stripes/yellow/hollow, -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "open"; - id_tag = "Singularity"; - name = "Containment Blast Doors"; - opacity = 0 +/obj/structure/sign/securearea{ + pixel_y = 32 }, -/turf/simulated/floor/plasteel, +/obj/machinery/light_switch{ + pixel_x = -9 + }, +/turf/simulated/wall/r_wall, /area/engine/engineering) "alR" = ( /obj/machinery/door/firedoor, @@ -6836,6 +5195,8 @@ 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" = ( @@ -6853,13 +5214,6 @@ icon_state = "showroomfloor" }, /area/security/main) -"alT" = ( -/obj/machinery/atmospherics/unary/tank/nitrogen{ - dir = 1 - }, -/obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) "alU" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable/yellow{ @@ -6869,29 +5223,11 @@ /obj/structure/cable/yellow, /turf/simulated/floor/plating, /area/security/armoury) -"alV" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/plasteel{ - icon_state = "showroomfloor" - }, -/area/security/main) "alW" = ( /turf/simulated/floor/plating, /area/maintenance/fore) "alX" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 - }, +/obj/machinery/atmospherics/unary/vent_scrubber, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -6934,20 +5270,20 @@ }) "amc" = ( /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 5 + dir = 5; + icon_state = "vault" }, /area/crew_quarters/fitness{ name = "\improper Recreation Area" }) "amd" = ( /obj/machinery/atmospherics/unary/vent_pump{ - dir = 2; + dir = 1; on = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 5 + dir = 5; + icon_state = "vault" }, /area/crew_quarters/fitness{ name = "\improper Recreation Area" @@ -6970,12 +5306,6 @@ dir = 8; icon_state = "neutralcorner" }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) -"amg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel, /area/crew_quarters/fitness{ name = "\improper Recreation Area" }) @@ -7007,12 +5337,6 @@ "amk" = ( /turf/simulated/wall/r_wall, /area/engine/gravitygenerator) -"aml" = ( -/obj/machinery/portable_atmospherics/canister/nitrogen, -/obj/machinery/light/spot, -/obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) "amm" = ( /obj/machinery/conveyor_switch/oneway{ id = "garbage"; @@ -7089,8 +5413,8 @@ /area/maintenance/auxsolarport) "ams" = ( /obj/structure/sink{ - icon_state = "sink"; dir = 8; + icon_state = "sink"; pixel_x = -12; pixel_y = 2 }, @@ -7167,12 +5491,9 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 1 + dir = 1; + icon_state = "red" }, /area/security/main) "amz" = ( @@ -7190,8 +5511,8 @@ icon_state = "1-4" }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 9 + dir = 9; + icon_state = "red" }, /area/security/main) "amB" = ( @@ -7209,42 +5530,15 @@ dir = 1; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 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 = "red"; - dir = 1 - }, -/area/security/main) -"amC" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 1 - }, -/area/security/main) -"amD" = ( -/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/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 1 + dir = 1; + icon_state = "red" }, /area/security/main) "amE" = ( @@ -7252,9 +5546,6 @@ /turf/simulated/floor/plating, /area/security/brig) "amF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -7263,12 +5554,15 @@ /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 = "red"; - dir = 1 + dir = 1; + icon_state = "red" }, /area/security/main) "amG" = ( @@ -7277,16 +5571,15 @@ d2 = 8; icon_state = "4-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/scrubbers{ - dir = 4; - level = 1 - }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 1 + dir = 1; + icon_state = "red" }, /area/security/main) "amH" = ( @@ -7305,16 +5598,15 @@ dir = 2; icon_state = "pipe-c" }, +/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{ - dir = 1; - initialize_directions = 11 - }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 1 + dir = 1; + icon_state = "red" }, /area/security/main) "amI" = ( @@ -7337,8 +5629,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - level = 1 + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -7355,16 +5646,15 @@ d2 = 8; icon_state = "4-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/scrubbers{ - dir = 4; - level = 1 - }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 5 + dir = 5; + icon_state = "red" }, /area/security/main) "amK" = ( @@ -7400,8 +5690,8 @@ icon_state = "1-2" }, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/security/main) "amN" = ( @@ -7415,13 +5705,11 @@ d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plasteel, /area/crew_quarters/fitness{ name = "\improper Recreation Area" @@ -7438,16 +5726,15 @@ }, /obj/structure/closet/secure_closet/security, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/security/main) "amQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/closet/secure_closet/security, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/security/main) "amR" = ( @@ -7457,30 +5744,21 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" - }, -/area/security/main) -"amS" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/closet/secure_closet/security, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/security/main) "amT" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /obj/structure/closet/secure_closet/security, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/security/main) "amU" = ( @@ -7490,8 +5768,8 @@ pixel_y = 6 }, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/security/main) "amV" = ( @@ -7540,16 +5818,21 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, /turf/simulated/floor/plasteel{ - icon_state = "redcorner"; - dir = 1 + dir = 1; + icon_state = "redcorner" }, /area/security/brig) "amZ" = ( /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) "ana" = ( @@ -7561,6 +5844,9 @@ /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" = ( @@ -7572,66 +5858,27 @@ d2 = 4; icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/plasteel, /area/security/armoury) "anc" = ( /obj/structure/chair/stool{ pixel_y = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel, /area/crew_quarters/fitness{ name = "\improper Recreation Area" }) "and" = ( /obj/structure/table, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/item/storage/firstaid/brute, /turf/simulated/floor/plasteel, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) -"ane" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) -"anf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 5 - }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) -"ang" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 5 - }, /area/crew_quarters/fitness{ name = "\improper Recreation Area" }) "anh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/hologram/holopad, /turf/simulated/floor/plasteel, /area/crew_quarters/fitness{ @@ -7656,6 +5903,7 @@ /obj/structure/chair{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/crew_quarters/fitness{ name = "\improper Recreation Area" @@ -7667,8 +5915,8 @@ /area/engine/gravitygenerator) "anl" = ( /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 1 + dir = 1; + icon_state = "vault" }, /area/engine/gravitygenerator) "anm" = ( @@ -7687,53 +5935,19 @@ /area/maintenance/auxsolarport) "ann" = ( /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 4 + dir = 4; + icon_state = "vault" }, /area/engine/gravitygenerator) "ano" = ( /turf/space, /area/maintenance/auxsolarstarboard) -"anp" = ( -/obj/machinery/portable_atmospherics/canister/toxins, -/obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) "anq" = ( /turf/simulated/wall/r_wall, /area/engine/mechanic_workshop) -"anr" = ( -/obj/structure/rack, -/obj/item/clothing/accessory/storage/black_vest, -/obj/item/clothing/suit/space/vox/carapace, -/obj/item/clothing/head/helmet/space/vox/carapace, -/obj/item/clothing/mask/breath, -/obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) "ans" = ( /turf/simulated/wall, /area/maintenance/auxsolarstarboard) -"ant" = ( -/obj/structure/grille, -/obj/structure/shuttle/window{ - tag = "icon-window5_end"; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "window5_end"; - dir = 2 - }, -/turf/simulated/shuttle/plating/vox, -/area/shuttle/vox) -"anu" = ( -/obj/structure/grille, -/obj/structure/shuttle/window{ - tag = "icon-window5_end (NORTH)"; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "window5_end"; - dir = 1 - }, -/turf/simulated/shuttle/plating/vox, -/area/shuttle/vox) "anv" = ( /obj/machinery/door/poddoor/preopen{ id_tag = "Disposal Exit"; @@ -7758,15 +5972,6 @@ /obj/structure/window/reinforced, /turf/simulated/floor/plating, /area/maintenance/disposal) -"anx" = ( -/obj/effect/spawner/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/yellow{ - d2 = 4; - icon_state = "0-4" - }, -/turf/simulated/floor/plating, -/area/security/brig) "any" = ( /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plating, @@ -7846,17 +6051,6 @@ /area/maintenance/fpmaint2{ name = "Port Maintenance" }) -"anF" = ( -/obj/structure/rack, -/obj/item/gun/dartgun/vox/raider, -/obj/item/gun/dartgun/vox/medical, -/obj/item/dart_cartridge, -/obj/item/dart_cartridge, -/obj/item/dart_cartridge, -/obj/item/dart_cartridge, -/obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) "anG" = ( /obj/item/vending_refill/cola, /obj/machinery/atmospherics/unary/vent_pump{ @@ -7937,10 +6131,10 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/security/armoury) "anM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, @@ -7954,6 +6148,11 @@ 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" }, @@ -7967,6 +6166,7 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -8024,8 +6224,8 @@ pixel_y = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 8 + dir = 8; + icon_state = "red" }, /area/security/main) "anU" = ( @@ -8039,29 +6239,17 @@ /area/security/main) "anV" = ( /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 5 + dir = 5; + icon_state = "red" }, /area/security/main) "anW" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 1 + dir = 1; + icon_state = "red" }, /area/security/main) -"anX" = ( -/obj/machinery/sleeper/upgraded, -/obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"anY" = ( -/obj/machinery/bodyscanner, -/obj/machinery/light/spot, -/obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) "anZ" = ( /obj/structure/rack, /obj/item/storage/box/chemimp{ @@ -8113,20 +6301,19 @@ pixel_x = 27 }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 4 + dir = 4; + icon_state = "red" }, /area/security/main) "aoe" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 1 + dir = 1; + icon_state = "red" }, /area/security/main) "aof" = ( @@ -8140,8 +6327,8 @@ network = list("SS13") }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 8 + dir = 8; + icon_state = "red" }, /area/security/main) "aoh" = ( @@ -8152,8 +6339,8 @@ name = "Security Officer" }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 4 + dir = 4; + icon_state = "red" }, /area/security/main) "aoi" = ( @@ -8164,7 +6351,6 @@ }, /obj/item/pen, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/security/main) "aoj" = ( @@ -8173,9 +6359,9 @@ }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - tag = "icon-vault (WEST)"; + dir = 8; icon_state = "vault"; - dir = 8 + tag = "icon-vault (WEST)" }, /area/security/evidence) "aok" = ( @@ -8204,10 +6390,11 @@ name = "Evidence Storage"; req_access_txt = "3" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - tag = "icon-vault (WEST)"; + dir = 8; icon_state = "vault"; - dir = 8 + tag = "icon-vault (WEST)" }, /area/security/armoury) "aoo" = ( @@ -8230,9 +6417,9 @@ }, /obj/machinery/disposal, /turf/simulated/floor/plasteel{ - tag = "icon-cafeteria (NORTHEAST)"; + dir = 5; icon_state = "cafeteria"; - dir = 5 + tag = "icon-cafeteria (NORTHEAST)" }, /area/security/brig) "aoq" = ( @@ -8247,12 +6434,6 @@ dir = 1; network = list("SS13") }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -8271,9 +6452,20 @@ }, /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{ - icon_state = "redcorner"; - dir = 4 + dir = 4; + icon_state = "redcorner" }, /area/security/brig) "aot" = ( @@ -8282,9 +6474,9 @@ }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - tag = "icon-vault (WEST)"; + dir = 8; icon_state = "vault"; - dir = 8 + tag = "icon-vault (WEST)" }, /area/security/evidence) "aou" = ( @@ -8306,9 +6498,9 @@ name = "Evidence Closet" }, /turf/simulated/floor/plasteel{ - tag = "icon-vault (WEST)"; + dir = 8; icon_state = "vault"; - dir = 8 + tag = "icon-vault (WEST)" }, /area/security/evidence) "aow" = ( @@ -8321,36 +6513,24 @@ pixel_x = 24 }, /turf/simulated/floor/plasteel{ - tag = "icon-vault (WEST)"; + dir = 8; icon_state = "vault"; - dir = 8 + tag = "icon-vault (WEST)" }, /area/security/evidence) "aox" = ( /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 8 + dir = 8; + icon_state = "red" }, /area/security/main) "aoy" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 5 - }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) -"aoz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 5 + dir = 5; + icon_state = "vault" }, /area/crew_quarters/fitness{ name = "\improper Recreation Area" @@ -8363,41 +6543,6 @@ dir = 1; icon_state = "neutralcorner" }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) -"aoB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "neutralcorner" - }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) -"aoC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/public/glass{ - name = "Holodeck Door" - }, -/turf/simulated/floor/plasteel, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) -"aoD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/public/glass{ - name = "Holodeck Door" - }, -/turf/simulated/floor/plasteel, /area/crew_quarters/fitness{ name = "\improper Recreation Area" }) @@ -8420,11 +6565,8 @@ }, /area/crew_quarters/sleep) "aoF" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1; - scrub_Toxins = 0 - }, +/obj/machinery/atmospherics/unary/vent_scrubber, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/crew_quarters/fitness{ name = "\improper Recreation Area" @@ -8434,14 +6576,20 @@ /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{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -8449,8 +6597,8 @@ /area/engine/gravitygenerator) "aoJ" = ( /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/engine/gravitygenerator) "aoK" = ( @@ -8470,7 +6618,6 @@ }, /obj/item/stack/packageWrap, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/security/main) "aoM" = ( @@ -8489,24 +6636,6 @@ "aoN" = ( /turf/simulated/floor/engine, /area/engine/mechanic_workshop) -"aoO" = ( -/obj/item/broken_bottle, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"aoP" = ( -/obj/machinery/portable_atmospherics/canister/oxygen, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"aoQ" = ( -/obj/item/tank/emergency_oxygen, -/obj/item/clothing/mask/breath, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"aoR" = ( -/obj/item/clothing/head/bearpelt, -/obj/item/xenos_claw, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) "aoS" = ( /obj/machinery/conveyor/north{ id = "garbage" @@ -8671,24 +6800,24 @@ pixel_x = 30 }, /turf/simulated/floor/plasteel{ - icon_state = "redcorner"; - dir = 4 + dir = 4; + icon_state = "redcorner" }, /area/security/brig) "apj" = ( -/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 = 5 }, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/security/brig) "apk" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -8714,15 +6843,18 @@ /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/manifold/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plasteel{ - icon_state = "redcorner"; - dir = 4 + dir = 4; + icon_state = "redcorner" }, /area/security/brig) "apo" = ( @@ -8730,22 +6862,20 @@ name = "Evidence Closet" }, /turf/simulated/floor/plasteel{ - tag = "icon-vault (NORTH)"; + dir = 1; icon_state = "vault"; - dir = 1 + tag = "icon-vault (NORTH)" }, /area/security/warden) "app" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - tag = "icon-vault (WEST)"; + dir = 8; icon_state = "vault"; - dir = 8 + tag = "icon-vault (WEST)" }, /area/security/warden) "apq" = ( @@ -8755,9 +6885,9 @@ pixel_y = 6 }, /turf/simulated/floor/plasteel{ - tag = "icon-cafeteria (NORTHEAST)"; + dir = 5; icon_state = "cafeteria"; - dir = 5 + tag = "icon-cafeteria (NORTHEAST)" }, /area/security/brig) "apr" = ( @@ -8775,37 +6905,28 @@ /obj/item/storage/fancy/donut_box, /obj/structure/table, /turf/simulated/floor/plasteel{ - tag = "icon-cafeteria (NORTHEAST)"; + dir = 5; icon_state = "cafeteria"; - dir = 5 + tag = "icon-cafeteria (NORTHEAST)" }, /area/security/brig) "apt" = ( /obj/structure/reagent_dispensers/peppertank{ pixel_x = -32 }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - external_pressure_bound = 101.325; - on = 1; - pressure_checks = 1 - }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 8 + dir = 8; + icon_state = "red" }, /area/security/main) "apu" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ - tag = "icon-vault (WEST)"; + dir = 8; icon_state = "vault"; - dir = 8 + tag = "icon-vault (WEST)" }, /area/security/evidence) "apv" = ( @@ -8816,33 +6937,11 @@ dir = 6 }, /turf/simulated/floor/plasteel{ - tag = "icon-vault (WEST)"; + dir = 8; icon_state = "vault"; - dir = 8 + tag = "icon-vault (WEST)" }, /area/security/evidence) -"apw" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/chair{ - dir = 4 - }, -/obj/effect/landmark/start{ - name = "Security Officer" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11; - level = 1 - }, -/turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 8 - }, -/area/security/main) "apx" = ( /obj/effect/decal/cleanable/blood/oil, /obj/machinery/light_switch{ @@ -8867,25 +6966,23 @@ }, /obj/item/storage/box/donkpockets, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/security/main) "apA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 9 + dir = 9; + icon_state = "red" }, /area/security/main) "apB" = ( /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 1 + dir = 1; + icon_state = "red" }, /area/security/main) "apC" = ( @@ -8903,6 +7000,8 @@ /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" = ( @@ -8915,12 +7014,9 @@ dir = 8; network = list("SS13") }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - on = 1 - }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 4 + dir = 4; + icon_state = "red" }, /area/security/main) "apH" = ( @@ -8943,8 +7039,8 @@ pixel_y = 32 }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/engine/gravitygenerator) "apK" = ( @@ -9024,18 +7120,18 @@ req_access_txt = "63" }, /obj/effect/mapping_helpers/airlock/unres{ - icon_state = "airlock_unres_helper"; - dir = 1 + dir = 1; + icon_state = "airlock_unres_helper" }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 1 + dir = 1; + icon_state = "red" }, /area/security/brig) "apQ" = ( /obj/machinery/sleeper{ - icon_state = "sleeper-open"; - dir = 4 + dir = 4; + icon_state = "sleeper-open" }, /turf/simulated/floor/plasteel{ dir = 8; @@ -9089,7 +7185,6 @@ }) "apW" = ( /obj/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -9119,7 +7214,6 @@ /obj/structure/chair{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "neutralcorner" @@ -9132,65 +7226,29 @@ icon_state = "white" }, /area/security/brig) -"aqb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/wall, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) "aqc" = ( /obj/machinery/door/airlock/maintenance{ name = "maintenance access"; req_access_txt = "12" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/maintenance/starboard) "aqd" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/sign/pods{ pixel_x = 32 }, /turf/simulated/floor/plasteel{ - icon_state = "redcorner"; - dir = 4 + dir = 4; + icon_state = "redcorner" }, /area/security/brig) -"aqe" = ( -/obj/effect/decal/warning_stripes/west, -/obj/machinery/suit_storage_unit/engine/secure, -/turf/simulated/floor/plasteel, -/area/engine/engineering) -"aqf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/engine/gravitygenerator) -"aqg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 4 - }, -/area/engine/gravitygenerator) "aqh" = ( /obj/machinery/gravity_generator/main/station, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 - }, -/area/engine/gravitygenerator) -"aqi" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 1 + dir = 8; + icon_state = "vault" }, /area/engine/gravitygenerator) "aqj" = ( @@ -9209,8 +7267,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - level = 1 + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "red" @@ -9238,31 +7295,6 @@ tag = "icon-whitehall (WEST)" }, /area/security/brig) -"aqm" = ( -/obj/structure/chair{ - dir = 4 - }, -/obj/item/clothing/mask/breath, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"aqn" = ( -/obj/item/clothing/head/collectable/xenom, -/obj/item/clothing/head/chicken, -/obj/item/aiModule/syndicate, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"aqo" = ( -/obj/item/stack/spacecash/c50, -/obj/structure/chair/comfy/shuttle{ - dir = 8 - }, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"aqp" = ( -/obj/item/stack/spacecash/c1000, -/obj/item/stack/spacecash/c500, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) "aqq" = ( /obj/machinery/conveyor/west{ id = "garbage" @@ -9293,6 +7325,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, /turf/simulated/floor/plating, /area/maintenance/starboard) "aqu" = ( @@ -9315,16 +7349,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/fore) -"aqv" = ( -/obj/machinery/alarm{ - dir = 4; - icon_state = "alarm0"; - pixel_x = -22 - }, -/obj/effect/decal/warning_stripes/southwest, -/obj/machinery/suit_storage_unit/engine/secure, -/turf/simulated/floor/plasteel, -/area/engine/engineering) "aqw" = ( /obj/structure/closet/crate, /obj/item/bodybag, @@ -9342,9 +7366,9 @@ dir = 8 }, /turf/simulated/floor/plasteel{ - tag = "icon-vault (WEST)"; + dir = 8; icon_state = "vault"; - dir = 8 + tag = "icon-vault (WEST)" }, /area/security/warden) "aqy" = ( @@ -9403,13 +7427,6 @@ /area/maintenance/fpmaint2{ name = "Port Maintenance" }) -"aqD" = ( -/obj/effect/spawner/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plating, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) "aqE" = ( /obj/machinery/door/airlock/security/glass{ name = "N2O Storage"; @@ -9427,9 +7444,6 @@ }, /turf/simulated/floor/plating, /area/security/brig) -"aqG" = ( -/turf/simulated/floor/plasteel, -/area/security/armoury) "aqH" = ( /obj/machinery/atmospherics/unary/vent_pump{ dir = 4; @@ -9447,32 +7461,32 @@ }, /obj/machinery/recharger, /turf/simulated/floor/plasteel{ - tag = "icon-vault (WEST)"; + dir = 8; icon_state = "vault"; - dir = 8 + tag = "icon-vault (WEST)" }, /area/security/warden) "aqJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - icon_state = "redcorner"; - dir = 1 + dir = 1; + 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{ - tag = "icon-vault (WEST)"; + dir = 8; icon_state = "vault"; - dir = 8 + tag = "icon-vault (WEST)" }, /area/security/warden) "aqL" = ( /obj/structure/table, /turf/simulated/floor/plasteel{ - tag = "icon-cafeteria (NORTHEAST)"; + dir = 5; icon_state = "cafeteria"; - dir = 5 + tag = "icon-cafeteria (NORTHEAST)" }, /area/security/brig) "aqM" = ( @@ -9502,9 +7516,9 @@ /area/security/brig) "aqN" = ( /turf/simulated/floor/plasteel{ - tag = "icon-cafeteria (NORTHEAST)"; + dir = 5; icon_state = "cafeteria"; - dir = 5 + tag = "icon-cafeteria (NORTHEAST)" }, /area/security/brig) "aqO" = ( @@ -9546,8 +7560,8 @@ level = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "redcorner"; - dir = 4 + dir = 4; + icon_state = "redcorner" }, /area/security/brig) "aqQ" = ( @@ -9556,9 +7570,9 @@ on = 1 }, /turf/simulated/floor/plasteel{ - tag = "icon-vault (WEST)"; + dir = 8; icon_state = "vault"; - dir = 8 + tag = "icon-vault (WEST)" }, /area/security/evidence) "aqR" = ( @@ -9575,15 +7589,12 @@ level = 1 }, /turf/simulated/floor/plasteel{ - tag = "icon-vault (WEST)"; + dir = 8; icon_state = "vault"; - dir = 8 + tag = "icon-vault (WEST)" }, /area/security/evidence) "aqS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/camera{ c_tag = "Holodeck"; dir = 1 @@ -9608,21 +7619,20 @@ network = list("SS13") }, /turf/simulated/floor/plasteel{ - tag = "icon-vault (WEST)"; + dir = 8; icon_state = "vault"; - dir = 8 + tag = "icon-vault (WEST)" }, /area/security/evidence) "aqU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 10 + dir = 10; + icon_state = "red" }, /area/security/main) "aqV" = ( @@ -9638,8 +7648,8 @@ /area/security/main) "aqW" = ( /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 6 + dir = 6; + icon_state = "red" }, /area/security/main) "aqX" = ( @@ -9650,7 +7660,6 @@ name = "Security Officer" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "red" }, @@ -9682,6 +7691,8 @@ "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" = ( @@ -9703,13 +7714,6 @@ icon_state = "dark" }, /area/security/main) -"are" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 4 - }, -/area/security/main) "arf" = ( /obj/machinery/door/airlock/public/glass{ name = "Cryodorms" @@ -9750,26 +7754,23 @@ level = 1 }, /turf/simulated/floor/plasteel{ - tag = "icon-vault (WEST)"; + dir = 8; icon_state = "vault"; - dir = 8 + tag = "icon-vault (WEST)" }, /area/security/evidence) "arh" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/crew_quarters/fitness{ name = "\improper Recreation Area" @@ -9796,24 +7797,9 @@ icon_state = "white" }, /area/security/brig) -"ark" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/plasteel{ - icon_state = "redcorner"; - dir = 1 - }, -/area/security/brig) "arl" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /turf/simulated/floor/plasteel, /area/crew_quarters/fitness{ @@ -9841,32 +7827,10 @@ /obj/structure/chair{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) -"arp" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "neutralcorner" - }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) -"arq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/turf/simulated/floor/plasteel, /area/crew_quarters/fitness{ name = "\improper Recreation Area" }) @@ -9886,7 +7850,7 @@ /area/maintenance/disposal) "art" = ( /obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; + dir = 4; on = 1 }, /turf/simulated/floor/plasteel{ @@ -9894,45 +7858,29 @@ }, /area/engine/gravitygenerator) "aru" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/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, +/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{ - dir = 1; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/engine/gravitygenerator) -"arx" = ( -/obj/structure/AIcore, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"ary" = ( -/obj/item/stack/spacecash/c200, -/obj/item/stack/spacecash/c50, -/obj/machinery/light/spot, -/obj/structure/chair/comfy/shuttle{ - dir = 1 - }, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"arz" = ( -/obj/item/storage/box/zipties, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) "arA" = ( /turf/simulated/floor/plating/airless, /area/space/nearstation) @@ -10098,14 +8046,10 @@ /obj/structure/table, /obj/item/storage/box/evidence, /obj/item/hand_labeler, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 7; - on = 1 - }, /turf/simulated/floor/plasteel{ - tag = "icon-vault (SOUTHEAST)"; + dir = 6; icon_state = "vault"; - dir = 6 + tag = "icon-vault (SOUTHEAST)" }, /area/security/warden) "arR" = ( @@ -10120,9 +8064,9 @@ pixel_x = 4 }, /turf/simulated/floor/plasteel{ - tag = "icon-vault (SOUTHWEST)"; + dir = 10; icon_state = "vault"; - dir = 10 + tag = "icon-vault (SOUTHWEST)" }, /area/security/warden) "arT" = ( @@ -10153,9 +8097,10 @@ }) "arV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/security/warden) "arW" = ( @@ -10180,9 +8125,9 @@ /obj/structure/table, /obj/item/storage/fancy/donut_box, /turf/simulated/floor/plasteel{ - tag = "icon-cafeteria (NORTHEAST)"; + dir = 5; icon_state = "cafeteria"; - dir = 5 + tag = "icon-cafeteria (NORTHEAST)" }, /area/security/brig) "arY" = ( @@ -10199,14 +8144,13 @@ /turf/simulated/floor/plasteel, /area/security/brig) "arZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/firealarm{ dir = 4; pixel_x = 28 }, /turf/simulated/floor/plasteel{ - icon_state = "redcorner"; - dir = 4 + dir = 4; + icon_state = "redcorner" }, /area/security/brig) "asa" = ( @@ -10220,26 +8164,14 @@ /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, /area/security/armoury) -"asb" = ( -/obj/structure/rack, -/obj/item/clothing/accessory/storage/black_vest, -/obj/item/clothing/suit/space/vox/medic, -/obj/item/clothing/head/helmet/space/vox/medic, -/obj/item/clothing/mask/breath, -/obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) "asc" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/plasteel{ - tag = "icon-cafeteria (NORTHEAST)"; + dir = 5; icon_state = "cafeteria"; - dir = 5 + tag = "icon-cafeteria (NORTHEAST)" }, /area/security/brig) "asd" = ( @@ -10255,9 +8187,9 @@ /obj/structure/table, /obj/item/hand_labeler, /turf/simulated/floor/plasteel{ - tag = "icon-vault (WEST)"; + dir = 8; icon_state = "vault"; - dir = 8 + tag = "icon-vault (WEST)" }, /area/security/evidence) "asf" = ( @@ -10271,17 +8203,16 @@ }, /obj/structure/cable/yellow, /turf/simulated/floor/plasteel{ - tag = "icon-vault (WEST)"; + dir = 8; icon_state = "vault"; - dir = 8 + tag = "icon-vault (WEST)" }, /area/security/evidence) "asg" = ( /obj/effect/spawner/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ - icon_state = "0-2"; - d2 = 2 + d2 = 2; + icon_state = "0-2" }, /obj/structure/cable{ d2 = 8; @@ -10293,18 +8224,16 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 4; icon_state = "1-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6; - level = 1 + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 }, /turf/simulated/floor/plasteel{ icon_state = "red" @@ -10319,8 +8248,8 @@ "asj" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /turf/simulated/floor/plating, /area/engine/gravitygenerator) @@ -10334,8 +8263,8 @@ }, /obj/machinery/disposal, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 10 + dir = 10; + icon_state = "red" }, /area/security/main) "asm" = ( @@ -10355,8 +8284,7 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - level = 1 + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "red" @@ -10397,21 +8325,16 @@ d2 = 8; icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - level = 1 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "red" }, /area/security/main) "asp" = ( /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 4 + dir = 4; + icon_state = "red" }, /area/security/main) "asq" = ( @@ -10438,9 +8361,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ icon_state = "red" }, @@ -10465,9 +8385,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 }, /turf/simulated/floor/plasteel{ icon_state = "red" @@ -10488,9 +8407,6 @@ dir = 2; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ icon_state = "red" }, @@ -10531,10 +8447,6 @@ icon_state = "pipe-j2s"; sortType = 8 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2; - initialize_directions = 11 - }, /turf/simulated/floor/plasteel{ icon_state = "red" }, @@ -10549,12 +8461,9 @@ d2 = 8; icon_state = "0-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 6 + dir = 6; + icon_state = "red" }, /area/security/main) "asy" = ( @@ -10607,6 +8516,9 @@ dir = 2; initialize_directions = 11 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/crew_quarters/fitness{ name = "\improper Recreation Area" @@ -10620,6 +8532,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 = "neutralcorner" @@ -10633,9 +8548,9 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2; - initialize_directions = 11 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -10645,11 +8560,8 @@ name = "\improper Recreation Area" }) "asE" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /turf/simulated/floor/carpet/arcade, /area/crew_quarters/fitness{ @@ -10657,30 +8569,7 @@ }) "asF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "neutralcorner" - }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) -"asG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "neutralcorner" - }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) -"asH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 + dir = 10 }, /turf/simulated/floor/plasteel{ dir = 2; @@ -10702,9 +8591,6 @@ dir = 8; network = list("SS13") }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -10720,21 +8606,25 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/storage/primary) "asM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/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/supply{ + dir = 4; + level = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/plasteel{ - icon_state = "redcorner"; - dir = 1 + dir = 1; + icon_state = "redcorner" }, /area/security/brig) "asN" = ( @@ -10747,40 +8637,18 @@ /obj/effect/spawner/lootdrop/maintenance, /turf/simulated/floor/plating, /area/maintenance/starboard) -"asO" = ( -/obj/effect/spawner/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 - }, -/turf/simulated/floor/plating, -/area/engine/gravitygenerator) -"asP" = ( -/obj/effect/spawner/window/reinforced, -/obj/structure/cable{ - icon_state = "0-2"; - d2 = 2 - }, -/obj/structure/cable{ - d2 = 8; - icon_state = "0-8" - }, -/turf/simulated/floor/plating, -/area/engine/gravitygenerator) "asQ" = ( /obj/machinery/door/airlock/command/glass{ 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" }, /area/engine/gravitygenerator) "asR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/door/window/westleft{ base_state = "right"; dir = 4; @@ -10788,6 +8656,13 @@ name = "Infirmary"; req_access_txt = "0" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4; + level = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitered"; @@ -10817,23 +8692,22 @@ track = 0 }, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /turf/simulated/floor/plating, /area/maintenance/auxsolarstarboard) "asV" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 4 + dir = 4; + icon_state = "tube1" }, /obj/structure/extinguisher_cabinet{ pixel_x = 27 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - icon_state = "redcorner"; - dir = 4 + dir = 4; + icon_state = "redcorner" }, /area/security/brig) "asW" = ( @@ -10854,42 +8728,6 @@ icon_state = "showroomfloor" }, /area/security/warden) -"asX" = ( -/obj/structure/table, -/obj/item/stack/sheet/metal{ - amount = 50 - }, -/obj/item/stack/sheet/glass{ - amount = 50 - }, -/obj/item/stack/rods{ - amount = 50 - }, -/obj/item/stack/sheet/mineral/plasma{ - amount = 30 - }, -/obj/machinery/cell_charger, -/turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 5 - }, -/area/engine/mechanic_workshop) -"asY" = ( -/obj/structure/rack, -/obj/item/pneumatic_cannon, -/obj/item/harpoon, -/obj/item/harpoon, -/obj/item/harpoon, -/obj/item/harpoon, -/obj/item/tank/nitrogen, -/obj/machinery/light/spot{ - tag = "icon-tube1 (EAST)"; - icon_state = "tube1"; - dir = 4 - }, -/obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) "asZ" = ( /turf/simulated/floor/engine, /area/security/podbay) @@ -10904,8 +8742,8 @@ }, /obj/structure/table, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 5 + dir = 5; + icon_state = "red" }, /area/security/processing) "atc" = ( @@ -11023,17 +8861,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/fore) -"atn" = ( -/obj/structure/table, -/obj/item/folder/red, -/obj/item/restraints/handcuffs, -/obj/machinery/light{ - dir = 4 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/siberia) "ato" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -11059,11 +8886,8 @@ dir = 4; pixel_y = -28 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" @@ -11076,37 +8900,34 @@ 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/security/brig) "atr" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - icon_state = "redcorner"; - dir = 4 + dir = 4; + icon_state = "redcorner" }, /area/security/brig) "ats" = ( -/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/manifold/hidden/supply{ + dir = 4; + initialize_directions = 11 }, /turf/simulated/floor/plasteel, /area/security/brig) -"att" = ( -/obj/effect/spawner/window/reinforced, -/obj/structure/cable/yellow{ - d2 = 2; - icon_state = "0-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plating, -/area/security/warden) "atu" = ( /obj/structure/table, /obj/item/storage/box/cups, /turf/simulated/floor/plasteel{ - tag = "icon-cafeteria (NORTHEAST)"; + dir = 5; icon_state = "cafeteria"; - dir = 5 + tag = "icon-cafeteria (NORTHEAST)" }, /area/security/brig) "atv" = ( @@ -11117,10 +8938,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/security/brig) "atw" = ( @@ -11133,8 +8951,8 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "redcorner"; - dir = 4 + dir = 4; + icon_state = "redcorner" }, /area/security/brig) "atx" = ( @@ -11231,19 +9049,6 @@ /area/maintenance/fpmaint2{ name = "Port Maintenance" }) -"atI" = ( -/obj/structure/shuttle/engine/propulsion/burst{ - dir = 8 - }, -/turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 5 - }, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f5"; - dir = 2 - }, -/area/shuttle/pod_4) "atJ" = ( /obj/structure/table, /obj/item/weldingtool, @@ -11252,7 +9057,6 @@ /obj/item/stack/packageWrap, /obj/item/stack/packageWrap, /obj/item/stack/packageWrap, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/storage/primary) "atK" = ( @@ -11278,7 +9082,10 @@ }, /area/security/brig) "atM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4; + initialize_directions = 11 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -11286,8 +9093,8 @@ "atN" = ( /obj/structure/closet/lasertag/red, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/crew_quarters/fitness{ name = "\improper Recreation Area" @@ -11299,8 +9106,8 @@ /obj/item/clothing/accessory/red, /obj/item/clothing/head/soft/red, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/crew_quarters/fitness{ name = "\improper Recreation Area" @@ -11312,8 +9119,8 @@ /obj/item/clothing/accessory/blue, /obj/item/clothing/head/soft/blue, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/crew_quarters/fitness{ name = "\improper Recreation Area" @@ -11321,8 +9128,8 @@ "atQ" = ( /obj/structure/closet/lasertag/blue, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/crew_quarters/fitness{ name = "\improper Recreation Area" @@ -11332,6 +9139,7 @@ dir = 4; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" @@ -11346,10 +9154,10 @@ name = "\improper Arcade" }) "atT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "neutralcorner" @@ -11385,8 +9193,8 @@ /obj/machinery/light, /obj/machinery/vending/cola, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/crew_quarters/fitness{ name = "\improper Recreation Area" @@ -11406,47 +9214,10 @@ /obj/machinery/portable_atmospherics/canister/air, /turf/simulated/floor/plating, /area/maintenance/auxsolarstarboard) -"atY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/turf/simulated/wall, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) -"atZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/wall, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) -"aua" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/turf/simulated/wall, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) "aub" = ( /obj/item/cigbutt, /turf/simulated/floor/plating, /area/maintenance/starboard) -"auc" = ( -/obj/machinery/flasher{ - id = "gulagshuttleflasher"; - pixel_x = 25 - }, -/obj/machinery/light{ - dir = 4 - }, -/obj/structure/chair/comfy/shuttle{ - dir = 8 - }, -/turf/simulated/shuttle/floor, -/area/shuttle/siberia) "aud" = ( /obj/item/mmi{ name = "man-machine interface" @@ -11463,8 +9234,8 @@ dir = 6 }, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/machinery/power/apc{ dir = 8; @@ -11473,6 +9244,9 @@ pixel_y = 1 }, /obj/effect/decal/warning_stripes/northwest, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, /turf/simulated/floor/plasteel, /area/engine/gravitygenerator) "auf" = ( @@ -11499,13 +9273,12 @@ /turf/simulated/wall, /area/maintenance/disposal) "auh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/extinguisher_cabinet{ pixel_x = -27 }, /turf/simulated/floor/plasteel{ - icon_state = "redcorner"; - dir = 1 + dir = 1; + icon_state = "redcorner" }, /area/security/brig) "aui" = ( @@ -11574,20 +9347,6 @@ }, /turf/simulated/floor/plating, /area/security/brig) -"aun" = ( -/obj/structure/rack, -/obj/item/clothing/accessory/storage/black_vest, -/obj/item/clothing/suit/space/vox/pressure, -/obj/item/clothing/head/helmet/space/vox/pressure, -/obj/item/clothing/mask/breath, -/obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"auo" = ( -/obj/structure/rack, -/obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) "aup" = ( /obj/structure/lattice, /obj/structure/grille/broken, @@ -11603,15 +9362,6 @@ /area/maintenance/fpmaint2{ name = "Port Maintenance" }) -"aur" = ( -/obj/structure/rack, -/obj/item/clothing/accessory/storage/black_vest, -/obj/item/clothing/suit/space/vox/stealth, -/obj/item/clothing/head/helmet/space/vox/stealth, -/obj/item/clothing/mask/breath, -/obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) "aus" = ( /obj/machinery/door/poddoor/shutters{ dir = 2; @@ -11644,8 +9394,8 @@ }) "auv" = ( /obj/structure/cable{ - icon_state = "0-2"; - d2 = 2 + d2 = 2; + icon_state = "0-2" }, /obj/structure/lattice/catwalk, /turf/space, @@ -11723,6 +9473,7 @@ "auF" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security/glass{ + locked = 1; name = "Labor Camp Shuttle Airlock"; req_access_txt = "2" }, @@ -11746,8 +9497,8 @@ pixel_y = -28 }, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/crew_quarters/fitness{ name = "\improper Recreation Area" @@ -11768,13 +9519,6 @@ /area/maintenance/fpmaint2{ name = "Port Maintenance" }) -"auK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/spawner/window/reinforced, -/turf/simulated/floor/plating, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) "auL" = ( /obj/effect/decal/cleanable/blood, /obj/structure/chair, @@ -11829,7 +9573,6 @@ d2 = 2; icon_state = "0-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -11847,38 +9590,33 @@ dir = 1 }, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/crew_quarters/fitness{ name = "\improper Recreation Area" }) -"auQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/wall/r_wall, -/area/security/warden) "auR" = ( /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 4; icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, /area/security/warden) "auS" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -11889,18 +9627,24 @@ d2 = 4; icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, /obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - on = 1 + 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/scrubbers{ + dir = 5 }, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" @@ -11909,9 +9653,9 @@ "auU" = ( /obj/machinery/vending/cigarette, /turf/simulated/floor/plasteel{ - tag = "icon-cafeteria (NORTHEAST)"; + dir = 5; icon_state = "cafeteria"; - dir = 5 + tag = "icon-cafeteria (NORTHEAST)" }, /area/security/brig) "auV" = ( @@ -11928,14 +9672,18 @@ dir = 5; level = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5; + level = 1 + }, /turf/simulated/floor/plasteel, /area/security/brig) "auW" = ( /obj/structure/reagent_dispensers/water_cooler, /turf/simulated/floor/plasteel{ - tag = "icon-cafeteria (NORTHEAST)"; + dir = 5; icon_state = "cafeteria"; - dir = 5 + tag = "icon-cafeteria (NORTHEAST)" }, /area/security/brig) "auX" = ( @@ -11983,9 +9731,12 @@ initialize_directions = 10; level = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, /turf/simulated/floor/plasteel{ - icon_state = "redcorner"; - dir = 4 + dir = 4; + icon_state = "redcorner" }, /area/security/brig) "ava" = ( @@ -12000,6 +9751,7 @@ }, /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"; @@ -12088,9 +9840,9 @@ /area/security/brig) "avj" = ( /obj/machinery/light/small{ - tag = "icon-bulb1 (EAST)"; + dir = 4; icon_state = "bulb1"; - dir = 4 + tag = "icon-bulb1 (EAST)" }, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" @@ -12169,8 +9921,8 @@ "avq" = ( /obj/machinery/cryopod/right, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -12182,14 +9934,14 @@ "avs" = ( /obj/structure/table, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 9 + dir = 9; + icon_state = "red" }, /area/security/processing) "avt" = ( /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 1 + dir = 1; + icon_state = "red" }, /area/security/processing) "avu" = ( @@ -12202,8 +9954,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 1 + dir = 1; + icon_state = "red" }, /area/security/processing) "avv" = ( @@ -12214,8 +9966,8 @@ /obj/structure/disposalpipe/segment, /obj/structure/table, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 1 + dir = 1; + icon_state = "red" }, /area/security/processing) "avx" = ( @@ -12230,7 +9982,7 @@ /area/maintenance/starboard) "avz" = ( /obj/structure/rack, -/obj/effect/landmark/costume/random, +/obj/effect/landmark/costume, /obj/effect/spawner/lootdrop/maintenance, /turf/simulated/floor/plating, /area/maintenance/starboard) @@ -12245,8 +9997,8 @@ /obj/structure/table/wood, /obj/machinery/photocopier/faxmachine/longrange, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 1 + dir = 1; + icon_state = "neutral" }, /area/crew_quarters/courtroom) "avC" = ( @@ -12270,20 +10022,11 @@ /obj/item/storage/box/lights/mixed, /turf/simulated/floor/plating, /area/maintenance/starboard) -"avE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/turf/simulated/wall/r_wall, -/area/engine/gravitygenerator) "avF" = ( /obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; + dir = 4; on = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -12296,23 +10039,18 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ req_access_txt = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /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, /turf/simulated/floor/plasteel, /area/engine/gravitygenerator) "avH" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /obj/machinery/power/terminal, /obj/structure/cable/yellow{ @@ -12328,9 +10066,6 @@ icon_state = "alarm0"; pixel_y = -22 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, /obj/machinery/hologram/holopad, /obj/structure/cable/yellow{ d1 = 4; @@ -12338,6 +10073,13 @@ icon_state = "4-8" }, /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 + }, /turf/simulated/floor/plasteel, /area/engine/gravitygenerator) "avJ" = ( @@ -12346,8 +10088,8 @@ pixel_x = 27 }, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/crew_quarters/fitness{ name = "\improper Recreation Area" @@ -12392,10 +10134,7 @@ /turf/simulated/floor/plating, /area/maintenance/auxsolarstarboard) "avN" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall12"; - dir = 2 - }, +/turf/simulated/wall/mineral/titanium, /area/shuttle/pod_4) "avO" = ( /obj/item/radio/intercom/department/security, @@ -12404,8 +10143,8 @@ "avP" = ( /obj/machinery/computer/podtracker, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 5 + dir = 5; + icon_state = "vault" }, /area/engine/mechanic_workshop) "avQ" = ( @@ -12422,10 +10161,6 @@ name = "Port Maintenance" }) "avR" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -12437,6 +10172,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 + }, /turf/simulated/floor/plasteel, /area/engine/gravitygenerator) "avS" = ( @@ -12472,10 +10213,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 - }, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel, /area/engine/gravitygenerator) @@ -12512,8 +10249,8 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 1 + dir = 1; + icon_state = "red" }, /area/security/processing) "awa" = ( @@ -12529,8 +10266,8 @@ /area/crew_quarters/sleep) "awb" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/machinery/conveyor/north{ id = "QMLoad2" @@ -12596,12 +10333,6 @@ /turf/simulated/floor/plating, /area/maintenance/fore) "awi" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - external_pressure_bound = 101.325; - on = 1; - pressure_checks = 1 - }, /obj/machinery/camera{ c_tag = "Labor Shuttle Control Desk"; dir = 4 @@ -12635,10 +10366,14 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, /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" = ( @@ -12712,10 +10447,6 @@ }, /area/security/brig) "aws" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -12730,8 +10461,8 @@ icon_state = "1-4" }, /turf/simulated/floor/plasteel{ - icon_state = "redcorner"; - dir = 1 + dir = 1; + icon_state = "redcorner" }, /area/security/brig) "awt" = ( @@ -12744,6 +10475,8 @@ 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/security/brig) "awu" = ( @@ -12759,7 +10492,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -12795,15 +10527,15 @@ pixel_x = -22 }, /turf/simulated/floor/plasteel{ - icon_state = "redcorner"; - dir = 1 + dir = 1; + icon_state = "redcorner" }, /area/security/brig) "awA" = ( /obj/machinery/vending/cola, /turf/simulated/floor/plasteel{ - icon_state = "redcorner"; - dir = 4 + dir = 4; + icon_state = "redcorner" }, /area/security/brig) "awB" = ( @@ -12814,6 +10546,9 @@ 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" = ( @@ -12838,7 +10573,7 @@ /obj/structure/chair/comfy/shuttle{ dir = 4 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/pod_4) "awE" = ( /obj/machinery/space_heater, @@ -12875,7 +10610,6 @@ network = list("Prison"); pixel_x = -30 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -12949,8 +10683,8 @@ dir = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 8 + dir = 8; + icon_state = "red" }, /area/security/processing) "awR" = ( @@ -12966,14 +10700,22 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6; + level = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, /turf/simulated/floor/plasteel, /area/crew_quarters/sleep) "awT" = ( /obj/machinery/light/small{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "neutralcorner" @@ -13032,10 +10774,6 @@ /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plating, /area/maintenance/fore) -"awY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/wall/r_wall, -/area/engine/gravitygenerator) "awZ" = ( /obj/structure/cable/yellow{ d1 = 4; @@ -13080,6 +10818,7 @@ icon_state = "1-2" }, /obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/engine/gravitygenerator) "axd" = ( @@ -13121,8 +10860,8 @@ pressure_checks = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 1 + dir = 1; + icon_state = "red" }, /area/security/processing) "axg" = ( @@ -13130,7 +10869,6 @@ /obj/machinery/door/airlock/public/glass{ name = "Primary Tool Storage" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/storage/primary) "axh" = ( @@ -13177,8 +10915,8 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 9 + dir = 9; + icon_state = "red" }, /area/security/processing) "axk" = ( @@ -13453,26 +11191,6 @@ icon_state = "grimy" }, /area/security/main) -"axD" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f6"; - dir = 2 - }, -/area/shuttle/siberia) -"axE" = ( -/obj/structure/grille, -/obj/structure/shuttle/window, -/turf/simulated/shuttle/plating, -/area/shuttle/siberia) -"axF" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall_f10"; - layer = 2 - }, -/area/shuttle/siberia) "axG" = ( /obj/machinery/computer/prisoner, /turf/simulated/floor/plasteel{ @@ -13486,8 +11204,8 @@ }, /obj/structure/chair/stool, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 5 + dir = 5; + icon_state = "red" }, /area/security/processing) "axI" = ( @@ -13501,17 +11219,9 @@ on = 1 }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/security/brig) -"axJ" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "redcorner"; - dir = 4 - }, -/area/security/brig) "axK" = ( /obj/structure/sign/pods, /turf/simulated/wall/r_wall, @@ -13526,8 +11236,8 @@ charge = 5e+006 }, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, @@ -13537,20 +11247,19 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 4 + dir = 4; + icon_state = "red" }, /area/security/processing) "axO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, /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/plasteel, /area/engine/gravitygenerator) "axP" = ( @@ -13566,11 +11275,8 @@ req_access_txt = "0"; specialfunctions = 4 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /obj/structure/bed, /obj/item/bedsheet, @@ -13632,13 +11338,11 @@ d2 = 4; icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 2; initialize_directions = 11 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plasteel, /area/crew_quarters/fitness{ name = "\improper Recreation Area" @@ -13657,9 +11361,6 @@ id = "QMLoad2"; pixel_x = 6 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel, /area/quartermaster/storage) @@ -13695,10 +11396,8 @@ /area/crew_quarters/mrchangs) "ayc" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -13711,21 +11410,21 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 - }, /obj/effect/landmark{ name = "lightsout" }, -/turf/simulated/floor/plasteel, -/area/crew_quarters/sleep) -"aye" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, +/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 = 6 + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 2; @@ -13769,17 +11468,6 @@ "ayi" = ( /turf/simulated/floor/carpet, /area/crew_quarters/sleep) -"ayj" = ( -/obj/machinery/door/poddoor{ - id_tag = "QMLoaddoor2"; - name = "supply dock loading door" - }, -/obj/machinery/conveyor/east{ - id = "QMLoad2" - }, -/obj/structure/plasticflaps/mining, -/turf/simulated/shuttle/plating, -/area/shuttle/supply) "ayk" = ( /obj/structure/closet/crate/hydroponics, /obj/effect/spawner/lootdrop/maintenance, @@ -13824,7 +11512,6 @@ /area/crew_quarters/sleep) "ayq" = ( /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/table/reinforced, /obj/item/paper, /obj/machinery/door/window/brigdoor{ @@ -13886,7 +11573,6 @@ icon_state = "4-8" }, /obj/machinery/computer/prisoner, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -13899,6 +11585,8 @@ /obj/machinery/light/small{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/maintenance/starboard) "ayw" = ( @@ -13914,8 +11602,9 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /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" = ( @@ -14017,21 +11706,13 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/light/small, +/obj/effect/decal/warning_stripes/southwest, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/light/small, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/decal/warning_stripes/southwest, /turf/simulated/floor/plasteel, /area/engine/gravitygenerator) -"ayJ" = ( -/obj/effect/spawner/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/wood, -/area/crew_quarters/mrchangs) "ayK" = ( /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, @@ -14047,12 +11728,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/security/brig) -"ayM" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall3"; - dir = 2 - }, -/area/shuttle/siberia) "ayN" = ( /obj/structure/closet/radiation, /obj/structure/sign/securearea{ @@ -14062,18 +11737,9 @@ name = "RADIOACTIVE AREA"; pixel_y = 32 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/warning_stripes/northwest, /turf/simulated/floor/plasteel, /area/engine/gravitygenerator) -"ayO" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 1 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/siberia) "ayP" = ( /obj/structure/disposalpipe/segment, /obj/effect/spawner/window/reinforced, @@ -14096,9 +11762,6 @@ icon_state = "alarm0"; pixel_x = 24 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, /obj/effect/decal/warning_stripes/northeast, /turf/simulated/floor/plasteel, /area/engine/gravitygenerator) @@ -14109,17 +11772,9 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/junction, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/security/brig) -"ayS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "redcorner"; - dir = 4 - }, -/area/security/brig) "ayT" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -14134,15 +11789,6 @@ icon_state = "showroomfloor" }, /area/security/warden) -"ayU" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/turf/simulated/floor/plasteel{ - icon_state = "redcorner"; - dir = 4 - }, -/area/security/brig) "ayV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/yellow{ @@ -14151,6 +11797,7 @@ icon_state = "2-8" }, /obj/machinery/hologram/holopad, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -14201,8 +11848,8 @@ /area/security/warden) "ayY" = ( /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 8 + dir = 8; + icon_state = "red" }, /area/security/processing) "ayZ" = ( @@ -14228,8 +11875,8 @@ level = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 8 + dir = 8; + icon_state = "red" }, /area/security/processing) "azb" = ( @@ -14239,8 +11886,8 @@ level = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 4 + dir = 4; + icon_state = "red" }, /area/security/processing) "azc" = ( @@ -14287,11 +11934,8 @@ /turf/simulated/floor/plating, /area/maintenance/starboard) "azg" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /turf/simulated/floor/wood, /area/crew_quarters/mrchangs) @@ -14316,37 +11960,20 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/crew_quarters/sleep) -"azk" = ( -/obj/machinery/computer/shuttle/labor, -/obj/structure/reagent_dispensers/peppertank{ - pixel_x = -31 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/siberia) -"azl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/wall, -/area/crew_quarters/sleep) "azn" = ( /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, /obj/effect/decal/warning_stripes/southeast, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/engine/gravitygenerator) "azo" = ( @@ -14369,9 +11996,7 @@ dir = 2; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /obj/structure/cable/yellow{ d1 = 1; d2 = 4; @@ -14383,6 +12008,7 @@ icon_state = "1-8" }, /obj/effect/decal/warning_stripes/south, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/engine/gravitygenerator) "azr" = ( @@ -14409,9 +12035,15 @@ /turf/simulated/floor/plating, /area/maintenance/starboard) "azt" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, /turf/simulated/floor/plasteel{ - tag = "icon-stage_stairs"; - icon_state = "stage_stairs" + icon_state = "stage_stairs"; + tag = "icon-stage_stairs" }, /area/security/podbay) "azu" = ( @@ -14445,8 +12077,8 @@ /area/security/brig) "azx" = ( /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 4 + dir = 4; + icon_state = "red" }, /area/security/processing) "azy" = ( @@ -14460,17 +12092,11 @@ }, /turf/simulated/floor/plating, /area/maintenance/starboard) -"azz" = ( -/obj/effect/spawner/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plating, -/area/security/brig) "azA" = ( /obj/structure/disposalpipe/segment{ dir = 4; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/sign/securearea{ desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; @@ -14516,8 +12142,8 @@ id_tag = "mechpodbay" }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 5 + dir = 5; + icon_state = "vault" }, /area/engine/mechanic_workshop) "azE" = ( @@ -14526,9 +12152,6 @@ }, /area/security/podbay) "azF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/yellow{ d2 = 2; icon_state = "0-2" @@ -14538,36 +12161,33 @@ name = "north bump"; pixel_y = 24 }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 + }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 1 + dir = 1; + icon_state = "red" }, /area/security/brig) "azG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/extinguisher_cabinet{ pixel_y = 30 }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 1 + dir = 1; + icon_state = "red" }, /area/security/brig) "azH" = ( /obj/machinery/atm{ pixel_x = 32 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/firealarm{ pixel_y = 28 }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 5 + dir = 5; + icon_state = "red" }, /area/security/brig) "azI" = ( @@ -14633,10 +12253,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/maintenance/fore) -"azM" = ( -/obj/machinery/space_heater, -/turf/simulated/floor/plating, -/area/engine/engineering) "azN" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -14725,15 +12341,11 @@ req_access_txt = "48" }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/quartermaster/miningdock{ name = "\improper Mining Office" }) -"azU" = ( -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/siberia) "azV" = ( /obj/structure/table/wood, /obj/machinery/alarm{ @@ -14742,29 +12354,10 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/mrchangs) -"azW" = ( -/obj/machinery/mineral/labor_claim_console{ - machinedir = 2; - pixel_x = 30; - pixel_y = 30 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/siberia) -"azX" = ( -/obj/machinery/door/airlock/shuttle{ - id_tag = "s_docking_airlock"; - name = "Labor Shuttle Airlock" - }, -/obj/structure/fans/tiny, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/siberia) "azY" = ( /obj/machinery/door/airlock/external{ id_tag = "laborcamp_home"; + locked = 1; name = "Labor Camp Shuttle Airlock" }, /obj/structure/fans/tiny, @@ -14787,8 +12380,10 @@ }, /area/crew_quarters/sleep) "aAa" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "redcorner" @@ -14809,6 +12404,7 @@ dir = 1; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/security/brig) "aAc" = ( @@ -14820,8 +12416,11 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = "0" +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 }, /turf/simulated/floor/plasteel, /area/security/brig) @@ -14834,16 +12433,19 @@ /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 + }, /turf/simulated/floor/plasteel, /area/security/brig) "aAe" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/extinguisher_cabinet{ pixel_x = 27 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "neutralcorner" @@ -14871,55 +12473,33 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, /area/security/warden) -"aAi" = ( -/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/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/security/brig) "aAj" = ( /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ d1 = 2; 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" }, /area/security/warden) -"aAk" = ( -/turf/simulated/floor/plasteel{ - icon_state = "redcorner"; - dir = 1 - }, -/area/security/brig) "aAl" = ( /obj/structure/closet/secure_closet/brig{ id = "Cell 4"; @@ -14935,7 +12515,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -14947,6 +12526,10 @@ /obj/effect/landmark{ name = "lightsout" }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, /turf/simulated/floor/plasteel, /area/security/brig) "aAn" = ( @@ -14976,8 +12559,8 @@ }, /obj/structure/chair, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 8 + dir = 8; + icon_state = "red" }, /area/security/processing) "aAq" = ( @@ -14991,12 +12574,24 @@ d2 = 8; icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1; + initialize_directions = 11 + }, +/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 + }, /turf/simulated/floor/plasteel, /area/security/brig) "aAt" = ( @@ -15014,21 +12609,18 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 10 + dir = 10; + icon_state = "red" }, /area/security/processing) "aAu" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /obj/structure/chair/stool, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 6 + dir = 6; + icon_state = "red" }, /area/security/processing) "aAv" = ( @@ -15084,19 +12676,13 @@ /area/crew_quarters/mrchangs) "aAC" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 - }, /turf/simulated/floor/wood, /area/crew_quarters/mrchangs) "aAD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/chair/wood{ dir = 1 }, +/obj/machinery/atmospherics/unary/vent_pump, /turf/simulated/floor/wood, /area/crew_quarters/mrchangs) "aAE" = ( @@ -15111,16 +12697,6 @@ }, /turf/simulated/floor/plating, /area/security/brig) -"aAF" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "neutralcorner" - }, -/area/crew_quarters/sleep) "aAG" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -15128,15 +12704,10 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/crew_quarters/sleep) "aAH" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, /obj/machinery/camera{ c_tag = "Dormitories - Fore"; dir = 8 @@ -15221,6 +12792,7 @@ 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" }, @@ -15244,32 +12816,6 @@ /area/maintenance/fpmaint2{ name = "Port Maintenance" }) -"aAQ" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f6"; - dir = 2 - }, -/area/shuttle/mining) -"aAR" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall12"; - dir = 2 - }, -/area/shuttle/mining) -"aAS" = ( -/obj/structure/grille, -/obj/structure/shuttle/window, -/turf/simulated/shuttle/plating, -/area/shuttle/mining) -"aAT" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall_f10"; - layer = 2 - }, -/area/shuttle/mining) "aAU" = ( /obj/item/clothing/gloves/color/rainbow, /obj/item/clothing/shoes/rainbow, @@ -15330,70 +12876,25 @@ "aBb" = ( /turf/simulated/wall/r_wall, /area/security/nuke_storage) -"aBc" = ( -/obj/machinery/door/airlock/shuttle{ - name = "Labor Shuttle Airlock"; - req_access_txt = "2" - }, -/turf/simulated/shuttle/floor{ - icon = 'icons/turf/floors.dmi'; - icon_state = "dark" - }, -/area/shuttle/siberia) -"aBd" = ( -/turf/simulated/shuttle/wall, -/area/shuttle/siberia) -"aBe" = ( -/obj/machinery/mineral/stacking_machine/laborstacker, -/turf/simulated/shuttle/floor{ - icon = 'icons/turf/floors.dmi'; - icon_state = "dark" - }, -/area/shuttle/siberia) "aBf" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 - }, /obj/machinery/disposal, /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) -"aBg" = ( -/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/security/brig) "aBh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = "0" - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "redcorner" }, /area/security/brig) "aBi" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/light, /obj/machinery/camera{ c_tag = "Brig - Hallway - Port"; @@ -15410,34 +12911,13 @@ }, /area/security/brig) "aBj" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "redcorner" }, /area/security/brig) -"aBk" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2; - initialize_directions = 11 - }, -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "neutralcorner" - }, -/area/security/brig) "aBl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/door_timer{ id = "Cell 2"; name = "Cell 2"; @@ -15448,21 +12928,12 @@ }, /area/security/brig) "aBm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = "0" - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "red" }, /area/security/brig) "aBn" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2; - initialize_directions = 11 - }, /obj/machinery/door_timer{ id = "Cell 3"; name = "Cell 3"; @@ -15474,24 +12945,12 @@ }, /area/security/brig) "aBo" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ req_access_txt = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 9 - }, -/area/security/brig) -"aBp" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 1 + dir = 9; + icon_state = "red" }, /area/security/brig) "aBq" = ( @@ -15500,13 +12959,10 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 5 + dir = 5; + icon_state = "red" }, /area/security/brig) "aBr" = ( @@ -15523,67 +12979,35 @@ icon_state = "dark" }, /area/crew_quarters/sleep) -"aBt" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 - }, -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "neutralcorner" - }, -/area/security/brig) "aBu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 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/scrubbers, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "neutralcorner" }, /area/security/brig) -"aBv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "redcorner" - }, -/area/security/brig) "aBw" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2; - initialize_directions = 11 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 }, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "redcorner" }, /area/security/brig) -"aBx" = ( -/obj/machinery/flasher_button{ - id = "gulagshuttleflasher"; - name = "Flash Control"; - pixel_y = -26; - req_access_txt = "1" - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/siberia) "aBy" = ( /obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment, /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" @@ -15598,19 +13022,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ req_access_txt = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "redcorner" - }, -/area/security/brig) -"aBA" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "redcorner" @@ -15619,6 +13031,7 @@ "aBB" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security/glass{ + locked = 1; name = "Labor Camp Shuttle Airlock"; req_access_txt = "2" }, @@ -15633,15 +13046,9 @@ icon_state = "dark" }, /area/security/brig) -"aBC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/wall/r_wall, -/area/security/brig) "aBD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 + dir = 5 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -15669,11 +13076,8 @@ req_access_txt = "0"; specialfunctions = 4 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /turf/simulated/floor/wood, /area/crew_quarters/sleep) @@ -15689,11 +13093,8 @@ }, /area/security/brig) "aBH" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -15716,7 +13117,6 @@ d2 = 4; icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -15734,6 +13134,9 @@ name = "south bump"; pixel_y = -24 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, /turf/simulated/floor/wood, /area/crew_quarters/mrchangs) "aBM" = ( @@ -15746,6 +13149,9 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -15763,6 +13169,9 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/wood, /area/crew_quarters/mrchangs) "aBO" = ( @@ -15771,15 +13180,13 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 - }, /obj/structure/cable/yellow{ d1 = 2; 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/crew_quarters/sleep) "aBP" = ( @@ -15840,6 +13247,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/starboard) "aBV" = ( @@ -15888,6 +13298,9 @@ dir = 2 }, /obj/effect/decal/warning_stripes/north, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/starboard) "aBY" = ( @@ -15963,49 +13376,38 @@ /turf/simulated/floor/plating, /area/maintenance/starboard) "aCd" = ( +/obj/effect/decal/warning_stripes/northwest, /obj/structure/sign/securearea{ pixel_y = 32 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/decal/warning_stripes/northwest, /turf/simulated/floor/plasteel, /area/engine/engineering) "aCe" = ( /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /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" }, /area/crew_quarters/sleep) "aCf" = ( -/obj/machinery/light_switch{ - pixel_x = 23 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/shower{ - dir = 8; - icon_state = "shower"; - name = "emergency shower"; - tag = "icon-shower (WEST)" - }, +/obj/effect/decal/warning_stripes/northeast, /obj/structure/sign/securearea{ pixel_y = 32 }, -/obj/effect/decal/warning_stripes/northeast, /turf/simulated/floor/plasteel, /area/engine/engineering) "aCg" = ( /turf/simulated/wall/r_wall, /area/engine/engineering) "aCh" = ( -/obj/structure/closet/emcloset, -/turf/simulated/floor/plating, +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, /area/engine/engineering) "aCi" = ( /obj/machinery/newscaster{ @@ -16024,9 +13426,6 @@ /turf/simulated/wall/r_wall, /area/maintenance/starboard) "aCk" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/flasher_button{ id = "secentranceflasher"; name = "Brig Entrance Flasher"; @@ -16037,19 +13436,24 @@ /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" }, /area/security/brig) "aCl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/flasher_button{ id = "holdingflash"; 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" @@ -16061,7 +13465,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/crew_quarters/sleep) @@ -16073,20 +13476,6 @@ /obj/item/stack/rods, /turf/simulated/floor/plating/airless, /area/space/nearstation) -"aCo" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall3"; - dir = 2 - }, -/area/shuttle/mining) -"aCp" = ( -/obj/structure/table, -/turf/simulated/shuttle/floor, -/area/shuttle/mining) -"aCq" = ( -/obj/machinery/computer/shuttle/mining, -/turf/simulated/shuttle/floor, -/area/shuttle/mining) "aCr" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable/yellow{ @@ -16126,15 +13515,12 @@ name = "\improper Warehouse" }) "aCv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/extinguisher_cabinet{ pixel_x = 27 }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 6 + dir = 6; + icon_state = "red" }, /area/security/brig) "aCw" = ( @@ -16151,8 +13537,8 @@ /obj/structure/closet/secure_closet/freezer/money, /obj/item/clothing/head/bearpelt, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/security/nuke_storage) "aCy" = ( @@ -16203,21 +13589,21 @@ pixel_y = 32 }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 1 + dir = 1; + icon_state = "vault" }, /area/security/nuke_storage) -"aCC" = ( -/turf/simulated/shuttle/floor, -/area/shuttle/siberia) "aCD" = ( -/obj/structure/grille, -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4" +/obj/machinery/atmospherics/unary/portables_connector{ + layer = 2 + }, +/obj/machinery/light{ + dir = 1; + on = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" }, -/turf/simulated/floor/plating/airless, /area/engine/engineering) "aCE" = ( /obj/machinery/alarm{ @@ -16346,8 +13732,8 @@ req_access_txt = "63" }, /obj/effect/mapping_helpers/airlock/unres{ - icon_state = "airlock_unres_helper"; - dir = 1 + dir = 1; + icon_state = "airlock_unres_helper" }, /turf/simulated/floor/plasteel{ icon_state = "red" @@ -16372,8 +13758,8 @@ req_access_txt = "63" }, /obj/effect/mapping_helpers/airlock/unres{ - icon_state = "airlock_unres_helper"; - dir = 1 + dir = 1; + icon_state = "airlock_unres_helper" }, /turf/simulated/floor/plasteel{ icon_state = "red" @@ -16386,7 +13772,7 @@ icon_state = "0-8" }, /turf/simulated/floor/plating, -/area/engine/engineering) +/area/engine/equipmentstorage) "aCN" = ( /obj/structure/disposalpipe/segment{ dir = 8; @@ -16429,21 +13815,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ req_access_txt = 1 }, -/turf/simulated/floor/plasteel, -/area/security/detectives_office) -"aCR" = ( -/obj/structure/grille, -/obj/structure/cable/yellow{ - d2 = 2; - icon_state = "0-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/window/reinforced/tinted{ - dir = 5; - max_integrity = 120; - reinf = 0 - }, -/turf/simulated/floor/plating, +/turf/simulated/floor/plasteel, /area/security/detectives_office) "aCS" = ( /turf/simulated/wall, @@ -16469,12 +13842,6 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 - }, /obj/machinery/alarm{ pixel_y = 26 }, @@ -16530,22 +13897,17 @@ dir = 2; icon_state = "pipe-c" }, -/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, /area/crew_quarters/sleep) "aCY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/light/small{ dir = 4 }, /obj/structure/sign/pods{ pixel_x = 30 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "neutralcorner" @@ -16559,6 +13921,7 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/maintenance/starboard) "aDa" = ( @@ -16573,13 +13936,13 @@ req_access_txt = "10" }, /obj/effect/decal/warning_stripes/yellow, +/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/supply{ - dir = 5 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel, /area/engine/engineering) @@ -16600,13 +13963,12 @@ /turf/simulated/floor/plating, /area/maintenance/starboard) "aDf" = ( -/obj/structure/grille, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" }, -/turf/simulated/floor/plating/airless, /area/engine/engineering) "aDg" = ( /obj/structure/table, @@ -16615,93 +13977,23 @@ icon_state = "showroomfloor" }, /area/security/warden) -"aDh" = ( -/obj/structure/grille, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/turf/simulated/floor/plating/airless, -/area/engine/engineering) "aDi" = ( -/turf/simulated/floor/plating/airless, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/camera{ + c_tag = "Engineering Supermatter Fore"; + dir = 8; + network = list("SS13","engine") + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, /area/engine/engineering) -"aDj" = ( -/obj/structure/cable, -/obj/machinery/power/emitter{ - anchored = 1; - state = 2 - }, -/turf/simulated/floor/plating/airless, -/area/engine/engineering) -"aDk" = ( -/obj/structure/grille, -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/turf/simulated/floor/plating/airless, -/area/maintenance/starboard) -"aDl" = ( -/obj/structure/grille, -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/plating/airless, -/area/engine/engineering) -"aDm" = ( -/obj/structure/grille, -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/turf/simulated/floor/plating/airless, -/area/engine/engineering) -"aDn" = ( -/obj/structure/sign/securearea{ - desc = "A warning sign which reads 'HIGH VOLTAGE'"; - icon_state = "shock"; - name = "HIGH VOLTAGE" - }, -/turf/simulated/wall/r_wall, -/area/engine/engineering) -"aDo" = ( -/obj/structure/grille, -/turf/simulated/floor/plating/airless, -/area/space/nearstation) "aDp" = ( /obj/item/stack/cable_coil, /turf/simulated/floor/plating/airless, /area/space/nearstation) -"aDq" = ( -/turf/simulated/shuttle/floor, -/area/shuttle/mining) -"aDr" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 1 - }, -/turf/simulated/shuttle/floor, -/area/shuttle/mining) -"aDs" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/decal/warning_stripes/west, -/turf/simulated/floor/plasteel, -/area/engine/engineering) "aDt" = ( /obj/machinery/power/apc{ dir = 1; @@ -16717,13 +14009,6 @@ luminosity = 2 }, /area/security/nuke_storage) -"aDu" = ( -/obj/machinery/mineral/labor_claim_console{ - machinedir = 1; - pixel_x = 30 - }, -/turf/simulated/shuttle/floor, -/area/shuttle/siberia) "aDv" = ( /obj/structure/closet/crate, /obj/item/flashlight{ @@ -16750,15 +14035,13 @@ name = "\improper Mining Office" }) "aDw" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ +/obj/effect/decal/warning_stripes/east, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/cable{ - 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/plasteel, /area/engine/engineering) "aDx" = ( @@ -16840,21 +14123,7 @@ /area/quartermaster/sorting{ name = "\improper Warehouse" }) -"aDC" = ( -/obj/machinery/camera/emp_proof{ - c_tag = "Fore Arm - Far"; - dir = 8; - network = list("Singulo") - }, -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/turf/simulated/floor/plating/airless, -/area/engine/engineering) "aDD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/yellow{ d1 = 1; d2 = 8; @@ -16869,15 +14138,12 @@ }, /area/security/warden) "aDE" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 1 + dir = 1; + icon_state = "vault" }, /area/security/nuke_storage) "aDF" = ( @@ -16892,8 +14158,8 @@ "aDG" = ( /obj/machinery/nuclearbomb, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/security/nuke_storage) "aDH" = ( @@ -16916,16 +14182,10 @@ on = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 4 + dir = 4; + icon_state = "vault" }, /area/security/nuke_storage) -"aDJ" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 4 - }, -/turf/simulated/shuttle/floor, -/area/shuttle/siberia) "aDK" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable/yellow{ @@ -16942,19 +14202,32 @@ /turf/simulated/floor/plating, /area/bridge) "aDL" = ( -/obj/effect/spawner/window/reinforced, -/turf/simulated/floor/plating, +/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; + 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) "aDM" = ( /obj/machinery/flasher{ id = "Cell 1"; pixel_x = -28 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" @@ -16989,22 +14262,16 @@ id = "Cell 2"; pixel_x = -28 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, /area/security/brig) "aDQ" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /obj/machinery/flasher{ id = "Cell 3"; @@ -17022,15 +14289,15 @@ dir = 8 }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 9 + dir = 9; + icon_state = "red" }, /area/security/brig) "aDS" = ( /obj/machinery/hologram/holopad, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 1 + dir = 1; + icon_state = "red" }, /area/security/brig) "aDT" = ( @@ -17044,8 +14311,8 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 5 + dir = 5; + icon_state = "red" }, /area/security/brig) "aDU" = ( @@ -17058,13 +14325,6 @@ icon_state = "floorgrime" }, /area/security/brig) -"aDV" = ( -/obj/structure/chair, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - icon_state = "floorgrime" - }, -/area/security/brig) "aDW" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -17072,6 +14332,7 @@ 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" }, @@ -17167,6 +14428,7 @@ /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) "aEc" = ( @@ -17178,20 +14440,17 @@ d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, /turf/simulated/floor/carpet, /area/security/detectives_office) "aEd" = ( -/obj/structure/cable{ - 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 = 9 }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 5 + icon_state = "dark" }, /area/engine/engineering) "aEe" = ( @@ -17235,14 +14494,6 @@ }, /turf/simulated/floor/plating, /area/bridge) -"aEi" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/turf/simulated/floor/plating/airless, -/area/engine/engineering) "aEj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/universal, /turf/simulated/floor/plating, @@ -17275,17 +14526,20 @@ }, /area/crew_quarters/sleep) "aEn" = ( -/obj/machinery/door/airlock/external{ - name = "Engineering External Access"; - req_access = null; - req_access_txt = "10;13" +/obj/machinery/door/airlock/engineering/glass{ + name = "Supermatter Engine Room"; + req_access_txt = "10"; + req_one_access_txt = "0" }, -/obj/structure/cable{ - 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 = "dark" }, -/turf/simulated/floor/plating, /area/engine/engineering) "aEo" = ( /obj/structure/disposalpipe/segment{ @@ -17308,12 +14562,19 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/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/supply{ + dir = 8; + initialize_directions = 11 + }, /turf/simulated/floor/plasteel, /area/crew_quarters/sleep) "aEq" = ( @@ -17325,8 +14586,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 = 4 }, /turf/simulated/floor/plasteel{ dir = 2; @@ -17348,6 +14612,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/starboard) "aEs" = ( @@ -17388,6 +14655,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/starboard) "aEv" = ( @@ -17406,6 +14676,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) "aEw" = ( @@ -17426,6 +14699,9 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, /turf/simulated/floor/plating, /area/maintenance/starboard) "aEx" = ( @@ -17439,7 +14715,7 @@ }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, -/area/maintenance/starboard) +/area/engine/engineering) "aEy" = ( /obj/machinery/door/window/southright{ dir = 4; @@ -17451,17 +14727,17 @@ /turf/simulated/floor/plasteel, /area/engine/engineering) "aEz" = ( -/obj/structure/table, -/obj/item/stack/packageWrap, -/obj/item/wrench, /obj/machinery/light{ dir = 8 }, -/obj/item/hand_labeler, /obj/structure/window/reinforced{ dir = 1 }, /obj/effect/decal/warning_stripes/yellow, +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/engine/engineering) "aEA" = ( @@ -17507,24 +14783,18 @@ dir = 4 }, /obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/starboard) "aEE" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel, /area/engine/engineering) -"aEF" = ( -/obj/item/multitool, -/turf/simulated/floor/plating/airless, -/area/engine/engineering) -"aEG" = ( -/obj/item/radio/off, -/turf/simulated/floor/plating/airless, -/area/engine/engineering) "aEH" = ( /obj/structure/closet/crate, /obj/item/stack/ore/glass, @@ -17535,18 +14805,6 @@ name = "\improper Warehouse" }) "aEI" = ( -/obj/machinery/door/airlock/shuttle{ - name = "Mining Shuttle Airlock"; - req_access_txt = "0" - }, -/obj/docking_port/mobile{ - dir = 8; - dwidth = 3; - height = 5; - id = "mining"; - name = "mining shuttle"; - width = 7 - }, /obj/docking_port/stationary{ dir = 8; dwidth = 3; @@ -17555,14 +14813,12 @@ name = "mining shuttle bay"; width = 7 }, -/obj/structure/fans/tiny, -/turf/simulated/shuttle/plating, -/area/shuttle/mining) +/turf/space, +/area/space) "aEJ" = ( /obj/machinery/door/airlock/external{ - name = "Mining Dock Airlock"; - req_access = null; - req_access_txt = "0" + locked = 1; + name = "Mining Dock Airlock" }, /obj/structure/fans/tiny, /turf/simulated/floor/plating, @@ -17576,6 +14832,7 @@ }) "aEL" = ( /obj/machinery/door/airlock/mining/glass{ + locked = 1; name = "Mining Dock"; req_access_txt = "48" }, @@ -17593,11 +14850,8 @@ name = "\improper Mining Office" }) "aEN" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/plasteel, /area/quartermaster/miningdock{ @@ -17605,7 +14859,7 @@ }) "aEO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 + dir = 8 }, /turf/simulated/floor/plasteel, /area/quartermaster/miningdock{ @@ -17621,6 +14875,11 @@ name = "Shaft Miner" }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10; + initialize_directions = 10; + level = 1 + }, /turf/simulated/floor/plasteel, /area/quartermaster/miningdock{ name = "\improper Mining Office" @@ -17674,14 +14933,6 @@ icon_state = "dark" }, /area/security/brig) -"aES" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/turf/simulated/floor/plating/airless, -/area/engine/engineering) "aET" = ( /turf/simulated/floor/plasteel{ icon_state = "floorgrime" @@ -17705,19 +14956,11 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, /area/security/warden) -"aEW" = ( -/obj/structure/grille, -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/turf/simulated/floor/plating/airless, -/area/engine/engineering) "aEX" = ( /obj/structure/closet/crate{ name = "Gold Crate" @@ -17734,45 +14977,24 @@ pixel_y = -2 }, /obj/item/storage/belt/champion, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 1 + dir = 1; + icon_state = "vault" }, /area/security/nuke_storage) "aEY" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/bluegrid{ icon_state = "gcircuit"; luminosity = 2 }, /area/security/nuke_storage) "aEZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/bluegrid{ icon_state = "gcircuit"; luminosity = 2 }, /area/security/nuke_storage) -"aFa" = ( -/obj/structure/grille, -/obj/machinery/light{ - dir = 1 - }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/plating/airless, -/area/engine/engineering) "aFb" = ( /obj/item/coin/silver{ pixel_x = 7; @@ -17798,23 +15020,11 @@ name = "Silver Crate" }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 4 + dir = 4; + icon_state = "vault" }, /area/security/nuke_storage) -"aFc" = ( -/obj/structure/closet/crate, -/turf/simulated/shuttle/floor, -/area/shuttle/siberia) "aFd" = ( -/obj/docking_port/mobile{ - dir = 8; - dwidth = 2; - height = 5; - id = "laborcamp"; - name = "labor camp shuttle"; - width = 9 - }, /obj/docking_port/stationary{ dir = 8; dwidth = 2; @@ -17823,16 +15033,12 @@ name = "fore bay 1"; width = 9 }, -/obj/machinery/door/airlock/shuttle{ - id_tag = "s_docking_airlock"; - name = "Labor Shuttle Airlock" - }, -/obj/structure/fans/tiny, -/turf/simulated/shuttle/floor, -/area/shuttle/siberia) +/turf/space, +/area/space) "aFe" = ( /obj/machinery/door/airlock/external{ id_tag = "laborcamp_home"; + locked = 1; name = "Labor Camp Shuttle Airlock" }, /obj/structure/fans/tiny, @@ -17896,35 +15102,14 @@ icon_state = "floorgrime" }, /area/security/brig) -"aFk" = ( -/obj/structure/grille, -/obj/structure/cable{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/turf/simulated/floor/plating/airless, -/area/engine/engineering) "aFl" = ( /turf/simulated/floor/plasteel{ icon_state = "red" }, /area/security/brig) -"aFm" = ( -/obj/structure/grille, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/plating/airless, -/area/engine/engineering) "aFn" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /obj/machinery/light/small{ dir = 8 @@ -17934,9 +15119,8 @@ }, /area/security/brig) "aFo" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" @@ -17951,6 +15135,10 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4; + initialize_directions = 11 + }, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -18010,6 +15198,7 @@ /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" = ( @@ -18025,7 +15214,6 @@ /obj/structure/chair/office/dark{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/carpet, /area/security/detectives_office) "aFx" = ( @@ -18062,6 +15250,7 @@ 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" @@ -18080,9 +15269,11 @@ /turf/simulated/floor/plating, /area/security/brig) "aFD" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 2; - on = 1 +/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" @@ -18129,9 +15320,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -18143,9 +15331,6 @@ pixel_x = 3; pixel_y = 2 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, /obj/structure/table/wood, /obj/machinery/computer/security/telescreen{ desc = "Used for watching Prison Wing holding areas."; @@ -18162,9 +15347,6 @@ icon_state = "4-8" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -18176,10 +15358,8 @@ d2 = 8; icon_state = "1-8" }, -/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/crew_quarters/sleep) "aFK" = ( @@ -18225,16 +15405,8 @@ /obj/item/clothing/gloves/color/yellow, /obj/item/clothing/suit/storage/hazardvest, /obj/item/clothing/suit/storage/hazardvest, -/obj/item/tank/emergency_oxygen/engi, -/obj/item/tank/emergency_oxygen/engi, -/obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, -/area/engine/engineering) -"aFN" = ( -/obj/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, +/obj/item/tank/internals/emergency_oxygen/engi, +/obj/item/tank/internals/emergency_oxygen/engi, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, /area/engine/engineering) @@ -18275,12 +15447,12 @@ req_access_txt = "48" }, /obj/effect/decal/warning_stripes/arrow{ - icon_state = "4"; - dir = 4 + dir = 4; + icon_state = "4" }, /obj/effect/decal/warning_stripes/yellow/partial{ - icon_state = "3"; - dir = 4 + dir = 4; + icon_state = "3" }, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" @@ -18291,21 +15463,10 @@ "aFR" = ( /turf/simulated/wall, /area/engine/engineering) -"aFS" = ( -/obj/effect/decal/warning_stripes/north, -/turf/simulated/floor/plating/airless, -/area/engine/engineering) "aFT" = ( /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plating, /area/maintenance/fore) -"aFU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/effect/decal/warning_stripes/northwestcorner, -/turf/simulated/floor/plasteel, -/area/engine/engineering) "aFV" = ( /obj/machinery/light/small{ dir = 8 @@ -18321,59 +15482,27 @@ icon_state = "floorgrime" }, /area/security/brig) -"aFW" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/decal/warning_stripes/north, -/turf/simulated/floor/plasteel, -/area/engine/engineering) "aFX" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - on = 1 - }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, /area/security/brig) "aFY" = ( -/obj/structure/reagent_dispensers/watertank, -/obj/effect/decal/warning_stripes/west, -/turf/simulated/floor/plating, +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 2 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, /area/engine/engineering) "aFZ" = ( -/obj/machinery/camera/emp_proof{ - c_tag = "Fore Arm - Near"; - dir = 4; - network = list("Singulo") +/obj/structure/closet/firecloset, +/turf/simulated/floor/plasteel{ + icon_state = "dark" }, -/turf/space, -/area/space/nearstation) -"aGa" = ( -/obj/effect/spawner/window/reinforced, -/obj/structure/cable/yellow{ - d2 = 2; - icon_state = "0-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plating, -/area/construction/Storage{ - name = "Storage Wing" - }) +/area/engine/engineering) "aGb" = ( -/obj/structure/rack{ - dir = 8; - layer = 2.9 - }, -/obj/item/clothing/mask/gas{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/clothing/mask/gas, -/obj/item/clothing/mask/gas{ - pixel_x = -3; - pixel_y = -3 - }, /obj/item/radio/intercom{ frequency = 1459; name = "Station Intercom (General)"; @@ -18384,7 +15513,7 @@ dir = 2; network = list("SS13") }, -/obj/effect/decal/warning_stripes/yellow, +/obj/effect/decal/warning_stripes/northwest, /turf/simulated/floor/plasteel, /area/engine/engineering) "aGc" = ( @@ -18393,30 +15522,10 @@ icon_state = "alarm0"; pixel_x = -22 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, /obj/effect/decal/warning_stripes/northwest, /turf/simulated/floor/plasteel, /area/engine/engineering) -"aGd" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/decal/warning_stripes/east, -/turf/simulated/floor/plasteel, -/area/engine/engineering) -"aGe" = ( -/obj/structure/sign/securearea{ - desc = "A warning sign which reads 'RADIOACTIVE AREA'"; - icon_state = "radiation"; - name = "RADIOACTIVE AREA"; - pixel_x = 32 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/decal/warning_stripes/east, -/turf/simulated/floor/plasteel, -/area/engine/engineering) "aGf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/hologram/holopad, /turf/simulated/floor/plasteel, /area/quartermaster/miningdock{ @@ -18429,6 +15538,7 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/quartermaster/miningdock{ name = "\improper Mining Office" @@ -18520,10 +15630,9 @@ name = "\improper Warehouse" }) "aGn" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 1 + dir = 1; + icon_state = "vault" }, /area/security/nuke_storage) "aGo" = ( @@ -18532,8 +15641,8 @@ dir = 5 }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 6 + dir = 6; + icon_state = "vault" }, /area/security/nuke_storage) "aGp" = ( @@ -18545,6 +15654,9 @@ d2 = 4; icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, /turf/simulated/floor/plasteel{ icon_state = "vault" }, @@ -18561,9 +15673,13 @@ d2 = 8; icon_state = "1-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9; + pixel_y = 0 + }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 10 + dir = 10; + icon_state = "vault" }, /area/security/nuke_storage) "aGr" = ( @@ -18577,17 +15693,8 @@ icon_state = "floorgrime" }, /area/security/brig) -"aGs" = ( -/obj/structure/shuttle/engine/heater, -/obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 - }, -/turf/simulated/shuttle/plating, -/area/shuttle/siberia) "aGt" = ( /obj/effect/spawner/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/yellow{ d2 = 4; icon_state = "0-4" @@ -18611,17 +15718,6 @@ /area/construction/Storage{ name = "Storage Wing" }) -"aGv" = ( -/obj/effect/spawner/window/reinforced, -/obj/structure/cable/yellow{ - d2 = 8; - icon_state = "0-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/engine/engineering) "aGw" = ( /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, @@ -18637,12 +15733,12 @@ req_access_txt = "63" }, /obj/effect/mapping_helpers/airlock/unres{ - icon_state = "airlock_unres_helper"; - dir = 1 + dir = 1; + icon_state = "airlock_unres_helper" }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 1 + dir = 1; + icon_state = "red" }, /area/security/brig) "aGy" = ( @@ -18659,10 +15755,6 @@ /area/construction/Storage{ name = "Storage Wing" }) -"aGz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel, -/area/crew_quarters/sleep) "aGA" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security/glass{ @@ -18680,6 +15772,7 @@ d2 = 8; icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -18695,17 +15788,9 @@ }, /area/security/brig) "aGC" = ( -/obj/structure/disposalpipe/sortjunction{ - sortType = 4 - }, -/obj/effect/landmark/start{ - name = "Station Engineer" - }, -/obj/structure/cable{ - 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, /area/engine/engineering) "aGD" = ( @@ -18714,17 +15799,12 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, /area/security/detectives_office) "aGE" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - on = 1 - }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/machinery/flasher{ id = "Cell 5"; pixel_x = 28 @@ -18737,12 +15817,14 @@ /obj/item/storage/box/evidence, /obj/structure/table, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 10 + dir = 10; + icon_state = "red" }, /area/security/processing) "aGG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/carpet, /area/security/detectives_office) "aGH" = ( @@ -18766,21 +15848,12 @@ }, /area/security/processing) "aGJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/urinal{ pixel_y = 29 }, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, -/area/crew_quarters/locker/locker_toilet{ - name = "\improper Restrooms" - }) -"aGK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/wall, /area/crew_quarters/locker/locker_toilet{ name = "\improper Restrooms" }) @@ -18790,6 +15863,7 @@ req_access_txt = "0" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, @@ -18802,7 +15876,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -18844,12 +15917,17 @@ }, /area/crew_quarters/sleep) "aGR" = ( +/obj/effect/landmark/start{ + name = "Mime" + }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8; initialize_directions = 11 }, -/obj/effect/landmark/start{ - name = "Mime" +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8; + initialize_directions = 11; + level = 1 }, /turf/simulated/floor/plasteel, /area/crew_quarters/sleep) @@ -18858,27 +15936,19 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 + dir = 4 }, /turf/simulated/floor/plasteel, /area/crew_quarters/sleep) -"aGT" = ( -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/turf/simulated/floor/plating/airless, -/area/engine/engineering) "aGU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/door/airlock/titanium/glass, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4; level = 1 }, +/obj/machinery/door/airlock/tranquillite, /turf/simulated/floor/mineral/tranquillite, /area/crew_quarters/sleep) "aGV" = ( @@ -18905,8 +15975,8 @@ }, /obj/machinery/suit_storage_unit/ce/secure, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 5 + dir = 5; + icon_state = "vault" }, /area/engine/chiefs_office) "aGY" = ( @@ -18940,44 +16010,16 @@ icon_state = "0-8" }, /obj/structure/cable/yellow, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/construction/Storage{ name = "Storage Wing" }) "aHc" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /turf/simulated/floor/plasteel, /area/engine/engineering) -"aHd" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/turf/simulated/floor/plasteel{ - icon_state = "freezerfloor" - }, -/area/crew_quarters/locker/locker_toilet{ - name = "\improper Restrooms" - }) -"aHe" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2; - initialize_directions = 11 - }, -/obj/structure/urinal{ - pixel_y = 29 - }, -/turf/simulated/floor/plasteel{ - icon_state = "freezerfloor" - }, -/area/crew_quarters/locker/locker_toilet{ - name = "\improper Restrooms" - }) "aHf" = ( /obj/structure/table, /turf/simulated/floor/plasteel{ @@ -19002,19 +16044,12 @@ dir = 8 }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 6 + dir = 6; + icon_state = "red" }, /area/security/processing) "aHi" = ( -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "open"; - id_tag = "Singularity"; - name = "Containment Blast Doors"; - opacity = 0 - }, -/obj/effect/decal/warning_stripes/west, +/obj/effect/spawner/window/reinforced/plasma, /turf/simulated/floor/plating, /area/engine/engineering) "aHj" = ( @@ -19065,27 +16100,6 @@ /area/maintenance/fpmaint2{ name = "Port Maintenance" }) -"aHo" = ( -/obj/structure/closet/crate, -/turf/simulated/shuttle/floor, -/area/shuttle/mining) -"aHp" = ( -/obj/structure/shuttle/engine/heater, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/shuttle/plating, -/area/shuttle/mining) -"aHq" = ( -/obj/structure/ore_box, -/turf/simulated/shuttle/floor, -/area/shuttle/mining) "aHr" = ( /obj/machinery/firealarm{ dir = 8; @@ -19103,7 +16117,6 @@ name = "\improper Mining Office" }) "aHs" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/landmark/start{ name = "Shaft Miner" }, @@ -19130,6 +16143,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ req_access_txt = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6; + level = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -19174,11 +16191,8 @@ name = "\improper Warehouse" }) "aHy" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /obj/machinery/light_construct/small{ dir = 4 @@ -19189,19 +16203,6 @@ /area/quartermaster/sorting{ name = "\improper Warehouse" }) -"aHz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/turf/simulated/wall/r_wall, -/area/security/nuke_storage) -"aHA" = ( -/obj/structure/sign/securearea, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/turf/simulated/wall/r_wall, -/area/security/nuke_storage) "aHB" = ( /obj/machinery/door/airlock/vault{ icon_state = "door_locked"; @@ -19214,33 +16215,16 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 5 + dir = 5; + icon_state = "vault" }, /area/security/nuke_storage) "aHC" = ( /obj/structure/sign/securearea, /turf/simulated/wall/r_wall, /area/security/nuke_storage) -"aHD" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f5"; - dir = 2 - }, -/area/shuttle/siberia) -"aHE" = ( -/obj/structure/shuttle/engine/propulsion, -/turf/simulated/shuttle/plating, -/area/shuttle/siberia) -"aHF" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f9"; - dir = 2 - }, -/area/shuttle/siberia) "aHG" = ( /turf/simulated/wall, /area/hallway/primary/fore) @@ -19254,18 +16238,18 @@ }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, -/area/engine/engineering) +/area/engine/equipmentstorage) "aHI" = ( /turf/simulated/floor/plasteel{ - icon_state = "redcorner"; - dir = 1 + dir = 1; + icon_state = "redcorner" }, /area/hallway/primary/fore) "aHJ" = ( /obj/structure/chair/stool, /turf/simulated/floor/plasteel{ - icon_state = "redcorner"; - dir = 1 + dir = 1; + icon_state = "redcorner" }, /area/hallway/primary/fore) "aHK" = ( @@ -19274,9 +16258,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/bluegrid{ icon_state = "gcircuit"; luminosity = 2 @@ -19291,8 +16273,8 @@ pixel_x = -26 }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 10 + dir = 10; + icon_state = "red" }, /area/security/brig) "aHM" = ( @@ -19312,8 +16294,8 @@ pixel_x = 27 }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 6 + dir = 6; + icon_state = "red" }, /area/security/brig) "aHO" = ( @@ -19321,14 +16303,14 @@ req_access_txt = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "redcorner"; - dir = 4 + dir = 4; + icon_state = "redcorner" }, /area/hallway/primary/fore) "aHP" = ( /turf/simulated/floor/plasteel{ - icon_state = "redcorner"; - dir = 4 + dir = 4; + icon_state = "redcorner" }, /area/hallway/primary/fore) "aHQ" = ( @@ -19339,8 +16321,8 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - icon_state = "redcorner"; - dir = 4 + dir = 4; + icon_state = "redcorner" }, /area/hallway/primary/fore) "aHR" = ( @@ -19408,7 +16390,6 @@ /obj/structure/filingcabinet/chestdrawer{ pixel_y = 3 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -19443,6 +16424,7 @@ pixel_x = 29; pixel_y = -2 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -19453,9 +16435,6 @@ d2 = 4; icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, /obj/structure/extinguisher_cabinet{ pixel_x = -27 }, @@ -19466,7 +16445,7 @@ /area/crew_quarters/sleep) "aHW" = ( /obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; + dir = 4; on = 1 }, /turf/simulated/floor/plasteel{ @@ -19511,9 +16490,6 @@ name = "Dormitories APC"; pixel_y = 24 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -19549,11 +16525,8 @@ /turf/simulated/floor/plating, /area/bridge) "aIc" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/mineral/tranquillite, /area/crew_quarters/sleep) @@ -19574,26 +16547,23 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, /area/crew_quarters/locker/locker_toilet{ name = "\improper Restrooms" }) -"aIf" = ( -/obj/structure/lattice, -/turf/space, -/area/engine/engineering) "aIg" = ( /obj/structure/reagent_dispensers/watertank, /obj/effect/decal/cleanable/fungus, /turf/simulated/floor/plating, /area/maintenance/fore) "aIh" = ( -/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{ icon_state = "freezerfloor" }, @@ -19601,22 +16571,19 @@ name = "\improper Restrooms" }) "aIi" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, /area/engine/engineering) -"aIj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/wall, -/area/crew_quarters/locker/locker_toilet{ - name = "\improper Restrooms" - }) "aIk" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -19624,11 +16591,8 @@ icon_state = "1-2" }, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 + dir = 8; + icon_state = "tube1" }, /turf/simulated/floor/plasteel{ dir = 1; @@ -19688,27 +16652,35 @@ /turf/simulated/wall, /area/crew_quarters/sleep) "aIs" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/unary/vent_pump{ + dir = 8; + on = 1 }, /obj/item/flag/mime, /turf/simulated/floor/mineral/tranquillite, /area/crew_quarters/sleep) "aIt" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - on = 1 - }, /obj/structure/table/wood, /obj/item/storage/fancy/crayons, /obj/item/toy/crayon/mime, /turf/simulated/floor/mineral/tranquillite, /area/crew_quarters/sleep) "aIu" = ( +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/yellow{ - d1 = 2; - d2 = 8; - icon_state = "2-8" + 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" }, /turf/simulated/floor/plasteel, /area/engine/engineering) @@ -19719,30 +16691,12 @@ icon_state = "2-4" }, /obj/effect/decal/warning_stripes/northeast, +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel, -/area/engine/engineering) +/area/engine/equipmentstorage) "aIw" = ( -/obj/effect/landmark/start{ - name = "Station Engineer" - }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 - }, /turf/simulated/floor/plasteel, -/area/engine/engineering) -"aIx" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/engine/engineering) +/area/engine/equipmentstorage) "aIy" = ( /obj/structure/sign/securearea{ desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; @@ -19761,7 +16715,7 @@ }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, -/area/engine/engineering) +/area/engine/equipmentstorage) "aIA" = ( /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel, @@ -19770,12 +16724,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/engine/engineering) "aIC" = ( @@ -19801,17 +16755,20 @@ d2 = 4; icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /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{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, /turf/simulated/floor/plasteel, -/area/engine/engineering) +/area/engine/equipmentstorage) "aIE" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -19821,25 +16778,30 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/warning_stripes/west, +/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 = 4 + 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/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, /area/engine/engineering) "aIG" = ( /obj/structure/table/wood, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 - }, /obj/machinery/power/apc{ dir = 8; name = "Detective APC"; @@ -19876,7 +16838,8 @@ /area/bridge) "aII" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 + dir = 4; + initialize_directions = 11 }, /turf/simulated/floor/plasteel{ dir = 2; @@ -19892,28 +16855,6 @@ /area/maintenance/fpmaint2{ name = "Port Maintenance" }) -"aIK" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f5"; - dir = 2 - }, -/area/shuttle/mining) -"aIL" = ( -/obj/structure/shuttle/engine/propulsion/burst, -/obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 - }, -/turf/simulated/shuttle/plating, -/area/shuttle/mining) -"aIM" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f9"; - dir = 2 - }, -/area/shuttle/mining) "aIN" = ( /obj/machinery/computer/security/mining, /turf/simulated/floor/plasteel, @@ -19936,7 +16877,6 @@ dir = 4; on = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/quartermaster/miningdock{ name = "\improper Mining Office" @@ -19951,6 +16891,7 @@ dir = 10 }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/quartermaster/miningdock{ name = "\improper Mining Office" @@ -19961,8 +16902,10 @@ d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 +/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) @@ -19980,7 +16923,7 @@ }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, -/area/engine/engineering) +/area/engine/equipmentstorage) "aIT" = ( /obj/machinery/light/small, /obj/structure/table/wood, @@ -20007,17 +16950,7 @@ }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, -/area/engine/engineering) -"aIW" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/decal/warning_stripes/east, -/turf/simulated/floor/plasteel, -/area/engine/engineering) +/area/engine/equipmentstorage) "aIX" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable/yellow{ @@ -20035,10 +16968,11 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - tag = "icon-vault (NORTHEAST)"; + dir = 5; icon_state = "vault"; - dir = 5 + tag = "icon-vault (NORTHEAST)" }, /area/construction/Storage{ name = "Storage Wing" @@ -20070,21 +17004,8 @@ /turf/simulated/floor/plasteel, /area/hallway/primary/fore) "aJb" = ( -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/plasteel, +/obj/effect/spawner/window/reinforced/plasma, +/turf/simulated/floor/engine, /area/engine/engineering) "aJc" = ( /turf/simulated/floor/plasteel, @@ -20097,18 +17018,10 @@ /turf/simulated/floor/plasteel, /area/hallway/primary/fore) "aJe" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 - }, +/obj/machinery/atmospherics/unary/vent_scrubber, /turf/simulated/floor/plasteel, /area/hallway/primary/fore) "aJf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 2; d2 = 4; @@ -20133,9 +17046,6 @@ /turf/simulated/floor/plasteel, /area/hallway/primary/fore) "aJh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -20144,9 +17054,6 @@ /turf/simulated/floor/plasteel, /area/hallway/primary/fore) "aJi" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -20160,15 +17067,14 @@ /turf/simulated/floor/plasteel, /area/hallway/primary/fore) "aJj" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, /turf/simulated/floor/plasteel, /area/hallway/primary/fore) "aJk" = ( @@ -20180,6 +17086,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, /turf/simulated/floor/plasteel, /area/hallway/primary/fore) "aJl" = ( @@ -20188,10 +17097,13 @@ 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/supply{ + dir = 9; + pixel_y = 0 + }, /turf/simulated/floor/plasteel, /area/hallway/primary/fore) "aJm" = ( @@ -20203,14 +17115,21 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 2; - on = 1 - }, /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, /turf/simulated/floor/plasteel, /area/hallway/primary/fore) @@ -20225,23 +17144,6 @@ }, /turf/simulated/floor/plasteel, /area/hallway/primary/fore) -"aJo" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/item/clothing/glasses/meson, -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "open"; - id_tag = "Singularity"; - name = "Containment Blast Doors"; - opacity = 0 - }, -/obj/effect/decal/warning_stripes/west, -/turf/simulated/floor/plating, -/area/engine/engineering) "aJp" = ( /obj/structure/chair/office/dark{ dir = 8 @@ -20261,11 +17163,8 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -20285,6 +17184,9 @@ /obj/machinery/light/small{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -20302,13 +17204,21 @@ }, /area/security/detectives_office) "aJt" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/manifold/visible/green{ + dir = 1; + tag = "icon-manifold-g (NORTH)" }, -/turf/simulated/floor/plating/airless, -/area/space/nearstation) +/obj/machinery/light{ + 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, +/area/engine/engineering) "aJu" = ( /obj/machinery/door/airlock/maintenance{ name = "Law Office Maintenance"; @@ -20317,7 +17227,6 @@ /turf/simulated/floor/plating, /area/lawoffice) "aJv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/firealarm{ dir = 8; pixel_x = -24 @@ -20327,6 +17236,9 @@ dir = 4; network = list("SS13") }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, @@ -20340,14 +17252,6 @@ /area/crew_quarters/locker/locker_toilet{ name = "\improper Restrooms" }) -"aJx" = ( -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/turf/simulated/floor/plating/airless, -/area/space/nearstation) "aJy" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security/glass{ @@ -20370,6 +17274,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/security/warden) "aJz" = ( @@ -20378,11 +17283,14 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5; + level = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 2; + initialize_directions = 11 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, @@ -20398,6 +17306,9 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, @@ -20418,6 +17329,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, @@ -20438,6 +17352,9 @@ /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" @@ -20460,16 +17377,7 @@ /area/crew_quarters/sleep) "aJG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel, -/area/crew_quarters/sleep) -"aJH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6; - level = 1 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/crew_quarters/sleep) "aJI" = ( @@ -20481,28 +17389,22 @@ }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, -/area/engine/engineering) +/area/engine/equipmentstorage) "aJJ" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/turf/simulated/floor/plating/airless, -/area/space/nearstation) -"aJK" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ +/obj/effect/spawner/window/reinforced/plasma, +/obj/machinery/atmospherics/pipe/simple/visible/red{ dir = 2 }, +/turf/simulated/floor/engine, +/area/engine/engineering) +"aJK" = ( /obj/machinery/door/airlock/bananium/glass, /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/sleep) "aJL" = ( @@ -20510,12 +17412,12 @@ /turf/simulated/floor/plasteel, /area/engine/engineering) "aJM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, /obj/effect/decal/warning_stripes/south, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, /turf/simulated/floor/plasteel, -/area/engine/engineering) +/area/engine/equipmentstorage) "aJN" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable/yellow, @@ -20529,30 +17431,23 @@ /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, /area/engine/engineering) -"aJP" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 - }, -/turf/simulated/floor/plasteel, -/area/engine/engineering) "aJQ" = ( /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 4; 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/engineering) +/area/engine/equipmentstorage) "aJR" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/engineering/glass{ @@ -20568,8 +17463,11 @@ dir = 4 }, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, -/area/engine/engineering) +/area/engine/equipmentstorage) "aJS" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ @@ -20581,13 +17479,14 @@ req_access_txt = 1 }, /obj/effect/decal/warning_stripes/yellow/partial{ - icon_state = "3"; - dir = 1 + dir = 1; + icon_state = "3" }, /obj/effect/decal/warning_stripes/arrow{ - icon_state = "4"; - dir = 1 + dir = 1; + icon_state = "4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -20605,34 +17504,30 @@ }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, -/area/engine/engineering) +/area/engine/equipmentstorage) "aJU" = ( -/obj/structure/closet/secure_closet/engineering_electrical, -/obj/effect/decal/warning_stripes/yellow, +/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/structure/rack{ - dir = 8; - layer = 2.9 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/obj/item/storage/belt/utility, -/obj/item/wrench, -/obj/item/weldingtool, -/obj/item/clothing/head/welding{ - pixel_x = -3; - pixel_y = 5 - }, -/obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, +/obj/effect/decal/warning_stripes/west, +/turf/simulated/floor/engine, /area/engine/engineering) "aJW" = ( -/obj/machinery/field/generator{ - anchored = 1; - state = 2 +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 10; + initialize_directions = 10 }, -/turf/simulated/floor/plating/airless, -/area/space/nearstation) +/obj/effect/decal/warning_stripes/southwestcorner, +/turf/simulated/floor/engine, +/area/engine/engineering) "aJX" = ( /turf/simulated/floor/wood, /area/lawoffice) @@ -20652,18 +17547,16 @@ /turf/simulated/floor/plating, /area/bridge) "aJZ" = ( -/obj/structure/closet/radiation, -/obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, -/area/engine/engineering) -"aKa" = ( -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" +/obj/machinery/door/airlock/engineering/glass{ + name = "Supermatter Engine Room"; + req_access_txt = "10"; + req_one_access_txt = "0" }, -/turf/simulated/floor/plating/airless, -/area/space/nearstation) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/engine, +/area/engine/engineering) "aKb" = ( /obj/effect/spawner/window/reinforced, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -20692,7 +17585,6 @@ /obj/item/shovel{ pixel_x = -5 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "brown" @@ -20710,6 +17602,7 @@ req_access_txt = 1 }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "brown" @@ -20737,20 +17630,15 @@ /obj/machinery/door/airlock/public/glass{ name = "Vault Storage" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - tag = "icon-vault (NORTHEAST)"; + dir = 5; icon_state = "vault"; - dir = 5 + tag = "icon-vault (NORTHEAST)" }, /area/construction/Storage{ name = "Storage Wing" }) -"aKh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/wall, -/area/quartermaster/sorting{ - name = "\improper Warehouse" - }) "aKi" = ( /obj/machinery/door/airlock/maintenance{ req_access_txt = "0"; @@ -20787,17 +17675,6 @@ }, /turf/simulated/floor/plating, /area/hallway/primary/fore) -"aKn" = ( -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/airlock/public/glass{ - name = "Primary Tool Storage" - }, -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "brown" - }, -/area/storage/primary) "aKo" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable/yellow{ @@ -20806,14 +17683,6 @@ }, /turf/simulated/floor/plating, /area/hallway/primary/fore) -"aKp" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/plating/airless, -/area/engine/engineering) "aKq" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable/yellow{ @@ -20857,20 +17726,24 @@ 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/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/supply{ + dir = 4; + level = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -20890,6 +17763,9 @@ req_access = null; req_access_txt = "63" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -20908,6 +17784,9 @@ d2 = 4; icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "redcorner" @@ -20922,6 +17801,9 @@ /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" @@ -20935,8 +17817,8 @@ pixel_y = 32 }, /turf/simulated/floor/plasteel{ - icon_state = "redcorner"; - dir = 1 + dir = 1; + icon_state = "redcorner" }, /area/hallway/primary/fore) "aKy" = ( @@ -20948,6 +17830,9 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "redcorner" @@ -20966,6 +17851,7 @@ dir = 1; pixel_y = -24 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "redcorner" @@ -20989,8 +17875,8 @@ req_access_txt = "2" }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 1 + dir = 1; + icon_state = "red" }, /area/security/brig) "aKB" = ( @@ -21011,14 +17897,17 @@ req_access_txt = "2" }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 1 + 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" @@ -21037,8 +17926,8 @@ network = list("SS13") }, /turf/simulated/floor/plasteel{ - icon_state = "redcorner"; - dir = 1 + dir = 1; + icon_state = "redcorner" }, /area/hallway/primary/fore) "aKE" = ( @@ -21050,6 +17939,9 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "redcorner" @@ -21059,7 +17951,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4; + initialize_directions = 11 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "redcorner" @@ -21076,28 +17971,7 @@ }, /turf/simulated/floor/plasteel, /area/hallway/primary/fore) -"aKH" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "redcorner" - }, -/area/hallway/primary/fore) "aKI" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "redcorner" - }, -/area/hallway/primary/fore) -"aKJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "redcorner" @@ -21120,8 +17994,8 @@ pixel_y = 32 }, /turf/simulated/floor/plasteel{ - icon_state = "redcorner"; - dir = 4 + dir = 4; + icon_state = "redcorner" }, /area/hallway/primary/fore) "aKM" = ( @@ -21184,13 +18058,12 @@ }, /area/security/detectives_office) "aKT" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2; - initialize_directions = 11 +/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ + dir = 4 }, -/obj/effect/decal/warning_stripes/west, -/turf/simulated/floor/plasteel, -/area/engine/engineering) +/obj/structure/lattice, +/turf/space, +/area/space/nearstation) "aKU" = ( /obj/structure/cable/yellow{ d1 = 4; @@ -21241,14 +18114,6 @@ id_tag = "Toilet2"; name = "Unit 2" }, -/turf/simulated/floor/plasteel{ - icon_state = "freezerfloor" - }, -/area/crew_quarters/locker/locker_toilet{ - name = "\improper Restrooms" - }) -"aKY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, @@ -21275,20 +18140,7 @@ /area/crew_quarters/locker/locker_toilet{ name = "\improper Restrooms" }) -"aLb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/turf/simulated/floor/plasteel{ - icon_state = "freezerfloor" - }, -/area/crew_quarters/locker/locker_toilet{ - name = "\improper Restrooms" - }) "aLc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/alarm{ dir = 8; icon_state = "alarm0"; @@ -21309,13 +18161,16 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, /obj/machinery/camera{ 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" @@ -21326,9 +18181,15 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /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 }, @@ -21339,27 +18200,28 @@ /area/crew_quarters/sleep) "aLg" = ( /obj/machinery/light/small, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /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) "aLh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/landmark/start{ name = "Clown" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "neutralcorner" @@ -21401,29 +18263,6 @@ /obj/structure/closet/secure_closet/clown, /turf/simulated/floor/wood, /area/crew_quarters/sleep) -"aLm" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2; - initialize_directions = 11 - }, -/obj/structure/closet/wardrobe/pjs, -/turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" - }, -/area/crew_quarters/sleep) -"aLn" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/effect/decal/warning_stripes/southeast, -/turf/simulated/floor/plasteel, -/area/engine/engineering) "aLo" = ( /obj/machinery/door/poddoor/shutters{ dir = 2; @@ -21440,6 +18279,7 @@ }, /obj/structure/disposalpipe/segment, /obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/quartermaster/sorting{ name = "\improper Warehouse" @@ -21469,7 +18309,7 @@ /obj/item/grenade/chem_grenade/metalfoam, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, -/area/engine/engineering) +/area/engine/equipmentstorage) "aLq" = ( /obj/structure/table, /obj/item/stack/rods{ @@ -21479,7 +18319,7 @@ /obj/item/storage/box/lights/mixed, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, -/area/engine/engineering) +/area/engine/equipmentstorage) "aLr" = ( /obj/structure/closet/crate{ name = "solar pack crate" @@ -21502,25 +18342,7 @@ /obj/item/paper/solar, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, -/area/engine/engineering) -"aLs" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment, -/obj/effect/decal/warning_stripes/east, -/turf/simulated/floor/plasteel, -/area/engine/engineering) -"aLt" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/landmark/start{ - name = "Station Engineer" - }, -/turf/simulated/floor/plasteel, -/area/engine/engineering) +/area/engine/equipmentstorage) "aLu" = ( /obj/structure/table, /obj/item/stack/cable_coil{ @@ -21540,7 +18362,7 @@ }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, -/area/engine/engineering) +/area/engine/equipmentstorage) "aLv" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security/glass{ @@ -21553,27 +18375,30 @@ }, /area/security/processing) "aLw" = ( -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4" +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/decal/warning_stripes/south, -/turf/simulated/floor/plasteel, +/obj/effect/decal/warning_stripes/north, +/turf/simulated/floor/engine, /area/engine/engineering) "aLx" = ( -/obj/item/wirecutters, -/obj/structure/lattice, -/turf/space, -/area/space/nearstation) +/obj/machinery/power/emitter{ + anchored = 1; + state = 2 + }, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/cable/yellow{ + d2 = 8; + icon_state = "0-8" + }, +/turf/simulated/floor/plating, +/area/engine/engineering) "aLy" = ( /obj/machinery/computer/guestpass{ pixel_x = 30 @@ -21610,21 +18435,15 @@ /turf/simulated/floor/plasteel, /area/construction) "aLE" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/machinery/atmospherics/unary/portables_connector{ + dir = 8 }, -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "open"; - id_tag = "Singularity"; - name = "Containment Blast Doors"; - opacity = 0 +/obj/machinery/portable_atmospherics/canister, +/obj/effect/decal/warning_stripes/yellow/hollow, +/turf/simulated/floor/plasteel{ + icon_state = "dark" }, -/obj/effect/decal/warning_stripes/west, -/turf/simulated/floor/plating, -/area/engine/engineering) +/area/engine/supermatter) "aLF" = ( /obj/structure/closet/toolcloset, /obj/machinery/light_construct{ @@ -21636,33 +18455,8 @@ /obj/structure/closet/toolcloset, /turf/simulated/floor/plasteel, /area/construction) -"aLH" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - tag = "icon-swall_f6"; - icon_state = "swall_f6"; - dir = 2 - }, -/area/shuttle/supply) -"aLI" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall12"; - dir = 2 - }, -/area/shuttle/supply) -"aLJ" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - tag = "icon-swall_f10"; - icon_state = "swall_f10"; - dir = 2 - }, -/area/shuttle/supply) "aLK" = ( /obj/effect/spawner/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plating, /area/quartermaster/qm) "aLL" = ( @@ -21677,6 +18471,7 @@ opacity = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -21686,23 +18481,20 @@ /turf/simulated/floor/plating, /area/maintenance/fore) "aLN" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/machinery/atmospherics/binary/pump{ + dir = 8; + name = "Mix Bypass" }, -/turf/simulated/floor/plating/airless, -/area/space/nearstation) -"aLO" = ( -/obj/machinery/power/grounding_rod{ - anchored = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" + d1 = 2; + d2 = 8; + icon_state = "2-8" }, -/turf/simulated/floor/plating/airless, +/obj/effect/decal/warning_stripes/south, +/turf/simulated/floor/engine, /area/engine/engineering) "aLP" = ( /obj/structure/disposalpipe/segment, @@ -21715,6 +18507,7 @@ req_access_txt = 1 }, /obj/effect/decal/warning_stripes/northwest, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/quartermaster/storage) "aLQ" = ( @@ -21729,11 +18522,8 @@ /obj/structure/cable/yellow, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, -/area/engine/engineering) +/area/engine/equipmentstorage) "aLS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel, /area/quartermaster/storage) @@ -21745,26 +18535,11 @@ /turf/simulated/floor/plasteel, /area/quartermaster/storage) "aLU" = ( -/obj/structure/table, -/obj/machinery/light_switch{ - pixel_x = 23 - }, /obj/machinery/light{ dir = 4; icon_state = "tube1" }, -/obj/item/storage/toolbox/mechanical{ - pixel_y = 5 - }, -/obj/item/flashlight{ - pixel_x = 1; - pixel_y = 5 - }, -/obj/item/flashlight{ - pixel_x = 1; - pixel_y = 5 - }, -/obj/effect/decal/warning_stripes/yellow, +/obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel, /area/engine/engineering) "aLV" = ( @@ -21776,6 +18551,9 @@ /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" @@ -21784,6 +18562,9 @@ /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" @@ -21792,8 +18573,12 @@ name = "Storage Wing" }) "aLX" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 +/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; @@ -21803,15 +18588,16 @@ name = "Storage Wing" }) "aLY" = ( -/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/manifold/hidden/scrubbers{ + dir = 2; + initialize_directions = 11 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "browncorner" @@ -21820,14 +18606,20 @@ name = "Storage Wing" }) "aLZ" = ( -/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/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" @@ -21867,6 +18659,12 @@ /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" }, @@ -21874,6 +18672,13 @@ "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" }, @@ -21946,19 +18751,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{ icon_state = "redfull" }, /area/security/processing) "aMp" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 - }, /obj/machinery/light_switch{ pixel_x = -26 }, @@ -21969,7 +18768,6 @@ name = "\improper Restrooms" }) "aMq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -22035,44 +18833,26 @@ }, /turf/simulated/floor/plasteel, /area/crew_quarters/sleep) -"aMv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "neutralcorner" - }, -/area/crew_quarters/sleep) "aMw" = ( /obj/structure/closet/secure_closet/personal, /obj/item/clothing/under/assistantformal, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/crew_quarters/sleep) "aMx" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /obj/item/flag/clown, /turf/simulated/floor/wood, /area/crew_quarters/sleep) "aMy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/closet/wardrobe/pjs, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/crew_quarters/sleep) "aMz" = ( @@ -22147,14 +18927,13 @@ 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" }) -"aMF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel, -/area/engine/engineering) "aMG" = ( /obj/structure/sign/securearea{ desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; @@ -22179,16 +18958,25 @@ }, /obj/structure/disposalpipe/segment, /obj/effect/decal/warning_stripes/northwest, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, /turf/simulated/floor/plasteel, /area/construction/Storage{ name = "Storage Wing" }) "aMI" = ( -/obj/machinery/power/grounding_rod{ - anchored = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, -/turf/simulated/floor/plating/airless, -/area/space/nearstation) +/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; @@ -22210,6 +18998,9 @@ d2 = 4; icon_state = "0-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, @@ -22227,15 +19018,6 @@ }, /turf/simulated/floor/plasteel, /area/construction) -"aMN" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall3"; - dir = 2 - }, -/area/shuttle/supply) -"aMO" = ( -/turf/simulated/shuttle/floor, -/area/shuttle/supply) "aMP" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable/yellow{ @@ -22246,20 +19028,19 @@ /turf/simulated/floor/plating, /area/turret_protected/ai_upload) "aMQ" = ( +/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; icon_state = "4-8" }, -/obj/structure/rack{ - dir = 8; - layer = 2.9 - }, -/obj/item/crowbar, -/obj/item/wirecutters, -/obj/item/stack/cable_coil, -/obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, +/obj/effect/decal/warning_stripes/south, +/turf/simulated/floor/engine, /area/engine/engineering) "aMR" = ( /obj/machinery/firealarm{ @@ -22279,6 +19060,9 @@ icon_state = "1-4" }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, /turf/simulated/floor/plasteel, /area/quartermaster/storage) "aMT" = ( @@ -22295,27 +19079,26 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/plasteel, /area/quartermaster/storage) "aMU" = ( +/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; icon_state = "2-4" }, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/obj/effect/decal/warning_stripes/southeastcorner, +/turf/simulated/floor/engine, /area/engine/engineering) -"aMV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/decal/warning_stripes/west, -/turf/simulated/floor/plasteel, -/area/quartermaster/storage) "aMW" = ( /obj/structure/cable/yellow{ d1 = 4; @@ -22329,6 +19112,9 @@ dir = 2; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/plasteel, /area/quartermaster/storage) "aMX" = ( @@ -22341,7 +19127,14 @@ d2 = 8; icon_state = "2-8" }, -/obj/effect/decal/warning_stripes/southeastcorner, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/plasteel, /area/engine/engineering) "aMY" = ( @@ -22364,6 +19157,9 @@ pixel_y = 32 }, /obj/effect/decal/warning_stripes/northeastcorner, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, /turf/simulated/floor/plasteel, /area/quartermaster/storage) "aMZ" = ( @@ -22375,12 +19171,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /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 + }, /turf/simulated/floor/plasteel, /area/quartermaster/storage) "aNa" = ( @@ -22414,6 +19212,7 @@ icon_state = "pipe-c" }, /obj/effect/decal/warning_stripes/northwestcorner, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/quartermaster/storage) "aNc" = ( @@ -22429,25 +19228,27 @@ dir = 4 }, /obj/effect/decal/warning_stripes/southeast, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/plasteel, /area/quartermaster/storage) "aNd" = ( -/obj/structure/sign/securearea{ - desc = "A warning sign which reads 'RADIOACTIVE AREA'"; - icon_state = "radiation"; - name = "RADIOACTIVE AREA" +/obj/machinery/atmospherics/binary/pump{ + dir = 8; + name = "External Gas to Loop" }, -/turf/simulated/wall/r_wall, -/area/engine/engineering) +/obj/effect/decal/warning_stripes/yellow, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/engine/supermatter) "aNe" = ( /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{ dir = 4; icon_state = "browncorner" @@ -22456,9 +19257,6 @@ name = "Storage Wing" }) "aNf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -22495,26 +19293,7 @@ /area/quartermaster/miningdock{ name = "\improper Mining Office" }) -"aNh" = ( -/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 = 4; - icon_state = "browncorner" - }, -/area/construction/Storage{ - name = "Storage Wing" - }) "aNi" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=3-Central-Port"; location = "2-Storage" @@ -22529,6 +19308,12 @@ d2 = 8; icon_state = "1-8" }, +/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 = "browncorner" @@ -22537,15 +19322,18 @@ name = "Storage Wing" }) "aNj" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 - }, /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, /area/construction/Storage{ name = "Storage Wing" @@ -22559,6 +19347,10 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4; + level = 1 + }, /turf/simulated/floor/plasteel, /area/construction/Storage{ name = "Storage Wing" @@ -22578,6 +19370,10 @@ req_access = null; req_access_txt = "63" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4; + level = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -22750,6 +19546,9 @@ /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" @@ -22766,6 +19565,9 @@ 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" @@ -22811,15 +19613,6 @@ }, /turf/simulated/floor/wood, /area/lawoffice) -"aNI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "redcorner"; - dir = 1 - }, -/area/security/brig) "aNJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -22831,6 +19624,9 @@ 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" @@ -22856,6 +19652,9 @@ 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" @@ -22918,14 +19717,14 @@ state = 2 }, /turf/simulated/floor/plating, -/area/engine/engineering) +/area/storage/secure) "aNT" = ( /obj/machinery/field/generator{ anchored = 0; state = 2 }, /turf/simulated/floor/plating, -/area/engine/engineering) +/area/storage/secure) "aNU" = ( /obj/machinery/shieldgen, /obj/machinery/light/small{ @@ -22937,17 +19736,11 @@ network = list("SS13") }, /turf/simulated/floor/plating, -/area/engine/engineering) +/area/storage/secure) "aNV" = ( /obj/machinery/shieldgen, /turf/simulated/floor/plating, -/area/engine/engineering) -"aNW" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/turf/simulated/floor/plating, -/area/maintenance/starboard) +/area/storage/secure) "aNX" = ( /obj/machinery/camera{ c_tag = "Cargo Bay - Storage Wing Entrance"; @@ -22972,27 +19765,21 @@ dir = 4 }, /obj/effect/decal/warning_stripes/south, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/plasteel, /area/quartermaster/storage) -"aNZ" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/turf/simulated/floor/plasteel{ - icon_state = "redcorner"; - dir = 1 - }, -/area/security/brig) "aOa" = ( -/obj/machinery/power/rad_collector{ - anchored = 1 +/obj/machinery/door/airlock/engineering/glass{ + name = "Supermatter Engine Room"; + req_access_txt = "10"; + req_one_access_txt = "0" }, -/obj/structure/cable{ - d2 = 8; - icon_state = "0-8" +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 2 }, -/obj/effect/decal/warning_stripes/west, -/turf/simulated/floor/plating, +/turf/simulated/floor/engine, /area/engine/engineering) "aOb" = ( /obj/machinery/computer/security{ @@ -23005,21 +19792,13 @@ icon_state = "dark" }, /area/security/brig) -"aOc" = ( -/obj/effect/landmark/start{ - name = "Station Engineer" - }, -/turf/simulated/floor/plating, -/area/engine/engineering) "aOd" = ( /turf/simulated/floor/plating, /area/engine/engineering) "aOe" = ( -/obj/structure/particle_accelerator/particle_emitter/right{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/engine/engineering) +/obj/machinery/atmospherics/pipe/simple/visible/universal, +/turf/simulated/wall/r_wall, +/area/engine/supermatter) "aOf" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -23034,12 +19813,23 @@ icon_state = "pipe-c" }, /obj/effect/decal/warning_stripes/southwest, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, /turf/simulated/floor/plasteel, /area/construction/Storage{ name = "Storage Wing" }) "aOg" = ( -/obj/effect/decal/warning_stripes/northeast, +/obj/effect/decal/warning_stripes/east, +/obj/structure/table, +/obj/item/geiger_counter, +/obj/item/geiger_counter, +/obj/item/clothing/suit/radiation, +/obj/item/clothing/head/radiation, +/obj/item/tank/internals/emergency_oxygen/engi, +/obj/item/clothing/gloves/color/black, +/obj/item/clothing/glasses/meson/engine, /turf/simulated/floor/plasteel, /area/engine/engineering) "aOh" = ( @@ -23084,10 +19874,6 @@ icon_state = "dark" }, /area/security/brig) -"aOj" = ( -/obj/item/crowbar, -/turf/space, -/area/space/nearstation) "aOk" = ( /obj/machinery/alarm{ dir = 4; @@ -23103,25 +19889,6 @@ }, /turf/simulated/floor/plating, /area/construction) -"aOm" = ( -/obj/effect/decal/warning_stripes/northwest, -/turf/simulated/floor/plating/airless, -/area/space/nearstation) -"aOn" = ( -/obj/machinery/light/spot{ - tag = "icon-tube1 (WEST)"; - icon_state = "tube1"; - dir = 8 - }, -/turf/simulated/shuttle/floor, -/area/shuttle/supply) -"aOo" = ( -/obj/effect/spawner/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, -/turf/simulated/floor/plating, -/area/crew_quarters/courtroom) "aOp" = ( /obj/machinery/door/poddoor{ id_tag = "QMLoaddoor"; @@ -23132,46 +19899,17 @@ }, /turf/simulated/floor/plating, /area/quartermaster/storage) -"aOq" = ( -/obj/effect/decal/warning_stripes/northeast, -/turf/simulated/floor/plating/airless, -/area/space/nearstation) -"aOr" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/quartermaster/storage) "aOs" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ req_access_txt = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/quartermaster/storage) -"aOt" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/quartermaster/storage) "aOu" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/quartermaster/storage) -"aOv" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment, -/obj/effect/decal/warning_stripes/northeastcorner, -/turf/simulated/floor/plasteel, -/area/engine/engineering) "aOw" = ( /obj/structure/toilet{ pixel_y = 8 @@ -23213,6 +19951,9 @@ req_one_access_txt = "48;50" }, /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" @@ -23273,6 +20014,8 @@ name = "Auxiliary Tool Storage"; req_access_txt = "12" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/storage/tools) "aOE" = ( @@ -23297,33 +20040,7 @@ icon_state = "redcorner" }, /area/hallway/primary/fore) -"aOI" = ( -/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/fore) -"aOJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "redcorner" - }, -/area/hallway/primary/fore) "aOK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security{ name = "Brig"; @@ -23332,24 +20049,21 @@ }, /turf/simulated/floor/plasteel, /area/crew_quarters/courtroom) -"aOL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/turf/simulated/floor/plasteel, -/area/crew_quarters/courtroom) "aOM" = ( /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 9 + dir = 9; + icon_state = "neutral" }, /area/crew_quarters/courtroom) "aON" = ( /obj/structure/extinguisher_cabinet{ pixel_x = 27 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 +/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" @@ -23362,24 +20076,14 @@ /obj/item/gavelblock, /obj/item/gavelhammer, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 1 + dir = 1; + icon_state = "neutral" }, /area/crew_quarters/courtroom) -"aOP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 1 - }, -/area/security/brig) "aOQ" = ( /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 5 + dir = 5; + icon_state = "neutral" }, /area/crew_quarters/courtroom) "aOR" = ( @@ -23391,9 +20095,9 @@ dir = 8 }, /turf/simulated/floor/plasteel{ - tag = "icon-vault (WEST)"; + dir = 8; icon_state = "vault"; - dir = 8 + tag = "icon-vault (WEST)" }, /area/crew_quarters/courtroom) "aOS" = ( @@ -23435,10 +20139,6 @@ /turf/simulated/floor/wood, /area/lawoffice) "aOW" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 - }, /obj/structure/disposalpipe/segment, /obj/effect/decal/warning_stripes/northeastcorner, /turf/simulated/floor/plasteel, @@ -23451,15 +20151,14 @@ /turf/simulated/floor/plasteel, /area/engine/engineering) "aOY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /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/unary/vent_pump, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "neutralcorner" @@ -23478,31 +20177,27 @@ name = "\improper Restrooms" }) "aPa" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/cyan{ + dir = 8; + initialize_directions = 11; + level = 2 + }, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "open"; - id_tag = "Singularity"; - name = "Containment Blast Doors"; - opacity = 0 - }, -/obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/obj/effect/decal/warning_stripes/east, +/turf/simulated/floor/engine, /area/engine/engineering) "aPb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/disposalpipe/segment, /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 = 2; @@ -23510,19 +20205,12 @@ }, /area/security/brig) "aPc" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - icon_state = "redcorner"; - dir = 1 + dir = 1; + icon_state = "redcorner" }, /area/security/brig) -"aPd" = ( -/obj/machinery/the_singularitygen{ - anchored = 1 - }, -/obj/effect/decal/warning_stripes/north, -/turf/simulated/floor/plating/airless, -/area/space/nearstation) "aPe" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/warning_stripes/west, @@ -23537,19 +20225,6 @@ /obj/structure/plasticflaps/mining, /turf/simulated/floor/plating, /area/quartermaster/storage) -"aPg" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/turf/simulated/floor/plating/airless, -/area/space/nearstation) "aPh" = ( /obj/structure/table, /obj/item/hatchet, @@ -23596,11 +20271,8 @@ "aPl" = ( /obj/machinery/portable_atmospherics/canister/toxins, /turf/simulated/floor/plating, -/area/engine/engineering) +/area/storage/secure) "aPm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/door_timer{ dir = 1; id = "Cell 4"; @@ -23616,8 +20288,8 @@ network = list("SS13") }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 1 + dir = 1; + icon_state = "red" }, /area/security/brig) "aPn" = ( @@ -23626,7 +20298,6 @@ /area/engine/engineering) "aPo" = ( /obj/machinery/hologram/holopad, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/engine/engineering) "aPp" = ( @@ -23637,6 +20308,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/engine/engineering) "aPq" = ( @@ -23660,29 +20332,59 @@ /turf/simulated/floor/plasteel, /area/construction) "aPs" = ( -/obj/structure/particle_accelerator/end_cap{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/visible/cyan{ + dir = 8; + initialize_directions = 11; + level = 2 }, -/turf/simulated/floor/plating, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/effect/decal/warning_stripes/east, +/obj/machinery/door_control{ + id = "engsm"; + name = "Radiation Shutters Control"; + pixel_x = 24; + req_access_txt = "10"; + req_one_access = null + }, +/turf/simulated/floor/engine, /area/engine/engineering) "aPt" = ( -/obj/structure/particle_accelerator/fuel_chamber{ +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ dir = 4 }, -/turf/simulated/floor/plating, -/area/engine/engineering) +/turf/simulated/wall/r_wall, +/area/engine/supermatter) "aPu" = ( -/obj/structure/particle_accelerator/power_box{ - dir = 4 +/obj/machinery/atmospherics/binary/pump{ + dir = 4; + name = "Gas to Chamber" }, -/turf/simulated/floor/plating, -/area/engine/engineering) +/obj/machinery/power/apc{ + 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" + }, +/turf/simulated/floor/engine, +/area/engine/supermatter) "aPv" = ( -/obj/structure/particle_accelerator/particle_emitter/center{ - dir = 4 +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 9 }, -/turf/simulated/floor/plating, -/area/engine/engineering) +/turf/simulated/wall/r_wall, +/area/engine/supermatter) "aPw" = ( /obj/machinery/door_control{ id = "qm_warehouse"; @@ -23690,9 +20392,6 @@ pixel_y = 24; req_access_txt = "50" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel, /area/quartermaster/storage) @@ -23711,12 +20410,20 @@ name = "Storage Wing" }) "aPy" = ( -/obj/machinery/power/tesla_coil{ - anchored = 1 +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/obj/structure/cable, -/turf/simulated/floor/plating/airless, -/area/space/nearstation) +/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" + }, +/turf/simulated/floor/engine, +/area/engine/engineering) "aPz" = ( /obj/item/seeds/apple, /obj/item/seeds/banana, @@ -23804,6 +20511,7 @@ "aPH" = ( /obj/machinery/door/airlock/external{ id_tag = "supply_home"; + locked = 1; name = "Supply Dock Airlock"; req_access_txt = "31" }, @@ -23834,31 +20542,30 @@ /turf/simulated/floor/plasteel, /area/engine/engineering) "aPL" = ( -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "open"; - id_tag = "Singularity"; - name = "Containment Blast Doors"; - opacity = 0 +/obj/machinery/door/airlock/engineering/glass{ + name = "Supermatter Engine Room"; + req_access_txt = "10"; + req_one_access_txt = "0" }, -/obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/engine, /area/engine/engineering) "aPM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, /obj/structure/window/reinforced{ dir = 1; pixel_y = 1 }, /obj/effect/decal/warning_stripes/arrow{ - icon_state = "4"; - dir = 8 + dir = 8; + icon_state = "4" }, /obj/effect/decal/warning_stripes/yellow/partial{ - icon_state = "3"; - dir = 8 + dir = 8; + icon_state = "3" }, /turf/simulated/floor/plasteel, /area/quartermaster/storage) @@ -23884,14 +20591,6 @@ }, /turf/simulated/floor/plasteel, /area/quartermaster/storage) -"aPO" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 - }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/plasteel, -/area/quartermaster/storage) "aPP" = ( /obj/structure/closet/crate, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -23900,6 +20599,7 @@ /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" = ( @@ -24001,13 +20701,6 @@ icon_state = "brown" }, /area/storage/primary) -"aPY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "brown" - }, -/area/storage/primary) "aPZ" = ( /obj/structure/table, /obj/item/stack/cable_coil{ @@ -24064,12 +20757,9 @@ /area/storage/primary) "aQd" = ( /obj/machinery/shower{ - tag = "icon-shower (EAST)"; + dir = 4; icon_state = "shower"; - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 + tag = "icon-shower (EAST)" }, /obj/structure/curtain/open/shower, /turf/simulated/floor/plasteel{ @@ -24078,19 +20768,6 @@ /area/crew_quarters/locker/locker_toilet{ name = "\improper Restrooms" }) -"aQe" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/wall/r_wall, -/area/storage/primary) -"aQf" = ( -/obj/structure/lattice, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/space, -/area/space/nearstation) "aQg" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -24098,9 +20775,6 @@ /turf/simulated/wall/r_wall, /area/turret_protected/ai_upload) "aQh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/porta_turret, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -24130,45 +20804,14 @@ }, /area/turret_protected/ai_upload) "aQk" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 - }, /obj/machinery/alarm{ pixel_y = 23 }, +/obj/machinery/atmospherics/unary/vent_pump, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/turret_protected/ai_upload) -"aQl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/porta_turret, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/turret_protected/ai_upload) -"aQm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/wall/r_wall, -/area/turret_protected/ai_upload) -"aQn" = ( -/obj/structure/lattice, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/space, -/area/space/nearstation) -"aQo" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/wall/r_wall, -/area/hallway/primary/fore) "aQp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/alarm{ @@ -24176,53 +20819,64 @@ icon_state = "alarm0"; pixel_x = -22 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "redcorner" }, /area/hallway/primary/fore) -"aQq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel, -/area/crew_quarters/courtroom) "aQr" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 8 + dir = 8; + icon_state = "neutral" }, /area/crew_quarters/courtroom) "aQs" = ( /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{ - icon_state = "neutral"; - dir = 4 + dir = 4; + icon_state = "neutral" }, /area/crew_quarters/courtroom) "aQu" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 - }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /turf/simulated/floor/wood, /area/lawoffice) "aQv" = ( /obj/machinery/shower{ - tag = "icon-shower (WEST)"; + dir = 8; icon_state = "shower"; - dir = 8 + tag = "icon-shower (WEST)" }, /obj/effect/landmark/start{ name = "Civilian" @@ -24257,20 +20911,17 @@ /area/lawoffice) "aQy" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel{ - icon_state = "redcorner"; - dir = 4 + dir = 4; + icon_state = "redcorner" }, /area/security/brig) "aQz" = ( /obj/structure/closet/secure_closet/personal, /obj/item/clothing/under/assistantformal, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/crew_quarters/locker) "aQA" = ( @@ -24285,8 +20936,8 @@ pixel_y = 32 }, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/crew_quarters/locker) "aQB" = ( @@ -24298,8 +20949,8 @@ pixel_y = 32 }, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/crew_quarters/locker) "aQC" = ( @@ -24314,32 +20965,23 @@ icon_state = "neutralcorner" }, /area/crew_quarters/locker) -"aQE" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/spawner/lootdrop/maintenance, -/obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, -/area/quartermaster/storage) "aQF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 8; + icon_state = "2-8" }, -/obj/effect/spawner/lootdrop/maintenance, -/obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel, -/area/quartermaster/storage) +/area/engine/engineering) "aQG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/warning_stripes/arrow{ - icon_state = "4"; - dir = 8 + dir = 8; + icon_state = "4" }, /obj/effect/decal/warning_stripes/yellow/partial{ - icon_state = "3"; - dir = 8 + dir = 8; + icon_state = "3" }, /turf/simulated/floor/plasteel, /area/quartermaster/storage) @@ -24368,8 +21010,8 @@ }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/crew_quarters/locker) "aQJ" = ( @@ -24391,10 +21033,10 @@ }, /area/crew_quarters/locker) "aQL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/light/small{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -24402,8 +21044,8 @@ /area/crew_quarters/locker) "aQM" = ( /obj/structure/sink{ - icon_state = "sink"; dir = 8; + icon_state = "sink"; pixel_x = -12; pixel_y = 2 }, @@ -24414,8 +21056,8 @@ pixel_x = -26 }, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 9 + dir = 9; + icon_state = "neutral" }, /area/hallway/secondary/construction{ name = "\improper Garden" @@ -24425,22 +21067,19 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 1 + dir = 1; + icon_state = "neutral" }, /area/hallway/secondary/construction{ name = "\improper Garden" }) "aQO" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 5 + dir = 5; + icon_state = "neutral" }, /area/hallway/secondary/construction{ name = "\improper Garden" @@ -24463,29 +21102,32 @@ name = "\improper Garden" }) "aQR" = ( +/obj/effect/decal/warning_stripes/east, /obj/structure/table, -/obj/machinery/door_control{ - id = "Singularity"; - name = "Shutters Control"; - pixel_x = 25; - req_access_txt = "11" - }, -/obj/item/storage/toolbox/electrical{ +/obj/item/rpd, +/obj/item/clothing/suit/radiation, +/obj/item/clothing/glasses/meson, +/obj/item/clothing/head/radiation, +/obj/item/tank/internals/emergency_oxygen/engi, +/obj/item/storage/toolbox/mechanical{ + pixel_y = 5 + }, +/obj/item/flashlight{ + pixel_x = 1; pixel_y = 5 }, -/obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, /area/engine/engineering) "aQS" = ( /obj/machinery/power/emitter, /turf/simulated/floor/plating, -/area/engine/engineering) +/area/storage/secure) "aQT" = ( /obj/effect/landmark{ name = "blobstart" }, /turf/simulated/floor/plating, -/area/engine/engineering) +/area/storage/secure) "aQU" = ( /obj/effect/decal/warning_stripes/southwestcorner, /turf/simulated/floor/plasteel, @@ -24503,9 +21145,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -24525,7 +21164,6 @@ name = "\improper Garden" }) "aQY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -24533,72 +21171,70 @@ }, /turf/simulated/floor/plasteel, /area/engine/engineering) -"aQZ" = ( -/obj/machinery/door_control{ - id = "Singularity"; - name = "Shutters Control"; - pixel_x = -25; - req_access_txt = "11" - }, -/obj/effect/decal/warning_stripes/northwest, -/turf/simulated/floor/plating, -/area/engine/engineering) "aRa" = ( -/obj/structure/cable{ +/obj/machinery/atmospherics/pipe/simple/visible/supply{ + dir = 6 + }, +/turf/simulated/wall/r_wall, +/area/engine/supermatter) +"aRb" = ( +/obj/machinery/door/airlock/engineering/glass{ + heat_proof = 1; + name = "Supermatter Chamber"; + req_access_txt = "10"; + req_one_access_txt = "0" + }, +/obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/effect/decal/warning_stripes/north, -/turf/simulated/floor/plating, -/area/engine/engineering) -"aRb" = ( -/obj/machinery/particle_accelerator/control_box, -/obj/structure/cable{ - d2 = 8; - icon_state = "0-8" - }, -/turf/simulated/floor/plating, -/area/engine/engineering) +/turf/simulated/floor/engine, +/area/engine/supermatter) "aRc" = ( -/obj/structure/chair/stool{ - pixel_y = 8 - }, -/turf/simulated/floor/plating, -/area/engine/engineering) -"aRd" = ( -/obj/structure/particle_accelerator/particle_emitter/left{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/engine/engineering) -"aRe" = ( -/obj/item/weldingtool, -/turf/space, -/area/space/nearstation) -"aRf" = ( -/obj/item/wirecutters, -/obj/structure/cable{ +/obj/structure/cable/yellow{ d1 = 1; - d2 = 4; - icon_state = "1-4" + d2 = 8; + icon_state = "1-8" }, -/obj/effect/decal/warning_stripes/east, -/turf/simulated/floor/plating, +/turf/simulated/floor/engine, +/area/engine/supermatter) +"aRd" = ( +/obj/machinery/door/airlock/engineering/glass{ + heat_proof = 1; + name = "Supermatter Chamber"; + req_access_txt = "10"; + req_one_access_txt = "0" + }, +/turf/simulated/floor/engine, +/area/engine/supermatter) +"aRe" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 2 + }, +/obj/effect/decal/warning_stripes/yellow, +/turf/simulated/floor/engine, /area/engine/engineering) +"aRf" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/engine, +/area/engine/supermatter) "aRg" = ( +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/manifold/visible/cyan{ + dir = 8; + initialize_directions = 11; + level = 2 + }, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/effect/decal/warning_stripes/north, -/turf/simulated/floor/plating, +/obj/effect/decal/warning_stripes/east, +/turf/simulated/floor/engine, /area/engine/engineering) "aRh" = ( /obj/effect/decal/warning_stripes/west, @@ -24630,24 +21266,6 @@ icon_state = "dark" }, /area/bridge) -"aRk" = ( -/obj/machinery/door/airlock/shuttle{ - name = "Supply Shuttle Airlock"; - req_access_txt = "31" - }, -/turf/simulated/shuttle/plating, -/area/shuttle/supply) -"aRl" = ( -/obj/machinery/door/poddoor{ - id_tag = "QMLoaddoor2"; - name = "supply dock loading door" - }, -/obj/machinery/conveyor/west{ - id = "QMLoad" - }, -/obj/structure/plasticflaps/mining, -/turf/simulated/shuttle/plating, -/area/shuttle/supply) "aRm" = ( /obj/machinery/light/small, /turf/simulated/floor/plating, @@ -24657,8 +21275,8 @@ /obj/machinery/portable_atmospherics/pump, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/crew_quarters/locker) "aRo" = ( @@ -24668,48 +21286,40 @@ /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/machinery/atmospherics/pipe/simple/hidden/scrubbers, /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) -"aRr" = ( -/obj/machinery/camera/emp_proof{ - c_tag = "Engineering - Particle Accelerator"; - dir = 2; - network = list("Singulo","SS13") - }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/decal/warning_stripes/north, -/turf/simulated/floor/plating, -/area/engine/engineering) "aRs" = ( -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" +/obj/machinery/atmospherics/pipe/simple/visible/supply{ + dir = 10 }, -/obj/effect/decal/warning_stripes/northeast, -/turf/simulated/floor/plating, -/area/engine/engineering) +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/engine, +/area/engine/supermatter) "aRt" = ( /obj/structure/mirror{ pixel_x = -28 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/shower{ - tag = "icon-shower (EAST)"; + dir = 4; icon_state = "shower"; - dir = 4 + tag = "icon-shower (EAST)" }, /obj/structure/curtain/open/shower, /turf/simulated/floor/plasteel{ @@ -24721,33 +21331,14 @@ "aRu" = ( /turf/simulated/floor/plasteel, /area/storage/primary) -"aRv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/turf/simulated/floor/plasteel, -/area/storage/primary) -"aRw" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 - }, -/turf/simulated/floor/plasteel, -/area/storage/primary) -"aRx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/storage/primary) "aRy" = ( /obj/structure/mirror{ pixel_x = 28 }, /obj/machinery/shower{ - tag = "icon-shower (WEST)"; + dir = 8; icon_state = "shower"; - dir = 8 + tag = "icon-shower (WEST)" }, /obj/structure/curtain/open/shower, /turf/simulated/floor/plasteel{ @@ -24770,12 +21361,6 @@ /turf/simulated/floor/bluegrid, /area/turret_protected/ai_upload) "aRB" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 - }, /obj/machinery/power/apc{ dir = 2; name = "Storage Wing APC"; @@ -24790,6 +21375,9 @@ d2 = 4; icon_state = "1-4" }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "browncorner" @@ -24814,7 +21402,6 @@ dir = 8; pixel_x = -24 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/crew_quarters/courtroom) "aRE" = ( @@ -24823,16 +21410,16 @@ name = "Prosecution" }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 9 + dir = 9; + icon_state = "red" }, /area/crew_quarters/courtroom) "aRF" = ( /obj/structure/table/wood, /obj/item/folder/red, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 8 + dir = 8; + icon_state = "neutral" }, /area/crew_quarters/courtroom) "aRG" = ( @@ -24841,10 +21428,6 @@ d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2; - initialize_directions = 11 - }, /obj/item/radio/intercom{ frequency = 1459; name = "Station Intercom (General)"; @@ -24872,8 +21455,8 @@ /obj/structure/table/wood, /obj/item/folder/blue, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 4 + dir = 4; + icon_state = "neutral" }, /area/crew_quarters/courtroom) "aRI" = ( @@ -24905,7 +21488,7 @@ name = "Internal Affairs Agent" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 + dir = 4 }, /turf/simulated/floor/wood, /area/lawoffice) @@ -24918,6 +21501,9 @@ d2 = 4; icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, /turf/simulated/floor/wood, /area/lawoffice) "aRN" = ( @@ -24933,6 +21519,13 @@ 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 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -24947,9 +21540,6 @@ /turf/simulated/floor/wood, /area/lawoffice) "aRP" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -24967,6 +21557,9 @@ /obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, /mob/living/simple_animal/mouse, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" @@ -25008,21 +21601,16 @@ }, /area/crew_quarters/courtroom) "aRT" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, /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/supply{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment{ dir = 4 @@ -25033,9 +21621,6 @@ }, /area/crew_quarters/locker) "aRV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/disposalpipe/junction{ dir = 4; icon_state = "pipe-j2"; @@ -25061,11 +21646,8 @@ /turf/simulated/floor/wood, /area/lawoffice) "aRX" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /obj/structure/disposalpipe/segment{ dir = 8; @@ -25074,11 +21656,11 @@ /turf/simulated/floor/plasteel, /area/crew_quarters/locker) "aRY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/navbeacon{ 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" @@ -25098,8 +21680,8 @@ "aSa" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 8 + dir = 8; + icon_state = "neutral" }, /area/hallway/secondary/construction{ name = "\improper Garden" @@ -25110,8 +21692,8 @@ /area/quartermaster/storage) "aSc" = ( /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 4 + dir = 4; + icon_state = "neutral" }, /area/hallway/secondary/construction{ name = "\improper Garden" @@ -25148,7 +21730,7 @@ /obj/machinery/power/emitter, /obj/machinery/light/small, /turf/simulated/floor/plating, -/area/engine/engineering) +/area/storage/secure) "aSh" = ( /obj/structure/closet/crate, /obj/item/stack/sheet/metal{ @@ -25171,34 +21753,7 @@ }, /obj/item/gps, /turf/simulated/floor/plating, -/area/engine/engineering) -"aSi" = ( -/obj/machinery/the_singularitygen{ - anchored = 0 - }, -/turf/simulated/floor/plating, -/area/engine/engineering) -"aSj" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 - }, -/obj/effect/decal/warning_stripes/arrow{ - icon_state = "4"; - dir = 8 - }, -/obj/effect/decal/warning_stripes/yellow/partial{ - icon_state = "3"; - dir = 8 - }, -/turf/simulated/floor/plasteel, -/area/quartermaster/storage) -"aSk" = ( -/obj/effect/decal/warning_stripes/east, -/turf/simulated/floor/plating/airless, -/area/space/nearstation) +/area/storage/secure) "aSl" = ( /obj/machinery/navbeacon{ codes_txt = "delivery"; @@ -25226,31 +21781,23 @@ /turf/simulated/floor/plasteel, /area/engine/engineering) "aSo" = ( -/obj/effect/decal/warning_stripes/east, -/turf/simulated/floor/plating, -/area/engine/engineering) +/turf/simulated/floor/engine, +/area/engine/supermatter) "aSp" = ( -/obj/effect/decal/warning_stripes/southwest, -/turf/simulated/floor/plating/airless, -/area/space/nearstation) -"aSq" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f6"; - dir = 2 +/obj/structure/reflector/box{ + anchored = 1; + dir = 8 }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/engine/engineering) +"aSq" = ( +/turf/simulated/wall/mineral/titanium, /area/shuttle/pod_1) "aSr" = ( -/obj/structure/window/full/shuttle, -/obj/structure/grille, -/turf/simulated/shuttle/plating, -/area/shuttle/pod_1) -"aSs" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f10"; - dir = 2 - }, +/obj/effect/spawner/window/shuttle, +/turf/simulated/floor/plating, /area/shuttle/pod_1) "aSt" = ( /obj/item/storage/toolbox/mechanical, @@ -25280,30 +21827,11 @@ /obj/machinery/pipedispenser/disposal, /turf/simulated/floor/plasteel, /area/construction) -"aSx" = ( -/obj/machinery/door_control{ - dir = 2; - id = "QMLoaddoor2"; - name = "Loading Doors"; - pixel_x = 24; - pixel_y = 8 - }, -/obj/machinery/door_control{ - id = "QMLoaddoor"; - name = "Loading Doors"; - pixel_x = 24; - pixel_y = -8 - }, -/obj/machinery/light/spot{ - tag = "icon-tube1 (EAST)"; - icon_state = "tube1"; - dir = 4 - }, -/turf/simulated/shuttle/floor, -/area/shuttle/supply) "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" = ( @@ -25330,13 +21858,8 @@ name = "\improper Garden" }) "aSC" = ( -/obj/structure/table, -/obj/machinery/cell_charger, -/obj/item/stock_parts/cell/high{ - charge = 100; - maxcharge = 15000 - }, /obj/effect/decal/warning_stripes/yellow, +/obj/machinery/computer/sm_monitor, /turf/simulated/floor/plasteel, /area/engine/engineering) "aSD" = ( @@ -25362,7 +21885,12 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, -/obj/effect/decal/warning_stripes/southeastcorner, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, /turf/simulated/floor/plasteel, /area/engine/engineering) "aSF" = ( @@ -25386,18 +21914,14 @@ /turf/simulated/floor/plasteel, /area/quartermaster/storage) "aSG" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, /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{ - dir = 1; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /obj/effect/landmark{ name = "JoinLateCryo" @@ -25409,14 +21933,6 @@ /area/crew_quarters/sleep) "aSI" = ( /obj/structure/closet/secure_closet/quartermaster, -/obj/machinery/atmospherics/unary/vent_scrubber{ - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "brown" @@ -25462,13 +21978,6 @@ icon_state = "brown" }, /area/quartermaster/qm) -"aSL" = ( -/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, -/turf/simulated/floor/plasteel{ - icon_state = "redcorner"; - dir = 1 - }, -/area/security/brig) "aSM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/yellow{ @@ -25490,9 +21999,12 @@ /turf/simulated/floor/plasteel, /area/quartermaster/storage) "aSO" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 +/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) @@ -25500,12 +22012,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel, -/area/storage/primary) -"aSQ" = ( -/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) @@ -25513,6 +22021,11 @@ /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" = ( @@ -25607,31 +22120,22 @@ icon_state = "dark" }, /area/turret_protected/ai_upload) -"aSZ" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 - }, -/turf/simulated/floor/plasteel, -/area/crew_quarters/courtroom) "aTa" = ( /obj/structure/chair{ dir = 4; name = "Prosecution" }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 10 + dir = 10; + icon_state = "red" }, /area/crew_quarters/courtroom) "aTb" = ( /obj/structure/table/wood, /obj/item/paper, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 10 + dir = 10; + icon_state = "neutral" }, /area/crew_quarters/courtroom) "aTc" = ( @@ -25641,18 +22145,22 @@ /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{ - tag = "icon-shower (EAST)"; + dir = 4; icon_state = "shower"; + tag = "icon-shower (EAST)" + }, +/obj/structure/curtain/open/shower, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/curtain/open/shower, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, @@ -25664,12 +22172,9 @@ dir = 8; name = "Defense" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, /turf/simulated/floor/plasteel{ - icon_state = "green"; - dir = 6 + dir = 6; + icon_state = "green" }, /area/crew_quarters/courtroom) "aTg" = ( @@ -25701,11 +22206,17 @@ }) "aTh" = ( /obj/machinery/shower{ - tag = "icon-shower (WEST)"; + dir = 8; icon_state = "shower"; - dir = 8 + 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" }, @@ -25719,6 +22230,9 @@ /obj/machinery/atm{ pixel_y = -32 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "redcorner" @@ -25731,21 +22245,13 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood, /area/lawoffice) "aTk" = ( /obj/machinery/hologram/holopad, /turf/simulated/floor/wood, /area/lawoffice) -"aTl" = ( -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/effect/decal/warning_stripes/west, -/turf/simulated/floor/plating, -/area/engine/engineering) "aTm" = ( /obj/machinery/firealarm{ dir = 8; @@ -25782,7 +22288,12 @@ /turf/simulated/floor/plasteel, /area/crew_quarters/locker) "aTr" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, /turf/simulated/floor/plasteel, /area/crew_quarters/locker) "aTs" = ( @@ -25791,6 +22302,10 @@ 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" = ( @@ -25802,6 +22317,10 @@ /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" }, @@ -25812,8 +22331,9 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/plasteel, /area/crew_quarters/locker) @@ -25827,6 +22347,9 @@ dir = 2; initialize_directions = 11 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/crew_quarters/locker) "aTw" = ( @@ -25835,6 +22358,9 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -25846,9 +22372,6 @@ d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -25858,13 +22381,13 @@ dir = 1; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/crew_quarters/locker) "aTy" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -25873,13 +22396,13 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/crew_quarters/locker) "aTz" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2; - initialize_directions = 11 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -25888,6 +22411,10 @@ 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" @@ -25910,6 +22437,9 @@ /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/construction{ name = "\improper Garden" @@ -25926,9 +22456,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 8 + dir = 8; + icon_state = "neutral" }, /area/hallway/secondary/construction{ name = "\improper Garden" @@ -25962,15 +22495,6 @@ /area/hallway/secondary/construction{ name = "\improper Garden" }) -"aTE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment, -/obj/effect/decal/warning_stripes/southeastcorner, -/turf/simulated/floor/plasteel, -/area/quartermaster/storage) "aTF" = ( /obj/structure/cable/yellow{ d1 = 4; @@ -25981,16 +22505,12 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 4 + dir = 4; + icon_state = "neutral" }, /area/hallway/secondary/construction{ name = "\improper Garden" }) -"aTG" = ( -/obj/effect/decal/warning_stripes/southeast, -/turf/simulated/floor/plating/airless, -/area/space/nearstation) "aTH" = ( /obj/machinery/power/apc{ dir = 4; @@ -26012,70 +22532,41 @@ dir = 8 }, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 4 + dir = 4; + icon_state = "neutral" }, /area/hallway/secondary/construction{ name = "\improper Garden" }) -"aTI" = ( -/obj/machinery/the_singularitygen/tesla{ - anchored = 1 - }, -/obj/effect/decal/warning_stripes/south, -/turf/simulated/floor/plating/airless, -/area/space/nearstation) "aTJ" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 8; - icon_state = "1-8" +/obj/machinery/atmospherics/pipe/simple/visible/cyan, +/obj/machinery/light{ + dir = 4 }, -/turf/simulated/floor/plating, -/area/engine/engineering) -"aTK" = ( /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2" }, /obj/effect/decal/warning_stripes/east, -/turf/simulated/floor/plating, +/turf/simulated/floor/engine, /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, +/turf/simulated/floor/engine, +/area/engine/supermatter) "aTL" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, /area/quartermaster/storage) -"aTM" = ( -/obj/machinery/power/tesla_coil{ - anchored = 1 - }, -/obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 - }, -/turf/simulated/floor/plating/airless, -/area/space/nearstation) -"aTN" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall3"; - icon_state = "swall3"; - dir = 2 - }, -/area/shuttle/pod_1) -"aTO" = ( -/obj/effect/spawner/lootdrop/maintenance, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/plating/airless, -/area/engine/engineering) "aTP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, @@ -26087,15 +22578,12 @@ /turf/simulated/floor/plasteel, /area/construction) "aTR" = ( -/obj/effect/decal/warning_stripes/south, -/turf/simulated/floor/plating, -/area/engine/engineering) -"aTS" = ( -/obj/machinery/door/airlock/shuttle{ - name = "Supply Shuttle Airlock"; - req_access_txt = "31" +/obj/machinery/atmospherics/pipe/simple/visible/green{ + dir = 4 }, -/obj/docking_port/mobile/supply, +/turf/simulated/wall/r_wall, +/area/engine/supermatter) +"aTS" = ( /obj/docking_port/stationary{ dir = 8; dwidth = 5; @@ -26104,8 +22592,8 @@ name = "supply bay"; width = 12 }, -/turf/simulated/shuttle/plating, -/area/shuttle/supply) +/turf/space, +/area/space) "aTT" = ( /obj/machinery/light/small{ dir = 1 @@ -26123,9 +22611,9 @@ /turf/simulated/floor/plating, /area/quartermaster/storage) "aTV" = ( -/obj/effect/decal/warning_stripes/southeast, -/turf/simulated/floor/plating, -/area/engine/engineering) +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/engine, +/area/engine/supermatter) "aTW" = ( /obj/structure/cable/yellow{ d1 = 4; @@ -26135,14 +22623,18 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/mining/glass{ 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 + }, /turf/simulated/floor/plasteel, /area/quartermaster/qm) "aTX" = ( @@ -26155,7 +22647,11 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4; + level = 1 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -26166,12 +22662,19 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/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{ + dir = 10; + initialize_directions = 10; + level = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, /turf/simulated/floor/plasteel, /area/quartermaster/qm) "aTZ" = ( @@ -26196,8 +22699,8 @@ name = "Station Intercom (Court)" }, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 1 + dir = 1; + icon_state = "neutral" }, /area/crew_quarters/courtroom) "aUb" = ( @@ -26214,26 +22717,15 @@ /area/hallway/secondary/construction{ name = "\improper Garden" }) -"aUc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/spawner/lootdrop/maintenance, -/obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, -/area/quartermaster/storage) "aUd" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/window/reinforced, /obj/effect/decal/warning_stripes/arrow{ - icon_state = "4"; - dir = 8 + dir = 8; + icon_state = "4" }, /obj/effect/decal/warning_stripes/yellow/partial{ - icon_state = "3"; - dir = 8 + dir = 8; + icon_state = "3" }, /turf/simulated/floor/plasteel, /area/quartermaster/storage) @@ -26246,9 +22738,9 @@ }, /obj/structure/chair/stool, /turf/simulated/floor/plasteel{ - tag = "icon-cafeteria (NORTHEAST)"; + dir = 5; icon_state = "cafeteria"; - dir = 5 + tag = "icon-cafeteria (NORTHEAST)" }, /area/quartermaster/office{ name = "\improper Cargo Office" @@ -26271,16 +22763,10 @@ }) "aUg" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/storage/primary) "aUh" = ( -/obj/machinery/computer/security/telescreen{ - desc = "Used for monitoring the singularity engine safely."; - dir = 8; - name = "Singularity Monitor"; - network = list("Singulo"); - pixel_x = 32 - }, /obj/machinery/camera{ c_tag = "Engineering - Central"; dir = 8; @@ -26325,6 +22811,7 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/bluegrid, /area/turret_protected/ai_upload) "aUl" = ( @@ -26420,6 +22907,8 @@ 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" }, @@ -26436,9 +22925,6 @@ icon_state = "1-2" }, /obj/machinery/door/window/southleft, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, /area/quartermaster/storage) @@ -26460,6 +22946,7 @@ 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" = ( @@ -26475,9 +22962,6 @@ }, /area/storage/primary) "aUx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/door_timer{ dir = 1; id = "Cell 5"; @@ -26485,8 +22969,8 @@ pixel_y = 32 }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 1 + dir = 1; + icon_state = "red" }, /area/security/brig) "aUy" = ( @@ -26499,21 +22983,7 @@ pixel_y = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel, -/area/crew_quarters/locker) -"aUA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/turf/simulated/floor/plasteel{ - icon_state = "floorgrime" - }, -/area/crew_quarters/locker) -"aUB" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/crew_quarters/locker) "aUC" = ( @@ -26526,51 +22996,20 @@ pixel_x = 4; pixel_y = -4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "neutralcorner" }, /area/crew_quarters/locker) -"aUD" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/tinted{ - dir = 5; - max_integrity = 120; - reinf = 0 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/hallway/secondary/construction{ - name = "\improper Garden" - }) "aUE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 8 + dir = 8; + icon_state = "neutral" }, /area/hallway/secondary/construction{ name = "\improper Garden" }) -"aUF" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/light{ - dir = 8 - }, -/obj/effect/decal/warning_stripes/west, -/turf/simulated/floor/plating, -/area/engine/engineering) "aUG" = ( /obj/structure/window/reinforced{ dir = 1 @@ -26613,6 +23052,9 @@ 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" = ( @@ -26632,23 +23074,10 @@ pixel_y = 32 }, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/engine/engineering) -"aUM" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/turf/simulated/floor/plating/airless, -/area/space/nearstation) "aUN" = ( /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, @@ -26656,7 +23085,6 @@ name = "Arrivals" }) "aUO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/table/wood, /obj/machinery/photocopier/faxmachine/longrange{ department = "Internal Affairs Office" @@ -26664,16 +23092,11 @@ /turf/simulated/floor/wood, /area/lawoffice) "aUP" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 - }, /obj/machinery/flasher{ - pixel_y = 24; - id = "AI" + id = "AI"; + pixel_y = 24 }, +/obj/machinery/atmospherics/unary/vent_scrubber, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -26698,19 +23121,9 @@ d2 = 8; icon_state = "2-8" }, -/obj/effect/decal/warning_stripes/east, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/engine/engineering) -"aUS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - icon_state = "redcorner"; - dir = 4 - }, -/area/security/brig) "aUT" = ( /obj/structure/plasticflaps{ opacity = 1 @@ -26739,7 +23152,7 @@ /obj/structure/chair/comfy/shuttle{ dir = 1 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/pod_1) "aUX" = ( /obj/machinery/door/poddoor{ @@ -26769,10 +23182,14 @@ dir = 4; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /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 + }, /turf/simulated/floor/plasteel, /area/quartermaster/storage) "aVb" = ( @@ -26804,10 +23221,14 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - 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 + }, /turf/simulated/floor/plasteel, /area/quartermaster/storage) "aVe" = ( @@ -26832,24 +23253,15 @@ /turf/simulated/floor/plasteel, /area/engine/engineering) "aVh" = ( -/obj/structure/closet/secure_closet/engineering_welding, -/obj/effect/decal/warning_stripes/yellow, +/obj/effect/decal/warning_stripes/east, +/obj/structure/table, +/obj/item/rpd, +/obj/item/geiger_counter, +/obj/item/clothing/suit/radiation, +/obj/item/clothing/glasses/meson, +/obj/item/clothing/head/radiation, /turf/simulated/floor/plasteel, /area/engine/engineering) -"aVi" = ( -/obj/machinery/power/smes/engineering, -/obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 - }, -/obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, -/area/engine/engineering) -"aVj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/plasteel, -/area/quartermaster/storage) "aVk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/yellow{ @@ -26878,16 +23290,22 @@ }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /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" = ( @@ -26900,8 +23318,8 @@ }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/crew_quarters/locker) "aVq" = ( @@ -26931,22 +23349,26 @@ }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/crew_quarters/locker) "aVs" = ( -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" +/obj/machinery/atmospherics/binary/pump/on{ + name = "Gas to Filter" }, /obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/turf/simulated/floor/plating, +/obj/effect/decal/warning_stripes/east, +/turf/simulated/floor/engine, /area/engine/engineering) "aVt" = ( /obj/structure/table, @@ -27002,8 +23424,8 @@ /obj/item/aiModule/paladin, /obj/item/aiModule/robocop, /obj/machinery/flasher{ - pixel_y = 24; - id = "AI" + id = "AI"; + pixel_y = 24 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -27025,6 +23447,9 @@ 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" = ( @@ -27038,6 +23463,14 @@ 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 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -27054,6 +23487,10 @@ 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" = ( @@ -27067,8 +23504,8 @@ }, /obj/structure/window/reinforced, /obj/machinery/flasher{ - pixel_y = 24; - id = "AI" + id = "AI"; + pixel_y = 24 }, /obj/item/aiModule/antimov, /obj/item/aiModule/oxygen, @@ -27089,22 +23526,7 @@ }, /turf/simulated/floor/wood, /area/lawoffice) -"aVC" = ( -/obj/structure/grille, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/window/reinforced/tinted{ - dir = 5; - max_integrity = 120; - reinf = 0 - }, -/turf/simulated/floor/plating, -/area/crew_quarters/courtroom) "aVD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, /obj/machinery/vending/cigarette, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -27118,17 +23540,6 @@ icon_state = "dark" }, /area/crew_quarters/courtroom) -"aVF" = ( -/obj/structure/chair{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/crew_quarters/courtroom) "aVG" = ( /obj/machinery/vending/coffee, /turf/simulated/floor/plasteel{ @@ -27141,13 +23552,11 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, /obj/structure/disposalpipe/junction{ - icon_state = "pipe-j1"; - dir = 4 + dir = 4; + icon_state = "pipe-j1" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -27159,7 +23568,6 @@ d2 = 4; icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -27179,6 +23587,9 @@ d2 = 8; icon_state = "1-8" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -27193,6 +23604,9 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -27212,44 +23626,14 @@ dir = 2; network = list("SS13") }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" }, /area/crew_quarters/locker) -"aVM" = ( -/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 = 2; - icon_state = "neutralcorner" - }, -/area/security/brig) -"aVN" = ( -/obj/structure/table, -/obj/item/book/manual/engineering_guide{ - pixel_x = 3; - pixel_y = 4 - }, -/obj/item/book/manual/engineering_particle_accelerator{ - pixel_x = -2; - pixel_y = 3 - }, -/obj/machinery/door_control{ - id = "Singularity"; - name = "Shutters Control"; - pixel_x = 25; - req_access_txt = "11" - }, -/obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, -/area/engine/engineering) "aVO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -27259,6 +23643,9 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/crew_quarters/locker) "aVP" = ( @@ -27273,6 +23660,9 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/crew_quarters/locker) "aVQ" = ( @@ -27281,8 +23671,11 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 +/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" @@ -27294,18 +23687,6 @@ d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/crew_quarters/locker) -"aVS" = ( -/obj/structure/chair/stool{ - pixel_y = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel, /area/crew_quarters/locker) "aVT" = ( @@ -27314,9 +23695,6 @@ pixel_x = -2; pixel_y = 3 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel, /area/crew_quarters/locker) "aVU" = ( @@ -27324,30 +23702,17 @@ /obj/item/razor{ pixel_y = 5 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel, /area/crew_quarters/locker) "aVV" = ( /obj/structure/table, /obj/item/paicard, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/crew_quarters/locker) -"aVW" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel, /area/crew_quarters/locker) "aVX" = ( /obj/structure/rack, -/obj/effect/landmark/costume/random, -/obj/effect/landmark/costume/random, +/obj/effect/landmark/costume, +/obj/effect/landmark/costume, /obj/item/clothing/mask/balaclava, /obj/machinery/alarm{ dir = 8; @@ -27357,24 +23722,21 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "neutralcorner" }, /area/crew_quarters/locker) "aVY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, /obj/structure/sink{ - icon_state = "sink"; dir = 8; + icon_state = "sink"; pixel_x = -12; pixel_y = 2 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "neutral" @@ -27400,20 +23762,10 @@ /area/hallway/secondary/construction{ name = "\improper Garden" }) -"aWb" = ( -/obj/machinery/door_control{ - id = "Singularity"; - name = "Shutters Control"; - pixel_x = -25; - req_access_txt = "11" - }, -/obj/effect/decal/warning_stripes/southwest, -/turf/simulated/floor/plating, -/area/engine/engineering) "aWc" = ( /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 6 + dir = 6; + icon_state = "neutral" }, /area/hallway/secondary/construction{ name = "\improper Garden" @@ -27450,13 +23802,25 @@ /turf/simulated/floor/plating, /area/maintenance/starboard) "aWg" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/green{ + dir = 8 + }, +/obj/machinery/firealarm{ + dir = 4; + pixel_x = 24 + }, +/obj/machinery/camera{ + c_tag = "Engineering Supermatter Port"; + dir = 8; + network = list("SS13","engine") + }, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/effect/decal/warning_stripes/south, -/turf/simulated/floor/plating, +/obj/effect/decal/warning_stripes/east, +/turf/simulated/floor/engine, /area/engine/engineering) "aWh" = ( /obj/machinery/camera/autoname{ @@ -27464,9 +23828,6 @@ network = list("SS13") }, /obj/machinery/hologram/holopad, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, /obj/machinery/power/apc{ dir = 1; name = "Quartermaster's Office APC"; @@ -27482,10 +23843,6 @@ }, /area/quartermaster/qm) "aWi" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - on = 1 - }, /obj/structure/extinguisher_cabinet{ pixel_x = 27 }, @@ -27504,9 +23861,9 @@ }, /obj/structure/table/glass, /turf/simulated/floor/plasteel{ - tag = "icon-cafeteria (NORTHEAST)"; + dir = 5; icon_state = "cafeteria"; - dir = 5 + tag = "icon-cafeteria (NORTHEAST)" }, /area/quartermaster/office{ name = "\improper Cargo Office" @@ -27546,6 +23903,9 @@ 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" = ( @@ -27564,34 +23924,18 @@ /turf/simulated/floor/plasteel, /area/engine/engineering) "aWo" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "neutralcorner" }, /area/security/brig) "aWp" = ( -/obj/structure/table, -/obj/item/book/manual/engineering_hacking{ - pixel_x = 4; - pixel_y = 5 - }, -/obj/item/book/manual/engineering_construction{ - pixel_y = 3 - }, -/obj/structure/extinguisher_cabinet{ - pixel_x = 27 - }, /obj/machinery/light{ dir = 4; icon_state = "tube1" }, -/obj/item/book/manual/engineering_singularity_safety{ - pixel_x = -4 - }, -/obj/effect/decal/warning_stripes/yellow, +/obj/effect/decal/warning_stripes/east, +/obj/structure/closet/firecloset, /turf/simulated/floor/plasteel, /area/engine/engineering) "aWq" = ( @@ -27615,7 +23959,7 @@ /obj/structure/chair/comfy/shuttle{ dir = 1 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/pod_1) "aWs" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -27653,8 +23997,8 @@ pixel_x = 30 }, /obj/machinery/light{ - icon_state = "tube1"; - dir = 4 + dir = 4; + icon_state = "tube1" }, /obj/machinery/camera{ c_tag = "Tool Storage"; @@ -27679,6 +24023,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/table, +/obj/machinery/cell_charger, +/obj/item/stock_parts/cell/high{ + charge = 100; + maxcharge = 15000 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "yellow" @@ -27712,15 +24062,10 @@ icon_state = "neutralcorner" }, /area/crew_quarters/locker) -"aWz" = ( -/obj/machinery/power/grounding_rod{ - anchored = 1 - }, -/turf/simulated/floor/plating/airless, -/area/engine/engineering) "aWA" = ( -/turf/space, -/area/engine/engineering) +/obj/structure/lattice, +/turf/simulated/wall/r_wall, +/area/space/nearstation) "aWB" = ( /obj/structure/window/reinforced{ dir = 1; @@ -27755,30 +24100,22 @@ name = "\improper Captain's Quarters" }) "aWF" = ( -/obj/machinery/door/airlock/shuttle{ +/obj/machinery/door/airlock/titanium{ name = "Escape Pod Airlock" }, /obj/docking_port/mobile/pod{ id = "pod1"; name = "escape pod 1" }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/pod_1) "aWG" = ( /obj/structure/shuttle/engine/propulsion/burst, -/turf/simulated/floor/plating, -/turf/simulated/shuttle/wall{ - tag = "icon-swall_f5"; - icon_state = "swall_f5"; - dir = 2 - }, +/turf/simulated/wall/mineral/titanium, /area/shuttle/pod_1) "aWH" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/plasteel, /area/construction) @@ -27788,12 +24125,6 @@ }, /turf/simulated/floor/plasteel, /area/construction) -"aWJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/turf/simulated/floor/plasteel, -/area/construction) "aWK" = ( /obj/structure/rack{ dir = 1 @@ -27826,8 +24157,8 @@ pixel_x = -26 }, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/engine/engineering) "aWO" = ( @@ -27898,6 +24229,7 @@ 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" = ( @@ -27908,10 +24240,9 @@ /area/storage/primary) "aWU" = ( /obj/structure/disposalpipe/junction{ - icon_state = "pipe-j1"; - dir = 4 + dir = 4; + icon_state = "pipe-j1" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/storage/primary) "aWV" = ( @@ -27922,12 +24253,6 @@ /turf/simulated/floor/plasteel, /area/storage/primary) "aWW" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 - }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "brown" @@ -27952,8 +24277,8 @@ network = list("SS13") }, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/engine/engineering) "aWY" = ( @@ -27962,6 +24287,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 = "dark" }, @@ -27980,9 +24307,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel, /area/hallway/primary/fore) @@ -27996,57 +24322,24 @@ icon_state = "dark" }, /area/crew_quarters/courtroom) -"aXc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/crew_quarters/courtroom) "aXd" = ( /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=16-Fore"; location = "15-Court" }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/crew_quarters/courtroom) -"aXe" = ( -/obj/structure/chair{ - dir = 1 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/crew_quarters/courtroom) -"aXf" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 - }, -/turf/simulated/floor/plasteel, -/area/crew_quarters/locker) "aXg" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, /area/crew_quarters/locker) -"aXh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/turf/simulated/floor/plasteel, -/area/crew_quarters/locker) "aXi" = ( /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, @@ -28064,12 +24357,6 @@ /obj/machinery/hologram/holopad, /turf/simulated/floor/plasteel, /area/crew_quarters/locker) -"aXl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - icon_state = "floorgrime" - }, -/area/crew_quarters/locker) "aXm" = ( /obj/structure/rack, /obj/item/storage/briefcase, @@ -28102,22 +24389,15 @@ /turf/simulated/floor/plasteel, /area/quartermaster/storage) "aXo" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/manifold/visible/red{ + dir = 1 }, -/obj/structure/rack{ - dir = 8; - layer = 2.9 - }, -/obj/item/crowbar, -/obj/item/stack/cable_coil, -/obj/item/screwdriver, -/obj/item/weldingtool, +/obj/machinery/meter, /obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, -/area/engine/engineering) +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/engine/supermatter) "aXp" = ( /obj/machinery/vending/crittercare, /obj/effect/decal/warning_stripes/north, @@ -28125,20 +24405,6 @@ /area/hallway/secondary/construction{ name = "\improper Garden" }) -"aXq" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "neutralcorner" - }, -/area/security/brig) "aXr" = ( /obj/structure/table, /obj/item/hatchet, @@ -28152,24 +24418,14 @@ name = "\improper Garden" }) "aXs" = ( +/obj/machinery/atmospherics/trinary/filter/flipped, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4"; - tag = "90Curve" - }, -/obj/structure/cable{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/obj/effect/decal/warning_stripes/east, +/turf/simulated/floor/engine, /area/engine/engineering) "aXt" = ( /obj/machinery/computer/security/mining, @@ -28210,11 +24466,8 @@ /turf/simulated/floor/plasteel, /area/engine/engineering) "aXy" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /obj/structure/cable/yellow{ d1 = 4; @@ -28231,17 +24484,6 @@ "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/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/engine/engineering) -"aXA" = ( /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -28267,27 +24509,19 @@ /area/quartermaster/qm) "aXC" = ( /obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - external_pressure_bound = 101.325; - on = 1; - pressure_checks = 1 + dir = 2; + on = 1 }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/security/brig) -"aXD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/wall/r_wall, -/area/security/brig) "aXE" = ( /obj/structure/table, /obj/item/aiModule/reset, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/machinery/ai_status_display{ pixel_x = -32 @@ -28373,12 +24607,6 @@ }) "aXL" = ( /turf/simulated/wall/r_wall, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) -"aXM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/wall/r_wall, /area/construction/hallway{ name = "\improper MiniSat Exterior" }) @@ -28415,16 +24643,13 @@ /area/engine/engineering) "aXR" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/structure/extinguisher_cabinet{ pixel_x = -27 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "redcorner" @@ -28457,7 +24682,6 @@ name = "protective hat"; pixel_y = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/construction) "aXX" = ( @@ -28480,12 +24704,13 @@ 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{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/structure/extinguisher_cabinet{ pixel_x = -27 @@ -28516,32 +24741,6 @@ /area/maintenance/fpmaint2{ name = "Port Maintenance" }) -"aYc" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall7"; - dir = 2 - }, -/area/shuttle/supply) -"aYd" = ( -/turf/simulated/shuttle/floor, -/turf/simulated/shuttle/wall/interior{ - tag = "icon-swall_f10"; - icon_state = "swall_f10" - }, -/area/shuttle/supply) -"aYe" = ( -/turf/simulated/shuttle/floor, -/turf/simulated/shuttle/wall/interior{ - tag = "icon-swall_f6"; - icon_state = "swall_f6" - }, -/area/shuttle/supply) -"aYf" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall11"; - dir = 2 - }, -/area/shuttle/supply) "aYg" = ( /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plating, @@ -28564,8 +24763,8 @@ opened = 1 }, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ @@ -28574,7 +24773,6 @@ }, /area/storage/primary) "aYk" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment{ dir = 1; icon_state = "pipe-c" @@ -28606,9 +24804,9 @@ }, /obj/structure/chair/stool, /turf/simulated/floor/plasteel{ - tag = "icon-cafeteria (NORTHEAST)"; + dir = 5; icon_state = "cafeteria"; - dir = 5 + tag = "icon-cafeteria (NORTHEAST)" }, /area/quartermaster/office{ name = "\improper Cargo Office" @@ -28661,9 +24859,6 @@ /area/storage/primary) "aYs" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -28672,9 +24867,6 @@ /turf/simulated/floor/plasteel, /area/storage/primary) "aYt" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -28683,22 +24875,8 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/storage/primary) -"aYu" = ( -/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, -/area/storage/primary) "aYv" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 2; d2 = 8; @@ -28709,12 +24887,10 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/storage/primary) "aYw" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -28741,6 +24917,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 = "dark" }, @@ -28767,17 +24945,6 @@ }, /turf/simulated/floor/plating, /area/crew_quarters/courtroom) -"aYB" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/crew_quarters/courtroom) "aYC" = ( /obj/structure/extinguisher_cabinet{ pixel_x = 5; @@ -28823,9 +24990,7 @@ /turf/simulated/floor/plasteel, /area/engine/engineering) "aYF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, +/obj/machinery/atmospherics/unary/vent_pump, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -28849,7 +25014,6 @@ dir = 4; on = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -28861,12 +25025,10 @@ /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/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=14.3-Lockers-Dorms"; location = "14.2-Central-CrewQuarters" @@ -28877,9 +25039,6 @@ }, /area/crew_quarters/locker) "aYK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "neutralcorner" @@ -28891,18 +25050,19 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = "0" - }, /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/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/power/apc{ dir = 2; name = "Locker Room APC"; @@ -28940,9 +25100,6 @@ }, /area/storage/primary) "aYP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/firealarm{ dir = 1; pixel_y = -24 @@ -28966,31 +25123,21 @@ /obj/effect/decal/warning_stripes/northwest, /turf/simulated/floor/plasteel, /area/engine/engineering) -"aYR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "neutralcorner" - }, -/area/crew_quarters/locker) "aYS" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/landmark/start{ - name = "Station Engineer" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/engine/engineering) "aYT" = ( @@ -29002,6 +25149,11 @@ d2 = 8; icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10; + initialize_directions = 10; + level = 1 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "arrival" @@ -29020,10 +25172,10 @@ }, /obj/machinery/power/smes/engineering, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, -/area/engine/chiefs_office) +/area/engine/engineering) "aYV" = ( /obj/structure/cable/yellow{ d2 = 4; @@ -29034,20 +25186,20 @@ }, /obj/machinery/power/smes/engineering, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, -/area/engine/chiefs_office) +/area/engine/engineering) "aYW" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/effect/decal/warning_stripes/north, +/obj/effect/decal/warning_stripes/east, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, /turf/simulated/floor/plasteel, /area/engine/engineering) "aYX" = ( @@ -29081,6 +25233,9 @@ dir = 6 }, /obj/effect/decal/warning_stripes/south, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, /turf/simulated/floor/plasteel, /area/engine/engineering) "aYZ" = ( @@ -29103,10 +25258,16 @@ d2 = 4; icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /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 + }, /turf/simulated/floor/plasteel, /area/security/brig) "aZb" = ( @@ -29125,6 +25286,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 + }, /turf/simulated/floor/plasteel, /area/security/brig) "aZc" = ( @@ -29133,9 +25299,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, /obj/structure/disposalpipe/sortjunction{ sortType = 5 }, @@ -29144,84 +25307,59 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/decal/warning_stripes/northeastcorner, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4; + initialize_directions = 11 + }, /turf/simulated/floor/plasteel, /area/engine/engineering) "aZd" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/machinery/power/terminal{ - icon_state = "term"; - dir = 1 - }, -/obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 - }, -/obj/effect/decal/warning_stripes/north, -/turf/simulated/floor/plasteel, +/obj/effect/decal/warning_stripes/west, +/turf/simulated/floor/engine, /area/engine/engineering) "aZe" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, +/obj/effect/spawner/window/reinforced/plasma, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/effect/decal/warning_stripes/north, -/turf/simulated/floor/plasteel, -/area/engine/engineering) -"aZf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/decal/warning_stripes/south, -/turf/simulated/floor/plasteel, +/obj/structure/sign/securearea{ + pixel_y = 32 + }, +/turf/simulated/floor/engine, /area/engine/engineering) "aZg" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 5 }, -/obj/effect/decal/warning_stripes/northeast, -/turf/simulated/floor/plasteel, -/area/engine/engineering) +/obj/effect/decal/warning_stripes/yellow, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/engine/supermatter) "aZh" = ( +/obj/machinery/atmospherics/pipe/simple/visible/green, /obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4"; - tag = "90Curve" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 + d1 = 2; + d2 = 8; + icon_state = "2-8"; + tag = "" }, /obj/structure/cable{ d1 = 1; d2 = 8; icon_state = "1-8" }, -/obj/effect/decal/warning_stripes/north, -/turf/simulated/floor/plasteel, +/obj/effect/decal/warning_stripes/east, +/turf/simulated/floor/engine, /area/engine/engineering) -"aZi" = ( -/obj/structure/sign/pods, -/turf/simulated/wall, -/area/hallway/secondary/entry{ - name = "Arrivals" - }) "aZj" = ( /obj/machinery/door/airlock/external{ name = "Escape Pod One" @@ -29236,18 +25374,6 @@ req_access_txt = "32" }, /turf/simulated/floor/plating, -/area/hallway/secondary/entry{ - name = "Arrivals" - }) -"aZl" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/tinted{ - dir = 5; - max_integrity = 120; - reinf = 0 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plating, /area/hallway/secondary/entry{ name = "Arrivals" }) @@ -29273,15 +25399,12 @@ 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{ name = "Arrivals" }) "aZo" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 - }, /obj/structure/cable/yellow{ d1 = 2; d2 = 8; @@ -29289,42 +25412,13 @@ }, /turf/simulated/floor/plasteel, /area/engine/break_room) -"aZp" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - tag = "icon-swall_f5"; - icon_state = "swall_f5"; - dir = 2 - }, -/area/shuttle/supply) -"aZq" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall15"; - dir = 2 - }, -/area/shuttle/supply) -"aZr" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/shuttle/engine/heater, -/turf/simulated/shuttle/plating, -/area/shuttle/supply) -"aZs" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - tag = "icon-swall_f9"; - icon_state = "swall_f9"; - dir = 2 - }, -/area/shuttle/supply) "aZt" = ( /turf/simulated/wall, /area/quartermaster/storage) "aZu" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/machinery/camera{ c_tag = "Cargo Bay - Port"; @@ -29336,10 +25430,6 @@ }, /turf/simulated/floor/plating, /area/quartermaster/storage) -"aZv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel, -/area/quartermaster/storage) "aZw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -29349,6 +25439,9 @@ 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" = ( @@ -29366,22 +25459,13 @@ "aZy" = ( /obj/item/flag/cargo, /turf/simulated/floor/plasteel{ - tag = "icon-cafeteria (NORTHEAST)"; + dir = 5; icon_state = "cafeteria"; - dir = 5 + tag = "icon-cafeteria (NORTHEAST)" }, /area/quartermaster/office{ name = "\improper Cargo Office" }) -"aZz" = ( -/obj/structure/shuttle/engine/propulsion/burst, -/turf/simulated/floor/plating, -/turf/simulated/shuttle/wall{ - tag = "icon-swall_f9"; - icon_state = "swall_f9"; - dir = 2 - }, -/area/shuttle/pod_1) "aZA" = ( /obj/structure/table, /obj/item/hatchet, @@ -29467,6 +25551,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "brown" @@ -29511,19 +25596,34 @@ 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 + }, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + 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; icon_state = "4-8" }, -/obj/effect/decal/warning_stripes/east, -/turf/simulated/floor/plasteel, +/obj/effect/decal/warning_stripes/north, +/obj/machinery/atmospherics/pipe/manifold/visible/green{ + dir = 1; + tag = "icon-manifold-g (NORTH)" + }, +/obj/machinery/meter, +/turf/simulated/floor/engine, /area/engine/engineering) "aZP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -29592,9 +25692,12 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 +/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" @@ -29609,6 +25712,11 @@ 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" }, @@ -29640,15 +25748,6 @@ icon_state = "dark" }, /area/crew_quarters/courtroom) -"aZX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/plasteel, -/area/crew_quarters/locker) "aZY" = ( /obj/machinery/firealarm{ dir = 4; @@ -29665,49 +25764,49 @@ "baa" = ( /obj/structure/closet/wardrobe/black, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/crew_quarters/locker) "bab" = ( /obj/structure/closet/wardrobe/grey, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/crew_quarters/locker) "bac" = ( /obj/structure/closet/wardrobe/white, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/crew_quarters/locker) "bad" = ( /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/crew_quarters/locker) "bae" = ( /obj/structure/closet/wardrobe/green, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/crew_quarters/locker) "baf" = ( /obj/machinery/vending/clothing, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/crew_quarters/locker) "bag" = ( /obj/structure/closet/wardrobe/mixed, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/crew_quarters/locker) "bah" = ( @@ -29787,33 +25886,33 @@ }, /area/storage/primary) "bao" = ( +/obj/machinery/atmospherics/pipe/simple/visible/green{ + dir = 5; + initialize_directions = 12; + tag = "icon-intact-g (NORTHEAST)" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /obj/structure/cable{ d1 = 1; d2 = 4; icon_state = "1-4"; - tag = "90Curve" + tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/plasteel, +/obj/effect/decal/warning_stripes/northeastcorner, +/turf/simulated/floor/engine, /area/engine/engineering) "bap" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/manifold/visible/yellow{ + dir = 4 }, -/obj/structure/cable{ - d1 = 1; - d2 = 8; - icon_state = "1-8" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/turf/simulated/floor/plating/airless, -/area/space/nearstation) +/obj/effect/decal/warning_stripes/east, +/turf/simulated/floor/engine, +/area/engine/engineering) "baq" = ( /obj/structure/cable/yellow{ d1 = 4; @@ -29833,12 +25932,11 @@ d2 = 4; icon_state = "1-4" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/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) "bar" = ( @@ -29847,6 +25945,7 @@ }, /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" = ( @@ -29859,10 +25958,6 @@ /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, /area/quartermaster/storage) -"bat" = ( -/obj/machinery/light_switch, -/turf/simulated/wall, -/area/engine/engineering) "bau" = ( /obj/item/clothing/head/fedora, /obj/structure/table/wood/poker, @@ -29876,21 +25971,21 @@ /area/construction) "baw" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, /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, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, /turf/simulated/floor/plasteel, /area/engine/engineering) -"bax" = ( -/obj/item/wrench, -/turf/simulated/floor/plating/airless, -/area/engine/engineering) "bay" = ( /obj/machinery/hologram/holopad, /obj/structure/cable/yellow{ @@ -29898,9 +25993,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 8; @@ -29910,25 +26002,6 @@ /area/bridge/meeting_room{ name = "\improper Command Hallway" }) -"baz" = ( -/obj/effect/spawner/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) -"baA" = ( -/obj/machinery/light, -/obj/machinery/camera{ - c_tag = "Engineering - Aft"; - dir = 1; - network = list("SS13") - }, -/obj/effect/decal/warning_stripes/south, -/turf/simulated/floor/plasteel, -/area/engine/engineering) "baB" = ( /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel, @@ -29959,41 +26032,11 @@ /turf/simulated/floor/plating, /area/maintenance/starboard) "baE" = ( -/obj/machinery/camera/autoname{ - dir = 4; - network = list("SS13") - }, -/obj/machinery/door_control{ - desc = "A remote control-switch for the engineering security doors."; - id = "Engineering"; - name = "Engineering Lockdown"; - pixel_x = -24; - pixel_y = -6; - req_access_txt = "1" - }, -/obj/machinery/door_control{ - id = "atmos"; - name = "Atmospherics Lockdown"; - pixel_x = -24; - pixel_y = 5; - req_access_txt = "1" - }, -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - external_pressure_bound = 101.325; - on = 1; - pressure_checks = 1 - }, /turf/simulated/floor/plasteel{ - dir = 10; + dir = 9; icon_state = "yellow" }, -/area/engine/engineering) +/area/engine/break_room) "baF" = ( /obj/machinery/light{ dir = 4 @@ -30015,20 +26058,30 @@ /turf/simulated/floor/plasteel, /area/quartermaster/storage) "baG" = ( -/obj/effect/decal/warning_stripes/south, -/turf/simulated/floor/plating/airless, -/area/engine/engineering) -"baH" = ( -/obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-13"; - layer = 4.1; - tag = "icon-plant-13" +/obj/structure/lattice/catwalk, +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 5 }, -/obj/effect/decal/warning_stripes/northwest, +/turf/space, +/area/space/nearstation) +"baH" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 10; + initialize_directions = 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" + }, +/obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel, -/area/hallway/secondary/entry{ - name = "Arrivals" - }) +/area/hallway/secondary/entry) "baI" = ( /obj/structure/chair, /obj/effect/decal/warning_stripes/north, @@ -30064,6 +26117,9 @@ dir = 1; network = list("SS13") }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -30082,6 +26138,9 @@ icon_state = "map-right-MS"; pixel_y = 32 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitecorner" @@ -30098,6 +26157,9 @@ d2 = 8; icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/wood, /area/crew_quarters/bar) "baO" = ( @@ -30106,29 +26168,8 @@ name = "Station Intercom (General)"; pixel_y = -26 }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/crew_quarters/courtroom) -"baP" = ( -/obj/structure/shuttle/engine/propulsion{ - icon_state = "burst_l" - }, -/turf/simulated/shuttle/plating, -/area/shuttle/supply) -"baQ" = ( -/obj/structure/shuttle/engine/propulsion, -/turf/simulated/shuttle/plating, -/area/shuttle/supply) -"baR" = ( -/obj/structure/shuttle/engine/propulsion{ - icon_state = "burst_r" - }, -/turf/simulated/shuttle/plating, -/area/shuttle/supply) -"baS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -30148,26 +26189,17 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/engine/engineering{ dir = 8 }) "baV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, /obj/effect/landmark/start{ name = "Cargo Technician" }, /turf/simulated/floor/plasteel, /area/quartermaster/storage) -"baW" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/quartermaster/storage) "baX" = ( /obj/machinery/atmospherics/unary/vent_pump{ dir = 4; @@ -30184,10 +26216,17 @@ 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{ - tag = "icon-cafeteria (NORTHEAST)"; + dir = 5; icon_state = "cafeteria"; - dir = 5 + tag = "icon-cafeteria (NORTHEAST)" }, /area/quartermaster/office{ name = "\improper Cargo Office" @@ -30198,23 +26237,37 @@ d2 = 8; icon_state = "1-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4; + level = 1 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/plasteel{ - tag = "icon-cafeteria (NORTHEAST)"; + dir = 5; icon_state = "cafeteria"; - dir = 5 + tag = "icon-cafeteria (NORTHEAST)" }, /area/quartermaster/office{ name = "\improper Cargo Office" }) "bba" = ( /obj/machinery/atmospherics/unary/vent_pump{ - dir = 2; - on = 1 + 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{ - tag = "icon-cafeteria (NORTHEAST)"; + dir = 5; icon_state = "cafeteria"; - dir = 5 + tag = "icon-cafeteria (NORTHEAST)" }, /area/quartermaster/office{ name = "\improper Cargo Office" @@ -30226,35 +26279,14 @@ pixel_x = 27 }, /turf/simulated/floor/plasteel{ - tag = "icon-cafeteria (NORTHEAST)"; + dir = 5; icon_state = "cafeteria"; - dir = 5 + tag = "icon-cafeteria (NORTHEAST)" }, /area/quartermaster/office{ name = "\improper Cargo Office" }) -"bbc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/wall, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) -"bbd" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/decal/warning_stripes/north, -/turf/simulated/floor/plasteel, -/area/hallway/secondary/entry{ - name = "Arrivals" - }) "bbe" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/item/radio/intercom{ frequency = 1459; name = "Station Intercom (General)"; @@ -30298,13 +26330,16 @@ d2 = 4; icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/engine/break_room) "bbg" = ( /obj/structure/closet/firecloset, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/hallway/primary/central) "bbh" = ( @@ -30315,21 +26350,17 @@ }, /obj/structure/closet/emcloset, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/hallway/primary/central) "bbi" = ( /obj/structure/closet/emcloset, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/hallway/primary/central) -"bbj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/wall/r_wall, -/area/turret_protected/ai_upload_foyer) "bbk" = ( /obj/machinery/door/airlock/highsecurity{ name = "Secure Network Access"; @@ -30340,9 +26371,11 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/turret_protected/ai_upload_foyer) "bbl" = ( @@ -30359,8 +26392,8 @@ tag = "icon-applebush" }, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 9 + dir = 9; + icon_state = "neutral" }, /area/hallway/primary/central) "bbn" = ( @@ -30370,8 +26403,8 @@ icon_state = "1-2" }, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 1 + dir = 1; + icon_state = "neutral" }, /area/hallway/primary/central) "bbo" = ( @@ -30384,8 +26417,8 @@ dir = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 1 + dir = 1; + icon_state = "neutral" }, /area/hallway/primary/central) "bbp" = ( @@ -30400,15 +26433,15 @@ network = list("SS13") }, /turf/simulated/floor/plasteel{ - icon_state = "redcorner"; - dir = 1 + dir = 1; + icon_state = "redcorner" }, /area/hallway/primary/central) "bbq" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - icon_state = "redcorner"; - dir = 1 + dir = 1; + icon_state = "redcorner" }, /area/hallway/primary/central) "bbr" = ( @@ -30424,8 +26457,8 @@ req_access_txt = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "redcorner"; - dir = 4 + dir = 4; + icon_state = "redcorner" }, /area/hallway/primary/central) "bbt" = ( @@ -30434,14 +26467,11 @@ pixel_y = 24 }, /turf/simulated/floor/plasteel{ - icon_state = "redcorner"; - dir = 4 + dir = 4; + icon_state = "redcorner" }, /area/hallway/primary/central) "bbu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/light, /obj/machinery/newscaster{ pixel_y = -32 @@ -30460,26 +26490,18 @@ icon_state = "neutralcorner" }, /area/crew_quarters/locker) -"bbw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/effect/decal/warning_stripes/south, -/turf/simulated/floor/plasteel, -/area/engine/engineering) "bbx" = ( /obj/machinery/door/airlock/highsecurity{ name = "Secure Tech Storage"; req_access_txt = "19;23" }, /turf/simulated/floor/plasteel{ - tag = "icon-vault (WEST)"; + dir = 8; icon_state = "vault"; - dir = 8 + tag = "icon-vault (WEST)" }, /area/storage/tech) "bby" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ name = "Crew Quarters Access" @@ -30497,6 +26519,7 @@ 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" = ( @@ -30506,21 +26529,18 @@ "bbB" = ( /obj/machinery/vending/snack, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/hallway/primary/central) "bbC" = ( -/obj/effect/landmark/start{ - name = "Station Engineer" +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/plasteel, +/obj/effect/decal/warning_stripes/south, +/turf/simulated/floor/engine, /area/engine/engineering) "bbD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -30532,8 +26552,8 @@ icon_state = "2-4" }, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/hallway/primary/central) "bbE" = ( @@ -30568,16 +26588,7 @@ "bbH" = ( /turf/simulated/wall, /area/storage/tech) -"bbI" = ( -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/turf/simulated/floor/plating/airless, -/area/engine/engineering) "bbJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ d1 = 2; d2 = 8; @@ -30591,8 +26602,8 @@ }, /obj/machinery/computer/station_alert, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/engine/chiefs_office) "bbL" = ( @@ -30610,28 +26621,12 @@ /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, /area/engine/engineering) -"bbN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/wall, -/area/engine/engineering) "bbO" = ( -/obj/structure/table, -/obj/item/paper_bin{ - pixel_x = -4; - pixel_y = 10 - }, -/obj/item/pen{ - pixel_x = -3; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/warning_stripes/yellow, +/obj/structure/closet/secure_closet/engineering_welding, /turf/simulated/floor/plasteel, /area/engine/engineering) "bbP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/table, /obj/item/paper_bin{ pixel_x = -4; @@ -30643,9 +26638,9 @@ }, /obj/item/toy/figure/cargotech, /turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "whitehall"; - tag = "icon-whitehall (WEST)" + dir = 5; + icon_state = "cafeteria"; + tag = "icon-cafeteria (NORTHEAST)" }, /area/quartermaster/office{ name = "\improper Cargo Office" @@ -30656,6 +26651,9 @@ }, /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" = ( @@ -30665,6 +26663,9 @@ /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" = ( @@ -30675,14 +26676,14 @@ dir = 1 }, /obj/effect/decal/warning_stripes/north, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry{ name = "Arrivals" }) "bbT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/camera{ c_tag = "Security Post - Cargo"; dir = 1; @@ -30690,26 +26691,13 @@ }, /obj/machinery/vending/cola, /turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "whitehall"; - tag = "icon-whitehall (WEST)" + dir = 5; + icon_state = "cafeteria"; + tag = "icon-cafeteria (NORTHEAST)" }, /area/quartermaster/office{ name = "\improper Cargo Office" }) -"bbU" = ( -/obj/structure/cable{ - icon_state = "0-2"; - pixel_y = 1; - d2 = 2 - }, -/obj/machinery/power/emitter{ - anchored = 1; - dir = 1; - state = 2 - }, -/turf/simulated/floor/plating/airless, -/area/engine/engineering) "bbV" = ( /obj/structure/table, /obj/item/analyzer, @@ -30785,6 +26773,9 @@ dir = 1; layer = 2.9 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -30798,7 +26789,6 @@ name = "Central Maintenance" }) "bcd" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/light_switch{ pixel_x = 28 }, @@ -30823,6 +26813,9 @@ }, /obj/effect/decal/warning_stripes/northwestcorner, /obj/effect/decal/warning_stripes/northwestcorner, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry{ name = "Arrivals" @@ -30837,6 +26830,7 @@ dir = 2 }, /obj/effect/decal/warning_stripes/north, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry{ name = "Arrivals" @@ -30852,29 +26846,15 @@ d2 = 4; icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, /obj/effect/decal/warning_stripes/east, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, /turf/simulated/floor/plasteel, /area/quartermaster/storage) -"bch" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/turf/simulated/floor/plasteel, -/area/hallway/secondary/entry{ - name = "Arrivals" - }) -"bci" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 - }, -/turf/simulated/floor/plasteel, -/area/hallway/secondary/entry{ - name = "Arrivals" - }) "bcj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -30906,21 +26886,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6; - level = 1 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "yellow" }, /area/engine/engineering) "bcl" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 - }, /obj/machinery/turretid{ control_area = "\improper AI Upload Chamber"; icon_state = "control_stun"; @@ -30956,20 +26928,15 @@ network = list("AIUpload"); pixel_x = -29 }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, /turf/simulated/floor/plasteel{ - tag = "icon-vault (SOUTHEAST)"; + dir = 6; icon_state = "vault"; - dir = 6 + tag = "icon-vault (SOUTHEAST)" }, /area/turret_protected/ai_upload_foyer) -"bcm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/turf/simulated/floor/plasteel, -/area/hallway/secondary/entry{ - name = "Arrivals" - }) "bcn" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -30979,15 +26946,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ req_access_txt = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry{ name = "Arrivals" }) "bco" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 2; - on = 1 - }, /obj/effect/landmark/start{ name = "Cyborg" }, @@ -31008,28 +26972,21 @@ /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{ - tag = "icon-vault (SOUTHWEST)"; + dir = 10; icon_state = "vault"; - dir = 10 + tag = "icon-vault (SOUTHWEST)" }, /area/turret_protected/ai_upload_foyer) -"bcp" = ( -/obj/machinery/light/small, -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/effect/decal/warning_stripes/south, -/turf/simulated/floor/plasteel, -/area/engine/engineering) "bcq" = ( -/obj/structure/table, -/obj/item/folder/yellow, -/obj/item/folder/yellow, -/obj/item/storage/firstaid/fire, /obj/effect/decal/warning_stripes/yellow, +/obj/structure/closet/secure_closet/engineering_electrical, /turf/simulated/floor/plasteel, /area/engine/engineering) "bcr" = ( @@ -31055,6 +27012,7 @@ 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" = ( @@ -31062,6 +27020,7 @@ req_access_txt = 1 }, /obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/quartermaster/storage) "bcv" = ( @@ -31074,6 +27033,9 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/plasteel, /area/quartermaster/storage) "bcw" = ( @@ -31085,6 +27047,9 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/plasteel, /area/quartermaster/storage) "bcx" = ( @@ -31094,15 +27059,13 @@ icon_state = "4-8" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 - }, /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" = ( @@ -31115,14 +27078,11 @@ /obj/machinery/newscaster{ pixel_y = -32 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, /obj/machinery/vending/coffee, /turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "whitehall"; - tag = "icon-whitehall (WEST)" + dir = 5; + icon_state = "cafeteria"; + tag = "icon-cafeteria (NORTHEAST)" }, /area/quartermaster/office{ name = "\improper Cargo Office" @@ -31130,9 +27090,9 @@ "bcA" = ( /obj/machinery/vending/cigarette, /turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "whitehall"; - tag = "icon-whitehall (WEST)" + dir = 5; + icon_state = "cafeteria"; + tag = "icon-cafeteria (NORTHEAST)" }, /area/quartermaster/office{ name = "\improper Cargo Office" @@ -31153,19 +27113,10 @@ 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, /area/security/brig) -"bcC" = ( -/obj/structure/sign/securearea{ - desc = "A warning sign which reads 'RADIOACTIVE AREA'"; - icon_state = "radiation"; - name = "RADIOACTIVE AREA"; - pixel_x = 32 - }, -/obj/effect/decal/warning_stripes/east, -/turf/simulated/floor/plasteel, -/area/engine/engineering) "bcD" = ( /obj/structure/cable/yellow{ d1 = 4; @@ -31178,6 +27129,13 @@ req_access_txt = "0"; req_one_access_txt = "48;50" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4; + level = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/plasteel, /area/quartermaster/office{ name = "\improper Cargo Office" @@ -31213,18 +27171,6 @@ /area/maintenance/fpmaint2{ name = "Port Maintenance" }) -"bcG" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 - }, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/plasteel, -/area/engine/engineering) "bcH" = ( /obj/structure/cable/yellow{ d1 = 4; @@ -31257,6 +27203,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -31275,6 +27224,9 @@ /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 = "neutralcorner" @@ -31285,6 +27237,9 @@ dir = 4 }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -31297,6 +27252,9 @@ /obj/machinery/firealarm{ pixel_y = 32 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -31311,6 +27269,7 @@ /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" @@ -31320,7 +27279,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -31331,6 +27292,9 @@ dir = 4 }, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -31340,6 +27304,9 @@ /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" @@ -31354,6 +27321,9 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -31366,29 +27336,8 @@ name = "Arrivals" }) "bcS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/effect/decal/warning_stripes/southeastcorner, /turf/simulated/floor/plasteel, -/area/hallway/secondary/entry{ - name = "Arrivals" - }) -"bcT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/decal/warning_stripes/south, -/turf/simulated/floor/plasteel, -/area/hallway/secondary/entry{ - name = "Arrivals" - }) -"bcU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/decal/warning_stripes/southwestcorner, -/turf/simulated/floor/plasteel, /area/hallway/secondary/entry{ name = "Arrivals" }) @@ -31412,19 +27361,25 @@ 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/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/hallway/primary/central) "bcZ" = ( @@ -31439,18 +27394,27 @@ /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 + }, /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" @@ -31460,6 +27424,9 @@ /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" @@ -31469,6 +27436,9 @@ /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" @@ -31483,6 +27453,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -31493,6 +27464,9 @@ dir = 4 }, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -31502,12 +27476,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/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/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -31517,6 +27493,10 @@ /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" @@ -31527,6 +27507,9 @@ dir = 4 }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -31541,6 +27524,9 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -31593,18 +27579,12 @@ /turf/simulated/floor/plating, /area/maintenance/starboard) "bdp" = ( -/obj/machinery/camera/emp_proof{ - c_tag = "Aft Arm - Far"; - dir = 8; - network = list("Singulo") +/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 10 }, -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/turf/simulated/floor/plating/airless, -/area/engine/engineering) +/turf/space, +/area/space/nearstation) "bdq" = ( /obj/structure/cable/yellow{ d1 = 4; @@ -31714,7 +27694,6 @@ }, /area/storage/tech) "bdw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -31748,14 +27727,14 @@ pixel_x = -29 }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 5 + dir = 5; + icon_state = "vault" }, /area/engine/chiefs_office) "bdz" = ( /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 5 + dir = 5; + icon_state = "vault" }, /area/engine/chiefs_office) "bdA" = ( @@ -31769,8 +27748,8 @@ network = list("SS13") }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 5 + dir = 5; + icon_state = "vault" }, /area/engine/chiefs_office) "bdB" = ( @@ -31807,6 +27786,7 @@ req_one_access_txt = "0" }, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/engine/chiefs_office) "bdE" = ( @@ -31824,8 +27804,8 @@ }, /obj/machinery/computer/card/minor/ce, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/engine/chiefs_office) "bdF" = ( @@ -31846,18 +27826,11 @@ 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) -"bdG" = ( -/obj/structure/grille, -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4"; - tag = "90Curve" - }, -/turf/simulated/floor/plating/airless, -/area/engine/engineering) "bdH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -31868,6 +27841,9 @@ pixel_y = 32 }, /obj/effect/decal/warning_stripes/north, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry{ name = "Arrivals" @@ -31883,7 +27859,9 @@ network = list("SS13","MiniSat") }, /obj/machinery/light/small, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -31924,13 +27902,6 @@ layer = 2.9 }, /turf/space, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) -"bdO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/lattice/catwalk, -/turf/space, /area/construction/hallway{ name = "\improper MiniSat Exterior" }) @@ -31953,8 +27924,8 @@ pixel_y = 21 }, /turf/simulated/floor/plasteel{ - icon_state = "arrival"; - dir = 5 + dir = 5; + icon_state = "arrival" }, /area/hallway/secondary/entry{ name = "Arrivals" @@ -31968,15 +27939,14 @@ name = "Arrivals" }) "bdS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, /obj/effect/decal/warning_stripes/north, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plasteel, /area/hallway/primary/central) "bdT" = ( @@ -31996,6 +27966,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" = ( @@ -32016,9 +27989,6 @@ /turf/simulated/floor/plating, /area/maintenance/starboard) "bdX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, /obj/machinery/alarm{ dir = 8; icon_state = "alarm0"; @@ -32093,7 +28063,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/light_switch{ pixel_x = 27 }, @@ -32118,6 +28087,7 @@ }) "beh" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -32178,15 +28148,6 @@ }, /turf/simulated/floor/plasteel, /area/hallway/primary/central) -"bem" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel, -/area/hallway/primary/central) "ben" = ( /obj/structure/cable/yellow{ d1 = 4; @@ -32202,10 +28163,8 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - on = 1; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel, /area/hallway/primary/central) @@ -32221,6 +28180,7 @@ d2 = 8; icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/hallway/primary/central) "beq" = ( @@ -32243,7 +28203,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=2-Storage"; location = "1.5-Fore-Central" @@ -32300,37 +28259,21 @@ }, /turf/simulated/floor/plasteel, /area/hallway/primary/central) -"bew" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/turf/simulated/floor/plasteel, -/area/hallway/primary/central) "bex" = ( /obj/structure/cable/yellow{ d1 = 2; d2 = 8; icon_state = "2-8" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - on = 1; - scrub_Toxins = 0 - }, /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ d1 = 2; d2 = 4; icon_state = "2-4" }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, /turf/simulated/floor/plasteel, /area/hallway/primary/central) "bey" = ( @@ -32346,6 +28289,7 @@ d2 = 8; icon_state = "1-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -32366,9 +28310,6 @@ /turf/simulated/floor/plating, /area/storage/tools) "beB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, /obj/machinery/vending/cart, /turf/simulated/floor/plasteel{ dir = 5; @@ -32388,8 +28329,8 @@ dir = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 1 + dir = 1; + icon_state = "neutral" }, /area/hallway/primary/central) "beE" = ( @@ -32399,27 +28340,9 @@ icon_state = "4-8" }, /turf/simulated/floor/plasteel{ - tag = "icon-vault (WEST)"; + dir = 8; icon_state = "vault"; - dir = 8 - }, -/area/storage/tech) -"beF" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/plasteel{ - tag = "icon-vault (WEST)"; - icon_state = "vault"; - dir = 8 + tag = "icon-vault (WEST)" }, /area/storage/tech) "beG" = ( @@ -32429,9 +28352,9 @@ icon_state = "2-8" }, /turf/simulated/floor/plasteel{ - tag = "icon-vault (WEST)"; + dir = 8; icon_state = "vault"; - dir = 8 + tag = "icon-vault (WEST)" }, /area/storage/tech) "beH" = ( @@ -32441,8 +28364,8 @@ pixel_y = 21 }, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 1 + dir = 1; + icon_state = "neutral" }, /area/hallway/primary/central) "beI" = ( @@ -32465,8 +28388,8 @@ dir = 8 }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 5 + dir = 5; + icon_state = "vault" }, /area/engine/chiefs_office) "beJ" = ( @@ -32517,17 +28440,15 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 5 + dir = 5; + icon_state = "vault" }, /area/engine/chiefs_office) "beO" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, @@ -32551,13 +28472,11 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ req_access_txt = 1 }, /obj/effect/decal/warning_stripes/southwestcorner, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry{ name = "Arrivals" @@ -32583,8 +28502,8 @@ /obj/machinery/disposal, /obj/structure/disposalpipe/trunk, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/hallway/primary/central) "beT" = ( @@ -32601,14 +28520,13 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1; + initialize_directions = 11 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plasteel, /area/security/brig) -"beU" = ( -/obj/machinery/door/airlock/external{ - name = "South Containment Arm Access" - }, -/turf/simulated/floor/plating, -/area/engine/engineering) "beV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -32635,26 +28553,6 @@ dir = 4 }, /turf/space, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) -"beZ" = ( -/obj/machinery/camera/emp_proof{ - c_tag = "Aft Arm - Near"; - dir = 4; - network = list("Singulo") - }, -/obj/machinery/power/grounding_rod{ - anchored = 1 - }, -/turf/simulated/floor/plating/airless, -/area/space/nearstation) -"bfa" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5; - level = 1 - }, -/turf/simulated/wall/r_wall, /area/construction/hallway{ name = "\improper MiniSat Exterior" }) @@ -32681,6 +28579,9 @@ dir = 8; network = list("SS13","MiniSat") }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -32697,8 +28598,8 @@ }, /obj/machinery/computer/atmos_alert, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/engine/chiefs_office) "bfe" = ( @@ -32715,6 +28616,7 @@ 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" = ( @@ -32735,6 +28637,9 @@ }, /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" = ( @@ -32759,7 +28664,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/yellow{ d1 = 2; d2 = 8; @@ -32795,7 +28699,11 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/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" = ( @@ -32821,15 +28729,19 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 - }, /obj/structure/cable/yellow{ d1 = 1; 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 + }, /turf/simulated/floor/plasteel, /area/security/brig) "bfn" = ( @@ -32861,6 +28773,7 @@ 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" = ( @@ -32887,36 +28800,17 @@ }, /area/engine/engineering) "bfs" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 - }, -/obj/machinery/shower{ - tag = "icon-shower (WEST)"; - icon_state = "shower"; +/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, /turf/simulated/floor/plasteel, /area/engine/engineering) -"bft" = ( -/obj/structure/sign/securearea{ - desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; - icon_state = "space"; - layer = 4; - name = "EXTERNAL AIRLOCK"; - pixel_y = -32 - }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/decal/warning_stripes/southeast, -/turf/simulated/floor/plasteel, -/area/engine/engineering) "bfu" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -32927,6 +28821,7 @@ req_access_txt = 1 }, /obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry{ name = "Arrivals" @@ -32952,6 +28847,9 @@ 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" = ( @@ -32959,31 +28857,20 @@ pixel_y = 32 }, /obj/structure/closet/radiation, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/warning_stripes/yellow, +/obj/item/clothing/glasses/meson/engine, /turf/simulated/floor/plasteel, /area/engine/engineering) "bfz" = ( -/obj/structure/sign/securearea{ - desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; - icon_state = "space"; - layer = 4; - name = "EXTERNAL AIRLOCK"; - pixel_y = 32 +/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ + dir = 6; + icon_state = "intact"; + tag = "icon-intact (SOUTHEAST)" }, -/obj/machinery/light/small{ - dir = 1 - }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/decal/warning_stripes/east, -/turf/simulated/floor/plating, -/area/engine/engineering) +/obj/structure/lattice, +/turf/space, +/area/space/nearstation) "bfA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -32992,18 +28879,13 @@ /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) -"bfB" = ( -/obj/machinery/light, -/obj/structure/grille, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/plating/airless, -/area/engine/engineering) "bfC" = ( /obj/machinery/status_display{ dir = 4; @@ -33011,8 +28893,8 @@ pixel_x = -32 }, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /turf/simulated/floor/bluegrid, /area/turret_protected/ai) @@ -33048,6 +28930,14 @@ 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 + }, /turf/simulated/floor/plasteel, /area/security/brig) "bfG" = ( @@ -33060,8 +28950,8 @@ pixel_x = 32 }, /obj/machinery/light{ - icon_state = "tube1"; - dir = 4 + dir = 4; + icon_state = "tube1" }, /turf/simulated/floor/bluegrid, /area/turret_protected/ai) @@ -33075,9 +28965,6 @@ /turf/simulated/floor/plasteel, /area/hallway/primary/central) "bfJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, /obj/structure/disposalpipe/segment{ dir = 4; icon_state = "pipe-c" @@ -33088,22 +28975,6 @@ }, /area/hallway/primary/central) "bfK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "neutralcorner" - }, -/area/hallway/primary/central) -"bfL" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2; - initialize_directions = 11 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -33113,9 +28984,6 @@ }, /area/hallway/primary/central) "bfM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment{ dir = 4 @@ -33126,22 +28994,15 @@ }, /area/hallway/primary/central) "bfN" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11; - level = 1 - }, /obj/structure/cable{ d1 = 2; d2 = 8; icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/bluegrid, /area/turret_protected/ai) "bfO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/alarm{ dir = 1; pixel_y = -22 @@ -33154,23 +29015,7 @@ icon_state = "neutralcorner" }, /area/hallway/primary/central) -"bfP" = ( -/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) "bfQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/yellow{ d1 = 1; @@ -33181,6 +29026,7 @@ dir = 2; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "neutralcorner" @@ -33191,54 +29037,28 @@ dir = 1; pixel_y = -24 }, -/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) "bfS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "neutralcorner" - }, -/area/hallway/primary/central) -"bfT" = ( -/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) "bfU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/hologram/holopad, /turf/simulated/floor/plasteel, /area/hallway/primary/central) "bfV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" }, /area/hallway/primary/central) "bfW" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/firealarm{ dir = 1; pixel_y = -24 @@ -33249,9 +29069,6 @@ }, /area/hallway/primary/central) "bfX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/camera{ c_tag = "Central Primary Hallway - Fore - Courtroom"; dir = 1; @@ -33263,10 +29080,6 @@ }, /area/hallway/primary/central) "bfY" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 - }, /obj/machinery/light, /turf/simulated/floor/plasteel{ dir = 8; @@ -33274,9 +29087,6 @@ }, /area/hallway/primary/central) "bfZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/alarm{ dir = 1; pixel_y = -22 @@ -33302,10 +29112,6 @@ name = "Arrivals" }) "bgb" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 - }, /obj/item/radio/intercom{ frequency = 1459; name = "Station Intercom (General)"; @@ -33317,18 +29123,6 @@ icon_state = "neutralcorner" }, /area/hallway/primary/central) -"bgc" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/plasteel, -/area/hallway/primary/central) "bgd" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ req_access_txt = 1 @@ -33338,6 +29132,7 @@ dir = 8; network = list("SS13") }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -33433,11 +29228,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/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) @@ -33455,8 +29251,8 @@ pixel_y = -2 }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 4 + dir = 4; + icon_state = "vault" }, /area/storage/tech) "bgn" = ( @@ -33528,7 +29324,6 @@ }, /obj/item/circuitboard/destructive_analyzer, /obj/item/circuitboard/protolathe, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -33539,10 +29334,11 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/unary/vent_scrubber, /turf/simulated/floor/plasteel{ - tag = "icon-vault (WEST)"; + dir = 8; icon_state = "vault"; - dir = 8 + tag = "icon-vault (WEST)" }, /area/storage/tech) "bgt" = ( @@ -33570,8 +29366,8 @@ req_access_txt = "11" }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 5 + dir = 5; + icon_state = "vault" }, /area/engine/chiefs_office) "bgv" = ( @@ -33589,8 +29385,8 @@ /obj/structure/table/reinforced, /obj/item/cartridge/atmos, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 4 + dir = 4; + icon_state = "neutral" }, /area/engine/chiefs_office) "bgw" = ( @@ -33618,9 +29414,6 @@ dir = 4; pixel_x = 24 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "brown" @@ -33637,14 +29430,17 @@ d2 = 8; icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/extinguisher_cabinet{ 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" = ( @@ -33678,42 +29474,41 @@ /turf/simulated/floor/plasteel, /area/quartermaster/storage) "bgE" = ( -/obj/machinery/door/firedoor, /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/door/airlock/engineering, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, -/area/engine/engineering) +/area/engine/break_room) "bgF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /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) -"bgG" = ( -/obj/item/cigbutt, -/turf/simulated/floor/plating, -/area/engine/engineering) "bgH" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, /obj/machinery/ai_status_display{ 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" = ( @@ -33731,16 +29526,12 @@ 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, /turf/simulated/floor/plasteel, /area/security/brig) -"bgJ" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 - }, -/turf/simulated/floor/plating, -/area/maintenance/starboard) "bgK" = ( /obj/item/radio/intercom{ broadcasting = 0; @@ -33799,8 +29590,8 @@ /area/storage/tech) "bgP" = ( /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/machinery/power/smes{ charge = 5e+006 @@ -33890,7 +29681,6 @@ /turf/simulated/floor/plasteel, /area/quartermaster/storage) "bgW" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -33940,6 +29730,9 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/carpet, /area/crew_quarters/theatre) "bhb" = ( @@ -33985,7 +29778,9 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "brown" @@ -34013,9 +29808,10 @@ pixel_x = 26; pixel_y = 26 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 5 + dir = 5; + icon_state = "vault" }, /area/engine/chiefs_office) "bhg" = ( @@ -34060,10 +29856,6 @@ /area/hallway/secondary/entry{ name = "Arrivals" }) -"bhk" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel, -/area/hallway/primary/port) "bhl" = ( /turf/simulated/floor/plasteel, /area/hallway/primary/port) @@ -34106,10 +29898,10 @@ pixel_x = 29 }, /obj/effect/decal/warning_stripes/yellow, +/obj/item/clothing/glasses/meson/engine, /turf/simulated/floor/plasteel, /area/engine/engineering) "bhp" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 2; @@ -34127,10 +29919,6 @@ }, /turf/simulated/floor/plasteel, /area/janitor) -"bhs" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/wall, -/area/janitor) "bht" = ( /turf/simulated/wall, /area/maintenance/maintcentral{ @@ -34148,6 +29936,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/maintenance/maintcentral{ name = "Central Maintenance" @@ -34162,6 +29951,10 @@ /obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -34171,59 +29964,41 @@ /area/crew_quarters/captain{ name = "\improper Captain's Quarters" }) -"bhx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/wall/r_wall, -/area/crew_quarters/captain{ - name = "\improper Captain's Quarters" - }) -"bhy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralcorner" - }, -/area/hallway/primary/central) "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/grille, -/obj/structure/cable{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/plating/airless, -/area/engine/engineering) +/obj/structure/lattice, +/obj/structure/lattice/catwalk, +/turf/space, +/area/space/nearstation) "bhB" = ( /obj/machinery/atmospherics/unary/vent_pump{ - dir = 2; + dir = 4; on = 1 }, /turf/simulated/floor/plasteel, /area/storage/tools) "bhC" = ( /obj/machinery/hologram/holopad, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, /turf/simulated/floor/plasteel, /area/storage/tools) "bhD" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel, /area/storage/tools) @@ -34287,33 +30062,30 @@ pixel_y = -5 }, /turf/simulated/floor/plasteel{ - tag = "icon-vault (WEST)"; + dir = 8; icon_state = "vault"; - dir = 8 + tag = "icon-vault (WEST)" }, /area/storage/tech) "bhJ" = ( /turf/simulated/floor/plasteel{ - tag = "icon-vault (WEST)"; + dir = 8; icon_state = "vault"; - dir = 8 + tag = "icon-vault (WEST)" }, /area/storage/tech) "bhK" = ( /obj/structure/reagent_dispensers/spacecleanertank{ pixel_y = 30 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, /turf/simulated/floor/plasteel, /area/janitor) "bhL" = ( /obj/machinery/hologram/holopad, /turf/simulated/floor/plasteel{ - tag = "icon-vault (WEST)"; + dir = 8; icon_state = "vault"; - dir = 8 + tag = "icon-vault (WEST)" }, /area/storage/tech) "bhM" = ( @@ -34326,9 +30098,9 @@ pixel_x = -1 }, /turf/simulated/floor/plasteel{ - tag = "icon-vault (WEST)"; + dir = 8; icon_state = "vault"; - dir = 8 + tag = "icon-vault (WEST)" }, /area/storage/tech) "bhN" = ( @@ -34336,20 +30108,9 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - tag = "icon-vault (WEST)"; + dir = 8; icon_state = "vault"; - dir = 8 - }, -/area/storage/tech) -"bhO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - tag = "icon-vault (WEST)"; - icon_state = "vault"; - dir = 8 + tag = "icon-vault (WEST)" }, /area/storage/tech) "bhP" = ( @@ -34361,10 +30122,11 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - tag = "icon-vault (WEST)"; + dir = 8; icon_state = "vault"; - dir = 8 + tag = "icon-vault (WEST)" }, /area/storage/tech) "bhQ" = ( @@ -34375,9 +30137,9 @@ /obj/item/wirecutters, /obj/item/multitool, /turf/simulated/floor/plasteel{ - tag = "icon-vault (WEST)"; + dir = 8; icon_state = "vault"; - dir = 8 + tag = "icon-vault (WEST)" }, /area/storage/tech) "bhR" = ( @@ -34409,8 +30171,8 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 1 + dir = 1; + icon_state = "neutral" }, /area/engine/chiefs_office) "bhU" = ( @@ -34418,7 +30180,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -34426,9 +30188,6 @@ }, /area/engine/chiefs_office) "bhV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, /obj/structure/sign/securearea{ desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; @@ -34460,6 +30219,7 @@ 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" @@ -34486,9 +30246,9 @@ icon_state = "0-4" }, /turf/simulated/floor/plasteel{ - tag = "icon-vault (WEST)"; + dir = 8; icon_state = "vault"; - dir = 8 + tag = "icon-vault (WEST)" }, /area/storage/tech) "bib" = ( @@ -34519,8 +30279,8 @@ dir = 8 }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/turret_protected/ai) "bie" = ( @@ -34545,11 +30305,7 @@ }, /area/storage/tech) "bif" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 - }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -34559,11 +30315,10 @@ dir = 4; on = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/shower{ - tag = "icon-shower (EAST)"; + dir = 4; icon_state = "shower"; - dir = 4 + tag = "icon-shower (EAST)" }, /obj/structure/extinguisher_cabinet{ pixel_x = -27 @@ -34573,8 +30328,8 @@ /area/engine/engineering) "bih" = ( /obj/machinery/power/terminal{ - icon_state = "term"; - dir = 1 + dir = 1; + icon_state = "term" }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -34604,15 +30359,18 @@ name = "lightsout" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, /obj/effect/decal/warning_stripes/north, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/plasteel, /area/engine/engineering) "bil" = ( @@ -34620,10 +30378,6 @@ /turf/simulated/floor/bluegrid, /area/turret_protected/ai) "bim" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5; - level = 1 - }, /obj/structure/cable{ d1 = 1; d2 = 4; @@ -34633,54 +30387,19 @@ /turf/simulated/floor/bluegrid, /area/turret_protected/ai) "bin" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - tag = "icon-swall_f6"; - icon_state = "swall_f6"; - dir = 2 - }, -/area/shuttle/arrival/station) -"bio" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall12"; - icon_state = "swall12"; - dir = 2 - }, +/turf/simulated/wall/mineral/titanium, /area/shuttle/arrival/station) "bip" = ( -/obj/machinery/door/airlock/shuttle{ +/obj/machinery/door/airlock/titanium{ name = "Arrivals Shuttle Airlock" }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/plating, /area/shuttle/arrival/station) "biq" = ( -/obj/structure/grille, -/obj/structure/shuttle/window, -/turf/simulated/shuttle/plating, -/area/shuttle/arrival/station) -"bir" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall14"; - icon_state = "swall14"; - dir = 2 - }, -/area/shuttle/arrival/station) -"bis" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - tag = "icon-swall_f10"; - icon_state = "swall_f10"; - dir = 2 - }, +/obj/effect/spawner/window/shuttle, +/turf/simulated/floor/plating, /area/shuttle/arrival/station) "bit" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/firealarm{ dir = 4; pixel_x = 24 @@ -34697,27 +30416,15 @@ /area/hallway/secondary/entry{ name = "Arrivals" }) -"biu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/wall, -/area/security/checkpoint2{ - name = "Customs" - }) "biv" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 - }, /obj/structure/table/reinforced, /obj/item/book/manual/security_space_law{ pixel_x = -3; pixel_y = 5 }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 9 + dir = 9; + icon_state = "red" }, /area/security/checkpoint2{ name = "Customs" @@ -34732,15 +30439,9 @@ d2 = 2; icon_state = "0-2" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 - }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 1 + dir = 1; + icon_state = "red" }, /area/security/checkpoint2{ name = "Customs" @@ -34753,8 +30454,8 @@ }, /obj/machinery/computer/security, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 1 + dir = 1; + icon_state = "red" }, /area/security/checkpoint2{ name = "Customs" @@ -34775,8 +30476,8 @@ network = list("SS13") }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 1 + dir = 1; + icon_state = "red" }, /area/security/checkpoint2{ name = "Customs" @@ -34802,6 +30503,7 @@ /obj/machinery/atmospherics/pipe/simple/visible{ dir = 2 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -34914,7 +30616,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/quartermaster/office{ name = "\improper Cargo Office" @@ -34923,10 +30624,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 - }, /turf/simulated/floor/plasteel, /area/quartermaster/office{ name = "\improper Cargo Office" @@ -34936,18 +30633,12 @@ dir = 2; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel, /area/quartermaster/office{ name = "\improper Cargo Office" }) "biN" = ( /obj/machinery/computer/supplycomp, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "brown" @@ -34970,7 +30661,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/mining{ name = "Cargo Bay"; @@ -34982,13 +30672,6 @@ /area/quartermaster/office{ name = "\improper Cargo Office" }) -"biQ" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 - }, -/turf/simulated/floor/plasteel, -/area/hallway/primary/port) "biR" = ( /obj/machinery/atmospherics/unary/vent_pump{ dir = 4; @@ -35026,6 +30709,7 @@ /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" @@ -35045,7 +30729,6 @@ /turf/simulated/floor/plasteel, /area/hallway/primary/central) "biX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment{ dir = 8; icon_state = "pipe-c" @@ -35079,9 +30762,6 @@ /obj/machinery/alarm{ pixel_y = 28 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -35090,8 +30770,8 @@ /obj/structure/table/wood, /obj/item/book/manual/security_space_law, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 6 + dir = 6; + icon_state = "neutral" }, /area/crew_quarters/courtroom) "bjc" = ( @@ -35165,12 +30845,6 @@ name = "\improper Cargo Office" }) "bjg" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 - }, /obj/machinery/status_display{ density = 0; pixel_y = 32 @@ -35236,13 +30910,13 @@ dir = 4; network = list("SS13") }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" }, /area/hallway/primary/central) "bjm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor, /turf/simulated/floor/plasteel{ dir = 8; @@ -35264,6 +30938,7 @@ req_access_txt = 1 }, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -35289,13 +30964,14 @@ amount = 50 }, /obj/item/storage/box/lights/mixed, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "yellow" }, /area/storage/tools) "bjr" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "yellow" @@ -35305,7 +30981,6 @@ /obj/structure/rack, /obj/item/apc_electronics, /obj/item/airlock_electronics, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/spawner/lootdrop/maintenance, /turf/simulated/floor/plasteel{ dir = 2; @@ -35344,8 +31019,8 @@ pixel_y = -1 }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 1 + dir = 1; + icon_state = "vault" }, /area/storage/tech) "bjw" = ( @@ -35385,10 +31060,6 @@ }, /area/storage/tech) "bjA" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 - }, /obj/machinery/light, /obj/structure/disposalpipe/segment{ dir = 4 @@ -35408,10 +31079,11 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - tag = "icon-vault (WEST)"; + dir = 8; icon_state = "vault"; - dir = 8 + tag = "icon-vault (WEST)" }, /area/storage/tech) "bjC" = ( @@ -35433,10 +31105,6 @@ }, /area/storage/tech) "bjD" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2; - initialize_directions = 11 - }, /obj/structure/extinguisher_cabinet{ pixel_y = -30 }, @@ -35467,13 +31135,6 @@ }, /area/storage/tools) "bjG" = ( -/obj/machinery/computer/security/telescreen{ - desc = "Used for monitoring the singularity engine safely."; - dir = 8; - name = "Singularity Monitor"; - network = list("Singulo"); - pixel_x = 29 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -35484,18 +31145,26 @@ icon_state = "tube1" }, /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; + layer = 4; + name = "Engine Monitor"; + network = list("engine"); + pixel_x = 30 + }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 5 + dir = 5; + icon_state = "vault" }, /area/engine/chiefs_office) "bjH" = ( /obj/structure/filingcabinet/chestdrawer, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /mob/living/simple_animal/parrot/Poly, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 5 + dir = 5; + icon_state = "vault" }, /area/engine/chiefs_office) "bjI" = ( @@ -35513,8 +31182,8 @@ pixel_x = 24 }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 5 + dir = 5; + icon_state = "vault" }, /area/engine/chiefs_office) "bjJ" = ( @@ -35537,9 +31206,6 @@ /area/atmos) "bjL" = ( /obj/effect/spawner/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 0; d2 = 2; @@ -35555,37 +31221,8 @@ "bjN" = ( /turf/simulated/wall, /area/engine/break_room) -"bjO" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/machinery/computer/monitor, -/obj/structure/cable/yellow{ - d2 = 8; - icon_state = "0-8" - }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 - }, -/turf/simulated/floor/plasteel{ - dir = 6; - icon_state = "yellow" - }, -/area/engine/engineering) "bjP" = ( /obj/effect/spawner/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/yellow, /turf/simulated/floor/plating, /area/security/checkpoint2{ @@ -35593,8 +31230,8 @@ }) "bjQ" = ( /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 1 + dir = 1; + icon_state = "vault" }, /area/turret_protected/ai) "bjR" = ( @@ -35615,31 +31252,25 @@ icon_state = "vault" }, /area/turret_protected/ai) -"bjT" = ( -/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/east, -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/engine/engineering) "bjU" = ( +/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{ - icon_state = "red"; - dir = 4 + dir = 4; + icon_state = "red" }, /area/security/brig) "bjV" = ( /obj/machinery/hologram/holopad, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 1 + dir = 1; + icon_state = "vault" }, /area/turret_protected/ai) "bjW" = ( @@ -35674,8 +31305,8 @@ req_access_txt = "75" }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 6 + dir = 6; + icon_state = "vault" }, /area/turret_protected/ai) "bjY" = ( @@ -35685,13 +31316,6 @@ }, /turf/simulated/floor/bluegrid, /area/turret_protected/ai) -"bjZ" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall11"; - icon_state = "swall11"; - dir = 2 - }, -/area/shuttle/arrival/station) "bka" = ( /obj/structure/table, /obj/item/storage/firstaid/regular{ @@ -35702,18 +31326,18 @@ dir = 1; in_use = 1 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) "bkb" = ( -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) "bkc" = ( /obj/machinery/computer/arcade, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) "bkd" = ( /obj/structure/closet/wardrobe/green, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) "bke" = ( /obj/structure/closet/wardrobe/black, @@ -35726,7 +31350,7 @@ dir = 1; in_use = 1 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) "bkf" = ( /obj/structure/closet/wardrobe/mixed, @@ -35735,11 +31359,11 @@ icon_state = "map-right-MS"; pixel_y = 32 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) "bkg" = ( /obj/structure/closet/wardrobe/grey, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) "bkh" = ( /obj/machinery/camera{ @@ -35751,23 +31375,12 @@ dir = 1; in_use = 1 }, -/turf/simulated/shuttle/floor, -/area/shuttle/arrival/station) -"bki" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall7"; - icon_state = "swall7"; - dir = 2 - }, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) "bkj" = ( /obj/item/crowbar, /obj/item/wrench, /obj/structure/table, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "cautioncorner" @@ -35775,11 +31388,9 @@ /area/hallway/primary/starboard) "bkk" = ( /obj/effect/spawner/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/storage/tools) "bkl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/table/reinforced, /obj/item/folder/red, /obj/item/folder/red, @@ -35789,8 +31400,8 @@ icon_state = "4-8" }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 8 + dir = 8; + icon_state = "red" }, /area/security/checkpoint2{ name = "Customs" @@ -35821,6 +31432,9 @@ d2 = 4; icon_state = "2-4" }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/security/checkpoint2{ name = "Customs" @@ -35832,15 +31446,17 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, /turf/simulated/floor/plasteel, /area/security/checkpoint2{ name = "Customs" }) "bkp" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -35851,22 +31467,30 @@ 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 + }, /turf/simulated/floor/plasteel, /area/security/checkpoint2{ name = "Customs" }) "bkq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 4 + dir = 4; + icon_state = "red" }, /area/security/checkpoint2{ name = "Customs" @@ -35876,9 +31500,6 @@ name = "Security Maintenance"; req_access_txt = "1" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -35901,9 +31522,6 @@ /turf/simulated/floor/plating, /area/maintenance/starboard) "bkt" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, /obj/machinery/light/small{ dir = 8 }, @@ -35922,9 +31540,6 @@ name = "\improper Cargo Office" }) "bkv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, /obj/machinery/light/small{ dir = 4 }, @@ -35943,11 +31558,9 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 - }, /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/engine/engineering) "bkx" = ( @@ -35958,6 +31571,10 @@ /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" @@ -35970,6 +31587,7 @@ req_access_txt = 1 }, /obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry{ name = "Arrivals" @@ -35991,6 +31609,7 @@ dir = 4; network = list("SS13") }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "brown" @@ -36004,17 +31623,11 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, /turf/simulated/floor/plasteel, /area/quartermaster/office{ name = "\improper Cargo Office" }) "bkB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, /mob/living/simple_animal/pet/sloth/paperwork, /turf/simulated/floor/plasteel, /area/quartermaster/office{ @@ -36071,29 +31684,20 @@ /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" }, /area/hallway/primary/central) -"bkJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "neutralcorner" - }, -/area/hallway/primary/central) "bkK" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 - }, /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" @@ -36109,7 +31713,6 @@ /turf/simulated/floor/plating, /area/janitor) "bkM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -36118,6 +31721,9 @@ d2 = 4; icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -36135,6 +31741,9 @@ dir = 4; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -36155,6 +31764,9 @@ /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" = ( @@ -36169,6 +31781,9 @@ /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" @@ -36195,15 +31810,13 @@ 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" }) -"bkR" = ( -/obj/effect/spawner/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plating, -/area/storage/tools) "bkS" = ( /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ @@ -36214,6 +31827,7 @@ "bkT" = ( /obj/structure/closet/toolcloset, /obj/effect/decal/warning_stripes/yellow, +/obj/item/clothing/glasses/meson/engine, /turf/simulated/floor/plasteel, /area/engine/engineering) "bkU" = ( @@ -36221,7 +31835,6 @@ codes_txt = "patrol;next_patrol=13.3-Engineering-Central"; location = "13.2-Tcommstore" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/yellow, /turf/simulated/floor/plasteel{ dir = 2; @@ -36229,11 +31842,8 @@ }, /area/hallway/primary/starboard) "bkV" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/engine, /area/engine/mechanic_workshop) @@ -36276,11 +31886,10 @@ /obj/effect/landmark/start{ name = "Captain" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/chair/comfy/brown{ - tag = "icon-comfychair (WEST)"; + dir = 8; icon_state = "comfychair"; - dir = 8 + tag = "icon-comfychair (WEST)" }, /turf/simulated/floor/carpet, /area/crew_quarters/captain{ @@ -36319,7 +31928,6 @@ name = "\improper Captain's Quarters" }) "blf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/alarm{ dir = 4; icon_state = "alarm0"; @@ -36334,6 +31942,7 @@ /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" @@ -36341,9 +31950,12 @@ /area/hallway/primary/central) "blh" = ( /obj/structure/closet/wardrobe/pjs, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 1 + dir = 1; + icon_state = "neutral" }, /area/hallway/secondary/construction{ name = "\improper Garden" @@ -36353,24 +31965,23 @@ /turf/simulated/floor/plating, /area/engine/mechanic_workshop) "blj" = ( -/obj/machinery/door/firedoor, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/machinery/door/airlock/engineering/glass{ - name = "Mechanic Workshop"; - req_access_txt = "70" - }, -/turf/simulated/floor/plasteel, -/area/engine/mechanic_workshop) -"blk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 + dir = 8 }, -/turf/simulated/floor/plasteel, -/area/engine/break_room) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4; + level = 1 + }, +/turf/simulated/floor/plasteel{ + dir = 5; + icon_state = "vault" + }, +/area/engine/mechanic_workshop) "bll" = ( /obj/structure/closet/emcloset, /obj/structure/sign/double/map/left{ @@ -36378,8 +31989,8 @@ pixel_y = 32 }, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/hallway/primary/starboard) "blm" = ( @@ -36390,8 +32001,8 @@ }, /obj/structure/closet/firecloset, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/hallway/primary/starboard) "bln" = ( @@ -36409,10 +32020,6 @@ "blo" = ( /turf/simulated/wall, /area/hallway/primary/starboard) -"blp" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/wall, -/area/storage/tech) "blq" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/engineering{ @@ -36426,68 +32033,29 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - tag = "icon-vault (WEST)"; + dir = 8; icon_state = "vault"; - dir = 8 + tag = "icon-vault (WEST)" }, /area/storage/tech) "blr" = ( /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/maintenance/incinerator) -"bls" = ( -/obj/structure/shuttle/engine/propulsion{ - dir = 8; - icon_state = "propulsion"; - tag = "icon-propulsion (EAST)" - }, -/turf/space, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f6"; - dir = 2 - }, -/area/shuttle/transport) "blt" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /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/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/engine/engineering) -"blu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "brown" - }, -/area/hallway/primary/port) -"blv" = ( -/obj/effect/spawner/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plating, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) -"blw" = ( -/obj/structure/shuttle/engine/propulsion{ - dir = 8; - icon_state = "propulsion"; - tag = "icon-propulsion (EAST)" - }, -/turf/space, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f5"; - dir = 2 - }, -/area/shuttle/transport) "blx" = ( /obj/effect/spawner/window/reinforced, /obj/structure/disposalpipe/segment, @@ -36501,18 +32069,10 @@ on = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/engine/break_room) -"blz" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall_f10"; - layer = 2 - }, -/area/shuttle/pod_4) "blA" = ( /obj/item/radio/intercom{ pixel_y = 25 @@ -36520,12 +32080,11 @@ /obj/structure/chair/comfy/shuttle{ dir = 4 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/pod_4) "blB" = ( -/obj/structure/shuttle/window, -/obj/structure/grille, -/turf/simulated/shuttle/plating, +/obj/effect/spawner/window/shuttle, +/turf/simulated/floor/plating, /area/shuttle/pod_4) "blC" = ( /obj/effect/spawner/window, @@ -36551,8 +32110,8 @@ /area/turret_protected/ai) "blE" = ( /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/construction/hallway{ name = "\improper MiniSat Exterior" @@ -36588,10 +32147,6 @@ icon_state = "vault" }, /area/turret_protected/ai) -"blH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/wall/r_wall, -/area/turret_protected/ai) "blI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/item/radio/intercom{ @@ -36604,6 +32159,7 @@ layer = 4; pixel_x = -32 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -36629,8 +32185,8 @@ pixel_x = -23 }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 1 + dir = 1; + icon_state = "vault" }, /area/turret_protected/ai) "blL" = ( @@ -36684,10 +32240,6 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - on = 1 - }, /obj/machinery/light/small{ dir = 4; pixel_y = 8 @@ -36697,36 +32249,26 @@ dir = 8; network = list("SS13","MiniSat") }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/construction/hallway{ name = "\improper MiniSat Exterior" }) -"blO" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall3"; - dir = 2 - }, -/area/shuttle/arrival/station) "blP" = ( /obj/machinery/light{ dir = 1; in_use = 1 }, /obj/structure/chair/comfy/shuttle, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) "blQ" = ( /obj/structure/chair/comfy/shuttle, -/turf/simulated/shuttle/floor, -/area/shuttle/arrival/station) -"blR" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall3"; - icon_state = "swall3"; - dir = 2 - }, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) "blS" = ( /obj/effect/landmark{ @@ -36735,24 +32277,24 @@ /obj/structure/chair/comfy/shuttle{ dir = 8 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium, /area/shuttle/arrival/station) "blT" = ( /obj/effect/landmark{ name = "JoinLate" }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) "blU" = ( /obj/structure/shuttle/engine/heater{ - tag = "icon-heater (EAST)"; + dir = 4; icon_state = "heater"; - dir = 4 + tag = "icon-heater (EAST)" }, /obj/structure/window/reinforced{ dir = 8 }, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/shuttle/arrival/station) "blV" = ( /obj/structure/shuttle/engine/propulsion{ @@ -36760,13 +32302,12 @@ icon_state = "burst_r"; tag = "icon-burst_r (WEST)" }, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/shuttle/arrival/station) "blW" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/light{ - icon_state = "tube1"; - dir = 4 + dir = 4; + icon_state = "tube1" }, /obj/structure/cable/yellow{ d1 = 1; @@ -36786,14 +32327,13 @@ icon_state = "alarm0"; pixel_x = -22 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/closet, /obj/item/crowbar, /obj/item/flash, /obj/item/radio, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 10 + dir = 10; + icon_state = "red" }, /area/security/checkpoint2{ name = "Customs" @@ -36813,6 +32353,12 @@ req_access_txt = "0"; req_one_access_txt = "1;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" }, @@ -36826,6 +32372,8 @@ 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" }, @@ -36854,8 +32402,8 @@ pixel_x = 24 }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 6 + dir = 6; + icon_state = "red" }, /area/security/checkpoint2{ name = "Customs" @@ -36874,9 +32422,6 @@ }) "bme" = ( /obj/machinery/space_heater, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, /obj/structure/disposalpipe/wrapsortjunction{ dir = 1 }, @@ -36919,13 +32464,14 @@ name = "Engine Room"; req_access_txt = "10" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /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/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/engine/engineering) "bmi" = ( @@ -36936,11 +32482,8 @@ }, /area/hallway/primary/port) "bmj" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /turf/simulated/floor/plasteel, /area/quartermaster/office{ @@ -36950,6 +32493,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, /turf/simulated/floor/plasteel, /area/quartermaster/office{ name = "\improper Cargo Office" @@ -36960,7 +32506,11 @@ pixel_y = 24 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 + dir = 1; + level = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/plasteel, /area/quartermaster/office{ @@ -36975,15 +32525,12 @@ dir = 4; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 5 + dir = 5; + icon_state = "vault" }, /area/engine/chiefs_office) "bmn" = ( @@ -36993,6 +32540,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/quartermaster/office{ name = "\improper Cargo Office" @@ -37019,6 +32569,10 @@ d2 = 4; icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 2; + initialize_directions = 11 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "brown" @@ -37040,6 +32594,9 @@ d2 = 8; icon_state = "1-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/plasteel, /area/quartermaster/office{ name = "\improper Cargo Office" @@ -37053,6 +32610,9 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/plasteel, /area/quartermaster/office{ name = "\improper Cargo Office" @@ -37070,6 +32630,9 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/plasteel, /area/quartermaster/office{ name = "\improper Cargo Office" @@ -37087,6 +32650,9 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "brown" @@ -37117,6 +32683,9 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "brown" @@ -37126,7 +32695,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -37135,6 +32703,9 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/plasteel, /area/hallway/primary/port) "bmx" = ( @@ -37149,6 +32720,9 @@ /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" = ( @@ -37185,6 +32759,7 @@ req_access_txt = "0" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/maintenance/starboard) "bmC" = ( @@ -37228,13 +32803,16 @@ /obj/machinery/newscaster{ pixel_x = 30 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 5 + dir = 5; + icon_state = "vault" }, /area/engine/chiefs_office) "bmF" = ( -/obj/item/tank/air, +/obj/item/tank/internals/air, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/maintenance/maintcentral{ @@ -37261,16 +32839,6 @@ /area/construction/hallway{ name = "\improper MiniSat Exterior" }) -"bmI" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2; - initialize_directions = 11 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "redcorner" - }, -/area/security/brig) "bmJ" = ( /obj/structure/table, /obj/item/storage/toolbox/mechanical{ @@ -37292,7 +32860,6 @@ pixel_x = -2; pixel_y = -1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/item/assembly/signaler, /obj/item/multitool{ pixel_x = 4 @@ -37303,9 +32870,6 @@ }, /area/storage/primary) "bmL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/light, /obj/machinery/atm{ pixel_y = -32 @@ -37341,6 +32905,7 @@ 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" @@ -37354,8 +32919,8 @@ }, /obj/structure/closet/secure_closet/security, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 5 + dir = 5; + icon_state = "red" }, /area/security/checkpoint2{ name = "Customs" @@ -37395,8 +32960,8 @@ pixel_y = 30 }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 1 + dir = 1; + icon_state = "red" }, /area/security/checkpoint2{ name = "Customs" @@ -37434,9 +32999,6 @@ pixel_y = -25 }, /obj/structure/table/wood, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, /obj/item/reagent_containers/food/drinks/flask/gold, /obj/item/razor{ pixel_x = -4; @@ -37448,11 +33010,8 @@ name = "\improper Captain's Quarters" }) "bmW" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/carpet, /area/crew_quarters/captain{ @@ -37463,6 +33022,9 @@ 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" @@ -37518,6 +33080,9 @@ dir = 2; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "yellowcorner" @@ -37531,6 +33096,9 @@ /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" @@ -37540,6 +33108,9 @@ /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" @@ -37547,7 +33118,10 @@ /area/hallway/primary/starboard) "bnf" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -37555,10 +33129,12 @@ }, /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/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "yellowcorner" @@ -37571,6 +33147,9 @@ /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" @@ -37585,6 +33164,9 @@ dir = 2; network = list("SS13") }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "yellowcorner" @@ -37599,6 +33181,9 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "yellowcorner" @@ -37609,6 +33194,9 @@ dir = 4 }, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "yellowcorner" @@ -37622,6 +33210,9 @@ /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" @@ -37635,6 +33226,9 @@ dir = 2; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "yellowcorner" @@ -37650,6 +33244,9 @@ /obj/machinery/light{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "yellowcorner" @@ -37659,6 +33256,9 @@ /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" @@ -37671,6 +33271,9 @@ /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" @@ -37687,6 +33290,7 @@ /obj/structure/extinguisher_cabinet{ pixel_x = -27 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "brown" @@ -37698,6 +33302,9 @@ /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" @@ -37711,6 +33318,9 @@ 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" @@ -37730,10 +33340,7 @@ dir = 1; network = list("SS13") }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2; - initialize_directions = 11 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "redcorner" @@ -37752,8 +33359,8 @@ amount = 100000 }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 4 + dir = 4; + icon_state = "vault" }, /area/security/nuke_storage) "bnw" = ( @@ -37766,28 +33373,45 @@ 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{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "yellow" }, /area/engine/break_room) "bny" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, /obj/structure/disposalpipe/junction{ - tag = "icon-pipe-j2"; + dir = 2; icon_state = "pipe-j2"; - dir = 2 + tag = "icon-pipe-j2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -37809,7 +33433,6 @@ layer = 4; pixel_y = 32 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/table/wood, /obj/item/pinpointer, /obj/item/disk/nuclear, @@ -37817,18 +33440,6 @@ /area/crew_quarters/captain{ name = "\improper Captain's Quarters" }) -"bnB" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "yellow" - }, -/area/engine/break_room) "bnC" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/yellow{ @@ -37836,30 +33447,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - level = 1 - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "yellow" - }, -/area/engine/break_room) -"bnD" = ( -/obj/machinery/disposal{ - pixel_x = 2; - pixel_y = 2 - }, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "yellow" - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plasteel, /area/engine/break_room) "bnE" = ( /obj/machinery/light_switch{ @@ -37880,10 +33469,10 @@ icon_state = "propulsion"; tag = "icon-propulsion (WEST)" }, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/shuttle/arrival/station) "bnG" = ( -/obj/machinery/door/airlock/shuttle{ +/obj/machinery/door/airlock/titanium{ name = "Escape Pod Airlock" }, /obj/docking_port/mobile/pod{ @@ -37891,14 +33480,7 @@ id = "pod4"; name = "escape pod 4" }, -/turf/simulated/shuttle/floor, -/area/shuttle/pod_4) -"bnH" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f9"; - dir = 2 - }, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/pod_4) "bnI" = ( /obj/machinery/door/airlock/external{ @@ -37922,7 +33504,6 @@ /obj/machinery/light_switch{ pixel_y = -28 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -37930,8 +33511,8 @@ "bnK" = ( /obj/machinery/light/small, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/construction/hallway{ name = "\improper MiniSat Exterior" @@ -37955,8 +33536,8 @@ pixel_y = -28 }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 5 + dir = 5; + icon_state = "vault" }, /area/engine/chiefs_office) "bnN" = ( @@ -38025,8 +33606,8 @@ dir = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/construction/hallway{ name = "\improper MiniSat Exterior" @@ -38043,7 +33624,7 @@ /obj/effect/landmark{ name = "Observer-Start" }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) "bnW" = ( /obj/structure/closet/crate, @@ -38064,7 +33645,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor, /turf/simulated/floor/plasteel{ dir = 4; @@ -38076,21 +33656,10 @@ "bnY" = ( /obj/structure/sign/pods, /turf/simulated/wall, -/area/security/checkpoint2{ - name = "Customs" - }) -"bnZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/turf/simulated/wall, /area/security/checkpoint2{ name = "Customs" }) "boa" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/door/airlock/security{ name = "Customs Desk"; req_access = null; @@ -38113,8 +33682,8 @@ pixel_y = -26 }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 5 + dir = 5; + icon_state = "vault" }, /area/engine/chiefs_office) "boc" = ( @@ -38133,9 +33702,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, /obj/machinery/door/airlock/maintenance{ req_access_txt = "0"; req_one_access_txt = "12;48;50;1" @@ -38145,7 +33711,6 @@ name = "Port Maintenance" }) "boe" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, /turf/simulated/wall, /area/maintenance/fpmaint2{ @@ -38160,13 +33725,14 @@ opacity = 0 }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /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/break_room) "bog" = ( @@ -38191,6 +33757,7 @@ }) "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" @@ -38223,8 +33790,8 @@ }, /obj/item/rcs, /turf/simulated/floor/plasteel{ - icon_state = "arrival"; - dir = 4 + dir = 4; + icon_state = "arrival" }, /area/quartermaster/office{ name = "\improper Cargo Office" @@ -38243,8 +33810,8 @@ pixel_y = -30 }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 5 + dir = 5; + icon_state = "vault" }, /area/engine/chiefs_office) "bon" = ( @@ -38277,20 +33844,11 @@ }, /turf/simulated/floor/plasteel, /area/hallway/primary/port) -"bor" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/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{ - dir = 8; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /obj/structure/cable/yellow{ d1 = 1; @@ -38330,8 +33888,8 @@ /area/janitor) "bow" = ( /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/machinery/power/apc{ aidisabled = 0; @@ -38364,13 +33922,6 @@ /area/maintenance/maintcentral{ name = "Central Maintenance" }) -"boA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/spawner/window, -/turf/simulated/floor/plating, -/area/civilian/barber) "boB" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -38433,8 +33984,8 @@ pixel_y = 21 }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/turret_protected/ai) "boI" = ( @@ -38541,9 +34092,10 @@ req_access_txt = 1 }, /obj/structure/disposalpipe/junction{ - icon_state = "pipe-j2"; - dir = 4 + dir = 4; + icon_state = "pipe-j2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "neutralcorner" @@ -38595,21 +34147,8 @@ d2 = 8; icon_state = "2-8" }, -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "neutralcorner" - }, -/area/hallway/primary/starboard) -"boT" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "neutralcorner" @@ -38698,26 +34237,6 @@ icon_state = "neutralcorner" }, /area/hallway/primary/starboard) -"boZ" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "neutralcorner" - }, -/area/hallway/primary/starboard) "bpa" = ( /obj/structure/cable/yellow{ d1 = 4; @@ -38728,6 +34247,7 @@ 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" @@ -38748,21 +34268,6 @@ icon_state = "neutralcorner" }, /area/hallway/primary/starboard) -"bpc" = ( -/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, -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "neutralcorner" - }, -/area/hallway/primary/starboard) "bpd" = ( /obj/structure/cable/yellow{ d1 = 4; @@ -38778,6 +34283,7 @@ d2 = 4; icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "neutralcorner" @@ -38822,6 +34328,7 @@ 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" @@ -38836,9 +34343,6 @@ }, /area/turret_protected/ai) "bpi" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -38851,9 +34355,6 @@ dir = 4; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -38866,10 +34367,6 @@ dir = 8; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2; - initialize_directions = 11 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -38882,13 +34379,6 @@ }, /turf/simulated/floor/plasteel, /area/engine/break_room) -"bpl" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 4; - icon_state = "diagonalWall3" - }, -/area/maintenance/starboard) "bpm" = ( /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel, @@ -38945,7 +34435,9 @@ name = "\improper Cargo Office" }) "bpt" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -38956,26 +34448,18 @@ }, /turf/simulated/floor/bluegrid, /area/turret_protected/ai) -"bpv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/turf/simulated/wall/r_wall, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) "bpw" = ( /obj/machinery/light, /obj/structure/chair/comfy/shuttle{ dir = 1 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) "bpx" = ( /obj/structure/chair/comfy/shuttle{ dir = 1 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) "bpy" = ( /obj/machinery/conveyor_switch/oneway{ @@ -38984,8 +34468,8 @@ pixel_y = 12 }, /obj/machinery/light{ - icon_state = "tube1"; - dir = 4 + dir = 4; + icon_state = "tube1" }, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel, @@ -38993,15 +34477,11 @@ name = "\improper Cargo Office" }) "bpz" = ( -/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{ dir = 4; icon_state = "whitecorner" @@ -39010,12 +34490,9 @@ name = "Arrivals" }) "bpA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel{ - icon_state = "arrival"; - dir = 5 + dir = 5; + icon_state = "arrival" }, /area/hallway/secondary/entry{ name = "Arrivals" @@ -39025,12 +34502,12 @@ dir = 4 }, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/plasteel, /area/hallway/primary/port) "bpC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "neutral" @@ -39038,12 +34515,12 @@ /area/hallway/primary/port) "bpD" = ( /obj/effect/decal/warning_stripes/yellow/partial{ - icon_state = "3"; - dir = 4 + dir = 4; + icon_state = "3" }, /obj/effect/decal/warning_stripes/arrow{ - icon_state = "4"; - dir = 4 + dir = 4; + icon_state = "4" }, /turf/simulated/floor/plasteel, /area/quartermaster/office{ @@ -39060,6 +34537,9 @@ 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" @@ -39072,6 +34552,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/quartermaster/office{ name = "\improper Cargo Office" @@ -39085,29 +34568,33 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 9 + dir = 9; + icon_state = "neutral" }, /area/hallway/primary/port) "bpH" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, /obj/structure/sign/double/map/left{ desc = "A framed picture of the station. Clockwise from security at the top (red), you see engineering (yellow), science (purple), escape (red and white), medbay (green), arrivals (blue and white), and finally cargo (brown)."; icon_state = "map-left-MS"; pixel_y = 32 }, /obj/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{ - icon_state = "neutral"; - dir = 1 + dir = 1; + icon_state = "neutral" }, /area/hallway/primary/port) "bpI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atm{ pixel_x = 32 }, @@ -39149,11 +34636,16 @@ name = "\improper Cargo Office" }) "bpL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /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" @@ -39162,7 +34654,13 @@ name = "\improper Cargo Office" }) "bpM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/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" @@ -39250,8 +34748,8 @@ }, /obj/item/hand_labeler, /turf/simulated/floor/plasteel{ - icon_state = "arrival"; - dir = 6 + dir = 6; + icon_state = "arrival" }, /area/quartermaster/office{ name = "\improper Cargo Office" @@ -39322,7 +34820,6 @@ }, /area/bridge) "bpW" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/hologram/holopad, /turf/simulated/floor/plasteel{ dir = 8; @@ -39342,6 +34839,7 @@ d2 = 4; icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "browncorner" @@ -39382,13 +34880,13 @@ "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/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor, /turf/simulated/floor/plasteel{ dir = 2; @@ -39465,9 +34963,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plating, /area/maintenance/fpmaint2{ @@ -39490,9 +34985,9 @@ pixel_x = -1 }, /obj/machinery/shower{ - tag = "icon-shower (EAST)"; + dir = 4; icon_state = "shower"; - dir = 4 + tag = "icon-shower (EAST)" }, /obj/machinery/door/window/westright{ dir = 4 @@ -39565,6 +35060,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood, /area/crew_quarters/captain{ name = "\improper Captain's Quarters" @@ -39586,16 +35082,6 @@ /area/crew_quarters/captain{ name = "\improper Captain's Quarters" }) -"bqt" = ( -/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) "bqu" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -39606,9 +35092,6 @@ codes_txt = "patrol;next_patrol=13.1-Engineering-Enter"; location = "12-Central-Starboard" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/hallway/primary/central) @@ -39616,18 +35099,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ req_access_txt = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "yellowcorner" }, /area/hallway/primary/central) "bqw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ name = "Starboard Primary Hallway" @@ -39638,34 +35116,25 @@ }, /area/hallway/primary/starboard) "bqx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "cautioncorner" }, /area/hallway/primary/starboard) "bqy" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 - }, /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 = "cautioncorner" }, /area/hallway/primary/starboard) "bqz" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2; - initialize_directions = 11 - }, /obj/structure/sign/barber{ pixel_y = -28 }, @@ -39675,9 +35144,6 @@ }, /area/hallway/primary/starboard) "bqA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -29 @@ -39701,15 +35167,15 @@ d2 = 2; icon_state = "0-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "yellowcorner" }, /area/hallway/primary/starboard) "bqC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/door/firedoor, /turf/simulated/floor/plasteel{ dir = 8; @@ -39717,9 +35183,6 @@ }, /area/hallway/primary/starboard) "bqD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; @@ -39727,10 +35190,6 @@ }, /area/hallway/primary/starboard) "bqE" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2; - initialize_directions = 11 - }, /obj/machinery/firealarm{ dir = 1; pixel_y = -24 @@ -39745,46 +35204,22 @@ icon_state = "cautioncorner" }, /area/hallway/primary/starboard) -"bqF" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "cautioncorner" - }, -/area/hallway/primary/starboard) "bqG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "cautioncorner" - }, -/area/hallway/primary/starboard) -"bqH" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2; - initialize_directions = 11 - }, +/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/scrubbers{ - dir = 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/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "cautioncorner" @@ -39792,9 +35227,6 @@ /area/hallway/primary/starboard) "bqJ" = ( /obj/machinery/light, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/camera{ c_tag = "Starboard Primary Hallway - Engineering"; dir = 1; @@ -39806,10 +35238,6 @@ }, /area/hallway/primary/starboard) "bqK" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 - }, /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=13.2-Tcommstore"; location = "13.1-Engineering-Enter" @@ -39826,19 +35254,14 @@ icon_state = "1-2" }, /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) "bqM" = ( -/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 = 4; icon_state = "cautioncorner" @@ -39854,9 +35277,8 @@ d2 = 2; icon_state = "1-2" }, -/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, /area/engine/break_room) "bqP" = ( @@ -39884,6 +35306,9 @@ /obj/structure/chair/stool{ pixel_y = 8 }, +/obj/effect/landmark/start{ + name = "Station Engineer" + }, /turf/simulated/floor/plasteel, /area/engine/break_room) "bqT" = ( @@ -39893,10 +35318,16 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/engine/break_room) "bqU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, /turf/simulated/floor/plasteel, /area/engine/break_room) "bqV" = ( @@ -39932,6 +35363,9 @@ 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/office{ name = "\improper Cargo Office" @@ -39943,9 +35377,9 @@ }, /obj/item/pen/multi, /obj/machinery/light/small{ - tag = "icon-bulb1 (WEST)"; + dir = 8; icon_state = "bulb1"; - dir = 8 + tag = "icon-bulb1 (WEST)" }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -39953,8 +35387,8 @@ /area/turret_protected/ai) "bqY" = ( /obj/structure/transit_tube{ - tag = "icon-D-SE"; - icon_state = "D-SE" + icon_state = "D-SE"; + tag = "icon-D-SE" }, /turf/space, /area/space/nearstation) @@ -39965,6 +35399,9 @@ /obj/machinery/ai_slipper{ icon_state = "motion0" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, /turf/simulated/floor/bluegrid, /area/turret_protected/ai) "bra" = ( @@ -39974,9 +35411,9 @@ }, /obj/item/pen/multi, /obj/machinery/light/small{ - tag = "icon-bulb1 (EAST)"; + dir = 4; icon_state = "bulb1"; - dir = 4 + tag = "icon-bulb1 (EAST)" }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -39994,6 +35431,12 @@ 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" @@ -40009,8 +35452,8 @@ }) "brd" = ( /obj/structure/transit_tube{ - tag = "icon-D-SW"; - icon_state = "D-SW" + icon_state = "D-SW"; + tag = "icon-D-SW" }, /obj/structure/window/reinforced, /turf/space, @@ -40072,16 +35515,14 @@ }) "brl" = ( /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /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" }) "brm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/ai_status_display{ pixel_y = -32 }, @@ -40101,25 +35542,17 @@ icon_state = "dark" }, /area/turret_protected/ai) -"bro" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - tag = "icon-swall_f5"; - icon_state = "swall_f5"; - dir = 2 - }, -/area/shuttle/arrival/station) "brp" = ( /obj/structure/closet/emcloset, /obj/machinery/light, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) "brq" = ( /obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -29 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) "brr" = ( /obj/structure/sign/double/map/left{ @@ -40128,7 +35561,7 @@ pixel_y = -32 }, /obj/machinery/light, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) "brs" = ( /obj/structure/sign/double/map/right{ @@ -40136,7 +35569,7 @@ icon_state = "map-right-MS"; pixel_y = -32 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) "brt" = ( /obj/machinery/requests_console{ @@ -40144,7 +35577,7 @@ pixel_y = -30 }, /obj/machinery/light, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) "bru" = ( /obj/structure/shuttle/engine/propulsion{ @@ -40152,7 +35585,7 @@ icon_state = "burst_l"; tag = "icon-burst_l (WEST)" }, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/shuttle/arrival/station) "brv" = ( /obj/structure/cable/yellow{ @@ -40165,7 +35598,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry{ name = "Arrivals" @@ -40253,8 +35685,8 @@ icon_state = "4-8" }, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 6 + dir = 6; + icon_state = "neutral" }, /area/hallway/primary/port) "brD" = ( @@ -40268,12 +35700,9 @@ d2 = 4; icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 10 + dir = 10; + icon_state = "neutral" }, /area/hallway/primary/port) "brE" = ( @@ -40282,9 +35711,6 @@ d2 = 8; icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; @@ -40293,9 +35719,10 @@ /area/hallway/primary/port) "brF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 4 + dir = 4; + icon_state = "neutral" }, /area/hallway/primary/port) "brG" = ( @@ -40328,6 +35755,7 @@ "brI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/hologram/holopad, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -40347,12 +35775,12 @@ pixel_y = 18 }, /obj/effect/decal/warning_stripes/yellow/partial{ - icon_state = "3"; - dir = 4 + dir = 4; + icon_state = "3" }, /obj/effect/decal/warning_stripes/arrow{ - icon_state = "4"; - dir = 4 + dir = 4; + icon_state = "4" }, /turf/simulated/floor/plasteel, /area/quartermaster/office{ @@ -40360,7 +35788,6 @@ }) "brL" = ( /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "brown" @@ -40375,6 +35802,7 @@ icon_state = "1-2" }, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "brown" @@ -40393,7 +35821,6 @@ name = "\improper Captain's Quarters" }) "brO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/light{ dir = 4 }, @@ -40420,8 +35847,13 @@ dir = 4; pixel_x = -23 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /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" @@ -40465,18 +35897,16 @@ }, /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry{ name = "Arrivals" }) "brV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 1 + dir = 1; + icon_state = "neutral" }, /area/hallway/primary/port) "brW" = ( @@ -40512,11 +35942,8 @@ }, /area/bridge) "brZ" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /obj/structure/cable/yellow{ d1 = 1; @@ -40658,6 +36085,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/carpet, /area/crew_quarters/captain{ name = "\improper Captain's Quarters" @@ -40690,6 +36118,7 @@ /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" @@ -40706,7 +36135,6 @@ }) "bso" = ( /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -40715,6 +36143,8 @@ /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" = ( @@ -40727,10 +36157,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/maintenance/starboard) -"bsr" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/wall, -/area/maintenance/starboard) "bss" = ( /obj/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -40759,15 +36185,9 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/maintenance/starboard) -"bsu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "cautioncorner" - }, -/area/hallway/primary/starboard) "bsv" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -40802,6 +36222,9 @@ /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" @@ -40817,9 +36240,6 @@ name = "Arrivals" }) "bsy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 8; @@ -40828,6 +36248,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 + }, /turf/simulated/floor/plasteel, /area/engine/break_room) "bsz" = ( @@ -40835,22 +36262,9 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, -/turf/simulated/floor/plasteel, -/area/engine/break_room) -"bsA" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/plasteel, -/area/engine/break_room) -"bsB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, /turf/simulated/floor/plasteel, @@ -40869,12 +36283,15 @@ 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{ - dir = 1; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /obj/machinery/light/small, /obj/item/radio/intercom{ @@ -40886,15 +36303,13 @@ /turf/simulated/floor/plating, /area/janitor) "bsF" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 +/obj/structure/disposalpipe/sortjunction, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8; + initialize_directions = 11 }, -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4" +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 }, /turf/simulated/floor/plasteel, /area/engine/engineering) @@ -40926,14 +36341,15 @@ pixel_x = -28 }, /obj/item/card/id/captains_spare, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood, /area/crew_quarters/captain{ name = "\improper Captain's Quarters" }) "bsI" = ( /obj/structure/transit_tube{ - tag = "icon-E-SW"; - icon_state = "E-SW" + icon_state = "E-SW"; + tag = "icon-E-SW" }, /obj/structure/window/reinforced{ dir = 8 @@ -40948,16 +36364,16 @@ /area/space/nearstation) "bsK" = ( /obj/structure/transit_tube{ - tag = "icon-W-SE"; - icon_state = "W-SE" + icon_state = "W-SE"; + tag = "icon-W-SE" }, /obj/structure/lattice, /turf/space, /area/space/nearstation) "bsL" = ( /obj/structure/transit_tube{ - tag = "icon-D-SW"; - icon_state = "D-SW" + icon_state = "D-SW"; + tag = "icon-D-SW" }, /turf/space, /area/space/nearstation) @@ -40968,9 +36384,11 @@ }) "bsN" = ( /obj/structure/transit_tube{ - tag = "icon-D-NW"; - icon_state = "D-NW" + icon_state = "D-NW"; + tag = "icon-D-NW" }, +/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/simple/visible/yellow, /turf/space, /area/space/nearstation) "bsO" = ( @@ -41050,7 +36468,6 @@ name = "\improper MiniSat Exterior" }) "bsV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/extinguisher_cabinet{ pixel_x = -27 }, @@ -41066,9 +36483,9 @@ }, /obj/machinery/computer/teleporter, /turf/simulated/floor/plasteel{ - tag = "icon-vault (EAST)"; + dir = 4; icon_state = "vault"; - dir = 4 + tag = "icon-vault (EAST)" }, /area/turret_protected/tcomfoyer{ name = "\improper MiniSat Teleporter Foyer" @@ -41076,18 +36493,14 @@ "bsX" = ( /obj/machinery/teleport/hub, /turf/simulated/floor/plasteel{ - tag = "icon-vault (EAST)"; + dir = 4; icon_state = "vault"; - dir = 4 + tag = "icon-vault (EAST)" }, /area/turret_protected/tcomfoyer{ name = "\improper MiniSat Teleporter Foyer" }) "bsY" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 - }, /obj/structure/cable/yellow{ d1 = 2; d2 = 4; @@ -41096,10 +36509,11 @@ /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" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -41111,16 +36525,26 @@ pixel_y = -24; req_access_txt = "70" }, -/turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 5 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 }, -/area/engine/mechanic_workshop) -"bta" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4; level = 1 }, +/obj/structure/table, +/obj/item/pod_parts/core, +/obj/item/circuitboard/mecha/pod, +/obj/item/clothing/glasses/welding{ + pixel_y = 12 + }, +/turf/simulated/floor/plasteel{ + dir = 5; + icon_state = "vault" + }, +/area/engine/mechanic_workshop) +"bta" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/structure/cable/yellow{ d2 = 8; icon_state = "0-8" @@ -41130,13 +36554,28 @@ name = "Mechanic Workshop APC"; pixel_y = -25 }, +/obj/structure/table, +/obj/item/stack/sheet/mineral/plasma{ + amount = 30 + }, +/obj/item/stack/rods{ + amount = 50 + }, +/obj/item/stack/sheet/glass{ + amount = 50 + }, +/obj/item/stack/sheet/metal{ + amount = 50 + }, +/obj/machinery/cell_charger, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 5 + dir = 5; + icon_state = "vault" }, /area/engine/mechanic_workshop) "btb" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -41178,6 +36617,7 @@ name = "AI Chamber"; req_access_txt = "16" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -41191,8 +36631,8 @@ icon_state = "0-4" }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/turret_protected/tcomeast{ name = "\improper MiniSat East Wing" @@ -41204,8 +36644,8 @@ }, /obj/machinery/power/port_gen/pacman, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/turret_protected/tcomeast{ name = "\improper MiniSat East Wing" @@ -41219,33 +36659,12 @@ }, /obj/machinery/portable_atmospherics/canister/air, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/turret_protected/tcomeast{ name = "\improper MiniSat East Wing" }) -"bth" = ( -/obj/machinery/door/airlock/shuttle{ - name = "Arrivals Shuttle Airlock" - }, -/turf/simulated/shuttle/plating, -/area/shuttle/arrival/station) -"bti" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall13"; - icon_state = "swall13"; - dir = 2 - }, -/area/shuttle/arrival/station) -"btj" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - tag = "icon-swall_f9"; - icon_state = "swall_f9"; - dir = 2 - }, -/area/shuttle/arrival/station) "btk" = ( /obj/effect/spawner/window/reinforced, /obj/machinery/door/poddoor/shutters{ @@ -41260,17 +36679,6 @@ /obj/structure/cable/yellow, /turf/simulated/floor/plating, /area/blueshield) -"btl" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel, -/area/hallway/secondary/entry{ - name = "Arrivals" - }) "btm" = ( /turf/simulated/floor/plasteel{ dir = 4; @@ -41324,25 +36732,30 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/junction{ dir = 1; icon_state = "pipe-j1"; tag = "icon-pipe-j1 (EAST)" }, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 8 + dir = 8; + icon_state = "neutral" }, /area/hallway/primary/port) "btt" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, /obj/structure/disposalpipe/segment{ 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" @@ -41355,6 +36768,9 @@ /obj/machinery/firealarm{ pixel_y = 32 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -41364,14 +36780,20 @@ /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/manifold/hidden/supply{ - 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; @@ -41379,19 +36801,8 @@ }, /area/hallway/primary/port) "btx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "neutralcorner" - }, -/area/hallway/primary/port) -"bty" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -41409,6 +36820,9 @@ dir = 2; network = list("SS13") }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -41419,6 +36833,9 @@ dir = 4 }, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -41438,6 +36855,9 @@ /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" @@ -41448,6 +36868,9 @@ dir = 1 }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -41465,6 +36888,9 @@ /obj/machinery/light{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "neutral" @@ -41474,6 +36900,9 @@ /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" @@ -41483,7 +36912,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "browncorner" @@ -41499,20 +36930,12 @@ /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) -"btH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "browncorner" - }, -/area/hallway/primary/port) "btI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -41521,6 +36944,9 @@ /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" @@ -41530,6 +36956,9 @@ /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" @@ -41560,6 +36989,11 @@ 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" @@ -41834,6 +37268,7 @@ "bug" = ( /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" @@ -41864,7 +37299,6 @@ name = "\improper Captain's Quarters" }) "buj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/item/radio/intercom{ dir = 8; name = "Station Intercom (General)"; @@ -41881,9 +37315,8 @@ }, /area/hallway/primary/central) "buk" = ( -/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{ dir = 4; icon_state = "neutralcorner" @@ -41926,20 +37359,15 @@ }, /area/bridge) "bun" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 - }, -/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{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "barber" @@ -41990,13 +37418,17 @@ /turf/simulated/floor/wood, /area/crew_quarters/bar) "but" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1; + level = 1 + }, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 1 + dir = 1; + icon_state = "neutral" }, /area/hallway/primary/port) "buu" = ( @@ -42010,6 +37442,7 @@ }, /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" @@ -42037,19 +37470,6 @@ icon_state = "dark" }, /area/bridge) -"bux" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, -/obj/effect/decal/warning_stripes/west, -/turf/simulated/floor/plasteel, -/area/hallway/secondary/entry{ - name = "Arrivals" - }) "buy" = ( /obj/structure/closet/firecloset, /turf/simulated/floor/plating, @@ -42058,11 +37478,6 @@ /obj/structure/reagent_dispensers/fueltank, /turf/simulated/floor/plating, /area/maintenance/starboard) -"buA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/space_heater, -/turf/simulated/floor/plating, -/area/maintenance/starboard) "buB" = ( /obj/item/radio/off, /obj/effect/decal/warning_stripes/east, @@ -42088,6 +37503,7 @@ network = list("SS13") }, /obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry{ name = "Arrivals" @@ -42131,6 +37547,7 @@ icon_state = "pipe-c" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "cautioncorner" @@ -42144,12 +37561,10 @@ "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/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, /obj/effect/decal/warning_stripes/southwestcorner, /turf/simulated/floor/plasteel, /area/engine/break_room) @@ -42165,6 +37580,7 @@ d2 = 4; icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/engine/break_room) "buL" = ( @@ -42200,8 +37616,8 @@ }) "buO" = ( /obj/structure/transit_tube{ - tag = "icon-D-NE"; - icon_state = "D-NE" + icon_state = "D-NE"; + tag = "icon-D-NE" }, /obj/structure/window/reinforced{ dir = 4 @@ -42241,21 +37657,6 @@ /area/construction/hallway{ name = "\improper MiniSat Exterior" }) -"buR" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6; - level = 1 - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "darkbluecorners" - }, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) "buS" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/window/eastright{ @@ -42273,7 +37674,6 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/light_switch{ pixel_x = 23 }, @@ -42290,6 +37690,7 @@ pixel_x = 9; pixel_y = 2 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkbluecorners" @@ -42298,10 +37699,11 @@ name = "\improper MiniSat Exterior" }) "buU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/bluespace_beacon, +/obj/machinery/atmospherics/unary/vent_pump{ + dir = 8; + on = 1 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkbluecorners" @@ -42310,9 +37712,6 @@ name = "\improper MiniSat Teleporter Foyer" }) "buV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/extinguisher_cabinet{ pixel_y = -30 }, @@ -42329,15 +37728,17 @@ }, /obj/machinery/teleport/station, /turf/simulated/floor/plasteel{ - tag = "icon-vault (EAST)"; + dir = 4; icon_state = "vault"; - dir = 4 + tag = "icon-vault (EAST)" }, /area/turret_protected/tcomfoyer{ name = "\improper MiniSat Teleporter Foyer" }) "buX" = ( -/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkbluecorners" @@ -42346,13 +37747,10 @@ name = "\improper MiniSat Central Foyer" }) "buY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/light/small{ - tag = "icon-bulb1 (WEST)"; + dir = 8; icon_state = "bulb1"; - dir = 8 + tag = "icon-bulb1 (WEST)" }, /obj/machinery/light_switch{ pixel_x = -23 @@ -42362,6 +37760,9 @@ dir = 4; network = list("SS13","MiniSat") }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkbluecorners" @@ -42370,9 +37771,7 @@ name = "\improper MiniSat Central Foyer" }) "buZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, +/obj/machinery/atmospherics/unary/vent_pump, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkbluecorners" @@ -42381,11 +37780,12 @@ name = "\improper MiniSat Central Foyer" }) "bva" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/hologram/holopad, +/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" }, @@ -42407,18 +37807,14 @@ pixel_x = 25 }, /obj/machinery/light/small{ - tag = "icon-bulb1 (EAST)"; + dir = 4; icon_state = "bulb1"; - dir = 4 + tag = "icon-bulb1 (EAST)" }, /obj/structure/cable/yellow{ d2 = 2; icon_state = "0-2" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 - }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkbluecorners" @@ -42427,11 +37823,6 @@ name = "\improper MiniSat Central Foyer" }) "bvd" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11; - level = 1 - }, /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."; @@ -42449,17 +37840,14 @@ name = "\improper MiniSat Central Foyer" }) "bve" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/effect/decal/warning_stripes/north, /obj/machinery/power/terminal{ - icon_state = "term"; - dir = 1 + dir = 1; + icon_state = "term" }, /obj/machinery/camera/motion{ c_tag = "Mini Satellite Maintenance"; @@ -42472,6 +37860,9 @@ /obj/machinery/ai_slipper{ icon_state = "motion0" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -42479,10 +37870,6 @@ name = "\improper MiniSat East Wing" }) "bvf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5; - level = 1 - }, /obj/machinery/porta_turret{ dir = 8 }, @@ -42493,8 +37880,8 @@ pixel_x = -29 }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/turret_protected/aisat_interior{ name = "\improper MiniSat Central Foyer" @@ -42547,12 +37934,13 @@ 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" = ( /obj/structure/transit_tube{ - tag = "icon-S-NE"; - icon_state = "S-NE" + icon_state = "S-NE"; + tag = "icon-S-NE" }, /obj/structure/window/reinforced{ dir = 4 @@ -42561,10 +37949,10 @@ dir = 6 }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, -/area/space/nearstation) +/area/engine/break_room) "bvl" = ( /obj/effect/spawner/window/reinforced, /obj/machinery/door/poddoor/shutters{ @@ -42589,8 +37977,8 @@ pixel_x = 29 }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/turret_protected/aisat_interior{ name = "\improper MiniSat Central Foyer" @@ -42624,8 +38012,8 @@ icon_state = "2-8" }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/turret_protected/tcomeast{ name = "\improper MiniSat East Wing" @@ -42676,7 +38064,6 @@ }, /area/bridge) "bvs" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/status_display{ density = 0; layer = 4; @@ -42716,8 +38103,8 @@ /area/engine/break_room) "bvv" = ( /obj/structure/transit_tube{ - tag = "icon-D-SE"; - icon_state = "D-SE" + icon_state = "D-SE"; + tag = "icon-D-SE" }, /obj/structure/window/reinforced{ dir = 4 @@ -42731,11 +38118,8 @@ /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/space/nearstation) +/area/engine/break_room) "bvw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/alarm{ dir = 4; pixel_x = -25 @@ -42750,6 +38134,9 @@ pixel_x = -9; pixel_y = 2 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkbluecorners" @@ -42758,11 +38145,6 @@ name = "\improper MiniSat Teleporter Foyer" }) "bvx" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11; - level = 1 - }, /obj/machinery/ai_slipper{ icon_state = "motion0" }, @@ -42854,7 +38236,6 @@ d2 = 4; icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ d1 = 1; @@ -42862,8 +38243,8 @@ icon_state = "1-2" }, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 8 + dir = 8; + icon_state = "neutral" }, /area/hallway/primary/port) "bvG" = ( @@ -42876,6 +38257,8 @@ dir = 1; 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/port) "bvH" = ( @@ -42889,30 +38272,6 @@ }, /turf/simulated/floor/plasteel, /area/hallway/primary/port) -"bvI" = ( -/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, -/turf/simulated/floor/plasteel, -/area/hallway/primary/port) -"bvJ" = ( -/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, -/turf/simulated/floor/plasteel, -/area/hallway/primary/port) "bvK" = ( /obj/structure/cable/yellow{ d1 = 4; @@ -42987,18 +38346,7 @@ icon_state = "pipe-j1s"; sortType = 3 }, -/turf/simulated/floor/plasteel, -/area/hallway/primary/port) -"bvP" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/simulated/floor/plasteel, /area/hallway/primary/port) "bvQ" = ( @@ -43007,12 +38355,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 4; @@ -43022,6 +38364,9 @@ dir = 8; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, /turf/simulated/floor/plasteel, /area/hallway/primary/port) "bvR" = ( @@ -43051,6 +38396,10 @@ 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" = ( @@ -43064,24 +38413,12 @@ d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1; - scrub_Toxins = 0 - }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/plasteel, /area/hallway/primary/central) -"bvV" = ( -/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) "bvW" = ( /obj/structure/window/reinforced, /obj/structure/cable/yellow{ @@ -43094,9 +38431,6 @@ }, /area/bridge) "bvX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -43108,6 +38442,9 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -43148,21 +38485,13 @@ name = "\improper MiniSat East Wing" }) "bwa" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5; - level = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10; - initialize_directions = 10; - level = 1 - }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8" }, /obj/effect/decal/warning_stripes/north, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -43178,6 +38507,9 @@ 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" @@ -43314,7 +38646,6 @@ /obj/structure/extinguisher_cabinet{ pixel_x = -27 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "cautioncorner" @@ -43349,8 +38680,8 @@ }) "bwr" = ( /obj/structure/transit_tube{ - tag = "icon-D-NW"; - icon_state = "D-NW" + icon_state = "D-NW"; + tag = "icon-D-NW" }, /obj/structure/window/reinforced{ dir = 8 @@ -43385,6 +38716,7 @@ /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" @@ -43412,6 +38744,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -43419,12 +38752,12 @@ /area/hallway/primary/central) "bwy" = ( /obj/structure/transit_tube{ - tag = "icon-D-SE"; - icon_state = "D-SE" + icon_state = "D-SE"; + tag = "icon-D-SE" }, /obj/structure/transit_tube{ - tag = "icon-D-NE"; - icon_state = "D-NE" + icon_state = "D-NE"; + tag = "icon-D-NE" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -43487,12 +38820,13 @@ /area/crew_quarters/bar) "bwF" = ( /obj/structure/transit_tube{ - tag = "icon-E-SW-NW"; - icon_state = "E-SW-NW" + icon_state = "E-SW-NW"; + tag = "icon-E-SW-NW" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/visible/yellow, /turf/simulated/floor/plating/airless, /area/space/nearstation) "bwG" = ( @@ -43521,13 +38855,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/starboard) -"bwJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/effect/decal/warning_stripes/south, -/turf/simulated/floor/plasteel, -/area/engine/break_room) "bwK" = ( /obj/machinery/door/airlock/maintenance{ req_access_txt = "12" @@ -43551,8 +38878,8 @@ /area/space/nearstation) "bwM" = ( /obj/structure/transit_tube{ - tag = "icon-E-W-Pass"; - icon_state = "E-W-Pass" + icon_state = "E-W-Pass"; + tag = "icon-E-W-Pass" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -43566,16 +38893,12 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2; - initialize_directions = 11 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/plating, /area/maintenance/starboard) "bwO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -43583,30 +38906,20 @@ }, /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" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/effect/decal/warning_stripes/west, -/turf/simulated/floor/plating, -/area/maintenance/starboard) -"bwQ" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /turf/simulated/floor/plating, /area/maintenance/starboard) "bwR" = ( @@ -43620,11 +38933,10 @@ icon_state = "pipe-j1s"; sortType = 19 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 - }, /obj/effect/decal/warning_stripes/east, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/starboard) "bwS" = ( @@ -43641,6 +38953,10 @@ 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" = ( @@ -43665,9 +38981,9 @@ "bwV" = ( /obj/machinery/vending/coffee, /turf/simulated/floor/plasteel{ - tag = "icon-cafeteria (NORTHEAST)"; + dir = 5; icon_state = "cafeteria"; - dir = 5 + tag = "icon-cafeteria (NORTHEAST)" }, /area/engine/break_room) "bwW" = ( @@ -43683,8 +38999,8 @@ /area/space/nearstation) "bwX" = ( /obj/structure/transit_tube{ - tag = "icon-D-SW"; - icon_state = "D-SW" + icon_state = "D-SW"; + tag = "icon-D-SW" }, /obj/structure/transit_tube{ icon_state = "D-NW"; @@ -43711,10 +39027,10 @@ d2 = 8; icon_state = "4-8" }, +/obj/effect/decal/warning_stripes/west, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plating, /area/maintenance/starboard) "bxa" = ( @@ -43738,13 +39054,13 @@ level = 1 }, /obj/structure/transit_tube/station{ - tag = "icon-closed (EAST)"; + dir = 4; icon_state = "closed"; - dir = 4 + tag = "icon-closed (EAST)" }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 5 + dir = 5; + icon_state = "vault" }, /area/construction/hallway{ name = "\improper MiniSat Exterior" @@ -43758,15 +39074,13 @@ /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" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -43800,19 +39114,14 @@ /area/engine/break_room) "bxg" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 - }, -/area/engine/break_room) -"bxh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, /turf/simulated/floor/plasteel{ - icon_state = "dark" + dir = 8; + icon_state = "vault" }, /area/engine/break_room) "bxi" = ( @@ -43827,16 +39136,16 @@ }) "bxj" = ( /obj/structure/transit_tube{ - tag = "icon-S-NE"; - icon_state = "S-NE" + icon_state = "S-NE"; + tag = "icon-S-NE" }, /obj/structure/lattice, /turf/space, /area/space/nearstation) "bxk" = ( /obj/structure/transit_tube{ - tag = "icon-D-NE"; - icon_state = "D-NE" + icon_state = "D-NE"; + tag = "icon-D-NE" }, /turf/space, /area/space/nearstation) @@ -43870,6 +39179,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" = ( @@ -43885,6 +39197,9 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/engine/break_room) "bxo" = ( @@ -43937,6 +39252,7 @@ pixel_x = -23 }, /obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry{ name = "Arrivals" @@ -43962,11 +39278,8 @@ name = "Aft Maintenance" }) "bxu" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /obj/structure/cable/yellow{ d1 = 4; @@ -44004,6 +39317,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 = "dark" }, @@ -44019,6 +39338,10 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -44032,6 +39355,12 @@ 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 = "dark" }, @@ -44039,14 +39368,15 @@ name = "\improper MiniSat Teleporter Foyer" }) "bxz" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - 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/supply, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -44064,6 +39394,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 = "dark" }, @@ -44071,12 +39407,6 @@ name = "\improper MiniSat Teleporter Foyer" }) "bxB" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -44087,6 +39417,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 = "dark" }, @@ -44094,11 +39430,8 @@ name = "\improper MiniSat Teleporter Foyer" }) "bxC" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /obj/structure/cable/yellow{ d1 = 4; @@ -44108,6 +39441,9 @@ /obj/effect/landmark/start{ name = "Cyborg" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -44123,6 +39459,12 @@ /obj/effect/landmark/start{ name = "Cyborg" }, +/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" }, @@ -44130,9 +39472,6 @@ name = "\improper MiniSat Central Foyer" }) "bxE" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - on = 1 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -44141,29 +39480,26 @@ /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" }, /area/turret_protected/aisat_interior{ name = "\improper MiniSat Central Foyer" }) -"bxF" = ( -/obj/machinery/light{ - icon_state = "tube1"; - dir = 8 - }, -/turf/simulated/shuttle/floor, -/area/shuttle/mining) "bxG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - 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 + }, /turf/simulated/floor/plating, /area/maintenance/starboard) "bxH" = ( @@ -44208,7 +39544,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/yellow{ d1 = 2; d2 = 4; @@ -44280,10 +39615,6 @@ }, /area/hallway/primary/port) "bxQ" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 - }, /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ d1 = 1; @@ -44291,14 +39622,13 @@ icon_state = "1-2" }, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 8 + dir = 8; + icon_state = "neutral" }, /area/hallway/primary/port) "bxR" = ( -/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 = 2; icon_state = "neutralcorner" @@ -44311,38 +39641,12 @@ name = "Station Intercom (General)"; pixel_y = -28 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" }, /area/hallway/primary/port) "bxT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralcorner" - }, -/area/hallway/primary/port) -"bxU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralcorner" - }, -/area/hallway/primary/port) -"bxV" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2; - initialize_directions = 11 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" @@ -44362,9 +39666,6 @@ /turf/simulated/floor/wood, /area/crew_quarters/heads) "bxX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/alarm{ dir = 1; pixel_y = -22 @@ -44375,9 +39676,6 @@ }, /area/hallway/primary/port) "bxY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -44390,9 +39688,6 @@ }, /area/hallway/primary/port) "bxZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/door/firedoor, /turf/simulated/floor/plasteel{ dir = 8; @@ -44411,21 +39706,16 @@ /turf/simulated/floor/wood, /area/crew_quarters/heads) "byb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /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 = "neutralcorner" }, /area/hallway/primary/port) "byc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/light, /obj/machinery/firealarm{ dir = 1; @@ -44437,9 +39727,6 @@ }, /area/hallway/primary/port) "byd" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/camera{ c_tag = "Port Primary Hallway - Starboard"; dir = 1; @@ -44462,9 +39749,6 @@ /turf/simulated/floor/wood, /area/crew_quarters/heads) "byf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ name = "Port Primary Hallway" @@ -44476,9 +39760,7 @@ /area/hallway/primary/port) "byg" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/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" @@ -44495,9 +39777,6 @@ location = "6-Port-Central" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel, /area/hallway/primary/central) "byi" = ( @@ -44515,11 +39794,8 @@ /turf/simulated/floor/carpet, /area/crew_quarters/heads) "byj" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /obj/structure/cable/yellow{ d1 = 1; @@ -44612,11 +39888,6 @@ pixel_y = -24; req_access_txt = "19" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 - }, /obj/machinery/door_control{ id = "council blast"; name = "Council Chamber Blast Door Control"; @@ -44629,10 +39900,19 @@ dir = 1; network = list("SS13") }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, /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 + }, /turf/simulated/floor/carpet, /area/bridge) "byu" = ( @@ -44750,6 +40030,7 @@ }, /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" @@ -44789,6 +40070,10 @@ 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" = ( @@ -44812,7 +40097,6 @@ name = "Central Maintenance" }) "byF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -44925,7 +40209,6 @@ req_access_txt = "12" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/maintenance/starboard) "byP" = ( @@ -44939,6 +40222,9 @@ d2 = 4; icon_state = "0-4" }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "barber" @@ -44954,20 +40240,7 @@ icon_state = "dark" }, /area/bridge) -"byR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/item/cigbutt, -/turf/simulated/floor/plating, -/area/maintenance/starboard) -"byS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/spawner/window/reinforced, -/turf/simulated/floor/plating, -/area/toxins/lab) "byT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "caution" @@ -44975,9 +40248,10 @@ /area/hallway/primary/starboard) "byU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - icon_state = "caution"; - dir = 4 + dir = 4; + icon_state = "caution" }, /area/hallway/primary/starboard) "byV" = ( @@ -44986,27 +40260,34 @@ req_access_txt = "0"; req_one_access_txt = "32;19" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /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) "byX" = ( -/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/manifold/hidden/supply{ + dir = 1; + level = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "caution" @@ -45017,10 +40298,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /obj/item/radio/intercom{ frequency = 1459; @@ -45035,6 +40314,7 @@ dir = 8; pixel_x = -24 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -45049,6 +40329,7 @@ /obj/structure/sign/securearea{ pixel_x = 32 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "blackcorner" @@ -45056,8 +40337,8 @@ /area/hallway/primary/starboard) "bzc" = ( /obj/structure/transit_tube{ - tag = "icon-D-SW"; - icon_state = "D-SW" + icon_state = "D-SW"; + tag = "icon-D-SW" }, /obj/structure/window/reinforced{ dir = 8 @@ -45067,14 +40348,13 @@ /area/space/nearstation) "bzd" = ( /obj/structure/transit_tube{ - tag = "icon-N-SW"; - icon_state = "N-SW" + icon_state = "N-SW"; + tag = "icon-N-SW" }, /obj/structure/lattice, /turf/space, /area/space/nearstation) "bze" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/ai_slipper{ icon_state = "motion0" }, @@ -45088,6 +40368,10 @@ 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, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -45106,6 +40390,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 = "dark" }, @@ -45123,10 +40413,15 @@ d2 = 4; icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/landmark/start{ name = "Cyborg" }, +/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" }, @@ -45143,6 +40438,7 @@ }) "bzi" = ( /obj/machinery/atmospherics/unary/vent_pump{ + dir = 1; on = 1 }, /obj/structure/cable/yellow{ @@ -45150,6 +40446,9 @@ d2 = 8; icon_state = "1-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -45167,6 +40466,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 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -45174,9 +40479,8 @@ name = "\improper MiniSat East Wing" }) "bzk" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -45185,11 +40489,8 @@ name = "\improper MiniSat East Wing" }) "bzl" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -45262,28 +40563,23 @@ /area/construction/hallway{ name = "\improper MiniSat Exterior" }) -"bzq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/decal/warning_stripes/west, -/turf/simulated/floor/plating, -/area/maintenance/starboard) "bzr" = ( /obj/machinery/computer/security/telescreen/entertainment{ pixel_y = -30 }, /obj/machinery/vending/cigarette, -/turf/simulated/floor/plasteel{ - tag = "icon-cafeteria (NORTHEAST)"; - icon_state = "cafeteria"; +/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"; + tag = "icon-cafeteria (NORTHEAST)" + }, /area/engine/break_room) "bzs" = ( /obj/machinery/hologram/holopad, @@ -45292,7 +40588,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry{ name = "Arrivals" @@ -45319,10 +40614,13 @@ name = "\improper MiniSat Exterior" }) "bzv" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 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/engine/break_room) "bzw" = ( @@ -45344,11 +40642,8 @@ name = "Arrivals" }) "bzz" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel, @@ -45399,7 +40694,6 @@ }, /area/hallway/primary/port) "bzE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment{ dir = 8; icon_state = "pipe-c" @@ -45410,8 +40704,8 @@ icon_state = "1-2" }, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 8 + dir = 8; + icon_state = "neutral" }, /area/hallway/primary/port) "bzF" = ( @@ -45419,31 +40713,25 @@ dir = 4; icon_state = "tube1" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 4 + dir = 4; + icon_state = "neutral" }, /area/hallway/primary/port) "bzG" = ( /obj/structure/closet/firecloset, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/hallway/primary/port) "bzH" = ( /obj/structure/closet/emcloset, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" - }, -/area/hallway/primary/port) -"bzI" = ( -/obj/structure/closet/emcloset, -/turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/hallway/primary/port) "bzJ" = ( @@ -45486,6 +40774,7 @@ /obj/machinery/door/airlock/public/glass{ name = "Library" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "carpetsymbol" @@ -45503,6 +40792,10 @@ /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" @@ -45524,6 +40817,9 @@ d2 = 4; icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/hallway/primary/central) "bzR" = ( @@ -45532,13 +40828,12 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "neutralcorner" @@ -45683,21 +40978,6 @@ icon_state = "dark" }, /area/bridge) -"bAc" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/bridge) -"bAd" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/wall, -/area/bridge) "bAe" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor, @@ -45709,26 +40989,18 @@ icon_state = "dark" }, /area/bridge) -"bAf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/turf/simulated/wall, -/area/bridge) "bAg" = ( /obj/machinery/door/airlock/command{ name = "Command Desk"; req_access = null; req_access_txt = "19" }, -/turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" - }, -/area/bridge) -"bAh" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/wall, +/turf/simulated/floor/plasteel{ + icon_state = "vault"; + tag = "icon-vault" + }, /area/bridge) "bAi" = ( /obj/structure/bookcase, @@ -45765,8 +41037,8 @@ pixel_y = -9 }, /turf/simulated/floor/carpet{ - tag = "icon-carpet6-2"; - icon_state = "carpet6-2" + icon_state = "carpet6-2"; + tag = "icon-carpet6-2" }, /area/crew_quarters/captain{ name = "\improper Captain's Quarters" @@ -45778,16 +41050,16 @@ icon_state = "1-2" }, /turf/simulated/floor/carpet{ - tag = "icon-carpet14-10"; - icon_state = "carpet14-10" + icon_state = "carpet14-10"; + tag = "icon-carpet14-10" }, /area/crew_quarters/captain{ name = "\improper Captain's Quarters" }) "bAo" = ( /turf/simulated/floor/carpet{ - tag = "icon-carpet14-10"; - icon_state = "carpet14-10" + icon_state = "carpet14-10"; + tag = "icon-carpet14-10" }, /area/crew_quarters/captain{ name = "\improper Captain's Quarters" @@ -45797,9 +41069,10 @@ req_access_txt = 1 }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/carpet{ - tag = "icon-carpet14-10"; - icon_state = "carpet14-10" + icon_state = "carpet14-10"; + tag = "icon-carpet14-10" }, /area/crew_quarters/captain{ name = "\improper Captain's Quarters" @@ -45811,8 +41084,8 @@ network = list("SS13") }, /turf/simulated/floor/carpet{ - tag = "icon-carpet10-8"; - icon_state = "carpet10-8" + icon_state = "carpet10-8"; + tag = "icon-carpet10-8" }, /area/crew_quarters/captain{ name = "\improper Captain's Quarters" @@ -45823,10 +41096,16 @@ }, /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{ - tag = "icon-cafeteria (NORTHEAST)"; + dir = 5; icon_state = "cafeteria"; - dir = 5 + tag = "icon-cafeteria (NORTHEAST)" }, /area/engine/break_room) "bAs" = ( @@ -45839,10 +41118,16 @@ network = list("SS13") }, /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{ - tag = "icon-cafeteria (NORTHEAST)"; + dir = 5; icon_state = "cafeteria"; - dir = 5 + tag = "icon-cafeteria (NORTHEAST)" }, /area/engine/break_room) "bAt" = ( @@ -45855,14 +41140,12 @@ dir = 4 }, /obj/structure/transit_tube_pod, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, -/area/space/nearstation) +/area/engine/break_room) "bAu" = ( /obj/machinery/vending/boozeomat, /turf/simulated/wall, @@ -45895,7 +41178,6 @@ /area/crew_quarters/bar) "bAy" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -45912,18 +41194,14 @@ /turf/simulated/floor/wood, /area/crew_quarters/bar) "bAA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4; - level = 1 - }, /obj/machinery/alarm{ dir = 4; pixel_x = -25 }, /obj/machinery/light/small{ - tag = "icon-bulb1 (WEST)"; + dir = 8; icon_state = "bulb1"; - dir = 8 + tag = "icon-bulb1 (WEST)" }, /mob/living/simple_animal/bot/cleanbot{ on = 0 @@ -45951,17 +41229,12 @@ icon_state = "dark" }, /area/crew_quarters/sleep) -"bAD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/turf/simulated/floor/plating, -/area/maintenance/starboard) "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, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry{ name = "Arrivals" @@ -45973,92 +41246,29 @@ /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/manifold/hidden/scrubbers{ - dir = 2; - initialize_directions = 11 +/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) -"bAH" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 - }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "neutralcorner" - }, -/area/hallway/primary/starboard) -"bAI" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/plasteel{ - icon_state = "caution"; - dir = 4 - }, -/area/hallway/primary/starboard) -"bAJ" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/maintenance/starboard) -"bAK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/maintenance/starboard) "bAL" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel, /area/engine/engineering) -"bAM" = ( -/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/starboard) -"bAN" = ( -/obj/effect/spawner/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "open"; - id_tag = "telelab"; - name = "test chamber blast door"; - opacity = 0 - }, -/turf/simulated/floor/plating, -/area/toxins/explab) -"bAO" = ( -/obj/structure/reagent_dispensers/fueltank, -/turf/simulated/floor/plating, -/area/engine/break_room) "bAP" = ( /obj/machinery/door/poddoor{ density = 0; @@ -46084,14 +41294,7 @@ /area/hallway/secondary/entry{ name = "Arrivals" }) -"bAS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/wall/r_wall, -/area/engine/break_room) "bAT" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/light, /obj/machinery/computer/station_alert, /obj/machinery/computer/security/telescreen{ @@ -46108,15 +41311,6 @@ }) "bAU" = ( /obj/machinery/light/small, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, /obj/machinery/light_switch{ pixel_x = -8; pixel_y = -24 @@ -46134,6 +41328,10 @@ pixel_x = 1; pixel_y = 5 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -46145,15 +41343,14 @@ dir = 1; level = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/engine/break_room) "bAW" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4; - level = 1 - }, /obj/machinery/firealarm{ dir = 8; pixel_x = -24 @@ -46183,8 +41380,8 @@ }) "bAX" = ( /obj/structure/transit_tube{ - tag = "icon-E-NW"; - icon_state = "E-NW" + icon_state = "E-NW"; + tag = "icon-E-NW" }, /obj/structure/window/reinforced{ dir = 8 @@ -46194,8 +41391,8 @@ /area/space/nearstation) "bAY" = ( /obj/structure/transit_tube{ - tag = "icon-W-NE"; - icon_state = "W-NE" + icon_state = "W-NE"; + tag = "icon-W-NE" }, /obj/structure/lattice, /turf/space, @@ -46203,15 +41400,15 @@ "bAZ" = ( /obj/structure/lattice, /obj/structure/transit_tube{ - tag = "icon-D-NW"; - icon_state = "D-NW" + icon_state = "D-NW"; + tag = "icon-D-NW" }, /turf/space, /area/space/nearstation) "bBa" = ( /obj/structure/transit_tube{ - tag = "icon-E-NW"; - icon_state = "E-NW" + icon_state = "E-NW"; + tag = "icon-E-NW" }, /turf/space, /area/space/nearstation) @@ -46260,22 +41457,13 @@ dir = 8; icon_state = "darkbluecorners" }, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) -"bBe" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/wall/r_wall, /area/construction/hallway{ name = "\improper MiniSat Exterior" }) "bBf" = ( /obj/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4; - level = 1 + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -46294,24 +41482,11 @@ /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) -"bBh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4; - level = 1 - }, -/turf/simulated/wall/r_wall, /area/construction/hallway{ name = "\improper MiniSat Exterior" }) "bBi" = ( /obj/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4; - level = 1 - }, /obj/machinery/firealarm{ dir = 4; pixel_x = 24 @@ -46327,6 +41502,9 @@ pixel_x = 9; pixel_y = 2 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkbluecorners" @@ -46335,10 +41513,6 @@ name = "\improper MiniSat Exterior" }) "bBj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4; - level = 1 - }, /obj/machinery/camera{ c_tag = "Mini Satellite Teleporter"; dir = 1; @@ -46354,6 +41528,9 @@ /obj/effect/landmark{ name = "JoinLateCyborg" }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkbluecorners" @@ -46371,9 +41548,10 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 8 + dir = 8; + icon_state = "vault" }, /area/turret_protected/aisat_interior{ name = "\improper MiniSat Central Foyer" @@ -46384,9 +41562,6 @@ name = "\improper Telecoms Control Room" }) "bBm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, /obj/structure/rack, /obj/item/storage/toolbox/electrical{ pixel_x = -3; @@ -46403,7 +41578,6 @@ name = "\improper MiniSat East Wing" }) "bBn" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/light_switch{ pixel_x = -23 }, @@ -46418,19 +41592,7 @@ /area/turret_protected/tcomfoyer{ name = "\improper MiniSat Teleporter Foyer" }) -"bBo" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4; - level = 1 - }, -/turf/simulated/wall/r_wall, -/area/turret_protected/aisat_interior{ - name = "\improper MiniSat Central Foyer" - }) "bBp" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/extinguisher_cabinet{ pixel_y = -30 }, @@ -46445,13 +41607,13 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /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" = ( @@ -46481,9 +41643,6 @@ name = "Arrivals" }) "bBu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/status_display{ density = 0; layer = 4; @@ -46501,9 +41660,6 @@ name = "Arrivals" }) "bBw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/effect/decal/warning_stripes/northeastcorner, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry{ @@ -46515,9 +41671,6 @@ d2 = 4; icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry{ name = "Arrivals" @@ -46528,12 +41681,10 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ req_access_txt = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry{ name = "Arrivals" @@ -46544,10 +41695,6 @@ d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2; - initialize_directions = 11 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -46557,41 +41704,10 @@ /area/hallway/secondary/entry{ name = "Arrivals" }) -"bBA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "arrival" - }, -/area/hallway/secondary/entry{ - name = "Arrivals" - }) -"bBB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/door/firedoor, -/turf/simulated/floor/plasteel, -/area/hallway/primary/port) -"bBC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 9; - icon_state = "neutral" - }, -/area/hallway/primary/port) "bBD" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 - }, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 1 + dir = 1; + icon_state = "neutral" }, /area/hallway/primary/port) "bBE" = ( @@ -46599,72 +41715,33 @@ codes_txt = "patrol;next_patrol=6-Port-Central"; location = "5-Customs" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 1 - }, -/area/hallway/primary/port) -"bBF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 1 + dir = 1; + icon_state = "neutral" }, /area/hallway/primary/port) "bBG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "neutral" }, /area/hallway/primary/port) -"bBH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 9 - }, -/area/hallway/primary/port) "bBI" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner"; - dir = 1 - }, -/area/hallway/primary/port) -"bBJ" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2; - initialize_directions = 11 - }, -/obj/structure/extinguisher_cabinet{ - pixel_y = -30 - }, -/turf/simulated/floor/plasteel{ - dir = 8; + dir = 1; icon_state = "neutralcorner" }, /area/hallway/primary/port) @@ -46673,21 +41750,6 @@ /area/crew_quarters/toilet{ name = "\improper Auxiliary Restrooms" }) -"bBL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/wall, -/area/crew_quarters/toilet{ - name = "\improper Auxiliary Restrooms" - }) -"bBM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/decal/warning_stripes/north, -/turf/simulated/floor/plasteel, -/area/hallway/secondary/entry{ - name = "Arrivals" - }) "bBN" = ( /obj/structure/closet, /obj/effect/decal/cleanable/cobweb2, @@ -46720,6 +41782,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ req_access_txt = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/carpet, /area/library) "bBS" = ( @@ -46738,16 +41801,12 @@ pixel_y = 30 }, /turf/simulated/floor/plasteel{ - tag = "icon-cult"; + dir = 2; icon_state = "cult"; - dir = 2 + tag = "icon-cult" }, /area/library) "bBU" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 2; - on = 1 - }, /obj/machinery/door_control{ id = "evashutter"; name = "E.V.A. Storage Shutter Control"; @@ -46760,6 +41819,10 @@ pixel_y = -34; req_access_txt = "19" }, +/obj/machinery/atmospherics/unary/vent_pump{ + dir = 8; + on = 1 + }, /turf/simulated/floor/carpet, /area/bridge) "bBV" = ( @@ -46926,6 +41989,9 @@ icon_state = "pipe-j2"; tag = "icon-pipe-j1 (WEST)" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -46934,10 +42000,7 @@ name = "\improper Command Hallway" }) "bCj" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/engine/engineering) "bCk" = ( @@ -46970,6 +42033,9 @@ 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" @@ -46978,9 +42044,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, /turf/simulated/floor/carpet{ - tag = "icon-carpet7-3"; - icon_state = "carpet7-3" + icon_state = "carpet7-3"; + tag = "icon-carpet7-3" }, /area/crew_quarters/captain{ name = "\improper Captain's Quarters" @@ -46995,8 +42064,11 @@ icon_state = "1-4" }, /obj/structure/chair/comfy/brown{ - tag = "icon-comfychair (EAST)"; + dir = 4; icon_state = "comfychair"; + tag = "icon-comfychair (EAST)" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /turf/simulated/floor/carpet, @@ -47014,6 +42086,9 @@ 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" @@ -47032,9 +42107,12 @@ icon_state = "pipe-c" }, /obj/structure/chair/comfy/brown{ - tag = "icon-comfychair (WEST)"; + dir = 8; icon_state = "comfychair"; - dir = 8 + tag = "icon-comfychair (WEST)" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 }, /turf/simulated/floor/carpet, /area/crew_quarters/captain{ @@ -47053,21 +42131,12 @@ dir = 4 }, /turf/simulated/floor/carpet{ - tag = "icon-carpet11-12"; - icon_state = "carpet11-12" + icon_state = "carpet11-12"; + tag = "icon-carpet11-12" }, /area/crew_quarters/captain{ name = "\improper Captain's Quarters" }) -"bCs" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/decal/warning_stripes/northwestcorner, -/turf/simulated/floor/plasteel, -/area/hallway/secondary/entry{ - name = "Arrivals" - }) "bCt" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -47081,13 +42150,19 @@ name = "Port Maintenance" }) "bCu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/computer/security/telescreen{ dir = 8; name = "MiniSat Monitor"; 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" @@ -47102,16 +42177,17 @@ /area/crew_quarters/bar) "bCw" = ( /obj/structure/transit_tube{ - tag = "icon-N-SE"; - icon_state = "N-SE" + icon_state = "N-SE"; + tag = "icon-N-SE" }, /obj/structure/window/reinforced{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/space/nearstation) +/area/engine/break_room) "bCx" = ( /obj/structure/sign/securearea{ desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; @@ -47156,7 +42232,6 @@ }, /area/bridge) "bCB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/alarm{ dir = 4; pixel_x = -23 @@ -47194,6 +42269,7 @@ /obj/structure/extinguisher_cabinet{ pixel_x = 27 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -47205,15 +42281,12 @@ d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, /turf/simulated/floor/wood, /area/crew_quarters/bar) "bCG" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - on = 1; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/wood, @@ -47233,6 +42306,7 @@ /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" = ( @@ -47257,6 +42331,9 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "neutralcorner" @@ -47264,21 +42341,21 @@ /area/hallway/primary/starboard) "bCL" = ( /obj/structure/rack, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/item/clothing/mask/breath{ pixel_x = 4 }, /obj/item/clothing/mask/breath{ pixel_x = 4 }, -/obj/item/tank/emergency_oxygen{ +/obj/item/tank/internals/emergency_oxygen{ pixel_x = -8 }, -/obj/item/tank/emergency_oxygen{ +/obj/item/tank/internals/emergency_oxygen{ pixel_x = -8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -47301,35 +42378,11 @@ name = "Atmospherics"; req_access_txt = "24" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/atmos) -"bCP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/turf/simulated/wall, -/area/atmos) -"bCQ" = ( -/obj/machinery/atmospherics/pipe/simple/visible/universal{ - dir = 4; - layer = 4.4 - }, -/turf/simulated/wall/r_wall, -/area/atmos) "bCR" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/purple{ - tag = "icon-map (NORTH)"; - icon_state = "map"; - dir = 1 - }, -/turf/simulated/wall/r_wall, -/area/atmos) -"bCS" = ( -/obj/machinery/atmospherics/pipe/simple/visible/purple{ - tag = "icon-intact (SOUTHWEST)"; - icon_state = "intact"; - dir = 10 - }, +/obj/machinery/atmospherics/pipe/simple/visible/universal, /turf/simulated/wall/r_wall, /area/atmos) "bCT" = ( @@ -47338,24 +42391,7 @@ }, /turf/simulated/wall/r_wall, /area/atmos) -"bCU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5; - level = 1 - }, -/turf/simulated/wall/r_wall, -/area/atmos) -"bCV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/turf/simulated/wall/r_wall, -/area/atmos) "bCW" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4; - level = 1 - }, /obj/machinery/power/apc{ dir = 2; name = "AI Satellite Teleporter APC"; @@ -47370,14 +42406,6 @@ name = "\improper MiniSat Teleporter Foyer" }) "bCX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4; - level = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6; - level = 1 - }, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "darkbluecorners" @@ -47387,8 +42415,8 @@ }) "bCY" = ( /obj/structure/transit_tube{ - tag = "icon-D-NE"; - icon_state = "D-NE" + icon_state = "D-NE"; + tag = "icon-D-NE" }, /obj/structure/window/reinforced{ dir = 4 @@ -47396,36 +42424,20 @@ /obj/structure/rack, /obj/item/clothing/suit/storage/hazardvest, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 + dir = 9 }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/space/nearstation) -"bCZ" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - level = 1 - }, -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "darkbluecorners" - }, -/area/turret_protected/aisat_interior{ - name = "\improper MiniSat Central Foyer" - }) +/area/engine/break_room) "bDa" = ( -/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - level = 1 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -47449,17 +42461,7 @@ /area/tcommsat/computer{ name = "\improper Telecoms Control Room" }) -"bDc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4; - level = 1 - }, -/turf/simulated/wall/r_wall, -/area/turret_protected/tcomeast{ - name = "\improper MiniSat East Wing" - }) "bDd" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /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."; @@ -47482,6 +42484,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -47548,17 +42551,10 @@ name = "\improper Telecoms Control Room" }) "bDi" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4; - level = 1 - }, /obj/machinery/light/small{ - tag = "icon-bulb1 (EAST)"; + dir = 4; icon_state = "bulb1"; - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 + tag = "icon-bulb1 (EAST)" }, /mob/living/simple_animal/bot/floorbot{ on = 0 @@ -47670,9 +42666,11 @@ /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{ - icon_state = "neutral"; - dir = 4 + dir = 4; + icon_state = "neutral" }, /area/hallway/primary/port) "bDr" = ( @@ -47710,7 +42708,9 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "bluecorner" @@ -47726,6 +42726,7 @@ dir = 1; pixel_y = -24 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "arrival" @@ -47742,6 +42743,9 @@ /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" @@ -47760,9 +42764,9 @@ pixel_x = 30 }, /turf/simulated/floor/plasteel{ - tag = "icon-cult"; + dir = 2; icon_state = "cult"; - dir = 2 + tag = "icon-cult" }, /area/library) "bDx" = ( @@ -47773,6 +42777,9 @@ dir = 1; pixel_y = -22 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "neutral" @@ -47782,11 +42789,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/firealarm{ dir = 2; pixel_y = -24 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, @@ -47801,19 +42810,27 @@ /obj/machinery/light{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/bridge) "bDA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, /obj/structure/cable/yellow{ d1 = 2; d2 = 8; icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1; + initialize_directions = 11 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1; + level = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, @@ -47824,9 +42841,16 @@ icon_state = "alarm0"; pixel_y = -22 }, +/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"; - dir = 6 + dir = 6; + icon_state = "neutral" }, /area/hallway/primary/port) "bDC" = ( @@ -47839,15 +42863,19 @@ 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{ - icon_state = "neutral"; - dir = 10 + dir = 10; + icon_state = "neutral" }, /area/hallway/primary/port) "bDE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 4; @@ -47858,22 +42886,28 @@ 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" }, /area/hallway/primary/port) "bDF" = ( -/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, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 6 + dir = 6; + icon_state = "neutral" }, /area/hallway/primary/port) "bDG" = ( @@ -47890,6 +42924,10 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4; + level = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -47910,6 +42948,10 @@ name = "old sink"; pixel_y = 28 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4; + level = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -47917,10 +42959,6 @@ name = "\improper Auxiliary Restrooms" }) "bDI" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 - }, /obj/structure/sink/kitchen{ desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; name = "old sink"; @@ -47930,6 +42968,9 @@ name = "xeno_spawn"; pixel_x = -1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, /turf/simulated/floor/plating, /area/crew_quarters/toilet{ name = "\improper Auxiliary Restrooms" @@ -47951,6 +42992,9 @@ }, /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" @@ -47985,6 +43029,9 @@ /obj/structure/window/reinforced/tinted{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -48000,9 +43047,9 @@ /area/library) "bDO" = ( /turf/simulated/floor/plasteel{ - tag = "icon-cult"; + dir = 2; icon_state = "cult"; - dir = 2 + tag = "icon-cult" }, /area/library) "bDP" = ( @@ -48010,9 +43057,9 @@ dir = 1 }, /turf/simulated/floor/plasteel{ - tag = "icon-cult"; + dir = 2; icon_state = "cult"; - dir = 2 + tag = "icon-cult" }, /area/library) "bDQ" = ( @@ -48039,6 +43086,10 @@ /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" = ( @@ -48101,6 +43152,9 @@ req_access = null; req_access_txt = "19" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -48196,26 +43250,27 @@ }) "bEi" = ( /turf/simulated/floor/carpet{ - tag = "icon-carpet6-2"; - icon_state = "carpet6-2" + icon_state = "carpet6-2"; + tag = "icon-carpet6-2" }, /area/crew_quarters/captain{ name = "\improper Captain's Quarters" }) "bEj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/carpet{ - tag = "icon-carpet15-11"; - icon_state = "carpet15-11" + icon_state = "carpet15-11"; + tag = "icon-carpet15-11" }, /area/crew_quarters/captain{ name = "\improper Captain's Quarters" }) "bEk" = ( /obj/structure/chair/comfy/brown{ - tag = "icon-comfychair (EAST)"; + dir = 4; icon_state = "comfychair"; - dir = 4 + tag = "icon-comfychair (EAST)" }, /turf/simulated/floor/carpet, /area/crew_quarters/captain{ @@ -48230,9 +43285,9 @@ }) "bEm" = ( /obj/structure/chair/comfy/brown{ - tag = "icon-comfychair (WEST)"; + dir = 8; icon_state = "comfychair"; - dir = 8 + tag = "icon-comfychair (WEST)" }, /turf/simulated/floor/carpet, /area/crew_quarters/captain{ @@ -48245,12 +43300,12 @@ pixel_x = 24 }, /obj/machinery/light{ - icon_state = "tube1"; - dir = 4 + dir = 4; + icon_state = "tube1" }, /turf/simulated/floor/carpet{ - tag = "icon-carpet11-12"; - icon_state = "carpet11-12" + icon_state = "carpet11-12"; + tag = "icon-carpet11-12" }, /area/crew_quarters/captain{ name = "\improper Captain's Quarters" @@ -48279,7 +43334,6 @@ }, /area/crew_quarters/bar) "bEp" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/firealarm{ dir = 8; pixel_x = -24 @@ -48365,23 +43419,17 @@ dir = 1; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, /obj/structure/chair/stool{ pixel_y = 8 }, /turf/simulated/floor/wood, /area/crew_quarters/bar) "bEz" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2; - initialize_directions = 11 - }, /obj/structure/disposalpipe/junction{ - icon_state = "pipe-j2"; - dir = 4 + dir = 4; + icon_state = "pipe-j2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood, /area/crew_quarters/bar) "bEA" = ( @@ -48389,9 +43437,6 @@ dir = 2; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, /turf/simulated/floor/wood, /area/crew_quarters/bar) "bEB" = ( @@ -48456,10 +43501,10 @@ 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/machinery/atmospherics/pipe/simple/hidden/supply, /obj/item/radio/beacon, /turf/simulated/floor/plasteel{ dir = 8; @@ -48471,6 +43516,9 @@ 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" @@ -48496,13 +43544,13 @@ }, /area/atmos) "bEL" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4" +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, /obj/effect/decal/warning_stripes/west, -/turf/simulated/floor/plating, +/turf/simulated/floor/engine, /area/engine/engineering) "bEM" = ( /obj/machinery/computer/atmos_alert, @@ -48574,8 +43622,11 @@ dir = 4; pixel_x = -23 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 + dir = 5 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -48589,6 +43640,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/atmos) "bES" = ( @@ -48604,6 +43656,9 @@ 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" @@ -48641,7 +43696,6 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/visible/purple, /obj/machinery/atmospherics/binary/volume_pump/on{ dir = 8; name = "Distro to Waste"; @@ -48666,9 +43720,9 @@ /area/atmos) "bEX" = ( /obj/machinery/atmospherics/pipe/manifold/visible/purple{ - tag = "icon-map (NORTH)"; + dir = 1; icon_state = "map"; - dir = 1 + tag = "icon-map (NORTH)" }, /turf/simulated/floor/plasteel{ dir = 1; @@ -48679,7 +43733,6 @@ /obj/machinery/alarm{ pixel_y = 25 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/camera{ c_tag = "Atmospherics - Distro Loop"; network = list("SS13") @@ -48714,9 +43767,12 @@ dir = 4; icon_state = "tube1" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, /turf/simulated/floor/plasteel{ - icon_state = "caution"; - dir = 4 + dir = 4; + icon_state = "caution" }, /area/hallway/primary/starboard) "bFb" = ( @@ -48764,10 +43820,6 @@ name = "Arrivals" }) "bFf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4; - level = 1 - }, /obj/machinery/computer/monitor{ name = "Grid Power Monitoring Computer" }, @@ -48795,12 +43847,6 @@ name = "\improper MiniSat Exterior" }) "bFh" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 - }, /obj/structure/closet/emcloset, /turf/simulated/floor/plasteel{ dir = 8; @@ -48825,9 +43871,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -48849,11 +43892,8 @@ }, /area/maintenance/starboard) "bFm" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /obj/structure/cable/yellow{ d1 = 4; @@ -48881,6 +43921,9 @@ 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" @@ -48903,10 +43946,6 @@ "bFp" = ( /turf/simulated/wall, /area/security/vacantoffice) -"bFq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/wall, -/area/security/vacantoffice) "bFr" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/centcom{ @@ -48920,6 +43959,7 @@ 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 = "carpetsymbol" @@ -48945,6 +43985,7 @@ /obj/structure/mirror{ pixel_x = 28 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/crew_quarters/toilet{ name = "\improper Auxiliary Restrooms" @@ -48985,6 +44026,7 @@ name = "Station Intercom (General)"; pixel_x = 27 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/carpet, /area/library) "bFy" = ( @@ -48993,9 +44035,9 @@ req_access_txt = "0" }, /turf/simulated/floor/plasteel{ - tag = "icon-cult"; + dir = 2; icon_state = "cult"; - dir = 2 + tag = "icon-cult" }, /area/library) "bFz" = ( @@ -49004,9 +44046,9 @@ req_access_txt = "0" }, /turf/simulated/floor/plasteel{ - tag = "icon-cult"; + dir = 2; icon_state = "cult"; - dir = 2 + tag = "icon-cult" }, /area/library) "bFA" = ( @@ -49024,6 +44066,7 @@ dir = 4; network = list("SS13") }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" @@ -49053,21 +44096,6 @@ /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, /area/engine/break_room) -"bFE" = ( -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "open"; - id_tag = "atmos"; - name = "Atmos Blast Door"; - opacity = 0 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, -/area/engine/break_room) "bFF" = ( /obj/machinery/door/poddoor{ density = 0; @@ -49081,10 +44109,9 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, /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/break_room) "bFG" = ( @@ -49097,6 +44124,9 @@ 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" @@ -49121,23 +44151,23 @@ name = "Station Intercom (General)"; pixel_y = -25 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/plasteel{ - icon_state = "arrival"; - dir = 6 + dir = 6; + icon_state = "arrival" }, /area/hallway/secondary/entry{ name = "Arrivals" }) "bFK" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 - }, /obj/machinery/vending/coffee{ pixel_x = -3 }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -49158,9 +44188,9 @@ /area/bridge) "bFM" = ( /obj/structure/chair/comfy/teal{ - tag = "icon-comfychair (EAST)"; + dir = 4; icon_state = "comfychair"; - dir = 4 + tag = "icon-comfychair (EAST)" }, /obj/structure/chair/comfy/black{ dir = 4 @@ -49247,19 +44277,13 @@ pixel_x = -24 }, /turf/simulated/floor/carpet{ - tag = "icon-carpet5-1"; - icon_state = "carpet5-1" + icon_state = "carpet5-1"; + tag = "icon-carpet5-1" }, /area/crew_quarters/captain{ name = "\improper Captain's Quarters" }) "bFW" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 4; @@ -49273,14 +44297,15 @@ layer = 4; pixel_y = -32 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, /area/hallway/primary/port) "bFX" = ( /turf/simulated/floor/carpet{ - tag = "icon-carpetside"; - icon_state = "carpetside" + icon_state = "carpetside"; + tag = "icon-carpetside" }, /area/crew_quarters/captain{ name = "\improper Captain's Quarters" @@ -49297,6 +44322,7 @@ /obj/structure/extinguisher_cabinet{ pixel_x = -27 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" @@ -49432,33 +44458,14 @@ /area/bridge) "bGl" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, /obj/structure/chair/stool{ pixel_y = 8 }, /turf/simulated/floor/wood, /area/crew_quarters/bar) -"bGm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor/carpet, -/area/crew_quarters/theatre) -"bGn" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 - }, -/turf/simulated/floor/carpet, -/area/crew_quarters/theatre) "bGo" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 + dir = 6 }, /turf/simulated/floor/carpet, /area/crew_quarters/theatre) @@ -49468,11 +44475,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/carpet, /area/crew_quarters/theatre) @@ -49493,8 +44497,7 @@ /obj/machinery/atmospherics/unary/portables_connector{ dir = 4 }, -/obj/machinery/portable_atmospherics/pump, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/portable_atmospherics/scrubber, /obj/structure/window/reinforced{ dir = 1 }, @@ -49504,8 +44507,8 @@ network = list("SS13") }, /turf/simulated/floor/plasteel{ - icon_state = "arrival"; - dir = 8 + dir = 8; + icon_state = "arrival" }, /area/hallway/primary/starboard) "bGs" = ( @@ -49514,22 +44517,17 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "neutralcorner" }, /area/hallway/primary/starboard) "bGt" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, /turf/simulated/floor/plasteel{ - icon_state = "caution"; - dir = 4 + dir = 4; + icon_state = "caution" }, /area/hallway/primary/starboard) "bGu" = ( @@ -49552,16 +44550,13 @@ pixel_x = 32 }, /turf/simulated/floor/plasteel{ - icon_state = "caution"; - dir = 4 + dir = 4; + icon_state = "caution" }, /area/hallway/primary/starboard) "bGw" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 2; @@ -49615,8 +44610,8 @@ /area/atmos) "bGA" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/structure/table, /obj/item/stack/sheet/metal{ @@ -49652,6 +44647,7 @@ d2 = 8; icon_state = "1-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/atmos) "bGD" = ( @@ -49668,11 +44664,8 @@ /turf/simulated/floor/plasteel, /area/atmos) "bGF" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel, /area/atmos) @@ -49756,8 +44749,8 @@ pixel_x = 26 }, /turf/simulated/floor/plasteel{ - icon_state = "caution"; - dir = 5 + dir = 5; + icon_state = "caution" }, /area/atmos) "bGQ" = ( @@ -49777,13 +44770,10 @@ name = "\improper Toxins Lab" }) "bGR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/closet/firecloset, /turf/simulated/floor/plasteel{ - icon_state = "caution"; - dir = 4 + dir = 4; + icon_state = "caution" }, /area/hallway/primary/starboard) "bGS" = ( @@ -49858,29 +44848,6 @@ /area/toxins/xenobiology{ name = "\improper Secure Lab" }) -"bGX" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall12"; - dir = 2 - }, -/area/shuttle/transport) -"bGY" = ( -/obj/structure/shuttle/window, -/obj/structure/grille, -/turf/simulated/shuttle/plating, -/area/shuttle/transport) -"bGZ" = ( -/obj/structure/grille, -/obj/structure/shuttle/window, -/turf/simulated/shuttle/plating, -/area/shuttle/transport) -"bHa" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f10"; - dir = 2 - }, -/area/shuttle/transport) "bHb" = ( /obj/structure/table, /obj/item/clothing/head/welding{ @@ -49915,9 +44882,8 @@ name = "Port Maintenance" }) "bHe" = ( -/obj/machinery/atmospherics/unary/heat_reservoir/heater{ - dir = 2; - on = 1 +/obj/machinery/atmospherics/unary/thermomachine/heater/on{ + dir = 2 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -49934,6 +44900,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood, /area/security/vacantoffice) "bHh" = ( @@ -50084,18 +45051,15 @@ name = "\improper Command Hallway" }) "bHw" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /turf/simulated/floor/wood, /area/library) "bHx" = ( /obj/item/twohanded/required/kirbyplants{ - tag = "icon-plant-22"; - icon_state = "plant-22" + icon_state = "plant-22"; + tag = "icon-plant-22" }, /turf/simulated/floor/wood, /area/library) @@ -50122,9 +45086,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/carpet{ - tag = "icon-carpetside"; - icon_state = "carpetside" + icon_state = "carpetside"; + tag = "icon-carpetside" }, /area/crew_quarters/captain{ name = "\improper Captain's Quarters" @@ -50136,8 +45101,8 @@ "bHB" = ( /obj/machinery/vending/cola, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/bridge/meeting_room{ name = "\improper Command Hallway" @@ -50152,17 +45117,13 @@ }, /mob/living/simple_animal/pet/dog/fox/Renault, /turf/simulated/floor/carpet{ - tag = "icon-carpetside"; - icon_state = "carpetside" + icon_state = "carpetside"; + tag = "icon-carpetside" }, /area/crew_quarters/captain{ name = "\improper Captain's Quarters" }) "bHD" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 - }, /obj/machinery/door_control{ id = "bridge blast"; name = "Bridge Access Blast Door Control"; @@ -50170,6 +45131,7 @@ pixel_y = -24; req_access_txt = "19" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -50182,13 +45144,6 @@ /obj/structure/table/wood/poker, /turf/simulated/floor/wood, /area/crew_quarters/bar) -"bHF" = ( -/obj/effect/spawner/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/atmos) "bHG" = ( /obj/effect/spawner/window/reinforced, /obj/machinery/atmospherics/pipe/simple/visible/yellow{ @@ -50197,18 +45152,12 @@ /turf/simulated/floor/plating, /area/atmos) "bHH" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 - }, /obj/structure/extinguisher_cabinet{ pixel_x = 27 }, /turf/simulated/floor/carpet{ - tag = "icon-carpet9-4"; - icon_state = "carpet9-4" + icon_state = "carpet9-4"; + tag = "icon-carpet9-4" }, /area/crew_quarters/captain{ name = "\improper Captain's Quarters" @@ -50244,7 +45193,6 @@ name = "Central Maintenance" }) "bHL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/light{ dir = 8 }, @@ -50312,6 +45260,9 @@ /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" = ( @@ -50320,17 +45271,6 @@ }, /turf/simulated/floor/carpet, /area/crew_quarters/theatre) -"bHV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5; - level = 1 - }, -/obj/machinery/vending/medical, -/turf/simulated/floor/plasteel{ - dir = 10; - icon_state = "whiteblue" - }, -/area/medical/reception) "bHW" = ( /turf/simulated/floor/carpet, /area/crew_quarters/theatre) @@ -50355,33 +45295,21 @@ /obj/machinery/atmospherics/unary/portables_connector{ dir = 4 }, -/obj/machinery/portable_atmospherics/pump, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/portable_atmospherics/scrubber, /turf/simulated/floor/plasteel{ - icon_state = "arrival"; - dir = 8 + dir = 8; + icon_state = "arrival" }, /area/hallway/primary/starboard) "bIa" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "caution"; - dir = 4 + dir = 4; + icon_state = "caution" }, /area/hallway/primary/starboard) -"bIb" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 - }, -/turf/simulated/floor/plasteel{ - icon_state = "grimy" - }, -/area/security/detectives_office) "bIc" = ( /obj/structure/chair{ dir = 8 @@ -50389,6 +45317,9 @@ /obj/effect/landmark/start{ name = "Life Support Specialist" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "caution" @@ -50401,9 +45332,10 @@ }, /area/atmos) "bIe" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 +/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; @@ -50411,8 +45343,10 @@ }, /area/atmos) "bIf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/visible/purple{ + dir = 10; + icon_state = "intact"; + tag = "icon-intact (SOUTHWEST)" }, /turf/simulated/floor/plasteel{ dir = 2; @@ -50420,9 +45354,6 @@ }, /area/atmos) "bIg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/computer/general_air_control{ frequency = 1443; level = 3; @@ -50431,8 +45362,8 @@ sensors = list("mair_in_meter" = "Mixed Air In", "air_sensor" = "Mixed Air Supply Tank", "mair_out_meter" = "Mixed Air Out", "dloop_atm_meter" = "Distribution Loop", "wloop_atm_meter" = "Waste Loop") }, /turf/simulated/floor/plasteel{ - icon_state = "caution"; - dir = 4 + dir = 4; + icon_state = "caution" }, /area/atmos) "bIh" = ( @@ -50452,9 +45383,6 @@ /obj/item/t_scanner, /obj/item/t_scanner, /obj/item/t_scanner, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "caution" @@ -50466,24 +45394,22 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/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/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4; + initialize_directions = 11 }, /turf/simulated/floor/plasteel, /area/atmos) "bIl" = ( /obj/machinery/space_heater, /obj/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, /obj/effect/decal/warning_stripes/southwest, /turf/simulated/floor/plasteel, /area/atmos) @@ -50590,8 +45516,8 @@ pixel_y = -26 }, /turf/simulated/floor/carpet{ - tag = "icon-carpetside"; - icon_state = "carpetside" + icon_state = "carpetside"; + tag = "icon-carpetside" }, /area/crew_quarters/captain{ name = "\improper Captain's Quarters" @@ -50608,8 +45534,8 @@ }) "bIA" = ( /obj/item/twohanded/required/kirbyplants{ - tag = "icon-plant-21"; - icon_state = "plant-21" + icon_state = "plant-21"; + tag = "icon-plant-21" }, /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -50627,12 +45553,6 @@ /area/tcommsat/computer{ name = "\improper Telecoms Control Room" }) -"bIC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/wall/r_wall, -/area/turret_protected/aisat_interior{ - name = "\improper MiniSat Central Foyer" - }) "bID" = ( /obj/structure/table/reinforced, /obj/item/lighter/zippo, @@ -50660,52 +45580,20 @@ /area/construction/hallway{ name = "\improper MiniSat Exterior" }) -"bIG" = ( -/turf/simulated/shuttle/floor, -/turf/simulated/shuttle/wall/interior{ - tag = "icon-swall_f9"; - icon_state = "swall_f9" - }, -/area/shuttle/transport) -"bIH" = ( -/obj/machinery/light/spot{ - tag = "icon-tube1 (NORTH)"; - icon_state = "tube1"; - dir = 1 - }, -/obj/structure/chair/comfy/shuttle{ - dir = 4 - }, -/turf/simulated/shuttle/floor, -/area/shuttle/transport) -"bII" = ( -/obj/machinery/computer/shuttle/ferry/request, -/turf/simulated/shuttle/floor, -/area/shuttle/transport) -"bIJ" = ( -/obj/structure/chair/comfy/shuttle, -/turf/simulated/shuttle/floor, -/area/shuttle/transport) -"bIK" = ( -/obj/machinery/light/spot{ - tag = "icon-tube1 (NORTH)"; - icon_state = "tube1"; - dir = 1 - }, -/obj/structure/chair/comfy/shuttle, -/turf/simulated/shuttle/floor, -/area/shuttle/transport) "bIL" = ( /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) "bIM" = ( /obj/item/clothing/mask/breath{ pixel_x = 4 }, -/obj/item/tank/emergency_oxygen{ +/obj/item/tank/internals/emergency_oxygen{ pixel_x = -8 }, /obj/structure/table, @@ -50718,7 +45606,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/carpet, /area/crew_quarters/theatre) "bIO" = ( @@ -50741,17 +45631,9 @@ name = "test chamber blast door"; opacity = 0 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/engine, /area/toxins/explab) -"bIQ" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 - }, -/turf/simulated/floor/wood, -/area/security/vacantoffice) "bIR" = ( /obj/structure/table/wood, /turf/simulated/floor/wood, @@ -50830,8 +45712,8 @@ pixel_x = 30 }, /turf/simulated/floor/plasteel{ - icon_state = "caution"; - dir = 4 + dir = 4; + icon_state = "caution" }, /area/atmos) "bIZ" = ( @@ -50844,13 +45726,19 @@ /turf/simulated/floor/wood, /area/library) "bJa" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/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" @@ -50870,16 +45758,21 @@ icon_state = "pipe-j1"; tag = "icon-pipe-j1 (EAST)" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/hallway/primary/central) "bJd" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /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 = 4; icon_state = "neutralcorner" @@ -50896,6 +45789,9 @@ /obj/machinery/door/airlock/public/glass{ name = "Command Hallway" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -50910,6 +45806,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -50924,6 +45823,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -50941,6 +45843,9 @@ /obj/effect/landmark{ name = "lightsout" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -50960,6 +45865,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -50968,13 +45876,13 @@ name = "\improper Command Hallway" }) "bJj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /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" @@ -50987,6 +45895,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -51035,9 +45946,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 1 + dir = 1; + icon_state = "neutral" }, /area/bridge/meeting_room{ name = "\improper Command Hallway" @@ -51046,6 +45960,9 @@ /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" @@ -51060,6 +45977,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -51079,9 +45999,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 1 + dir = 1; + icon_state = "neutral" }, /area/bridge/meeting_room{ name = "\improper Command Hallway" @@ -51094,9 +46017,12 @@ dir = 2; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 1 + dir = 1; + icon_state = "neutral" }, /area/bridge/meeting_room{ name = "\improper Command Hallway" @@ -51105,6 +46031,9 @@ /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" @@ -51119,6 +46048,9 @@ /obj/machinery/ai_status_display{ pixel_y = 32 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -51131,7 +46063,6 @@ /obj/machinery/light_switch{ pixel_x = -28 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/item/folder, /turf/simulated/floor/wood, /area/security/vacantoffice) @@ -51144,6 +46075,9 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -51153,6 +46087,9 @@ }) "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" @@ -51164,6 +46101,9 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -51178,6 +46118,7 @@ /obj/effect/landmark{ name = "lightsout" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -51223,7 +46164,9 @@ /obj/machinery/alarm{ pixel_y = 32 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -51240,6 +46183,9 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 2 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -51255,6 +46201,9 @@ /obj/machinery/door/airlock/public/glass{ name = "Command Hallway" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -51262,16 +46211,6 @@ /area/bridge/meeting_room{ name = "\improper Command Hallway" }) -"bJE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "neutralcorner" - }, -/area/hallway/primary/central) "bJF" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -51281,6 +46220,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/primary/central) "bJG" = ( @@ -51291,10 +46233,8 @@ /turf/simulated/floor/plasteel, /area/crew_quarters/bar) "bJH" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - on = 1; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /turf/simulated/floor/plasteel{ icon_state = "bar" @@ -51331,6 +46271,9 @@ /obj/structure/window/reinforced{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/carpet, /area/crew_quarters/theatre) "bJM" = ( @@ -51340,6 +46283,7 @@ /obj/effect/landmark/start{ name = "Civilian" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood, /area/crew_quarters/bar) "bJN" = ( @@ -51351,7 +46295,6 @@ /area/crew_quarters/theatre) "bJO" = ( /obj/machinery/hologram/holopad, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/carpet, /area/crew_quarters/theatre) "bJP" = ( @@ -51379,8 +46322,7 @@ /obj/machinery/atmospherics/unary/portables_connector{ dir = 4 }, -/obj/machinery/portable_atmospherics/scrubber, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/portable_atmospherics/pump, /obj/structure/window/reinforced{ dir = 1 }, @@ -51415,23 +46357,43 @@ /area/atmos) "bJT" = ( /obj/machinery/hologram/holopad, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "neutralcorner" }, /area/atmos) "bJU" = ( -/turf/simulated/floor/plasteel{ - icon_state = "caution"; +/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 = 4; + icon_state = "caution" + }, /area/atmos) "bJV" = ( /obj/machinery/door/airlock/atmos/glass{ name = "Atmospherics Monitoring"; req_access_txt = "24" }, +/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" = ( @@ -51446,15 +46408,30 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/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/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, /turf/simulated/floor/plasteel, /area/atmos) "bJZ" = ( /obj/structure/closet/crate, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/atmos) "bKa" = ( @@ -51468,19 +46445,20 @@ dir = 8; name = "Mix to Filter" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/atmos) "bKc" = ( /obj/machinery/atmospherics/pipe/manifold/visible/yellow{ - tag = "icon-manifold-y (EAST)"; - dir = 4 + dir = 4; + tag = "icon-manifold-y (EAST)" }, /turf/simulated/floor/plasteel, /area/atmos) "bKd" = ( /obj/machinery/atmospherics/pipe/simple/visible/green{ - tag = "icon-intact-g (SOUTHEAST)"; - dir = 6 + dir = 6; + tag = "icon-intact-g (SOUTHEAST)" }, /turf/simulated/floor/plasteel, /area/atmos) @@ -51489,12 +46467,13 @@ dir = 1; tag = "icon-manifold-g (NORTH)" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/atmos) "bKf" = ( /obj/machinery/atmospherics/pipe/manifold/visible/green{ - tag = "icon-manifold-g (EAST)"; - dir = 4 + dir = 4; + tag = "icon-manifold-g (EAST)" }, /turf/simulated/floor/plasteel, /area/atmos) @@ -51508,8 +46487,8 @@ }, /obj/machinery/atmospherics/pipe/simple/visible/cyan, /turf/simulated/floor/plasteel{ - icon_state = "green"; - dir = 4 + dir = 4; + icon_state = "green" }, /area/atmos) "bKh" = ( @@ -51558,6 +46537,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, /turf/simulated/floor/carpet, /area/crew_quarters/theatre) "bKn" = ( @@ -51575,7 +46557,7 @@ /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{ @@ -51619,43 +46601,25 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - on = 1 - }, /obj/machinery/light/small{ - tag = "icon-bulb1 (EAST)"; + dir = 4; icon_state = "bulb1"; - dir = 4 + tag = "icon-bulb1 (EAST)" }, /obj/machinery/camera/motion{ c_tag = "AI Satellite Exterior South West"; dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/construction/hallway{ name = "\improper MiniSat Exterior" }) -"bKr" = ( -/obj/machinery/door/airlock/shuttle, -/turf/simulated/shuttle/floor, -/area/shuttle/transport) -"bKs" = ( -/turf/simulated/shuttle/floor, -/area/shuttle/transport) "bKt" = ( -/obj/machinery/door/airlock/shuttle, -/obj/docking_port/mobile{ - dir = 8; - dwidth = 2; - height = 12; - id = "ferry"; - name = "ferry shuttle"; - roundstart_move = "ferry_away"; - width = 5 - }, /obj/docking_port/stationary{ dir = 8; dwidth = 2; @@ -51664,16 +46628,15 @@ name = "port bay 3"; width = 5 }, -/turf/simulated/shuttle/floor, -/area/shuttle/transport) +/turf/space, +/area/space) "bKu" = ( /obj/machinery/door/airlock/external{ - name = "Transport Airlock" + id_tag = "ferry_home"; + locked = 1 }, /turf/simulated/floor/plating, -/area/hallway/secondary/entry{ - name = "Arrivals" - }) +/area/hallway/secondary/entry) "bKv" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/yellow{ @@ -51763,59 +46726,12 @@ }, /turf/simulated/floor/wood, /area/library) -"bKF" = ( -/obj/effect/spawner/window/reinforced, -/obj/structure/sign/securearea{ - desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; - icon_state = "space"; - layer = 4; - name = "EXTERNAL AIRLOCK" - }, -/turf/simulated/floor/plating, -/area/hallway/secondary/entry{ - name = "Arrivals" - }) -"bKG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/turf/simulated/floor/carpet, -/area/library) -"bKH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, -/turf/simulated/floor/carpet, -/area/library) "bKI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /turf/simulated/floor/carpet, /area/library) -"bKJ" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2; - initialize_directions = 11 - }, -/turf/simulated/floor/carpet, -/area/library) -"bKK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/public/glass{ - name = "Library" - }, -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "carpetsymbol" - }, -/area/library) "bKL" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -51828,9 +46744,6 @@ d2 = 4; icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=11.1-Command-Starboard"; location = "11-Command-Port" @@ -51838,10 +46751,6 @@ /turf/simulated/floor/plasteel, /area/hallway/primary/central) "bKM" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -51853,9 +46762,6 @@ }, /area/hallway/primary/central) "bKN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/structure/cable/yellow{ d1 = 4; @@ -51873,9 +46779,6 @@ name = "\improper Command Hallway" }) "bKO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -51889,9 +46792,6 @@ name = "\improper Command Hallway" }) "bKP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -51916,10 +46816,7 @@ d2 = 4; icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" @@ -51928,12 +46825,6 @@ name = "\improper Command Hallway" }) "bKR" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -51942,6 +46833,9 @@ /obj/structure/extinguisher_cabinet{ pixel_x = 27 }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "arrival" @@ -51961,9 +46855,6 @@ /turf/simulated/floor/wood, /area/library) "bKT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -51981,9 +46872,6 @@ name = "\improper Command Hallway" }) "bKU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 4; @@ -52002,9 +46890,6 @@ name = "\improper Command Hallway" }) "bKV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -52017,23 +46902,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralcorner" - }, -/area/bridge/meeting_room{ - name = "\improper Command Hallway" - }) -"bKW" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" @@ -52047,10 +46916,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2; - initialize_directions = 11 - }, /obj/machinery/newscaster{ pixel_y = -29 }, @@ -52068,17 +46933,17 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 1 + dir = 1; + icon_state = "neutral" }, /area/bridge/meeting_room{ name = "\improper Command Hallway" }) "bKZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -52097,9 +46962,6 @@ name = "\improper Command Hallway" }) "bLa" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -52115,9 +46977,6 @@ name = "\improper Command Hallway" }) "bLb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -52133,23 +46992,20 @@ /turf/simulated/floor/plasteel, /area/atmos) "bLd" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /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/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -52168,9 +47024,6 @@ name = "\improper Command Hallway" }) "bLf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -52190,9 +47043,6 @@ name = "\improper Command Hallway" }) "bLg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -52211,9 +47061,6 @@ name = "\improper Command Hallway" }) "bLh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -52235,9 +47082,6 @@ name = "\improper Command Hallway" }) "bLi" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -52251,9 +47095,6 @@ name = "\improper Command Hallway" }) "bLj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -52267,23 +47108,7 @@ d2 = 4; icon_state = "2-4" }, -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "neutralcorner" - }, -/area/bridge/meeting_room{ - name = "\improper Command Hallway" - }) -"bLk" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "neutralcorner" @@ -52300,17 +47125,14 @@ layer = 4; pixel_y = 32 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 - }, /obj/structure/disposalpipe/junction{ dir = 8; icon_state = "pipe-j2"; tag = "icon-pipe-j1 (WEST)" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -52319,9 +47141,6 @@ name = "\improper Command Hallway" }) "bLm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -52339,48 +47158,14 @@ /area/bridge/meeting_room{ name = "\improper Command Hallway" }) -"bLn" = ( -/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{ - dir = 2; - icon_state = "neutralcorner" - }, -/area/bridge/meeting_room{ - name = "\improper Command Hallway" - }) "bLo" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2; - initialize_directions = 11 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "neutralcorner" - }, -/area/bridge/meeting_room{ - name = "\improper Command Hallway" - }) -"bLp" = ( -/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/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 2; @@ -52390,9 +47175,6 @@ name = "\improper Command Hallway" }) "bLq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -52416,9 +47198,6 @@ name = "\improper Command Hallway" }) "bLr" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -52441,10 +47220,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" @@ -52481,6 +47256,10 @@ /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" @@ -52499,6 +47278,9 @@ /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" = ( @@ -52510,6 +47292,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 = "bar" }, @@ -52523,7 +47308,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "bar" }, @@ -52537,6 +47322,9 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "bar" }, @@ -52550,6 +47338,9 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "bar" }, @@ -52563,6 +47354,9 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "bar" }, @@ -52581,6 +47375,9 @@ name = "Club"; opacity = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "bar" }, @@ -52624,19 +47421,6 @@ /area/maintenance/fpmaint2{ name = "Port Maintenance" }) -"bLE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6; - level = 1 - }, -/obj/effect/decal/warning_stripes/west, -/turf/simulated/floor/plasteel, -/area/hallway/secondary/entry{ - name = "Arrivals" - }) "bLF" = ( /obj/machinery/atmospherics/unary/vent_pump{ dir = 2; @@ -52644,13 +47428,6 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/bar) -"bLG" = ( -/obj/effect/spawner/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/crew_quarters/bar) "bLH" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -52662,7 +47439,6 @@ /area/crew_quarters/theatre) "bLI" = ( /obj/structure/chair/wood/wings, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/carpet, /area/crew_quarters/theatre) "bLJ" = ( @@ -52672,6 +47448,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/carpet, /area/crew_quarters/theatre) "bLK" = ( @@ -52693,6 +47472,9 @@ /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" = ( @@ -52713,6 +47495,9 @@ /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" = ( @@ -52733,11 +47518,10 @@ /obj/machinery/atmospherics/unary/portables_connector{ dir = 4 }, -/obj/machinery/portable_atmospherics/scrubber, +/obj/machinery/portable_atmospherics/pump, /obj/machinery/light/small{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/window/reinforced, /turf/simulated/floor/plasteel{ dir = 8; @@ -52750,28 +47534,27 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 - }, /obj/structure/disposalpipe/segment{ dir = 1; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "neutralcorner" }, /area/hallway/primary/starboard) "bLQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/simulated/floor/plasteel{ - icon_state = "caution"; +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "caution" + }, /area/hallway/primary/starboard) "bLR" = ( /obj/structure/cable/yellow{ @@ -52800,6 +47583,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -52811,6 +47597,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/visible/universal{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "neutralcorner" @@ -52820,7 +47609,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/binary/volume_pump/on{ + dir = 8; + name = "Air to External" + }, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "neutralcorner" @@ -52831,9 +47623,12 @@ dir = 4 }, /obj/machinery/atmospherics/unary/vent_pump{ - dir = 2; + dir = 1; on = 1 }, +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "blackcorner" @@ -52855,6 +47650,9 @@ pixel_y = -26; req_access_txt = "24" }, +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "caution" @@ -52862,6 +47660,10 @@ /area/atmos) "bLX" = ( /obj/machinery/hologram/holopad, +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 10; + initialize_directions = 10 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "caution" @@ -52873,23 +47675,37 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/visible/purple{ +/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/hidden/supply, /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/hidden/scrubbers, /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, /area/atmos) "bMb" = ( @@ -52900,6 +47716,12 @@ /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" = ( @@ -52913,6 +47735,9 @@ dir = 9; tag = "icon-intact-y (NORTHWEST)" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/atmos) "bMe" = ( @@ -52921,13 +47746,20 @@ name = "Pure to Mix"; on = 0 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/atmos) "bMf" = ( /obj/machinery/atmospherics/pipe/simple/visible/green{ - tag = "icon-intact-g (NORTHEAST)"; dir = 5; - initialize_directions = 12 + 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) @@ -52946,8 +47778,8 @@ }, /obj/machinery/atmospherics/pipe/simple/visible/cyan, /turf/simulated/floor/plasteel{ - icon_state = "green"; - dir = 6 + dir = 6; + icon_state = "green" }, /area/atmos) "bMi" = ( @@ -53000,6 +47832,9 @@ d2 = 2; icon_state = "0-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -53126,35 +47961,6 @@ /area/toxins/xenobiology{ name = "\improper Secure Lab" }) -"bMw" = ( -/turf/simulated/shuttle/floor, -/turf/simulated/shuttle/wall/interior{ - tag = "icon-swall_f10"; - icon_state = "swall_f10" - }, -/area/shuttle/transport) -"bMx" = ( -/obj/structure/closet/crate, -/obj/machinery/light/spot, -/turf/simulated/shuttle/floor, -/area/shuttle/transport) -"bMy" = ( -/obj/structure/closet/crate, -/turf/simulated/shuttle/floor, -/area/shuttle/transport) -"bMz" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 1 - }, -/turf/simulated/shuttle/floor, -/area/shuttle/transport) -"bMA" = ( -/obj/machinery/light/spot, -/obj/structure/chair/comfy/shuttle{ - dir = 1 - }, -/turf/simulated/shuttle/floor, -/area/shuttle/transport) "bMB" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -53194,9 +48000,6 @@ d2 = 4; icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, /turf/simulated/floor/wood, /area/security/vacantoffice) "bMF" = ( @@ -53213,6 +48016,9 @@ dir = 2; network = list("SS13") }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -53229,11 +48035,8 @@ layer = 4; pixel_y = 32 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -53297,6 +48100,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/carpet, /area/library) "bMN" = ( @@ -53306,39 +48110,11 @@ }, /turf/simulated/floor/wood, /area/library) -"bMO" = ( -/obj/machinery/power/rad_collector{ - anchored = 1 - }, -/obj/item/tank/plasma, -/obj/structure/cable{ - d2 = 8; - icon_state = "0-8" - }, -/obj/effect/decal/warning_stripes/west, -/turf/simulated/floor/plating, -/area/engine/engineering) "bMP" = ( /obj/machinery/bookbinder, /turf/simulated/floor/wood, /area/library) -"bMQ" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/turf/simulated/floor/plasteel, -/area/hallway/primary/central) "bMR" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 - }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -53351,11 +48127,9 @@ }) "bMT" = ( /obj/structure/closet/emcloset, -/obj/effect/decal/warning_stripes/yellow/hollow, +/obj/effect/decal/warning_stripes/southwest, /turf/simulated/floor/plasteel, -/area/hallway/secondary/entry{ - name = "Arrivals" - }) +/area/hallway/secondary/entry) "bMU" = ( /obj/structure/sign/securearea, /turf/simulated/wall/r_wall, @@ -53374,12 +48148,12 @@ icon_state = "4-8" }, /obj/effect/decal/warning_stripes/arrow{ - icon_state = "4"; - dir = 1 + dir = 1; + icon_state = "4" }, /obj/effect/decal/warning_stripes/yellow/partial{ - icon_state = "3"; - dir = 1 + dir = 1; + icon_state = "3" }, /turf/simulated/floor/plasteel, /area/bridge/meeting_room{ @@ -53413,7 +48187,6 @@ name = "\improper Command Hallway" }) "bMY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/sign/securearea, /turf/simulated/wall/r_wall, /area/teleporter{ @@ -53509,17 +48282,16 @@ opacity = 0 }, /obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/atmos) -"bNk" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/wall/r_wall, -/area/gateway) "bNl" = ( /obj/machinery/vending/coffee, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/bridge/meeting_room{ name = "\improper Command Hallway" @@ -53556,9 +48328,9 @@ req_access_txt = "28" }, /turf/simulated/floor/plasteel{ - tag = "icon-cafeteria (NORTHEAST)"; + dir = 5; icon_state = "cafeteria"; - dir = 5 + tag = "icon-cafeteria (NORTHEAST)" }, /area/crew_quarters/kitchen) "bNo" = ( @@ -53576,33 +48348,16 @@ name = "Central Maintenance" }) "bNp" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" }, /area/hallway/primary/central) -"bNq" = ( -/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) "bNr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ req_access_txt = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "neutralcorner" @@ -53618,31 +48373,6 @@ /area/teleporter{ name = "\improper Teleporter Room" }) -"bNt" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "bar" - }, -/area/crew_quarters/bar) -"bNu" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2; - initialize_directions = 11 - }, -/turf/simulated/floor/plasteel{ - icon_state = "bar" - }, -/area/crew_quarters/bar) -"bNv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/turf/simulated/floor/plasteel{ - icon_state = "bar" - }, -/area/crew_quarters/bar) "bNw" = ( /obj/machinery/atmospherics/unary/vent_pump{ dir = 1; @@ -53660,36 +48390,20 @@ icon_state = "1-8" }, /turf/simulated/floor/plasteel{ - tag = "icon-cafeteria (NORTHEAST)"; + dir = 5; icon_state = "cafeteria"; - dir = 5 - }, -/area/crew_quarters/kitchen) -"bNy" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - tag = "icon-cafeteria (NORTHEAST)"; - icon_state = "cafeteria"; - dir = 5 + tag = "icon-cafeteria (NORTHEAST)" }, /area/crew_quarters/kitchen) "bNz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 1; icon_state = "pipe-c" }, /turf/simulated/floor/plasteel{ - tag = "icon-cafeteria (NORTHEAST)"; + dir = 5; icon_state = "cafeteria"; - dir = 5 + tag = "icon-cafeteria (NORTHEAST)" }, /area/crew_quarters/kitchen) "bNA" = ( @@ -53700,9 +48414,6 @@ name = "Station Intercom (General)"; pixel_y = -29 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -53716,9 +48427,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -53731,9 +48439,6 @@ pixel_y = -26 }, /obj/machinery/light, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -53746,9 +48451,6 @@ dir = 1; pixel_y = -22 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/camera{ c_tag = "Kitchen - Coldroom"; dir = 1; @@ -53776,6 +48478,7 @@ /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" = ( @@ -53801,24 +48504,15 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, /obj/machinery/firealarm{ dir = 4; pixel_x = 24 }, /turf/simulated/floor/plasteel{ - icon_state = "caution"; - dir = 4 + dir = 4; + icon_state = "caution" }, /area/hallway/primary/starboard) -"bNJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/wall/r_wall, -/area/atmos) "bNK" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -53839,6 +48533,9 @@ opacity = 0 }, /obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/atmos) "bNL" = ( @@ -53857,11 +48554,14 @@ pixel_y = 1 }, /obj/effect/decal/warning_stripes/arrow{ - icon_state = "4"; - dir = 4 + dir = 4; + icon_state = "4" }, /obj/effect/decal/warning_stripes/yellow/partial{ - icon_state = "3"; + dir = 4; + icon_state = "3" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /turf/simulated/floor/plasteel, @@ -53881,28 +48581,16 @@ "bNN" = ( /obj/machinery/computer/card/minor/rd, /turf/simulated/floor/plasteel{ - tag = "icon-cafeteria (NORTHEAST)"; + dir = 5; icon_state = "cafeteria"; - dir = 5 + tag = "icon-cafeteria (NORTHEAST)" }, /area/crew_quarters/hor) -"bNO" = ( -/obj/machinery/atmospherics/pipe/simple/visible/universal{ - dir = 4 - }, -/turf/simulated/wall/r_wall, -/area/atmos) -"bNP" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ - dir = 10; - initialize_directions = 10 - }, -/turf/simulated/wall/r_wall, -/area/atmos) "bNQ" = ( /obj/machinery/light{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/visible/cyan, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "caution" @@ -53915,6 +48603,8 @@ 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, /turf/simulated/floor/plasteel, /area/atmos) "bNS" = ( @@ -54003,13 +48693,6 @@ /area/toxins/xenobiology{ name = "\improper Secure Lab" }) -"bOd" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f9"; - dir = 2 - }, -/area/shuttle/transport) "bOe" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -54025,6 +48708,7 @@ /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" @@ -54072,6 +48756,9 @@ /obj/structure/chair/comfy/black{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + req_access_txt = 1 + }, /turf/simulated/floor/carpet, /area/security/vacantoffice) "bOj" = ( @@ -54081,9 +48768,9 @@ /area/security/vacantoffice) "bOk" = ( /obj/machinery/shower{ - tag = "icon-shower (EAST)"; + dir = 4; icon_state = "shower"; - dir = 4 + tag = "icon-shower (EAST)" }, /obj/effect/decal/cleanable/blood, /obj/effect/decal/cleanable/blood/gibs/limb, @@ -54098,11 +48785,8 @@ /obj/machinery/shower{ dir = 8 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plating, /area/crew_quarters/toilet{ @@ -54200,13 +48884,6 @@ }, /turf/simulated/floor/plasteel, /area/hallway/primary/central) -"bOv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "neutralcorner" - }, -/area/hallway/primary/central) "bOw" = ( /obj/structure/table/wood, /obj/machinery/computer/security/telescreen/entertainment{ @@ -54215,11 +48892,8 @@ /turf/simulated/floor/wood, /area/library) "bOx" = ( -/obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plating, -/area/hallway/secondary/entry{ - name = "Arrivals" - }) +/area/hallway/secondary/entry) "bOy" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -54239,6 +48913,10 @@ 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" = ( @@ -54254,9 +48932,9 @@ pixel_y = 30 }, /turf/simulated/floor/plasteel{ - tag = "icon-vault (WEST)"; + dir = 8; icon_state = "vault"; - dir = 8 + tag = "icon-vault (WEST)" }, /area/ai_monitored/storage/eva{ name = "E.V.A. Storage" @@ -54281,13 +48959,11 @@ req_access_txt = 1 }, /obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/gateway) "bOD" = ( /obj/machinery/portable_atmospherics/canister/oxygen, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, /area/atmos) @@ -54296,9 +48972,6 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, /area/atmos) @@ -54307,9 +48980,6 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, /area/atmos) @@ -54353,9 +49023,6 @@ dir = 1; on = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -54377,9 +49044,6 @@ name = "\improper Command Hallway" }) "bOK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -54436,16 +49100,12 @@ icon_state = "1-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 + req_access_txt = 1 }, /turf/simulated/floor/wood, /area/security/vacantoffice) "bOQ" = ( /obj/machinery/portable_atmospherics/canister/nitrogen, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, /area/atmos) @@ -54490,6 +49150,9 @@ 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" = ( @@ -54498,10 +49161,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/plasteel, /area/hallway/primary/central) @@ -54509,6 +49170,10 @@ /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" @@ -54516,9 +49181,9 @@ /area/hallway/primary/central) "bOX" = ( /obj/machinery/shower{ - tag = "icon-shower (EAST)"; + dir = 4; icon_state = "shower"; - dir = 4 + tag = "icon-shower (EAST)" }, /obj/machinery/door_control{ id = "AuxShower"; @@ -54541,19 +49206,12 @@ pixel_y = -29 }, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/bridge/meeting_room{ name = "\improper Command Hallway" }) -"bOZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/chair/stool/bar, -/turf/simulated/floor/plasteel{ - icon_state = "bar" - }, -/area/crew_quarters/bar) "bPa" = ( /obj/machinery/light, /obj/machinery/camera{ @@ -54611,18 +49269,9 @@ /obj/machinery/light_switch{ pixel_y = -28 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, /obj/machinery/light, /turf/simulated/floor/carpet, /area/crew_quarters/theatre) -"bPf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/turf/simulated/floor/carpet, -/area/crew_quarters/theatre) "bPg" = ( /obj/structure/table/wood, /obj/machinery/light/small, @@ -54642,9 +49291,9 @@ pixel_x = -27 }, /turf/simulated/floor/plasteel{ - tag = "icon-vault (WEST)"; + dir = 8; icon_state = "vault"; - dir = 8 + tag = "icon-vault (WEST)" }, /area/ai_monitored/storage/eva{ name = "E.V.A. Storage" @@ -54708,6 +49357,7 @@ }, /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" @@ -54739,19 +49389,12 @@ dir = 4; pixel_x = 24 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/closet/crate, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, /area/teleporter{ name = "\improper Teleporter Room" }) -"bPr" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/turf/simulated/wall/r_wall, -/area/atmos) "bPs" = ( /obj/structure/cable/yellow{ d1 = 4; @@ -54761,9 +49404,9 @@ /turf/simulated/floor/wood, /area/ntrep) "bPt" = ( -/obj/machinery/atmospherics/binary/volume_pump/on{ +/obj/machinery/atmospherics/pipe/manifold/visible/cyan{ dir = 8; - name = "Air to External" + initialize_directions = 11 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -54771,21 +49414,16 @@ }, /area/atmos) "bPu" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/visible/purple, -/turf/simulated/floor/plasteel, -/area/atmos) -"bPv" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/cyan{ - dir = 1; - initialize_directions = 11 +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 4 }, /turf/simulated/floor/plasteel, /area/atmos) @@ -54906,6 +49544,7 @@ 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" }, @@ -55003,10 +49642,6 @@ name = "Port Maintenance" }) "bPR" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 - }, /obj/item/radio/intercom{ frequency = 1459; name = "Station Intercom (General)"; @@ -55069,6 +49704,9 @@ 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" @@ -55118,9 +49756,9 @@ "bQd" = ( /obj/machinery/suit_storage_unit/standard_unit, /turf/simulated/floor/plasteel{ - tag = "icon-vault (WEST)"; + dir = 8; icon_state = "vault"; - dir = 8 + tag = "icon-vault (WEST)" }, /area/ai_monitored/storage/eva{ name = "E.V.A. Storage" @@ -55131,8 +49769,10 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/warning_stripes/northeast, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, /turf/simulated/floor/plasteel, /area/gateway) "bQf" = ( @@ -55166,9 +49806,9 @@ pixel_x = 24 }, /turf/simulated/floor/plasteel{ - tag = "icon-vault (WEST)"; + dir = 8; icon_state = "vault"; - dir = 8 + tag = "icon-vault (WEST)" }, /area/ai_monitored/storage/eva{ name = "E.V.A. Storage" @@ -55202,27 +49842,13 @@ /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, /area/gateway) -"bQj" = ( -/obj/machinery/portable_atmospherics/canister/oxygen, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, -/area/atmos) "bQk" = ( /obj/machinery/portable_atmospherics/canister/air, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, /area/atmos) "bQl" = ( /obj/machinery/portable_atmospherics/canister/sleeping_agent, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, /area/atmos) @@ -55235,76 +49861,31 @@ /turf/simulated/floor/plating, /area/gateway) "bQn" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /turf/simulated/floor/wood, /area/blueshield) -"bQo" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "bcarpet05" - }, -/area/blueshield) "bQp" = ( /obj/machinery/light_switch{ pixel_x = 27 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, +/obj/machinery/atmospherics/unary/vent_pump, /turf/simulated/floor/wood, /area/blueshield) -"bQq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/wall, -/area/ntrep) "bQr" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, +/obj/machinery/atmospherics/unary/vent_pump, /turf/simulated/floor/wood, /area/ntrep) -"bQs" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/carpet, -/area/ntrep) -"bQt" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11; - level = 1 - }, -/turf/simulated/floor/carpet, -/area/ntrep) "bQu" = ( /obj/machinery/light_switch{ pixel_x = 27 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /turf/simulated/floor/wood, /area/ntrep) -"bQw" = ( -/obj/machinery/portable_atmospherics/canister/nitrogen, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2; - initialize_directions = 11 - }, -/obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, -/area/atmos) "bQx" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 @@ -55343,11 +49924,6 @@ /obj/item/stack/rods{ amount = 50 }, -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ - tag = "icon-intact (NORTHEAST)"; - icon_state = "intact"; - dir = 5 - }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -55359,16 +49935,16 @@ frequency = 1443; id = "air_in" }, -/turf/simulated/floor/engine/insulated/vacuum, +/turf/simulated/floor/engine/vacuum, /area/maintenance/incinerator) "bQB" = ( /obj/machinery/gateway{ dir = 9 }, /turf/simulated/floor/plasteel{ - tag = "icon-vault (NORTH)"; + dir = 1; icon_state = "vault"; - dir = 1 + tag = "icon-vault (NORTH)" }, /area/gateway) "bQC" = ( @@ -55390,9 +49966,9 @@ dir = 5 }, /turf/simulated/floor/plasteel{ - tag = "icon-vault (EAST)"; + dir = 4; icon_state = "vault"; - dir = 4 + tag = "icon-vault (EAST)" }, /area/gateway) "bQE" = ( @@ -55406,7 +49982,6 @@ }, /area/crew_quarters/bar) "bQF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor, /turf/simulated/floor/plasteel{ dir = 1; @@ -55427,6 +50002,7 @@ req_access_txt = 1 }, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "neutralcorner" @@ -55443,7 +50019,6 @@ id_tag = "kitchen"; name = "Serving Hatch" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/item/reagent_containers/food/snacks/pie, /obj/machinery/door/window/eastleft{ dir = 2; @@ -55451,9 +50026,9 @@ req_access_txt = "28" }, /turf/simulated/floor/plasteel{ - tag = "icon-cafeteria (NORTHEAST)"; + dir = 5; icon_state = "cafeteria"; - dir = 5 + tag = "icon-cafeteria (NORTHEAST)" }, /area/crew_quarters/kitchen) "bQK" = ( @@ -55471,9 +50046,9 @@ req_access_txt = "28" }, /turf/simulated/floor/plasteel{ - tag = "icon-cafeteria (NORTHEAST)"; + dir = 5; icon_state = "cafeteria"; - dir = 5 + tag = "icon-cafeteria (NORTHEAST)" }, /area/crew_quarters/kitchen) "bQL" = ( @@ -55514,8 +50089,8 @@ req_access_txt = "28" }, /turf/simulated/floor/plasteel{ - icon_state = "cafeteria"; - dir = 2 + dir = 2; + icon_state = "cafeteria" }, /area/crew_quarters/kitchen) "bQP" = ( @@ -55559,7 +50134,6 @@ name = "Theatre Backstage"; req_access_txt = "46" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood, /area/crew_quarters/theatre) "bQV" = ( @@ -55600,9 +50174,9 @@ pixel_y = -2 }, /turf/simulated/floor/plasteel{ - tag = "icon-cafeteria (NORTHEAST)"; + dir = 5; icon_state = "cafeteria"; - dir = 5 + tag = "icon-cafeteria (NORTHEAST)" }, /area/crew_quarters/hor) "bQX" = ( @@ -55618,38 +50192,14 @@ /area/teleporter{ name = "\improper Teleporter Room" }) -"bQY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/turf/simulated/wall/r_wall, -/area/atmos) -"bQZ" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/turf/simulated/floor/wood, -/area/security/vacantoffice) "bRa" = ( /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/visible/purple{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/atmos) -"bRb" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/atmos) "bRc" = ( @@ -55770,15 +50320,11 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel/dark, /area/tcommsat/server) "bRr" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 - }, +/obj/machinery/atmospherics/unary/vent_scrubber, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -55789,7 +50335,12 @@ 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{ + dir = 5 + }, /turf/simulated/floor/plasteel/dark, /area/tcommsat/server) "bRt" = ( @@ -55839,22 +50390,19 @@ d2 = 8; icon_state = "1-8" }, -/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/unary/vent_pump{ + dir = 1; + on = 1 + }, /turf/simulated/floor/plasteel, /area/gateway) "bRx" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - on = 1 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/yellow{ d1 = 4; @@ -55883,17 +50431,6 @@ dir = 4; icon_state = "arrival" }, -/area/hallway/secondary/entry{ - name = "Arrivals" - }) -"bRz" = ( -/obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-06"; - level = 4.1; - tag = "icon-plant-06" - }, -/obj/effect/decal/warning_stripes/northwest, -/turf/simulated/floor/plasteel, /area/hallway/secondary/entry{ name = "Arrivals" }) @@ -55965,8 +50502,8 @@ dir = 8; layer = 2.9 }, -/obj/effect/landmark/costume/random, -/obj/effect/landmark/costume/random, +/obj/effect/landmark/costume, +/obj/effect/landmark/costume, /turf/simulated/floor/plating, /area/maintenance/fpmaint2{ name = "Port Maintenance" @@ -55977,8 +50514,8 @@ dir = 8; layer = 2.9 }, -/obj/effect/landmark/costume/random, -/obj/effect/landmark/costume/random, +/obj/effect/landmark/costume, +/obj/effect/landmark/costume, /turf/simulated/floor/plating, /area/maintenance/fpmaint2{ name = "Port Maintenance" @@ -56002,6 +50539,7 @@ /obj/effect/landmark{ name = "lightsout" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/carpet, /area/library) "bRM" = ( @@ -56020,7 +50558,6 @@ /turf/simulated/floor/wood, /area/library) "bRO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/extinguisher_cabinet{ pixel_x = 27 }, @@ -56039,9 +50576,9 @@ pixel_y = 32 }, /turf/simulated/floor/plasteel{ - tag = "icon-vault (WEST)"; + dir = 8; icon_state = "vault"; - dir = 8 + tag = "icon-vault (WEST)" }, /area/gateway) "bRQ" = ( @@ -56076,9 +50613,9 @@ icon_state = "0-4" }, /turf/simulated/floor/plasteel{ - tag = "icon-vault (WEST)"; + dir = 8; icon_state = "vault"; - dir = 8 + tag = "icon-vault (WEST)" }, /area/ai_monitored/storage/eva{ name = "E.V.A. Storage" @@ -56136,9 +50673,9 @@ req_access_txt = "28" }, /turf/simulated/floor/plasteel{ - tag = "icon-cafeteria (NORTHEAST)"; + dir = 5; icon_state = "cafeteria"; - dir = 5 + tag = "icon-cafeteria (NORTHEAST)" }, /area/crew_quarters/kitchen) "bRV" = ( @@ -56177,9 +50714,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 4; @@ -56187,11 +50721,13 @@ }, /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, /turf/simulated/floor/wood, /area/blueshield) "bSa" = ( @@ -56210,9 +50746,11 @@ 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, /turf/simulated/floor/wood, /area/ntrep) "bSe" = ( @@ -56220,7 +50758,6 @@ /area/ntrep) "bSf" = ( /obj/machinery/hologram/holopad, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/carpet, /area/ntrep) "bSg" = ( @@ -56228,6 +50765,7 @@ pixel_x = 29; pixel_y = -1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood, /area/ntrep) "bSh" = ( @@ -56276,9 +50814,6 @@ /area/crew_quarters/bar) "bSk" = ( /obj/machinery/shieldwallgen, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -56294,16 +50829,16 @@ id_tag = "auxincineratorvent"; name = "Auxiliary Incinerator Vent" }, -/turf/simulated/floor/engine/insulated/vacuum, +/turf/simulated/floor/engine/vacuum, /area/maintenance/incinerator) "bSm" = ( /obj/machinery/gateway{ dir = 8 }, /turf/simulated/floor/plasteel{ - tag = "icon-vault (WEST)"; + dir = 8; icon_state = "vault"; - dir = 8 + tag = "icon-vault (WEST)" }, /area/gateway) "bSn" = ( @@ -56317,9 +50852,9 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - tag = "icon-vault (WEST)"; + dir = 8; icon_state = "vault"; - dir = 8 + tag = "icon-vault (WEST)" }, /area/gateway) "bSp" = ( @@ -56338,19 +50873,13 @@ dir = 4; pixel_x = -23 }, -/obj/machinery/atmospherics/binary/volume_pump/on{ - dir = 4; - name = "External to Filter" - }, +/obj/machinery/atmospherics/pipe/simple/visible/cyan, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "caution" }, /area/atmos) "bSr" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -56386,17 +50915,9 @@ /area/atmos) "bSt" = ( /turf/simulated/floor/plasteel{ - tag = "icon-cafeteria (NORTHEAST)"; + dir = 5; icon_state = "cafeteria"; - dir = 5 - }, -/area/crew_quarters/kitchen) -"bSu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - tag = "icon-cafeteria (NORTHEAST)"; - icon_state = "cafeteria"; - dir = 5 + tag = "icon-cafeteria (NORTHEAST)" }, /area/crew_quarters/kitchen) "bSv" = ( @@ -56408,9 +50929,9 @@ dir = 1 }, /turf/simulated/floor/plasteel{ - tag = "icon-cafeteria (NORTHEAST)"; + dir = 5; icon_state = "cafeteria"; - dir = 5 + tag = "icon-cafeteria (NORTHEAST)" }, /area/crew_quarters/kitchen) "bSw" = ( @@ -56418,9 +50939,9 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - tag = "icon-cafeteria (NORTHEAST)"; + dir = 5; icon_state = "cafeteria"; - dir = 5 + tag = "icon-cafeteria (NORTHEAST)" }, /area/crew_quarters/kitchen) "bSx" = ( @@ -56437,9 +50958,9 @@ icon_state = "2-4" }, /turf/simulated/floor/plasteel{ - tag = "icon-cafeteria (NORTHEAST)"; + dir = 5; icon_state = "cafeteria"; - dir = 5 + tag = "icon-cafeteria (NORTHEAST)" }, /area/crew_quarters/kitchen) "bSy" = ( @@ -56449,9 +50970,9 @@ icon_state = "1-8" }, /turf/simulated/floor/plasteel{ - tag = "icon-cafeteria (NORTHEAST)"; + dir = 5; icon_state = "cafeteria"; - dir = 5 + tag = "icon-cafeteria (NORTHEAST)" }, /area/crew_quarters/kitchen) "bSz" = ( @@ -56490,6 +51011,7 @@ 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" = ( @@ -56547,9 +51069,9 @@ pixel_y = -3 }, /turf/simulated/floor/plasteel{ - tag = "icon-vault (WEST)"; + dir = 8; icon_state = "vault"; - dir = 8 + tag = "icon-vault (WEST)" }, /area/ai_monitored/storage/eva{ name = "E.V.A. Storage" @@ -56586,30 +51108,15 @@ /area/atmos) "bSK" = ( /obj/machinery/atmospherics/pipe/manifold/visible/cyan{ - dir = 1; + dir = 4; initialize_directions = 11 }, /turf/simulated/floor/plasteel{ - icon_state = "arrival"; - dir = 8 + dir = 8; + icon_state = "arrival" }, /area/atmos) -"bSL" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/visible/purple, -/turf/simulated/floor/plasteel, -/area/atmos) "bSM" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ - dir = 9 - }, /obj/structure/reagent_dispensers/watertank/high, /turf/simulated/floor/plasteel, /area/atmos) @@ -56703,7 +51210,6 @@ /turf/simulated/floor/engine/n20, /area/atmos) "bSW" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/status_display{ density = 0; layer = 4; @@ -56758,6 +51264,9 @@ /obj/machinery/door/airlock/medical{ name = "Morgue" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -56793,10 +51302,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/manifold/hidden/supply{ - dir = 2 +/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" @@ -56808,7 +51316,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/carpet, /area/crew_quarters/theatre) "bTe" = ( @@ -56847,17 +51354,14 @@ d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/security/podbay) "bTh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/computer/account_database, /turf/simulated/floor/bluegrid, /area/bridge) @@ -56929,8 +51433,8 @@ tag = "icon-plant-03" }, /turf/simulated/floor/plasteel{ - icon_state = "arrival"; - dir = 6 + dir = 6; + icon_state = "arrival" }, /area/hallway/secondary/entry{ name = "Arrivals" @@ -57018,7 +51522,6 @@ /turf/simulated/floor/wood, /area/library) "bTu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -57035,6 +51538,7 @@ d2 = 8; icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/carpet, /area/library) "bTw" = ( @@ -57076,12 +51580,11 @@ "bTB" = ( /obj/structure/closet/emcloset, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/library) "bTC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/light{ dir = 4 }, @@ -57100,8 +51603,8 @@ }, /obj/machinery/kitchen_machine/microwave, /turf/simulated/floor/plasteel{ - icon_state = "cafeteria"; - dir = 2 + dir = 2; + icon_state = "cafeteria" }, /area/crew_quarters/kitchen) "bTE" = ( @@ -57168,7 +51671,6 @@ name = "Arrivals" }) "bTK" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/alarm{ dir = 1; pixel_y = -22 @@ -57184,12 +51686,9 @@ icon_state = "alarm0"; pixel_x = 24 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/wood, /area/blueshield) -"bTM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/carpet, -/area/ntrep) "bTN" = ( /obj/structure/chair/office/dark, /turf/simulated/floor/carpet, @@ -57200,6 +51699,7 @@ icon_state = "alarm0"; pixel_x = 24 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood, /area/ntrep) "bTP" = ( @@ -57210,7 +51710,6 @@ /turf/simulated/floor/wood, /area/crew_quarters/theatre) "bTQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/light_switch{ pixel_x = -26 }, @@ -57233,9 +51732,9 @@ dir = 10 }, /turf/simulated/floor/plasteel{ - tag = "icon-vault (EAST)"; + dir = 4; icon_state = "vault"; - dir = 4 + tag = "icon-vault (EAST)" }, /area/gateway) "bTT" = ( @@ -57245,9 +51744,9 @@ icon_state = "0-2" }, /turf/simulated/floor/plasteel{ - tag = "icon-vault (WEST)"; + dir = 8; icon_state = "vault"; - dir = 8 + tag = "icon-vault (WEST)" }, /area/gateway) "bTU" = ( @@ -57255,9 +51754,9 @@ dir = 6 }, /turf/simulated/floor/plasteel{ - tag = "icon-vault (NORTH)"; + dir = 1; icon_state = "vault"; - dir = 1 + tag = "icon-vault (NORTH)" }, /area/gateway) "bTV" = ( @@ -57271,7 +51770,6 @@ name = "Central Maintenance" }) "bTW" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/item/radio/intercom{ dir = 8; name = "Station Intercom (General)"; @@ -57286,6 +51784,10 @@ /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" @@ -57306,10 +51808,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ - tag = "icon-cafeteria (NORTHEAST)"; + dir = 5; icon_state = "cafeteria"; - dir = 5 + tag = "icon-cafeteria (NORTHEAST)" }, /area/crew_quarters/kitchen) "bUb" = ( @@ -57318,30 +51823,9 @@ on = 1 }, /turf/simulated/floor/plasteel{ - tag = "icon-cafeteria (NORTHEAST)"; + dir = 5; icon_state = "cafeteria"; - dir = 5 - }, -/area/crew_quarters/kitchen) -"bUc" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 - }, -/turf/simulated/floor/plasteel{ - tag = "icon-cafeteria (NORTHEAST)"; - icon_state = "cafeteria"; - dir = 5 - }, -/area/crew_quarters/kitchen) -"bUd" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/turf/simulated/floor/plasteel{ - tag = "icon-cafeteria (NORTHEAST)"; - icon_state = "cafeteria"; - dir = 5 + tag = "icon-cafeteria (NORTHEAST)" }, /area/crew_quarters/kitchen) "bUe" = ( @@ -57352,9 +51836,9 @@ }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ - tag = "icon-cafeteria (NORTHEAST)"; + dir = 5; icon_state = "cafeteria"; - dir = 5 + tag = "icon-cafeteria (NORTHEAST)" }, /area/crew_quarters/kitchen) "bUf" = ( @@ -57364,12 +51848,12 @@ }, /obj/machinery/vending/dinnerware, /turf/simulated/floor/plasteel{ - icon_state = "cafeteria"; - dir = 2 + dir = 2; + icon_state = "cafeteria" }, /area/crew_quarters/kitchen) "bUg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, /turf/simulated/floor/wood, @@ -57406,9 +51890,6 @@ /turf/simulated/floor/wood, /area/crew_quarters/theatre) "bUl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, /turf/simulated/floor/wood, /area/crew_quarters/theatre) "bUm" = ( @@ -57463,8 +51944,8 @@ dir = 9 }, /turf/simulated/floor/plasteel{ - icon_state = "arrival"; - dir = 8 + dir = 8; + icon_state = "arrival" }, /area/atmos) "bUt" = ( @@ -57478,8 +51959,8 @@ }, /obj/structure/window/reinforced, /turf/simulated/floor/plasteel{ - icon_state = "escape"; - dir = 6 + dir = 6; + icon_state = "escape" }, /area/atmos) "bUu" = ( @@ -57511,31 +51992,15 @@ icon_state = "dark" }, /area/atmos) -"bUx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10; - initialize_directions = 10; - level = 1 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/research{ - name = "Research Division" - }) "bUy" = ( /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1; - scrub_Toxins = 0 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -57549,7 +52014,12 @@ d2 = 8; icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/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" }, @@ -57569,14 +52039,15 @@ req_access_txt = "13;75" }, /obj/machinery/light/small{ - tag = "icon-bulb1 (EAST)"; + dir = 4; icon_state = "bulb1"; - dir = 4 + tag = "icon-bulb1 (EAST)" }, /obj/machinery/camera/motion{ c_tag = "AI Satellite Exterior South East 2"; dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -57584,10 +52055,8 @@ name = "\improper MiniSat Exterior" }) "bUB" = ( -/obj/machinery/door/airlock/external{ - name = "Auxiliary Airlock" - }, -/turf/simulated/floor/plating, +/obj/effect/decal/warning_stripes/east, +/turf/simulated/floor/plasteel, /area/hallway/secondary/entry{ name = "Arrivals" }) @@ -57595,9 +52064,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -57638,7 +52104,6 @@ name = "Quiet Room"; opacity = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "carpetsymbol" @@ -57658,6 +52123,7 @@ /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 = "carpetsymbol" @@ -57669,21 +52135,21 @@ req_access_txt = "37" }, /turf/simulated/floor/plasteel{ - tag = "icon-cult"; + dir = 2; icon_state = "cult"; - dir = 2 + 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/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor, /turf/simulated/floor/plasteel{ dir = 4; @@ -57713,9 +52179,9 @@ pixel_x = -22 }, /turf/simulated/floor/plasteel{ - tag = "icon-vault (WEST)"; + dir = 8; icon_state = "vault"; - dir = 8 + tag = "icon-vault (WEST)" }, /area/ai_monitored/storage/eva{ name = "E.V.A. Storage" @@ -57740,9 +52206,6 @@ name = "E.V.A. Storage" }) "bUQ" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4; level = 1 @@ -57753,6 +52216,9 @@ icon_state = "4-8" }, /obj/effect/decal/warning_stripes/south, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry{ name = "Arrivals" @@ -57764,19 +52230,18 @@ name = "Aft Maintenance" }) "bUS" = ( -/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/south, +/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" @@ -57820,10 +52285,6 @@ name = "Station Intercom (General)"; pixel_y = -25 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6; - level = 1 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -57861,18 +52322,9 @@ icon_state = "bcarpet05" }, /area/blueshield) -"bUZ" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 2; - layer = 2.4; - on = 1 - }, -/turf/simulated/floor/plasteel{ - icon_state = "bcarpet05" - }, -/area/blueshield) "bVa" = ( /obj/machinery/photocopier, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/wood, /area/blueshield) "bVb" = ( @@ -57891,16 +52343,15 @@ pixel_y = 1 }, /turf/simulated/floor/plasteel{ - tag = "icon-vault (WEST)"; + dir = 8; icon_state = "vault"; - dir = 8 + tag = "icon-vault (WEST)" }, /area/ai_monitored/storage/eva{ name = "E.V.A. Storage" }) "bVc" = ( /obj/structure/table/wood, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/carpet, /area/ntrep) "bVd" = ( @@ -58005,6 +52456,7 @@ dir = 8; initialize_directions = 11 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -58027,11 +52479,8 @@ dir = 2; network = list("SS13","RD") }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -58062,10 +52511,9 @@ }, /area/crew_quarters/sleep) "bVn" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /turf/simulated/floor/plasteel{ dir = 1; @@ -58133,24 +52581,24 @@ }, /obj/machinery/kitchen_machine/microwave, /turf/simulated/floor/plasteel{ - icon_state = "cafeteria"; - dir = 2 + dir = 2; + icon_state = "cafeteria" }, /area/crew_quarters/kitchen) "bVt" = ( /obj/machinery/kitchen_machine/candy_maker, /turf/simulated/floor/plasteel{ - tag = "icon-cafeteria (NORTHEAST)"; + dir = 5; icon_state = "cafeteria"; - dir = 5 + tag = "icon-cafeteria (NORTHEAST)" }, /area/crew_quarters/kitchen) "bVu" = ( /obj/machinery/hologram/holopad, /turf/simulated/floor/plasteel{ - tag = "icon-cafeteria (NORTHEAST)"; + dir = 5; icon_state = "cafeteria"; - dir = 5 + tag = "icon-cafeteria (NORTHEAST)" }, /area/crew_quarters/kitchen) "bVv" = ( @@ -58163,6 +52611,8 @@ 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, /turf/simulated/floor/plasteel, /area/atmos) "bVw" = ( @@ -58222,6 +52672,7 @@ 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" }, @@ -58229,12 +52680,6 @@ name = "Research Division" }) "bVD" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 - }, /obj/structure/disposalpipe/segment{ dir = 4; icon_state = "pipe-c" @@ -58242,6 +52687,9 @@ /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" = ( @@ -58256,6 +52704,9 @@ /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" = ( @@ -58403,9 +52854,9 @@ pixel_y = 1 }, /turf/simulated/floor/plasteel{ - tag = "icon-vault (WEST)"; + dir = 8; icon_state = "vault"; - dir = 8 + tag = "icon-vault (WEST)" }, /area/ai_monitored/storage/eva{ name = "E.V.A. Storage" @@ -58499,6 +52950,7 @@ name = "Desk Door"; req_access_txt = "67" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood, /area/blueshield) "bWc" = ( @@ -58596,6 +53048,9 @@ /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" = ( @@ -58610,27 +53065,14 @@ /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/crew_quarters/sleep) -"bWq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/turf/simulated/floor/wood, -/area/library) -"bWr" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/turf/simulated/floor/wood, -/area/library) "bWs" = ( /obj/structure/cable/yellow{ d1 = 1; d2 = 4; icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood, /area/library) "bWt" = ( @@ -58639,9 +53081,6 @@ d2 = 8; icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, /turf/simulated/floor/wood, /area/library) "bWu" = ( @@ -58664,14 +53103,15 @@ /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{ - tag = "icon-cult"; + dir = 2; icon_state = "cult"; - dir = 2 + tag = "icon-cult" }, /area/library) "bWy" = ( @@ -58688,7 +53128,6 @@ name = "Central Maintenance" }) "bWz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/alarm{ dir = 8; icon_state = "alarm0"; @@ -58728,9 +53167,9 @@ "bWC" = ( /obj/structure/cable/yellow, /turf/simulated/floor/plasteel{ - tag = "icon-vault (EAST)"; + dir = 4; icon_state = "vault"; - dir = 4 + tag = "icon-vault (EAST)" }, /area/teleporter{ name = "\improper Teleporter Room" @@ -58738,19 +53177,16 @@ "bWD" = ( /obj/item/radio/beacon, /turf/simulated/floor/plasteel{ - tag = "icon-vault (WEST)"; + dir = 8; icon_state = "vault"; - dir = 8 + tag = "icon-vault (WEST)" }, /area/teleporter{ name = "\improper Teleporter Room" }) "bWE" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /obj/machinery/door_control{ id = "teleshutter"; @@ -58760,9 +53196,9 @@ req_access_txt = "19" }, /turf/simulated/floor/plasteel{ - tag = "icon-vault (WEST)"; + dir = 8; icon_state = "vault"; - dir = 8 + tag = "icon-vault (WEST)" }, /area/teleporter{ name = "\improper Teleporter Room" @@ -58771,9 +53207,9 @@ /obj/structure/cable/yellow, /obj/machinery/shieldwallgen, /turf/simulated/floor/plasteel{ - tag = "icon-vault (EAST)"; + dir = 4; icon_state = "vault"; - dir = 4 + tag = "icon-vault (EAST)" }, /area/teleporter{ name = "\improper Teleporter Room" @@ -58786,6 +53222,7 @@ name = "Blueshield Requests Console"; pixel_x = -30 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood, /area/blueshield) "bWH" = ( @@ -58809,43 +53246,24 @@ /obj/structure/chair/comfy/black{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11; - level = 1 - }, /turf/simulated/floor/plasteel{ icon_state = "bcarpet05" }, /area/blueshield) "bWK" = ( /obj/item/flag/nt, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/wood, /area/blueshield) -"bWL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/wall, -/area/ntrep) "bWM" = ( /obj/item/flag/nt, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/wood, /area/ntrep) "bWN" = ( /obj/structure/chair/comfy/black{ dir = 4 }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - on = 1 - }, /turf/simulated/floor/carpet, /area/ntrep) "bWO" = ( @@ -58856,7 +53274,6 @@ pixel_y = 12 }, /obj/item/paper/ntrep, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/carpet, /area/ntrep) "bWP" = ( @@ -58877,11 +53294,12 @@ name = "NT Rep Requests Console"; pixel_x = 30 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood, /area/ntrep) "bWR" = ( -/obj/item/tank/oxygen, -/obj/item/tank/oxygen, +/obj/item/tank/internals/oxygen, +/obj/item/tank/internals/oxygen, /obj/item/clothing/mask/gas, /obj/item/clothing/mask/gas, /obj/structure/table, @@ -58915,6 +53333,10 @@ 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" = ( @@ -58948,11 +53370,8 @@ /turf/simulated/floor/plasteel, /area/gateway) "bWW" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /obj/structure/cable/yellow{ d1 = 4; @@ -59001,24 +53420,15 @@ }, /turf/simulated/floor/plating, /area/gateway) -"bXa" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/obj/effect/decal/warning_stripes/south, -/turf/simulated/floor/plating, -/area/hallway/secondary/entry{ - name = "Arrivals" - }) "bXb" = ( /obj/structure/extinguisher_cabinet{ pixel_x = 27 }, /obj/structure/closet/secure_closet/freezer/fridge, /turf/simulated/floor/plasteel{ - tag = "icon-cafeteria (NORTHEAST)"; + dir = 5; icon_state = "cafeteria"; - dir = 5 + tag = "icon-cafeteria (NORTHEAST)" }, /area/crew_quarters/kitchen) "bXc" = ( @@ -59031,9 +53441,9 @@ pixel_x = 5 }, /turf/simulated/floor/plasteel{ - tag = "icon-cafeteria (NORTHEAST)"; + dir = 5; icon_state = "cafeteria"; - dir = 5 + tag = "icon-cafeteria (NORTHEAST)" }, /area/crew_quarters/kitchen) "bXd" = ( @@ -59042,76 +53452,13 @@ d2 = 8; icon_state = "4-8" }, -/turf/simulated/floor/plasteel{ - tag = "icon-cafeteria (NORTHEAST)"; - icon_state = "cafeteria"; - dir = 5 - }, -/area/crew_quarters/kitchen) -"bXe" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/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{ - tag = "icon-cafeteria (NORTHEAST)"; + dir = 5; icon_state = "cafeteria"; - dir = 5 - }, -/area/crew_quarters/kitchen) -"bXf" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 - }, -/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{ - tag = "icon-cafeteria (NORTHEAST)"; - icon_state = "cafeteria"; - dir = 5 - }, -/area/crew_quarters/kitchen) -"bXg" = ( -/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{ - tag = "icon-cafeteria (NORTHEAST)"; - icon_state = "cafeteria"; - dir = 5 - }, -/area/crew_quarters/kitchen) -"bXh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/plasteel{ - tag = "icon-cafeteria (NORTHEAST)"; - icon_state = "cafeteria"; - dir = 5 + tag = "icon-cafeteria (NORTHEAST)" }, /area/crew_quarters/kitchen) "bXi" = ( @@ -59122,6 +53469,9 @@ dir = 2; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/starboard) "bXj" = ( @@ -59264,7 +53614,7 @@ name = "Secure Storage Blast Doors" }, /turf/simulated/floor/plating, -/area/engine/engineering) +/area/storage/secure) "bXv" = ( /obj/structure/sign/nosmoking_2, /turf/simulated/wall, @@ -59299,9 +53649,9 @@ }, /obj/item/clothing/under/suit_jacket/red, /turf/simulated/floor/plasteel{ - tag = "icon-cult"; + dir = 2; icon_state = "cult"; - dir = 2 + tag = "icon-cult" }, /area/library) "bXz" = ( @@ -59419,15 +53769,11 @@ pixel_x = 30 }, /turf/simulated/floor/plasteel{ - tag = "icon-cult"; + dir = 2; icon_state = "cult"; - dir = 2 + tag = "icon-cult" }, /area/library) -"bXM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/wood, -/area/library) "bXN" = ( /obj/structure/chair/office/dark, /turf/simulated/floor/wood, @@ -59437,8 +53783,7 @@ active_power_usage = 0; c_tag = "Turbine Vent"; dir = 4; - network = list("Turbine"); - use_power = 0 + network = list("Turbine") }, /obj/structure/lattice, /obj/structure/disposalpipe/segment, @@ -59448,7 +53793,6 @@ /turf/space, /area/space/nearstation) "bXP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/extinguisher_cabinet{ pixel_x = -27 }, @@ -59460,8 +53804,8 @@ "bXQ" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/crew_quarters/locker) "bXR" = ( @@ -59474,9 +53818,9 @@ }, /obj/structure/table/wood, /turf/simulated/floor/plasteel{ - tag = "icon-cult"; + dir = 2; icon_state = "cult"; - dir = 2 + tag = "icon-cult" }, /area/library) "bXS" = ( @@ -59484,13 +53828,12 @@ name = "Forbidden Knowledge" }, /turf/simulated/floor/plasteel{ - tag = "icon-cult"; + dir = 2; icon_state = "cult"; - dir = 2 + tag = "icon-cult" }, /area/library) "bXT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/item/radio/intercom{ dir = 4; name = "Station Intercom (General)"; @@ -59511,11 +53854,8 @@ name = "Port Maintenance" }) "bXV" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel, @@ -59523,11 +53863,8 @@ name = "E.V.A. Storage" }) "bXW" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /obj/structure/cable/yellow{ d1 = 1; @@ -59545,8 +53882,8 @@ }, /obj/machinery/processor, /turf/simulated/floor/plasteel{ - icon_state = "cafeteria"; - dir = 2 + dir = 2; + icon_state = "cafeteria" }, /area/crew_quarters/kitchen) "bXY" = ( @@ -59583,6 +53920,9 @@ dir = 8; pixel_x = -24 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, /turf/simulated/floor/wood, /area/blueshield) "bYc" = ( @@ -59612,18 +53952,21 @@ /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/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, /turf/simulated/floor/wood, /area/blueshield) "bYf" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - layer = 2.4; - on = 1 - }, /obj/structure/closet{ icon_closed = "cabinet_closed"; icon_opened = "cabinet_open"; @@ -59632,16 +53975,23 @@ /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" = ( /obj/structure/cable, /obj/machinery/power/turbine, -/turf/simulated/floor/engine/insulated/vacuum, +/turf/simulated/floor/engine/vacuum, /area/maintenance/incinerator) "bYi" = ( /obj/machinery/hologram/holopad, @@ -59651,16 +54001,14 @@ /turf/simulated/floor/wood, /area/library) "bYj" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - layer = 2.4; - on = 1 - }, /obj/structure/closet/secure_closet/ntrep, /obj/machinery/firealarm{ dir = 4; pixel_x = 24 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, /turf/simulated/floor/wood, /area/ntrep) "bYk" = ( @@ -59703,13 +54051,15 @@ network = list("SS13") }, /obj/structure/table/wood, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/newscaster/security_unit{ pixel_y = -32 }, /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" = ( @@ -59751,7 +54101,6 @@ name = "Aft Maintenance" }) "bYr" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/firealarm{ dir = 8; pixel_x = -24 @@ -59762,7 +54111,6 @@ }, /area/hallway/primary/central) "bYs" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/table, /obj/item/book/manual/chef_recipes{ pixel_x = 2; @@ -59771,20 +54119,19 @@ /obj/item/stack/packageWrap, /obj/item/hand_labeler, /turf/simulated/floor/plasteel{ - tag = "icon-cafeteria (NORTHEAST)"; + dir = 5; icon_state = "cafeteria"; - dir = 5 + tag = "icon-cafeteria (NORTHEAST)" }, /area/crew_quarters/kitchen) "bYt" = ( /obj/structure/table, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/item/storage/box/donkpockets, /obj/item/eftpos, /turf/simulated/floor/plasteel{ - tag = "icon-cafeteria (NORTHEAST)"; + dir = 5; icon_state = "cafeteria"; - dir = 5 + tag = "icon-cafeteria (NORTHEAST)" }, /area/crew_quarters/kitchen) "bYu" = ( @@ -59794,9 +54141,9 @@ icon_state = "2-4" }, /turf/simulated/floor/plasteel{ - tag = "icon-cafeteria (NORTHEAST)"; + dir = 5; icon_state = "cafeteria"; - dir = 5 + tag = "icon-cafeteria (NORTHEAST)" }, /area/crew_quarters/kitchen) "bYv" = ( @@ -59815,9 +54162,9 @@ req_access_txt = "19" }, /turf/simulated/floor/plasteel{ - tag = "icon-vault (WEST)"; + dir = 8; icon_state = "vault"; - dir = 8 + tag = "icon-vault (WEST)" }, /area/ai_monitored/storage/eva{ name = "E.V.A. Storage" @@ -59829,9 +54176,6 @@ name = "Port Maintenance" }) "bYy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, /obj/structure/disposalpipe/segment{ dir = 1; icon_state = "pipe-c" @@ -59848,8 +54192,8 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "green"; - dir = 6 + dir = 6; + icon_state = "green" }, /area/hydroponics) "bYA" = ( @@ -59893,8 +54237,8 @@ "bYE" = ( /obj/machinery/cooker/deepfryer, /turf/simulated/floor/plasteel{ - icon_state = "cafeteria"; - dir = 2 + dir = 2; + icon_state = "cafeteria" }, /area/crew_quarters/kitchen) "bYF" = ( @@ -59925,9 +54269,6 @@ d2 = 4; icon_state = "0-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, /obj/machinery/door/poddoor{ density = 0; icon_state = "open"; @@ -59945,6 +54286,9 @@ req_access_txt = "67" }, /obj/machinery/computer/crew, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/wood, /area/blueshield) "bYK" = ( @@ -59980,6 +54324,9 @@ 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" = ( @@ -60115,9 +54462,6 @@ d2 = 8; icon_state = "0-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, /obj/machinery/door/poddoor{ density = 0; icon_state = "open"; @@ -60158,15 +54502,14 @@ /obj/structure/table, /obj/machinery/reagentgrinder, /turf/simulated/floor/plasteel{ - icon_state = "cafeteria"; - dir = 2 + dir = 2; + icon_state = "cafeteria" }, /area/crew_quarters/kitchen) "bZc" = ( /obj/structure/chair/office/dark{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood, /area/library) "bZd" = ( @@ -60190,13 +54533,15 @@ req_access_txt = "28" }, /turf/simulated/floor/plasteel{ - icon_state = "cafeteria"; - dir = 2 + 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" = ( @@ -60205,7 +54550,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/wood, /area/library) "bZg" = ( @@ -60224,6 +54568,7 @@ dir = 8; pixel_x = -24 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" @@ -60245,9 +54590,9 @@ }, /obj/machinery/kitchen_machine/oven, /turf/simulated/floor/plasteel{ - tag = "icon-cafeteria (NORTHEAST)"; + dir = 5; icon_state = "cafeteria"; - dir = 5 + tag = "icon-cafeteria (NORTHEAST)" }, /area/crew_quarters/kitchen) "bZk" = ( @@ -60269,6 +54614,7 @@ name = "Blueshield's Office"; req_access_txt = "67" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood, /area/blueshield) "bZn" = ( @@ -60279,11 +54625,9 @@ name = "NT Representative's Office"; req_access_txt = "73" }, -/turf/simulated/floor/wood, -/area/ntrep) -"bZp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/wall/r_wall, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/wood, /area/ntrep) "bZq" = ( /obj/structure/closet/fireaxecabinet{ @@ -60317,17 +54661,11 @@ /area/maintenance/maintcentral{ name = "Central Maintenance" }) -"bZs" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "neutralcorner" - }, -/area/hallway/primary/central) "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" @@ -60381,9 +54719,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "hydrofloor" }, @@ -60392,11 +54729,11 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "hydrofloor" @@ -60433,14 +54770,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/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/starboard) "bZG" = ( @@ -60570,10 +54910,6 @@ /area/maintenance/aft{ name = "Aft Maintenance" }) -"bZV" = ( -/obj/effect/decal/cleanable/fungus, -/turf/simulated/wall/r_wall, -/area/maintenance/starboard) "bZW" = ( /obj/machinery/newscaster{ pixel_x = -32 @@ -60591,11 +54927,8 @@ /turf/simulated/floor/plasteel, /area/gateway) "bZY" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/wood, /area/library) @@ -60608,7 +54941,7 @@ pixel_y = -22 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 + dir = 4 }, /turf/simulated/floor/wood, /area/library) @@ -60623,12 +54956,20 @@ }, /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/item/paper, /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" = ( @@ -60701,33 +55042,16 @@ tag = "icon-shower (WEST)" }, /obj/machinery/atmospherics/pipe/simple/visible/purple, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/atmos) "cag" = ( -/obj/machinery/atmospherics/unary/heat_reservoir/heater{ +/obj/machinery/atmospherics/unary/thermomachine/heater{ dir = 8 }, /turf/simulated/floor/plasteel, /area/atmos) -"cah" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "neutralcorner" - }, -/area/hallway/primary/central) -"cai" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "neutralcorner" - }, -/area/hallway/primary/central) "caj" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, @@ -60751,27 +55075,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1 - }, /obj/effect/decal/warning_stripes/north, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/crew_quarters/kitchen) -"cam" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/door/firedoor, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "neutralcorner" - }, -/area/hallway/primary/central) "can" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/firealarm{ pixel_y = 28 }, @@ -60781,11 +55091,10 @@ }, /area/hallway/primary/central) "cao" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 - }, /obj/effect/decal/warning_stripes/north, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/crew_quarters/kitchen) "cap" = ( @@ -60800,6 +55109,9 @@ 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" = ( @@ -60815,51 +55127,17 @@ name = "Arrivals" }) "car" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 1 + dir = 1; + icon_state = "neutral" }, /area/hallway/primary/central) "cas" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 1 - }, -/area/hallway/primary/central) -"cat" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 - }, -/turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 1 - }, -/area/hallway/primary/central) -"cau" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2; - initialize_directions = 11 - }, -/turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 1 - }, -/area/hallway/primary/central) -"cav" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "neutralcorner" + icon_state = "neutral" }, /area/hallway/primary/central) "caw" = ( @@ -60871,10 +55149,6 @@ /turf/simulated/wall/r_wall, /area/maintenance/portsolar) "cax" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 - }, /obj/machinery/power/apc{ cell_type = 10000; dir = 1; @@ -60891,10 +55165,6 @@ }, /area/hallway/primary/central) "cay" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 - }, /obj/structure/sign/double/map/left{ desc = "A framed picture of the station. Clockwise from security at the top (red), you see engineering (yellow), science (purple), escape (red and white), medbay (green), arrivals (blue and white), and finally cargo (brown)."; icon_state = "map-left-MS"; @@ -60906,9 +55176,6 @@ }, /area/hallway/primary/central) "caz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /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"; @@ -60929,9 +55196,6 @@ }, /area/hallway/primary/central) "caB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -60954,9 +55218,6 @@ /turf/simulated/floor/plasteel, /area/hallway/primary/central) "caD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/door_control{ id = "evashutter"; name = "E.V.A. Storage Shutter Control"; @@ -60966,15 +55227,6 @@ /obj/effect/decal/warning_stripes/northwestcorner, /turf/simulated/floor/plasteel, /area/hallway/primary/central) -"caE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "neutralcorner" - }, -/area/hallway/primary/central) "caF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ req_access_txt = 1 @@ -60983,9 +55235,10 @@ pixel_x = 32; pixel_y = 32 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - icon_state = "green"; - dir = 4 + dir = 4; + icon_state = "green" }, /area/hallway/primary/central) "caG" = ( @@ -60997,7 +55250,6 @@ req_one_access_txt = "0" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/item/paper, /obj/machinery/door/window/eastleft{ dir = 2; @@ -61021,6 +55273,9 @@ /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" }, @@ -61037,10 +55292,13 @@ d2 = 2; icon_state = "0-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, /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" = ( @@ -61071,9 +55329,6 @@ name = "Port Maintenance" }) "caL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/firealarm{ dir = 2; pixel_y = 24 @@ -61082,16 +55337,10 @@ /turf/simulated/floor/plasteel, /area/hallway/primary/central) "caM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel, /area/hallway/primary/central) "caN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/door_control{ id = "teleshutter"; name = "Teleporter Shutter Control"; @@ -61105,10 +55354,6 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 - }, /obj/machinery/status_display{ density = 0; layer = 4; @@ -61120,9 +55365,6 @@ }, /area/hallway/primary/central) "caP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/item/radio/intercom{ frequency = 1459; name = "Station Intercom (General)"; @@ -61140,9 +55382,6 @@ /turf/simulated/floor/plasteel, /area/hydroponics) "caR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/light{ dir = 1 }, @@ -61161,9 +55400,6 @@ dir = 1; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/door/window/eastright{ dir = 1; name = "Kitchen Delivery"; @@ -61176,9 +55412,6 @@ /obj/structure/closet{ name = "spare parts locker" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, /obj/item/rack_parts, /obj/item/rack_parts, /obj/item/wrench, @@ -61200,9 +55433,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, /area/crew_quarters/kitchen) @@ -61218,6 +55448,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plating, /area/hydroponics) "caW" = ( @@ -61244,9 +55477,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, /turf/simulated/floor/plating, /area/maintenance/starboard) "caY" = ( @@ -61280,14 +55510,11 @@ }, /obj/machinery/kitchen_machine/grill, /turf/simulated/floor/plasteel{ - icon_state = "cafeteria"; - dir = 2 + dir = 2; + icon_state = "cafeteria" }, /area/crew_quarters/kitchen) "cbb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/item/radio/intercom{ frequency = 1459; name = "Station Intercom (General)"; @@ -61326,6 +55553,9 @@ d2 = 8; icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/crew_quarters/locker) "cbf" = ( @@ -61354,9 +55584,6 @@ /turf/simulated/floor/plasteel, /area/atmos) "cbi" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/machinery/door_control{ id = "gateshutter"; @@ -61368,9 +55595,6 @@ /turf/simulated/floor/plasteel, /area/hallway/primary/central) "cbj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/extinguisher_cabinet{ pixel_y = 30 }, @@ -61423,11 +55647,6 @@ /obj/machinery/power/smes, /turf/simulated/floor/plating, /area/maintenance/portsolar) -"cbp" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/decal/warning_stripes/south, -/turf/simulated/floor/plasteel, -/area/hydroponics) "cbq" = ( /obj/structure/closet, /obj/item/storage/box/donkpockets, @@ -61517,21 +55736,8 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1; - scrub_Toxins = 0 - }, -/turf/simulated/floor/plasteel, -/area/hallway/primary/central) -"cbz" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel, /area/hallway/primary/central) @@ -61541,21 +55747,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/turf/simulated/floor/plasteel, -/area/hallway/primary/central) -"cbB" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - on = 1 - }, +/obj/machinery/atmospherics/unary/vent_pump, /turf/simulated/floor/plasteel, /area/hallway/primary/central) "cbC" = ( @@ -61616,7 +55808,6 @@ d2 = 8; icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/yellow{ d1 = 1; d2 = 8; @@ -61630,11 +55821,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1; - scrub_Toxins = 0 - }, +/obj/machinery/atmospherics/unary/vent_scrubber, /turf/simulated/floor/plasteel, /area/hallway/primary/central) "cbI" = ( @@ -61676,9 +55863,10 @@ d2 = 8; icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - icon_state = "green"; - dir = 4 + dir = 4; + icon_state = "green" }, /area/hallway/primary/central) "cbL" = ( @@ -61719,18 +55907,12 @@ icon_state = "green" }, /area/hydroponics) -"cbQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "green" - }, -/area/hydroponics) "cbR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 }, /turf/simulated/floor/plasteel{ dir = 9; @@ -61739,7 +55921,10 @@ /area/hydroponics) "cbS" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -61747,7 +55932,7 @@ }, /area/hydroponics) "cbT" = ( -/obj/machinery/atmospherics/unary/cold_sink/freezer{ +/obj/machinery/atmospherics/unary/thermomachine/freezer{ dir = 8 }, /turf/simulated/floor/plasteel, @@ -61764,10 +55949,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/maintenance/starboard) -"cbV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plating, -/area/maintenance/starboard) "cbW" = ( /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, @@ -61780,22 +55961,6 @@ /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/medical/genetics) -"cbZ" = ( -/obj/effect/spawner/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "open"; - id_tag = "toxins_blastdoor"; - name = "privacy shutters"; - opacity = 0 - }, -/turf/simulated/floor/plating, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) "cca" = ( /obj/machinery/camera{ c_tag = "Security Post - Medbay"; @@ -61843,6 +56008,8 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/manifold/visible/purple, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/atmos) "ccf" = ( @@ -61866,8 +56033,8 @@ pixel_y = 1 }, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/atmos) "cch" = ( @@ -61899,21 +56066,21 @@ name = "JoinLateGateway" }, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/gateway) "ccm" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 4 + dir = 4; + icon_state = "tube1" }, /obj/effect/landmark{ name = "JoinLateGateway" }, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/gateway) "ccn" = ( @@ -61938,13 +56105,12 @@ codes_txt = "patrol;next_patrol=8.1-Aft-to-Escape"; location = "8-Central-to-Aft" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/hallway/primary/central) "ccp" = ( /obj/machinery/power/terminal{ - icon_state = "term"; - dir = 1 + dir = 1; + icon_state = "term" }, /obj/structure/cable{ d2 = 8; @@ -61979,10 +56145,6 @@ d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - on = 1 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -62018,9 +56180,16 @@ name = "Aft Maintenance" }) "ccu" = ( -/obj/structure/reagent_dispensers/fueltank, -/obj/effect/decal/warning_stripes/west, -/turf/simulated/floor/plating, +/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) "ccv" = ( /obj/structure/closet/crate/hydroponics, @@ -62033,15 +56202,15 @@ /turf/simulated/floor/plasteel, /area/hydroponics) "ccw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, /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" }, @@ -62056,10 +56225,6 @@ /area/maintenance/aft{ name = "Aft Maintenance" }) -"ccy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel, -/area/engine/engineering) "ccz" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ @@ -62072,6 +56237,8 @@ d2 = 8; icon_state = "1-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/engine/engineering) "ccA" = ( @@ -62143,12 +56310,12 @@ dir = 4 }, /obj/structure/disposalpipe/junction{ - icon_state = "pipe-j2"; - dir = 4 + dir = 4; + icon_state = "pipe-j2" }, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/hallway/primary/central) "ccE" = ( @@ -62163,6 +56330,10 @@ /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" @@ -62186,6 +56357,9 @@ dir = 1; network = list("SS13") }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" @@ -62195,6 +56369,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 = "neutralcorner" @@ -62211,6 +56388,9 @@ dir = 1; pixel_y = -22 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" @@ -62230,6 +56410,9 @@ dir = 4 }, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" @@ -62244,15 +56427,25 @@ /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/manifold/hidden/supply{ - 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/central) @@ -62260,6 +56453,9 @@ /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" @@ -62274,11 +56470,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /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" @@ -62291,6 +56489,10 @@ /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" @@ -62304,6 +56506,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "neutralcorner" @@ -62317,6 +56522,9 @@ dir = 2; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "neutralcorner" @@ -62335,8 +56543,8 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/atmos) "ccU" = ( @@ -62347,6 +56555,9 @@ dir = 1; pixel_y = -22 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "neutralcorner" @@ -62356,6 +56567,9 @@ /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" @@ -62370,15 +56584,19 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel{ - icon_state = "green"; - dir = 6 + 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" }, @@ -62397,6 +56615,9 @@ }, /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"; @@ -62413,6 +56634,9 @@ /obj/effect/landmark/start{ name = "Botanist" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "green" @@ -62422,18 +56646,24 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ - icon_state = "green"; - dir = 6 + 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 + }, /turf/simulated/floor/plasteel{ - icon_state = "green"; - dir = 8 + dir = 8; + icon_state = "green" }, /area/hydroponics) "cdc" = ( @@ -62441,31 +56671,43 @@ dir = 4 }, /obj/machinery/hydroponics/constructable, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/hydroponics) "cdd" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, /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" = ( -/turf/simulated/floor/plasteel{ - icon_state = "green"; +/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" + }, /area/hydroponics) "cdf" = ( -/turf/simulated/floor/plasteel{ - icon_state = "green"; - dir = 8 +/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) -"cdg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/hydroponics/constructable, -/turf/simulated/floor/plasteel, /area/hydroponics) "cdh" = ( /obj/machinery/hydroponics/constructable, @@ -62479,15 +56721,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ req_access_txt = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /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" = ( @@ -62521,12 +56761,15 @@ dir = 4 }, /obj/effect/decal/warning_stripes/yellow/partial{ - icon_state = "3"; - dir = 1 + dir = 1; + icon_state = "3" }, /obj/effect/decal/warning_stripes/arrow{ - icon_state = "4"; - dir = 1 + dir = 1; + icon_state = "4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -62546,6 +56789,9 @@ dir = 4; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, /turf/simulated/floor/plating, /area/maintenance/starboard) "cdn" = ( @@ -62586,6 +56832,9 @@ d2 = 4; icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, /turf/simulated/floor/plating, /area/maintenance/starboard) "cdq" = ( @@ -62641,6 +56890,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plating, /area/atmos) "cdt" = ( @@ -62656,6 +56908,9 @@ 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" @@ -62670,15 +56925,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/atmos) "cdv" = ( @@ -62694,6 +56946,9 @@ dir = 8; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/atmos) "cdw" = ( @@ -62702,9 +56957,11 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - on = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 }, /turf/simulated/floor/plasteel, /area/atmos) @@ -62714,6 +56971,10 @@ d2 = 8; icon_state = "1-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plasteel, /area/atmos) "cdy" = ( @@ -62748,6 +57009,9 @@ /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" @@ -62763,8 +57027,8 @@ name = "JoinLateGateway" }, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/gateway) "cdC" = ( @@ -62774,8 +57038,8 @@ track = 0 }, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/structure/cable, /turf/simulated/floor/plating, @@ -62803,6 +57067,9 @@ dir = 1; network = list("SS13") }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "neutralcorner" @@ -62891,9 +57158,6 @@ }) "cdP" = ( /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/door/airlock/public/glass{ name = "Locker Room" }, @@ -62912,8 +57176,8 @@ }, /obj/structure/window/reinforced, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/atmos) "cdR" = ( @@ -62990,12 +57254,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ req_access_txt = 1 }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "bluecorner" - }, -/area/hallway/primary/central) -"cdY" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; @@ -63020,22 +57278,6 @@ icon_state = "bluecorner" }, /area/hallway/primary/central) -"ceb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "bluecorner" - }, -/area/hallway/primary/central) -"cec" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "purplecorner" - }, -/area/hallway/primary/central) "ced" = ( /obj/machinery/light/small, /turf/simulated/floor/plasteel{ @@ -63062,6 +57304,7 @@ /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" @@ -63073,7 +57316,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 2; @@ -63104,8 +57346,8 @@ pixel_y = -29 }, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/hallway/primary/central) "cek" = ( @@ -63177,10 +57419,6 @@ icon_state = "greenfull" }, /area/hydroponics) -"cep" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/wall/r_wall, -/area/tcommsat/server) "ceq" = ( /obj/machinery/door/airlock/medical{ name = "Paramedic" @@ -63204,17 +57442,19 @@ "ces" = ( /obj/machinery/hologram/holopad, /turf/simulated/floor/plasteel{ - icon_state = "green"; - dir = 4 + dir = 4; + icon_state = "green" }, /area/hydroponics) "cet" = ( /obj/effect/landmark/start{ name = "Botanist" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - icon_state = "green"; - dir = 4 + dir = 4; + icon_state = "green" }, /area/hydroponics) "ceu" = ( @@ -63262,24 +57502,13 @@ icon_state = "1-4" }, /obj/structure/disposalpipe/junction{ - tag = "icon-pipe-j2"; + dir = 2; icon_state = "pipe-j2"; - dir = 2 + tag = "icon-pipe-j2" }, -/turf/simulated/floor/plating, -/area/maintenance/starboard) -"cey" = ( -/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, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8; + initialize_directions = 11 }, /turf/simulated/floor/plating, /area/maintenance/starboard) @@ -63299,6 +57528,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" = ( @@ -63314,17 +57546,8 @@ dir = 8; icon_state = "pipe-c" }, -/turf/simulated/floor/plating, -/area/maintenance/starboard) -"ceB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/turf/simulated/floor/plating, -/area/maintenance/starboard) -"ceC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 + dir = 9 }, /turf/simulated/floor/plating, /area/maintenance/starboard) @@ -63347,21 +57570,12 @@ name = "Aft Maintenance" }) "ceF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/visible/purple, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "caution" }, /area/atmos) -"ceG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/turf/simulated/floor/plasteel, -/area/atmos) "ceH" = ( /obj/machinery/atmospherics/unary/portables_connector, /turf/simulated/floor/plasteel, @@ -63477,6 +57691,9 @@ 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" = ( @@ -63619,8 +57836,8 @@ }, /obj/item/clipboard, /turf/simulated/floor/plasteel{ - icon_state = "neutral"; - dir = 8 + dir = 8; + icon_state = "neutral" }, /area/engine/chiefs_office) "cfe" = ( @@ -63721,8 +57938,8 @@ pixel_x = 27 }, /obj/machinery/light{ - icon_state = "tube1"; - dir = 4 + dir = 4; + icon_state = "tube1" }, /obj/machinery/camera/autoname{ dir = 8; @@ -63772,9 +57989,6 @@ name = "\improper Captain's Quarters" }) "cfo" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass, /turf/simulated/floor/plasteel{ @@ -63790,10 +58004,11 @@ }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/hallway/primary/aft) "cfq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass, /turf/simulated/floor/plasteel{ @@ -63830,6 +58045,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"; @@ -63844,7 +58060,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ @@ -63881,6 +58096,9 @@ 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" = ( @@ -63921,8 +58139,8 @@ /area/hallway/primary/central) "cfC" = ( /obj/structure/sink{ - icon_state = "sink"; dir = 8; + icon_state = "sink"; pixel_x = -12; pixel_y = 2 }, @@ -63936,8 +58154,8 @@ name = "Botanist" }, /turf/simulated/floor/plasteel{ - icon_state = "green"; - dir = 8 + dir = 8; + icon_state = "green" }, /area/hydroponics) "cfE" = ( @@ -63973,26 +58191,10 @@ id_tag = "mixvent"; name = "Mixer Room Vent" }, -/turf/simulated/floor/engine/insulated/vacuum, +/turf/simulated/floor/engine/vacuum, /area/toxins/mixing{ name = "\improper Toxins Lab" }) -"cfI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - 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/starboard) -"cfJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/turf/simulated/floor/plating, -/area/maintenance/starboard) "cfK" = ( /turf/simulated/wall, /area/maintenance/incinerator) @@ -64007,6 +58209,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/maintenance/incinerator) "cfM" = ( @@ -64051,6 +58254,7 @@ icon_state = "sink"; pixel_x = 11 }, +/obj/machinery/atmospherics/unary/vent_scrubber, /turf/simulated/floor/plasteel{ icon_state = "hydrofloor" }, @@ -64175,6 +58379,12 @@ req_one_access_txt = "0" }, /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/hydroponics) "cge" = ( @@ -64270,6 +58480,12 @@ 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/hydroponics) "cgm" = ( @@ -64301,14 +58517,12 @@ 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{ - dir = 8; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /obj/machinery/light, /turf/simulated/floor/plasteel{ @@ -64336,9 +58550,9 @@ }, /obj/item/pen/invisible, /turf/simulated/floor/plasteel{ - tag = "icon-cult"; + dir = 2; icon_state = "cult"; - dir = 2 + tag = "icon-cult" }, /area/library) "cgu" = ( @@ -64386,9 +58600,6 @@ /turf/simulated/floor/wood, /area/library) "cgw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "bluecorner" @@ -64400,10 +58611,11 @@ 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/aft) "cgy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "purplecorner" @@ -64444,20 +58656,7 @@ }) "cgC" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/research{ - name = "Research Division" - }) -"cgD" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -64527,16 +58726,6 @@ icon_state = "whiteblue" }, /area/medical/paramedic) -"cgJ" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/medbay2{ - name = "Medbay Storage" - }) "cgK" = ( /obj/structure/table, /obj/item/paper_bin{ @@ -64566,7 +58755,7 @@ pressure_checks = 2; pump_direction = 0 }, -/turf/simulated/floor/engine/insulated/vacuum, +/turf/simulated/floor/engine/vacuum, /area/toxins/mixing{ name = "\improper Toxins Lab" }) @@ -64576,8 +58765,8 @@ pixel_x = -24 }, /obj/structure/sink{ - icon_state = "sink"; dir = 8; + icon_state = "sink"; pixel_x = -12; pixel_y = 2 }, @@ -64645,8 +58834,8 @@ icon_state = "4-8" }, /turf/simulated/floor/plasteel{ - icon_state = "green"; - dir = 6 + dir = 6; + icon_state = "green" }, /area/hydroponics) "cgS" = ( @@ -64692,9 +58881,6 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ icon_state = "hydrofloor" @@ -64737,13 +58923,8 @@ d2 = 8; icon_state = "2-8" }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/toxins/explab) -"cgZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -64755,9 +58936,6 @@ }, /area/toxins/explab) "chb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/item/cigbutt, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/yellow{ @@ -64766,6 +58944,7 @@ 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" = ( @@ -64820,9 +58999,9 @@ /area/atmos) "chh" = ( /obj/machinery/atmospherics/pipe/simple/visible/purple{ - tag = "icon-intact (SOUTHWEST)"; + dir = 10; icon_state = "intact"; - dir = 10 + tag = "icon-intact (SOUTHWEST)" }, /turf/simulated/floor/plasteel, /area/atmos) @@ -64930,9 +59109,6 @@ pixel_y = 5 }, /obj/item/watertank, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, /obj/item/grenade/chem_grenade/antiweed, /obj/structure/table/glass, /obj/effect/decal/warning_stripes/north, @@ -64964,13 +59140,16 @@ 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" }, /area/hallway/primary/central) "chu" = ( -/turf/simulated/floor/engine/insulated/vacuum, +/turf/simulated/floor/engine/vacuum, /area/toxins/mixing{ name = "\improper Toxins Lab" }) @@ -65074,6 +59253,9 @@ 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" = ( @@ -65086,7 +59268,7 @@ name = "Mixing Room Exterior Airlock"; req_access_txt = "8" }, -/turf/simulated/floor/engine/insulated/vacuum, +/turf/simulated/floor/engine/vacuum, /area/toxins/mixing{ name = "\improper Toxins Lab" }) @@ -65155,15 +59337,14 @@ name = "Medical Doctor" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/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/pipe/manifold/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -65388,6 +59569,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -65400,21 +59582,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, /obj/machinery/hologram/holopad, /obj/structure/disposalpipe/segment, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/research{ - name = "Research Division" - }) -"cih" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -65422,10 +59591,7 @@ name = "Research Division" }) "cii" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 - }, +/obj/machinery/atmospherics/unary/vent_scrubber, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -65444,6 +59610,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -65451,15 +59618,13 @@ name = "Medbay Storage" }) "cil" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 - }, /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" }, @@ -65481,12 +59646,6 @@ pixel_y = -3 }, /obj/structure/table/glass, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 - }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whiteblue" @@ -65511,8 +59670,8 @@ slogan_delay = 700 }, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/hallway/primary/central) "cip" = ( @@ -65529,15 +59688,15 @@ pixel_y = -25 }, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/hallway/primary/central) "ciq" = ( /obj/machinery/vending/hydronutrients, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/hallway/primary/central) "cir" = ( @@ -65553,14 +59712,6 @@ /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plating, /area/maintenance/starboard) -"cit" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 - }, -/obj/machinery/hydroponics/constructable, -/turf/simulated/floor/plasteel, -/area/hydroponics) "ciu" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -65572,15 +59723,13 @@ d2 = 4; icon_state = "1-4" }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 - }, /obj/effect/landmark{ name = "xeno_spawn"; 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" = ( @@ -65612,16 +59761,6 @@ /area/maintenance/aft{ name = "Aft Maintenance" }) -"cix" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 - }, -/obj/machinery/hydroponics/constructable, -/turf/simulated/floor/plasteel, -/area/hydroponics) "ciy" = ( /obj/item/stack/sheet/cardboard, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -65656,9 +59795,6 @@ /obj/structure/plasticflaps{ opacity = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ icon_state = "hydrofloor" @@ -65746,6 +59882,8 @@ /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" }, @@ -65762,8 +59900,8 @@ icon_state = "0-8" }, /obj/machinery/power/terminal{ - icon_state = "term"; - dir = 1 + dir = 1; + icon_state = "term" }, /obj/machinery/alarm{ desc = "This particular atmos control unit appears to have no access restrictions."; @@ -66021,18 +60159,6 @@ /obj/structure/lattice/catwalk, /turf/space, /area/solar/port) -"cjd" = ( -/obj/effect/spawner/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "open"; - id_tag = "lawyer_blast"; - name = "privacy shutters"; - opacity = 0 - }, -/turf/simulated/floor/plating, -/area/lawoffice) "cje" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -66069,7 +60195,6 @@ name = "Aft Maintenance" }) "cjh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor, /turf/simulated/floor/plasteel{ dir = 2; @@ -66095,6 +60220,7 @@ req_access_txt = 1 }, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "whitehall"; @@ -66172,6 +60298,7 @@ "cjr" = ( /obj/machinery/mecha_part_fabricator{ dir = 1; + id = "0"; name = "counterfeit fabricator"; req_access = "0" }, @@ -66200,7 +60327,6 @@ name = "Aft Maintenance" }) "cjt" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -66287,15 +60413,13 @@ d2 = 8; icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, /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" @@ -66388,9 +60512,6 @@ }, /area/medical/reception) "cjH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -66405,16 +60526,14 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/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/supply, /turf/simulated/floor/plasteel, /area/hallway/primary/aft) "cjJ" = ( @@ -66443,13 +60562,16 @@ d2 = 4; icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ 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{ icon_state = "white" }, @@ -66462,13 +60584,16 @@ 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/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -66481,6 +60606,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 }, @@ -66504,11 +60632,8 @@ name = "Medbay Storage" }) "cjP" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 2; @@ -66533,15 +60658,6 @@ /area/medical/medbay2{ name = "Medbay Storage" }) -"cjS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whiteblue" - }, -/area/medical/reception) "cjT" = ( /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, @@ -66564,30 +60680,10 @@ }, /turf/simulated/floor/plating, /area/hydroponics) -"cjW" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/spawner/window/reinforced, -/turf/simulated/floor/plating, -/area/medical/virology) "cjX" = ( /obj/item/flashlight, /turf/simulated/floor/plating, /area/maintenance/starboard) -"cjY" = ( -/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/medical/reception) "cjZ" = ( /obj/machinery/alarm{ dir = 1; @@ -66648,6 +60744,7 @@ /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" }, @@ -66663,7 +60760,7 @@ frequency = 1443; id = "air_in" }, -/turf/simulated/floor/engine/insulated/vacuum, +/turf/simulated/floor/engine/vacuum, /area/toxins/mixing{ name = "\improper Toxins Lab" }) @@ -66676,6 +60773,9 @@ 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" @@ -66767,14 +60867,13 @@ /area/space/nearstation) "ckr" = ( /obj/structure/cable{ - icon_state = "0-2"; - d2 = 2 + d2 = 2; + icon_state = "0-2" }, /obj/structure/lattice/catwalk, /turf/space, /area/solar/port) "cks" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, /obj/machinery/door/poddoor{ density = 0; @@ -66871,9 +60970,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/assembly/robotics) @@ -67010,8 +61106,8 @@ name = "Aft Maintenance" }) "ckK" = ( -/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{ icon_state = "white" }, @@ -67038,9 +61134,6 @@ name = "Medbay Storage" }) "ckM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/power/apc{ dir = 1; name = "Medbay Central APC"; @@ -67068,6 +61161,7 @@ dir = 2; initialize_directions = 11 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -67086,6 +61180,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -67114,6 +61211,9 @@ /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" }, @@ -67133,6 +61233,9 @@ /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" }, @@ -67146,11 +61249,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -67163,6 +61263,10 @@ 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" = ( @@ -67218,8 +61322,8 @@ }) "clb" = ( /obj/structure/disposalpipe/junction{ - icon_state = "pipe-j2"; - dir = 4 + dir = 4; + icon_state = "pipe-j2" }, /turf/simulated/floor/plasteel{ dir = 2; @@ -67245,6 +61349,7 @@ icon_state = "sink"; pixel_x = 11 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "whitepurple" @@ -67253,7 +61358,6 @@ name = "Research Division" }) "cld" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment{ dir = 2; icon_state = "pipe-c" @@ -67312,6 +61416,10 @@ 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" @@ -67351,14 +61459,6 @@ /area/maintenance/aft{ name = "Aft Maintenance" }) -"clk" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 - }, -/obj/effect/spawner/window/reinforced, -/turf/simulated/floor/plating, -/area/medical/virology) "cll" = ( /obj/item/wrench, /obj/item/clothing/suit/apron, @@ -67382,6 +61482,7 @@ opacity = 0 }, /obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitepurplefull"; @@ -67420,7 +61521,6 @@ }) "clp" = ( /obj/structure/cable/yellow, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/medical/virology) @@ -67434,9 +61534,6 @@ req_access_txt = 1 }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plating, /area/maintenance/starboard) @@ -67545,15 +61642,6 @@ /area/maintenance/aft{ name = "Aft Maintenance" }) -"clx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/reception) "cly" = ( /turf/simulated/floor/plasteel{ icon_state = "floorgrime" @@ -67600,6 +61688,9 @@ dir = 2 }, /obj/machinery/hologram/holopad, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -67703,8 +61794,10 @@ /obj/effect/landmark/start{ name = "Coroner" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -67717,9 +61810,11 @@ /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 = 4; - initialize_directions = 11 + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -67814,7 +61909,6 @@ name = "Medbay Storage" }) "cma" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/sink{ dir = 4; icon_state = "sink"; @@ -67824,26 +61918,7 @@ icon_state = "whitebluefull" }, /area/medical/reception) -"cmb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/structure/morgue{ - tag = "icon-morgue1 (WEST)"; - icon_state = "morgue1"; - dir = 8 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/medical/morgue) "cmc" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 - }, /obj/structure/table, /obj/item/autopsy_scanner, /obj/item/camera{ @@ -67865,17 +61940,6 @@ icon_state = "dark" }, /area/medical/morgue) -"cme" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/morgue{ - tag = "icon-morgue1 (WEST)"; - icon_state = "morgue1"; - dir = 8 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/medical/morgue) "cmf" = ( /obj/machinery/power/apc{ dir = 4; @@ -67911,14 +61975,7 @@ icon_state = "alarm0"; pixel_x = -22 }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/reception) -"cmh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -67945,25 +62002,7 @@ tag = "icon-whitehall (WEST)" }, /area/medical/chemistry) -"cmk" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/reception) -"cml" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/reception) "cmm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "neutralcorner" @@ -68014,11 +62053,16 @@ /turf/simulated/wall, /area/medical/reception) "cmu" = ( -/obj/machinery/atmospherics/unary/vent_pump, /obj/machinery/door/window/eastright{ 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 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -68046,6 +62090,13 @@ 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 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -68248,7 +62299,6 @@ /turf/simulated/floor/plating, /area/atmos) "cmR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/research{ @@ -68366,12 +62416,17 @@ name = "Aft Maintenance" }) "cna" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /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/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -68385,6 +62440,12 @@ 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" }, @@ -68393,8 +62454,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/effect/landmark/start{ name = "Coroner" }, @@ -68404,9 +62463,6 @@ }, /area/medical/morgue) "cnd" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, /obj/machinery/alarm{ dir = 4; pixel_x = -23 @@ -68425,23 +62481,12 @@ /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) -"cnf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/morgue, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/medical/morgue) "cng" = ( /obj/structure/noticeboard{ desc = "A board for pinning important notices upon."; @@ -68465,27 +62510,14 @@ }, /obj/item/storage/box/donkpockets, /obj/structure/table/glass, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - external_pressure_bound = 101.325; - on = 1; - pressure_checks = 1 - }, /turf/simulated/floor/plasteel{ - tag = "icon-cafeteria (NORTHEAST)"; + dir = 5; icon_state = "cafeteria"; - dir = 5 + tag = "icon-cafeteria (NORTHEAST)" }, /area/medical/research{ name = "Research Division" }) -"cni" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "whiteblue" - }, -/area/medical/reception) "cnj" = ( /obj/structure/cable/yellow{ d1 = 4; @@ -68493,10 +62525,6 @@ icon_state = "4-8" }, /obj/machinery/light, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2; - initialize_directions = 11 - }, /obj/structure/cable/yellow{ d1 = 2; d2 = 4; @@ -68553,8 +62581,8 @@ /area/medical/reception) "cno" = ( /obj/item/twohanded/required/kirbyplants{ - tag = "icon-plant-11"; - icon_state = "plant-11" + icon_state = "plant-11"; + tag = "icon-plant-11" }, /turf/simulated/floor/plasteel{ dir = 2; @@ -68595,9 +62623,6 @@ /turf/simulated/floor/plating, /area/maintenance/incinerator) "cns" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" @@ -68615,10 +62640,11 @@ icon_state = "2-4" }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/hallway/primary/aft) "cnu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -68667,15 +62693,11 @@ pixel_y = 32 }, /obj/structure/chair/stool, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4; - level = 1 - }, /mob/living/simple_animal/pet/dog/corgi/borgi, /turf/simulated/floor/plasteel{ - tag = "icon-cafeteria (NORTHEAST)"; + dir = 5; icon_state = "cafeteria"; - dir = 5 + tag = "icon-cafeteria (NORTHEAST)" }, /area/medical/research{ name = "Research Division" @@ -68713,6 +62735,7 @@ 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" @@ -68728,26 +62751,7 @@ }, /area/toxins/lab) "cnC" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - external_pressure_bound = 101.325; - on = 1; - pressure_checks = 1 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/medical/morgue) -"cnD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/morgue{ - tag = "icon-morgue1 (WEST)"; - icon_state = "morgue1"; - dir = 8 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -68784,14 +62788,10 @@ pixel_y = 7 }, /obj/structure/table/glass, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1; - level = 1 - }, /turf/simulated/floor/plasteel{ - tag = "icon-cafeteria (NORTHEAST)"; + dir = 5; icon_state = "cafeteria"; - dir = 5 + tag = "icon-cafeteria (NORTHEAST)" }, /area/medical/research{ name = "Research Division" @@ -68808,14 +62808,10 @@ /turf/simulated/floor/plating, /area/maintenance/incinerator) "cnI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - level = 1 - }, /turf/simulated/floor/plasteel{ - tag = "icon-cafeteria (NORTHEAST)"; + dir = 5; icon_state = "cafeteria"; - dir = 5 + tag = "icon-cafeteria (NORTHEAST)" }, /area/medical/research{ name = "Research Division" @@ -68977,12 +62973,6 @@ /area/toxins/xenobiology{ name = "\improper Secure Lab" }) -"cnX" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 2 - }, -/turf/simulated/wall/r_wall/coated, -/area/maintenance/incinerator) "cnY" = ( /obj/machinery/atmospherics/pipe/simple, /obj/machinery/meter, @@ -69187,6 +63177,15 @@ /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 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -69207,9 +63206,9 @@ dir = 4 }, /obj/structure/morgue{ - tag = "icon-morgue1 (WEST)"; + dir = 8; icon_state = "morgue1"; - dir = 8 + tag = "icon-morgue1 (WEST)" }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -69259,6 +63258,7 @@ /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" }, @@ -69318,12 +63318,9 @@ }, /area/medical/surgery1) "coz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /turf/simulated/floor/plasteel{ dir = 8; @@ -69485,9 +63482,6 @@ /turf/simulated/floor/plating, /area/maintenance/starboard) "coR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/sign/nosmoking_2{ pixel_y = 28 }, @@ -69498,11 +63492,13 @@ /area/medical/reception) "coS" = ( /obj/structure/chair/stool, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, /turf/simulated/floor/plasteel{ - tag = "icon-cafeteria (NORTHEAST)"; + dir = 5; icon_state = "cafeteria"; - dir = 5 + tag = "icon-cafeteria (NORTHEAST)" }, /area/medical/research{ name = "Research Division" @@ -69510,9 +63506,9 @@ "coU" = ( /obj/item/cigbutt, /turf/simulated/floor/plasteel{ - tag = "icon-cafeteria (NORTHEAST)"; + dir = 5; icon_state = "cafeteria"; - dir = 5 + tag = "icon-cafeteria (NORTHEAST)" }, /area/medical/research{ name = "Research Division" @@ -69553,10 +63549,8 @@ /turf/simulated/floor/engine, /area/toxins/explab) "coZ" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/engine, /area/toxins/explab) @@ -69567,20 +63561,14 @@ /turf/simulated/floor/engine, /area/toxins/explab) "cpb" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/exam_room) "cpc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -69774,8 +63762,8 @@ pixel_y = 28 }, /turf/simulated/floor/wood{ - tag = "icon-wood-broken3"; - icon_state = "wood-broken3" + icon_state = "wood-broken3"; + tag = "icon-wood-broken3" }, /area/maintenance/aft{ name = "Aft Maintenance" @@ -69803,9 +63791,6 @@ normaldoorcontrol = 1; pixel_y = 26 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whiteblue" @@ -69917,7 +63902,6 @@ }, /area/medical/cmo) "cpH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/camera{ c_tag = "Chemistry"; dir = 4; @@ -69959,12 +63943,12 @@ req_access_txt = "5" }, /obj/effect/mapping_helpers/airlock/unres, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "whitebluefull" }, /area/medical/reception) "cpL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/medical/glass{ id_tag = "MedbayFoyer"; @@ -69989,10 +63973,6 @@ pixel_x = 4; pixel_y = -4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - level = 1 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whiteblue" @@ -70000,10 +63980,6 @@ /area/medical/reception) "cpN" = ( /obj/structure/table, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6; - level = 1 - }, /obj/machinery/computer/guestpass, /obj/machinery/camera{ c_tag = "Medbay Surgery 1 North"; @@ -70027,12 +64003,6 @@ dir = 1; pixel_y = 3 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whiteblue" @@ -70076,10 +64046,16 @@ /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{ - tag = "icon-cafeteria (NORTHEAST)"; + dir = 5; icon_state = "cafeteria"; - dir = 5 + tag = "icon-cafeteria (NORTHEAST)" }, /area/medical/research{ name = "Research Division" @@ -70156,12 +64132,9 @@ /obj/machinery/atmospherics/pipe/simple/insulated{ dir = 5 }, -/turf/simulated/floor/engine/insulated, +/turf/simulated/floor/engine, /area/maintenance/incinerator) "cqb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whiteblue" @@ -70207,10 +64180,8 @@ /obj/effect/landmark/start{ name = "Scientist" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, /obj/effect/decal/warning_stripes/east, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -70226,12 +64197,11 @@ }, /area/toxins/lab) "cqi" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, /obj/machinery/shower{ - tag = "icon-shower (EAST)"; + dir = 4; icon_state = "shower"; - dir = 4 + tag = "icon-shower (EAST)" }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -70262,7 +64232,6 @@ name = "\improper Secure Lab" }) "cqk" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atm{ pixel_x = 32 }, @@ -70279,9 +64248,6 @@ /obj/item/stock_parts/manipulator, /obj/item/stock_parts/micro_laser, /obj/item/stock_parts/micro_laser, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/item/clothing/glasses/science, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel{ @@ -70352,18 +64318,21 @@ }, /obj/item/cigbutt, /turf/simulated/floor/plasteel{ - tag = "icon-cafeteria (NORTHEAST)"; + dir = 5; icon_state = "cafeteria"; - dir = 5 + tag = "icon-cafeteria (NORTHEAST)" }, /area/medical/research{ name = "Research Division" }) "cqt" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ - tag = "icon-cafeteria (NORTHEAST)"; + dir = 5; icon_state = "cafeteria"; - dir = 5 + tag = "icon-cafeteria (NORTHEAST)" }, /area/medical/research{ name = "Research Division" @@ -70392,11 +64361,16 @@ name = "Research Division" }) "cqx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/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" = ( @@ -70531,6 +64505,9 @@ name = "Test Chamber Blast Doors"; pixel_y = -25 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/engine, /area/toxins/explab) "cqN" = ( @@ -70546,7 +64523,7 @@ d2 = 2; icon_state = "1-2" }, -/turf/simulated/floor/engine/insulated, +/turf/simulated/floor/engine, /area/maintenance/incinerator) "cqQ" = ( /obj/effect/landmark{ @@ -70637,8 +64614,8 @@ }) "cra" = ( /turf/simulated/floor/wood{ - tag = "icon-wood-broken7"; - icon_state = "wood-broken7" + icon_state = "wood-broken7"; + tag = "icon-wood-broken7" }, /area/maintenance/aft{ name = "Aft Maintenance" @@ -70647,16 +64624,16 @@ /obj/item/reagent_containers/glass/rag, /obj/structure/table/wood, /turf/simulated/floor/wood{ - tag = "icon-wood-broken4"; - icon_state = "wood-broken4" + icon_state = "wood-broken4"; + tag = "icon-wood-broken4" }, /area/maintenance/aft{ name = "Aft Maintenance" }) "crc" = ( /turf/simulated/floor/wood{ - tag = "icon-wood-broken5"; - icon_state = "wood-broken5" + icon_state = "wood-broken5"; + tag = "icon-wood-broken5" }, /area/maintenance/aft{ name = "Aft Maintenance" @@ -70665,23 +64642,11 @@ /obj/machinery/sleeper{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/exam_room) -"cre" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whiteblue" - }, -/area/medical/exam_room) "crf" = ( /obj/machinery/door/poddoor/shutters{ density = 0; @@ -70692,30 +64657,12 @@ opacity = 0 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel{ - tag = "icon-whitebluefull"; - icon_state = "whitebluefull" - }, -/area/medical/exam_room) -"crg" = ( -/obj/machinery/sleeper{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - icon_state = "white" + icon_state = "whitebluefull"; + tag = "icon-whitebluefull" }, /area/medical/exam_room) "crh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "whiteblue" @@ -70731,12 +64678,9 @@ name = "Acute 1 Privacy Shutters"; opacity = 0 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel{ - tag = "icon-whitebluefull"; - icon_state = "whitebluefull" + icon_state = "whitebluefull"; + tag = "icon-whitebluefull" }, /area/medical/exam_room) "crj" = ( @@ -70745,19 +64689,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whiteblue" - }, -/area/medical/reception) -"crk" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whiteblue" @@ -70772,9 +64705,6 @@ /turf/simulated/floor/engine/o2, /area/atmos) "crm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/light{ dir = 1; in_use = 1 @@ -70833,14 +64763,13 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, /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/plasteel{ dir = 1; icon_state = "whiteblue" @@ -70857,23 +64786,12 @@ /area/maintenance/aft{ name = "Aft Maintenance" }) -"crz" = ( -/obj/effect/spawner/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/medical/reception) "crA" = ( /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 - }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "whiteblue" @@ -70881,9 +64799,6 @@ /area/medical/reception) "crB" = ( /obj/structure/table, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, /obj/item/paper_bin{ pixel_x = -2; pixel_y = 5 @@ -70948,7 +64863,6 @@ }, /area/medical/surgery1) "crI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/camera{ c_tag = "Aft Primary Hallway - Fore"; dir = 8; @@ -70965,9 +64879,6 @@ /area/hallway/primary/aft) "crJ" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, /obj/structure/sink{ dir = 8; icon_state = "sink"; @@ -70983,6 +64894,7 @@ "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" }, @@ -71002,6 +64914,7 @@ /area/toxins/lab) "crN" = ( /obj/effect/decal/warning_stripes/east, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -71122,9 +65035,9 @@ }, /obj/structure/table/glass, /turf/simulated/floor/plasteel{ - tag = "icon-cafeteria (NORTHEAST)"; + dir = 5; icon_state = "cafeteria"; - dir = 5 + tag = "icon-cafeteria (NORTHEAST)" }, /area/medical/research{ name = "Research Division" @@ -71134,14 +65047,12 @@ dir = 4; icon_state = "pipe-c" }, -/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{ - tag = "icon-cafeteria (NORTHEAST)"; + dir = 5; icon_state = "cafeteria"; - dir = 5 + tag = "icon-cafeteria (NORTHEAST)" }, /area/medical/research{ name = "Research Division" @@ -71150,13 +65061,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ - tag = "icon-cafeteria (NORTHEAST)"; + dir = 5; icon_state = "cafeteria"; - dir = 5 + tag = "icon-cafeteria (NORTHEAST)" }, /area/medical/research{ name = "Research Division" @@ -71165,11 +65073,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1; - scrub_Toxins = 0 - }, /obj/structure/noticeboard{ pixel_y = -32 }, @@ -71180,9 +65083,9 @@ network = list("SS13","RD") }, /turf/simulated/floor/plasteel{ - tag = "icon-cafeteria (NORTHEAST)"; + dir = 5; icon_state = "cafeteria"; - dir = 5 + tag = "icon-cafeteria (NORTHEAST)" }, /area/medical/research{ name = "Research Division" @@ -71429,6 +65332,9 @@ normaldoorcontrol = 1; pixel_y = -26 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "whiteblue" @@ -71548,6 +65454,9 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whiteblue" @@ -71578,10 +65487,6 @@ name = "\improper Secure Lab" }) "csG" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5; level = 1 @@ -71594,6 +65499,9 @@ /obj/effect/landmark/start{ name = "Medical Doctor" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -71607,6 +65515,9 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whiteblue" @@ -71630,9 +65541,12 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ - tag = "icon-whitebluefull"; - icon_state = "whitebluefull" + icon_state = "whitebluefull"; + tag = "icon-whitebluefull" }, /area/medical/exam_room) "csJ" = ( @@ -71697,10 +65611,6 @@ name = "\improper Secure Lab" }) "csN" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 - }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 2; initialize_directions = 11 @@ -71713,6 +65623,9 @@ /obj/effect/landmark/start{ name = "Medical Doctor" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -71726,6 +65639,9 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whiteblue" @@ -71749,9 +65665,12 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ - tag = "icon-whitebluefull"; - icon_state = "whitebluefull" + icon_state = "whitebluefull"; + tag = "icon-whitebluefull" }, /area/medical/exam_room) "csQ" = ( @@ -71765,12 +65684,13 @@ d2 = 4; icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /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{ icon_state = "white" }, @@ -71779,18 +65699,19 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /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" }, /area/medical/reception) "csT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/light{ dir = 4; icon_state = "tube1" @@ -71810,8 +65731,8 @@ pixel_x = -28 }, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /turf/simulated/floor/plasteel{ dir = 8; @@ -71854,7 +65775,6 @@ }, /area/medical/chemistry) "csY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/research{ @@ -71886,6 +65806,7 @@ 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" @@ -71933,9 +65854,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - tag = "icon-cafeteria (NORTHEAST)"; + dir = 5; icon_state = "cafeteria"; - dir = 5 + tag = "icon-cafeteria (NORTHEAST)" }, /area/medical/research{ name = "Research Division" @@ -71944,13 +65865,14 @@ /turf/simulated/wall, /area/toxins/explab) "ctf" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, /obj/structure/disposalpipe/segment, /obj/machinery/shower{ dir = 4 }, +/obj/machinery/atmospherics/unary/vent_pump{ + dir = 4; + on = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -71967,6 +65889,9 @@ icon_state = "4-8" }, /obj/machinery/hologram/holopad, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -71978,9 +65903,8 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - on = 1 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -72044,7 +65968,7 @@ d2 = 2; icon_state = "1-2" }, -/turf/simulated/floor/engine/insulated, +/turf/simulated/floor/engine, /area/maintenance/incinerator) "cto" = ( /obj/structure/table/reinforced, @@ -72055,7 +65979,6 @@ /obj/item/taperecorder{ pixel_y = 0 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, /area/toxins/explab) @@ -72077,8 +66000,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/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -72107,9 +66033,6 @@ }, /turf/simulated/floor/plating/airless, /area/space/nearstation) -"ctu" = ( -/turf/simulated/wall/r_wall/coated, -/area/maintenance/incinerator) "ctv" = ( /obj/machinery/door/poddoor{ id_tag = "turbinevent"; @@ -72132,8 +66055,8 @@ }) "cty" = ( /turf/simulated/floor/wood{ - tag = "icon-wood-broken"; - icon_state = "wood-broken" + icon_state = "wood-broken"; + tag = "icon-wood-broken" }, /area/maintenance/aft{ name = "Aft Maintenance" @@ -72146,19 +66069,6 @@ /area/maintenance/aft{ name = "Aft Maintenance" }) -"ctB" = ( -/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{ - icon_state = "white" - }, -/area/medical/reception) "ctE" = ( /obj/machinery/portable_atmospherics/canister/air, /obj/machinery/atmospherics/unary/portables_connector{ @@ -72174,12 +66084,8 @@ d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/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" }, @@ -72208,15 +66114,23 @@ name = "Medical Reception"; req_access_txt = "5" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ - tag = "icon-whitebluefull"; - icon_state = "whitebluefull" + icon_state = "whitebluefull"; + tag = "icon-whitebluefull" }, /area/medical/reception) "ctK" = ( -/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{ dir = 4; @@ -72237,6 +66151,12 @@ /turf/simulated/floor/plasteel, /area/toxins/explab) "ctM" = ( +/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" @@ -72264,23 +66184,20 @@ }, /area/medical/reception) "ctQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, /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{ - dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -72310,10 +66227,6 @@ /area/medical/surgery1) "ctV" = ( /obj/machinery/optable, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 2; - on = 1 - }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -72361,6 +66274,10 @@ }, /area/medical/exam_room) "cua" = ( +/obj/machinery/atmospherics/unary/vent_pump{ + dir = 1; + on = 1 + }, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "whiteblue" @@ -72377,26 +66294,15 @@ on = 1 }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/hallway/primary/aft) "cuc" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 - }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "purple" }, /area/hallway/primary/aft) -"cud" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "purplefull" - }, -/area/hallway/primary/aft) "cue" = ( /obj/structure/bed, /obj/machinery/iv_drip, @@ -72405,38 +66311,13 @@ icon_state = "whiteblue" }, /area/medical/exam_room) -"cuf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whitepurple" - }, -/area/toxins/lab) -"cug" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/chair/stool, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/toxins/lab) -"cuh" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/chair/stool, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/toxins/lab) "cui" = ( /obj/structure/closet/wardrobe/chemistry_white, /obj/item/storage/backpack/satchel_chem, /obj/effect/decal/warning_stripes/south, +/obj/structure/disaster_counter/chemistry{ + pixel_y = 32 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -72454,8 +66335,8 @@ pixel_y = 4 }, /obj/machinery/light{ - icon_state = "tube1"; - dir = 4 + dir = 4; + icon_state = "tube1" }, /turf/simulated/floor/plasteel{ dir = 6; @@ -72467,9 +66348,6 @@ dir = 1; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "whitepurple" @@ -72486,12 +66364,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/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 = 1; icon_state = "whitepurple" @@ -72504,9 +66378,6 @@ dir = 2; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitepurplecorner" @@ -72515,9 +66386,6 @@ name = "Research Division" }) "cuo" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/sign/nosmoking_2{ pixel_y = 32 }, @@ -72533,9 +66401,6 @@ name = "Research Division" }) "cup" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, /obj/machinery/light{ dir = 1 }, @@ -72657,9 +66522,6 @@ /obj/structure/table/reinforced, /obj/item/folder/white, /obj/item/folder/white, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -72672,17 +66534,11 @@ dir = 1; pixel_y = 3 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/toxins/explab) "cuB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/table/reinforced, /obj/item/wrench, /obj/item/crowbar, @@ -72697,20 +66553,15 @@ }, /area/toxins/explab) "cuC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/hologram/holopad, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/toxins/explab) "cuD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, /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" = ( @@ -72762,8 +66613,8 @@ name = "The Gobbetting Barmaid" }, /turf/simulated/floor/wood{ - tag = "icon-wood-broken6"; - icon_state = "wood-broken6" + icon_state = "wood-broken6"; + tag = "icon-wood-broken6" }, /area/maintenance/aft{ name = "Aft Maintenance" @@ -72774,19 +66625,19 @@ 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" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitebluecorner" }, /area/medical/reception) "cuM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 3; icon_state = "whitebluecorner" @@ -72798,9 +66649,6 @@ name = "Test Chamber Blast Doors"; pixel_y = 25 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, /obj/structure/table/reinforced, /obj/item/reagent_containers/glass/bottle/epinephrine{ pixel_x = 7; @@ -72834,11 +66682,12 @@ name = "EXTERNAL AIRLOCK"; pixel_y = -32 }, -/turf/simulated/floor/engine/insulated/vacuum, +/turf/simulated/floor/engine/vacuum, /area/maintenance/incinerator) "cuP" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 2; @@ -72855,40 +66704,14 @@ d2 = 2; icon_state = "1-2" }, -/turf/simulated/floor/engine/insulated/vacuum, +/turf/simulated/floor/engine/vacuum, /area/maintenance/incinerator) -"cuR" = ( -/obj/effect/spawner/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/medical/reception) "cuS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "whiteblue" }, /area/medical/reception) -"cuT" = ( -/obj/structure/table, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/item/paper_bin{ - pixel_x = -2; - pixel_y = 5 - }, -/obj/item/pen, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whiteblue" - }, -/area/medical/reception) "cuU" = ( /obj/structure/table, /obj/machinery/computer/crew, @@ -72918,15 +66741,6 @@ icon_state = "white" }, /area/medical/surgery1) -"cuY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - level = 1 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/surgery1) "cuZ" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -72936,9 +66750,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -72979,8 +66790,8 @@ req_access_txt = "5" }, /turf/simulated/floor/plasteel{ - tag = "icon-whitebluefull"; - icon_state = "whitebluefull" + icon_state = "whitebluefull"; + tag = "icon-whitebluefull" }, /area/medical/exam_room) "cvd" = ( @@ -72994,23 +66805,8 @@ opacity = 0 }, /turf/simulated/floor/plasteel{ - tag = "icon-whitebluefull"; - icon_state = "whitebluefull" - }, -/area/medical/exam_room) -"cve" = ( -/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 - }, -/turf/simulated/floor/plasteel{ - tag = "icon-whitebluefull"; - icon_state = "whitebluefull" + icon_state = "whitebluefull"; + tag = "icon-whitebluefull" }, /area/medical/exam_room) "cvf" = ( @@ -73020,8 +66816,8 @@ req_access_txt = "5" }, /turf/simulated/floor/plasteel{ - tag = "icon-whitebluefull"; - icon_state = "whitebluefull" + icon_state = "whitebluefull"; + tag = "icon-whitebluefull" }, /area/medical/exam_room) "cvg" = ( @@ -73035,13 +66831,19 @@ 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, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whiteblue" @@ -73052,7 +66854,6 @@ /area/medical/chemistry) "cvk" = ( /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whiteblue" @@ -73073,13 +66874,6 @@ icon_state = "whitepurple" }, /area/toxins/lab) -"cvm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "purple" - }, -/area/hallway/primary/aft) "cvn" = ( /turf/simulated/floor/plasteel{ icon_state = "purplefull" @@ -73095,6 +66889,7 @@ /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" }, @@ -73146,6 +66941,12 @@ /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/plasteel{ icon_state = "white" }, @@ -73160,6 +66961,12 @@ 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/plasteel{ dir = 4; icon_state = "whitepurple" @@ -73176,6 +66983,12 @@ name = "Research and Development Lab"; req_access_txt = "47" }, +/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 = "whitepurplefull"; @@ -73188,6 +67001,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 = 8; icon_state = "whitepurple" @@ -73201,14 +67020,13 @@ d2 = 4; icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, /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" }, @@ -73225,6 +67043,9 @@ dir = 1 }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -73245,6 +67066,9 @@ /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" }, @@ -73260,7 +67084,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -73281,20 +67107,8 @@ d2 = 8; icon_state = "2-8" }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/research{ - name = "Research Division" - }) -"cvB" = ( -/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/scrubbers{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -73314,13 +67128,16 @@ icon_state = "1-8" }, /obj/structure/disposalpipe/junction{ - tag = "icon-pipe-j2"; + dir = 2; icon_state = "pipe-j2"; - dir = 2 + tag = "icon-pipe-j2" }, /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" }, @@ -73339,6 +67156,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" }, @@ -73360,6 +67180,9 @@ /obj/effect/landmark{ name = "lightsout" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -73377,10 +67200,13 @@ icon_state = "pipe-j1"; tag = "icon-pipe-j1 (EAST)" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /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" }, @@ -73400,6 +67226,9 @@ dir = 4; level = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -73407,10 +67236,8 @@ name = "Research Division" }) "cvH" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - on = 1; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -73440,13 +67267,16 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/disposalpipe/junction{ dir = 8; icon_state = "pipe-j2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitepurple" @@ -73471,6 +67301,9 @@ name = "Experimentation Lab"; req_access_txt = "8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitepurplefull"; @@ -73490,6 +67323,9 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitepurple" @@ -73502,7 +67338,6 @@ name = "Medbay"; req_access_txt = "5" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "whitebluefull" }, @@ -73510,9 +67345,6 @@ "cvM" = ( /obj/structure/table, /obj/machinery/computer/crew, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "whiteblue" @@ -73538,8 +67370,8 @@ /area/medical/reception) "cvP" = ( /obj/structure/cable{ - icon_state = "0-2"; - d2 = 2 + d2 = 2; + icon_state = "0-2" }, /obj/machinery/power/solar{ id = "aftport"; @@ -73565,10 +67397,6 @@ /area/solar/port) "cvR" = ( /obj/structure/chair/office/light, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - on = 1 - }, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "whiteblue" @@ -73584,17 +67412,6 @@ icon_state = "white" }, /area/medical/surgery1) -"cvT" = ( -/obj/structure/sink{ - dir = 4; - icon_state = "sink"; - pixel_x = 11 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - icon_state = "whitebluefull" - }, -/area/medical/reception) "cvU" = ( /obj/machinery/smartfridge/medbay, /obj/effect/decal/warning_stripes/yellow, @@ -73639,16 +67456,16 @@ "cvZ" = ( /obj/structure/chair/stool, /turf/simulated/floor/wood{ - tag = "icon-wood-broken7"; - icon_state = "wood-broken7" + icon_state = "wood-broken7"; + tag = "icon-wood-broken7" }, /area/maintenance/aft{ name = "Aft Maintenance" }) "cwa" = ( /turf/simulated/floor/wood{ - tag = "icon-wood-broken6"; - icon_state = "wood-broken6" + icon_state = "wood-broken6"; + tag = "icon-wood-broken6" }, /area/maintenance/aft{ name = "Aft Maintenance" @@ -73711,7 +67528,9 @@ icon_state = "pipe-c" }, /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 = "white" }, @@ -73720,10 +67539,9 @@ /obj/structure/extinguisher_cabinet{ pixel_x = 27 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, /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" = ( @@ -73739,11 +67557,8 @@ }, /area/medical/medbay3) "cwk" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -73783,6 +67598,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -73799,12 +67615,11 @@ "cwp" = ( /obj/machinery/vending/coffee, /turf/simulated/floor/plasteel{ - tag = "icon-whitebluefull"; - icon_state = "whitebluefull" + icon_state = "whitebluefull"; + tag = "icon-whitebluefull" }, /area/medical/medbay3) "cwq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whiteblue" @@ -73821,12 +67636,9 @@ }, /area/medical/chemistry) "cws" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1; - scrub_Toxins = 0 - }, +/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" }, @@ -73854,6 +67666,7 @@ /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" }, @@ -73899,18 +67712,8 @@ }, /area/hallway/primary/aft) "cwA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/door/firedoor, -/obj/machinery/door/poddoor/shutters/preopen{ - dir = 8; - id_tag = "rndshutters"; - name = "research and development lab shutters" - }, -/obj/effect/spawner/window/reinforced, -/turf/simulated/floor/plating, -/area/toxins/lab) +/turf/simulated/wall/r_wall, +/area/engine/equipmentstorage) "cwB" = ( /obj/machinery/power/compressor{ comp_id = "incineratorturbine"; @@ -73921,7 +67724,7 @@ d2 = 2; icon_state = "1-2" }, -/turf/simulated/floor/engine/insulated/vacuum, +/turf/simulated/floor/engine/vacuum, /area/maintenance/incinerator) "cwC" = ( /obj/structure/table, @@ -73953,7 +67756,6 @@ desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back."; name = "Surgery Cleaner" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/light_switch{ pixel_x = 5; pixel_y = -27 @@ -73992,7 +67794,10 @@ }) "cwH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -74013,10 +67818,13 @@ name = "Aft Maintenance" }) "cwJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, /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" = ( @@ -74051,6 +67859,7 @@ "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" }, @@ -74078,10 +67887,6 @@ dir = 4; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 - }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -74092,9 +67897,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -74110,10 +67912,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -74125,9 +67923,6 @@ dir = 8; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -74135,9 +67930,6 @@ name = "Research Division" }) "cwS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/camera{ c_tag = "Research Division Hallway - Starboard"; dir = 1; @@ -74151,10 +67943,6 @@ }) "cwT" = ( /obj/machinery/light, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2; - initialize_directions = 11 - }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -74162,13 +67950,13 @@ name = "Research Division" }) "cwU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/firealarm{ dir = 1; pixel_y = -24 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -74193,11 +67981,12 @@ d2 = 2; icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; + dir = 4; initialize_directions = 11 }, -/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "whitepurple" @@ -74205,12 +67994,6 @@ /area/medical/research{ name = "Research Division" }) -"cwX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/wall, -/area/toxins/explab) "cwY" = ( /obj/machinery/door/firedoor, /obj/machinery/status_display{ @@ -74228,9 +68011,6 @@ dir = 1; on = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/power/apc{ dir = 2; name = "Experimentation Lab APC"; @@ -74242,9 +68022,6 @@ }, /area/toxins/explab) "cxa" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -29 @@ -74259,27 +68036,9 @@ icon_state = "white" }, /area/toxins/explab) -"cxb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/toxins/explab) -"cxc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/toxins/explab) "cxd" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -74354,8 +68113,8 @@ }) "cxl" = ( /turf/simulated/floor/wood{ - tag = "icon-wood-broken4"; - icon_state = "wood-broken4" + icon_state = "wood-broken4"; + tag = "icon-wood-broken4" }, /area/maintenance/aft{ name = "Aft Maintenance" @@ -74385,21 +68144,14 @@ icon_state = "whiteblue" }, /area/medical/medbay3) -"cxq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - level = 1 - }, -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "whiteblue" - }, -/area/medical/medbay3) "cxr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6; level = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, /turf/simulated/floor/plasteel{ dir = 3; icon_state = "whitebluecorner" @@ -74407,6 +68159,9 @@ /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" @@ -74430,26 +68185,28 @@ dir = 4; level = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5; - 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/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - level = 1 - }, /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/scrubbers{ + dir = 4; + initialize_directions = 11 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -74460,7 +68217,7 @@ level = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 + dir = 2 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -74470,18 +68227,19 @@ "cxx" = ( /obj/machinery/vending/cola, /obj/machinery/light{ - icon_state = "tube1"; - dir = 4 + dir = 4; + icon_state = "tube1" }, /turf/simulated/floor/plasteel{ - tag = "icon-whitebluefull"; - icon_state = "whitebluefull" + icon_state = "whitebluefull"; + tag = "icon-whitebluefull" }, /area/medical/medbay3) "cxy" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whiteblue" @@ -74527,6 +68285,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ req_access_txt = 1 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whiteblue" @@ -74558,7 +68319,9 @@ }, /area/medical/reception) "cxF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whiteblue" @@ -74590,8 +68353,8 @@ /area/medical/reception) "cxJ" = ( /obj/item/twohanded/required/kirbyplants{ - tag = "icon-plant-11"; - icon_state = "plant-11" + icon_state = "plant-11"; + tag = "icon-plant-11" }, /turf/simulated/floor/plasteel{ dir = 1; @@ -74610,15 +68373,19 @@ 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 + }, /turf/simulated/floor/plasteel, /area/hallway/primary/aft) "cxL" = ( /obj/machinery/computer/security/telescreen/entertainment{ pixel_x = -30 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whiteblue" @@ -74643,6 +68410,7 @@ req_access_txt = "8" }, /obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/toxins/storage) "cxN" = ( @@ -74669,9 +68437,10 @@ /turf/simulated/floor/plasteel, /area/toxins/lab) "cxO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /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" @@ -74694,7 +68463,6 @@ }) "cxQ" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -74856,7 +68624,7 @@ }) "cyh" = ( /obj/structure/rack, -/obj/item/tank/anesthetic, +/obj/item/tank/internals/anesthetic, /obj/item/clothing/mask/gas, /turf/simulated/floor/plating, /area/maintenance/aft{ @@ -74966,9 +68734,6 @@ /obj/machinery/light_switch{ pixel_x = -23 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitepurplecorner" @@ -74990,9 +68755,6 @@ dir = 4; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -75003,6 +68765,12 @@ 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" }, @@ -75011,7 +68779,7 @@ /obj/structure/sign/fire{ pixel_y = 0 }, -/turf/simulated/wall/r_wall/coated, +/turf/simulated/wall/r_wall, /area/maintenance/incinerator) "cyv" = ( /obj/structure/disposalpipe/segment{ @@ -75030,19 +68798,14 @@ icon_state = "4-8" }, /turf/simulated/floor/plasteel{ - tag = "icon-whitebluefull"; - icon_state = "whitebluefull" + icon_state = "whitebluefull"; + tag = "icon-whitebluefull" }, /area/medical/medbay3) "cyw" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11; - level = 1 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -75051,6 +68814,10 @@ 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" @@ -75137,11 +68904,8 @@ }, /area/medical/chemistry) "cyC" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -75151,6 +68915,7 @@ /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" }, @@ -75186,11 +68951,8 @@ /turf/simulated/floor/plating, /area/medical/chemistry) "cyH" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -75227,21 +68989,21 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /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, /turf/simulated/floor/plasteel, /area/hallway/primary/aft) "cyM" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -75342,6 +69104,7 @@ /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" @@ -75360,18 +69123,6 @@ icon_state = "pipe-j2s"; sortType = 13 }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/research{ - name = "Research Division" - }) -"cyY" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -75407,9 +69158,9 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - tag = "icon-cafeteria (NORTHEAST)"; + dir = 5; icon_state = "cafeteria"; - dir = 5 + tag = "icon-cafeteria (NORTHEAST)" }, /area/crew_quarters/hor) "czd" = ( @@ -75471,11 +69222,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /obj/structure/chair{ dir = 1 @@ -75537,10 +69285,6 @@ /turf/space, /area/space/nearstation) "czn" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - level = 1 - }, /obj/structure/chair{ dir = 1 }, @@ -75548,31 +69292,44 @@ name = "Medical Doctor" }, /obj/effect/decal/warning_stripes/south, +/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/surgeryobs) "czo" = ( -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /obj/structure/disposalpipe/segment{ dir = 8; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/chair{ dir = 1 }, /obj/effect/decal/warning_stripes/south, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/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/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -75628,11 +69385,8 @@ }, /area/medical/surgeryobs) "czv" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /obj/machinery/light{ dir = 8 @@ -75673,7 +69427,6 @@ name = "Aft Hallway APC"; pixel_x = 24 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/yellow{ d2 = 8; icon_state = "0-8" @@ -75746,30 +69499,22 @@ /area/medical/genetics) "czD" = ( /obj/structure/disposalpipe/junction{ - tag = "icon-pipe-j2"; + dir = 2; icon_state = "pipe-j2"; - dir = 2 + tag = "icon-pipe-j2" }, /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/medbay3) -"czE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whiteblue" - }, -/area/medical/medbay3) "czF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, /obj/machinery/door/firedoor, /turf/simulated/floor/plasteel{ dir = 8; @@ -75783,10 +69528,11 @@ 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/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor, /turf/simulated/floor/plasteel{ dir = 2; @@ -75807,8 +69553,8 @@ icon_state = "pipe-c" }, /turf/simulated/floor/plasteel{ - tag = "icon-whitebluefull"; - icon_state = "whitebluefull" + icon_state = "whitebluefull"; + tag = "icon-whitebluefull" }, /area/medical/medbay3) "czK" = ( @@ -75820,8 +69566,8 @@ name = "Aft Maintenance" }) "czL" = ( -/obj/item/tank/air, -/obj/item/tank/air, +/obj/item/tank/internals/air, +/obj/item/tank/internals/air, /obj/item/clothing/mask/breath, /obj/item/clothing/mask/breath, /obj/machinery/space_heater, @@ -75846,11 +69592,12 @@ name = "\improper Research Testing Range" }) "czO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "whitehall" @@ -75865,14 +69612,6 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/research{ - name = "Research Division" - }) -"czQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -75910,9 +69649,9 @@ }, /obj/item/radio/off, /turf/simulated/floor/plasteel{ - tag = "icon-cafeteria (NORTHEAST)"; + dir = 5; icon_state = "cafeteria"; - dir = 5 + tag = "icon-cafeteria (NORTHEAST)" }, /area/crew_quarters/hor) "czS" = ( @@ -75922,11 +69661,10 @@ /obj/effect/landmark/start{ name = "Research Director" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - tag = "icon-cafeteria (NORTHEAST)"; + dir = 5; icon_state = "cafeteria"; - dir = 5 + tag = "icon-cafeteria (NORTHEAST)" }, /area/crew_quarters/hor) "czT" = ( @@ -75935,17 +69673,24 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - tag = "icon-cafeteria (NORTHEAST)"; + dir = 5; icon_state = "cafeteria"; - dir = 5 + tag = "icon-cafeteria (NORTHEAST)" }, /area/crew_quarters/hor) "czU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - level = 1 - }, /obj/effect/decal/warning_stripes/southwestcorner, +/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/plasteel{ icon_state = "white" }, @@ -76097,7 +69842,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whiteblue" @@ -76179,6 +69923,9 @@ dir = 5; level = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -76214,6 +69961,9 @@ dir = 4; level = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -76231,8 +69981,8 @@ }, /obj/structure/table/glass, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/medical/genetics) "cAr" = ( @@ -76240,6 +69990,9 @@ 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" }, @@ -76253,6 +70006,9 @@ dir = 4; level = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -76266,6 +70022,9 @@ dir = 4; level = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitehall"; @@ -76287,8 +70046,8 @@ }, /obj/structure/table/glass, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/medical/genetics) "cAv" = ( @@ -76296,9 +70055,12 @@ dir = 2; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4; - initialize_directions = 11 + level = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -76379,7 +70141,6 @@ name = "Aft Maintenance" }) "cAA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/alarm{ dir = 8; icon_state = "alarm0"; @@ -76456,12 +70217,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, /obj/effect/decal/warning_stripes/northwest, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /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" @@ -76487,7 +70250,6 @@ name = "Research Division" }) "cAK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "whitebluecorner" @@ -76511,11 +70273,10 @@ /turf/simulated/floor/plasteel, /area/toxins/storage) "cAN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - tag = "icon-cafeteria (NORTHEAST)"; + dir = 5; icon_state = "cafeteria"; - dir = 5 + tag = "icon-cafeteria (NORTHEAST)" }, /area/crew_quarters/hor) "cAO" = ( @@ -76524,9 +70285,9 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - tag = "icon-cafeteria (NORTHEAST)"; + dir = 5; icon_state = "cafeteria"; - dir = 5 + tag = "icon-cafeteria (NORTHEAST)" }, /area/crew_quarters/hor) "cAP" = ( @@ -76538,16 +70299,9 @@ }, /obj/item/circuitboard/teleporter, /turf/simulated/floor/plasteel{ - tag = "icon-cafeteria (NORTHEAST)"; + dir = 5; icon_state = "cafeteria"; - dir = 5 - }, -/area/crew_quarters/hor) -"cAQ" = ( -/turf/simulated/floor/plasteel{ - tag = "icon-cafeteria (NORTHEAST)"; - icon_state = "cafeteria"; - dir = 5 + tag = "icon-cafeteria (NORTHEAST)" }, /area/crew_quarters/hor) "cAR" = ( @@ -76564,9 +70318,9 @@ pixel_x = 24 }, /turf/simulated/floor/plasteel{ - tag = "icon-cafeteria (NORTHEAST)"; + dir = 5; icon_state = "cafeteria"; - dir = 5 + tag = "icon-cafeteria (NORTHEAST)" }, /area/crew_quarters/hor) "cAS" = ( @@ -76575,20 +70329,24 @@ /turf/simulated/floor/plasteel, /area/toxins/storage) "cAT" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /obj/machinery/hologram/holopad, /obj/effect/decal/warning_stripes/west, -/turf/simulated/floor/plasteel{ - icon_state = "white" +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 4; + icon_state = "1-4" }, -/area/medical/surgeryobs) -"cAU" = ( -/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/manifold/hidden/scrubbers{ + dir = 8; + initialize_directions = 11 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -76653,11 +70411,8 @@ name = "Aft Maintenance" }) "cBa" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /obj/structure/cable/yellow{ d1 = 1; @@ -76709,18 +70464,17 @@ network = list("RD"); pixel_y = 2 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/table/reinforced, /turf/simulated/floor/plasteel{ - tag = "icon-cafeteria (NORTHEAST)"; + dir = 5; icon_state = "cafeteria"; - dir = 5 + tag = "icon-cafeteria (NORTHEAST)" }, /area/crew_quarters/hor) "cBg" = ( /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/structure/lattice/catwalk, /turf/space, @@ -76764,6 +70518,9 @@ icon_state = "pipe-c" }, /obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, /turf/simulated/floor/plasteel, /area/toxins/storage) "cBk" = ( @@ -76779,10 +70536,6 @@ name = "Aft Maintenance" }) "cBl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - level = 1 - }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitebluecorner" @@ -76803,18 +70556,11 @@ icon_state = "pipe-c" }, /obj/effect/decal/warning_stripes/east, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, /turf/simulated/floor/plasteel, /area/toxins/storage) -"cBn" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - level = 1 - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whitebluecorner" - }, -/area/medical/medbay3) "cBo" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/medical/glass{ @@ -76822,10 +70568,6 @@ name = "Recovery Ward"; req_access_txt = "0" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - level = 1 - }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -76850,9 +70592,8 @@ dir = 4; icon_state = "pipe-c" }, -/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 = 4; icon_state = "whiteblue" @@ -76862,11 +70603,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -76917,9 +70655,9 @@ /area/medical/genetics_cloning) "cBw" = ( /obj/machinery/shower{ - tag = "icon-shower (EAST)"; + dir = 4; icon_state = "shower"; - dir = 4 + tag = "icon-shower (EAST)" }, /obj/machinery/door/window/southleft{ dir = 2; @@ -76929,8 +70667,8 @@ pixel_x = -28 }, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/medical/genetics_cloning) "cBx" = ( @@ -76946,8 +70684,8 @@ pixel_y = 28 }, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/medical/genetics_cloning) "cBy" = ( @@ -76961,8 +70699,8 @@ }, /obj/structure/window/reinforced, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/medical/genetics_cloning) "cBz" = ( @@ -77067,23 +70805,6 @@ /turf/simulated/floor/plasteel, /area/toxins/storage) "cBM" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /obj/machinery/status_display{ density = 0; layer = 4 @@ -77097,7 +70818,12 @@ name = "\improper Toxins Lab" }) "cBO" = ( -/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/plasteel{ dir = 4; icon_state = "whitehall" @@ -77120,6 +70846,12 @@ dir = 1; icon_state = "pipe-c" }, +/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" }, @@ -77135,9 +70867,11 @@ /obj/structure/disposalpipe/segment{ dir = 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/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -77164,10 +70898,13 @@ req_access_txt = "30"; req_one_access_txt = "0" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ - tag = "icon-cafeteria (NORTHEAST)"; + dir = 5; icon_state = "cafeteria"; - dir = 5 + tag = "icon-cafeteria (NORTHEAST)" }, /area/crew_quarters/hor) "cBS" = ( @@ -77182,15 +70919,18 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ - tag = "icon-cafeteria (NORTHEAST)"; + dir = 5; icon_state = "cafeteria"; - dir = 5 + tag = "icon-cafeteria (NORTHEAST)" }, /area/crew_quarters/hor) "cBT" = ( /obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; + dir = 8; on = 1 }, /obj/structure/disposalpipe/segment{ @@ -77200,9 +70940,9 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - tag = "icon-cafeteria (NORTHEAST)"; + dir = 5; icon_state = "cafeteria"; - dir = 5 + tag = "icon-cafeteria (NORTHEAST)" }, /area/crew_quarters/hor) "cBU" = ( @@ -77213,25 +70953,23 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - tag = "icon-cafeteria (NORTHEAST)"; + dir = 5; icon_state = "cafeteria"; - dir = 5 + tag = "icon-cafeteria (NORTHEAST)" }, /area/crew_quarters/hor) "cBV" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /obj/structure/disposalpipe/segment{ dir = 2; icon_state = "pipe-c" }, /turf/simulated/floor/plasteel{ - tag = "icon-cafeteria (NORTHEAST)"; + dir = 5; icon_state = "cafeteria"; - dir = 5 + tag = "icon-cafeteria (NORTHEAST)" }, /area/crew_quarters/hor) "cBW" = ( @@ -77279,8 +71017,8 @@ dir = 1 }, /turf/simulated/floor/plasteel{ - tag = "icon-whitebluefull"; - icon_state = "whitebluefull" + icon_state = "whitebluefull"; + tag = "icon-whitebluefull" }, /area/medical/medbay3) "cCd" = ( @@ -77386,8 +71124,8 @@ pixel_y = 30 }, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/medical/genetics) "cCj" = ( @@ -77454,9 +71192,6 @@ }, /area/medical/reception) "cCp" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, /obj/item/radio/intercom{ frequency = 1459; name = "Station Intercom (General)"; @@ -77480,11 +71215,6 @@ dir = 5; max_integrity = 1e+007 }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /turf/simulated/floor/grass, /area/medical/surgeryobs) "cCr" = ( @@ -77510,11 +71240,6 @@ dir = 5; max_integrity = 1e+007 }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /turf/simulated/floor/grass, /area/medical/surgeryobs) "cCt" = ( @@ -77533,19 +71258,33 @@ 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/surgeryobs) "cCv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/chair, /obj/effect/landmark/start{ name = "Medical Doctor" }, /obj/effect/decal/warning_stripes/north, +/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" }, @@ -77561,6 +71300,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{ icon_state = "white" }, @@ -77577,6 +71322,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{ icon_state = "white" }, @@ -77628,6 +71379,12 @@ d2 = 8; icon_state = "2-8" }, +/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 = "whiteblue" @@ -77646,7 +71403,6 @@ }, /area/medical/cmo) "cCH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/power/apc{ dir = 8; name = "Chemistry APC"; @@ -77692,33 +71448,45 @@ }, /area/medical/cmo) "cCL" = ( +/obj/structure/chair, +/obj/effect/decal/warning_stripes/north, /obj/structure/cable/yellow{ - d1 = 1; + d1 = 4; d2 = 8; - icon_state = "1-8" + icon_state = "4-8" }, /obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" + d1 = 2; + d2 = 8; + icon_state = "2-8" }, /obj/structure/disposalpipe/segment{ dir = 2; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, -/obj/structure/chair, -/obj/effect/decal/warning_stripes/north, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/surgeryobs) "cCM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/decal/warning_stripes/northwestcorner, +/obj/structure/cable/yellow{ + d1 = 1; + 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" }, @@ -77744,6 +71512,8 @@ 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" }, @@ -77751,7 +71521,6 @@ name = "Research Division" }) "cCP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/firealarm{ dir = 4; pixel_x = 24 @@ -77764,7 +71533,6 @@ name = "Research Division" }) "cCQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/extinguisher_cabinet{ pixel_x = 27 }, @@ -77816,9 +71584,9 @@ pixel_y = -29 }, /turf/simulated/floor/plasteel{ - tag = "icon-cafeteria (NORTHEAST)"; + dir = 5; icon_state = "cafeteria"; - dir = 5 + tag = "icon-cafeteria (NORTHEAST)" }, /area/crew_quarters/hor) "cCW" = ( @@ -77995,12 +71763,6 @@ }) "cDl" = ( /obj/machinery/atmospherics/unary/cryo_cell, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 - }, /obj/effect/decal/warning_stripes/northeast, /turf/simulated/floor/plasteel, /area/medical/cryo) @@ -78026,19 +71788,6 @@ /area/maintenance/aft{ name = "Aft Maintenance" }) -"cDp" = ( -/obj/effect/spawner/window/reinforced, -/obj/machinery/door/poddoor/preopen{ - id_tag = "researchrangeshutters"; - name = "blast door" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/toxins/misc_lab{ - name = "\improper Research Testing Range" - }) "cDq" = ( /obj/machinery/light/small{ dir = 1 @@ -78057,8 +71806,8 @@ pixel_y = 32 }, /turf/simulated/floor/plasteel{ - icon_state = "whitehall"; - dir = 2 + dir = 2; + icon_state = "whitehall" }, /area/medical/medbreak) "cDs" = ( @@ -78071,9 +71820,6 @@ name = "\improper Research Testing Range" }) "cDt" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 8; @@ -78085,16 +71831,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/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/hallway/primary/fore) "cDu" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 5; @@ -78102,38 +71850,20 @@ }, /area/medical/genetics) "cDv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitebluecorner" }, /area/medical/medbay3) -"cDw" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/medical/glass{ - id_tag = null; - name = "Recovery Ward"; - req_access_txt = "0" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/surgeryobs) "cDx" = ( /obj/structure/disposalpipe/segment, -/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, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whiteblue" @@ -78145,12 +71875,10 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/hallway/primary/aft) "cDA" = ( @@ -78164,7 +71892,7 @@ /area/medical/genetics) "cDB" = ( /obj/structure/rack, -/obj/item/tank/air, +/obj/item/tank/internals/air, /obj/item/wrench, /obj/effect/spawner/lootdrop/maintenance, /turf/simulated/floor/plating, @@ -78178,7 +71906,6 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/assembly/chargebay) "cDD" = ( @@ -78224,11 +71951,6 @@ icon_state = "2-4" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - on = 1; - scrub_Toxins = 0 - }, /obj/structure/sign/nosmoking_2{ pixel_x = -28 }, @@ -78242,10 +71964,10 @@ req_access_txt = "8" }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/toxins/storage) "cDJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/camera{ c_tag = "Research Division Hallway - Mech Bay"; dir = 4; @@ -78274,9 +71996,9 @@ }, /obj/item/twohanded/required/kirbyplants/dead, /turf/simulated/floor/plasteel{ - tag = "icon-cafeteria (NORTHEAST)"; + dir = 5; icon_state = "cafeteria"; - dir = 5 + tag = "icon-cafeteria (NORTHEAST)" }, /area/crew_quarters/hor) "cDL" = ( @@ -78288,9 +72010,9 @@ pixel_y = -32 }, /turf/simulated/floor/plasteel{ - tag = "icon-cafeteria (NORTHEAST)"; + dir = 5; icon_state = "cafeteria"; - dir = 5 + tag = "icon-cafeteria (NORTHEAST)" }, /area/crew_quarters/hor) "cDM" = ( @@ -78303,6 +72025,9 @@ }) "cDN" = ( /obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/toxins/storage) "cDO" = ( @@ -78322,18 +72047,22 @@ pixel_y = -32 }, /turf/simulated/floor/plasteel{ - tag = "icon-cafeteria (NORTHEAST)"; + dir = 5; icon_state = "cafeteria"; - dir = 5 + tag = "icon-cafeteria (NORTHEAST)" }, /area/crew_quarters/hor) "cDQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/landmark/start{ name = "Scientist" }, /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, /turf/simulated/floor/plasteel, /area/toxins/storage) "cDR" = ( @@ -78350,11 +72079,7 @@ name = "Aft Maintenance" }) "cDS" = ( -/obj/structure/sign/redcross{ - desc = "The Star of Life, a symbol of Medical Aid."; - icon_state = "lifestar"; - name = "Medbay" - }, +/obj/structure/sign/lifestar, /turf/simulated/wall, /area/medical/reception) "cDT" = ( @@ -78410,7 +72135,13 @@ req_one_access_txt = "5" }, /obj/effect/mapping_helpers/airlock/unres{ - icon_state = "airlock_unres_helper"; + 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 }, /turf/simulated/floor/plasteel{ @@ -78423,6 +72154,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 = 8; icon_state = "whiteblue" @@ -78453,6 +72190,9 @@ 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" = ( @@ -78461,9 +72201,9 @@ pixel_y = -24 }, /turf/simulated/floor/plasteel{ - tag = "icon-cafeteria (NORTHEAST)"; + dir = 5; icon_state = "cafeteria"; - dir = 5 + tag = "icon-cafeteria (NORTHEAST)" }, /area/crew_quarters/hor) "cEe" = ( @@ -78529,6 +72269,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whiteblue" @@ -78550,14 +72291,17 @@ 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) "cEm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=10.1-Central-from-Aft"; location = "10-Aft-To-Central" @@ -78578,33 +72322,23 @@ 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/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 }, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "neutralcorner" }, /area/hallway/primary/aft) -"cEp" = ( -/obj/machinery/door/poddoor/shutters{ - dir = 8; - id_tag = "Skynet_launch"; - name = "Mech Bay" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, -/area/assembly/chargebay) "cEq" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -78613,7 +72347,7 @@ }, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 + dir = 6 }, /turf/simulated/floor/plasteel, /area/assembly/chargebay) @@ -78630,8 +72364,8 @@ name = "Roboticist" }, /obj/machinery/light{ - icon_state = "tube1"; - dir = 4 + dir = 4; + icon_state = "tube1" }, /turf/simulated/floor/bluegrid, /area/assembly/chargebay) @@ -78646,6 +72380,9 @@ 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" }, @@ -78654,10 +72391,13 @@ /obj/machinery/atmospherics/pipe/simple/visible{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - 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" = ( @@ -78680,11 +72420,10 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -78710,6 +72449,9 @@ }) "cEz" = ( /obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -78718,6 +72460,9 @@ /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 + }, /turf/simulated/floor/plasteel, /area/toxins/storage) "cEB" = ( @@ -78734,9 +72479,6 @@ }, /area/maintenance/incinerator) "cED" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -78746,10 +72488,11 @@ /obj/machinery/atmospherics/pipe/simple/visible{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - 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" = ( @@ -78776,6 +72519,7 @@ /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" @@ -78784,6 +72528,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, /obj/effect/decal/warning_stripes/southeast, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/toxins/storage) "cEK" = ( @@ -78819,16 +72564,18 @@ name = "\improper Toxins Lab" }) "cEO" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11; - 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; + level = 1 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whiteblue" @@ -78871,16 +72618,15 @@ /area/medical/cryo) "cES" = ( /obj/machinery/atmospherics/pipe/simple/visible, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - 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/scrubbers{ + dir = 5 + }, /turf/simulated/floor/plasteel, /area/medical/cryo) "cET" = ( @@ -78894,6 +72640,9 @@ /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" = ( @@ -78903,6 +72652,12 @@ icon_state = "4-8" }, /obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -78925,9 +72680,6 @@ }, /area/medical/genetics_cloning) "cEX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, /obj/machinery/firealarm{ dir = 8; pixel_x = -24 @@ -78984,7 +72736,9 @@ icon_state = "sink"; pixel_x = 11 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -79030,8 +72784,8 @@ }, /obj/structure/table/glass, /turf/simulated/floor/plasteel{ - icon_state = "whitehall"; - dir = 2 + dir = 2; + icon_state = "whitehall" }, /area/medical/medbreak) "cFg" = ( @@ -79045,8 +72799,8 @@ dir = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "whitehall"; - dir = 2 + dir = 2; + icon_state = "whitehall" }, /area/medical/medbreak) "cFh" = ( @@ -79057,8 +72811,8 @@ pixel_y = 32 }, /turf/simulated/floor/plasteel{ - icon_state = "whitehall"; - dir = 2 + dir = 2; + icon_state = "whitehall" }, /area/medical/medbreak) "cFi" = ( @@ -79067,39 +72821,23 @@ pixel_y = 32 }, /turf/simulated/floor/plasteel{ - icon_state = "whitehall"; - dir = 2 + dir = 2; + icon_state = "whitehall" }, /area/medical/medbreak) "cFj" = ( -/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/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/medbay3) -"cFk" = ( -/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/aft) "cFl" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 - }, /obj/machinery/door_control{ dir = 2; id = "Skynet_launch"; @@ -79136,6 +72874,7 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/assembly/chargebay) "cFn" = ( @@ -79161,6 +72900,7 @@ name = "door"; req_access_txt = "0" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/toxins/misc_lab{ name = "\improper Research Testing Range" @@ -79173,9 +72913,6 @@ }, /area/medical/cryo) "cFs" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitepurplecorner" @@ -79189,8 +72926,10 @@ 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{ + dir = 6; + level = 1 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -79199,9 +72938,8 @@ name = "Research Division" }) "cFu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 }, /turf/simulated/floor/plasteel{ dir = 2; @@ -79299,6 +73037,7 @@ "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" }, @@ -79307,7 +73046,7 @@ }) "cFF" = ( /obj/machinery/light, -/obj/machinery/atmospherics/unary/cold_sink/freezer{ +/obj/machinery/atmospherics/unary/thermomachine/freezer{ dir = 1 }, /obj/effect/decal/warning_stripes/south, @@ -79338,6 +73077,9 @@ dir = 4 }, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/structure/disaster_counter/toxins{ + pixel_y = 32 + }, /turf/simulated/floor/plasteel, /area/toxins/mixing{ name = "\improper Toxins Lab" @@ -79393,6 +73135,12 @@ req_access_txt = "8" }, /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{ icon_state = "purplefull" }, @@ -79416,18 +73164,12 @@ /turf/simulated/floor/plating, /area/assembly/chargebay) "cFP" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /turf/simulated/floor/plasteel{ dir = 8; @@ -79467,39 +73209,27 @@ }) "cFU" = ( /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whiteblue" }, /area/medical/cryo) -"cFV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "whiteblue" - }, -/area/medical/medbay3) "cFW" = ( /obj/structure/table, /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{ - dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plating, @@ -79513,9 +73243,6 @@ name = "\improper Research Testing Range" }) "cFZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/hologram/holopad, /obj/machinery/atmospherics/pipe/manifold4w/visible, /turf/simulated/floor/plasteel, @@ -79525,11 +73252,8 @@ /turf/simulated/floor/plating, /area/medical/genetics_cloning) "cGb" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -79549,17 +73273,14 @@ }, /area/medical/genetics_cloning) "cGe" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, /obj/item/radio/intercom{ frequency = 1459; name = "Station Intercom (General)"; pixel_x = -26 }, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /turf/simulated/floor/plasteel{ dir = 8; @@ -79577,8 +73298,8 @@ }, /obj/structure/table/glass, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/medical/genetics_cloning) "cGg" = ( @@ -79606,8 +73327,8 @@ pixel_x = 24 }, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/medical/genetics_cloning) "cGi" = ( @@ -79691,9 +73412,9 @@ pixel_x = 28 }, /turf/simulated/floor/plasteel{ - tag = "icon-cafeteria (NORTHEAST)"; + dir = 5; icon_state = "cafeteria"; - dir = 5 + tag = "icon-cafeteria (NORTHEAST)" }, /area/medical/medbreak) "cGn" = ( @@ -79741,16 +73462,21 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - 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/aft) "cGr" = ( -/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" @@ -79766,6 +73492,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/assembly/chargebay) "cGt" = ( @@ -79781,6 +73510,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/assembly/chargebay) "cGu" = ( @@ -79795,6 +73525,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/assembly/chargebay) "cGv" = ( @@ -79812,8 +73545,11 @@ dir = 2; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 + dir = 10 }, /turf/simulated/floor/plasteel, /area/assembly/chargebay) @@ -79848,7 +73584,7 @@ dir = 2; pixel_y = 24 }, -/obj/machinery/atmospherics/unary/cold_sink/freezer, +/obj/machinery/atmospherics/unary/thermomachine/freezer, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, /area/toxins/mixing{ @@ -79879,28 +73615,15 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "purplefull" }, /area/toxins/misc_lab{ name = "\improper Research Testing Range" }) -"cGB" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/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" - }) "cGC" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -79917,6 +73640,8 @@ 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" }, @@ -79929,7 +73654,12 @@ 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/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitepurple" @@ -79954,6 +73684,9 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -79969,6 +73702,9 @@ /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" }, @@ -79984,6 +73720,9 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -79997,7 +73736,10 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -80015,6 +73757,12 @@ 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{ icon_state = "white" }, @@ -80022,9 +73770,6 @@ name = "\improper Toxins Lab" }) "cGL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, /obj/structure/cable/yellow{ d1 = 2; d2 = 8; @@ -80033,6 +73778,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" }, @@ -80040,9 +73791,6 @@ name = "\improper Toxins Lab" }) "cGM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/hologram/holopad, /obj/effect/landmark/start{ name = "Scientist" @@ -80057,14 +73805,12 @@ name = "\improper Toxins Lab" }) "cGN" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 - }, /obj/structure/disposalpipe/segment{ 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" }, @@ -80095,14 +73841,14 @@ name = "\improper Toxins Lab" }) "cGR" = ( -/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/simple/hidden/supply{ + req_access_txt = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -80231,9 +73977,9 @@ /area/medical/medbreak) "cHb" = ( /obj/structure/disposalpipe/junction{ - tag = "icon-pipe-j2"; + dir = 2; icon_state = "pipe-j2"; - dir = 2 + tag = "icon-pipe-j2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/yellow{ @@ -80241,6 +73987,7 @@ d2 = 4; icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whiteblue" @@ -80257,9 +74004,9 @@ icon_state = "4-8" }, /turf/simulated/floor/plasteel{ - tag = "icon-cafeteria (NORTHEAST)"; + dir = 5; icon_state = "cafeteria"; - dir = 5 + tag = "icon-cafeteria (NORTHEAST)" }, /area/medical/medbreak) "cHd" = ( @@ -80277,17 +74024,14 @@ icon_state = "2-4" }, /turf/simulated/floor/plasteel{ - tag = "icon-cafeteria (NORTHEAST)"; + dir = 5; icon_state = "cafeteria"; - dir = 5 + tag = "icon-cafeteria (NORTHEAST)" }, /area/medical/medbreak) "cHe" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /obj/structure/cable/yellow{ d1 = 4; @@ -80295,9 +74039,9 @@ icon_state = "4-8" }, /turf/simulated/floor/plasteel{ - tag = "icon-cafeteria (NORTHEAST)"; + dir = 5; icon_state = "cafeteria"; - dir = 5 + tag = "icon-cafeteria (NORTHEAST)" }, /area/medical/medbreak) "cHf" = ( @@ -80311,9 +74055,9 @@ icon_state = "4-8" }, /turf/simulated/floor/plasteel{ - tag = "icon-cafeteria (NORTHEAST)"; + dir = 5; icon_state = "cafeteria"; - dir = 5 + tag = "icon-cafeteria (NORTHEAST)" }, /area/medical/medbreak) "cHh" = ( @@ -80357,14 +74101,13 @@ name = "Medical Doctor" }, /turf/simulated/floor/plasteel{ - tag = "icon-cafeteria (NORTHEAST)"; + dir = 5; icon_state = "cafeteria"; - dir = 5 + tag = "icon-cafeteria (NORTHEAST)" }, /area/medical/medbreak) "cHj" = ( /obj/effect/spawner/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/yellow{ d2 = 2; icon_state = "0-2" @@ -80372,10 +74115,6 @@ /turf/simulated/floor/plating, /area/medical/virology) "cHk" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - level = 1 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -80391,20 +74130,27 @@ 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" }, /area/medical/medbay3) "cHl" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/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 = 8; icon_state = "whiteblue" @@ -80450,6 +74196,8 @@ }, /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, /turf/simulated/floor/plasteel, /area/assembly/chargebay) "cHr" = ( @@ -80469,9 +74217,6 @@ name = "Port Maintenance" }) "cHs" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, /obj/machinery/power/apc{ dir = 4; name = "Cloning Lab APC"; @@ -80507,47 +74252,7 @@ /area/toxins/misc_lab{ name = "\improper Research Testing Range" }) -"cHu" = ( -/obj/effect/spawner/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/yellow{ - d2 = 2; - icon_state = "0-2" - }, -/turf/simulated/floor/plating, -/area/medical/virology) -"cHv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whitepurplecorner" - }, -/area/medical/research{ - name = "Research Division" - }) -"cHw" = ( -/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{ - icon_state = "white" - }, -/area/medical/research{ - name = "Research Division" - }) "cHx" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 - }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitepurplecorner" @@ -80556,9 +74261,6 @@ name = "Research Division" }) "cHy" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -80570,10 +74272,10 @@ }, /area/medical/medbay3) "cHz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -80604,7 +74306,6 @@ /obj/item/target/syndicate, /obj/item/target/syndicate, /obj/item/target/syndicate, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/light_switch{ pixel_x = -25 }, @@ -80623,18 +74324,13 @@ 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" }) -"cHE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) "cHF" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ @@ -80644,12 +74340,13 @@ name = "\improper Toxins Lab" }) "cHG" = ( -/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{ icon_state = "white" }, @@ -80657,10 +74354,7 @@ name = "\improper Toxins Lab" }) "cHH" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1 - }, +/obj/machinery/atmospherics/unary/vent_scrubber, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -80668,9 +74362,11 @@ name = "\improper Toxins Lab" }) "cHI" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2; - initialize_directions = 11 + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -80683,6 +74379,9 @@ dir = 4 }, /obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/toxins/mixing{ name = "\improper Toxins Lab" @@ -80693,6 +74392,9 @@ 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" @@ -80704,6 +74406,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 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -80711,7 +74419,6 @@ name = "\improper Toxins Lab" }) "cHM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -80720,6 +74427,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -80750,6 +74458,9 @@ req_access_txt = "8" }, /obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/toxins/mixing{ name = "\improper Toxins Lab" @@ -80767,9 +74478,6 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/decal/warning_stripes/southeastcorner, /turf/simulated/floor/plasteel, /area/toxins/mixing{ @@ -80798,7 +74506,6 @@ name = "\improper Toxins Lab" }) "cHT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/extinguisher_cabinet{ pixel_x = -27 }, @@ -80842,6 +74549,9 @@ dir = 4 }, /obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/toxins/mixing{ name = "\improper Toxins Lab" @@ -80849,13 +74559,6 @@ "cHZ" = ( /turf/simulated/wall/r_wall, /area/medical/virology) -"cIa" = ( -/obj/effect/spawner/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/medical/virology) "cIb" = ( /obj/item/cigbutt, /obj/effect/spawner/lootdrop/maintenance, @@ -80891,20 +74594,15 @@ name = "\improper Toxins Lab" }) "cIf" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 2; - on = 1 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11; - level = 1 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -80936,9 +74634,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, /obj/structure/cable/yellow{ d1 = 2; d2 = 8; @@ -80947,6 +74642,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 = "whiteblue" @@ -80958,9 +74656,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, /obj/structure/cable/yellow{ d1 = 2; d2 = 8; @@ -81031,9 +74726,9 @@ /obj/item/reagent_containers/spray/cleaner, /obj/structure/table/glass, /turf/simulated/floor/plasteel{ - tag = "icon-cafeteria (NORTHEAST)"; + dir = 5; icon_state = "cafeteria"; - dir = 5 + tag = "icon-cafeteria (NORTHEAST)" }, /area/medical/medbreak) "cIq" = ( @@ -81054,7 +74749,6 @@ }, /area/medical/surgery2) "cIt" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/item/radio/intercom{ frequency = 1459; name = "Station Intercom (General)"; @@ -81079,7 +74773,9 @@ icon_state = "pipe-c" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -81096,22 +74792,14 @@ req_access_txt = "29" }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/assembly/chargebay) "cIx" = ( /turf/simulated/wall/r_wall, /area/assembly/robotics) "cIy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/firedoor, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/research{ - name = "Research Division" - }) -"cIz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -81132,9 +74820,9 @@ }, /obj/structure/table/glass, /turf/simulated/floor/plasteel{ - tag = "icon-cafeteria (NORTHEAST)"; + dir = 5; icon_state = "cafeteria"; - dir = 5 + tag = "icon-cafeteria (NORTHEAST)" }, /area/medical/medbreak) "cIB" = ( @@ -81151,9 +74839,9 @@ network = list("SS13","Medbay") }, /turf/simulated/floor/plasteel{ - tag = "icon-cafeteria (NORTHEAST)"; + dir = 5; icon_state = "cafeteria"; - dir = 5 + tag = "icon-cafeteria (NORTHEAST)" }, /area/medical/medbreak) "cIC" = ( @@ -81179,7 +74867,6 @@ pixel_x = -27 }, /obj/item/folder/white, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel, /area/toxins/misc_lab{ @@ -81209,14 +74896,17 @@ }, /area/medical/patient_a) "cIG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 4; icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -81224,14 +74914,13 @@ name = "\improper Toxins Lab" }) "cIH" = ( -/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/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -81239,14 +74928,17 @@ name = "\improper Toxins Lab" }) "cII" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, /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/simple/hidden/scrubbers{ + dir = 9 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -81293,6 +74985,9 @@ dir = 4 }, /obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/toxins/mixing{ name = "\improper Toxins Lab" @@ -81328,11 +75023,7 @@ }, /area/medical/virology) "cIS" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 - }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, @@ -81351,11 +75042,8 @@ "cIU" = ( /obj/structure/bed, /obj/item/bedsheet/medical, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /obj/machinery/status_display{ dir = 4; @@ -81382,6 +75070,7 @@ "cIW" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whiteblue" @@ -81393,9 +75082,9 @@ name = "Medical Doctor" }, /turf/simulated/floor/plasteel{ - tag = "icon-cafeteria (NORTHEAST)"; + dir = 5; icon_state = "cafeteria"; - dir = 5 + tag = "icon-cafeteria (NORTHEAST)" }, /area/medical/medbreak) "cIY" = ( @@ -81408,9 +75097,9 @@ }, /obj/structure/cable/yellow, /turf/simulated/floor/plasteel{ - tag = "icon-cafeteria (NORTHEAST)"; + dir = 5; icon_state = "cafeteria"; - dir = 5 + tag = "icon-cafeteria (NORTHEAST)" }, /area/medical/medbreak) "cIZ" = ( @@ -81418,18 +75107,18 @@ dir = 6 }, /turf/simulated/floor/plasteel{ - tag = "icon-cafeteria (NORTHEAST)"; + dir = 5; icon_state = "cafeteria"; - dir = 5 + tag = "icon-cafeteria (NORTHEAST)" }, /area/medical/medbreak) "cJa" = ( /obj/item/cigbutt, /obj/machinery/hologram/holopad, /turf/simulated/floor/plasteel{ - tag = "icon-cafeteria (NORTHEAST)"; + dir = 5; icon_state = "cafeteria"; - dir = 5 + tag = "icon-cafeteria (NORTHEAST)" }, /area/medical/medbreak) "cJb" = ( @@ -81457,6 +75146,9 @@ dir = 4 }, /obj/effect/decal/warning_stripes/east, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/toxins/mixing{ name = "\improper Toxins Lab" @@ -81466,6 +75158,9 @@ dir = 4 }, /obj/effect/decal/warning_stripes/southwest, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, /turf/simulated/floor/plasteel, /area/toxins/mixing{ name = "\improper Toxins Lab" @@ -81476,11 +75171,23 @@ /area/toxins/mixing{ name = "\improper Toxins Lab" }) -"cJh" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 +"cJg" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/toxins/xenobiology{ + 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" @@ -81536,6 +75243,8 @@ icon_state = "1-2" }, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/assembly/robotics) "cJm" = ( @@ -81565,10 +75274,6 @@ /turf/simulated/floor/plasteel, /area/assembly/robotics) "cJo" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - on = 1 - }, /obj/item/radio/intercom{ broadcasting = 0; listening = 1; @@ -81582,6 +75287,9 @@ pixel_x = -23 }, /obj/effect/decal/warning_stripes/northwest, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, /turf/simulated/floor/plasteel, /area/toxins/mixing{ name = "\improper Toxins Lab" @@ -81590,10 +75298,9 @@ /turf/simulated/wall, /area/assembly/robotics) "cJq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -81620,6 +75327,7 @@ name = "emergency shower"; tag = "icon-shower (EAST)" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -81627,10 +75335,8 @@ name = "\improper Toxins Lab" }) "cJu" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, @@ -81724,6 +75430,9 @@ name = "Station Intercom (Medbay)"; pixel_x = 30 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -81757,9 +75466,7 @@ name = "\improper Toxins Lab" }) "cJG" = ( -/turf/simulated/shuttle/wall{ - icon_state = "wall3" - }, +/turf/simulated/wall/indestructible/riveted, /area/toxins/test_area) "cJH" = ( /obj/structure/bed/roller, @@ -81768,7 +75475,9 @@ }, /area/medical/virology) "cJI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, /mob/living/carbon/human/monkey, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" @@ -81778,12 +75487,20 @@ /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, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, /mob/living/carbon/human/monkey, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" @@ -81807,6 +75524,10 @@ pixel_x = -25; req_access_txt = "0" }, +/obj/machinery/atmospherics/unary/vent_pump{ + dir = 4; + on = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -81853,6 +75574,10 @@ pixel_x = 25; req_access_txt = "0" }, +/obj/machinery/atmospherics/unary/vent_pump{ + dir = 8; + on = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -81911,9 +75636,6 @@ name = "Port Maintenance" }) "cJW" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "yellow" @@ -81934,14 +75656,6 @@ icon_state = "white" }, /area/medical/surgery2) -"cJZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/surgery2) "cKa" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -81951,10 +75665,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5; - level = 1 - }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -81999,6 +75709,7 @@ /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" @@ -82011,9 +75722,6 @@ name = "Station Intercom (General)"; pixel_y = -25 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, /obj/item/clothing/glasses/science, /obj/effect/decal/warning_stripes/southwest, /turf/simulated/floor/plasteel, @@ -82028,9 +75736,6 @@ pixel_y = -28 }, /obj/structure/table, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/yellow, /obj/effect/decal/warning_stripes/southeast, /turf/simulated/floor/plasteel, @@ -82040,9 +75745,9 @@ "cKj" = ( /obj/structure/chair/stool, /turf/simulated/floor/plasteel{ - tag = "icon-cafeteria (NORTHEAST)"; + dir = 5; icon_state = "cafeteria"; - dir = 5 + tag = "icon-cafeteria (NORTHEAST)" }, /area/medical/medbreak) "cKk" = ( @@ -82052,9 +75757,9 @@ }, /obj/structure/table/glass, /turf/simulated/floor/plasteel{ - tag = "icon-cafeteria (NORTHEAST)"; + dir = 5; icon_state = "cafeteria"; - dir = 5 + tag = "icon-cafeteria (NORTHEAST)" }, /area/medical/medbreak) "cKl" = ( @@ -82076,8 +75781,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/medical/genetics_cloning) "cKo" = ( @@ -82092,24 +75797,17 @@ }, /area/assembly/robotics) "cKq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, /obj/item/radio/intercom{ frequency = 1459; name = "Station Intercom (General)"; pixel_x = -26 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "yellow" }, /area/hallway/primary/aft) "cKr" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/item/radio/intercom{ broadcasting = 0; listening = 1; @@ -82127,9 +75825,6 @@ /obj/machinery/recharger{ pixel_y = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/door_control{ id = "researchrangeshutters"; name = "Blast Door Control"; @@ -82206,11 +75901,8 @@ name = "\improper Toxins Lab" }) "cKy" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -82233,10 +75925,6 @@ /area/medical/surgery2) "cKA" = ( /obj/machinery/optable, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 - }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -82313,16 +76001,13 @@ /area/toxins/test_area) "cKK" = ( /obj/machinery/camera{ - active_power_usage = 0; c_tag = "Bomb Test Site"; desc = "A specially-reinforced camera with a long lasting battery, used to monitor the bomb testing site. An external light is attached to the top."; dir = 8; invuln = 1; - light = null; luminosity = 3; name = "Hardened Bomb-Test Camera"; - network = list("Toxins","Research","SS13"); - use_power = 0 + network = list("Toxins","Research","SS13") }, /obj/item/target/alien{ anchored = 1 @@ -82360,6 +76045,8 @@ name = "Test Subject Cell"; req_access_txt = "39" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, @@ -82371,7 +76058,8 @@ icon_state = "pipe-c" }, /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 9 + dir = 4; + level = 1 }, /turf/simulated/floor/plating, /area/medical/virology) @@ -82423,9 +76111,6 @@ /area/medical/virology) "cKU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, /obj/machinery/power/apc{ dir = 4; name = "CMO's Office APC"; @@ -82435,6 +76120,7 @@ d2 = 2; icon_state = "0-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -82468,13 +76154,13 @@ /obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment, /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) "cKY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/alarm{ dir = 4; icon_state = "alarm0"; @@ -82491,11 +76177,8 @@ "cLa" = ( /obj/structure/bed, /obj/item/bedsheet/medical, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /obj/machinery/camera{ c_tag = "Medbay Surgery 1 North"; @@ -82512,10 +76195,6 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 - }, /obj/machinery/light_switch{ pixel_y = -24 }, @@ -82535,10 +76214,6 @@ /obj/structure/table, /obj/item/folder/white, /obj/item/clothing/accessory/stethoscope, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - on = 1 - }, /obj/machinery/light_switch{ pixel_y = -24 }, @@ -82575,9 +76250,6 @@ dir = 4; network = list("SS13") }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "yellow" @@ -82614,6 +76286,9 @@ /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" @@ -82622,7 +76297,6 @@ "cLl" = ( /obj/structure/table, /obj/item/crowbar, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/item/wrench, /obj/item/clothing/mask/gas, /obj/effect/decal/warning_stripes/north, @@ -82701,6 +76375,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -82708,7 +76383,6 @@ name = "Research Division" }) "cLu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitehall" @@ -82725,6 +76399,9 @@ dir = 5; level = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitebluecorner" @@ -82747,10 +76424,14 @@ }, /area/medical/medbay3) "cLx" = ( -/obj/machinery/atmospherics/binary/dp_vent_pump/high_volume{ - dir = 2; - frequency = 1449; - id_tag = "tox_airlock_pump" +/obj/machinery/atmospherics/unary/vent_pump{ + dir = 4; + external_pressure_bound = 0; + initialize_directions = 1; + internal_pressure_bound = 4000; + on = 1; + pressure_checks = 2; + pump_direction = 0 }, /turf/simulated/floor/plasteel, /area/toxins/mixing{ @@ -82766,6 +76447,9 @@ 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" @@ -82861,38 +76545,19 @@ name = "\improper Toxins Lab" }) "cLH" = ( -/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{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitegreen" }, /area/medical/virology) "cLI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whitegreen" - }, -/area/medical/virology) -"cLJ" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitegreen" @@ -82902,13 +76567,12 @@ /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 = 4 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whiteblue" @@ -82927,9 +76591,6 @@ "cLM" = ( /obj/machinery/disposal, /obj/structure/disposalpipe/trunk, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitegreen" @@ -82941,25 +76602,17 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/virology) "cLO" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/virology) "cLP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -82995,12 +76648,6 @@ /area/toxins/mixing{ name = "\improper Toxins Lab" }) -"cLR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/wall/r_wall, -/area/medical/virology) "cLS" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable/yellow{ @@ -83012,10 +76659,6 @@ name = "\improper Departure Lounge" }) "cLT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5; - level = 1 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -83067,10 +76710,6 @@ dir = 2; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - level = 1 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -83079,6 +76718,13 @@ /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 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -83091,7 +76737,7 @@ dir = 4; level = 1 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /turf/simulated/floor/plasteel{ @@ -83141,6 +76787,9 @@ name = "Station Intercom (General)"; pixel_x = -28 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -83187,7 +76836,7 @@ /area/medical/morgue) "cMh" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 + dir = 5 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -83201,8 +76850,8 @@ pixel_y = 5 }, /obj/machinery/light{ - icon_state = "tube1"; - dir = 4 + dir = 4; + icon_state = "tube1" }, /obj/structure/table, /obj/item/wrench, @@ -83217,9 +76866,6 @@ /turf/simulated/floor/plasteel, /area/assembly/robotics) "cMj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -83229,6 +76875,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/plasteel, /area/assembly/robotics) "cMk" = ( @@ -83239,17 +76891,12 @@ /turf/simulated/floor/plasteel, /area/assembly/robotics) "cMl" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - on = 1; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /turf/simulated/floor/plasteel, /area/assembly/robotics) "cMm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, /obj/structure/disposalpipe/segment{ dir = 1; icon_state = "pipe-c" @@ -83260,6 +76907,12 @@ 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 + }, /turf/simulated/floor/plasteel, /area/assembly/robotics) "cMn" = ( @@ -83276,20 +76929,7 @@ /obj/machinery/photocopier, /turf/simulated/floor/plasteel, /area/assembly/robotics) -"cMo" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/research{ - name = "Research Division" - }) "cMp" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -83298,6 +76938,10 @@ /obj/effect/landmark{ name = "lightsout" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -83305,7 +76949,6 @@ name = "Research Division" }) "cMq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/firealarm{ dir = 4; pixel_x = 24 @@ -83346,14 +76989,11 @@ /obj/item/radio/headset/headset_medsci, /obj/item/flashlight/pen, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/medical/genetics) "cMt" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, /obj/structure/disposalpipe/segment{ dir = 2; icon_state = "pipe-c" @@ -83401,7 +77041,6 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/warning_stripes/northeast, /turf/simulated/floor/plasteel, /area/toxins/mixing{ @@ -83417,7 +77056,6 @@ d2 = 4; icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitegreen" @@ -83427,7 +77065,6 @@ /obj/structure/chair/office/light{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/yellow{ d1 = 1; d2 = 4; @@ -83438,6 +77075,12 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -83448,6 +77091,9 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -83463,6 +77109,12 @@ 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{ icon_state = "white" }, @@ -83478,7 +77130,12 @@ 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/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitegreen" @@ -83495,6 +77152,12 @@ name = "Containment Cells"; req_access_txt = "39" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "whitegreenfull" }, @@ -83506,6 +77169,12 @@ 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/plasteel{ dir = 8; icon_state = "whitegreen" @@ -83522,8 +77191,11 @@ d2 = 8; icon_state = "4-8" }, +/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 = "white" @@ -83535,13 +77207,16 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, /obj/effect/landmark{ name = "lightsout" }, /obj/machinery/hologram/holopad, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -83552,10 +77227,8 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -83570,6 +77243,9 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitegreen" @@ -83589,6 +77265,9 @@ name = "Virology Access"; req_access_txt = "39" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "whitegreenfull" }, @@ -83605,6 +77284,9 @@ /obj/machinery/light/small{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -83618,6 +77300,9 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitegreen" @@ -83659,6 +77344,9 @@ pixel_y = 25; req_access_txt = "39" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "whitegreenfull" }, @@ -83742,11 +77430,18 @@ 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, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "yellowcorner" @@ -83824,7 +77519,6 @@ name = "Aft Maintenance" }) "cMZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/extinguisher_cabinet{ pixel_x = 27 }, @@ -83886,7 +77580,7 @@ name = "EXTERNAL AIRLOCK"; pixel_y = 32 }, -/turf/simulated/floor/engine/insulated/vacuum, +/turf/simulated/floor/engine/vacuum, /area/toxins/mixing{ name = "\improper Toxins Lab" }) @@ -83908,15 +77602,14 @@ pixel_x = -22 }, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/machinery/r_n_d/circuit_imprinter, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, /area/assembly/robotics) "cNg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ d1 = 1; @@ -83942,9 +77635,6 @@ }, /area/medical/surgery2) "cNj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -83963,33 +77653,22 @@ d2 = 2; icon_state = "1-2" }, -/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/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/research{ name = "Research Division" }) -"cNl" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 - }, -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "whitebluecorner" - }, -/area/medical/research{ - name = "Research Division" - }) "cNm" = ( /obj/machinery/atmospherics/pipe/simple/insulated, -/turf/simulated/wall/r_wall/coated, +/turf/simulated/wall/r_wall, /area/maintenance/incinerator) "cNn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -84008,14 +77687,6 @@ /area/toxins/server{ name = "\improper Research Division Server Room" }) -"cNp" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/wall/r_wall, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) "cNq" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 @@ -84034,17 +77705,10 @@ 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" }, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) -"cNr" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/turf/simulated/wall/r_wall, /area/toxins/mixing{ name = "\improper Toxins Lab" }) @@ -84075,9 +77739,8 @@ /turf/simulated/floor/plasteel, /area/assembly/robotics) "cNv" = ( -/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/plasteel{ icon_state = "whitegreen" }, @@ -84088,27 +77751,15 @@ pixel_y = -24 }, /obj/machinery/light, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/iv_drip, /turf/simulated/floor/plasteel{ icon_state = "whitegreen" }, /area/medical/virology) -"cNx" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/turf/simulated/floor/plasteel{ - icon_state = "whitegreen" - }, -/area/medical/virology) "cNy" = ( /obj/structure/extinguisher_cabinet{ pixel_x = 27 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/camera{ c_tag = "Toxins - Mixing Area"; dir = 8; @@ -84126,9 +77777,6 @@ name = "\improper Secure Lab" }) "cNA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 10; @@ -84136,26 +77784,27 @@ }, /area/medical/virology) "cNB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ icon_state = "whitegreen" }, /area/medical/virology) "cNC" = ( -/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 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "whitegreen" }, /area/medical/virology) "cND" = ( -/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{ icon_state = "whitegreen" @@ -84166,10 +77815,6 @@ dir = 8; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - level = 1 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -84180,6 +77825,13 @@ 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" }, @@ -84192,14 +77844,14 @@ dir = 4; level = 1 }, -/obj/machinery/atmospherics/pipe/manifold/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 = 8; icon_state = "whiteblue" @@ -84210,6 +77862,9 @@ 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" @@ -84245,11 +77900,8 @@ }, /area/medical/medbay3) "cNM" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 2; @@ -84268,8 +77920,8 @@ /area/medical/medbay3) "cNO" = ( /obj/structure/sink{ - icon_state = "sink"; dir = 8; + icon_state = "sink"; pixel_x = -12; pixel_y = 2 }, @@ -84316,9 +77968,6 @@ name = "Aft Maintenance" }) "cNS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, /obj/structure/extinguisher_cabinet{ pixel_x = -27 }, @@ -84350,6 +77999,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 = "white" }, @@ -84377,7 +78028,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /turf/simulated/floor/plasteel{ @@ -84396,28 +78047,26 @@ d2 = 8; icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/hallway/primary/aft) "cNY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, /obj/structure/rack, -/obj/item/storage/firstaid/regular{ - empty = 1; +/obj/item/storage/firstaid/regular/empty{ name = "First-Aid (empty)" }, -/obj/item/storage/firstaid/regular{ - empty = 1; +/obj/item/storage/firstaid/regular/empty{ name = "First-Aid (empty)" }, -/obj/item/storage/firstaid/regular{ - empty = 1; +/obj/item/storage/firstaid/regular/empty{ name = "First-Aid (empty)" }, /obj/item/healthanalyzer{ @@ -84457,7 +78106,6 @@ /turf/simulated/floor/plasteel, /area/assembly/robotics) "cOb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment{ dir = 1; icon_state = "pipe-c" @@ -84492,11 +78140,17 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "purplefull" }, /area/assembly/robotics) "cOf" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -84518,10 +78172,8 @@ d2 = 4; icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -84534,9 +78186,11 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -84557,6 +78211,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 = "dark" }, @@ -84572,6 +78232,12 @@ /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" }, @@ -84586,15 +78252,13 @@ desc = "A warning sign which reads 'SERVER ROOM'."; name = "SERVER ROOM" }, -/turf/simulated/wall/r_wall/coated, +/turf/simulated/wall/r_wall, /area/toxins/server{ name = "\improper Research Division Server Room" }) "cOl" = ( -/obj/machinery/atmospherics/unary/cold_sink/freezer{ - current_temperature = 80; - dir = 2; - on = 1 +/obj/machinery/atmospherics/unary/thermomachine/freezer/on/server{ + dir = 2 }, /obj/effect/decal/cleanable/cobweb2, /turf/simulated/floor/plasteel{ @@ -84641,13 +78305,6 @@ /area/toxins/server{ name = "\improper Research Division Server Room" }) -"cOq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whitebluecorner" - }, -/area/medical/medbay3) "cOr" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 @@ -84771,6 +78428,7 @@ name = "Isolation B"; req_access_txt = "39" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, @@ -84782,12 +78440,12 @@ name = "Isolation A"; req_access_txt = "39" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, /area/medical/virology) "cOB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment{ dir = 4; icon_state = "pipe-c" @@ -84819,8 +78477,8 @@ /obj/item/reagent_containers/iv_bag/blood/random, /obj/item/reagent_containers/iv_bag/blood/random, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/medical/virology) "cOD" = ( @@ -84831,22 +78489,23 @@ icon_state = "pipe-c" }, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/medical/virology) "cOE" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/medical/virology) "cOF" = ( /obj/structure/closet/secure_closet/medical1, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/medical/virology) "cOG" = ( @@ -84896,9 +78555,6 @@ /obj/machinery/shower{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, /obj/effect/decal/warning_stripes/northeast, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -84926,9 +78582,6 @@ }) "cOL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, /obj/machinery/power/apc{ dir = 8; name = "west bump"; @@ -84939,6 +78592,7 @@ d2 = 2; icon_state = "0-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -84956,9 +78610,6 @@ name = "Aft Maintenance" }) "cON" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "escape" @@ -84970,13 +78621,14 @@ 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 = "escape" }, /area/hallway/primary/aft) "cOP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/camera{ c_tag = "Aft Primary Hallway - Aft"; dir = 8; @@ -85032,6 +78684,12 @@ 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" = ( @@ -85039,6 +78697,9 @@ dir = 4 }, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/assembly/robotics) "cOW" = ( @@ -85063,36 +78724,18 @@ /area/medical/research{ name = "Research Division" }) -"cPa" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1; - scrub_Toxins = 0 - }, -/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" - }) "cPb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, /obj/item/radio/intercom{ frequency = 1459; name = "Station Intercom (General)"; pixel_x = 29 }, /obj/machinery/light{ - icon_state = "tube1"; - dir = 4 + dir = 4; + icon_state = "tube1" + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -85110,6 +78753,10 @@ /obj/machinery/light/small{ dir = 8 }, +/obj/machinery/atmospherics/unary/vent_pump{ + dir = 1; + on = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -85118,6 +78765,9 @@ }) "cPe" = ( /obj/structure/chair/office/light, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -85179,6 +78829,9 @@ d2 = 8; icon_state = "0-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -85200,7 +78853,6 @@ /obj/machinery/atmospherics/unary/portables_connector{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/portable_atmospherics/canister, /obj/effect/decal/warning_stripes/southeast, /turf/simulated/floor/plasteel, @@ -85236,19 +78888,19 @@ /turf/simulated/floor/plasteel, /area/assembly/robotics) "cPp" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/item/bedsheet/medical, /obj/structure/bed, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, /area/medical/virology) "cPq" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 }, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" @@ -85256,14 +78908,15 @@ /area/medical/virology) "cPr" = ( /obj/structure/bed, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/item/bedsheet/medical, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, /area/medical/virology) "cPs" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, /turf/simulated/wall, /area/medical/virology) @@ -85274,6 +78927,7 @@ name = "Break Room"; req_access_txt = "39" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "whitegreenfull" }, @@ -85335,18 +78989,12 @@ 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" }, /area/medical/medbay3) -"cPB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/firedoor, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whiteblue" - }, -/area/medical/medbay3) "cPC" = ( /obj/structure/table, /obj/machinery/camera{ @@ -85358,23 +79006,12 @@ department = "Research Director's Office" }, /turf/simulated/floor/plasteel{ - tag = "icon-cafeteria (NORTHEAST)"; + dir = 5; icon_state = "cafeteria"; - dir = 5 + tag = "icon-cafeteria (NORTHEAST)" }, /area/crew_quarters/hor) -"cPD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/firedoor, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "whiteblue" - }, -/area/medical/medbay3) "cPE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 4; @@ -85415,8 +79052,8 @@ "cPH" = ( /obj/structure/closet/firecloset, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/hallway/secondary/exit{ name = "\improper Departure Lounge" @@ -85424,8 +79061,8 @@ "cPI" = ( /obj/structure/closet/emcloset, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/hallway/secondary/exit{ name = "\improper Departure Lounge" @@ -85433,8 +79070,8 @@ "cPJ" = ( /obj/machinery/computer/arcade, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/hallway/secondary/exit{ name = "\improper Departure Lounge" @@ -85471,8 +79108,8 @@ pixel_y = 32 }, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/hallway/secondary/exit{ name = "\improper Departure Lounge" @@ -85485,16 +79122,13 @@ pixel_y = 32 }, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/hallway/secondary/exit{ name = "\improper Departure Lounge" }) "cPN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ name = "Departure Lounge" @@ -85516,12 +79150,13 @@ /obj/machinery/door/airlock/public/glass{ name = "Departure Lounge" }, +/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" }) "cPP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ name = "Departure Lounge" @@ -85694,7 +79329,6 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/camera/motion{ c_tag = "AI Satellite Exterior South"; network = list("SS13","RD","AIUpload") @@ -85702,6 +79336,9 @@ /obj/machinery/light/small{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -85756,9 +79393,6 @@ }, /area/medical/patient_b) "cQg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/door/poddoor/shutters/preopen{ dir = 2; id_tag = "toxins_blastdoor"; @@ -85779,9 +79413,6 @@ 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" @@ -85852,6 +79483,9 @@ /obj/machinery/light/small{ dir = 4 }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, @@ -85860,6 +79494,9 @@ /obj/machinery/light/small{ dir = 8 }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, @@ -85904,6 +79541,7 @@ }) "cQs" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitegreen" @@ -85920,9 +79558,6 @@ frequency = 1439; pixel_y = 23 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, /obj/machinery/camera{ c_tag = "Virology - Cells"; dir = 4; @@ -85954,10 +79589,11 @@ /turf/simulated/floor/plasteel, /area/assembly/robotics) "cQw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, /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/assembly/robotics) "cQx" = ( @@ -85988,19 +79624,15 @@ shock_proof = 0 }, /obj/effect/decal/warning_stripes/east, -/obj/structure/cable/yellow{ - d2 = 4; - icon_state = "0-4" - }, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/surgeryobs) "cQA" = ( /obj/structure/morgue{ - tag = "icon-morgue1 (WEST)"; + dir = 8; icon_state = "morgue1"; - dir = 8 + tag = "icon-morgue1 (WEST)" }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -86011,6 +79643,9 @@ dir = 4 }, /obj/effect/decal/warning_stripes/southeast, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/assembly/robotics) "cQE" = ( @@ -86048,9 +79683,6 @@ pixel_y = 26 }, /obj/item/wrench, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, /obj/item/restraints/handcuffs/cable/zipties, /turf/simulated/floor/plasteel{ dir = 5; @@ -86059,7 +79691,7 @@ /area/medical/virology) "cQH" = ( /obj/structure/rack, -/obj/effect/landmark/costume/random, +/obj/effect/landmark/costume, /obj/effect/spawner/lootdrop/maintenance{ lootcount = 2; name = "2maintenance loot spawner" @@ -86121,9 +79753,6 @@ dir = 4; icon_state = "tube1" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/computer/pandemic, /turf/simulated/floor/plasteel{ dir = 4; @@ -86192,10 +79821,13 @@ d2 = 2; icon_state = "0-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /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" @@ -86215,15 +79847,6 @@ /area/maintenance/fpmaint2{ name = "Port Maintenance" }) -"cQT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/effect/decal/warning_stripes/north, -/turf/simulated/floor/plasteel, -/area/hallway/secondary/exit{ - name = "\improper Departure Lounge" - }) "cQU" = ( /obj/item/storage/box/lights/mixed, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -86266,13 +79889,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/maintenance/starboardsolar) -"cQY" = ( -/obj/effect/spawner/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/turf/simulated/floor/plating, -/area/medical/virology) "cQZ" = ( /obj/structure/table/glass, /obj/item/reagent_containers/dropper, @@ -86292,33 +79908,20 @@ icon_state = "freezerfloor" }, /area/medical/virology) -"cRb" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/wall, -/area/medical/virology) "cRc" = ( /obj/structure/table/glass, /obj/item/paper_bin{ pixel_x = -2; pixel_y = 9 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitegreen" }, /area/medical/virology) "cRd" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -86326,21 +79929,15 @@ /area/medical/virology) "cRe" = ( /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" }, /area/medical/virology) -"cRf" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - on = 1 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/virology) "cRg" = ( /obj/structure/closet/emcloset, /obj/item/radio/intercom{ @@ -86357,9 +79954,9 @@ "cRi" = ( /obj/machinery/door/airlock/centcom{ icon = 'icons/obj/doors/airlocks/station/maintenance.dmi'; - overlays_file = 'icons/obj/doors/airlocks/station/overlays.dmi'; name = "Crematorium Maintenance"; opacity = 1; + overlays_file = 'icons/obj/doors/airlocks/station/overlays.dmi'; req_access_txt = "27" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -86370,9 +79967,9 @@ "cRj" = ( /obj/machinery/door/airlock/centcom{ icon = 'icons/obj/doors/airlocks/station/maintenance.dmi'; - overlays_file = 'icons/obj/doors/airlocks/station/overlays.dmi'; name = "Chapel Office Maintenance"; opacity = 1; + overlays_file = 'icons/obj/doors/airlocks/station/overlays.dmi'; req_access_txt = "27" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -86382,6 +79979,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/maintenance/aft{ name = "Aft Maintenance" @@ -86391,6 +79989,9 @@ 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" @@ -86435,6 +80036,9 @@ 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" @@ -86447,14 +80051,13 @@ name = "Aft Maintenance" }) "cRp" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/item/twohanded/required/kirbyplants{ - tag = "icon-plant-11"; - icon_state = "plant-11" + icon_state = "plant-11"; + tag = "icon-plant-11" }, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /turf/simulated/floor/plasteel{ dir = 8; @@ -86469,6 +80072,9 @@ 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" @@ -86487,6 +80093,9 @@ 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" @@ -86519,6 +80128,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/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" @@ -86558,19 +80169,6 @@ icon_state = "4-8" }, /turf/simulated/floor/plasteel, -/area/hallway/secondary/exit{ - name = "\improper Departure Lounge" - }) -"cRz" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/plasteel, /area/hallway/secondary/exit{ name = "\improper Departure Lounge" }) @@ -86581,14 +80179,14 @@ icon_state = "1-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/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/manifold/hidden/supply{ + dir = 8 + }, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit{ name = "\improper Departure Lounge" @@ -86604,10 +80202,15 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, /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 + }, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit{ name = "\improper Departure Lounge" @@ -86630,10 +80233,13 @@ name = "Aft Maintenance" }) "cRD" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ +/obj/effect/decal/warning_stripes/north, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit{ name = "\improper Departure Lounge" @@ -86742,7 +80348,6 @@ name = "\improper Recreation Area" }) "cRL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitebluecorner" @@ -86780,9 +80385,6 @@ d2 = 8; icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, /obj/machinery/firealarm{ dir = 4; pixel_x = 24 @@ -86837,17 +80439,6 @@ /obj/machinery/power/smes, /turf/simulated/floor/plating, /area/maintenance/starboardsolar) -"cRT" = ( -/obj/docking_port/stationary{ - dir = 2; - dwidth = 2; - height = 18; - id = "skipjack_sw"; - name = "southwest of SS13"; - width = 19 - }, -/turf/space, -/area/space) "cRU" = ( /turf/simulated/wall, /area/medical/psych) @@ -86895,6 +80486,9 @@ /area/medical/psych) "cRY" = ( /obj/structure/chair/stool, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, /turf/simulated/floor/plasteel{ icon_state = "whitegreen" }, @@ -86930,8 +80524,8 @@ pixel_y = 32 }, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/hallway/secondary/exit{ name = "\improper Departure Lounge" @@ -86964,16 +80558,14 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, /area/chapel/office) "cSf" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -86985,9 +80577,9 @@ req_access_txt = "22" }, /turf/simulated/floor/plasteel{ - tag = "icon-cult"; + dir = 2; icon_state = "cult"; - dir = 2 + tag = "icon-cult" }, /area/chapel/office) "cSh" = ( @@ -87000,11 +80592,15 @@ pixel_x = -2; pixel_y = 2 }, +/obj/item/nullrod{ + pixel_x = 4 + }, /obj/item/organ/internal/heart, +/obj/structure/closet/secure_closet/chaplain, /turf/simulated/floor/plasteel{ - tag = "icon-cult"; + dir = 2; icon_state = "cult"; - dir = 2 + tag = "icon-cult" }, /area/chapel/office) "cSi" = ( @@ -87019,6 +80615,7 @@ 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" @@ -87034,15 +80631,11 @@ }) "cSk" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit{ name = "\improper Departure Lounge" }) "cSl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, /obj/structure/disposalpipe/sortjunction{ dir = 8; icon_state = "pipe-j2s"; @@ -87053,10 +80646,14 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, /obj/effect/decal/warning_stripes/south, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4; + initialize_directions = 11 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/aft{ name = "Aft Maintenance" @@ -87072,14 +80669,14 @@ d2 = 4; icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/disposalpipe/junction{ dir = 8; icon_state = "pipe-j2" }, /obj/effect/decal/warning_stripes/south, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, /turf/simulated/floor/plating, /area/maintenance/aft{ name = "Aft Maintenance" @@ -87087,17 +80684,6 @@ "cSo" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, -/area/hallway/secondary/exit{ - name = "\improper Departure Lounge" - }) -"cSp" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/plasteel, /area/hallway/secondary/exit{ name = "\improper Departure Lounge" }) @@ -87168,8 +80754,8 @@ }) "cSv" = ( /obj/item/twohanded/required/kirbyplants{ - tag = "icon-plant-11"; - icon_state = "plant-11" + icon_state = "plant-11"; + tag = "icon-plant-11" }, /turf/simulated/floor/plasteel{ dir = 5; @@ -87192,8 +80778,8 @@ /area/assembly/robotics) "cSy" = ( /obj/machinery/power/terminal{ - icon_state = "term"; - dir = 1 + dir = 1; + icon_state = "term" }, /obj/structure/cable{ d2 = 8; @@ -87232,9 +80818,13 @@ /obj/machinery/atmospherics/unary/tank/air{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4; + level = 1 + }, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/medical/virology) "cSE" = ( @@ -87243,25 +80833,35 @@ 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{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/medical/virology) "cSF" = ( /obj/item/trash/popcorn, /obj/structure/table/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/universal{ + dir = 4 + }, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/medical/virology) "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{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/medical/virology) "cSH" = ( @@ -87270,16 +80870,13 @@ }, /obj/structure/table/glass, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/medical/virology) "cSI" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /obj/machinery/crema_switch{ pixel_x = -25 @@ -87341,6 +80938,12 @@ 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" }, @@ -87356,8 +80959,8 @@ "cSR" = ( /obj/structure/table/wood, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/chapel/main) "cSS" = ( @@ -87367,9 +80970,10 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/chapel/main) "cST" = ( @@ -87385,8 +80989,8 @@ pixel_y = 29 }, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/chapel/main) "cSU" = ( @@ -87405,8 +81009,8 @@ req_access_txt = "0" }, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/chapel/main) "cSV" = ( @@ -87479,7 +81083,6 @@ /obj/structure/extinguisher_cabinet{ pixel_x = -25 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "whitegreen" @@ -87492,24 +81095,14 @@ /area/maintenance/aft{ name = "Aft Maintenance" }) -"cTb" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/plasteel, -/area/hallway/secondary/exit{ - name = "\improper Departure Lounge" - }) "cTc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/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/supply, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit{ name = "\improper Departure Lounge" @@ -87523,15 +81116,11 @@ name = "Aft Maintenance" }) "cTe" = ( -/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/simple/hidden/supply, /obj/structure/sink{ dir = 4; icon_state = "sink"; @@ -87560,6 +81149,9 @@ icon_state = "sink"; pixel_x = 11 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "whitegreen" @@ -87570,7 +81162,6 @@ dir = 4; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=10-Aft-To-Central"; location = "9.4-Escape-4" @@ -87587,8 +81178,8 @@ pixel_y = 32 }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 1 + dir = 1; + icon_state = "red" }, /area/hallway/secondary/exit{ name = "\improper Departure Lounge" @@ -87609,8 +81200,8 @@ pixel_y = 32 }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 5 + dir = 5; + icon_state = "red" }, /area/hallway/secondary/exit{ name = "\improper Departure Lounge" @@ -87633,9 +81224,7 @@ req_access_txt = "47" }, /turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "whitepurplefull"; - tag = "icon-whitehall (WEST)" + icon_state = "white" }, /area/toxins/xenobiology{ name = "\improper Secure Lab" @@ -87672,8 +81261,8 @@ /area/maintenance/starboardsolar) "cTq" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/machinery/camera{ c_tag = "Departure Lounge - Port Fore"; @@ -87723,8 +81312,8 @@ pixel_y = -30 }, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/medical/virology) "cTw" = ( @@ -87804,6 +81393,7 @@ codes_txt = "patrol;next_patrol=9.2-Escape-2"; location = "9.1-Escape-1" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit{ name = "\improper Departure Lounge" @@ -87836,11 +81426,8 @@ name = "Aft Maintenance" }) "cTG" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/carpet, /area/chapel/main) @@ -87850,12 +81437,6 @@ }, /turf/simulated/floor/carpet, /area/chapel/main) -"cTI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/turf/simulated/floor/carpet, -/area/chapel/main) "cTJ" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -87866,21 +81447,13 @@ dir = 1; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, /turf/simulated/floor/carpet, /area/chapel/main) "cTK" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/turf/simulated/floor/carpet, -/area/chapel/main) -"cTL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -87892,9 +81465,6 @@ name = "Chapel"; opacity = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -87927,9 +81497,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit{ name = "\improper Departure Lounge" @@ -87939,9 +81506,6 @@ dir = 8; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit{ name = "\improper Departure Lounge" @@ -87977,8 +81541,8 @@ icon_state = "2-8" }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 8 + dir = 8; + icon_state = "red" }, /area/hallway/secondary/exit{ name = "\improper Departure Lounge" @@ -88035,8 +81599,7 @@ icon_state = "1-2" }, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whitepurple" + icon_state = "white" }, /area/toxins/xenobiology{ name = "\improper Secure Lab" @@ -88108,9 +81671,6 @@ dir = 1; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -88122,6 +81682,10 @@ icon_state = "1-4" }, /obj/machinery/hologram/holopad, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -88203,15 +81767,15 @@ }, /area/chapel/office) "cUl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/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 = 5 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -88241,7 +81805,9 @@ }, /area/chapel/office) "cUo" = ( -/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whiteblue" @@ -88271,19 +81837,17 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11; - 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/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -88314,7 +81878,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/carpet, /area/chapel/main) "cUt" = ( @@ -88326,6 +81892,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" }, @@ -88335,6 +81904,9 @@ 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" @@ -88352,6 +81924,9 @@ /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" @@ -88371,13 +81946,18 @@ }, /obj/structure/table/wood, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/chapel/main) "cUy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 +/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{ @@ -88402,14 +81982,12 @@ dir = 8; initialize_directions = 11 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit{ name = "\improper Departure Lounge" }) "cUB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit{ @@ -88429,6 +82007,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 = "redfull" }, @@ -88441,12 +82022,6 @@ d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -88456,9 +82031,15 @@ 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{ - icon_state = "red"; - dir = 10 + dir = 10; + icon_state = "red" }, /area/hallway/secondary/exit{ name = "\improper Departure Lounge" @@ -88469,6 +82050,12 @@ d2 = 8; icon_state = "2-8" }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, /turf/simulated/floor/plasteel{ icon_state = "red" }, @@ -88493,35 +82080,17 @@ }, /area/medical/medbay3) "cUG" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - on = 1 - }, +/obj/machinery/atmospherics/unary/vent_pump, /obj/structure/reagent_dispensers/peppertank{ pixel_y = 28 }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 1 + dir = 1; + icon_state = "red" }, /area/hallway/secondary/exit{ name = "\improper Departure Lounge" }) -"cUH" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/light/small{ - dir = 8 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/toxins/xenobiology{ - name = "\improper Secure Lab" - }) "cUI" = ( /obj/structure/chair, /turf/simulated/floor/plasteel{ @@ -88580,9 +82149,6 @@ /obj/structure/chair/office/dark{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/computer/security/telescreen{ desc = "Used for watching output from station security cameras."; name = "Security Camera Monitor"; @@ -88590,8 +82156,8 @@ pixel_y = 30 }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 9 + dir = 9; + icon_state = "red" }, /area/hallway/secondary/exit{ name = "\improper Departure Lounge" @@ -88614,6 +82180,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -88666,7 +82233,6 @@ }, /area/chapel/main) "cUY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/chair/stool, /turf/simulated/floor/plasteel{ dir = 1; @@ -88691,28 +82257,27 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4; - level = 1 + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/medical/morgue) "cVc" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + 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 = 2; + dir = 4; initialize_directions = 11 }, /turf/simulated/floor/plasteel, @@ -88735,9 +82300,6 @@ dir = 5; max_integrity = 1e+007 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/grass, /area/hallway/secondary/exit{ name = "\improper Departure Lounge" @@ -88761,7 +82323,7 @@ "cVh" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 + dir = 6 }, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit{ @@ -88800,13 +82362,6 @@ /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{ icon_state = "dark" }, @@ -88818,10 +82373,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -88832,9 +82383,11 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/light{ + dir = 8 + }, /turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "whitepurple" + icon_state = "white" }, /area/toxins/xenobiology{ name = "\improper Secure Lab" @@ -88877,9 +82430,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/plasteel, /area/hallway/secondary/exit{ @@ -88890,24 +82440,22 @@ 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/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /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 = 4 + dir = 5 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -88920,21 +82468,6 @@ icon_state = "chapel" }, /area/chapel/main) -"cVx" = ( -/obj/structure/chair/stool, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - icon_state = "chapel" - }, -/area/chapel/main) -"cVy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/chair/stool, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "chapel" - }, -/area/chapel/main) "cVz" = ( /obj/structure/chair/stool, /turf/simulated/floor/plasteel{ @@ -88951,21 +82484,9 @@ icon_state = "chapel" }, /area/chapel/main) -"cVB" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel, -/area/hallway/secondary/exit{ - name = "\improper Departure Lounge" - }) "cVC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit{ @@ -88975,9 +82496,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/decal/warning_stripes/northwestcorner, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit{ @@ -88991,36 +82509,6 @@ }) "cVG" = ( /turf/simulated/wall/r_wall, -/area/toxins/xenobiology{ - name = "\improper Secure Lab" - }) -"cVH" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/research{ - autoclose = 0; - frequency = 1449; - icon_state = "door_locked"; - id_tag = "xeno_airlock_exterior"; - locked = 1; - name = "Secure Lab External Airlock"; - req_access_txt = "55" - }, -/obj/machinery/access_button{ - command = "cycle_exterior"; - master_tag = "xeno_airlock_control"; - pixel_x = -25; - req_access_txt = "55" - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "whitepurplefull"; - tag = "icon-whitehall (WEST)" - }, /area/toxins/xenobiology{ name = "\improper Secure Lab" }) @@ -89102,10 +82590,6 @@ /obj/structure/table/wood, /turf/simulated/floor/carpet, /area/chapel/main) -"cVQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/wall, -/area/chapel/main) "cVR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ @@ -89140,29 +82624,6 @@ }, /area/chapel/main) "cVU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "chapel" - }, -/area/chapel/main) -"cVV" = ( -/obj/structure/chair/stool, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "chapel" - }, -/area/chapel/main) -"cVW" = ( -/obj/structure/chair/stool, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "chapel" @@ -89187,8 +82648,11 @@ name = "\improper Departure Lounge" }) "cWa" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/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{ @@ -89199,6 +82663,9 @@ 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" @@ -89248,6 +82715,9 @@ 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" @@ -89302,8 +82772,9 @@ dir = 8; on = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4; + initialize_directions = 11 }, /turf/simulated/floor/plasteel, /area/hallway/primary/aft) @@ -89333,8 +82804,8 @@ }, /obj/item/restraints/handcuffs, /obj/machinery/light{ - icon_state = "tube1"; - dir = 4 + dir = 4; + icon_state = "tube1" }, /obj/item/radio/off, /obj/machinery/requests_console{ @@ -89343,8 +82814,8 @@ pixel_x = 30 }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 4 + dir = 4; + icon_state = "red" }, /area/hallway/secondary/exit{ name = "\improper Departure Lounge" @@ -89370,6 +82841,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 2 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -89378,11 +82850,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -89397,6 +82866,9 @@ name = "Funeral Parlour"; opacity = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -89411,10 +82883,12 @@ }, /area/chapel/main) "cWv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "chapel" }, @@ -89427,15 +82901,6 @@ icon_state = "chapel" }, /area/chapel/main) -"cWx" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "chapel" - }, -/area/chapel/main) "cWy" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -89452,9 +82917,9 @@ /area/chapel/main) "cWA" = ( /obj/machinery/shower{ - tag = "icon-shower (EAST)"; + dir = 4; icon_state = "shower"; - dir = 4 + tag = "icon-shower (EAST)" }, /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel{ @@ -89473,18 +82938,9 @@ dir = 4 }, /obj/effect/decal/warning_stripes/east, -/turf/simulated/floor/plasteel, -/area/hallway/secondary/exit{ - name = "\improper Departure Lounge" - }) -"cWD" = ( -/obj/structure/chair{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/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" @@ -89532,12 +82988,10 @@ name = "\improper Secure Lab" }) "cWG" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "neutralcorner" @@ -89551,10 +83005,6 @@ name = "\improper ROBOTICS!"; pixel_x = 32 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 - }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "purplecorner" @@ -89577,18 +83027,6 @@ /area/maintenance/aft{ name = "Aft Maintenance" }) -"cWJ" = ( -/obj/structure/chair{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/decal/warning_stripes/west, -/turf/simulated/floor/plasteel, -/area/hallway/secondary/exit{ - name = "\improper Departure Lounge" - }) "cWK" = ( /obj/structure/cable{ d1 = 4; @@ -89621,8 +83059,8 @@ pixel_y = -2 }, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/chapel/main) "cWO" = ( @@ -89633,21 +83071,13 @@ name = "Chaplain" }, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/chapel/main) "cWP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/chapel/main) -"cWQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -89664,6 +83094,7 @@ pixel_y = 5 }, /obj/structure/table/wood, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -89701,16 +83132,6 @@ /area/hallway/secondary/exit{ name = "\improper Departure Lounge" }) -"cWU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5; - level = 1 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whiteblue" - }, -/area/medical/medbay3) "cWV" = ( /obj/structure/table/wood, /turf/simulated/floor/plasteel{ @@ -89808,12 +83229,13 @@ }) "cXg" = ( /obj/structure/sink{ - icon_state = "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, @@ -89845,6 +83267,9 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/warning_stripes/south, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -89947,6 +83372,7 @@ }) "cXr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 3; icon_state = "whitebluecorner" @@ -89968,17 +83394,14 @@ /obj/structure/noticeboard{ pixel_y = 30 }, +/obj/structure/disaster_counter/scichem{ + pixel_x = 32 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitepurplefull"; tag = "icon-whitehall (WEST)" }, -/area/toxins/xenobiology{ - name = "\improper Secure Lab" - }) -"cXu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/wall/r_wall, /area/toxins/xenobiology{ name = "\improper Secure Lab" }) @@ -90014,6 +83437,7 @@ pixel_x = -25; req_access_txt = "55" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitepurplefull"; @@ -90087,8 +83511,8 @@ pixel_y = -32 }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 6 + dir = 6; + icon_state = "red" }, /area/hallway/secondary/exit{ name = "\improper Departure Lounge" @@ -90152,15 +83576,15 @@ /area/chapel/main) "cXJ" = ( /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/chapel/main) "cXK" = ( /obj/machinery/hologram/holopad, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/chapel/main) "cXL" = ( @@ -90251,7 +83675,6 @@ pixel_x = -6; pixel_y = 26 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitepurple" @@ -90271,6 +83694,7 @@ d2 = 4; icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitepurple" @@ -90345,8 +83769,8 @@ }) "cXY" = ( /obj/item/twohanded/required/kirbyplants{ - tag = "icon-plant-11"; - icon_state = "plant-11" + icon_state = "plant-11"; + tag = "icon-plant-11" }, /turf/simulated/floor/plasteel{ dir = 6; @@ -90383,20 +83807,8 @@ "cYb" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 5 - }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) -"cYc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 5 + dir = 5; + icon_state = "vault" }, /area/crew_quarters/fitness{ name = "\improper Recreation Area" @@ -90421,6 +83833,7 @@ "cYf" = ( /obj/machinery/door/airlock/external{ id_tag = "emergency_home"; + locked = 1; name = "Departure Lounge Airlock" }, /obj/effect/decal/warning_stripes/yellow, @@ -90436,9 +83849,9 @@ dir = 1 }, /turf/simulated/floor/plasteel{ - tag = "icon-cult"; + dir = 2; icon_state = "cult"; - dir = 2 + tag = "icon-cult" }, /area/chapel/main) "cYh" = ( @@ -90447,9 +83860,9 @@ req_access_txt = "0" }, /turf/simulated/floor/plasteel{ - tag = "icon-cult"; + dir = 2; icon_state = "cult"; - dir = 2 + tag = "icon-cult" }, /area/chapel/main) "cYi" = ( @@ -90464,8 +83877,8 @@ "cYj" = ( /obj/structure/chair, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/chapel/main) "cYk" = ( @@ -90474,8 +83887,8 @@ name = "Chaplain" }, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/chapel/main) "cYl" = ( @@ -90490,8 +83903,8 @@ }, /obj/structure/table/wood, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/chapel/main) "cYm" = ( @@ -90533,16 +83946,6 @@ /area/toxins/xenobiology{ name = "\improper Secure Lab" }) -"cYs" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/toxins/xenobiology{ - name = "\improper Secure Lab" - }) "cYt" = ( /obj/machinery/hologram/holopad, /obj/structure/cable/yellow{ @@ -90553,6 +83956,9 @@ /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" }, @@ -90569,19 +83975,6 @@ /area/toxins/xenobiology{ name = "\improper Secure Lab" }) -"cYv" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/toxins/xenobiology{ - name = "\improper Secure Lab" - }) "cYw" = ( /obj/machinery/hydroponics/soil{ pixel_y = 8 @@ -90607,15 +84000,14 @@ d2 = 8; icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 - }, /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=14.8-Dorms-Lockers"; location = "14.5-Recreation" }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/crew_quarters/fitness{ name = "\improper Recreation Area" @@ -90650,27 +84042,8 @@ }, /turf/simulated/floor/plating, /area/medical/psych) -"cYD" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - tag = "icon-swall_f6"; - icon_state = "swall_f6"; - dir = 2 - }, -/area/shuttle/escape) -"cYE" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall12"; - icon_state = "swall12"; - dir = 2 - }, -/area/shuttle/escape) "cYF" = ( -/obj/structure/sign/redcross{ - desc = "The Star of Life, a symbol of Medical Aid."; - icon_state = "lifestar"; - name = "Medbay" - }, +/obj/structure/sign/lifestar, /turf/simulated/wall, /area/medical/genetics) "cYG" = ( @@ -90679,7 +84052,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/junction{ dir = 8 }, @@ -90687,19 +84059,12 @@ /area/crew_quarters/fitness{ name = "\improper Recreation Area" }) -"cYH" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall14"; - icon_state = "swall14"; - dir = 2 - }, -/area/shuttle/escape) "cYI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/junction{ - tag = "icon-pipe-j2"; + dir = 2; icon_state = "pipe-j2"; - dir = 2 + tag = "icon-pipe-j2" }, /obj/structure/cable/yellow{ d1 = 1; @@ -90710,14 +84075,6 @@ icon_state = "dark" }, /area/medical/morgue) -"cYJ" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - tag = "icon-swall_f10"; - icon_state = "swall_f10"; - dir = 2 - }, -/area/shuttle/escape) "cYK" = ( /obj/machinery/atmospherics/unary/portables_connector{ dir = 1; @@ -90725,9 +84082,9 @@ }, /obj/machinery/portable_atmospherics/canister/air, /turf/simulated/floor/plasteel{ - tag = "icon-whitepurple (SOUTHWEST)"; + dir = 10; icon_state = "whitepurple"; - dir = 10 + tag = "icon-whitepurple (SOUTHWEST)" }, /area/toxins/xenobiology{ name = "\improper Secure Lab" @@ -90750,6 +84107,9 @@ /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" }, @@ -90764,7 +84124,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -90800,7 +84159,6 @@ master_tag = "tox_airlock_control"; pixel_y = 24 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/binary/pump{ dir = 4 }, @@ -90809,7 +84167,6 @@ name = "\improper Toxins Lab" }) "cYT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/sign/fire{ pixel_y = -32 }, @@ -90892,14 +84249,17 @@ dir = 8; network = list("SS13") }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, /area/chapel/office) "cZb" = ( /obj/structure/cable{ - icon_state = "0-2"; - d2 = 2 + d2 = 2; + icon_state = "0-2" }, /obj/machinery/power/solar{ id = "aftstarboard"; @@ -90942,13 +84302,6 @@ /obj/structure/lattice/catwalk, /turf/space, /area/solar/starboard) -"cZe" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall3"; - icon_state = "swall3"; - dir = 2 - }, -/area/shuttle/escape) "cZf" = ( /obj/structure/table/wood, /obj/machinery/bottler, @@ -90956,16 +84309,6 @@ /area/maintenance/aft{ name = "Aft Maintenance" }) -"cZg" = ( -/obj/structure/dispenser/oxygen{ - layer = 2.7; - pixel_x = -1; - pixel_y = 2 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, -/area/shuttle/escape) "cZh" = ( /obj/structure/table/wood, /obj/item/flashlight/lamp, @@ -90997,10 +84340,6 @@ /turf/simulated/wall, /area/chapel/main) "cZl" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2; - initialize_directions = 11 - }, /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-24"; layer = 4.1; @@ -91010,13 +84349,6 @@ icon_state = "dark" }, /area/chapel/main) -"cZm" = ( -/obj/effect/spawner/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/turf/simulated/floor/plating, -/area/medical/virology) "cZn" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -91033,36 +84365,17 @@ /area/crew_quarters/fitness{ name = "\improper Arcade" }) -"cZo" = ( -/obj/machinery/door/airlock/shuttle{ - id_tag = "s_docking_airlock"; - name = "Emergency Shuttle Airlock"; - req_access_txt = "0" - }, -/turf/simulated/shuttle/floor, -/area/shuttle/escape) "cZp" = ( -/obj/docking_port/mobile/emergency{ - dir = 2; - dwidth = 5; - height = 14; - width = 25 - }, /obj/docking_port/stationary{ dir = 2; - dwidth = 5; - height = 14; + dwidth = 11; + height = 18; id = "emergency_home"; name = "emergency evac bay"; - width = 25 + width = 29 }, -/obj/machinery/door/airlock/shuttle{ - id_tag = "s_docking_airlock"; - name = "Emergency Shuttle Airlock"; - req_access_txt = "0" - }, -/turf/simulated/shuttle/floor, -/area/shuttle/escape) +/turf/space, +/area/space) "cZq" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -91103,7 +84416,6 @@ name = "Chapel Office APC"; pixel_y = -25 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/unary/vent_pump{ dir = 4; on = 1 @@ -91114,7 +84426,6 @@ }, /area/chapel/office) "cZu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ @@ -91172,6 +84483,9 @@ /obj/effect/landmark/start{ name = "Medical Doctor" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -91198,9 +84512,6 @@ /obj/structure/lattice/catwalk, /turf/space, /area/solar/starboard) -"cZB" = ( -/turf/simulated/shuttle/floor, -/area/shuttle/escape) "cZC" = ( /obj/item/radio/intercom{ frequency = 1459; @@ -91213,8 +84524,8 @@ /area/chapel/main) "cZD" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 4 + dir = 4; + icon_state = "tube1" }, /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, @@ -91224,18 +84535,6 @@ /area/toxins/xenobiology{ name = "\improper Secure Lab" }) -"cZE" = ( -/turf/simulated/shuttle/plating{ - icon_state = "floorgrime" - }, -/area/shuttle/escape) -"cZF" = ( -/obj/structure/shuttle/engine/propulsion{ - dir = 8; - icon_state = "burst_l" - }, -/turf/simulated/shuttle/plating, -/area/shuttle/escape) "cZG" = ( /obj/structure/disposalpipe/trunk{ dir = 4 @@ -91261,6 +84560,9 @@ 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" @@ -91288,6 +84590,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/warning_stripes/south, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -91297,15 +84600,6 @@ "cZL" = ( /obj/machinery/computer/camera_advanced/xenobio, /obj/effect/decal/warning_stripes/southwestcorner, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/toxins/xenobiology{ - name = "\improper Secure Lab" - }) -"cZM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -91327,10 +84621,22 @@ 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/simple/hidden/scrubbers, +/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" }, @@ -91344,14 +84650,6 @@ icon_state = "chapel" }, /area/chapel/main) -"cZS" = ( -/obj/structure/shuttle/engine/propulsion{ - dir = 8; - icon_state = "propulsion"; - tag = "icon-propulsion (EAST)" - }, -/turf/simulated/shuttle/plating, -/area/shuttle/escape) "cZT" = ( /obj/structure/lattice, /obj/effect/spawner/window/reinforced, @@ -91369,32 +84667,25 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/toxins/xenobiology{ name = "\improper Secure Lab" }) -"cZV" = ( -/obj/structure/shuttle/engine/propulsion{ - dir = 8; - icon_state = "propulsion_r"; - tag = "icon-propulsion_r (EAST)" - }, -/turf/simulated/shuttle/plating, -/area/shuttle/escape) "cZW" = ( /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/structure/lattice/catwalk, /turf/space, /area/solar/starboard) "cZX" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/machinery/alarm{ dir = 4; @@ -91414,14 +84705,6 @@ /area/maintenance/aft{ name = "Aft Maintenance" }) -"cZZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/toxins/xenobiology{ - name = "\improper Secure Lab" - }) "daa" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ @@ -91430,6 +84713,7 @@ 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" }, @@ -91460,8 +84744,8 @@ dir = 1 }, /obj/item/twohanded/required/kirbyplants{ - tag = "icon-plant-25"; - icon_state = "plant-25" + icon_state = "plant-25"; + tag = "icon-plant-25" }, /turf/simulated/floor/wood, /area/medical/psych) @@ -91489,6 +84773,10 @@ c_tag = "Medbay Surgery 1 North"; network = list("SS13") }, +/obj/machinery/atmospherics/unary/vent_pump{ + dir = 8; + on = 1 + }, /turf/simulated/floor/wood, /area/medical/psych) "dag" = ( @@ -91500,25 +84788,6 @@ /obj/structure/fans/tiny, /turf/simulated/floor/plating, /area/chapel/main) -"dah" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swallc2"; - dir = 2 - }, -/area/shuttle/escape) -"dai" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall0"; - dir = 2 - }, -/area/shuttle/escape) -"daj" = ( -/obj/structure/sign/nosmoking_2, -/turf/simulated/shuttle/wall{ - icon_state = "swall0"; - dir = 2 - }, -/area/shuttle/escape) "dak" = ( /obj/machinery/alarm{ dir = 8; @@ -91528,24 +84797,6 @@ /obj/structure/closet/secure_closet/psychiatrist, /turf/simulated/floor/wood, /area/medical/psych) -"dal" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall4"; - dir = 2 - }, -/area/shuttle/escape) -"dam" = ( -/obj/structure/rack, -/obj/item/crowbar, -/obj/item/wrench, -/obj/item/weldingtool, -/obj/item/wirecutters, -/obj/item/stack/cable_coil, -/obj/effect/decal/warning_stripes/east, -/turf/simulated/shuttle/plating{ - icon_state = "floorgrime" - }, -/area/shuttle/escape) "dan" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/yellow{ @@ -91559,17 +84810,15 @@ /area/maintenance/aft{ name = "Aft Maintenance" }) -"dao" = ( -/obj/effect/spawner/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plating, -/area/medical/virology) "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" @@ -91602,6 +84851,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -91617,6 +84867,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/warning_stripes/north, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -91654,8 +84905,8 @@ network = list("SS13") }, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/structure/extinguisher_cabinet{ pixel_x = -27 @@ -91681,6 +84932,9 @@ /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" @@ -91705,6 +84959,9 @@ d2 = 8; icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitegreen"; @@ -91727,73 +84984,6 @@ /area/maintenance/aft{ name = "Aft Maintenance" }) -"daz" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - tag = "icon-swall_f6"; - icon_state = "swall_f6"; - dir = 2 - }, -/turf/simulated/shuttle/wall{ - dir = 8; - icon_state = "diagonalWall3" - }, -/area/shuttle/escape) -"daA" = ( -/obj/structure/table, -/obj/item/phone{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/cigbutt/cigarbutt{ - pixel_x = 5; - pixel_y = -1 - }, -/turf/simulated/shuttle/floor, -/area/shuttle/escape) -"daB" = ( -/obj/structure/table, -/obj/item/storage/firstaid/regular, -/turf/simulated/shuttle/floor, -/area/shuttle/escape) -"daC" = ( -/obj/structure/chair/comfy/shuttle, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, -/area/shuttle/escape) -"daD" = ( -/obj/machinery/light{ - dir = 1; - on = 1 - }, -/obj/structure/chair/comfy/shuttle, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, -/area/shuttle/escape) -"daE" = ( -/obj/structure/sink{ - icon_state = "sink"; - dir = 8; - pixel_x = -12; - pixel_y = 2 - }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1 - }, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = -26 - }, -/obj/effect/decal/warning_stripes/northwest, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/toxins/xenobiology{ - name = "\improper Secure Lab" - }) "daF" = ( /obj/structure/sign/securearea{ desc = "A warning sign which reads 'HIGH VOLTAGE'"; @@ -91810,7 +85000,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/warning_stripes/southwestcorner, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -91831,74 +85020,6 @@ /area/toxins/xenobiology{ name = "\improper Secure Lab" }) -"daI" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 - }, -/obj/effect/decal/warning_stripes/southeastcorner, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/toxins/xenobiology{ - name = "\improper Secure Lab" - }) -"daJ" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall1"; - dir = 2 - }, -/area/shuttle/escape) -"daK" = ( -/obj/structure/closet/crate{ - name = "lifejackets" - }, -/obj/item/clothing/suit/storage/hazardvest, -/obj/item/clothing/suit/storage/hazardvest, -/obj/item/clothing/suit/storage/hazardvest, -/obj/item/clothing/suit/storage/hazardvest, -/obj/item/clothing/suit/storage/hazardvest, -/obj/item/tank/emergency_oxygen/engi, -/obj/item/tank/emergency_oxygen/engi, -/obj/item/tank/emergency_oxygen/engi, -/obj/item/tank/emergency_oxygen/engi, -/obj/item/tank/emergency_oxygen/engi, -/obj/item/clothing/mask/breath{ - pixel_x = -5; - pixel_y = -2 - }, -/obj/item/clothing/mask/breath{ - pixel_x = -5; - pixel_y = -2 - }, -/obj/item/clothing/mask/breath{ - pixel_x = -5; - pixel_y = -2 - }, -/obj/item/clothing/mask/breath{ - pixel_x = -5; - pixel_y = -2 - }, -/obj/item/clothing/mask/breath{ - pixel_x = -5; - pixel_y = -2 - }, -/obj/item/clothing/head/hardhat, -/obj/item/clothing/head/hardhat, -/obj/item/clothing/head/hardhat, -/obj/item/clothing/head/hardhat, -/obj/item/clothing/head/hardhat, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, -/area/shuttle/escape) "daL" = ( /obj/structure/cable/yellow{ d1 = 4; @@ -91910,6 +85031,9 @@ name = "Virology Access"; req_access_txt = "39" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "whitegreenfull" }, @@ -91920,6 +85044,9 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitegreen" @@ -91933,11 +85060,8 @@ d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -91949,6 +85073,9 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitegreen"; @@ -91956,31 +85083,27 @@ }, /area/medical/medbay3) "daP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/medbay3) "daQ" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 2; - on = 1 - }, /obj/structure/cable/yellow{ d1 = 2; d2 = 4; icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/wood, /area/medical/psych) "daR" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -92018,47 +85141,11 @@ d2 = 8; icon_state = "4-8" }, -/turf/simulated/floor/carpet, -/area/medical/psych) -"daW" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall7"; - icon_state = "swall7"; - dir = 2 - }, -/area/shuttle/escape) -"daX" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall8"; - dir = 2 - }, -/area/shuttle/escape) -"daY" = ( -/obj/machinery/door/airlock/medical/glass{ - id_tag = null; - name = "Escape Shuttle Infirmary"; - req_access_txt = "0" - }, -/turf/simulated/shuttle/floor, -/area/shuttle/escape) -"daZ" = ( -/obj/structure/shuttle/engine/heater{ - tag = "icon-heater (WEST)"; - icon_state = "heater"; +/obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/shuttle/plating, -/area/shuttle/escape) -"dba" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall11"; - icon_state = "swall11"; - dir = 2 - }, -/area/shuttle/escape) +/turf/simulated/floor/carpet, +/area/medical/psych) "dbb" = ( /obj/structure/cable/yellow{ d1 = 4; @@ -92066,6 +85153,9 @@ 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" = ( @@ -92082,6 +85172,7 @@ /obj/effect/landmark{ name = "lightsout" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -92111,29 +85202,6 @@ }, /turf/simulated/floor/carpet, /area/medical/psych) -"dbg" = ( -/obj/structure/reagent_dispensers/fueltank, -/obj/machinery/light{ - dir = 1; - on = 1 - }, -/obj/effect/decal/warning_stripes/yellow, -/turf/simulated/shuttle/plating{ - icon_state = "floorgrime" - }, -/area/shuttle/escape) -"dbh" = ( -/obj/machinery/status_display, -/turf/simulated/shuttle/wall{ - tag = "icon-swall3"; - icon_state = "swall3"; - dir = 2 - }, -/area/shuttle/escape) -"dbi" = ( -/obj/machinery/sleeper, -/turf/simulated/shuttle/floor, -/area/shuttle/escape) "dbj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/warning_stripes/south, @@ -92145,11 +85213,6 @@ /area/hallway/secondary/exit{ name = "\improper Departure Lounge" }) -"dbk" = ( -/obj/structure/table, -/obj/item/storage/fancy, -/turf/simulated/shuttle/floor, -/area/shuttle/escape) "dbl" = ( /obj/structure/table/reinforced, /obj/item/wrench, @@ -92204,6 +85267,7 @@ d2 = 8; icon_state = "1-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -92211,7 +85275,6 @@ name = "\improper Secure Lab" }) "dbo" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/warning_stripes/northwestcorner, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -92233,11 +85296,6 @@ icon_state = "dark" }, /area/chapel/main) -"dbq" = ( -/obj/structure/table, -/obj/item/restraints/handcuffs, -/turf/simulated/shuttle/floor, -/area/shuttle/escape) "dbr" = ( /obj/effect/decal/warning_stripes/northeastcorner, /turf/simulated/floor/plasteel{ @@ -92259,19 +85317,8 @@ /area/toxins/xenobiology{ name = "\improper Secure Lab" }) -"dbt" = ( -/obj/structure/reagent_dispensers/watertank, -/obj/effect/decal/warning_stripes/yellow, -/turf/simulated/shuttle/plating{ - icon_state = "floorgrime" - }, -/area/shuttle/escape) "dbu" = ( -/obj/structure/sign/redcross{ - desc = "The Star of Life, a symbol of Medical Aid."; - icon_state = "lifestar"; - name = "Medbay" - }, +/obj/structure/sign/lifestar, /turf/simulated/wall, /area/medical/surgeryobs) "dbv" = ( @@ -92287,6 +85334,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitegreen"; @@ -92307,7 +85355,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -92316,8 +85366,11 @@ /obj/structure/chair/comfy/black{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -92342,13 +85395,15 @@ }) "dbz" = ( /obj/structure/sink{ - icon_state = "sink"; dir = 8; + icon_state = "sink"; pixel_x = -12; pixel_y = 2 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -92563,33 +85618,6 @@ }, /turf/simulated/floor/carpet, /area/medical/psych) -"dbO" = ( -/obj/structure/shuttle/engine/heater{ - tag = "icon-heater (WEST)"; - icon_state = "heater"; - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/machinery/light{ - icon_state = "tube1"; - dir = 4 - }, -/turf/simulated/shuttle/plating, -/area/shuttle/escape) -"dbP" = ( -/obj/machinery/computer/communications, -/turf/simulated/shuttle/floor, -/area/shuttle/escape) -"dbQ" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 1 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, -/area/shuttle/escape) "dbR" = ( /obj/structure/window/reinforced{ dir = 1 @@ -92717,19 +85745,10 @@ req_access_txt = "0" }, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/chapel/main) -"dbY" = ( -/obj/machinery/light, -/obj/structure/chair/comfy/shuttle{ - dir = 1 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, -/area/shuttle/escape) "dbZ" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -92744,61 +85763,6 @@ /obj/machinery/power/tracker, /turf/simulated/floor/plating/airless, /area/solar/starboard) -"dcb" = ( -/obj/machinery/door/airlock/shuttle{ - id_tag = "s_docking_airlock"; - name = "Emergency Shuttle Airlock"; - req_access_txt = "2" - }, -/turf/simulated/shuttle/floor, -/area/shuttle/escape) -"dcc" = ( -/obj/structure/closet/crate{ - name = "lifejackets" - }, -/obj/item/clothing/suit/storage/hazardvest, -/obj/item/clothing/suit/storage/hazardvest, -/obj/item/clothing/suit/storage/hazardvest, -/obj/item/clothing/suit/storage/hazardvest, -/obj/item/clothing/suit/storage/hazardvest, -/obj/item/tank/emergency_oxygen/engi, -/obj/item/tank/emergency_oxygen/engi, -/obj/item/tank/emergency_oxygen/engi, -/obj/item/tank/emergency_oxygen/engi, -/obj/item/tank/emergency_oxygen/engi, -/obj/item/clothing/mask/breath{ - pixel_x = -5; - pixel_y = -2 - }, -/obj/item/clothing/mask/breath{ - pixel_x = -5; - pixel_y = -2 - }, -/obj/item/clothing/mask/breath{ - pixel_x = -5; - pixel_y = -2 - }, -/obj/item/clothing/mask/breath{ - pixel_x = -5; - pixel_y = -2 - }, -/obj/item/clothing/mask/breath{ - pixel_x = -5; - pixel_y = -2 - }, -/obj/item/clothing/head/hardhat, -/obj/item/clothing/head/hardhat, -/obj/item/clothing/head/hardhat, -/obj/item/clothing/head/hardhat, -/obj/item/clothing/head/hardhat, -/obj/machinery/light{ - icon_state = "tube1"; - dir = 4 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, -/area/shuttle/escape) "dcd" = ( /obj/structure/table, /obj/item/folder/white, @@ -92812,13 +85776,6 @@ /area/toxins/server{ name = "\improper Research Division Server Room" }) -"dce" = ( -/obj/machinery/computer/emergency_shuttle, -/obj/machinery/light{ - dir = 8 - }, -/turf/simulated/shuttle/floor, -/area/shuttle/escape) "dcf" = ( /obj/machinery/door/window/northleft{ dir = 4; @@ -92936,34 +85893,6 @@ /area/toxins/xenobiology{ name = "\improper Secure Lab" }) -"dcm" = ( -/obj/structure/extinguisher_cabinet, -/turf/simulated/shuttle/wall{ - icon_state = "swall0"; - dir = 2 - }, -/area/shuttle/escape) -"dcn" = ( -/obj/structure/closet/emcloset, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, -/area/shuttle/escape) -"dco" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall2"; - dir = 2 - }, -/area/shuttle/escape) -"dcp" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/structure/chair/comfy/shuttle, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, -/area/shuttle/escape) "dcq" = ( /obj/machinery/disposal, /obj/structure/sign/deathsposal{ @@ -92979,11 +85908,6 @@ /area/toxins/xenobiology{ name = "\improper Secure Lab" }) -"dcr" = ( -/obj/structure/table, -/obj/item/storage/toolbox/emergency, -/turf/simulated/shuttle/floor, -/area/shuttle/escape) "dcs" = ( /obj/structure/closet, /turf/simulated/floor/plating, @@ -93002,8 +85926,8 @@ "dcu" = ( /obj/machinery/door/airlock/command{ icon = 'icons/obj/doors/airlocks/centcom/centcom.dmi'; - overlays_file = 'icons/obj/doors/airlocks/centcom/overlays.dmi'; name = "Test Chamber Maintenance"; + overlays_file = 'icons/obj/doors/airlocks/centcom/overlays.dmi'; req_access_txt = "47" }, /obj/structure/disposalpipe/segment{ @@ -93141,8 +86065,8 @@ "dcC" = ( /obj/machinery/door/airlock/command{ icon = 'icons/obj/doors/airlocks/centcom/centcom.dmi'; - overlays_file = 'icons/obj/doors/airlocks/centcom/overlays.dmi'; name = "Test Chamber Maintenance"; + overlays_file = 'icons/obj/doors/airlocks/centcom/overlays.dmi'; req_access_txt = "47" }, /turf/simulated/floor/plating, @@ -93160,36 +86084,13 @@ /area/toxins/xenobiology{ name = "\improper Secure Lab" }) -"dcF" = ( -/obj/machinery/door/airlock/command/glass{ - name = "Cockpit"; - req_access_txt = "19" - }, -/turf/simulated/shuttle/floor, -/area/shuttle/escape) -"dcG" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall15"; - icon_state = "swall15"; - dir = 2 - }, -/area/shuttle/escape) "dcH" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/toxins/xenobiology{ name = "\improper Secure Lab" }) -"dcJ" = ( -/obj/machinery/light{ - dir = 8 - }, -/turf/simulated/shuttle/floor, -/area/shuttle/escape) "dcK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/visible{ dir = 6; level = 2 @@ -93197,15 +86098,6 @@ /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel, /area/medical/cryo) -"dcM" = ( -/obj/structure/table, -/obj/machinery/recharger{ - active_power_usage = 0; - idle_power_usage = 0; - use_power = 0 - }, -/turf/simulated/shuttle/floor, -/area/shuttle/escape) "dcN" = ( /obj/structure/cable{ d1 = 1; @@ -93232,76 +86124,6 @@ }, /turf/space, /area/space) -"dcP" = ( -/obj/machinery/computer/security, -/turf/simulated/shuttle/floor, -/area/shuttle/escape) -"dcQ" = ( -/obj/item/radio/intercom{ - broadcasting = 0; - listening = 1; - name = "Station Intercom (General)"; - pixel_y = -28 - }, -/obj/machinery/light, -/obj/structure/chair/comfy/shuttle{ - dir = 1 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, -/area/shuttle/escape) -"dcR" = ( -/obj/structure/table, -/obj/item/healthanalyzer, -/obj/item/healthanalyzer{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/stack/medical/ointment, -/obj/item/stack/medical/bruise_pack, -/obj/machinery/light{ - icon_state = "tube1"; - dir = 4 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, -/area/shuttle/escape) -"dcS" = ( -/obj/structure/extinguisher_cabinet, -/turf/simulated/shuttle/wall{ - tag = "icon-swall12"; - icon_state = "swall12"; - dir = 2 - }, -/area/shuttle/escape) -"dcT" = ( -/obj/machinery/computer/crew, -/turf/simulated/shuttle/floor, -/area/shuttle/escape) -"dcU" = ( -/obj/machinery/door/airlock/security/glass{ - name = "Brig"; - req_access_txt = "2" - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/escape) -"dcV" = ( -/obj/structure/sign/redcross, -/turf/simulated/shuttle/wall{ - dir = 1; - icon_state = "swallc2" - }, -/area/shuttle/escape) -"dcW" = ( -/obj/machinery/door/airlock/shuttle{ - name = "Emergency Shuttle Cargo Bay Airlock" - }, -/turf/simulated/shuttle/floor, -/area/shuttle/escape) "dcX" = ( /obj/structure/sign/securearea{ desc = "A warning sign which reads 'HIGH VOLTAGE'"; @@ -93312,65 +86134,6 @@ /area/toxins/xenobiology{ name = "\improper Secure Lab" }) -"dda" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 1 - }, -/turf/simulated/shuttle/floor, -/area/shuttle/escape) -"ddb" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 4 - }, -/turf/simulated/shuttle/plating{ - icon_state = "floorgrime" - }, -/area/shuttle/escape) -"ddc" = ( -/obj/structure/chair/comfy/shuttle, -/turf/simulated/shuttle/floor, -/area/shuttle/escape) -"ddd" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 8 - }, -/turf/simulated/shuttle/floor, -/area/shuttle/escape) -"dde" = ( -/obj/machinery/door/airlock/command{ - name = "Emergency Recovery Airlock"; - req_access = null; - req_access_txt = "19" - }, -/turf/simulated/shuttle/floor, -/area/shuttle/escape) -"ddf" = ( -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/escape) -"ddg" = ( -/obj/machinery/door/airlock/external{ - name = "Emergency Recovery Airlock" - }, -/turf/simulated/shuttle/plating{ - icon_state = "floorgrime" - }, -/area/shuttle/escape) -"ddi" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 4 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/escape) -"ddj" = ( -/obj/structure/chair/comfy/shuttle, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/escape) "ddk" = ( /obj/structure/cable, /obj/machinery/power/solar{ @@ -93381,40 +86144,6 @@ icon_state = "solarpanel" }, /area/solar/starboard) -"ddl" = ( -/obj/machinery/shower, -/turf/simulated/shuttle/floor, -/area/shuttle/escape) -"ddm" = ( -/obj/machinery/computer/atmos_alert, -/turf/simulated/shuttle/floor, -/area/shuttle/escape) -"ddn" = ( -/obj/structure/table, -/obj/item/defibrillator, -/turf/simulated/shuttle/floor, -/area/shuttle/escape) -"ddo" = ( -/obj/machinery/sleeper, -/obj/machinery/light{ - icon_state = "tube1"; - dir = 4 - }, -/turf/simulated/shuttle/floor, -/area/shuttle/escape) -"ddp" = ( -/obj/effect/decal/warning_stripes/yellow, -/turf/simulated/shuttle/plating{ - icon_state = "floorgrime" - }, -/area/shuttle/escape) -"ddq" = ( -/obj/machinery/recharge_station, -/obj/effect/decal/warning_stripes/yellow, -/turf/simulated/shuttle/plating{ - icon_state = "floorgrime" - }, -/area/shuttle/escape) "ddv" = ( /obj/docking_port/stationary{ dir = 2; @@ -93434,69 +86163,14 @@ /obj/structure/lattice/catwalk, /turf/space, /area/solar/starboard) -"ddx" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall13"; - icon_state = "swall13"; - dir = 2 - }, -/area/shuttle/escape) -"ddy" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - tag = "icon-swall_f9"; - icon_state = "swall_f9"; - dir = 2 - }, -/area/shuttle/escape) "ddD" = ( /obj/structure/cable{ - icon_state = "0-2"; - d2 = 2 + d2 = 2; + icon_state = "0-2" }, /obj/structure/lattice/catwalk, /turf/space, /area/solar/starboard) -"ddE" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall12"; - dir = 2 - }, -/area/shuttle/escape) -"ddF" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall11"; - dir = 2 - }, -/area/shuttle/escape) -"ddG" = ( -/obj/structure/reagent_dispensers/peppertank{ - pixel_x = 31 - }, -/obj/structure/chair/comfy/shuttle{ - dir = 8 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/escape) -"ddH" = ( -/obj/effect/decal/warning_stripes/east, -/turf/simulated/shuttle/plating{ - icon_state = "floorgrime" - }, -/area/shuttle/escape) -"ddI" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/structure/chair/comfy/shuttle{ - dir = 4 - }, -/turf/simulated/shuttle/plating{ - icon_state = "floorgrime" - }, -/area/shuttle/escape) "ddJ" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -93564,8 +86238,8 @@ /area/space) "ddR" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 4 + dir = 4; + icon_state = "tube1" }, /obj/structure/cable/yellow{ d1 = 2; @@ -93603,12 +86277,6 @@ /area/toxins/xenobiology{ name = "\improper Secure Lab" }) -"ddT" = ( -/obj/machinery/suit_storage_unit/standard_unit, -/turf/simulated/shuttle/plating{ - icon_state = "floorgrime" - }, -/area/shuttle/escape) "ddU" = ( /obj/machinery/atmospherics/pipe/simple/visible, /obj/structure/window/reinforced{ @@ -93637,17 +86305,6 @@ /area/toxins/xenobiology{ name = "\improper Secure Lab" }) -"ddV" = ( -/obj/item/radio/intercom{ - dir = 4; - name = "Station Intercom (General)"; - pixel_y = 27 - }, -/obj/structure/chair/comfy/shuttle, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, -/area/shuttle/escape) "ddW" = ( /obj/structure/window/reinforced, /obj/structure/table/reinforced, @@ -93675,70 +86332,39 @@ /area/toxins/xenobiology{ name = "\improper Secure Lab" }) -"ddY" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/structure/chair/comfy/shuttle{ +"ddZ" = ( +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/simple/visible/yellow, +/obj/effect/decal/warning_stripes/east, +/turf/simulated/floor/engine, +/area/engine/engineering) +"dea" = ( +/obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 4 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/area/shuttle/escape) -"ddZ" = ( -/obj/machinery/power/tesla_coil{ - anchored = 1 - }, -/obj/structure/cable{ - icon_state = "0-2"; - d2 = 2 - }, -/turf/simulated/floor/plating/airless, -/area/space/nearstation) -"dea" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/turf/simulated/floor/plating/airless, -/area/space/nearstation) -"deb" = ( -/obj/machinery/vending/wallmed{ - name = "Emergency NanoMed"; - req_access_txt = "0"; - use_power = 0 - }, -/turf/simulated/shuttle/wall{ - icon_state = "swall0"; - dir = 2 - }, -/area/shuttle/escape) -"dec" = ( /obj/structure/cable{ d1 = 1; d2 = 8; icon_state = "1-8" }, -/turf/simulated/floor/plating/airless, -/area/space/nearstation) +/obj/effect/decal/warning_stripes/north, +/turf/simulated/floor/engine, +/area/engine/engineering) "ded" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/dye_generator, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "barber" }, /area/civilian/barber) "def" = ( -/obj/structure/sign/redcross{ - desc = "The Star of Life, a symbol of Medical Aid."; - icon_state = "lifestar"; - name = "Medbay" - }, +/obj/structure/sign/lifestar, /turf/simulated/wall, /area/medical/medbay3{ name = "Medbay Aft" @@ -93760,6 +86386,7 @@ dir = 8; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/maintenance/aft{ name = "Aft Maintenance" @@ -93774,6 +86401,12 @@ name = "Aft Maintenance" }) "dei" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, /turf/simulated/floor/wood, /area/medical/psych) "dej" = ( @@ -93805,16 +86438,16 @@ /obj/item/candle, /obj/structure/table/wood, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/chapel/main) "dem" = ( /obj/structure/table/wood, /obj/effect/decal/cleanable/cobweb, /turf/simulated/floor/plasteel{ - tag = "icon-vault"; - icon_state = "vault" + icon_state = "vault"; + tag = "icon-vault" }, /area/chapel/main) "den" = ( @@ -93842,9 +86475,6 @@ pixel_x = -3; pixel_y = 5 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit{ name = "\improper Departure Lounge" @@ -93896,17 +86526,8 @@ }) "deu" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/universal, /turf/simulated/wall/r_wall, /area/medical/virology) -"dev" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 8 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/escape) "dew" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -93916,19 +86537,6 @@ }, /turf/simulated/floor/plating/airless, /area/space/nearstation) -"dex" = ( -/obj/structure/rack{ - dir = 1 - }, -/obj/item/tank/oxygen, -/obj/item/clothing/suit/fire/firefighter, -/obj/item/clothing/mask/gas, -/obj/item/clothing/head/hardhat/red, -/obj/effect/decal/warning_stripes/east, -/turf/simulated/shuttle/plating{ - icon_state = "floorgrime" - }, -/area/shuttle/escape) "dey" = ( /obj/machinery/atmospherics/unary/outlet_injector/on{ dir = 1 @@ -94050,6 +86658,7 @@ icon_state = "1-2" }, /obj/structure/table/wood, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -94060,13 +86669,6 @@ /area/maintenance/fpmaint2{ name = "Port Maintenance" }) -"deK" = ( -/obj/machinery/optable, -/obj/machinery/light{ - dir = 8 - }, -/turf/simulated/shuttle/floor, -/area/shuttle/escape) "deL" = ( /obj/machinery/light_switch{ pixel_x = -27 @@ -94084,22 +86686,18 @@ "deN" = ( /turf/simulated/floor/carpet, /area/chapel/main) -"deO" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 - }, -/turf/simulated/floor/carpet, -/area/chapel/main) "deP" = ( -/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/manifold/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/carpet, /area/chapel/main) "deQ" = ( @@ -94128,28 +86726,6 @@ icon_state = "redfull" }, /area/security/main) -"deS" = ( -/obj/structure/closet/crate{ - name = "emergency supplies crate" - }, -/obj/item/storage/toolbox/emergency, -/obj/item/storage/toolbox/emergency, -/obj/item/flashlight/flare{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/flashlight/flare{ - pixel_x = -6; - pixel_y = -2 - }, -/obj/item/crowbar, -/obj/item/wrench, -/obj/item/radio, -/obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/shuttle/plating{ - icon_state = "floorgrime" - }, -/area/shuttle/escape) "deT" = ( /obj/structure/table/reinforced, /obj/machinery/door_control{ @@ -94186,26 +86762,26 @@ icon_state = "chapel" }, /area/chapel/main) -"deV" = ( -/obj/item/radio/intercom{ - broadcasting = 0; - listening = 1; - name = "Station Intercom (General)"; - pixel_y = -28 - }, -/obj/machinery/portable_atmospherics/canister/oxygen, -/obj/machinery/light, -/obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/shuttle/plating{ - icon_state = "floorgrime" - }, -/area/shuttle/escape) "deW" = ( -/obj/machinery/light_switch, -/turf/simulated/wall/r_wall, +/obj/structure/rack{ + dir = 1 + }, +/obj/item/radio{ + pixel_y = 6 + }, +/obj/item/storage/toolbox/mechanical{ + pixel_x = -2; + pixel_y = -1 + }, +/obj/item/storage/toolbox/electrical, +/obj/item/storage/belt/utility, +/obj/item/extinguisher, +/turf/simulated/floor/plasteel{ + dir = 5; + icon_state = "vault" + }, /area/engine/mechanic_workshop) "deX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/chair/stool, /obj/structure/cable/yellow{ d1 = 4; @@ -94238,92 +86814,27 @@ "dfa" = ( /obj/machinery/computer/rdconsole/mechanics, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 5 - }, -/area/engine/mechanic_workshop) -"dfb" = ( -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "open"; - id_tag = "mechpod"; - name = "Mechanic's Workshop Inner Door"; - opacity = 0 - }, -/turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 5 - }, -/area/engine/mechanic_workshop) -"dfc" = ( -/obj/machinery/mecha_part_fabricator/spacepod, -/obj/machinery/light{ - dir = 1; - in_use = 1 - }, -/turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 5 - }, -/area/engine/mechanic_workshop) -"dfd" = ( -/obj/machinery/camera, -/turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 5 - }, -/area/engine/mechanic_workshop) -"dfe" = ( -/obj/structure/table, -/obj/item/pod_parts/core, -/obj/item/circuitboard/mecha/pod, -/obj/item/clothing/glasses/welding{ - pixel_y = 12 - }, -/turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 5 - }, -/area/engine/mechanic_workshop) -"dff" = ( -/obj/structure/rack{ - dir = 1 - }, -/obj/item/extinguisher, -/obj/item/storage/belt/utility, -/obj/item/storage/toolbox/electrical, -/obj/item/storage/toolbox/mechanical{ - pixel_x = -2; - pixel_y = -1 - }, -/obj/item/radio{ - pixel_y = 6 - }, -/turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 5 + dir = 5; + icon_state = "vault" }, /area/engine/mechanic_workshop) "dfg" = ( /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 5 + dir = 5; + icon_state = "vault" }, /area/engine/mechanic_workshop) "dfh" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /obj/structure/chair/office/light{ dir = 1; pixel_y = 3 }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 5 + dir = 5; + icon_state = "vault" }, /area/engine/mechanic_workshop) "dfi" = ( @@ -94352,23 +86863,11 @@ "dfl" = ( /obj/structure/spacepoddoor, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 5 - }, -/area/engine/mechanic_workshop) -"dfm" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 7; - on = 1 - }, -/obj/machinery/vending/cola, -/turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 5 + dir = 5; + icon_state = "vault" }, /area/engine/mechanic_workshop) "dfn" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -94381,8 +86880,8 @@ name = "Security Officer" }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 8 + dir = 8; + icon_state = "red" }, /area/security/main) "dfo" = ( @@ -94391,23 +86890,12 @@ d2 = 8; icon_state = "1-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/chapel/main) -"dfp" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - tag = "icon-swall_f5"; - icon_state = "swall_f5"; - dir = 2 - }, -/turf/simulated/shuttle/wall{ - tag = "icon-diagonalWall3"; - icon_state = "diagonalWall3"; - dir = 2 - }, -/area/shuttle/escape) "dfq" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4; @@ -94416,20 +86904,15 @@ /obj/effect/landmark/start{ name = "Mechanic" }, +/obj/machinery/atmospherics/unary/vent_pump{ + dir = 7; + on = 1 + }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 5 + dir = 5; + icon_state = "vault" }, /area/engine/mechanic_workshop) -"dfr" = ( -/obj/machinery/hologram/holopad, -/obj/machinery/status_display{ - dir = 4; - layer = 4; - pixel_x = 32 - }, -/turf/simulated/shuttle/floor, -/area/shuttle/escape) "dfs" = ( /obj/machinery/door/airlock/centcom{ name = "Chapel Office"; @@ -94437,6 +86920,7 @@ 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" }, @@ -94447,8 +86931,8 @@ initialize_directions = 11 }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 5 + dir = 5; + icon_state = "vault" }, /area/engine/mechanic_workshop) "dfu" = ( @@ -94478,9 +86962,6 @@ /turf/simulated/floor/plating, /area/chapel/main) "dfw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "chapel" @@ -94492,8 +86973,8 @@ level = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 5 + dir = 5; + icon_state = "vault" }, /area/engine/mechanic_workshop) "dfy" = ( @@ -94504,9 +86985,6 @@ /turf/simulated/floor/engine, /area/engine/mechanic_workshop) "dfz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 2; d2 = 8; @@ -94517,8 +86995,11 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 }, /turf/simulated/floor/plasteel, /area/engine/break_room) @@ -94532,58 +87013,35 @@ 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" + }, +/obj/machinery/door/firedoor, /turf/simulated/floor/plasteel, -/area/engine/break_room) +/area/engine/mechanic_workshop) "dfB" = ( /obj/structure/cable/yellow{ d1 = 1; d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 - }, /obj/machinery/hologram/holopad, -/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/manifold/hidden/scrubbers{ + dir = 2; + initialize_directions = 11 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plasteel, /area/engine/break_room) -"dfC" = ( -/obj/structure/closet/crate/medical{ - name = "medical crate" - }, -/obj/item/storage/firstaid/regular, -/obj/item/storage/firstaid/o2{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/storage/firstaid/toxin{ - pixel_x = -4; - pixel_y = 3 - }, -/obj/item/healthanalyzer{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/lazarus_injector, -/obj/effect/decal/warning_stripes/yellow/hollow, -/mob/living/simple_animal/bot/medbot{ - name = "\improper emergency medibot"; - pixel_x = -3; - pixel_y = 2 - }, -/turf/simulated/shuttle/plating{ - icon_state = "floorgrime" - }, -/area/shuttle/escape) "dfD" = ( /obj/structure/sink{ dir = 4; @@ -94602,21 +87060,13 @@ /area/toxins/xenobiology{ name = "\improper Secure Lab" }) -"dfE" = ( -/obj/structure/table, -/obj/item/clipboard, -/obj/item/folder/yellow, -/obj/item/pen{ - pixel_x = -3; - pixel_y = 5 - }, -/obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/shuttle/plating{ - icon_state = "floorgrime" - }, -/area/shuttle/escape) "dfG" = ( -/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/plasteel{ dir = 4; icon_state = "chapel" @@ -94637,7 +87087,6 @@ name = "\improper Secure Lab" }) "dfI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4; level = 1 @@ -94647,9 +87096,13 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/vending/cola, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 5 + dir = 5; + icon_state = "vault" }, /area/engine/mechanic_workshop) "dfJ" = ( @@ -94681,53 +87134,18 @@ pixel_y = -22 }, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 5 + dir = 5; + icon_state = "vault" }, /area/engine/mechanic_workshop) -"dfM" = ( -/obj/structure/reagent_dispensers/watertank, -/turf/simulated/shuttle/plating{ - icon_state = "floorgrime" - }, -/area/shuttle/escape) -"dfN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/wall, -/area/hallway/secondary/entry{ - name = "Arrivals" - }) "dfO" = ( -/obj/structure/sign/redcross{ - desc = "The Star of Life, a symbol of Medical Aid."; - icon_state = "lifestar"; - name = "Medbay" - }, +/obj/structure/sign/lifestar, /turf/simulated/wall, /area/medical/psych) -"dfP" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "arrival" - }, -/area/hallway/secondary/entry{ - name = "Arrivals" - }) "dfQ" = ( /obj/structure/sink{ pixel_y = 28 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -94738,26 +87156,15 @@ pixel_y = 32 }, /obj/machinery/shower{ - tag = "icon-shower (EAST)"; + dir = 4; icon_state = "shower"; - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 + tag = "icon-shower (EAST)" }, /obj/effect/decal/warning_stripes/northwest, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/virology) -"dfS" = ( -/obj/structure/table, -/obj/item/folder/blue, -/obj/structure/extinguisher_cabinet{ - pixel_y = -30 - }, -/turf/simulated/shuttle/floor, -/area/shuttle/escape) "dfT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6; @@ -94768,6 +87175,9 @@ d2 = 4; icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitegreen"; @@ -94775,9 +87185,8 @@ }, /area/medical/virology) "dfU" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /obj/effect/decal/warning_stripes/west, /obj/structure/cable/yellow{ @@ -94785,13 +87194,16 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/virology) "dfV" = ( /obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; + dir = 8; on = 1 }, /obj/structure/cable/yellow{ @@ -94832,6 +87244,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitegreen"; @@ -94875,40 +87288,6 @@ /area/hallway/secondary/entry{ name = "Arrivals" }) -"dga" = ( -/obj/structure/table, -/obj/item/reagent_containers/glass/bottle/epinephrine{ - pixel_x = 6 - }, -/obj/item/reagent_containers/glass/bottle/charcoal{ - pixel_x = -3 - }, -/obj/item/reagent_containers/glass/bottle/epinephrine{ - pixel_x = -3; - pixel_y = 8 - }, -/obj/item/reagent_containers/glass/bottle/charcoal{ - pixel_x = 6; - pixel_y = 8 - }, -/obj/item/reagent_containers/syringe/epinephrine{ - pixel_x = 3; - pixel_y = -2 - }, -/obj/item/reagent_containers/syringe/epinephrine{ - pixel_x = 4; - pixel_y = 1 - }, -/obj/item/reagent_containers/syringe/epinephrine{ - pixel_x = -2; - pixel_y = 5 - }, -/obj/item/reagent_containers/syringe/epinephrine{ - pixel_x = 2; - pixel_y = 8 - }, -/turf/simulated/shuttle/floor, -/area/shuttle/escape) "dgb" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 2 @@ -94933,80 +87312,7 @@ /area/hallway/secondary/entry{ name = "Arrivals" }) -"dgc" = ( -/obj/structure/rack, -/obj/item/storage/toolbox/electrical{ - pixel_x = -3; - pixel_y = 1 - }, -/obj/item/storage/toolbox/mechanical{ - pixel_y = -1 - }, -/obj/item/storage/toolbox/emergency{ - pixel_x = 3; - pixel_y = -5 - }, -/obj/effect/decal/warning_stripes/east, -/turf/simulated/shuttle/plating{ - icon_state = "floorgrime" - }, -/area/shuttle/escape) -"dgd" = ( -/obj/structure/table, -/obj/item/scalpel{ - pixel_y = 12 - }, -/obj/item/circular_saw, -/obj/item/retractor{ - pixel_x = 4 - }, -/obj/item/hemostat{ - pixel_x = -4 - }, -/obj/item/clothing/gloves/color/latex, -/obj/item/clothing/mask/surgical, -/obj/item/radio/intercom{ - dir = 4; - name = "Station Intercom (General)"; - pixel_y = -27 - }, -/turf/simulated/shuttle/floor, -/area/shuttle/escape) -"dge" = ( -/obj/structure/table, -/obj/item/folder/red{ - pixel_x = 3 - }, -/obj/item/folder/white{ - pixel_x = -4; - pixel_y = 2 - }, -/obj/item/book/manual/security_space_law{ - pixel_x = -4; - pixel_y = 4 - }, -/obj/item/radio/intercom{ - broadcasting = 0; - listening = 1; - name = "Station Intercom (General)"; - pixel_y = -28 - }, -/turf/simulated/shuttle/floor4, -/area/shuttle/escape) -"dgf" = ( -/obj/structure/extinguisher_cabinet{ - pixel_y = -30 - }, -/obj/machinery/space_heater, -/obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/shuttle/plating{ - icon_state = "floorgrime" - }, -/area/shuttle/escape) "dgg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/camera{ c_tag = "Chapel - Port"; dir = 4; @@ -95047,17 +87353,18 @@ /obj/structure/rack, /obj/item/clothing/mask/gas, /obj/item/clothing/mask/gas, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry{ name = "Arrivals" }) "dgl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /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" @@ -95065,7 +87372,7 @@ "dgm" = ( /obj/effect/decal/warning_stripes/yellow/hollow, /obj/structure/closet/emcloset, -/obj/item/tank/emergency_oxygen, +/obj/item/tank/internals/emergency_oxygen, /obj/item/clothing/mask/breath, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry{ @@ -95086,14 +87393,6 @@ /area/hallway/secondary/entry{ name = "Arrivals" }) -"dgp" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/turf/simulated/floor/plasteel{ - icon_state = "chapel" - }, -/area/chapel/main) "dgq" = ( /obj/effect/decal/warning_stripes/yellow/hollow, /obj/machinery/portable_atmospherics/canister/oxygen, @@ -95108,11 +87407,8 @@ }) "dgs" = ( /obj/effect/decal/warning_stripes/south, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry{ @@ -95134,7 +87430,7 @@ /obj/effect/decal/warning_stripes/south, /obj/structure/reagent_dispensers/watertank, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 + dir = 8 }, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry{ @@ -95257,8 +87553,8 @@ /area/maintenance/starboard) "dgJ" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/machinery/alarm{ dir = 4; @@ -95278,74 +87574,12 @@ dir = 4; icon_state = "tube1" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - level = 1 - }, /turf/simulated/floor/plasteel, /area/engine/break_room) -"dgM" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 - }, -/turf/simulated/floor/plasteel, -/area/engine/break_room) -"dgN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - level = 1 - }, -/turf/simulated/wall/r_wall, -/area/engine/break_room) "dgO" = ( -/obj/structure/sign/pods, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - level = 1 - }, +/obj/machinery/light_switch, /turf/simulated/wall, -/area/engine/break_room) -"dgP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/turf/simulated/wall/r_wall, -/area/engine/break_room) -"dgQ" = ( -/obj/structure/table, -/obj/item/restraints/handcuffs, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/escape) -"dgR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/wall, -/area/hallway/secondary/entry{ - name = "Arrivals" - }) -"dgS" = ( -/turf/simulated/wall/r_wall/coated, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) -"dgT" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 4 - }, -/turf/simulated/wall/r_wall/coated, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) -"dgU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/wall/r_wall/coated, -/area/toxins/server{ - name = "\improper Research Division Server Room" - }) +/area/engine/mechanic_workshop) "dgW" = ( /obj/machinery/computer/camera_advanced/xenobio, /turf/simulated/floor/plasteel{ @@ -95355,46 +87589,6 @@ /area/toxins/xenobiology{ name = "\improper Secure Lab" }) -"dgY" = ( -/obj/structure/table, -/obj/machinery/recharger{ - active_power_usage = 0; - idle_power_usage = 0; - use_power = 0 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/escape) -"dgZ" = ( -/obj/structure/table, -/obj/item/storage/box/handcuffs, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/escape) -"dha" = ( -/obj/structure/sink, -/turf/simulated/shuttle/floor, -/area/shuttle/escape) -"dhb" = ( -/obj/structure/table, -/obj/item/storage/firstaid/toxin, -/obj/item/storage/firstaid/o2{ - pixel_x = 3; - pixel_y = 3 - }, -/turf/simulated/shuttle/floor, -/area/shuttle/escape) -"dhc" = ( -/obj/structure/table, -/obj/item/storage/firstaid/fire, -/obj/item/storage/firstaid/regular{ - pixel_x = 2; - pixel_y = 3 - }, -/turf/simulated/shuttle/floor, -/area/shuttle/escape) "dhd" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ req_access_txt = 1 @@ -95404,14 +87598,6 @@ /area/maintenance/aft{ name = "Aft Maintenance" }) -"dhe" = ( -/obj/structure/sign/redcross, -/turf/simulated/shuttle/wall{ - dir = 8; - icon_state = "swall2"; - tag = "icon-swall2" - }, -/area/shuttle/escape) "dhf" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -95422,21 +87608,10 @@ /area/maintenance/aft{ name = "Aft Maintenance" }) -"dhh" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - tag = "icon-swall_f5"; - icon_state = "swall_f5"; - dir = 2 - }, -/area/shuttle/escape) "dhi" = ( /obj/structure/chair/comfy/black{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "chapel" @@ -95459,6 +87634,9 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitegreen"; @@ -95485,6 +87663,9 @@ d2 = 8; icon_state = "1-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitegreen"; @@ -95494,11 +87675,6 @@ "dhn" = ( /turf/space, /area/chapel/main) -"dhp" = ( -/obj/structure/grille, -/obj/structure/window/full/shuttle, -/turf/simulated/shuttle/plating, -/area/shuttle/escape) "dhq" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -95561,20 +87737,6 @@ /area/maintenance/aft{ name = "Aft Maintenance" }) -"dhv" = ( -/obj/structure/table, -/obj/item/radio/intercom{ - broadcasting = 0; - listening = 1; - name = "Station Intercom (General)"; - pixel_y = -28 - }, -/obj/item/paper_bin{ - pixel_x = -4; - pixel_y = 10 - }, -/turf/simulated/shuttle/floor, -/area/shuttle/escape) "dhw" = ( /obj/structure/closet/crate, /obj/item/clothing/gloves/color/fyellow, @@ -95713,12 +87875,150 @@ /obj/machinery/portable_atmospherics/canister/air, /turf/simulated/floor/plating, /area/security/permabrig) +"dmU" = ( +/obj/machinery/atmospherics/unary/vent_pump{ + dir = 8; + on = 1 + }, +/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 + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "yellowcorner" + }, +/area/hallway/primary/starboard) +"dom" = ( +/obj/effect/decal/warning_stripes/north, +/turf/simulated/floor/plasteel, +/area/engine/equipmentstorage) +"dqh" = ( +/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/engine/break_room) +"dqm" = ( +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 9 + }, +/obj/machinery/camera{ + c_tag = "Supermatter Chamber"; + dir = 4; + network = list("engine") + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/engine, +/area/engine/supermatter) +"dvV" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plasteel, +/area/atmos) +"dwC" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/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 + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "neutral" + }, +/area/hallway/primary/port) +"dAs" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/machinery/door/airlock/external{ + frequency = 1379; + icon_state = "door_locked"; + id_tag = "sol_inner"; + locked = 1; + name = "Arrivals External Access"; + req_access = null; + req_access_txt = "0" + }, +/turf/simulated/floor/plating, +/area/hallway/secondary/entry) "dAH" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 5 }, /turf/simulated/floor/plating, /area/maintenance/starboard) +"dHm" = ( +/obj/machinery/atmospherics/unary/vent_pump, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "green" + }, +/area/hydroponics) +"dHr" = ( +/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 = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/starboard) +"dJz" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10; + initialize_directions = 10; + level = 1 + }, +/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" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/engine, +/area/engine/engineering) "dMV" = ( /obj/machinery/atmospherics/pipe/manifold/visible/cyan{ dir = 8; @@ -95728,17 +88028,258 @@ icon_state = "dark" }, /area/atmos) +"dOL" = ( +/obj/machinery/atmospherics/unary/vent_pump{ + dir = 1; + on = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "redcorner" + }, +/area/security/permabrig) +"dPn" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6; + level = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/bridge) "dRN" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 4 + dir = 4; + icon_state = "tube1" }, /turf/simulated/floor/plasteel/dark, /area/tcommsat/server) +"dRX" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/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/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" = ( +/obj/structure/chair/stool{ + pixel_y = 8 + }, +/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 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralcorner" + }, +/area/hallway/primary/central) +"dXb" = ( +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/manifold/visible/cyan{ + level = 2 + }, +/obj/machinery/light{ + dir = 2 + }, +/obj/effect/decal/warning_stripes/south, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/floor/engine, +/area/engine/engineering) +"dZe" = ( +/obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/medical/cryo) +"ebM" = ( +/obj/machinery/atmospherics/pipe/simple/visible/green{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/decal/warning_stripes/north, +/turf/simulated/floor/engine, +/area/engine/engineering) +"ebV" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/engine, +/area/engine/supermatter) +"edg" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/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 = "green" + }, +/area/hydroponics) +"edK" = ( +/obj/machinery/atmospherics/binary/pump{ + dir = 1; + name = "Gas to Mix" + }, +/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 = 6 + }, +/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, +/turf/simulated/floor/plasteel{ + dir = 2; + 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 + }, +/turf/simulated/floor/plasteel, +/area/storage/primary) "elK" = ( /obj/effect/spawner/airlock/w_to_e, /turf/simulated/wall/r_wall, /area/security/permabrig) +"erQ" = ( +/obj/structure/window/reinforced{ + 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 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/engine/break_room) +"evR" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 4 + }, +/turf/simulated/wall/r_wall, +/area/engine/engineering) +"eEV" = ( +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 4; + frequency = 1379; + 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"; + tag_interior_door = "sol_inner" + }, +/turf/simulated/floor/plating, +/area/hallway/secondary/entry) +"eIn" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/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{ + dir = 8 + }, +/turf/simulated/floor/plasteel, +/area/quartermaster/storage) +"eKV" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/turf/simulated/floor/plasteel{ + icon_state = "whitebluefull" + }, +/area/medical/reception) "eSt" = ( /obj/structure/window/reinforced{ dir = 1 @@ -95746,14 +88287,91 @@ /obj/effect/spawner/airlock/e_to_w/long/square, /turf/space, /area/space/nearstation) +"eSB" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4; + level = 1 + }, +/turf/simulated/floor/plasteel, +/area/crew_quarters/courtroom) +"eTd" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/security/brig) +"faY" = ( +/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) +"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 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/atmos) +"fgw" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/plasteel, +/area/storage/primary) +"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" + }) +"flr" = ( +/obj/structure/window/plasmareinforced{ + dir = 1 + }, +/obj/machinery/power/rad_collector{ + anchored = 1 + }, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 9 + }, +/obj/structure/cable{ + d2 = 2; + icon_state = "0-2" + }, +/turf/simulated/floor/engine, +/area/engine/supermatter) "fmg" = ( /obj/effect/spawner/window/reinforced, /obj/effect/spawner/airlock, /turf/simulated/floor/plating, /area/maintenance/portsolar) -"fnC" = ( -/turf/space, -/area/space/nearstation) +"fmP" = ( +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 10 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/engine/engineering) "frX" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -95766,12 +88384,130 @@ /area/maintenance/fpmaint2{ name = "Port Maintenance" }) -"fBB" = ( -/obj/structure/lattice, -/turf/space, -/area/space) -"fZV" = ( +"fsY" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/medical/reception) +"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, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/medical/virology) +"fwO" = ( +/obj/machinery/door/airlock/external{ + id_tag = "specops_home"; + locked = 1 + }, +/turf/simulated/floor/plating, +/area/hallway/secondary/entry) +"fyS" = ( +/obj/machinery/atmospherics/unary/vent_pump{ + dir = 4; + on = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/medical/virology) +"fDi" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/bluegrid, +/area/turret_protected/ai_upload) +"fFk" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "brown" + }, +/area/storage/primary) +"fFl" = ( +/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) +"fHC" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 5 + }, +/obj/effect/decal/warning_stripes/west, +/turf/simulated/floor/engine, +/area/engine/engineering) +"fNU" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/security/vacantoffice) +"fPa" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/chapel/main) +"fTe" = ( +/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 + }, +/turf/simulated/floor/plasteel, +/area/security/brig) +"fZa" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6; + level = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/turf/simulated/floor/plasteel{ + icon_state = "floorgrime" + }, +/area/security/permabrig) +"fZu" = ( +/obj/machinery/door/firedoor, +/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/hallway/primary/port) +"fZV" = ( /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -95780,18 +88516,315 @@ /obj/machinery/tcomms/core/station, /turf/simulated/floor/bluegrid, /area/tcommsat/server) +"gbT" = ( +/obj/machinery/door/airlock/external{ + id_tag = "admin_home"; + locked = 1 + }, +/turf/simulated/floor/plating, +/area/hallway/secondary/entry) +"gda" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/turf/simulated/floor/plasteel{ + dir = 2; + icon_state = "neutralcorner" + }, +/area/hallway/primary/starboard) +"gdk" = ( +/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 = "chapel" + }, +/area/chapel/main) +"gdM" = ( +/obj/effect/spawner/window/reinforced/plasma, +/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction, +/turf/simulated/floor/engine, +/area/engine/engineering) +"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 + }, +/obj/effect/decal/warning_stripes/northwest, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/toxins/xenobiology{ + name = "\improper Secure Lab" + }) +"gfB" = ( +/obj/structure/window/plasmareinforced, +/obj/machinery/power/rad_collector{ + anchored = 1 + }, +/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" + }, +/area/security/main) +"gpj" = ( +/obj/machinery/status_display, +/turf/simulated/wall/r_wall, +/area/engine/supermatter) +"gqj" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/cyan{ + dir = 8; + initialize_directions = 11; + level = 2 + }, +/obj/machinery/light{ + dir = 8 + }, +/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" + }, +/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) +"gyy" = ( +/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ + dir = 9 + }, +/obj/structure/lattice, +/obj/structure/lattice/catwalk, +/turf/space, +/area/space/nearstation) +"gyR" = ( +/obj/structure/sign/securearea{ + desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; + icon_state = "space"; + layer = 4; + name = "EXTERNAL AIRLOCK"; + pixel_x = 0; + pixel_y = -32 + }, +/obj/machinery/atmospherics/unary/portables_connector{ + dir = 1 + }, +/obj/machinery/portable_atmospherics/canister/air, +/obj/effect/decal/warning_stripes/south, +/turf/simulated/floor/plasteel, +/area/hallway/secondary/entry) +"gGG" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5; + level = 1 + }, +/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 + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "redcorner" + }, +/area/security/brig) +"gIN" = ( +/obj/structure/chair/wood/wings{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/carpet, +/area/crew_quarters/theatre) +"gOD" = ( +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/plasteel, +/area/hallway/primary/fore) +"gQu" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "neutralcorner" + }, +/area/crew_quarters/sleep) "gRw" = ( /obj/effect/spawner/window/reinforced, /obj/effect/spawner/airlock/s_to_n, /turf/simulated/floor/plating, /area/maintenance/auxsolarstarboard) +"gYM" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/engine/engineering) +"gZY" = ( +/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/engine/engineering) +"hdL" = ( +/obj/structure/cable/yellow{ + d2 = 8; + icon_state = "0-8" + }, +/turf/simulated/floor/plating, +/area/engine/engineering) +"hfb" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/engine/engineering) +"hgN" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/engine/engineering) +"hlZ" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/toxins/xenobiology{ + name = "\improper Secure Lab" + }) +"hnt" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/plasteel, +/area/crew_quarters/courtroom) +"hnC" = ( +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 5 + }, +/turf/simulated/floor/plasteel, +/area/atmos) +"hnL" = ( +/obj/structure/chair{ + dir = 8 + }, +/obj/effect/landmark/start{ + name = "Civilian" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plasteel, +/area/crew_quarters/fitness{ + name = "\improper Recreation Area" + }) +"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 + }, +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/turf/simulated/floor/engine, +/area/engine/engineering) +"huo" = ( +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 10 + }, +/turf/simulated/wall/r_wall, +/area/engine/supermatter) "hxv" = ( /obj/machinery/camera{ c_tag = "Telecoms - Server Room - Aft"; dir = 1; network = list("SS13","tcomm") }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/yellow, /obj/machinery/power/apc{ dir = 2; @@ -95800,10 +88833,278 @@ }, /turf/simulated/floor/plasteel/dark, /area/tcommsat/server) +"hAg" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/decal/warning_stripes/northwest, +/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 + }, +/turf/simulated/floor/plasteel, +/area/storage/primary) +"hEA" = ( +/obj/machinery/camera/autoname{ + dir = 4; + network = list("SS13") + }, +/obj/machinery/door_control{ + desc = "A remote control-switch for the engineering security doors."; + id = "Engineering"; + name = "Engineering Lockdown"; + pixel_x = -24; + pixel_y = -6; + req_access_txt = "1" + }, +/obj/machinery/door_control{ + id = "atmos"; + name = "Atmospherics Lockdown"; + pixel_x = -24; + pixel_y = 5; + req_access_txt = "1" + }, +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/machinery/atmospherics/unary/vent_pump{ + dir = 4; + on = 1 + }, +/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, +/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; + pixel_x = 24 + }, +/obj/machinery/computer/monitor, +/obj/structure/cable/yellow{ + d2 = 8; + icon_state = "0-8" + }, +/turf/simulated/floor/plasteel{ + dir = 6; + icon_state = "yellow" + }, +/area/engine/engineering) +"hIT" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/turf/simulated/floor/plasteel, +/area/security/armoury) +"hLH" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/turf/simulated/floor/bluegrid, +/area/turret_protected/ai) "hLL" = ( /obj/structure/lattice, /turf/simulated/wall, /area/space/nearstation) +"hNq" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/bluegrid, +/area/turret_protected/ai_upload) +"hWr" = ( +/obj/structure/sign/securearea{ + desc = "A warning sign which reads 'HIGH VOLTAGE'"; + icon_state = "shock"; + name = "HIGH VOLTAGE" + }, +/turf/simulated/wall/r_wall, +/area/engine/supermatter) +"hYZ" = ( +/obj/machinery/atmospherics/pipe/simple/visible/universal{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 2; + icon_state = "neutralcorner" + }, +/area/atmos) +"hZZ" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/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{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 4 + }, +/turf/simulated/floor/engine, +/area/engine/engineering) +"ibR" = ( +/obj/docking_port/stationary{ + dir = 8; + dwidth = 2; + height = 11; + id = "specops_home"; + name = "port bay 2"; + width = 5 + }, +/turf/space, +/area/space) +"ied" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/visible/purple{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel, +/area/atmos) +"ihM" = ( +/obj/machinery/atmospherics/unary/vent_pump{ + dir = 8; + on = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/medical/surgery1) +"iiB" = ( +/obj/docking_port/stationary{ + dir = 8; + dwidth = 3; + height = 5; + id = "sit_arrivals"; + name = "Cerebron Maintenance"; + width = 11 + }, +/turf/space, +/area/space) +"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) +"iof" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/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) +"iAT" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/cyan{ + dir = 8; + initialize_directions = 11; + level = 2 + }, +/obj/machinery/camera{ + c_tag = "Engineering Supermatter Starboard"; + dir = 4; + network = list("SS13","engine") + }, +/obj/effect/decal/warning_stripes/northwest, +/turf/simulated/floor/engine, +/area/engine/engineering) "iDw" = ( /obj/machinery/atmospherics/unary/portables_connector, /obj/machinery/portable_atmospherics/canister/air, @@ -95811,6 +89112,88 @@ /area/maintenance/aft{ name = "Aft Maintenance" }) +"iHk" = ( +/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{ + dir = 2; + initialize_directions = 11 + }, +/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{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/plasteel, +/area/engine/engineering) +"iMC" = ( +/obj/effect/decal/warning_stripes/west, +/obj/machinery/light{ + dir = 8; + icon_state = "tube1" + }, +/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; + icon_state = "yellow" + }, +/area/engine/break_room) +"iNI" = ( +/obj/machinery/atmospherics/pipe/manifold4w/visible, +/turf/simulated/floor/plasteel, +/area/atmos) +"iSH" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/decal/warning_stripes/south, +/obj/machinery/atmospherics/binary/pump{ + dir = 8; + name = "Atmos to Loop" + }, +/turf/simulated/floor/engine, +/area/engine/engineering) "iTR" = ( /obj/effect/decal/warning_stripes/south, /obj/machinery/atmospherics/pipe/simple/visible{ @@ -95821,16 +89204,299 @@ /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" + }) +"iWv" = ( +/obj/machinery/alarm{ + dir = 4; + pixel_x = -23 + }, +/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 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/chapel/main) +"iZY" = ( +/obj/structure/sign/pods, +/turf/simulated/wall, +/area/engine/mechanic_workshop) "jap" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/maintenance/fpmaint2{ name = "Port Maintenance" }) +"jbk" = ( +/obj/structure/reflector/double{ + anchored = 1; + dir = 8 + }, +/turf/simulated/floor/plasteel{ + 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{ + dir = 5 + }, +/turf/simulated/floor/plasteel{ + icon_state = "freezerfloor" + }, +/area/medical/virology) +"jhQ" = ( +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/toxins/xenobiology{ + name = "\improper Secure Lab" + }) +"jmm" = ( +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 2 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/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) +"jCT" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/decal/warning_stripes/north, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/plasteel, +/area/hallway/secondary/entry{ + name = "Arrivals" + }) +"jGE" = ( +/obj/effect/decal/warning_stripes/southeast, +/obj/effect/decal/warning_stripes/north, +/turf/simulated/floor/plasteel, +/area/hallway/secondary/entry) +"jLP" = ( +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/plasteel, +/area/atmos) +"jPv" = ( +/obj/effect/decal/warning_stripes/north, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/turf/simulated/floor/plasteel, +/area/engine/engineering) +"jUV" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/binary/valve{ + dir = 4; + name = "Output to Waste" + }, +/turf/simulated/floor/plating, +/area/engine/engineering) +"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 + }, +/turf/simulated/floor/plating, +/area/atmos) +"kmF" = ( +/obj/effect/spawner/window/reinforced, +/turf/simulated/floor/plating, +/area/hallway/secondary/entry) +"knc" = ( +/obj/machinery/atmospherics/pipe/simple/visible/green, +/obj/machinery/light{ + dir = 4 + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/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" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/floor/wood, +/area/security/vacantoffice) +"ksa" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "neutralcorner" + }, +/area/hallway/primary/port) +"kto" = ( +/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/simple/visible/green{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/visible/yellow, +/turf/space, +/area/space/nearstation) +"ktv" = ( +/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 9; + tag = "icon-intact-y (NORTHWEST)" + }, +/turf/space, +/area/space/nearstation) +"ktI" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/turf/simulated/floor/plasteel{ + dir = 5; + icon_state = "green" + }, +/area/hydroponics) +"kuf" = ( +/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/hallway/primary/central) "kwJ" = ( /obj/machinery/message_server, /turf/simulated/floor/bluegrid, /area/tcommsat/server) +"kxc" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/bluegrid, +/area/assembly/chargebay) +"kxf" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/effect/decal/warning_stripes/northwestcorner, +/obj/effect/decal/warning_stripes/southeastcorner, +/turf/simulated/floor/plasteel, +/area/engine/engineering) +"kBa" = ( +/obj/machinery/atmospherics/binary/pump/on{ + name = "Gas to Cooling Loop" + }, +/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) "kBq" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -95841,12 +89507,88 @@ }, /turf/space, /area/space/nearstation) +"kDt" = ( +/obj/machinery/door/firedoor, +/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) +"kGw" = ( +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + dir = 2; + id_tag = "engsm"; + name = "Radiation Chamber Shutters" + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/engine/supermatter) +"kHS" = ( +/obj/structure/chair/office/dark{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/library) +"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) +"kLs" = ( +/obj/machinery/atmospherics/unary/portables_connector{ + layer = 2 + }, +/turf/simulated/floor/plasteel{ + 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 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/engine/gravitygenerator) "kNJ" = ( /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whiteblue" }, /area/medical/paramedic) +"kRX" = ( +/obj/structure/window/plasmareinforced{ + dir = 1 + }, +/obj/machinery/power/rad_collector{ + anchored = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/visible/scrubbers, +/obj/structure/cable{ + d2 = 2; + icon_state = "0-2" + }, +/turf/simulated/floor/engine, +/area/engine/supermatter) "kSC" = ( /obj/machinery/atmospherics/unary/portables_connector{ dir = 4 @@ -95854,12 +89596,32 @@ /obj/machinery/portable_atmospherics/canister/air, /turf/simulated/floor/plasteel, /area/construction) -"kWU" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 6; - level = 2 +"kUj" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 }, /turf/simulated/floor/plating, +/area/maintenance/starboard) +"kWg" = ( +/obj/machinery/atmospherics/unary/portables_connector{ + dir = 8 + }, +/obj/machinery/portable_atmospherics/canister/nitrogen, +/obj/effect/decal/warning_stripes/yellow/hollow, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/engine/supermatter) +"lcc" = ( +/obj/machinery/atmospherics/pipe/manifold4w/visible, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, /area/engine/engineering) "lcL" = ( /obj/machinery/portable_atmospherics/canister/air, @@ -95870,6 +89632,66 @@ /area/maintenance/aft{ name = "Aft Maintenance" }) +"len" = ( +/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 + }, +/turf/simulated/floor/plasteel, +/area/toxins/storage) +"lgv" = ( +/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{ + 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" + }, +/area/security/main) +"lmi" = ( +/obj/structure/lattice/catwalk, +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 10 + }, +/turf/space, +/area/space/nearstation) +"lpU" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 2 + }, +/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 + }, +/turf/simulated/floor/plasteel, +/area/engine/engineering) "lCt" = ( /obj/structure/window/reinforced{ dir = 4 @@ -95884,10 +89706,356 @@ /area/construction/hallway{ name = "\improper MiniSat Exterior" }) +"lFT" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/engine, +/area/toxins/explab) +"lGk" = ( +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/engine/engineering) +"lGr" = ( +/obj/machinery/atmospherics/binary/pump{ + dir = 8; + name = "Gas to Filter" + }, +/obj/machinery/alarm/engine{ + dir = 4; + pixel_x = -22 + }, +/turf/simulated/floor/engine, +/area/engine/supermatter) +"lIR" = ( +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "green" + }, +/area/hydroponics) +"lJX" = ( +/obj/structure/window/plasmareinforced, +/obj/machinery/power/rad_collector{ + anchored = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/visible/supply{ + dir = 1 + }, +/obj/structure/cable, +/turf/simulated/floor/engine, +/area/engine/supermatter) +"lOU" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan, +/obj/effect/decal/warning_stripes/west, +/turf/simulated/floor/engine, +/area/engine/engineering) +"lPA" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/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" = ( +/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) +"lYf" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/turret_protected/ai) +"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" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/lattice/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/turf/space, +/area/construction/hallway{ + name = "\improper MiniSat Exterior" + }) +"mcY" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/security/glass{ + name = "Security Pods"; + req_access_txt = "71" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/security/podbay) +"mea" = ( +/obj/machinery/door/airlock/external{ + frequency = 1379; + icon_state = "door_locked"; + id_tag = "sol_outer"; + locked = 1; + name = "Arrivals External Access"; + req_access = null; + req_access_txt = "0" + }, +/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" + }, +/turf/simulated/floor/plating, +/area/hallway/secondary/entry) +"miB" = ( +/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 = 5; + tag = "icon-intact-y (NORTHWEST)" + }, +/turf/simulated/floor/engine, +/area/engine/engineering) +"moi" = ( +/obj/machinery/atmospherics/trinary/filter/flipped{ + dir = 1; + filter_type = -1 + }, +/obj/effect/decal/warning_stripes/northeast, +/turf/simulated/floor/engine, +/area/engine/engineering) +"moJ" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/machinery/door/window/eastright{ + dir = 1; + name = "MiniSat Walkway Access"; + req_access_txt = "13;75" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/construction/hallway{ + name = "\improper MiniSat Exterior" + }) +"mpt" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/medical/research{ + name = "Research Division" + }) +"mzf" = ( +/obj/structure/window/plasmareinforced{ + dir = 1 + }, +/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" + }, +/turf/simulated/floor/engine, +/area/engine/supermatter) +"mAt" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/plasteel{ + dir = 5; + icon_state = "cafeteria"; + tag = "icon-cafeteria (NORTHEAST)" + }, +/area/crew_quarters/kitchen) +"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 + }, +/turf/simulated/floor/plasteel, +/area/quartermaster/storage) +"mGK" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/toxins/xenobiology{ + name = "\improper Secure Lab" + }) +"mVG" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/effect/decal/warning_stripes/north, +/obj/machinery/atmospherics/pipe/simple/visible/green{ + dir = 4 + }, +/turf/simulated/floor/engine, +/area/engine/engineering) +"mWL" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/engine/engineering) +"mXy" = ( +/turf/simulated/floor/mineral/titanium, +/area/shuttle/arrival/station) +"mZJ" = ( +/obj/structure/reflector/single{ + anchored = 1; + dir = 8 + }, +/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" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/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/hallway/primary/fore) +"nbt" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plasteel, +/area/atmos) "nbO" = ( /obj/effect/spawner/airlock/s_to_n, /turf/simulated/wall, /area/construction) +"neT" = ( +/obj/effect/decal/warning_stripes/southwest, +/obj/effect/decal/warning_stripes/north, +/turf/simulated/floor/plasteel, +/area/hallway/secondary/entry) +"nhZ" = ( +/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) "nig" = ( /obj/effect/decal/warning_stripes/south, /obj/structure/disposalpipe/segment{ @@ -95895,35 +90063,607 @@ }, /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 + }, +/turf/simulated/floor/plasteel{ + icon_state = "redfull" + }, +/area/security/main) +"nqA" = ( +/obj/machinery/hologram/holopad, +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 10 + }, +/turf/simulated/floor/plasteel, +/area/atmos) +"nss" = ( +/obj/machinery/atmospherics/binary/pump{ + 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" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/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" + }) +"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{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/machinery/atmospherics/unary/vent_pump{ + dir = 4; + on = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/construction/hallway{ + name = "\improper MiniSat Exterior" + }) +"nEQ" = ( +/obj/machinery/atmospherics/binary/pump/on{ + dir = 1; + name = "Cooling Loop to Gas" + }, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/decal/warning_stripes/southeast, +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 4 + }, +/turf/simulated/floor/engine, +/area/engine/engineering) +"nIZ" = ( +/obj/docking_port/stationary{ + dir = 8; + dwidth = 4; + height = 11; + id = "trade_dock"; + name = "port bay 4 at Cerebron"; + width = 9 + }, +/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 + }, +/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, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/crew_quarters/courtroom) +"nMx" = ( +/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/visible/yellow, +/turf/space, +/area/space/nearstation) +"nMC" = ( +/turf/simulated/wall/r_wall, +/area/storage/secure) +"nRh" = ( +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/engine/engineering) +"nUW" = ( +/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 = 4; + level = 1 + }, +/turf/simulated/floor/plasteel, +/area/security/brig) +"nVz" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "freezerfloor" + }, +/area/crew_quarters/locker/locker_toilet{ + name = "\improper Restrooms" + }) +"obL" = ( +/obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/toxins/mixing{ + name = "\improper Toxins Lab" + }) "odO" = ( /obj/machinery/blackbox_recorder, /turf/simulated/floor/bluegrid, /area/tcommsat/server) +"ofz" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/turf/simulated/floor/plating, +/area/maintenance/starboard) +"ogE" = ( +/obj/machinery/door/airlock/engineering/glass{ + name = "Supermatter Engine Room"; + req_access_txt = "10"; + req_one_access_txt = "0" + }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 4 + }, +/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{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/toxins/xenobiology{ + name = "\improper Secure Lab" + }) +"ojl" = ( +/obj/machinery/atmospherics/trinary/filter/flipped{ + dir = 1; + filter_type = 2 + }, +/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) -"oAG" = ( -/obj/effect/spawner/airlock/w_to_e, -/turf/simulated/wall, +"oqV" = ( +/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" + }, +/area/hydroponics) +"oGg" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8; + initialize_directions = 11; + level = 1 + }, +/turf/simulated/floor/plasteel, +/area/quartermaster/storage) +"oJA" = ( +/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 + }, +/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) +"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 + }, +/turf/simulated/floor/plasteel/dark, +/area/tcommsat/server) +"oRr" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/medical/medbay2{ + name = "Medbay Storage" + }) +"oTM" = ( +/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" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel, +/area/hallway/primary/aft) +"oWm" = ( +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/turf/simulated/floor/plating, +/area/engine/engineering) +"pad" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/research{ + autoclose = 0; + frequency = 1449; + icon_state = "door_locked"; + id_tag = "xeno_airlock_exterior"; + locked = 1; + name = "Secure Lab External Airlock"; + req_access_txt = "55" + }, +/obj/machinery/access_button{ + command = "cycle_exterior"; + master_tag = "xeno_airlock_control"; + pixel_x = -25; + req_access_txt = "55" + }, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/toxins/xenobiology{ + name = "\improper Secure Lab" + }) +"pcW" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/decal/warning_stripes/southwest, +/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 + }, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/medical/research{ + name = "Research Division" + }) +"peo" = ( +/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/simple/visible/yellow, +/turf/space, +/area/space) "pep" = ( /obj/effect/spawner/airlock/s_to_n, /turf/simulated/wall, /area/maintenance/starboard) +"peO" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow, +/obj/machinery/atmospherics/binary/pump{ + dir = 4; + name = "Mix to Engine" + }, +/turf/simulated/floor/plasteel, +/area/atmos) +"pkf" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/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 + }, +/turf/simulated/floor/plasteel, +/area/toxins/mixing{ + name = "\improper Toxins Lab" + }) +"plu" = ( +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 6 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/engine/engineering) +"pmh" = ( +/obj/machinery/atmospherics/pipe/manifold/visible{ + dir = 2 + }, +/obj/machinery/meter, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/engine/engineering) +"poN" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "ptc" = ( /turf/simulated/floor/plasteel{ dir = 2; icon_state = "whiteblue" }, /area/medical/paramedic) +"pue" = ( +/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" + }) +"pvv" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan, +/obj/effect/decal/warning_stripes/southwest, +/turf/simulated/floor/engine, +/area/engine/engineering) +"pzX" = ( +/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/plasteel, +/area/assembly/robotics) +"pDi" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/floor/plasteel{ + dir = 2; + icon_state = "purplecorner" + }, +/area/hallway/primary/aft) +"pFi" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + 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/scrubbers, +/turf/simulated/floor/plasteel, +/area/security/armoury) +"pKs" = ( +/obj/machinery/atmospherics/pipe/simple/visible/universal{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/engine/engineering) "pMx" = ( /obj/effect/spawner/airlock/w_to_e, /turf/simulated/wall, /area/maintenance/aft{ name = "Aft Maintenance" }) +"pNG" = ( +/obj/machinery/atmospherics/pipe/simple/visible, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/engine/engineering) +"pOV" = ( +/obj/effect/decal/warning_stripes/south, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/floor/plasteel, +/area/hallway/secondary/entry{ + name = "Arrivals" + }) +"pPA" = ( +/obj/machinery/light{ + dir = 1; + in_use = 1 + }, +/turf/simulated/floor/plasteel{ + dir = 5; + icon_state = "vault" + }, +/area/engine/mechanic_workshop) "pQx" = ( /obj/structure/cable/yellow{ d1 = 4; @@ -95943,13 +90683,44 @@ /area/maintenance/aft{ name = "Aft Maintenance" }) -"pVq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +"pRy" = ( +/obj/effect/decal/warning_stripes/north, +/obj/machinery/camera, +/turf/simulated/floor/engine, +/area/engine/mechanic_workshop) +"pSk" = ( +/obj/machinery/mecha_part_fabricator/spacepod, +/turf/simulated/floor/plasteel{ + dir = 5; + icon_state = "vault" }, -/obj/structure/disposalpipe/segment, +/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 + }, +/obj/effect/decal/warning_stripes/west, +/turf/simulated/floor/engine, +/area/engine/engineering) +"pXI" = ( +/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, /turf/simulated/floor/plasteel, -/area/quartermaster/storage) +/area/hallway/primary/aft) "qaM" = ( /obj/structure/cable/yellow{ d1 = 4; @@ -95969,10 +90740,153 @@ /obj/machinery/atmospherics/pipe/simple/visible, /turf/simulated/floor/plating, /area/construction) +"qcX" = ( +/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, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/medical/research{ + name = "Research Division" + }) +"qhv" = ( +/obj/machinery/atmospherics/unary/vent_pump{ + dir = 8; + on = 1 + }, +/turf/simulated/floor/plasteel, +/area/atmos) "qhx" = ( /obj/effect/spawner/airlock/w_to_e, /turf/simulated/wall/r_wall, /area/atmos) +"qiC" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel, +/area/security/brig) +"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 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/turf/simulated/floor/plasteel, +/area/assembly/robotics) +"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{ + dir = 2; + icon_state = "neutralcorner" + }, +/area/hallway/primary/aft) +"qxn" = ( +/obj/machinery/alarm{ + dir = 1; + pixel_y = -22 + }, +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 4 + }, +/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 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralcorner" + }, +/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; + d2 = 2; + icon_state = "1-2" + }, +/obj/effect/landmark{ + name = "lightsout" + }, +/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) +"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{ @@ -95986,6 +90900,123 @@ /area/maintenance/aft{ name = "Aft Maintenance" }) +"qHr" = ( +/obj/effect/decal/warning_stripes/south, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/turf/simulated/floor/plating, +/area/toxins/misc_lab{ + name = "\improper Research Testing Range" + }) +"qHS" = ( +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/machinery/disposal{ + pixel_x = 2; + pixel_y = 2 + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "yellowcorner" + }, +/area/engine/break_room) +"qQy" = ( +/obj/structure/disposalpipe/segment{ + 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/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/floor/plating, +/area/maintenance/starboard) +"qWn" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 2 + }, +/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 + }, +/turf/simulated/floor/bluegrid, +/area/turret_protected/ai_upload) +"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" = ( +/obj/item/twohanded/required/kirbyplants{ + icon_state = "plant-06"; + level = 4.1; + tag = "icon-plant-06" + }, +/obj/effect/decal/warning_stripes/northwest, +/obj/structure/sign/securearea{ + desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; + icon_state = "space"; + layer = 4; + name = "EXTERNAL AIRLOCK"; + pixel_y = 32 + }, +/turf/simulated/floor/plasteel, +/area/hallway/secondary/entry{ + name = "Arrivals" + }) +"riM" = ( +/obj/effect/decal/warning_stripes/northwest, +/turf/simulated/floor/plasteel, +/area/engine/equipmentstorage) +"rjU" = ( +/obj/structure/window/reinforced{ + dir = 1; + layer = 2.9 + }, +/obj/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/construction/hallway{ + 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/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/decal/warning_stripes/south, +/turf/simulated/floor/engine, +/area/engine/engineering) "rpg" = ( /obj/structure/lattice/catwalk, /obj/structure/cable{ @@ -95995,23 +91026,166 @@ }, /turf/space, /area/solar/starboard) -"rzO" = ( -/obj/machinery/portable_atmospherics/canister/air, -/obj/machinery/atmospherics/unary/portables_connector{ - dir = 1 +"rrO" = ( +/obj/machinery/door/poddoor{ + density = 0; + icon_state = "open"; + id_tag = "transittube"; + name = "Transit Tube Blast Door"; + opacity = 0 }, -/turf/simulated/floor/plating, +/obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4; + level = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel, +/area/engine/break_room) +"rsT" = ( +/obj/machinery/atmospherics/binary/pump{ + name = "Mix to Gas" + }, +/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) +"rwh" = ( +/obj/machinery/power/supermatter_crystal/engine, +/turf/simulated/floor/engine, +/area/engine/supermatter) +"rxV" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/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) +"rDg" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/light{ + dir = 1; + on = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/toxins/xenobiology{ + name = "\improper Secure Lab" + }) +"rDy" = ( +/obj/docking_port/stationary{ + dir = 4; + dwidth = 7; + height = 5; + id = "sst_home"; + name = "Near Cerebron Arrivals"; + width = 11 + }, +/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" + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "yellow" + }, +/area/engine/break_room) +"rEw" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + 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, +/area/hallway/primary/aft) +"rHe" = ( +/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 = 4; + level = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4; + level = 1 + }, +/turf/simulated/floor/plasteel, +/area/security/brig) "rIq" = ( /obj/structure/table, /obj/item/clothing/mask/breath{ pixel_x = 4 }, -/obj/item/tank/emergency_oxygen{ +/obj/item/tank/internals/emergency_oxygen{ pixel_x = -8 }, /turf/simulated/floor/plating, /area/maintenance/starboard) +"rJJ" = ( +/obj/machinery/door/airlock/titanium{ + name = "Arrivals Shuttle Airlock" + }, +/turf/simulated/floor/mineral/titanium, +/area/shuttle/arrival/station) +"rKu" = ( +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/construction/hallway{ + name = "\improper MiniSat Exterior" + }) +"rNt" = ( +/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{ @@ -96021,6 +91195,103 @@ }, /turf/space, /area/solar/starboard) +"rPA" = ( +/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) +"rRM" = ( +/obj/effect/spawner/window/reinforced/plasma, +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/engine, +/area/engine/engineering) +"rTO" = ( +/obj/docking_port/stationary{ + dir = 2; + dwidth = 9; + height = 18; + id = "admin_home"; + name = "port bay 1"; + timid = 1; + width = 19 + }, +/turf/space, +/area/space) +"rYj" = ( +/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ + dir = 9 + }, +/obj/structure/lattice, +/turf/space, +/area/space/nearstation) +"rYO" = ( +/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ + dir = 4 + }, +/obj/structure/lattice, +/obj/structure/lattice/catwalk, +/turf/space, +/area/space/nearstation) +"say" = ( +/obj/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + 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 + }, +/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 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "bluecorner" + }, +/area/hallway/primary/aft) "sjF" = ( /obj/structure/window/reinforced{ dir = 1 @@ -96034,6 +91305,52 @@ icon_state = "dark" }, /area/space/nearstation) +"skc" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + dir = 5; + icon_state = "cafeteria"; + tag = "icon-cafeteria (NORTHEAST)" + }, +/area/medical/research{ + name = "Research Division" + }) +"ssZ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/turf/simulated/floor/plating, +/area/engine/engineering) +"swl" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 4 + }, +/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) +"sBY" = ( +/turf/simulated/floor/plating, +/area/storage/secure) "sDC" = ( /obj/docking_port/stationary/whiteship{ dir = 8; @@ -96043,6 +91360,28 @@ }, /turf/space, /area/space) +"sEe" = ( +/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/medical/morgue) +"sGi" = ( +/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 @@ -96057,6 +91396,34 @@ /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{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 2; + icon_state = "neutralcorner" + }, +/area/hallway/primary/central) "sRB" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 10 @@ -96065,12 +91432,121 @@ /area/maintenance/aft{ name = "Aft Maintenance" }) +"tay" = ( +/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) +"tgE" = ( +/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ + dir = 10 + }, +/obj/structure/lattice, +/turf/space, +/area/space/nearstation) +"thz" = ( +/obj/effect/decal/warning_stripes/north, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plasteel, +/area/toxins/mixing{ + name = "\improper Toxins Lab" + }) "tlh" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 9 }, /turf/simulated/floor/plasteel, /area/construction) +"tpg" = ( +/obj/machinery/firealarm{ + pixel_y = 29 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/engine/engineering) +"tvk" = ( +/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; + icon_state = "4-8" + }, +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/effect/decal/warning_stripes/north, +/turf/simulated/floor/engine, +/area/engine/engineering) +"tvn" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9; + pixel_y = 0 + }, +/turf/simulated/floor/plasteel{ + icon_state = "grimy" + }, +/area/security/detectives_office) +"tvr" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/turf/simulated/floor/plating, +/area/engine/engineering) "twD" = ( /obj/structure/disposalpipe/segment{ dir = 2; @@ -96080,6 +91556,74 @@ /area/maintenance/fpmaint2{ name = "Port Maintenance" }) +"tAn" = ( +/obj/machinery/atmospherics/pipe/simple/visible/green{ + dir = 4 + }, +/obj/machinery/light{ + dir = 1; + on = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/decal/warning_stripes/north, +/turf/simulated/floor/engine, +/area/engine/engineering) +"tEL" = ( +/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/aft) +"tNG" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/turf/simulated/floor/wood, +/area/library) +"tOU" = ( +/obj/machinery/atmospherics/unary/vent_scrubber, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/security/brig) +"tPc" = ( +/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, +/area/hallway/primary/aft) +"tSX" = ( +/obj/structure/lattice, +/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 4 + }, +/turf/space, +/area/space/nearstation) +"tVw" = ( +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 5 + }, +/turf/simulated/wall/r_wall, +/area/engine/supermatter) "tWl" = ( /obj/effect/spawner/window/reinforced, /obj/effect/spawner/airlock/e_to_w, @@ -96087,12 +91631,59 @@ /area/maintenance/aft{ name = "Aft Maintenance" }) -"tXL" = ( -/obj/structure/chair/comfy/shuttle{ +"tZI" = ( +/obj/machinery/atmospherics/unary/outlet_injector{ + frequency = 1441; + icon_state = "on"; + id = "engine-waste_out"; + name = "engine outlet injector"; + on = 1; + volume_rate = 200 + }, +/turf/simulated/floor/plating, +/area/engine/engineering) +"uaQ" = ( +/turf/simulated/wall, +/area/engine/mechanic_workshop) +"ueD" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/toxins/xenobiology{ + name = "\improper Secure Lab" + }) +"ugy" = ( +/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" + }, +/area/security/hos) +"ulS" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "redcorner" + }, +/area/security/brig) +"umD" = ( +/obj/machinery/atmospherics/unary/vent_pump{ + dir = 1; + on = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "floorgrime" + }, +/area/crew_quarters/toilet{ + name = "\improper Auxiliary Restrooms" + }) "umT" = ( /obj/structure/closet/crate/freezer, /obj/item/reagent_containers/iv_bag, @@ -96109,6 +91700,36 @@ /area/medical/medbay2{ name = "Medbay Storage" }) +"upv" = ( +/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) +"uuE" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/command{ + name = "Captain's Quarters"; + req_access = null; + req_access_txt = "20" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/crew_quarters/captain{ + name = "\improper Captain's Quarters" + }) +"uzt" = ( +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "green" + }, +/area/hydroponics) "uJn" = ( /obj/effect/spawner/airlock/w_to_e, /turf/simulated/wall/r_wall, @@ -96119,6 +91740,130 @@ /area/maintenance/fpmaint2{ name = "Port Maintenance" }) +"uLE" = ( +/obj/structure/reflector/single{ + anchored = 1; + dir = 1 + }, +/turf/simulated/floor/plating, +/area/engine/engineering) +"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, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/medical/medbay3) +"uQl" = ( +/obj/machinery/atmospherics/unary/vent_pump{ + dir = 1; + on = 1 + }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/medical/medbay3) +"uQo" = ( +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "whiteblue" + }, +/area/medical/medbay3) +"uRT" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/bridge) +"uTZ" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 + }, +/turf/simulated/floor/plasteel, +/area/atmos) +"uWq" = ( +/obj/effect/decal/warning_stripes/west, +/turf/simulated/floor/plasteel, +/area/hallway/secondary/entry{ + name = "Arrivals" + }) +"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 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/crew_quarters/courtroom) +"vfv" = ( +/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/heat_exchanging, +/obj/structure/lattice, +/obj/structure/lattice/catwalk, +/turf/space, +/area/space/nearstation) +"vgP" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "redfull" + }, +/area/security/main) +"vgQ" = ( +/obj/docking_port/stationary/whiteship{ + dir = 8; + id = "whiteship_cyberiad"; + name = "North of Cerebron" + }, +/turf/space, +/area/space) +"vjL" = ( +/obj/effect/spawner/window/reinforced/plasma, +/turf/simulated/floor/engine, +/area/engine/supermatter) +"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" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/decal/warning_stripes/west, +/turf/simulated/floor/engine, +/area/engine/engineering) "vtP" = ( /obj/machinery/conveyor/west{ id = "garbage" @@ -96126,9 +91871,207 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/maintenance/disposal) +"vuE" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/floor/plasteel{ + icon_state = "whitebluefull" + }, +/area/medical/reception) +"vwA" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan, +/obj/machinery/light{ + dir = 8 + }, +/obj/effect/decal/warning_stripes/west, +/turf/simulated/floor/engine, +/area/engine/engineering) +"vBA" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/bridge) +"vCR" = ( +/obj/machinery/light{ + dir = 4; + icon_state = "tube1" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/floor/plating, +/area/engine/engineering) +"vDW" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/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, +/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{ + dir = 8 + }, +/turf/simulated/floor/plasteel, +/area/hallway/secondary/entry{ + name = "Arrivals" + }) +"vJx" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/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) +"vLL" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "redcorner" + }, +/area/security/brig) +"vRY" = ( +/obj/effect/spawner/window/reinforced/plasma, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/engine, +/area/engine/engineering) +"vUD" = ( +/obj/machinery/power/emitter{ + anchored = 1; + dir = 1; + state = 2 + }, +/obj/structure/cable/yellow{ + d2 = 8; + icon_state = "0-8" + }, +/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 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/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" + }) "vZo" = ( /turf/simulated/floor/plating, /area/space/nearstation) +"vZU" = ( +/obj/machinery/atmospherics/unary/thermomachine/freezer{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/engine/engineering) +"wgm" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "whitebluecorner" + }, +/area/medical/medbay3) +"wlG" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/turf/simulated/floor/plasteel{ + dir = 2; + icon_state = "whiteblue" + }, +/area/medical/reception) +"wuZ" = ( +/obj/machinery/light{ + dir = 4; + icon_state = "tube1" + }, +/turf/simulated/floor/plating, +/area/engine/engineering) "wvK" = ( /obj/structure/cable{ d1 = 1; @@ -96144,16 +92087,57 @@ /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) +"wxE" = ( +/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/heat_exchanging, +/obj/structure/lattice, +/turf/space, +/area/space/nearstation) "wyX" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, /turf/simulated/floor/plasteel{ - tag = "icon-cafeteria (NORTHEAST)"; + dir = 5; icon_state = "cafeteria"; - dir = 5 + tag = "icon-cafeteria (NORTHEAST)" }, /area/medical/research{ name = "Research Division" }) +"wAP" = ( +/obj/structure/transit_tube{ + icon_state = "D-SW"; + tag = "icon-D-SW" + }, +/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 6 + }, +/turf/space, +/area/space/nearstation) +"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 + }, +/turf/simulated/floor/plating, +/area/hallway/secondary/entry) "wJQ" = ( /obj/effect/decal/warning_stripes/north, /obj/machinery/atmospherics/pipe/simple/visible{ @@ -96161,6 +92145,101 @@ }, /turf/simulated/floor/plating, /area/maintenance/starboard) +"wLN" = ( +/obj/machinery/atmospherics/trinary/filter/flipped{ + dir = 1; + filter_type = -1 + }, +/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, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5; + level = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel, +/area/security/brig) +"xbe" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + 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" = ( +/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 = 1 + }, +/turf/simulated/floor/plasteel{ + dir = 2; + icon_state = "neutralcorner" + }, +/area/hallway/primary/starboard) +"xno" = ( +/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) "xrG" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 5 @@ -96182,10 +92261,213 @@ /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" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plasteel, +/area/hallway/primary/aft) +"xDw" = ( +/obj/effect/decal/warning_stripes/east, +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/manifold/visible/red{ + dir = 8 + }, +/turf/simulated/floor/engine, +/area/engine/engineering) +"xEi" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/turf/simulated/floor/plasteel/dark, +/area/tcommsat/server) +"xFR" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "whitebluefull" + }, +/area/medical/reception) +"xGP" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plating, +/area/maintenance/starboard) +"xHf" = ( +/obj/effect/decal/warning_stripes/southeast, +/obj/structure/cable/yellow{ + d1 = 4; + 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" + }, +/area/hallway/primary/central) +"xLf" = ( +/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ + dir = 10 + }, +/obj/structure/lattice, +/obj/structure/lattice/catwalk, +/turf/space, +/area/space/nearstation) +"xOM" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "stage_stairs"; + 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 + }, +/turf/simulated/floor/bluegrid, +/area/turret_protected/ai_upload) +"xRI" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5; + level = 1 + }, +/turf/simulated/floor/wood, +/area/security/vacantoffice) +"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, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/security/podbay) +"xYx" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6; + level = 1 + }, +/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) "xZq" = ( /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/solar/starboard) +"yaq" = ( +/obj/machinery/power/emitter{ + anchored = 1; + dir = 1; + state = 2 + }, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/cable/yellow{ + d2 = 8; + icon_state = "0-8" + }, +/turf/simulated/floor/plating, +/area/engine/engineering) +"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 + }, +/turf/simulated/wall/r_wall, +/area/engine/supermatter) +"yij" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/construction) (1,1,1) = {" aaa @@ -102235,7 +98517,7 @@ aaa aaa aaa aaa -aaD +aaa aaa aaa aaa @@ -102407,15 +98689,15 @@ aaa aaa aaa aaa -aaE -aai -aai -aai -aai -aai -aai -aai -aaw +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -102658,21 +98940,21 @@ aaa aaa aaa aaa -aaE -aai -aai -aai -aai -aai -aad -abg -aak -abv -abw -aak -abN -abQ -acb +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -102915,21 +99197,21 @@ aaa aaa aaa aaa -aad -aaG -aaG -aaN -aaG -aaG -aad -abg -aak -aak -aak -aak -abO -abQ -acc +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -103172,21 +99454,21 @@ aaa aaa aaa aaa -aad -aak -aak -aak -aak -aak -aad -abh -aak -aak -aak -acl -abP -abQ -acd +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -103422,28 +99704,28 @@ aaa aaa aaa aaa -aac -aai -aai -aai -aaw aaa aaa -aad -aak -aaI -aak -aak -aak -aad -abi -aaI -aak -abC -aai -aai -aai -aay +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -103679,25 +99961,25 @@ aaa aaa aaa aaa -aad -aaj -aap -aas -aad aaa aaa -aad -aaH -aaJ -aaO -aak -aak -aad -abj -aak -aak -abD -aad +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -103936,27 +100218,27 @@ aaa aaa aaa aaa -aae -aak -aak -aat -aad -aai -aai -aai -aai -aai -aai -aaS -aaY -aad -aai -abr -abx -aai -aai -aai -aaw +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -104193,27 +100475,27 @@ aaa aaa aaa aaa -aaf -aal -aak -aak -aad -aaz -aaB -aaB -aaB -aaB -aaP -aak -aak -abc -abk -aak -aak -abE -aak -abQ -acb +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -104450,27 +100732,27 @@ aaa aaa aaa aaa -aaf -aam -aaq -aak -aax -aak -aak -aak -aak -aak -aak -aak -aak -aak -aak -aak -aak -abF -abJ -abQ -acc +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -104518,11 +100800,11 @@ aaa aaa aaa aaa -abq -abq -abq -abq -abq +aaa +aaa +aaa +nIZ +aaa aaa aaa aaa @@ -104707,27 +100989,27 @@ aaa aaa aaa aaa -aaf -aan -aak -aau -aad -aaA -aaC -aaC -aaC -aaC -aar -aaT -aak -aak -aak -aak -aak -abE -aak -abQ -acd +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -104775,11 +101057,11 @@ aaa aaa aaa aaa -abq aaa aaa -aaa -abq +kmF +mea +wHZ abq abq abq @@ -104801,12 +101083,12 @@ aaa aaa aaa aaa -abq -abq -abq -abq -abq -abq +aaa +ibR +aaa +aaa +aaa +aaa aaa aaa aaa @@ -104964,27 +101246,27 @@ aaa aaa aaa aaa -aag -aao -aak -aak -aad -aai -aai -aaF -aai -aai -aaQ -aaU -aaZ -aad -aai -abs -aby -aai -aai -aai -aay +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -105030,13 +101312,13 @@ aaa aaa aaa aaa -acG aWD aWD aWD aWD -aaa -aaa +vaO +eEV +kmF abq aaa abq @@ -105057,13 +101339,13 @@ abq aaa aaa aaa -abq +aaa +kmF +fwO +kmF abq aaa aaa -abq -aaa -abq aaa aaa aaa @@ -105221,25 +101503,25 @@ aaa aaa aaa aaa -aad -aao -aar -aav -aad aaa aaa aaa aaa -aad -aaR -aaV -aba -aad -abl -aak -aak -abG -aad +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -105287,13 +101569,13 @@ aaa aaa aaa aSq -aTN -aTN +aSq +aSq aWG ayC -aWD -aUN -aUN +vaO +dAs +kmF aUN aUN abq @@ -105311,15 +101593,15 @@ aUN aUN aUN aaa -bls -bKr -blw aaa -aUN -aUN -aUN -aUN aaa +aaa +aaa +kmF +bOx +kmF +abq +abq abq aaa aaa @@ -105478,28 +101760,28 @@ aaa aaa aaa aaa -aah -aai -aai -aai -aay +aaa +aaa +aaa +aaa +aaa aaa aaa aaa aaa aaK -aaR -aaV -aba -aad -abm -aaI -aak -abH -aai -aai -aai -aaw +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -105548,18 +101830,18 @@ aWr aUW aWF aYa -aZi +vaO baH -bcy +gyR aUN abq abq aaa bin -blO +bin biq -blO -bro +bin +bin aaa abq abq @@ -105567,24 +101849,24 @@ aUN bBr bcy aUN -bls -bIG -bKs -bMw -blw -aUN -bRz -bcy +aaa +aaa +aaa +aaa +aaa +kmF +fwO +kmF +aUN +aUN +aUN +aUN +aUN +aUN +aUN aUN aUN aUN -aaa -aaa -aaa -aaa -aaa -aaa -aaa aaa aaa aaa @@ -105744,19 +102026,19 @@ aaa aaa aaa aaa -aaL -aaR -aaW -abb -aad -abn -aak -aak -aak -aak -abR -abQ -acb +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -105800,10 +102082,10 @@ aaa aaa aaa aaa -aSs -aTN -aTN -aZz +aSq +aSq +aSq +aWG aYg aZj baJ @@ -105812,11 +102094,11 @@ bhR aaa abq aaa -bio +bin blP -bkb +mXy bpw -bio +bin aaa abq aaa @@ -105824,24 +102106,24 @@ bhR baJ dgx aWD -bGX -bIH -bKs -bMx -bGX +aaa +aaa +aaa +aaa +aaa aWD -bCx -dgx -bUB -bXa -bUB -aaa -aaa -aaa -aaa -aaa -aaa -aaa +rdz +uWq +uWq +uWq +uWq +uWq +uWq +iMC +bcy +gbT +neT +gbT aaa aaa aaa @@ -106001,19 +102283,6 @@ aaa aaa aaa aaa -aaM -aai -aai -aai -aad -abo -aaI -aak -aak -aak -abS -abQ -acc aaa aaa aaa @@ -106038,6 +102307,19 @@ aaa aaa aaa aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +rDy +aaa +aaa +aaa +aaa abq aup arA @@ -106058,7 +102340,7 @@ aaa abq aaa aaa -acJ +aWD aWD aWD aXS @@ -106069,11 +102351,11 @@ aUN abq abq aaa -bio +bin blQ -bkb +mXy bpx -bio +bin aaa abq abq @@ -106081,25 +102363,25 @@ aUN baI dgx aUN -bGX -bII -bKs -bMy -bGX +aaa +aaa +aaa +aaa +aaa aUN baI -dgx +bcS bUB -aYg bUB -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bUB +bUB +bUB +bUB +dgw +gbT +jGE +gbT +rTO aaa aaa aaa @@ -106262,15 +102544,15 @@ aaa aaa aaa aaa -aad -abp -abt -abz -aak -aak -abT -abQ -acd +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -106326,36 +102608,36 @@ aWD aaa aaa bin -bjZ -blR -bip -blR -bjZ -bro +bin +bin +rJJ +bin +bin +bin aaa aaa aWD bDo bDm bhR -bGY -bIJ -bKs -bMz -bGY +aaa +aaa +aaa +aaa +aaa bhR bRR dgx aUN aUN aUN -bre -aaa -aaa -aaa -aaa -aaa -aaa +dgr +dgr +dgr +dgr +dgr +aUN +aUN aaa aaa aaa @@ -106519,15 +102801,15 @@ aaa aaa aaa aaa -aaM -aai -aai -aai -aai -aai -aai -aai -aay +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -106582,24 +102864,24 @@ dgx aUN aUN aUN -bio +bin bka -bkb -bkb -bkb +mXy +mXy +mXy brp -bio +bin aUN aUN aUN bBs dgx aUN -bGX -bIJ -bKs -bMz -bGX +aaa +aaa +aaa +aaa +aaa aUN baI dgx @@ -106627,6 +102909,11 @@ aaa aaa aaa aaa +aaa +aaa +aaa +aaa +aaa czm arB abe @@ -106718,11 +103005,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa "} (42,1,1) = {" aaa @@ -106845,18 +103127,18 @@ blS blS blS bkb -bth +bip bdR bzw bdR baJ bFe aWD -bGX -bIK -bKs -bMA -bGX +aaa +aaa +aaa +aaa +aaa aWD baJ bTJ @@ -106883,6 +103165,11 @@ aaa aaa aaa aaa +aaa +aaa +aaa +aaa +aaa arB aaa aaa @@ -106975,11 +103262,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa "} (43,1,1) = {" aaa @@ -107096,24 +103378,24 @@ dgx aUN aUN aUN -bio +bin bkc blT blT blT brq -bio +bin aUN aUN aUN baJ bDn aUN -bGX -bIJ -bKs -bMz -bGX +aaa +aaa +aaa +aaa +aaa aUN baJ bTH @@ -107140,6 +103422,11 @@ aaa aaa aaa aaa +aaa +aaa +aaa +aaa +aaa arB aaa cvP @@ -107163,11 +103450,6 @@ aaa aaa aaa aaa -cRT -aaa -aaa -aaa -aaa aaa aaa aaa @@ -107366,11 +103648,11 @@ bzx bBv bDp aUN -bGZ -bIJ -bKs -bMz -bGZ +aaa +aaa +aaa +aaa +aaa aUN bRT bUO @@ -107394,6 +103676,11 @@ aaa aaa aaa aaa +aaa +aaa +aaa +aaa +aaa abq abq abq @@ -107489,11 +103776,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa "} (45,1,1) = {" aaa @@ -107602,38 +103884,38 @@ aLB aLB aLB aLB -aWJ +aWI aXW -aZl -bbd -bch +aZm +bbF +bBt dgx bhb aUN -bio +bin bke blT bnV blT brr -bio +bin aUN bAQ baJ bBt bDp aUN -bGX -bIJ -bKs -bMz -bGX +aaa +aaa +aaa +aaa +aaa aUN baJ bUW -dgR +aWD dgk -dgo +bBt dgu dgz dgz @@ -107651,6 +103933,11 @@ aaa aaa aaa aaa +aaa +aaa +aaa +aaa +aaa abq aaa aaa @@ -107746,11 +104033,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa "} (46,1,1) = {" aaa @@ -107859,39 +104141,39 @@ aLB aLB aLB aLB -aLB +yij aML aZm -bbF -bci +vZb +dgo beO bhW aUN -bio +bin bkf blS blS blS brs -bio +bin aUN bhb bzz -bch +dgo bFn aWD -bGX -bIK -bKs -bMA -bGX +aaa +aaa +aaa +aaa +aaa aWD bCx bUS -bQN -bBt -bBt -dgx +fhW +lPA +dgo +pOV dgz dgz dgz @@ -107906,6 +104188,11 @@ aaa aaa aaa aaa +aaa +aaa +aaa +aaa +aaa abq abq abq @@ -108003,11 +104290,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa "} (47,1,1) = {" aaa @@ -108116,7 +104398,7 @@ aLB aSt aLB aLB -aLB +yij aML aWD bbS @@ -108135,17 +104417,17 @@ aUN bDU bzy bBw -bDp +vFn aUN -bHa -bGY +aaa +aaa bKt -bGY -bOd +aaa +aaa aUN baJ bUQ -dfN +aWD dgl bsx dgw @@ -108163,6 +104445,11 @@ aaa aaa aaa aaa +aaa +aaa +aaa +aaa +aaa abq aaa aaa @@ -108260,11 +104547,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa "} (48,1,1) = {" aaa @@ -108373,31 +104655,31 @@ aLB aSu aLB aLB -aLB +yij aML aWD bdH -bcT +dgx aUN aUN aUN -bio +bin bkh blS blS blS brt -bio +bin aUN aUN aUN -bBM +baJ bDK aWD abq -bKF +kmF bKu -aUN +kmF abq aWD bRV @@ -108420,6 +104702,11 @@ aaa aaa aaa aaa +aaa +aaa +aaa +aaa +aaa abq aaa aaa @@ -108517,11 +104804,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa "} (49,1,1) = {" aaa @@ -108630,32 +104912,32 @@ aLB aSu aLB aLB -aLB +yij aXX aWD -bbF -bcT +jCT +dgx bdR aYg bdR bip bkb -bkb -bkb -bkb +mXy +mXy +mXy bkb bip bdR bzw bdR -bBM +baJ bFG aWD -aUN -aUN +kmF +kmF bOx -aUN -aUN +kmF +kmF aWD bCx dfZ @@ -108677,6 +104959,11 @@ aaa aaa aaa aaa +aaa +aaa +aaa +aaa +aaa abq abq abq @@ -108774,11 +105061,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa "} (50,1,1) = {" aaa @@ -108887,29 +105169,29 @@ aLB aSv aTP aUY -aUY +dJz aXY aZn bcf -bcT +dgx aUN aUN aUN -bir -bki +bin +bin blU blU blU -bki -bti +bin +bin aUN aUN aUN -bBM +baJ bES aWD bMT -aUN +kmF bKu aUN bOT @@ -108935,6 +105217,11 @@ abq abq abq abq +abq +abq +abq +abq +abq aaa aaa aaa @@ -109031,11 +105318,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa "} (51,1,1) = {" aaa @@ -109148,25 +105430,25 @@ aWK bav aWD bce -bcU +bcR beP aUN aaa -bis +bin blV bnF bnF bnF bru -btj +bin aaa aUN bzA -bCs +bBv bEJ brU -bLE -bMK +bky +hBn bMK bMK bMK @@ -109191,6 +105473,11 @@ aaa abq aaa aaa +aaa +aaa +aaa +aaa +aaa abq aaa aaa @@ -109288,11 +105575,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa "} (52,1,1) = {" aaa @@ -109405,7 +105687,7 @@ aHk aHk aWD baM -bcm +bBt bhV aWD aWD @@ -109422,7 +105704,7 @@ bCx bBx bDt bnX -dfP +bgW bKR bNm bMB @@ -109448,6 +105730,11 @@ arB arB abe arB +arB +abq +abq +abq +abq abe arB abe @@ -109545,11 +105832,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa "} (53,1,1) = {" aaa @@ -109670,7 +105952,7 @@ bky bky bky brU -bux +bky bky buD bxr @@ -109705,6 +105987,11 @@ aaa aaa aaa aaa +aaa +aaa +aaa +aaa +aaa abq aaa aaa @@ -109802,11 +106089,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa "} (54,1,1) = {" aaa @@ -109929,10 +106211,10 @@ blW bnX bpz brv -btl +dgj bzs bxK -btl +dgj bBz bDv bFo @@ -109963,6 +106245,11 @@ ciB cjc cjc cjc +cjc +cjc +cjc +cjc +cjc ckr cmH ciB @@ -110059,11 +106346,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa "} (55,1,1) = {" aaa @@ -110180,7 +106462,7 @@ apf apf bfj bgX -biu +bgX bbL bgX bnY @@ -110190,7 +106472,7 @@ btm bxJ bxL btm -bBA +btm bFJ apf cwu @@ -110219,6 +106501,11 @@ aaa aaa abq abq +aaa +aaa +abq +aaa +aaa abq aaa abq @@ -110253,11 +106540,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa aaD aaa aaa @@ -110440,14 +106722,14 @@ bgX biv bkl blX -bnZ -bpB +bgX +bDC brx bfG bfG bfG bfG -bBB +bDC bpB apf bHd @@ -110478,6 +106760,11 @@ abq aaa aaa aaa +abq +aaa +aaa +abq +aaa aaa aaa aaa @@ -110573,11 +106860,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa "} (57,1,1) = {" aaa @@ -110670,25 +106952,25 @@ apd axk abq aaa -aAQ -aCo -aAS -aCo -aAS -aCo -aIK aaa -aLH -aMN -aMN -aMN -aMN -aMN -aMN -aMN -aMN -aYc -aZp +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa apf @@ -110704,7 +106986,7 @@ btn bvA bxM bzB -bBC +bpC bDx bFp bFp @@ -110735,6 +107017,11 @@ abq aaa aaa aaa +abq +aaa +aaa +abq +aaa aaa aaa abq @@ -110830,11 +107117,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa "} (58,1,1) = {" aaa @@ -110927,26 +107209,26 @@ apd axk abq aaa -aAR -aCp -aDq -bxF -aDr -aHo -aAR aaa -aLI -aMO -aOn -aMO -aMO -aMO -aMO -aMO -aOn -aYd -aZq -baP +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa abq apf cEg @@ -110963,9 +107245,9 @@ bvB bzC bBD bDy -bFq +bFp bJu -bIQ +bHf bKz bMD bOh @@ -111173,7 +107455,7 @@ aaa aaa aaa aaa -aaa +iiB aaa aaa aaa @@ -111184,26 +107466,26 @@ apd axk abq aaa -aAS -aCq -aDr -aDq -aDr -aHp -aIL aaa -aLI -aMO -aMO -aMO -aMO -aMO -aMO -aMO -aMO -aMO -aZr -baQ +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa abq alL avU @@ -111212,7 +107494,7 @@ biy bko bma brl -brV +dxy brA btp bvC @@ -111223,10 +107505,10 @@ bFW bFp bHf bHf -bHf +fNU bME -bHg -bQZ +hZZ +hZZ bRB bTn bUD @@ -111441,26 +107723,26 @@ apd axk abq aaa -aAR -aCp -aDq -aDq -aDr -aHq -aAR aaa -aLI -aMO -aMO -aMO -aMO -aMO -aMO -aMO -aMO -aMO -aZr -baQ +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa alL bfl @@ -111475,16 +107757,16 @@ bto bvB bvB bzC -bBF +bBD bDA bFr bHg bHg -bHg +koz bOP bOi bOi -bHf +xRI bHf bUE bFp @@ -111698,26 +107980,26 @@ apd axk abq aaa -aAT -aCo -aAS -aEI -aAS -aCo -aIM aaa -aLI -aMO -aMO -aMO -aMO -aMO -aMO -aMO -aMO -aMO -aZr -baQ +aaa +aaa +aEI +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa alL avU @@ -111725,7 +108007,7 @@ bgX bmP bkq bmc -biu +bgX btD brC btq @@ -111741,7 +108023,7 @@ bKA bHf bOj bPT -bHf +szt bHf bHf bWj @@ -111963,18 +108245,18 @@ ayK ayK abq aaa -aLI -aMO -aMO -aMO -aMO -aSx -aMO -aMO -aMO -aYe -aZq -baR +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa abq apf avU @@ -111982,15 +108264,15 @@ bgX bgX bkr bgX -biu +bgX bpB brx bfG bfG bfG bfG -bBB bDC +fZu bFp bJz bIS @@ -112042,7 +108324,7 @@ cIR cJJ cKO cLI -cMB +fts cNw cKM cKM @@ -112220,17 +108502,17 @@ aGY ayK abq aaa -aLJ -aMN -aMN -ayj -aRk -aMN +aaa +aaa +aaa +aaa +aaa +aaa aTS -aRl -aMN -aYf -aZs +aaa +aaa +aaa +aaa aaa abq apf @@ -112246,7 +108528,7 @@ btr bvE bxP bzD -bBH +bpC bDD bFp bHj @@ -112297,12 +108579,12 @@ aaa cHZ cIT cJK -cHu -cLJ +cHj +cLH cMC -cNx +cNv cOA -cPq +jeY cQo cRa cFv @@ -112812,13 +109094,13 @@ cHZ cHZ cGX cKM -cjW +cFv cME -clk +cFv cOB cPs cPs -cRb +cPs deu cKP cHZ @@ -113332,7 +109614,7 @@ cNB cOC cKM cVO -cRd +fyS cRW cSE cHZ @@ -113505,8 +109787,8 @@ aGf aHs aIP aKd -auK -aMV +ayK +aSm axX aSm aSm @@ -113528,13 +109810,13 @@ brK bpK aXi btw -bvI -bxU +bvH +bxT bzH -bBL +bBK bDI bFt -bHm +umD bIX bHm cgp @@ -113764,7 +110046,7 @@ aIQ aKe azT aMS -pVq +aOu aPJ aOu aSz @@ -113785,9 +110067,9 @@ boh bpL buu btx -bvJ -bxV -bzI +bvH +bxT +bzH bBK bDJ bBK @@ -113846,7 +110128,7 @@ cND cOF cKM cWe -cRf +cRd cRY cSG cHZ @@ -114021,7 +110303,7 @@ aMb aKf aCs aMT -aOr +aRo aPQ aRo aSN @@ -114040,8 +110322,8 @@ bpy bmk boi bpM -blv -bty +aXi +btw bvH bBp bfG @@ -114282,11 +110564,11 @@ aOs aPP aRp aSG -aRp +oGg aWS -aRp +aOs bar -aRp +aOs bcu bfg bea @@ -114354,7 +110636,7 @@ abq cHZ cHZ cHZ -cLR +cHZ cMK cHZ cHZ @@ -114535,11 +110817,11 @@ aJS aLo aLP aNb -aOt -aQF -aRo -aUc aRo +baT +tdP +baT +upv aYi aRo baT @@ -114555,7 +110837,7 @@ bpF bok bpO bfw -btw +ksa bvK bxY bzJ @@ -114611,7 +110893,7 @@ aaa aaa aaa aaa -cIa +cFv dhk cFv aaa @@ -114789,14 +111071,14 @@ aET cbm ccw aMq -aKh +aCu aPw aMW aOu -aQE -aOu +aYh +eKN aTL -aOu +tca aYh aOu bas @@ -114845,8 +111127,8 @@ coC cpV crE ctV -cuY crE +ihM crE cyo czs @@ -114856,8 +111138,8 @@ cCv czs cEZ cGo +dmU cGo -cJZ cKA cGo cKL @@ -114866,9 +111148,9 @@ cNT bZU abq aaa -cZm -dao -cQY +cFv +cFv +cFv dhk cFv aaa @@ -115050,14 +111332,14 @@ aCu aLS aMZ aOW -aPO +aOu aRq -aTE -aOW -aVj -aVj +beb +mGz +aOu +aOu aYk -aZv +aRo baV bcw bfq @@ -115123,7 +111405,7 @@ cog bZU abq abq -cIa +cFv dfT dfX dhm @@ -115308,14 +111590,14 @@ aLQ aNY aPM aQG -aSj +aQG aUd aVa aOu aWM aYl aOu -baW +aOu bcx bfp bhX @@ -115326,7 +111608,7 @@ bmp bsk btO bfw -btw +ksa bvN bxT bzK @@ -115366,7 +111648,7 @@ cyo czu cBl cCu -cAU +czs cEj cEZ cGO @@ -115380,7 +111662,7 @@ cog bZU abq aaa -cIa +cFv cMM cFv cFv @@ -115583,7 +111865,7 @@ bmq bon bpR aXi -btv +rPA bvH bxT bai @@ -115599,8 +111881,8 @@ bFw bRK bTt bai -bWq -bXM +bFw +bFw bZc bZZ bzK @@ -115623,7 +111905,7 @@ coC czp cBo cCy -cDw +cBo czp cEY cEY @@ -115637,7 +111919,7 @@ cQV bZU aaa aaa -cIa +cFv cMN cFv aaa @@ -115830,7 +112112,7 @@ aVl bfw bfw bcD -bbc +bfw bfw bfw bkK @@ -115840,7 +112122,7 @@ bmr boj bpS brJ -btv +rPA bvH bxT bzM @@ -115849,14 +112131,14 @@ bBQ bBQ bBQ bBQ -bKG -bJa -bJa -bJa -bJa +bBQ +bBQ +bBQ +bBQ +bBQ bTu bUI -bWr +bFw bXN cgv caa @@ -115878,7 +112160,7 @@ cwi cxp cwY czv -cBn +cYO cCx cDv cxp @@ -115894,7 +112176,7 @@ cog bZU bZU cHZ -cLR +cHZ cMO cHZ cHZ @@ -116105,8 +112387,8 @@ bBR bBR bFx bBR +xvd bBR -bKH bMM bBR bBR @@ -116114,7 +112396,7 @@ bRL bTv bUJ bWs -bXN +ehr bZe cab bzK @@ -116133,7 +112415,7 @@ cua cvd cwj cxr -cvk +uQo cxy cBq cCE @@ -116354,7 +112636,7 @@ bmt bss btR bfw -btv +rPA bvH bxT bai @@ -116362,8 +112644,8 @@ bBS bBS bzK bHs -bBQ bKI +bBQ bMN bOp bFw @@ -116371,9 +112653,9 @@ bRM bFw bai bWt -bWs -bHr +tNG bHr +kHS bzK ccA auy @@ -116389,7 +112671,7 @@ csE ctZ cvd cwj -cxq +cxt csJ cys cBp @@ -116605,7 +112887,7 @@ bcz bfw bfw bhi -baz +aXi aXi bqW bfw @@ -116619,8 +112901,8 @@ bzK bzK bzK bKw -bBQ bKI +bBQ bFw bOp bFw @@ -116630,7 +112912,7 @@ bzK bWu bWt bZf -bWs +qBH bzK chp auJ @@ -116862,7 +113144,7 @@ bcA bfw bjJ bkS -blu +bmi bmi bmv brX @@ -116876,8 +113158,8 @@ bBT bDO bFy bFw -bBQ bKI +bBQ bFw bOq bPY @@ -116898,12 +113180,12 @@ cjp cmX coi cpz -cre +coE csH cue -cve +cri cwj -cxq +cxt cys czw cBr @@ -117069,10 +113351,10 @@ adl acN acN abB -afc -afQ -afQ -afQ +abB +abB +abB +abB ahD aiy abB @@ -117100,7 +113382,7 @@ aCx aDE aEX aGn -aHz +aBb aaa aHj aLW @@ -117118,23 +113400,23 @@ apf apf apf bjg -bhk -biQ -bhk +bhl +bhl +bhl bmw -boq +bhl bpW brL btF -bvP -bxV +bvH +bxT bzK bDw bDP bzK bHu -bBQ bKI +bBQ bFw bOr bFw @@ -117155,10 +113437,10 @@ cdT cmX cok cpb -crg +crd csN cua -cve +cri cwl cxu csJ @@ -117329,8 +113611,8 @@ adC acN afP agp -agR -ahC +acN +ahG aiy abB aaa @@ -117357,8 +113639,8 @@ aCy aDF aEY aGo -aHA -aGa +aHC +aGu aHb aLX aNf @@ -117379,19 +113661,19 @@ bhl biR bhl bmx -bor +boq bpX brM btG bvQ -bBJ +bBp bzK bzK bzK bzK bKE -bBQ bKI +bBQ bFw bOs bPZ @@ -117447,8 +113729,8 @@ deI cWR cUl cZt -cVQ -cVQ +cSO +cSO dbw cWP cSO @@ -117585,7 +113867,7 @@ aep ado afd ado -ado +fZa agS ahF ahL @@ -117639,7 +113921,7 @@ bmy bos btS aAM -btH +btF bvR bxT bzK @@ -117648,7 +113930,7 @@ bDO bFz bHw bJa -bKJ +bBQ bFw bOt bRh @@ -117705,9 +113987,9 @@ cTD cZa cUR dfs -cVR +teY cWr -cWQ +cUX cSO dbL dbc @@ -117845,7 +114127,7 @@ afp agq acN ahE -aiy +dOL aiE abB aaa @@ -117875,7 +114157,7 @@ aHC aGu aHR aLW -aNh +aNe avx aYO bgk @@ -117896,7 +114178,7 @@ bmz bot bpZ aAM -btv +rPA bvR bxT bzK @@ -117905,7 +114187,7 @@ bDP bzK bHx bBQ -bKI +bBQ bMP bzK bzK @@ -118097,10 +114379,10 @@ ado acA aco aeO -aft -aft -agt -aft +acN +acN +acN +acN ahd aiB aiU @@ -118133,10 +114415,10 @@ aaa aIZ aLZ aNi -aOC -aPX -aRu -aRu +kDt +fFk +izL +vJx aRu aRu aWT @@ -118162,7 +114444,7 @@ bzK bzK bai bzM -bKK +bzM bai bzK bQb @@ -118178,34 +114460,34 @@ ccD cdT chU cgf -cgJ -cjt +chJ cjt +oRr cLT cpE -crk +cxI csS cuL cvi cwo cxw cxL -czE +cxp cNG -czE +cxp cpH cCH cFP cHl -czE -czE +cxp +cxp cKY cLY -cOq -cPB +cDv +cKW cRp cUo -cWU +cxp cYO cZI daO @@ -118390,11 +114672,11 @@ abq aIX aMa aNj -aKn -aPY -aRv -aSO +aOC +aPX aRu +aSO +hBM aRu aWT aYr @@ -118414,23 +114696,23 @@ btJ bvT byg bzP -bzP +byg bFZ bFA -bzP +byg bJb byg -bzP -bJb -bzP -bzP -bzP +byg +dUP +byg +byg +byg bUL -bzP +byg bFZ bZh -bzP -bzP +byg +cMS ccE cdT cfz @@ -118449,20 +114731,20 @@ cxv cyt czD cNF -cDe -cDe +uMx +uMx cEl cFj cHk -cDe -cDe -cDe +uMx +uMx +uMx cLX cNU cPA cNU cUe -cwn +uQl cDe cZy daN @@ -118477,22 +114759,22 @@ cRh cRh cSO cUX -cWp +cWs dgg dhj cSO aaa -abq -cZF -cZS -cZV -dal -cZF -cZV -dal -cZF -cZS -cZV +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -118649,7 +114931,7 @@ aPx aNk avx aPZ -aRw +aRu aSP atJ bmK @@ -118677,7 +114959,7 @@ bfI bfI bJc bKL -bMQ +bfI bOu bfI bfI @@ -118702,25 +114984,25 @@ ctq cuM cvk cwq -cxy +cwq cyw cAh -cxy +cwq cwq cwq cEO -cFV +cwq cHy cwq cwq cwq -cxy cwq -cPD +cwq +cvk cRL cUq cXr -cRL +wgm cZQ daP dbG @@ -118739,18 +115021,18 @@ dhi cVa cSO aaa -daz -daZ -dbO -daZ -cYE -daZ -dbO -cYE -daZ -dbO -daZ -dfp +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -118871,9 +115153,9 @@ aeP acN afx agu -aft +acN ahI -aiz +aiy aiS abB abq @@ -118891,23 +115173,23 @@ aqu arW ake aWv -axD -ayM -axE -ayM -ayM -axE -ayM -ayM -aHD +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aHG aHG aHG aNl aOA aQa -aRx -aSQ +aRu +aSP bmJ aVt aWV @@ -118919,32 +115201,32 @@ bej bfJ bhp biX -bkJ +bfS bpI -bkJ +bfS bqb brO -bkJ -bvV -bvV +bfS +bfS +bfS bzR -bkJ -bkJ -bkJ -bkJ +bfS +bfS +bfS +bfS bJd bKM bMR -bOv +bMR bRO -bOv +bMR bTC bUM bWz bXT -bOv -cah -cbz +bMR +bMR +bek ccG chM chM @@ -118992,23 +115274,23 @@ cZX cVU cWv dfG -dgp +cWz cXI cSO -cYD -dba -cZe -cZe -cZe -dba -cZe -cZe -dcG -cZe -cZe -cZe -dba -dhh +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -119148,27 +115430,27 @@ arP dhI aIg aWv -axE -azk -azU -aBc -aCC -aDJ -aFc -aGs -aHE +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aAf aNy cBa cDt aOA aQb -aRx -aSQ +aRu +aSP aRu aVu -aRu -aYu +fgw +aYr aZG aOF bcL @@ -119200,7 +115482,7 @@ bMS bMS bMS deE -cai +bMR bek ccI chM @@ -119211,8 +115493,8 @@ chM ciX cjD cdT -cjS -ctB +cxI +csS crP cvj cvj @@ -119246,26 +115528,26 @@ cTH deN deY cVw -cVV -cWu +cUY +gdk cWV cXm cXJ dhl -dhp -daA -dbk -dbP -dce -ddm -dcr -dcM -dcS -ddb -ddb -ddI -dfM -dhp +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -119385,7 +115667,7 @@ aeR acN afV agw -agR +acN ahK aiy ajd @@ -119405,26 +115687,26 @@ arH apO aqw ajg -axE -ayO -aBx -aBd -aCC -aCC -aCC -aGs -aHE +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aAf aKs aMd aRN aOA aQc -aRx +aRu aSR aUg aUg -aUg +elA aYv aZH asL @@ -119468,8 +115750,8 @@ chM ciY clZ cjT -clL -cjY +cmq +ctq cnn cjQ cnp @@ -119499,30 +115781,30 @@ der dek bZU cSR -cTI -deO +cTH +deN deX -cVx -cVW -cWw +cVz +cUZ +hEP cWV cUX cXJ dhl -dhp -dcT -cZB -ddc -ddd -dda -cZB -dhv -cYE -cZE -cZE -cZE -cZE -ddg +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -119641,7 +115923,7 @@ ado ado afv ado -ado +xYx agU ahN aiG @@ -119662,17 +115944,17 @@ aum amx ajg ajg -axE -atn -azW -aBe -aDu -auc -aCC -aGs -aHE +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aAf -aKs +nbq aMe bTq aOA @@ -119686,8 +115968,8 @@ aYw bcd axg bcN -bem -bfL +bek +bfK bhr biZ bkL @@ -119759,27 +116041,27 @@ cSS cTJ deP dfo -cUX -cUX -cWp +fPa +fPa +iYb cWW cXn cXK dhl -dhp -dcP -dda -cZB -cZB -cZB -ddc -dfS -daX -ddg -dal -cZE -cZE -ddg +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -119898,8 +116180,8 @@ aev aeT acN afA -agu -aft +agq +acN ahM aiF acN @@ -119919,21 +116201,21 @@ azc amx auL ajg -axF -ayM -azX -ayM -ayM -ayM +aaa +aaa +aaa +aaa +aaa +aaa aFd -ayM -aHF +aaa +aaa aHG aKt aMf aKm aOF -aQe +aOF aOF aOF aOF @@ -119982,8 +116264,8 @@ chM cjx cjP ckI -clL -cjY +cmq +ctq cnn cjQ cwr @@ -120016,27 +116298,27 @@ cSR cTK cUs cUY -cVy +cVw cUY -cWx +cWu cWV cUX cXJ dhl -dhp -daB -dbq -cZB -cZB -cZB -cZB -cZB -dde -ddf -ddE -ddT -ddT -dhp +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -120146,7 +116428,7 @@ aaa abq abq aaa -acG +acN abB abB abB @@ -120170,8 +116452,8 @@ amx aoW aqa arj -aqH aqa +aqH aCT amx amx @@ -120190,7 +116472,7 @@ aKu aMf aaa aaa -aQf +abq aaa aaa aaa @@ -120199,10 +116481,10 @@ abq aaa aZJ bbg -bcP +bcN bek bjA -bhs +bhq bhK bkN bpQ @@ -120239,8 +116521,8 @@ chM ciY clZ cjT -clL -cjY +cmq +ctq ckt cvj cui @@ -120251,7 +116533,7 @@ cBd cDf dbl cEz -cEz +dZe cEU cFW cLd @@ -120270,8 +116552,8 @@ cRU cRm bZU cST -cTL -cTH +cTK +cUs cUZ cVz cUZ @@ -120280,20 +116562,20 @@ cWV cXm cXJ dhl -dah -cZe -dbh -daJ -dcF -dco -cZe -cZe -daW -cZe -ddF -dbh -cZe -ddx +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -120403,8 +116685,8 @@ aaa abq aaa acu -acH -acH +acu +acu abK adv adV @@ -120425,8 +116707,8 @@ abq abq amx anS -aqa -aqa +tOU +eTd apj atM awr @@ -120447,7 +116729,7 @@ aKv aKk aaa aaa -aQg +aOG aOG aMg aMP @@ -120498,7 +116780,7 @@ cjR cdT ckM ckO -cnn +wlG cvj csX cpZ @@ -120527,8 +116809,8 @@ cRU cRm bZU cSU -cTL -cTH +cTK +cUs cVa cVA cVa @@ -120537,20 +116819,20 @@ cWX cZx cXL cSO -daX -dcn -cZB -cZB -cZB -cZB -dcJ -dcn -cYE -ddi -ddi -ddY -dge -cYE +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -120715,7 +116997,7 @@ aZJ bbi bcP beo -bfP +bfK bht bjc bkP @@ -120742,7 +117024,7 @@ bOB bOB bOB bMS -cam +bUM ben ccK chM @@ -120773,7 +117055,7 @@ cBv bTa clI cmc -cSB +jeK cVb cnE cIm @@ -120794,20 +117076,20 @@ cWY cZC cZR cSO -dhp -cZB -cZB -cZB -cZB -cZB -cZB -cZB -dcU -ddf -ddf -ddf -dgY -dhp +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -120916,10 +117198,10 @@ aaa aaa abq aaa -acw -acH -acH -acY +acu +acu +acu +abK djL adW abB @@ -120927,7 +117209,7 @@ aeU aeC afB agx -aft +acN ahP aiH ajf @@ -120936,13 +117218,13 @@ akG akR alN amY -amY -amY -amY -amY -ark +vLL +vLL +vLL +vLL +vLL asM -ark +vLL aws auh aqJ @@ -120962,8 +117244,8 @@ aMf abq aOG aQh -aRA -aRA +vLz +hNq aUk aVx aOG @@ -121030,7 +117312,7 @@ bRn cMd clQ cMd -cMd +wxw cnc cpJ cIm @@ -121051,20 +117333,20 @@ cSO cSO cVk cVk -dai -daC -cZB -dbQ -dhp -daC -cZB -dbQ -dhp -ddj -ddf -ddf -dgQ -dhp +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -121174,7 +117456,7 @@ aaa abq aaa aaa -acJ +acN acN acN acN @@ -121193,21 +117475,21 @@ akK ajH alF aAs -aAs -aAs +qiC +qiC apm -aAs -aAs +qiC +qiC ats -aAs +qiC awt atq atq -atq +wSU axI ayR aAb -aBg +aRP aCG aDN aDN @@ -121219,16 +117501,16 @@ aMf aaa aOG aUP -aRA +wRS aSV aUl -aUk +sGi aZx aOG bcl -bbj +aZL bgF -bem +bek bfR bht bje @@ -121263,15 +117545,15 @@ cdW cDS cjF ckU -cmk -cni +cmq +cnn cma cpL crA ctK cuS cvL -cvT +cma cxF cyH cAp @@ -121285,7 +117567,7 @@ cHs cGh cDg bRt -cIo +rOw cIo cmu cVm @@ -121308,20 +117590,20 @@ cXc cYf cYB cYf -cZo -cZB -cZB -dbY -deb -dcp -cZB -dbQ -dal -ddj -ddG -dev -dgZ -dal +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -121441,7 +117723,7 @@ aeU afy afZ agy -agR +acN ahR aiI ajG @@ -121455,14 +117737,14 @@ atr atr atr aqd -axJ +atr asV arZ atr -apn atr +gHt aII -apn +ulS aAc aBh azw @@ -121514,19 +117796,19 @@ bWE bZw bZA caM -cbB +bek bcX cdW cia cjE ckT -cmh +cjG ckf coo coo -crz +cia ctJ -cuR +cia coo coo cxE @@ -121544,7 +117826,7 @@ cBv bSE clV cmd -cIo +sEe cVl cIn cIm @@ -121565,20 +117847,20 @@ cXb cTX cTX cTX -dhp -daD -cZB -dbQ -dhp -daC -cZB -dcQ -cYH -cZe -cZe -cZe -cZe -ddx +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -121716,10 +117998,10 @@ agB agB agB asS -auQ +agB asS axK -aNI +aqJ aAd aBi akD @@ -121733,10 +118015,10 @@ aMf aaa aOG aQk -aRA +qYF aSX aUl -aRA +iHq aWZ aOG bco @@ -121760,7 +118042,7 @@ bGa bAk aUi bJk -bKW +bKO bMY bPq bSk @@ -121777,14 +118059,14 @@ cdX cjj ckd clE -cmh +cmq cnm coo cpN crB ctM -cuT -bHV +crB +cuF coo cxH cyI @@ -121808,12 +118090,12 @@ cYW cQh bZU cPJ -cQT +cQM cTg cSk cSk cTQ -cUw +pue cVc cRt cVZ @@ -121822,20 +118104,20 @@ cXd cYf cXb cYf -cZo -cZB -cZB -dbQ -dcm -daC -cZB -dbQ -daX -ddn -dga -deK -dgd -daX +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -121969,30 +118251,30 @@ agA apo aqx arQ -att +amK auO awu ayt awH avd aqY -ayS -aAd +atr +lgv aBj ayL aDP aFg aAE aHI -aJg +gOD aNJ aMf abq aOG -aQl -aRA -aRA -aUk +aQh +xQv +xQq +fDi aVz aOG aOG @@ -122011,9 +118293,9 @@ brY btQ btQ bAe -bAc -bDr btQ +bDr +oqV bHD aPU bJj @@ -122028,19 +118310,19 @@ bMW bMW bMW caO -bem -bcY -cdY +bek +bcX +cdW cjh -cjG -clx -cml +cmq +clL +cmq cnl cia cpM cmq -crC -cmq +xFR +cmp cvM cia cxG @@ -122057,9 +118339,9 @@ cGj czC bSX bRr -cIo +cSB cmw -cnf +cIn com cIm cje @@ -122067,32 +118349,32 @@ bZU bZU cQR cRv -cRt -cRt -cRt +lUY +lUY +lUY cUy cVd -cRt +lUY cWa cTr cXb cTX cTX cTX -daj -daC -cZB -dbQ -dhp -daC -cZB -dbQ -dhp -ddl -cZB -cZB -dha -dhp +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -122220,8 +118502,8 @@ agA agA akW akW -amZ -aqG +hIT +ala aon app aqK @@ -122233,9 +118515,9 @@ ayV auT aDD ayq -aOP +alF aZa -aBk +aRP aCI aDN aDN @@ -122246,7 +118528,7 @@ aTi aMf aaa aOG -aQm +aOG aVA aSY aUn @@ -122255,7 +118537,7 @@ aOG aaa aZJ bbm -bcP +bcN bek bfS aYx @@ -122268,13 +118550,13 @@ brZ boE boE byq -bAd +byq byq bDX -bAd +byq bkW bLS -bKO +xca bMZ bOG bQn @@ -122284,7 +118566,7 @@ bWb bWG bYb bZl -cai +bMR bek bcX cdW @@ -122295,8 +118577,8 @@ cmq cmq cox cpP -crC -crC +eKV +vuE crC cvR cwx @@ -122313,8 +118595,8 @@ dhD cGk czC cQA -cmb -cme +cQA +cQA cna cnC coq @@ -122328,7 +118610,7 @@ cTs cTW cTW cTW -cWD +cTW cTW cUu cTr @@ -122336,20 +118618,20 @@ cXb cTX aaa aaa -dhp -daC -cZB -cZB -cZB -cZB -cZB -cZB -daY -cZB -cZB -cZB -dhc -dhp +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -122490,7 +118772,7 @@ ayT auR aDg asS -aNZ +aqJ aYL aBh azw @@ -122503,7 +118785,7 @@ aNL aMf aaa aaa -aQm +aOG aOG aMg aNp @@ -122526,22 +118808,22 @@ boE byp byq bTh -boE -boE +dPn +ogV bFK bkW bLl cnj btk bOH -bQo +bSa bSa bSa bUX bWH bYJ bZl -cai +bMR bek bcX cdZ @@ -122552,7 +118834,7 @@ cmp cnn cia cpO -cmq +fsY crC cmq cvO @@ -122572,8 +118854,8 @@ czC bTb cIn cIn -cmw -cnD +vVE +cQA cos cIm cmY @@ -122593,20 +118875,20 @@ cXe cTX aaa aaa -dhp -daD -cZB -dbQ -dhp -daC -cZB -dbQ -dhp -ddo -dbi -cZB -dhb -dal +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -122732,8 +119014,8 @@ aiN aiN akc akr -ala -ala +pJV +pJV anL asa agA @@ -122760,7 +119042,7 @@ aKE aKk aaa aaa -aQn +abq aaa aaa aaa @@ -122782,7 +119064,7 @@ bsa boE byw byq -bAd +byq bDM bwi bFL @@ -122791,7 +119073,7 @@ bJp bKZ bxo bNb -bQo +bSa bSb bSa bUY @@ -122842,7 +119124,7 @@ cTt cUv cUv cUv -cWJ +cUv cUv cWb cTr @@ -122850,20 +119132,20 @@ cXb cTX aaa aaa -dhp -daC -cZB -dbQ -dcm -daC -cZB -dbQ -dcV -daJ -dhp -daY -dhe -ddx +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -123004,8 +119286,8 @@ ayW aAh axi asd -ayS -aAd +atr +lgv aBj ayL aDQ @@ -123017,7 +119299,7 @@ aKC aMf aKo aMf -aQo +aMf aMf aMf aMf @@ -123039,7 +119321,7 @@ bvW btU bwh byr -bAd +byq bDz bwi bFM @@ -123048,15 +119330,15 @@ bJn bLa bvl bNf -bQo bSa bSa -bUZ +bSa +bSa bWJ bYe bZm cas -bvT +faY ccM cea cjm @@ -123099,28 +119381,28 @@ cRt cRt cRt cRt -cUw cRt -cWa +cRt +pue cTr cXb cTX cTX cTX -dai -ddV -cZB -dbQ -dhp -daC -cZB -dbY -daX -dam -dgc -ddH -dex -cYE +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -123263,7 +119545,7 @@ aqY agB azF baq -aBk +aRP aCJ aDN aDN @@ -123273,7 +119555,7 @@ aJj aKF aMh aNr -aOH +aMh aQp aRC aMh @@ -123285,7 +119567,7 @@ aZP bbq bcY ber -bfT +bfS aYx abq aEh @@ -123296,8 +119578,8 @@ bwf boE bwi bys -bAf -boE +byq +uRT bDY bFN bGk @@ -123315,7 +119597,7 @@ bZl car ccn ccN -ceb +cdW cfo cgw cgw @@ -123328,7 +119610,7 @@ cgw cgw ctQ cwz -cgw +siL cgw cAv cCp @@ -123343,7 +119625,7 @@ cLg cMT cns cns -cEX +hHX cWG cMh cNS @@ -123351,13 +119633,13 @@ cNW cON cPN cRD -cRz -cSo -cTb -cSo -cSo +cRy +cRt +cRt +cRt +cVZ cVh -cVB +lUY daw dbm cXp @@ -123365,19 +119647,19 @@ cYf cYX cYf cZp -cZB -cZB -dbY -deb -dcp -cZB -dbQ -dhp -dbt -cZE -cZE -dgf -daX +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -123504,7 +119786,7 @@ ajL akd akN alB -alV +alB anM aoc aoo @@ -123515,11 +119797,11 @@ atv auV awz awz -aAk +aqJ aFz amE -aNZ -aAc +aqJ +nUW aBm azw aDO @@ -123530,12 +119812,12 @@ aJg aKG aMi aNs -aOI -aKG +aMi +aMi aMi aMi aUp -aOI +aMi aXa aYz aZQ @@ -123554,7 +119836,7 @@ btV bwj byt bAg -boE +vBA bDZ bFO bGj @@ -123562,48 +119844,48 @@ bJq bay bNd bNd -bQq bNd bNd bNd -bWL +bNd +bNd bNd bZn car cbE -bcZ -bbr +qBP +kuf cfp cgx -cgx +pXI cjI ckV -ckV +tPc cnt -ckV -ckV -ckV -ckV +tPc +tPc +tPc +dSJ cub -ckV -ckV +dRX +pdC cxK cyL czG -cgx -cgx -cgx +tEL +tEL +oJA cDz +xBd cgx -cFk cGq -czG -cgx +rEw cgx cgx +gsn cWl -cgx -cgx +oUC +tEL cNX cOO cPO @@ -123611,7 +119893,7 @@ cRB cRA cTC cTc -cSp +cTc cUA cVi cVC @@ -123621,20 +119903,20 @@ cXf cTX cTX cTX -dhp -daC -cZB -dbQ -dhp -daC -cZB -dbQ -dcm -dbg -cZE -cZE -deS -dhp +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -123764,14 +120046,14 @@ aks alY anO aof -aos +atr api aqP -aos +atr atw auZ -awB -awB +atv +atv awB aFB ayw @@ -123784,15 +120066,15 @@ akD amx aKL aJk -aKH +aNt aMj aNt -aOJ -aNt +aMj +elv aMj aMj aUq -aOJ +aMj aMj aMj aZR @@ -123810,8 +120092,8 @@ bvW btW bwi bBU -bAh -bAk +byq +bCf bEa bFP bHy @@ -123826,15 +120108,15 @@ cgq bWM bYg bZn -cat +car cco -bcY -cec +ccN +cee cfq cgy -cgy +oym cjJ -cgy +pDi cmm cnu cmm @@ -123842,22 +120124,22 @@ cqk crI csT cuc -cvm -cvm +cuc +cuc czx cyM czH cAA cCQ -cmm +qtw cEv cEo cFl cGr czH cIt -cvm -cvm +cuc +cuc cWH cmm cmm @@ -123878,20 +120160,20 @@ cXM cYf cXb cYf -dcb -cZB -cZB -cZB -cZB -cZB -cZB -cZB -dcW -ddp -cZE -cZE -dfC -dhp +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -124028,12 +120310,12 @@ aoq aoq auY awA -aos +atr aos aFA amE -ayU -aAi +atr +nUW aBo aCK aDR @@ -124049,7 +120331,7 @@ aMk aMk aMk aMk -aVC +aYA aXb aYA aZS @@ -124076,16 +120358,16 @@ bJr cpc bvy bOM -bQs +bSe bSe bSe bSe bWN -bSd +nKy bZo -car -bek -bcX +cas +faY +ccM ced cfr cft @@ -124098,7 +120380,7 @@ bWe cmo cmo cmo -cud +cvn cvn cwE cmo @@ -124108,7 +120390,7 @@ bZU cBJ cBJ cDb -cEp +cDb cBJ cGs cHn @@ -124135,20 +120417,20 @@ cVk cTX cTX cZT -dal -cZB -cZB -cZB -cZB -cZB -cZB -cZB -dcW -ddp -cZE -cZE -deV -dal +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -124290,25 +120572,25 @@ akD akD amx aPm -aAd -aBp +rHe +alF alM aDS aFl aCH aHP aJm -aKJ +aKI aMk aNu -aOL -aQq +aNA +aNA aRD -aSZ +aNA aNq aVD -aXc -aYB +aNC +aNC aMk beH bcX @@ -124333,14 +120615,14 @@ bJs bLe bxp bON -bQt +bSe bSf -bTM +bSe bVc bWO bYn -bZp -cau +bZn +car bek bcX cee @@ -124355,7 +120637,7 @@ cqe cqv csi cmo -cwA +cyK cxR cyK cmo @@ -124388,27 +120670,27 @@ cVk abq aaa aaa -abq aaa aaa -abq -cYE -daK -cZg -dcc -cZB -dfr -cZB -dcR -dal -ddq -ddp -ddp -dfE -cYE -abq -abq -abq +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -124590,14 +120872,14 @@ bJt bLf bCD bPs -bQs +bSe bSe bTN bVd bWP bYN bZn -cav +bNp bek bcX cef @@ -124612,7 +120894,7 @@ cnB cqf crr csU -cuf +crr cvp cxN cmo @@ -124622,7 +120904,7 @@ cAC cBJ cCI cDD -cEr +kxc cCI cGu cHo @@ -124639,33 +120921,33 @@ cIx cmY bZU cUG -cRt +cSo cUE cSV abq abq -abq -abq -abq -abq -abq -cYJ -daJ -dhp -dai -dhp -dai -dhp -dco -dba -daJ -dhp -dhp -dco -ddy aaa aaa -abq +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -124854,7 +121136,7 @@ bWw bWQ bYj bZn -cav +bNp bek bdb cee @@ -124869,7 +121151,7 @@ coP cqh crL csV -cug +crL cvq cxZ cmo @@ -124903,35 +121185,35 @@ aaa abq aaa aaa -abq aaa aaa aaa aaa aaa -abq aaa aaa aaa aaa -abq -cVG -cVG -cVG -cVG -cVG aaa aaa -abq -abq aaa -abq -abq aaa -abq -abq -abe -abf +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -125062,7 +121344,7 @@ aFX aKc aQy bfk -bmI +aFA amE aDU aFn @@ -125073,7 +121355,7 @@ aOb aMl aNx aUa -aNA +hnt aNA aTc aNq @@ -125118,7 +121400,7 @@ ceg cfu cgC cif -cjK +iWi ckZ cmo cng @@ -125126,7 +121408,7 @@ coJ cpd crM cuq -cuh +crM cvr cxX cmo @@ -125159,37 +121441,37 @@ cVk aaa abq aaa -cVG -cVG -cNz -cNz -cVG -cVG -cVG -cVG -cVG -cVG -cVG -cVG -cVG -cVG -cZG -bMu -bMu -cVG -cVG -cVG -abq -aaa -aaa -abq aaa aaa aaa -abq aaa -abf -abf +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -125318,12 +121600,12 @@ amE amE amx aUx -aAd -aBt -azz -aDV +tay +aWo +amE +aDX aFo -anx +alM aHT aJq aOi @@ -125334,9 +121616,9 @@ aQs aSy aTd aUs -aNC +nLj aXd -aNC +gGG aZT aMk bdc @@ -125373,7 +121655,7 @@ cbG ccP ceh cfv -cgD +czP cig cjL cla @@ -125399,11 +121681,11 @@ czM czM cIx cJn -cMj -cLo -cLo -cLo -cQv +qsd +nzK +nzK +nzK +pzX cOX cPW cSs @@ -125415,38 +121697,38 @@ qbl bZU abq abq -abq -cVG -cXq -cXO -cnU -cYK -cZr -cZG -bMu -aOE -cZr -cZG -bMu -aOE -cZr -cZH -bMu -bMu -cVG -dcs -cVG -cVG -cVG -cVG -cVG -cVG -cVG -cVG -abq -abq aaa -abe +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -125564,7 +121846,7 @@ amy apA dfn dfn -apw +dfn aqU ash atx @@ -125574,7 +121856,7 @@ akD aAo aGr aKb -aSL +aPc aAm aBu aAN @@ -125587,13 +121869,13 @@ aOh aMl aNz avB -aNA +eSB aNA aTc aNq aVE aVE -aNC +veh aZU aYA bdd @@ -125631,7 +121913,7 @@ ccQ cee cOm cgE -cih +cic cjM clb coA @@ -125656,7 +121938,7 @@ cHC cKh cIx cJm -cMj +pkf cLr cMl cNh @@ -125673,37 +121955,37 @@ aef aef abq aaa -cVG -cmD -cXP -cYp -cnW -cZr -cZH -bMu -bMu -cZr -cZH -bMu -bMu -cZr -cZH -bMu -bMu -cVG -dct -dcH -dcH -dcH -dcH -dcH -dcH -ddJ -cVG aaa aaa aaa -abf +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -125831,9 +122113,9 @@ akD aAn aAn aKB -aVM +aRP bfF -aBv +aFz amE aDX aFq @@ -125872,8 +122154,8 @@ bEi bFV bhw bJo -bLk -bNk +bLi +bNh bQe bRx bTG @@ -125884,17 +122166,17 @@ bZk bNh caz bek -ccQ +xJS cee cft cgF -cih +cic cjN ckE cmr cmo cmo -byS +bWe cmo cmo bWe @@ -125907,7 +122189,7 @@ cAG cBi cAG cDF -cFY +qHr cFq cHK cKs @@ -125930,38 +122212,38 @@ abq abq abq aaa -cVG -dbC -cXQ -cYq -dcq -cZr -cZH -bMu -bMu -cZr -cZH -bMu -bMu -cZr -csB -csF -csL -cVG -dcu -cVG -cVG -cVG -cVG -cVG -cVG -ddK -cVG -abq aaa aaa -abf -abf +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -126077,7 +122359,7 @@ amP aoe apC apC -apC +npj atD aqV asm @@ -126088,9 +122370,9 @@ akD aFg aGE aKc -aUS +aQy bfA -aBw +aFz amE aDY aFr @@ -126104,10 +122386,10 @@ aOR aNA aRI aTf -aOo -aVF -aXe -baS +aNq +aVE +aVE +aNC aNC aYA bdc @@ -126127,7 +122409,7 @@ bAm bCn bEj bHz -bEh +uuE bJy bOK bNh @@ -126141,7 +122423,7 @@ bYP bNh cbb bek -ccQ +xJS cei cOm cgG @@ -126187,38 +122469,38 @@ aaa aaa abq aaa -cVG -cXt -cXR -cYr -dcl -cZr -cpf -cqc -cqJ -cZr -crs -cse -csm -cZr -dbe -dcx -dcz -dcB -ddS -bGU -cVG -bMu -bNH -bPk -cVG -ddK -cVG -abq aaa aaa aaa -abe +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -126331,10 +122613,10 @@ ajO akB akY amQ -amC +aoe apD ara -apC +lhK atE aqV aqj @@ -126346,7 +122628,7 @@ akD akD akD azG -aAd +fTe aCl aCO aCO @@ -126370,7 +122652,7 @@ aMk bdc bek bfY -bhx +bhw bnA bla bmV @@ -126402,7 +122684,7 @@ ccR bZu cfw cgu -bUx +cic bUz clc clm @@ -126424,7 +122706,7 @@ czM czM cxS cGA -cDp +cxS cIx cJp cJp @@ -126441,42 +122723,42 @@ bZU aaa abq aaa -cVF -cVG -cVG -cVG -cVG -cnk -cYr -cYQ -cTk -dbe -dbB -deT -daF -dbe -dcf -dfW -daF -dch -dab -dbS -dcj -dgB -bGW -dcX -bMu -bMu -bMu -cVG -ddK -cVG aaa aaa aaa -abq -abf -abq +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -126592,8 +122874,8 @@ amB apE arb aoH -apC -apC +gog +gog aso axL avs @@ -126602,7 +122884,7 @@ ayY aAp aGF aKO -aNI +aqJ bgl bnu aCO @@ -126643,7 +122925,7 @@ bEl bHC bhw bJo -bLn +bLi bHB bNh bQB @@ -126655,7 +122937,7 @@ bZz bZX caM bek -ccQ +xJS bbg bZU bZU @@ -126677,16 +122959,16 @@ czO cAI cBO cDJ -cgC +cic cHT cFs -cGB -cHv +cvv +cuv cIy cJq -cgC +mpt cLs -cMo +cjK cNj cOf cOZ @@ -126698,36 +122980,36 @@ cTk cNz cNz cNz -cVG -daE -cWA -cXg -cXu -cXS -cYs -cYP -cZu -cZM -cZZ -daG -daR -dbo -cZZ -daG -dbz -dcg -dab -dbT -dci -ddU -bHo -bMs -bMs -bNZ -bMu -cVG -ddL cNz +cNz +cNz +cNz +cNz +aaa +aaa +aaa +aaa +abq +aaa +aaa +abq +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +abq +abq +abq aaa aaa aaa @@ -126844,11 +123126,11 @@ aiZ akb alA alu -amS +amQ amF anU arc -apC +vgP atG aqV ass @@ -126859,7 +123141,7 @@ aza aAt aGI aMo -aXq +aPb bgI aBw aCP @@ -126912,7 +123194,7 @@ bZz bZX caM bek -ccQ +xJS bbi bZU cfE @@ -126934,59 +123216,59 @@ czP cAJ cBP cCO -cCO +pdV cEw cFt cGC -cHw -cxP cCO +iNq cCO +qcX cLt cMp cNk cOg -cPa +cPY cPY cQQ cRJ cVJ cTl cTY -cUH +cTY cVn -cVH -cWh -cWF -cXi -cXv -cXT -cYt -cZK -cZU -das -daa -dar -daH -daH -dbd -dbn -daH -daH -dbJ -dbU -dez -dej -bMo -bMu -bMu -bMu -bPl -cVG -ddM -ddN -ddO -ddP +cTY +cTY +cTY +mGK +cNz +aaa +aaa +aaa +abq +abq +abq +abq +abq +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +abq +aaa +aaa aaa aaa aaa @@ -127098,14 +123380,14 @@ agC adg aib aja -ajY +ugy akU als amT -amD -apC +amF apC apC +vXU apy aqV asr @@ -127123,7 +123405,7 @@ aCQ aEb aFu aIR -bHc +tvn aMJ aKR aMn @@ -127132,14 +123414,14 @@ aOU beL aRL aUO -cjd +con aVI -aXf +aTn aYH -aZX +aTn bby bdg -bew +beu bjD bhw bjj @@ -127155,9 +123437,9 @@ bAq bCr bEn bHH -bhx +bhw bJB -bLp +bLi bNl bNh bQD @@ -127169,7 +123451,7 @@ bZD bZX caM bek -ccQ +xJS bbi bZU bVI @@ -127186,8 +123468,8 @@ cup cvz cwO cxQ -cyY -czQ +cwR +cic cAK cBQ cCP @@ -127196,12 +123478,12 @@ cEx cFu cGD cHx -cIz -czQ +cIy +cic cMZ cLu cMq -cNl +cAK cOh cPb cic @@ -127212,36 +123494,12 @@ cTm cNz cNz cNz -cVG -cWg -cWE -cXh -cVG -cXU -cYu -cYR -cZD -daq -dab -daI -dfD -dbr -dab -dbs -dbA -dbr -dab -dbV -cYR -ddX -bMp -bMv -bMu -bOc -bMu -cVG -dcD cNz +cNz +cNz +cJg +cNz +aaa aaa aaa aaa @@ -127252,6 +123510,30 @@ aaa aaa aaa aaa +abq +aaa +aaa +aaa +aaa +abq +cVG +cVG +cVG +cVG +cVG +aaa +aaa +abq +abq +aaa +abq +abq +aaa +abq +abq +abe +abf +aaa aaa aaa aaa @@ -127373,10 +123655,10 @@ azd aAv aHf aKO -ayS -aAs -aBA -aCR +atr +lWo +aFz +aCP aEc aFv byD @@ -127393,7 +123675,7 @@ aUv aVJ aXg aYI -aTr +vVo bbz bdh bek @@ -127450,14 +123732,14 @@ cBR cxU cxU cEy -cbZ +cdM cFL cdM cEy -dgS -dgS +cEK +cEK cBN -dgS +cEK cOk cOi cPc @@ -127469,46 +123751,46 @@ bZU aaa abq aaa -cVI -cVG -deA +aaa +aaa +cNz +cJg +cNz +aaa +aaa +aaa +aaa cVG cVG -cnv -cYu -cZL -cTk -ddW -dbI -dbR -daF -dfH -dck -dbR -daF -daq -dab -dbW -deB -det -bMq -dcX +cNz +cNz +cVG +cVG +cVG +cVG +cVG +cVG +cVG +cVG +cVG +cVG +cZG bMu bMu -bPI cVG -dcD +cVG cVG abq aaa aaa +abq +aaa +aaa +aaa +abq aaa abf -aaa -aaa -aaa -aaa -aaa +abf aaa aaa aaa @@ -127637,7 +123919,7 @@ aCO aFH aFw aGG -bIb +bHc bNV aLM aMn @@ -127648,7 +123930,7 @@ aVB aTk con aVK -aXh +aTo aYJ aZY ayu @@ -127697,7 +123979,7 @@ cqp crU cmz cvX -cvB +cvz cwQ bYI bNN @@ -127711,11 +123993,11 @@ cHz cHL cIE cJz -dgS +cEK cKx cKx cKx -dgU +cNn cOj cPd cPZ @@ -127728,44 +124010,44 @@ aaa aaa aaa aaa -cxT +cNz +rDg +cNz +aaa +aaa +aaa +abq cVG -cmG -cXV -cYu -dgW +cXq +cXO +cnU +cYK cZr -cpg -cqj -cqX +cZG +bMu +aOE cZr -csd -csf -csA +cZG +bMu +aOE cZr -dcw -dcy -dcA -ddR -des -bGU +cZH +bMu +bMu +cVG +dcs +cVG +cVG +cVG +cVG +cVG cVG -bNG -bPj -bPK cVG -dcD cVG abq abq -abq -abq -abf -aaa -aaa -aaa -aaa aaa +abe aaa aaa aaa @@ -127878,7 +124160,7 @@ asp asp aod apG -are +asp asx atK atb @@ -127887,9 +124169,9 @@ azx azx aHh awd -aXD +amx blZ -aBC +amx aCO aEe aFx @@ -127938,9 +124220,9 @@ bht bht bht deF -cav +bNp bek -ccO +sQp cek chd dhd @@ -127968,11 +124250,11 @@ cFx cGG cHA cJz -dgS +cEK cfH cfH cfH -dgU +cNn cPi cPe cQa @@ -127985,44 +124267,44 @@ aaa aaa aaa aaa +cNz +cJg +cNz +aaa +aaa +aaa aaa cVG -dbK -cXW -cYu -cYU +cmD +cXP +cYp +cnW cZr -bMu -bMu cZH +bMu +bMu cZr -bMu -bMu cZH +bMu +bMu cZr -csD -csK -csM +cZH +bMu +bMu cVG -dcC +dct +dcH +dcH +dcH +dcH +dcH +dcH +ddJ cVG -cVG -cVG -cVG -cVG -cVG -dcD -cVG -abq +aaa aaa aaa abf -abf -aaa -aaa -aaa -aaa -aaa aaa aaa aaa @@ -128145,7 +124427,7 @@ avk atK atK aXC -aze +vDW aBD aCS aCS @@ -128169,22 +124451,22 @@ bbB bdc bek bgb -bhy +bfV bjm blf -bhy +bfV bsV -bqt +bfV bvs buj -bhy +bfV byF bCB -bhy +bfV bEp -bhy +bfV bHL -bJE +bcN bLs bNp bNp @@ -128194,8 +124476,8 @@ bTW bVn bXP bYr -bZs -caE +bNp +bNp cbA ccU bZu @@ -128212,7 +124494,7 @@ ctE cmz cus cvD -cih +cic cxU czc czT @@ -128225,11 +124507,11 @@ cFy cGH cKv cLn -dgS +cEK cNd chu chu -dgU +cNn cOl cPf dcd @@ -128242,45 +124524,45 @@ aaa aaa aaa aaa +cNz +cJg +cNz +aaa +aaa +aaa aaa cVG -dbF -cXX -cYv -cYV +dbC +cXQ +cYq +dcq cZr -bMu -bMu cZH +bMu +bMu cZr -bMu -bMu cZH +bMu +bMu cZr -dbD -dbM -dbZ +csB +csF +csL cVG -dcD -dcD -dcD -dcD -dcD -dcD -dcD -dcD +dcu +cVG +cVG +cVG +cVG +cVG +cVG +ddK cVG abq -abq -aaa -abe -aaa -aaa -aaa -aaa -aaa aaa aaa +abf +abf aaa aaa aaa @@ -128425,7 +124707,7 @@ aZZ beS bdi bex -bgc +bfI bfI bjn bfI @@ -128443,7 +124725,7 @@ bbr bHM bJF bLt -bNq +bbr bOV bQG bbr @@ -128469,7 +124751,7 @@ cmz cmz cic cvE -cih +cic cxU cAB cBb @@ -128482,11 +124764,11 @@ cFz cGI cIK cLQ -dgS +cEK cgL chu cke -dgU +cNn cJL cPg cKN @@ -128499,45 +124781,45 @@ bZU bZU bZU aaa +cNz +cJg +cNz +aaa +aaa +aaa aaa cVG -cXz -cnT -cnV -cpe +cXt +cXR +cYr +dcl cZr -bMu -bMu -dav +cpf +cqc +cqJ cZr -aOE -bMu -dav +crs +cse +csm cZr +dbe +dcx +dcz +dcB +ddS +bGU +cVG bMu -bMu -cZH -cVG -dcE -cVG -cVG -cVG -cVG -cVG -cVG +bNH +bPk cVG +ddK cVG abq aaa aaa -abf -aaa -aaa -aaa -aaa -aaa -aaa aaa +abe aaa aaa aaa @@ -128640,9 +124922,9 @@ aui aui awx azt -agj -azE -bPL +mcY +xbe +xXW alJ azE aid @@ -128698,16 +124980,16 @@ bhz bhz bhz bhz -bwx +qCG bLu bNr bOW bQH -bOW +bNr bTX -bOW -bOW -bOW +bNr +bNr +bNr bZt caF cbK @@ -128730,7 +125012,7 @@ cwS cxU cze cAY -cAQ +cAN cBV cDP cxU @@ -128739,11 +125021,11 @@ cFA cGI cIJ cLG -dgS -dgT +cEK +cKB chE -dgT -dgU +cKB +cNn cOn cPh cQd @@ -128756,45 +125038,45 @@ chy cYm bZU aaa +cNz +cJg +cNz aaa -cVG -cVG -cNz -cNz -cVG -cVG -cVG -cVG -cVG -cVG +cVF cVG cVG cVG cVG +cnk +cYr +cYQ +cTk +dbe +dbB +deT +daF +dbe +dcf +dfW +daF +dch +dab +dbS +dcj +dgB +bGW +dcX +bMu bMu bMu -dav -cVG cVG +ddK cVG aaa -abq -abq -abq -abq -abq aaa -abq +aaa abq abf -abf -abq -aaa -aaa -aaa -aaa -aaa -aaa aaa aaa aaa @@ -128896,7 +125178,7 @@ aol asZ ava aww -azt +xOM agj azE bPL @@ -128947,7 +125229,7 @@ bnd boQ bqw bZi -boA +blC bsm blC bsm @@ -128957,7 +125239,7 @@ bsp bHA bJG bLv -bLG +bHA bsp bQI bQI @@ -128988,13 +125270,13 @@ cxU cBh cBc cAR -cAQ +cAN cCV cxU cGU cFB cGJ -cHE +cHA cKr cJr cYS @@ -129013,40 +125295,40 @@ cuV cZJ bZU aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +cNz +cJg +cNz +cNz cVG +ged +cWA +cXg cVG +cXS +cYr +cYP +cZu +daq +dab +daG +daR +dbo +dab +daG +dbz +dcg +dab +dbT +dci +ddU +bHo +bMs +bMs +bNZ +bMu cVG -cVG -cVG -aaa -abq -aaa -aaa -aaa -abq -aaa -aaa -aaa -aaa -aaa -abe -aaa -aaa -aaa +ddL +cNz aaa aaa aaa @@ -129154,7 +125436,7 @@ asZ asZ aww ajv -afs +afr aBK bTg deG @@ -129214,7 +125496,7 @@ bID bHO bCy bLw -bNt +bCy bQC bQI bTD @@ -129234,7 +125516,7 @@ bZv clj cmz cny -cqt +cnI cqt crZ cOm @@ -129270,42 +125552,42 @@ chy cYw bZU aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -abq -aaa -aaa -aaa -aaa -abq -abq -abq -abq -abq -abq -abq -abq -abq -abe -abf -aaa -aaa -aaa -aaa -aaa +cNz +jhQ +hlZ +cTY +pad +cWh +cWF +cXi +cXv +cXT +cYt +cZK +cZU +das +daa +dar +oiv +oiv +dbd +dbn +ntG +daH +dbJ +dbU +dez +dej +bMo +bMu +bMu +bMu +bPl +cVG +ddM +ddN +ddO +ddP aaa aaa aaa @@ -129436,9 +125718,9 @@ akD aEg aFT aFy -aHd +aJw aJv -aKY +aJw aMp aJw aOZ @@ -129471,12 +125753,12 @@ bGd bHO bJH bLx -bNu +bCy bQE bQI bVs -bUa -bVq +eIn +okl bXd bYE bZv @@ -129492,7 +125774,7 @@ cmZ cmA cnI coU -cqt +skc csa cfw cic @@ -129512,9 +125794,9 @@ cHG cIG cJt cNq -cIE +obL cOr -cNp +cEK cln clN chy @@ -129527,29 +125809,40 @@ cUJ bZU bZU aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -abq -abq -abq -abq -abq -abq -abq -abq -aaa -abq +cNz +cNz +cNz +cNz +cVG +cWg +cWE +cXh +cVG +cXU +cYu +cYR +cZD +daq +dab +iae +dfD +dbr +dab +dbs +dbA +dbr +dab +dbV +cYR +ddX +bMp +bMv +bMu +bOc +bMu +cVG +dcD +cNz aaa aaa aaa @@ -129585,17 +125878,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa "} (131,1,1) = {" aaa @@ -129694,7 +125976,7 @@ aDd alW aWv aGJ -aJw +nVz aKZ aPS aPS @@ -129714,7 +125996,7 @@ bgg bhC bjr aOD -bne +vEp boR bqx blC @@ -129728,13 +126010,13 @@ bGe bHO bCy bLy -bNt +bCy bHO bNn bSt bUb bXc -bXd +mAt bZd bZv caQ @@ -129759,7 +126041,7 @@ cxM cAH cBj cDN -cDN +lfz cEH cxV cGV @@ -129788,41 +126070,41 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +cVI +cVG +deA +cVG +cVG +cnv +cYu +cZL +cTk +ddW +dbI +dbR +daF +dfH +dck +dbR +daF +daq +dab +dbW +deB +det +bMq +dcX +bMu +bMu +bPI +cVG +dcD +cVG abq aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +abf aaa aaa aaa @@ -129970,9 +126252,9 @@ bez bjF bhD bjs -bkR +bkk bng -boT +boR bqz bsm bsm @@ -129985,20 +126267,20 @@ bGd bHP bJI bLy -bNv -bOZ +bCy +bHO bQJ -bSu -bUc +bSt +bSt bYt -bXe +mAt bSt bZv cbn cbN cdb cfD -cdf +uzt cgS cjf bZv @@ -130011,7 +126293,7 @@ cmB cte cte cvJ -cwX +cte cxV cAM cBm @@ -130028,7 +126310,7 @@ cLl cMy cNy cPm -cNr +cEK cOs bZU bZU @@ -130047,39 +126329,39 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +cxT +cVG +cmG +cXV +cYu +dgW +cZr +cpg +cqj +cqX +cZr +csd +csf +csA +cZr +dcw +dcy +dcA +ddR +des +bGU +cVG +bNG +bPj +bPK +cVG +dcD +cVG abq -aaa -aaa abq -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +abq +abq +abf aaa aaa aaa @@ -130206,8 +126488,8 @@ aBI aQd aRt aTe -aGK -aHe +aBI +aGJ aIe aLa aMr @@ -130217,7 +126499,7 @@ aQI aRT aTt aTo -aVS +aTq aTp aYK bac @@ -130246,9 +126528,9 @@ bNw bPa bQL bSv -bUd +bSt bYs -bXf +mAt cba bZv cbd @@ -130305,38 +126587,38 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -abq +cVG +dbK +cXW +cYu +cYU +cZr +bMu +bMu +cZH +cZr +bMu +bMu +cZH +cZr +csD +csK +csM +cVG +dcC +cVG +cVG +cVG +cVG +cVG +cVG +dcD +cVG abq aaa aaa -abq -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +abf +abf aaa aaa aaa @@ -130466,7 +126748,7 @@ aFD aGL aIh aJz -aLb +aJw aBI aBI aBI @@ -130505,13 +126787,13 @@ bRU bSw bSt bVu -bXg +mAt bZj bZv cbt -cbP +dHm cdd -cit +cdh cdh bYA chm @@ -130562,37 +126844,37 @@ aaa aaa aaa aaa +cVG +dbF +cXX +ueD +cYV +cZr +bMu +bMu +cZH +cZr +bMu +bMu +cZH +cZr +dbD +dbM +dbZ +cVG +dcD +dcD +dcD +dcD +dcD +dcD +dcD +dcD +cVG +abq +abq aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +abe aaa aaa aaa @@ -130762,14 +127044,14 @@ bQK bSw bSt bVq -bXh -bUc +mAt +bSt caG -cbp -cbQ +cbW +cbO cde ces -cde +lIR bYz cjf bZv @@ -130778,7 +127060,7 @@ cmB cnK coX cqx -bAN +bIO cto cuz cwH @@ -130819,37 +127101,37 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa +cVG +cXz +cnT +cnV +cpe +cZr +bMu +bMu +dav +cZr +aOE +bMu +dav +cZr +bMu +bMu +cZH +cVG +dcE +cVG +cVG +cVG +cVG +cVG +cVG +cVG +cVG abq aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +abf aaa aaa aaa @@ -130978,7 +127260,7 @@ avr aBI aBI aBI -aIj +aBI aJB aBI aBI @@ -130999,8 +127281,8 @@ bks bhG aoG blm -bne -boR +dnk +xla bqx bsp bus @@ -131025,7 +127307,7 @@ bZy cbW cbR cdf -cdf +oBY cfD bYC cjZ @@ -131034,12 +127316,12 @@ clj cmB cnL coY -cnK +lFT bIO cuj cuA +cwH cha -cxb cyP cmB cfY @@ -131076,38 +127358,38 @@ aaa aaa aaa aaa +cVG +cVG +cNz +cNz +cVG +cVG +cVG +cVG +cVG +cVG +cVG +cVG +cVG +cVG +bMu +bMu +dav +cVG +cVG +cVG aaa +abq +abq +abq +abq +abq aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +abq +abq +abf +abf +abq aaa aaa aaa @@ -131244,8 +127526,8 @@ bVm aQJ aVH aTx -aUA -aVS +aTp +aTq aTp bbu aZZ @@ -131277,12 +127559,12 @@ bSy bUf bXb bXX -bNy +bSw bZv cbv cbS -cdg -cix +cdh +cdh cdh bYB cjf @@ -131291,12 +127573,12 @@ clj cmB cnM cnK -cnK +lFT bIO ctS cuB -cgZ -cxc +cwH +cha cyO cmB clP @@ -131346,23 +127628,23 @@ aaa aaa aaa aaa +cVG +cVG +cVG +cVG +cVG +aaa +abq +aaa +aaa +aaa +abq aaa aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +abe aaa aaa aaa @@ -131501,10 +127783,10 @@ bWp aQK aRX aTy -aUB -aVW -aXl -aYR +aTo +aTo +aTp +aYK bag aoG bdr @@ -131537,7 +127819,7 @@ bQI bNB bZv ccs -cbP +cbS cdh cdh cdh @@ -131604,22 +127886,22 @@ aaa aaa aaa aaa +abq aaa aaa aaa aaa -aaa -aaa -aaD -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +abq +abq +abq +abq +abq +abq +abq +abq +abq +abe +abf aaa aaa aaa @@ -131752,7 +128034,7 @@ aGO aIp aJF aLf -aMv +aNP aNP bVo aQL @@ -131794,11 +128076,11 @@ bXk bNA bZv cbF -cbO -cde +ktI +imQ cet -cde -bYz +imQ +edg cku bZv clj @@ -131859,21 +128141,21 @@ aaa aaa aaa aaa +abq +abq +abq +abq +abq +abq +abq +abq +aaa +abq aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +abq aaa aaa aaa @@ -131990,7 +128272,7 @@ cXo aki alc amb -ane +amb amb apT ajp @@ -132000,7 +128282,7 @@ avr awo awo avr -ayJ +awo aBN avr avv @@ -132009,13 +128291,13 @@ aGP aIn aJF aLg -azl +avv aNQ aNQ aNQ aRZ aTA -aUD +aRZ aNQ aNQ aNQ @@ -132077,7 +128359,7 @@ bZU bZU bZU bGQ -cHS +thz cJu cBN cMr @@ -132247,17 +128529,17 @@ cWS akj ald amc -anf +amc aoy apU arm asD atR aBy -awR +gQu ayc azZ -aAF +awR aBM aCW aEo @@ -132265,7 +128547,7 @@ aFI aGQ aJF aJE -aLf +nhZ aMy aNQ aUf @@ -132334,7 +128616,7 @@ cDa chy cEM cEN -cHS +pkJ cJf cBN cLq @@ -132504,7 +128786,7 @@ amN cXD cXZ cYb -cYc +cYb cYb cYe cYx @@ -132523,7 +128805,7 @@ aGR aJG aJG aLh -aLm +aMy aNQ aPq aQN @@ -132551,11 +128833,11 @@ aoG bAz bCG bEz -bEv -bCH +poN +dTK bJM -bCH -bIL +dTK +vYK bEv bQS bQI @@ -132759,10 +129041,10 @@ cZi aij ajn akl -ald +erQ amd -ang -aoz +amc +amc apW aro asF @@ -132775,11 +129057,11 @@ aAH aye aCY aEq -aGz +aJE aGS aJE aJE -aJH +aGS aMw aNQ aPh @@ -132799,7 +129081,7 @@ bhJ bjw beC bnn -boZ +boR bqE aoG buy @@ -133015,14 +129297,14 @@ cKl aik aik amW -akm +qAG ale ame ame ame apX -arp -asG +apY +aki auP avv avv @@ -133065,7 +129347,7 @@ aoG aoG aoG bEB -bGm +bHU bHU bHU bLH @@ -133272,14 +129554,14 @@ aik aik ain ajp -akm +qAG akm amf amj aoA apY -arp -asG +apY +aki auH avv axP @@ -133314,15 +129596,15 @@ bjx bbH bne boR -bqF -bsr -buA +bqx +aoG +arr bwN aLC bZJ aoG bEC -bGn +bHW bLI bJO bTd @@ -133336,10 +129618,10 @@ bXo bEG cap cdi -cbU -cbU +mcn +mcn cex -cbU +mcn chD clq cbU @@ -133530,13 +129812,13 @@ ahg aio ajp akn -alf -amg +akh +akh anh -amg -amg -arq -asG +akh +akh +akh +aki atW avv awV @@ -133569,7 +129851,7 @@ bgp bhM bjy bbH -bno +bnf bpa bqG bmB @@ -133580,11 +129862,11 @@ bAB aoG bED bGo -bHW -bEC +xyZ +gIN bLJ bKm -bPf +bHW bQU bTQ bUl @@ -133593,12 +129875,12 @@ bXp bEG bXi bYy -cbV -cbV -cey -bgJ -cbV -cfJ +asJ +asJ +sfr +asJ +asJ +asJ cjX cnQ asJ @@ -133782,18 +130064,18 @@ aaa afb ahH agh -ajs +ahH afb ajb ajp ako -alg +ajp amh amh -aoB +aki apZ apZ -asH +aki avJ avv ayp @@ -133853,7 +130135,7 @@ caX asI asI cez -cfI +bxI asI aoG aoG @@ -134036,22 +130318,22 @@ aaa aaa abq aaa -cKI +afb afH agi afH -ahh -aiv -aiv -aiv +afb +aeN +aeN +aeN alh aeN aeN -aoC -aqD -aqD -aqD -atY +alh +aeN +aeN +aeN +afb avv avv avv @@ -134078,17 +130360,17 @@ aNQ bak bbH bdv -beF +beE bgr -bhO +bhN bnJ -blp -bng -bpc -bqH +bbH +dnk +xla +bqx aoG aoG -bwQ +bwK aoG buy aoG @@ -134105,12 +130387,12 @@ bUn bVD bXr bEG -asJ -cdo +fFl +kUj arr asI -cdo -ceC +sfr +asJ cis buC cmx @@ -134293,11 +130575,11 @@ aaa aaa abq aaa -acJ +afb afH ajD afH -ahj +aeN air air air @@ -134308,7 +130590,7 @@ air air air air -atZ +afb aDe buC ath @@ -134316,7 +130598,7 @@ axR aAL aBT aoG -aBW +dHr aoG aoG aoG @@ -134340,14 +130622,14 @@ bgs bhP bjB blq -bnj +iHk boV bqx aoG arr -bzq -byR -bAD +bwZ +aub +asJ aoG bEG bEG @@ -134363,11 +130645,11 @@ bVE bEG bEG bZF -aCa +ofz bdl asI -cdo -ceC +sfr +asJ cir buC clR @@ -134551,10 +130833,10 @@ aaa abq abq abe -afI +afH agk -agI -ahj +afH +aeN air air air @@ -134565,7 +130847,7 @@ air air air air -atZ +afb aoG aoG buC @@ -134619,12 +130901,12 @@ bNF bWT bNF bNF -aCa +oMK caZ cbX asI -cdo -ceC +sfr +asJ cfK cfK cfK @@ -134822,31 +131104,31 @@ air air air air -atZ +afb axb asJ ayk asI aoG -aBW +dHr asI -axh -axh -axh -axh -axh -axh -axh -axh -axh -axh -axh -axh -axh -axh -axh -axh -axh +cwA +cwA +cwA +cwA +cwA +cwA +nMC +nMC +nMC +nMC +nMC +nMC +aCg +aCg +aCg +aCg +aCg bam bam bam @@ -134880,8 +131162,8 @@ aoG aoG asI asI -cdo -ceC +sfr +asJ cfK ciD cka @@ -135068,7 +131350,7 @@ abe abq abe abq -ahj +aeN air air air @@ -135079,31 +131361,31 @@ air air air air -atZ +afb avy aub ayl asJ aoG -aBW +dHr arr -axh +cwA aHH aIV aJI aJT aLq -aCg +nMC aNS aNT aQS aQS -aCg +nMC aWN aYE aZI aYV -bam +aCg bdE bdy beI @@ -135114,9 +131396,9 @@ bam bno bpe bqK -bsu +bqx bwo -bsu +bqx byT bAG bEQ @@ -135138,7 +131420,7 @@ aoG cbX cdm ceA -ceC +asJ cfK chs ckb @@ -135325,7 +131607,7 @@ aaa aaa abf aaa -ahj +aeN air air air @@ -135336,7 +131618,7 @@ air air air air -atZ +afb avz asJ aym @@ -135344,23 +131626,23 @@ awL ayo aBX asJ -axh +cwA ajS -aHa -aIA -aJL +riM +tbK +hHE aLp -aCg +nMC aNT aNT aQS aSg -aCg +nMC aUL aYD aXx aYU -bam +aCg bfd bdz beJ @@ -135375,12 +131657,12 @@ bsv buF bwT bwT -bAH +bwT bCK bwT -bGs -bGs bJR +bGs +gda bLP bkU bTK @@ -135393,9 +131675,9 @@ bUr bZH aoG azp -cdo -ceB -cfJ +sfr +asJ +asJ cfK ciF ckc @@ -135582,42 +131864,42 @@ aaa aaa abe aaa -ahy -aiv -aiv -akp -ali aeN aeN -aoD -aqb -aqb -aqb -aua +aeN +afb +alh +aeN +aeN +alh +afb +afb +afb +afb aoG asI ayn asJ aoG -aBW +dHr asI -axh +cwA aIz -aHg +dom aIw -aJO +rNt aLu -aCg +nMC aNU aPl aQT aSh -aCg +nMC aWX aYG aXF aYU -bam +aCg bbK bdz beK @@ -135632,12 +131914,12 @@ bsw buG bzb byU -bAI +byU bFa bGv bGt bIa -byU +bGt bLQ bNI bGR @@ -135650,20 +131932,20 @@ asJ bZI aoG bef -cdo -ceC +sfr +asJ cfK cfK chQ aRQ cly -cly +sdQ cor clA clA -ctu -ctu -ctu +clA +clA +clA cyn ctt abq @@ -135856,25 +132138,25 @@ aoG aoG aoG aoG -aBW +dHr aDa -axh +cwA akP -aHg -aIx +dom +aIw aJM aLr -aCg +nMC aNV -aOd -aOd -aSi -aCg +sBY +sBY +sBY +nMC aST aUK aZM aST -bam +aCg bam bdA bmN @@ -135889,14 +132171,14 @@ bbf bjM bnt bnt -bAJ +bbG bCM bCM bDT bNj bDT bNK -bNJ +bCM bPm bCM axh @@ -135914,14 +132196,14 @@ ciu ciH bhv biB -biB +jmm bul clB cqr -cnX +clB bQA -ctu -ctu +clA +clA cyu abq aaa @@ -136101,32 +132383,32 @@ abq aaa afb alk -amj +hnL anj aoF aqc aqt -asJ +xGP ayv -asJ +xGP ayv -asJ +xGP ayv -asJ -aBW +xGP +qQy dgI -axh +cwA aIS aIv aID aJQ aLR -aCg -aCg +nMC +nMC bXu bXu -aCg -aCg +nMC +nMC aVg aYQ aXQ @@ -136146,7 +132428,7 @@ bsy bwH bwV bjN -bAK +asJ bCN bEK bIM @@ -136165,7 +132447,7 @@ bYH awL ayo cfy -ceC +asJ cfK cgW chX @@ -136372,12 +132654,12 @@ aoG aoG aBZ axh -axh -aFR +cwA +qpO aCM aJR -aGv -aFR +aCM +qpO aFR aPK aHa @@ -136400,18 +132682,18 @@ brb bpi bqP bsz -bwH +dqh bzr bjN -bAK +asJ bCN bGz bGw -bId +hYZ bId bLT bOD -bQj +bOD bCM cBF cBG @@ -136422,7 +132704,7 @@ ckg bXt aoG ceR -ceC +asJ cfK chf ciJ @@ -136434,8 +132716,8 @@ clD cqI cNm cuO -ctu -ctu +clA +clA cyu abq aaa @@ -136628,12 +132910,12 @@ buC bZJ asJ aBW -axh +aCg aEA aGc -aDs +aIA aIE -aKT +aIA aOX aMR aIA @@ -136656,11 +132938,11 @@ bam bnw bpi bqQ -bsA +bqR bwH bAs bjN -bAM +bxI bCN bEM bGx @@ -136668,7 +132950,7 @@ bIe bJT bLU bOQ -bQw +bOQ bCM asJ asJ @@ -136679,7 +132961,7 @@ asJ bCM bCM cds -bPm +bCM bCM bCM bCM @@ -136689,9 +132971,9 @@ blr clA clA clA -ctu +clA bSl -ctu +clA csp arA abq @@ -136885,25 +133167,25 @@ aoG aoG aoG dgE -axh +aCg aEA -aFW +aHg aHc aIB -aJP -aLt -aMF -aMF +ccH +ccH +ccH +ccH aPo -aMF -aMF +ccH +ccH aQY -aMF +ccH aYS -aXA -aZf +aQY +aJO bbO -bbN +aFR bfy big bkt @@ -136913,16 +133195,16 @@ bmu bnx bpj bqR -bsB -bwJ +bpn +bwH bAr bjN -bAK +asJ bCN bEN bGy bIf -bId +rxV bLV bOF bQl @@ -137142,20 +133424,20 @@ ayo ayr atA aCa -axh +aCg aFM -aFW +jPv bCj aMX -aLs -aLs -aLs -aOv +aPp +aPp +aPp +aPp aPp aSE -aLs +aPp aUR -aLs +aPp aZc ccz baw @@ -137174,16 +133456,16 @@ bqS buJ bzv byV -aNW +asJ bCN bGP bIY bIg bJU bLW -bNO -bPr -bQY +bCM +bCM +bCM bCM bCM bCM @@ -137193,7 +133475,7 @@ bCM bCM bjK cdu -ceG +bGG cfN chh ciL @@ -137397,11 +133679,11 @@ asJ asJ aoG aAI -axh +aCg aEx -axh +aCg aGb -aFW +kxf bAL aIF aJU @@ -137409,13 +133691,13 @@ aLU aQR aOg aUh -aSn -aVN +iIk +baB aWp aVh aYW -ccy -bbw +lwo +xHf bcq aFR bho @@ -137431,16 +133713,16 @@ bsC bqS bxm bjN -bAO +buz bCM bCM bCM -bHF -bJV bzL -bNP +bJV +bNa +bCM bQz -bNO +bCM bSJ bSJ bVN @@ -137654,26 +133936,26 @@ avD aoG aoG azs -axh +aCg aEy aEz -aFN -aFW -bAL -aIF -aJZ +aHg +iof aCg +vRY +aJZ +aJb aCg alQ -aCg +aJb aPL +aJb aCg aCg -aJZ aZe -ccH -baA -bat +dMG +vRY +aCg aFR aFR aFR @@ -137693,7 +133975,7 @@ bCM bHb bGA bIi -bJW +xno bLX bNQ bPt @@ -137707,7 +133989,7 @@ bJW bJW ccd cdw -bGG +bGF cfP bGG ciN @@ -137907,38 +134189,38 @@ amk amk amk amk -avE -awY +amk +amk ayN ayI -awY +amk aCd -aDs aEE -aFU -bAL -aIF +aPn +iof +aCg +hAg aJV -aCg -aQZ -aTl -aUF +len +len +len +len bEL -aWb -aCg -aVi +len +len +len aZd -ccH -aQU -aqe -aqv -aFR +vny +pcW +aCg ayE aAO aHw -baE +hEA bhZ -bnB +baE +iNu +qHS dfz bqT bsD @@ -137955,10 +134237,10 @@ bLY bNR bPu bRa -bSL +bNR bVv -bRa -bRa +ied +ied bNR caf bNR @@ -138160,7 +134442,7 @@ abq amk ank aoI -aqf +ank art asj aue @@ -138182,23 +134464,23 @@ aTJ aPs aVs aWg -aPa +knc aXs aZh bao bbC -bcG -bcp -aFR +aCg azv aAW -aIu +aQF bck +aIu +rDF bgE bnC dfB -dgM -bqU +dgL +bpn aZo bxd byX @@ -138210,8 +134492,8 @@ bIk bJY bLZ bGI -bPv -bRb +bPw +bGG bSM bCN bWU @@ -138220,7 +134502,7 @@ bWU bCN biz ccf -bGG +nbt bPw bIn chi @@ -138417,7 +134699,7 @@ abf amk anl aoJ -aqg +ann aru asg avR @@ -138428,45 +134710,45 @@ azn amk aCf aDw -aGe -aGd -aIW -aLn +baB +aSn +aJb +aLw aMQ aNd -aRa -aOc +aNd +kez aPt aRb aTR -aNd +yeW aXo aZg aZO -baB -bcC -bft -aFR +miB +aCg azJ aHl bfr -bjO -bhZ -bnD +hIG +aFR +uaQ +bli +bli dfA -dgL +iZY bvt -blk +bpn bqU bCu -bFE -bCP +bFD +bCN bGD bLc bIl bJZ bMa -bGF +bGG bPw bGG bUo @@ -138477,7 +134759,7 @@ bCN bCN cDd ccf -bGG +nbt bPw bGG bIq @@ -138675,49 +134957,49 @@ amk apJ ank aqh -ank +kNc asQ awk avI amk amk bqV -bZV cbc +aCg aEn aCg aHi -aJo -aLE -aLE aCg -aRr -aOd +aLw +aMQ +kWg +kWg +kez aPu aRc -aTR +lGr +kez +aLE +aLE +ebM +iSH aCg -aLE -aLE -aLE -aHi -aCg -aEn aFR aFR aFR aFR -aFR -aFR -bli +uaQ +pSk +dfg +dfg blj dgO bjN bAP -bAP +rrO bnt -bAS -bCQ +bnt +bCM bzL bzL bzL @@ -138734,7 +135016,7 @@ bZG bCN biA ccf -bGG +qhv bPw bGG bIq @@ -138931,47 +135213,47 @@ abq amk ann aoJ -aqi +anl arv -asO +asj avV avH axM amk aAK -bZV +cbc aCh aEd -aCg +plu aFY aOa -aOa -aOa -aDL +rsT +rlJ +gpj aRa aOe aPv aRd -aTR -aDL -aOa -bMO -aOa +huo +aOe +tVw +gpj +tAn ccu aCg bfz -aTR -beU -bgG -aCh +pUc +pUc +kKa +anq deW -dff -dfm +dfg +dfg bsZ -dgN +anq bnt bxf -bxf +jdX bnt bCL bCR @@ -138979,7 +135261,7 @@ bEU bGE bIm bKa -bMc +xhr bMi bPx bRd @@ -139190,53 +135472,53 @@ ank aoK asK arw -asP +asg awn awU ayz amk aCb -axh -aCg -aEn -aCg aCg +kLs +pNG +lcc +vZU +aJb +aLw aDL -aDL -aDL -aDL +kGw aRs aTK aRf aSo aTV -aDL -aDL -aDL -aDL -aCg -aCg -aEn -aCg -aCg -aOd +mzf +dqm +kGw +mVG +ccu aCg +aKT +bfz +pUc +rYj +anq avP dfh dft dfI -dgP +anq bvu bly bxg byZ bAU -bCS +bCM bEV -bGF -bIn +uTZ +jdi bKb -bIo +dvV bNc bPy bRe @@ -139453,31 +135735,31 @@ amk amk amk azy -bZV +cbc aCD -aES -abq +pNG +pmh aFZ -arA +aJb aMI -aDL -aDL -aDL -aDL -aUK -aDL -aDL -aDL -aDL -beZ -arA -aaa -abq -aGT -bdG -aCg -aOd +naP +kGw +ebV +lJX +aRf +rwh +aTV +kRX +ebV +kGw +tvk +xHU aCg +aKT +tgE +pUc +kKa +anq dfa dfg dfq @@ -139485,8 +135767,8 @@ bta anq bsG bza -bxh bza +esj bAV bCT bEW @@ -139497,7 +135779,7 @@ bMd bNa bPz bRf -bSR +iNI bUv bSP bSP @@ -139710,33 +135992,33 @@ ape arr ayx azy -axh -aDf -aDi -abq -abq -aJx -aLN -aLN -aLN -aLN -aLN -aUM -aLN -aLN -aLN -aLN +aCg +kLs +pNG +lcc +vZU +aJb +aLw aLN +kGw +ebV +gfB +aRf +aSo +aTV +flr +ebV +kGw dea -abq -abq -aDi -aDf +ccu aCg -aOd -aCg -dfc -dfg +aKT +bfz +pUc +rYj +anq +anq +pPA dfx dfK anq @@ -139745,7 +136027,7 @@ bvk bAt bCw bCY -bCU +bCM bEX bGH bIp @@ -139754,8 +136036,8 @@ bMe bNc bIp bIn -bSS -bGG +nqA +hnC bYk bYm bYk @@ -139967,32 +136249,32 @@ ans ans asI azy -axh +aCg aDf aDi -aDi -aaa +fmP +aFY +aOa +edK +dXb +gpj +kez +kez +oTM +vjL +hWr +kez +kez +gpj aJt -arA -arA -arA -arA -arA -arA -arA -arA -arA -arA -arA -aJt -aaa -aDi -aDi -aDf -aCg -aOd -aCg -dfb +kBa +gdM +gyy +xLf +qtt +vmT +qtt +anq dfj dfu dfJ @@ -140002,17 +136284,17 @@ bwr aWC bzc bAX -bCV +bCM bEY -bGI -bIq +jLP +pFi bKe bMf bNa bPA bRg bRg -bRg +peO bVS bRg bRg @@ -140224,33 +136506,33 @@ arT ans azr azy -axh -aDh -aDj -aFS -abq -aJt -arA -aJW -aaa -aaa -aJW -aaa -aaa -aaa -aaa -aJW -arA -aJt -abq -baG -bbU -bhA aCg -aOd aCg -dfd -dfk +aCg +aCg +aHi +aCg +gsr +aJW +pUq +lOU +gqj +pvv +oOs +iAT +vwA +fHC +len +nss +ccu +aJb +abq +bfz +wxE +wxE +gyy +anq +pRy dfy btc anq @@ -140269,7 +136551,7 @@ bNg bQR bSs bUt -bUw +fga bXj bYc bZK @@ -140482,31 +136764,31 @@ axd aGW bal axh -aDf -aWz -aEF -aaa +axh +abq +aef +tZI aJJ aPy -aaa -aaa -aaa -abq -aaa +xDw +wLN +qWn +wLN +lpU aRe -aaa -aaa -aaa +moi +qWn +ojl ddZ bap -aaa -bax -aDi -aDf -aCg -aOd -aCg -asX +nEQ +gdM +kKa +tgE +wxE +wxE +qtt +anq dfk deZ bkV @@ -140526,7 +136808,7 @@ bNe bPC bRi bSU -bRi +xyA bPC bRi bSU @@ -140739,31 +137021,31 @@ ayA azu asJ axh -aDk -aEW -aDi -aaa -aJt -arA -aaa -aaa +axh abq -abq -abq -abq -abq -aaa -aaa -arA -aJt -aaa -aDi -aCD -aFk +aef +aef aCg -aOd +rRM +ogE +aJb aCg -dfe +aCg +aJb +aJb +aJb +aCg +aCg +aJb +hqN +ibi +aCg +aKT +bfz +wxE +wxE +gyy +anq dfk aoN dgK @@ -140783,7 +137065,7 @@ bzL bHG bzL bIt -bzL +kkt bHG bzL bIt @@ -140997,50 +137279,50 @@ buC aCc axh axh -aDf -aDi -aaa -aJt -arA -aaa -aaa -abq -aOm -aRh -aSp abq abq -aJW -arA -aJt -aaa -aDi -aDf -aCg +abq aCg +mWL +jUV aOd +gYM +nRh +nRh +aSp +jbk +nRh +gYM +aOd +gZY +hgN aCg +rYO +xLf +vfv +vfv +qtt anq dfl dfl azD anq -bsL +wAP bwF bsN -aaa -abq -abq -abq -abq -bIu -abq -bMj -abq -bIu -abq -bMj -abq +peo +cmL +cmL +cmL +cmL +nMx +cmL +kto +cmL +nMx +cmL +kto +ktv bIu abq bMj @@ -141254,35 +137536,35 @@ cbX asJ arr axh -aFa -aDi -abq -aJJ -aPy aaa aaa -abq -aPd -csp -aTI -abq aaa -aaa -ddZ -bap -aaa -aDi -bfB aCg -azM -aOd +tpg +lGk +raV +nRh +nRh +nRh +nRh +nRh +nRh +nRh +oWm +ssZ +qxn aCg +rYO +vmT +vfv +vfv +gyy anq abq abq abq anq -abq +bIu bwL abq abq @@ -141510,36 +137792,36 @@ bnI asJ asJ axh +axh +aaa +aaa +aaa aCg -aDf -aDi -abq -aJt -arA -aJW +mWL +pKs aLx -abq -aOq -aSk -aTG -abq -aaa -aaa -arA -aJt -abq -aDi -aDf +nRh +nRh +nRh +aSp +nRh +nRh +nRh +yaq +xYW +hfb aCg -aCg -kWU -rzO -aDL +aKT +tgE +wxE +wxE +qtt +aaa aaa aaa aaa abq -aaa +bIu bwL aaa aaa @@ -141762,41 +138044,41 @@ aaa aoG ajA bnG -atI +ajA axh azf dAH axh -aCD -aFk -aDi -aaa -aJt -arA aaa aaa -abq -abq -abq -abq -abq aaa aaa -arA -aJt -aaa -aDi -aDm -bdG aCg -bjT -aFR -aFR +tvr +vCR +hdL +aOd +aOd +uLE +aCg +mZJ +aOd +aOd +vUD +wuZ +swl +aCg +aKT +bfz +wxE +wxE +gyy aaa aaa aaa -abq aaa +aaa +bIu bwL aaa aaa @@ -142016,7 +138298,7 @@ aaa aaa aaa aaa -cKI +aoG avN blA avN @@ -142024,36 +138306,36 @@ aoG aoG asJ uJn -aDf -aWz -aEG aaa -aJJ -aPy -aaa -aaa -aaa -aOj aaa abq -aaa -aaa -aaa -ddZ -bap -aaa -aDi -aDi -aDf +abq aCg -aOd -oAG +aCg +aCg +aCg +aCg +aCg +aCg +aCg +aCg +aCg +aCg +aCg +aCg +evR +aCg +aKT +tgE +wxE +wxE +qtt aaa aaa aaa aaa -abq -abq +aaa +tSX bwM abq abq @@ -142273,44 +138555,44 @@ aaa aaa aaa aaa -acJ +aoG avN awD avN -bpl +aoG aoG asJ axh -aDl -aDj -aFS abq -aJt -arA -aJW +abd +abd aaa aaa aaa aaa -aJW -aaa -aaa -aJW -arA -aJt abq +aaa +aaa +aaa +aaa +abq +aaa +aaa +abq +aef +lmi baG -bbU +rYO bhA -aCg -aOd -aFR +xLf +gyy +rYO aaa -fnC -fnC -abq -abq aaa +aaa +aaa +abq +bIu bwU aaa abq @@ -142531,43 +138813,43 @@ aaa aaa aaa aaa -blz +avN blB -bnH +avN aaa aoG asJ axh -aDf -aDi -aDi aaa -aJt -arA -arA -aTM -arA -arA -aTM -arA -arA -aTM -arA -arA -aJt +abd +bre +bre +aaa +aaa +aaa abq -aDi -aDi -aDf -aCg -aOd -aFR aaa aaa aaa aaa abq aaa +aaa +abq +aaa +aaa +bIu +tgE +pUc +pUc +pUc +rYj +aaa +aaa +aaa +aaa +aaa +bIu bwL aaa abq @@ -142795,36 +139077,36 @@ aaa abq aef aCj -aDm -aFm -aDC -aWA -aKa -aLN -aLN -aPg -aLN -aLN -aPg -aLN -aLN -aPg -aLN -aLN -dec -aWA -bdp -aFm -aFk -aNd -aef -abq -abq -abq -fBB -fBB -abq aaa +abd +abd +bre +abd +abq +arB +arB +arB +arB +arB +arB +arB +arB +arB +arB +arB +arB +bdp +cmL +cmL +cmL +cmL +cmL +cmL +cmL +cmL +cmL +cmL +ktv bwL aaa abq @@ -143051,32 +139333,32 @@ abq abq abq aef +axh +aaa +aaa +abd +abd +abd +aaa +abd +bre bre -aCg -aDn -aGT -aEi aWA +bre +bre +bre +bre aWA -aIf -aIf -aWA -aWA -aIf -aWA -aWA -aIf -aIf -aWA -aWA -bbI -aES -aDn -aCg -aCg -aef -aaa +bre +bre +arB aaa +arB +abd +arB +abd +abd +abd aaa aaa aaa @@ -143285,18 +139567,18 @@ aaa aaa aaa aaa -adJ -aeh -aeh -aeh -aeF -aeF -afh -ahm -afK -aeh -aeh -afl +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -143309,34 +139591,34 @@ aaa aaa aaa abq -abq -aCg -aCg -aGT -aKp -aLO -aKp -aKp -aKp -aTO -aLO -aKp -aKp -aKp -aKp -aLO -aKp -aES -aCg -aCg -abq -abq aaa aaa aaa aaa aaa aaa +arB +arB +arB +arB +arB +arB +arB +arB +bFb +arB +arB +arB +abq +arB +bre +aWA +bre +bre +abd +aaa +aaa +aaa abq aaa bwL @@ -143542,18 +139824,6 @@ aaa aaa aaa aaa -adK -aei -aeD -afe -afJ -afJ -afJ -ahn -ahn -alT -akq -all aaa aaa aaa @@ -143567,33 +139837,45 @@ aaa aaa aaa aaa -abq -aCg -aCg -aCg -aCg -aCg -aCg -aCg -aCg -aCg -aCg -aCg -aCg -aCg -aCg -aCg -aCg -aCg -abq -aaa -abf aaa aaa aaa aaa aaa aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +arB +abd +arB +abd +abd +abd +aaa +aaa +aaa abq aaa bwL @@ -143799,18 +140081,6 @@ aaa aaa aaa aaa -adL -aej -aeE -aff -aeF -aeF -agJ -aho -aeG -anp -akq -all aaa aaa aaa @@ -143825,23 +140095,35 @@ aaa aaa aaa aaa -aDo -aDo -aDo -aDo -aNd -aDo -aDo -aDo -aDo -aDo -aDo -aDo -aNd -aDo -aDo -aDo -aDo +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaD +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +abq abq aaa abq @@ -144056,18 +140338,6 @@ aaa aaa aaa aaa -adM -aeh -aeh -afg -aaa -aeF -agJ -ahp -aeG -aml -aeF -afg aaa aaa aaa @@ -144082,22 +140352,34 @@ aaa aaa aaa aaa -abq -abq -abq -abq -abq -abq -abq -abq -abq -abq -abq -abq -abq -abq -abq -abq +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa abq abq aaa @@ -144318,12 +140600,6 @@ aaa aaa aaa aaa -aeF -agJ -ahq -aeG -ajt -aeF aaa aaa aaa @@ -144343,15 +140619,21 @@ aaa aaa aaa aaa -abq -aaa -aaa -abq aaa aaa aaa aaa -abq +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -144572,15 +140854,6 @@ aaa aaa aaa aaa -adJ -afh -afK -aeF -agJ -ahr -ais -aju -aeF aaa aaa aaa @@ -144600,7 +140873,6 @@ aaa aaa aaa aaa -abq aaa aaa aaa @@ -144608,7 +140880,17 @@ aaa aaa aaa aaa -abq +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -144828,22 +141110,6 @@ aaa aaa aaa aaa -adJ -aeF -afi -afi -aeF -agJ -aeh -aeh -aeh -aeh -aeh -aeh -aeh -aeh -aeh -afl aaa aaa aaa @@ -144857,7 +141123,6 @@ aaa aaa aaa aaa -abq aaa aaa aaa @@ -144865,7 +141130,24 @@ aaa aaa aaa aaa -abq +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -145084,24 +141366,6 @@ aaa aaa aaa aaa -adJ -aeh -aeG -aeG -aeG -aeF -agJ -agl -aeG -anr -asb -aun -aur -ant -aoO -aqm -aeF -afl aaa aaa aaa @@ -145122,7 +141386,25 @@ aaa aaa aaa aaa -abq +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -145342,23 +141624,23 @@ aaa aaa aaa aaa -aek -aeH -aeG -afL -aeF -aeh -aeF -aeG -aeG -aeG -aeG -aeG -anu -aoP -aqn -arx -aeF +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -145599,23 +141881,23 @@ aaa aaa aaa aaa -ael -aeI -afj -afM -agl -agK -agl -aeG -aeG -aeG -aeG -aeG -agl -aeG -aeG -ary -aeF +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -145856,23 +142138,6 @@ aaa aaa aaa aaa -aem -aeJ -aeG -aeG -aeF -aeh -aeF -aeG -aeG -aeG -aeG -aeG -ant -aoQ -aqp -arz -aeF aaa aaa aaa @@ -145884,7 +142149,24 @@ aaa aaa aaa aaa -aaD +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -146112,24 +142394,24 @@ aaa aaa aaa aaa -adM -aeh -aeG -aeG -aeG -aeF -agJ -agl -aeG -anF -asY -auo -auo -anu -aoR -aqo -aeF -afg +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -146370,22 +142652,22 @@ aaa aaa aaa aaa -adM -aeF -tXL -tXL -aeF -agJ -aeh -aeh -aeh -aeh -aeh -aeh -aeh -aeh -aeh -afg +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -146628,15 +142910,15 @@ aaa aaa aaa aaa -adM -afk -afN -aeF -agJ -ahs -aeG -anX -aeF +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -146888,12 +143170,12 @@ aaa aaa aaa aaa -aeF -agJ -aht -aeG -aeG -aeF +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -147140,18 +143422,18 @@ aaa aaa aaa aaa -adJ -aeh -aeh -afl aaa -aeF -agJ -ahu -ait -anY -aeF -afl +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -147398,17 +143680,17 @@ aaa aaa aaa adN -aen -aeK -afm -aeF -aeF -agJ -ahv -aeG -aeG -akq -all +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -147654,18 +143936,18 @@ aaa aaa aaa aaa -adO -aeo -aeL -afn -afJ -afJ -afJ -ahn -ahn -ajq -akq -all +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -147911,18 +144193,18 @@ aaa aaa aaa aaa -adM -aeh -aeh -aeh -aeF -aeF -afk -ahw -afN -aeh -aeh -afg +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -148724,18 +145006,18 @@ aXH aXH bgM bcb -bgT -bdM -bdM -bdM -bdM -bdM +moJ +bsf +nwx +nEe +sJj +bsf blN bic beW beW bsT -buR +buP bxu bBf bGO @@ -148976,16 +145258,16 @@ aaa abd aUU bcb -bdM -bdM -bdM -bdM +bsf +bsf +bsf +bsf bfc bic beW -beW -beW -beW +mcP +qAm +nKW beW bfb beX @@ -148999,15 +145281,15 @@ brc beX bvh bKq -bdM -bdM -bdM -bdM -bdM +bsf +nwx +nEe +sJj +bsf bUA -bdM -bdM -cer +bsf +bsf +bKp bPH abd aaa @@ -149232,7 +145514,7 @@ aaa aaa abd aUU -bca +rjU bdK beW beW @@ -149249,22 +145531,22 @@ beX beX aXL aXL -bBe +aXL bxw -bBh +aXL aXL beX beX bfb beW -beW -beW -beW +mcP +qAm +nKW bfb beW beW bKk -bMr +bKo bsd abd aaa @@ -149489,7 +145771,7 @@ aaa aaa abd aUU -bca +rjU bdN beX beX @@ -149521,7 +145803,7 @@ bgN beX beX bvh -bMr +bKo bsd abd aaa @@ -149671,7 +145953,7 @@ aaa aaa aaa aaa -aaa +vgQ aaa aaa aaa @@ -149746,7 +146028,7 @@ aaa aaa abd aUU -bca +rjU bdN beX beX @@ -149778,7 +146060,7 @@ bgN beX beX bvh -bMr +bKo bsd abd aaa @@ -150003,7 +146285,7 @@ abd abd abd aUV -bca +rjU bdN beX beX @@ -150035,7 +146317,7 @@ aXL beX beX bvh -bMr +bKo bPH abd abd @@ -150260,7 +146542,7 @@ abd aaa aXH aXN -bca +rjU bdN beX beX @@ -150279,7 +146561,7 @@ bdI bri bri bxA -bBo +bri bri bDb bHi @@ -150292,7 +146574,7 @@ aXL beX beX bvh -bMr +bKo bNY aXH aaa @@ -150517,7 +146799,7 @@ abd aUU aXI bbX -bzh +say bdN beX aXL @@ -150532,7 +146814,7 @@ bil bil bpt brm -blH +bdI bvf buY bxD @@ -150542,14 +146824,14 @@ bDf bFi bIz bKl -bOa +iWv bOb odO bKl aXL beX bvh -cLL +rKu bbX cer bsd @@ -150774,7 +147056,7 @@ abd aUU aWB bbW -bzh +say bdN beX aXL @@ -150787,26 +147069,26 @@ bjX bdI bdI bmT -bdL -bif -blH +hLH +lYf +bdI bvd buX bxC bCX -bIC +bri bDd bFj bIA bHN -bOa -bOa +dwC +oOT bOa bKl aXL beX bvh -cLL +rKu cUI bzh bsd @@ -151032,10 +147314,10 @@ aUU aXJ bbY bdJ -bdO -bdO -aXM -bfa +bdN +beX +aXL +aXL bgP bih bnQ @@ -151059,10 +147341,10 @@ bRq bRs fZV hxv -cep -aXM -bdO -bdO +bKl +aXL +beX +bvh cQc cUM cWj @@ -151292,7 +147574,7 @@ bzh bdN beX aXL -bpv +aXL bbJ bdw bim @@ -151307,14 +147589,14 @@ bdI bvg buZ bxE -bCZ +bCX bri bDg bGT bIB bHN -bOa -bOa +xEi +jsQ bOa bKl aXL @@ -151821,7 +148103,7 @@ bdI brk bvb bzf -bDc +brk brk bDh bFd diff --git a/_maps/map_files/MetaStation/z2.dmm b/_maps/map_files/MetaStation/z2.dmm deleted file mode 100644 index 0d5b4fdb20e..00000000000 --- a/_maps/map_files/MetaStation/z2.dmm +++ /dev/null @@ -1,71910 +0,0 @@ -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"aa" = ( -/turf/space/transit, -/area/space) -"ab" = ( -/turf/space, -/area/space) -"ac" = ( -/turf/space/transit/east{ - dir = 8 - }, -/area/space) -"ad" = ( -/obj/structure/flora/ausbushes/brflowers, -/turf/simulated/floor/holofloor/grass, -/turf/simulated/floor/holofloor{ - tag = "icon-wood_siding2 (EAST)"; - icon_state = "wood_siding2"; - dir = 4 - }, -/area/holodeck/source_picnicarea) -"ae" = ( -/turf/unsimulated/wall{ - tag = "icon-iron6"; - icon_state = "iron6" - }, -/area/space) -"af" = ( -/obj/structure/window/reinforced, -/turf/unsimulated/wall{ - tag = "icon-iron12"; - icon_state = "iron12" - }, -/area/space) -"ag" = ( -/turf/unsimulated/wall{ - tag = "icon-iron14"; - icon_state = "iron14" - }, -/area/space) -"ah" = ( -/turf/unsimulated/wall{ - tag = "icon-iron10"; - icon_state = "iron10" - }, -/area/space) -"ai" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/unsimulated/wall{ - tag = "icon-iron3"; - icon_state = "iron3" - }, -/area/space) -"aj" = ( -/turf/simulated/floor/holofloor{ - tag = "icon-asteroid"; - icon_state = "asteroid"; - dir = 2 - }, -/area/holodeck/source_desert) -"ak" = ( -/turf/simulated/floor/holofloor{ - tag = "icon-asteroid6"; - icon_state = "asteroid6"; - dir = 2 - }, -/area/holodeck/source_desert) -"al" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/unsimulated/wall{ - tag = "icon-iron3"; - icon_state = "iron3" - }, -/area/space) -"am" = ( -/turf/unsimulated/floor/snow, -/area/syndicate_mothership) -"an" = ( -/obj/effect/landmark/costume/random, -/obj/structure/rack, -/turf/simulated/floor/holofloor{ - tag = "icon-cult"; - icon_state = "cult"; - dir = 2 - }, -/area/holodeck/source_theatre) -"ao" = ( -/obj/structure/rack, -/obj/item/clothing/under/dress/dress_saloon, -/obj/item/clothing/head/hairflower, -/turf/simulated/floor/holofloor{ - tag = "icon-cult"; - icon_state = "cult"; - dir = 2 - }, -/area/holodeck/source_theatre) -"ap" = ( -/turf/simulated/floor/holofloor{ - icon_state = "engine"; - name = "Holodeck Projector Floor" - }, -/area/holodeck/source_wildlife) -"aq" = ( -/turf/simulated/floor/holofloor{ - icon_state = "engine"; - name = "Holodeck Projector Floor" - }, -/area/holodeck/source_plating) -"ar" = ( -/turf/simulated/floor/holofloor{ - icon_state = "engine"; - name = "Burn-Mix Floor"; - nitrogen = 0; - oxygen = 2500; - temperature = 370; - toxins = 5000 - }, -/area/holodeck/source_burntest) -"as" = ( -/turf/simulated/floor/holofloor{ - dir = 1; - icon_state = "red" - }, -/area/holodeck/source_emptycourt) -"at" = ( -/obj/structure/flora/grass/brown, -/turf/unsimulated/floor/snow, -/area/syndicate_mothership) -"au" = ( -/obj/structure/flora/bush, -/turf/unsimulated/floor/snow, -/area/syndicate_mothership) -"av" = ( -/obj/structure/flora/tree/pine{ - pixel_x = 1 - }, -/turf/unsimulated/floor/snow, -/area/syndicate_mothership) -"aw" = ( -/turf/simulated/floor/holofloor{ - dir = 9; - icon_state = "red" - }, -/area/holodeck/source_emptycourt) -"ax" = ( -/turf/unsimulated/floor/snow, -/turf/unsimulated/floor/snow{ - icon_state = "gravsnow_corner" - }, -/area/syndicate_mothership) -"ay" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/unsimulated/wall{ - tag = "icon-iron3"; - icon_state = "iron3" - }, -/area/space) -"az" = ( -/turf/unsimulated/floor/snow, -/area/space) -"aA" = ( -/turf/simulated/floor/holofloor{ - dir = 5; - icon_state = "red" - }, -/area/holodeck/source_emptycourt) -"aB" = ( -/obj/structure/flora/ausbushes/fullgrass, -/turf/simulated/floor/holofloor{ - tag = "icon-asteroid"; - icon_state = "asteroid"; - dir = 2 - }, -/area/holodeck/source_desert) -"aC" = ( -/turf/simulated/floor/holofloor{ - tag = "icon-asteroid8 (EAST)"; - icon_state = "asteroid8"; - dir = 4 - }, -/area/holodeck/source_desert) -"aD" = ( -/turf/simulated/floor/holofloor{ - tag = "icon-cult"; - icon_state = "cult"; - dir = 2 - }, -/area/holodeck/source_theatre) -"aE" = ( -/obj/effect/landmark{ - name = "Holocarp Spawn" - }, -/turf/simulated/floor/holofloor{ - icon_state = "engine"; - name = "Holodeck Projector Floor" - }, -/area/holodeck/source_wildlife) -"aF" = ( -/obj/effect/landmark{ - name = "Atmospheric Test Start" - }, -/turf/simulated/floor/holofloor{ - icon_state = "engine"; - name = "Burn-Mix Floor"; - nitrogen = 0; - oxygen = 2500; - temperature = 370; - toxins = 5000 - }, -/area/holodeck/source_burntest) -"aG" = ( -/turf/simulated/floor/holofloor{ - dir = 8; - icon_state = "red" - }, -/area/holodeck/source_emptycourt) -"aH" = ( -/turf/simulated/floor/holofloor{ - dir = 4; - icon_state = "red" - }, -/area/holodeck/source_emptycourt) -"aI" = ( -/turf/simulated/floor/holofloor{ - tag = "icon-asteroid2 (EAST)"; - icon_state = "asteroid2"; - dir = 4 - }, -/area/holodeck/source_desert) -"aJ" = ( -/obj/structure/flora/ausbushes/ywflowers, -/turf/simulated/floor/holofloor/grass, -/turf/simulated/floor/holofloor{ - tag = "icon-wood_siding2 (EAST)"; - icon_state = "wood_siding2"; - dir = 4 - }, -/area/holodeck/source_picnicarea) -"aK" = ( -/obj/structure/flora/ausbushes/fullgrass, -/turf/simulated/floor/holofloor/grass, -/area/holodeck/source_picnicarea) -"aL" = ( -/obj/structure/flora/ausbushes/sparsegrass, -/turf/simulated/floor/holofloor/grass, -/area/holodeck/source_picnicarea) -"aM" = ( -/obj/structure/flora/ausbushes/grassybush, -/turf/simulated/floor/holofloor/grass, -/turf/simulated/floor/holofloor{ - tag = "icon-wood_siding5"; - icon_state = "wood_siding5"; - dir = 2 - }, -/area/holodeck/source_picnicarea) -"aN" = ( -/turf/simulated/floor/holofloor{ - tag = "icon-asteroid11 (EAST)"; - icon_state = "asteroid11"; - dir = 4 - }, -/area/holodeck/source_desert) -"aO" = ( -/obj/structure/flora/ausbushes/sparsegrass, -/turf/simulated/floor/holofloor{ - tag = "icon-asteroid"; - icon_state = "asteroid"; - dir = 2 - }, -/area/holodeck/source_desert) -"aP" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/holofloor{ - tag = "icon-asteroid"; - icon_state = "asteroid"; - dir = 2 - }, -/area/holodeck/source_picnicarea) -"aQ" = ( -/turf/simulated/floor/holofloor{ - tag = "icon-wood (EAST)"; - icon_state = "wood"; - dir = 4 - }, -/turf/simulated/floor/holofloor{ - tag = "icon-siding1"; - icon_state = "siding1"; - dir = 2 - }, -/area/holodeck/source_theatre) -"aR" = ( -/turf/simulated/floor/holofloor{ - tag = "icon-rampbottom"; - icon_state = "rampbottom"; - dir = 2 - }, -/area/holodeck/source_theatre) -"aS" = ( -/turf/simulated/floor/holofloor{ - tag = "icon-asteroid7"; - icon_state = "asteroid7"; - dir = 2 - }, -/area/holodeck/source_desert) -"aT" = ( -/obj/structure/chair/stool, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/holofloor{ - tag = "icon-asteroid"; - icon_state = "asteroid"; - dir = 2 - }, -/area/holodeck/source_picnicarea) -"aU" = ( -/obj/structure/flora/ausbushes/grassybush, -/turf/simulated/floor/holofloor/grass, -/turf/simulated/floor/holofloor{ - tag = "icon-wood_siding9"; - icon_state = "wood_siding9"; - dir = 2 - }, -/area/holodeck/source_picnicarea) -"aV" = ( -/turf/unsimulated/wall, -/area/vox_station) -"aW" = ( -/obj/structure/table/wood, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/holofloor{ - tag = "icon-asteroid"; - icon_state = "asteroid"; - dir = 2 - }, -/area/holodeck/source_picnicarea) -"aX" = ( -/obj/structure/flora/ausbushes/grassybush, -/turf/simulated/floor/holofloor/grass, -/turf/simulated/floor/holofloor{ - tag = "icon-wood_siding6"; - icon_state = "wood_siding6"; - dir = 2 - }, -/area/holodeck/source_picnicarea) -"aY" = ( -/turf/simulated/floor/holofloor{ - tag = "icon-carpet6-2 (EAST)"; - icon_state = "carpet6-2"; - dir = 4 - }, -/area/holodeck/source_theatre) -"aZ" = ( -/turf/simulated/floor/holofloor{ - tag = "icon-wood (EAST)"; - icon_state = "wood"; - dir = 4 - }, -/area/holodeck/source_theatre) -"ba" = ( -/turf/simulated/floor/holofloor{ - tag = "icon-carpet10-8 (EAST)"; - icon_state = "carpet10-8"; - dir = 4 - }, -/area/holodeck/source_theatre) -"bb" = ( -/obj/structure/flora/ausbushes/ywflowers, -/turf/simulated/floor/holofloor/grass, -/area/holodeck/source_picnicarea) -"bc" = ( -/obj/structure/flora/ausbushes/brflowers, -/turf/simulated/floor/holofloor/grass, -/area/holodeck/source_picnicarea) -"bd" = ( -/turf/simulated/floor/holofloor{ - tag = "icon-carpet14-10 (EAST)"; - icon_state = "carpet14-10"; - dir = 4 - }, -/area/holodeck/source_theatre) -"be" = ( -/turf/simulated/floor/holofloor{ - tag = "icon-asteroid5"; - icon_state = "asteroid5"; - dir = 2 - }, -/area/holodeck/source_desert) -"bf" = ( -/obj/structure/flora/ausbushes/grassybush, -/turf/simulated/floor/holofloor/grass, -/turf/simulated/floor/holofloor{ - tag = "icon-wood_siding10"; - icon_state = "wood_siding10"; - dir = 2 - }, -/area/holodeck/source_picnicarea) -"bg" = ( -/obj/structure/flora/ausbushes/brflowers, -/turf/simulated/floor/holofloor/grass, -/turf/simulated/floor/holofloor{ - tag = "icon-wood_siding1"; - icon_state = "wood_siding1"; - dir = 2 - }, -/area/holodeck/source_picnicarea) -"bh" = ( -/turf/simulated/floor/holofloor, -/area/holodeck/source_emptycourt) -"bi" = ( -/obj/structure/chair/stool, -/turf/simulated/floor/holofloor{ - tag = "icon-carpet7-3 (EAST)"; - icon_state = "carpet7-3"; - dir = 4 - }, -/area/holodeck/source_theatre) -"bj" = ( -/obj/structure/chair/stool, -/turf/simulated/floor/holofloor{ - tag = "icon-carpet11-12 (EAST)"; - icon_state = "carpet11-12"; - dir = 4 - }, -/area/holodeck/source_theatre) -"bk" = ( -/obj/structure/chair/stool, -/turf/simulated/floor/holofloor{ - tag = "icon-carpet15-15 (EAST)"; - icon_state = "carpet15-15"; - dir = 4 - }, -/area/holodeck/source_theatre) -"bl" = ( -/turf/simulated/floor/holofloor{ - dir = 8; - icon_state = "green" - }, -/area/holodeck/source_emptycourt) -"bm" = ( -/turf/simulated/floor/holofloor{ - dir = 4; - icon_state = "green" - }, -/area/holodeck/source_emptycourt) -"bn" = ( -/turf/simulated/floor/holofloor{ - tag = "icon-carpet2-0 (EAST)"; - icon_state = "carpet2-0"; - dir = 4 - }, -/area/holodeck/source_theatre) -"bo" = ( -/obj/structure/flora/ausbushes/ywflowers, -/turf/simulated/floor/holofloor/grass, -/turf/simulated/floor/holofloor{ - tag = "icon-wood_siding1"; - icon_state = "wood_siding1"; - dir = 2 - }, -/area/holodeck/source_picnicarea) -"bp" = ( -/obj/structure/flora/tree/pine{ - pixel_x = 1 - }, -/turf/unsimulated/floor/snow, -/turf/unsimulated/floor/snow{ - tag = "icon-gravsnow_corner (WEST)"; - icon_state = "gravsnow_corner"; - dir = 8 - }, -/area/syndicate_mothership) -"bq" = ( -/turf/simulated/floor/holofloor{ - tag = "icon-carpet3-0 (EAST)"; - icon_state = "carpet3-0"; - dir = 4 - }, -/area/holodeck/source_theatre) -"br" = ( -/obj/docking_port/stationary/transit{ - dir = 4; - dwidth = 1; - height = 4; - id = "pod3_transit"; - name = "pod 3 in transit"; - width = 3 - }, -/turf/space/transit/east{ - dir = 8 - }, -/area/space) -"bs" = ( -/turf/simulated/floor/holofloor{ - tag = "icon-asteroid1 (EAST)"; - icon_state = "asteroid1"; - dir = 4 - }, -/area/holodeck/source_desert) -"bt" = ( -/turf/simulated/floor/holofloor{ - tag = "icon-asteroid3 (EAST)"; - icon_state = "asteroid3"; - dir = 4 - }, -/area/holodeck/source_desert) -"bu" = ( -/obj/structure/chair/stool, -/turf/simulated/floor/holofloor{ - tag = "icon-carpet5-1 (EAST)"; - icon_state = "carpet5-1"; - dir = 4 - }, -/area/holodeck/source_theatre) -"bv" = ( -/turf/simulated/floor/holofloor{ - tag = "icon-carpet1-0 (EAST)"; - icon_state = "carpet1-0"; - dir = 4 - }, -/area/holodeck/source_theatre) -"bw" = ( -/obj/structure/chair/stool, -/turf/simulated/floor/holofloor{ - tag = "icon-carpet9-4 (EAST)"; - icon_state = "carpet9-4"; - dir = 4 - }, -/area/holodeck/source_theatre) -"bx" = ( -/obj/structure/chair/stool, -/turf/simulated/floor/holofloor{ - tag = "icon-carpet13-5 (EAST)"; - icon_state = "carpet13-5"; - dir = 4 - }, -/area/holodeck/source_theatre) -"by" = ( -/turf/simulated/floor/holofloor{ - dir = 2; - icon_state = "green" - }, -/area/holodeck/source_emptycourt) -"bz" = ( -/turf/simulated/floor/holofloor{ - dir = 10; - icon_state = "green" - }, -/area/holodeck/source_emptycourt) -"bA" = ( -/turf/simulated/floor/holofloor{ - dir = 6; - icon_state = "green" - }, -/area/holodeck/source_emptycourt) -"bB" = ( -/obj/docking_port/stationary/transit{ - dir = 8; - dwidth = 5; - height = 7; - id = "supply_transit"; - name = "supply in transit"; - width = 12 - }, -/turf/space/transit, -/area/space) -"bC" = ( -/obj/docking_port/stationary/transit{ - dir = 1; - dwidth = 1; - height = 4; - id = "pod1_transit"; - name = "pod 1 in transit"; - width = 3 - }, -/turf/space/transit, -/area/space) -"bD" = ( -/obj/docking_port/stationary/transit{ - dir = 1; - dwidth = 1; - height = 4; - id = "pod2_transit"; - name = "pod 2 in transit"; - width = 3 - }, -/turf/space/transit, -/area/space) -"bE" = ( -/turf/unsimulated/wall{ - tag = "icon-iron3"; - icon_state = "iron3" - }, -/area/space) -"bF" = ( -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/unsimulated/wall{ - tag = "icon-iron12"; - icon_state = "iron12" - }, -/area/space) -"bG" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced, -/turf/unsimulated/wall{ - tag = "icon-iron12"; - icon_state = "iron12" - }, -/area/space) -"bH" = ( -/turf/unsimulated/wall{ - tag = "icon-iron11"; - icon_state = "iron11" - }, -/area/space) -"bI" = ( -/turf/simulated/floor/holofloor{ - tag = "icon-17 (NORTHEAST)"; - icon_state = "17"; - dir = 5 - }, -/area/holodeck/source_space) -"bJ" = ( -/turf/simulated/floor/holofloor{ - tag = "icon-1 (NORTHEAST)"; - icon_state = "1"; - dir = 5 - }, -/area/holodeck/source_space) -"bK" = ( -/turf/simulated/floor/holofloor{ - tag = "icon-22 (NORTHEAST)"; - icon_state = "22"; - dir = 5 - }, -/area/holodeck/source_space) -"bL" = ( -/turf/simulated/floor/holofloor{ - tag = "icon-snow"; - icon_state = "snow" - }, -/area/holodeck/source_snowfield) -"bM" = ( -/turf/simulated/floor/holofloor{ - tag = "icon-grimy"; - icon_state = "grimy"; - dir = 2 - }, -/area/holodeck/source_meetinghall) -"bN" = ( -/turf/simulated/floor/holofloor{ - dir = 9; - icon_state = "red" - }, -/area/holodeck/source_basketball) -"bO" = ( -/turf/simulated/floor/holofloor{ - dir = 5; - icon_state = "red" - }, -/area/holodeck/source_basketball) -"bP" = ( -/obj/structure/holohoop, -/turf/simulated/floor/holofloor{ - dir = 1; - icon_state = "red" - }, -/area/holodeck/source_basketball) -"bQ" = ( -/obj/structure/table/holotable, -/obj/item/clothing/head/helmet/thunderdome, -/obj/item/clothing/suit/armor/tdome/red, -/obj/item/clothing/under/color/red, -/obj/item/holo/esword/red, -/turf/simulated/floor/holofloor{ - dir = 1; - icon_state = "red" - }, -/area/holodeck/source_thunderdomecourt) -"bR" = ( -/obj/structure/table/holotable, -/obj/machinery/readybutton{ - pixel_y = 0 - }, -/turf/simulated/floor/holofloor{ - dir = 9; - icon_state = "red" - }, -/area/holodeck/source_thunderdomecourt) -"bS" = ( -/obj/structure/table/holotable, -/turf/simulated/floor/holofloor{ - dir = 5; - icon_state = "red" - }, -/area/holodeck/source_thunderdomecourt) -"bT" = ( -/turf/simulated/floor/holofloor{ - dir = 1; - icon_state = "red" - }, -/area/holodeck/source_boxingcourt) -"bU" = ( -/obj/structure/table/holotable, -/obj/item/clothing/gloves/boxing/hologlove, -/turf/simulated/floor/holofloor{ - dir = 9; - icon_state = "red" - }, -/area/holodeck/source_boxingcourt) -"bV" = ( -/obj/structure/table/holotable, -/obj/item/clothing/gloves/boxing/hologlove, -/turf/simulated/floor/holofloor{ - dir = 5; - icon_state = "red" - }, -/area/holodeck/source_boxingcourt) -"bW" = ( -/obj/structure/flora/grass/both, -/turf/simulated/floor/holofloor{ - tag = "icon-snow"; - icon_state = "snow" - }, -/area/holodeck/source_snowfield) -"bX" = ( -/turf/simulated/floor/holofloor{ - tag = "icon-carpet4-0 (EAST)"; - icon_state = "carpet4-0"; - dir = 4 - }, -/area/holodeck/source_meetinghall) -"bY" = ( -/turf/simulated/floor/holofloor{ - tag = "icon-carpet8-0 (EAST)"; - icon_state = "carpet8-0"; - dir = 4 - }, -/area/holodeck/source_meetinghall) -"bZ" = ( -/turf/simulated/floor/holofloor{ - tag = "icon-carpetsymbol (SOUTHEAST)"; - icon_state = "carpetsymbol"; - dir = 6 - }, -/area/holodeck/source_meetinghall) -"ca" = ( -/turf/simulated/floor/holofloor{ - dir = 8; - icon_state = "red" - }, -/area/holodeck/source_basketball) -"cb" = ( -/turf/simulated/floor/holofloor{ - dir = 4; - icon_state = "red" - }, -/area/holodeck/source_basketball) -"cc" = ( -/turf/simulated/floor/holofloor{ - dir = 8; - icon_state = "red" - }, -/area/holodeck/source_thunderdomecourt) -"cd" = ( -/turf/simulated/floor/holofloor{ - dir = 4; - icon_state = "red" - }, -/area/holodeck/source_thunderdomecourt) -"ce" = ( -/turf/simulated/floor/holofloor{ - dir = 8; - icon_state = "red" - }, -/area/holodeck/source_boxingcourt) -"cf" = ( -/turf/simulated/floor/holofloor{ - dir = 4; - icon_state = "red" - }, -/area/holodeck/source_boxingcourt) -"cg" = ( -/obj/docking_port/stationary/transit{ - dir = 2; - dwidth = 5; - height = 14; - id = "emergency_transit"; - name = "emergency in transit"; - width = 25 - }, -/turf/space/transit, -/area/space) -"ch" = ( -/obj/docking_port/stationary/transit{ - dir = 4; - dwidth = 1; - height = 4; - id = "pod4_transit"; - name = "pod 4 in transit"; - width = 3 - }, -/turf/space/transit/east{ - dir = 8 - }, -/area/space) -"ci" = ( -/obj/structure/flora/tree/pine, -/turf/simulated/floor/holofloor{ - tag = "icon-snow"; - icon_state = "snow" - }, -/area/holodeck/source_snowfield) -"cj" = ( -/turf/unsimulated/wall, -/area/space) -"ck" = ( -/obj/structure/table/wood, -/turf/simulated/floor/holofloor{ - tag = "icon-grimy"; - icon_state = "grimy"; - dir = 2 - }, -/area/holodeck/source_meetinghall) -"cl" = ( -/turf/simulated/floor/holofloor{ - dir = 1; - icon_state = "red" - }, -/area/holodeck/source_basketball) -"cm" = ( -/obj/docking_port/stationary/transit{ - dir = 8; - dwidth = 2; - height = 5; - id = "laborcamp_transit"; - name = "labor in transit"; - width = 9 - }, -/turf/space/transit, -/area/space) -"cn" = ( -/obj/structure/flora/grass/green, -/turf/simulated/floor/holofloor{ - tag = "icon-snow"; - icon_state = "snow" - }, -/area/holodeck/source_snowfield) -"co" = ( -/obj/structure/chair/stool, -/turf/simulated/floor/holofloor{ - tag = "icon-carpet6-0 (EAST)"; - icon_state = "carpet6-0"; - dir = 4 - }, -/area/holodeck/source_meetinghall) -"cp" = ( -/obj/structure/chair/stool, -/turf/simulated/floor/holofloor{ - tag = "icon-carpet10-0 (EAST)"; - icon_state = "carpet10-0"; - dir = 4 - }, -/area/holodeck/source_meetinghall) -"cq" = ( -/obj/effect/light_emitter{ - light_power = 1 - }, -/turf/unsimulated/floor{ - tag = "icon-cult"; - icon_state = "cult" - }, -/area/wizard_station) -"cr" = ( -/obj/structure/chair/stool, -/turf/simulated/floor/holofloor{ - tag = "icon-carpet14-0 (EAST)"; - icon_state = "carpet14-0"; - dir = 4 - }, -/area/holodeck/source_meetinghall) -"cs" = ( -/turf/simulated/floor/holofloor{ - dir = 2; - icon_state = "red" - }, -/area/holodeck/source_basketball) -"ct" = ( -/turf/simulated/floor/holofloor{ - dir = 10; - icon_state = "red" - }, -/area/holodeck/source_basketball) -"cu" = ( -/turf/simulated/floor/holofloor{ - dir = 6; - icon_state = "red" - }, -/area/holodeck/source_basketball) -"cv" = ( -/obj/structure/holowindow, -/turf/simulated/floor/holofloor{ - dir = 8; - icon_state = "red" - }, -/area/holodeck/source_thunderdomecourt) -"cw" = ( -/obj/structure/holowindow, -/turf/simulated/floor/holofloor{ - dir = 4; - icon_state = "red" - }, -/area/holodeck/source_thunderdomecourt) -"cx" = ( -/obj/structure/flora/tree/dead, -/turf/simulated/floor/holofloor{ - tag = "icon-snow"; - icon_state = "snow" - }, -/area/holodeck/source_snowfield) -"cy" = ( -/obj/structure/chair/stool, -/turf/simulated/floor/holofloor{ - tag = "icon-carpet7-0 (EAST)"; - icon_state = "carpet7-0"; - dir = 4 - }, -/area/holodeck/source_meetinghall) -"cz" = ( -/turf/simulated/floor/beach/sand, -/area/holodeck/source_beach) -"cA" = ( -/obj/structure/chair/stool, -/turf/simulated/floor/holofloor{ - tag = "icon-carpet11-0 (EAST)"; - icon_state = "carpet11-0"; - dir = 4 - }, -/area/holodeck/source_meetinghall) -"cB" = ( -/obj/structure/chair/stool, -/turf/simulated/floor/holofloor{ - tag = "icon-carpet15-0 (EAST)"; - icon_state = "carpet15-0"; - dir = 4 - }, -/area/holodeck/source_meetinghall) -"cC" = ( -/turf/simulated/floor/holofloor{ - dir = 1; - icon_state = "green" - }, -/area/holodeck/source_basketball) -"cD" = ( -/turf/simulated/floor/holofloor{ - dir = 9; - icon_state = "green" - }, -/area/holodeck/source_basketball) -"cE" = ( -/turf/simulated/floor/holofloor{ - dir = 5; - icon_state = "green" - }, -/area/holodeck/source_basketball) -"cF" = ( -/obj/structure/holowindow{ - dir = 1 - }, -/turf/simulated/floor/holofloor{ - dir = 8; - icon_state = "green" - }, -/area/holodeck/source_thunderdomecourt) -"cG" = ( -/obj/structure/holowindow{ - dir = 1 - }, -/turf/simulated/floor/holofloor{ - dir = 4; - icon_state = "green" - }, -/area/holodeck/source_thunderdomecourt) -"cH" = ( -/turf/simulated/floor/holofloor{ - dir = 8; - icon_state = "green" - }, -/area/holodeck/source_boxingcourt) -"cI" = ( -/turf/simulated/floor/holofloor{ - dir = 4; - icon_state = "green" - }, -/area/holodeck/source_boxingcourt) -"cJ" = ( -/turf/simulated/floor/holofloor{ - dir = 8; - icon_state = "green" - }, -/area/holodeck/source_basketball) -"cK" = ( -/turf/simulated/floor/holofloor{ - dir = 4; - icon_state = "green" - }, -/area/holodeck/source_basketball) -"cL" = ( -/turf/simulated/floor/holofloor{ - dir = 8; - icon_state = "green" - }, -/area/holodeck/source_thunderdomecourt) -"cM" = ( -/turf/simulated/floor/holofloor, -/area/holodeck/source_basketball) -"cN" = ( -/turf/simulated/floor/holofloor{ - dir = 4; - icon_state = "green" - }, -/area/holodeck/source_thunderdomecourt) -"cO" = ( -/obj/effect/overlay/palmtree_r, -/turf/simulated/floor/beach/sand, -/area/holodeck/source_beach) -"cP" = ( -/obj/effect/overlay/palmtree_l, -/obj/effect/overlay/coconut, -/turf/simulated/floor/beach/sand, -/area/holodeck/source_beach) -"cQ" = ( -/obj/structure/flora/grass/brown, -/turf/simulated/floor/holofloor{ - tag = "icon-snow"; - icon_state = "snow" - }, -/area/holodeck/source_snowfield) -"cR" = ( -/turf/simulated/floor/holofloor, -/area/holodeck/source_thunderdomecourt) -"cS" = ( -/turf/simulated/floor/holofloor{ - dir = 2; - icon_state = "green" - }, -/area/holodeck/source_basketball) -"cT" = ( -/turf/simulated/floor/holofloor{ - icon_state = "sand"; - name = "Soft sand" - }, -/area/holodeck/source_beach) -"cU" = ( -/turf/simulated/floor/holofloor, -/area/holodeck/source_boxingcourt) -"cV" = ( -/obj/structure/chair/stool, -/turf/simulated/floor/holofloor{ - tag = "icon-carpet5-0 (EAST)"; - icon_state = "carpet5-0"; - dir = 4 - }, -/area/holodeck/source_meetinghall) -"cW" = ( -/obj/structure/chair/stool, -/turf/simulated/floor/holofloor{ - tag = "icon-carpet9-0 (EAST)"; - icon_state = "carpet9-0"; - dir = 4 - }, -/area/holodeck/source_meetinghall) -"cX" = ( -/obj/structure/chair/stool, -/turf/simulated/floor/holofloor{ - tag = "icon-carpet13-0 (EAST)"; - icon_state = "carpet13-0"; - dir = 4 - }, -/area/holodeck/source_meetinghall) -"cY" = ( -/turf/simulated/floor/holofloor{ - dir = 10; - icon_state = "green" - }, -/area/holodeck/source_basketball) -"cZ" = ( -/turf/simulated/floor/holofloor{ - dir = 6; - icon_state = "green" - }, -/area/holodeck/source_basketball) -"da" = ( -/obj/structure/holohoop{ - dir = 1 - }, -/turf/simulated/floor/holofloor{ - dir = 2; - icon_state = "green" - }, -/area/holodeck/source_basketball) -"db" = ( -/obj/structure/table/holotable, -/obj/item/clothing/head/helmet/thunderdome, -/obj/item/clothing/suit/armor/tdome/green, -/obj/item/clothing/under/color/green, -/obj/item/holo/esword/green, -/turf/simulated/floor/holofloor{ - dir = 2; - icon_state = "green" - }, -/area/holodeck/source_thunderdomecourt) -"dc" = ( -/obj/structure/table/holotable, -/turf/simulated/floor/holofloor{ - dir = 10; - icon_state = "green" - }, -/area/holodeck/source_thunderdomecourt) -"dd" = ( -/obj/structure/table/holotable, -/obj/machinery/readybutton{ - pixel_y = 0 - }, -/turf/simulated/floor/holofloor{ - dir = 6; - icon_state = "green" - }, -/area/holodeck/source_thunderdomecourt) -"de" = ( -/turf/simulated/floor/holofloor{ - dir = 2; - icon_state = "green" - }, -/area/holodeck/source_boxingcourt) -"df" = ( -/obj/structure/table/holotable, -/obj/item/clothing/gloves/boxing/hologlove{ - icon_state = "boxinggreen"; - item_state = "boxinggreen" - }, -/turf/simulated/floor/holofloor{ - dir = 10; - icon_state = "green" - }, -/area/holodeck/source_boxingcourt) -"dg" = ( -/obj/structure/table/holotable, -/obj/item/clothing/gloves/boxing/hologlove{ - icon_state = "boxinggreen"; - item_state = "boxinggreen" - }, -/turf/simulated/floor/holofloor{ - dir = 6; - icon_state = "green" - }, -/area/holodeck/source_boxingcourt) -"dh" = ( -/obj/item/clothing/under/rainbow, -/obj/item/clothing/glasses/sunglasses, -/turf/simulated/floor/beach/sand, -/area/holodeck/source_beach) -"di" = ( -/turf/unsimulated/wall{ - tag = "icon-iron5"; - icon_state = "iron5" - }, -/area/space) -"dj" = ( -/obj/structure/holowindow, -/turf/simulated/floor/holofloor, -/area/holodeck/source_thunderdomecourt) -"dk" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/unsimulated/wall{ - tag = "icon-iron12"; - icon_state = "iron12" - }, -/area/space) -"dl" = ( -/turf/unsimulated/wall{ - tag = "icon-iron13"; - icon_state = "iron13" - }, -/area/space) -"dm" = ( -/turf/unsimulated/wall{ - tag = "icon-iron9"; - icon_state = "iron9" - }, -/area/space) -"dn" = ( -/obj/machinery/door/poddoor{ - id_tag = "thunderdomegen"; - name = "General Supply" - }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, -/area/tdome/arena_source) -"do" = ( -/obj/machinery/door/poddoor{ - id_tag = "thunderdome"; - name = "Thunderdome Blast Door" - }, -/turf/unsimulated/floor{ - name = "plating" - }, -/area/tdome/arena_source) -"dp" = ( -/turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 8 - }, -/area/tdome/arena_source) -"dq" = ( -/turf/simulated/floor/plasteel{ - icon_state = "green"; - dir = 4 - }, -/area/tdome/arena_source) -"dr" = ( -/obj/machinery/flasher{ - id = "tdomeflash"; - name = "Thunderdome Flash" - }, -/turf/simulated/floor/bluegrid, -/area/tdome/arena_source) -"ds" = ( -/obj/machinery/door/poddoor{ - id_tag = "thunderdomehea"; - name = "Heavy Supply" - }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, -/area/tdome/arena_source) -"dt" = ( -/obj/item/beach_ball, -/turf/simulated/floor/beach/sand, -/area/holodeck/source_beach) -"du" = ( -/obj/docking_port/stationary/transit{ - dir = 8; - dwidth = 3; - height = 5; - id = "mining_transit"; - name = "mining in transit"; - width = 7 - }, -/turf/space/transit, -/area/space) -"dv" = ( -/obj/structure/holowindow{ - dir = 1 - }, -/turf/simulated/floor/holofloor, -/area/holodeck/source_thunderdomecourt) -"dw" = ( -/obj/docking_port/stationary/transit{ - dir = 2; - dwidth = 2; - height = 18; - id = "skipjack_transit"; - name = "skipjack in transit"; - width = 19 - }, -/turf/space/transit, -/area/space) -"dx" = ( -/obj/docking_port/stationary/transit{ - dheight = 9; - dir = 2; - dwidth = 5; - height = 22; - id = "syndicate_transit"; - name = "syndicate in transit"; - width = 18 - }, -/turf/space/transit, -/area/space) -"dy" = ( -/obj/docking_port/stationary/transit{ - dir = 8; - dwidth = 2; - height = 12; - id = "ferry_transit"; - name = "ferry in transit"; - turf_type = /turf/space/transit/horizontal; - width = 5 - }, -/turf/space/transit/horizontal, -/area/space) -"dz" = ( -/turf/unsimulated/floor{ - tag = "icon-dark"; - icon_state = "dark" - }, -/area/vox_station) -"dA" = ( -/obj/machinery/vox_win_button, -/turf/unsimulated/floor{ - tag = "icon-light_on"; - icon_state = "light_on" - }, -/area/vox_station) -"dB" = ( -/obj/item/beach_ball/holoball, -/turf/simulated/floor/holofloor, -/area/holodeck/source_basketball) -"dC" = ( -/turf/unsimulated/wall/fakeglass{ - tag = "icon-fakewindows2 (WEST)"; - icon_state = "fakewindows2"; - dir = 8 - }, -/area/vox_station) -"dD" = ( -/turf/unsimulated/wall/fakeglass{ - tag = "icon-fakewindows (WEST)"; - icon_state = "fakewindows"; - dir = 8 - }, -/area/vox_station) -"dE" = ( -/turf/unsimulated/wall/fakeglass{ - tag = "icon-fakewindows (EAST)"; - icon_state = "fakewindows"; - dir = 4 - }, -/area/vox_station) -"dF" = ( -/obj/machinery/door/airlock/centcom, -/turf/unsimulated/floor{ - tag = "icon-dark"; - icon_state = "dark" - }, -/area/vox_station) -"dG" = ( -/obj/structure/girder/displaced, -/turf/unsimulated/floor{ - tag = "icon-dark"; - icon_state = "dark" - }, -/area/vox_station) -"dH" = ( -/obj/structure/closet/crate, -/turf/unsimulated/floor{ - tag = "icon-dark"; - icon_state = "dark" - }, -/area/vox_station) -"dI" = ( -/obj/structure/chair/comfy/red, -/obj/effect/landmark{ - name = "voxstart" - }, -/turf/unsimulated/floor{ - tag = "icon-dark"; - icon_state = "dark" - }, -/area/vox_station) -"dJ" = ( -/obj/structure/kitchenspike, -/turf/unsimulated/floor{ - tag = "icon-dark"; - icon_state = "dark" - }, -/area/vox_station) -"dK" = ( -/obj/structure/table/wood, -/turf/unsimulated/floor{ - tag = "icon-dark"; - icon_state = "dark" - }, -/area/vox_station) -"dL" = ( -/turf/simulated/floor/beach/coastline, -/area/holodeck/source_beach) -"dM" = ( -/obj/item/chair/stool, -/obj/effect/landmark{ - name = "voxstart" - }, -/turf/unsimulated/floor{ - tag = "icon-dark"; - icon_state = "dark" - }, -/area/vox_station) -"dN" = ( -/obj/docking_port/stationary/transit{ - dwidth = 3; - height = 5; - id = "science_transit"; - name = "science in transit"; - turf_type = /turf/space/transit/horizontal; - width = 7 - }, -/turf/space/transit/horizontal, -/area/space) -"dO" = ( -/obj/docking_port/stationary{ - dir = 2; - dwidth = 2; - height = 18; - id = "skipjack_away"; - name = "vox bay 1"; - width = 19 - }, -/turf/space, -/area/space) -"dP" = ( -/turf/simulated/floor/beach/water, -/area/holodeck/source_beach) -"dQ" = ( -/obj/docking_port/stationary/transit{ - dwidth = 3; - height = 7; - id = "steel_rain_transit"; - name = "steel_rain in transit"; - width = 7 - }, -/turf/space/transit/horizontal, -/area/space) -"dR" = ( -/obj/structure/shuttle/engine/propulsion{ - icon_state = "propulsion_r"; - dir = 1 - }, -/turf/simulated/shuttle/plating, -/area/centcom/evac) -"dS" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall_s6"; - dir = 2 - }, -/area/centcom/evac) -"dT" = ( -/obj/structure/shuttle/engine/propulsion{ - icon_state = "propulsion_l"; - dir = 1 - }, -/turf/simulated/shuttle/plating, -/area/centcom/evac) -"dU" = ( -/obj/structure/shuttle/engine/propulsion{ - icon_state = "propulsion"; - dir = 1 - }, -/turf/simulated/shuttle/plating, -/area/centcom/evac) -"dV" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall_s10"; - dir = 2 - }, -/area/centcom/evac) -"dW" = ( -/obj/docking_port/stationary{ - dir = 1; - dwidth = 1; - height = 4; - id = "pod1_away"; - name = "recovery ship bay 1"; - width = 3 - }, -/turf/space, -/area/shuttle/escape_pod1/centcom) -"dX" = ( -/obj/docking_port/stationary{ - dir = 1; - dwidth = 1; - height = 4; - id = "pod2_away"; - name = "recovery ship bay 2"; - width = 3 - }, -/turf/space, -/area/shuttle/escape_pod2/centcom) -"dY" = ( -/obj/structure/window/reinforced, -/obj/structure/shuttle/engine/heater{ - icon_state = "heater"; - dir = 1 - }, -/turf/simulated/floor/plating/airless, -/area/centcom/evac) -"dZ" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall3"; - dir = 2 - }, -/area/centcom/evac) -"ea" = ( -/turf/unsimulated/wall, -/area/tdome/arena_source) -"eb" = ( -/obj/machinery/igniter/on, -/turf/simulated/floor/plasteel, -/area/tdome/arena_source) -"ec" = ( -/turf/simulated/floor/plasteel, -/area/tdome/arena_source) -"ed" = ( -/obj/structure/rack, -/obj/item/clothing/under/color/red, -/obj/item/clothing/shoes/brown, -/obj/item/clothing/suit/armor/tdome/red, -/obj/item/clothing/head/helmet/thunderdome, -/obj/item/melee/baton/loaded, -/obj/item/melee/energy/sword/saber/red, -/turf/unsimulated/floor{ - icon_state = "dark" - }, -/area/tdome/arena_source) -"ee" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall8"; - dir = 2 - }, -/area/centcom/evac) -"ef" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall7"; - dir = 2 - }, -/area/centcom/evac) -"eg" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall0"; - dir = 2 - }, -/area/centcom/evac) -"eh" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall4"; - dir = 2 - }, -/area/centcom/evac) -"ei" = ( -/obj/structure/rack, -/obj/item/clothing/under/color/green, -/obj/item/clothing/shoes/brown, -/obj/item/clothing/suit/armor/tdome/green, -/obj/item/clothing/head/helmet/thunderdome, -/obj/item/melee/baton/loaded, -/obj/item/melee/energy/sword/saber/green, -/turf/unsimulated/floor{ - icon_state = "dark" - }, -/area/tdome/arena_source) -"ej" = ( -/turf/simulated/floor/bluegrid, -/area/tdome/arena_source) -"ek" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall11"; - dir = 2 - }, -/area/centcom/evac) -"el" = ( -/turf/simulated/shuttle/plating, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f6"; - dir = 2 - }, -/area/centcom/evac) -"em" = ( -/obj/structure/rack, -/obj/item/clothing/under/color/red, -/obj/item/clothing/shoes/brown, -/obj/item/clothing/suit/armor/vest, -/obj/item/clothing/head/helmet/swat, -/obj/item/gun/energy/laser, -/turf/unsimulated/floor{ - icon_state = "dark" - }, -/area/tdome/arena_source) -"en" = ( -/obj/structure/rack, -/obj/item/clothing/under/color/green, -/obj/item/clothing/shoes/brown, -/obj/item/clothing/suit/armor/vest, -/obj/item/clothing/head/helmet/swat, -/obj/item/gun/energy/laser, -/turf/unsimulated/floor{ - icon_state = "dark" - }, -/area/tdome/arena_source) -"eo" = ( -/turf/simulated/shuttle/floor, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f9"; - dir = 2 - }, -/area/centcom/evac) -"ep" = ( -/obj/structure/table, -/obj/item/storage/firstaid/toxin{ - pixel_x = -2; - pixel_y = 4 - }, -/obj/item/storage/firstaid/toxin, -/turf/simulated/shuttle/floor, -/area/centcom/evac) -"eq" = ( -/obj/structure/table, -/obj/item/storage/firstaid/regular{ - pixel_x = 2; - pixel_y = 0 - }, -/obj/item/storage/firstaid/regular{ - pixel_x = -2; - pixel_y = 4 - }, -/turf/simulated/shuttle/floor, -/area/centcom/evac) -"er" = ( -/obj/structure/table, -/obj/item/storage/firstaid/fire, -/obj/item/storage/firstaid/fire{ - pixel_x = -2; - pixel_y = 4 - }, -/turf/simulated/shuttle/floor, -/area/centcom/evac) -"es" = ( -/turf/simulated/shuttle/plating, -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall_f10"; - layer = 2 - }, -/area/centcom/evac) -"et" = ( -/turf/simulated/shuttle/floor, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f5"; - dir = 2 - }, -/area/centcom/evac) -"eu" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall1"; - dir = 2 - }, -/area/centcom/evac) -"ev" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall_s5"; - dir = 2 - }, -/area/centcom/evac) -"ew" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall_s9"; - dir = 2 - }, -/area/centcom/evac) -"ex" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swallc1"; - dir = 2 - }, -/area/centcom/evac) -"ey" = ( -/turf/unsimulated/wall, -/area/start) -"ez" = ( -/obj/effect/landmark/start, -/turf/unsimulated/floor, -/area/start) -"eA" = ( -/turf/unsimulated/wall/splashscreen, -/area/start) -"eB" = ( -/turf/space, -/area/shuttle/escape_pod1/centcom) -"eC" = ( -/turf/space, -/area/shuttle/escape_pod2/centcom) -"eD" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall12"; - dir = 2 - }, -/area/centcom/evac) -"eE" = ( -/obj/machinery/sleeper{ - icon_state = "sleeper-open"; - dir = 8 - }, -/turf/simulated/shuttle/floor, -/area/centcom/evac) -"eF" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swallc2"; - dir = 2 - }, -/area/centcom/evac) -"eG" = ( -/obj/machinery/door/window/northright{ - base_state = "right"; - dir = 4; - icon_state = "right"; - name = "Security Desk"; - req_access_txt = "103" - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/centcom/evac) -"eH" = ( -/obj/docking_port/stationary{ - dir = 4; - dwidth = 1; - height = 4; - id = "pod3_away"; - name = "recovery ship bay 3"; - width = 3 - }, -/turf/space, -/area/shuttle/escape_pod3/centcom) -"eI" = ( -/obj/docking_port/stationary{ - dir = 4; - dwidth = 1; - height = 4; - id = "pod4_away"; - name = "recovery ship bay 4"; - width = 3 - }, -/turf/space, -/area/shuttle/escape_pod5/centcom) -"eJ" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall2"; - dir = 2 - }, -/area/centcom/evac) -"eK" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall14"; - dir = 2 - }, -/area/centcom/evac) -"eL" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swallc4"; - dir = 2 - }, -/area/centcom/evac) -"eM" = ( -/obj/machinery/door/airlock/shuttle, -/turf/simulated/shuttle/plating, -/area/centcom/evac) -"eN" = ( -/obj/machinery/door/airlock/shuttle{ - name = "Cockpit"; - req_access_txt = "109" - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor2" - }, -/area/centcom/evac) -"eO" = ( -/obj/structure/shuttle/window, -/obj/structure/grille, -/turf/simulated/shuttle/plating, -/area/centcom/evac) -"eP" = ( -/obj/structure/flora/grass/brown, -/turf/unsimulated/floor/snow, -/turf/unsimulated/floor/snow{ - tag = "icon-gravsnow_corner (SOUTHWEST)"; - icon_state = "gravsnow_corner"; - dir = 10 - }, -/area/syndicate_mothership) -"eQ" = ( -/obj/structure/closet/secure_closet/cargotech, -/turf/unsimulated/floor{ - dir = 1; - icon_state = "loadingarea" - }, -/area/centcom/suppy) -"eR" = ( -/turf/simulated/shuttle/plating, -/area/centcom/evac) -"eS" = ( -/obj/structure/closet, -/turf/unsimulated/floor{ - tag = "icon-warningcorner (NORTH)"; - icon_state = "warningcorner"; - dir = 1 - }, -/area/centcom/suppy) -"eT" = ( -/obj/structure/closet/secure_closet/quartermaster, -/turf/unsimulated/floor{ - dir = 1; - icon_state = "loadingarea" - }, -/area/centcom/suppy) -"eU" = ( -/obj/structure/closet/emcloset, -/turf/simulated/shuttle/floor, -/area/centcom/evac) -"eV" = ( -/turf/unsimulated/wall/fakeglass{ - icon_state = "fakewindows2"; - dir = 6 - }, -/area/centcom/suppy) -"eW" = ( -/turf/unsimulated/floor{ - dir = 8; - heat_capacity = 1; - icon_state = "warning" - }, -/area/centcom/suppy) -"eX" = ( -/obj/machinery/door/airlock/centcom{ - name = "Supply Shuttle"; - req_access_txt = "106" - }, -/turf/unsimulated/floor{ - icon_state = "delivery" - }, -/area/centcom/suppy) -"eY" = ( -/obj/machinery/computer/supplycomp, -/turf/unsimulated/floor{ - dir = 8; - heat_capacity = 1; - icon_state = "warning" - }, -/area/centcom/suppy) -"eZ" = ( -/obj/machinery/door/airlock/centcom{ - opacity = 1 - }, -/turf/unsimulated/floor, -/area/vox_station) -"fa" = ( -/obj/docking_port/stationary{ - dir = 8; - dwidth = 5; - height = 7; - id = "supply_away"; - name = "supply centcom"; - width = 12 - }, -/turf/space, -/area/space) -"fb" = ( -/turf/unsimulated/wall/fakeglass{ - icon_state = "fakewindows"; - dir = 1 - }, -/area/centcom/suppy) -"fc" = ( -/turf/unsimulated/wall/fakeglass{ - icon_state = "fakewindows2"; - dir = 1 - }, -/area/centcom/suppy) -"fd" = ( -/turf/simulated/shuttle/floor, -/area/centcom/evac) -"fe" = ( -/turf/simulated/shuttle/floor{ - icon_state = "floor2" - }, -/area/centcom/evac) -"ff" = ( -/obj/structure/closet/crate, -/turf/unsimulated/floor{ - tag = "icon-plating"; - icon_state = "plating" - }, -/area/centcom/suppy) -"fg" = ( -/obj/machinery/door/airlock/centcom{ - name = "Crate Storage"; - req_access_txt = "106" - }, -/turf/unsimulated/floor{ - icon_state = "floor" - }, -/area/centcom/suppy) -"fh" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall_s6"; - dir = 2 - }, -/area/shuttle/escape) -"fi" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall12"; - icon_state = "swall12"; - dir = 2 - }, -/area/shuttle/escape) -"fj" = ( -/obj/structure/table/reinforced, -/obj/item/paper_bin, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/centcom/evac) -"fk" = ( -/obj/structure/table/reinforced, -/obj/item/storage/fancy/donut_box, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/centcom/evac) -"fl" = ( -/obj/structure/table/reinforced, -/obj/item/pen, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/centcom/evac) -"fm" = ( -/obj/structure/table/reinforced, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/centcom/evac) -"fn" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall_s10"; - dir = 2 - }, -/area/shuttle/escape) -"fo" = ( -/obj/structure/table, -/obj/item/paper_bin, -/turf/unsimulated/floor{ - tag = "icon-warningcorner (EAST)"; - icon_state = "warningcorner"; - dir = 4 - }, -/area/centcom/suppy) -"fp" = ( -/obj/structure/table, -/obj/item/pen/blue{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/pen/red, -/obj/item/pen{ - pixel_x = 8; - pixel_y = 8 - }, -/turf/unsimulated/floor{ - icon_state = "floor" - }, -/area/centcom/suppy) -"fq" = ( -/obj/machinery/computer/secure_data, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/centcom/evac) -"fr" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall3"; - icon_state = "swall3"; - dir = 2 - }, -/area/shuttle/escape) -"fs" = ( -/obj/machinery/door/airlock/centcom{ - name = "Centcom Supply"; - req_access_txt = "106" - }, -/turf/unsimulated/floor{ - tag = "icon-brown"; - icon_state = "brown" - }, -/area/centcom/suppy) -"ft" = ( -/obj/structure/table/reinforced, -/obj/item/clipboard, -/obj/item/stamp, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/centcom/evac) -"fu" = ( -/obj/structure/table, -/obj/item/flash, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/centcom/evac) -"fv" = ( -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/centcom/evac) -"fw" = ( -/turf/unsimulated/wall/fakeglass{ - icon_state = "fakewindows"; - dir = 1 - }, -/area/centcom/control) -"fx" = ( -/turf/space, -/area/shuttle/escape_pod3/centcom) -"fy" = ( -/obj/structure/table, -/obj/item/storage/box/handcuffs, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/centcom/evac) -"fz" = ( -/turf/unsimulated/floor{ - dir = 1; - icon_state = "green" - }, -/area/centcom/control) -"fA" = ( -/turf/unsimulated/floor, -/area/vox_station) -"fB" = ( -/turf/unsimulated/floor{ - tag = "icon-darkred (NORTH)"; - icon_state = "darkred"; - dir = 1 - }, -/area/centcom/evac) -"fC" = ( -/obj/structure/grille, -/obj/structure/shuttle/window, -/turf/simulated/shuttle/plating, -/area/centcom/evac) -"fD" = ( -/obj/machinery/door/airlock/shuttle, -/turf/simulated/shuttle/floor{ - icon_state = "floor2" - }, -/area/centcom/evac) -"fE" = ( -/turf/unsimulated/floor{ - tag = "icon-darkred (NORTHWEST)"; - icon_state = "darkred"; - dir = 9 - }, -/area/centcom/evac) -"fF" = ( -/obj/structure/table, -/obj/item/storage/box/handcuffs, -/turf/unsimulated/floor{ - tag = "icon-darkred (NORTHEAST)"; - icon_state = "darkred"; - dir = 5 - }, -/area/centcom/evac) -"fG" = ( -/obj/structure/table, -/obj/structure/bedsheetbin, -/turf/simulated/shuttle/floor, -/area/centcom/evac) -"fH" = ( -/obj/structure/table, -/obj/item/hand_labeler, -/turf/simulated/shuttle/floor, -/area/centcom/evac) -"fI" = ( -/obj/structure/table, -/obj/item/storage/box/donkpockets, -/turf/simulated/shuttle/floor, -/area/centcom/evac) -"fJ" = ( -/turf/unsimulated/wall/fakeglass{ - icon_state = "fakewindows2"; - dir = 1 - }, -/area/centcom/control) -"fK" = ( -/obj/machinery/door/airlock/external{ - id_tag = "specops_away"; - name = "Shuttle Hatch"; - req_access_txt = "109" - }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, -/area/centcom/evac) -"fL" = ( -/obj/machinery/door/airlock/shuttle, -/obj/docking_port/mobile/emergency/backup{ - dwidth = 11; - roundstart_move = null - }, -/obj/docking_port/stationary{ - dir = 4; - dwidth = 3; - height = 8; - id = "backup_away"; - name = "Backup Shuttle Dock"; - width = 8 - }, -/turf/unsimulated/floor{ - icon_state = "floor" - }, -/area/shuttle/escape) -"fM" = ( -/obj/structure/table, -/obj/item/radio/off, -/turf/simulated/shuttle/floor, -/area/centcom/evac) -"fN" = ( -/obj/machinery/door/airlock/external{ - id_tag = "specops_away"; - name = "Shuttle Hatch"; - req_access_txt = "109" - }, -/turf/unsimulated/floor{ - icon_state = "floor" - }, -/area/centcom/control) -"fO" = ( -/obj/structure/filingcabinet, -/turf/simulated/shuttle/floor, -/area/centcom/evac) -"fP" = ( -/obj/structure/table/wood, -/obj/item/paper_bin{ - pixel_y = 4 - }, -/obj/item/pen, -/turf/unsimulated/floor{ - dir = 8; - icon_state = "wood" - }, -/area/centcom/ferry) -"fQ" = ( -/obj/structure/table, -/obj/item/storage/lockbox, -/turf/simulated/shuttle/floor, -/area/centcom/evac) -"fR" = ( -/obj/structure/table, -/turf/simulated/shuttle/floor, -/area/centcom/evac) -"fS" = ( -/obj/machinery/computer/shuttle, -/turf/simulated/shuttle/floor, -/area/centcom/evac) -"fT" = ( -/obj/structure/table, -/obj/item/clipboard, -/obj/item/pen, -/turf/simulated/shuttle/floor, -/area/centcom/evac) -"fU" = ( -/obj/structure/table, -/obj/item/paper_bin, -/turf/simulated/shuttle/floor, -/area/centcom/evac) -"fV" = ( -/turf/unsimulated/wall, -/area/centcom/suppy) -"fW" = ( -/obj/structure/mirror{ - pixel_y = 32 - }, -/obj/structure/dresser, -/turf/unsimulated/floor{ - dir = 8; - icon_state = "wood" - }, -/area/centcom/ferry) -"fX" = ( -/turf/unsimulated/floor{ - dir = 8; - icon_state = "wood" - }, -/area/centcom/ferry) -"fY" = ( -/turf/space, -/area/centcom/evac) -"fZ" = ( -/obj/machinery/vending/autodrobe, -/turf/unsimulated/floor{ - dir = 8; - icon_state = "wood" - }, -/area/centcom/ferry) -"ga" = ( -/obj/structure/table/reinforced, -/obj/item/clipboard, -/turf/unsimulated/floor{ - tag = "icon-darkred (WEST)"; - icon_state = "darkred"; - dir = 8 - }, -/area/centcom/evac) -"gb" = ( -/obj/structure/table/wood, -/turf/unsimulated/floor{ - dir = 8; - icon_state = "wood" - }, -/area/centcom/ferry) -"gc" = ( -/obj/structure/chair/comfy/black{ - dir = 8 - }, -/obj/effect/landmark{ - name = "ERT Director" - }, -/turf/unsimulated/floor{ - dir = 8; - icon_state = "wood" - }, -/area/centcom/ferry) -"gd" = ( -/turf/unsimulated/wall/fakeglass{ - icon_state = "fakewindows2"; - dir = 6 - }, -/area/centcom/control) -"ge" = ( -/obj/structure/table/reinforced, -/turf/unsimulated/floor{ - tag = "icon-darkred (SOUTHWEST)"; - icon_state = "darkred"; - dir = 10 - }, -/area/centcom/evac) -"gf" = ( -/obj/structure/closet, -/turf/unsimulated/floor{ - icon_state = "floor" - }, -/area/centcom/suppy) -"gg" = ( -/obj/machinery/door/window/northleft{ - dir = 2; - name = "Centcom Security"; - req_access_txt = "101" - }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, -/area/centcom/evac) -"gh" = ( -/obj/structure/table/reinforced, -/obj/item/paper_bin, -/turf/unsimulated/floor{ - tag = "icon-darkred"; - icon_state = "darkred"; - dir = 2 - }, -/area/centcom/evac) -"gi" = ( -/obj/structure/table/reinforced, -/obj/item/pen, -/turf/unsimulated/floor{ - tag = "icon-darkred"; - icon_state = "darkred"; - dir = 2 - }, -/area/centcom/evac) -"gj" = ( -/turf/unsimulated/floor{ - icon_state = "floor" - }, -/area/centcom/suppy) -"gk" = ( -/turf/unsimulated/wall, -/area/centcom) -"gl" = ( -/turf/space/transit/horizontal, -/area/space) -"gm" = ( -/obj/machinery/vending/clothing, -/turf/unsimulated/floor{ - dir = 8; - icon_state = "wood" - }, -/area/centcom/ferry) -"gn" = ( -/turf/unsimulated/wall/fakedoor, -/area/centcom/suppy) -"go" = ( -/obj/effect/landmark{ - name = "prisonwarp" - }, -/turf/unsimulated/floor{ - name = "plating" - }, -/area/centcom) -"gp" = ( -/turf/unsimulated/floor{ - icon_state = "greencorner"; - dir = 8 - }, -/area/centcom/control) -"gq" = ( -/obj/structure/chair, -/turf/unsimulated/floor{ - dir = 1; - icon_state = "green" - }, -/area/centcom/evac) -"gr" = ( -/obj/item/twohanded/required/kirbyplants, -/turf/unsimulated/floor{ - icon_state = "green"; - dir = 9 - }, -/area/centcom/evac) -"gs" = ( -/obj/structure/rack, -/turf/unsimulated/floor{ - dir = 1; - icon_state = "green" - }, -/area/centcom/evac) -"gt" = ( -/turf/unsimulated/floor{ - dir = 1; - icon_state = "green" - }, -/area/centcom/evac) -"gu" = ( -/turf/unsimulated/wall/fakeglass{ - icon_state = "fakewindows"; - dir = 1 - }, -/area/centcom/evac) -"gv" = ( -/obj/structure/rack, -/obj/item/storage/fancy/crayons, -/obj/item/toy/sword, -/turf/unsimulated/floor{ - dir = 1; - icon_state = "green" - }, -/area/centcom/evac) -"gw" = ( -/obj/machinery/door/airlock/centcom{ - name = "Dressing Room"; - opacity = 1; - req_access_txt = "0" - }, -/turf/unsimulated/floor{ - dir = 8; - icon_state = "wood" - }, -/area/centcom/ferry) -"gx" = ( -/obj/structure/chair{ - dir = 4 - }, -/turf/unsimulated/floor{ - icon_state = "green"; - dir = 8 - }, -/area/centcom/control) -"gy" = ( -/turf/unsimulated/floor{ - icon_state = "greencorner"; - dir = 4 - }, -/area/centcom/control) -"gz" = ( -/turf/unsimulated/wall/fakeglass, -/area/centcom/suppy) -"gA" = ( -/obj/structure/chair{ - dir = 4 - }, -/turf/unsimulated/floor{ - icon_state = "green"; - dir = 8 - }, -/area/centcom/evac) -"gB" = ( -/turf/unsimulated/wall/fakeglass{ - icon_state = "fakewindows2"; - dir = 1 - }, -/area/centcom/evac) -"gC" = ( -/obj/effect/decal/warning_stripes/southeastcorner, -/turf/simulated/floor/plating/airless, -/area/syndicate_mothership) -"gD" = ( -/turf/simulated/floor/plating/airless, -/area/syndicate_mothership) -"gE" = ( -/obj/effect/decal/warning_stripes/south, -/turf/simulated/floor/plating/airless, -/area/syndicate_mothership) -"gF" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall_s5"; - dir = 2 - }, -/area/shuttle/escape) -"gG" = ( -/obj/structure/table, -/obj/item/clipboard, -/obj/item/coin/silver, -/turf/unsimulated/floor, -/area/centcom/suppy) -"gH" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall_s9"; - dir = 2 - }, -/area/shuttle/escape) -"gI" = ( -/turf/unsimulated/floor, -/area/centcom/suppy) -"gJ" = ( -/obj/effect/decal/warning_stripes/south, -/obj/machinery/light{ - dir = 1 - }, -/turf/simulated/floor/plating/airless, -/area/syndicate_mothership) -"gK" = ( -/obj/effect/decal/warning_stripes/southwestcorner, -/turf/simulated/floor/plating/airless, -/area/syndicate_mothership) -"gL" = ( -/obj/machinery/light{ - dir = 1 - }, -/turf/simulated/floor/plating/airless, -/area/syndicate_mothership) -"gM" = ( -/turf/unsimulated/wall/fakeglass{ - icon_state = "fakewindows"; - dir = 1 - }, -/area/centcom/ferry) -"gN" = ( -/turf/unsimulated/wall, -/area/centcom/evac) -"gO" = ( -/turf/unsimulated/wall, -/area/centcom/control) -"gP" = ( -/obj/structure/flora/ausbushes/brflowers, -/turf/unsimulated/floor/grass, -/area/centcom/control) -"gQ" = ( -/turf/unsimulated/floor{ - tag = "icon-warndark (WEST)"; - icon_state = "warndark"; - dir = 8 - }, -/area/centcom/ferry) -"gR" = ( -/turf/unsimulated/floor{ - tag = "icon-darkgreen (EAST)"; - icon_state = "darkgreen"; - dir = 4 - }, -/area/centcom/ferry) -"gS" = ( -/obj/machinery/door/airlock/centcom{ - name = "Centcom Customs"; - opacity = 1; - req_access_txt = "109" - }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, -/area/centcom/control) -"gT" = ( -/turf/unsimulated/floor{ - dir = 4; - heat_capacity = 1; - icon_state = "warning" - }, -/area/centcom/control) -"gU" = ( -/turf/unsimulated/wall/fakeglass{ - tag = "icon-fakewindows (SOUTHWEST)"; - icon_state = "fakewindows"; - dir = 10 - }, -/area/centcom/evac) -"gV" = ( -/turf/unsimulated/wall, -/area/centcom/ferry) -"gW" = ( -/obj/structure/flora/ausbushes/palebush, -/turf/unsimulated/floor/grass, -/area/centcom/control) -"gX" = ( -/turf/unsimulated/wall/fakeglass{ - icon_state = "fakewindows"; - dir = 4 - }, -/area/centcom/evac) -"gY" = ( -/turf/unsimulated/floor{ - icon_state = "floor" - }, -/area/centcom/control) -"gZ" = ( -/turf/unsimulated/wall/fakedoor{ - name = "Centcom Security" - }, -/area/centcom/evac) -"ha" = ( -/turf/unsimulated/floor{ - icon_state = "dark" - }, -/area/centcom/evac) -"hb" = ( -/turf/unsimulated/wall/fakeglass{ - icon_state = "fakewindows2"; - dir = 8 - }, -/area/centcom/evac) -"hc" = ( -/turf/unsimulated/wall/fakeglass{ - icon_state = "fakewindows"; - dir = 8 - }, -/area/centcom/evac) -"hd" = ( -/obj/machinery/door/airlock/centcom{ - name = "Centcom Security"; - opacity = 1; - req_access_txt = "0" - }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, -/area/centcom/evac) -"he" = ( -/turf/unsimulated/wall/fakeglass{ - icon_state = "fakewindows2"; - dir = 1 - }, -/area/centcom/ferry) -"hf" = ( -/turf/unsimulated/wall/fakeglass, -/area/centcom/control) -"hg" = ( -/obj/structure/table/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/unsimulated/floor{ - icon_state = "green"; - dir = 4 - }, -/area/centcom/evac) -"hh" = ( -/turf/unsimulated/floor{ - tag = "icon-yellowsiding (WEST)"; - icon_state = "yellowsiding"; - dir = 8 - }, -/area/centcom/evac) -"hi" = ( -/obj/effect/decal/warning_stripes/southeast, -/turf/simulated/floor/plating/airless, -/area/syndicate_mothership) -"hj" = ( -/turf/simulated/shuttle/wall{ - icon_state = "wall3" - }, -/area/shuttle/assault_pod) -"hk" = ( -/turf/unsimulated/floor{ - dir = 4; - heat_capacity = 1; - icon_state = "warning" - }, -/area/centcom/evac) -"hl" = ( -/turf/unsimulated/wall/fakeglass{ - tag = "icon-fakewindows (SOUTHEAST)"; - icon_state = "fakewindows"; - dir = 6 - }, -/area/centcom/ferry) -"hm" = ( -/obj/effect/decal/warning_stripes/southwest, -/turf/simulated/floor/plating/airless, -/area/syndicate_mothership) -"hn" = ( -/obj/structure/sign/securearea{ - desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; - icon_state = "space"; - layer = 4; - name = "EXTERNAL AIRLOCK"; - pixel_x = 0 - }, -/turf/unsimulated/wall/fakeglass{ - icon_state = "fakewindows"; - dir = 8 - }, -/area/centcom/ferry) -"ho" = ( -/obj/effect/decal/warning_stripes/east, -/turf/simulated/floor/plating/airless, -/area/syndicate_mothership) -"hp" = ( -/obj/machinery/computer/shuttle/ferry, -/turf/unsimulated/floor{ - tag = "icon-warndark (WEST)"; - icon_state = "warndark"; - dir = 8 - }, -/area/centcom/ferry) -"hq" = ( -/turf/unsimulated/floor{ - icon_state = "green"; - dir = 4 - }, -/area/centcom/control) -"hr" = ( -/obj/machinery/door_control{ - desc = "A remote control switch for port-side blast doors."; - icon_state = "doorctrl0"; - id = "CentComPort"; - name = "Security Doors"; - pixel_y = 28; - req_access_txt = "101" - }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, -/area/centcom/control) -"hs" = ( -/obj/structure/table, -/obj/item/stamp{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/stamp/denied{ - pixel_x = 4; - pixel_y = -2 - }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, -/area/centcom/control) -"ht" = ( -/turf/unsimulated/floor{ - icon_state = "greencorner"; - dir = 1 - }, -/area/centcom/evac) -"hu" = ( -/obj/structure/table/reinforced, -/obj/item/toy/carpplushie, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/unsimulated/floor{ - icon_state = "green"; - dir = 6 - }, -/area/centcom/evac) -"hv" = ( -/obj/docking_port/stationary{ - dir = 8; - dwidth = 2; - height = 12; - id = "ferry_away"; - name = "centcom bay 2"; - width = 5 - }, -/turf/space, -/area/space) -"hw" = ( -/turf/unsimulated/floor{ - tag = "icon-warndark (EAST)"; - icon_state = "warndark"; - dir = 4 - }, -/area/centcom/ferry) -"hx" = ( -/obj/machinery/door/airlock/external{ - name = "Ferry Airlock"; - req_access_txt = "0" - }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, -/area/centcom/ferry) -"hy" = ( -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/assault_pod) -"hz" = ( -/obj/effect/decal/warning_stripes/west, -/turf/simulated/floor/plating/airless, -/area/syndicate_mothership) -"hA" = ( -/turf/unsimulated/floor{ - tag = "icon-darkgreencorners (EAST)"; - icon_state = "darkgreencorners"; - dir = 4 - }, -/area/centcom/ferry) -"hB" = ( -/turf/simulated/floor/plating, -/area/syndicate_mothership) -"hC" = ( -/obj/machinery/door/airlock/external{ - req_access_txt = "150" - }, -/turf/simulated/floor/plating, -/area/syndicate_mothership) -"hD" = ( -/obj/machinery/light, -/turf/simulated/floor/plating, -/area/syndicate_mothership) -"hE" = ( -/turf/unsimulated/wall/fakeglass{ - icon_state = "fakewindows2"; - dir = 6 - }, -/area/centcom/ferry) -"hF" = ( -/turf/unsimulated/floor{ - icon_state = "greencorner"; - dir = 1 - }, -/area/centcom/control) -"hG" = ( -/obj/machinery/computer/shuttle/syndicate/drop_pod, -/turf/simulated/shuttle/wall{ - icon_state = "wall3" - }, -/area/shuttle/assault_pod) -"hH" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/window/brigdoor{ - base_state = "rightsecure"; - dir = 1; - icon_state = "rightsecure"; - name = "Centcom Customs"; - req_access_txt = "109" - }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, -/area/centcom/control) -"hI" = ( -/turf/unsimulated/floor{ - tag = "icon-warningcorner (NORTH)"; - icon_state = "warningcorner"; - dir = 1 - }, -/area/centcom/evac) -"hJ" = ( -/turf/unsimulated/floor{ - tag = "icon-yellowsiding (NORTH)"; - icon_state = "yellowsiding"; - dir = 1 - }, -/area/centcom/evac) -"hK" = ( -/turf/unsimulated/floor/grass, -/area/centcom/control) -"hL" = ( -/turf/unsimulated/floor{ - tag = "icon-yellowcornersiding (NORTH)"; - icon_state = "yellowcornersiding"; - dir = 1 - }, -/area/centcom/evac) -"hM" = ( -/turf/unsimulated/floor{ - icon_state = "greencorner" - }, -/area/centcom/control) -"hN" = ( -/turf/unsimulated/wall/fakeglass{ - icon_state = "fakewindows"; - dir = 5 - }, -/area/centcom/ferry) -"hO" = ( -/obj/machinery/door/airlock/centcom{ - name = "Transport Shuttle"; - opacity = 1; - req_access_txt = "101" - }, -/turf/unsimulated/floor{ - icon_state = "floor" - }, -/area/centcom/ferry) -"hP" = ( -/obj/machinery/door/airlock/centcom{ - name = "Centcom Docks"; - opacity = 1; - req_access_txt = "101" - }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, -/area/centcom/control) -"hQ" = ( -/turf/unsimulated/floor{ - dir = 8; - icon_state = "vault" - }, -/area/centcom/control) -"hR" = ( -/obj/machinery/door/poddoor/preopen{ - id_tag = "CentComPort"; - name = "security door" - }, -/turf/unsimulated/floor{ - tag = "icon-loadingarea (WEST)"; - icon_state = "loadingarea"; - dir = 8 - }, -/area/centcom/control) -"hS" = ( -/turf/unsimulated/floor{ - dir = 8; - heat_capacity = 1; - icon_state = "warning" - }, -/area/centcom/evac) -"hT" = ( -/obj/structure/flora/tree/pine{ - pixel_x = 1 - }, -/obj/structure/flora/grass/brown, -/turf/unsimulated/floor/snow, -/area/syndicate_mothership) -"hU" = ( -/obj/effect/decal/warning_stripes/northeast, -/turf/simulated/floor/plating/airless, -/area/syndicate_mothership) -"hV" = ( -/obj/effect/decal/warning_stripes/northeastcorner, -/turf/simulated/floor/plating/airless, -/area/syndicate_mothership) -"hW" = ( -/obj/structure/sign/securearea{ - desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; - icon_state = "space"; - layer = 4; - name = "EXTERNAL AIRLOCK"; - pixel_x = 0 - }, -/turf/unsimulated/wall, -/area/centcom/evac) -"hX" = ( -/turf/unsimulated/floor{ - tag = "icon-darkgreencorners"; - icon_state = "darkgreencorners" - }, -/area/centcom/ferry) -"hY" = ( -/turf/unsimulated/floor{ - tag = "icon-warningcorner (EAST)"; - icon_state = "warningcorner"; - dir = 4 - }, -/area/centcom/evac) -"hZ" = ( -/turf/unsimulated/floor{ - tag = "icon-yellowsiding"; - icon_state = "yellowsiding" - }, -/area/centcom/evac) -"ia" = ( -/turf/unsimulated/floor{ - tag = "icon-yellowcornersiding (WEST)"; - icon_state = "yellowcornersiding"; - dir = 8 - }, -/area/centcom/evac) -"ib" = ( -/turf/unsimulated/floor{ - icon_state = "floor" - }, -/area/centcom/evac) -"ic" = ( -/obj/structure/chair{ - dir = 8 - }, -/turf/unsimulated/floor{ - icon_state = "green"; - dir = 4 - }, -/area/centcom/control) -"id" = ( -/obj/effect/decal/warning_stripes/northwest, -/turf/simulated/floor/plating/airless, -/area/syndicate_mothership) -"ie" = ( -/obj/effect/decal/warning_stripes/northwestcorner, -/turf/simulated/floor/plating/airless, -/area/syndicate_mothership) -"if" = ( -/obj/machinery/light, -/turf/simulated/floor/plating/airless, -/area/syndicate_mothership) -"ig" = ( -/obj/effect/decal/warning_stripes/north, -/turf/simulated/floor/plating/airless, -/area/syndicate_mothership) -"ih" = ( -/obj/effect/decal/warning_stripes/north, -/obj/machinery/light, -/turf/simulated/floor/plating/airless, -/area/syndicate_mothership) -"ii" = ( -/turf/unsimulated/floor{ - name = "plating" - }, -/area/centcom/ferry) -"ij" = ( -/turf/unsimulated/floor{ - tag = "icon-redcorner (WEST)"; - icon_state = "redcorner"; - dir = 8 - }, -/area/centcom/evac) -"ik" = ( -/obj/structure/table/reinforced, -/obj/item/paper_bin, -/turf/unsimulated/floor{ - tag = "icon-red (NORTH)"; - icon_state = "red"; - dir = 1 - }, -/area/centcom/evac) -"il" = ( -/turf/unsimulated/floor{ - icon_state = "dark" - }, -/area/centcom/ferry) -"im" = ( -/obj/structure/table/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/unsimulated/floor{ - tag = "icon-red (NORTHEAST)"; - icon_state = "red"; - dir = 5 - }, -/area/centcom/evac) -"in" = ( -/obj/structure/table/reinforced, -/obj/item/pen, -/turf/unsimulated/floor{ - tag = "icon-red (NORTH)"; - icon_state = "red"; - dir = 1 - }, -/area/centcom/evac) -"io" = ( -/turf/unsimulated/wall/fakeglass{ - icon_state = "fakewindows2"; - dir = 8 - }, -/area/centcom/ferry) -"ip" = ( -/turf/unsimulated/floor{ - icon_state = "dark" - }, -/area/centcom/control) -"iq" = ( -/obj/structure/table, -/turf/unsimulated/floor{ - icon_state = "dark" - }, -/area/centcom/control) -"ir" = ( -/turf/unsimulated/wall/fakeglass{ - icon_state = "fakewindows"; - dir = 8 - }, -/area/centcom/ferry) -"is" = ( -/turf/unsimulated/wall/fakeglass{ - icon_state = "fakewindows"; - dir = 4 - }, -/area/centcom/ferry) -"it" = ( -/obj/machinery/door/airlock/centcom{ - name = "briefing room"; - opacity = 1; - req_access_txt = "101" - }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, -/area/centcom/ferry) -"iu" = ( -/obj/structure/chair{ - dir = 4 - }, -/turf/unsimulated/floor{ - dir = 8; - icon_state = "red" - }, -/area/centcom/evac) -"iv" = ( -/obj/structure/table/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/unsimulated/floor{ - tag = "icon-red (EAST)"; - icon_state = "red"; - dir = 4 - }, -/area/centcom/evac) -"iw" = ( -/obj/structure/dresser, -/obj/structure/mirror{ - pixel_x = 0; - pixel_y = 30 - }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, -/area/centcom/ferry) -"ix" = ( -/obj/structure/table/reinforced, -/obj/item/paper_bin{ - pixel_x = -3; - pixel_y = 5 - }, -/obj/item/pen/blue, -/turf/unsimulated/floor{ - dir = 8; - icon_state = "vault" - }, -/area/centcom/ferry) -"iy" = ( -/turf/unsimulated/floor{ - tag = "icon-darkblue (EAST)"; - icon_state = "darkblue"; - dir = 4 - }, -/area/centcom/ferry) -"iz" = ( -/obj/effect/landmark{ - name = "Commando" - }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, -/area/centcom/ferry) -"iA" = ( -/turf/unsimulated/wall/fakeglass{ - icon_state = "fakewindows"; - dir = 4 - }, -/area/tdome/tdomeobserve) -"iB" = ( -/turf/unsimulated/wall/fakeglass{ - icon_state = "fakewindows"; - dir = 9 - }, -/area/tdome/tdomeobserve) -"iC" = ( -/turf/unsimulated/wall/fakeglass{ - icon_state = "fakewindows"; - dir = 8 - }, -/area/tdome/tdomeobserve) -"iD" = ( -/turf/unsimulated/floor{ - name = "plating" - }, -/area/space) -"iE" = ( -/obj/machinery/door/airlock/centcom{ - name = "Thunderdome"; - opacity = 1; - req_access_txt = "101" - }, -/turf/unsimulated/floor{ - icon_state = "vault"; - dir = 5 - }, -/area/tdome/tdomeobserve) -"iF" = ( -/turf/unsimulated/wall/fakeglass{ - icon_state = "fakewindows"; - dir = 5 - }, -/area/tdome/tdomeobserve) -"iG" = ( -/obj/structure/table, -/obj/item/paper_bin, -/obj/item/pen, -/turf/unsimulated/floor{ - icon_state = "dark" - }, -/area/centcom/control) -"iH" = ( -/obj/machinery/door/airlock/external{ - name = "Port Docking Bay 1"; - id_tag = "emergency_away" - }, -/turf/unsimulated/floor{ - icon_state = "floor" - }, -/area/centcom/evac) -"iI" = ( -/obj/machinery/door/airlock/external{ - name = "Port Docking Bay 1"; - id_tag = "emergency_away" - }, -/turf/unsimulated/floor{ - dir = 4; - heat_capacity = 1; - icon_state = "warning" - }, -/area/centcom/evac) -"iJ" = ( -/obj/structure/table/reinforced, -/turf/unsimulated/floor{ - dir = 8; - icon_state = "vault" - }, -/area/centcom/ferry) -"iK" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = 28 - }, -/turf/unsimulated/floor{ - tag = "icon-darkbrown (EAST)"; - icon_state = "darkbrown"; - dir = 4 - }, -/area/centcom/ferry) -"iL" = ( -/turf/unsimulated/wall/fakeglass{ - dir = 1 - }, -/area/centcom/evac) -"iM" = ( -/turf/unsimulated/floor{ - icon_state = "neutral"; - dir = 8 - }, -/area/tdome/tdomeobserve) -"iN" = ( -/turf/unsimulated/floor{ - icon_state = "neutral"; - dir = 4 - }, -/area/tdome/tdomeobserve) -"iO" = ( -/turf/unsimulated/floor{ - icon_state = "vault"; - dir = 5 - }, -/area/tdome/tdomeobserve) -"iP" = ( -/obj/structure/chair{ - dir = 1 - }, -/turf/unsimulated/floor{ - icon_state = "red"; - dir = 2 - }, -/area/centcom/evac) -"iQ" = ( -/obj/item/twohanded/required/kirbyplants, -/turf/unsimulated/floor{ - icon_state = "red"; - dir = 10 - }, -/area/centcom/evac) -"iR" = ( -/obj/structure/rack, -/obj/item/toy/katana, -/turf/unsimulated/floor{ - icon_state = "red"; - dir = 2 - }, -/area/centcom/evac) -"iS" = ( -/turf/unsimulated/wall, -/area/syndicate_mothership) -"iT" = ( -/turf/unsimulated/wall/fakedoor{ - name = "Thunderdome" - }, -/area/tdome/tdomeadmin) -"iU" = ( -/turf/unsimulated/floor{ - icon_state = "red"; - dir = 2 - }, -/area/centcom/evac) -"iV" = ( -/turf/unsimulated/floor{ - icon_state = "redyellowfull" - }, -/area/tdome/tdomeobserve) -"iW" = ( -/obj/structure/rack, -/obj/item/storage/fancy/crayons, -/obj/item/toy/sword, -/turf/unsimulated/floor{ - icon_state = "red"; - dir = 2 - }, -/area/centcom/evac) -"iX" = ( -/obj/structure/table, -/obj/machinery/computer/security/telescreen{ - pixel_y = 0 - }, -/turf/unsimulated/floor{ - icon_state = "redyellowfull" - }, -/area/tdome/tdomeobserve) -"iY" = ( -/obj/docking_port/stationary{ - area_type = /area/syndicate_mothership; - dir = 1; - dwidth = 5; - height = 14; - id = "emergency_syndicate"; - name = "404 Not Found"; - turf_type = /turf/unsimulated/floor/snow; - width = 25 - }, -/turf/unsimulated/floor/snow, -/area/syndicate_mothership) -"iZ" = ( -/obj/machinery/shuttle_manipulator, -/turf/unsimulated/floor{ - tag = "icon-light_on"; - icon_state = "light_on" - }, -/area/centcom/ferry) -"ja" = ( -/obj/machinery/computer/communications, -/turf/unsimulated/floor{ - dir = 8; - icon_state = "vault" - }, -/area/centcom/ferry) -"jb" = ( -/turf/unsimulated/floor{ - tag = "icon-light_on"; - icon_state = "light_on" - }, -/area/centcom/ferry) -"jc" = ( -/turf/unsimulated/floor{ - tag = "icon-darkred (EAST)"; - icon_state = "darkred"; - dir = 4 - }, -/area/centcom/ferry) -"jd" = ( -/obj/machinery/door/airlock/external{ - name = "Port Docking Bay 1"; - id_tag = "emergency_away" - }, -/turf/space, -/area/centcom/evac) -"je" = ( -/turf/unsimulated/wall/fakeglass{ - color = "#008000"; - dir = 8; - icon_state = "fakewindows2" - }, -/area/wizard_station) -"jf" = ( -/obj/item/shard{ - color = "#008000"; - icon_state = "small" - }, -/obj/structure/grille/broken{ - color = "#008000" - }, -/turf/simulated/floor/plating/airless, -/area/wizard_station) -"jg" = ( -/obj/structure/table/reinforced, -/obj/item/paper_bin, -/turf/unsimulated/floor{ - icon_state = "green" - }, -/area/centcom/evac) -"jh" = ( -/obj/structure/table/reinforced, -/obj/item/pen, -/turf/unsimulated/floor{ - icon_state = "green" - }, -/area/centcom/evac) -"ji" = ( -/turf/unsimulated/wall{ - tag = "icon-uranium2"; - icon_state = "uranium2" - }, -/area/wizard_station) -"jj" = ( -/turf/unsimulated/wall/fakeglass{ - color = "#008000"; - dir = 4; - icon_state = "fakewindows" - }, -/area/wizard_station) -"jk" = ( -/obj/machinery/computer/security/telescreen{ - pixel_y = -32 - }, -/turf/unsimulated/floor{ - icon_state = "redyellowfull" - }, -/area/tdome/tdomeobserve) -"jl" = ( -/turf/unsimulated/wall/fakedoor{ - name = "Thunderdome Admin" - }, -/area/tdome/tdomeobserve) -"jm" = ( -/obj/machinery/door/airlock/external{ - id_tag = "syndicate_away"; - req_access_txt = "150" - }, -/turf/unsimulated/floor{ - icon_state = "bar"; - dir = 2 - }, -/area/syndicate_mothership) -"jn" = ( -/turf/unsimulated/floor/snow, -/turf/unsimulated/floor/snow{ - tag = "icon-gravsnow_corner (WEST)"; - icon_state = "gravsnow_corner"; - dir = 8 - }, -/area/syndicate_mothership) -"jo" = ( -/turf/unsimulated/floor/snow, -/turf/unsimulated/floor/snow{ - tag = "icon-gravsnow_corner (EAST)"; - icon_state = "gravsnow_corner"; - dir = 4 - }, -/area/syndicate_mothership) -"jp" = ( -/obj/effect/landmark/shuttle_import, -/turf/space, -/area/space) -"jq" = ( -/turf/unsimulated/wall/fakeglass{ - icon_state = "fakewindows2"; - dir = 6 - }, -/area/tdome/tdomeobserve) -"jr" = ( -/obj/docking_port/stationary{ - dir = 2; - dwidth = 5; - height = 14; - id = "emergency_away"; - name = "emergency centcom"; - width = 25 - }, -/turf/space, -/area/space) -"js" = ( -/obj/machinery/computer/shuttle, -/turf/unsimulated/floor{ - tag = "icon-cultdamage"; - icon_state = "cultdamage" - }, -/area/wizard_station) -"jt" = ( -/obj/item/shard{ - color = "#008000" - }, -/turf/unsimulated/floor{ - tag = "icon-cultdamage5"; - icon_state = "cultdamage5" - }, -/area/wizard_station) -"ju" = ( -/turf/unsimulated/wall{ - tag = "icon-uranium5"; - icon_state = "uranium5" - }, -/area/wizard_station) -"jv" = ( -/turf/unsimulated/floor{ - tag = "icon-cult"; - icon_state = "cult" - }, -/area/wizard_station) -"jw" = ( -/turf/unsimulated/wall{ - tag = "icon-uranium10"; - icon_state = "uranium10" - }, -/area/wizard_station) -"jx" = ( -/turf/unsimulated/floor{ - icon_state = "bar"; - dir = 2 - }, -/area/syndicate_mothership) -"jy" = ( -/turf/unsimulated/wall/fakeglass{ - icon_state = "fakewindows"; - dir = 1 - }, -/area/syndicate_mothership) -"jz" = ( -/turf/unsimulated/floor{ - dir = 8; - icon_state = "red" - }, -/area/tdome/tdomeobserve) -"jA" = ( -/turf/unsimulated/floor{ - icon_state = "green"; - dir = 4 - }, -/area/tdome/tdomeobserve) -"jB" = ( -/obj/structure/lattice, -/obj/item/shard{ - color = "#008000"; - icon_state = "medium" - }, -/turf/space/transit, -/area/wizard_station) -"jC" = ( -/turf/unsimulated/floor{ - tag = "icon-cultdamage3"; - icon_state = "cultdamage3" - }, -/area/wizard_station) -"jD" = ( -/obj/effect/decal/cleanable/blood/splatter, -/turf/unsimulated/floor{ - tag = "icon-cultdamage2"; - icon_state = "cultdamage2" - }, -/area/wizard_station) -"jE" = ( -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/escape) -"jF" = ( -/obj/effect/decal/cleanable/blood/gibs/body, -/turf/unsimulated/floor{ - tag = "icon-cult"; - icon_state = "cult" - }, -/area/wizard_station) -"jG" = ( -/turf/unsimulated/wall{ - tag = "icon-uranium3"; - icon_state = "uranium3" - }, -/area/wizard_station) -"jH" = ( -/turf/unsimulated/wall/fakeglass{ - dir = 0; - icon_state = "fakewindows"; - tag = "icon-fakewindows (EAST)" - }, -/area/syndicate_mothership) -"jI" = ( -/turf/unsimulated/floor/snow, -/turf/unsimulated/floor/snow{ - tag = "icon-gravsnow_corner (SOUTHWEST)"; - icon_state = "gravsnow_corner"; - dir = 10 - }, -/area/syndicate_mothership) -"jJ" = ( -/turf/unsimulated/floor/snow, -/turf/unsimulated/floor/snow{ - tag = "icon-gravsnow_corner (SOUTHEAST)"; - icon_state = "gravsnow_corner"; - dir = 6 - }, -/area/syndicate_mothership) -"jK" = ( -/obj/machinery/light/spot, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/escape) -"jL" = ( -/turf/unsimulated/floor{ - tag = "icon-darkblue"; - icon_state = "darkblue"; - dir = 2 - }, -/area/centcom/ferry) -"jM" = ( -/turf/unsimulated/floor{ - tag = "icon-darkred"; - icon_state = "darkred"; - dir = 2 - }, -/area/centcom/ferry) -"jN" = ( -/obj/structure/extinguisher_cabinet{ - pixel_y = -28 - }, -/turf/unsimulated/floor{ - tag = "icon-darkbrown"; - icon_state = "darkbrown"; - dir = 2 - }, -/area/centcom/ferry) -"jO" = ( -/turf/unsimulated/floor{ - icon_state = "red"; - dir = 2 - }, -/area/tdome/tdomeobserve) -"jP" = ( -/turf/unsimulated/floor{ - icon_state = "red"; - dir = 10 - }, -/area/tdome/tdomeobserve) -"jQ" = ( -/turf/unsimulated/floor{ - icon_state = "green"; - dir = 6 - }, -/area/tdome/tdomeobserve) -"jR" = ( -/turf/unsimulated/floor{ - icon_state = "floor" - }, -/area/centcom/ferry) -"jS" = ( -/obj/structure/showcase{ - desc = "A strange machine supposedly from another world. The Wizard Federation has been meddling with it for years."; - icon_state = "processor"; - name = "byond random number generator" - }, -/turf/unsimulated/floor{ - tag = "icon-cultdamage7"; - icon_state = "cultdamage7" - }, -/area/wizard_station) -"jT" = ( -/turf/unsimulated/floor{ - tag = "icon-cultdamage"; - icon_state = "cultdamage" - }, -/area/wizard_station) -"jU" = ( -/obj/structure/showcase{ - desc = "A historical figure of great importance to the wizard federation. He spent his long life learning magic, stealing artifacts, and harassing idiots with swords. May he rest forever, Rodney."; - icon = 'icons/mob/mob.dmi'; - icon_state = "nim"; - name = "wizard of yendor showcase" - }, -/turf/unsimulated/floor{ - tag = "icon-cultdamage4"; - icon_state = "cultdamage4" - }, -/area/wizard_station) -"jV" = ( -/obj/effect/decal/cleanable/blood, -/turf/unsimulated/floor{ - tag = "icon-cult"; - icon_state = "cult" - }, -/area/wizard_station) -"jW" = ( -/turf/unsimulated/wall/fakeglass{ - icon_state = "fakewindows"; - dir = 8 - }, -/area/syndicate_mothership) -"jX" = ( -/turf/unsimulated/wall/fakeglass{ - tag = "icon-fakewindows (EAST)"; - icon_state = "fakewindows"; - dir = 4 - }, -/area/syndicate_mothership) -"jY" = ( -/turf/unsimulated/wall/fakeglass{ - tag = "icon-fakewindows2 (WEST)"; - icon_state = "fakewindows2"; - dir = 8 - }, -/area/syndicate_mothership) -"jZ" = ( -/obj/structure/flora/tree/pine{ - pixel_x = 1 - }, -/turf/unsimulated/floor/snow, -/turf/unsimulated/floor/snow{ - icon_state = "gravsnow_corner" - }, -/area/syndicate_mothership) -"ka" = ( -/obj/effect/forcefield, -/obj/structure/door_assembly{ - anchored = 1; - icon_state = "door_as_uranium1"; - name = "Bridge" - }, -/turf/unsimulated/floor{ - tag = "icon-cult"; - icon_state = "cult" - }, -/area/wizard_station) -"kb" = ( -/turf/unsimulated/wall/fakeglass{ - color = "#008000"; - dir = 6; - icon_state = "fakewindows2" - }, -/area/wizard_station) -"kc" = ( -/turf/unsimulated/wall{ - tag = "icon-uranium6"; - icon_state = "uranium6" - }, -/area/wizard_station) -"kd" = ( -/turf/unsimulated/wall{ - tag = "icon-uranium9"; - icon_state = "uranium9" - }, -/area/wizard_station) -"ke" = ( -/obj/machinery/light{ - dir = 1; - on = 1 - }, -/turf/unsimulated/floor{ - icon_state = "bar"; - dir = 2 - }, -/area/syndicate_mothership) -"kf" = ( -/obj/effect/decal/cleanable/blood/splatter, -/turf/unsimulated/floor{ - tag = "icon-cultdamage"; - icon_state = "cultdamage" - }, -/area/wizard_station) -"kg" = ( -/obj/effect/decal/remains/human, -/obj/effect/decal/cleanable/blood, -/turf/unsimulated/floor{ - tag = "icon-cultdamage6"; - icon_state = "cultdamage6" - }, -/area/wizard_station) -"kh" = ( -/obj/structure/mirror{ - pixel_x = 28 - }, -/turf/unsimulated/floor{ - tag = "icon-cult"; - icon_state = "cult" - }, -/area/wizard_station) -"ki" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall0"; - dir = 2 - }, -/area/wizard_station) -"kj" = ( -/turf/unsimulated/wall/fakeglass, -/area/centcom/ferry) -"kk" = ( -/turf/unsimulated/floor{ - tag = "icon-cult"; - icon_state = "cult" - }, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f10"; - dir = 2 - }, -/area/wizard_station) -"kl" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall4"; - dir = 2 - }, -/area/wizard_station) -"km" = ( -/turf/unsimulated/floor{ - tag = "icon-cultdamage7"; - icon_state = "cultdamage7" - }, -/area/wizard_station) -"kn" = ( -/obj/effect/forcefield, -/turf/unsimulated/floor{ - tag = "icon-cult"; - icon_state = "cult" - }, -/area/wizard_station) -"ko" = ( -/obj/effect/forcefield, -/turf/unsimulated/floor{ - tag = "icon-cultdamage"; - icon_state = "cultdamage" - }, -/area/wizard_station) -"kp" = ( -/obj/machinery/light{ - dir = 4 - }, -/turf/unsimulated/floor{ - icon_state = "bar"; - dir = 2 - }, -/area/syndicate_mothership) -"kq" = ( -/obj/structure/shuttle/engine/propulsion{ - dir = 8; - icon_state = "propulsion"; - tag = "icon-propulsion (EAST)" - }, -/turf/simulated/shuttle/plating, -/area/wizard_station) -"kr" = ( -/obj/structure/flora/grass/brown, -/turf/unsimulated/floor/snow, -/turf/unsimulated/floor/snow{ - tag = "icon-gravsnow_corner (EAST)"; - icon_state = "gravsnow_corner"; - dir = 4 - }, -/area/syndicate_mothership) -"ks" = ( -/obj/structure/shuttle/engine/heater{ - tag = "icon-heater (WEST)"; - icon_state = "heater"; - dir = 8 - }, -/turf/simulated/shuttle/plating, -/area/wizard_station) -"kt" = ( -/obj/structure/cult/altar{ - desc = "A altar dedicated to the Wizard's Federation" - }, -/obj/item/kitchen/knife/ritual, -/obj/effect/light_emitter{ - light_power = 1 - }, -/turf/unsimulated/floor{ - tag = "icon-cult"; - icon_state = "cult" - }, -/area/wizard_station) -"ku" = ( -/obj/effect/forcefield, -/turf/unsimulated/floor{ - tag = "icon-cultdamage7"; - icon_state = "cultdamage7" - }, -/area/wizard_station) -"kv" = ( -/obj/effect/forcefield, -/turf/unsimulated/floor{ - tag = "icon-cultdamage5"; - icon_state = "cultdamage5" - }, -/area/wizard_station) -"kw" = ( -/turf/unsimulated/floor/snow, -/turf/unsimulated/floor/snow{ - icon_state = "gravsnow_corner" - }, -/turf/unsimulated/floor/snow{ - tag = "icon-gravsnow_corner (NORTH)"; - icon_state = "gravsnow_corner"; - dir = 1 - }, -/area/syndicate_mothership) -"kx" = ( -/turf/unsimulated/floor/snow, -/turf/unsimulated/floor/snow{ - tag = "icon-gravsnow_corner (NORTH)"; - icon_state = "gravsnow_corner"; - dir = 1 - }, -/area/syndicate_mothership) -"ky" = ( -/turf/unsimulated/floor/snow, -/turf/unsimulated/floor/snow{ - tag = "icon-gravsnow_corner (NORTHEAST)"; - icon_state = "gravsnow_corner"; - dir = 5 - }, -/area/syndicate_mothership) -"kz" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall12"; - dir = 2 - }, -/area/wizard_station) -"kA" = ( -/turf/unsimulated/floor{ - tag = "icon-cult"; - icon_state = "cult" - }, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f9"; - dir = 2 - }, -/area/wizard_station) -"kB" = ( -/turf/unsimulated/floor{ - tag = "icon-cultdamage5"; - icon_state = "cultdamage5" - }, -/area/wizard_station) -"kC" = ( -/obj/structure/table/wood/poker, -/obj/item/toy/cards/cardhand, -/turf/unsimulated/floor{ - tag = "icon-cultdamage2"; - icon_state = "cultdamage2" - }, -/area/wizard_station) -"kD" = ( -/obj/effect/decal/cleanable/blood/gibs/body, -/turf/unsimulated/floor{ - tag = "icon-cultdamage2"; - icon_state = "cultdamage2" - }, -/area/wizard_station) -"kE" = ( -/turf/unsimulated/wall/abductor{ - icon_state = "alien21" - }, -/area/abductor_ship) -"kF" = ( -/obj/machinery/vending/magivend, -/turf/unsimulated/floor{ - tag = "icon-cult"; - icon_state = "cult" - }, -/area/wizard_station) -"kG" = ( -/obj/machinery/vending/snack, -/turf/unsimulated/floor{ - tag = "icon-cultdamage"; - icon_state = "cultdamage" - }, -/area/wizard_station) -"kH" = ( -/turf/unsimulated/wall/fakeglass{ - dir = 8; - icon_state = "fakewindows3"; - tag = "icon-fakewindows (WEST)" - }, -/area/syndicate_mothership) -"kI" = ( -/turf/unsimulated/wall/abductor{ - icon_state = "alien20" - }, -/area/abductor_ship) -"kJ" = ( -/turf/unsimulated/wall/abductor{ - icon_state = "alien23" - }, -/area/abductor_ship) -"kK" = ( -/turf/unsimulated/wall/abductor{ - icon_state = "alien22" - }, -/area/abductor_ship) -"kL" = ( -/turf/unsimulated/wall/abductor{ - icon_state = "alien24" - }, -/area/abductor_ship) -"kM" = ( -/turf/unsimulated/wall/abductor{ - icon_state = "alien16" - }, -/area/abductor_ship) -"kN" = ( -/obj/machinery/abductor/experiment{ - team = 1 - }, -/turf/unsimulated/floor/abductor, -/area/abductor_ship) -"kO" = ( -/turf/unsimulated/wall/abductor{ - icon_state = "alien17" - }, -/area/abductor_ship) -"kP" = ( -/obj/machinery/abductor/pad{ - team = 1 - }, -/turf/unsimulated/floor/abductor, -/area/abductor_ship) -"kQ" = ( -/obj/machinery/abductor/console{ - team = 1 - }, -/turf/unsimulated/floor/abductor, -/area/abductor_ship) -"kR" = ( -/turf/unsimulated/wall/abductor{ - icon_state = "alien19" - }, -/area/abductor_ship) -"kS" = ( -/turf/unsimulated/wall/abductor{ - icon_state = "alien18" - }, -/area/abductor_ship) -"kT" = ( -/obj/machinery/abductor/experiment{ - team = 4 - }, -/turf/unsimulated/floor/abductor, -/area/abductor_ship) -"kU" = ( -/obj/machinery/door/airlock/centcom{ - name = "Shuttle Dock #2"; - opacity = 1; - req_access_txt = "150" - }, -/turf/unsimulated/floor{ - icon_state = "bar"; - dir = 2 - }, -/area/syndicate_mothership) -"kV" = ( -/turf/unsimulated/wall, -/area/tdome/tdomeobserve) -"kW" = ( -/obj/effect/decal/cleanable/blood/splatter, -/obj/effect/decal/remains/human, -/obj/effect/light_emitter{ - light_power = 1 - }, -/turf/unsimulated/floor{ - icon_state = "floor" - }, -/area/wizard_station) -"kX" = ( -/turf/unsimulated/wall{ - tag = "icon-uranium8"; - icon_state = "uranium8" - }, -/area/wizard_station) -"kY" = ( -/turf/unsimulated/wall{ - tag = "icon-uranium4"; - icon_state = "uranium4" - }, -/area/wizard_station) -"kZ" = ( -/obj/structure/door_assembly{ - anchored = 1; - icon_state = "door_as_uranium1"; - name = "Break Room" - }, -/turf/unsimulated/floor{ - tag = "icon-cult"; - icon_state = "cult" - }, -/area/wizard_station) -"la" = ( -/turf/unsimulated/wall{ - tag = "icon-uranium14"; - icon_state = "uranium14" - }, -/area/wizard_station) -"lb" = ( -/obj/machinery/abductor/pad{ - team = 4 - }, -/turf/unsimulated/floor/abductor, -/area/abductor_ship) -"lc" = ( -/obj/machinery/abductor/console{ - team = 4 - }, -/turf/unsimulated/floor/abductor, -/area/abductor_ship) -"ld" = ( -/turf/unsimulated/wall/abductor{ - icon_state = "alien14" - }, -/area/abductor_ship) -"le" = ( -/turf/unsimulated/floor/abductor, -/area/abductor_ship) -"lf" = ( -/obj/machinery/computer/camera_advanced/abductor{ - team = 1 - }, -/turf/unsimulated/floor/abductor, -/area/abductor_ship) -"lg" = ( -/turf/unsimulated/wall/abductor{ - icon_state = "alien15" - }, -/area/abductor_ship) -"lh" = ( -/obj/structure/closet/abductor, -/turf/unsimulated/floor/abductor, -/area/abductor_ship) -"li" = ( -/obj/machinery/computer/camera_advanced/abductor{ - team = 4 - }, -/turf/unsimulated/floor/abductor, -/area/abductor_ship) -"lj" = ( -/turf/unsimulated/wall/abductor{ - icon_state = "alien12" - }, -/area/abductor_ship) -"lk" = ( -/obj/effect/landmark/abductor/scientist, -/turf/unsimulated/floor/abductor, -/area/abductor_ship) -"ll" = ( -/obj/structure/table/abductor, -/obj/item/retractor/alien, -/obj/item/hemostat/alien, -/turf/unsimulated/floor/abductor, -/area/abductor_ship) -"lm" = ( -/turf/unsimulated/wall{ - tag = "icon-uranium12"; - icon_state = "uranium12" - }, -/area/wizard_station) -"ln" = ( -/obj/machinery/door/airlock{ - icon = 'icons/obj/doors/airlocks/station/uranium.dmi'; - name = "Break Room" - }, -/turf/unsimulated/floor{ - tag = "icon-cult"; - icon_state = "cult" - }, -/area/wizard_station) -"lo" = ( -/obj/structure/reagent_dispensers/water_cooler, -/turf/unsimulated/floor{ - icon_state = "dark" - }, -/area/centcom/ferry) -"lp" = ( -/obj/machinery/washing_machine, -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, -/area/syndicate_mothership) -"lq" = ( -/obj/effect/landmark/abductor/agent, -/turf/unsimulated/floor/abductor, -/area/abductor_ship) -"lr" = ( -/obj/structure/table, -/obj/item/storage/fancy/crayons, -/obj/item/storage/fancy/crayons, -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, -/area/syndicate_mothership) -"ls" = ( -/obj/structure/table, -/turf/unsimulated/floor{ - icon_state = "floor" - }, -/area/tdome/tdomeobserve) -"lt" = ( -/turf/unsimulated/floor{ - icon_state = "floor" - }, -/area/tdome/tdomeobserve) -"lu" = ( -/turf/unsimulated/wall/fakeglass, -/area/tdome/tdomeobserve) -"lv" = ( -/obj/item/storage/fancy/crayons, -/obj/machinery/light{ - dir = 1; - on = 1 - }, -/obj/structure/table, -/obj/item/storage/fancy/crayons, -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, -/area/syndicate_mothership) -"lw" = ( -/obj/structure/chair/wood/wings, -/turf/unsimulated/floor{ - tag = "icon-cult"; - icon_state = "cult" - }, -/area/wizard_station) -"lx" = ( -/turf/unsimulated/wall{ - tag = "icon-uranium1"; - icon_state = "uranium1" - }, -/area/wizard_station) -"ly" = ( -/obj/structure/table/wood, -/obj/item/retractor, -/turf/unsimulated/floor{ - tag = "icon-cult"; - icon_state = "cult" - }, -/area/wizard_station) -"lz" = ( -/obj/structure/table/wood, -/obj/item/stack/medical/bruise_pack, -/obj/item/stack/medical/ointment, -/turf/unsimulated/floor{ - tag = "icon-cult"; - icon_state = "cult" - }, -/area/wizard_station) -"lA" = ( -/obj/structure/table/wood, -/obj/item/clothing/suit/wizrobe/magusblue, -/obj/item/clothing/head/wizard/magus, -/obj/item/twohanded/staff, -/turf/unsimulated/floor{ - tag = "icon-cult"; - icon_state = "cult" - }, -/area/wizard_station) -"lB" = ( -/obj/structure/table/wood, -/obj/item/clothing/suit/wizrobe/magusred, -/obj/item/clothing/head/wizard/magus, -/obj/item/twohanded/staff, -/turf/unsimulated/floor{ - tag = "icon-cult"; - icon_state = "cult" - }, -/area/wizard_station) -"lC" = ( -/obj/structure/rack, -/turf/unsimulated/floor{ - tag = "icon-cult"; - icon_state = "cult" - }, -/area/wizard_station) -"lD" = ( -/turf/unsimulated/wall/fakeglass, -/area/centcom/evac) -"lE" = ( -/obj/machinery/optable/abductor, -/turf/unsimulated/floor/abductor, -/area/abductor_ship) -"lF" = ( -/turf/unsimulated/wall/abductor{ - icon_state = "alien13" - }, -/area/abductor_ship) -"lG" = ( -/obj/structure/table/abductor, -/obj/item/storage/box/alienhandcuffs, -/turf/unsimulated/floor/abductor, -/area/abductor_ship) -"lH" = ( -/obj/effect/landmark/abductor/scientist{ - team = 4 - }, -/turf/unsimulated/floor/abductor, -/area/abductor_ship) -"lI" = ( -/obj/effect/landmark/abductor/agent{ - team = 4 - }, -/turf/unsimulated/floor/abductor, -/area/abductor_ship) -"lJ" = ( -/turf/unsimulated/wall/abductor{ - icon_state = "alien10" - }, -/area/abductor_ship) -"lK" = ( -/obj/structure/table/abductor, -/obj/item/paper/abductor, -/obj/item/scalpel/alien, -/obj/item/cautery/alien, -/turf/unsimulated/floor/abductor, -/area/abductor_ship) -"lL" = ( -/turf/unsimulated/wall/abductor{ - icon_state = "alien11" - }, -/area/abductor_ship) -"lM" = ( -/turf/unsimulated/wall/abductor{ - icon_state = "alien6" - }, -/area/abductor_ship) -"lN" = ( -/obj/machinery/abductor/gland_dispenser, -/turf/unsimulated/floor/abductor, -/area/abductor_ship) -"lO" = ( -/turf/unsimulated/wall/abductor{ - icon_state = "alien7" - }, -/area/abductor_ship) -"lP" = ( -/obj/effect/decal/cleanable/blood/splatter, -/turf/unsimulated/floor{ - tag = "icon-cult"; - icon_state = "cult" - }, -/area/wizard_station) -"lQ" = ( -/obj/machinery/computer/shuttle/syndicate/recall, -/turf/unsimulated/floor{ - icon_state = "bar"; - dir = 2 - }, -/area/syndicate_mothership) -"lR" = ( -/obj/machinery/vending/syndisnack, -/turf/unsimulated/floor{ - icon_state = "bar"; - dir = 2 - }, -/area/syndicate_mothership) -"lS" = ( -/obj/machinery/vending/cigarette, -/turf/unsimulated/floor{ - icon_state = "dark" - }, -/area/centcom/ferry) -"lT" = ( -/obj/structure/table/abductor, -/obj/item/surgicaldrill/alien, -/obj/item/circular_saw/alien, -/turf/unsimulated/floor/abductor, -/area/abductor_ship) -"lU" = ( -/turf/unsimulated/wall/abductor{ - icon_state = "alien9" - }, -/area/abductor_ship) -"lV" = ( -/turf/unsimulated/wall/abductor{ - icon_state = "alien8" - }, -/area/abductor_ship) -"lW" = ( -/obj/item/radio/intercom/syndicate{ - pixel_x = 0; - pixel_y = 25 - }, -/obj/item/twohanded/required/kirbyplants, -/turf/unsimulated/floor{ - icon_state = "bar"; - dir = 2 - }, -/area/syndicate_mothership) -"lX" = ( -/obj/machinery/vending/syndicigs, -/turf/unsimulated/floor{ - icon_state = "bar"; - dir = 2 - }, -/area/syndicate_mothership) -"lY" = ( -/obj/structure/table/reinforced, -/turf/unsimulated/floor{ - icon_state = "floor" - }, -/area/tdome/tdomeobserve) -"lZ" = ( -/obj/item/soap/syndie, -/obj/structure/mopbucket, -/obj/machinery/light{ - dir = 1 - }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, -/area/syndicate_mothership) -"ma" = ( -/turf/unsimulated/wall/abductor{ - icon_state = "alien2" - }, -/area/abductor_ship) -"mb" = ( -/turf/unsimulated/wall/abductor, -/area/abductor_ship) -"mc" = ( -/turf/unsimulated/wall/abductor{ - icon_state = "alien4" - }, -/area/abductor_ship) -"md" = ( -/turf/unsimulated/wall/abductor{ - icon_state = "alien3" - }, -/area/abductor_ship) -"me" = ( -/turf/unsimulated/wall/abductor{ - icon_state = "alien5" - }, -/area/abductor_ship) -"mf" = ( -/obj/structure/urinal{ - pixel_y = 28 - }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, -/area/syndicate_mothership) -"mg" = ( -/obj/item/mop, -/obj/structure/mirror{ - pixel_x = 28 - }, -/obj/item/twohanded/required/kirbyplants, -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, -/area/syndicate_mothership) -"mh" = ( -/obj/structure/cult/archives, -/turf/unsimulated/floor{ - tag = "icon-cult"; - icon_state = "cult" - }, -/area/wizard_station) -"mi" = ( -/turf/unsimulated/wall/fakeglass{ - color = "#008000"; - dir = 1; - icon_state = "fakewindows" - }, -/area/wizard_station) -"mj" = ( -/obj/machinery/abductor/experiment{ - team = 2 - }, -/turf/unsimulated/floor/abductor, -/area/abductor_ship) -"mk" = ( -/obj/machinery/abductor/pad{ - team = 2 - }, -/turf/unsimulated/floor/abductor, -/area/abductor_ship) -"ml" = ( -/obj/machinery/abductor/console{ - team = 2 - }, -/turf/unsimulated/floor/abductor, -/area/abductor_ship) -"mm" = ( -/obj/machinery/abductor/experiment{ - team = 3 - }, -/turf/unsimulated/floor/abductor, -/area/abductor_ship) -"mn" = ( -/obj/structure/closet/crate{ - icon_state = "crateopen"; - opened = 1 - }, -/obj/item/clothing/suit/wizrobe/red, -/obj/item/clothing/head/wizard/red, -/obj/item/twohanded/staff, -/obj/item/clothing/shoes/sandal, -/turf/unsimulated/floor{ - tag = "icon-cult"; - icon_state = "cult" - }, -/area/wizard_station) -"mo" = ( -/turf/unsimulated/floor{ - tag = "icon-cult"; - icon_state = "cult" - }, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f6"; - dir = 2 - }, -/area/wizard_station) -"mp" = ( -/obj/effect/decal/cleanable/blood/splatter, -/obj/structure/rack, -/obj/item/clothing/suit/space/hardsuit/shielded/wizard, -/turf/unsimulated/floor{ - tag = "icon-cultdamage"; - icon_state = "cultdamage" - }, -/area/wizard_station) -"mq" = ( -/obj/machinery/abductor/pad{ - team = 3 - }, -/turf/unsimulated/floor/abductor, -/area/abductor_ship) -"mr" = ( -/obj/machinery/abductor/console{ - team = 3 - }, -/turf/unsimulated/floor/abductor, -/area/abductor_ship) -"ms" = ( -/obj/machinery/computer/camera_advanced/abductor{ - team = 2 - }, -/turf/unsimulated/floor/abductor, -/area/abductor_ship) -"mt" = ( -/obj/machinery/computer/camera_advanced/abductor{ - team = 3 - }, -/turf/unsimulated/floor/abductor, -/area/abductor_ship) -"mu" = ( -/obj/machinery/vending/coffee, -/turf/unsimulated/floor{ - icon_state = "dark" - }, -/area/centcom/ferry) -"mv" = ( -/obj/structure/table/reinforced, -/obj/item/clothing/mask/gas, -/obj/item/clothing/mask/gas, -/obj/item/clothing/mask/gas, -/obj/item/clothing/mask/gas, -/obj/item/clothing/mask/gas, -/obj/item/clothing/mask/gas, -/obj/item/clothing/mask/gas, -/turf/unsimulated/floor{ - icon_state = "dark" - }, -/area/centcom/ferry) -"mw" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall8"; - dir = 2 - }, -/area/wizard_station) -"mx" = ( -/obj/effect/landmark/abductor/scientist{ - team = 2 - }, -/turf/unsimulated/floor/abductor, -/area/abductor_ship) -"my" = ( -/obj/effect/landmark/abductor/agent{ - team = 2 - }, -/turf/unsimulated/floor/abductor, -/area/abductor_ship) -"mz" = ( -/obj/effect/landmark/abductor/scientist{ - team = 3 - }, -/turf/unsimulated/floor/abductor, -/area/abductor_ship) -"mA" = ( -/obj/effect/landmark/abductor/agent{ - team = 3 - }, -/turf/unsimulated/floor/abductor, -/area/abductor_ship) -"mB" = ( -/obj/machinery/porta_turret/syndicate/pod, -/turf/simulated/floor/pod, -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 8; - icon_state = "diagonalWall3" - }, -/area/shuttle/assault_pod) -"mC" = ( -/obj/structure/noticeboard{ - pixel_x = -32 - }, -/obj/item/paper/syndimemo, -/turf/unsimulated/floor{ - icon_state = "bar"; - dir = 2 - }, -/area/syndicate_mothership) -"mD" = ( -/obj/structure/chair/stool, -/obj/effect/landmark{ - name = "Syndicate-Spawn" - }, -/turf/unsimulated/floor{ - icon_state = "bar"; - dir = 2 - }, -/area/syndicate_mothership) -"mE" = ( -/mob/living/simple_animal/pet/dog/fox/Syndifox, -/turf/unsimulated/floor{ - icon_state = "bar"; - dir = 2 - }, -/area/syndicate_mothership) -"mF" = ( -/obj/machinery/door/airlock/centcom{ - name = "Restroom"; - opacity = 1; - req_access_txt = "150" - }, -/turf/unsimulated/floor{ - icon_state = "bar"; - dir = 2 - }, -/area/syndicate_mothership) -"mG" = ( -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, -/area/syndicate_mothership) -"mH" = ( -/obj/structure/lattice, -/turf/space/transit, -/area/wizard_station) -"mI" = ( -/obj/structure/mirror{ - pixel_x = 28 - }, -/obj/structure/sink{ - dir = 4; - icon_state = "sink"; - pixel_x = 11; - pixel_y = 0 - }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, -/area/syndicate_mothership) -"mJ" = ( -/obj/structure/bookcase, -/turf/unsimulated/floor{ - tag = "icon-cult"; - icon_state = "cult" - }, -/area/wizard_station) -"mK" = ( -/turf/unsimulated/wall/fakeglass{ - color = "#008000"; - dir = 1; - icon_state = "fakewindows2" - }, -/area/wizard_station) -"mL" = ( -/obj/machinery/porta_turret/syndicate/pod, -/turf/simulated/floor/pod, -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 1; - icon_state = "diagonalWall3" - }, -/area/shuttle/assault_pod) -"mM" = ( -/obj/item/clothing/shoes/sandal/marisa, -/obj/item/clothing/suit/wizrobe/marisa, -/obj/item/clothing/head/wizard/marisa, -/obj/item/twohanded/staff/broom, -/turf/unsimulated/floor{ - tag = "icon-cult"; - icon_state = "cult" - }, -/area/wizard_station) -"mN" = ( -/obj/effect/decal/cleanable/blood/splatter, -/mob/living/simple_animal/hostile/creature{ - name = "Experiment 35b" - }, -/turf/unsimulated/floor{ - tag = "icon-cult"; - icon_state = "cult" - }, -/area/wizard_station) -"mO" = ( -/obj/structure/shuttle/engine/propulsion{ - dir = 4; - icon_state = "propulsion" - }, -/turf/simulated/shuttle/plating, -/area/wizard_station) -"mP" = ( -/obj/structure/shuttle/engine/heater{ - icon_state = "heater"; - dir = 4 - }, -/turf/simulated/shuttle/plating, -/area/wizard_station) -"mQ" = ( -/obj/machinery/light{ - icon_state = "tube1"; - dir = 8 - }, -/turf/unsimulated/floor{ - icon_state = "bar"; - dir = 2 - }, -/area/syndicate_mothership) -"mR" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/cans/beer{ - pixel_x = -2; - pixel_y = 5 - }, -/turf/unsimulated/floor{ - icon_state = "bar"; - dir = 2 - }, -/area/syndicate_mothership) -"mS" = ( -/obj/structure/table/wood, -/obj/item/pizzabox, -/obj/item/paicard/syndicate, -/turf/unsimulated/floor{ - icon_state = "bar"; - dir = 2 - }, -/area/syndicate_mothership) -"mT" = ( -/obj/machinery/light{ - dir = 4; - icon_state = "tube1" - }, -/turf/unsimulated/floor{ - icon_state = "bar"; - dir = 2 - }, -/area/syndicate_mothership) -"mU" = ( -/obj/structure/toilet{ - dir = 8 - }, -/obj/structure/window/reinforced/tinted{ - dir = 1 - }, -/obj/machinery/door/window{ - dir = 8; - name = "Tactical Toilet"; - opacity = 1; - req_access_txt = "150" - }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, -/area/syndicate_mothership) -"mV" = ( -/obj/machinery/light{ - dir = 1; - on = 1 - }, -/turf/simulated/floor/plating/airless, -/area/syndicate_mothership) -"mW" = ( -/obj/item/shard{ - color = "#008000"; - icon_state = "medium" - }, -/obj/structure/grille/broken{ - color = "#008000" - }, -/turf/simulated/floor/plating, -/area/wizard_station) -"mX" = ( -/obj/effect/landmark/start{ - name = "wizard" - }, -/turf/unsimulated/floor{ - tag = "icon-cultdamage5"; - icon_state = "cultdamage5" - }, -/area/wizard_station) -"mY" = ( -/obj/structure/table/wood, -/obj/item/storage/box/drinkingglasses, -/turf/unsimulated/floor{ - icon_state = "dark" - }, -/area/centcom/ferry) -"mZ" = ( -/turf/unsimulated/floor{ - tag = "icon-cult"; - icon_state = "cult" - }, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f5"; - dir = 2 - }, -/area/wizard_station) -"na" = ( -/obj/structure/table/reinforced, -/obj/item/storage/box/syringes, -/obj/item/gun/syringe/rapidsyringe, -/turf/unsimulated/floor{ - icon_state = "dark" - }, -/area/centcom/ferry) -"nb" = ( -/obj/effect/decal/remains/human, -/obj/effect/decal/cleanable/blood/splatter, -/turf/unsimulated/floor{ - tag = "icon-cult"; - icon_state = "cult" - }, -/area/wizard_station) -"nc" = ( -/turf/unsimulated/wall/fakeglass{ - tag = "icon-fakewindows (NORTHWEST)"; - icon_state = "fakewindows"; - dir = 9 - }, -/area/syndicate_mothership) -"nd" = ( -/obj/item/twohanded/required/kirbyplants, -/turf/unsimulated/floor{ - icon_state = "bar"; - dir = 2 - }, -/area/syndicate_mothership) -"ne" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/food/snacks/mushroompizzaslice{ - pixel_x = -5; - pixel_y = 5 - }, -/turf/unsimulated/floor{ - icon_state = "bar"; - dir = 2 - }, -/area/syndicate_mothership) -"nf" = ( -/obj/structure/chair/stool, -/turf/unsimulated/floor{ - icon_state = "bar"; - dir = 2 - }, -/area/syndicate_mothership) -"ng" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/cans/beer{ - pixel_x = 5; - pixel_y = -2 - }, -/obj/item/toy/cards/deck/syndicate{ - pixel_x = -6; - pixel_y = 6 - }, -/turf/unsimulated/floor{ - icon_state = "bar"; - dir = 2 - }, -/area/syndicate_mothership) -"nh" = ( -/obj/structure/flora/grass/brown, -/turf/unsimulated/floor/snow, -/turf/unsimulated/floor/snow{ - tag = "icon-gravsnow_corner (WEST)"; - icon_state = "gravsnow_corner"; - dir = 8 - }, -/area/syndicate_mothership) -"ni" = ( -/obj/machinery/door/airlock/centcom{ - aiControlDisabled = 1; - name = "Assault Pod"; - opacity = 1; - req_one_access_txt = "150" - }, -/turf/simulated/floor/plating, -/area/shuttle/assault_pod) -"nj" = ( -/obj/machinery/porta_turret/syndicate/pod, -/turf/simulated/floor/pod, -/turf/space, -/turf/simulated/shuttle/wall{ - tag = "icon-diagonalWall3"; - icon_state = "diagonalWall3"; - dir = 2 - }, -/area/shuttle/assault_pod) -"nk" = ( -/obj/structure/chair/wood/wings{ - tag = "icon-wooden_chair_wings (NORTH)"; - icon_state = "wooden_chair_wings"; - dir = 1 - }, -/turf/unsimulated/floor{ - tag = "icon-cult"; - icon_state = "cult" - }, -/area/wizard_station) -"nl" = ( -/obj/structure/cult/pylon, -/turf/unsimulated/floor{ - tag = "icon-cult"; - icon_state = "cult" - }, -/area/wizard_station) -"nm" = ( -/obj/effect/decal/cleanable/blood/splatter, -/turf/unsimulated/floor{ - tag = "icon-cultdamage4"; - icon_state = "cultdamage4" - }, -/area/wizard_station) -"nn" = ( -/obj/effect/decal/cleanable/blood/splatter, -/obj/structure/rack, -/obj/item/twohanded/staff, -/turf/unsimulated/floor{ - tag = "icon-cultdamage"; - icon_state = "cultdamage" - }, -/area/wizard_station) -"no" = ( -/turf/unsimulated/floor{ - tag = "icon-cultdamage4"; - icon_state = "cultdamage4" - }, -/area/wizard_station) -"np" = ( -/obj/effect/decal/cleanable/blood/splatter, -/obj/effect/forcefield, -/turf/unsimulated/floor{ - tag = "icon-cultdamage"; - icon_state = "cultdamage" - }, -/area/wizard_station) -"nq" = ( -/turf/unsimulated/wall/fakeglass{ - tag = "icon-fakewindows2 (NORTH)"; - icon_state = "fakewindows2"; - dir = 1 - }, -/area/syndicate_mothership) -"nr" = ( -/obj/machinery/door/poddoor{ - id_tag = "nukeop_ready"; - name = "Shuttle Dock Door" - }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, -/area/syndicate_mothership) -"ns" = ( -/mob/living/simple_animal/pet/cat/Syndi, -/turf/unsimulated/floor{ - icon_state = "bar"; - dir = 2 - }, -/area/syndicate_mothership) -"nt" = ( -/obj/item/flag/syndi, -/turf/unsimulated/floor{ - icon_state = "bar"; - dir = 2 - }, -/area/syndicate_mothership) -"nu" = ( -/obj/structure/door_assembly{ - anchored = 1; - icon_state = "door_as_uranium1"; - name = "Corridor A" - }, -/turf/unsimulated/floor{ - tag = "icon-cult"; - icon_state = "cult" - }, -/area/wizard_station) -"nv" = ( -/turf/unsimulated/wall{ - tag = "icon-uranium15"; - icon_state = "uranium15" - }, -/area/wizard_station) -"nw" = ( -/obj/machinery/door/airlock{ - icon = 'icons/obj/doors/airlocks/station/uranium.dmi'; - name = "Corridor A" - }, -/turf/unsimulated/floor{ - tag = "icon-cult"; - icon_state = "cult" - }, -/area/wizard_station) -"nx" = ( -/turf/unsimulated/wall/fakeglass{ - tag = "icon-fakewindows (WEST)"; - icon_state = "fakewindows"; - dir = 8 - }, -/area/syndicate_mothership) -"ny" = ( -/obj/machinery/door/airlock/external{ - id_tag = "syndicate_away"; - req_access_txt = "150" - }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, -/area/syndicate_mothership) -"nz" = ( -/obj/machinery/door_control{ - id = "nukeop_ready"; - name = "Mission Launch Control"; - pixel_x = -26; - pixel_y = -2; - req_access_txt = "151" - }, -/obj/item/twohanded/required/kirbyplants, -/turf/unsimulated/floor{ - icon_state = "bar"; - dir = 2 - }, -/area/syndicate_mothership) -"nA" = ( -/obj/effect/forcefield, -/turf/unsimulated/floor{ - tag = "icon-cultdamage3"; - icon_state = "cultdamage3" - }, -/area/wizard_station) -"nB" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/bottle/rum, -/obj/item/reagent_containers/food/drinks/bottle/vodka{ - pixel_x = -5 - }, -/obj/item/reagent_containers/food/drinks/bottle/whiskey{ - pixel_x = 5 - }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, -/area/centcom/ferry) -"nC" = ( -/obj/docking_port/stationary{ - area_type = /area/syndicate_mothership; - dheight = 9; - dir = 2; - dwidth = 5; - height = 22; - id = "syndicate_away"; - name = "syndicate recon outpost"; - turf_type = /turf/unsimulated/floor/snow; - width = 18 - }, -/turf/space, -/area/space) -"nD" = ( -/obj/structure/table/wood, -/obj/item/storage/box/drinkingglasses, -/obj/item/reagent_containers/food/drinks/bottle/rum, -/turf/unsimulated/floor{ - dir = 2; - icon_state = "wood" - }, -/area/syndicate_mothership) -"nE" = ( -/obj/structure/table/wood, -/obj/item/syndicatedetonator, -/turf/unsimulated/floor{ - dir = 2; - icon_state = "wood" - }, -/area/syndicate_mothership) -"nF" = ( -/obj/structure/table/reinforced, -/obj/item/storage/box/emps, -/obj/item/gun/energy/ionrifle, -/turf/unsimulated/floor{ - icon_state = "dark" - }, -/area/centcom/ferry) -"nG" = ( -/obj/structure/table/reinforced, -/obj/item/grenade/plastic/c4, -/obj/item/grenade/plastic/c4{ - pixel_x = 7 - }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, -/area/centcom/ferry) -"nH" = ( -/obj/structure/table/wood, -/turf/unsimulated/floor{ - dir = 2; - icon_state = "wood" - }, -/area/syndicate_mothership) -"nI" = ( -/obj/structure/table/wood, -/obj/item/toy/nuke, -/turf/unsimulated/floor{ - dir = 2; - icon_state = "wood" - }, -/area/syndicate_mothership) -"nJ" = ( -/turf/unsimulated/floor{ - icon_state = "green" - }, -/area/tdome/tdomeobserve) -"nK" = ( -/obj/machinery/light/small{ - tag = "icon-bulb1 (EAST)"; - icon_state = "bulb1"; - dir = 4 - }, -/obj/structure/chair/comfy/shuttle{ - dir = 8 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/assault_pod) -"nL" = ( -/obj/machinery/light/small{ - tag = "icon-bulb1 (WEST)"; - icon_state = "bulb1"; - dir = 8 - }, -/obj/structure/chair/comfy/shuttle{ - dir = 4 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/assault_pod) -"nM" = ( -/turf/unsimulated/floor{ - tag = "icon-cultdamage2"; - icon_state = "cultdamage2" - }, -/area/wizard_station) -"nN" = ( -/obj/effect/decal/remains/human, -/turf/unsimulated/floor{ - tag = "icon-cultdamage"; - icon_state = "cultdamage" - }, -/area/wizard_station) -"nO" = ( -/obj/structure/sign/securearea{ - desc = "A warning sign which reads 'FOURTH WALL'."; - name = "\improper FOURTH WALL"; - pixel_x = -32 - }, -/turf/unsimulated/floor/snow, -/area/syndicate_mothership) -"nP" = ( -/obj/machinery/porta_turret/syndicate/pod, -/turf/simulated/floor/pod, -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 4; - icon_state = "diagonalWall3" - }, -/area/shuttle/assault_pod) -"nQ" = ( -/obj/item/radio/intercom/syndicate{ - pixel_x = -28 - }, -/turf/unsimulated/floor{ - dir = 2; - icon_state = "wood" - }, -/area/syndicate_mothership) -"nR" = ( -/obj/effect/landmark{ - name = "Syndicate-Spawn" - }, -/turf/unsimulated/floor{ - dir = 2; - icon_state = "wood" - }, -/area/syndicate_mothership) -"nS" = ( -/turf/unsimulated/floor{ - dir = 2; - icon_state = "wood" - }, -/area/syndicate_mothership) -"nT" = ( -/obj/machinery/door/window{ - dir = 4; - name = "Uplink Management Control"; - req_access_txt = "151" - }, -/turf/unsimulated/floor{ - dir = 2; - icon_state = "wood" - }, -/area/syndicate_mothership) -"nU" = ( -/obj/machinery/door/airlock/centcom{ - name = "Thunderdome"; - opacity = 1; - req_access_txt = "101" - }, -/turf/unsimulated/floor{ - icon_state = "vault"; - dir = 5 - }, -/area/tdome/tdomeadmin) -"nV" = ( -/obj/machinery/computer/shuttle/syndicate/recall, -/turf/unsimulated/floor{ - dir = 2; - icon_state = "wood" - }, -/area/syndicate_mothership) -"nW" = ( -/obj/item/flag/syndi, -/turf/unsimulated/floor{ - dir = 2; - icon_state = "wood" - }, -/area/syndicate_mothership) -"nX" = ( -/obj/structure/sign/double/map/right{ - pixel_y = -32 - }, -/obj/structure/rack/skeletal_bar/right, -/obj/item/reagent_containers/food/drinks/bottle/gin, -/turf/unsimulated/floor{ - dir = 2; - icon_state = "wood" - }, -/area/syndicate_mothership) -"nY" = ( -/obj/structure/sign/double/map/left{ - pixel_y = -32 - }, -/obj/machinery/light, -/obj/structure/rack/skeletal_bar/left, -/obj/item/reagent_containers/food/drinks/bottle/vodka, -/turf/unsimulated/floor{ - dir = 2; - icon_state = "wood" - }, -/area/syndicate_mothership) -"nZ" = ( -/obj/machinery/door/airlock/multi_tile/glass{ - name = "Equipment Room"; - req_access_txt = "150" - }, -/turf/unsimulated/floor{ - icon_state = "bar"; - dir = 2 - }, -/area/syndicate_mothership) -"oa" = ( -/obj/structure/flora/bush, -/turf/unsimulated/floor/snow, -/turf/unsimulated/floor/snow{ - tag = "icon-gravsnow_corner (NORTH)"; - icon_state = "gravsnow_corner"; - dir = 1 - }, -/area/syndicate_mothership) -"ob" = ( -/obj/structure/bed, -/obj/item/bedsheet/wiz, -/obj/effect/light_emitter{ - light_power = 1 - }, -/turf/unsimulated/floor{ - icon_state = "carpet"; - dir = 2 - }, -/area/wizard_station) -"oc" = ( -/turf/unsimulated/floor{ - icon_state = "redbluefull"; - dir = 2 - }, -/area/tdome/tdomeadmin) -"od" = ( -/obj/structure/chair, -/obj/effect/landmark{ - name = "tdomeobserve" - }, -/turf/unsimulated/floor{ - icon_state = "redbluefull"; - dir = 2 - }, -/area/tdome/tdomeadmin) -"oe" = ( -/obj/machinery/door/airlock{ - icon = 'icons/obj/doors/airlocks/station/uranium.dmi'; - name = "Personal Quarters" - }, -/turf/unsimulated/floor{ - tag = "icon-cult"; - icon_state = "cult" - }, -/area/wizard_station) -"of" = ( -/turf/unsimulated/floor{ - dir = 2; - icon_state = "stage_stairs" - }, -/area/syndicate_mothership) -"og" = ( -/obj/machinery/mech_bay_recharge_port/upgraded, -/obj/structure/cable{ - icon_state = "0-2"; - d2 = 2 - }, -/turf/unsimulated/floor, -/area/syndicate_mothership) -"oh" = ( -/turf/unsimulated/wall/fakedoor, -/area/centcom/ferry) -"oi" = ( -/obj/machinery/vending/tool, -/turf/unsimulated/floor{ - tag = "icon-dark"; - icon_state = "dark" - }, -/area/syndicate_mothership) -"oj" = ( -/obj/machinery/door/airlock/centcom{ - aiControlDisabled = 1; - name = "Assault Pod"; - opacity = 1; - req_one_access_txt = "150" - }, -/obj/docking_port/mobile/assault_pod, -/turf/simulated/floor/plating, -/area/shuttle/assault_pod) -"ok" = ( -/obj/machinery/computer/security/telescreen, -/turf/unsimulated/floor{ - icon_state = "redbluefull"; - dir = 2 - }, -/area/tdome/tdomeadmin) -"ol" = ( -/turf/unsimulated/floor{ - dir = 1; - icon_state = "carpetside" - }, -/area/wizard_station) -"om" = ( -/obj/structure/table/wood, -/obj/effect/landmark{ - name = "Teleport-Scroll" - }, -/obj/item/dice/d20, -/obj/item/dice, -/turf/unsimulated/floor{ - dir = 9; - icon_state = "carpetside" - }, -/area/wizard_station) -"on" = ( -/turf/unsimulated/floor{ - dir = 5; - icon_state = "carpetside" - }, -/area/wizard_station) -"oo" = ( -/turf/unsimulated/floor{ - tag = "icon-cult"; - icon_state = "cult" - }, -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall_f10"; - layer = 2 - }, -/area/wizard_station) -"op" = ( -/turf/unsimulated/floor{ - tag = "icon-cultdamage6"; - icon_state = "cultdamage6" - }, -/area/wizard_station) -"oq" = ( -/turf/unsimulated/floor{ - icon_state = "floor" - }, -/area/syndicate_mothership) -"or" = ( -/obj/machinery/light, -/turf/unsimulated/floor{ - icon_state = "floor" - }, -/area/syndicate_mothership) -"os" = ( -/obj/structure/flora/tree/pine, -/turf/unsimulated/floor/snow, -/turf/unsimulated/floor/snow{ - icon_state = "gravsnow_corner" - }, -/area/syndicate_mothership) -"ot" = ( -/obj/machinery/light{ - icon_state = "tube1"; - dir = 8 - }, -/turf/unsimulated/floor{ - tag = "icon-dark"; - icon_state = "dark" - }, -/area/syndicate_mothership) -"ou" = ( -/turf/unsimulated/floor{ - tag = "icon-dark"; - icon_state = "dark" - }, -/area/syndicate_mothership) -"ov" = ( -/obj/structure/flora/grass/brown, -/turf/unsimulated/floor/snow, -/turf/unsimulated/floor/snow{ - icon_state = "gravsnow_corner" - }, -/area/syndicate_mothership) -"ow" = ( -/turf/unsimulated/floor{ - dir = 8; - icon_state = "carpetside" - }, -/area/wizard_station) -"ox" = ( -/turf/unsimulated/floor{ - dir = 4; - icon_state = "carpetside" - }, -/area/wizard_station) -"oy" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall1"; - dir = 2 - }, -/area/wizard_station) -"oz" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall3"; - dir = 2 - }, -/area/wizard_station) -"oA" = ( -/obj/structure/chair/stool, -/turf/unsimulated/floor{ - tag = "icon-dark"; - icon_state = "dark" - }, -/area/syndicate_mothership) -"oB" = ( -/turf/unsimulated/wall/fakeglass{ - icon_state = "fakewindows"; - dir = 8 - }, -/area/tdome/tdomeadmin) -"oC" = ( -/turf/unsimulated/wall/fakeglass{ - icon_state = "fakewindows2"; - dir = 8 - }, -/area/tdome/tdomeadmin) -"oD" = ( -/turf/unsimulated/wall/fakeglass, -/area/syndicate_mothership) -"oE" = ( -/turf/unsimulated/wall/fakeglass{ - icon_state = "fakewindows"; - dir = 4 - }, -/area/tdome/tdomeadmin) -"oF" = ( -/turf/unsimulated/floor{ - dir = 2; - icon_state = "carpetside" - }, -/area/wizard_station) -"oG" = ( -/obj/structure/dresser, -/obj/item/storage/backpack/satchel, -/turf/unsimulated/floor{ - dir = 10; - icon_state = "carpetside" - }, -/area/wizard_station) -"oH" = ( -/obj/structure/table/wood, -/obj/item/storage/bag/tray, -/turf/unsimulated/floor{ - dir = 6; - icon_state = "carpetside" - }, -/area/wizard_station) -"oI" = ( -/obj/structure/closet/syndicate/personal, -/turf/unsimulated/floor{ - icon_state = "vault"; - dir = 8 - }, -/area/syndicate_mothership) -"oJ" = ( -/obj/structure/table, -/obj/item/gun/energy/ionrifle, -/turf/unsimulated/floor{ - tag = "icon-dark"; - icon_state = "dark" - }, -/area/syndicate_mothership) -"oK" = ( -/turf/unsimulated/wall{ - tag = "icon-uranium13"; - icon_state = "uranium13" - }, -/area/wizard_station) -"oL" = ( -/turf/unsimulated/wall/fakedoor{ - name = "Squad 4 Pod" - }, -/area/wizard_station) -"oM" = ( -/obj/machinery/door/poddoor{ - id_tag = "thunderdomegen"; - name = "General Supply" - }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, -/area/tdome/arena) -"oN" = ( -/turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 8 - }, -/area/tdome/arena) -"oO" = ( -/obj/machinery/door/poddoor{ - id_tag = "thunderdome"; - name = "Thunderdome Blast Door" - }, -/turf/unsimulated/floor{ - name = "plating" - }, -/area/tdome/arena) -"oP" = ( -/turf/simulated/floor/plasteel{ - icon_state = "green"; - dir = 4 - }, -/area/tdome/arena) -"oQ" = ( -/obj/structure/table/wood, -/obj/item/gun/magic/wand{ - desc = "Used in emergency's to reignite magma engines. This one appears spent."; - name = "wand of emergency engine ignition" - }, -/turf/unsimulated/floor{ - tag = "icon-cult"; - icon_state = "cult" - }, -/area/wizard_station) -"oR" = ( -/obj/structure/table/wood, -/turf/unsimulated/floor{ - tag = "icon-cult"; - icon_state = "cult" - }, -/area/wizard_station) -"oS" = ( -/obj/structure/flora/bush, -/turf/unsimulated/floor/snow, -/turf/unsimulated/floor/snow{ - tag = "icon-gravsnow_corner (WEST)"; - icon_state = "gravsnow_corner"; - dir = 8 - }, -/area/syndicate_mothership) -"oT" = ( -/obj/machinery/door/airlock{ - icon = 'icons/obj/doors/airlocks/station/uranium.dmi'; - name = "Engine Room B" - }, -/turf/space, -/area/wizard_station) -"oU" = ( -/obj/machinery/camera{ - pixel_x = 11; - pixel_y = -9; - network = list("thunder"); - c_tag = "Red Team" - }, -/obj/effect/landmark{ - name = "tdome2" - }, -/turf/unsimulated/floor{ - name = "plating" - }, -/area/tdome/tdome2) -"oV" = ( -/obj/machinery/flasher{ - id = "tdomeflash"; - name = "Thunderdome Flash" - }, -/turf/simulated/floor/bluegrid, -/area/tdome/arena) -"oW" = ( -/obj/machinery/camera{ - pixel_x = 12; - pixel_y = -10; - network = list("thunder"); - c_tag = "Green Team" - }, -/obj/effect/landmark{ - name = "tdome1" - }, -/turf/unsimulated/floor{ - name = "plating" - }, -/area/tdome/tdome1) -"oX" = ( -/obj/structure/cult/forge{ - desc = "A engine used in powering the wizards ship"; - name = "magma engine" - }, -/turf/unsimulated/floor{ - tag = "icon-cult"; - icon_state = "cult" - }, -/area/wizard_station) -"oY" = ( -/obj/machinery/camera{ - pixel_x = 10; - network = list("thunder"); - c_tag = "Arena" - }, -/turf/simulated/floor/bluegrid, -/area/tdome/arena) -"oZ" = ( -/obj/structure/window/reinforced{ - color = "#008000"; - dir = 1 - }, -/turf/unsimulated/floor{ - tag = "icon-lava"; - icon_state = "lava" - }, -/area/wizard_station) -"pa" = ( -/turf/unsimulated/wall{ - tag = "icon-uranium11"; - icon_state = "uranium11" - }, -/area/wizard_station) -"pb" = ( -/turf/unsimulated/wall{ - tag = "icon-uranium7"; - icon_state = "uranium7" - }, -/area/wizard_station) -"pc" = ( -/obj/structure/shuttle/engine/heater, -/turf/unsimulated/floor{ - tag = "icon-lava"; - icon_state = "lava" - }, -/area/wizard_station) -"pd" = ( -/obj/machinery/door/poddoor{ - id_tag = "thunderdomehea"; - name = "Heavy Supply" - }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, -/area/tdome/arena) -"pe" = ( -/turf/unsimulated/wall/fakeglass{ - icon_state = "fakewindows2"; - dir = 8 - }, -/area/tdome/tdomeobserve) -"pf" = ( -/obj/machinery/flasher_button{ - id = "tdomeflash"; - pixel_x = 0; - pixel_y = 0 - }, -/obj/structure/table, -/turf/unsimulated/floor{ - icon_state = "redyellowfull" - }, -/area/tdome/tdomeobserve) -"pg" = ( -/obj/structure/table, -/obj/machinery/door_control{ - id = "thunderdomehea"; - name = "Heavy Supply Control"; - pixel_y = 0; - req_access_txt = "102" - }, -/turf/unsimulated/floor{ - icon_state = "floor" - }, -/area/tdome/tdomeobserve) -"ph" = ( -/obj/structure/table, -/obj/machinery/door_control{ - id = "thunderdomegen"; - name = "General Supply Control"; - pixel_y = 0; - req_access_txt = "102" - }, -/turf/unsimulated/floor{ - icon_state = "floor" - }, -/area/tdome/tdomeobserve) -"pi" = ( -/obj/structure/table, -/obj/machinery/door_control{ - id = "thunderdome"; - name = "Main Blast Doors Control"; - pixel_y = 0; - req_access_txt = "102" - }, -/turf/unsimulated/floor{ - icon_state = "floor" - }, -/area/tdome/tdomeobserve) -"pj" = ( -/obj/effect/decal/cleanable/blood/gibs/body, -/turf/unsimulated/floor{ - icon_state = "floor" - }, -/area/wizard_station) -"pk" = ( -/turf/unsimulated/floor{ - icon_state = "floor" - }, -/area/wizard_station) -"pl" = ( -/obj/machinery/door/poddoor/preopen, -/obj/effect/decal/cleanable/blood/splatter, -/turf/simulated/floor/plating/airless, -/area/wizard_station) -"pm" = ( -/obj/structure/table, -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, -/area/centcom/holding) -"pn" = ( -/obj/structure/closet/secure_closet/bar{ - req_access_txt = "25" - }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, -/area/centcom/holding) -"po" = ( -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, -/area/centcom/holding) -"pp" = ( -/obj/structure/reagent_dispensers/beerkeg, -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, -/area/centcom/holding) -"pq" = ( -/obj/structure/table, -/obj/item/storage/box/donkpockets{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/storage/box/donkpockets{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/storage/box/donkpockets{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/storage/box/donkpockets{ - pixel_x = 3; - pixel_y = 3 - }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, -/area/centcom/holding) -"pr" = ( -/obj/structure/table, -/obj/item/clothing/head/that, -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, -/area/centcom/holding) -"ps" = ( -/obj/structure/table, -/obj/item/reagent_containers/food/drinks/shaker, -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, -/area/centcom/holding) -"pt" = ( -/obj/structure/table, -/obj/item/lighter/zippo, -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, -/area/centcom/holding) -"pu" = ( -/obj/structure/table, -/obj/item/dice/d20, -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, -/area/centcom/holding) -"pv" = ( -/obj/structure/rack, -/obj/item/clothing/shoes/laceup, -/obj/item/clothing/under/suit_jacket/female{ - desc = "A black trouser suit for women. Very formal."; - name = "black suit"; - pixel_x = 3; - pixel_y = 1 - }, -/turf/unsimulated/floor{ - icon_state = "cafeteria" - }, -/area/centcom/holding) -"pT" = ( -/obj/structure/lattice, -/obj/effect/forcefield, -/turf/space/transit, -/area/wizard_station) -"qe" = ( -/turf/simulated/floor/mech_bay_recharge_floor, -/area/syndicate_mothership) -"qf" = ( -/obj/machinery/computer/mech_bay_power_console, -/turf/unsimulated/floor, -/area/syndicate_mothership) -"qt" = ( -/turf/unsimulated/wall, -/area/tdome/arena) -"qu" = ( -/obj/machinery/igniter/on, -/turf/simulated/floor/plasteel, -/area/tdome/arena) -"qv" = ( -/turf/simulated/floor/plasteel, -/area/tdome/arena) -"qQ" = ( -/obj/structure/rack, -/obj/item/clothing/under/color/red, -/obj/item/clothing/shoes/brown, -/obj/item/clothing/suit/armor/tdome/red, -/obj/item/clothing/head/helmet/thunderdome, -/obj/item/melee/baton/loaded, -/obj/item/melee/energy/sword/saber/red, -/turf/unsimulated/floor{ - icon_state = "dark" - }, -/area/tdome/arena) -"qS" = ( -/obj/effect/landmark{ - name = "tdome2" - }, -/turf/unsimulated/floor{ - name = "plating" - }, -/area/tdome/tdome2) -"qW" = ( -/obj/effect/landmark{ - name = "tdome1" - }, -/turf/unsimulated/floor{ - name = "plating" - }, -/area/tdome/tdome1) -"qX" = ( -/obj/structure/rack, -/obj/item/clothing/under/color/green, -/obj/item/clothing/shoes/brown, -/obj/item/clothing/suit/armor/tdome/green, -/obj/item/clothing/head/helmet/thunderdome, -/obj/item/melee/baton/loaded, -/obj/item/melee/energy/sword/saber/green, -/turf/unsimulated/floor{ - icon_state = "dark" - }, -/area/tdome/arena) -"rl" = ( -/obj/machinery/recharger{ - pixel_y = 4 - }, -/obj/effect/landmark{ - name = "tdome2" - }, -/turf/unsimulated/floor{ - name = "plating" - }, -/area/tdome/tdome2) -"rm" = ( -/obj/machinery/recharger{ - pixel_y = 4 - }, -/obj/effect/landmark{ - name = "tdome1" - }, -/turf/unsimulated/floor{ - name = "plating" - }, -/area/tdome/tdome1) -"rp" = ( -/obj/structure/grille/broken{ - color = "#008000" - }, -/turf/simulated/floor/plating, -/area/wizard_station) -"rt" = ( -/obj/machinery/door/poddoor/preopen, -/obj/effect/decal/cleanable/blood/splatter, -/obj/effect/decal/cleanable/blood/gibs/body, -/turf/simulated/floor/plating/airless, -/area/wizard_station) -"rv" = ( -/obj/effect/decal/cleanable/blood/splatter, -/obj/effect/decal/cleanable/blood/gibs/body, -/turf/unsimulated/floor{ - icon_state = "floor" - }, -/area/wizard_station) -"rD" = ( -/turf/simulated/floor/bluegrid, -/area/tdome/arena) -"rG" = ( -/turf/unsimulated/wall/fakeglass{ - color = "#008000" - }, -/area/wizard_station) -"rL" = ( -/turf/unsimulated/wall/fakedoor{ - name = "Squad 3 Pod" - }, -/area/wizard_station) -"su" = ( -/obj/effect/forcefield, -/turf/space, -/area/wizard_station) -"sw" = ( -/obj/structure/rack, -/obj/item/clothing/under/color/red, -/obj/item/clothing/shoes/brown, -/obj/item/clothing/suit/armor/vest, -/obj/item/clothing/head/helmet/swat, -/obj/item/gun/energy/laser, -/turf/unsimulated/floor{ - icon_state = "dark" - }, -/area/tdome/arena) -"sA" = ( -/obj/structure/rack, -/obj/item/clothing/under/color/green, -/obj/item/clothing/shoes/brown, -/obj/item/clothing/suit/armor/vest, -/obj/item/clothing/head/helmet/swat, -/obj/item/gun/energy/laser, -/turf/unsimulated/floor{ - icon_state = "dark" - }, -/area/tdome/arena) -"sB" = ( -/obj/structure/lattice, -/obj/effect/forcefield, -/turf/space, -/area/wizard_station) -"sC" = ( -/obj/effect/forcefield, -/turf/space/transit, -/area/wizard_station) -"sJ" = ( -/turf/unsimulated/wall, -/area/tdome/tdomeadmin) -"td" = ( -/turf/unsimulated/wall/fakedoor{ - name = "Squad 2 Pod" - }, -/area/wizard_station) -"tf" = ( -/turf/simulated/shuttle/wall, -/area/wizard_station) -"tg" = ( -/obj/structure/shuttle/engine/heater, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/shuttle/plating, -/area/wizard_station) -"th" = ( -/turf/unsimulated/wall, -/area/centcom/holding) -"tk" = ( -/obj/structure/shuttle/engine/propulsion{ - icon_state = "propulsion_l" - }, -/turf/simulated/shuttle/plating, -/area/wizard_station) -"tq" = ( -/obj/structure/rack, -/obj/item/camera, -/turf/unsimulated/floor{ - icon_state = "cafeteria" - }, -/area/centcom/holding) -"tr" = ( -/obj/structure/rack, -/obj/item/toy/sword, -/turf/unsimulated/floor{ - icon_state = "cafeteria" - }, -/area/centcom/holding) -"ts" = ( -/obj/structure/rack, -/obj/item/gun/projectile/revolver/capgun, -/turf/unsimulated/floor{ - icon_state = "cafeteria" - }, -/area/centcom/holding) -"tt" = ( -/turf/unsimulated/floor{ - icon_state = "cafeteria" - }, -/area/centcom/holding) -"tu" = ( -/turf/unsimulated/beach/sand, -/area/centcom/holding) -"tv" = ( -/obj/effect/overlay/palmtree_r, -/obj/effect/overlay/coconut, -/turf/unsimulated/beach/sand, -/area/centcom/holding) -"tw" = ( -/obj/effect/overlay/palmtree_l, -/turf/unsimulated/beach/sand, -/area/centcom/holding) -"tA" = ( -/obj/item/camera, -/turf/unsimulated/beach/sand, -/area/centcom/holding) -"tK" = ( -/obj/structure/rack, -/obj/item/clothing/head/that, -/obj/item/clothing/under/suit_jacket, -/obj/item/clothing/accessory/waistcoat, -/turf/unsimulated/floor{ - icon_state = "cafeteria" - }, -/area/centcom/holding) -"tL" = ( -/obj/item/beach_ball, -/turf/unsimulated/beach/sand, -/area/centcom/holding) -"tN" = ( -/obj/structure/rack, -/obj/item/storage/fancy/crayons, -/turf/unsimulated/floor{ - icon_state = "cafeteria" - }, -/area/centcom/holding) -"tO" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/unsimulated/floor{ - icon_state = "cafeteria" - }, -/area/centcom/holding) -"tP" = ( -/obj/structure/shuttle/engine/propulsion, -/turf/simulated/shuttle/plating, -/area/space) -"tQ" = ( -/turf/unsimulated/beach/coastline, -/area/centcom/holding) -"tR" = ( -/obj/item/clothing/head/collectable/paper, -/turf/unsimulated/beach/coastline, -/area/centcom/holding) -"tT" = ( -/obj/structure/table, -/turf/unsimulated/floor{ - icon_state = "cafeteria" - }, -/area/centcom/holding) -"tU" = ( -/turf/unsimulated/beach/water, -/area/centcom/holding) -"tV" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/unsimulated/floor{ - name = "plating" - }, -/area/centcom/holding) -"tW" = ( -/turf/unsimulated/floor{ - icon_state = "delivery" - }, -/area/centcom/holding) -"tX" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/unsimulated/floor{ - name = "plating" - }, -/area/centcom/holding) -"tY" = ( -/obj/effect/landmark{ - name = "Holding Facility" - }, -/turf/unsimulated/floor{ - icon_state = "engine" - }, -/area/centcom/holding) -"wP" = ( -/turf/space, -/area/shuttle/escape_pod5/centcom) -"xF" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 1 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/centcom/evac) -"xG" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 4 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/centcom/evac) -"xW" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 4 - }, -/turf/simulated/shuttle/floor, -/area/centcom/evac) -"yc" = ( -/obj/structure/bed, -/turf/simulated/shuttle/floor, -/area/centcom/evac) -"yd" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 8 - }, -/turf/simulated/shuttle/floor, -/area/centcom/evac) -"yf" = ( -/obj/structure/chair/comfy/shuttle, -/turf/simulated/shuttle/floor, -/area/centcom/evac) -"yg" = ( -/obj/structure/chair/sofa/right, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/escape) -"yk" = ( -/obj/structure/chair/sofa, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/escape) -"ym" = ( -/obj/structure/chair/office/dark, -/turf/unsimulated/floor{ - icon_state = "dark" - }, -/area/centcom/evac) -"yx" = ( -/obj/structure/chair/office/dark, -/turf/unsimulated/floor{ - icon_state = "floor" - }, -/area/centcom/evac) -"yz" = ( -/obj/structure/chair/office/dark{ - dir = 8 - }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, -/area/centcom/control) -"yF" = ( -/obj/structure/chair/office/dark{ - dir = 1 - }, -/turf/unsimulated/floor{ - icon_state = "floor" - }, -/area/centcom/evac) -"yG" = ( -/obj/structure/chair/office/dark{ - dir = 8 - }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, -/area/centcom/ferry) -"yL" = ( -/obj/structure/chair/office/dark, -/obj/effect/landmark{ - name = "Response Team" - }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, -/area/centcom/ferry) -"yR" = ( -/obj/structure/chair/office/dark{ - dir = 4 - }, -/obj/effect/landmark{ - name = "Response Team" - }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, -/area/centcom/ferry) -"yS" = ( -/obj/structure/chair/office/dark{ - dir = 4 - }, -/turf/unsimulated/floor{ - icon_state = "floor" - }, -/area/tdome/tdomeobserve) -"yT" = ( -/obj/structure/chair/office/dark{ - dir = 8 - }, -/turf/unsimulated/floor{ - icon_state = "floor" - }, -/area/tdome/tdomeobserve) -"yU" = ( -/obj/structure/chair/office/dark{ - dir = 8 - }, -/obj/effect/landmark{ - name = "Response Team" - }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, -/area/centcom/ferry) -"yW" = ( -/obj/structure/chair/office/dark{ - dir = 1 - }, -/obj/effect/landmark{ - name = "Response Team" - }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, -/area/centcom/ferry) -"Dq" = ( -/obj/effect/landmark/ai_multicam_room, -/turf/unsimulated/ai_visible, -/area/ai_multicam_room) -"EE" = ( -/obj/machinery/light/small, -/obj/structure/chair/comfy/shuttle{ - dir = 1 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/assault_pod) -"Fz" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/obj/structure/chair/comfy/shuttle, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/assault_pod) -"FV" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 4 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/assault_pod) -"FW" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 8 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/assault_pod) -"Gs" = ( -/obj/effect/light_emitter, -/turf/unsimulated/floor{ - tag = "icon-cultdamage3"; - icon_state = "cultdamage3" - }, -/area/wizard_station) -"Gw" = ( -/obj/structure/chair/sofa/left, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/escape) -"HX" = ( -/turf/unsimulated/ai_visible, -/area/ai_multicam_room) -"It" = ( -/turf/unsimulated/wall, -/area/ai_multicam_room) -"Iz" = ( -/obj/structure/chair/comfy/brown{ - dir = 1 - }, -/turf/unsimulated/floor{ - icon_state = "redyellowfull" - }, -/area/tdome/tdomeobserve) -"IE" = ( -/obj/structure/chair{ - dir = 1 - }, -/obj/effect/landmark{ - name = "tdomeadmin" - }, -/turf/unsimulated/floor{ - icon_state = "redyellowfull" - }, -/area/tdome/tdomeobserve) -"IG" = ( -/obj/structure/chair/stool{ - pixel_y = 8 - }, -/obj/item/clothing/head/bandana{ - pixel_y = -10 - }, -/obj/item/clothing/glasses/sunglasses, -/turf/unsimulated/beach/sand, -/area/centcom/holding) -"IH" = ( -/obj/structure/chair/stool{ - pixel_y = 8 - }, -/turf/unsimulated/beach/sand, -/area/centcom/holding) -"IP" = ( -/obj/structure/chair/stool{ - pixel_y = 8 - }, -/turf/unsimulated/floor{ - icon_state = "cafeteria" - }, -/area/centcom/holding) -"IT" = ( -/obj/structure/bed/abductor, -/turf/unsimulated/floor/abductor, -/area/abductor_ship) -"Ur" = ( -/obj/machinery/poolcontroller/invisible, -/turf/unsimulated/beach/water, -/area/centcom/holding) - -(1,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ey -ey -ey -ey -ey -ey -ey -ey -ey -ey -ey -ey -ey -ey -eA -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(2,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ey -ey -ey -ey -ey -ey -ey -ey -ey -ey -ey -ey -ey -ey -ey -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(3,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ey -ey -ey -ey -ey -ey -ey -ey -ey -ey -ey -ey -ey -ey -ey -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(4,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ey -ey -ey -ey -ey -ey -ey -ey -ey -ey -ey -ey -ey -ey -ey -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(5,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ey -ey -ey -ey -ey -ey -ey -ey -ey -ey -ey -ey -ey -ey -ey -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(6,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ey -ey -ey -ey -ey -ey -ey -ey -ey -ey -ey -ey -ey -ey -ey -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(7,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ey -ey -ey -ey -ey -ey -ey -ey -ey -ey -ey -ey -ey -ey -ey -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(8,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ey -ey -ey -ey -ey -ey -ey -ez -ey -ey -ey -ey -ey -ey -ey -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(9,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ey -ey -ey -ey -ey -ey -ey -ey -ey -ey -ey -ey -ey -ey -ey -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(10,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ey -ey -ey -ey -ey -ey -ey -ey -ey -ey -ey -ey -ey -ey -ey -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(11,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ey -ey -ey -ey -ey -ey -ey -ey -ey -ey -ey -ey -ey -ey -ey -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(12,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ey -ey -ey -ey -ey -ey -ey -ey -ey -ey -ey -ey -ey -ey -ey -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(13,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ey -ey -ey -ey -ey -ey -ey -ey -ey -ey -ey -ey -ey -ey -ey -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(14,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ey -ey -ey -ey -ey -ey -ey -ey -ey -ey -ey -ey -ey -ey -ey -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(15,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ey -ey -ey -ey -ey -ey -ey -ey -ey -ey -ey -ey -ey -ey -ey -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(16,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(17,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(18,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -kc -lx -mi -mK -rG -ji -ju -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(19,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -kX -lw -mh -mJ -mh -nk -kX -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(20,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -mH -ko -kZ -jv -jv -cq -jv -jv -nu -pT -mH -aa -aa -aa -aa -aa -aa -aa -aa -mH -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(21,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -kq -aa -mH -kY -jv -jv -jT -jC -jv -kY -jT -mH -aa -aa -aa -aa -aa -aa -aa -aa -mH -mH -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(22,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -cg -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ki -ks -kl -aa -lm -lw -mh -jv -kB -nk -lm -aa -aa -aa -aa -aa -aa -aa -aa -aa -mH -km -lm -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(23,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -mH -oL -pj -kz -aa -la -lx -mi -rp -mW -ji -nv -mH -nM -mH -aa -aa -aa -km -mH -mH -jT -jv -lm -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(24,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -mH -mH -jG -ju -mH -kl -pk -kz -mH -lm -lz -lP -kB -jC -nl -lm -aa -jT -mH -mH -aa -aa -mH -la -lx -oT -ji -pa -ju -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(25,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -jB -jS -jw -kd -kk -pl -kA -pT -lm -ly -lP -jT -jv -jv -kX -mH -aa -aa -la -lx -kb -ji -oK -jv -jv -oX -oZ -kX -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(26,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -jf -jt -jD -jT -kb -kg -kn -kn -kn -kF -kX -jv -jv -jv -jv -jT -kb -nA -su -sB -kX -om -ow -oG -kX -oR -jv -jv -oZ -pc -tP -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(27,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -je -js -Gs -jF -ka -kf -km -cq -jv -jC -ln -jv -jv -kt -mX -jC -nw -km -nN -jT -oe -ol -ob -oF -kb -oQ -cq -jv -oZ -pc -tP -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(28,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -jj -jv -jv -jV -kb -kh -jv -jT -kB -kG -kY -jv -jv -jv -jv -jv -kb -pT -pT -sC -kY -on -ox -oH -kY -oR -jv -jv -oZ -pc -tP -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(29,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ji -ju -jF -jU -kc -ju -ko -ku -jT -jC -lm -lA -jv -jv -jv -jv -kY -aa -mH -aa -la -lx -kb -ji -oK -jv -jv -oX -oZ -kY -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(30,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -jw -jG -jG -kd -aa -mH -kv -kv -ko -lm -lB -mn -mM -jv -nl -lm -aa -aa -aa -mH -nM -jT -jC -la -lx -oT -ji -pb -kd -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(31,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -dN -gl -gl -gl -gl -gl -gl -gl -gl -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -mH -aa -mH -la -lx -mi -mK -rG -ji -nv -mH -kB -aa -aa -mo -oy -td -tf -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(32,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -mH -kD -mH -lm -lC -mp -mN -nb -nn -lm -aa -aa -mH -mH -pl -pk -pk -tg -tk -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(33,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -kC -aa -lm -kf -mo -rt -mZ -nm -kX -aa -aa -aa -mH -oo -oz -oz -oz -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(34,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ko -kz -kW -mw -np -mH -aa -aa -aa -aa -op -jv -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(35,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -mH -lP -kz -rv -rL -no -mH -aa -aa -aa -aa -mH -jG -mH -mH -mH -jT -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(36,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -mH -mw -mP -ki -aa -mH -mH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(37,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -mH -aa -mO -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(38,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(39,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(40,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(41,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(42,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(43,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(44,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(45,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(46,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -dx -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(47,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(48,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -iS -iS -iS -iS -iS -iS -iS -iS -iS -iS -iS -iS -iS -iS -iS -iS -iS -iS -iS -iS -iS -iS -iS -iS -iS -iS -iS -iS -iS -iS -iS -iS -iS -iS -iS -iS -iS -iS -iS -iS -iS -iS -iS -iS -iS -iS -iS -iS -iS -iS -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(49,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -iS -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -av -am -am -at -am -am -am -am -am -at -am -am -nO -av -am -am -am -am -am -am -am -am -am -am -am -iS -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(50,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -iS -am -am -am -av -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -av -am -am -am -am -am -av -am -am -hT -am -am -am -am -am -am -am -am -az -ab -ab -ab -ab -ab -ab -ab -az -am -iS -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(51,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -iS -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -av -am -am -av -am -am -am -am -am -am -am -az -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -am -iS -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -kM -ld -lj -lJ -lM -ab -ab -ab -kM -ld -lj -lJ -lM -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(52,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -iS -am -am -at -at -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -at -am -am -am -am -am -am -av -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -am -iS -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -kI -kO -lf -ll -lK -lO -mb -ab -kI -kO -ms -ll -lK -lO -mb -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(53,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -iS -am -am -av -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -at -am -av -am -am -am -am -am -am -am -am -am -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -am -iS -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -kE -kN -le -lk -le -lN -ma -ab -kE -mj -le -mx -le -lN -ma -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(54,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -iS -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -av -am -am -av -am -az -ab -ab -ab -az -am -am -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -az -am -iS -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -kK -kQ -le -lE -le -lT -md -ab -kK -ml -le -lE -le -lT -md -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(55,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -dQ -gl -gl -gl -gl -gl -gl -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -iS -am -at -am -av -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -ax -ab -ab -ab -ab -ab -am -am -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -am -am -am -am -iS -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -kJ -kP -le -lq -le -IT -mc -ab -kJ -mk -le -my -le -IT -mc -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(56,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -iS -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -av -am -at -am -av -ax -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -az -am -am -iS -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -kL -kS -lh -lG -lh -lV -me -ab -kL -kS -lh -lG -lh -lV -me -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(57,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -iS -am -am -av -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -jo -jo -jo -jo -ax -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -am -am -iS -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -kR -lg -lF -lL -lU -ab -ab -ab -kR -lg -lF -lL -lU -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(58,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -bB -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -iS -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -iS -jy -jH -iS -iS -iS -iS -kw -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -am -am -iS -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(59,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -iS -am -am -am -av -am -am -am -am -am -am -am -am -am -am -am -am -am -jm -jx -jx -jm -ke -jx -jW -kw -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -am -am -iS -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -kM -ld -lj -lJ -lM -ab -ab -ab -kM -ld -lj -lJ -lM -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(60,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -iS -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -iS -jy -jH -iS -jx -jx -jY -kw -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -az -am -am -iS -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -kI -kO -li -ll -lK -lO -mb -ab -kI -kO -mt -ll -lK -lO -mb -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(61,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -iS -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -iY -jm -jx -jx -jm -jx -jx -jY -kw -ab -ab -ab -ab -ab -eP -nc -nq -oD -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -am -am -am -am -iS -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -kE -kT -le -lH -le -lN -ma -ab -kE -mm -le -mz -le -lN -ma -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(62,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -iS -am -am -at -am -am -am -am -am -am -am -am -am -am -am -am -am -am -iS -jy -jH -iS -jx -jx -jY -kx -az -ab -ab -ab -az -ax -jY -oq -ny -nC -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -az -am -iS -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -kK -lc -le -lE -le -lT -md -ab -kK -mr -le -lE -le -lT -md -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(63,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -iS -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -jn -jn -jI -jW -ke -jx -jY -kx -at -bp -jn -jn -am -ax -jY -or -nx -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -am -iS -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -kJ -lb -le -lI -le -IT -mc -ab -kJ -mq -le -mA -le -IT -mc -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(64,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -iS -am -am -av -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -ax -jY -jx -jx -jY -kx -am -am -am -av -am -ax -jY -oq -jY -az -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -am -iS -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -kL -kS -lh -lG -lh -lV -me -ab -kL -kS -lh -lG -lh -lV -me -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(65,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -iS -am -am -am -at -am -am -am -am -am -am -am -am -am -am -am -am -am -jo -jo -jJ -jX -jx -jx -jY -kx -am -am -am -am -am -ax -jY -oq -jY -am -nh -jn -jI -ab -ab -ab -ab -ab -ab -ab -ab -ab -am -iS -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -kR -lg -lF -lL -lU -ab -ab -ab -kR -lg -lF -lL -lU -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(66,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -iS -at -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -iS -jy -jH -iS -jx -jx -jY -kx -av -am -am -au -am -jZ -jY -oq -jY -am -am -am -am -az -ab -ab -ab -ab -ab -ab -ab -az -am -iS -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(67,1,1) = {" -ab -ab -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -iS -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -jm -jx -jx -jm -ke -jx -jY -kx -am -at -jo -jo -kr -jJ -jX -oq -jX -ky -jo -jo -am -am -jn -jn -jn -oS -jn -jn -jn -am -am -iS -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(68,1,1) = {" -ab -ab -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -iS -am -am -am -av -am -am -am -am -am -am -am -am -am -am -am -am -am -iS -jy -jH -iS -jx -jx -jY -kx -am -jJ -iS -iS -iS -iS -iS -nr -iS -iS -iS -iS -am -am -am -am -am -av -am -am -am -am -am -iS -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(69,1,1) = {" -ab -ab -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -iS -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -jm -jx -jx -jm -jx -jx -jY -kx -ax -iS -iS -lQ -mC -mQ -nd -jx -nz -nD -nQ -iS -iS -am -am -am -am -am -am -am -am -av -am -iS -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(70,1,1) = {" -ab -ab -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -iS -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -iS -jy -jH -iS -jx -jx -jY -kx -ax -iS -lr -jx -jx -mD -nf -ns -nf -nH -nS -nW -iS -kx -at -au -jo -am -am -am -am -am -am -iS -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(71,1,1) = {" -ab -ab -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -iS -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -jn -jn -jI -iS -ke -jx -jX -ky -jJ -kH -lp -jx -mD -mR -ne -jx -nf -nE -nR -nV -iS -kx -am -os -iS -iS -iS -iS -iS -iS -iS -iS -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(72,1,1) = {" -ab -ab -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -iS -am -am -at -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -av -iS -jx -jx -iS -iS -iS -iS -lv -jx -mD -mS -ng -jx -nf -nH -nS -nY -iS -oa -am -ov -iS -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(73,1,1) = {" -ab -ab -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -iS -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -ax -iS -jx -jx -kp -jx -jx -kU -jx -jx -mE -mD -nf -jx -nd -nI -nT -nX -iS -ky -jo -jJ -iS -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(74,1,1) = {" -ab -ab -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -dS -dZ -dZ -dZ -ev -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -iS -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -at -ax -iS -iS -iS -iS -iS -iS -iS -iS -lW -jx -jx -jx -jx -jx -jx -jx -iS -iS -iS -kH -iS -iS -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(75,1,1) = {" -ab -ab -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -dR -dY -eR -eR -es -ev -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -iS -am -am -av -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -bp -jn -jn -jn -bp -jn -eP -iS -lR -jx -jx -jx -jx -jx -jx -jx -nZ -of -ot -ou -oI -iS -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(76,1,1) = {" -ab -ab -ac -ac -ac -ac -ac -ac -ac -br -ac -ac -ac -ac -ch -ac -ac -ac -ac -ac -ac -ac -ac -ac -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -dU -dY -eR -eR -eR -eD -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -iS -am -am -am -at -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -at -am -am -am -ax -iS -lX -jx -mT -nd -nt -jx -jx -jx -jx -of -ou -ou -oI -iS -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(77,1,1) = {" -ab -ab -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -dT -dY -el -eu -eM -ex -dZ -dZ -dZ -ef -dZ -dZ -dZ -dZ -dZ -ev -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -iS -am -am -am -av -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -av -am -am -am -av -at -am -jZ -iS -iS -mF -iS -iS -iS -nx -hC -nx -iS -og -ou -ou -oI -iS -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(78,1,1) = {" -ab -ab -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -dV -ef -eo -fd -fd -fj -fq -fu -fy -eD -yc -yc -yc -yc -yc -eK -ev -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -iS -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -at -am -am -am -am -am -ax -iS -mf -mG -mG -iS -iS -jY -hB -jY -iS -qe -ou -ou -oI -iS -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(79,1,1) = {" -ab -ab -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -eB -eB -eB -eB -ee -eU -fd -fe -fk -xF -fv -fv -eD -fe -fe -fe -fe -fe -eK -ek -dZ -dZ -ev -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -iS -am -am -at -am -am -am -am -am -am -am -am -am -am -am -am -am -am -at -am -am -am -av -am -at -am -am -jZ -iS -lZ -mG -mU -iS -iS -jY -hB -jY -iS -qf -ou -ou -oI -iS -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(80,1,1) = {" -ab -ab -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -eB -eB -eB -dW -eM -fe -fe -fe -fl -xG -fv -fv -eD -yc -yc -fe -yc -yc -eD -fM -fI -fQ -fC -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -iS -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am -ax -iS -mg -mI -iS -iS -iS -jY -hD -jY -iS -oi -ou -oA -oJ -iS -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(81,1,1) = {" -ab -ab -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -eB -eB -eB -eB -eg -ep -fd -fe -fm -ft -fm -eG -ex -dZ -eu -fD -eJ -dZ -eL -yd -fd -fR -fC -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -iS -iS -iS -iS -iS -iS -iS -iS -iS -iS -iS -iS -iS -iS -iS -iS -iS -iS -iS -iS -iS -iS -iS -iS -iS -iS -iS -iS -iS -iS -iS -iS -iS -iS -jY -hB -jY -iS -iS -iS -iS -iS -iS -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(82,1,1) = {" -ab -ab -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -eO -er -fd -fe -fe -fe -fe -fe -fe -fe -fe -fe -fe -fe -eN -fe -yf -fS -fC -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -iS -mV -gD -gD -jY -hB -jY -gD -gD -if -iS -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(83,1,1) = {" -ab -ab -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -dw -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -eC -eC -eC -eC -eg -eq -fd -fe -eE -fd -yd -yd -fd -yd -yd -fe -fd -fG -eh -xW -fd -fT -fC -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -iS -gD -gC -ho -jY -hC -jY -ho -hV -gD -iS -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(84,1,1) = {" -ab -ab -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -eC -eC -eC -dX -eM -fe -fe -fe -fd -fd -xW -xW -fd -xW -xW -fe -fd -fH -eD -fO -fM -fU -fC -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -iS -gC -hi -mB -hj -ni -hj -nj -hU -hV -iS -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(85,1,1) = {" -ab -ab -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -eC -eC -eC -eC -eh -eU -fd -fe -fe -fe -fe -fe -fe -fe -fe -fe -fd -fI -eK -ef -dZ -dZ -ew -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -iS -gE -mB -hj -FV -hy -FV -hj -nj -ig -iS -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(86,1,1) = {" -ab -ab -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -dS -ek -et -fd -fd -yd -yd -yd -fe -yd -yd -yd -fe -fd -eU -eK -ew -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -iS -gE -hj -FV -hy -nK -hy -FV -hj -ig -iS -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(87,1,1) = {" -ab -ab -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -dR -dY -es -eu -eM -eF -dZ -eu -eM -eg -fC -eg -eM -eJ -dZ -ew -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -iS -gJ -ni -hy -EE -hG -Fz -hy -oj -ih -iS -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(88,1,1) = {" -ab -ab -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -dU -dY -eR -eR -eR -eD -ab -fx -eH -fx -ab -wP -eI -wP -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -iS -gE -hj -FW -hy -nL -hy -FW -hj -ig -iS -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(89,1,1) = {" -ab -ab -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -dT -dY -eR -eR -el -ew -ab -fx -fx -fx -ab -wP -wP -wP -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -iS -gE -mL -hj -FW -hy -hy -hj -nP -ig -iS -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(90,1,1) = {" -ab -ab -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -dV -dZ -dZ -dZ -ew -ab -ab -fx -fx -fx -ab -wP -wP -wP -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -iS -gK -hm -mL -hj -ni -hj -nP -id -ie -iS -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(91,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -fx -fx -fx -ab -wP -wP -wP -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -iS -gL -gK -hz -hz -hz -hz -hz -ie -if -iS -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(92,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -iS -iS -iS -iS -iS -iS -iS -iS -iS -iS -iS -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(93,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(94,1,1) = {" -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(95,1,1) = {" -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(96,1,1) = {" -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(97,1,1) = {" -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(98,1,1) = {" -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -th -th -th -th -th -th -th -th -th -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(99,1,1) = {" -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -th -pm -pm -pm -tK -tN -tN -pv -th -th -th -th -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(100,1,1) = {" -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -th -po -po -po -tt -tt -tt -tt -tV -tY -tY -th -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(101,1,1) = {" -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -th -pn -po -ps -IP -tt -tt -tt -tW -tY -tY -th -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(102,1,1) = {" -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -th -pp -po -pm -IP -tt -tt -tt -tW -tY -tY -th -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(103,1,1) = {" -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -th -pp -po -pt -IP -tt -tt -tt -tX -tY -tY -th -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(104,1,1) = {" -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -th -po -po -pm -IP -tt -tt -tt -th -th -th -th -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(105,1,1) = {" -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -gV -gV -gV -gV -gV -gV -gV -gV -gV -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -th -pq -pr -pu -IP -tt -tt -tt -th -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(106,1,1) = {" -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -gV -ii -ii -iD -ab -iD -ii -ii -gV -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -th -tq -tt -tt -tt -tt -tt -tt -th -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(107,1,1) = {" -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -cm -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -gV -ii -iD -ab -ab -ab -iD -ii -gV -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -th -tr -tt -tt -tt -tt -tt -IP -th -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(108,1,1) = {" -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -gV -ii -ab -ab -ab -ab -ab -ii -gV -gV -gV -gV -gV -gV -gV -gV -gV -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -th -ts -tt -tt -tt -tt -IP -tT -th -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(109,1,1) = {" -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -gV -ii -ab -ab -ab -ab -ab -ii -gV -il -il -lo -lS -mu -mY -nB -gV -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -th -tt -IP -tt -tt -tt -tt -IP -th -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(110,1,1) = {" -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -gV -ii -ab -ab -ab -ab -ab -ii -gV -iw -il -il -il -il -il -il -gV -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -th -tu -tu -tu -tu -tO -tO -tO -th -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(111,1,1) = {" -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -gV -ii -ab -ab -ab -ab -ab -ii -gV -il -il -il -yR -il -il -il -gV -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -th -tv -tu -tu -tu -tu -tQ -tU -th -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(112,1,1) = {" -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -gV -ii -ab -ab -ab -ab -ab -ii -ir -il -il -iJ -ja -iJ -yW -il -gV -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -qt -qt -qt -qt -qt -qt -qt -qt -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -th -tu -tu -IG -tu -tu -tQ -tU -th -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(113,1,1) = {" -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -gV -ii -ab -ab -ab -ab -ab -ii -io -il -yL -iJ -iZ -iJ -il -il -oh -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -qt -qQ -qQ -qQ -qQ -qQ -qQ -qt -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -th -tu -tA -tu -tL -tu -tQ -tU -th -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(114,1,1) = {" -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -du -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -gV -ii -ab -ab -ab -ab -ab -ii -io -il -il -iJ -jb -iJ -yW -il -gV -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -qt -oM -oM -oM -oM -oM -oM -qt -qt -qt -ab -ab -ab -ab -ab -ab -ab -ab -th -tu -tu -IH -tu -tu -tR -tU -th -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(115,1,1) = {" -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -fV -fV -fV -fV -fV -fV -fV -fV -fV -fV -fV -fV -fV -ab -ab -ab -ab -ab -gV -ii -ab -ab -ab -ab -ab -ii -is -il -yL -iJ -iJ -iJ -il -il -gV -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -qt -qS -qS -qS -qS -qS -qS -pd -sw -qt -ab -ab -ab -ab -ab -ab -ab -ab -th -tw -tu -tv -tu -tu -tQ -Ur -th -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(116,1,1) = {" -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -fV -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -fV -ab -ab -ab -ab -gV -ii -ab -ab -ab -ab -ab -ii -gV -il -il -yU -il -yU -il -il -gV -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -qt -qS -rl -qS -qS -rl -qS -pd -sw -qt -ab -ab -ab -ab -ab -ab -ab -ab -th -th -th -th -th -th -th -th -th -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(117,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -gl -gl -gl -gl -gl -gl -gl -gl -dy -gl -gl -gl -gl -gl -gl -gl -gl -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -fV -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -fV -ab -ab -ab -ab -gV -ii -iD -ab -hv -ab -iD -ii -gV -il -il -il -il -il -il -jL -gV -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -qt -qS -qS -oU -qS -qS -qS -pd -sw -qt -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(118,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -fV -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -fV -gV -gV -gV -gV -gV -ii -ii -hn -hx -hn -ii -ii -gV -ix -il -il -il -il -il -jN -gV -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -qt -qS -rl -qS -qS -rl -qS -pd -sw -qt -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(119,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -fV -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -fV -gV -fP -gb -fX -gV -gM -he -hl -hw -hN -he -kj -gV -yG -il -il -il -il -il -jM -gV -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -qt -qS -qS -qS -qS -qS -qS -pd -sw -qt -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(120,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -fV -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -fV -gV -fX -gc -fX -gV -gQ -gQ -hp -gQ -gQ -gQ -gQ -gV -il -il -il -il -il -il -nF -gV -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -sJ -sJ -iT -sJ -sJ -qt -oO -oO -oO -oO -oO -oO -qt -kV -kV -kV -kV -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(121,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -fV -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -fV -gV -fW -fX -fX -gw -il -iz -iz -iz -iz -iz -il -it -il -il -il -il -il -il -na -gV -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -sJ -oc -oc -oc -oB -qu -oN -oN -oN -oN -oN -oN -qu -iC -iV -iV -kV -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(122,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -fV -ab -ab -ab -ab -ab -ab -fa -ab -ab -ab -ab -ab -fV -gV -fZ -fX -gm -gV -gR -gR -gR -hA -il -hX -gR -gV -il -iy -iK -jc -mv -na -nG -gV -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -sJ -od -oc -od -oC -qv -qv -qv -qv -qv -qv -qv -qv -pe -IE -iV -jl -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(123,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -fV -fV -fV -fV -eV -eX -eV -eX -fb -fc -gz -fV -fV -gO -gO -gV -gV -gV -gV -gV -gV -gV -gV -hO -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -gV -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -sJ -od -oc -od -oC -qv -qv -qv -qv -qv -qv -qv -qv -pe -IE -iV -kV -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(124,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -gl -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -fV -eS -eW -eW -eY -eW -eW -eW -eW -fo -fV -gP -gP -gP -gd -hK -hK -hK -hK -hK -hE -jR -hE -hK -hK -hK -kV -ls -lt -jq -jz -jP -kV -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -sJ -od -ok -od -oC -qv -qv -qv -qv -qv -qv -qv -qv -pe -IE -jk -kV -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(125,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -fV -eQ -gj -gj -gj -gj -gj -gj -gj -gG -fV -gP -gW -gP -gO -fw -fJ -fJ -fJ -hf -gV -jR -gV -fw -fJ -hf -kV -lt -yS -lt -lt -jO -kV -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -sJ -od -oc -od -oC -qv -qv -qv -qv -qv -qv -qv -qv -pe -IE -iV -kV -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(126,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -fV -eT -gj -gj -gj -gj -gj -gj -gj -fp -fV -gP -gP -gP -gd -gp -gx -gx -gx -gx -hF -gY -gp -gx -gx -gx -iB -lu -lY -jq -lt -jO -kV -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -sJ -od -oc -od -oC -qv -qv -qv -qv -qv -qv -qv -qv -pe -IE -lt -kV -kV -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(127,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -bC -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -fV -eQ -gj -gj -gj -gj -gj -gj -gj -gj -fV -fw -fJ -hf -gO -gY -gY -gY -gY -gY -gY -gY -gY -gY -gY -gY -iA -iM -iM -iM -iM -iM -kV -kV -kV -kV -kV -kV -kV -kV -kV -kV -kV -kV -kV -kV -kV -sJ -oc -oc -oc -oC -qv -qv -qv -rD -rD -qv -qv -qv -pe -iX -lt -pg -kV -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(128,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -fV -gf -gj -gj -gj -gj -gj -gj -gj -gI -fs -fz -gY -gY -gY -gY -gY -gY -gY -gY -gY -gY -gY -gY -gY -gY -iE -iO -iO -iO -iO -iO -iO -iO -iE -iO -iO -iO -iO -iO -iO -iO -iO -iO -iO -iO -iO -nU -oc -oc -oc -oC -qv -qv -qv -oV -oY -qv -qv -qv -pe -Iz -lt -pi -kV -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(129,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -fV -fV -fV -gn -fV -fV -fV -fV -fg -fV -fV -fw -fJ -hf -gO -gY -gY -gY -gY -gY -gY -gY -gY -gY -gY -gY -iC -iN -iN -iN -iN -iN -kV -kV -kV -kV -kV -kV -kV -kV -kV -kV -kV -kV -kV -kV -kV -sJ -oc -oc -oc -oC -qv -qv -qv -rD -rD -qv -qv -qv -pe -pf -lt -ph -kV -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(130,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -fV -ff -ff -ff -fV -gP -gP -gP -gd -hM -gy -gY -hM -hq -gy -gY -hM -ic -ic -ic -iF -lu -lY -jq -lt -nJ -kV -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -sJ -od -oc -od -oC -qv -qv -qv -qv -qv -qv -qv -qv -pe -IE -lt -kV -kV -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(131,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -fV -ff -ff -ff -fV -gP -gW -gP -gO -gd -gO -gY -gO -gd -gO -gY -gO -fw -fJ -hf -kV -lt -yT -lt -lt -nJ -kV -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -sJ -od -oc -od -oC -qv -qv -qv -qv -qv -qv -qv -qv -pe -IE -iV -kV -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(132,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -fV -ff -ff -ff -fV -gP -gP -gP -gd -hK -gd -gT -gd -hK -gd -gT -gd -hK -hK -hK -kV -lt -lt -jq -jA -jQ -kV -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -sJ -od -ok -od -oC -qv -qv -qv -qv -qv -qv -qv -qv -pe -IE -jk -kV -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(133,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -bD -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -fV -fV -fV -fV -fV -gO -gO -gO -gO -gO -gO -gS -gO -gO -gO -hP -gO -gO -gO -gO -kV -kV -kV -kV -kV -kV -kV -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -sJ -od -oc -od -oC -qv -qv -qv -qv -qv -qv -qv -qv -pe -IE -iV -kV -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(134,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -gO -ip -gO -hr -gd -ip -gO -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -sJ -od -oc -od -oC -qv -qv -qv -qv -qv -qv -qv -qv -pe -IE -iV -jl -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(135,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -gk -gk -gk -gk -gk -ab -gk -gk -gk -gk -gk -ab -ab -ab -gO -ip -ip -yz -hH -hQ -gO -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -sJ -oc -oc -oc -oE -qu -oP -oP -oP -oP -oP -oP -qu -iA -iV -iV -kV -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(136,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -gk -go -gk -go -gk -ab -gk -go -gk -go -gk -ab -ab -ab -gO -iq -iG -hs -gd -ip -gO -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -sJ -sJ -iT -sJ -sJ -qt -oO -oO -oO -oO -oO -oO -qt -kV -kV -kV -kV -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(137,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -jp -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -gk -gk -gk -gk -gk -ab -gk -gk -gk -gk -gk -ab -gN -gN -gN -gN -gN -gN -gN -hR -gN -gN -gN -gN -gN -gN -gN -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -qt -qW -qW -qW -qW -qW -qW -pd -sA -qt -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(138,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -gk -go -gk -go -gk -ab -gk -go -gk -go -gk -ab -gN -gr -gA -gA -gA -ht -hI -hS -hY -ij -iu -iu -iu -iQ -gN -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -qt -qW -rm -qW -qW -rm -qW -pd -sA -qt -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(139,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -gk -gk -gk -gk -gk -ab -gk -gk -gk -gk -gk -ab -gN -gq -ib -ib -ib -ib -ib -ib -ib -ib -ib -ib -ib -iP -gN -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -qt -qW -qW -oW -qW -qW -qW -pd -sA -qt -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(140,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -gk -go -gk -go -gk -ab -gk -go -gk -go -gk -ab -gN -gq -ib -ib -ib -ib -ib -ib -ib -ib -ib -ib -ib -iP -gN -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -qt -qW -rm -qW -qW -rm -qW -pd -sA -qt -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(141,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -gk -gk -gk -gk -gk -ab -gk -gk -gk -gk -gk -ab -gN -gq -ib -ib -ib -ib -ib -ib -ib -ib -ib -ib -ib -iP -gN -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -qt -qW -qW -qW -qW -qW -qW -pd -sA -qt -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(142,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -gk -go -gk -go -gk -ab -gk -go -gk -go -gk -ab -gN -gt -ib -ib -ib -ib -ib -ib -ib -ib -ib -ib -ib -iU -gN -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -qt -oM -oM -oM -oM -oM -oM -qt -qt -qt -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(143,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -gk -gk -gk -gk -gk -ab -gk -gk -gk -gk -gk -ab -gN -gs -ib -ib -ib -jg -hJ -ib -hZ -ik -ib -ib -ib -iR -gN -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -qt -qX -qX -qX -qX -qX -qX -qt -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(144,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -gN -gv -ib -ib -yx -jh -hJ -ib -hZ -in -yF -ib -ib -iW -gN -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -qt -qt -qt -qt -qt -qt -qt -qt -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(145,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -gN -gN -gZ -gN -gN -gu -gB -gU -hg -hu -hJ -ib -hZ -im -iv -ib -ib -iU -gN -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(146,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -gN -fE -ha -ha -gg -ha -ha -hb -hh -hh -hL -ib -ia -hh -hh -ib -iL -gB -lD -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(147,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -gN -fB -ha -ga -ge -ha -ha -gX -ib -ib -ib -ib -ib -ib -ib -ib -iH -ib -jd -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(148,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -gN -fB -ha -ym -gi -ha -ha -hd -ib -ib -ib -ib -ib -ib -ib -ib -iL -gB -lD -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(149,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -gN -fF -ha -ha -gh -ha -ha -hc -hk -hk -hk -hk -hk -ib -ib -ib -iI -hk -jd -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(150,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -gN -gN -fK -gN -gN -gN -gN -gN -gN -gN -gN -hW -gN -ib -ib -ib -iL -gB -lD -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(151,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -gO -gY -gO -ab -ab -ab -fY -fY -fY -ab -ab -gN -ib -ib -ib -hb -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(152,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -gO -fN -gO -ab -ab -ab -fY -fY -fY -ab -ab -gN -ib -ib -ib -hb -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(153,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -fh -fr -fr -fr -fL -fr -fr -fr -gF -ab -ab -ab -ab -ab -gN -ib -ib -ib -hb -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(154,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -fi -jE -jE -jE -jE -jE -jE -jE -fi -ab -ab -ab -ab -ab -gN -ib -ib -ib -iL -gB -lD -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(155,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -fi -yg -jE -jE -jE -jE -jE -jE -fi -ab -ab -ab -ab -ab -gN -ib -ib -ib -iH -ib -iH -jr -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(156,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -fi -yk -jE -jE -jE -jE -jE -jE -fi -ab -ab -ab -ab -ab -gN -ib -ib -ib -iL -gB -lD -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(157,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -fi -yk -jE -jE -jE -jE -jE -jK -fi -ab -ab -ab -ab -ab -gN -ib -ib -ib -iH -ib -iH -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(158,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -fi -yk -jE -jE -jE -jE -jE -jE -fi -ab -ab -ab -ab -ab -gN -gN -gN -gN -iL -gB -lD -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(159,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -fi -Gw -jE -jE -jE -jE -jE -jE -fi -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(160,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -fi -jE -jE -jE -jE -jE -jE -jE -fi -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(161,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -fn -fr -fr -fr -fr -fr -fr -fr -gH -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(162,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(163,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(164,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(165,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(166,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(167,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(168,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(169,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(170,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(171,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(172,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(173,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(174,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(175,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(176,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(177,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(178,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(179,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(180,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(181,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(182,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(183,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(184,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(185,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(186,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(187,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(188,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -It -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -It -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(189,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -It -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -It -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(190,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -It -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -It -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(191,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -It -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -It -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(192,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aV -aV -aV -aV -aV -aV -aV -aV -aV -aV -aV -aV -aV -aV -aV -aV -aV -aV -aV -aV -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -It -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -It -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(193,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aV -aV -aV -aV -aV -aV -aV -aV -aV -aV -aV -aV -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aV -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -It -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -It -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(194,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aV -dG -dH -dJ -dJ -dJ -dz -dz -aV -fA -fA -fA -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aV -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -It -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -It -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(195,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aV -dG -dz -dz -dz -dz -dz -dz -eZ -fA -fA -fA -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aV -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -It -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -It -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(196,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aV -dG -dz -dz -dz -dz -dz -dH -aV -aV -aV -aV -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aV -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -It -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -It -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(197,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aV -dH -dz -dz -dz -dz -dz -dG -aV -ab -ab -aV -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aV -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -It -HX -HX -HX -HX -HX -HX -HX -HX -HX -Dq -HX -HX -HX -HX -HX -HX -HX -HX -HX -It -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(198,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -dD -dz -dz -dz -dz -dz -dz -dG -aV -ab -ab -aV -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aV -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -It -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -It -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(199,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -dC -dz -dz -dz -dz -dz -dz -dH -aV -ab -ab -aV -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aV -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -It -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -It -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(200,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -dC -dz -dz -dz -dM -dz -dz -dz -aV -ab -ab -aV -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aV -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -It -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -It -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(201,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -dC -dz -dz -dK -dK -dM -dz -dz -aV -ab -ab -aV -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aV -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -It -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -It -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(202,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -dC -dz -dI -dK -dK -dM -dz -dz -aV -ab -ab -aV -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aV -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -It -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -It -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(203,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -dC -dz -dz -dK -dK -dM -dz -dz -aV -ab -ab -aV -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aV -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -It -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -It -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(204,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -dC -dz -dz -dz -dM -dz -dz -dz -aV -ab -ab -aV -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aV -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -It -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -It -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(205,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -dC -dz -dz -dz -dz -dz -dz -dz -aV -ab -ab -aV -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aV -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -It -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -It -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(206,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -dE -dH -dz -dz -dz -dz -dz -dz -aV -ab -ab -aV -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aV -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -It -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -HX -It -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(207,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aV -aV -aV -aV -aV -dH -dz -dz -dz -dz -dz -dz -aV -ab -ab -aV -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aV -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -It -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(208,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aV -dz -dz -dz -aV -dH -dz -dz -dz -dz -dz -dz -aV -aV -aV -aV -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aV -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(209,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aV -dz -dA -dz -dF -dz -dz -dz -dz -dz -dz -dz -eZ -fA -fA -fA -dO -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aV -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(210,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aV -dz -dz -dz -aV -dG -dG -dG -dH -dz -dz -dz -aV -fA -fA -fA -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aV -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(211,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aV -aV -aV -aV -aV -aV -aV -aV -aV -aV -aV -aV -aV -aV -aV -aV -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aV -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(212,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aV -aV -aV -aV -aV -aV -aV -aV -aV -aV -aV -aV -aV -aV -aV -aV -aV -aV -aV -aV -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(213,1,1) = {" -ae -ai -ai -ai -ai -ai -ai -ai -ai -ai -ai -bE -ai -ai -ai -ai -ai -ai -ai -ai -ai -ai -di -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(214,1,1) = {" -af -aj -aj -aj -aj -aS -aj -aj -aj -aj -aO -bF -bJ -bI -bK -bJ -bI -bK -bJ -bI -bK -bJ -dk -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(215,1,1) = {" -af -aj -aB -aI -aj -aj -aS -aB -aj -bs -aj -bF -bI -bK -bJ -bI -bK -bJ -bI -bK -bJ -bI -dk -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(216,1,1) = {" -af -ak -aj -aj -aO -aj -aj -aS -aj -aj -bt -bF -bK -bJ -bI -bK -bJ -bI -bK -bJ -bI -bK -dk -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(217,1,1) = {" -af -aj -aj -aj -aN -aj -aj -aj -aS -aj -aj -bF -bJ -bI -bK -bJ -bI -bK -bJ -bI -bK -bJ -dk -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(218,1,1) = {" -af -aj -aC -aj -aj -aj -be -aO -aj -aS -aB -bF -bI -bK -bJ -bI -bK -bJ -bI -bK -bJ -bI -dk -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(219,1,1) = {" -ag -al -al -al -al -al -al -al -al -al -al -cj -al -al -al -al -al -al -al -al -al -al -dl -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(220,1,1) = {" -af -aK -bb -ad -aP -aM -aX -aP -bg -bb -aK -bF -bL -bL -bL -bL -bL -bL -bL -cQ -bL -bL -dk -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(221,1,1) = {" -af -aL -bc -aJ -aP -aT -aT -aP -bo -bc -aL -bF -bL -bW -bL -bL -bL -cx -bL -bL -cn -bL -dk -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(222,1,1) = {" -af -aK -bb -ad -aP -aW -aW -aP -bg -bb -aK -bF -bL -bL -bL -bL -bL -bL -bL -bL -bL -bL -dk -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(223,1,1) = {" -af -aL -bc -aJ -aP -aT -aT -aP -bo -bc -aL -bF -bL -bL -ci -bL -cn -bL -bL -bL -cx -bL -dk -ea -ea -ea -ea -ea -ea -ea -ea -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(224,1,1) = {" -af -aK -bb -ad -aP -aU -bf -aP -bg -bb -aK -bF -bL -bL -bL -bL -bL -bL -bW -bL -bL -cQ -dk -ea -ed -ed -ed -ed -ed -ed -ea -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(225,1,1) = {" -ag -al -al -al -al -al -al -al -al -al -al -cj -al -al -al -al -al -al -al -al -al -al -dl -ea -dn -dn -dn -dn -dn -dn -ea -ea -ea -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(226,1,1) = {" -af -ao -aD -aD -aQ -aZ -aZ -bn -bq -bq -bv -bF -bM -bM -bM -bM -bM -bM -bM -bM -bM -bM -dk -ea -cj -cj -cj -cj -cj -cj -ds -em -ea -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(227,1,1) = {" -af -an -aD -aD -aQ -aY -bi -bi -bi -bi -bu -bF -bM -bX -ck -bM -co -cy -cy -cy -cV -bM -dk -ea -cj -cj -cj -cj -cj -cj -ds -em -ea -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(228,1,1) = {" -af -an -aD -aD -aQ -bd -bk -bk -bk -bk -bx -bF -bM -bZ -ck -bM -cr -cB -cB -cB -cX -bM -dk -ea -cj -cj -cj -cj -cj -cj -ds -em -ea -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(229,1,1) = {" -af -an -aD -aD -aQ -ba -bj -bj -bj -bj -bw -bF -bM -bY -ck -bM -cp -cA -cA -cA -cW -bM -dk -ea -cj -cj -cj -cj -cj -cj -ds -em -ea -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(230,1,1) = {" -af -an -aD -aD -aR -aZ -aZ -bn -bq -bq -bv -bF -bM -bM -bM -bM -bM -bM -bM -bM -bM -bM -dk -ea -cj -cj -cj -cj -cj -cj -ds -em -ea -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(231,1,1) = {" -ag -al -al -al -al -al -al -al -al -al -al -cj -al -al -al -al -al -al -al -al -al -al -dl -ea -do -do -do -do -do -do -ea -ea -ea -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(232,1,1) = {" -af -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -bG -bN -ca -ca -ca -ct -cD -cJ -cJ -cJ -cY -dk -eb -dp -dp -dp -dp -dp -dp -eb -cj -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(233,1,1) = {" -af -ap -aE -ap -ap -ap -ap -ap -ap -aE -ap -bG -bN -ca -cl -cM -cs -cC -cM -cS -cJ -cY -dk -ec -ec -ec -ec -ec -ec -ec -ec -cj -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(234,1,1) = {" -af -ap -ap -ap -ap -aE -aE -ap -ap -ap -ap -bG -bP -cM -cl -cM -cs -cC -dB -cS -cM -da -dk -ec -ec -ec -ec -ec -ec -ec -ec -cj -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(235,1,1) = {" -af -ap -aE -ap -ap -ap -ap -ap -ap -aE -ap -bG -bO -cb -cl -cM -cs -cC -cM -cS -cK -cZ -dk -ec -ec -ec -ec -ec -ec -ec -ec -cj -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(236,1,1) = {" -af -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -bG -bO -cb -cb -cb -cu -cE -cK -cK -cK -cZ -dk -ec -ec -ec -ec -ec -ec -ec -ec -cj -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(237,1,1) = {" -ag -al -al -al -al -al -al -al -al -al -al -cj -al -al -al -al -al -al -al -al -al -al -dl -ec -ec -ec -ec -ec -ec -ec -ec -cj -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(238,1,1) = {" -af -aq -aq -aq -aq -aq -aq -aq -aq -aq -aq -bG -cz -cz -cz -cz -cz -cz -cz -cT -dL -dP -dk -ec -ec -ec -ej -ej -ec -ec -ec -cj -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(239,1,1) = {" -af -aq -aq -aq -aq -aq -aq -aq -aq -aq -aq -bG -cz -cO -cz -cz -dh -cz -cz -cT -dL -dP -dk -ec -ec -ec -dr -ej -ec -ec -ec -cj -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(240,1,1) = {" -af -aq -aq -aq -aq -aq -aq -aq -aq -aq -aq -bG -cz -cz -cz -cz -cz -cz -cz -cT -dL -dP -dk -ec -ec -ec -ej -ej -ec -ec -ec -cj -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(241,1,1) = {" -af -aq -aq -aq -aq -aq -aq -aq -aq -aq -aq -bG -cz -cP -cz -cz -cz -dt -cz -cT -dL -dP -dk -ec -ec -ec -ec -ec -ec -ec -ec -cj -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(242,1,1) = {" -af -aq -aq -aq -aq -aq -aq -aq -aq -aq -aq -bG -cz -cz -cz -cz -cz -cz -cz -cT -dL -dP -dk -ec -ec -ec -ec -ec -ec -ec -ec -cj -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(243,1,1) = {" -ag -al -al -al -al -al -al -al -al -al -al -cj -al -al -al -al -al -al -al -al -al -al -dl -ec -ec -ec -ec -ec -ec -ec -ec -cj -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(244,1,1) = {" -af -ar -ar -ar -ar -ar -ar -ar -ar -ar -ar -bG -bR -cc -cc -cc -cv -cF -cL -cL -cL -dc -dk -ec -ec -ec -ec -ec -ec -ec -ec -cj -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(245,1,1) = {" -af -ar -aF -ar -ar -ar -ar -ar -ar -aF -ar -bG -bQ -cR -cR -cR -dj -dv -cR -cR -cR -db -dk -ec -ec -ec -ec -ec -ec -ec -ec -cj -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(246,1,1) = {" -af -ar -ar -ar -ar -ar -ar -ar -ar -ar -ar -bG -bQ -cR -cR -cR -dj -dv -cR -cR -cR -db -dk -eb -dq -dq -dq -dq -dq -dq -eb -cj -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(247,1,1) = {" -af -ar -aF -ar -ar -ar -ar -ar -ar -aF -ar -bG -bQ -cR -cR -cR -dj -dv -cR -cR -cR -db -dk -ea -do -do -do -do -do -do -ea -ea -ea -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(248,1,1) = {" -af -ar -ar -ar -ar -ar -ar -ar -ar -ar -ar -bG -bS -cd -cd -cd -cw -cG -cN -cN -cN -dd -dk -ea -cj -cj -cj -cj -cj -cj -ds -en -ea -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(249,1,1) = {" -ag -al -al -al -al -al -al -al -al -al -al -cj -al -al -al -al -al -al -al -al -al -al -dl -ea -cj -cj -cj -cj -cj -cj -ds -en -ea -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(250,1,1) = {" -af -aw -aG -aG -aG -aG -bl -bl -bl -bl -bz -bG -bU -ce -ce -ce -ce -cH -cH -cH -cH -df -dk -ea -cj -cj -cj -cj -cj -cj -ds -en -ea -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(251,1,1) = {" -af -as -bh -bh -bh -bh -bh -bh -bh -bh -by -bG -bT -cU -cU -cU -cU -cU -cU -cU -cU -de -dk -ea -cj -cj -cj -cj -cj -cj -ds -en -ea -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(252,1,1) = {" -af -as -bh -bh -bh -bh -bh -bh -bh -bh -by -bG -bT -cU -cU -cU -cU -cU -cU -cU -cU -de -dk -ea -cj -cj -cj -cj -cj -cj -ds -en -ea -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(253,1,1) = {" -af -as -bh -bh -bh -bh -bh -bh -bh -bh -by -bG -bT -cU -cU -cU -cU -cU -cU -cU -cU -de -dk -ea -dn -dn -dn -dn -dn -dn -ea -ea -ea -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(254,1,1) = {" -af -aA -aH -aH -aH -aH -bm -bm -bm -bm -bA -bG -bV -cf -cf -cf -cf -cI -cI -cI -cI -dg -dk -ea -ei -ei -ei -ei -ei -ei -ea -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(255,1,1) = {" -ah -ay -ay -ay -ay -ay -ay -ay -ay -ay -ay -bH -ay -ay -ay -ay -ay -ay -ay -ay -ay -ay -dm -ea -ea -ea -ea -ea -ea -ea -ea -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm index 98afd5183c2..1be71d3b8a8 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm @@ -178,7 +178,7 @@ /area/ruin/powered/beach) "aJ" = ( /obj/structure/closet/crate, -/obj/item/tank/emergency_oxygen, +/obj/item/tank/internals/emergency_oxygen, /obj/item/trash/candy, /obj/effect/turf_decal/sand, /obj/item/toy/figure/bartender, @@ -406,7 +406,7 @@ /area/ruin/powered/beach) "cR" = ( /obj/structure/table/wood, -/obj/item/tank/oxygen, +/obj/item/tank/internals/oxygen, /obj/item/pickaxe, /obj/item/clothing/mask/gas, /turf/simulated/floor/pod, diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm index be40fb0f2ab..6bf8bd85d37 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm @@ -961,7 +961,7 @@ /area/ruin/powered/clownplanet) "by" = ( /obj/structure/table/glass, -/obj/item/gun/magic/staff/slipping, +/obj/item/gun/magic/wand/slipping, /turf/simulated/floor/carpet, /area/ruin/powered/clownplanet) "bB" = ( diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm index fe3615237da..03fd9835019 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm @@ -256,7 +256,7 @@ /turf/simulated/floor/plasteel, /area/ruin/powered/animal_hospital) "aF" = ( -/obj/machinery/door/airlock/shuttle{ +/obj/machinery/door/airlock/titanium{ name = "Restroom" }, /obj/effect/turf_decal/tile/bar, @@ -629,15 +629,15 @@ /area/ruin/powered/animal_hospital) "bH" = ( /obj/structure/table, -/obj/item/tank/oxygen, -/obj/item/tank/oxygen, +/obj/item/tank/internals/oxygen, +/obj/item/tank/internals/oxygen, /obj/effect/turf_decal/tile/blue{ dir = 1 }, /obj/effect/turf_decal/tile/blue{ dir = 8 }, -/obj/item/tank/oxygen, +/obj/item/tank/internals/oxygen, /turf/simulated/floor/plasteel, /area/ruin/powered/animal_hospital) "bI" = ( @@ -809,7 +809,7 @@ /turf/simulated/floor/plasteel/white, /area/ruin/powered/animal_hospital) "cg" = ( -/obj/machinery/door/airlock/shuttle{ +/obj/machinery/door/airlock/titanium{ name = "Break Room" }, /obj/effect/turf_decal/tile/blue{ @@ -821,39 +821,39 @@ /turf/simulated/floor/plasteel/white, /area/ruin/powered/animal_hospital) "ch" = ( -/obj/machinery/door/airlock/shuttle{ +/obj/machinery/door/airlock/titanium{ name = "Operating Theatre" }, /turf/simulated/floor/plasteel/white, /area/ruin/powered/animal_hospital) "ci" = ( /obj/structure/fans/tiny/invisible, -/obj/machinery/door/airlock/shuttle{ +/obj/machinery/door/airlock/titanium{ desc = "There's a smudged note wedged into it that says something about pizza dropoffs."; name = "Staff Entrance" }, /turf/simulated/floor/plating, /area/ruin/powered/animal_hospital) "cj" = ( -/obj/machinery/door/airlock/shuttle{ +/obj/machinery/door/airlock/titanium{ name = "Morgue" }, /turf/simulated/floor/plating, /area/ruin/powered/animal_hospital) "ck" = ( -/obj/machinery/door/airlock/shuttle{ +/obj/machinery/door/airlock/titanium{ name = "Medical Supplies" }, /turf/simulated/floor/plasteel/white, /area/ruin/powered/animal_hospital) "cl" = ( -/obj/machinery/door/airlock/shuttle{ +/obj/machinery/door/airlock/titanium{ name = "Safety Supplies" }, /turf/simulated/floor/plasteel/white, /area/ruin/powered/animal_hospital) "cm" = ( -/obj/machinery/door/airlock/shuttle{ +/obj/machinery/door/airlock/titanium{ name = "Storage" }, /turf/simulated/floor/plating, @@ -988,7 +988,7 @@ /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "cG" = ( -/obj/machinery/door/airlock/shuttle{ +/obj/machinery/door/airlock/titanium{ desc = "There's a smudged note wedged into it that says something about pizza dropoffs."; name = "Staff Entrance" }, diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm index be8f849400f..5da86c4d35a 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm @@ -169,7 +169,6 @@ /obj/structure/stone_tile/cracked{ dir = 8 }, -/obj/item/malf_upgrade, /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/ruin/unpowered/ash_walkers) "aB" = ( diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_cube.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_cube.dmm index 888ead3e24c..66bd2dd2c11 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_cube.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_cube.dmm @@ -10,7 +10,7 @@ /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "d" = ( -/turf/unsimulated/wall, +/turf/simulated/wall/indestructible/riveted, /area/lavaland/surface/outdoors) "e" = ( /obj/machinery/wish_granter, diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_golem_ship.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_golem_ship.dmm index 8fdc459c863..8e007e8396f 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_golem_ship.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_golem_ship.dmm @@ -1,32 +1,32 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"aa" = ( +"a" = ( /turf/template_noop, /area/template_noop) -"ab" = ( -/turf/simulated/wall/mineral/titanium, +"b" = ( +/turf/simulated/wall/mineral/titanium/nodiagonal, /area/shuttle/freegolem) -"ac" = ( +"c" = ( /obj/structure/fans/tiny, -/obj/machinery/door/airlock/shuttle, -/turf/simulated/shuttle/plating, +/obj/machinery/door/airlock/titanium, +/turf/simulated/floor/plating, /area/shuttle/freegolem) -"ad" = ( +"d" = ( /obj/structure/closet/crate/golemgear, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating, /area/shuttle/freegolem) -"ae" = ( +"e" = ( /obj/item/storage/toolbox/mechanical, /obj/item/reagent_containers/spray/cleaner, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating, /area/shuttle/freegolem) -"af" = ( -/turf/simulated/shuttle/plating, +"f" = ( +/turf/simulated/floor/plating, /area/shuttle/freegolem) -"ag" = ( +"g" = ( /obj/structure/reagent_dispensers/watertank/high, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating, /area/shuttle/freegolem) -"ah" = ( +"h" = ( /obj/structure/shuttle/engine/heater{ icon_state = "heater"; dir = 4 @@ -34,131 +34,73 @@ /obj/structure/window/reinforced{ dir = 8 }, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating, /area/shuttle/freegolem) -"ai" = ( +"i" = ( /obj/structure/shuttle/engine/propulsion{ dir = 4; icon_state = "burst_l" }, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating, /area/shuttle/freegolem) -"aj" = ( +"j" = ( /obj/machinery/light/small, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating, /area/shuttle/freegolem) -"ak" = ( +"k" = ( /obj/structure/reagent_dispensers/watertank, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating, /area/shuttle/freegolem) -"al" = ( -/obj/structure/table/wood, -/obj/item/disk/design_disk/golem_shell, -/obj/item/areaeditor/golem, -/turf/simulated/shuttle/floor{ - icon_state = "floor5" - }, +"l" = ( +/obj/machinery/door/airlock/titanium, +/turf/simulated/floor/mineral/titanium/purple, /area/shuttle/freegolem) -"am" = ( +"m" = ( /obj/machinery/vending/hydronutrients, -/turf/simulated/shuttle/floor{ - icon_state = "floor5" - }, +/turf/simulated/floor/mineral/titanium/purple, /area/shuttle/freegolem) -"an" = ( +"n" = ( /obj/machinery/vending/hydroseeds, -/turf/simulated/shuttle/floor{ - icon_state = "floor5" - }, +/turf/simulated/floor/mineral/titanium/purple, /area/shuttle/freegolem) -"ao" = ( +"o" = ( /obj/machinery/light{ dir = 1; on = 1 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor5" - }, +/turf/simulated/floor/mineral/titanium/purple, /area/shuttle/freegolem) -"ap" = ( -/turf/simulated/shuttle/floor{ - icon_state = "floor5" - }, +"p" = ( +/turf/simulated/floor/mineral/titanium/purple, /area/shuttle/freegolem) -"aq" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swallc2"; - dir = 2 - }, -/area/shuttle/freegolem) -"ar" = ( -/obj/effect/mob_spawn/human/golem/adamantine, -/turf/simulated/shuttle/floor{ - icon_state = "floor5" - }, -/area/shuttle/freegolem) -"as" = ( -/obj/machinery/vending/coffee/free, -/turf/simulated/shuttle/floor{ - icon_state = "floor5" - }, -/area/shuttle/freegolem) -"at" = ( +"q" = ( /obj/machinery/mineral/equipment_vendor/golem, -/turf/simulated/shuttle/floor{ - icon_state = "floor5" - }, +/turf/simulated/floor/mineral/titanium/purple, /area/shuttle/freegolem) -"au" = ( -/obj/machinery/door/airlock/shuttle, +"r" = ( +/obj/machinery/door/airlock/titanium, /obj/structure/fans/tiny, -/turf/simulated/shuttle/floor{ - icon_state = "floor5" - }, +/turf/simulated/floor/mineral/titanium/purple, /area/shuttle/freegolem) -"av" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall12"; - dir = 2 - }, -/area/shuttle/freegolem) -"aw" = ( -/obj/machinery/door/airlock/shuttle, -/turf/simulated/shuttle/floor{ - icon_state = "floor5" - }, -/area/shuttle/freegolem) -"ax" = ( +"s" = ( /obj/machinery/light{ dir = 8 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor5" - }, +/turf/simulated/floor/mineral/titanium/purple, /area/shuttle/freegolem) -"ay" = ( +"t" = ( +/obj/effect/mob_spawn/human/golem/adamantine, +/turf/simulated/floor/mineral/titanium/purple, +/area/shuttle/freegolem) +"u" = ( /obj/machinery/mineral/ore_redemption/golem, -/turf/simulated/shuttle/floor{ - icon_state = "floor5" - }, +/turf/simulated/floor/mineral/titanium/purple, /area/shuttle/freegolem) -"az" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swallc1"; - dir = 2 - }, +"v" = ( +/obj/effect/spawner/window/shuttle, +/turf/simulated/floor/plating, /area/shuttle/freegolem) -"aA" = ( -/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, -/area/ruin/powered/golem_ship) -"aB" = ( -/obj/structure/window/full/shuttle{ - icon_state = "16" - }, -/obj/structure/grille, -/turf/simulated/shuttle/plating, -/area/shuttle/freegolem) -"aC" = ( +"w" = ( /obj/structure/statue/gold/rd{ name = "statue of the Liberator" }, @@ -166,32 +108,28 @@ dir = 4; pixel_x = 0 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor5" - }, +/turf/simulated/floor/mineral/titanium/purple, /area/shuttle/freegolem) -"aD" = ( +"x" = ( /obj/structure/computerframe, -/turf/simulated/shuttle/floor{ - icon_state = "floor5" - }, +/turf/simulated/floor/mineral/titanium/purple, /area/shuttle/freegolem) -"aE" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall3"; - dir = 2 - }, +"y" = ( +/obj/structure/table/wood, +/obj/item/resonator, +/turf/simulated/floor/mineral/titanium/purple, /area/shuttle/freegolem) -"aF" = ( +"z" = ( /obj/structure/extinguisher_cabinet{ pixel_y = 30 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor5" - }, +/turf/simulated/floor/mineral/titanium/purple, /area/shuttle/freegolem) -"aG" = ( -/obj/machinery/door/airlock/shuttle, +"A" = ( +/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, +/area/ruin/powered/golem_ship) +"B" = ( +/obj/machinery/door/airlock/titanium, /obj/structure/fans/tiny, /obj/docking_port/stationary{ area_type = /area/ruin/powered/golem_ship; @@ -211,18 +149,9 @@ name = "Free Golem Ship"; width = 16 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor5" - }, +/turf/simulated/floor/mineral/titanium/purple, /area/shuttle/freegolem) -"aH" = ( -/obj/structure/window/full/shuttle{ - icon_state = "15" - }, -/obj/structure/grille, -/turf/simulated/shuttle/plating, -/area/shuttle/freegolem) -"aI" = ( +"C" = ( /obj/structure/window/reinforced{ dir = 4; pixel_x = 0 @@ -238,533 +167,474 @@ pixel_x = -4; pixel_y = 3 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor5" - }, +/turf/simulated/floor/mineral/titanium/purple, /area/shuttle/freegolem) -"aJ" = ( +"D" = ( /obj/machinery/light, /obj/structure/chair/comfy/purp{ icon_state = "comfychair"; dir = 1 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor5" - }, +/turf/simulated/floor/mineral/titanium/purple, /area/shuttle/freegolem) -"aK" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall13"; - icon_state = "swall13"; - dir = 2 - }, -/area/shuttle/freegolem) -"aL" = ( -/obj/structure/fans/tiny, -/obj/machinery/door/airlock/shuttle, -/turf/simulated/shuttle/floor{ - icon_state = "floor5" - }, -/area/shuttle/freegolem) -"aM" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall11"; - icon_state = "swall11"; - dir = 2 - }, -/area/shuttle/freegolem) -"aN" = ( -/obj/item/resonator/upgraded, -/turf/simulated/shuttle/floor{ - icon_state = "floor5" - }, -/area/shuttle/freegolem) -"aO" = ( -/obj/machinery/autolathe, -/turf/simulated/shuttle/floor{ - icon_state = "floor5" - }, -/area/shuttle/freegolem) -"aP" = ( -/obj/machinery/computer/shuttle/golem_ship/recall, -/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, -/area/ruin/powered/golem_ship) -"aQ" = ( -/obj/structure/table/wood, -/obj/machinery/reagentgrinder, -/turf/simulated/shuttle/floor{ - icon_state = "floor5" - }, -/area/shuttle/freegolem) -"aR" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swallc4" - }, -/area/shuttle/freegolem) -"aS" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall4"; - dir = 2 - }, -/area/shuttle/freegolem) -"aT" = ( -/obj/machinery/light, -/turf/simulated/shuttle/floor{ - icon_state = "floor5" - }, -/area/shuttle/freegolem) -"aU" = ( -/obj/structure/table/wood, -/obj/item/resonator, -/turf/simulated/shuttle/floor{ - icon_state = "floor5" - }, -/area/shuttle/freegolem) -"aV" = ( -/obj/machinery/vending/snack/free, -/turf/simulated/shuttle/floor{ - icon_state = "floor5" - }, -/area/shuttle/freegolem) -"aW" = ( -/obj/structure/table/wood, -/obj/item/storage/firstaid/brute, -/obj/item/storage/firstaid/brute, -/obj/item/storage/firstaid/brute, -/turf/simulated/shuttle/floor{ - icon_state = "floor5" - }, -/area/shuttle/freegolem) -"aX" = ( -/obj/structure/table/wood, -/obj/item/storage/firstaid/fire, -/obj/item/storage/firstaid/fire, -/obj/item/storage/firstaid/fire, -/obj/machinery/light, -/turf/simulated/shuttle/floor{ - icon_state = "floor5" - }, -/area/shuttle/freegolem) -"aY" = ( -/obj/structure/table/wood, -/obj/item/storage/firstaid/adv, -/obj/item/storage/firstaid/adv, -/turf/simulated/shuttle/floor{ - icon_state = "floor5" - }, -/area/shuttle/freegolem) -"ba" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/turf/simulated/shuttle/plating, -/area/shuttle/freegolem) -"bb" = ( -/obj/structure/reagent_dispensers/fueltank, -/turf/simulated/shuttle/plating, -/area/shuttle/freegolem) -"bc" = ( -/obj/structure/ore_box, -/turf/simulated/shuttle/plating, -/area/shuttle/freegolem) -"be" = ( +"E" = ( /obj/structure/extinguisher_cabinet{ pixel_y = -30 }, /obj/machinery/light, -/turf/simulated/shuttle/floor{ - icon_state = "floor5" - }, +/turf/simulated/floor/mineral/titanium/purple, /area/shuttle/freegolem) -"bf" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swallc3"; - dir = 2 - }, +"F" = ( +/obj/structure/fans/tiny, +/obj/machinery/door/airlock/titanium, +/turf/simulated/floor/mineral/titanium/purple, /area/shuttle/freegolem) -"bh" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall14"; - icon_state = "swall14"; - dir = 2 +"G" = ( +/obj/item/resonator/upgraded, +/turf/simulated/floor/mineral/titanium/purple, +/area/shuttle/freegolem) +"H" = ( +/obj/machinery/autolathe, +/turf/simulated/floor/mineral/titanium/purple, +/area/shuttle/freegolem) +"I" = ( +/obj/structure/table/wood, +/obj/machinery/reagentgrinder, +/turf/simulated/floor/mineral/titanium/purple, +/area/shuttle/freegolem) +"J" = ( +/obj/machinery/vending/coffee/free, +/turf/simulated/floor/mineral/titanium/purple, +/area/shuttle/freegolem) +"K" = ( +/obj/machinery/vending/snack/free, +/turf/simulated/floor/mineral/titanium/purple, +/area/shuttle/freegolem) +"L" = ( +/obj/machinery/light, +/turf/simulated/floor/mineral/titanium/purple, +/area/shuttle/freegolem) +"M" = ( +/obj/structure/table/wood, +/obj/item/storage/firstaid/brute, +/obj/item/storage/firstaid/brute, +/obj/item/storage/firstaid/brute, +/turf/simulated/floor/mineral/titanium/purple, +/area/shuttle/freegolem) +"N" = ( +/obj/structure/table/wood, +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/fire, +/obj/machinery/light, +/turf/simulated/floor/mineral/titanium/purple, +/area/shuttle/freegolem) +"O" = ( +/obj/structure/table/wood, +/obj/item/storage/firstaid/adv, +/obj/item/storage/firstaid/adv, +/turf/simulated/floor/mineral/titanium/purple, +/area/shuttle/freegolem) +"P" = ( +/obj/machinery/computer/shuttle/golem_ship/recall, +/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, +/area/ruin/powered/golem_ship) +"Q" = ( +/obj/structure/table/wood, +/obj/item/disk/design_disk/golem_shell, +/obj/item/areaeditor/golem, +/turf/simulated/floor/mineral/titanium/purple, +/area/shuttle/freegolem) +"R" = ( +/obj/machinery/light/small{ + dir = 1 }, +/turf/simulated/floor/plating, +/area/shuttle/freegolem) +"S" = ( +/obj/structure/reagent_dispensers/fueltank, +/turf/simulated/floor/plating, +/area/shuttle/freegolem) +"T" = ( +/obj/structure/ore_box, +/turf/simulated/floor/plating, /area/shuttle/freegolem) (1,1,1) = {" -aa -aa -aa -aa -aa -aa -aq -aB -aH -bf -aa -aa -aa -aa -aa -aa +a +a +a +a +a +a +b +v +v +b +a +a +a +a +a +a "} (2,1,1) = {" -aa -aa -aa -aa -aa -aa -av -aC -aI -av -aa -aa -aa -aa -aa -aa +a +a +a +a +a +a +b +w +C +b +a +a +a +a +a +a "} (3,1,1) = {" -aa -aa -aa -aq -aE -au -aR -aD -aJ -ab -au -aE -bf -aa -aa -aa +a +a +a +b +b +r +b +x +D +b +r +b +b +a +a +a "} (4,1,1) = {" -aa -aa -aa -av -am -ap -ax -ap -ap -ax -ap -as -av -aa -aa -aa +a +a +a +b +m +p +s +p +p +s +p +J +b +a +a +a "} (5,1,1) = {" -aa -aa -aa -av -an -ap -ap -ap -ap -ap -ap -aV -av -aa -aa -aa +a +a +a +b +n +p +p +p +p +p +p +K +b +a +a +a "} (6,1,1) = {" -aq -aE -aE -aK -ao -ap -ap -ap -ap -ap -ap -aT -bh -aE -aE -bf +b +b +b +b +o +p +p +p +p +p +p +L +b +b +b +b "} (7,1,1) = {" -av -ad -af -aw -ap -ap -ap -ap -ap -ap -ap -ap -aw -af -bc -av +b +d +f +l +p +p +p +p +p +p +p +p +l +f +T +b "} (8,1,1) = {" -av -ad -af -aw -ap -ap -ap -ap -ap -ap -ap -ap -aw -af -bc -av +b +d +f +l +p +p +p +p +p +p +p +p +l +f +T +b "} (9,1,1) = {" -av -ad -aj -av -ao -ap -ap -ap -ap -ap -ap -aT -av -ba -bc -av +b +d +j +b +o +p +p +p +p +p +p +L +b +R +T +b "} (10,1,1) = {" -av -ad -af -av -ap -ap -ar -aU -aU -ar -ap -ap -av -af -bc -av +b +d +f +b +p +p +t +y +y +t +p +p +b +f +T +b "} (11,1,1) = {" -av -ad -af -av -ap -ap -ar -aU -aU -ar -ap -ap -av -af -bc -av +b +d +f +b +p +p +t +y +y +t +p +p +b +f +T +b "} (12,1,1) = {" -av -ad -aj -av -ao -ap -ap -ap -ap -ap -ap -aT -av -ba -bc -av +b +d +j +b +o +p +p +p +p +p +p +L +b +R +T +b "} (13,1,1) = {" -av -ad -af -aw -ap -ap -ap -ap -ap -ap -ap -ap -aw -af -bc -av +b +d +f +l +p +p +p +p +p +p +p +p +l +f +T +b "} (14,1,1) = {" -av -ad -af -aw -ap -ap -ap -ap -ap -ap -ap -ap -aw -af -bc -av +b +d +f +l +p +p +p +p +p +p +p +p +l +f +T +b "} (15,1,1) = {" -av -ae -af -av -ap -ap -ap -ap -ap -ap -ap -aW -av -af -ae -av +b +e +f +b +p +p +p +p +p +p +p +M +b +f +e +b "} (16,1,1) = {" -ac -af -aj -av -ao -ap -ap -ap -ap -ap -ap -aX -av -ba -af -ac +c +f +j +b +o +p +p +p +p +p +p +N +b +R +f +c "} (17,1,1) = {" -ac -af -af -av -ap -ap -ap -ap -ap -aN -ap -aY -av -af -af -ac +c +f +f +b +p +p +p +p +p +G +p +O +b +f +f +c "} (18,1,1) = {" -av -ag -ak -av -at -ap -ay -ap -ap -aO -aQ -al -av -bb -bb -av +b +g +k +b +q +p +u +p +p +H +I +Q +b +S +S +b "} (19,1,1) = {" -av -ah -ah -av -ah -ah -aS -aF -be -aS -ah -ah -av -ah -ah -av +b +h +h +b +h +h +b +z +E +b +h +h +b +h +h +b "} (20,1,1) = {" -az -ai -ai -aM -ai -ai -aM -aG -aL -aM -ai -ai -aM -ai -ai -aR +b +i +i +b +i +i +b +B +F +b +i +i +b +i +i +b "} (21,1,1) = {" -aa -aa -aa -aa -aa -aa -aA -aA -aA -aP -aa -aa -aa -aa -aa -aa +a +a +a +a +a +a +A +A +A +P +a +a +a +a +a +a "} diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm index bcddc0f965d..7bea889e743 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm @@ -84,7 +84,7 @@ "r" = ( /obj/structure/rack, /obj/item/pickaxe/emergency, -/obj/item/tank/oxygen, +/obj/item/tank/internals/oxygen, /turf/simulated/floor/plating/asteroid/basalt, /area/ruin/powered) "s" = ( diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_sloth.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_sloth.dmm index 0a3a3c70e6a..4a556a25f9d 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_sloth.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_sloth.dmm @@ -1,6 +1,6 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( -/turf/unsimulated/wall, +/turf/simulated/wall/indestructible/riveted, /area/ruin/unpowered/misc_lavaruin) "b" = ( /turf/simulated/floor/plating/lava/smooth/lava_land_surface, diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm deleted file mode 100644 index e0870fd0ff3..00000000000 --- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm +++ /dev/null @@ -1,9177 +0,0 @@ -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"aa" = ( -/turf/template_noop, -/area/template_noop) -"ab" = ( -/turf/simulated/floor/plating/lava/smooth/lava_land_surface, -/area/lavaland/surface/outdoors) -"ac" = ( -/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, -/area/lavaland/surface/outdoors) -"ad" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/access_button{ - command = "cycle_interior"; - frequency = 1449; - master_tag = "syndicate_base_virology"; - name = "interior access button"; - pixel_x = 25; - pixel_y = -25; - req_access_txt = "150" - }, -/turf/simulated/floor/plasteel/white/side{ - dir = 4 - }, -/area/ruin/unpowered/syndicate_lava_base/virology) -"ae" = ( -/turf/simulated/wall/mineral/plastitanium/nodiagonal, -/area/ruin/unpowered/syndicate_lava_base/testlab) -"af" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/main) -"ag" = ( -/obj/machinery/alarm/syndicate{ - dir = 4; - pixel_x = -24 - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/main) -"ah" = ( -/obj/structure/table/wood, -/obj/machinery/chem_dispenser/beer/upgraded{ - dir = 1 - }, -/obj/structure/sign/barsign{ - pixel_y = -32; - req_access = null; - req_access_txt = "0" - }, -/turf/simulated/floor/wood, -/area/ruin/unpowered/syndicate_lava_base/bar) -"ai" = ( -/obj/structure/table/wood, -/obj/machinery/chem_dispenser/soda/upgraded{ - dir = 1 - }, -/turf/simulated/floor/wood, -/area/ruin/unpowered/syndicate_lava_base/bar) -"aj" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/vending/medical/syndicate_access, -/turf/simulated/floor/plasteel/white/side{ - dir = 4 - }, -/area/ruin/unpowered/syndicate_lava_base/virology) -"ak" = ( -/obj/machinery/vending/boozeomat/syndicate_access, -/turf/simulated/wall/mineral/plastitanium/nodiagonal, -/area/ruin/unpowered/syndicate_lava_base/bar) -"al" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/vending/medical/syndicate_access, -/turf/simulated/floor/plasteel/white, -/area/ruin/unpowered/syndicate_lava_base/medbay) -"am" = ( -/obj/effect/decal/cleanable/dirt, -/mob/living/carbon/human/monkey{ - faction = list("neutral","syndicate") - }, -/turf/simulated/floor/plasteel/white/side{ - dir = 9 - }, -/area/ruin/unpowered/syndicate_lava_base/virology) -"an" = ( -/mob/living/carbon/human/monkey{ - faction = list("neutral","syndicate") - }, -/turf/simulated/floor/plasteel/white/side{ - dir = 5 - }, -/area/ruin/unpowered/syndicate_lava_base/virology) -"ao" = ( -/mob/living/carbon/human/monkey{ - faction = list("neutral","syndicate") - }, -/turf/simulated/floor/plasteel/white/side{ - dir = 10 - }, -/area/ruin/unpowered/syndicate_lava_base/virology) -"ap" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/turf/simulated/floor/engine, -/area/ruin/unpowered/syndicate_lava_base/testlab) -"aq" = ( -/turf/simulated/floor/engine, -/area/ruin/unpowered/syndicate_lava_base/testlab) -"ar" = ( -/obj/effect/decal/cleanable/dirt, -/mob/living/carbon/human/monkey{ - faction = list("neutral","syndicate") - }, -/turf/simulated/floor/plasteel/white/side{ - dir = 6 - }, -/area/ruin/unpowered/syndicate_lava_base/virology) -"as" = ( -/turf/simulated/wall/mineral/plastitanium/nodiagonal, -/area/ruin/unpowered/syndicate_lava_base/chemistry) -"at" = ( -/obj/structure/grille, -/obj/structure/window/plastitanium, -/obj/machinery/door/poddoor{ - id_tag = "lavalandsyndi_chemistry" - }, -/turf/simulated/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/chemistry) -"au" = ( -/obj/structure/bed/roller, -/obj/machinery/iv_drip, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/mob/living/carbon/human/monkey{ - faction = list("neutral","syndicate") - }, -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/testlab) -"av" = ( -/obj/machinery/light/small, -/obj/structure/bed/roller, -/obj/machinery/iv_drip, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/mob/living/carbon/human/monkey{ - faction = list("neutral","syndicate") - }, -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/testlab) -"aw" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating{ - baseturf = /turf/simulated/floor/plating/lava/smooth/lava_land_surface; - oxygen = 14; - nitrogen = 23; - temperature = 300 - }, -/area/ruin/unpowered/syndicate_lava_base/arrivals) -"ax" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/virology) -"ay" = ( -/obj/machinery/door/airlock/external{ - frequency = 1449; - id_tag = "syndicate_base_west_north_interior"; - locked = 1; - req_access_txt = "150" - }, -/obj/structure/fans/tiny, -/turf/simulated/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/main) -"az" = ( -/obj/machinery/embedded_controller/radio/airlock/access_controller{ - frequency = 1449; - id_tag = "syndicate_base_west_south"; - pixel_x = -25; - req_access_txt = "150"; - tag_exterior_door = "syndicate_base_west_south_exterior"; - tag_interior_door = "syndicate_base_west_south_interior" - }, -/turf/simulated/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/arrivals) -"aA" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/obj/structure/sign/fire{ - pixel_x = 32 - }, -/obj/structure/closet/emcloset/anchored, -/obj/item/tank/emergency_oxygen/engi, -/obj/item/flashlight/seclite, -/obj/item/clothing/mask/gas, -/obj/structure/sign/vacuum{ - pixel_x = 0; - pixel_y = 32 - }, -/turf/simulated/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/arrivals) -"aB" = ( -/obj/structure/fans/tiny, -/obj/machinery/door/airlock/external{ - frequency = 1449; - id_tag = "syndicate_base_west_north_interior"; - locked = 1; - req_access_txt = "150" - }, -/turf/simulated/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/main) -"aC" = ( -/obj/structure/fans/tiny, -/obj/machinery/door/airlock/external{ - frequency = 1449; - id_tag = "syndicate_base_west_north_exterior"; - locked = 1; - req_access_txt = "150" - }, -/turf/simulated/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/main) -"aD" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/access_button{ - command = "cycle_interior"; - frequency = 1449; - master_tag = "syndicate_base_west_south"; - name = "interior access button"; - pixel_x = 25; - pixel_y = 25; - req_access_txt = "150" - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/arrivals) -"aE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/arrivals) -"aF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/engine, -/area/ruin/unpowered/syndicate_lava_base/testlab) -"aG" = ( -/obj/structure/fans/tiny, -/obj/machinery/door/airlock/external{ - frequency = 1449; - id_tag = "syndicate_base_south_exterior"; - locked = 1; - req_access_txt = "150" - }, -/turf/simulated/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/arrivals) -"aH" = ( -/obj/effect/turf_decal/stripes/corner, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/arrivals) -"aI" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/medical{ - frequency = 1449; - id_tag = "syndicate_base_virology_interior"; - locked = 1; - name = "Virology Lab Interior Airlock"; - req_access_txt = "150" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/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/white, -/area/ruin/unpowered/syndicate_lava_base/virology) -"aJ" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/medical{ - frequency = 1449; - id_tag = "syndicate_base_virology_exterior"; - locked = 1; - name = "Virology Lab Exterior Airlock"; - req_access_txt = "150" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/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, -/area/ruin/unpowered/syndicate_lava_base/main) -"aK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/machinery/access_button{ - command = "cycle_exterior"; - frequency = 1449; - master_tag = "syndicate_base_virology"; - name = "exterior access button"; - pixel_x = -25; - pixel_y = 25; - req_access_txt = "150" - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/main) -"aL" = ( -/turf/simulated/wall/mineral/plastitanium/explosive, -/area/ruin/unpowered/syndicate_lava_base/testlab) -"aM" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/chem_dispenser/upgraded, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/chemistry) -"aN" = ( -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/caution/stand_clear{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/access_button{ - command = "cycle_interior"; - frequency = 1449; - master_tag = "syndicate_base_south"; - name = "interior access button"; - pixel_x = 25; - pixel_y = -25; - req_access_txt = "150" - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/arrivals) -"aO" = ( -/obj/machinery/door/airlock/external{ - frequency = 1449; - id_tag = "syndicate_base_south_interior"; - locked = 1; - req_access_txt = "150" - }, -/obj/structure/fans/tiny, -/turf/simulated/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/arrivals) -"aP" = ( -/obj/structure/sign/vacuum{ - pixel_x = -32 - }, -/obj/machinery/light/small{ - dir = 8 - }, -/obj/machinery/embedded_controller/radio/airlock/access_controller{ - frequency = 1449; - id_tag = "syndicate_base_south"; - pixel_x = 25; - req_access_txt = "150"; - tag_exterior_door = "syndicate_base_south_exterior"; - tag_interior_door = "syndicate_base_south_interior" - }, -/turf/simulated/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/arrivals) -"aQ" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/arrivals) -"aR" = ( -/obj/structure/sign/xeno_warning_mining{ - pixel_x = -32 - }, -/obj/structure/sign/fire{ - pixel_x = 32 - }, -/turf/simulated/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/arrivals) -"aS" = ( -/obj/machinery/access_button{ - command = "cycle_exterior"; - frequency = 1449; - master_tag = "syndicate_base_south"; - name = "exterior access button"; - pixel_x = 20; - pixel_y = 21; - req_access_txt = "150" - }, -/turf/simulated/floor/plating/lava/smooth/lava_land_surface, -/area/lavaland/surface/outdoors) -"aT" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/access_button{ - command = "cycle_interior"; - frequency = 1449; - master_tag = "syndicate_base_west_north"; - name = "interior access button"; - pixel_x = 25; - pixel_y = -8; - req_access_txt = "150" - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/main) -"aU" = ( -/obj/machinery/embedded_controller/radio/airlock/access_controller{ - frequency = 1449; - id_tag = "syndicate_base_west_north"; - pixel_x = -25; - req_access_txt = "150"; - tag_exterior_door = "syndicate_base_west_north_exterior"; - tag_interior_door = "syndicate_base_west_north_interior" - }, -/turf/simulated/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/main) -"aV" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/obj/structure/sign/fire{ - pixel_x = 32 - }, -/obj/structure/closet/emcloset/anchored, -/obj/item/tank/emergency_oxygen/engi, -/obj/item/flashlight/seclite, -/obj/item/clothing/mask/gas, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/structure/sign/vacuum{ - pixel_x = 0; - pixel_y = -32 - }, -/turf/simulated/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/main) -"aW" = ( -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/machinery/door_control{ - id = "lavalandsyndi_arrivals"; - name = "Arrivals Blast Door Control"; - pixel_y = -26; - req_access_txt = "150" - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/arrivals) -"aX" = ( -/obj/effect/turf_decal/caution/red{ - dir = 1 - }, -/obj/machinery/light/small{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/turf/simulated/floor/plasteel/white/side{ - dir = 4 - }, -/area/ruin/unpowered/syndicate_lava_base/virology) -"aY" = ( -/obj/structure/fans/tiny, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/door/airlock/external{ - frequency = 1449; - id_tag = "syndicate_base_west_north_exterior"; - locked = 1; - req_access_txt = "150" - }, -/turf/simulated/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/main) -"aZ" = ( -/obj/structure/fans/tiny, -/obj/machinery/door/airlock/external{ - frequency = 1449; - id_tag = "syndicate_base_west_south_exterior"; - locked = 1; - req_access_txt = "150" - }, -/turf/simulated/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/arrivals) -"ba" = ( -/obj/machinery/door/airlock/external{ - frequency = 1449; - id_tag = "syndicate_base_west_south_interior"; - locked = 1; - req_access_txt = "150" - }, -/obj/structure/fans/tiny, -/turf/simulated/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/arrivals) -"bb" = ( -/obj/structure/fans/tiny, -/obj/machinery/door/airlock/external{ - frequency = 1449; - id_tag = "syndicate_base_west_south_interior"; - locked = 1; - req_access_txt = "150" - }, -/turf/simulated/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/arrivals) -"bc" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/obj/effect/mapping_helpers/no_lava, -/obj/machinery/access_button{ - command = "cycle_exterior"; - frequency = 1449; - master_tag = "syndicate_base_west_north"; - name = "exterior access button"; - pixel_x = -21; - pixel_y = 21; - req_access_txt = "150" - }, -/turf/simulated/floor/plating{ - baseturf = /turf/simulated/floor/plating/lava/smooth/lava_land_surface; - oxygen = 14; - nitrogen = 23; - temperature = 300 - }, -/area/lavaland/surface/outdoors) -"bd" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/embedded_controller/radio/airlock/access_controller{ - frequency = 1449; - id_tag = "syndicate_base_virology"; - pixel_x = -25; - req_access_txt = "150"; - tag_exterior_door = "syndicate_base_virology_exterior"; - tag_interior_door = "syndicate_base_virology_interior" - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/main) -"be" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/obj/machinery/power/apc/syndicate{ - dir = 1; - name = "Engineering APC"; - pixel_y = 24 - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/cable/yellow{ - d1 = 0; - d2 = 8; - icon_state = "0-8" - }, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ - dir = 9 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"bf" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/door/airlock/glass{ - frequency = 1449; - id_tag = "syndicate_base_incinerator_interior"; - locked = 1; - req_access_txt = "150" - }, -/obj/machinery/access_button{ - command = "cycle_interior"; - frequency = 1449; - master_tag = "syndicate_base_incinerator"; - name = "interior access button"; - pixel_x = -25; - pixel_y = 0; - req_access_txt = "150" - }, -/turf/simulated/floor/engine/insulated, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"bg" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/turf/simulated/floor/engine/insulated, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"bh" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/engine/insulated, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"bi" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/obj/machinery/atmospherics/binary/pump{ - name = "Incinerator Input" - }, -/turf/simulated/floor/engine/insulated, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"bj" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/door/airlock/glass{ - frequency = 1449; - id_tag = "syndicate_base_incinerator_exterior"; - locked = 1; - req_access_txt = "150" - }, -/obj/machinery/access_button{ - command = "cycle_exterior"; - frequency = 1449; - master_tag = "syndicate_base_incinerator"; - name = "exterior access button"; - pixel_x = -25; - pixel_y = 0; - req_access_txt = "150" - }, -/turf/simulated/floor/engine/insulated, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"bk" = ( -/obj/structure/rack, -/obj/item/flashlight{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/flashlight, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/brown{ - dir = 1 - }, -/obj/effect/turf_decal/tile/brown{ - dir = 4 - }, -/obj/machinery/firealarm/syndicate{ - dir = 8; - pixel_x = -26 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/cargo) -"bl" = ( -/obj/effect/turf_decal/stripes/corner, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/cargo) -"bm" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/turf_decal/caution/stand_clear{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/access_button{ - command = "cycle_interior"; - frequency = 1449; - master_tag = "syndicate_base_east"; - name = "interior access button"; - pixel_x = 25; - pixel_y = 25; - req_access_txt = "150" - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/cargo) -"bn" = ( -/obj/machinery/door/airlock/external{ - frequency = 1449; - id_tag = "syndicate_base_east_interior"; - locked = 1; - req_access_txt = "150" - }, -/obj/structure/fans/tiny, -/turf/simulated/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/cargo) -"bo" = ( -/obj/structure/sign/vacuum{ - pixel_y = -32 - }, -/obj/machinery/light/small, -/obj/machinery/embedded_controller/radio/airlock/access_controller{ - frequency = 1449; - id_tag = "syndicate_base_east"; - pixel_x = 0; - pixel_y = 25; - req_access_txt = "150"; - tag_exterior_door = "syndicate_base_east_exterior"; - tag_interior_door = "syndicate_base_east_interior" - }, -/turf/simulated/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/cargo) -"bp" = ( -/obj/structure/fans/tiny, -/obj/machinery/door/airlock/external{ - frequency = 1449; - id_tag = "syndicate_base_east_exterior"; - locked = 1; - req_access_txt = "150" - }, -/turf/simulated/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/cargo) -"bq" = ( -/obj/machinery/access_button{ - command = "cycle_exterior"; - frequency = 1449; - master_tag = "syndicate_base_east"; - name = "exterior access button"; - pixel_x = -21; - pixel_y = 21; - req_access_txt = "150" - }, -/turf/simulated/floor/plating/lava/smooth/lava_land_surface, -/area/lavaland/surface/outdoors) -"br" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/trinary/mixer/flipped{ - dir = 8; - node1_concentration = 0.2; - node2_concentration = 0.8; - on = 1; - target_pressure = 4500 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"bs" = ( -/obj/machinery/air_sensor{ - frequency = 1442; - id_tag = "syndie_lavaland_n2_sensor" - }, -/turf/simulated/floor/engine/n2, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"bt" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/turf/simulated/floor/engine/n2, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"bu" = ( -/obj/machinery/atmospherics/unary/vent_pump/siphon/on{ - dir = 8; - frequency = 1442; - id_tag = "syndie_lavaland_n2_out"; - name = "nitrogen out" - }, -/turf/simulated/floor/engine/n2, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"bv" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/obj/effect/mapping_helpers/no_lava, -/obj/machinery/access_button{ - command = "cycle_exterior"; - frequency = 1449; - master_tag = "syndicate_base_west_south"; - name = "exterior access button"; - pixel_x = -21; - pixel_y = -21; - req_access_txt = "150" - }, -/turf/simulated/floor/plating{ - baseturf = /turf/simulated/floor/plating/lava/smooth/lava_land_surface; - oxygen = 14; - nitrogen = 23; - temperature = 300 - }, -/area/lavaland/surface/outdoors) -"bw" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/structure/bookcase/random, -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/bar) -"bx" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/obj/machinery/turretid/lethal{ - ailock = 1; - check_synth = 0; - control_area = "Syndicate Lavaland Primary Hallway"; - dir = 1; - faction = "syndicate"; - name = "Base turret controls"; - pixel_y = 30; - req_access = null; - req_access_txt = "150"; - syndicate = 1 - }, -/turf/simulated/floor/redgrid, -/area/ruin/unpowered/syndicate_lava_base/main) -"by" = ( -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/visible/supply, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"bz" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ - dir = 6; - initialize_directions = 6; - level = 2 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"bA" = ( -/obj/effect/turf_decal/bot, -/obj/machinery/portable_atmospherics/scrubber, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ - dir = 4; - level = 2 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"bB" = ( -/obj/structure/grille, -/obj/structure/window/plastitanium, -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ - dir = 4; - level = 2 - }, -/turf/simulated/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"bC" = ( -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, -/obj/machinery/atmospherics/pipe/simple/visible/supply, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"bD" = ( -/obj/machinery/atmospherics/pipe/simple/visible/universal, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"bE" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"bF" = ( -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/visible/supply{ - dir = 5 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"bG" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold/visible/supply, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"bH" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"bI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/baseturf_helper/lava_land/surface, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/chemistry) -"bJ" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold/visible/cyan, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"bK" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ - dir = 4; - level = 2 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"bL" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold/visible/yellow{ - dir = 8; - level = 2 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"bM" = ( -/obj/effect/turf_decal/stripes/corner, -/obj/machinery/light/small, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/binary/pump{ - dir = 8; - name = "Plasma to Incinerator" - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"bN" = ( -/obj/effect/turf_decal/stripes/line, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ - dir = 10; - level = 2 - }, -/obj/structure/reagent_dispensers/fueltank, -/obj/item/clothing/head/welding, -/obj/item/weldingtool/largetank, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"bO" = ( -/obj/machinery/ignition_switch{ - id = "syndicate_base_incinerator"; - pixel_x = 6; - pixel_y = -24 - }, -/obj/effect/turf_decal/stripes/line, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/portable_atmospherics/canister, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/embedded_controller/radio/airlock/access_controller{ - frequency = 1449; - id_tag = "syndicate_base_incinerator"; - pixel_x = -6; - pixel_y = -25; - req_access_txt = "150"; - tag_exterior_door = "syndicate_base_incinerator_exterior"; - tag_interior_door = "syndicate_base_incinerator_interior" - }, -/obj/machinery/atmospherics/pipe/simple/visible/yellow, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"bP" = ( -/obj/structure/grille, -/obj/structure/window/plastitanium, -/obj/machinery/atmospherics/pipe/simple/visible/yellow, -/turf/simulated/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"bQ" = ( -/turf/simulated/floor/engine/insulated, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"bR" = ( -/obj/machinery/optable, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel/white/side{ - dir = 4 - }, -/area/ruin/unpowered/syndicate_lava_base/medbay) -"bS" = ( -/obj/machinery/vending/toyliberationstation{ - req_access_txt = "150" - }, -/obj/effect/turf_decal/tile/brown, -/obj/effect/turf_decal/tile/brown{ - dir = 8 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/cargo) -"bT" = ( -/turf/simulated/wall/mineral/plastitanium/explosive, -/area/ruin/unpowered/syndicate_lava_base/medbay) -"bU" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/obj/machinery/door_control{ - id = "lavalandsyndi"; - name = "Syndicate Experimentation Lockdown Control"; - pixel_y = 26; - req_access_txt = "150" - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/corner{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/baseturf_helper/lava_land/surface, -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/testlab) -"bV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/effect/baseturf_helper/lava_land/surface, -/turf/simulated/floor/plasteel/white/corner{ - dir = 1 - }, -/area/ruin/unpowered/syndicate_lava_base/virology) -"bW" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/baseturf_helper/lava_land/surface, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/cargo) -"bX" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/baseturf_helper/lava_land/surface, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/dormitories) -"bY" = ( -/obj/effect/baseturf_helper/lava_land/surface, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/main) -"bZ" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 - }, -/obj/effect/baseturf_helper/lava_land/surface, -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/bar) -"ca" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ - dir = 6; - level = 2 - }, -/obj/effect/baseturf_helper/lava_land/surface, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"cb" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/baseturf_helper/lava_land/surface, -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/telecomms) -"cc" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/effect/baseturf_helper/lava_land/surface, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/arrivals) -"cd" = ( -/obj/machinery/light/small, -/obj/structure/extinguisher_cabinet{ - pixel_y = -29 - }, -/obj/structure/cable/yellow, -/obj/machinery/power/apc/syndicate{ - dir = 4; - name = "Medbay APC"; - pixel_x = 24 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/baseturf_helper/lava_land/surface, -/turf/simulated/floor/plasteel/white/side{ - dir = 6 - }, -/area/ruin/unpowered/syndicate_lava_base/medbay) -"ce" = ( -/obj/structure/sign/securearea, -/turf/simulated/wall/mineral/plastitanium/explosive, -/area/ruin/unpowered/syndicate_lava_base/main) -"cg" = ( -/obj/machinery/portable_atmospherics/canister/nitrogen, -/turf/simulated/floor/engine/n2, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"ch" = ( -/obj/machinery/air_sensor{ - frequency = 1442; - id_tag = "syndie_lavaland_o2_sensor" - }, -/turf/simulated/floor/engine/o2, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"ci" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/turf/simulated/floor/engine/o2, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"cj" = ( -/obj/machinery/atmospherics/unary/vent_pump/siphon/on{ - dir = 8; - frequency = 1442; - id_tag = "syndie_lavaland_o2_out"; - name = "oxygen out" - }, -/turf/simulated/floor/engine/o2, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"ck" = ( -/obj/machinery/portable_atmospherics/canister/oxygen, -/turf/simulated/floor/engine/o2, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"cl" = ( -/obj/machinery/atmospherics/unary/vent_pump/siphon/on{ - dir = 1; - frequency = 1442; - id_tag = "syndie_lavaland_tox_out"; - name = "toxin out" - }, -/turf/simulated/floor/engine/plasma, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"cm" = ( -/obj/machinery/air_sensor{ - frequency = 1442; - id_tag = "syndie_lavaland_tox_sensor" - }, -/turf/simulated/floor/engine/plasma, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"cn" = ( -/obj/machinery/portable_atmospherics/canister/toxins, -/turf/simulated/floor/engine/plasma, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"co" = ( -/obj/machinery/light/small, -/turf/simulated/floor/engine/plasma, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"cp" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/igniter{ - id = "syndicate_base_incinerator" - }, -/turf/simulated/floor/engine/insulated, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"cq" = ( -/obj/machinery/atmospherics/unary/outlet_injector/on{ - dir = 1; - id = "syndie_lavaland_inc_in" - }, -/obj/structure/sign/vacuum/external{ - pixel_y = -32 - }, -/turf/simulated/floor/engine/insulated, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"cr" = ( -/obj/machinery/door/poddoor{ - id_tag = "lavalandsyndi_incineratorinput" - }, -/turf/simulated/floor/engine/insulated, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"cs" = ( -/obj/structure/cable, -/obj/structure/cable{ - d2 = 2; - icon_state = "0-2" - }, -/obj/machinery/power/compressor{ - comp_id = "syndie_lavaland_incineratorturbine"; - dir = 1; - luminosity = 2 - }, -/turf/simulated/floor/engine/insulated, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"ct" = ( -/obj/structure/cable, -/obj/machinery/power/turbine{ - dir = 2; - luminosity = 2 - }, -/turf/simulated/floor/engine/insulated, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"cu" = ( -/obj/machinery/door/poddoor{ - id_tag = "lavalandsyndi_incineratoroutput" - }, -/turf/simulated/floor/engine/insulated, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"cA" = ( -/obj/structure/table/reinforced, -/obj/item/clothing/glasses/science, -/obj/item/clothing/glasses/science, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/chemistry) -"cG" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/chem_master, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/chemistry) -"dc" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/turf/simulated/floor/engine, -/area/ruin/unpowered/syndicate_lava_base/testlab) -"di" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/turf/simulated/floor/engine, -/area/ruin/unpowered/syndicate_lava_base/testlab) -"do" = ( -/obj/structure/closet/secure_closet/medical1{ - req_access = null; - req_access_txt = "150" - }, -/obj/effect/decal/cleanable/dirt, -/obj/item/storage/box/beakers/bluespace, -/obj/item/storage/box/beakers/bluespace, -/turf/simulated/floor/plasteel/white/side{ - dir = 9 - }, -/area/ruin/unpowered/syndicate_lava_base/chemistry) -"du" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/obj/machinery/door_control{ - id = "lavalandsyndi_chemistry"; - name = "Chemistry Blast Door Control"; - pixel_y = 26; - req_access_txt = "150" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel/white/side{ - dir = 1 - }, -/area/ruin/unpowered/syndicate_lava_base/chemistry) -"dv" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/obj/machinery/chem_heater, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/chemistry) -"dw" = ( -/obj/structure/chair/office/light{ - dir = 1 - }, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/stripes/line, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/chemistry) -"dx" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/obj/structure/closet/crate, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/chemistry) -"dy" = ( -/turf/simulated/wall/mineral/plastitanium/nodiagonal, -/area/ruin/unpowered/syndicate_lava_base/cargo) -"dA" = ( -/obj/structure/closet/l3closet, -/obj/machinery/power/apc/syndicate{ - dir = 8; - name = "Chemistry APC"; - pixel_x = -24 - }, -/obj/structure/cable/yellow{ - d1 = 0; - d2 = 2; - icon_state = "0-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel/white/side{ - dir = 8 - }, -/area/ruin/unpowered/syndicate_lava_base/chemistry) -"dB" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/chemistry) -"dC" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/chemistry) -"dE" = ( -/obj/structure/table/glass, -/obj/item/stack/sheet/mineral/plasma{ - amount = 5; - pixel_x = -2; - pixel_y = 6 - }, -/obj/item/stack/sheet/mineral/plasma{ - amount = 5; - pixel_y = 2 - }, -/obj/item/stack/sheet/mineral/plasma{ - amount = 5; - pixel_x = 2; - pixel_y = -2 - }, -/obj/effect/decal/cleanable/dirt, -/obj/item/reagent_containers/glass/bottle/charcoal{ - pixel_x = 6 - }, -/obj/item/reagent_containers/glass/bottle/epinephrine, -/turf/simulated/floor/plasteel/white/corner{ - dir = 4 - }, -/area/ruin/unpowered/syndicate_lava_base/chemistry) -"dG" = ( -/obj/structure/lattice/catwalk, -/turf/simulated/floor/plating/lava/smooth/lava_land_surface, -/area/lavaland/surface/outdoors) -"dI" = ( -/obj/structure/table/glass, -/obj/machinery/reagentgrinder{ - pixel_y = 5 - }, -/obj/item/reagent_containers/glass/beaker/large, -/turf/simulated/floor/plasteel/white/side{ - dir = 5 - }, -/area/ruin/unpowered/syndicate_lava_base/chemistry) -"dK" = ( -/obj/effect/turf_decal/box/white/corners{ - dir = 1 - }, -/obj/structure/closet/crate/secure/gear{ - req_access_txt = "150" - }, -/obj/item/clothing/gloves/combat, -/obj/item/clothing/gloves/combat, -/obj/item/clothing/under/syndicate/combat, -/obj/item/clothing/under/syndicate/combat, -/obj/item/storage/belt/military, -/obj/item/storage/belt/military, -/obj/item/clothing/shoes/combat, -/obj/item/clothing/shoes/combat, -/obj/item/clothing/mask/gas/syndicate, -/obj/item/clothing/mask/gas/syndicate, -/obj/item/clothing/glasses/night, -/obj/item/clothing/glasses/night, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/cargo) -"dL" = ( -/obj/machinery/alarm/syndicate{ - pixel_y = 24 - }, -/obj/structure/closet/crate, -/obj/item/extinguisher{ - pixel_x = -5; - pixel_y = 5 - }, -/obj/item/extinguisher{ - pixel_x = -2; - pixel_y = 2 - }, -/obj/item/extinguisher{ - pixel_x = 1; - pixel_y = -1 - }, -/obj/item/flashlight{ - pixel_x = -5; - pixel_y = 5 - }, -/obj/item/flashlight{ - pixel_x = -2; - pixel_y = 2 - }, -/obj/item/flashlight{ - pixel_x = 1; - pixel_y = -1 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/cargo) -"dM" = ( -/obj/effect/turf_decal/box/white/corners{ - dir = 4 - }, -/obj/structure/closet/crate, -/obj/item/storage/box/donkpockets{ - pixel_x = -2; - pixel_y = 6 - }, -/obj/item/storage/box/donkpockets{ - pixel_y = 3 - }, -/obj/item/storage/box/donkpockets{ - pixel_x = 2 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/cargo) -"dP" = ( -/turf/simulated/wall/mineral/plastitanium/explosive, -/area/ruin/unpowered/syndicate_lava_base/cargo) -"dQ" = ( -/obj/structure/sign/securearea, -/turf/simulated/wall/mineral/plastitanium/nodiagonal, -/area/ruin/unpowered/syndicate_lava_base/testlab) -"dR" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/hatch{ - heat_proof = 1; - name = "Experimentation Room"; - req_access_txt = "150" - }, -/obj/machinery/door/poddoor/preopen{ - id_tag = "lavalandsyndi"; - name = "Syndicate Research Experimentation Shutters" - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/testlab) -"dS" = ( -/obj/structure/grille, -/obj/structure/window/plastitanium, -/obj/machinery/door/firedoor, -/obj/machinery/door/poddoor/preopen{ - id_tag = "lavalandsyndi"; - name = "Syndicate Research Experimentation Shutters" - }, -/turf/simulated/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/testlab) -"dT" = ( -/obj/machinery/firealarm/syndicate{ - dir = 8; - pixel_x = -26 - }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel/white/side{ - dir = 8 - }, -/area/ruin/unpowered/syndicate_lava_base/chemistry) -"dU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/chemistry) -"dX" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/chemistry) -"dY" = ( -/obj/structure/chair{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/chemistry) -"dZ" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/obj/structure/table/glass, -/obj/item/folder/white, -/obj/item/reagent_containers/glass/beaker/large{ - pixel_x = -3 - }, -/obj/item/reagent_containers/glass/beaker/large{ - pixel_x = -3 - }, -/obj/item/reagent_containers/dropper, -/obj/machinery/alarm/syndicate{ - dir = 8; - pixel_x = 24 - }, -/obj/effect/decal/cleanable/dirt, -/obj/item/screwdriver/nuke{ - pixel_y = 18 - }, -/turf/simulated/floor/plasteel/white/side{ - dir = 4 - }, -/area/ruin/unpowered/syndicate_lava_base/chemistry) -"ea" = ( -/obj/effect/turf_decal/box/white/corners{ - dir = 8 - }, -/obj/structure/closet/crate/secure/weapon{ - req_access_txt = "150" - }, -/obj/item/ammo_box/c10mm{ - pixel_y = 6 - }, -/obj/item/ammo_box/c10mm, -/obj/item/ammo_box/magazine/m10mm{ - pixel_x = -5; - pixel_y = 5 - }, -/obj/item/ammo_box/magazine/m10mm{ - pixel_x = -2; - pixel_y = 2 - }, -/obj/item/ammo_box/magazine/m10mm{ - pixel_x = 1; - pixel_y = -1 - }, -/obj/item/ammo_box/magazine/m10mm{ - pixel_x = 4; - pixel_y = -4 - }, -/obj/machinery/atmospherics/unary/vent_pump/on, -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/cargo) -"eb" = ( -/obj/structure/closet/crate, -/obj/item/storage/toolbox/electrical{ - pixel_y = 4 - }, -/obj/item/storage/toolbox/mechanical, -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/cargo) -"ec" = ( -/obj/effect/turf_decal/box/white/corners, -/obj/structure/closet/crate/medical, -/obj/item/storage/firstaid/fire{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/storage/firstaid/brute, -/obj/item/storage/firstaid/regular{ - pixel_x = -3; - pixel_y = -3 - }, -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/cargo) -"ed" = ( -/obj/structure/table, -/obj/item/pen, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/item/paper_bin/syndicate, -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/cargo) -"ef" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/obj/structure/cable/yellow{ - d1 = 0; - d2 = 2; - icon_state = "0-2" - }, -/obj/machinery/power/apc/syndicate{ - dir = 1; - name = "Cargo Bay APC"; - pixel_y = 24 - }, -/obj/structure/closet/emcloset/anchored, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/brown{ - dir = 1 - }, -/obj/effect/turf_decal/tile/brown{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/cargo) -"eg" = ( -/obj/structure/closet/firecloset/full{ - anchored = 1 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/brown{ - dir = 1 - }, -/obj/effect/turf_decal/tile/brown{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/cargo) -"eh" = ( -/turf/simulated/wall/mineral/plastitanium/nodiagonal, -/area/ruin/unpowered/syndicate_lava_base/virology) -"ei" = ( -/obj/structure/disposaloutlet{ - dir = 1 - }, -/obj/structure/disposalpipe/trunk, -/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, -/area/ruin/unpowered/syndicate_lava_base/virology) -"ek" = ( -/obj/structure/grille, -/obj/structure/window/plastitanium, -/turf/simulated/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/testlab) -"el" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/testlab) -"eo" = ( -/obj/structure/table/reinforced, -/obj/item/storage/toolbox/syndicate, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/item/paper/crumpled{ - info = "Explosive testing on site is STRICTLY forbidden, as this outpost's walls are lined with explosives intended for intentional self-destruct purposes that may be set off prematurely through careless experiments."; - name = "Explosives Testing Warning"; - pixel_x = -6; - pixel_y = -3 - }, -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/testlab) -"ep" = ( -/obj/structure/table/reinforced, -/obj/effect/decal/cleanable/dirt, -/obj/item/pen, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/item/paper_bin/syndicate, -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/testlab) -"eq" = ( -/obj/structure/table/reinforced, -/obj/item/restraints/handcuffs, -/obj/item/taperecorder, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/testlab) -"er" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/obj/structure/extinguisher_cabinet{ - pixel_x = -27; - pixel_y = 1 - }, -/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/white/side{ - dir = 8 - }, -/area/ruin/unpowered/syndicate_lava_base/chemistry) -"es" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/closet/crate, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/chemistry) -"et" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/chemistry) -"eu" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/obj/machinery/chem_heater, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/chemistry) -"ev" = ( -/turf/simulated/floor/plasteel/white/corner, -/area/ruin/unpowered/syndicate_lava_base/chemistry) -"ew" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/vending/syndichem, -/turf/simulated/floor/plasteel/white/side{ - dir = 6 - }, -/area/ruin/unpowered/syndicate_lava_base/chemistry) -"ex" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/obj/machinery/firealarm/syndicate{ - dir = 8; - pixel_x = -26 - }, -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/cargo) -"ey" = ( -/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 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/cargo) -"ez" = ( -/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/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/cargo) -"eA" = ( -/obj/machinery/door/firedoor, -/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 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/door/airlock/mining/glass{ - name = "Warehouse"; - req_access_txt = "150" - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/cargo) -"eB" = ( -/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 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/cargo) -"eC" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/cargo) -"eD" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/cargo) -"eE" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/structure/table, -/obj/item/storage/box/lights/bulbs, -/obj/item/wrench, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/mineral/plastitanium, -/area/ruin/unpowered/syndicate_lava_base/cargo) -"eF" = ( -/obj/structure/grille, -/obj/structure/window/plastitanium, -/obj/machinery/door/firedoor, -/obj/machinery/door/poddoor{ - id_tag = "lavalandsyndi_cargo" - }, -/turf/simulated/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/cargo) -"eG" = ( -/obj/structure/closet/secure_closet/personal/patient, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel/white/side{ - dir = 9 - }, -/area/ruin/unpowered/syndicate_lava_base/virology) -"eH" = ( -/obj/structure/bed, -/obj/item/bedsheet, -/obj/machinery/light/small{ - dir = 1 - }, -/turf/simulated/floor/plasteel/white/side{ - dir = 5 - }, -/area/ruin/unpowered/syndicate_lava_base/virology) -"eI" = ( -/obj/structure/grille, -/obj/structure/window/plastitanium, -/turf/simulated/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/virology) -"eJ" = ( -/obj/structure/disposalpipe/segment, -/turf/simulated/wall/mineral/plastitanium/nodiagonal, -/area/ruin/unpowered/syndicate_lava_base/virology) -"eL" = ( -/obj/machinery/door/airlock/hatch{ - name = "Monkey Pen"; - req_access_txt = "150" - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/testlab) -"eM" = ( -/obj/machinery/firealarm/syndicate{ - dir = 1; - pixel_y = -24 - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/testlab) -"eN" = ( -/obj/machinery/alarm/syndicate{ - dir = 1; - pixel_y = -24 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/testlab) -"eO" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/testlab) -"eP" = ( -/obj/structure/chair{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/testlab) -"eQ" = ( -/obj/machinery/light/small, -/obj/structure/table/reinforced, -/obj/item/storage/box/monkeycubes/syndicate, -/obj/item/storage/box/monkeycubes/syndicate, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/testlab) -"eR" = ( -/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/white/side{ - dir = 10 - }, -/area/ruin/unpowered/syndicate_lava_base/chemistry) -"eS" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/chem_master, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/chemistry) -"eT" = ( -/obj/effect/turf_decal/bot, -/obj/structure/chair/office/light, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/chemistry) -"eU" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/chem_dispenser/upgraded, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/chemistry) -"eV" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel/white/side{ - dir = 6 - }, -/area/ruin/unpowered/syndicate_lava_base/chemistry) -"eW" = ( -/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/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/cargo) -"eX" = ( -/obj/effect/turf_decal/box/white/corners{ - dir = 1 - }, -/obj/structure/closet/crate/internals, -/obj/item/tank/oxygen/yellow, -/obj/item/tank/oxygen/yellow, -/obj/item/tank/oxygen/yellow, -/obj/item/tank/emergency_oxygen/double, -/obj/item/tank/emergency_oxygen/double, -/obj/item/tank/emergency_oxygen/double, -/obj/item/clothing/mask/gas, -/obj/item/clothing/mask/gas, -/obj/item/clothing/mask/gas, -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/cargo) -"eY" = ( -/obj/effect/turf_decal/box/white/corners{ - dir = 4 - }, -/obj/structure/closet/crate, -/obj/item/storage/box/donkpockets{ - pixel_x = -2; - pixel_y = 6 - }, -/obj/item/storage/box/donkpockets{ - pixel_y = 3 - }, -/obj/item/storage/box/donkpockets{ - pixel_x = 2 - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/cargo) -"eZ" = ( -/obj/structure/rack{ - dir = 8 - }, -/obj/item/stack/sheet/cardboard{ - amount = 3 - }, -/obj/item/stack/rods/twentyfive, -/obj/item/stock_parts/cell/high/plus, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/cargo) -"fa" = ( -/obj/structure/grille, -/obj/structure/window/plastitanium, -/obj/machinery/door/firedoor, -/turf/simulated/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/cargo) -"fb" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/closet/crate, -/obj/effect/turf_decal/tile/brown{ - dir = 8 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/cargo) -"fc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/cargo) -"fd" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/cargo) -"fe" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/structure/table, -/obj/machinery/cell_charger, -/obj/item/stock_parts/cell/high/plus, -/turf/simulated/floor/mineral/plastitanium, -/area/ruin/unpowered/syndicate_lava_base/cargo) -"ff" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel/white/side{ - dir = 10 - }, -/area/ruin/unpowered/syndicate_lava_base/virology) -"fg" = ( -/obj/machinery/atmospherics/unary/vent_pump/on, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/turf/simulated/floor/plasteel/white/side{ - dir = 6 - }, -/area/ruin/unpowered/syndicate_lava_base/virology) -"fh" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, -/turf/simulated/floor/plasteel/white/side{ - dir = 10 - }, -/area/ruin/unpowered/syndicate_lava_base/virology) -"fi" = ( -/obj/structure/table/glass, -/obj/item/storage/box/beakers{ - pixel_x = 2; - pixel_y = 2 - }, -/obj/item/storage/box/syringes, -/obj/machinery/power/apc/syndicate{ - dir = 1; - name = "Virology APC"; - pixel_y = 24 - }, -/obj/structure/cable/yellow{ - d1 = 0; - d2 = 2; - icon_state = "0-2" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel/white/side{ - dir = 9 - }, -/area/ruin/unpowered/syndicate_lava_base/virology) -"fj" = ( -/obj/structure/table/glass, -/obj/structure/reagent_dispensers/virusfood{ - pixel_y = 28 - }, -/obj/item/clothing/gloves/color/latex, -/obj/item/healthanalyzer, -/obj/item/clothing/glasses/hud/health, -/obj/structure/disposalpipe/segment, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/firealarm/syndicate{ - dir = 4; - pixel_x = 26 - }, -/turf/simulated/floor/plasteel/white/side{ - dir = 5 - }, -/area/ruin/unpowered/syndicate_lava_base/virology) -"fk" = ( -/obj/machinery/power/apc/syndicate{ - dir = 2; - name = "Experimentation Lab APC"; - pixel_y = -24 - }, -/obj/structure/cable/yellow{ - d2 = 4; - icon_state = "0-4" - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/testlab) -"fl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/extinguisher_cabinet{ - pixel_x = 25 - }, -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/testlab) -"fm" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/medical{ - name = "Chemistry Lab"; - req_access_txt = "150" - }, -/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/white, -/area/ruin/unpowered/syndicate_lava_base/chemistry) -"fn" = ( -/obj/structure/grille, -/obj/structure/window/plastitanium, -/obj/machinery/door/firedoor, -/turf/simulated/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/chemistry) -"fo" = ( -/obj/machinery/door/firedoor, -/obj/structure/table/reinforced, -/obj/machinery/door/window/southleft{ - base_state = "left"; - dir = 2; - icon_state = "left"; - name = "Chemistry" - }, -/obj/machinery/door/window/southleft{ - base_state = "left"; - dir = 1; - icon_state = "left"; - name = "Chemistry"; - req_access_txt = "150" - }, -/turf/simulated/floor/plasteel/white, -/area/ruin/unpowered/syndicate_lava_base/chemistry) -"fp" = ( -/obj/machinery/smartfridge/secure/chemistry/preloaded/syndicate, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/chemistry) -"fq" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/vending/assist, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/cargo) -"fr" = ( -/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/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/cargo) -"fs" = ( -/obj/effect/turf_decal/box/white/corners{ - dir = 8 - }, -/obj/structure/closet/crate, -/obj/item/storage/box/stockparts/deluxe, -/obj/item/storage/box/stockparts/deluxe, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/glass/fifty, -/obj/item/circuitboard/processor, -/obj/item/circuitboard/gibber, -/obj/item/circuitboard/deepfryer, -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/cargo) -"ft" = ( -/obj/effect/turf_decal/box/white/corners, -/obj/structure/closet/crate, -/obj/item/reagent_containers/glass/beaker/waterbottle/large{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/reagent_containers/glass/beaker/waterbottle/large{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/reagent_containers/glass/beaker/waterbottle/large, -/obj/item/reagent_containers/glass/beaker/waterbottle/large, -/obj/item/reagent_containers/glass/beaker/waterbottle/large{ - pixel_x = 3; - pixel_y = -3 - }, -/obj/item/reagent_containers/glass/beaker/waterbottle/large{ - pixel_x = 3; - pixel_y = -3 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/cargo) -"fu" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/obj/machinery/alarm/syndicate{ - dir = 4; - pixel_x = -24 - }, -/obj/structure/table, -/obj/item/clothing/suit/storage/hazardvest, -/obj/item/clothing/suit/storage/hazardvest, -/obj/item/clothing/head/soft{ - pixel_x = -8 - }, -/obj/item/clothing/head/soft{ - pixel_x = -8 - }, -/obj/item/radio{ - pixel_x = 5 - }, -/obj/item/radio{ - pixel_x = 5 - }, -/obj/effect/turf_decal/tile/brown{ - dir = 1 - }, -/obj/effect/turf_decal/tile/brown{ - dir = 8 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/cargo) -"fv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/cargo) -"fx" = ( -/obj/structure/sign/securearea, -/turf/simulated/wall/mineral/plastitanium/nodiagonal, -/area/ruin/unpowered/syndicate_lava_base/cargo) -"fy" = ( -/obj/machinery/door/airlock/medical/glass{ - name = "Isolation B"; - req_access_txt = "150" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel/white, -/area/ruin/unpowered/syndicate_lava_base/virology) -"fz" = ( -/obj/machinery/door/airlock/medical/glass{ - name = "Isolation A"; - req_access_txt = "150" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel/white, -/area/ruin/unpowered/syndicate_lava_base/virology) -"fA" = ( -/obj/structure/table/glass, -/obj/item/reagent_containers/syringe/antiviral, -/obj/item/reagent_containers/dropper, -/obj/item/reagent_containers/spray/cleaner, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/plasteel/white/side{ - dir = 8 - }, -/area/ruin/unpowered/syndicate_lava_base/virology) -"fB" = ( -/obj/structure/chair/stool, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/plasteel/white/corner{ - dir = 4 - }, -/area/ruin/unpowered/syndicate_lava_base/virology) -"fC" = ( -/obj/machinery/smartfridge/secure/chemistry/virology/preloaded/syndicate, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel/white/side{ - dir = 5 - }, -/area/ruin/unpowered/syndicate_lava_base/virology) -"fD" = ( -/obj/structure/sign/biohazard, -/turf/simulated/wall/mineral/plastitanium/nodiagonal, -/area/ruin/unpowered/syndicate_lava_base/virology) -"fE" = ( -/obj/effect/turf_decal/bot, -/obj/structure/closet/l3closet, -/obj/machinery/light/small{ - dir = 8 - }, -/obj/machinery/alarm/syndicate{ - pixel_y = 24 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/main) -"fF" = ( -/obj/effect/turf_decal/bot, -/obj/machinery/shower{ - pixel_y = 14 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/main) -"fG" = ( -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/airlock/hatch{ - name = "Experimentation Lab"; - req_access_txt = "150" - }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/testlab) -"fH" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel/white/side{ - dir = 1 - }, -/area/ruin/unpowered/syndicate_lava_base/main) -"fI" = ( -/obj/effect/decal/cleanable/dirt, -/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/white/side{ - dir = 1 - }, -/area/ruin/unpowered/syndicate_lava_base/main) -"fO" = ( -/turf/simulated/floor/plasteel/white/side{ - dir = 1 - }, -/area/ruin/unpowered/syndicate_lava_base/main) -"fW" = ( -/obj/machinery/door/firedoor, -/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/door/airlock/mining/glass{ - name = "Warehouse"; - req_access_txt = "150" - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/cargo) -"fY" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = -27; - pixel_y = 1 - }, -/obj/structure/table, -/obj/item/folder/yellow, -/obj/item/stack/wrapping_paper{ - pixel_y = 5 - }, -/obj/item/stack/packageWrap, -/obj/item/hand_labeler, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/brown{ - dir = 1 - }, -/obj/effect/turf_decal/tile/brown{ - dir = 4 - }, -/obj/effect/turf_decal/tile/brown{ - dir = 8 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/cargo) -"gb" = ( -/obj/structure/table, -/obj/item/paper_bin, -/obj/item/pen, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/brown{ - dir = 1 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/cargo) -"gg" = ( -/obj/structure/sign/fire{ - pixel_y = 32 - }, -/obj/structure/sign/xeno_warning_mining{ - pixel_y = -32 - }, -/turf/simulated/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/cargo) -"gj" = ( -/turf/simulated/wall/mineral/plastitanium/explosive, -/area/ruin/unpowered/syndicate_lava_base/virology) -"gp" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel/white, -/area/ruin/unpowered/syndicate_lava_base/virology) -"gq" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/turf/simulated/floor/plasteel/white, -/area/ruin/unpowered/syndicate_lava_base/virology) -"gr" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel/white, -/area/ruin/unpowered/syndicate_lava_base/virology) -"gs" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/light/small, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel/white, -/area/ruin/unpowered/syndicate_lava_base/virology) -"gt" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/turf/simulated/floor/plasteel/white/side{ - dir = 9 - }, -/area/ruin/unpowered/syndicate_lava_base/virology) -"gv" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/disposalpipe/segment, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/virology) -"gy" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/main) -"gz" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/main) -"gE" = ( -/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/main) -"gF" = ( -/obj/machinery/light/small{ - dir = 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 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/main) -"gG" = ( -/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/ruin/unpowered/syndicate_lava_base/main) -"gH" = ( -/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{ - dir = 2 - }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/main) -"gI" = ( -/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 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/main) -"gJ" = ( -/obj/machinery/door/firedoor, -/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 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/main) -"gK" = ( -/obj/machinery/light/small{ - dir = 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 - }, -/obj/effect/turf_decal/tile/brown{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/main) -"gL" = ( -/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 - }, -/obj/effect/turf_decal/tile/brown{ - dir = 1 - }, -/obj/effect/turf_decal/tile/brown{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/main) -"gM" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/brown{ - dir = 1 - }, -/obj/effect/turf_decal/tile/brown{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/main) -"gN" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/brown{ - dir = 1 - }, -/obj/effect/turf_decal/tile/brown, -/obj/effect/turf_decal/tile/brown{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/main) -"gO" = ( -/obj/structure/sign/cargo, -/turf/simulated/wall/mineral/plastitanium/nodiagonal, -/area/ruin/unpowered/syndicate_lava_base/cargo) -"gP" = ( -/obj/machinery/photocopier, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/brown{ - dir = 1 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/cargo) -"gQ" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/cargo) -"gR" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/cargo) -"gS" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 4 - }, -/obj/machinery/light/small{ - dir = 4 - }, -/obj/machinery/door_control{ - id = "lavalandsyndi_cargo"; - name = "Cargo Bay Blast Door Control"; - pixel_x = 26; - req_access_txt = "150" - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/cargo) -"gT" = ( -/obj/machinery/door/airlock/medical/glass{ - name = "Monkey Pen"; - req_access_txt = "150" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel/white, -/area/ruin/unpowered/syndicate_lava_base/virology) -"gU" = ( -/obj/machinery/alarm/syndicate{ - dir = 4; - pixel_x = -24 - }, -/obj/structure/sink{ - dir = 8; - pixel_x = -12; - pixel_y = 2 - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel/white/side{ - dir = 8 - }, -/area/ruin/unpowered/syndicate_lava_base/virology) -"gV" = ( -/obj/structure/chair/office/light, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/virology) -"ha" = ( -/turf/simulated/wall/mineral/plastitanium/nodiagonal, -/area/ruin/unpowered/syndicate_lava_base/main) -"hb" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/main) -"hc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/main) -"hd" = ( -/obj/effect/turf_decal/tile/red, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/main) -"he" = ( -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/main) -"hf" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/main) -"hg" = ( -/obj/machinery/light/small, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/main) -"hh" = ( -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/main) -"hi" = ( -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/main) -"hj" = ( -/obj/effect/turf_decal/tile/brown, -/obj/effect/turf_decal/tile/brown{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/main) -"hk" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/mining/glass{ - name = "Cargo Bay" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/cargo) -"hl" = ( -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/cargo) -"hn" = ( -/obj/structure/chair{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/cargo) -"ho" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/computer/shuttle{ - desc = "Occasionally used to call in a resupply shuttle if one is in range."; - dir = 8; - icon_keyboard = "syndie_key"; - icon_screen = "syndishuttle"; - light_color = "#FA8282"; - name = "syndicate cargo shuttle terminal"; - possible_destinations = "syndielavaland_cargo"; - req_access_txt = "150"; - shuttleId = "syndie_cargo" - }, -/turf/simulated/floor/mineral/plastitanium, -/area/ruin/unpowered/syndicate_lava_base/cargo) -"hq" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel/white/side{ - dir = 1 - }, -/area/ruin/unpowered/syndicate_lava_base/virology) -"hs" = ( -/obj/machinery/computer/pandemic, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/door_control{ - id = "lavalandsyndi_virology"; - name = "Virology Blast Door Control"; - pixel_x = -26; - req_access_txt = "150" - }, -/turf/simulated/floor/plasteel/white/side{ - dir = 10 - }, -/area/ruin/unpowered/syndicate_lava_base/virology) -"ht" = ( -/obj/structure/table, -/obj/item/paper_bin{ - pixel_x = -2; - pixel_y = 5 - }, -/obj/item/hand_labeler, -/obj/item/pen/red, -/obj/item/restraints/handcuffs, -/obj/effect/decal/cleanable/dirt, -/obj/item/clothing/glasses/science, -/turf/simulated/floor/plasteel/white/side, -/area/ruin/unpowered/syndicate_lava_base/virology) -"hu" = ( -/obj/structure/table, -/obj/machinery/reagentgrinder, -/obj/item/stack/sheet/mineral/plasma{ - amount = 5 - }, -/obj/item/stack/sheet/mineral/uranium{ - amount = 10 - }, -/obj/item/stack/sheet/mineral/gold{ - amount = 10 - }, -/turf/simulated/floor/plasteel/white/side, -/area/ruin/unpowered/syndicate_lava_base/virology) -"hv" = ( -/obj/machinery/disposal, -/obj/structure/sign/deathsposal{ - pixel_x = 32 - }, -/obj/effect/turf_decal/stripes/red/box, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel/white/side{ - dir = 6 - }, -/area/ruin/unpowered/syndicate_lava_base/virology) -"hx" = ( -/obj/machinery/alarm/syndicate{ - dir = 4; - pixel_x = -24 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/main) -"hy" = ( -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/main) -"hz" = ( -/turf/simulated/wall/mineral/plastitanium/nodiagonal, -/area/ruin/unpowered/syndicate_lava_base/dormitories) -"hA" = ( -/obj/structure/closet/emcloset/anchored, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/dormitories) -"hB" = ( -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/main) -"hC" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/mining/glass{ - name = "Cargo Bay" - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/cargo) -"hD" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/structure/rack, -/obj/item/storage/belt/utility, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/mineral/plastitanium, -/area/ruin/unpowered/syndicate_lava_base/cargo) -"hF" = ( -/obj/machinery/light/small, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel/white/side, -/area/ruin/unpowered/syndicate_lava_base/virology) -"hH" = ( -/obj/structure/grille, -/obj/structure/window/plastitanium, -/obj/machinery/door/poddoor/preopen{ - id_tag = "lavalandsyndi_virology" - }, -/turf/simulated/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/virology) -"hJ" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/main) -"hL" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/main) -"hM" = ( -/obj/structure/table/wood, -/obj/item/ammo_box/magazine/m10mm, -/obj/item/ammo_box/magazine/sniper_rounds, -/obj/machinery/alarm/syndicate{ - pixel_y = 24 - }, -/turf/simulated/floor/plasteel/grimy, -/area/ruin/unpowered/syndicate_lava_base/dormitories) -"hN" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/turf/simulated/floor/plasteel/grimy, -/area/ruin/unpowered/syndicate_lava_base/dormitories) -"hO" = ( -/turf/simulated/wall/mineral/plastitanium/explosive, -/area/ruin/unpowered/syndicate_lava_base/dormitories) -"hP" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/turf/simulated/floor/plasteel/grimy, -/area/ruin/unpowered/syndicate_lava_base/dormitories) -"hQ" = ( -/obj/structure/table/wood, -/obj/item/ammo_box/magazine/m10mm, -/obj/machinery/alarm/syndicate{ - pixel_y = 24 - }, -/turf/simulated/floor/plasteel/grimy, -/area/ruin/unpowered/syndicate_lava_base/dormitories) -"hR" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/brown{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/main) -"hS" = ( -/obj/structure/table/reinforced, -/obj/item/folder, -/obj/item/suppressor, -/obj/item/clothing/ears/earmuffs, -/obj/item/clothing/ears/earmuffs, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/brown, -/obj/effect/turf_decal/tile/brown{ - dir = 8 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/cargo) -"hU" = ( -/obj/machinery/light/small, -/obj/structure/filingcabinet/chestdrawer, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/brown, -/obj/effect/turf_decal/tile/brown{ - dir = 8 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/cargo) -"hV" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/brown, -/obj/effect/turf_decal/tile/brown{ - dir = 8 - }, -/obj/machinery/autolathe, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/cargo) -"hW" = ( -/obj/machinery/porta_turret/syndicate{ - dir = 10 - }, -/turf/simulated/wall/mineral/plastitanium/nodiagonal, -/area/ruin/unpowered/syndicate_lava_base/main) -"hZ" = ( -/obj/machinery/firealarm/syndicate{ - dir = 8; - pixel_x = -26 - }, -/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/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/main) -"ia" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/main) -"ib" = ( -/obj/effect/mob_spawn/human/lavaland_syndicate{ - icon_state = "sleeper_s"; - dir = 4 - }, -/turf/simulated/floor/plasteel/grimy, -/area/ruin/unpowered/syndicate_lava_base/dormitories) -"ic" = ( -/obj/machinery/atmospherics/unary/vent_pump/on, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel/grimy, -/area/ruin/unpowered/syndicate_lava_base/dormitories) -"id" = ( -/obj/structure/toilet{ - pixel_y = 18 - }, -/obj/structure/sink{ - dir = 4; - pixel_x = 11 - }, -/obj/machinery/light/small{ - dir = 8 - }, -/obj/structure/mirror{ - pixel_x = 28 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/dormitories) -"ie" = ( -/obj/effect/mob_spawn/human/lavaland_syndicate/comms{ - dir = 8; - icon_state = "sleeper_s" - }, -/turf/simulated/floor/plasteel/grimy, -/area/ruin/unpowered/syndicate_lava_base/dormitories) -"if" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/main) -"ig" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/obj/effect/mapping_helpers/no_lava, -/turf/simulated/floor/plating{ - baseturf = /turf/simulated/floor/plating/lava/smooth/lava_land_surface; - oxygen = 14; - nitrogen = 23; - temperature = 300 - }, -/area/lavaland/surface/outdoors) -"ih" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/mapping_helpers/no_lava, -/turf/simulated/floor/plating{ - oxygen = 14; - nitrogen = 23; - temperature = 300 - }, -/area/lavaland/surface/outdoors) -"ii" = ( -/obj/structure/table, -/obj/item/storage/toolbox/emergency, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/main) -"ij" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/main) -"ik" = ( -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/main) -"il" = ( -/obj/machinery/door/airlock{ - name = "Cabin 2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/dormitories) -"im" = ( -/obj/machinery/door/airlock{ - name = "Unisex Restrooms" - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/dormitories) -"in" = ( -/obj/machinery/door/airlock{ - name = "Cabin 4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/dormitories) -"ip" = ( -/obj/effect/turf_decal/stripes/red/corner, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/main) -"iq" = ( -/obj/structure/sign/securearea, -/turf/simulated/wall/mineral/plastitanium/nodiagonal, -/area/ruin/unpowered/syndicate_lava_base/main) -"ir" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/red/line{ - dir = 9 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/main) -"it" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/red/line{ - dir = 5 - }, -/obj/structure/filingcabinet, -/obj/item/folder/syndicate/mining, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/main) -"iu" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/mapping_helpers/no_lava, -/turf/simulated/floor/plating{ - baseturf = /turf/simulated/floor/plating/lava/smooth/lava_land_surface; - oxygen = 14; - nitrogen = 23; - temperature = 300 - }, -/area/lavaland/surface/outdoors) -"iv" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/mapping_helpers/no_lava, -/turf/simulated/floor/plating{ - baseturf = /turf/simulated/floor/plating/lava/smooth/lava_land_surface; - oxygen = 14; - nitrogen = 23; - temperature = 300 - }, -/area/lavaland/surface/outdoors) -"iw" = ( -/obj/structure/chair{ - dir = 4 - }, -/obj/structure/extinguisher_cabinet{ - pixel_x = -27; - pixel_y = 1 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/main) -"ix" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/main) -"iy" = ( -/obj/machinery/door/airlock/public/glass{ - name = "Dormitories" - }, -/obj/machinery/door/firedoor, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/dormitories) -"iz" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/dormitories) -"iA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/dormitories) -"iB" = ( -/obj/machinery/alarm/syndicate{ - pixel_y = 24 - }, -/obj/machinery/atmospherics/unary/vent_pump/on, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/dormitories) -"iD" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/obj/machinery/firealarm/syndicate{ - dir = 2; - pixel_y = 24 - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/dormitories) -"iE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/dormitories) -"iF" = ( -/obj/machinery/washing_machine, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/dormitories) -"iG" = ( -/obj/machinery/firealarm/syndicate{ - dir = 8; - pixel_x = -26 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/main) -"iH" = ( -/obj/effect/turf_decal/stripes/red/line{ - dir = 4 - }, -/obj/effect/turf_decal/caution/red{ - dir = 8 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/main) -"iI" = ( -/obj/machinery/door/airlock/vault{ - id_tag = "syndie_lavaland_vault"; - req_access_txt = "150"; - locked = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/main) -"iJ" = ( -/turf/simulated/floor/redgrid, -/area/ruin/unpowered/syndicate_lava_base/main) -"iK" = ( -/obj/machinery/syndicatebomb/self_destruct{ - anchored = 1 - }, -/turf/simulated/floor/redgrid, -/area/ruin/unpowered/syndicate_lava_base/main) -"iM" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/turf/simulated/floor/plating{ - baseturf = /turf/simulated/floor/plating/lava/smooth/lava_land_surface; - oxygen = 14; - nitrogen = 23; - temperature = 300 - }, -/area/ruin/unpowered/syndicate_lava_base/arrivals) -"iN" = ( -/turf/simulated/wall/mineral/plastitanium/explosive, -/area/ruin/unpowered/syndicate_lava_base/main) -"iO" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/main) -"iP" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/main) -"iQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/main) -"iR" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/public/glass{ - name = "Dormitories" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/dormitories) -"iS" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/dormitories) -"iT" = ( -/obj/machinery/light/small, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2 - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/simulated/floor/plasteel{ - heat_capacity = 1e+006 - }, -/area/ruin/unpowered/syndicate_lava_base/dormitories) -"iU" = ( -/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/dormitories) -"iV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/power/apc/syndicate{ - dir = 2; - name = "Dormitories APC"; - pixel_y = -24 - }, -/obj/structure/cable/yellow{ - d1 = 0; - d2 = 8; - icon_state = "0-8" - }, -/obj/effect/turf_decal/tile/neutral, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/dormitories) -"iW" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/dormitories) -"iX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/simulated/floor/plasteel{ - heat_capacity = 1e+006 - }, -/area/ruin/unpowered/syndicate_lava_base/dormitories) -"iY" = ( -/obj/structure/table, -/obj/structure/bedsheetbin, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/dormitories) -"iZ" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = -27; - pixel_y = 1 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/main) -"ja" = ( -/obj/effect/turf_decal/stripes/red/corner{ - dir = 4 - }, -/obj/machinery/door_control{ - id = "syndie_lavaland_vault"; - name = "Vault Bolt Control"; - normaldoorcontrol = 1; - pixel_x = 24; - pixel_y = 8; - req_access_txt = "150"; - specialfunctions = 4 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/main) -"jb" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/red/line{ - dir = 10 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/main) -"jc" = ( -/obj/machinery/light/small, -/turf/simulated/floor/redgrid, -/area/ruin/unpowered/syndicate_lava_base/main) -"jd" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/red/line{ - dir = 6 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/main) -"je" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 1 - }, -/obj/effect/mapping_helpers/no_lava, -/turf/simulated/floor/plating{ - baseturf = /turf/simulated/floor/plating/lava/smooth/lava_land_surface; - oxygen = 14; - nitrogen = 23; - temperature = 300 - }, -/area/lavaland/surface/outdoors) -"jf" = ( -/obj/machinery/door/airlock{ - name = "Cabin 1" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/dormitories) -"jg" = ( -/obj/machinery/door/airlock/maintenance, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/dormitories) -"jh" = ( -/obj/machinery/door/airlock{ - name = "Cabin 3" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/dormitories) -"ji" = ( -/obj/structure/cable/yellow{ - d1 = 0; - d2 = 2; - icon_state = "0-2" - }, -/obj/machinery/power/apc/syndicate{ - dir = 8; - name = "Primary Hallway APC"; - pixel_x = -24 - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/main) -"jj" = ( -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/main) -"jk" = ( -/obj/effect/mapping_helpers/no_lava, -/turf/simulated/floor/plating{ - baseturf = /turf/simulated/floor/plating/lava/smooth/lava_land_surface; - oxygen = 14; - nitrogen = 23; - temperature = 300 - }, -/area/lavaland/surface/outdoors) -"jl" = ( -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/main) -"jm" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/main) -"jn" = ( -/obj/effect/mob_spawn/human/lavaland_syndicate{ - icon_state = "sleeper_s"; - dir = 4 - }, -/obj/machinery/alarm/syndicate{ - pixel_y = 24 - }, -/turf/simulated/floor/plasteel/grimy, -/area/ruin/unpowered/syndicate_lava_base/dormitories) -"jo" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel/grimy, -/area/ruin/unpowered/syndicate_lava_base/dormitories) -"jp" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/main) -"jq" = ( -/obj/effect/mob_spawn/human/lavaland_syndicate{ - dir = 8; - icon_state = "sleeper_s" - }, -/obj/machinery/alarm/syndicate{ - pixel_y = 24 - }, -/turf/simulated/floor/plasteel/grimy, -/area/ruin/unpowered/syndicate_lava_base/dormitories) -"jr" = ( -/obj/machinery/vending/snack, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/main) -"js" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/unary/vent_pump/on, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/main) -"jt" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/obj/structure/reagent_dispensers/watertank, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/main) -"ju" = ( -/turf/simulated/wall/mineral/plastitanium/nodiagonal, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"jv" = ( -/obj/effect/turf_decal/bot, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/suit_storage_unit/radsuit, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"jw" = ( -/obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/effect/decal/cleanable/dirt, -/obj/structure/closet/toolcloset{ - anchored = 1 - }, -/obj/item/crowbar, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"jx" = ( -/obj/structure/grille, -/obj/structure/window/plastitanium, -/obj/machinery/door/firedoor, -/obj/machinery/door/poddoor/preopen{ - id_tag = "lavalandsyndi_bar" - }, -/turf/simulated/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/bar) -"jy" = ( -/turf/simulated/wall/mineral/plastitanium/nodiagonal, -/area/ruin/unpowered/syndicate_lava_base/bar) -"jz" = ( -/obj/machinery/door/airlock/public/glass{ - name = "Bar" - }, -/obj/machinery/door/firedoor, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/bar) -"jA" = ( -/obj/structure/table/wood, -/obj/item/ammo_box/magazine/m10mm, -/obj/item/ammo_box/magazine/sniper_rounds, -/turf/simulated/floor/plasteel/grimy, -/area/ruin/unpowered/syndicate_lava_base/dormitories) -"jB" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, -/turf/simulated/floor/plasteel/grimy, -/area/ruin/unpowered/syndicate_lava_base/dormitories) -"jC" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, -/turf/simulated/floor/plasteel/grimy, -/area/ruin/unpowered/syndicate_lava_base/dormitories) -"jD" = ( -/obj/machinery/vending/cola, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/main) -"jE" = ( -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/main) -"jF" = ( -/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 - }, -/obj/effect/turf_decal/tile/yellow, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/main) -"jG" = ( -/obj/effect/turf_decal/delivery, -/obj/machinery/door/firedoor, -/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 - }, -/obj/machinery/door/airlock/engineering{ - name = "Engineering"; - req_access_txt = "150" - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"jH" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/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/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"jI" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/obj/machinery/light/small{ - dir = 4 - }, -/obj/machinery/alarm/syndicate{ - dir = 8; - pixel_x = 24 - }, -/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/manifold/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"jJ" = ( -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ - dir = 6 - }, -/turf/simulated/wall/mineral/plastitanium/nodiagonal, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"jK" = ( -/obj/machinery/atmospherics/unary/outlet_injector/on{ - dir = 8; - volume_rate = 200; - id = "syndie_lavaland_waste" - }, -/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"jL" = ( -/obj/structure/table, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/item/lighter{ - pixel_x = 7; - pixel_y = 6 - }, -/obj/item/storage/fancy/cigarettes/cigpack_syndicate{ - pixel_x = -3 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/bar) -"jM" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/obj/structure/chair{ - dir = 8 - }, -/obj/machinery/door_control{ - id = "lavalandsyndi_bar"; - name = "Bar Blast Door Control"; - pixel_y = 26; - req_access_txt = "150" - }, -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/bar) -"jN" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/bar) -"jO" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = 25 - }, -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/bar) -"jP" = ( -/turf/simulated/wall/mineral/plastitanium/explosive, -/area/ruin/unpowered/syndicate_lava_base/bar) -"jQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/main) -"jR" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/main) -"jS" = ( -/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/ruin/unpowered/syndicate_lava_base/main) -"jT" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/closet/firecloset/full{ - anchored = 1 - }, -/obj/effect/turf_decal/tile/yellow, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/main) -"jU" = ( -/obj/structure/sign/engineering, -/turf/simulated/wall/mineral/plastitanium/nodiagonal, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"jV" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/shower{ - desc = "The HS-452. Installed recently by the DonkCo Hygiene Division."; - dir = 4; - name = "emergency shower" - }, -/obj/structure/sign/radiation/rad_area{ - pixel_y = -32 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"jW" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/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/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"jY" = ( -/obj/structure/chair{ - dir = 1 - }, -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/bar) -"jZ" = ( -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/bar) -"ka" = ( -/obj/structure/closet/crate, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/bar) -"kb" = ( -/obj/structure/rack{ - dir = 8 - }, -/obj/item/storage/box/lights/bulbs, -/obj/item/stack/rods{ - amount = 50 - }, -/obj/item/clothing/head/welding, -/obj/item/stock_parts/cell/high/plus, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/main) -"kc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/main) -"kd" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2 - }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/main) -"ke" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/main) -"kf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/main) -"kg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/main) -"kh" = ( -/obj/machinery/door/airlock/maintenance, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/main) -"ki" = ( -/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/manifold/hidden/scrubbers{ - dir = 2 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/main) -"kj" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/obj/structure/chair{ - dir = 8 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/main) -"kk" = ( -/obj/effect/turf_decal/delivery, -/obj/machinery/door/firedoor, -/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/door/airlock/engineering{ - name = "Engineering"; - req_access_txt = "150" - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"kl" = ( -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, -/turf/simulated/wall/mineral/plastitanium/nodiagonal, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"km" = ( -/obj/structure/cable/yellow{ - d1 = 0; - d2 = 2; - icon_state = "0-2" - }, -/obj/machinery/computer/monitor/secret, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"kn" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/bar) -"ko" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/bar) -"kp" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/bar) -"kq" = ( -/obj/machinery/alarm/syndicate{ - dir = 8; - pixel_x = 24 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/machinery/vending/coffee/free, -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/bar) -"kr" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "150" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/bar) -"ks" = ( -/obj/structure/reagent_dispensers/fueltank, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/main) -"kt" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/portable_atmospherics/canister/oxygen, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/main) -"ku" = ( -/turf/simulated/floor/plasteel/white/side, -/area/ruin/unpowered/syndicate_lava_base/main) -"kv" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel/white/side, -/area/ruin/unpowered/syndicate_lava_base/main) -"kw" = ( -/obj/structure/table, -/obj/effect/decal/cleanable/dirt, -/obj/item/clothing/gloves/combat{ - pixel_y = -6 - }, -/obj/item/tank/emergency_oxygen{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/clothing/mask/breath{ - pixel_x = -2; - pixel_y = 4 - }, -/turf/simulated/floor/plasteel/white/side, -/area/ruin/unpowered/syndicate_lava_base/main) -"kx" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"ky" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"kz" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/visible/supply, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold/visible/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"kB" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"kC" = ( -/obj/machinery/computer/general_air_control/large_tank_control{ - dir = 8; - frequency = 1442; - name = "Nitrogen Supply Control"; - output_tag = "syndie_lavaland_n2_out"; - sensors = list("syndie_lavaland_n2_sensor" = "Tank") - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"kD" = ( -/obj/structure/grille, -/obj/structure/window/plastitanium, -/turf/simulated/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"kG" = ( -/obj/structure/table, -/obj/item/reagent_containers/food/drinks/cans/beer, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/bar) -"kH" = ( -/obj/structure/chair{ - dir = 8 - }, -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/bar) -"kJ" = ( -/obj/structure/chair/stool/bar, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/bar) -"kK" = ( -/obj/structure/chair/stool/bar, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/bar) -"kL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/bar) -"kM" = ( -/obj/machinery/firealarm/syndicate{ - dir = 4; - pixel_x = 26 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/vending/cigarette/syndicate/free, -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/bar) -"kN" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/structure/sink/kitchen{ - pixel_y = 28 - }, -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/bar) -"kO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/bar) -"kP" = ( -/obj/structure/reagent_dispensers/watertank, -/obj/effect/decal/cleanable/dirt, -/obj/item/soap/syndie, -/obj/item/mop, -/obj/item/reagent_containers/glass/bucket, -/turf/simulated/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/main) -"kQ" = ( -/turf/simulated/wall/mineral/plastitanium/nodiagonal, -/area/ruin/unpowered/syndicate_lava_base/medbay) -"kR" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/medical/glass{ - name = "Medbay" - }, -/turf/simulated/floor/plasteel/white, -/area/ruin/unpowered/syndicate_lava_base/medbay) -"kS" = ( -/obj/machinery/door/firedoor, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/door/airlock/medical/glass{ - name = "Medbay" - }, -/turf/simulated/floor/plasteel/white, -/area/ruin/unpowered/syndicate_lava_base/medbay) -"kT" = ( -/obj/structure/sign/redcross, -/turf/simulated/wall/mineral/plastitanium/nodiagonal, -/area/ruin/unpowered/syndicate_lava_base/medbay) -"kV" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/power/smes/engineering, -/obj/structure/cable/yellow, -/obj/structure/sign/electricshock{ - pixel_x = -32 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"kW" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/power/smes/engineering, -/obj/structure/cable/yellow, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"lf" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/obj/structure/chair{ - dir = 1 - }, -/obj/machinery/firealarm/syndicate{ - dir = 8; - pixel_x = -26 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/bar) -"lg" = ( -/obj/structure/chair/stool/bar, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/bar) -"lh" = ( -/obj/structure/table/wood, -/turf/simulated/floor/wood, -/area/ruin/unpowered/syndicate_lava_base/bar) -"li" = ( -/obj/structure/table/wood, -/obj/item/toy/cards/deck/syndicate{ - pixel_x = -6; - pixel_y = 6 - }, -/turf/simulated/floor/wood{ - icon_state = "wood-broken4" - }, -/area/ruin/unpowered/syndicate_lava_base/bar) -"lj" = ( -/obj/machinery/door/window/southleft{ - base_state = "right"; - dir = 1; - icon_state = "right"; - name = "Bar" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/wood, -/area/ruin/unpowered/syndicate_lava_base/bar) -"lk" = ( -/obj/structure/table/wood, -/obj/machinery/light/small{ - dir = 4 - }, -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_x = 30 - }, -/obj/structure/window/reinforced{ - dir = 1; - pixel_y = 1 - }, -/obj/item/book/manual/chef_recipes{ - pixel_x = 2; - pixel_y = 6 - }, -/obj/item/reagent_containers/food/drinks/shaker, -/turf/simulated/floor/wood, -/area/ruin/unpowered/syndicate_lava_base/bar) -"ll" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/reagent_dispensers/beerkeg, -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/bar) -"lm" = ( -/obj/structure/closet/secure_closet/medical1{ - req_access = null; - req_access_txt = "150" - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/item/defibrillator, -/turf/simulated/floor/plasteel/white/side{ - dir = 9 - }, -/area/ruin/unpowered/syndicate_lava_base/medbay) -"ln" = ( -/turf/simulated/floor/plasteel/white/side{ - dir = 1 - }, -/area/ruin/unpowered/syndicate_lava_base/medbay) -"lo" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/obj/structure/table, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/item/storage/box/masks{ - pixel_x = -2; - pixel_y = -2 - }, -/obj/item/storage/box/gloves{ - pixel_x = 5; - pixel_y = 5 - }, -/turf/simulated/floor/plasteel/white/side{ - dir = 5 - }, -/area/ruin/unpowered/syndicate_lava_base/medbay) -"lp" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/obj/machinery/power/terminal{ - dir = 1 - }, -/obj/structure/cable{ - d2 = 4; - icon_state = "0-4" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"lq" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/obj/machinery/power/terminal{ - dir = 1 - }, -/obj/structure/cable{ - d2 = 2; - icon_state = "0-2" - }, -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/turf/simulated/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"lu" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/obj/effect/turf_decal/bot, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/portable_atmospherics/pump, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"lw" = ( -/obj/effect/turf_decal/stripes/line, -/obj/effect/mapping_helpers/no_lava, -/turf/simulated/floor/plating{ - baseturf = /turf/simulated/floor/plating/lava/smooth/lava_land_surface; - oxygen = 14; - nitrogen = 23; - temperature = 300 - }, -/area/lavaland/surface/outdoors) -"ly" = ( -/obj/structure/chair/stool/bar, -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/bar) -"lz" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/glass/rag{ - pixel_x = -4; - pixel_y = 9 - }, -/obj/item/reagent_containers/food/drinks/cans/beer{ - pixel_x = 5; - pixel_y = -2 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/wood, -/area/ruin/unpowered/syndicate_lava_base/bar) -"lA" = ( -/turf/simulated/floor/wood, -/area/ruin/unpowered/syndicate_lava_base/bar) -"lB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/wood, -/area/ruin/unpowered/syndicate_lava_base/bar) -"lC" = ( -/obj/structure/table/wood, -/obj/machinery/reagentgrinder, -/obj/item/kitchen/rollingpin, -/obj/item/kitchen/knife{ - pixel_x = 6 - }, -/turf/simulated/floor/wood, -/area/ruin/unpowered/syndicate_lava_base/bar) -"lE" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/bar) -"lF" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/obj/structure/closet/crate, -/obj/item/vending_refill/snack{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/vending_refill/snack{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/vending_refill/coffee, -/obj/item/vending_refill/cola, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/bar) -"lG" = ( -/obj/structure/table, -/obj/item/storage/box/syringes, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/item/gun/syringe/syndicate, -/obj/machinery/defibrillator_mount/loaded{ - pixel_x = -30 - }, -/turf/simulated/floor/plasteel/white/side{ - dir = 9 - }, -/area/ruin/unpowered/syndicate_lava_base/medbay) -"lH" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel/white/corner{ - dir = 1 - }, -/area/ruin/unpowered/syndicate_lava_base/medbay) -"lI" = ( -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/medbay) -"lJ" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/medbay) -"lK" = ( -/obj/structure/table, -/obj/item/storage/firstaid/regular{ - pixel_x = -4; - pixel_y = -4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/item/storage/firstaid/fire{ - pixel_x = 4; - pixel_y = 4 - }, -/turf/simulated/floor/plasteel/white/side{ - dir = 4 - }, -/area/ruin/unpowered/syndicate_lava_base/medbay) -"lL" = ( -/obj/machinery/alarm/syndicate{ - dir = 4; - pixel_x = -24 - }, -/obj/machinery/light/small{ - dir = 8 - }, -/obj/structure/table, -/obj/item/stack/sheet/metal/fifty{ - pixel_x = -1; - pixel_y = 1 - }, -/obj/item/stack/sheet/mineral/plastitanium{ - amount = 30 - }, -/obj/item/stack/sheet/glass/fifty{ - pixel_x = 1; - pixel_y = -1 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"lM" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"lP" = ( -/obj/machinery/computer/general_air_control/large_tank_control{ - dir = 8; - frequency = 1442; - name = "Oxygen Supply Control"; - output_tag = "syndie_lavaland_o2_out"; - sensors = list("syndie_lavaland_o2_sensor" = "Tank") - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"lS" = ( -/obj/machinery/porta_turret/syndicate{ - dir = 9 - }, -/turf/simulated/wall/mineral/plastitanium/nodiagonal, -/area/ruin/unpowered/syndicate_lava_base/main) -"lU" = ( -/obj/machinery/alarm/syndicate{ - dir = 4; - pixel_x = -24 - }, -/obj/structure/chair/stool, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/bar) -"lV" = ( -/obj/structure/chair/stool/bar, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/bar) -"lW" = ( -/obj/structure/table/wood, -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/wood, -/area/ruin/unpowered/syndicate_lava_base/bar) -"lX" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/wood, -/area/ruin/unpowered/syndicate_lava_base/bar) -"lY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/wood, -/area/ruin/unpowered/syndicate_lava_base/bar) -"lZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/wood, -/area/ruin/unpowered/syndicate_lava_base/bar) -"ma" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/door/airlock{ - name = "Bar Storage"; - req_access_txt = "150" - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/bar) -"mb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/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/dark, -/area/ruin/unpowered/syndicate_lava_base/bar) -"mc" = ( -/obj/item/storage/box/donkpockets{ - pixel_x = -2; - pixel_y = 6 - }, -/obj/item/storage/box/donkpockets{ - pixel_y = 3 - }, -/obj/item/storage/box/donkpockets{ - pixel_x = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/closet/secure_closet/freezer/kitchen/maintenance{ - req_access = null - }, -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/bar) -"md" = ( -/obj/machinery/sleeper/syndie{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/medbay) -"me" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/medbay) -"mf" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = 11 - }, -/obj/machinery/alarm/syndicate{ - dir = 8; - pixel_x = 24 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/medbay) -"mg" = ( -/obj/machinery/firealarm/syndicate{ - dir = 8; - pixel_x = -26 - }, -/obj/structure/table, -/obj/machinery/cell_charger, -/obj/item/stock_parts/cell/high/plus, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/item/rpd{ - pixel_y = 3 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"mh" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"mj" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/binary/pump{ - dir = 8; - name = "O2 to Incinerator" - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"mn" = ( -/turf/simulated/wall/mineral/plastitanium/nodiagonal, -/area/ruin/unpowered/syndicate_lava_base/telecomms) -"mo" = ( -/turf/simulated/wall/mineral/plastitanium/explosive, -/area/ruin/unpowered/syndicate_lava_base/telecomms) -"mp" = ( -/obj/structure/grille, -/obj/structure/window/plastitanium, -/obj/machinery/door/firedoor, -/obj/machinery/door/poddoor/preopen{ - id_tag = "lavalandsyndi_telecomms" - }, -/turf/simulated/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/telecomms) -"mr" = ( -/turf/simulated/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/arrivals) -"mt" = ( -/obj/machinery/computer/arcade/orion_trail, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/bar) -"mu" = ( -/obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-22" - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/bar) -"mv" = ( -/obj/structure/table/wood, -/obj/machinery/light/small, -/obj/structure/cable/yellow, -/obj/machinery/power/apc/syndicate{ - dir = 2; - name = "Bar APC"; - pixel_y = -24 - }, -/turf/simulated/floor/wood, -/area/ruin/unpowered/syndicate_lava_base/bar) -"mw" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/wood, -/area/ruin/unpowered/syndicate_lava_base/bar) -"mx" = ( -/obj/structure/table/wood, -/obj/machinery/kitchen_machine/microwave, -/turf/simulated/floor/wood, -/area/ruin/unpowered/syndicate_lava_base/bar) -"my" = ( -/obj/structure/closet/secure_closet/freezer/fridge/open, -/obj/item/reagent_containers/food/condiment/enzyme, -/obj/item/reagent_containers/food/snacks/chocolatebar, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/bar) -"mz" = ( -/obj/machinery/door/airlock/maintenance, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/main) -"mA" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/obj/structure/bed/roller, -/obj/machinery/iv_drip, -/obj/item/reagent_containers/iv_bag/blood/OMinus, -/obj/machinery/firealarm/syndicate{ - dir = 8; - pixel_x = -26 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel/white/side{ - dir = 8 - }, -/area/ruin/unpowered/syndicate_lava_base/medbay) -"mB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/medbay) -"mC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/medbay) -"mD" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/medbay) -"mE" = ( -/obj/structure/table/reinforced, -/obj/item/scalpel, -/obj/item/circular_saw{ - pixel_y = 9 - }, -/obj/machinery/light/small{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel/white/side{ - dir = 4 - }, -/area/ruin/unpowered/syndicate_lava_base/medbay) -"mF" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = -27; - pixel_y = 1 - }, -/obj/structure/chair/stool, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"mG" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"mK" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/computer/general_air_control/large_tank_control{ - dir = 1; - frequency = 1442; - name = "Toxins Supply Control"; - output_tag = "syndie_lavaland_tox_out"; - sensors = list("syndie_lavaland_tox_sensor" = "Tank") - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"mN" = ( -/obj/structure/sign/securearea, -/turf/simulated/wall/mineral/plastitanium/nodiagonal, -/area/ruin/unpowered/syndicate_lava_base/telecomms) -"mP" = ( -/obj/structure/filingcabinet/security, -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/telecomms) -"mQ" = ( -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/telecomms) -"mR" = ( -/obj/structure/table, -/obj/item/storage/toolbox/syndicate, -/obj/item/multitool, -/obj/machinery/door_control{ - id = "lavalandsyndi_telecomms"; - name = "Telecomms Blast Door Control"; - pixel_x = 26; - req_access_txt = "150" - }, -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/telecomms) -"mT" = ( -/turf/simulated/wall/mineral/plastitanium/nodiagonal, -/area/ruin/unpowered/syndicate_lava_base/arrivals) -"mU" = ( -/obj/structure/grille, -/obj/structure/window/plastitanium, -/obj/machinery/door/firedoor, -/turf/simulated/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/bar) -"mX" = ( -/obj/structure/rack{ - dir = 8 - }, -/obj/item/storage/toolbox/mechanical, -/obj/item/stack/cable_coil/yellow{ - pixel_x = 2; - pixel_y = -3 - }, -/obj/item/multitool, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/arrivals) -"mY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel/white/side{ - dir = 4 - }, -/area/ruin/unpowered/syndicate_lava_base/arrivals) -"mZ" = ( -/obj/machinery/sleeper/syndie{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/medbay) -"na" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/medbay) -"nc" = ( -/obj/machinery/computer/turbine_computer{ - dir = 1; - id = "syndie_lavaland_incineratorturbine" - }, -/obj/machinery/door_control{ - id = "lavalandsyndi_incineratoroutput"; - name = "Incinerator Output Blast Door Control"; - pixel_x = -6; - pixel_y = -24; - req_access_txt = "150" - }, -/obj/machinery/door_control{ - id = "lavalandsyndi_incineratorinput"; - name = "Incinerator Input Blast Door Control"; - pixel_x = 6; - pixel_y = -24; - req_access_txt = "150" - }, -/obj/effect/turf_decal/stripes/line, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"nd" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/effect/turf_decal/stripes/line, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"nf" = ( -/obj/structure/sign/fire, -/turf/simulated/wall/mineral/plastitanium/coated, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"ng" = ( -/obj/structure/table, -/obj/machinery/photocopier/faxmachine/longrange/syndie{ - department = "Syndicate Bioweapon Research Outpost" - }, -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/telecomms) -"nk" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/telecomms) -"nl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/telecomms) -"nm" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/obj/machinery/atmospherics/unary/vent_pump/on, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/structure/noticeboard{ - dir = 8; - pixel_x = 27 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/telecomms) -"nn" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/arrivals) -"no" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/arrivals) -"np" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/arrivals) -"nq" = ( -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/arrivals) -"ns" = ( -/obj/structure/closet/emcloset/anchored, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/arrivals) -"nt" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/power/apc/syndicate{ - dir = 1; - name = "Arrival Hallway APC"; - pixel_y = 24 - }, -/obj/structure/cable/yellow{ - d2 = 4; - icon_state = "0-4" - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/arrivals) -"nu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/arrivals) -"nv" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/arrivals) -"nw" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 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" - }, -/turf/simulated/floor/plasteel/white/side{ - dir = 4 - }, -/area/ruin/unpowered/syndicate_lava_base/arrivals) -"nx" = ( -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/door/airlock/medical/glass{ - name = "Medbay" - }, -/turf/simulated/floor/plasteel/white, -/area/ruin/unpowered/syndicate_lava_base/medbay) -"ny" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/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/white/side{ - dir = 8 - }, -/area/ruin/unpowered/syndicate_lava_base/medbay) -"nz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/medbay) -"nA" = ( -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/turf/simulated/floor/plasteel/white/corner, -/area/ruin/unpowered/syndicate_lava_base/medbay) -"nB" = ( -/obj/structure/table/reinforced, -/obj/item/surgicaldrill, -/obj/effect/decal/cleanable/dirt, -/obj/item/bonegel, -/obj/item/bonesetter, -/obj/item/FixOVein, -/turf/simulated/floor/plasteel/white/side, -/area/ruin/unpowered/syndicate_lava_base/medbay) -"nC" = ( -/obj/structure/table/reinforced, -/obj/item/retractor, -/obj/item/hemostat, -/obj/effect/decal/cleanable/dirt, -/obj/item/cautery, -/turf/simulated/floor/plasteel/white/side{ - dir = 6 - }, -/area/ruin/unpowered/syndicate_lava_base/medbay) -"nH" = ( -/obj/machinery/alarm/syndicate{ - dir = 4; - pixel_x = -24 - }, -/obj/machinery/light/small{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/telecomms) -"nI" = ( -/obj/machinery/computer/camera_advanced, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/telecomms) -"nJ" = ( -/obj/structure/table/reinforced, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/telecomms) -"nK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/telecomms) -"nL" = ( -/obj/machinery/door/airlock/hatch{ - name = "Telecommunications"; - req_access_txt = "150" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/telecomms) -"nN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/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, -/area/ruin/unpowered/syndicate_lava_base/arrivals) -"nQ" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, -/obj/machinery/light/small, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/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, -/area/ruin/unpowered/syndicate_lava_base/arrivals) -"nR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/arrivals) -"nS" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/firealarm/syndicate{ - dir = 2; - pixel_y = 24 - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/arrivals) -"nT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/arrivals) -"nU" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/obj/machinery/alarm/syndicate{ - pixel_y = 24 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/arrivals) -"nV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/arrivals) -"nW" = ( -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/arrivals) -"nX" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/arrivals) -"nZ" = ( -/turf/simulated/floor/plasteel/white/side{ - dir = 4 - }, -/area/ruin/unpowered/syndicate_lava_base/arrivals) -"oa" = ( -/turf/simulated/floor/plasteel/white/side{ - dir = 10 - }, -/area/ruin/unpowered/syndicate_lava_base/medbay) -"ob" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel/white/side, -/area/ruin/unpowered/syndicate_lava_base/medbay) -"oh" = ( -/obj/machinery/firealarm/syndicate{ - dir = 8; - pixel_x = -26 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/telecomms) -"oi" = ( -/obj/structure/chair/office{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/telecomms) -"ok" = ( -/obj/structure/chair{ - dir = 8 - }, -/obj/structure/cable/yellow, -/obj/machinery/power/apc/syndicate{ - dir = 2; - name = "Telecommunications APC"; - pixel_y = -24 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/telecomms) -"ol" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/structure/rack{ - dir = 8 - }, -/obj/item/clothing/suit/space/syndicate, -/obj/item/clothing/mask/gas/syndicate, -/obj/item/clothing/head/helmet/space/syndicate, -/obj/item/mining_scanner, -/obj/item/pickaxe, -/turf/simulated/floor/mineral/plastitanium, -/area/ruin/unpowered/syndicate_lava_base/arrivals) -"om" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/arrivals) -"on" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 - }, -/obj/structure/extinguisher_cabinet{ - pixel_y = -29 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/arrivals) -"oo" = ( -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/arrivals) -"op" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/turf/simulated/floor/plasteel, -/area/ruin/unpowered/syndicate_lava_base/arrivals) -"or" = ( -/obj/structure/rack{ - dir = 8 - }, -/obj/item/storage/belt/medical, -/obj/effect/decal/cleanable/dirt, -/obj/item/crowbar, -/obj/item/clothing/glasses/hud/health, -/obj/item/clothing/accessory/stethoscope, -/turf/simulated/floor/plasteel/white, -/area/ruin/unpowered/syndicate_lava_base/medbay) -"ou" = ( -/obj/machinery/computer/message_monitor{ - dir = 1 - }, -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/telecomms) -"ov" = ( -/obj/structure/table/reinforced, -/obj/item/pen, -/obj/item/paper_bin/syndicate, -/turf/simulated/floor/plasteel/dark, -/area/ruin/unpowered/syndicate_lava_base/telecomms) -"ox" = ( -/obj/structure/grille, -/obj/structure/window/plastitanium, -/obj/machinery/door/firedoor, -/obj/machinery/door/poddoor{ - id_tag = "lavalandsyndi_arrivals" - }, -/turf/simulated/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/arrivals) -"oF" = ( -/obj/structure/sign/securearea, -/turf/simulated/wall/mineral/plastitanium/nodiagonal, -/area/ruin/unpowered/syndicate_lava_base/arrivals) -"oP" = ( -/obj/structure/sign/chemistry, -/turf/simulated/wall/mineral/plastitanium/nodiagonal, -/area/ruin/unpowered/syndicate_lava_base/testlab) -"pQ" = ( -/obj/structure/sign/explosives/alt{ - pixel_x = 32 - }, -/turf/simulated/floor/redgrid, -/area/ruin/unpowered/syndicate_lava_base/main) -"qG" = ( -/obj/structure/sign/explosives/alt{ - pixel_x = -32 - }, -/turf/simulated/floor/engine, -/area/ruin/unpowered/syndicate_lava_base/testlab) -"vu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/engine, -/area/ruin/unpowered/syndicate_lava_base/testlab) -"yd" = ( -/obj/machinery/atmospherics/pipe/simple/visible/yellow, -/turf/simulated/wall/mineral/plastitanium/coated, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"yU" = ( -/turf/simulated/wall/mineral/plastitanium/explosive, -/area/ruin/unpowered/syndicate_lava_base/chemistry) -"Au" = ( -/turf/simulated/wall/mineral/plastitanium/explosive, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"BF" = ( -/obj/structure/grille, -/obj/structure/window/plastitanium, -/obj/machinery/door/firedoor, -/obj/machinery/door/poddoor/preopen{ - id_tag = "lavalandsyndi"; - name = "Syndicate Research Experimentation Shutters" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/testlab) -"Cg" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/engine, -/area/ruin/unpowered/syndicate_lava_base/testlab) -"CG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/turf/simulated/floor/engine, -/area/ruin/unpowered/syndicate_lava_base/testlab) -"DL" = ( -/obj/structure/sign/explosives/alt{ - pixel_x = 32 - }, -/turf/simulated/floor/engine, -/area/ruin/unpowered/syndicate_lava_base/testlab) -"Lg" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, -/turf/simulated/floor/engine, -/area/ruin/unpowered/syndicate_lava_base/testlab) -"LQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/engine, -/area/ruin/unpowered/syndicate_lava_base/testlab) -"RI" = ( -/turf/simulated/wall/mineral/plastitanium/coated, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"RV" = ( -/obj/structure/sign/fire, -/turf/simulated/wall/mineral/plastitanium/nodiagonal, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"Tp" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 - }, -/turf/simulated/floor/engine, -/area/ruin/unpowered/syndicate_lava_base/testlab) -"TC" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/engine, -/area/ruin/unpowered/syndicate_lava_base/testlab) - -(1,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -"} -(2,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -"} -(3,1,1) = {" -aa -aa -aa -aa -aa -ab -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -"} -(4,1,1) = {" -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -"} -(5,1,1) = {" -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -"} -(6,1,1) = {" -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -"} -(7,1,1) = {" -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -eh -gj -eh -eh -eh -eh -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -mn -mN -mn -mn -mn -mn -ab -ab -ab -ab -ab -ab -ab -aa -"} -(8,1,1) = {" -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ac -eh -eG -ff -eI -aj -eh -eh -eh -eh -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -mp -mP -cb -nH -oh -mn -mn -ab -ab -ab -ab -ab -ab -aa -"} -(9,1,1) = {" -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -eh -eH -fg -fy -gp -eI -am -ao -eh -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -mp -ng -nk -nI -oi -ou -mn -ab -ab -ab -ab -ab -ab -ab -"} -(10,1,1) = {" -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ac -eh -eI -eI -eI -gq -gT -hq -hF -eh -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -mp -mQ -nl -nJ -nJ -ov -mn -ab -ab -ab -ab -ab -ab -ab -"} -(11,1,1) = {" -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ac -eh -eG -fh -eI -gr -eI -an -ar -eh -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -mp -mR -nm -nK -ok -mn -mn -ab -ab -ab -ab -ab -ab -ab -"} -(12,1,1) = {" -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -eh -eH -fg -fz -gs -eh -gj -eh -eh -ab -ab -ab -ab -ab -ab -dG -dG -dG -dG -dG -dG -lS -mn -mn -mo -nL -mn -mn -ab -ab -ab -ab -ab -ab -ab -ab -"} -(13,1,1) = {" -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -eh -gj -eI -eI -gt -gU -hs -hH -ab -ab -ab -ab -ab -ab -dG -dG -ig -iu -iu -iu -bv -aZ -az -ba -nn -aE -mT -mT -ab -ab -ab -ab -ab -ab -ab -ab -"} -(14,1,1) = {" -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ac -eh -fi -fA -bV -gV -ht -hH -ab -ab -ab -ab -ab -dG -dG -ig -je -iv -jk -aw -lw -aZ -mr -bb -aD -nN -ol -mT -ab -ab -ab -ab -ab -ab -ab -ab -"} -(15,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ei -eJ -fj -fB -gv -ax -hu -hH -ab -ab -ab -ab -dG -dG -ig -je -jk -jx -jx -jy -jy -jy -aA -mT -no -nN -ol -mT -ab -ab -ab -ab -ab -ab -ab -ab -"} -(16,1,1) = {" -aa -ab -ab -ab -ab -ab -ab -ac -ab -ac -ac -ae -ae -ae -ae -fC -ad -aX -hv -hH -ab -ab -ab -dG -dG -ig -je -jk -jx -jx -kG -lf -bw -jy -jy -jP -np -aH -mT -mT -mT -oF -ab -ab -ab -ab -ab -ab -"} -(17,1,1) = {" -ab -ab -ab -ab -ab -ae -ae -ae -ae -ae -ae -ae -au -av -aL -fD -aI -eh -eh -eh -hW -dG -dG -dG -ig -je -iv -jx -jx -kn -kH -jN -jZ -lU -mt -mU -np -aN -aO -aP -aR -aG -aS -ab -ab -ab -ab -aa -"} -(18,1,1) = {" -ab -ab -ab -ab -ae -aL -aq -aq -qG -dc -aq -dQ -ek -eL -ae -fE -gy -bd -ay -aU -aC -bc -iu -iu -je -jk -jx -jx -jN -jZ -jN -jZ -jN -jZ -kn -mU -nq -nQ -mT -mT -mT -oF -ab -ab -ab -ab -ab -aa -"} -(19,1,1) = {" -ab -ab -ab -ab -ae -ap -aq -Lg -aq -Lg -aq -dR -el -eM -ae -fF -gz -aT -aB -hJ -aY -ih -iv -iM -iv -iv -jx -jL -jY -jN -bZ -lg -ly -lV -mu -mU -cc -nR -om -mT -ab -ab -ab -ab -ab -ab -aa -aa -"} -(20,1,1) = {" -aa -ab -ab -ab -ae -aq -aq -aF -aq -aF -aq -ae -bU -eN -ae -ae -aJ -ha -ha -aV -ha -ha -ha -ha -ha -ha -jy -jM -jN -jZ -kJ -lh -lz -lW -mv -jy -jy -nS -on -mT -ab -ab -ab -ab -ab -ab -ab -aa -"} -(21,1,1) = {" -aa -ab -ab -ab -ae -aq -aq -Tp -aq -Cg -aq -dS -eo -eO -fk -ae -aK -hb -ha -iN -ha -ii -iw -iO -hB -jl -jz -jN -jZ -ko -kK -li -lA -lX -mw -ah -jy -nu -oo -ox -ab -ab -ab -ab -ab -ab -ab -ab -"} -(22,1,1) = {" -aa -ab -ab -ab -ae -ap -aq -CG -vu -TC -LQ -BF -ep -eP -fl -fG -gE -hc -hx -hL -hZ -ij -ix -iP -hd -jm -jz -jO -jN -kp -kL -lj -lB -lY -lA -ai -jP -nT -op -ox -ab -ab -ab -ab -ab -ab -ab -ab -"} -(23,1,1) = {" -aa -ab -ab -ab -ae -ae -aq -aq -DL -di -aq -dS -eq -eQ -ae -dQ -gF -hd -hy -hy -ia -ik -if -iQ -hz -hz -jP -jy -ka -kq -kM -lk -lC -lZ -mx -jy -jy -nU -oo -ox -ab -ab -ab -ab -ab -ab -ab -ab -"} -(24,1,1) = {" -aa -ab -ab -ab -ab -ae -ae -ae -ae -ae -aL -ae -ae -ae -oP -fH -gG -he -hz -hz -hz -hz -iy -iR -hz -jn -jA -jy -jy -jy -jy -jy -ak -ma -jy -jy -ns -nV -oo -ox -ab -ab -ab -ab -ab -ab -ab -ab -"} -(25,1,1) = {" -aa -ab -ab -ab -ab -ab -ac -ac -as -do -dA -dT -er -eR -fm -fI -gH -he -hz -hM -ib -hz -iz -iS -jf -jo -jB -hz -kb -jy -kN -jZ -lE -mb -my -jy -nt -nW -aW -mT -ab -ab -ab -ab -ab -ab -ab -ab -"} -(26,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -as -as -du -dB -dU -es -eS -fn -fO -gG -hf -hz -hN -ic -il -iA -iT -hz -hz -hz -hz -kc -kr -kO -ll -lF -mc -jy -jy -nu -nX -oo -mT -ab -ab -ab -ab -ab -ab -ab -ab -"} -(27,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -at -aM -dv -dC -bI -et -eT -fo -fO -gG -hg -hz -hz -hz -hz -iB -iU -jg -jp -jp -jQ -kd -jy -jy -jy -jy -jy -jy -mX -nv -aQ -mT -mT -ab -ab -ab -ab -ab -ab -ab -aa -"} -(28,1,1) = {" -aa -ab -ab -ab -ab -ab -ab -at -cA -dw -dC -dX -eu -eU -fn -fH -gG -he -hA -hO -id -im -bX -iV -hz -hz -hz -hz -ke -jQ -jQ -jQ -jp -jp -mz -mY -nw -nZ -mT -ab -ab -ab -ab -ab -ab -ab -ab -aa -"} -(29,1,1) = {" -aa -ab -ab -ab -ab -ab -ab -at -cG -dx -dE -dY -ev -eV -fp -fH -gI -he -hz -hz -hz -hz -iD -iW -jh -jo -jC -hz -kf -ks -kP -kQ -kQ -kQ -kQ -kT -nx -kR -kQ -kQ -ab -ab -ab -ab -ab -ab -ab -ab -"} -(30,1,1) = {" -aa -ab -ab -ab -ab -ab -ab -as -as -as -dI -dZ -ew -as -yU -as -gJ -hh -hz -hP -ic -in -iE -iX -hz -jq -jA -hz -kg -kt -kQ -bT -lG -md -mA -mZ -ny -oa -or -kQ -ab -ab -ab -ab -ab -ab -ab -ab -"} -(31,1,1) = {" -aa -ab -ab -ab -ab -ab -ab -ab -ac -as -as -as -as -as -fq -dy -gK -he -hz -hQ -ie -hz -iF -iY -hz -hO -hz -hz -kh -ha -kQ -lm -lH -me -mB -na -nz -ob -al -kQ -ab -ab -ab -ab -ab -ab -ab -ab -"} -(32,1,1) = {" -aa -aa -ab -ab -ab -ab -ab -ab -ac -dy -dK -ea -ex -eW -fr -fW -gL -he -hz -hz -hz -hz -hz -hz -hz -jr -jD -jR -iQ -ku -kR -ln -lI -lI -mC -lI -nA -cd -kQ -kQ -ac -ab -ab -ab -ab -ab -ab -ab -"} -(33,1,1) = {" -aa -aa -ab -ab -ab -ab -ab -ab -ab -dy -dL -eb -ey -eX -fs -fa -gM -hi -hB -hB -hB -ag -iG -iZ -ji -js -jE -jS -ki -kv -kS -ln -lJ -mf -mD -lI -nB -kQ -kQ -ac -ab -ab -ab -ab -ab -ab -ab -ab -"} -(34,1,1) = {" -aa -aa -aa -ab -ab -ab -ab -ab -ab -dy -dM -ec -ez -eY -ft -dP -gN -hj -hj -hR -af -ip -iH -ja -bY -jj -gI -if -kj -kw -kT -lo -lK -kQ -mE -bR -nC -kQ -ac -ab -ab -ab -ab -ab -ab -ab -ab -aa -"} -(35,1,1) = {" -aa -aa -ab -ab -ab -ab -ab -ab -ab -dy -dy -ed -ey -eZ -dy -dy -gO -hk -hC -dy -ha -ce -iI -iq -ha -jt -jF -jT -ju -ju -ju -ju -ju -Au -ju -ju -RI -RI -RI -RI -RI -ab -ab -ab -ab -ab -ab -ab -"} -(36,1,1) = {" -aa -aa -ab -ab -ab -ab -ab -ab -ab -ac -dy -dy -eA -fa -dy -fY -gP -gQ -hl -hS -ha -ir -iJ -jb -ha -ju -jG -jU -ju -kx -kV -lp -lL -mg -mF -nc -RI -bg -RI -bQ -RI -RI -nf -ab -ab -ab -ab -aa -"} -(37,1,1) = {" -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -dy -bk -eB -fb -fu -gb -gQ -hl -bW -bS -ha -bx -iK -jc -ha -jv -jH -jV -ju -ky -kW -lq -lM -mh -mG -nd -bf -bh -bj -cp -cs -ct -cu -ab -ab -ab -ab -ab -"} -(38,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -dy -ef -eC -fc -fv -fv -gR -gQ -hl -hU -ha -it -pQ -jd -ha -jw -jI -jW -kk -kz -by -bC -bF -ca -bL -bO -yd -bi -yd -cq -RI -RI -nf -ab -ab -ab -ab -ab -"} -(39,1,1) = {" -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -dy -eg -eD -fd -bl -bm -gS -hn -gQ -hV -ha -ha -ha -ha -ha -ju -jJ -kl -kl -be -bz -bD -bG -mj -bM -RV -RI -RI -RI -cr -nf -ab -ab -ab -ab -ab -ab -ab -"} -(40,1,1) = {" -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -dy -dP -eE -fe -dy -bn -dy -ho -hD -dy -dy -ac -ab -ab -ab -ac -jK -ju -km -kB -br -bE -bH -bJ -bN -bP -cl -cn -RI -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(41,1,1) = {" -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -dy -eF -eF -dy -bo -dy -eF -eF -dy -ab -ab -ab -ab -ab -ab -ab -ju -ju -kC -bA -lu -lP -bK -mK -kD -cm -co -RI -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(42,1,1) = {" -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -dy -gg -dy -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ju -kD -bB -Au -kD -bB -ju -ju -ju -ju -RI -ab -ab -ab -ab -ab -ab -ab -ab -aa -"} -(43,1,1) = {" -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -fx -bp -fx -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ju -bs -bu -ju -ch -cj -ju -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -"} -(44,1,1) = {" -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -bq -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ju -bt -cg -ju -ci -ck -ju -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -"} -(45,1,1) = {" -aa -aa -aa -ab -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ju -ju -ju -ju -ju -ju -ju -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -"} -(46,1,1) = {" -aa -aa -aa -aa -aa -ab -ab -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -"} -(47,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -"} -(48,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -"} diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_ufo_crash.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_ufo_crash.dmm index a6e841566f3..575d8f5f4ef 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_ufo_crash.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_ufo_crash.dmm @@ -7,66 +7,66 @@ /area/lavaland/surface/outdoors) "c" = ( /obj/machinery/abductor/experiment, -/turf/unsimulated/floor/abductor, +/turf/simulated/floor/plating/abductor, /area/ruin/unpowered/misc_lavaruin) "d" = ( /turf/simulated/wall/mineral/abductor, /area/ruin/unpowered/misc_lavaruin) "e" = ( -/turf/unsimulated/floor/abductor, +/turf/simulated/floor/plating/abductor, /area/ruin/unpowered/misc_lavaruin) "g" = ( /obj/machinery/abductor/pad, -/turf/unsimulated/floor/abductor, +/turf/simulated/floor/plating/abductor, /area/ruin/unpowered/misc_lavaruin) "h" = ( /obj/item/hemostat/alien, -/turf/unsimulated/floor/abductor, +/turf/simulated/floor/plating/abductor, /area/ruin/unpowered/misc_lavaruin) "i" = ( /obj/effect/mob_spawn/human/abductor, -/turf/unsimulated/floor/abductor, +/turf/simulated/floor/plating/abductor, /area/ruin/unpowered/misc_lavaruin) "j" = ( /obj/structure/closet/abductor, -/turf/unsimulated/floor/abductor, +/turf/simulated/floor/plating/abductor, /area/ruin/unpowered/misc_lavaruin) "k" = ( /obj/effect/baseturf_helper/lava_land/surface, -/turf/unsimulated/floor/abductor, +/turf/simulated/floor/plating/abductor, /area/ruin/unpowered/misc_lavaruin) "l" = ( /obj/machinery/optable/abductor, /obj/item/cautery/alien, -/turf/unsimulated/floor/abductor, +/turf/simulated/floor/plating/abductor, /area/ruin/unpowered/misc_lavaruin) "m" = ( /obj/structure/table/abductor, /obj/item/storage/box/alienhandcuffs, -/turf/unsimulated/floor/abductor, +/turf/simulated/floor/plating/abductor, /area/ruin/unpowered/misc_lavaruin) "n" = ( /obj/item/scalpel/alien, /obj/item/surgical_drapes, -/turf/unsimulated/floor/abductor, +/turf/simulated/floor/plating/abductor, /area/ruin/unpowered/misc_lavaruin) "o" = ( /obj/item/retractor/alien, -/turf/unsimulated/floor/abductor, +/turf/simulated/floor/plating/abductor, /area/ruin/unpowered/misc_lavaruin) "p" = ( /obj/machinery/abductor/gland_dispenser, -/turf/unsimulated/floor/abductor, +/turf/simulated/floor/plating/abductor, /area/ruin/unpowered/misc_lavaruin) "q" = ( /obj/structure/table/abductor, /obj/item/surgicaldrill/alien, /obj/item/circular_saw/alien, -/turf/unsimulated/floor/abductor, +/turf/simulated/floor/plating/abductor, /area/ruin/unpowered/misc_lavaruin) "r" = ( /obj/structure/bed/abductor, -/turf/unsimulated/floor/abductor, +/turf/simulated/floor/plating/abductor, /area/ruin/unpowered/misc_lavaruin) (1,1,1) = {" diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_xeno_nest.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_xeno_nest.dmm index 63ffac70fd8..ec1443e4b37 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_xeno_nest.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_xeno_nest.dmm @@ -156,7 +156,7 @@ /obj/structure/alien/weeds, /obj/structure/bed/nest, /obj/effect/decal/cleanable/blood/gibs, -/obj/item/tank/emergency_oxygen, +/obj/item/tank/internals/emergency_oxygen, /obj/item/clothing/suit/space/syndicate/orange, /obj/item/clothing/mask/gas, /obj/item/clothing/head/helmet/space/syndicate/orange, diff --git a/_maps/map_files/RandomRuins/SpaceRuins/abandonedzoo.dmm b/_maps/map_files/RandomRuins/SpaceRuins/abandonedzoo.dmm index 72ed4f08af3..e189a85dd73 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/abandonedzoo.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/abandonedzoo.dmm @@ -100,7 +100,7 @@ /area/ruin/unpowered) "al" = ( /obj/structure/flora/ausbushes/genericbush, -/turf/unsimulated/floor/grass, +/turf/simulated/floor/grass, /area/ruin/unpowered) "am" = ( /mob/living/simple_animal/hostile/poison/bees, @@ -109,15 +109,15 @@ /mob/living/simple_animal/hostile/poison/bees, /mob/living/simple_animal/hostile/poison/bees, /mob/living/simple_animal/hostile/poison/bees, -/turf/unsimulated/floor/grass, +/turf/simulated/floor/grass, /area/ruin/unpowered) "an" = ( /mob/living/simple_animal/hostile/poison/bees, -/turf/unsimulated/floor/grass, +/turf/simulated/floor/grass, /area/ruin/unpowered) "ao" = ( /obj/structure/flora/ausbushes/lavendergrass, -/turf/unsimulated/floor/grass, +/turf/simulated/floor/grass, /area/ruin/unpowered) "ap" = ( /mob/living/simple_animal/hostile/asteroid/goldgrub{ @@ -127,7 +127,7 @@ /area/ruin/unpowered) "aq" = ( /obj/structure/flora/ausbushes/grassybush, -/turf/unsimulated/floor/grass, +/turf/simulated/floor/grass, /area/ruin/unpowered) "ar" = ( /obj/structure/flora/rock/pile, @@ -143,11 +143,11 @@ "au" = ( /obj/structure/flora/ausbushes/leafybush, /mob/living/simple_animal/hostile/poison/bees, -/turf/unsimulated/floor/grass, +/turf/simulated/floor/grass, /area/ruin/unpowered) "av" = ( /obj/structure/flora/ausbushes/brflowers, -/turf/unsimulated/floor/grass, +/turf/simulated/floor/grass, /area/ruin/unpowered) "aw" = ( /obj/structure/flora/rock, @@ -187,16 +187,16 @@ /area/ruin/unpowered) "aA" = ( /obj/structure/flora/ausbushes/ywflowers, -/turf/unsimulated/floor/grass, +/turf/simulated/floor/grass, /area/ruin/unpowered) "aB" = ( /obj/machinery/light, /mob/living/simple_animal/hostile/poison/bees, -/turf/unsimulated/floor/grass, +/turf/simulated/floor/grass, /area/ruin/unpowered) "aC" = ( /obj/structure/flora/ausbushes/ppflowers, -/turf/unsimulated/floor/grass, +/turf/simulated/floor/grass, /area/ruin/unpowered) "aD" = ( /obj/structure/cable{ @@ -396,7 +396,7 @@ }, /obj/structure/rack, /obj/item/clothing/suit/space/hardsuit/medical, -/obj/item/tank/emergency_oxygen/double, +/obj/item/tank/internals/emergency_oxygen/double, /turf/simulated/floor/plasteel{ icon_state = "dark" }, diff --git a/_maps/map_files/RandomRuins/SpaceRuins/asteroid4.dmm b/_maps/map_files/RandomRuins/SpaceRuins/asteroid4.dmm index fb1039beb6f..166960064eb 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/asteroid4.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/asteroid4.dmm @@ -31,37 +31,24 @@ /turf/simulated/floor/plating, /area/ruin/unpowered) "i" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall3"; - dir = 2 - }, +/turf/simulated/wall/mineral/titanium, /area/ruin/unpowered) "j" = ( /obj/item/shard, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/ruin/unpowered) "k" = ( -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/ruin/unpowered) "l" = ( /obj/structure/shuttle/engine/propulsion/burst, -/turf/simulated/shuttle/wall{ - icon_state = "swall_s5"; - dir = 2 - }, +/turf/simulated/wall/mineral/titanium, /area/ruin/unpowered) "m" = ( -/obj/machinery/door/airlock/shuttle{ +/obj/machinery/door/airlock/titanium{ name = "Escape Pod Airlock" }, -/turf/simulated/shuttle/floor, -/area/ruin/unpowered) -"n" = ( -/obj/structure/shuttle/engine/propulsion/burst, -/turf/simulated/shuttle/wall{ - icon_state = "swall_s9"; - dir = 2 - }, +/turf/simulated/floor/mineral/titanium/blue, /area/ruin/unpowered) (1,1,1) = {" @@ -369,7 +356,7 @@ f f i i -n +l a "} (15,1,1) = {" diff --git a/_maps/map_files/RandomRuins/SpaceRuins/clownmime.dmm b/_maps/map_files/RandomRuins/SpaceRuins/clownmime.dmm index 6df1793588d..853fed945a1 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/clownmime.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/clownmime.dmm @@ -3,12 +3,7 @@ /turf/template_noop, /area/template_noop) "b" = ( -/turf/template_noop, -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall_f6"; - tag = "icon-swall_f6" - }, +/turf/simulated/wall/mineral/titanium, /area/space/nearstation) "c" = ( /obj/structure/shuttle/engine/heater{ @@ -17,18 +12,10 @@ dir = 1 }, /obj/structure/window/reinforced, -/turf/simulated/shuttle/plating, -/area/space/nearstation) -"d" = ( -/turf/template_noop, -/turf/simulated/shuttle/wall{ - tag = "icon-swall_f10"; - icon_state = "swall_f10"; - dir = 2 - }, +/turf/simulated/floor/plating/airless, /area/space/nearstation) "e" = ( -/obj/machinery/door/unpowered/shuttle, +/obj/machinery/door/airlock/titanium, /turf/simulated/floor/plasteel/airless, /area/space/nearstation) "f" = ( @@ -48,13 +35,6 @@ /obj/effect/mob_spawn/human/mime/corpse, /turf/simulated/floor/plasteel/airless, /area/space/nearstation) -"i" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall11"; - icon_state = "swall11"; - dir = 2 - }, -/area/space/nearstation) "j" = ( /obj/structure/closet/crate, /obj/item/stack/ore/tranquillite, @@ -70,25 +50,12 @@ "k" = ( /turf/simulated/floor/plasteel/airless, /area/space/nearstation) -"l" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall7"; - dir = 2 - }, -/area/space/nearstation) "m" = ( /turf/simulated/mineral, /area/space/nearstation) "n" = ( /turf/simulated/floor/plating/asteroid/airless, /area/space/nearstation) -"o" = ( -/turf/simulated/floor/plating/asteroid/airless, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f5"; - dir = 2 - }, -/area/space/nearstation) "p" = ( /obj/item/shard{ icon_state = "small" @@ -106,14 +73,6 @@ /obj/item/stack/ore/tranquillite, /turf/simulated/floor/plasteel/airless, /area/space/nearstation) -"r" = ( -/turf/template_noop, -/turf/simulated/shuttle/wall{ - tag = "icon-swall_f9"; - icon_state = "swall_f9"; - dir = 2 - }, -/area/space/nearstation) "s" = ( /obj/item/shard, /turf/simulated/floor/plating/asteroid/airless, @@ -124,27 +83,6 @@ }, /turf/simulated/floor/plasteel/airless, /area/space/nearstation) -"u" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall3"; - dir = 2 - }, -/area/space/nearstation) -"v" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall12"; - icon_state = "swall12"; - dir = 2 - }, -/area/space/nearstation) -"w" = ( -/turf/simulated/floor/plating/asteroid/airless, -/turf/simulated/shuttle/wall{ - tag = "icon-swall_f9"; - icon_state = "swall_f9"; - dir = 2 - }, -/area/space/nearstation) "x" = ( /obj/effect/mob_spawn/human/clown/corpse, /turf/simulated/floor/plasteel/airless, @@ -176,7 +114,7 @@ /obj/structure/window/reinforced{ dir = 8 }, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/space/nearstation) "B" = ( /obj/structure/shuttle/engine/propulsion{ @@ -189,7 +127,7 @@ icon_state = "burst_r"; tag = "icon-burst_r (WEST)" }, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/space/nearstation) "C" = ( /obj/effect/mob_spawn/human/corpse/clownmili, @@ -205,7 +143,7 @@ icon_state = "propulsion_l"; tag = "icon-propulsion_l (WEST)" }, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/space/nearstation) "F" = ( /obj/structure/computerframe/HONKputer, @@ -231,14 +169,7 @@ /turf/simulated/floor/plasteel/airless, /area/space/nearstation) "J" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, +/obj/effect/spawner/window/shuttle, /turf/simulated/floor/plating/airless, /area/space/nearstation) "K" = ( @@ -254,22 +185,6 @@ }, /turf/simulated/floor/plasteel/airless, /area/space/nearstation) -"M" = ( -/turf/simulated/mineral/random/labormineral, -/turf/simulated/shuttle/wall{ - tag = "icon-swall_f5"; - icon_state = "swall_f5"; - dir = 2 - }, -/area/space/nearstation) -"N" = ( -/turf/simulated/floor/plasteel/airless, -/turf/simulated/shuttle/wall{ - tag = "icon-swall_f10"; - icon_state = "swall_f10"; - dir = 2 - }, -/area/space/nearstation) "O" = ( /obj/effect/mob_spawn/human/corpse/clownoff, /turf/simulated/floor/plasteel/airless, @@ -297,7 +212,7 @@ icon_state = "propulsion_l"; tag = "icon-propulsion_l (WEST)" }, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/space/nearstation) (1,1,1) = {" @@ -480,7 +395,7 @@ a a a b -o +b m m m @@ -501,8 +416,8 @@ a (10,1,1) = {" b e -i -i +b +b m m m @@ -587,11 +502,11 @@ m a "} (14,1,1) = {" -d +b e -l -l -u +b +b +b m m n @@ -611,8 +526,8 @@ a (15,1,1) = {" a a -d -r +b +b m m m @@ -643,7 +558,7 @@ b m m J -M +b m m m @@ -661,11 +576,11 @@ a a a a -v +b m F k -v +b m m m @@ -683,12 +598,12 @@ a a a b -w +b m G K -N -M +b +b m m m @@ -704,13 +619,13 @@ a a a a -v +b n p H k O -v +b m m m @@ -726,13 +641,13 @@ a a a a -v +b x C k L P -v +b m m m @@ -792,13 +707,13 @@ a a a a -v +b y k k k Q -v +b m a a @@ -814,13 +729,13 @@ a a a a -v +b y k D k y -v +b m a a @@ -836,13 +751,13 @@ a a a a -v +b z D k k y -v +b m a a @@ -858,13 +773,13 @@ a a a a -v +b k k D D k -v +b a a a @@ -880,13 +795,13 @@ a a a a -d +b A A A A A -r +b a a a diff --git a/_maps/map_files/RandomRuins/SpaceRuins/derelict4.dmm b/_maps/map_files/RandomRuins/SpaceRuins/derelict4.dmm index ce660407cca..019d72b4145 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/derelict4.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/derelict4.dmm @@ -12,17 +12,17 @@ /turf/simulated/mineral/random/high_chance, /area/ruin/unpowered) "e" = ( -/turf/simulated/shuttle/wall, +/turf/simulated/wall/mineral/titanium, /area/ruin/unpowered) "f" = ( -/obj/machinery/door/airlock/shuttle, +/obj/machinery/door/airlock/titanium, /turf/simulated/floor/plating/airless, /area/ruin/unpowered) "g" = ( /turf/simulated/floor/plating/airless, /area/ruin/unpowered) "h" = ( -/turf/simulated/floor/mineral/titanium/blue, +/turf/simulated/floor/mineral/titanium/blue/airless, /area/ruin/unpowered) "i" = ( /obj/structure/window/reinforced{ @@ -31,15 +31,15 @@ dir = 8 }, /obj/structure/chair/comfy/shuttle, -/turf/simulated/floor/mineral/titanium/blue, +/turf/simulated/floor/mineral/titanium/blue/airless, /area/ruin/unpowered) "j" = ( /obj/structure/chair/comfy/shuttle, -/turf/simulated/floor/mineral/titanium/blue, +/turf/simulated/floor/mineral/titanium/blue/airless, /area/ruin/unpowered) "k" = ( /obj/effect/spawner/lootdrop/crate_spawner, -/turf/simulated/floor/mineral/titanium/blue, +/turf/simulated/floor/mineral/titanium/blue/airless, /area/ruin/unpowered) "l" = ( /obj/structure/shuttle/engine/propulsion{ @@ -47,7 +47,7 @@ icon_state = "propulsion"; tag = "icon-propulsion (WEST)" }, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/ruin/unpowered) "m" = ( /obj/item/shard, @@ -65,14 +65,14 @@ /area/ruin/unpowered) "p" = ( /obj/structure/table, -/turf/simulated/floor/mineral/titanium/blue, +/turf/simulated/floor/mineral/titanium/blue/airless, /area/ruin/unpowered) "q" = ( /obj/item/shard, /obj/structure/chair/comfy/shuttle{ dir = 8 }, -/turf/simulated/floor/mineral/titanium/blue, +/turf/simulated/floor/mineral/titanium/blue/airless, /area/ruin/unpowered) "r" = ( /obj/structure/window/reinforced{ @@ -83,7 +83,7 @@ /obj/structure/chair/comfy/shuttle{ dir = 1 }, -/turf/simulated/floor/mineral/titanium/blue, +/turf/simulated/floor/mineral/titanium/blue/airless, /area/ruin/unpowered) "s" = ( /obj/structure/chair/comfy/shuttle{ diff --git a/_maps/map_files/RandomRuins/SpaceRuins/dj.dmm b/_maps/map_files/RandomRuins/SpaceRuins/dj.dmm index 57a4f32e098..334a71acb15 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/dj.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/dj.dmm @@ -770,15 +770,6 @@ icon_state = "freezerfloor" }, /area/djstation) -"bK" = ( -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/turf/simulated/wall/mineral/titanium/nodecon/tileblend{ - fixed_underlay = list("icon" = 'icons/turf/floors.dmi', "icon_state" = "dark"); - icon_state = "4-i" - }, -/area/djstation) "bL" = ( /obj/structure/chair/stool, /turf/simulated/floor/plasteel{ @@ -1258,7 +1249,7 @@ bd aV bv bF -bK +ao ao ao aa diff --git a/_maps/map_files/RandomRuins/SpaceRuins/intactemptyship.dmm b/_maps/map_files/RandomRuins/SpaceRuins/intactemptyship.dmm index ad1ca6cf96a..3874c094d78 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/intactemptyship.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/intactemptyship.dmm @@ -3,23 +3,7 @@ /turf/template_noop, /area/template_noop) "b" = ( -/turf/template_noop, -/turf/simulated/shuttle/wall{ - dir = 8; - icon_state = "diagonalWall3" - }, -/area/ruin/powered) -"c" = ( -/turf/simulated/shuttle/wall{ - icon_state = "wall3" - }, -/area/ruin/powered) -"d" = ( -/turf/template_noop, -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "diagonalWall3" - }, +/turf/simulated/wall/mineral/plastitanium, /area/ruin/powered) "e" = ( /obj/structure/shuttle/engine/propulsion{ @@ -27,7 +11,7 @@ icon_state = "propulsion"; tag = "icon-propulsion (EAST)" }, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/ruin/powered) "f" = ( /obj/structure/window/reinforced{ @@ -38,21 +22,15 @@ icon_state = "heater"; dir = 8 }, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/ruin/powered) "g" = ( /obj/structure/table/wood, /obj/item/clothing/under/shorts/black, -/turf/simulated/shuttle/floor{ - tag = "icon-floor5"; - icon_state = "floor5" - }, +/turf/simulated/floor/mineral/titanium/purple, /area/ruin/powered) "h" = ( -/turf/simulated/shuttle/floor{ - tag = "icon-floor5"; - icon_state = "floor5" - }, +/turf/simulated/floor/mineral/titanium/purple, /area/ruin/powered) "i" = ( /obj/structure/table, @@ -60,117 +38,72 @@ /obj/machinery/light{ dir = 1 }, -/turf/simulated/shuttle/floor{ - tag = "icon-floor5"; - icon_state = "floor5" - }, +/turf/simulated/floor/mineral/titanium/purple, /area/ruin/powered) "j" = ( /obj/structure/closet, -/turf/simulated/shuttle/floor{ - tag = "icon-floor5"; - icon_state = "floor5" - }, +/turf/simulated/floor/mineral/titanium/purple, /area/ruin/powered) "k" = ( /obj/machinery/vending/assist, -/turf/simulated/shuttle/floor{ - tag = "icon-floor5"; - icon_state = "floor5" - }, +/turf/simulated/floor/mineral/titanium/purple, /area/ruin/powered) "l" = ( /obj/structure/table/wood, /obj/item/clothing/shoes/sandal, -/turf/simulated/shuttle/floor{ - tag = "icon-floor5"; - icon_state = "floor5" - }, +/turf/simulated/floor/mineral/titanium/purple, /area/ruin/powered) "m" = ( /obj/machinery/light{ dir = 8 }, -/turf/simulated/shuttle/floor{ - tag = "icon-floor5"; - icon_state = "floor5" - }, +/turf/simulated/floor/mineral/titanium/purple, /area/ruin/powered) "n" = ( /obj/structure/table/wood, -/turf/simulated/shuttle/floor{ - tag = "icon-floor5"; - icon_state = "floor5" - }, +/turf/simulated/floor/mineral/titanium/purple, /area/ruin/powered) "o" = ( /obj/structure/table/wood, /obj/machinery/computer/library/checkout, -/turf/simulated/shuttle/floor{ - tag = "icon-floor5"; - icon_state = "floor5" - }, +/turf/simulated/floor/mineral/titanium/purple, /area/ruin/powered) "p" = ( -/obj/structure/window/full/reinforced, -/obj/structure/grille, -/turf/simulated/floor/plating, -/area/ruin/powered) -"q" = ( -/obj/structure/grille, -/obj/structure/window/full/reinforced, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/ruin/powered) "r" = ( /obj/structure/table, /obj/item/paper_bin, /obj/item/pen, -/turf/simulated/shuttle/floor{ - tag = "icon-floor5"; - icon_state = "floor5" - }, +/turf/simulated/floor/mineral/titanium/purple, /area/ruin/powered) "s" = ( /obj/machinery/door/poddoor{ id_tag = "strange ship"; name = "Strange Ship Blast Door" }, -/turf/simulated/shuttle/floor{ - tag = "icon-floor5"; - icon_state = "floor5" - }, +/turf/simulated/floor/mineral/titanium/purple, /area/ruin/powered) "t" = ( /obj/machinery/door/airlock/external, -/turf/simulated/shuttle/floor{ - tag = "icon-floor5"; - icon_state = "floor5" - }, +/turf/simulated/floor/mineral/titanium/purple, /area/ruin/powered) "u" = ( /obj/machinery/door/airlock/public/glass, -/turf/simulated/shuttle/floor{ - tag = "icon-floor5"; - icon_state = "floor5" - }, +/turf/simulated/floor/mineral/titanium/purple, /area/ruin/powered) "v" = ( /obj/structure/chair/comfy/shuttle{ dir = 4 }, -/turf/simulated/shuttle/floor{ - tag = "icon-floor5"; - icon_state = "floor5" - }, +/turf/simulated/floor/mineral/titanium/purple, /area/ruin/powered) "w" = ( /obj/structure/table, /obj/item/paper, /obj/item/pen, -/turf/simulated/shuttle/floor{ - tag = "icon-floor5"; - icon_state = "floor5" - }, +/turf/simulated/floor/mineral/titanium/purple, /area/ruin/powered) "x" = ( /obj/machinery/door_control{ @@ -179,52 +112,24 @@ pixel_y = 0; id = "strange ship" }, -/turf/simulated/shuttle/wall{ - icon_state = "wall3" - }, +/turf/simulated/wall/mineral/plastitanium, /area/ruin/powered) "y" = ( /obj/machinery/light, -/turf/simulated/shuttle/floor{ - tag = "icon-floor5"; - icon_state = "floor5" - }, +/turf/simulated/floor/mineral/titanium/purple, /area/ruin/powered) "z" = ( /mob/living/simple_animal/bot/medbot, -/turf/simulated/shuttle/floor{ - tag = "icon-floor5"; - icon_state = "floor5" - }, -/area/ruin/powered) -"A" = ( -/turf/template_noop, -/turf/simulated/shuttle/wall{ - dir = 1; - icon_state = "diagonalWall3" - }, +/turf/simulated/floor/mineral/titanium/purple, /area/ruin/powered) "B" = ( /obj/structure/chair/comfy/shuttle, -/turf/simulated/shuttle/floor{ - tag = "icon-floor5"; - icon_state = "floor5" - }, -/area/ruin/powered) -"C" = ( -/turf/template_noop, -/turf/simulated/shuttle/wall{ - dir = 4; - icon_state = "diagonalWall3" - }, +/turf/simulated/floor/mineral/titanium/purple, /area/ruin/powered) "D" = ( /obj/machinery/light, /obj/structure/bed, -/turf/simulated/shuttle/floor{ - tag = "icon-floor5"; - icon_state = "floor5" - }, +/turf/simulated/floor/mineral/titanium/purple, /area/ruin/powered) (1,1,1) = {" @@ -232,10 +137,10 @@ a a a b -c +b s x -d +b a a a @@ -244,11 +149,11 @@ a a e e -c +b n h h -c +b e e a @@ -257,43 +162,43 @@ a b f f -c +b o h y -c +b f f -d +b "} (4,1,1) = {" -c +b g l -c +b p t p -c +b B n -c +b "} (5,1,1) = {" -c +b h h -c +b h h z -c +b h n -c +b "} (6,1,1) = {" -c +b i h m @@ -303,10 +208,10 @@ h m h D -c +b "} (7,1,1) = {" -c +b j h h @@ -316,10 +221,10 @@ h h h h -c +b "} (8,1,1) = {" -c +b k h h @@ -329,70 +234,70 @@ h h h j -c +b "} (9,1,1) = {" -A -c -c -c -q +b +b +b +b +p u -q -c -c -c -C +p +b +b +b +b "} (10,1,1) = {" a a -c +b m h h h m -c +b a a "} (11,1,1) = {" a a -c +b h h v h h -c +b a a "} (12,1,1) = {" a a -c +b j r w n j -c +b a a "} (13,1,1) = {" a a -A -c -c -c -c -c -C +b +b +b +b +b +b +b a a "} diff --git a/_maps/map_files/RandomRuins/SpaceRuins/listeningpost.dmm b/_maps/map_files/RandomRuins/SpaceRuins/listeningpost.dmm index 5607083f0a8..61faecbacdf 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/listeningpost.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/listeningpost.dmm @@ -96,7 +96,7 @@ "t" = ( /obj/structure/rack, /obj/item/tank/jetpack/carbondioxide, -/obj/item/tank/air, +/obj/item/tank/internals/air, /turf/simulated/floor/plasteel, /area/ruin/powered) "u" = ( diff --git a/_maps/map_files/RandomRuins/SpaceRuins/mechtransport.dmm b/_maps/map_files/RandomRuins/SpaceRuins/mechtransport.dmm index 99b254e2684..835b69d00fc 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/mechtransport.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/mechtransport.dmm @@ -3,133 +3,84 @@ /turf/template_noop, /area/template_noop) "b" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall_s6"; - icon_state = "swall_s6" - }, +/turf/simulated/wall/mineral/titanium, /area/ruin/powered) "c" = ( -/obj/structure/grille, -/obj/structure/window/full/reinforced, +/obj/effect/spawner/window/shuttle, /turf/simulated/floor/plating/airless, /area/ruin/powered) -"d" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall_s10"; - icon_state = "swall_s10" - }, -/area/ruin/powered) -"e" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall3"; - icon_state = "swall3" - }, -/area/ruin/powered) "f" = ( /obj/structure/closet/crate/secure/loot, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue/airless, /area/ruin/powered) "g" = ( /obj/structure/table, /obj/machinery/door_control{ id = "mecha cargo" }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue/airless, /area/ruin/powered) "h" = ( /obj/structure/table, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue/airless, /area/ruin/powered) "i" = ( /obj/machinery/computer/shuttle, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue/airless, /area/ruin/powered) "j" = ( /obj/effect/decal/cleanable/vomit, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue/airless, /area/ruin/powered) "k" = ( /obj/effect/decal/remains/human, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue/airless, /area/ruin/powered) "l" = ( -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue/airless, /area/ruin/powered) "m" = ( /obj/structure/chair/comfy/shuttle{ dir = 1 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue/airless, /area/ruin/powered) "n" = ( /obj/machinery/computer/mecha, -/turf/simulated/shuttle/floor, -/area/ruin/powered) -"o" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall13"; - icon_state = "swall13" - }, +/turf/simulated/floor/mineral/titanium/blue/airless, /area/ruin/powered) "p" = ( /obj/machinery/door/airlock/hatch, -/turf/simulated/shuttle/floor{ - tag = "icon-floor3"; - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium/airless, /area/ruin/powered) "q" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall12"; - icon_state = "swall12" - }, +/turf/simulated/wall/mineral/titanium/nodiagonal, /area/ruin/powered) "r" = ( -/turf/simulated/shuttle/floor{ - tag = "icon-floor3"; - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium/airless, /area/ruin/powered) "s" = ( /obj/structure/mecha_wreckage/phazon, -/turf/simulated/shuttle/floor{ - tag = "icon-floor2"; - icon_state = "floor2" - }, +/turf/simulated/floor/mineral/titanium/yellow/airless, /area/ruin/powered) "t" = ( -/turf/simulated/shuttle/floor{ - tag = "icon-floor2"; - icon_state = "floor2" - }, +/turf/simulated/floor/mineral/titanium/yellow/airless, /area/ruin/powered) "u" = ( /obj/structure/mecha_wreckage/ripley/firefighter, -/turf/simulated/shuttle/floor{ - tag = "icon-floor2"; - icon_state = "floor2" - }, +/turf/simulated/floor/mineral/titanium/yellow/airless, /area/ruin/powered) "v" = ( /obj/structure/mecha_wreckage/ripley, -/turf/simulated/shuttle/floor{ - tag = "icon-floor2"; - icon_state = "floor2" - }, +/turf/simulated/floor/mineral/titanium/yellow/airless, /area/ruin/powered) "w" = ( /obj/effect/decal/cleanable/blood/oil, -/turf/simulated/shuttle/floor{ - tag = "icon-floor2"; - icon_state = "floor2" - }, +/turf/simulated/floor/mineral/titanium/yellow/airless, /area/ruin/powered) "x" = ( /obj/effect/decal/cleanable/blood/gibs/robot/up, -/turf/simulated/shuttle/floor{ - tag = "icon-floor2"; - icon_state = "floor2" - }, +/turf/simulated/floor/mineral/titanium/yellow/airless, /area/ruin/powered) "y" = ( /obj/machinery/door/poddoor{ @@ -137,24 +88,15 @@ name = "Cargo Bay Door"; tag = "" }, -/turf/simulated/shuttle/floor{ - tag = "icon-floor3"; - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium/airless, /area/ruin/powered) "z" = ( /obj/effect/decal/cleanable/blood/gibs/robot, -/turf/simulated/shuttle/floor{ - tag = "icon-floor2"; - icon_state = "floor2" - }, +/turf/simulated/floor/mineral/titanium/yellow/airless, /area/ruin/powered) "A" = ( /obj/structure/mecha_wreckage/durand, -/turf/simulated/shuttle/floor{ - tag = "icon-floor2"; - icon_state = "floor2" - }, +/turf/simulated/floor/mineral/titanium/yellow/airless, /area/ruin/powered) "B" = ( /obj/item/stack/tile/plasteel{ @@ -184,10 +126,7 @@ pixel_y = 8 }, /obj/effect/decal/cleanable/blood/gibs/robot, -/turf/simulated/shuttle/floor{ - tag = "icon-floor2"; - icon_state = "floor2" - }, +/turf/simulated/floor/mineral/titanium/yellow/airless, /area/ruin/powered) "H" = ( /obj/effect/landmark/damageturf, @@ -195,10 +134,7 @@ /area/ruin/powered) "J" = ( /obj/structure/mecha_wreckage/odysseus, -/turf/simulated/shuttle/floor{ - tag = "icon-floor2"; - icon_state = "floor2" - }, +/turf/simulated/floor/mineral/titanium/yellow/airless, /area/ruin/powered) "K" = ( /obj/item/stack/sheet/metal, @@ -206,46 +142,22 @@ /area/space/nearstation) "L" = ( /obj/structure/mecha_wreckage/gygax, -/turf/simulated/shuttle/floor{ - tag = "icon-floor3"; - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium/airless, /area/ruin/powered) "M" = ( -/turf/unsimulated/floor/plating/airless, +/turf/simulated/floor/plating/airless, /area/space/nearstation) -"N" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall14"; - icon_state = "swall14" - }, -/area/ruin/powered) -"O" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall_s9"; - icon_state = "swall_s9" - }, -/area/ruin/powered) "P" = ( /obj/item/stack/rods, /turf/template_noop, /area/space/nearstation) -"Q" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall15"; - icon_state = "swall15" - }, -/area/ruin/powered) "R" = ( /obj/structure/shuttle/engine/propulsion, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/ruin/powered) "U" = ( /obj/item/gps/ruin, -/turf/simulated/shuttle/wall{ - tag = "icon-swall12"; - icon_state = "swall12" - }, +/turf/simulated/wall/mineral/titanium, /area/ruin/powered) (1,1,1) = {" @@ -253,10 +165,10 @@ a a a b -e -e -e -e +b +b +b +b B D H @@ -267,9 +179,9 @@ a "} (2,1,1) = {" b -e -e -o +b +b +b r s w @@ -303,7 +215,7 @@ a c f k -q +b r t x @@ -337,7 +249,7 @@ a c h m -q +b r t v @@ -354,7 +266,7 @@ a c i n -q +b r v t @@ -368,10 +280,10 @@ b R "} (8,1,1) = {" -d -e -e -o +b +b +b +b r t t @@ -380,24 +292,24 @@ t w t r -N -Q +b +b R "} (9,1,1) = {" a a a -d -e -e +b +b +b y y y y y -e -O -d +b +q +b R "} diff --git a/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm index 6562103334e..8084a99f002 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm @@ -549,9 +549,7 @@ /turf/simulated/floor/plasteel, /area/ruin/space/ancientstation) "bD" = ( -/obj/structure/sign/redcross{ - icon_state = "greencross" - }, +/obj/structure/sign/greencross, /turf/simulated/wall/rust, /area/ruin/space/ancientstation) "bE" = ( @@ -1028,10 +1026,10 @@ /obj/structure/closet/crate/engineering{ name = "plasma tank crate" }, -/obj/item/tank/plasma/full, -/obj/item/tank/plasma/full, -/obj/item/tank/plasma/full, -/obj/item/tank/plasma/full, +/obj/item/tank/internals/plasma/full, +/obj/item/tank/internals/plasma/full, +/obj/item/tank/internals/plasma/full, +/obj/item/tank/internals/plasma/full, /turf/simulated/floor/plating, /area/ruin/space/ancientstation/thetacorridor) "cR" = ( @@ -1399,7 +1397,7 @@ "dP" = ( /obj/structure/table, /obj/effect/decal/cleanable/dirt, -/obj/item/tank/emergency_oxygen, +/obj/item/tank/internals/emergency_oxygen, /turf/simulated/floor/plasteel{ dir = 0; icon_state = "blue" @@ -1801,7 +1799,7 @@ "eJ" = ( /obj/structure/table, /obj/machinery/atmospherics/unary/vent_pump/on, -/obj/item/tank/oxygen, +/obj/item/tank/internals/oxygen, /obj/item/clothing/mask/breath, /turf/simulated/floor/plasteel{ dir = 9; @@ -1907,7 +1905,7 @@ "eV" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table, -/obj/item/tank/anesthetic, +/obj/item/tank/internals/anesthetic, /obj/item/clothing/mask/breath/medical, /turf/simulated/floor/plasteel{ icon_state = "white" diff --git a/_maps/map_files/RandomRuins/SpaceRuins/onehalf.dmm b/_maps/map_files/RandomRuins/SpaceRuins/onehalf.dmm index 93dc1fffed4..6e6e0e12f1f 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/onehalf.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/onehalf.dmm @@ -68,7 +68,7 @@ /turf/template_noop, /area/space/nearstation) "aj" = ( -/turf/unsimulated/floor/plating/airless, +/turf/simulated/floor/plating/airless, /area/ruin/onehalf/hallway) "ak" = ( /turf/simulated/wall, @@ -481,7 +481,7 @@ dir = 2; icon_state = "coil_red2" }, -/turf/unsimulated/floor/plating/airless, +/turf/simulated/floor/plating/airless, /area/ruin/onehalf/hallway) "bf" = ( /obj/structure/disposalpipe/segment{ @@ -746,7 +746,7 @@ /area/ruin/onehalf/drone_bay) "bJ" = ( /obj/structure/girder, -/turf/unsimulated/floor/plating/airless, +/turf/simulated/floor/plating/airless, /area/ruin/onehalf/hallway) "bK" = ( /obj/machinery/vending/coffee{ @@ -813,16 +813,9 @@ /obj/effect/landmark/damageturf, /turf/simulated/floor/plating, /area/ruin/onehalf/hallway) -"bW" = ( -/obj/structure/girder/reinforced, -/turf/unsimulated/floor/plating/airless, -/area/ruin/onehalf/hallway) "bX" = ( /turf/simulated/wall/r_wall, /area/ruin/onehalf/hallway) -"bY" = ( -/turf/simulated/floor/plating/airless, -/area/ruin/onehalf/hallway) "bZ" = ( /obj/structure/disposalpipe/junction{ tag = "icon-pipe-j1 (NORTH)"; @@ -902,7 +895,7 @@ /area/ruin/onehalf/hallway) "ck" = ( /obj/structure/girder/reinforced, -/turf/unsimulated/floor/plating/airless, +/turf/simulated/floor/plating/airless, /area/space/nearstation) "cl" = ( /obj/effect/landmark/damageturf, @@ -1011,7 +1004,7 @@ /turf/template_noop, /area/space/nearstation) "cw" = ( -/turf/unsimulated/floor/plating/airless, +/turf/simulated/floor/plating/airless, /area/space/nearstation) "cx" = ( /obj/structure/lattice, @@ -1126,7 +1119,7 @@ /area/ruin/onehalf/bridge) "cM" = ( /obj/structure/safe/floor, -/obj/item/tank/oxygen/red, +/obj/item/tank/internals/oxygen/red, /obj/item/clothing/mask/gas/syndicate, /obj/item/clothing/suit/space/hardsuit/syndi, /obj/item/reagent_containers/food/drinks/bottle/rum, @@ -1572,7 +1565,7 @@ ag bh bv bL -bW +bP ck cw aa @@ -1616,7 +1609,7 @@ ag bf bw bO -bY +aj aa aa cE @@ -1662,9 +1655,9 @@ aL bX bX ax -bY +aj cF -bY +aj ax bX bP diff --git a/_maps/map_files/RandomRuins/SpaceRuins/spacebar.dmm b/_maps/map_files/RandomRuins/SpaceRuins/spacebar.dmm index 46bb64b8c60..cf634eb3490 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/spacebar.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/spacebar.dmm @@ -33,41 +33,22 @@ /turf/simulated/mineral, /area/ruin/powered) "aj" = ( -/turf/simulated/floor/plating/asteroid/airless, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f6"; - dir = 2 - }, +/turf/simulated/wall/mineral/titanium, /area/ruin/powered) "ak" = ( -/obj/structure/grille, -/obj/structure/window/full/shuttle, +/obj/effect/spawner/window/shuttle, /turf/simulated/floor/plating, /area/ruin/powered) -"al" = ( -/turf/simulated/floor/plating/asteroid/airless, -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall_f10"; - layer = 2 - }, -/area/ruin/powered) "am" = ( /turf/simulated/wall, /area/ruin/powered{ name = "Space Bar" }) -"an" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall3"; - dir = 2 - }, -/area/ruin/powered) "ao" = ( /obj/structure/chair/comfy/shuttle{ dir = 1 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue/airless, /area/ruin/powered) "ap" = ( /obj/structure/table, @@ -124,7 +105,7 @@ name = "Space Bar" }) "ax" = ( -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue/airless, /area/ruin/powered) "ay" = ( /obj/machinery/door/airlock{ @@ -144,25 +125,13 @@ }) "aA" = ( /obj/structure/shuttle/engine/propulsion/burst, -/turf/simulated/floor/plating, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f5"; - dir = 2 - }, +/turf/simulated/wall/mineral/titanium, /area/ruin/powered) "aB" = ( -/obj/machinery/door/airlock/shuttle{ +/obj/machinery/door/airlock/titanium{ name = "Escape Pod Airlock" }, -/turf/simulated/shuttle/floor, -/area/ruin/powered) -"aC" = ( -/obj/structure/shuttle/engine/propulsion/burst, -/turf/simulated/floor/plating, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f9"; - dir = 2 - }, +/turf/simulated/floor/mineral/titanium/blue/airless, /area/ruin/powered) "aD" = ( /obj/machinery/door_control{ @@ -441,14 +410,6 @@ "bo" = ( /turf/simulated/floor/plating, /area/ruin/powered) -"bp" = ( -/obj/structure/shuttle/engine/propulsion/burst, -/turf/simulated/floor/plating/asteroid/airless, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f5"; - dir = 2 - }, -/area/ruin/powered) "bq" = ( /obj/machinery/door/poddoor/preopen{ id_tag = "pod cycle"; @@ -463,14 +424,6 @@ }, /turf/simulated/floor/plating, /area/ruin/powered) -"bs" = ( -/obj/structure/shuttle/engine/propulsion/burst, -/turf/simulated/floor/plating/asteroid/airless, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f9"; - dir = 2 - }, -/area/ruin/powered) "bt" = ( /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plating, @@ -951,8 +904,8 @@ ac af ag aj -an -an +aj +aj aA ag ag @@ -1034,10 +987,10 @@ ac af ag ag -al -an -an -aC +aj +aj +aj +aA ag ag ag @@ -1131,9 +1084,9 @@ ag ag ag aj -an -an -bp +aj +aj +aA ag ag ag @@ -1214,10 +1167,10 @@ aQ ag ag ag -al -an -an -bs +aj +aj +aj +aA ag ag ag diff --git a/_maps/map_files/RandomRuins/SpaceRuins/syndie_space_base.dmm b/_maps/map_files/RandomRuins/SpaceRuins/syndie_space_base.dmm new file mode 100644 index 00000000000..6f97ce3e9f8 --- /dev/null +++ b/_maps/map_files/RandomRuins/SpaceRuins/syndie_space_base.dmm @@ -0,0 +1,8654 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"aj" = ( +/obj/effect/spawner/window/reinforced, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/arrivals) +"ap" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/bar) +"ar" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0; + tag = "" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/turf/simulated/floor/plating, +/area/ruin/unpowered/syndicate_space_base/engineering) +"at" = ( +/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/ruin/unpowered/syndicate_space_base/engineering) +"av" = ( +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "whiteblue"; + tag = "icon-whitehall (WEST)" + }, +/area/ruin/unpowered/syndicate_space_base/medbay) +"aT" = ( +/obj/effect/decal/cleanable/blood, +/obj/item/clothing/mask/gas/clown_hat{ + desc = "What is this? A secret syndie space face, inside the secret syndie space base?"; + name = "syndicate clown mask" + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/dormitories) +"aX" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/turf/simulated/floor/plating, +/area/ruin/unpowered/syndicate_space_base/engineering) +"be" = ( +/obj/machinery/atmospherics/binary/pump/on{ + name = "Air To Distro" + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/engineering) +"br" = ( +/obj/effect/turf_decal/stripes/red/line, +/obj/machinery/door_control{ + id = "syndie_lavaland_vault"; + name = "Vault Bolt Control"; + normaldoorcontrol = 1; + pixel_x = 24; + pixel_y = -24; + req_access_txt = "150"; + specialfunctions = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 2; + icon_state = "brown" + }, +/area/ruin/unpowered/syndicate_space_base/cargo) +"bw" = ( +/turf/simulated/floor/plasteel{ + icon_state = "whitebluefull"; + tag = "icon-whitebluefull" + }, +/area/ruin/unpowered/syndicate_space_base/medbay) +"bO" = ( +/obj/structure/rack, +/obj/item/rpd{ + pixel_y = 3 + }, +/turf/simulated/floor/plating, +/area/ruin/unpowered/syndicate_space_base/engineering) +"bS" = ( +/obj/structure/chair{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + icon_state = "whitegreenfull"; + tag = "icon-whitebluefull" + }, +/area/ruin/unpowered/syndicate_space_base/virology) +"bT" = ( +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/ruin/unpowered/syndicate_space_base/chemistry) +"bY" = ( +/obj/structure/table, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/arrivals) +"cg" = ( +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "darkbluecorners" + }, +/area/ruin/unpowered/syndicate_space_base/dormitories) +"ch" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/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{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/ruin/unpowered/syndicate_space_base/engineering) +"cj" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/arrivals) +"cs" = ( +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "whitegreen"; + tag = "icon-whitegreen (WEST)" + }, +/area/ruin/unpowered/syndicate_space_base/virology) +"cB" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5; + level = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/chemistry) +"cC" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + pixel_y = 0; + tag = "" + }, +/obj/machinery/light, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/main) +"cD" = ( +/obj/machinery/atmospherics/pipe/manifold/visible{ + dir = 4; + initialize_directions = 11; + level = 2 + }, +/obj/machinery/meter, +/turf/simulated/floor/plating, +/area/ruin/unpowered/syndicate_space_base/engineering) +"cE" = ( +/obj/machinery/atmospherics/binary/valve, +/turf/simulated/floor/plating, +/area/ruin/unpowered/syndicate_space_base/engineering) +"cH" = ( +/obj/machinery/door/window/eastright{ + name = "Animal Storage"; + req_access_txt = "150"; + req_one_access_txt = "150" + }, +/obj/structure/window/basic{ + dir = 1 + }, +/turf/simulated/floor/grass, +/area/ruin/unpowered/syndicate_space_base/bar) +"cJ" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5; + level = 1 + }, +/turf/simulated/floor/engine, +/area/ruin/unpowered/syndicate_space_base/testlab) +"cL" = ( +/obj/structure/cable{ + d2 = 8; + icon_state = "0-8" + }, +/obj/machinery/power/apc/syndicate{ + dir = 1; + name = "Medical APC"; + pixel_y = 24 + }, +/turf/simulated/floor/plasteel{ + dir = 5; + icon_state = "whiteblue"; + tag = "icon-whiteblue (NORTHEAST)" + }, +/area/ruin/unpowered/syndicate_space_base/medbay) +"cO" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 4; + icon_state = "1-4"; + tag = "90Curve" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/ruin/unpowered/syndicate_space_base/medbay) +"cS" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4; + initialize_directions = 11; + level = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "floorgrime" + }, +/area/ruin/unpowered/syndicate_space_base/bar) +"cU" = ( +/obj/structure/table/glass, +/obj/machinery/reagentgrinder{ + pixel_y = 5 + }, +/obj/item/reagent_containers/glass/beaker/large, +/turf/simulated/floor/plasteel{ + dir = 5; + icon_state = "whitepurple"; + tag = "icon-whitepurple (NORTHEAST)" + }, +/area/ruin/unpowered/syndicate_space_base/chemistry) +"di" = ( +/turf/simulated/floor/plasteel{ + icon_state = "grimy" + }, +/area/ruin/unpowered/syndicate_space_base/bar) +"dl" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/dormitories) +"ds" = ( +/obj/structure/sign/poster/contraband/hacking_guide, +/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/area/ruin/unpowered/syndicate_space_base/engineering) +"dH" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/turf/simulated/floor/engine, +/area/ruin/unpowered/syndicate_space_base/testlab) +"dP" = ( +/obj/effect/decal/warning_stripes/yellow, +/obj/machinery/portable_atmospherics/canister/sleeping_agent, +/turf/simulated/floor/plating, +/area/ruin/unpowered/syndicate_space_base/engineering) +"dS" = ( +/obj/structure/closet/crate, +/obj/item/extinguisher{ + pixel_x = -5; + pixel_y = 5 + }, +/obj/item/extinguisher{ + pixel_x = -2; + pixel_y = 2 + }, +/obj/item/extinguisher{ + pixel_x = 1; + pixel_y = -1 + }, +/obj/item/flashlight{ + pixel_x = -5; + pixel_y = 5 + }, +/obj/item/flashlight{ + pixel_x = -2; + pixel_y = 2 + }, +/obj/item/flashlight{ + pixel_x = 1; + pixel_y = -1 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "brown" + }, +/area/ruin/unpowered/syndicate_space_base/cargo) +"dW" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + pixel_y = 0; + tag = "" + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/arrivals) +"el" = ( +/obj/structure/table/reinforced, +/obj/item/storage/box/monkeycubes/syndicate, +/obj/item/storage/box/monkeycubes/syndicate, +/obj/item/storage/box/monkeycubes/syndicate, +/obj/item/storage/box/monkeycubes/syndicate, +/obj/item/storage/box/monkeycubes/syndicate, +/turf/simulated/floor/plasteel{ + dir = 6; + icon_state = "brown" + }, +/area/ruin/unpowered/syndicate_space_base/cargo) +"em" = ( +/obj/structure/table, +/obj/machinery/door_control{ + id = "SSBrestricted"; + name = "Shutters Control"; + pixel_x = 6; + req_access_txt = "151" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "darkred" + }, +/area/ruin/unpowered/syndicate_space_base/arrivals) +"eC" = ( +/obj/machinery/atmospherics/unary/thermomachine/freezer, +/turf/simulated/floor/plating, +/area/ruin/unpowered/syndicate_space_base/engineering) +"eN" = ( +/obj/machinery/light{ + dir = 1; + on = 1 + }, +/turf/simulated/floor/engine, +/area/ruin/unpowered/syndicate_space_base/testlab) +"eQ" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0; + tag = "" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plating, +/area/ruin/unpowered/syndicate_space_base/engineering) +"eV" = ( +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "whiteblue"; + tag = "icon-whiteblue (NORTH)" + }, +/area/ruin/unpowered/syndicate_space_base/medbay) +"fb" = ( +/obj/machinery/kitchen_machine/microwave, +/obj/structure/table, +/turf/simulated/floor/plasteel{ + dir = 2; + icon_state = "cafeteria"; + tag = "icon-cafeteria (NORTHEAST)" + }, +/area/ruin/unpowered/syndicate_space_base/bar) +"fe" = ( +/obj/effect/spawner/window/reinforced, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/chemistry) +"ff" = ( +/obj/machinery/cryopod/offstation, +/turf/simulated/floor/plasteel{ + dir = 6; + icon_state = "darkblue" + }, +/area/ruin/unpowered/syndicate_space_base/dormitories) +"fi" = ( +/obj/machinery/atmospherics/pipe/simple/visible, +/turf/simulated/floor/engine/air, +/area/ruin/unpowered/syndicate_space_base/engineering) +"fn" = ( +/obj/machinery/vending/syndichem, +/obj/structure/extinguisher_cabinet{ + pixel_x = -5; + pixel_y = 30 + }, +/turf/simulated/floor/plasteel{ + dir = 9; + icon_state = "whitepurple"; + tag = "icon-whitepurple (NORTHWEST)" + }, +/area/ruin/unpowered/syndicate_space_base/chemistry) +"fu" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/chem_master, +/turf/simulated/floor/plasteel{ + dir = 10; + icon_state = "whitepurple"; + tag = "icon-whitepurple (SOUTHWEST)" + }, +/area/ruin/unpowered/syndicate_space_base/chemistry) +"fx" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0; + tag = "" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/main) +"fF" = ( +/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/area/ruin/unpowered/syndicate_space_base/dormitories) +"fH" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0; + tag = "" + }, +/turf/simulated/floor/engine, +/area/ruin/unpowered/syndicate_space_base/testlab) +"fP" = ( +/obj/effect/mob_spawn/human/spacebase_syndicate{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + dir = 9; + icon_state = "darkblue" + }, +/area/ruin/unpowered/syndicate_space_base/dormitories) +"fQ" = ( +/obj/structure/cable{ + 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{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/main) +"fU" = ( +/obj/machinery/alarm/syndicate{ + pixel_y = 24 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/telecomms) +"fX" = ( +/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ + dir = 4 + }, +/turf/simulated/floor/engine/vacuum, +/area/ruin/unpowered/syndicate_space_base/engineering) +"ge" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0; + tag = "" + }, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/chemistry) +"gg" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plasteel{ + icon_state = "whitegreenfull"; + tag = "icon-whitebluefull" + }, +/area/ruin/unpowered/syndicate_space_base/virology) +"gh" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "yellow" + }, +/area/ruin/unpowered/syndicate_space_base/engineering) +"gj" = ( +/obj/structure/sign/securearea{ + name = "\improper STAY CLEAR HEAVY MACHINERY"; + pixel_y = 32 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/arrivals) +"gl" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0; + tag = "" + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/dormitories) +"gn" = ( +/obj/structure/sign/poster/contraband/syndicate_pistol, +/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/area/ruin/unpowered/syndicate_space_base/cargo) +"gs" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/main) +"gu" = ( +/obj/machinery/atmospherics/unary/portables_connector{ + dir = 1 + }, +/obj/machinery/portable_atmospherics/canister/toxins, +/turf/simulated/floor/plating, +/area/ruin/unpowered/syndicate_space_base/engineering) +"gD" = ( +/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/area/ruin/unpowered/syndicate_space_base/medbay) +"gS" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/obj/structure/bed/roller, +/obj/machinery/iv_drip, +/obj/item/reagent_containers/iv_bag/blood/OMinus, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "whiteblue"; + tag = "icon-whiteblue (WEST)" + }, +/area/ruin/unpowered/syndicate_space_base/medbay) +"gY" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/redgrid, +/area/ruin/unpowered/syndicate_space_base/telecomms) +"gZ" = ( +/obj/machinery/light, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4; + level = 1 + }, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/arrivals) +"hc" = ( +/obj/machinery/atmospherics/binary/volume_pump, +/turf/simulated/floor/plating, +/area/ruin/unpowered/syndicate_space_base/engineering) +"hp" = ( +/obj/structure/table/glass, +/obj/machinery/reagentgrinder{ + pixel_y = 5 + }, +/obj/item/reagent_containers/glass/beaker/large, +/obj/structure/cable{ + d2 = 2; + icon_state = "0-2" + }, +/obj/machinery/power/apc/syndicate{ + dir = 1; + name = "Chemistry APC"; + pixel_y = 24 + }, +/turf/simulated/floor/plasteel{ + dir = 5; + icon_state = "whitepurple"; + tag = "icon-whitepurple (NORTHEAST)" + }, +/area/ruin/unpowered/syndicate_space_base/chemistry) +"hq" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4; + level = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/arrivals) +"hr" = ( +/obj/machinery/atmospherics/pipe/manifold/visible{ + dir = 8 + }, +/obj/machinery/meter, +/turf/simulated/floor/plating, +/area/ruin/unpowered/syndicate_space_base/engineering) +"hB" = ( +/obj/machinery/plantgenes, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/bar) +"hK" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/main) +"hO" = ( +/obj/item/stack/sheet/mineral/plastitanium{ + amount = 30; + pixel_x = 5; + pixel_y = 5 + }, +/obj/item/stack/sheet/mineral/plastitanium{ + amount = 30 + }, +/obj/item/stack/sheet/mineral/plastitanium{ + amount = 30; + pixel_x = -5; + pixel_y = -5 + }, +/obj/structure/rack{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + dir = 5; + icon_state = "yellow" + }, +/area/ruin/unpowered/syndicate_space_base/engineering) +"hR" = ( +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4; + level = 1 + }, +/obj/effect/spawner/window/reinforced, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/telecomms) +"hS" = ( +/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 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/chemistry) +"hX" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4; + initialize_directions = 11; + level = 1 + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0; + tag = "" + }, +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8"; + tag = "" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/main) +"ia" = ( +/turf/simulated/mineral, +/area/ruin/unpowered/syndicate_space_base/testlab) +"ic" = ( +/turf/template_noop, +/area/template_noop) +"id" = ( +/obj/machinery/atmospherics/unary/passive_vent, +/turf/simulated/floor/engine/vacuum, +/area/ruin/unpowered/syndicate_space_base/engineering) +"ii" = ( +/obj/machinery/hydroponics/constructable, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/bar) +"ik" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/bar) +"in" = ( +/obj/machinery/kitchen_machine/oven, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 2; + icon_state = "cafeteria"; + tag = "icon-cafeteria (NORTHEAST)" + }, +/area/ruin/unpowered/syndicate_space_base/bar) +"ir" = ( +/obj/machinery/door/airlock/hatch/syndicate, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0; + tag = "" + }, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/virology) +"it" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 4; + icon_state = "1-4"; + tag = "" + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/bar) +"iy" = ( +/obj/structure/table, +/obj/machinery/photocopier/faxmachine/longrange/syndie{ + department = "Syndicate Bioweapon Research Outpost" + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/telecomms) +"iA" = ( +/obj/machinery/atmospherics/pipe/simple/visible/universal{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/engineering) +"iF" = ( +/obj/structure/table, +/obj/item/pen, +/obj/item/paper_bin, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/telecomms) +"iH" = ( +/obj/machinery/atmospherics/unary/thermomachine/heater, +/turf/simulated/floor/plating, +/area/ruin/unpowered/syndicate_space_base/engineering) +"ji" = ( +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/turf/simulated/floor/plating, +/area/ruin/unpowered/syndicate_space_base/engineering) +"jl" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/telecomms) +"jm" = ( +/obj/machinery/light/small, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/arrivals) +"jq" = ( +/obj/structure/chair{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "whitegreenfull"; + tag = "icon-whitebluefull" + }, +/area/ruin/unpowered/syndicate_space_base/virology) +"jt" = ( +/obj/structure/table, +/obj/item/storage/box/masks{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/item/storage/box/gloves{ + pixel_x = 5; + pixel_y = 5 + }, +/turf/simulated/floor/plasteel{ + dir = 6; + icon_state = "whiteblue"; + tag = "icon-whitehall (WEST)" + }, +/area/ruin/unpowered/syndicate_space_base/medbay) +"jy" = ( +/obj/structure/toilet{ + dir = 8 + }, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "freezerfloor" + }, +/area/ruin/unpowered/syndicate_space_base/arrivals) +"jB" = ( +/obj/structure/rack{ + dir = 8 + }, +/obj/item/soap/syndie, +/obj/item/soap/syndie, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/arrivals) +"jC" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/main) +"jI" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/ruin/unpowered/syndicate_space_base/virology) +"jO" = ( +/obj/structure/chair/stool/bar, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/bar) +"jS" = ( +/obj/machinery/atmospherics/pipe/manifold/visible{ + dir = 4; + initialize_directions = 11; + level = 2 + }, +/obj/machinery/meter, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/engineering) +"jW" = ( +/obj/structure/table/wood, +/obj/machinery/chem_dispenser/beer/upgraded{ + dir = 1 + }, +/obj/machinery/alarm/syndicate{ + pixel_y = 24 + }, +/turf/simulated/floor/plasteel{ + icon_state = "grimy" + }, +/area/ruin/unpowered/syndicate_space_base/bar) +"kg" = ( +/obj/machinery/computer/cryopod{ + pixel_x = -32; + req_one_access = null + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "darkblue" + }, +/area/ruin/unpowered/syndicate_space_base/dormitories) +"kk" = ( +/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" + }, +/area/ruin/unpowered/syndicate_space_base/main) +"ks" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "whitebluefull"; + tag = "icon-whitebluefull" + }, +/area/ruin/unpowered/syndicate_space_base/medbay) +"ku" = ( +/obj/structure/window/basic{ + dir = 4 + }, +/obj/structure/reagent_dispensers/watertank/high, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/bar) +"kC" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/chemistry) +"kD" = ( +/obj/structure/table, +/obj/item/paper_bin, +/obj/item/pen, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + dir = 10; + icon_state = "darkred" + }, +/area/ruin/unpowered/syndicate_space_base/arrivals) +"kE" = ( +/obj/effect/spawner/window/reinforced, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/telecomms) +"kI" = ( +/obj/machinery/portable_atmospherics/canister/toxins, +/obj/effect/decal/warning_stripes/yellow, +/turf/simulated/floor/plating, +/area/ruin/unpowered/syndicate_space_base/engineering) +"kU" = ( +/obj/structure/table/glass, +/obj/item/storage/box/beakers{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/storage/box/syringes, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "whitegreen"; + tag = "icon-whitegreen (EAST)" + }, +/area/ruin/unpowered/syndicate_space_base/virology) +"kY" = ( +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/ruin/unpowered/syndicate_space_base/engineering) +"lf" = ( +/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/area/ruin/unpowered/syndicate_space_base/main) +"lm" = ( +/obj/machinery/atmospherics/unary/passive_vent, +/turf/simulated/floor/engine/air, +/area/ruin/unpowered/syndicate_space_base/engineering) +"lo" = ( +/obj/machinery/optable, +/obj/machinery/light, +/turf/simulated/floor/plasteel{ + dir = 2; + icon_state = "whiteblue"; + tag = "icon-whitehall (WEST)" + }, +/area/ruin/unpowered/syndicate_space_base/medbay) +"lr" = ( +/obj/machinery/smartfridge, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/bar) +"lu" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plasteel{ + icon_state = "whitebluefull"; + tag = "icon-whitebluefull" + }, +/area/ruin/unpowered/syndicate_space_base/medbay) +"lv" = ( +/obj/structure/rack{ + dir = 8 + }, +/obj/item/stack/sheet/cardboard{ + amount = 3 + }, +/obj/item/stack/rods/twentyfive, +/obj/item/stock_parts/cell/high/plus, +/obj/item/storage/box/stockparts/deluxe, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "brown" + }, +/area/ruin/unpowered/syndicate_space_base/cargo) +"lw" = ( +/obj/structure/reagent_dispensers/fueltank, +/obj/effect/decal/warning_stripes/yellow, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "yellow" + }, +/area/ruin/unpowered/syndicate_space_base/engineering) +"ly" = ( +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "whitegreen"; + tag = "icon-whitegreen (WEST)" + }, +/area/ruin/unpowered/syndicate_space_base/virology) +"lB" = ( +/obj/machinery/smartfridge/secure/chemistry/virology/preloaded/syndicate, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "whitegreen"; + tag = "icon-whitegreen (WEST)" + }, +/area/ruin/unpowered/syndicate_space_base/virology) +"lM" = ( +/obj/effect/mob_spawn/human/spacebase_syndicate{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + dir = 6; + icon_state = "darkblue" + }, +/area/ruin/unpowered/syndicate_space_base/dormitories) +"lZ" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/machinery/power/terminal{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable/yellow{ + d1 = 0; + d2 = 2; + icon_state = "0-2" + }, +/turf/simulated/floor/plating, +/area/ruin/unpowered/syndicate_space_base/engineering) +"mh" = ( +/obj/structure/table/glass, +/obj/structure/reagent_dispensers/virusfood{ + pixel_y = 28 + }, +/obj/item/clothing/gloves/color/latex, +/obj/item/healthanalyzer, +/obj/item/clothing/glasses/hud/health, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/plasteel{ + dir = 5; + icon_state = "whitegreen"; + tag = "icon-whitegreen (NORTHEAST)" + }, +/area/ruin/unpowered/syndicate_space_base/virology) +"mi" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/main) +"mB" = ( +/obj/structure/cable{ + d2 = 2; + icon_state = "0-2" + }, +/obj/machinery/power/apc/syndicate{ + dir = 1; + name = "Telecomms APC"; + pixel_y = 24 + }, +/obj/structure/filingcabinet/chestdrawer, +/turf/simulated/floor/plasteel{ + 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, +/turf/simulated/floor/plating, +/area/ruin/unpowered/syndicate_space_base/engineering) +"mX" = ( +/obj/structure/sink{ + dir = 4; + icon_state = "sink"; + pixel_x = 10; + pixel_y = 0 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/chemistry) +"nc" = ( +/obj/machinery/atmospherics/unary/outlet_injector/on{ + dir = 8 + }, +/turf/simulated/floor/plating/airless, +/area/ruin/unpowered/syndicate_space_base/engineering) +"ne" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + pixel_y = 0; + tag = "" + }, +/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{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/main) +"nf" = ( +/obj/item/book/manual/chef_recipes{ + pixel_x = 2; + pixel_y = 6 + }, +/obj/structure/table, +/turf/simulated/floor/plasteel{ + dir = 2; + icon_state = "cafeteria"; + tag = "icon-cafeteria (NORTHEAST)" + }, +/area/ruin/unpowered/syndicate_space_base/bar) +"nj" = ( +/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/area/ruin/unpowered/syndicate_space_base/telecomms) +"nm" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 4; + icon_state = "1-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/plating, +/area/ruin/unpowered/syndicate_space_base/engineering) +"nr" = ( +/obj/machinery/door/airlock/vault{ + id_tag = "syndie_lavaland_vault"; + locked = 1; + req_access_txt = "150" + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/cargo) +"nv" = ( +/obj/machinery/light, +/turf/simulated/floor/engine, +/area/ruin/unpowered/syndicate_space_base/testlab) +"ny" = ( +/turf/simulated/floor/plasteel{ + dir = 2; + icon_state = "whitegreen"; + tag = "icon-whitehall (WEST)" + }, +/area/ruin/unpowered/syndicate_space_base/virology) +"nA" = ( +/turf/simulated/floor/grass, +/area/ruin/unpowered/syndicate_space_base/bar) +"nD" = ( +/obj/machinery/hydroponics/constructable, +/turf/simulated/floor/plasteel{ + icon_state = "floorgrime" + }, +/area/ruin/unpowered/syndicate_space_base/bar) +"nG" = ( +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "darkred" + }, +/area/ruin/unpowered/syndicate_space_base/cargo) +"nT" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + pixel_y = 0; + tag = "" + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/arrivals) +"nY" = ( +/obj/machinery/door/airlock/hatch/syndicate, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/ruin/unpowered/syndicate_space_base/virology) +"nZ" = ( +/obj/machinery/reagentgrinder, +/obj/item/stack/sheet/mineral/plasma{ + amount = 5 + }, +/obj/item/stack/sheet/mineral/uranium{ + amount = 10 + }, +/obj/item/stack/sheet/mineral/gold{ + amount = 10 + }, +/obj/structure/table/glass, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "whitegreen"; + tag = "icon-whitegreen (EAST)" + }, +/area/ruin/unpowered/syndicate_space_base/virology) +"ob" = ( +/obj/machinery/door/airlock/hatch/syndicate, +/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/ruin/unpowered/syndicate_space_base/arrivals) +"oi" = ( +/obj/machinery/door/airlock/hatch/syndicate, +/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 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/cargo) +"oj" = ( +/obj/structure/closet/crate, +/obj/item/storage/box/donkpockets{ + pixel_x = -2; + pixel_y = 6 + }, +/obj/item/storage/box/donkpockets{ + pixel_y = 3 + }, +/obj/item/storage/box/donkpockets{ + pixel_x = 2 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/power/apc/syndicate{ + dir = 1; + name = "Storage APC"; + pixel_y = 24 + }, +/obj/structure/cable{ + d2 = 2; + icon_state = "0-2" + }, +/turf/simulated/floor/plasteel{ + dir = 1; + 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{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/storage/firstaid/brute, +/obj/item/storage/firstaid/regular{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/structure/window/basic, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "whiteblue"; + tag = "icon-whitehall (WEST)" + }, +/area/ruin/unpowered/syndicate_space_base/medbay) +"oO" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 4; + icon_state = "1-4"; + tag = "90Curve" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4; + level = 1 + }, +/turf/simulated/floor/plasteel, +/area/ruin/unpowered/syndicate_space_base/cargo) +"oW" = ( +/obj/structure/window/basic{ + dir = 4 + }, +/obj/machinery/biogenerator, +/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, +/turf/simulated/floor/plasteel{ + icon_state = "floorgrime" + }, +/area/ruin/unpowered/syndicate_space_base/bar) +"oZ" = ( +/obj/effect/decal/warning_stripes/north, +/obj/machinery/atmospherics/binary/pump{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/ruin/unpowered/syndicate_space_base/engineering) +"pa" = ( +/obj/effect/mob_spawn/human/spacebase_syndicate{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + dir = 5; + icon_state = "darkblue" + }, +/area/ruin/unpowered/syndicate_space_base/dormitories) +"ph" = ( +/obj/machinery/light, +/obj/machinery/cryopod/offstation, +/turf/simulated/floor/plasteel{ + dir = 2; + icon_state = "darkblue" + }, +/area/ruin/unpowered/syndicate_space_base/dormitories) +"pp" = ( +/obj/machinery/vending/hydronutrients, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/bar) +"pA" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4; + level = 1 + }, +/obj/effect/spawner/window/reinforced, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/engineering) +"pG" = ( +/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/ruin/unpowered/syndicate_space_base/main) +"pI" = ( +/obj/structure/table/reinforced, +/obj/item/retractor, +/obj/item/hemostat, +/obj/effect/decal/cleanable/dirt, +/obj/item/cautery, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "whiteblue"; + tag = "icon-whiteblue (WEST)" + }, +/area/ruin/unpowered/syndicate_space_base/medbay) +"pK" = ( +/obj/item/flag/syndi, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "darkblue" + }, +/area/ruin/unpowered/syndicate_space_base/dormitories) +"pR" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0; + tag = "" + }, +/obj/machinery/door/firedoor, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/bar) +"qs" = ( +/turf/simulated/floor/plasteel{ + dir = 5; + icon_state = "darkred" + }, +/area/ruin/unpowered/syndicate_space_base/cargo) +"qt" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/computer/operating, +/turf/simulated/floor/plasteel{ + dir = 2; + icon_state = "whiteblue"; + tag = "icon-whitehall (WEST)" + }, +/area/ruin/unpowered/syndicate_space_base/medbay) +"qv" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/engine, +/area/ruin/unpowered/syndicate_space_base/testlab) +"qz" = ( +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "darkblue" + }, +/area/ruin/unpowered/syndicate_space_base/dormitories) +"qF" = ( +/turf/simulated/floor/plating, +/area/ruin/unpowered/syndicate_space_base/engineering) +"qN" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4; + initialize_directions = 11; + level = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/bar) +"qQ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "whitegreenfull"; + tag = "icon-whitebluefull" + }, +/area/ruin/unpowered/syndicate_space_base/virology) +"qT" = ( +/obj/machinery/conveyor_switch/oneway{ + id = "syndiegarbage"; + name = "disposal coveyor" + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/arrivals) +"qY" = ( +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 10 + }, +/turf/simulated/floor/plating, +/area/ruin/unpowered/syndicate_space_base/engineering) +"rp" = ( +/obj/machinery/vending/toyliberationstation{ + req_access_txt = "150" + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0; + tag = "" + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "brown" + }, +/area/ruin/unpowered/syndicate_space_base/cargo) +"rr" = ( +/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 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/testlab) +"rw" = ( +/obj/item/gun/energy/floragun, +/obj/item/gun/energy/floragun, +/obj/item/gun/energy/floragun, +/obj/item/gun/energy/floragun, +/obj/structure/closet/crate/hydroponics, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "floorgrime" + }, +/area/ruin/unpowered/syndicate_space_base/bar) +"rD" = ( +/obj/structure/rack{ + dir = 8 + }, +/obj/item/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/spray/cleaner, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/arrivals) +"rK" = ( +/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/ruin/unpowered/syndicate_space_base/arrivals) +"rN" = ( +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 9 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/engineering) +"rV" = ( +/obj/machinery/seed_extractor, +/turf/simulated/floor/plasteel{ + icon_state = "floorgrime" + }, +/area/ruin/unpowered/syndicate_space_base/bar) +"rW" = ( +/obj/effect/decal/warning_stripes/north, +/obj/machinery/atmospherics/binary/pump, +/turf/simulated/floor/plating, +/area/ruin/unpowered/syndicate_space_base/engineering) +"sb" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/chemistry) +"sr" = ( +/obj/effect/decal/warning_stripes/blue, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/arrivals) +"ss" = ( +/obj/structure/bookcase/random, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/arrivals) +"sw" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4; + level = 1 + }, +/turf/simulated/floor/engine, +/area/ruin/unpowered/syndicate_space_base/testlab) +"sz" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/navbeacon/invisible{ + codes_txt = "patrol;next_patrol=SBSE"; + location = "SBNE" + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0; + tag = "" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/main) +"sH" = ( +/obj/machinery/vending/artvend, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "brown" + }, +/area/ruin/unpowered/syndicate_space_base/cargo) +"sR" = ( +/obj/machinery/door/airlock/hatch/syndicate, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/engineering) +"te" = ( +/obj/machinery/computer/camera_advanced, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/telecomms) +"tf" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4; + level = 1 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + pixel_y = 0; + tag = "" + }, +/obj/machinery/alarm/syndicate{ + pixel_y = 24 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/main) +"th" = ( +/obj/machinery/light{ + dir = 1; + on = 1 + }, +/turf/simulated/floor/plating, +/area/ruin/unpowered/syndicate_space_base/engineering) +"tj" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0; + tag = "" + }, +/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{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/main) +"tv" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6; + level = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/main) +"tz" = ( +/obj/structure/closet/secure_closet/medical1{ + req_access = null; + req_access_txt = "150" + }, +/obj/item/defibrillator, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "whiteblue"; + tag = "icon-whiteblue (WEST)" + }, +/area/ruin/unpowered/syndicate_space_base/medbay) +"tL" = ( +/obj/structure/closet/firecloset/full, +/turf/simulated/floor/plasteel{ + dir = 9; + icon_state = "yellow" + }, +/area/ruin/unpowered/syndicate_space_base/engineering) +"tQ" = ( +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "whitepurple"; + tag = "icon-whitepurple (WEST)" + }, +/area/ruin/unpowered/syndicate_space_base/chemistry) +"tW" = ( +/obj/structure/table, +/obj/machinery/computer/library/checkout, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/arrivals) +"uk" = ( +/turf/simulated/floor/plasteel{ + 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" + }, +/area/ruin/unpowered/syndicate_space_base/arrivals) +"ur" = ( +/obj/structure/reagent_dispensers/watertank, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/arrivals) +"uu" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8"; + tag = "" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/ruin/unpowered/syndicate_space_base/virology) +"uz" = ( +/obj/machinery/portable_atmospherics/pump, +/turf/simulated/floor/plasteel{ + dir = 5; + icon_state = "yellow" + }, +/area/ruin/unpowered/syndicate_space_base/engineering) +"uF" = ( +/obj/structure/rack{ + dir = 8 + }, +/obj/item/stack/sheet/metal/fifty{ + pixel_x = -5; + pixel_y = -5 + }, +/obj/item/stack/sheet/metal/fifty{ + pixel_x = 5; + pixel_y = 5 + }, +/obj/item/stack/sheet/metal/fifty, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "yellow" + }, +/area/ruin/unpowered/syndicate_space_base/engineering) +"uJ" = ( +/turf/simulated/floor/plasteel{ + dir = 2; + icon_state = "cafeteria"; + tag = "icon-cafeteria (NORTHEAST)" + }, +/area/ruin/unpowered/syndicate_space_base/bar) +"uL" = ( +/obj/structure/sink{ + dir = 4; + pixel_x = 12 + }, +/obj/item/storage/box/monkeycubes/syndicate, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "whitegreen"; + tag = "icon-whitegreen (EAST)" + }, +/area/ruin/unpowered/syndicate_space_base/virology) +"uN" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8"; + tag = "" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4; + initialize_directions = 11; + level = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1; + initialize_directions = 11; + level = 1 + }, +/turf/simulated/floor/engine, +/area/ruin/unpowered/syndicate_space_base/testlab) +"uX" = ( +/obj/machinery/door/airlock/hatch/syndicate, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + pixel_y = 0; + tag = "" + }, +/obj/machinery/door/firedoor, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/telecomms) +"uZ" = ( +/obj/machinery/monkey_recycler, +/turf/simulated/floor/plasteel{ + dir = 6; + icon_state = "whitegreen"; + tag = "icon-whitegreen (SOUTHEAST)" + }, +/area/ruin/unpowered/syndicate_space_base/virology) +"ve" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/engine, +/area/ruin/unpowered/syndicate_space_base/testlab) +"vk" = ( +/obj/machinery/kitchen_machine/grill, +/turf/simulated/floor/plasteel{ + dir = 2; + icon_state = "cafeteria"; + tag = "icon-cafeteria (NORTHEAST)" + }, +/area/ruin/unpowered/syndicate_space_base/bar) +"vn" = ( +/obj/machinery/portable_atmospherics/canister/air, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/engineering) +"vq" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/ruin/unpowered/syndicate_space_base/virology) +"vs" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0; + tag = "" + }, +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8"; + tag = "" + }, +/turf/simulated/floor/plating, +/area/ruin/unpowered/syndicate_space_base/engineering) +"vt" = ( +/obj/machinery/light{ + dir = 1; + on = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/arrivals) +"vv" = ( +/obj/structure/table/wood, +/obj/machinery/chem_dispenser/soda/upgraded{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "grimy" + }, +/area/ruin/unpowered/syndicate_space_base/bar) +"vE" = ( +/obj/machinery/atmospherics/binary/volume_pump{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/ruin/unpowered/syndicate_space_base/engineering) +"vF" = ( +/obj/structure/window/plasmareinforced{ + dir = 1 + }, +/obj/structure/window/plasmareinforced, +/obj/structure/grille, +/turf/simulated/floor/engine/vacuum, +/area/ruin/unpowered/syndicate_space_base/engineering) +"vJ" = ( +/obj/structure/closet/l3closet, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "brown" + }, +/area/ruin/unpowered/syndicate_space_base/cargo) +"vK" = ( +/obj/structure/rack{ + dir = 8 + }, +/obj/item/reagent_containers/glass/bucket, +/obj/item/mop, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/arrivals) +"vL" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/bot, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "whitepurplefull"; + tag = "icon-whitepurple (WEST)" + }, +/area/ruin/unpowered/syndicate_space_base/chemistry) +"vM" = ( +/obj/machinery/door/firedoor, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/chemistry) +"vP" = ( +/obj/machinery/recycler, +/obj/machinery/conveyor/east{ + id = "syndiegarbage" + }, +/obj/machinery/light, +/turf/simulated/floor/plating, +/area/ruin/unpowered/syndicate_space_base/arrivals) +"vQ" = ( +/turf/simulated/floor/plasteel, +/area/ruin/unpowered/syndicate_space_base/cargo) +"vY" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/meter, +/turf/simulated/floor/plating, +/area/ruin/unpowered/syndicate_space_base/engineering) +"wc" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1; + initialize_directions = 11; + level = 1 + }, +/turf/simulated/floor/plating, +/area/ruin/unpowered/syndicate_space_base/engineering) +"wf" = ( +/obj/structure/closet/crate, +/obj/item/vending_refill/snack{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/vending_refill/snack{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/vending_refill/coffee, +/obj/item/vending_refill/cola, +/turf/simulated/floor/plasteel{ + dir = 10; + icon_state = "brown" + }, +/area/ruin/unpowered/syndicate_space_base/cargo) +"wg" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "whitegreen"; + tag = "icon-whitegreen (WEST)" + }, +/area/ruin/unpowered/syndicate_space_base/virology) +"wh" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0; + tag = "" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/main) +"wj" = ( +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "whitepurplefull"; + tag = "icon-whitepurple (WEST)" + }, +/area/ruin/unpowered/syndicate_space_base/chemistry) +"wn" = ( +/obj/structure/table, +/obj/machinery/smartfridge/disks, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/bar) +"wp" = ( +/turf/simulated/floor/plasteel{ + dir = 5; + icon_state = "darkred" + }, +/area/ruin/unpowered/syndicate_space_base/arrivals) +"wq" = ( +/obj/structure/closet/crate/secure/weapon{ + req_access_txt = "150" + }, +/obj/item/ammo_box/magazine/m10mm/ap, +/obj/item/ammo_box/magazine/m10mm/ap, +/obj/item/ammo_box/magazine/m10mm/fire, +/obj/item/ammo_box/magazine/m10mm/fire, +/obj/item/ammo_box/magazine/m10mm/hp, +/obj/item/ammo_box/magazine/m10mm/hp, +/turf/simulated/floor/plasteel{ + dir = 10; + icon_state = "darkred" + }, +/area/ruin/unpowered/syndicate_space_base/cargo) +"ws" = ( +/turf/simulated/floor/plasteel{ + dir = 9; + icon_state = "darkred" + }, +/area/ruin/unpowered/syndicate_space_base/cargo) +"wz" = ( +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "darkbluecorners" + }, +/area/ruin/unpowered/syndicate_space_base/dormitories) +"wB" = ( +/obj/structure/bed, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/ruin/unpowered/syndicate_space_base/virology) +"wC" = ( +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/ruin/unpowered/syndicate_space_base/virology) +"wJ" = ( +/obj/structure/window/plasmareinforced{ + dir = 1 + }, +/obj/effect/turf_decal/caution/red, +/obj/machinery/atmospherics/pipe/manifold/visible{ + dir = 4; + initialize_directions = 11; + level = 2 + }, +/obj/machinery/meter, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/engineering) +"wS" = ( +/obj/item/kitchen/rollingpin, +/obj/structure/table, +/turf/simulated/floor/plasteel{ + dir = 2; + icon_state = "cafeteria"; + tag = "icon-cafeteria (NORTHEAST)" + }, +/area/ruin/unpowered/syndicate_space_base/bar) +"wX" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4; + level = 1 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + pixel_y = 0; + tag = "" + }, +/obj/structure/cable{ + d2 = 4; + icon_state = "0-4" + }, +/obj/machinery/power/apc/syndicate{ + dir = 1; + name = "Primary Corridor APC"; + pixel_y = 24 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/main) +"wZ" = ( +/obj/machinery/atmospherics/binary/circulator{ + side = 4 + }, +/turf/simulated/floor/plating, +/area/ruin/unpowered/syndicate_space_base/engineering) +"xc" = ( +/obj/machinery/door/airlock/hatch/syndicate, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/arrivals) +"xm" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/vending/medical/syndicate_access, +/obj/machinery/alarm/syndicate{ + pixel_y = 24 + }, +/turf/simulated/floor/plasteel{ + dir = 9; + icon_state = "whiteblue"; + tag = "icon-whiteblue (NORTHWEST)" + }, +/area/ruin/unpowered/syndicate_space_base/medbay) +"xo" = ( +/obj/machinery/door_control{ + id = "syndbaseventing"; + name = "Toxin Venting Control"; + pixel_x = -8; + pixel_y = 26 + }, +/obj/machinery/ignition_switch{ + id = "syndbaseigniter"; + pixel_x = 6; + pixel_y = 25 + }, +/turf/simulated/floor/plating, +/area/ruin/unpowered/syndicate_space_base/engineering) +"xr" = ( +/obj/structure/window/basic{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/bar) +"xt" = ( +/obj/machinery/portable_atmospherics/canister/air{ + anchored = 1 + }, +/turf/simulated/floor/engine/air, +/area/ruin/unpowered/syndicate_space_base/engineering) +"xu" = ( +/obj/structure/sign/poster/contraband/tools, +/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/area/ruin/unpowered/syndicate_space_base/engineering) +"xB" = ( +/obj/item/storage/box/monkeycubes/syndicate, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/chemistry) +"xG" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0; + tag = "" + }, +/obj/structure/cable{ + d1 = 1; + d2 = 4; + icon_state = "1-4"; + tag = "90Curve" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/main) +"xN" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4; + level = 1 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + pixel_y = 0; + tag = "" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/main) +"yf" = ( +/obj/machinery/computer/monitor{ + name = "Engine Grid Power Monitoring Computer" + }, +/obj/structure/cable/yellow, +/turf/simulated/floor/plating, +/area/ruin/unpowered/syndicate_space_base/engineering) +"yq" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "whitegreenfull"; + tag = "icon-whitebluefull" + }, +/area/ruin/unpowered/syndicate_space_base/virology) +"yz" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + pixel_y = 0; + tag = "" + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/main) +"yB" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0; + tag = "" + }, +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8"; + tag = "" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/main) +"yE" = ( +/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/area/ruin/unpowered/syndicate_space_base/arrivals) +"yY" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/bar) +"yZ" = ( +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 9 + }, +/turf/simulated/floor/plating, +/area/ruin/unpowered/syndicate_space_base/engineering) +"zj" = ( +/obj/structure/table, +/obj/item/storage/box/disks_plantgene, +/turf/simulated/floor/plasteel{ + icon_state = "floorgrime" + }, +/area/ruin/unpowered/syndicate_space_base/bar) +"zl" = ( +/obj/structure/table/glass, +/obj/item/reagent_containers/syringe/antiviral, +/obj/item/reagent_containers/dropper, +/obj/item/reagent_containers/spray/cleaner, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "whitegreen"; + tag = "icon-whitegreen (EAST)" + }, +/area/ruin/unpowered/syndicate_space_base/virology) +"zm" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 4; + icon_state = "1-4"; + tag = "90Curve" + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/telecomms) +"zs" = ( +/obj/structure/sign/biohazard{ + pixel_y = 0 + }, +/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/area/ruin/unpowered/syndicate_space_base/virology) +"zG" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/food/drinks/cans/beer, +/turf/simulated/floor/plasteel{ + icon_state = "grimy" + }, +/area/ruin/unpowered/syndicate_space_base/bar) +"zS" = ( +/obj/structure/window/basic{ + dir = 4 + }, +/obj/machinery/floodlight, +/turf/simulated/floor/plasteel{ + icon_state = "floorgrime" + }, +/area/ruin/unpowered/syndicate_space_base/bar) +"Ai" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/chemistry) +"Aj" = ( +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/engineering) +"Am" = ( +/obj/structure/closet/secure_closet/freezer/fridge/open, +/obj/item/reagent_containers/food/condiment/flour, +/obj/item/reagent_containers/food/condiment/flour, +/obj/item/reagent_containers/food/condiment/flour, +/obj/item/reagent_containers/food/condiment/flour, +/obj/item/reagent_containers/food/condiment/flour, +/obj/item/reagent_containers/food/condiment/flour, +/obj/item/reagent_containers/food/condiment/flour, +/obj/item/reagent_containers/food/condiment/flour, +/obj/item/reagent_containers/food/condiment/flour, +/obj/item/reagent_containers/food/condiment/flour, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "floorgrime" + }, +/area/ruin/unpowered/syndicate_space_base/bar) +"AA" = ( +/obj/structure/table/reinforced, +/obj/item/clothing/glasses/science, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "whitepurplefull"; + tag = "icon-whitepurple (WEST)" + }, +/area/ruin/unpowered/syndicate_space_base/chemistry) +"AB" = ( +/obj/machinery/autolathe/syndicate, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "yellow" + }, +/area/ruin/unpowered/syndicate_space_base/engineering) +"AG" = ( +/obj/machinery/alarm/syndicate{ + pixel_y = 24 + }, +/turf/simulated/floor/plasteel{ + dir = 9; + icon_state = "whitegreen"; + tag = "icon-whitegreen (NORTHWEST)" + }, +/area/ruin/unpowered/syndicate_space_base/virology) +"AI" = ( +/obj/structure/table/glass, +/obj/item/stack/sheet/mineral/plasma{ + amount = 5; + pixel_x = -2; + pixel_y = 6 + }, +/obj/item/stack/sheet/mineral/plasma{ + amount = 5; + pixel_y = 2 + }, +/obj/item/stack/sheet/mineral/plasma{ + amount = 5; + pixel_x = 2; + pixel_y = -2 + }, +/obj/item/reagent_containers/glass/bottle/charcoal{ + pixel_x = 6 + }, +/obj/item/reagent_containers/glass/bottle/epinephrine, +/obj/item/storage/box/beakers/bluespace, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "whitepurple"; + tag = "icon-whitepurple (NORTH)" + }, +/area/ruin/unpowered/syndicate_space_base/chemistry) +"AJ" = ( +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "yellow" + }, +/area/ruin/unpowered/syndicate_space_base/engineering) +"AM" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/ruin/unpowered/syndicate_space_base/engineering) +"AU" = ( +/obj/machinery/vending/cigarette/syndicate/free, +/turf/simulated/floor/plasteel{ + icon_state = "floorgrime" + }, +/area/ruin/unpowered/syndicate_space_base/bar) +"AV" = ( +/turf/simulated/mineral, +/area/template_noop) +"AX" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4; + level = 1 + }, +/turf/simulated/floor/plating, +/area/ruin/unpowered/syndicate_space_base/engineering) +"Bt" = ( +/obj/machinery/atmospherics/unary/portables_connector{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/ruin/unpowered/syndicate_space_base/engineering) +"BC" = ( +/obj/machinery/door/airlock/hatch/syndicate, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/cargo) +"BG" = ( +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 5 + }, +/turf/simulated/floor/plating, +/area/ruin/unpowered/syndicate_space_base/engineering) +"BH" = ( +/obj/structure/table/reinforced, +/obj/item/scalpel, +/obj/item/circular_saw{ + pixel_y = 9 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "whiteblue"; + tag = "icon-whiteblue (WEST)" + }, +/area/ruin/unpowered/syndicate_space_base/medbay) +"BN" = ( +/obj/structure/chair{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/arrivals) +"BS" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0; + tag = "" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/main) +"Cd" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/main) +"Ce" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4; + level = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/engineering) +"Cf" = ( +/obj/machinery/conveyor/east{ + id = "syndiegarbage" + }, +/turf/simulated/floor/plating, +/area/ruin/unpowered/syndicate_space_base/arrivals) +"Cj" = ( +/obj/item/reagent_containers/food/condiment/saltshaker{ + pixel_x = -3; + pixel_y = 0 + }, +/obj/item/reagent_containers/food/condiment/peppermill{ + pixel_x = 3 + }, +/obj/structure/table, +/turf/simulated/floor/plasteel{ + dir = 2; + icon_state = "cafeteria"; + tag = "icon-cafeteria (NORTHEAST)" + }, +/area/ruin/unpowered/syndicate_space_base/bar) +"Cr" = ( +/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/effect/decal/warning_stripes/yellow, +/turf/simulated/floor/plating, +/area/ruin/unpowered/syndicate_space_base/engineering) +"Cv" = ( +/turf/simulated/floor/plasteel{ + dir = 10; + icon_state = "whitegreen"; + tag = "icon-whitegreen (SOUTHWEST)" + }, +/area/ruin/unpowered/syndicate_space_base/virology) +"CG" = ( +/turf/simulated/floor/plasteel, +/area/ruin/unpowered/syndicate_space_base/engineering) +"CH" = ( +/obj/structure/closet/bombcloset, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "brown" + }, +/area/ruin/unpowered/syndicate_space_base/cargo) +"CI" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/chemistry) +"CL" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/redgrid, +/area/ruin/unpowered/syndicate_space_base/telecomms) +"CM" = ( +/obj/structure/sign/explosives/alt, +/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/area/ruin/unpowered/syndicate_space_base/testlab) +"Da" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0; + tag = "" + }, +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/plating, +/area/ruin/unpowered/syndicate_space_base/engineering) +"Dp" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4; + initialize_directions = 11; + level = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/main) +"Dv" = ( +/obj/machinery/portable_atmospherics/pump, +/turf/simulated/floor/plasteel{ + dir = 6; + icon_state = "yellow" + }, +/area/ruin/unpowered/syndicate_space_base/engineering) +"Dw" = ( +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "darkred" + }, +/area/ruin/unpowered/syndicate_space_base/arrivals) +"Dy" = ( +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/bar) +"DE" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + dir = 2; + icon_state = "darkblue" + }, +/area/ruin/unpowered/syndicate_space_base/dormitories) +"DG" = ( +/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/area/ruin/unpowered/syndicate_space_base/cargo) +"DH" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0; + tag = "" + }, +/turf/simulated/floor/plating, +/area/ruin/unpowered/syndicate_space_base/engineering) +"DL" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/turf/simulated/floor/engine, +/area/ruin/unpowered/syndicate_space_base/testlab) +"DN" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "floorgrime" + }, +/area/ruin/unpowered/syndicate_space_base/bar) +"DP" = ( +/obj/item/clothing/glasses/night, +/obj/item/clothing/glasses/night, +/obj/item/clothing/mask/gas/syndicate, +/obj/item/clothing/mask/gas/syndicate, +/obj/item/clothing/shoes/combat, +/obj/item/clothing/shoes/combat, +/obj/item/storage/belt/military, +/obj/item/storage/belt/military, +/obj/item/clothing/under/syndicate/combat, +/obj/item/clothing/under/syndicate/combat, +/obj/item/clothing/gloves/combat, +/obj/structure/closet/crate/secure/gear{ + req_access_txt = "150" + }, +/obj/item/clothing/gloves/combat, +/obj/machinery/light, +/turf/simulated/floor/plasteel{ + dir = 2; + icon_state = "darkred" + }, +/area/ruin/unpowered/syndicate_space_base/cargo) +"DW" = ( +/obj/machinery/computer/pandemic, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "whitegreen"; + tag = "icon-whitegreen (WEST)" + }, +/area/ruin/unpowered/syndicate_space_base/virology) +"El" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4; + level = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/main) +"Em" = ( +/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/area/ruin/unpowered/syndicate_space_base/engineering) +"Es" = ( +/obj/machinery/light, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/main) +"EA" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/machinery/power/terminal{ + dir = 1 + }, +/obj/structure/cable/yellow{ + d1 = 0; + d2 = 2; + icon_state = "0-2" + }, +/turf/simulated/floor/plating, +/area/ruin/unpowered/syndicate_space_base/engineering) +"EC" = ( +/obj/structure/table, +/obj/item/storage/box/syringes, +/obj/item/gun/syringe/syndicate, +/obj/machinery/defibrillator_mount/loaded{ + pixel_x = -30 + }, +/obj/item/stock_parts/cell/high/plus, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "whiteblue"; + tag = "icon-whiteblue (WEST)" + }, +/area/ruin/unpowered/syndicate_space_base/medbay) +"EI" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0; + tag = "" + }, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/medbay) +"EK" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/ruin/unpowered/syndicate_space_base/engineering) +"EM" = ( +/obj/effect/spawner/window/reinforced, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/cargo) +"EO" = ( +/turf/simulated/floor/plasteel{ + icon_state = "whitegreenfull"; + tag = "icon-whitebluefull" + }, +/area/ruin/unpowered/syndicate_space_base/virology) +"EP" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8"; + tag = "" + }, +/obj/structure/cable{ + d1 = 1; + d2 = 4; + icon_state = "1-4"; + tag = "90Curve" + }, +/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{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/chemistry) +"ET" = ( +/obj/machinery/atmospherics/unary/portables_connector{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/ruin/unpowered/syndicate_space_base/engineering) +"EW" = ( +/obj/structure/window/plasmareinforced{ + dir = 1 + }, +/obj/structure/window/plasmareinforced, +/obj/structure/window/plasmareinforced{ + dir = 8 + }, +/obj/structure/grille, +/obj/machinery/atmospherics/pipe/simple/insulated, +/turf/simulated/floor/engine/vacuum, +/area/ruin/unpowered/syndicate_space_base/engineering) +"EX" = ( +/turf/simulated/floor/plasteel{ + dir = 2; + icon_state = "darkbluecorners" + }, +/area/ruin/unpowered/syndicate_space_base/dormitories) +"Fd" = ( +/obj/structure/table, +/obj/item/storage/firstaid/regular{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/item/storage/firstaid/fire{ + pixel_x = 4; + pixel_y = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "whiteblue"; + tag = "icon-whitehall (WEST)" + }, +/area/ruin/unpowered/syndicate_space_base/medbay) +"Fe" = ( +/obj/structure/cable{ + d2 = 4; + icon_state = "0-4" + }, +/obj/machinery/power/apc/syndicate{ + dir = 1; + name = "Virology APC"; + pixel_y = 24 + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "whitegreen"; + tag = "icon-whitegreen (WEST)" + }, +/area/ruin/unpowered/syndicate_space_base/virology) +"Fi" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0; + tag = "" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/chemistry) +"Fl" = ( +/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/area/ruin/unpowered/syndicate_space_base/virology) +"Fm" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 2; + icon_state = "darkblue" + }, +/area/ruin/unpowered/syndicate_space_base/dormitories) +"Fp" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/machinery/chem_heater, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "whitepurple"; + tag = "icon-whitepurple (EAST)" + }, +/area/ruin/unpowered/syndicate_space_base/chemistry) +"Fs" = ( +/obj/structure/window/basic{ + dir = 1 + }, +/turf/simulated/floor/grass, +/area/ruin/unpowered/syndicate_space_base/bar) +"Ft" = ( +/obj/structure/sign/chemistry, +/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/area/ruin/unpowered/syndicate_space_base/chemistry) +"FC" = ( +/turf/simulated/floor/plasteel{ + dir = 9; + icon_state = "darkred" + }, +/area/ruin/unpowered/syndicate_space_base/arrivals) +"FK" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "whitepurple"; + tag = "icon-whitepurple (WEST)" + }, +/area/ruin/unpowered/syndicate_space_base/chemistry) +"FQ" = ( +/obj/structure/rack{ + dir = 8 + }, +/obj/item/storage/bag/trash, +/obj/item/storage/bag/trash, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/arrivals) +"FW" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0; + tag = "" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/main) +"FY" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0; + tag = "" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4; + level = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/telecomms) +"Ga" = ( +/obj/machinery/cryopod/offstation, +/turf/simulated/floor/plasteel{ + dir = 5; + icon_state = "darkblue" + }, +/area/ruin/unpowered/syndicate_space_base/dormitories) +"Gd" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + icon_state = "floorgrime" + }, +/area/ruin/unpowered/syndicate_space_base/bar) +"Ge" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/chem_master, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/plasteel{ + dir = 10; + icon_state = "whitepurple"; + tag = "icon-whitepurple (SOUTHWEST)" + }, +/area/ruin/unpowered/syndicate_space_base/chemistry) +"Go" = ( +/obj/machinery/cooker/deepfryer, +/turf/simulated/floor/plasteel{ + dir = 2; + icon_state = "cafeteria"; + tag = "icon-cafeteria (NORTHEAST)" + }, +/area/ruin/unpowered/syndicate_space_base/bar) +"Gq" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/dormitories) +"GJ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4; + level = 1 + }, +/obj/structure/extinguisher_cabinet{ + pixel_x = -5; + pixel_y = 30 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + pixel_y = 0; + tag = "" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/main) +"GK" = ( +/obj/structure/closet/crate/hydroponics, +/obj/item/storage/bag/plants, +/obj/item/storage/bag/plants, +/obj/item/storage/bag/plants, +/obj/item/storage/bag/plants, +/turf/simulated/floor/plasteel{ + icon_state = "floorgrime" + }, +/area/ruin/unpowered/syndicate_space_base/bar) +"GM" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + pixel_y = 0; + tag = "" + }, +/obj/machinery/door/firedoor, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/arrivals) +"GQ" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/ruin/unpowered/syndicate_space_base/engineering) +"GY" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4; + level = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "darkred" + }, +/area/ruin/unpowered/syndicate_space_base/arrivals) +"Hc" = ( +/turf/space, +/area/ruin/unpowered/syndicate_space_base/engineering) +"He" = ( +/obj/machinery/portable_atmospherics/scrubber, +/obj/effect/decal/warning_stripes/yellow, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "yellow" + }, +/area/ruin/unpowered/syndicate_space_base/engineering) +"Hq" = ( +/obj/structure/closet/firecloset/full, +/turf/simulated/floor/plasteel{ + dir = 10; + icon_state = "yellow" + }, +/area/ruin/unpowered/syndicate_space_base/engineering) +"Hv" = ( +/obj/effect/spawner/window/reinforced, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/engineering) +"HB" = ( +/obj/structure/sink{ + dir = 8; + icon_state = "sink"; + pixel_x = -12; + pixel_y = 2 + }, +/turf/simulated/floor/plasteel{ + icon_state = "floorgrime" + }, +/area/ruin/unpowered/syndicate_space_base/bar) +"HF" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "whitepurple"; + tag = "icon-whitepurple (WEST)" + }, +/area/ruin/unpowered/syndicate_space_base/chemistry) +"HL" = ( +/obj/structure/closet/crate, +/obj/item/storage/box/stockparts/deluxe, +/obj/item/storage/box/stockparts/deluxe, +/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/glass/fifty, +/obj/item/circuitboard/gibber, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "brown" + }, +/area/ruin/unpowered/syndicate_space_base/cargo) +"HS" = ( +/obj/machinery/alarm/syndicate{ + pixel_y = 24 + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "darkblue" + }, +/area/ruin/unpowered/syndicate_space_base/dormitories) +"HZ" = ( +/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/area/ruin/unpowered/syndicate_space_base/bar) +"Ig" = ( +/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{ + dir = 4 + }, +/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/area/ruin/unpowered/syndicate_space_base/engineering) +"Ih" = ( +/obj/machinery/alarm/syndicate{ + pixel_y = 24 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/arrivals) +"Il" = ( +/obj/structure/closet/secure_closet/freezer/fridge/open, +/obj/item/reagent_containers/food/condiment/enzyme, +/obj/item/reagent_containers/food/drinks/cans/beer, +/obj/item/reagent_containers/food/drinks/cans/beer, +/obj/item/reagent_containers/food/drinks/cans/beer, +/obj/item/reagent_containers/food/drinks/cans/beer, +/obj/item/reagent_containers/food/drinks/cans/beer, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/bar) +"Iv" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4; + level = 1 + }, +/turf/simulated/floor/plasteel, +/area/ruin/unpowered/syndicate_space_base/cargo) +"IA" = ( +/obj/machinery/vending/boozeomat, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/bar) +"IL" = ( +/obj/machinery/navbeacon/invisible{ + codes_txt = "patrol;next_patrol=SBNE"; + location = "SBNW" + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0; + tag = "" + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/main) +"IZ" = ( +/obj/machinery/atmospherics/binary/circulator, +/turf/simulated/floor/plating, +/area/ruin/unpowered/syndicate_space_base/engineering) +"Ja" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel, +/area/ruin/unpowered/syndicate_space_base/cargo) +"Je" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/ruin/unpowered/syndicate_space_base/engineering) +"Jg" = ( +/obj/structure/window/plasmareinforced{ + dir = 1 + }, +/obj/effect/turf_decal/caution/red, +/obj/machinery/atmospherics/unary/portables_connector{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/engineering) +"Jh" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "whitebluefull"; + tag = "icon-whitebluefull" + }, +/area/ruin/unpowered/syndicate_space_base/medbay) +"Ji" = ( +/obj/item/twohanded/required/kirbyplants{ + icon_state = "plant-22" + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/bar) +"Jk" = ( +/obj/machinery/tcomms/relay/ruskie{ + network_id = "SYNDIE-RELAY" + }, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/telecomms) +"Jm" = ( +/turf/simulated/floor/plasteel{ + icon_state = "yellow" + }, +/area/ruin/unpowered/syndicate_space_base/engineering) +"Jq" = ( +/obj/structure/table/wood, +/turf/simulated/floor/plasteel{ + icon_state = "grimy" + }, +/area/ruin/unpowered/syndicate_space_base/bar) +"JH" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/plating, +/area/ruin/unpowered/syndicate_space_base/engineering) +"JX" = ( +/obj/machinery/navbeacon/invisible{ + codes_txt = "patrol;next_patrol=SBNW"; + location = "SBSW" + }, +/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/ruin/unpowered/syndicate_space_base/main) +"Kf" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0; + tag = "" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/chemistry) +"Kh" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + pixel_y = 0; + tag = "" + }, +/obj/structure/cable{ + 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{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/main) +"Ki" = ( +/obj/item/twohanded/required/kirbyplants{ + icon_state = "plant-22" + }, +/obj/structure/cable{ + d2 = 8; + icon_state = "0-8" + }, +/obj/machinery/power/apc/syndicate{ + dir = 1; + name = "Bar APC"; + pixel_y = 24 + }, +/turf/simulated/floor/plasteel{ + icon_state = "grimy" + }, +/area/ruin/unpowered/syndicate_space_base/bar) +"Kj" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/ruin/unpowered/syndicate_space_base/engineering) +"Km" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/machinery/chem_heater, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "whitepurple"; + tag = "icon-whitepurple (EAST)" + }, +/area/ruin/unpowered/syndicate_space_base/chemistry) +"Ko" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0; + tag = "" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/main) +"Kt" = ( +/obj/machinery/bodyscanner, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "whiteblue"; + tag = "icon-whitehall (WEST)" + }, +/area/ruin/unpowered/syndicate_space_base/medbay) +"Kv" = ( +/obj/structure/mirror{ + pixel_y = 32 + }, +/turf/simulated/floor/plasteel{ + icon_state = "freezerfloor" + }, +/area/ruin/unpowered/syndicate_space_base/arrivals) +"Kw" = ( +/obj/machinery/processor, +/obj/structure/table, +/turf/simulated/floor/plasteel{ + dir = 2; + icon_state = "cafeteria"; + tag = "icon-cafeteria (NORTHEAST)" + }, +/area/ruin/unpowered/syndicate_space_base/bar) +"Kx" = ( +/obj/machinery/recharge_station, +/turf/simulated/floor/plasteel{ + dir = 9; + icon_state = "yellow" + }, +/area/ruin/unpowered/syndicate_space_base/engineering) +"KB" = ( +/mob/living/simple_animal/pig, +/turf/simulated/floor/grass, +/area/ruin/unpowered/syndicate_space_base/bar) +"KH" = ( +/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/effect/decal/warning_stripes/yellow, +/obj/machinery/alarm/syndicate{ + pixel_y = 24 + }, +/turf/simulated/floor/plating, +/area/ruin/unpowered/syndicate_space_base/engineering) +"KJ" = ( +/obj/item/flag/syndi, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "darkblue" + }, +/area/ruin/unpowered/syndicate_space_base/dormitories) +"KK" = ( +/obj/structure/chair{ + dir = 1 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + dir = 6; + icon_state = "darkred" + }, +/area/ruin/unpowered/syndicate_space_base/arrivals) +"KQ" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/main) +"KS" = ( +/obj/item/stack/sheet/glass/fifty{ + pixel_x = 5; + pixel_y = 5 + }, +/obj/item/stack/sheet/glass/fifty{ + pixel_x = -5; + pixel_y = -5 + }, +/obj/structure/rack{ + dir = 8 + }, +/obj/item/stack/sheet/glass/fifty, +/turf/simulated/floor/plasteel{ + dir = 6; + icon_state = "yellow" + }, +/area/ruin/unpowered/syndicate_space_base/engineering) +"La" = ( +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/dormitories) +"Le" = ( +/obj/structure/reagent_dispensers/beerkeg, +/turf/simulated/floor/plasteel{ + icon_state = "floorgrime" + }, +/area/ruin/unpowered/syndicate_space_base/bar) +"Lf" = ( +/obj/machinery/cryopod/offstation, +/turf/simulated/floor/plasteel{ + dir = 9; + icon_state = "darkblue" + }, +/area/ruin/unpowered/syndicate_space_base/dormitories) +"Lh" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/item/wrench, +/turf/simulated/floor/plating, +/area/ruin/unpowered/syndicate_space_base/engineering) +"Lj" = ( +/obj/item/reagent_containers/food/drinks/shaker, +/obj/structure/table, +/turf/simulated/floor/plasteel{ + dir = 2; + icon_state = "cafeteria"; + tag = "icon-cafeteria (NORTHEAST)" + }, +/area/ruin/unpowered/syndicate_space_base/bar) +"Lk" = ( +/obj/machinery/computer/syndicate_depot/teleporter, +/obj/machinery/light, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/arrivals) +"Lm" = ( +/obj/structure/table, +/obj/item/clothing/glasses/welding, +/obj/item/clothing/glasses/welding, +/obj/item/clothing/glasses/welding, +/obj/item/clothing/glasses/welding, +/obj/machinery/power/apc/syndicate{ + dir = 1; + name = "Engineering APC"; + pixel_y = 24; + shock_proof = 1 + }, +/obj/structure/cable/yellow{ + d1 = 0; + d2 = 2; + icon_state = "0-2" + }, +/turf/simulated/floor/plating, +/area/ruin/unpowered/syndicate_space_base/engineering) +"Ls" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/ruin/unpowered/syndicate_space_base/engineering) +"LI" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0; + tag = "" + }, +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8"; + tag = "" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4; + initialize_directions = 11; + level = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/main) +"LK" = ( +/obj/structure/chair/stool/bar, +/turf/simulated/floor/plasteel{ + icon_state = "floorgrime" + }, +/area/ruin/unpowered/syndicate_space_base/bar) +"LP" = ( +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "darkbluecorners" + }, +/area/ruin/unpowered/syndicate_space_base/dormitories) +"LQ" = ( +/obj/structure/closet/crate/secure/gear{ + req_access_txt = "150" + }, +/obj/item/clothing/suit/space/syndicate, +/obj/item/clothing/suit/space/syndicate, +/obj/item/clothing/mask/gas/syndicate, +/obj/item/clothing/mask/gas/syndicate, +/obj/item/clothing/head/helmet/space/syndicate, +/obj/item/clothing/head/helmet/space/syndicate, +/turf/simulated/floor/plasteel{ + dir = 6; + icon_state = "darkred" + }, +/area/ruin/unpowered/syndicate_space_base/cargo) +"LR" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/main) +"LV" = ( +/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ + dir = 10 + }, +/turf/simulated/floor/engine/vacuum, +/area/ruin/unpowered/syndicate_space_base/engineering) +"LX" = ( +/obj/machinery/door/poddoor{ + id_tag = "syndbaseventing"; + name = "Venting Bay Door"; + use_power = 0 + }, +/turf/simulated/floor/engine/vacuum, +/area/ruin/unpowered/syndicate_space_base/engineering) +"LY" = ( +/obj/structure/sink{ + dir = 4; + pixel_x = 12 + }, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "freezerfloor" + }, +/area/ruin/unpowered/syndicate_space_base/arrivals) +"Mb" = ( +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/arrivals) +"Mc" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/ruin/unpowered/syndicate_space_base/engineering) +"Me" = ( +/obj/machinery/atmospherics/binary/volume_pump, +/obj/machinery/alarm/syndicate{ + pixel_x = -32 + }, +/turf/simulated/floor/plating, +/area/ruin/unpowered/syndicate_space_base/engineering) +"Mi" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4; + level = 1 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + pixel_y = 0; + tag = "" + }, +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/structure/cable{ + d1 = 1; + d2 = 4; + icon_state = "1-4"; + tag = "90Curve" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/main) +"Mk" = ( +/obj/structure/chair{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "whitepurplefull"; + tag = "icon-whitepurple (WEST)" + }, +/area/ruin/unpowered/syndicate_space_base/chemistry) +"Mq" = ( +/obj/structure/rack{ + dir = 8 + }, +/obj/item/storage/belt/medical, +/obj/item/crowbar, +/obj/item/clothing/glasses/hud/health, +/obj/item/clothing/accessory/stethoscope, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "whiteblue"; + tag = "icon-whiteblue (WEST)" + }, +/area/ruin/unpowered/syndicate_space_base/medbay) +"Ms" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0; + tag = "" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plating, +/area/ruin/unpowered/syndicate_space_base/engineering) +"MH" = ( +/obj/structure/chair{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/arrivals) +"MU" = ( +/obj/structure/table, +/obj/item/t_scanner, +/obj/item/t_scanner, +/obj/item/t_scanner, +/obj/item/t_scanner, +/turf/simulated/floor/plating, +/area/ruin/unpowered/syndicate_space_base/engineering) +"MV" = ( +/obj/effect/mob_spawn/human/spacebase_syndicate{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + dir = 10; + icon_state = "darkblue" + }, +/area/ruin/unpowered/syndicate_space_base/dormitories) +"Na" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/chemistry) +"NE" = ( +/obj/machinery/atmospherics/unary/outlet_injector/on, +/turf/simulated/floor/engine/vacuum, +/area/ruin/unpowered/syndicate_space_base/engineering) +"NN" = ( +/obj/structure/bookcase/random, +/obj/machinery/light{ + dir = 1; + on = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/arrivals) +"NO" = ( +/obj/item/paper_bin{ + pixel_x = -2; + pixel_y = 5 + }, +/obj/item/hand_labeler, +/obj/item/pen/red, +/obj/item/restraints/handcuffs, +/obj/effect/decal/cleanable/dirt, +/obj/item/clothing/glasses/science, +/obj/structure/table/glass, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "whitegreen"; + tag = "icon-whitegreen (EAST)" + }, +/area/ruin/unpowered/syndicate_space_base/virology) +"NT" = ( +/obj/structure/extinguisher_cabinet{ + pixel_x = -5; + pixel_y = 30 + }, +/obj/structure/rack, +/obj/item/clothing/gloves/color/yellow, +/obj/item/clothing/gloves/color/yellow, +/turf/simulated/floor/plating, +/area/ruin/unpowered/syndicate_space_base/engineering) +"NV" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + pixel_y = 0; + tag = "" + }, +/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" + }, +/area/ruin/unpowered/syndicate_space_base/main) +"Og" = ( +/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/area/ruin/unpowered/syndicate_space_base/chemistry) +"On" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/power/smes/engineering, +/obj/structure/cable/yellow, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/plating, +/area/ruin/unpowered/syndicate_space_base/engineering) +"Op" = ( +/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 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/main) +"Ot" = ( +/obj/machinery/light, +/turf/simulated/floor/plasteel{ + dir = 2; + icon_state = "darkred" + }, +/area/ruin/unpowered/syndicate_space_base/arrivals) +"OG" = ( +/obj/machinery/door/firedoor, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/bar) +"OK" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plating, +/area/ruin/unpowered/syndicate_space_base/engineering) +"OY" = ( +/obj/machinery/power/apc/syndicate{ + dir = 1; + name = "Dorms APC"; + pixel_y = 24 + }, +/obj/structure/cable{ + d2 = 2; + icon_state = "0-2" + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "darkblue" + }, +/area/ruin/unpowered/syndicate_space_base/dormitories) +"Pq" = ( +/obj/item/holosign_creator/atmos, +/obj/structure/table, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "yellow" + }, +/area/ruin/unpowered/syndicate_space_base/engineering) +"PB" = ( +/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 = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/chemistry) +"PE" = ( +/obj/machinery/vending/medical/syndicate_access, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "whitegreen"; + tag = "icon-whitegreen (WEST)" + }, +/area/ruin/unpowered/syndicate_space_base/virology) +"PH" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/chem_dispenser/upgraded, +/turf/simulated/floor/plasteel{ + dir = 6; + icon_state = "whitepurple"; + tag = "icon-whitepurple (SOUTHEAST)" + }, +/area/ruin/unpowered/syndicate_space_base/chemistry) +"PI" = ( +/obj/machinery/light, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + pixel_y = 0; + tag = "" + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/main) +"PK" = ( +/obj/structure/table/wood, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/plasteel{ + icon_state = "grimy" + }, +/area/ruin/unpowered/syndicate_space_base/bar) +"PX" = ( +/obj/structure/cable{ + d2 = 2; + icon_state = "0-2"; + pixel_y = 1 + }, +/obj/machinery/computer/monitor{ + name = "Output Grid Power Monitoring Computer" + }, +/turf/simulated/floor/plating, +/area/ruin/unpowered/syndicate_space_base/engineering) +"Qj" = ( +/obj/structure/closet/crate/medical, +/obj/item/clothing/mask/breath/medical, +/obj/item/clothing/mask/breath/medical, +/obj/item/tank/internals/anesthetic, +/obj/item/tank/internals/anesthetic, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "whiteblue"; + tag = "icon-whitehall (WEST)" + }, +/area/ruin/unpowered/syndicate_space_base/medbay) +"Qr" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0; + tag = "" + }, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plating, +/area/ruin/unpowered/syndicate_space_base/engineering) +"Qt" = ( +/obj/structure/sign/barsign, +/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/area/ruin/unpowered/syndicate_space_base/bar) +"QO" = ( +/obj/machinery/light, +/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/ruin/unpowered/syndicate_space_base/arrivals) +"QQ" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plating, +/area/ruin/unpowered/syndicate_space_base/engineering) +"QW" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/turf/simulated/floor/plating, +/area/ruin/unpowered/syndicate_space_base/engineering) +"Ri" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/engine, +/area/ruin/unpowered/syndicate_space_base/testlab) +"Rk" = ( +/obj/machinery/cryopod/offstation, +/turf/simulated/floor/plasteel{ + dir = 10; + icon_state = "darkblue" + }, +/area/ruin/unpowered/syndicate_space_base/dormitories) +"Rn" = ( +/obj/machinery/alarm/syndicate{ + pixel_y = 24 + }, +/turf/simulated/floor/engine, +/area/ruin/unpowered/syndicate_space_base/testlab) +"Rr" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/main) +"Ry" = ( +/obj/structure/table/reinforced, +/obj/item/surgicaldrill, +/obj/effect/decal/cleanable/dirt, +/obj/item/bonegel, +/obj/item/bonesetter, +/obj/item/FixOVein, +/turf/simulated/floor/plasteel{ + dir = 10; + icon_state = "whiteblue"; + tag = "icon-whitehall (WEST)" + }, +/area/ruin/unpowered/syndicate_space_base/medbay) +"RC" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0; + tag = "" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/turf/simulated/floor/engine, +/area/ruin/unpowered/syndicate_space_base/testlab) +"RF" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/engine, +/area/ruin/unpowered/syndicate_space_base/testlab) +"RG" = ( +/obj/machinery/light{ + dir = 1; + on = 1 + }, +/obj/effect/mob_spawn/human/spacebase_syndicate{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "darkblue" + }, +/area/ruin/unpowered/syndicate_space_base/dormitories) +"RM" = ( +/obj/structure/grille, +/obj/structure/window/full/plastitanium, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/ruin/unpowered/syndicate_space_base/virology) +"RN" = ( +/obj/structure/reagent_dispensers/watertank, +/obj/effect/decal/warning_stripes/yellow, +/turf/simulated/floor/plasteel{ + dir = 10; + icon_state = "yellow" + }, +/area/ruin/unpowered/syndicate_space_base/engineering) +"Sh" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/navbeacon/invisible{ + codes_txt = "patrol;next_patrol=SBSW"; + location = "SBSE" + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0; + tag = "" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8; + initialize_directions = 11 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/main) +"SE" = ( +/obj/structure/table/glass, +/obj/item/folder/white, +/obj/item/reagent_containers/glass/beaker/large{ + pixel_x = -3 + }, +/obj/item/reagent_containers/glass/beaker/large{ + pixel_x = -3 + }, +/obj/item/reagent_containers/dropper, +/obj/item/screwdriver/nuke{ + pixel_y = 18 + }, +/obj/machinery/light{ + dir = 4 + }, +/obj/item/reagent_containers/spray/cleaner, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "whitepurple"; + tag = "icon-whitepurple (EAST)" + }, +/area/ruin/unpowered/syndicate_space_base/chemistry) +"SI" = ( +/obj/effect/decal/warning_stripes/yellow, +/obj/machinery/bluespace_beacon/syndicate/infiltrator, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/arrivals) +"SO" = ( +/obj/machinery/light{ + dir = 1; + on = 1 + }, +/obj/machinery/cryopod/offstation, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "darkblue" + }, +/area/ruin/unpowered/syndicate_space_base/dormitories) +"SQ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4; + level = 1 + }, +/turf/simulated/floor/plating, +/area/ruin/unpowered/syndicate_space_base/engineering) +"SU" = ( +/obj/machinery/vending/coffee/free, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/bar) +"SV" = ( +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "brown" + }, +/area/ruin/unpowered/syndicate_space_base/cargo) +"SW" = ( +/mob/living/simple_animal/cow, +/turf/simulated/floor/grass, +/area/ruin/unpowered/syndicate_space_base/bar) +"SX" = ( +/obj/structure/window/basic{ + dir = 4 + }, +/mob/living/simple_animal/chicken, +/turf/simulated/floor/grass, +/area/ruin/unpowered/syndicate_space_base/bar) +"Tc" = ( +/obj/structure/closet/crate, +/obj/item/storage/box/donkpockets{ + pixel_x = -2; + pixel_y = 6 + }, +/obj/item/storage/box/donkpockets{ + pixel_y = 3 + }, +/obj/item/storage/box/donkpockets{ + pixel_x = 2 + }, +/obj/machinery/alarm/syndicate{ + pixel_y = 24 + }, +/turf/simulated/floor/plasteel{ + dir = 9; + icon_state = "brown" + }, +/area/ruin/unpowered/syndicate_space_base/cargo) +"Te" = ( +/obj/machinery/sparker{ + id = "syndbaseigniter"; + pixel_x = -20 + }, +/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ + dir = 4 + }, +/turf/simulated/floor/engine/vacuum, +/area/ruin/unpowered/syndicate_space_base/engineering) +"Tg" = ( +/obj/machinery/door/firedoor, +/turf/simulated/floor/plating, +/area/ruin/unpowered/syndicate_space_base/engineering) +"Tl" = ( +/obj/machinery/atmospherics/pipe/manifold/visible{ + dir = 4; + initialize_directions = 11; + level = 2 + }, +/turf/simulated/floor/plating, +/area/ruin/unpowered/syndicate_space_base/engineering) +"Tm" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/dormitories) +"Tn" = ( +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/turf/simulated/floor/plating, +/area/ruin/unpowered/syndicate_space_base/engineering) +"Tq" = ( +/obj/structure/window/basic{ + dir = 4 + }, +/obj/machinery/vending/hydroseeds, +/turf/simulated/floor/plasteel{ + icon_state = "floorgrime" + }, +/area/ruin/unpowered/syndicate_space_base/bar) +"Tr" = ( +/obj/machinery/power/apc/syndicate{ + dir = 1; + name = "Arrivals APC"; + pixel_y = 24 + }, +/obj/structure/cable{ + d2 = 8; + icon_state = "0-8" + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/arrivals) +"Tv" = ( +/turf/simulated/floor/engine/vacuum, +/area/ruin/unpowered/syndicate_space_base/engineering) +"Tw" = ( +/turf/simulated/floor/plasteel{ + icon_state = "floorgrime" + }, +/area/ruin/unpowered/syndicate_space_base/bar) +"TC" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/ruin/unpowered/syndicate_space_base/engineering) +"TD" = ( +/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/area/ruin/unpowered/syndicate_space_base/testlab) +"TJ" = ( +/obj/structure/table/wood, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "grimy" + }, +/area/ruin/unpowered/syndicate_space_base/bar) +"TM" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + pixel_y = 0; + tag = "" + }, +/obj/machinery/alarm/syndicate{ + pixel_y = 24 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/chemistry) +"TN" = ( +/obj/structure/curtain/open/shower, +/turf/simulated/floor/plasteel{ + icon_state = "freezerfloor" + }, +/area/ruin/unpowered/syndicate_space_base/arrivals) +"Uo" = ( +/obj/structure/closet/l3closet, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "brown" + }, +/area/ruin/unpowered/syndicate_space_base/cargo) +"Us" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4; + level = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/arrivals) +"UF" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 4; + icon_state = "1-4"; + tag = "" + }, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/ruin/unpowered/syndicate_space_base/chemistry) +"UR" = ( +/obj/machinery/light, +/obj/machinery/atmospherics/unary/portables_connector{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/engineering) +"Vc" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/engine, +/area/ruin/unpowered/syndicate_space_base/testlab) +"Vd" = ( +/obj/structure/chair{ + dir = 8 + }, +/turf/simulated/floor/redgrid, +/area/ruin/unpowered/syndicate_space_base/telecomms) +"Vf" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0; + tag = "" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/simulated/floor/plating, +/area/ruin/unpowered/syndicate_space_base/engineering) +"Vg" = ( +/obj/machinery/portable_atmospherics/canister/carbon_dioxide, +/obj/effect/decal/warning_stripes/yellow, +/turf/simulated/floor/plating, +/area/ruin/unpowered/syndicate_space_base/engineering) +"Vl" = ( +/turf/simulated/floor/engine, +/area/ruin/unpowered/syndicate_space_base/testlab) +"Vs" = ( +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "darkblue" + }, +/area/ruin/unpowered/syndicate_space_base/dormitories) +"Vu" = ( +/obj/machinery/monkey_recycler, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/chemistry) +"Vx" = ( +/obj/structure/window/plasmareinforced{ + dir = 1 + }, +/obj/effect/turf_decal/caution/red, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/engineering) +"VB" = ( +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/simple/insulated{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/ruin/unpowered/syndicate_space_base/engineering) +"VH" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/power/smes/engineering{ + charge = 0 + }, +/obj/structure/cable/yellow, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/plating, +/area/ruin/unpowered/syndicate_space_base/engineering) +"VK" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/ruin/unpowered/syndicate_space_base/engineering) +"VP" = ( +/obj/machinery/light, +/obj/effect/mob_spawn/human/spacebase_syndicate{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + dir = 2; + icon_state = "darkblue" + }, +/area/ruin/unpowered/syndicate_space_base/dormitories) +"VQ" = ( +/obj/machinery/shower{ + dir = 8; + icon_state = "shower"; + tag = "icon-shower (WEST)" + }, +/obj/item/soap/syndie, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "freezerfloor" + }, +/area/ruin/unpowered/syndicate_space_base/arrivals) +"VW" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0; + tag = "" + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/main) +"Wi" = ( +/obj/machinery/kitchen_machine/candy_maker, +/turf/simulated/floor/plasteel{ + dir = 2; + icon_state = "cafeteria"; + tag = "icon-cafeteria (NORTHEAST)" + }, +/area/ruin/unpowered/syndicate_space_base/bar) +"Wl" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/hydroponics/constructable, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/bar) +"Wn" = ( +/obj/machinery/sleeper/syndie, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "whiteblue"; + tag = "icon-whitehall (WEST)" + }, +/area/ruin/unpowered/syndicate_space_base/medbay) +"Wr" = ( +/turf/simulated/floor/engine/air, +/area/ruin/unpowered/syndicate_space_base/engineering) +"Wz" = ( +/obj/structure/sign/lifestar{ + desc = "The Star of Life, a symbol of Medical Aid."; + icon_state = "lifestar"; + name = "Medbay" + }, +/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/area/ruin/unpowered/syndicate_space_base/medbay) +"WC" = ( +/obj/item/kitchen/knife{ + pixel_x = 6 + }, +/obj/structure/table, +/turf/simulated/floor/plasteel{ + dir = 2; + icon_state = "cafeteria"; + tag = "icon-cafeteria (NORTHEAST)" + }, +/area/ruin/unpowered/syndicate_space_base/bar) +"WG" = ( +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/arrivals) +"WN" = ( +/obj/machinery/atmospherics/pipe/manifold/visible{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/ruin/unpowered/syndicate_space_base/engineering) +"WT" = ( +/obj/structure/window/basic, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "whiteblue"; + tag = "icon-whiteblue (WEST)" + }, +/area/ruin/unpowered/syndicate_space_base/medbay) +"Xa" = ( +/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ + dir = 9 + }, +/turf/simulated/floor/engine/vacuum, +/area/ruin/unpowered/syndicate_space_base/engineering) +"Xb" = ( +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/chemistry) +"Xh" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0; + tag = "" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/dormitories) +"Xm" = ( +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "yellow" + }, +/area/ruin/unpowered/syndicate_space_base/engineering) +"XQ" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/structure/window/plasmareinforced{ + dir = 1 + }, +/obj/structure/window/plasmareinforced, +/obj/structure/window/plasmareinforced{ + dir = 4 + }, +/obj/structure/grille, +/obj/machinery/atmospherics/pipe/simple/insulated, +/turf/simulated/floor/engine/vacuum, +/area/ruin/unpowered/syndicate_space_base/engineering) +"XS" = ( +/obj/structure/table/glass, +/obj/item/folder/white, +/obj/item/reagent_containers/glass/beaker/large{ + pixel_x = -3 + }, +/obj/item/reagent_containers/glass/beaker/large{ + pixel_x = -3 + }, +/obj/item/reagent_containers/dropper, +/obj/item/screwdriver/nuke{ + pixel_y = 18 + }, +/obj/item/reagent_containers/spray/cleaner, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0; + tag = "" + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "whitepurple"; + tag = "icon-whitepurple (EAST)" + }, +/area/ruin/unpowered/syndicate_space_base/chemistry) +"Ya" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4; + level = 1 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + pixel_y = 0; + tag = "" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1; + initialize_directions = 11; + level = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/main) +"Yc" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0; + tag = "" + }, +/obj/machinery/door/firedoor, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/dormitories) +"Yq" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/universal{ + dir = 4 + }, +/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/area/ruin/unpowered/syndicate_space_base/engineering) +"Yz" = ( +/obj/machinery/door/poddoor/shutters{ + dir = 8; + id_tag = "SSBrestricted"; + name = "Syndicate Restricted Area" + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/arrivals) +"YC" = ( +/obj/effect/spawner/window/reinforced, +/obj/machinery/door/firedoor, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/chemistry) +"YJ" = ( +/obj/structure/table, +/obj/machinery/cell_charger, +/obj/item/stock_parts/cell/high/plus, +/turf/simulated/floor/plating, +/area/ruin/unpowered/syndicate_space_base/engineering) +"YP" = ( +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 6 + }, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/ruin/unpowered/syndicate_space_base/engineering) +"YU" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/item/storage/part_replacer, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "brown" + }, +/area/ruin/unpowered/syndicate_space_base/cargo) +"Za" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + pixel_y = 0; + tag = "" + }, +/turf/simulated/floor/plating, +/area/ruin/unpowered/syndicate_space_base/engineering) +"Zg" = ( +/obj/machinery/power/apc/syndicate{ + dir = 1; + name = "Test Chamber APC"; + pixel_y = 24 + }, +/obj/structure/cable{ + d2 = 2; + icon_state = "0-2" + }, +/turf/simulated/floor/engine, +/area/ruin/unpowered/syndicate_space_base/testlab) +"Zl" = ( +/obj/structure/closet/crate/hydroponics, +/obj/item/cultivator, +/obj/item/cultivator, +/obj/item/cultivator, +/obj/item/cultivator, +/obj/item/shovel/spade, +/obj/item/shovel/spade, +/obj/item/shovel/spade, +/obj/item/shovel/spade, +/obj/item/hatchet, +/obj/item/hatchet, +/obj/item/hatchet, +/obj/item/hatchet, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/bar) +"Zo" = ( +/obj/machinery/computer/general_air_control{ + frequency = 1222; + name = "Bomb Mix Monitor"; + sensors = list("burn_sensor" = "Burn Mix") + }, +/obj/effect/decal/warning_stripes/north, +/turf/simulated/floor/plating, +/area/ruin/unpowered/syndicate_space_base/engineering) +"Zy" = ( +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "darkblue" + }, +/area/ruin/unpowered/syndicate_space_base/dormitories) +"ZB" = ( +/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/ruin/unpowered/syndicate_space_base/main) +"ZR" = ( +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/testlab) + +(1,1,1) = {" +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +"} +(2,1,1) = {" +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +AV +AV +AV +AV +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +"} +(3,1,1) = {" +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +AV +AV +AV +AV +AV +AV +AV +AV +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +"} +(4,1,1) = {" +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +ic +ic +AV +AV +AV +AV +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +"} +(5,1,1) = {" +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +"} +(6,1,1) = {" +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +"} +(7,1,1) = {" +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +"} +(8,1,1) = {" +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +"} +(9,1,1) = {" +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +ic +ic +ic +ic +ic +ic +ic +"} +(10,1,1) = {" +ic +ic +ic +ic +ic +ic +ic +ic +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +ic +ic +ic +ic +ic +ic +"} +(11,1,1) = {" +ic +ic +ic +ic +ic +ic +ic +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +ic +ic +ic +ic +ic +"} +(12,1,1) = {" +ic +ic +ic +ic +ic +ic +ic +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +HZ +HZ +HZ +HZ +HZ +HZ +HZ +HZ +HZ +HZ +HZ +HZ +HZ +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +ic +ic +ic +ic +"} +(13,1,1) = {" +ic +ic +ic +ic +ic +ic +AV +AV +AV +AV +AV +fF +fF +fF +fF +fF +fF +fF +fF +nj +nj +nj +nj +nj +nj +hB +Tw +Wl +Tw +ii +HB +ii +Tw +ii +Fs +nA +HZ +AV +AV +gD +gD +gD +gD +gD +gD +gD +gD +gD +gD +gD +AV +AV +AV +AV +AV +AV +ic +ic +ic +ic +"} +(14,1,1) = {" +ic +ic +ic +ic +ic +AV +AV +AV +AV +AV +AV +fF +Lf +Vs +KJ +kg +KJ +Vs +Rk +nj +iy +iF +Jk +te +nj +rV +Dy +nD +Dy +nD +Dy +nD +Dy +nD +Fs +KB +HZ +lf +lf +gD +xm +Mq +tz +EC +gS +WT +pI +BH +Ry +gD +AV +AV +AV +AV +AV +AV +ic +ic +ic +ic +"} +(15,1,1) = {" +ic +ic +ic +ic +ic +ic +AV +AV +AV +AV +AV +fF +SO +La +La +La +La +La +ph +nj +fU +CL +Vd +gY +nj +pp +Tw +Dy +Tw +Dy +Tw +Dy +Tw +Dy +Fs +SW +HZ +uk +uk +Wz +eV +bw +bw +bw +bw +bw +bw +bw +lo +gD +AV +AV +AV +AV +AV +AV +AV +ic +ic +ic +"} +(16,1,1) = {" +ic +ic +ic +ic +ic +AV +AV +AV +AV +AV +AV +fF +Ga +Zy +cg +La +EX +Zy +ff +nj +mB +FY +zm +jl +nj +Tq +xr +zS +wn +Tw +Dy +zj +ku +oW +cH +SX +HZ +tv +fQ +EI +cO +ks +lu +lu +Jh +bw +bw +bw +qt +gD +AV +AV +AV +AV +AV +AV +AV +ic +ic +ic +"} +(17,1,1) = {" +ic +ic +ic +ic +AV +AV +AV +AV +AV +AV +AV +fF +fF +fF +qz +La +Fm +fF +fF +nj +nj +hR +uX +kE +nj +Ji +GK +Zl +rw +Dy +Tw +lr +Am +Il +Tw +Ji +HZ +ZB +yz +gD +cL +Fd +Kt +Wn +Wn +ow +Qj +av +jt +gD +AV +AV +AV +AV +AV +AV +AV +ic +ic +ic +"} +(18,1,1) = {" +ic +ic +ic +ic +AV +AV +AV +AV +AV +AV +AV +AV +AV +fF +HS +La +Gq +dl +dl +Tm +LR +Dp +ne +Cd +ik +Gd +ap +DN +qN +Gd +ap +Gd +yY +cS +ap +Gd +ik +Rr +cC +gD +gD +gD +gD +gD +gD +gD +gD +gD +gD +gD +gD +AV +AV +AV +AV +AV +AV +AV +ic +ic +"} +(19,1,1) = {" +ic +ic +ic +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +fF +OY +gl +Xh +gl +gl +Yc +VW +VW +Mi +IL +pR +it +Tw +Dy +Tw +Dy +Tw +Dy +Tw +Dy +Tw +Dy +OG +JX +yz +Fl +AG +cs +wg +lB +DW +PE +Cv +RM +vq +wC +Fl +AV +AV +AV +AV +AV +AV +AV +ic +ic +"} +(20,1,1) = {" +ic +ic +ic +AV +AV +AV +AV +AV +AV +AV +AV +fF +fF +fF +qz +La +DE +fF +fF +fF +fF +fF +Op +Es +HZ +Ki +di +Jq +jO +Tw +IA +WC +wS +fb +Cj +uJ +Qt +ZB +yz +Fl +Fe +EO +EO +EO +bS +EO +ny +nY +wC +wB +Fl +AV +AV +AV +AV +AV +AV +AV +AV +ic +"} +(21,1,1) = {" +ic +ic +ic +AV +AV +AV +AV +AV +AV +AV +AV +fF +fP +Vs +wz +La +LP +Vs +MV +fF +La +fF +xN +uk +HZ +jW +di +zG +LK +Dy +AU +Lj +uJ +uJ +uJ +uJ +HZ +kk +Kh +ir +uu +qQ +gg +gg +yq +EO +ny +RM +RM +RM +Fl +AV +AV +AV +AV +AV +AV +AV +AV +ic +"} +(22,1,1) = {" +ic +ic +AV +AV +AV +AV +AV +AV +AV +AV +AV +fF +RG +La +La +La +La +La +VP +fF +La +fF +xN +uk +HZ +Jq +di +PK +jO +Tw +SU +nf +uJ +uJ +uJ +uJ +HZ +uk +yz +zs +ly +jq +EO +jq +EO +EO +ny +nY +wC +wC +Fl +AV +AV +AV +AV +AV +AV +AV +AV +ic +"} +(23,1,1) = {" +ic +ic +AV +AV +AV +AV +AV +AV +AV +AV +AV +fF +pa +Zy +pK +Zy +pK +Zy +lM +fF +aT +fF +Ya +mi +HZ +vv +di +TJ +LK +Dy +Le +Kw +vk +in +Go +Wi +HZ +uk +yz +Fl +mh +NO +zl +kU +nZ +uL +uZ +RM +jI +wB +Fl +AV +AV +AV +AV +AV +AV +AV +AV +ic +"} +(24,1,1) = {" +ic +ic +AV +AV +AV +AV +AV +AV +AV +AV +Em +Em +Em +Em +Em +Em +Em +Em +Em +Em +Em +Em +xN +uk +DG +DG +DG +DG +DG +DG +DG +DG +DG +DG +DG +DG +DG +uk +PI +Og +Og +Og +Og +YC +Og +Og +YC +Og +Og +Og +Og +Og +AV +AV +AV +AV +AV +AV +AV +AV +"} +(25,1,1) = {" +ic +AV +AV +AV +AV +AV +AV +AV +AV +AV +Em +Kx +gh +lw +RN +Em +tL +He +Pq +He +Hq +Em +NV +jC +DG +Tc +dS +YU +vJ +lv +wf +HL +wf +gn +ws +wq +DG +uk +yz +Og +fn +tQ +HF +FK +fu +Og +fn +tQ +HF +FK +Ge +Og +AV +AV +AV +AV +AV +AV +AV +AV +"} +(26,1,1) = {" +ic +AV +AV +AV +AV +AV +AV +AV +AV +AV +Em +AB +CG +CG +Jm +Em +AJ +CG +CG +CG +Jm +Em +wX +uk +EM +SV +vQ +Iv +vQ +vQ +vQ +Ja +br +nr +nG +DP +DG +uk +yz +YC +AI +Mk +wj +vL +AA +fe +AI +Mk +wj +vL +AA +Og +AV +AV +AV +AV +AV +AV +AV +AV +"} +(27,1,1) = {" +ic +AV +AV +AV +AV +AV +AV +AV +AV +AV +Em +hO +CG +uF +KS +Em +uz +Xm +CG +Xm +Dv +Em +GJ +uk +DG +oj +rp +oO +Uo +CH +sH +Ja +el +DG +qs +LQ +DG +uk +yz +Og +hp +XS +UF +Fp +PH +Og +cU +SE +bT +Km +PH +Og +AV +AV +AV +AV +AV +AV +AV +AV +"} +(28,1,1) = {" +ic +AV +AV +AV +AV +AV +AV +AV +AV +AV +Em +Em +sR +Hv +Em +Em +Em +Hv +sR +Em +Em +Em +tf +uk +DG +DG +DG +oi +EM +EM +EM +BC +DG +DG +DG +DG +DG +uk +yz +Og +Og +Og +TM +Ft +Og +Og +Og +Ft +Xb +Og +Og +Og +Og +AV +AV +AV +AV +AV +AV +AV +"} +(29,1,1) = {" +ic +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +Em +Tn +DH +DH +Da +eQ +ar +Ms +Qr +BS +BS +hX +sz +BS +FW +Ko +LI +BS +xG +tj +fx +BS +BS +BS +wh +BS +Sh +yB +ge +Kf +Fi +EP +PB +Na +Na +Na +sb +kC +cB +Xb +xB +Og +AV +AV +AV +AV +AV +AV +AV +"} +(30,1,1) = {" +ic +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +Em +Za +qF +qF +qF +qF +Ls +SQ +Tg +uk +uk +hK +uk +uk +uk +El +uk +uk +yz +pG +uk +uk +uk +uk +KQ +uk +gs +uk +vM +Xb +Ai +hS +CI +Xb +mX +Xb +CI +Xb +Ai +Xb +Vu +Og +AV +AV +AV +AV +AV +AV +AV +"} +(31,1,1) = {" +ic +AV +AV +AV +AV +AV +AV +AV +AV +Em +Em +Em +Za +qF +qF +qF +JH +QW +SQ +xu +Em +Em +Em +Em +Em +sR +pA +Em +yE +GM +gZ +yE +yE +yE +yE +yE +yE +TD +TD +TD +TD +TD +rr +CM +TD +TD +TD +CM +ZR +TD +Og +Og +Og +AV +AV +AV +AV +AV +AV +AV +"} +(32,1,1) = {" +ic +AV +AV +AV +AV +AV +AV +AV +AV +Em +MU +qF +Za +qF +qF +qF +qF +Ls +SQ +bO +Em +Wr +Wr +Wr +Vx +Aj +Ce +vn +yE +nT +rK +xc +uq +uq +uq +uq +uq +TD +ia +ia +ia +TD +un +TD +ia +ia +ia +TD +mE +TD +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +"} +(33,1,1) = {" +ic +AV +AV +AV +AV +AV +AV +AV +AV +Em +PX +DH +vs +Vf +VH +lZ +AM +Je +SQ +YJ +Em +Wr +xt +Wr +Jg +Aj +iA +UR +yE +nT +rK +yE +Kv +yE +TN +yE +TN +TD +TD +TD +TD +TD +rr +CM +TD +TD +TD +CM +ZR +TD +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +"} +(34,1,1) = {" +ic +AV +AV +AV +AV +AV +AV +AV +AV +Em +Lm +VK +aX +Mc +On +EA +AM +ch +AX +yf +Em +Wr +lm +fi +wJ +be +jS +rN +yE +dW +Us +yE +LY +yE +jy +yE +VQ +TD +Zg +fH +fH +RC +uN +ol +RF +RF +dH +cJ +Vl +TD +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +"} +(35,1,1) = {" +ic +ic +AV +AV +AV +AV +AV +AV +AV +Em +NT +qF +ji +AM +AM +AM +AM +nm +EK +ds +Em +Em +Em +Em +Em +yE +yE +yE +yE +Tr +rK +yE +yE +yE +yE +yE +yE +TD +Rn +Vl +Vl +sw +Vc +Vl +Vl +Vl +Vc +Ri +Vl +TD +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +"} +(36,1,1) = {" +ic +ic +AV +AV +AV +AV +AV +AV +AV +Em +th +qF +qF +qF +qF +qF +qF +at +qF +YP +Me +BG +TC +qF +Em +jB +ur +WG +aj +Mb +cj +aj +WG +qT +jm +yE +AV +TD +Vl +Vl +Vl +sw +Vc +Vl +Vl +Vl +Vc +Ri +Vl +TD +AV +AV +AV +AV +AV +AV +AV +AV +AV +ic +"} +(37,1,1) = {" +ic +ic +AV +AV +AV +AV +AV +AV +AV +Em +qF +ET +qF +qF +qF +qF +qF +at +eC +Tl +IZ +cD +vE +gu +Em +vt +WG +WG +xc +WG +rK +xc +WG +WG +Cf +yE +AV +TD +Vl +Vl +Vl +sw +Vc +Vl +Vl +Vl +Vc +Ri +Vl +TD +AV +AV +AV +AV +AV +AV +AV +AV +AV +ic +"} +(38,1,1) = {" +ic +ic +AV +AV +AV +AV +AV +AV +AV +Em +qF +VB +qF +qF +qF +qF +qF +kY +AM +Lh +mP +qF +qF +qF +Em +rD +vK +FQ +yE +Ih +QO +yE +yE +gj +vP +yE +AV +TD +Vl +Vl +Vl +sw +Vc +Vl +Vl +Vl +Vc +Ri +Vl +TD +AV +AV +AV +AV +AV +AV +AV +AV +AV +ic +"} +(39,1,1) = {" +ic +ic +AV +AV +AV +AV +AV +AV +AV +Em +Em +Ig +Em +Em +xo +qF +JH +QW +iH +WN +wZ +hr +vE +gu +Em +yE +yE +yE +yE +WG +rK +BN +yE +WG +Cf +yE +AV +TD +Vl +Vl +Vl +DL +ve +Vl +Vl +Vl +ve +DL +Vl +TD +AV +AV +AV +AV +AV +AV +AV +AV +AV +ic +"} +(40,1,1) = {" +ic +ic +ic +AV +AV +AV +AV +Em +Em +Em +fX +Te +NE +EW +oZ +cE +Bt +Ls +qF +qY +hc +yZ +qF +qF +Em +ss +WG +WG +aj +WG +rK +bY +yE +WG +yE +yE +AV +TD +eN +Vl +Vl +Vl +Vl +Vl +Vl +Vl +Vl +Vl +nv +TD +AV +AV +AV +AV +AV +AV +AV +AV +AV +ic +"} +(41,1,1) = {" +ic +ic +ic +AV +AV +AV +AV +Em +Hc +LX +fX +fX +Tv +vF +Zo +qF +qF +wc +OK +QQ +OK +OK +GQ +qF +Em +ss +WG +WG +xc +WG +rK +MH +yE +yE +yE +AV +AV +TD +Vl +Vl +Vl +Vl +Vl +Vl +Vl +Vl +Vl +Vl +Vl +TD +AV +AV +AV +AV +AV +AV +AV +AV +AV +ic +"} +(42,1,1) = {" +ic +ic +ic +AV +AV +AV +AV +Em +Em +Em +LV +Xa +id +XQ +rW +cE +Bt +vY +qF +Em +KH +qF +qF +dP +Em +NN +WG +WG +yE +aj +ob +aj +yE +AV +AV +AV +AV +TD +Vl +Vl +Vl +Vl +Vl +Vl +Vl +Vl +Vl +Vl +Vl +TD +AV +AV +AV +AV +AV +AV +AV +AV +ic +ic +"} +(43,1,1) = {" +ic +ic +ic +AV +AV +AV +AV +AV +AV +Em +Em +Em +Em +Em +Em +Em +Em +Yq +Em +Em +Cr +qF +qF +dP +Em +ss +WG +BN +yE +FC +GY +kD +yE +AV +AV +AV +AV +TD +Vl +Vl +Vl +Vl +Vl +Vl +Vl +Vl +Vl +Vl +Vl +TD +AV +AV +AV +AV +AV +AV +AV +AV +ic +ic +"} +(44,1,1) = {" +ic +ic +ic +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +Em +nc +Hc +Em +kI +qF +qF +Vg +Em +ss +WG +tW +yE +Dw +hq +Ot +yE +AV +AV +AV +AV +TD +Vl +Vl +Vl +Vl +Vl +Vl +Vl +Vl +Vl +Vl +Vl +TD +AV +AV +AV +AV +AV +AV +AV +AV +ic +ic +"} +(45,1,1) = {" +ic +ic +ic +ic +ic +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +Em +Hc +Hc +Em +kI +qF +Kj +Vg +Em +yE +yE +yE +yE +wp +em +KK +yE +AV +AV +AV +AV +TD +Vl +Vl +Vl +Vl +Vl +Vl +Vl +Vl +Vl +Vl +Vl +TD +AV +AV +AV +AV +AV +AV +AV +AV +ic +ic +"} +(46,1,1) = {" +ic +ic +ic +AV +ic +ic +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +Em +Em +Em +Em +Em +Em +Em +Em +Em +AV +AV +AV +yE +Yz +yE +yE +yE +AV +AV +AV +AV +TD +eN +Vl +Vl +Vl +Vl +Vl +Vl +Vl +Vl +Vl +nv +TD +AV +AV +AV +AV +AV +AV +AV +ic +ic +ic +"} +(47,1,1) = {" +ic +ic +ic +ic +ic +ic +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +yE +WG +WG +sr +yE +AV +AV +AV +AV +TD +Vl +Vl +Vl +Vl +Vl +Vl +Vl +Vl +Vl +Vl +Vl +TD +AV +AV +AV +AV +AV +AV +AV +ic +ic +ic +"} +(48,1,1) = {" +ic +AV +ic +ic +ic +ic +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +yE +WG +WG +Lk +yE +AV +AV +AV +AV +TD +Vl +Vl +Vl +Vl +Vl +Vl +Vl +Vl +Vl +Vl +Vl +TD +AV +AV +AV +AV +AV +AV +AV +ic +ic +ic +"} +(49,1,1) = {" +ic +ic +ic +ic +ic +ic +ic +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +yE +WG +WG +SI +yE +AV +AV +AV +AV +TD +Vl +qv +Vl +Vl +Vl +Vl +Vl +Vl +Vl +qv +Vl +TD +AV +AV +AV +AV +AV +AV +ic +ic +ic +ic +"} +(50,1,1) = {" +ic +AV +ic +ic +ic +ic +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +yE +yE +yE +yE +yE +AV +AV +AV +AV +TD +TD +TD +TD +TD +TD +TD +TD +TD +TD +TD +TD +TD +AV +AV +AV +AV +AV +AV +ic +ic +ic +ic +"} +(51,1,1) = {" +ic +ic +ic +AV +ic +ic +ic +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +ic +ic +ic +ic +"} +(52,1,1) = {" +ic +ic +ic +ic +ic +ic +ic +AV +ic +ic +AV +AV +AV +AV +ic +ic +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +ic +ic +ic +ic +ic +"} +(53,1,1) = {" +ic +ic +ic +ic +ic +AV +ic +ic +ic +ic +ic +AV +ic +ic +ic +ic +ic +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +ic +ic +ic +ic +ic +ic +"} +(54,1,1) = {" +ic +AV +ic +ic +ic +ic +ic +ic +ic +AV +ic +AV +ic +ic +AV +ic +ic +ic +AV +AV +ic +ic +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +ic +ic +ic +ic +ic +ic +ic +"} +(55,1,1) = {" +ic +ic +ic +ic +AV +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +ic +ic +ic +ic +ic +ic +ic +"} +(56,1,1) = {" +ic +ic +ic +ic +ic +ic +ic +AV +ic +AV +ic +ic +ic +AV +ic +AV +ic +ic +ic +ic +AV +ic +ic +AV +ic +ic +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +ic +ic +ic +ic +ic +ic +ic +ic +"} +(57,1,1) = {" +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +AV +AV +ic +ic +ic +ic +ic +AV +ic +ic +ic +ic +ic +ic +AV +ic +AV +AV +AV +AV +AV +AV +AV +AV +ic +ic +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +AV +ic +ic +ic +ic +ic +ic +ic +ic +"} +(58,1,1) = {" +ic +ic +ic +ic +ic +ic +ic +ic +AV +ic +ic +ic +ic +ic +ic +ic +ic +AV +ic +ic +ic +ic +AV +ic +ic +ic +ic +AV +AV +AV +AV +AV +AV +ic +ic +ic +ic +ic +ic +ic +AV +AV +AV +ic +AV +AV +AV +AV +AV +AV +AV +ic +ic +ic +ic +ic +ic +ic +ic +ic +"} +(59,1,1) = {" +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +AV +ic +ic +ic +ic +AV +ic +ic +ic +ic +ic +AV +ic +ic +ic +AV +AV +AV +ic +ic +ic +ic +ic +ic +AV +ic +ic +ic +ic +ic +ic +ic +AV +AV +ic +ic +AV +ic +ic +ic +ic +ic +ic +ic +ic +ic +"} +(60,1,1) = {" +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +AV +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +AV +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +ic +"} diff --git a/_maps/map_files/RandomRuins/SpaceRuins/syndiecakesfactory.dmm b/_maps/map_files/RandomRuins/SpaceRuins/syndiecakesfactory.dmm index ec11a787510..92421ce7aa1 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/syndiecakesfactory.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/syndiecakesfactory.dmm @@ -18,11 +18,11 @@ /obj/item/reagent_containers/food/snacks/syndicake, /obj/item/reagent_containers/food/snacks/syndicake, /obj/item/reagent_containers/food/snacks/syndicake, -/turf/simulated/floor/plating, +/turf/simulated/floor/plating/airless, /area/space) "dy" = ( /obj/structure/lattice, -/turf/unsimulated, +/turf/simulated/floor/plating/airless, /area/template_noop) "es" = ( /obj/structure/cable{ @@ -30,11 +30,8 @@ d2 = 8; icon_state = "1-8" }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/airless, /area/ruin/unpowered) -"eY" = ( -/turf/simulated/floor/plating, -/area/ruin) "fq" = ( /obj/machinery/autolathe, /turf/simulated/floor/plasteel, @@ -50,6 +47,9 @@ /obj/item/stack/sheet/metal, /turf/template_noop, /area/template_noop) +"gy" = ( +/turf/simulated/floor/plasteel/airless, +/area/ruin/unpowered) "hm" = ( /obj/structure/cable{ d1 = 1; @@ -61,11 +61,6 @@ "ho" = ( /turf/space, /area/ruin/space) -"hs" = ( -/turf/unsimulated/wall/fakeglass{ - dir = 4 - }, -/area/ruin/unpowered) "iK" = ( /obj/item/stack/sheet/metal, /obj/item/stack/sheet/metal, @@ -137,7 +132,7 @@ /obj/machinery/conveyor/east{ id = null }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/airless, /area/space) "ob" = ( /obj/structure/lattice, @@ -150,7 +145,7 @@ /obj/item/reagent_containers/food/snacks/syndicake, /obj/item/reagent_containers/food/snacks/syndicake, /obj/item/reagent_containers/food/snacks/syndicake, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/airless, /area/space) "oJ" = ( /obj/item/stack/rods, @@ -160,7 +155,7 @@ /obj/machinery/door/airlock/mining/glass{ name = "Nexus" }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/airless, /area/ruin/unpowered) "pb" = ( /obj/structure/lattice/catwalk, @@ -169,14 +164,11 @@ "pd" = ( /turf/template_noop, /area/space) -"pp" = ( -/turf/unsimulated, -/area/space) "pR" = ( /obj/machinery/conveyor/northeast{ id = null }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/airless, /area/ruin/unpowered) "qS" = ( /obj/machinery/door/airlock/mining/glass{ @@ -203,9 +195,6 @@ /obj/machinery/space_heater, /turf/simulated/floor/plasteel, /area/ruin/unpowered) -"sd" = ( -/turf/simulated/floor/plating, -/area/space) "sN" = ( /turf/simulated/floor/plasteel, /area/ruin/unpowered) @@ -226,14 +215,18 @@ /obj/structure/plasticflaps{ canmove = 0 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/airless, /area/ruin/unpowered) "wB" = ( /obj/item/trash/syndi_cakes, /turf/simulated/floor/plasteel, /area/ruin/unpowered) +"xB" = ( +/obj/effect/spawner/random_spawners/oil_maybe, +/turf/simulated/floor/plasteel/airless, +/area/ruin/unpowered) "xT" = ( -/turf/unsimulated/floor/plating/airless, +/turf/simulated/floor/plating/airless, /area/space) "yU" = ( /obj/item/stack/sheet/metal, @@ -264,9 +257,8 @@ /turf/template_noop, /area/space) "zF" = ( -/turf/unsimulated/wall/fakeglass{ - dir = 8 - }, +/obj/effect/spawner/window/reinforced, +/turf/simulated/floor/plating, /area/ruin/unpowered) "zP" = ( /obj/structure/rack{ @@ -307,7 +299,7 @@ icon_state = "1-2"; tag = "" }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/airless, /area/ruin/unpowered) "CY" = ( /obj/item/stack/rods, @@ -317,11 +309,11 @@ /turf/space, /area/space) "Dz" = ( -/mob/living/simple_animal/pet/dog/corgi, /obj/machinery/conveyor/east{ id = null }, -/turf/simulated/floor/plasteel, +/mob/living/simple_animal/pet/dog/corgi, +/turf/simulated/floor/plasteel/airless, /area/ruin/unpowered) "Ej" = ( /obj/structure/closet/emcloset, @@ -334,6 +326,16 @@ /obj/item/stack/cable_coil/cut, /turf/template_noop, /area/template_noop) +"Fy" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + pixel_y = 0; + tag = "" + }, +/turf/simulated/floor/plasteel/airless, +/area/ruin/unpowered) "FO" = ( /obj/machinery/suit_storage_unit/syndicate, /turf/simulated/floor/plasteel, @@ -353,19 +355,19 @@ /turf/simulated/floor/plasteel, /area/ruin/unpowered) "Hx" = ( -/mob/living/simple_animal/pet/dog/corgi, -/mob/living/simple_animal/pet/dog/corgi, /obj/machinery/conveyor/east{ id = null }, -/turf/simulated/floor/plasteel, +/mob/living/simple_animal/pet/dog/corgi, +/mob/living/simple_animal/pet/dog/corgi, +/turf/simulated/floor/plasteel/airless, /area/ruin/unpowered) "Hy" = ( /turf/template_noop, /area/template_noop) "HQ" = ( /obj/structure/table/reinforced, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/airless, /area/ruin/unpowered) "Ic" = ( /turf/simulated/floor/plating/burnt, @@ -378,9 +380,15 @@ /obj/structure/lattice, /turf/space, /area/ruin/unpowered) +"IJ" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/plasteel/airless, +/area/ruin/unpowered) "JI" = ( /obj/effect/spawner/random_spawners/syndicate/loot, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/airless, /area/ruin/unpowered) "Ki" = ( /obj/structure/lattice, @@ -388,13 +396,13 @@ /area/template_noop) "Kr" = ( /obj/structure/girder, -/turf/simulated/floor/plating, +/turf/simulated/floor/plating/airless, /area/ruin/unpowered) "KD" = ( /turf/simulated/floor/plating, /area/ruin/unpowered) "KS" = ( -/turf/unsimulated/floor/plating/airless, +/turf/simulated/floor/plating/airless, /area/ruin) "Le" = ( /obj/structure/cable{ @@ -404,12 +412,13 @@ /obj/machinery/power/port_gen/pacman, /turf/simulated/floor/plasteel, /area/ruin/unpowered) +"Lq" = ( +/mob/living/simple_animal/pet/dog/corgi, +/turf/simulated/floor/plasteel/airless, +/area/ruin/unpowered) "Mi" = ( -/turf/unsimulated, +/turf/simulated/floor/plating/airless, /area/template_noop) -"Mz" = ( -/turf/simulated/floor/plasteel, -/area/ruin) "Nw" = ( /obj/machinery/power/smes, /obj/structure/cable/blue{ @@ -445,7 +454,7 @@ dir = 2; id = null }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/airless, /area/ruin) "QI" = ( /obj/effect/spawner/random_spawners/wall_rusted_probably, @@ -472,7 +481,7 @@ /area/ruin/unpowered) "Ry" = ( /obj/item/stack/cable_coil/random, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/airless, /area/ruin/unpowered) "RB" = ( /mob/living/simple_animal/hostile/alien/sentinel{ @@ -527,7 +536,7 @@ /obj/machinery/conveyor/east{ id = null }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/airless, /area/ruin) "UC" = ( /obj/machinery/tcomms/relay/ruskie{ @@ -549,7 +558,7 @@ /obj/machinery/conveyor/north/ccw{ id = null }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/airless, /area/ruin/unpowered) "VH" = ( /obj/structure/lattice, @@ -558,7 +567,7 @@ /area/space) "VR" = ( /obj/structure/lattice, -/turf/unsimulated, +/turf/simulated/floor/plating/airless, /area/space) "WL" = ( /turf/space, @@ -582,7 +591,7 @@ /obj/machinery/light{ dir = 4 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/airless, /area/ruin/unpowered) "YU" = ( /obj/structure/chair/office/dark, @@ -592,14 +601,14 @@ /obj/machinery/conveyor/east{ id = null }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/airless, /area/ruin/unpowered) "Zt" = ( /obj/machinery/conveyor/east{ dir = 2; id = null }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/airless, /area/space) (1,1,1) = {" @@ -780,10 +789,10 @@ Hy Hy EJ JI -GB -Vf -sN -sN +Lq +IJ +gy +gy EJ Ra sN @@ -821,11 +830,11 @@ Hy Hy Hy EJ -sN +gy Hx -GB +Lq Dz -sN +gy EJ Nw hm @@ -863,11 +872,11 @@ Hy Hy Hy EJ -sN +gy Dz -sN +gy Dz -sN +gy EJ UC sN @@ -905,11 +914,11 @@ Hy Hy Hy EJ -sN +gy Zs -sN +gy Zs -sN +gy EJ fq sN @@ -947,11 +956,11 @@ Hy Hy Hy EJ -sN +gy Zs -sN +gy Zs -Id +xB EJ sN GB @@ -993,7 +1002,7 @@ pR Vt Vt Vt -sN +gy EJ XZ BI @@ -1079,11 +1088,11 @@ TM Qv lK EJ -sN -Vf -Gm -sN -sN +gy +IJ +Fy +gy +gy Ry Kr OU @@ -1116,7 +1125,7 @@ Hy Hy EJ Zs -hs +zF Tj zP Xd @@ -1124,12 +1133,12 @@ ky Cp Cp es -sN +gy rJ rJ Kr rL -eY +KS OU EJ pd @@ -1163,16 +1172,16 @@ sN wB sN BG -sN -sN -sN -sN -sN -sN +gy +gy +gy +gy +gy +gy oO OU -eY -eY +KS +KS EJ pd pd @@ -1206,14 +1215,14 @@ RB wB EJ IB -sN -sN -sN -sN -sN +gy +gy +gy +gy +gy EJ -eY -eY +KS +KS rJ EJ pd @@ -1242,20 +1251,20 @@ Hy Hy EJ Zs -hs +zF bb OA sN EJ WL IB -sN +gy YR HQ HQ EJ OU -eY +KS rJ EJ zt @@ -1297,7 +1306,7 @@ EJ EJ EJ OU -eY +KS OK Da pd @@ -1330,7 +1339,7 @@ OU OU KS KS -Mz +OU ho OU OU @@ -1338,7 +1347,7 @@ OU OU ho iK -eY +KS Da OK OK @@ -1379,7 +1388,7 @@ Ic ub NQ OU -eY +KS NQ NQ Da @@ -1450,7 +1459,7 @@ Hy Hy Hy Ki -pp +xT pd Zt rJ @@ -1492,7 +1501,7 @@ Hy Hy Hy Hy -pp +xT pd pd zo @@ -1591,7 +1600,7 @@ QF QF QF Da -sd +xT oJ pd pd diff --git a/_maps/map_files/RandomRuins/SpaceRuins/syndiedepot.dmm b/_maps/map_files/RandomRuins/SpaceRuins/syndiedepot.dmm index ceb8067f7ac..9be65975462 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/syndiedepot.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/syndiedepot.dmm @@ -453,9 +453,7 @@ req_access_txt = "150" }, /obj/structure/fans/tiny, -/turf/unsimulated/floor{ - name = "plating" - }, +/turf/simulated/floor/plating, /area/syndicate_depot/core) "br" = ( /obj/machinery/door/airlock/external{ @@ -463,9 +461,7 @@ req_access_txt = "150" }, /obj/structure/fans/tiny, -/turf/unsimulated/floor{ - name = "plating" - }, +/turf/simulated/floor/plating, /area/syndicate_depot/outer) "bs" = ( /obj/effect/spawner/random_spawners/syndicate/turret, diff --git a/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm b/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm index d8d711001d0..1ba82c992a5 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm @@ -1,10 +1,6 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "aa" = ( /obj/effect/landmark/burnturf, -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "cautionfull" - }, /turf/simulated/wall/mineral/titanium/nodecon/tileblend{ fixed_underlay = list("icon" = 'icons/turf/floors.dmi', "icon_state" = "cautionfull"); icon_state = "4-i" @@ -718,9 +714,6 @@ }, /area/derelict/bridge) "bE" = ( -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, /turf/simulated/wall/mineral/titanium/nodecon/tileblend{ fixed_underlay = list("icon" = 'icons/turf/floors.dmi', "icon_state" = "dark"); icon_state = "4-i" @@ -1206,7 +1199,7 @@ }, /area/derelict/bridge) "cI" = ( -/obj/machinery/door/airlock/shuttle{ +/obj/machinery/door/airlock/titanium{ name = "Bathroom" }, /obj/effect/decal/cleanable/dirt, @@ -1665,7 +1658,7 @@ /turf/simulated/floor/plating, /area/derelict/crew_quarters) "dI" = ( -/obj/machinery/door/airlock/shuttle{ +/obj/machinery/door/airlock/titanium{ name = "Dormitories" }, /turf/simulated/floor/plasteel, @@ -1716,10 +1709,6 @@ /turf/simulated/floor/plasteel, /area/derelict/crew_quarters) "dO" = ( -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "darkredfull" - }, /turf/simulated/wall/mineral/titanium/nodecon/tileblend{ icon_state = "4-i" }, @@ -1927,7 +1916,7 @@ name = "Derelict Annex" }) "ek" = ( -/obj/machinery/door/airlock/shuttle{ +/obj/machinery/door/airlock/titanium{ name = "Dormitories" }, /turf/simulated/floor/plasteel{ @@ -2224,10 +2213,6 @@ name = "Derelict Annex" }) "eM" = ( -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "purplefull" - }, /turf/simulated/wall/mineral/titanium/nodecon/tileblend{ fixed_underlay = list("icon" = 'icons/turf/floors.dmi', "icon_state" = "purplefull"); icon_state = "4-i" @@ -2368,10 +2353,6 @@ name = "Derelict Annex" }) "eZ" = ( -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "cautionfull" - }, /turf/simulated/wall/mineral/titanium/nodecon/tileblend{ fixed_underlay = list("icon" = 'icons/turf/floors.dmi', "icon_state" = "cautionfull"); icon_state = "4-i" @@ -3501,10 +3482,6 @@ /obj/structure/window/reinforced{ dir = 1 }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whiteredfull" - }, /turf/simulated/wall/mineral/titanium/nodecon/tileblend{ fixed_underlay = list("icon" = 'icons/turf/floors.dmi', "icon_state" = "whiteredfull"); icon_state = "4-i" @@ -3744,17 +3721,7 @@ /area/derelict/crew_quarters) "hF" = ( /obj/structure/sign/barsign, -/turf/simulated/shuttle/wall{ - icon_state = "swall4"; - dir = 2 - }, -/area/derelict/crew_quarters) -"hG" = ( -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall8"; - tag = "icon-swall12" - }, +/turf/simulated/wall/mineral/titanium/nodecon, /area/derelict/crew_quarters) "hH" = ( /obj/machinery/door/airlock/public/glass{ @@ -4083,41 +4050,11 @@ /turf/template_noop, /area/space/nearstation) "ir" = ( -/obj/structure/grille, -/obj/structure/shuttle/window{ - tag = "icon-window5_end"; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "window5_end"; - dir = 2 - }, -/turf/simulated/floor/plating, -/area/derelict/arrival) -"is" = ( -/obj/structure/grille, -/obj/structure/shuttle/window{ - tag = "icon-window5_mid"; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "window5_mid"; - dir = 2 - }, -/turf/simulated/floor/plating, -/area/derelict/arrival) -"it" = ( -/obj/structure/grille, -/obj/structure/shuttle/window{ - tag = "icon-window5_end (NORTH)"; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "window5_end"; - dir = 1 - }, +/obj/effect/spawner/window/plastitanium, /turf/simulated/floor/plating, /area/derelict/arrival) "iu" = ( -/turf/template_noop, -/turf/simulated/shuttle/wall{ - dir = 8; - icon_state = "diagonalWall3" - }, +/turf/simulated/wall/mineral/plastitanium, /area/derelict/arrival) "iv" = ( /turf/simulated/floor/plasteel{ @@ -4203,11 +4140,6 @@ name = "Derelict Annex" }) "iD" = ( -/turf/simulated/floor/engine{ - name = "vacuum floor"; - nitrogen = 0.01; - oxygen = 0.01 - }, /turf/simulated/wall/mineral/titanium/nodecon/tileblend{ fixed_underlay = list("icon" = 'icons/turf/floors.dmi', "icon_state" = "engine"); icon_state = "4-i" @@ -4224,13 +4156,6 @@ /area/derelict/eva{ name = "Derelict Annex" }) -"iF" = ( -/turf/template_noop, -/turf/simulated/shuttle/wall{ - dir = 1; - icon_state = "diagonalWall3" - }, -/area/derelict/arrival) "iG" = ( /obj/item/shard{ icon_state = "medium" @@ -4295,17 +4220,9 @@ icon_state = "chapel" }, /area/derelict/crew_quarters) -"iO" = ( -/turf/simulated/shuttle/wall{ - dir = 4; - icon_state = "wall3" - }, -/area/derelict/arrival) "iP" = ( /obj/structure/computerframe, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/derelict/arrival) "iQ" = ( /obj/effect/decal/remains/human{ @@ -4316,9 +4233,7 @@ /obj/structure/chair/comfy/shuttle{ dir = 8 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/derelict/arrival) "iR" = ( /obj/structure/table, @@ -4326,9 +4241,7 @@ dir = 4 }, /obj/item/clothing/head/soft/solgov, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/derelict/arrival) "iS" = ( /obj/structure/closet/crate, @@ -4490,10 +4403,7 @@ }, /area/derelict/crew_quarters) "jh" = ( -/turf/template_noop, -/turf/simulated/wall/mineral/titanium/nodecon/nosmooth{ - icon_state = "swall_f10" - }, +/turf/simulated/wall/mineral/titanium/nodecon/nosmooth, /area/derelict/eva{ name = "Derelict Annex" }) @@ -4501,23 +4411,17 @@ /obj/machinery/light/small{ dir = 8 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/derelict/arrival) "jj" = ( /obj/item/paper/djstation{ info = "Fuck. Fuckfuckfuck. I knew this mission was a mistake, that idiot Thomas got himself killed by some angry Russian security bot in the armoury, and the Lt. ran into the annex like a moron and got himself trapped. Now I'm just sitting on my god damn hands because this shuttle won't bloody move. Stupid USSP piece of shit docking arm must be jammed and I don't have the kit to go out and fix it.

Who the hell attacks a space station without EVA gear anyways? It's not like you can just bloody well waltz out into space with a hot coffee and shrug it off."; name = "unknown report" }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/derelict/arrival) "jk" = ( -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/derelict/arrival) "jl" = ( /obj/machinery/door/airlock/external{ @@ -4526,9 +4430,7 @@ name = "Shuttle Airlock"; req_access_txt = "150" }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/plating, /area/derelict/arrival) "jm" = ( /obj/machinery/door/airlock/external{ @@ -4654,18 +4556,6 @@ }) "jA" = ( /turf/simulated/floor/plating/airless, -/area/derelict/eva{ - name = "Derelict Annex" - }) -"jB" = ( -/turf/simulated/floor/engine{ - name = "vacuum floor"; - nitrogen = 0.01; - oxygen = 0.01 - }, -/turf/simulated/wall/mineral/titanium/nodecon/nosmooth{ - icon_state = "swall_f5" - }, /area/derelict/eva{ name = "Derelict Annex" }) @@ -4839,17 +4729,13 @@ /obj/structure/chair/comfy/shuttle{ dir = 4 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/derelict/arrival) "jR" = ( /obj/structure/chair/comfy/shuttle{ dir = 8 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/derelict/arrival) "jS" = ( /turf/simulated/floor/plasteel{ @@ -4924,7 +4810,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/door/airlock/shuttle{ +/obj/machinery/door/airlock/titanium{ name = "Central Annex" }, /turf/simulated/floor/plasteel, @@ -4984,7 +4870,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/door/airlock/shuttle{ +/obj/machinery/door/airlock/titanium{ name = "Central Annex" }, /obj/effect/decal/cleanable/blood/tracks{ @@ -5228,7 +5114,7 @@ layer = 3; name = "Central Annex Lockdown" }, -/obj/machinery/door/airlock/shuttle{ +/obj/machinery/door/airlock/titanium{ name = "Central Annex" }, /turf/simulated/floor/plasteel, @@ -5252,7 +5138,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/door/airlock/shuttle{ +/obj/machinery/door/airlock/titanium{ name = "Central Annex" }, /obj/effect/decal/cleanable/dirt, @@ -5739,9 +5625,7 @@ /obj/structure/chair/comfy/shuttle{ dir = 4 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/derelict/arrival) "lu" = ( /obj/machinery/door/airlock/external{ @@ -5889,18 +5773,14 @@ /area/derelict/solar_control) "lI" = ( /obj/structure/window/reinforced/tinted, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/derelict/arrival) "lJ" = ( /obj/structure/window/reinforced/tinted, /obj/machinery/light/small{ dir = 4 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/derelict/arrival) "lK" = ( /obj/structure/dispenser/oxygen, @@ -6086,13 +5966,7 @@ dir = 1 }, /obj/structure/shuttle/engine/propulsion, -/turf/simulated/shuttle/plating, -/area/derelict/arrival) -"md" = ( -/turf/template_noop, -/turf/simulated/shuttle/wall{ - icon_state = "diagonalWall3" - }, +/turf/simulated/floor/plating/airless, /area/derelict/arrival) "me" = ( /obj/effect/decal/cleanable/dirt, @@ -6154,13 +6028,6 @@ /area/derelict/eva{ name = "Derelict Annex" }) -"mm" = ( -/turf/template_noop, -/turf/simulated/shuttle/wall{ - dir = 4; - icon_state = "diagonalWall3" - }, -/area/derelict/arrival) "mn" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -6321,7 +6188,7 @@ /area/derelict/arrival) "mI" = ( /obj/structure/sign/greencross, -/turf/simulated/shuttle/wall, +/turf/simulated/wall/mineral/titanium/nodecon, /area/derelict/arrival) "mJ" = ( /obj/structure/cable{ @@ -6700,10 +6567,6 @@ /obj/structure/window/reinforced{ dir = 8 }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whiteredfull" - }, /turf/simulated/wall/mineral/titanium/nodecon/tileblend{ fixed_underlay = list("icon" = 'icons/turf/floors.dmi', "icon_state" = "whiteredfull"); icon_state = "4-i" @@ -6811,12 +6674,6 @@ icon_state = "floorscorched2" }, /area/derelict/arrival) -"nL" = ( -/turf/template_noop, -/turf/simulated/wall/mineral/titanium/nodecon/nosmooth{ - icon_state = "swall_f10" - }, -/area/space/nearstation) "nM" = ( /obj/item/stack/tile, /turf/simulated/floor/plating/airless, @@ -6878,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" }, @@ -6912,9 +6769,6 @@ name = "Derelict Annex" }) "nU" = ( -/turf/simulated/floor/plasteel{ - icon_state = "hydrofloor" - }, /turf/simulated/wall/mineral/titanium/nodecon/tileblend{ fixed_underlay = list("icon" = 'icons/turf/floors.dmi', "icon_state" = "hydrofloor"); icon_state = "4-i" @@ -7066,17 +6920,6 @@ /obj/item/stack/tile, /turf/template_noop, /area/derelict/arrival) -"oo" = ( -/turf/simulated/floor/plasteel/airless{ - dir = 5; - icon_state = "green" - }, -/turf/simulated/wall/mineral/titanium/nodecon/nosmooth{ - icon_state = "swall_f10" - }, -/area/derelict/eva{ - name = "Derelict Annex" - }) "op" = ( /obj/item/stack/ore/iron, /turf/simulated/floor/plasteel/airless{ @@ -7255,12 +7098,6 @@ icon_state = "floorscorched2" }, /area/derelict/arrival) -"oG" = ( -/turf/template_noop, -/turf/simulated/wall/mineral/titanium/nodecon/nosmooth{ - icon_state = "swall_f5" - }, -/area/derelict/arrival) "oH" = ( /obj/structure/lattice, /obj/item/retractor, @@ -7340,14 +7177,6 @@ /area/derelict/eva{ name = "Derelict Annex" }) -"oQ" = ( -/turf/template_noop, -/turf/simulated/wall/mineral/titanium/nodecon/nosmooth{ - icon_state = "swall_f5" - }, -/area/derelict/eva{ - name = "Derelict Annex" - }) "oR" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -7519,10 +7348,6 @@ }, /area/derelict/crew_quarters) "pj" = ( -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "orangefull" - }, /turf/simulated/wall/mineral/titanium/nodecon/tileblend{ fixed_underlay = list("icon" = 'icons/turf/floors.dmi', "icon_state" = "orangefull"); icon_state = "4-i" @@ -7537,7 +7362,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/door/airlock/shuttle{ +/obj/machinery/door/airlock/titanium{ name = "Central Annex" }, /obj/effect/decal/cleanable/dirt, @@ -7702,12 +7527,6 @@ name = "floor" }, /area/derelict/crew_quarters) -"pG" = ( -/turf/template_noop, -/turf/simulated/wall/mineral/titanium/nodecon/nosmooth{ - icon_state = "swall_f10" - }, -/area/derelict/arrival) "pH" = ( /obj/effect/landmark/damageturf, /obj/item/hemostat, @@ -7950,11 +7769,6 @@ }, /area/derelict/arrival) "qk" = ( -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "redfull"; - tag = "icon-redfull (NORTHWEST)" - }, /turf/simulated/wall/mineral/titanium/nodecon/tileblend{ fixed_underlay = list("icon" = 'icons/turf/floors.dmi', "icon_state" = "redfull"); icon_state = "4-i" @@ -8055,7 +7869,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/door/airlock/shuttle{ +/obj/machinery/door/airlock/titanium{ name = "Central Annex" }, /turf/simulated/floor/plasteel, @@ -9133,6 +8947,9 @@ }, /turf/simulated/wall/mineral/titanium/nodecon/nodiagonal, /area/derelict/arrival) +"QN" = ( +/turf/simulated/wall/mineral/titanium/nodecon/nosmooth, +/area/derelict/arrival) (1,1,1) = {" ac @@ -9177,13 +8994,13 @@ ac ac ac iu -iO -iO -iO -iO -iO -iO -md +iu +iu +iu +iu +iu +iu +iu ac ac ac @@ -9360,7 +9177,7 @@ ac ac ac ac -is +ir iQ jj jk @@ -9452,7 +9269,7 @@ ac ac ac ac -it +ir iR jk jR @@ -9544,14 +9361,14 @@ ac ac ac ac -iF -iO +iu +iu jl -iO -iO +iu +iu jl -iO -mm +iu +iu ac ac ac @@ -9636,14 +9453,14 @@ ac ac ac ac -aW +QN bn jm bn bn lu bn -aW +QN ac ac ac @@ -10020,7 +9837,7 @@ nw mG bn mG -oG +aW ac ai ac @@ -10752,7 +10569,7 @@ ac ac ac ac -nL +pk oc on oc @@ -10766,7 +10583,7 @@ oc oc oc qf -oG +aW ac ac iq @@ -11220,7 +11037,7 @@ ac ac ai ac -pG +aW aW pI mS @@ -11859,8 +11676,8 @@ ii ii ja jA -oo -oQ +dW +dW ac ac ac @@ -12950,7 +12767,7 @@ ac iq iY iZ -jB +jh kq iD eg @@ -15153,7 +14970,7 @@ go go gV hn -hG +aV hU hU hT diff --git a/_maps/map_files/RandomRuins/SpaceRuins/whiteship.dmm b/_maps/map_files/RandomRuins/SpaceRuins/whiteship.dmm index 8959d8f5f6d..96af170f3c2 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/whiteship.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/whiteship.dmm @@ -3,32 +3,10 @@ /turf/template_noop, /area/template_noop) "ab" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f6"; - dir = 2 - }, -/area/shuttle/abandoned) -"ac" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall12"; - icon_state = "swall12"; - dir = 2 - }, -/area/shuttle/abandoned) -"ad" = ( -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, -/turf/simulated/shuttle/wall/interior{ - tag = "icon-swall_f9"; - icon_state = "swall_f9" - }, +/turf/simulated/wall/mineral/titanium, /area/shuttle/abandoned) "ae" = ( -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/abandoned) "af" = ( /obj/machinery/sleeper{ @@ -38,39 +16,7 @@ dir = 1 }, /obj/effect/decal/remains/human, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, -/area/shuttle/abandoned) -"ag" = ( -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, -/turf/simulated/shuttle/wall/interior{ - tag = "icon-swall_f5"; - icon_state = "swall_f5" - }, -/area/shuttle/abandoned) -"ah" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall13"; - icon_state = "swall13"; - dir = 2 - }, -/area/shuttle/abandoned) -"ai" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall14"; - icon_state = "swall14"; - dir = 2 - }, -/area/shuttle/abandoned) -"aj" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f10"; - dir = 2 - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/abandoned) "ak" = ( /obj/structure/shuttle/engine/propulsion{ @@ -78,20 +24,11 @@ icon_state = "burst_r"; tag = "icon-burst_r (WEST)" }, -/turf/simulated/shuttle/plating, -/area/shuttle/abandoned) -"al" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall11"; - icon_state = "swall11"; - dir = 2 - }, +/turf/simulated/floor/plating/airless, /area/shuttle/abandoned) "am" = ( /obj/machinery/computer/med_data, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/abandoned) "an" = ( /obj/structure/table, @@ -99,23 +36,7 @@ pixel_x = 6; pixel_y = -5 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, -/area/shuttle/abandoned) -"ao" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall15"; - icon_state = "swall15"; - dir = 2 - }, -/area/shuttle/abandoned) -"ap" = ( -/turf/simulated/shuttle/plating, -/turf/simulated/shuttle/wall/interior{ - tag = "icon-swall_f9"; - icon_state = "swall_f9" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/abandoned) "aq" = ( /obj/structure/shuttle/engine/heater{ @@ -126,7 +47,7 @@ /obj/structure/window/reinforced{ dir = 8 }, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/shuttle/abandoned) "ar" = ( /obj/structure/shuttle/engine/propulsion{ @@ -134,134 +55,72 @@ icon_state = "propulsion"; tag = "icon-propulsion (WEST)" }, -/turf/simulated/shuttle/plating, -/area/shuttle/abandoned) -"as" = ( -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, -/turf/simulated/shuttle/wall/interior{ - tag = "icon-swall_f10"; - icon_state = "swall_f10" - }, +/turf/simulated/floor/plating/airless, /area/shuttle/abandoned) "at" = ( /obj/item/scalpel, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, -/area/shuttle/abandoned) -"au" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall7"; - icon_state = "swall7"; - dir = 2 - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/abandoned) "av" = ( -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating, /area/shuttle/abandoned) "aw" = ( /obj/structure/computerframe{ anchored = 1 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/abandoned) "ax" = ( -/obj/structure/window/full/shuttle{ - icon_state = "14" - }, -/obj/structure/grille, -/turf/simulated/shuttle/plating, -/area/shuttle/abandoned) -"ay" = ( -/obj/structure/window/full/shuttle{ - dir = 10; - icon_state = "9" - }, -/obj/structure/grille, -/turf/simulated/shuttle/plating, -/area/shuttle/abandoned) -"az" = ( -/obj/structure/window/full/shuttle{ - icon_state = "17" - }, -/obj/structure/grille, -/turf/simulated/shuttle/plating, +/obj/effect/spawner/window/shuttle, +/turf/simulated/floor/plating, /area/shuttle/abandoned) "aA" = ( /obj/machinery/door/airlock/public/glass{ name = "Hibernation Pods" }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/abandoned) "aB" = ( /obj/machinery/light/small{ dir = 8 }, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating, /area/shuttle/abandoned) "aC" = ( /obj/structure/chair/comfy/shuttle{ dir = 1 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/abandoned) "aD" = ( /obj/structure/table, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, -/area/shuttle/abandoned) -"aE" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall3"; - icon_state = "swall3"; - dir = 2 - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/abandoned) "aF" = ( /obj/item/multitool, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/abandoned) "aG" = ( /obj/item/stock_parts/cell{ charge = 100; maxcharge = 15000 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/abandoned) "aH" = ( -/obj/machinery/door/unpowered/shuttle, +/obj/machinery/door/airlock/titanium, /turf/simulated/floor/plating, /area/shuttle/abandoned) -"aI" = ( -/turf/simulated/shuttle/plating, -/turf/simulated/shuttle/wall/interior{ - tag = "icon-swall_f6"; - icon_state = "swall_f6" - }, -/area/shuttle/abandoned) "aJ" = ( /obj/structure/shuttle/engine/propulsion{ dir = 4; icon_state = "burst_l"; tag = "icon-burst_l (WEST)" }, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/shuttle/abandoned) "aK" = ( -/obj/machinery/door/unpowered/shuttle, +/obj/machinery/door/airlock/titanium, /obj/docking_port/mobile{ dir = 8; dwidth = 10; @@ -277,196 +136,104 @@ id = "whiteship_away"; name = "Deep Space" }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, -/area/shuttle/abandoned) -"aL" = ( -/obj/structure/window/full/shuttle{ - icon_state = "16" - }, -/obj/structure/grille, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/mineral/titanium, /area/shuttle/abandoned) "aM" = ( /obj/structure/table, /obj/machinery/light{ dir = 4 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, -/area/shuttle/abandoned) -"aN" = ( -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, -/turf/simulated/shuttle/wall/interior{ - tag = "icon-swall_f6"; - icon_state = "swall_f6" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/abandoned) "aO" = ( /obj/machinery/door/airlock/public/glass, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/abandoned) "aP" = ( /obj/machinery/light_switch{ pixel_x = 27 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/abandoned) "aQ" = ( /obj/machinery/portable_atmospherics/scrubber, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, -/area/shuttle/abandoned) -"aR" = ( -/obj/structure/grille, -/obj/structure/window/full/shuttle{ - icon_state = "8" - }, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/mineral/titanium, /area/shuttle/abandoned) "aS" = ( /obj/structure/bed, /obj/item/bedsheet, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/abandoned) "aT" = ( /obj/machinery/light{ dir = 8 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/abandoned) "aU" = ( /obj/structure/table, /obj/item/gun/energy/laser/retro, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/abandoned) "aV" = ( /obj/machinery/computer/shuttle/white_ship, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, -/area/shuttle/abandoned) -"aW" = ( -/obj/structure/grille, -/obj/structure/window/full/shuttle, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/mineral/titanium, /area/shuttle/abandoned) "aX" = ( /obj/machinery/light/small{ dir = 8 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/abandoned) "aY" = ( /obj/structure/table, -/obj/item/tank/oxygen, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, -/area/shuttle/abandoned) -"aZ" = ( -/obj/structure/window/full/shuttle, -/obj/structure/grille, -/turf/simulated/shuttle/plating, +/obj/item/tank/internals/oxygen, +/turf/simulated/floor/mineral/titanium, /area/shuttle/abandoned) "ba" = ( /obj/machinery/light{ dir = 1 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/abandoned) "bb" = ( /obj/structure/table, /obj/item/analyzer, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/abandoned) "bc" = ( /obj/effect/decal/remains/human, /obj/structure/chair/comfy/shuttle{ dir = 8 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/abandoned) "bd" = ( /obj/machinery/door/airlock/public/glass{ name = "Living Module" }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/abandoned) "be" = ( -/obj/machinery/door/unpowered/shuttle, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/obj/machinery/door/airlock/titanium, +/turf/simulated/floor/mineral/titanium, /area/shuttle/abandoned) "bf" = ( /obj/machinery/light/small{ dir = 1 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/abandoned) "bg" = ( /turf/template_noop, /area/shuttle/abandoned) "bh" = ( /obj/effect/decal/remains/human, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/abandoned) "bi" = ( /obj/machinery/portable_atmospherics/canister/oxygen, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, -/area/shuttle/abandoned) -"bj" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f9"; - dir = 2 - }, -/area/shuttle/abandoned) -"bk" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f5"; - dir = 2 - }, -/area/shuttle/abandoned) -"bl" = ( -/obj/structure/window/full/shuttle{ - icon_state = "15" - }, -/obj/structure/grille, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/mineral/titanium, /area/shuttle/abandoned) "bm" = ( /obj/machinery/light_switch{ @@ -475,122 +242,82 @@ /obj/machinery/light{ dir = 4 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/abandoned) "bn" = ( /obj/item/gps/ruin{ gpstag = "NT Medical Ship"; pixel_x = -32 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/abandoned) "bo" = ( /obj/item/shard, /obj/structure/chair/comfy/shuttle, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/abandoned) "bp" = ( /obj/structure/chair/comfy/shuttle, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/abandoned) "bq" = ( /obj/structure/computerframe{ anchored = 1 }, /obj/item/stack/cable_coil/cut, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/abandoned) "br" = ( /obj/structure/rack, -/obj/item/tank/emergency_oxygen, -/obj/item/tank/emergency_oxygen, -/obj/item/tank/emergency_oxygen, -/obj/item/tank/emergency_oxygen, +/obj/item/tank/internals/emergency_oxygen, +/obj/item/tank/internals/emergency_oxygen, +/obj/item/tank/internals/emergency_oxygen, +/obj/item/tank/internals/emergency_oxygen, /obj/item/storage/toolbox/mechanical, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/abandoned) "bs" = ( /obj/structure/rack, /obj/item/clothing/suit/space/hardsuit/medical, /obj/item/clothing/mask/breath, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/abandoned) "bt" = ( /obj/structure/rack, /obj/item/clothing/suit/space/syndicate/black/med, /obj/item/clothing/head/helmet/space/syndicate/black/med, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/abandoned) "bu" = ( /obj/machinery/light/small, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, -/area/shuttle/abandoned) -"bv" = ( -/turf/simulated/shuttle/plating, -/turf/simulated/shuttle/wall/interior{ - tag = "icon-swall_f5"; - icon_state = "swall_f5" - }, -/area/shuttle/abandoned) -"bw" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall14"; - dir = 2 - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/abandoned) "bx" = ( /obj/effect/decal/cleanable/blood{ amount = 0 }, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating, /area/shuttle/abandoned) "by" = ( /obj/structure/spacepoddoor, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating, /area/shuttle/abandoned) "bz" = ( /obj/machinery/door/airlock/public/glass{ name = "Pod Bay" }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, -/area/shuttle/abandoned) -"bA" = ( -/turf/simulated/shuttle/plating, -/turf/simulated/shuttle/wall/interior{ - tag = "icon-swall_f10"; - icon_state = "swall_f10" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/abandoned) "bB" = ( /obj/effect/decal/remains/human, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating, /area/shuttle/abandoned) "bC" = ( /obj/structure/spacepoddoor, /obj/machinery/door/poddoor/multi_tile/two_tile_ver{ id_tag = "whiteshippoddoor" }, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating, /area/shuttle/abandoned) "bD" = ( /obj/machinery/door_control{ @@ -598,24 +325,18 @@ name = "Pod Door Control"; pixel_y = -24 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/abandoned) "bE" = ( /obj/structure/table, /obj/item/screwdriver, /obj/machinery/light, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/abandoned) "bF" = ( /obj/structure/table, /obj/item/radio, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/abandoned) (1,1,1) = {" @@ -624,18 +345,18 @@ aa aa aa ab -au -aE -aL -aR -aR -aR -aR -aR -bl -aE -au -bk +ab +ab +ax +ax +ax +ax +ax +ax +ax +ab +ab +ab aa aa aa @@ -646,8 +367,8 @@ aa aa aa ab -ao -ad +ab +ab ae ae ae @@ -657,8 +378,8 @@ aD ae ae bn -as -ah +ab +ab aa aa aa @@ -668,8 +389,8 @@ aa aa aa ab -ao -ad +ab +ab ae ae ae @@ -681,7 +402,7 @@ ae ae bo aw -ac +ab aa aa aa @@ -690,8 +411,8 @@ aa (4,1,1) = {" aa ab -al -ah +ab +ab aw aC ae @@ -704,18 +425,18 @@ ae ae bp bq -bw +ab by bC -bk +ab aa "} (5,1,1) = {" aa -ac +ab am -as -ag +ab +ab ae ae ae @@ -726,19 +447,19 @@ ae ae ae ae -aN -ah +ab +ab ae ae -ac +ab aa "} (6,1,1) = {" ab -ad +ab ae ae -ac +ab aD aD aM @@ -748,39 +469,39 @@ ae ae ae bm -aN -ao -ad +ab +ab +ab ae bD -ai -bk +ab +ab "} (7,1,1) = {" -ac +ab ae ae ae -ai -aE -aE -aE -aE -aW +ab +ab +ab +ab +ab +ax aO -aW -aE -au -ao -ad +ax +ab +ab +ab +ab ae ae ae -as -ah +ab +ab "} (8,1,1) = {" -ac +ab ae ae ae @@ -793,21 +514,21 @@ ae ae ae ae -as -ah +ab +ab br ae ae ae ae -ac +ab "} (9,1,1) = {" -ac +ab af ae ae -ay +ax ae ae ae @@ -817,43 +538,43 @@ ae ae ae ae -ac +ab bs ae ae ae bE -ac +ab "} (10,1,1) = {" -ac +ab ae ae at -az +ax aG ae -aN -aE -aE -aE -aE -ag +ab +ab +ab +ab +ab +ab ae -ac +ab bt ae ae ae bF -ac +ab "} (11,1,1) = {" -ai -ag +ab +ab ae ae -ac +ab ae ae aO @@ -861,48 +582,48 @@ ae aX ae bh -ac +ab ae -ai -ag +ab +ab ae ae ae -aN -ah +ab +ab "} (12,1,1) = {" -aj -ah +ab +ab an ae -ac +ab ae ae -ac +ab aS aY ae aS -ac +ab ae -as -al -aE +ab +ab +ab bz -au -ao -bj +ab +ab +ab "} (13,1,1) = {" aa -ai -ag +ab +ab ae aA ae ae -ac +ab ae aP ae @@ -913,39 +634,39 @@ ae ae ae bh -ai -ah +ab +ab aa "} (14,1,1) = {" aa -aj -ao -au -ah +ab +ab +ab +ab ae ae -as -aE -aE -aE -aE -ad +ab +ab +ab +ab +ab +ab ae ae ae ae -aN -ao -bj +ab +ab +ab aa "} (15,1,1) = {" aa aa -aj -ao -ah +ab +ab +ab ae ae ae @@ -957,9 +678,9 @@ ae ae ae aG -aN -ao -bj +ab +ab +ab aa aa "} @@ -967,8 +688,8 @@ aa aa aa aa -aj -ah +ab +ab ae ae aP @@ -980,8 +701,8 @@ ae ae ae bu -ai -bj +ab +ab aa aa aa @@ -991,20 +712,20 @@ aa aa aa ab -al +ab aH -au -aE -aE -aZ +ab +ab +ab +ax bd -aZ -aE -aE -au +ax +ab +ab +ab aH -al -bk +ab +ab aa aa aa @@ -1013,10 +734,10 @@ aa aa aa ab -ap +ab aB av -ac +ab aQ aT ae @@ -1024,82 +745,82 @@ ae ae aT ae -ac +ab av aB -bA -bk +ab +ab aa aa "} (19,1,1) = {" aa ab -ap +ab av av -aI -ao -ag +ab +ab +ab ae ae ae ae ae -aN -ao -bv +ab +ab +ab bx bB -bA -bk +ab +ab aa "} (20,1,1) = {" ab -ah +ab aq aq aq -ac -aj -ah +ab +ab +ab ae ae ae ae ae -ai -bj -ac +ab +ab +ab aq aq aq -ai -bk +ab +ab "} (21,1,1) = {" -aj +ab ak ar ar ar aJ bg -ai -ag +ab +ab ae ae ae -aN -ah +ab +ab bg ak ar ar ar aJ -bj +ab "} (22,1,1) = {" aa @@ -1109,13 +830,13 @@ aa aa aa aa -aj -ao -ag +ab +ab +ab ae -aN -ao -bj +ab +ab +ab aa aa aa @@ -1133,11 +854,11 @@ aa aa aa aa -aj -ao +ab +ab be -ao -bj +ab +ab aa aa aa @@ -1157,9 +878,9 @@ aa aa aa aa -ac +ab bf -ac +ab aa aa aa @@ -1180,10 +901,10 @@ aa aa aa ab -ao +ab be -ao -bk +ab +ab aa aa aa @@ -1202,11 +923,11 @@ aa aa aa aa -ai -ad +ab +ab ae -as -ah +ab +ab aa aa aa @@ -1225,11 +946,11 @@ aa aa aa aa -ac +ab ae ae ae -ac +ab aa aa aa @@ -1248,11 +969,11 @@ aa aa aa aa -ac +ab ae ae ae -ac +ab aa aa aa @@ -1271,11 +992,11 @@ aa aa aa aa -ac +ab ae ae ae -ac +ab aa aa aa @@ -1294,11 +1015,11 @@ aa aa aa aa -ac +ab ba ae ae -ac +ab aa aa aa @@ -1317,11 +1038,11 @@ aa aa aa aa -ac +ab ae ae ae -ac +ab aa aa aa @@ -1340,11 +1061,11 @@ aa aa aa aa -ac +ab ae ae ae -ac +ab aa aa aa @@ -1363,11 +1084,11 @@ aa aa aa aa -ac +ab ae ae bi -ac +ab aa aa aa @@ -1386,11 +1107,11 @@ aa aa aa aa -ai -ag +ab +ab ae -aN -ah +ab +ab aa aa aa @@ -1409,11 +1130,11 @@ aa aa aa aa -aj -al +ab +ab aK -al -bj +ab +ab aa aa aa diff --git a/_maps/map_files/RandomRuins/SpaceRuins/wizardcrash.dmm b/_maps/map_files/RandomRuins/SpaceRuins/wizardcrash.dmm index 3add952e8e2..228f1580e51 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/wizardcrash.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/wizardcrash.dmm @@ -65,9 +65,8 @@ /turf/simulated/floor/wood, /area/ruin/unpowered) "al" = ( -/obj/structure/shuttle/window, -/obj/structure/grille, -/turf/simulated/floor/wood, +/obj/effect/spawner/window/shuttle, +/turf/simulated/floor/plating/airless, /area/ruin/unpowered) "am" = ( /obj/structure/table/wood, @@ -492,7 +491,7 @@ /area/ruin/unpowered) "bG" = ( /obj/structure/shuttle/engine/propulsion, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/ruin/unpowered) "bH" = ( /turf/simulated/wall/mineral/titanium, @@ -533,11 +532,6 @@ }, /turf/simulated/floor/plating, /area/ruin/unpowered) -"bO" = ( -/obj/structure/shuttle/window, -/obj/structure/grille, -/turf/space, -/area/ruin/unpowered) "bP" = ( /obj/item/stack/sheet/mineral/plasma, /obj/item/stack/sheet/mineral/plasma, @@ -709,7 +703,7 @@ ae al ae ae -bO +al ae ae ae diff --git a/_maps/map_files/RandomZLevels/academy.dmm b/_maps/map_files/RandomZLevels/academy.dmm index 9237881653b..a98fe0ef8f3 100644 --- a/_maps/map_files/RandomZLevels/academy.dmm +++ b/_maps/map_files/RandomZLevels/academy.dmm @@ -505,23 +505,7 @@ /turf/simulated/wall, /area/awaymission/academy/classrooms) "bF" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swallc2"; - icon_state = "swallc2" - }, -/area/awaymission/academy/classrooms) -"bG" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall12"; - icon_state = "swall12"; - dir = 2 - }, -/area/awaymission/academy/classrooms) -"bH" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swallc1"; - icon_state = "swallc1" - }, +/turf/simulated/wall/mineral/titanium, /area/awaymission/academy/classrooms) "bI" = ( /obj/machinery/light{ @@ -638,13 +622,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/awaymission/academy/classrooms) -"bW" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall3"; - icon_state = "swall3"; - dir = 2 - }, -/area/awaymission/academy/classrooms) "bX" = ( /obj/effect/decal/cleanable/ash, /turf/simulated/floor/engine, @@ -782,12 +759,6 @@ }, /turf/simulated/floor/plasteel, /area/awaymission/academy/classrooms) -"cs" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall1"; - icon_state = "swall1" - }, -/area/awaymission/academy/classrooms) "ct" = ( /obj/structure/chair, /turf/simulated/floor/plasteel, @@ -971,8 +942,8 @@ /area/awaymission/academy/headmaster) "cU" = ( /obj/structure/closet/crate/internals, -/obj/item/tank/oxygen, -/obj/item/tank/oxygen/red, +/obj/item/tank/internals/oxygen, +/obj/item/tank/internals/oxygen/red, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -11565,9 +11536,9 @@ aa aa bs bF -bW -bW -cs +bF +bF +bF cA cA cP @@ -11694,7 +11665,7 @@ aa aa aa bs -bG +bF bX bZ bZ @@ -11824,7 +11795,7 @@ aa aa aP bs -bG +bF bY bZ bZ @@ -11954,7 +11925,7 @@ aa aP aP bs -bG +bF bZ bZ bZ @@ -12084,7 +12055,7 @@ aP aP aa bs -bG +bF bZ bX bZ @@ -12214,7 +12185,7 @@ ab aP aP bs -bG +bF ca bZ bZ @@ -12344,7 +12315,7 @@ aP aa aa bs -bG +bF bZ bZ bZ @@ -12474,10 +12445,10 @@ aP aa aa bs -bH -bW -bW -cs +bF +bF +bF +bF cC cC cR diff --git a/_maps/map_files/RandomZLevels/beach.dmm b/_maps/map_files/RandomZLevels/beach.dmm index eb5e1193f4a..3001121184a 100644 --- a/_maps/map_files/RandomZLevels/beach.dmm +++ b/_maps/map_files/RandomZLevels/beach.dmm @@ -3,144 +3,144 @@ /turf/space, /area/space) "ab" = ( -/turf/unsimulated/beach/water/deep, +/turf/simulated/floor/beach/away/water/deep, /area/awaymission/undersea) "ac" = ( /obj/machinery/poolcontroller/invisible/sea, -/turf/unsimulated/beach/water/deep, +/turf/simulated/floor/beach/away/water/deep, /area/awaymission/undersea) "ad" = ( -/turf/unsimulated/beach/water/deep/rock_wall, +/turf/simulated/floor/beach/away/water/deep/rock_wall, /area/awaymission/undersea) "ae" = ( /obj/structure/ladder/unbreakable/dive_point/anchor{ id = "pirate" }, -/turf/unsimulated/beach/water/deep/sand_floor, +/turf/simulated/floor/beach/away/water/deep/sand_floor, /area/awaymission/undersea) "af" = ( /obj/structure/constructshell, -/turf/unsimulated/beach/water/deep/wood_floor, +/turf/simulated/floor/beach/away/water/deep/wood_floor, /area/awaymission/undersea) "ag" = ( /obj/structure/chair/wood/wings, -/turf/unsimulated/beach/water/deep/wood_floor, +/turf/simulated/floor/beach/away/water/deep/wood_floor, /area/awaymission/undersea) "ah" = ( -/turf/unsimulated/beach/water/deep/wood_floor, +/turf/simulated/floor/beach/away/water/deep/wood_floor, /area/awaymission/undersea) "ai" = ( /obj/structure/cult/pylon, -/turf/unsimulated/beach/water/deep/wood_floor, +/turf/simulated/floor/beach/away/water/deep/wood_floor, /area/awaymission/undersea) "aj" = ( /obj/structure/cult/altar, /obj/item/veilrender/crabrender, -/turf/unsimulated/beach/water/deep/wood_floor, +/turf/simulated/floor/beach/away/water/deep/wood_floor, /area/awaymission/undersea) "ak" = ( /obj/structure/cult/altar, /obj/item/tome, -/turf/unsimulated/beach/water/deep/wood_floor, +/turf/simulated/floor/beach/away/water/deep/wood_floor, /area/awaymission/undersea) "al" = ( /obj/structure/curtain/black, -/turf/unsimulated/beach/water/deep/wood_floor, +/turf/simulated/floor/beach/away/water/deep/wood_floor, /area/awaymission/undersea) "am" = ( /obj/structure/cult/forge, -/turf/unsimulated/beach/water/deep/wood_floor, +/turf/simulated/floor/beach/away/water/deep/wood_floor, /area/awaymission/undersea) "an" = ( /obj/structure/flora/rock/pile, -/turf/unsimulated/beach/water/deep/sand_floor, +/turf/simulated/floor/beach/away/water/deep/sand_floor, /area/awaymission/undersea) "ao" = ( /obj/structure/flora/rock, -/turf/unsimulated/beach/water/deep/sand_floor, +/turf/simulated/floor/beach/away/water/deep/sand_floor, /area/awaymission/undersea) "ap" = ( /obj/structure/chair/stool, -/turf/unsimulated/beach/water/deep/wood_floor, +/turf/simulated/floor/beach/away/water/deep/wood_floor, /area/awaymission/undersea) "aq" = ( /mob/living/simple_animal/hostile/retaliate/carp, -/turf/unsimulated/beach/water/deep/sand_floor, +/turf/simulated/floor/beach/away/water/deep/sand_floor, /area/awaymission/undersea) "ar" = ( /mob/living/simple_animal/hostile/retaliate/carp, -/turf/unsimulated/beach/water/deep/wood_floor, +/turf/simulated/floor/beach/away/water/deep/wood_floor, /area/awaymission/undersea) "as" = ( /obj/structure/boulder, -/turf/unsimulated/beach/water/deep/sand_floor, +/turf/simulated/floor/beach/away/water/deep/sand_floor, /area/awaymission/undersea) "at" = ( /obj/item/flag/cult, -/turf/unsimulated/beach/water/deep/wood_floor, +/turf/simulated/floor/beach/away/water/deep/wood_floor, /area/awaymission/undersea) "au" = ( /obj/structure/mineral_door/sandstone, /obj/structure/barricade/wooden, -/turf/unsimulated/beach/water/deep/wood_floor, +/turf/simulated/floor/beach/away/water/deep/wood_floor, /area/awaymission/undersea) "av" = ( -/turf/unsimulated/beach/water/deep/sand_floor, +/turf/simulated/floor/beach/away/water/deep/sand_floor, /area/awaymission/undersea) "aw" = ( /obj/item/toy/eight_ball/conch, -/turf/unsimulated/beach/water/deep/wood_floor, +/turf/simulated/floor/beach/away/water/deep/wood_floor, /area/awaymission/undersea) "ax" = ( /obj/structure/reagent_dispensers/beerkeg, -/turf/unsimulated/beach/water/deep/wood_floor, +/turf/simulated/floor/beach/away/water/deep/wood_floor, /area/awaymission/undersea) "ay" = ( /obj/structure/closet/cabinet, -/turf/unsimulated/beach/water/deep/wood_floor, +/turf/simulated/floor/beach/away/water/deep/wood_floor, /area/awaymission/undersea) "az" = ( /obj/structure/rack/skeletal_bar/left, -/turf/unsimulated/beach/water/deep/wood_floor, +/turf/simulated/floor/beach/away/water/deep/wood_floor, /area/awaymission/undersea) "aA" = ( /obj/structure/rack/skeletal_bar/right, -/turf/unsimulated/beach/water/deep/wood_floor, +/turf/simulated/floor/beach/away/water/deep/wood_floor, /area/awaymission/undersea) "aB" = ( /obj/structure/rack/skeletal_bar, -/turf/unsimulated/beach/water/deep/wood_floor, +/turf/simulated/floor/beach/away/water/deep/wood_floor, /area/awaymission/undersea) "aC" = ( /obj/structure/mineral_door/wood{ tag = "icon-wood"; icon_state = "wood" }, -/turf/unsimulated/beach/water/deep/wood_floor, +/turf/simulated/floor/beach/away/water/deep/wood_floor, /area/awaymission/undersea) "aD" = ( /obj/structure/chair/comfy/teal{ dir = 4 }, -/turf/unsimulated/beach/water/deep/wood_floor, +/turf/simulated/floor/beach/away/water/deep/wood_floor, /area/awaymission/undersea) "aE" = ( /obj/structure/table/wood, -/turf/unsimulated/beach/water/deep/wood_floor, +/turf/simulated/floor/beach/away/water/deep/wood_floor, /area/awaymission/undersea) "aF" = ( /obj/structure/chair/comfy/teal{ dir = 8 }, -/turf/unsimulated/beach/water/deep/wood_floor, +/turf/simulated/floor/beach/away/water/deep/wood_floor, /area/awaymission/undersea) "aG" = ( /obj/structure/toilet, -/turf/unsimulated/beach/water/deep/wood_floor, +/turf/simulated/floor/beach/away/water/deep/wood_floor, /area/awaymission/undersea) "aH" = ( /obj/structure/grille, -/turf/unsimulated/beach/water/deep/sand_floor, +/turf/simulated/floor/beach/away/water/deep/sand_floor, /area/awaymission/undersea) "aI" = ( /obj/structure/chair/wood/wings{ @@ -148,7 +148,7 @@ icon_state = "wooden_chair_wings"; dir = 4 }, -/turf/unsimulated/beach/water/deep/wood_floor, +/turf/simulated/floor/beach/away/water/deep/wood_floor, /area/awaymission/undersea) "aJ" = ( /obj/structure/chair/wood/wings{ @@ -156,15 +156,15 @@ icon_state = "wooden_chair_wings"; dir = 8 }, -/turf/unsimulated/beach/water/deep/wood_floor, +/turf/simulated/floor/beach/away/water/deep/wood_floor, /area/awaymission/undersea) "aK" = ( /obj/structure/chair/sofa/right, -/turf/unsimulated/beach/water/deep/wood_floor, +/turf/simulated/floor/beach/away/water/deep/wood_floor, /area/awaymission/undersea) "aL" = ( /obj/structure/chair/sofa/left, -/turf/unsimulated/beach/water/deep/wood_floor, +/turf/simulated/floor/beach/away/water/deep/wood_floor, /area/awaymission/undersea) "aM" = ( /obj/structure/sink{ @@ -173,7 +173,7 @@ pixel_x = 11; pixel_y = 0 }, -/turf/unsimulated/beach/water/deep/wood_floor, +/turf/simulated/floor/beach/away/water/deep/wood_floor, /area/awaymission/undersea) "aN" = ( /obj/structure/sink{ @@ -182,16 +182,16 @@ pixel_x = -12; pixel_y = 2 }, -/turf/unsimulated/beach/water/deep/wood_floor, +/turf/simulated/floor/beach/away/water/deep/wood_floor, /area/awaymission/undersea) "aO" = ( /obj/structure/closet/crate/can, /obj/item/storage/bag/trash, -/turf/unsimulated/beach/water/deep/sand_floor, +/turf/simulated/floor/beach/away/water/deep/sand_floor, /area/awaymission/undersea) "aP" = ( /obj/item/flag/species/skrell, -/turf/unsimulated/beach/water/deep/sand_floor, +/turf/simulated/floor/beach/away/water/deep/sand_floor, /area/awaymission/undersea) "aQ" = ( /obj/structure/mirror{ @@ -199,45 +199,45 @@ pixel_y = 28 }, /obj/item/storage/wallet/random, -/turf/unsimulated/beach/water/deep/wood_floor, +/turf/simulated/floor/beach/away/water/deep/wood_floor, /area/awaymission/undersea) "aR" = ( /obj/structure/mirror{ icon_state = "mirror_broke"; pixel_y = 28 }, -/turf/unsimulated/beach/water/deep/wood_floor, +/turf/simulated/floor/beach/away/water/deep/wood_floor, /area/awaymission/undersea) "aS" = ( /obj/structure/bed, -/turf/unsimulated/beach/water/deep/wood_floor, +/turf/simulated/floor/beach/away/water/deep/wood_floor, /area/awaymission/undersea) "aT" = ( /obj/structure/dresser, -/turf/unsimulated/beach/water/deep/wood_floor, +/turf/simulated/floor/beach/away/water/deep/wood_floor, /area/awaymission/undersea) "aU" = ( /obj/structure/ladder/unbreakable/dive_point/anchor, -/turf/unsimulated/beach/water/deep/sand_floor, +/turf/simulated/floor/beach/away/water/deep/sand_floor, /area/awaymission/undersea) "aV" = ( /obj/structure/barricade/wooden, -/turf/unsimulated/beach/water/deep/wood_floor, +/turf/simulated/floor/beach/away/water/deep/wood_floor, /area/awaymission/undersea) "aW" = ( /obj/structure/grille/broken, -/turf/unsimulated/beach/water/deep/sand_floor, +/turf/simulated/floor/beach/away/water/deep/sand_floor, /area/awaymission/undersea) "aX" = ( /obj/item/stack/spacecash/c500, -/turf/unsimulated/beach/water/deep/sand_floor, +/turf/simulated/floor/beach/away/water/deep/sand_floor, /area/awaymission/undersea) "aY" = ( /obj/structure/mineral_door/wood{ tag = "icon-wood"; icon_state = "wood" }, -/turf/unsimulated/beach/water/deep/sand_floor, +/turf/simulated/floor/beach/away/water/deep/sand_floor, /area/awaymission/undersea) "aZ" = ( /obj/structure/closet/crate{ @@ -251,7 +251,7 @@ /obj/item/coin/gold, /obj/item/coin/gold, /obj/item/coin/gold, -/turf/unsimulated/beach/water/deep/sand_floor, +/turf/simulated/floor/beach/away/water/deep/sand_floor, /area/awaymission/undersea) "bc" = ( /obj/structure/flora/ausbushes/leafybush, @@ -261,11 +261,11 @@ icon_state = "gravsnow_corner"; dir = 9 }, -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, /area/awaymission/beach) "bd" = ( /obj/structure/flora/grass/brown, -/turf/unsimulated/beach/sand/dense, +/turf/simulated/floor/beach/away/sand/dense, /area/awaymission/beach) "be" = ( /obj/effect/decal/snow/sand/edge{ @@ -274,11 +274,11 @@ icon_state = "gravsnow_corner"; dir = 5 }, -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, /area/awaymission/beach) "bf" = ( /obj/structure/flora/ausbushes/genericbush, -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, /area/awaymission/beach) "bg" = ( /obj/effect/decal/snow/sand/edge{ @@ -287,7 +287,7 @@ icon_state = "gravsnow_corner"; dir = 8 }, -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, /area/awaymission/beach) "bh" = ( /obj/structure/flora/ausbushes/leafybush, @@ -297,16 +297,16 @@ icon_state = "gravsnow_corner"; dir = 4 }, -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, /area/awaymission/beach) "bi" = ( /obj/effect/decal/snow/sand/edge{ name = "rough sand" }, -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, /area/awaymission/beach) "bj" = ( -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, /area/awaymission/beach) "bk" = ( /obj/effect/decal/snow/sand/surround{ @@ -315,7 +315,7 @@ icon_state = "gravsnow_surround"; dir = 1 }, -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, /area/awaymission/beach) "bl" = ( /obj/effect/decal/snow/sand/edge{ @@ -324,7 +324,7 @@ icon_state = "gravsnow_corner"; dir = 4 }, -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, /area/awaymission/beach) "bm" = ( /obj/effect/decal/snow/sand/edge{ @@ -333,13 +333,13 @@ icon_state = "gravsnow_corner"; dir = 9 }, -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, /area/awaymission/beach) "bn" = ( /obj/effect/decal/snow/sand/edge{ name = "rough sand" }, -/turf/unsimulated/floor/grass, +/turf/simulated/floor/grass, /area/awaymission/beach) "bo" = ( /obj/effect/decal/snow/sand/edge{ @@ -348,13 +348,13 @@ icon_state = "gravsnow_corner"; dir = 10 }, -/turf/unsimulated/floor/grass, +/turf/simulated/floor/grass, /area/awaymission/beach) "bp" = ( /obj/effect/decal/snow/sand/surround{ name = "rough sand" }, -/turf/unsimulated/floor/grass, +/turf/simulated/floor/grass, /area/awaymission/beach) "bq" = ( /obj/effect/decal/snow/sand/edge{ @@ -363,7 +363,7 @@ icon_state = "gravsnow_corner"; dir = 6 }, -/turf/unsimulated/floor/grass, +/turf/simulated/floor/grass, /area/awaymission/beach) "br" = ( /obj/effect/decal/snow/sand/edge{ @@ -372,7 +372,7 @@ icon_state = "gravsnow_corner"; dir = 6 }, -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, /area/awaymission/beach) "bs" = ( /obj/effect/decal/snow/sand/edge{ @@ -381,11 +381,11 @@ icon_state = "gravsnow_corner"; dir = 10 }, -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, /area/awaymission/beach) "bt" = ( /obj/structure/flora/ausbushes/lavendergrass, -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, /area/awaymission/beach) "bu" = ( /obj/structure/flora/ausbushes/leafybush, @@ -395,7 +395,7 @@ icon_state = "gravsnow_corner"; dir = 9 }, -/turf/unsimulated/beach/sand/dense, +/turf/simulated/floor/beach/away/sand/dense, /area/awaymission/beach) "bv" = ( /obj/effect/decal/snow/sand/edge{ @@ -404,11 +404,11 @@ icon_state = "gravsnow_corner"; dir = 5 }, -/turf/unsimulated/beach/sand/dense, +/turf/simulated/floor/beach/away/sand/dense, /area/awaymission/beach) "bw" = ( /obj/effect/overlay/palmtree_r, -/turf/unsimulated/beach/sand/dense, +/turf/simulated/floor/beach/away/sand/dense, /area/awaymission/beach) "bx" = ( /obj/effect/overlay/palmtree_r, @@ -418,7 +418,7 @@ icon_state = "gravsnow_corner"; dir = 9 }, -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, /area/awaymission/beach) "by" = ( /obj/effect/decal/snow/sand/edge{ @@ -427,11 +427,11 @@ icon_state = "gravsnow_corner"; dir = 1 }, -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, /area/awaymission/beach) "bz" = ( /obj/effect/overlay/palmtree_r, -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, /area/awaymission/beach) "bA" = ( /obj/structure/flora/ausbushes/genericbush, @@ -441,7 +441,7 @@ icon_state = "gravsnow_corner"; dir = 1 }, -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, /area/awaymission/beach) "bB" = ( /obj/effect/overlay/palmtree_r, @@ -451,7 +451,7 @@ icon_state = "gravsnow_corner"; dir = 1 }, -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, /area/awaymission/beach) "bC" = ( /obj/effect/overlay/palmtree_r, @@ -461,24 +461,24 @@ icon_state = "gravsnow_corner"; dir = 4 }, -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, /area/awaymission/beach) "bD" = ( /obj/effect/overlay/palmtree_r, /obj/effect/overlay/coconut, -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, /area/awaymission/beach) "bE" = ( /obj/structure/flora/bush, -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, /area/awaymission/beach) "bF" = ( /obj/effect/overlay/palmtree_l, -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, /area/awaymission/beach) "bG" = ( /obj/structure/flora/ausbushes/sunnybush, -/turf/unsimulated/beach/sand/dense, +/turf/simulated/floor/beach/away/sand/dense, /area/awaymission/beach) "bH" = ( /obj/effect/overlay/palmtree_r, @@ -488,7 +488,7 @@ icon_state = "gravsnow_corner"; dir = 8 }, -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, /area/awaymission/beach) "bI" = ( /obj/effect/decal/snow/sand/edge{ @@ -497,7 +497,7 @@ icon_state = "gravsnow_corner"; dir = 4 }, -/turf/unsimulated/beach/sand/dense, +/turf/simulated/floor/beach/away/sand/dense, /area/awaymission/beach) "bJ" = ( /obj/effect/overlay/palmtree_l, @@ -507,16 +507,16 @@ icon_state = "gravsnow_corner"; dir = 1 }, -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, /area/awaymission/beach) "bK" = ( /obj/effect/overlay/palmtree_l, /obj/effect/overlay/coconut, -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, /area/awaymission/beach) "bL" = ( /obj/structure/flora/ausbushes/sunnybush, -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, /area/awaymission/beach) "bM" = ( /obj/structure/flora/ausbushes/sunnybush, @@ -526,102 +526,102 @@ icon_state = "gravsnow_corner"; dir = 1 }, -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, /area/awaymission/beach) "bN" = ( /obj/structure/flora/ausbushes/leafybush, -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, /area/awaymission/beach) "bO" = ( /obj/structure/flora/grass/brown, -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, /area/awaymission/beach) "bP" = ( /obj/structure/flora/rock/pile, /obj/effect/overlay/palmtree_l, -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, /area/awaymission/beach) "bQ" = ( /obj/structure/flora/ausbushes/grassybush, -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, /area/awaymission/beach) "bR" = ( /obj/structure/flora/ausbushes/reedbush, -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, /area/awaymission/beach) "bS" = ( /obj/structure/flora/grass/green, -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, /area/awaymission/beach) "bT" = ( /obj/structure/flora/rock/pile, /obj/structure/flora/ausbushes/palebush, -/turf/unsimulated/beach/sand/dense, +/turf/simulated/floor/beach/away/sand/dense, /area/awaymission/beach) "bU" = ( /obj/structure/flora/rock/pile, /obj/structure/flora/ausbushes/genericbush, -/turf/unsimulated/beach/sand/dense, +/turf/simulated/floor/beach/away/sand/dense, /area/awaymission/beach) "bV" = ( /obj/structure/flora/rock/pile, /obj/structure/flora/ausbushes/sunnybush, -/turf/unsimulated/beach/sand/dense, +/turf/simulated/floor/beach/away/sand/dense, /area/awaymission/beach) "bW" = ( /obj/structure/flora/rock/pile, /obj/structure/flora/ausbushes/leafybush, -/turf/unsimulated/beach/sand/dense, +/turf/simulated/floor/beach/away/sand/dense, /area/awaymission/beach) "bX" = ( /obj/structure/flora/rock, -/turf/unsimulated/beach/sand/dense, +/turf/simulated/floor/beach/away/sand/dense, /area/awaymission/beach) "bY" = ( /obj/structure/flora/ausbushes/palebush, -/turf/unsimulated/beach/sand/dense, +/turf/simulated/floor/beach/away/sand/dense, /area/awaymission/beach) "bZ" = ( /obj/structure/flora/rock/pile, /obj/structure/flora/ausbushes/lavendergrass, -/turf/unsimulated/beach/sand/dense, +/turf/simulated/floor/beach/away/sand/dense, /area/awaymission/beach) "ca" = ( /obj/structure/flora/rock/pile, /obj/effect/overlay/palmtree_r, -/turf/unsimulated/beach/sand/dense, +/turf/simulated/floor/beach/away/sand/dense, /area/awaymission/beach) "cb" = ( /obj/structure/flora/rock/pile, /obj/effect/overlay/palmtree_l, -/turf/unsimulated/beach/sand/dense, +/turf/simulated/floor/beach/away/sand/dense, /area/awaymission/beach) "cc" = ( /obj/structure/flora/rock/pile, /obj/structure/flora/ausbushes/fernybush, -/turf/unsimulated/beach/sand/dense, +/turf/simulated/floor/beach/away/sand/dense, /area/awaymission/beach) "cd" = ( /obj/structure/flora/rock/pile, /obj/structure/flora/ausbushes/sunnybush, -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, /area/awaymission/beach) "ce" = ( /obj/structure/flora/rock/pile, /obj/structure/flora/ausbushes/leafybush, -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, /area/awaymission/beach) "cf" = ( /obj/structure/flora/rock/pile, /obj/structure/flora/ausbushes/fernybush, -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, /area/awaymission/beach) "cg" = ( -/turf/unsimulated/beach/sand/dense, +/turf/simulated/floor/beach/away/sand/dense, /area/awaymission/beach) "ch" = ( /obj/structure/flora/rock, -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, /area/awaymission/beach) "ci" = ( /obj/effect/overlay/palmtree_r, @@ -632,46 +632,46 @@ icon_state = "gravsnow_corner"; dir = 1 }, -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, /area/awaymission/beach) "cj" = ( /obj/machinery/gateway{ dir = 9 }, -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, /area/awaymission/beach) "ck" = ( /obj/machinery/gateway{ dir = 1 }, -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, /area/awaymission/beach) "cl" = ( /obj/machinery/gateway{ dir = 5 }, -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, /area/awaymission/beach) "cm" = ( /obj/structure/flora/rock/pile, /obj/structure/flora/ausbushes/palebush, -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, /area/awaymission/beach) "cn" = ( /obj/machinery/gateway{ dir = 8 }, -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, /area/awaymission/beach) "co" = ( /obj/machinery/gateway/centeraway, -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, /area/awaymission/beach) "cp" = ( /obj/machinery/gateway{ dir = 4 }, -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, /area/awaymission/beach) "cq" = ( /obj/effect/decal/snow/sand/edge{ @@ -683,14 +683,14 @@ /obj/item/clothing/mask/breath, /obj/item/clothing/mask/breath, /obj/item/clothing/mask/breath, -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, /area/awaymission/beach) "cr" = ( /obj/effect/decal/snow/sand/edge{ name = "rough sand" }, /obj/structure/dispenser/oxygen, -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, /area/awaymission/beach) "cs" = ( /obj/structure/flora/ausbushes/reedbush, @@ -700,40 +700,40 @@ icon_state = "gravsnow_corner"; dir = 5 }, -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, /area/awaymission/beach) "ct" = ( /obj/effect/overlay/palmtree_r, /obj/effect/overlay/coconut, -/turf/unsimulated/beach/sand/dense, +/turf/simulated/floor/beach/away/sand/dense, /area/awaymission/beach) "cu" = ( /obj/structure/flora/ausbushes/lavendergrass, -/turf/unsimulated/beach/sand/dense, +/turf/simulated/floor/beach/away/sand/dense, /area/awaymission/beach) "cv" = ( /obj/structure/flora/bush, -/turf/unsimulated/beach/sand/dense, +/turf/simulated/floor/beach/away/sand/dense, /area/awaymission/beach) "cx" = ( /obj/structure/flora/ausbushes/genericbush, -/turf/unsimulated/beach/sand/dense, +/turf/simulated/floor/beach/away/sand/dense, /area/awaymission/beach) "cy" = ( /obj/machinery/gateway{ dir = 10 }, -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, /area/awaymission/beach) "cz" = ( /obj/machinery/gateway, -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, /area/awaymission/beach) "cA" = ( /obj/machinery/gateway{ dir = 6 }, -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, /area/awaymission/beach) "cB" = ( /obj/effect/decal/snow/sand/edge{ @@ -743,29 +743,14 @@ dir = 4 }, /obj/effect/overlay/palmtree_r, -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, /area/awaymission/beach) "cC" = ( /obj/structure/flora/ausbushes/leafybush, -/turf/unsimulated/beach/sand/dense, -/area/awaymission/beach) -"cD" = ( -/turf/unsimulated/wall{ - tag = "icon-sandstone12"; - icon_state = "sandstone12" - }, +/turf/simulated/floor/beach/away/sand/dense, /area/awaymission/beach) "cE" = ( -/turf/unsimulated/wall{ - tag = "icon-sandstone6"; - icon_state = "sandstone6" - }, -/area/awaymission/beach) -"cF" = ( -/turf/unsimulated/wall{ - tag = "icon-sandstone10"; - icon_state = "sandstone10" - }, +/turf/simulated/wall/mineral/sandstone, /area/awaymission/beach) "cG" = ( /obj/structure/flora/ausbushes/ppflowers, @@ -775,19 +760,7 @@ icon_state = "gravsnow_corner"; dir = 8 }, -/turf/unsimulated/beach/sand, -/area/awaymission/beach) -"cH" = ( -/turf/unsimulated/wall{ - tag = "icon-sandstone3"; - icon_state = "sandstone3" - }, -/area/awaymission/beach) -"cI" = ( -/turf/unsimulated/wall{ - tag = "icon-sandstone1"; - icon_state = "sandstone1" - }, +/turf/simulated/floor/beach/away/sand, /area/awaymission/beach) "cJ" = ( /obj/effect/decal/snow/sand/edge{ @@ -797,7 +770,7 @@ dir = 4 }, /obj/structure/closet/athletic_mixed, -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, /area/awaymission/beach) "cK" = ( /obj/effect/decal/snow/sand/edge{ @@ -807,14 +780,14 @@ dir = 8 }, /obj/effect/overlay/palmtree_l, -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, /area/awaymission/beach) "cL" = ( /obj/structure/mineral_door/wood{ tag = "icon-wood"; icon_state = "wood" }, -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, /area/awaymission/beach) "cN" = ( /obj/effect/decal/snow/sand/edge{ @@ -827,34 +800,14 @@ /obj/item/clothing/shoes/sandal, /obj/item/clothing/shoes/sandal, /obj/structure/closet/crate, -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, /area/awaymission/beach) "cO" = ( /obj/structure/chair/stool, -/turf/unsimulated/floor{ - tag = "icon-wood"; - icon_state = "wood" - }, -/area/awaymission/beach) -"cP" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall8"; - icon_state = "swall8" - }, +/turf/simulated/floor/wood, /area/awaymission/beach) "cQ" = ( -/turf/unsimulated/beach/sand, -/turf/simulated/shuttle/wall{ - tag = "icon-swall_f6"; - icon_state = "swall_f6" - }, -/area/awaymission/beach) -"cR" = ( -/turf/unsimulated/beach/sand, -/turf/simulated/shuttle/wall{ - tag = "icon-swall_f10"; - icon_state = "swall_f10" - }, +/turf/simulated/wall/mineral/titanium, /area/awaymission/beach) "cS" = ( /obj/structure/closet/gmcloset{ @@ -862,130 +815,97 @@ icon_state = "black"; name = "formal wardrobe" }, -/turf/unsimulated/floor{ - tag = "icon-wood"; - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/awaymission/beach) "cT" = ( /obj/structure/closet/crate, /obj/item/gun/energy/laser/retro, /obj/item/gun/energy/laser/retro, -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, /area/awaymission/beach) "cU" = ( /obj/structure/closet/secure_closet/bar, -/turf/unsimulated/floor{ - tag = "icon-wood"; - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/awaymission/beach) "cV" = ( /obj/structure/table/wood, -/turf/unsimulated/floor{ - tag = "icon-wood"; - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/awaymission/beach) "cW" = ( /obj/structure/table/wood, /obj/item/book/manual/barman_recipes, -/turf/unsimulated/floor{ - tag = "icon-wood"; - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/awaymission/beach) "cX" = ( /obj/structure/table/wood, /obj/item/reagent_containers/food/drinks/shaker, -/turf/unsimulated/floor{ - tag = "icon-wood"; - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/awaymission/beach) "cY" = ( /obj/structure/flora/rock/pile, -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, /area/awaymission/beach) "cZ" = ( /obj/machinery/vending/boozeomat{ emagged = 1 }, -/turf/unsimulated/floor{ - tag = "icon-wood"; - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/awaymission/beach) "da" = ( /obj/structure/table/wood, /obj/item/clothing/glasses/sunglasses, -/turf/unsimulated/floor{ - tag = "icon-wood"; - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/awaymission/beach) "db" = ( /obj/machinery/vending/cola, -/turf/unsimulated/floor{ - tag = "icon-wood"; - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/awaymission/beach) "dc" = ( /obj/structure/flora/ausbushes/palebush, -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, /area/awaymission/beach) "dd" = ( /mob/living/simple_animal/crab, -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, /area/awaymission/beach) "de" = ( /obj/effect/overlay/coconut, -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, /area/awaymission/beach) "df" = ( /mob/living/simple_animal/crab/Coffee, -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, /area/awaymission/beach) "dg" = ( /obj/structure/chair, -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, /area/awaymission/beach) "dh" = ( /obj/structure/flora/ausbushes/reedbush, -/turf/unsimulated/beach/sand/dense, +/turf/simulated/floor/beach/away/sand/dense, /area/awaymission/beach) "di" = ( /obj/structure/flora/rock/pile, /obj/structure/flora/ausbushes/stalkybush, -/turf/unsimulated/beach/sand/dense, +/turf/simulated/floor/beach/away/sand/dense, /area/awaymission/beach) "dj" = ( -/turf/unsimulated/beach/coastline, +/turf/simulated/floor/beach/away/coastline, /area/awaymission/beach) "dk" = ( -/turf/unsimulated/beach/coastline/dense, +/turf/simulated/floor/beach/away/coastline/dense, /area/awaymission/beach) "dl" = ( /obj/machinery/vending/cigarette, -/turf/unsimulated/floor{ - tag = "icon-wood"; - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/awaymission/beach) "dm" = ( /obj/machinery/vending/snack, -/turf/unsimulated/floor{ - tag = "icon-wood"; - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/awaymission/beach) "dn" = ( /obj/structure/curtain/open, -/turf/unsimulated/floor{ - tag = "icon-wood"; - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/awaymission/beach) "do" = ( /obj/effect/decal/snow/sand/edge{ @@ -995,44 +915,35 @@ dir = 1 }, /obj/structure/flora/ausbushes/sunnybush, -/turf/unsimulated/beach/sand, -/area/awaymission/beach) -"dp" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall3"; - icon_state = "swall3" - }, +/turf/simulated/floor/beach/away/sand, /area/awaymission/beach) "dq" = ( -/turf/unsimulated/floor{ - tag = "icon-wood"; - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/awaymission/beach) "dr" = ( -/turf/unsimulated/beach/water, +/turf/simulated/floor/beach/away/water, /area/awaymission/beach) "ds" = ( -/turf/unsimulated/beach/water/dense, +/turf/simulated/floor/beach/away/water/dense, /area/awaymission/beach) "dt" = ( -/turf/unsimulated/beach/water/drop, +/turf/simulated/floor/beach/away/water/drop, /area/awaymission/beach) "du" = ( -/turf/unsimulated/beach/water/deep, +/turf/simulated/floor/beach/away/water/deep, /area/awaymission/beach) "dv" = ( /obj/structure/ladder/unbreakable/dive_point/buoy, -/turf/unsimulated/beach/water/deep, +/turf/simulated/floor/beach/away/water/deep, /area/awaymission/beach) "dw" = ( -/turf/unsimulated/beach/water/deep/dense, +/turf/simulated/floor/beach/away/water/deep/dense, /area/awaymission/beach) "dx" = ( -/turf/unsimulated/beach/water/drop/dense, +/turf/simulated/floor/beach/away/water/drop/dense, /area/awaymission/beach) "dy" = ( -/turf/unsimulated/beach/water/edge_drop, +/turf/simulated/floor/beach/away/water/edge_drop, /area/awaymission/beach) "dz" = ( /obj/effect/overlay/palmtree_r, @@ -1042,55 +953,40 @@ icon_state = "gravsnow_corner"; dir = 10 }, -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, /area/awaymission/beach) "dA" = ( /obj/structure/mineral_door/wood{ tag = "icon-wood"; icon_state = "wood" }, -/turf/unsimulated/floor{ - tag = "icon-wood"; - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/awaymission/beach) "dB" = ( /obj/structure/flora/grass/green, -/turf/unsimulated/beach/sand/dense, +/turf/simulated/floor/beach/away/sand/dense, /area/awaymission/beach) "dC" = ( /obj/structure/table/wood, /obj/machinery/chem_dispenser/soda, -/turf/unsimulated/floor{ - tag = "icon-wood"; - icon_state = "wood" - }, -/area/awaymission/beach) -"dD" = ( -/turf/unsimulated/wall{ - tag = "icon-sandstone0"; - icon_state = "sandstone0" - }, +/turf/simulated/floor/wood, /area/awaymission/beach) "dE" = ( /obj/effect/decal/snow/sand/edge{ name = "rough sand" }, /obj/structure/flora/ausbushes/leafybush, -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, /area/awaymission/beach) "dF" = ( /obj/structure/table/wood, /obj/machinery/chem_dispenser/beer, -/turf/unsimulated/floor{ - tag = "icon-wood"; - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/awaymission/beach) "dG" = ( /obj/structure/flora/grass/green, /obj/structure/flora/ausbushes/leafybush, -/turf/unsimulated/beach/sand/dense, +/turf/simulated/floor/beach/away/sand/dense, /area/awaymission/beach) "dH" = ( /obj/effect/decal/snow/sand/edge{ @@ -1100,28 +996,28 @@ dir = 1 }, /obj/structure/chair/stool/bar, -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, /area/awaymission/beach) "dI" = ( /obj/structure/table/wood, /obj/item/clothing/glasses/eyepatch, -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, /area/awaymission/beach) "dJ" = ( /obj/structure/table/wood, /obj/item/clothing/head/bandana, -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, /area/awaymission/beach) "dK" = ( /obj/item/ship_in_a_bottle, /obj/structure/table/wood, -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, /area/awaymission/beach) "dL" = ( /mob/living/simple_animal/hostile/pirate/ranged{ loot = list(/obj/effect/mob_spawn/human/corpse/pirate/ranged) }, -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, /area/awaymission/beach) "dM" = ( /obj/structure/table/wood, @@ -1129,18 +1025,18 @@ /obj/item/stack/sheet/mineral/diamond{ amount = 2 }, -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, /area/awaymission/beach) "dN" = ( /obj/structure/closet/crate, /obj/item/stack/sheet/mineral/uranium{ amount = 20 }, -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, /area/awaymission/beach) "dO" = ( /obj/structure/chair/office/light, -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, /area/awaymission/beach) "dP" = ( /obj/effect/overlay/palmtree_r, @@ -1150,14 +1046,14 @@ icon_state = "gravsnow_corner"; dir = 6 }, -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, /area/awaymission/beach) "dQ" = ( /obj/structure/chair/office/light, /mob/living/simple_animal/hostile/pirate/ranged{ loot = list(/obj/effect/mob_spawn/human/corpse/pirate/ranged) }, -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, /area/awaymission/beach) "dR" = ( /obj/machinery/light{ @@ -1167,7 +1063,7 @@ /obj/structure/chair/comfy/shuttle{ dir = 4 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/awaymission/beach) "dS" = ( /obj/machinery/light{ @@ -1177,7 +1073,7 @@ /obj/structure/chair/comfy/shuttle{ dir = 8 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/awaymission/beach) "dT" = ( /obj/effect/overlay/palmtree_l, @@ -1187,210 +1083,209 @@ icon_state = "gravsnow_corner"; dir = 8 }, -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, /area/awaymission/beach) "dU" = ( -/obj/structure/grille, -/obj/structure/shuttle/window, -/turf/simulated/floor/plating/airless, +/obj/effect/spawner/window/shuttle, +/turf/simulated/floor/plating, /area/awaymission/beach) "dV" = ( /obj/structure/flora/rock, /obj/structure/flora/ausbushes/leafybush, -/turf/unsimulated/beach/sand/dense, +/turf/simulated/floor/beach/away/sand/dense, /area/awaymission/beach) "dW" = ( /obj/structure/ladder/unbreakable/dive_point/buoy{ id = "pirate" }, -/turf/unsimulated/beach/water, +/turf/simulated/floor/beach/away/water, /area/awaymission/beach) "dX" = ( /obj/item/paper, -/turf/unsimulated/beach/sand, -/area/awaymission/beach) -"dY" = ( -/turf/unsimulated/beach/sand, -/turf/simulated/shuttle/wall{ - tag = "icon-swall_f5"; - icon_state = "swall_f5" - }, +/turf/simulated/floor/beach/away/sand, /area/awaymission/beach) "dZ" = ( /obj/structure/chair/comfy/shuttle{ dir = 4 }, -/turf/simulated/shuttle/floor, -/area/awaymission/beach) -"ea" = ( -/turf/unsimulated/beach/sand, -/turf/simulated/shuttle/wall{ - tag = "icon-swall_f9"; - icon_state = "swall_f9" - }, +/turf/simulated/floor/mineral/titanium/blue, /area/awaymission/beach) "eb" = ( /obj/structure/chair/comfy/shuttle{ dir = 8 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/awaymission/beach) "ec" = ( /obj/machinery/computer, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/awaymission/beach) "ed" = ( /obj/structure/closet/crate, /obj/item/clothing/under/pirate, /obj/item/clothing/under/pirate, -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, /area/awaymission/beach) "ee" = ( /obj/structure/closet/crate, /obj/item/clothing/suit/pirate_brown, -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, /area/awaymission/beach) "ef" = ( /obj/effect/overlay/palmtree_r, /obj/structure/flora/ausbushes/sunnybush, -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, /area/awaymission/beach) "eg" = ( /mob/living/simple_animal/hostile/pirate{ loot = list(/obj/effect/mob_spawn/human/corpse/pirate) }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/awaymission/beach) "eh" = ( -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/awaymission/beach) "ei" = ( /obj/structure/chair/comfy/shuttle{ dir = 1 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/awaymission/beach) "ej" = ( /obj/structure/table/wood, /obj/item/clothing/suit/pirate_black, -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, /area/awaymission/beach) "ek" = ( /obj/effect/decal/snow/sand/edge{ name = "rough sand" }, /obj/structure/flora/ausbushes/sunnybush, -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, /area/awaymission/beach) "el" = ( -/obj/machinery/door/unpowered/shuttle, -/turf/simulated/shuttle/floor, +/obj/machinery/door/airlock/titanium, +/turf/simulated/floor/mineral/titanium/blue, /area/awaymission/beach) "em" = ( /obj/item/beach_ball, -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, /area/awaymission/beach) "en" = ( /mob/living/simple_animal/hostile/pirate{ loot = list(/obj/effect/mob_spawn/human/corpse/pirate) }, -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, /area/awaymission/beach) "eo" = ( /obj/effect/waterfall{ dir = 1; water_frequency = 75 }, -/turf/unsimulated/beach/coastline, +/turf/simulated/floor/beach/away/coastline, /area/awaymission/beach) "ep" = ( /obj/effect/decal/cleanable/blood, -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, /area/awaymission/beach) "eq" = ( /obj/effect/waterfall{ dir = 1; water_frequency = 192 }, -/turf/unsimulated/beach/coastline, +/turf/simulated/floor/beach/away/coastline, /area/awaymission/beach) "er" = ( /obj/effect/waterfall{ dir = 1; water_frequency = 104 }, -/turf/unsimulated/beach/coastline, +/turf/simulated/floor/beach/away/coastline, /area/awaymission/beach) "es" = ( /obj/structure/chair/stool, -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, /area/awaymission/beach) "et" = ( /obj/structure/shuttle/engine/heater, -/turf/simulated/floor/plating/airless, +/turf/simulated/floor/plating, /area/awaymission/beach) "eu" = ( /obj/structure/table/wood, -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, /area/awaymission/beach) "ev" = ( /obj/structure/table/wood, /obj/item/reagent_containers/food/snacks/pie, -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, /area/awaymission/beach) "ew" = ( /obj/effect/waterfall{ dir = 1; water_frequency = 44 }, -/turf/unsimulated/beach/coastline, +/turf/simulated/floor/beach/away/coastline, /area/awaymission/beach) "ex" = ( /obj/structure/shuttle/engine/propulsion{ icon_state = "propulsion_l" }, -/turf/simulated/floor/plating/airless, +/turf/simulated/floor/plating, /area/awaymission/beach) "ey" = ( /obj/effect/waterfall{ dir = 1; water_frequency = 97 }, -/turf/unsimulated/beach/coastline, +/turf/simulated/floor/beach/away/coastline, /area/awaymission/beach) "ez" = ( /obj/structure/shuttle/engine/propulsion{ icon_state = "propulsion_r" }, -/turf/simulated/floor/plating/airless, +/turf/simulated/floor/plating, /area/awaymission/beach) "eA" = ( /obj/structure/shuttle/engine/propulsion, -/turf/simulated/floor/plating/airless, +/turf/simulated/floor/plating, /area/awaymission/beach) "eB" = ( /obj/effect/waterfall{ dir = 1; water_frequency = 94 }, -/turf/unsimulated/beach/coastline, +/turf/simulated/floor/beach/away/coastline, /area/awaymission/beach) "eC" = ( /obj/structure/table/wood, /obj/effect/decal/cleanable/blood, -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, /area/awaymission/beach) "eD" = ( /obj/structure/closet/crate/can, -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, /area/awaymission/beach) "eE" = ( /obj/structure/closet/crate, -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, +/area/awaymission/beach) +"kX" = ( +/turf/simulated/wall/indestructible/sandstone, +/area/awaymission/beach) +"nL" = ( +/turf/simulated/wall/indestructible/sandstone, +/area/space) +"rS" = ( +/obj/effect/baseturf_helper/beach/away/water, +/turf/simulated/floor/beach/away/water/deep/sand_floor, +/area/awaymission/undersea) +"sF" = ( +/obj/effect/baseturf_helper/beach/away/sand, +/turf/simulated/floor/beach/away/sand, /area/awaymission/beach) "LZ" = ( /obj/machinery/poolcontroller/invisible, -/turf/unsimulated/beach/water/deep, +/turf/simulated/floor/beach/away/water/deep, /area/awaymission/beach) (1,1,1) = {" @@ -1600,7 +1495,7 @@ aa aa aa aa -aa +nL cg cg bw @@ -1857,7 +1752,7 @@ aa aa aa aa -aa +nL cg bw bx @@ -2114,7 +2009,7 @@ aa aa aa aa -aa +nL bX cg bJ @@ -2371,7 +2266,7 @@ aa aa aa aa -aa +nL bd bm bj @@ -2628,7 +2523,7 @@ aa aa aa aa -aa +nL bc bt bj @@ -2885,7 +2780,7 @@ aa aa aa aa -aa +nL be bl bD @@ -3142,7 +3037,7 @@ aa aa aa aa -aa +nL cg bw by @@ -3399,7 +3294,7 @@ aa aa aa aa -aa +nL cg bw bB @@ -3656,7 +3551,7 @@ aa aa aa aa -aa +nL cg bw bB @@ -3913,7 +3808,7 @@ aa aa aa aa -aa +nL cg bx bj @@ -4170,7 +4065,7 @@ aa aa aa aa -aa +nL bg bj bE @@ -4427,7 +4322,7 @@ aa aa aa aa -aa +nL bf bj bz @@ -4684,7 +4579,7 @@ aa aa aa aa -aa +nL bh bj bz @@ -4941,7 +4836,7 @@ aa aa aa aa -aa +nL cg bA bD @@ -4953,7 +4848,7 @@ bj bj bj bj -bj +sF bj bj bj @@ -5198,7 +5093,7 @@ aa aa aa aa -aa +nL bX by bF @@ -5455,7 +5350,7 @@ aa aa aa aa -aa +nL cg bB bj @@ -5712,7 +5607,7 @@ aa aa aa aa -aa +nL cg bB bj @@ -5969,7 +5864,7 @@ aa aa aa aa -aa +nL cg by bE @@ -6226,7 +6121,7 @@ aa aa aa aa -aa +nL bk bj bz @@ -6483,7 +6378,7 @@ aa aa aa aa -aa +nL cg by bz @@ -6495,10 +6390,10 @@ bj bj bi cE -cH -cI +cE +cE dA -dD +cE by bj bj @@ -6740,7 +6635,7 @@ aa aa aa aa -aa +nL bg bC bj @@ -6751,7 +6646,7 @@ bT bj bj bi -cD +cE cS dq dq @@ -6997,7 +6892,7 @@ aa aa aa aa -aa +nL bi bw by @@ -7008,7 +6903,7 @@ bV bj bj cq -cD +cE cU dq dq @@ -7254,7 +7149,7 @@ aa aa aa aa -aa +nL bj bg bz @@ -7265,7 +7160,7 @@ bX bj bj cr -cD +cE cW dq dq @@ -7511,7 +7406,7 @@ aa aa aa aa -aa +nL bj bj bj @@ -7522,7 +7417,7 @@ bW bj bj cq -cD +cE cX dq dq @@ -7768,7 +7663,7 @@ aa aa aa aa -aa +nL bl bz bE @@ -7779,7 +7674,7 @@ bV bj bj bi -cD +cE cV dq dq @@ -8025,7 +7920,7 @@ aa aa aa aa -aa +nL cg bB bj @@ -8036,7 +7931,7 @@ bX bj bj bi -cD +cE da dq dq @@ -8282,7 +8177,7 @@ aa aa aa aa -aa +nL cg by bj @@ -8293,7 +8188,7 @@ bT bj bj bi -cD +cE cZ dq dq @@ -8539,7 +8434,7 @@ aa aa aa aa -aa +nL bm bz bz @@ -8550,7 +8445,7 @@ bZ ce bj bi -cD +cE dl dq dq @@ -8796,7 +8691,7 @@ aa aa aa aa -aa +nL bj bj bz @@ -8807,7 +8702,7 @@ ca bj bj bi -cD +cE db dq dq @@ -9053,7 +8948,7 @@ aa aa aa aa -aa +nL bl bl bF @@ -9064,7 +8959,7 @@ bX cf bj bi -cD +cE dm dq dq @@ -9310,7 +9205,7 @@ aa aa aa aa -aa +nL cg bw by @@ -9321,11 +9216,11 @@ bT cd bj bi -cF -cH -cH -cH -cI +cE +cE +cE +cE +cE by bj bj @@ -9567,7 +9462,7 @@ aa aa aa aa -aa +nL cg cg bJ @@ -9824,7 +9719,7 @@ aa aa aa aa -aa +nL cg cg by @@ -10081,7 +9976,7 @@ aa aa aa aa -aa +nL cg bw by @@ -10092,8 +9987,8 @@ cc bj bi cE -cH -cI +cE +cE by bj bj @@ -10338,7 +10233,7 @@ aa aa aa aa -aa +nL cg bX by @@ -10348,7 +10243,7 @@ bN bX bj bi -cD +cE cO dn by @@ -10595,7 +10490,7 @@ aa aa aa aa -aa +nL bo bd bB @@ -10605,9 +10500,9 @@ bj bW bj bi -cF -cH -cI +cE +cE +cE by bj bj @@ -10674,6 +10569,141 @@ aa aa aa aa +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL aa aa aa @@ -10717,142 +10747,7 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +nL bn cg bM @@ -10931,7 +10826,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -11065,6 +10960,7 @@ ab ab ab ab +nL aa aa aa @@ -11108,8 +11004,7 @@ aa aa aa aa -aa -aa +nL bn cg ci @@ -11188,7 +11083,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -11322,6 +11217,7 @@ ab ab ab ab +nL aa aa aa @@ -11365,8 +11261,7 @@ aa aa aa aa -aa -aa +nL bq bw by @@ -11377,8 +11272,8 @@ bX bj bi cE -cH -cI +cE +cE by bj bj @@ -11445,7 +11340,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -11579,6 +11474,7 @@ ab ab ab ab +nL aa aa aa @@ -11622,8 +11518,7 @@ aa aa aa aa -aa -aa +nL cg bG by @@ -11633,7 +11528,7 @@ bj bT bj bi -cD +cE cO dn by @@ -11702,7 +11597,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -11836,6 +11731,7 @@ ab ab ab ab +nL aa aa aa @@ -11879,8 +11775,7 @@ aa aa aa aa -aa -aa +nL bp cg by @@ -11890,9 +11785,9 @@ bN bV bj bi -cF -cH -cI +cE +cE +cE by bF bj @@ -11959,7 +11854,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -12093,6 +11988,7 @@ ab ab ab ab +nL aa aa aa @@ -12136,8 +12032,7 @@ aa aa aa aa -aa -aa +nL cg cg bB @@ -12216,7 +12111,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -12350,6 +12245,7 @@ ab ab ab ab +nL aa aa aa @@ -12393,8 +12289,7 @@ aa aa aa aa -aa -aa +nL cg cg bB @@ -12473,7 +12368,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -12607,6 +12502,7 @@ ab ab ab ab +nL aa aa aa @@ -12650,8 +12546,7 @@ aa aa aa aa -aa -aa +nL bg bH bj @@ -12662,8 +12557,8 @@ bX bj bi cE -cH -cI +cE +cE by bj bj @@ -12730,7 +12625,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -12864,6 +12759,7 @@ ab ab ab ab +nL aa aa aa @@ -12907,8 +12803,7 @@ aa aa aa aa -aa -aa +nL bj bj bj @@ -12918,7 +12813,7 @@ bR cb bf bi -cD +cE cO dn by @@ -12987,7 +12882,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -13121,6 +13016,7 @@ ab ab ab ab +nL aa aa aa @@ -13164,8 +13060,7 @@ aa aa aa aa -aa -aa +nL bj bl bC @@ -13175,9 +13070,9 @@ bf bX bz bi -cF -cH -cI +cE +cE +cE by bj bj @@ -13244,7 +13139,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -13378,6 +13273,7 @@ ab ab ab ab +nL aa aa aa @@ -13421,8 +13317,7 @@ aa aa aa aa -aa -aa +nL br bw cg @@ -13501,7 +13396,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -13635,6 +13530,7 @@ ab ab ab ab +nL aa aa aa @@ -13678,8 +13574,7 @@ aa aa aa aa -aa -aa +nL cg bX cg @@ -13758,7 +13653,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -13892,6 +13787,7 @@ ab ab ab ab +nL aa aa aa @@ -13935,8 +13831,7 @@ aa aa aa aa -aa -aa +nL cg cg cg @@ -14015,7 +13910,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -14149,6 +14044,7 @@ ab ab ab ab +nL aa aa aa @@ -14192,8 +14088,7 @@ aa aa aa aa -aa -aa +nL cg cg bx @@ -14272,7 +14167,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -14406,6 +14301,7 @@ ab ab ab ab +nL aa aa aa @@ -14449,8 +14345,7 @@ aa aa aa aa -aa -aa +nL bs cg by @@ -14529,7 +14424,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -14663,6 +14558,7 @@ ab ab ab ab +nL aa aa aa @@ -14706,8 +14602,7 @@ aa aa aa aa -aa -aa +nL br bw cs @@ -14786,7 +14681,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -14920,6 +14815,7 @@ ab ab ab ab +nL aa aa aa @@ -14963,8 +14859,7 @@ aa aa aa aa -aa -aa +nL cg cg cg @@ -15043,7 +14938,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -15177,6 +15072,7 @@ ab ab ab ab +nL aa aa aa @@ -15220,8 +15116,7 @@ aa aa aa aa -aa -aa +nL cg cg cg @@ -15300,7 +15195,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -15434,6 +15329,7 @@ ab ab ab ab +nL aa aa aa @@ -15477,8 +15373,7 @@ aa aa aa aa -aa -aa +nL cg bw by @@ -15503,30 +15398,30 @@ bF bJ bj bD -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL "} (56,1,1) = {" aa @@ -15557,7 +15452,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -15691,6 +15586,7 @@ ab ab ab ab +nL aa aa aa @@ -15734,8 +15630,7 @@ aa aa aa aa -aa -aa +nL cg cg bJ @@ -15747,20 +15642,20 @@ bj bj bj cQ -dp -dp +cQ +cQ el el -dp -dp -dY +cQ +cQ +cQ bj bj cb by bj bF -aa +nL aa aa aa @@ -15814,7 +15709,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -15948,6 +15843,7 @@ ab ab ab ab +nL aa aa aa @@ -15991,8 +15887,7 @@ aa aa aa aa -aa -aa +nL cg cg by @@ -16003,7 +15898,7 @@ bV bj bj bj -cP +cQ dZ eg eh @@ -16017,7 +15912,7 @@ bV by bD bL -aa +nL aa aa aa @@ -16071,7 +15966,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -16205,6 +16100,7 @@ ab ab ab ab +nL aa aa aa @@ -16248,8 +16144,7 @@ aa aa aa aa -aa -aa +nL cg bw by @@ -16274,7 +16169,7 @@ cc by bz bj -aa +nL aa aa aa @@ -16328,7 +16223,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -16462,6 +16357,7 @@ ab ab ab ab +nL aa aa aa @@ -16505,8 +16401,7 @@ aa aa aa aa -aa -aa +nL cg bX by @@ -16517,7 +16412,7 @@ bX bj bj bj -cP +cQ eb eh eh @@ -16531,7 +16426,7 @@ bX bB bE bz -aa +nL aa aa aa @@ -16585,7 +16480,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -16719,6 +16614,7 @@ ab ab ab ab +nL aa aa aa @@ -16762,8 +16658,7 @@ aa aa aa aa -aa -aa +nL bo bd bB @@ -16774,21 +16669,21 @@ bW bj bj bj -cR -dp -dp +cQ +cQ +cQ el el -dp -dp -ea +cQ +cQ +cQ bj bj bW bM bj bj -aa +nL aa aa aa @@ -16842,7 +16737,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -16976,6 +16871,7 @@ ab ab ab ab +nL aa aa aa @@ -17019,8 +16915,7 @@ aa aa aa aa -aa -aa +nL bn cg bM @@ -17045,7 +16940,7 @@ ca ci bf bL -aa +nL aa aa aa @@ -17099,7 +16994,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -17233,6 +17128,7 @@ ab ab ab ab +nL aa aa aa @@ -17276,8 +17172,7 @@ aa aa aa aa -aa -aa +nL bn cg ci @@ -17286,11 +17181,11 @@ bL bj cc cE -cH -cH -cH -cH -cI +cE +cE +cE +cE +cE bj bj bj @@ -17302,7 +17197,7 @@ cc by bj bz -aa +nL aa aa aa @@ -17356,7 +17251,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -17490,6 +17385,7 @@ ab ab ab ab +nL aa aa aa @@ -17533,8 +17429,7 @@ aa aa aa aa -aa -aa +nL bq bw by @@ -17542,7 +17437,7 @@ bj bz bf bX -cD +cE dr dr dr @@ -17559,7 +17454,7 @@ bX by bz bj -aa +nL aa aa aa @@ -17613,7 +17508,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -17747,6 +17642,7 @@ ab ab ab ab +nL aa aa aa @@ -17790,8 +17686,7 @@ aa aa aa aa -aa -aa +nL cg bG by @@ -17799,7 +17694,7 @@ bz bj bj bT -cD +cE dr dr dr @@ -17816,7 +17711,7 @@ bT by bL bj -aa +nL aa aa aa @@ -17870,7 +17765,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -18004,6 +17899,7 @@ ab ab ab ab +nL aa aa aa @@ -18047,8 +17943,7 @@ aa aa aa aa -aa -aa +nL bp cg by @@ -18056,7 +17951,7 @@ bL bj bN bV -cD +cE dr dr dW @@ -18073,7 +17968,7 @@ bV bB bj bz -aa +nL aa aa aa @@ -18127,7 +18022,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -18261,6 +18156,7 @@ ab ab ab ab +nL aa aa aa @@ -18304,8 +18200,7 @@ aa aa aa aa -aa -aa +nL cg cg bB @@ -18313,7 +18208,7 @@ bj bz bj bW -cD +cE dr dr dr @@ -18330,7 +18225,7 @@ bW bB bj bD -aa +nL aa aa aa @@ -18384,7 +18279,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -18518,6 +18413,7 @@ ab ab ab ab +nL aa aa aa @@ -18561,8 +18457,7 @@ aa aa aa aa -aa -aa +nL cg cg bB @@ -18570,7 +18465,7 @@ bj bD bj cc -cD +cE dr dr dr @@ -18587,7 +18482,7 @@ cc bj bz bz -aa +nL aa aa aa @@ -18641,7 +18536,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -18775,6 +18670,7 @@ ab ab ab ab +nL aa aa aa @@ -18818,8 +18714,7 @@ aa aa aa aa -aa -aa +nL bg bH bj @@ -18827,12 +18722,12 @@ bz bz bL bX -cF -cH -cH -cH -cH -cI +cE +cE +cE +cE +cE +cE bj bj bj @@ -18844,7 +18739,7 @@ bX bj bz bj -aa +nL aa aa aa @@ -18898,7 +18793,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -19032,6 +18927,7 @@ ab ab ab ab +nL aa aa aa @@ -19075,8 +18971,7 @@ aa aa aa aa -aa -aa +nL bj bj bj @@ -19101,7 +18996,7 @@ cb bC bj bz -aa +nL aa aa aa @@ -19155,7 +19050,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -19289,6 +19184,7 @@ ab ab ab ab +nL aa aa aa @@ -19332,8 +19228,7 @@ aa aa aa aa -aa -aa +nL bj bl bC @@ -19341,24 +19236,24 @@ bj bz bf bX -cE -cH -cH -cH -cH -cH -cH -cH -cI +kX +kX +kX +kX +kX +kX +kX +kX +kX cL cL -dD +kX bf bX cg by bj -aa +nL aa aa aa @@ -19412,7 +19307,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -19546,6 +19441,7 @@ ab ab ab ab +nL aa aa aa @@ -19589,8 +19485,7 @@ aa aa aa aa -aa -aa +nL br bw cg @@ -19598,10 +19493,10 @@ by bj bN bT -cD +kX dI dO -cD +kX bj dL bj @@ -19609,13 +19504,13 @@ cL bj bj bj -cD +kX bN bT cg bB bL -aa +nL aa aa aa @@ -19669,7 +19564,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -19803,6 +19698,7 @@ ab ab ab ab +nL aa aa aa @@ -19846,8 +19742,7 @@ aa aa aa aa -aa -aa +nL cg bX cg @@ -19855,24 +19750,24 @@ bB bL bj ca -cD +kX dK bj -cD +kX bj bj bj -dD +kX bj bj bj -cD +kX bj ca cg ci bE -aa +nL aa aa aa @@ -19926,7 +19821,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -20060,6 +19955,7 @@ ab ab ab ab +nL aa aa aa @@ -20103,8 +19999,7 @@ aa aa aa aa -aa -aa +nL cg cg cg @@ -20112,24 +20007,24 @@ ci bE bj bj -cD +kX dJ bj -cD +kX ed bj bj -dD +kX bj en bj -cD +kX bj bj bx bz bj -aa +nL aa aa aa @@ -20183,7 +20078,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -20317,6 +20212,7 @@ ab ab ab ab +nL aa aa aa @@ -20360,8 +20256,7 @@ aa aa aa aa -aa -aa +nL cg cg bx @@ -20369,10 +20264,10 @@ bz bj bL bL -cD +kX bj bj -cD +kX ee bj bj @@ -20380,13 +20275,13 @@ cL bj bj bj -cD +kX bL bL by bj bz -aa +nL aa aa aa @@ -20440,7 +20335,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -20574,6 +20469,7 @@ ab ab ab ab +nL aa aa aa @@ -20617,8 +20513,7 @@ aa aa aa aa -aa -aa +nL bs cg by @@ -20626,24 +20521,24 @@ bj bz bj bz -cD -cI +kX +kX cL -cF -cH -cH -cH -cH -cI +kX +kX +kX +kX +kX +kX bj bj -cD +kX bj bz bJ bj bD -aa +nL aa aa aa @@ -20697,7 +20592,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -20831,6 +20726,7 @@ ab ab ab ab +nL aa aa aa @@ -20874,8 +20770,7 @@ aa aa aa aa -aa -aa +nL bX cg bJ @@ -20883,7 +20778,7 @@ bj bD bj bz -cD +kX dL bj bj @@ -20894,13 +20789,13 @@ bj bj bj bj -cD +kX bj bz bj bD bj -aa +nL aa aa aa @@ -20954,7 +20849,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -21088,6 +20983,7 @@ ab ab ab ab +nL aa aa aa @@ -21131,8 +21027,7 @@ aa aa aa aa -aa -aa +nL bd bm bj @@ -21140,7 +21035,7 @@ bD bj bK bj -cD +kX bj bj bj @@ -21151,13 +21046,13 @@ bj bj bj bj -cD +kX bK bj bJ bj bD -aa +nL aa aa aa @@ -21211,7 +21106,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -21345,6 +21240,7 @@ ab ab ab ab +nL aa aa aa @@ -21388,8 +21284,7 @@ aa aa aa aa -aa -aa +nL bX cg bJ @@ -21397,7 +21292,7 @@ bj bD bj bz -cD +kX dL bj bj @@ -21408,13 +21303,13 @@ bj bj bj bj -cD +kX bj bz bj bD bj -aa +nL aa aa aa @@ -21468,7 +21363,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -21602,6 +21497,7 @@ ab ab ab ab +nL aa aa aa @@ -21645,8 +21541,7 @@ aa aa aa aa -aa -aa +nL bd bm bj @@ -21654,24 +21549,24 @@ bD bj bK bD -cD -cH -cI +kX +kX +kX cL -cE -cH -cH -cH -cI +kX +kX +kX +kX +kX bj bj -cD +kX bK bD bj bz bD -aa +nL aa aa aa @@ -21725,7 +21620,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -21859,6 +21754,7 @@ ab ab ab ab +nL aa aa aa @@ -21902,8 +21798,7 @@ aa aa aa aa -aa -aa +nL bc bt bj @@ -21911,11 +21806,11 @@ bz bD bj bS -cD +kX dN bj bj -cD +kX ej bj bj @@ -21928,7 +21823,7 @@ bX bj bD bj -aa +nL aa aa aa @@ -21982,7 +21877,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -22116,6 +22011,7 @@ ab ab ab ab +nL aa aa aa @@ -22159,8 +22055,7 @@ aa aa aa aa -aa -aa +nL be bl bD @@ -22168,11 +22063,11 @@ bE bj bz bf -cD +kX dM dQ cT -cD +kX bj dL bj @@ -22185,7 +22080,7 @@ bT bD bj bD -aa +nL aa aa aa @@ -22239,7 +22134,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -22373,6 +22268,7 @@ ab ab ab ab +nL aa aa aa @@ -22416,8 +22312,7 @@ aa aa aa aa -aa -aa +nL cg bw by @@ -22425,24 +22320,24 @@ bz bN bf bT -cF -cH -cH -cH -cD -cH -cH -cH -cH -cH -cH -cI +kX +kX +kX +kX +kX +kX +kX +kX +kX +kX +kX +kX bj ca bj bD bj -aa +nL aa aa aa @@ -22496,7 +22391,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -22630,6 +22525,7 @@ ab ab ab ab +nL aa aa aa @@ -22673,8 +22569,7 @@ aa aa aa aa -aa -aa +nL cg cg bw @@ -22699,7 +22594,7 @@ bj bD bj bD -aa +nL aa aa aa @@ -22753,7 +22648,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -22887,6 +22782,7 @@ ab ab ab ab +nL aa aa aa @@ -22930,8 +22826,7 @@ aa aa aa aa -aa -aa +nL cg bw bx @@ -22956,7 +22851,7 @@ bj bz bD bj -aa +nL aa aa aa @@ -23010,7 +22905,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -23144,6 +23039,7 @@ ab ab ab ab +nL aa aa aa @@ -23187,8 +23083,7 @@ aa aa aa aa -aa -aa +nL bX cg bJ @@ -23213,7 +23108,7 @@ bj by bz bD -aa +nL aa aa aa @@ -23267,7 +23162,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -23401,6 +23296,7 @@ ab ab ab ab +nL aa aa aa @@ -23444,8 +23340,7 @@ aa aa aa aa -aa -aa +nL bd bm bj @@ -23470,7 +23365,7 @@ bj bB by bj -aa +nL aa aa aa @@ -23524,7 +23419,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -23658,6 +23553,7 @@ ab ab ab ab +nL aa aa aa @@ -23701,8 +23597,7 @@ aa aa aa aa -aa -aa +nL bu bt bj @@ -23727,7 +23622,7 @@ bj ci bB bL -aa +nL aa aa aa @@ -23781,7 +23676,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -23915,6 +23810,7 @@ ab ab ab ab +nL aa aa aa @@ -23958,8 +23854,7 @@ aa aa aa aa -aa -aa +nL bv bI ct @@ -23984,7 +23879,7 @@ cg cg ci bE -aa +nL aa aa aa @@ -24038,7 +23933,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -24172,6 +24067,7 @@ ab ab ab ab +nL aa aa aa @@ -24215,33 +24111,32 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL aa aa aa @@ -24295,7 +24190,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -24429,7 +24324,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -24552,7 +24447,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -24686,7 +24581,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -24809,7 +24704,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -24943,7 +24838,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -25066,7 +24961,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -25200,7 +25095,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -25323,7 +25218,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -25457,7 +25352,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -25580,7 +25475,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -25714,7 +25609,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -25837,7 +25732,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -25971,7 +25866,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -26094,7 +25989,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -26228,7 +26123,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -26351,7 +26246,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -26485,7 +26380,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -26608,7 +26503,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -26742,7 +26637,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -26865,7 +26760,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -26999,7 +26894,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -27122,7 +27017,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -27256,7 +27151,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -27379,7 +27274,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -27513,7 +27408,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -27636,7 +27531,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -27770,7 +27665,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -27893,7 +27788,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -28027,7 +27922,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -28150,7 +28045,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -28284,7 +28179,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -28407,7 +28302,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -28541,7 +28436,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -28664,7 +28559,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -28798,7 +28693,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -28921,7 +28816,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -29055,7 +28950,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -29178,7 +29073,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -29312,7 +29207,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -29435,7 +29330,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -29569,7 +29464,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -29692,7 +29587,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -29826,7 +29721,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -29949,7 +29844,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -30083,7 +29978,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -30206,7 +30101,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -30340,7 +30235,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -30463,7 +30358,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -30597,7 +30492,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -30720,7 +30615,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -30854,7 +30749,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -30977,7 +30872,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -31111,7 +31006,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -31234,7 +31129,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -31368,7 +31263,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -31491,7 +31386,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -31625,7 +31520,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -31748,7 +31643,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -31882,7 +31777,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -32005,7 +31900,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -32139,7 +32034,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -32262,7 +32157,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -32396,7 +32291,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -32519,7 +32414,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -32653,7 +32548,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -32776,7 +32671,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -32910,7 +32805,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -33033,7 +32928,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -33167,7 +33062,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -33290,7 +33185,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -33424,7 +33319,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -33547,7 +33442,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -33681,7 +33576,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -33804,7 +33699,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -33938,7 +33833,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -34061,7 +33956,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -34195,7 +34090,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -34318,7 +34213,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -34452,7 +34347,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -34575,7 +34470,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -34709,7 +34604,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -34832,7 +34727,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -34966,7 +34861,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -35089,7 +34984,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -35223,7 +35118,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -35346,7 +35241,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -35480,7 +35375,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -35603,7 +35498,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -35737,7 +35632,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -35860,7 +35755,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -35994,7 +35889,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -36117,7 +36012,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -36251,7 +36146,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -36374,7 +36269,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -36508,7 +36403,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -36631,7 +36526,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -36765,7 +36660,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -36888,7 +36783,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -37022,7 +36917,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -37145,7 +37040,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -37279,7 +37174,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -37402,7 +37297,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -37536,7 +37431,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -37659,7 +37554,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -37793,7 +37688,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -37916,7 +37811,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -38050,7 +37945,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -38173,7 +38068,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -38307,7 +38202,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -38430,7 +38325,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -38564,7 +38459,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -38687,7 +38582,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -38821,7 +38716,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -38944,7 +38839,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -39078,7 +38973,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -39201,7 +39096,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -39335,7 +39230,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -39458,7 +39353,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -39592,7 +39487,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -39715,7 +39610,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -39849,7 +39744,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -39972,7 +39867,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -40106,7 +40001,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -40229,7 +40124,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -40363,7 +40258,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -40486,7 +40381,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -40620,7 +40515,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -40743,7 +40638,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -40877,7 +40772,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -41000,7 +40895,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -41134,7 +41029,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -41257,7 +41152,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -41391,7 +41286,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -41514,7 +41409,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -41648,7 +41543,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -41771,7 +41666,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -41905,7 +41800,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -42028,7 +41923,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -42162,7 +42057,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -42285,7 +42180,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -42419,7 +42314,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -42542,7 +42437,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -42676,7 +42571,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -42799,7 +42694,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -42933,7 +42828,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -43056,7 +42951,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -43190,7 +43085,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -43313,7 +43208,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -43447,7 +43342,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -43570,7 +43465,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -43704,7 +43599,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -43827,7 +43722,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -43961,7 +43856,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -44084,7 +43979,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -44218,7 +44113,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -44341,7 +44236,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -44475,7 +44370,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -44598,7 +44493,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -44732,7 +44627,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -44855,7 +44750,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -44989,7 +44884,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -45112,7 +45007,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -45246,7 +45141,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -45369,7 +45264,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -45503,7 +45398,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -45626,7 +45521,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -45760,7 +45655,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -45883,7 +45778,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -46017,7 +45912,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -46140,7 +46035,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -46274,7 +46169,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -46397,7 +46292,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -46531,7 +46426,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -46654,7 +46549,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -46788,7 +46683,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -46911,7 +46806,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -47045,7 +46940,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -47168,7 +47063,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -47302,7 +47197,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -47425,7 +47320,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -47559,7 +47454,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -47682,7 +47577,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -47816,7 +47711,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -47939,7 +47834,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -48073,7 +47968,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -48196,7 +48091,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -48330,7 +48225,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -48453,7 +48348,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -48587,7 +48482,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -48710,7 +48605,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -48844,7 +48739,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -48967,7 +48862,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -49101,7 +48996,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -49224,7 +49119,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -49358,7 +49253,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -49481,7 +49376,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -49615,7 +49510,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -49738,7 +49633,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -49872,7 +49767,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -49995,7 +49890,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -50129,7 +50024,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -50252,7 +50147,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -50386,7 +50281,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -50509,7 +50404,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -50643,7 +50538,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -50766,7 +50661,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -50900,7 +50795,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -51023,7 +50918,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -51157,7 +51052,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -51280,7 +51175,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -51414,7 +51309,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -51537,7 +51432,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -51671,7 +51566,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -51794,7 +51689,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -51928,7 +51823,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -52051,7 +51946,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -52148,7 +52043,7 @@ av av av av -av +rS av av av @@ -52185,7 +52080,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -52308,7 +52203,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -52442,7 +52337,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -52565,7 +52460,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -52699,7 +52594,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -52822,7 +52717,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -52956,7 +52851,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -53079,7 +52974,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -53213,7 +53108,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -53336,7 +53231,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -53470,7 +53365,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -53593,7 +53488,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -53727,7 +53622,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -53850,7 +53745,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -53984,7 +53879,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -54107,7 +54002,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -54241,7 +54136,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -54364,7 +54259,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -54498,7 +54393,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -54621,7 +54516,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -54755,7 +54650,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -54878,7 +54773,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -55012,7 +54907,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -55135,7 +55030,7 @@ aa aa aa aa -aa +nL ab ab ab @@ -55269,7 +55164,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -55392,7 +55287,7 @@ aa aa aa aa -aa +nL ac ab ab @@ -55526,7 +55421,7 @@ ab ab ab ab -aa +nL aa aa aa @@ -55649,141 +55544,141 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL aa aa aa diff --git a/_maps/map_files/RandomZLevels/blackmarketpackers.dmm b/_maps/map_files/RandomZLevels/blackmarketpackers.dmm index c6de0762d16..d4015627b27 100644 --- a/_maps/map_files/RandomZLevels/blackmarketpackers.dmm +++ b/_maps/map_files/RandomZLevels/blackmarketpackers.dmm @@ -17,80 +17,25 @@ /obj/structure/lattice, /turf/space, /area/space/nearstation) -"af" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall12"; - icon_state = "swall12" - }, -/area/awaymission/BMPship/Aft) -"ag" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall4"; - icon_state = "swall4" - }, -/area/awaymission/BMPship/Aft) -"ah" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall14"; - icon_state = "swall14" - }, -/area/awaymission/BMPship/Aft) "ai" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - tag = "icon-swall_f10"; - icon_state = "swall_f10"; - dir = 2 - }, +/turf/simulated/wall/mineral/titanium, /area/awaymission/BMPship/Aft) "aj" = ( /mob/living/simple_animal/hostile/carp, /turf/space, /area/space/nearstation) -"ak" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall12"; - icon_state = "swall12" - }, -/area/awaymission/BMPship/Gate) "al" = ( /turf/simulated/floor/engine, /area/awaymission/BMPship/Fore) "am" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall4"; - icon_state = "swall4" - }, +/turf/simulated/wall/mineral/titanium, /area/awaymission/BMPship/Gate) -"an" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall3"; - icon_state = "swall3"; - dir = 2 - }, -/area/awaymission/BMPship/Aft) "ao" = ( /obj/machinery/light/small{ dir = 8 }, /turf/simulated/floor/plating, /area/awaymission/BMPship/Aft) -"ap" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/grille, -/turf/simulated/floor/engine, -/area/awaymission/BMPship/Aft) -"aq" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall14"; - icon_state = "swall14" - }, -/area/awaymission/BMPship/Gate) "ar" = ( /turf/simulated/floor/plating, /area/awaymission/BMPship/Fore) @@ -98,14 +43,6 @@ /obj/structure/lattice, /turf/space, /area/space/nearstation) -"at" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - tag = "icon-swall_f10"; - icon_state = "swall_f10"; - dir = 2 - }, -/area/awaymission/BMPship/Gate) "au" = ( /obj/machinery/porta_turret{ lethal = 1; @@ -120,119 +57,30 @@ icon_state = "bar" }, /area/awaymission/BMPship/Midship) -"aw" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall7"; - icon_state = "swall7" - }, -/area/awaymission/BMPship/Aft) "ax" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/grille, +/obj/effect/spawner/window/shuttle, /turf/simulated/floor/engine, /area/awaymission/BMPship/Gate) -"ay" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall13"; - icon_state = "swall13" - }, -/area/awaymission/BMPship/Aft) -"az" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall3"; - icon_state = "swall3"; - dir = 2 - }, -/area/awaymission/BMPship/Gate) -"aA" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall8"; - icon_state = "swall8" - }, -/area/awaymission/BMPship/Aft) "aB" = ( /turf/simulated/floor/engine, /area/awaymission/BMPship/Gate) -"aC" = ( -/turf/simulated/floor/plating, -/turf/simulated/shuttle/wall{ - tag = "icon-swall_f5"; - icon_state = "swall_f5"; - dir = 2 - }, -/area/awaymission/BMPship/Gate) "aD" = ( /obj/machinery/light/small{ dir = 8 }, /turf/simulated/floor/plating, /area/awaymission/BMPship/Gate) -"aE" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/grille, -/turf/simulated/floor/engine, -/area/awaymission/BMPship/Gate) "aF" = ( -/obj/machinery/door/unpowered/shuttle, +/obj/machinery/door/airlock/titanium, /turf/simulated/floor/plating, /area/awaymission/BMPship/Gate) "aG" = ( /turf/simulated/floor/plating, /area/awaymission/BMPship/Gate) -"aH" = ( -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/grille, -/turf/simulated/floor/engine, -/area/awaymission/BMPship/Gate) "aI" = ( /obj/machinery/light/small, /turf/simulated/floor/engine, /area/awaymission/BMPship/Gate) -"aJ" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall7"; - icon_state = "swall7" - }, -/area/awaymission/BMPship/Gate) -"aK" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - tag = "icon-swall_f6"; - icon_state = "swall_f6"; - dir = 2 - }, -/area/awaymission/BMPship/Gate) -"aL" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall3"; - icon_state = "swall3" - }, -/area/awaymission/BMPship/Aft) -"aM" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall13"; - icon_state = "swall13" - }, -/area/awaymission/BMPship/Gate) "aN" = ( /obj/machinery/door/airlock/silver{ locked = 1 @@ -240,22 +88,6 @@ /obj/effect/landmark/burnturf, /turf/simulated/floor/plating/airless, /area/awaymission/BMPship/Gate) -"aO" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall8"; - icon_state = "swall8" - }, -/area/awaymission/BMPship/Gate) -"aP" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall12"; - icon_state = "swall12"; - dir = 2 - }, -/area/awaymission/BMPship/Gate) -"aQ" = ( -/turf/simulated/shuttle/wall, -/area/awaymission/BMPship/Gate) "aR" = ( /turf/simulated/floor/plating/airless, /area/awaymission/BMPship/Gate) @@ -266,33 +98,11 @@ "aT" = ( /obj/item/scalpel, /obj/structure/closet/crate, -/obj/item/tank/anesthetic, +/obj/item/tank/internals/anesthetic, /turf/simulated/floor/plating/airless, /area/awaymission/BMPship/Gate) "aU" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall4"; - icon_state = "swall4" - }, -/area/awaymission/BMPship/Fore) -"aV" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall12"; - icon_state = "swall12" - }, -/area/awaymission/BMPship/Fore) -"aW" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall14"; - icon_state = "swall14" - }, -/area/awaymission/BMPship/Fore) -"aX" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall_s10"; - icon_state = "swall_s10"; - dir = 2 - }, +/turf/simulated/wall/mineral/titanium, /area/awaymission/BMPship/Fore) "aY" = ( /obj/item/restraints/handcuffs, @@ -317,12 +127,6 @@ }, /turf/simulated/floor/plating/airless, /area/awaymission/BMPship/Gate) -"bc" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall1"; - icon_state = "swall1" - }, -/area/awaymission/BMPship/Aft) "bd" = ( /turf/simulated/floor/plating, /area/awaymission/BMPship/Aft) @@ -335,12 +139,6 @@ }, /turf/simulated/floor/plating/airless, /area/awaymission/BMPship/Gate) -"bf" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall3"; - icon_state = "swall3" - }, -/area/awaymission/BMPship/Gate) "bg" = ( /obj/machinery/computer/operating, /obj/structure/cable{ @@ -367,16 +165,7 @@ /turf/simulated/floor/plating, /area/awaymission/BMPship/Gate) "bk" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/grille, +/obj/effect/spawner/window/shuttle, /turf/simulated/floor/plating/airless, /area/awaymission/BMPship/Fore) "bl" = ( @@ -403,12 +192,6 @@ /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plating, /area/awaymission/BMPship/Gate) -"bp" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall3"; - icon_state = "swall3" - }, -/area/awaymission/BMPship/Fore) "bq" = ( /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plating, @@ -437,10 +220,7 @@ /area/awaymission/BMPship/Gate) "bt" = ( /obj/structure/sign/vacuum, -/turf/simulated/shuttle/wall{ - tag = "icon-swall1"; - icon_state = "swall1" - }, +/turf/simulated/wall/mineral/titanium, /area/awaymission/BMPship/Fore) "bu" = ( /obj/structure/largecrate, @@ -481,26 +261,10 @@ }, /turf/simulated/floor/plating/airless, /area/awaymission/BMPship/Gate) -"bC" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall1"; - icon_state = "swall1" - }, -/area/awaymission/BMPship/Gate) "bD" = ( /obj/effect/decal/warning_stripes/northeast, /turf/simulated/floor/plating, /area/awaymission/BMPship/Fore) -"bE" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/grille, -/turf/simulated/floor/plating/airless, -/area/awaymission/BMPship/Fore) "bF" = ( /turf/simulated/floor/wood, /area/awaymission/BMPship/Fore) @@ -529,12 +293,6 @@ /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plating, /area/awaymission/BMPship/Gate) -"bK" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall2"; - icon_state = "swall2" - }, -/area/awaymission/BMPship/Aft) "bL" = ( /obj/machinery/gateway{ dir = 1 @@ -562,17 +320,6 @@ }, /turf/simulated/floor/plating, /area/awaymission/BMPship/Aft) -"bP" = ( -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/grille, -/turf/simulated/floor/plating/airless, -/area/awaymission/BMPship/Fore) "bQ" = ( /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plating, @@ -598,12 +345,6 @@ /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plating, /area/awaymission/BMPship/Fore) -"bV" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall2"; - icon_state = "swall2" - }, -/area/awaymission/BMPship/Fore) "bW" = ( /obj/item/hand_labeler, /obj/structure/cable{ @@ -614,12 +355,6 @@ }, /turf/simulated/floor/plating, /area/awaymission/BMPship/Gate) -"bX" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall11"; - icon_state = "swall11" - }, -/area/awaymission/BMPship/Aft) "bY" = ( /obj/structure/window/reinforced{ dir = 1 @@ -646,7 +381,7 @@ /turf/simulated/floor/plating/airless, /area/awaymission/BMPship/Gate) "cb" = ( -/obj/machinery/door/unpowered/shuttle, +/obj/machinery/door/airlock/titanium, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -673,26 +408,14 @@ /obj/structure/closet/crate/freezer, /turf/simulated/floor/plating, /area/awaymission/BMPship/Gate) -"cf" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swallc2"; - icon_state = "swallc2" - }, -/area/awaymission/BMPship/Fore) "cg" = ( -/obj/machinery/door/unpowered/shuttle, +/obj/machinery/door/airlock/titanium, /turf/simulated/floor/plasteel{ tag = "icon-carpetside (NORTH)"; icon_state = "carpetside"; dir = 1 }, /area/awaymission/BMPship/Fore) -"ch" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall8"; - icon_state = "swall8" - }, -/area/awaymission/BMPship/Fore) "ci" = ( /obj/machinery/door/airlock/silver, /turf/simulated/floor/plasteel{ @@ -701,36 +424,9 @@ dir = 1 }, /area/awaymission/BMPship/Fore) -"cj" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall1"; - icon_state = "swall1" - }, -/area/awaymission/BMPship/Fore) -"ck" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall12"; - icon_state = "swall12" - }, -/area/awaymission/BMPship/Midship) "cl" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swallc2"; - icon_state = "swallc2" - }, +/turf/simulated/wall/mineral/titanium, /area/awaymission/BMPship/Midship) -"cm" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall13"; - icon_state = "swall13" - }, -/area/awaymission/BMPship/Midship) -"cn" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall15"; - icon_state = "swall15" - }, -/area/awaymission/BMPship/Aft) "co" = ( /obj/machinery/gateway/centeraway{ calibrated = 0 @@ -776,12 +472,6 @@ }, /turf/simulated/floor/plating, /area/awaymission/BMPship/Gate) -"ct" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall2"; - icon_state = "swall2" - }, -/area/awaymission/BMPship/Gate) "cu" = ( /obj/machinery/gateway, /turf/simulated/floor/plating, @@ -802,31 +492,6 @@ /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plating, /area/awaymission/BMPship/Gate) -"cy" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall11"; - icon_state = "swall11" - }, -/area/awaymission/BMPship/Gate) -"cz" = ( -/turf/simulated/floor/plasteel{ - tag = "icon-carpet"; - icon_state = "carpet" - }, -/turf/simulated/shuttle/wall{ - tag = "icon-swall_f9"; - icon_state = "swall_f9"; - dir = 2 - }, -/area/awaymission/BMPship/Fore) -"cA" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - tag = "icon-swall_f6"; - icon_state = "swall_f6"; - dir = 2 - }, -/area/awaymission/BMPship/Fore) "cB" = ( /turf/simulated/floor/plasteel{ tag = "icon-carpet"; @@ -865,13 +530,6 @@ icon_state = "bar" }, /area/awaymission/BMPship/Midship) -"cE" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall3"; - icon_state = "swall3"; - dir = 2 - }, -/area/awaymission/BMPship/Midship) "cF" = ( /turf/simulated/floor/plasteel{ tag = "icon-green (WEST)"; @@ -919,12 +577,6 @@ dir = 4 }, /area/awaymission/BMPship/Midship) -"cL" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall3"; - icon_state = "swall3" - }, -/area/awaymission/BMPship/Midship) "cM" = ( /turf/simulated/floor/plasteel{ icon_state = "bar" @@ -1035,12 +687,6 @@ icon_state = "bar" }, /area/awaymission/BMPship/Midship) -"da" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall1"; - icon_state = "swall1" - }, -/area/awaymission/BMPship/Midship) "db" = ( /turf/simulated/floor/plasteel{ tag = "icon-barber"; @@ -1068,12 +714,6 @@ }, /turf/simulated/floor/plasteel, /area/awaymission/BMPship/Aft) -"df" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swallc3"; - icon_state = "swallc3" - }, -/area/awaymission/BMPship/Aft) "dg" = ( /obj/structure/chair/stool, /turf/simulated/floor/plasteel{ @@ -1197,7 +837,7 @@ }, /area/awaymission/BMPship/Midship) "dx" = ( -/obj/machinery/door/unpowered/shuttle, +/obj/machinery/door/airlock/titanium, /turf/simulated/floor/plasteel{ icon_state = "bar" }, @@ -1352,12 +992,6 @@ dir = 6 }, /area/awaymission/BMPship/Midship) -"dQ" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall2"; - icon_state = "swall2" - }, -/area/awaymission/BMPship/Midship) "dR" = ( /obj/structure/cable{ d1 = 2; @@ -1499,7 +1133,7 @@ /obj/structure/window/reinforced{ dir = 8 }, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/awaymission/BMPship/Aft) "ec" = ( /obj/structure/shuttle/engine/propulsion{ @@ -1507,7 +1141,7 @@ icon_state = "propulsion"; tag = "icon-propulsion (WEST)" }, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/awaymission/BMPship/Aft) "ed" = ( /obj/item/multitool, @@ -1702,23 +1336,14 @@ }, /area/awaymission/BMPship/Fore) "ey" = ( -/obj/machinery/door/unpowered/shuttle, +/obj/machinery/door/airlock/titanium, /turf/simulated/floor/plating, /area/awaymission/BMPship/Aft) "ez" = ( /turf/simulated/floor/engine, /area/awaymission/BMPship/Aft) "eA" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/grille, +/obj/effect/spawner/window/shuttle, /turf/simulated/floor/plating, /area/awaymission/BMPship/Fore) "eB" = ( @@ -1792,7 +1417,7 @@ dir = 4; id = "meatConvey1" }, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating, /area/awaymission/BMPship/Midship) "eH" = ( /obj/structure/closet/crate, @@ -1807,7 +1432,7 @@ id = "meatConvey1" }, /obj/structure/plasticflaps, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating, /area/awaymission/BMPship/Midship) "eJ" = ( /obj/structure/disposalpipe/segment{ @@ -1846,7 +1471,7 @@ /obj/machinery/disposal/deliveryChute{ dir = 8 }, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating, /area/awaymission/BMPship/Midship) "eN" = ( /obj/structure/disposalpipe/segment{ @@ -1961,16 +1586,6 @@ dir = 4 }, /area/awaymission/BMPship/Fore) -"eY" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/grille, -/turf/simulated/floor/plating, -/area/awaymission/BMPship/Fore) "eZ" = ( /obj/structure/cable{ d1 = 1; @@ -2073,21 +1688,10 @@ icon_state = "showroomfloor" }, /area/awaymission/BMPship/Aft) -"fm" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - tag = "icon-swall_f9"; - icon_state = "swall_f9"; - dir = 2 - }, -/area/awaymission/BMPship/Aft) "fn" = ( /obj/effect/gibspawner/human, /turf/simulated/floor/plating, /area/awaymission/BMPship/Aft) -"fo" = ( -/turf/simulated/shuttle/plating, -/area/awaymission/BMPship/Aft) "fp" = ( /obj/structure/window/reinforced{ dir = 8 @@ -2264,17 +1868,6 @@ icon_state = "showroomfloor" }, /area/awaymission/BMPship/Aft) -"fH" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced, -/obj/structure/grille, -/turf/simulated/floor/plating, -/area/awaymission/BMPship/Fore) "fI" = ( /obj/structure/cable{ d1 = 1; @@ -2489,16 +2082,8 @@ /obj/structure/window/reinforced, /turf/simulated/floor/plating, /area/awaymission/BMPship/Aft) -"gg" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - tag = "icon-swall_f5"; - icon_state = "swall_f5"; - dir = 2 - }, -/area/awaymission/BMPship/Fore) "gh" = ( -/obj/machinery/door/unpowered/shuttle, +/obj/machinery/door/airlock/titanium, /turf/simulated/floor/plasteel{ tag = "icon-carpetside"; icon_state = "carpetside" @@ -2512,19 +2097,12 @@ pixel_y = 0; tag = "" }, -/obj/machinery/door/unpowered/shuttle, +/obj/machinery/door/airlock/titanium, /turf/simulated/floor/plasteel{ tag = "icon-carpetside"; icon_state = "carpetside" }, /area/awaymission/BMPship/Fore) -"gj" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall11"; - icon_state = "swall11"; - dir = 2 - }, -/area/awaymission/BMPship/Midship) "gk" = ( /obj/structure/window/reinforced{ dir = 8 @@ -2538,7 +2116,7 @@ id = "meatConvey2" }, /obj/item/kitchen/knife, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating, /area/awaymission/BMPship/Midship) "gm" = ( /obj/structure/kitchenspike, @@ -2561,7 +2139,7 @@ dir = 4; id = "meatConvey2" }, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating, /area/awaymission/BMPship/Midship) "gp" = ( /obj/machinery/conveyor{ @@ -2569,7 +2147,7 @@ id = "meatConvey2" }, /obj/structure/plasticflaps, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating, /area/awaymission/BMPship/Midship) "gq" = ( /obj/structure/disposalpipe/segment{ @@ -2798,12 +2376,6 @@ icon_state = "showroomfloor" }, /area/awaymission/BMPship/Aft) -"gW" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swallc2"; - icon_state = "swallc2" - }, -/area/awaymission/BMPship/Aft) "gX" = ( /obj/structure/reagent_dispensers, /turf/simulated/floor/plasteel{ @@ -2855,7 +2427,7 @@ /turf/simulated/floor/plasteel, /area/awaymission/BMPship/Aft) "hf" = ( -/obj/machinery/door/unpowered/shuttle, +/obj/machinery/door/airlock/titanium, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -2875,12 +2447,6 @@ /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel, /area/awaymission/BMPship/Aft) -"hi" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swallc3"; - icon_state = "swallc3" - }, -/area/awaymission/BMPship/Fore) "hj" = ( /turf/simulated/mineral/random, /area/awaymission) @@ -2894,33 +2460,6 @@ /obj/machinery/door/airlock/silver, /turf/simulated/floor/plating/airless, /area/awaymission/BMPship/Fore) -"hl" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swallc1"; - icon_state = "swallc1" - }, -/area/awaymission/BMPship/Fore) -"hm" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swallc3"; - icon_state = "swallc3" - }, -/area/awaymission/BMPship/Midship) -"hn" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall15"; - icon_state = "swall15" - }, -/area/awaymission/BMPship/Midship) -"ho" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall4"; - icon_state = "swall4" - }, -/area/awaymission/BMPship/Midship) -"hp" = ( -/turf/simulated/shuttle/wall, -/area/awaymission/BMPship/Midship) "hq" = ( /turf/simulated/mineral/random, /area/awaymission/BMPship/Midship) @@ -2964,31 +2503,12 @@ /obj/item/clothing/under/overalls, /turf/simulated/floor/plasteel, /area/awaymission/BMPship/Aft) -"hy" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/grille, -/turf/simulated/floor/plating/airless, -/area/awaymission/BMPship/Fore) "hz" = ( /obj/machinery/light/small{ dir = 1 }, /turf/simulated/floor/engine, /area/awaymission/BMPship/Fore) -"hA" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall1"; - icon_state = "swall1" - }, -/area/awaymission) "hB" = ( /obj/machinery/light/small{ dir = 1 @@ -3009,7 +2529,7 @@ /turf/simulated/floor/plating/asteroid/airless, /area/awaymission/BMPship/Fore) "hF" = ( -/turf/simulated/shuttle/wall, +/turf/simulated/wall/mineral/titanium, /area/awaymission) "hG" = ( /obj/structure/cable{ @@ -3109,16 +2629,6 @@ }, /turf/simulated/floor/plasteel, /area/awaymission/BMPship/Aft) -"hT" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/grille, -/obj/item/shard{ - icon_state = "small" - }, -/turf/simulated/floor/plating/airless, -/area/awaymission/BMPship/Fore) "hU" = ( /obj/effect/decal/remains/human, /obj/item/clothing/head/helmet/space/syndicate/green/dark, @@ -3137,7 +2647,7 @@ }, /area/awaymission/BMPship/Midship) "hW" = ( -/obj/machinery/door/unpowered/shuttle, +/obj/machinery/door/airlock/titanium, /turf/simulated, /area/awaymission/BMPship/Fore) "hX" = ( @@ -3205,14 +2715,6 @@ /obj/item/clothing/suit/space/syndicate/green/dark, /turf/space, /area/awaymission) -"ii" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced, -/obj/structure/grille, -/turf/simulated/floor/plating/airless, -/area/awaymission/BMPship/Fore) "ij" = ( /obj/structure/cable{ icon_state = "0-4"; @@ -3221,7 +2723,7 @@ /turf/simulated/floor/plating/airless, /area/awaymission) "ik" = ( -/obj/machinery/door/unpowered/shuttle, +/obj/machinery/door/airlock/titanium, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -3266,20 +2768,11 @@ }, /turf/space, /area/space/nearstation) -"ip" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall13"; - icon_state = "swall13" - }, -/area/awaymission/BMPship/Fore) "iq" = ( /obj/structure/rack, /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel, /area/awaymission/BMPship/Aft) -"ir" = ( -/turf/simulated/shuttle/wall, -/area/awaymission/BMPship/Fore) "is" = ( /obj/structure/bed, /obj/item/bedsheet, @@ -3290,7 +2783,7 @@ /turf/simulated/floor/plasteel, /area/awaymission/BMPship/Aft) "iu" = ( -/obj/machinery/door/unpowered/shuttle, +/obj/machinery/door/airlock/titanium, /turf/simulated/floor/plasteel{ icon_state = "cafeteria"; dir = 2 @@ -3321,17 +2814,6 @@ /obj/item/caution, /turf/simulated/floor/plating/airless, /area/awaymission) -"iy" = ( -/turf/simulated/floor/plasteel{ - icon_state = "cafeteria"; - dir = 2 - }, -/turf/simulated/shuttle/wall{ - tag = "icon-swall_f6"; - icon_state = "swall_f6"; - dir = 2 - }, -/area/awaymission/BMPship/Aft) "iz" = ( /obj/machinery/portable_atmospherics/canister/air, /turf/simulated/floor/plating/airless, @@ -3350,22 +2832,10 @@ dir = 2 }, /area/awaymission/BMPship/Aft) -"iC" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall4"; - icon_state = "swall4" - }, -/area/awaymission) "iD" = ( /obj/item/clothing/gloves/color/yellow, /turf/space, /area/awaymission) -"iE" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall12"; - icon_state = "swall12" - }, -/area/awaymission) "iF" = ( /obj/machinery/porta_turret{ check_synth = 1; @@ -3375,16 +2845,7 @@ /turf/simulated/floor/engine, /area/awaymission/BMPship/Aft) "iG" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/grille, +/obj/effect/spawner/window/shuttle, /turf/simulated/floor/engine, /area/awaymission/BMPship/Aft) "iH" = ( @@ -3446,14 +2907,6 @@ /mob/living/simple_animal/hostile/carp, /turf/simulated/floor/plating/asteroid/airless, /area/awaymission) -"iT" = ( -/turf/simulated/floor/plating, -/turf/simulated/shuttle/wall{ - tag = "icon-swall_f6"; - icon_state = "swall_f6"; - dir = 2 - }, -/area/awaymission/BMPship/Aft) "iU" = ( /obj/structure/table, /obj/item/storage/toolbox/syndicate, @@ -3465,17 +2918,6 @@ }, /turf/simulated/floor/plating, /area/awaymission) -"iW" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced, -/obj/structure/grille, -/turf/simulated/floor/engine, -/area/awaymission/BMPship/Aft) "iX" = ( /obj/structure/table, /obj/item/reagent_containers/glass/beaker/drugs/meth, @@ -3589,12 +3031,6 @@ }, /turf/simulated/floor/plating, /area/awaymission/BMPship/Gate) -"jp" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall15"; - icon_state = "swall15" - }, -/area/awaymission/BMPship/Gate) "jq" = ( /obj/machinery/door/poddoor/shutters{ dir = 2; @@ -9668,14 +9104,14 @@ aa aa aa aa -cA -cj +aU +aU eA -eY -eY -fH -bV -gg +eA +eA +eA +aU +aU aa aj aa @@ -9797,16 +9233,16 @@ aa aa aa aa -cA -cz +aU +aU ee ew eW eW fF ee -aW -gg +aU +aU aa aa gP @@ -9926,8 +9362,8 @@ aa aa aa aa -cA -cz +aU +aU cB ee ev @@ -9935,7 +9371,7 @@ eV eV fE ee -aV +aU gs as aa @@ -10055,8 +9491,8 @@ aa aa aa aa -cA -cz +aU +aU cB cB ee @@ -10065,7 +9501,7 @@ ee ee ee ee -aV +aU gA gs aa @@ -10182,10 +9618,10 @@ aa aa aU bk -bE -bP -cf -cz +bk +bk +aU +aU cW dh dH @@ -10199,10 +9635,10 @@ gh gs gz gs -hi -hy -hT -ii +aU +bk +bk +bk aU ac ac @@ -10310,11 +9746,11 @@ aa aa aa aa -aV +aU bl bF bR -ch +aU cB cX dp @@ -10329,11 +9765,11 @@ gi gC gA gN -aV +aU hv al hv -aV +aU hj hj hj @@ -10440,7 +9876,7 @@ aa aa aa aa -aV +aU bn bG bF @@ -10455,15 +9891,15 @@ dh fr dh ee -aV +aU gB gD gE -aV +aU hz al al -aV +aU hj hj hj @@ -10570,11 +10006,11 @@ aa aa aa aa -aW -bp -bp -bp -cj +aU +aU +aU +aU +aU cC cY ds @@ -10585,15 +10021,15 @@ dp fv dp fZ -aV +aU gu gR gs -hl -cj +aU +aU hW -bV -ip +aU +aU hj hj hj @@ -10700,7 +10136,7 @@ aa aa aa aa -aV +aU bv bQ ar @@ -10715,7 +10151,7 @@ eZ fu cB fY -aV +aU gt gQ gQ @@ -10723,7 +10159,7 @@ hk gS hX gs -aV +aU hj hj hj @@ -10830,30 +10266,30 @@ aa aa aa aa -aV +aU bw ar bT cl -cE -cE -cE -cE -da +cl +cl +cl +cl +cl eB -dQ -da +cl +cl fJ -dQ -gj -cE -cE -cE -hm +cl +cl +cl +cl +cl +cl hB gs gs -ir +aU hj hj hj @@ -10960,11 +10396,11 @@ aa aa aa aa -aV +aU bx ar bT -ck +cl cD cM cM @@ -10979,7 +10415,7 @@ cM cM cM cM -ck +cl hC hX hC @@ -11090,11 +10526,11 @@ aa aa aa aa -aV +aU bw ar bU -ck +cl cG cZ cM @@ -11109,7 +10545,7 @@ cM cM cM hd -ck +cl hD hC gs @@ -11220,11 +10656,11 @@ aa aa aa aa -aV +aU bx ar bT -ck +cl cF cF cF @@ -11239,7 +10675,7 @@ er er cM cM -ck +cl gs hY hC @@ -11350,11 +10786,11 @@ aa aa aa aa -aV +aU bw ar bT -ck +cl cI dc dc @@ -11369,7 +10805,7 @@ fg er cM cM -ck +cl hE hX gs @@ -11480,11 +10916,11 @@ aa aa aa aa -aV +aU bD ar cd -ck +cl cH dc dt @@ -11499,7 +10935,7 @@ fg er cM cM -ck +cl gs hC hC @@ -11610,11 +11046,11 @@ aa aa aa aa -aX +aU bt bI -bV -cm +aU +cl cJ dc dc @@ -11629,7 +11065,7 @@ fg er cM cM -ck +cl hF hj hF @@ -11744,7 +11180,7 @@ aa aa aa aa -ck +cl cI dc dc @@ -11759,7 +11195,7 @@ gd er cM gO -ck +cl hj hj hj @@ -11874,7 +11310,7 @@ aa aa aa aa -ck +cl cK cK cK @@ -11889,7 +11325,7 @@ fg eE cM cM -hp +cl hj hj hj @@ -12004,7 +11440,7 @@ aa aa aa aa -ck +cl cG cM cM @@ -12133,8 +11569,8 @@ aa aa aa as -aK -cm +am +cl cM cM cM @@ -12149,7 +11585,7 @@ gm cM cM gO -ho +cl hj hj hF @@ -12262,25 +11698,25 @@ aa aa aa aa -aK -cy -jp -cL -da +am +am +am +cl +cl dx -dQ -da +cl +cl eF en fx fO -dQ -da +cl +cl dx -dQ -cL -hn -hA +cl +cl +cl +hF hj hj hj @@ -12392,9 +11828,9 @@ aa as aa as -aQ +am by -ak +am cO db dv @@ -12409,7 +11845,7 @@ cM cM cM cM -ck +cl ac hF hj @@ -12524,7 +11960,7 @@ as by aR bz -ak +am cN db du @@ -12539,7 +11975,7 @@ en en gT hd -ck +cl ac ac hj @@ -12654,7 +12090,7 @@ by by bz aR -ak +am cQ db dy @@ -12669,7 +12105,7 @@ hV cM ek cM -ck +cl hH gY ac @@ -12778,13 +12214,13 @@ aa aa aa aa -aK -aQ +am +am by aR by cT -ak +am cP dd dw @@ -12799,7 +12235,7 @@ gl gH ek cM -ck +cl gY ia ha @@ -12908,13 +12344,13 @@ aa aa aa aa -ak +am aS aR bz aR jh -aO +am cM cM cM @@ -12929,7 +12365,7 @@ gp er ek cM -ck +cl ac hH ac @@ -13038,7 +12474,7 @@ aa aa aa aa -ak +am aR aR aR @@ -13059,13 +12495,13 @@ go er ek hd -ck +cl hJ ib id id gY -iC +hF hj iQ hj @@ -13168,7 +12604,7 @@ aa aa aa aa -ak +am aY bA aR @@ -13189,13 +12625,13 @@ go er ek cM -ck +cl hH gZ id id hH -iE +hF hj iK hj @@ -13298,7 +12734,7 @@ aa aa aj aa -ak +am aT aR aR @@ -13319,13 +12755,13 @@ go er ek cM -ck +cl ac id id ib hH -iE +hF hj iK hj @@ -13428,7 +12864,7 @@ aa aa aa aa -ak +am ba aR aS @@ -13449,13 +12885,13 @@ go er dS cM -ck +cl gY id id id gY -iE +hF hj iR hj @@ -13558,13 +12994,13 @@ aa aa aa aa -ak +am aZ aR aR bA aR -ak +am cR dg cM @@ -13579,13 +13015,13 @@ eM er dS cM -ck +cl hL hH hH hH ix -iE +hF ac ac ac @@ -13688,13 +13124,13 @@ aa aa aj aa -ak +am be bB ca aR cT -ak +am cU cM cM @@ -13709,13 +13145,13 @@ eN er dS hd -ck +cl hM hH hH hb ix -iE +hF ac iS ac @@ -13818,13 +13254,13 @@ aa aa aa aa -ak +am bb aR bb aR ji -ak +am av dg cM @@ -13839,13 +13275,13 @@ eJ en eC cM -ck +cl hN hH ij hH ix -iE +hF aa aa aa @@ -13948,13 +13384,13 @@ aj aa aa aa -ak +am bg aR bb aR aR -ak +am cV cM cM @@ -13969,13 +13405,13 @@ gq cM cM cM -ck +cl hO hH il hH iz -iE +hF aa aa aa @@ -14078,34 +13514,34 @@ aa aa aa aa -aq -bf -bC +am +am +am cb -ct -bf -cy -aJ -an -aL -an -aL -bc +am +am +am +am +ai +ai +ai +ai +ai fk fC fN ge -bK -aL -an -aw -bX -aL -bc +ai +ai +ai +ai +ai +ai +ai ik -bK -aL -ay +ai +ai +ai aa aa aa @@ -14206,16 +13642,16 @@ aa aa am ax -aE -aH -ak +ax +ax +am bh bs bJ bs bs dC -ak +am di dj dj @@ -14228,18 +13664,18 @@ fl dj dj gU -af +ai dq hP hu im dq iA -af +ai iG -ap -iW -ag +iG +iG +ai aa aa aa @@ -14334,18 +13770,18 @@ aa aa aa aa -ak +am au aB au -ak +am bi aG cc cs jj dG -ak +am di dz dU @@ -14358,18 +13794,18 @@ fc eo gG dj -aA +ai dq dq dq im dq iA -af +ai iF ez iF -af +ai aa aa aa @@ -14464,18 +13900,18 @@ aa aa aa aa -ak +am aB aB aI -ak +am bj aG aG aG jl dV -ak +am dj dj dj @@ -14495,11 +13931,11 @@ dq im it dq -af +ai iH ez ez -af +ai aa aa aa @@ -14594,21 +14030,21 @@ aa aa aa aa -aq -az +am +am aF -az -aM +am +am bm bH ce aG jk ep -ak +am dk -bK -df +ai +ai dj bY bd @@ -14618,18 +14054,18 @@ fD gf gI dj -ag +ai dq dq ie im is bd -ah -bc +ai +ai ey -bK -ay +ai +ai aa aa aa @@ -14724,21 +14160,21 @@ aa aa aa aa -ak +am aD aG aG -aO +am bo aG aG aG jk dG -ak +am dl dD -af +ai dj bY fn @@ -14748,18 +14184,18 @@ bd gf gI fG -aA +ai ht dq dq im dq dq -aA +ai iI bd ao -af +ai aa aa aa @@ -14854,8 +14290,8 @@ aa aa aa aa -at -aC +am +am aG aG aN @@ -14865,10 +14301,10 @@ aG aG jm dG -ak +am dm dA -af +ai dj eQ eS @@ -14888,8 +14324,8 @@ dq hg bd bd -iT -fm +ai +ai aa aa aa @@ -14985,8 +14421,8 @@ aa aa aa aa -at -aC +am +am aG am bq @@ -14995,10 +14431,10 @@ cp cv jk eH -ak +am dl dF -af +ai dj dj dj @@ -15008,17 +14444,17 @@ dj dj dj gV -ag +ai hu hQ dq dq dq dq -ag +ai iJ -iT -fm +ai +ai aa aa aa @@ -15116,19 +14552,19 @@ aa aa aa aa -at -aJ -aM +am +am +am bq bL co cu jk eL -ak +am dn dB -af +ai et dj dj @@ -15138,16 +14574,16 @@ et dj gK gX -af +ai hr hQ ie dq ie dq -ah -aw -fm +ai +ai +ai aa aa aa @@ -15247,36 +14683,36 @@ aa aa aa aa -at -aM +am +am bq bN cr cw jk fh -aq -aL -aL -bX -aL -aL -aL -aL -aL -aL -aL -aL -aL -ay +am +ai +ai +ai +ai +ai +ai +ai +ai +ai +ai +ai +ai +ai hs hQ dq dq dq dq -ah -fm +ai +ai aa aa aa @@ -15378,14 +14814,14 @@ aa aa aa aa -ak +am bq aG cq aG jk fA -aO +am hc hh hG @@ -15398,14 +14834,14 @@ hI jn hh js -aA +ai ht hQ dq -ag +ai iu -bK -ay +ai +ai aa aa aa @@ -15508,7 +14944,7 @@ aa aa aa aa -aP +am br bW cs @@ -15532,10 +14968,10 @@ hf es hS dq -af +ai iw iB -af +ai aa aa aa @@ -15638,8 +15074,8 @@ aa aa aa aa -at -aC +am +am bu bu bS @@ -15652,20 +15088,20 @@ dW bd bd bd -fo -fo -fo +bd +bd +bd bd dq -fo -ag +bd +ai hx hR ig -af +ai iv -iy -fm +ai +ai aa aa aa @@ -15769,14 +15205,14 @@ aa aa aa aa -at -bf -bf -bf -bf -bf -jp -df +am +am +am +am +am +am +am +ai do dZ eu @@ -15787,14 +15223,14 @@ fS bd gv do -gW -cn -aL -aL -aL -bX -aL -fm +ai +ai +ai +ai +ai +ai +ai +ai aa aa aa @@ -15906,7 +15342,7 @@ aa aa aa ai -ay +ai dE dY bd @@ -15917,8 +15353,8 @@ eP bd bd gM -ah -fm +ai +ai aa aa aa @@ -16036,7 +15472,7 @@ aa aa aa aa -af +ai hw ea bO @@ -16047,7 +15483,7 @@ fT bd fs jr -af +ai aa aa aa @@ -16166,18 +15602,18 @@ aa aa aa aa -ah -aw -bc +ai +ai +ai ey -bK -aw -aw -bc +ai +ai +ai +ai ey -bK -aw -ay +ai +ai +ai aa aa aa @@ -16297,17 +15733,17 @@ aa aa aa ai -ay +ai ed ez ez -ah -ay +ai +ai fX ez gx -ah -fm +ai +ai aa aa aa @@ -16427,16 +15863,16 @@ aa aa aa aa -af +ai eb eb eb -af -af +ai +ai eb eb eb -af +ai aa aa aa @@ -16561,12 +15997,12 @@ ai ec ec ec -fm +ai ai ec ec ec -fm +ai aa aa aa diff --git a/_maps/map_files/RandomZLevels/centcomAway.dmm b/_maps/map_files/RandomZLevels/centcomAway.dmm index 16ecc9308ae..640d9c18651 100644 --- a/_maps/map_files/RandomZLevels/centcomAway.dmm +++ b/_maps/map_files/RandomZLevels/centcomAway.dmm @@ -563,14 +563,7 @@ /turf/simulated/floor/plating, /area/awaymission/centcomAway/hangar) "bx" = ( -/turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 5 - }, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f6"; - dir = 2 - }, +/turf/simulated/wall/mineral/titanium, /area/awaymission/centcomAway/hangar) "by" = ( /obj/structure/shuttle/engine/propulsion{ @@ -600,16 +593,6 @@ }, /turf/simulated/floor/plating, /area/awaymission/centcomAway/hangar) -"bD" = ( -/turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 5 - }, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f10"; - dir = 2 - }, -/area/awaymission/centcomAway/hangar) "bE" = ( /obj/structure/closet/crate, /turf/simulated/floor/plasteel{ @@ -664,47 +647,11 @@ }, /turf/simulated/floor/plating, /area/awaymission/centcomAway/hangar) -"bL" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall3"; - dir = 2 - }, -/area/awaymission/centcomAway/hangar) -"bM" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall8"; - dir = 2 - }, -/area/awaymission/centcomAway/hangar) -"bN" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall7"; - dir = 2 - }, -/area/awaymission/centcomAway/hangar) -"bO" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall4"; - dir = 2 - }, -/area/awaymission/centcomAway/hangar) -"bP" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall12"; - dir = 2 - }, -/area/awaymission/centcomAway/hangar) "bQ" = ( /obj/structure/disposalpipe/segment, /obj/structure/reagent_dispensers/watertank, /turf/simulated/floor/plating, /area/awaymission/centcomAway/cafe) -"bR" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall11"; - dir = 2 - }, -/area/awaymission/centcomAway/hangar) "bS" = ( /obj/structure/chair/comfy/brown, /turf/simulated/floor/plasteel{ @@ -720,9 +667,6 @@ dir = 1 }, /area/awaymission/centcomAway/cafe) -"bU" = ( -/turf/simulated/shuttle/plating, -/area/awaymission/centcomAway/hangar) "bV" = ( /obj/structure/table, /turf/simulated/floor/plasteel{ @@ -740,12 +684,10 @@ /area/awaymission/centcomAway/cafe) "bX" = ( /obj/structure/closet/emcloset, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/awaymission/centcomAway/hangar) "bY" = ( -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/awaymission/centcomAway/hangar) "bZ" = ( /obj/machinery/gibber, @@ -779,20 +721,6 @@ icon_state = "solarpanel" }, /area/awaymission/centcomAway/maint) -"cd" = ( -/turf/simulated/shuttle/plating, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f6"; - dir = 2 - }, -/area/awaymission/centcomAway/hangar) -"ce" = ( -/turf/simulated/shuttle/floor, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f9"; - dir = 2 - }, -/area/awaymission/centcomAway/hangar) "cf" = ( /obj/structure/table, /obj/item/storage/firstaid/toxin{ @@ -800,7 +728,7 @@ pixel_y = 4 }, /obj/item/storage/firstaid/toxin, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/awaymission/centcomAway/hangar) "cg" = ( /obj/structure/table, @@ -812,7 +740,7 @@ pixel_x = -2; pixel_y = 4 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/awaymission/centcomAway/hangar) "ch" = ( /obj/structure/grille, @@ -840,20 +768,12 @@ dir = 1; in_use = 1 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/awaymission/centcomAway/hangar) "cj" = ( /obj/structure/sign/botany, /turf/simulated/wall/r_wall, /area/awaymission/centcomAway/cafe) -"ck" = ( -/turf/simulated/shuttle/plating, -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall_f10"; - layer = 2 - }, -/area/awaymission/centcomAway/hangar) "cl" = ( /obj/structure/grille, /obj/structure/window/reinforced{ @@ -871,13 +791,6 @@ /obj/machinery/door/airlock/external, /turf/simulated/floor/plating, /area/awaymission/centcomAway/maint) -"cn" = ( -/turf/simulated/shuttle/floor, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f5"; - dir = 2 - }, -/area/awaymission/centcomAway/hangar) "co" = ( /obj/item/paper_bin, /obj/structure/table, @@ -895,7 +808,7 @@ }, /area/awaymission/centcomAway/cafe) "cq" = ( -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/awaymission/centcomAway/hangar) "cr" = ( /obj/structure/disposalpipe/segment, @@ -969,7 +882,7 @@ /obj/machinery/door/airlock/maintenance_hatch{ req_access_txt = "101" }, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating, /area/awaymission/centcomAway/hangar) "cB" = ( /obj/structure/cable{ @@ -1087,35 +1000,27 @@ /area/awaymission/centcomAway/maint) "cP" = ( /obj/structure/table/reinforced, -/turf/simulated/shuttle/floor{ - icon_state = "floor2" - }, +/turf/simulated/floor/mineral/titanium/yellow, /area/awaymission/centcomAway/hangar) "cQ" = ( /obj/machinery/light{ icon_state = "tube1"; dir = 8 }, -/turf/simulated/shuttle/plating, -/area/awaymission/centcomAway/hangar) -"cR" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall1"; - dir = 2 - }, +/turf/simulated/floor/plating, /area/awaymission/centcomAway/hangar) "cS" = ( /obj/structure/chair/comfy/shuttle{ dir = 8 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/awaymission/centcomAway/hangar) "cT" = ( /obj/machinery/light{ icon_state = "tube1"; dir = 4 }, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating, /area/awaymission/centcomAway/hangar) "cU" = ( /turf/simulated/floor/plating, @@ -1151,9 +1056,7 @@ /area/awaymission/centcomAway/cafe) "cY" = ( /obj/machinery/computer/secure_data, -/turf/simulated/shuttle/floor{ - icon_state = "floor2" - }, +/turf/simulated/floor/mineral/titanium/yellow, /area/awaymission/centcomAway/hangar) "cZ" = ( /obj/structure/disposalpipe/segment{ @@ -1169,9 +1072,7 @@ /obj/structure/chair/comfy/shuttle{ dir = 4 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor2" - }, +/turf/simulated/floor/mineral/titanium/yellow, /area/awaymission/centcomAway/hangar) "db" = ( /obj/machinery/light{ @@ -1205,40 +1106,16 @@ "de" = ( /obj/structure/table, /obj/item/flash, -/turf/simulated/shuttle/floor{ - icon_state = "floor2" - }, +/turf/simulated/floor/mineral/titanium/yellow, /area/awaymission/centcomAway/hangar) "df" = ( -/turf/simulated/shuttle/floor{ - icon_state = "floor2" - }, +/turf/simulated/floor/mineral/titanium/yellow, /area/awaymission/centcomAway/hangar) "dg" = ( /obj/structure/chair/comfy/shuttle{ dir = 4 }, -/turf/simulated/shuttle/floor, -/area/awaymission/centcomAway/hangar) -"dh" = ( -/turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 5 - }, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f5"; - dir = 2 - }, -/area/awaymission/centcomAway/hangar) -"di" = ( -/turf/simulated/floor/plasteel{ - icon_state = "vault"; - dir = 5 - }, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f9"; - dir = 2 - }, +/turf/simulated/floor/mineral/titanium/blue, /area/awaymission/centcomAway/hangar) "dj" = ( /obj/machinery/light{ @@ -1265,18 +1142,10 @@ }, /turf/simulated/floor/plating, /area/awaymission/centcomAway/maint) -"dl" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swallc1"; - dir = 2 - }, -/area/awaymission/centcomAway/hangar) "dm" = ( /obj/structure/table/reinforced, /obj/item/storage/fancy/donut_box, -/turf/simulated/shuttle/floor{ - icon_state = "floor2" - }, +/turf/simulated/floor/mineral/titanium/yellow, /area/awaymission/centcomAway/hangar) "dn" = ( /obj/structure/table/reinforced, @@ -1285,29 +1154,19 @@ icon_state = "tube1"; dir = 8 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor2" - }, +/turf/simulated/floor/mineral/titanium/yellow, /area/awaymission/centcomAway/hangar) "do" = ( /obj/structure/table/reinforced, /obj/item/pen, -/turf/simulated/shuttle/floor{ - icon_state = "floor2" - }, +/turf/simulated/floor/mineral/titanium/yellow, /area/awaymission/centcomAway/hangar) "dp" = ( /obj/machinery/sleeper{ icon_state = "sleeper-open"; dir = 8 }, -/turf/simulated/shuttle/floor, -/area/awaymission/centcomAway/hangar) -"dq" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swallc2"; - dir = 2 - }, +/turf/simulated/floor/mineral/titanium/blue, /area/awaymission/centcomAway/hangar) "dr" = ( /obj/machinery/light{ @@ -1317,7 +1176,7 @@ /obj/structure/chair/comfy/shuttle{ dir = 8 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/awaymission/centcomAway/hangar) "ds" = ( /obj/machinery/light{ @@ -1384,9 +1243,7 @@ /obj/structure/table/reinforced, /obj/item/clipboard, /obj/item/stamp/granted, -/turf/simulated/shuttle/floor{ - icon_state = "floor2" - }, +/turf/simulated/floor/mineral/titanium/yellow, /area/awaymission/centcomAway/hangar) "dB" = ( /obj/structure/disposalpipe/segment, @@ -1409,21 +1266,11 @@ /area/awaymission/centcomAway/maint) "dE" = ( /obj/structure/bed, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/awaymission/centcomAway/hangar) "dF" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/shuttle/plating, +/obj/effect/spawner/window/shuttle, +/turf/simulated/floor/plating, /area/awaymission/centcomAway/hangar) "dG" = ( /turf/simulated/floor/plasteel{ @@ -1521,9 +1368,7 @@ "dS" = ( /obj/structure/table, /obj/item/storage/box/handcuffs, -/turf/simulated/shuttle/floor{ - icon_state = "floor2" - }, +/turf/simulated/floor/mineral/titanium/yellow, /area/awaymission/centcomAway/hangar) "dT" = ( /obj/machinery/door/window/northright{ @@ -1533,9 +1378,7 @@ name = "Security Desk"; req_access_txt = "103" }, -/turf/simulated/shuttle/floor{ - icon_state = "floor2" - }, +/turf/simulated/floor/mineral/titanium/yellow, /area/awaymission/centcomAway/hangar) "dU" = ( /obj/structure/cable{ @@ -1632,12 +1475,6 @@ /obj/effect/decal/warning_stripes/northeast, /turf/simulated/floor/plating, /area/awaymission/centcomAway/hangar) -"eg" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall0"; - dir = 2 - }, -/area/awaymission/centcomAway/hangar) "eh" = ( /obj/structure/cable{ d1 = 1; @@ -1652,7 +1489,7 @@ "ei" = ( /obj/structure/table, /obj/structure/bedsheetbin, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/awaymission/centcomAway/hangar) "ej" = ( /obj/structure/disposalpipe/segment, @@ -1770,18 +1607,14 @@ icon_state = "tube1"; dir = 4 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/awaymission/centcomAway/hangar) "ex" = ( /obj/machinery/light{ icon_state = "tube1"; dir = 8 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/awaymission/centcomAway/hangar) "ey" = ( /obj/structure/table, @@ -1833,9 +1666,7 @@ name = "Rest Room"; req_access_txt = "0" }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/awaymission/centcomAway/hangar) "eE" = ( /obj/effect/decal/warning_stripes/northeast, @@ -1867,7 +1698,7 @@ "eK" = ( /obj/structure/table, /obj/item/radio/off, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/awaymission/centcomAway/hangar) "eL" = ( /obj/structure/closet/crate, @@ -1876,7 +1707,7 @@ /area/awaymission/centcomAway/hangar) "eM" = ( /obj/structure/filingcabinet, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/awaymission/centcomAway/hangar) "eN" = ( /obj/effect/decal/warning_stripes/southeast, @@ -1887,12 +1718,6 @@ icon_state = "floor" }, /area/awaymission/centcomAway/general) -"eQ" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall2"; - dir = 2 - }, -/area/awaymission/centcomAway/hangar) "eR" = ( /obj/machinery/power/apc/noalarm{ cell_type = 15000; @@ -1964,16 +1789,16 @@ "fa" = ( /obj/structure/table, /obj/item/storage/box/donkpockets, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/awaymission/centcomAway/hangar) "fb" = ( /obj/structure/table, /obj/item/hand_labeler, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/awaymission/centcomAway/hangar) "fc" = ( /obj/structure/chair/comfy/shuttle, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/awaymission/centcomAway/hangar) "fd" = ( /obj/machinery/portable_atmospherics/pump, @@ -2039,11 +1864,11 @@ /area/awaymission/centcomAway/cafe) "fl" = ( /obj/structure/table, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/awaymission/centcomAway/hangar) "fm" = ( /obj/structure/computerframe, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/awaymission/centcomAway/hangar) "fn" = ( /obj/structure/flora/ausbushes, @@ -2088,7 +1913,7 @@ icon_state = "tube1"; dir = 4 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/awaymission/centcomAway/hangar) "fs" = ( /obj/structure/closet/chefcloset, @@ -2140,36 +1965,6 @@ icon_state = "dark" }, /area/awaymission/centcomAway/courtroom) -"fz" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced, -/turf/simulated/shuttle/plating, -/area/awaymission/centcomAway/hangar) -"fA" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced, -/turf/simulated/shuttle/plating, -/area/awaymission/centcomAway/hangar) -"fB" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/shuttle/plating, -/area/awaymission/centcomAway/hangar) "fC" = ( /obj/structure/closet/secure_closet/freezer/fridge, /obj/machinery/light, @@ -2247,13 +2042,6 @@ icon_state = "redfull" }, /area/awaymission/centcomAway/cafe) -"fM" = ( -/turf/simulated/floor/plating, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f5"; - dir = 2 - }, -/area/awaymission/centcomAway/hangar) "fN" = ( /obj/structure/window/reinforced{ dir = 4 @@ -2265,18 +2053,6 @@ icon_state = "floor" }, /area/awaymission/centcomAway/general) -"fO" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall14"; - dir = 2 - }, -/area/awaymission/centcomAway/hangar) -"fP" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swallc4"; - dir = 2 - }, -/area/awaymission/centcomAway/hangar) "fQ" = ( /turf/simulated/floor/carpet, /area/awaymission/centcomAway/courtroom) @@ -2285,9 +2061,7 @@ name = "Cockpit"; req_access_txt = "109" }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/awaymission/centcomAway/hangar) "fS" = ( /obj/machinery/door/airlock/centcom, @@ -2553,7 +2327,7 @@ /area/awaymission/centcomAway/general) "gB" = ( /obj/structure/table/reinforced, -/obj/item/tank/anesthetic, +/obj/item/tank/internals/anesthetic, /obj/item/clothing/mask/breath/medical, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -2733,7 +2507,7 @@ icon_state = "tube1"; dir = 8 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/awaymission/centcomAway/hangar) "hb" = ( /obj/structure/table/reinforced, @@ -2906,7 +2680,7 @@ "hx" = ( /obj/structure/table, /obj/item/storage/lockbox, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/awaymission/centcomAway/hangar) "hy" = ( /obj/structure/grille, @@ -2943,8 +2717,8 @@ }, /area/awaymission/centcomAway/courtroom) "hD" = ( -/obj/machinery/door/unpowered/shuttle, -/turf/simulated/shuttle/floor, +/obj/machinery/door/airlock/titanium, +/turf/simulated/floor/mineral/titanium/blue, /area/awaymission/centcomAway/hangar) "hE" = ( /obj/structure/chair{ @@ -2956,21 +2730,7 @@ /obj/structure/chair/comfy/shuttle{ dir = 4 }, -/turf/simulated/shuttle/floor, -/area/awaymission/centcomAway/hangar) -"hF" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/mineral/titanium/blue, /area/awaymission/centcomAway/hangar) "hG" = ( /obj/structure/reagent_dispensers/fueltank, @@ -2980,7 +2740,7 @@ /obj/structure/table, /obj/item/clipboard, /obj/item/pen, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/awaymission/centcomAway/hangar) "hI" = ( /obj/structure/morgue, @@ -3001,7 +2761,7 @@ "hL" = ( /obj/structure/table, /obj/item/paper_bin, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/awaymission/centcomAway/hangar) "hM" = ( /obj/structure/cable{ @@ -3109,20 +2869,6 @@ }, /turf/simulated/floor/plating, /area/awaymission/centcomAway/courtroom) -"hX" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/awaymission/centcomAway/hangar) "hY" = ( /turf/simulated/floor/plasteel{ tag = "icon-blackcorner (NORTH)"; @@ -3616,9 +3362,7 @@ }, /area/awaymission/centcomAway/general) "jd" = ( -/obj/structure/sign/redcross{ - icon_state = "lifestar" - }, +/obj/structure/sign/lifestar, /turf/simulated/wall/r_wall, /area/awaymission/centcomAway/general) "je" = ( @@ -4048,15 +3792,6 @@ /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plating, /area/awaymission/centcomAway/hangar) -"jZ" = ( -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f10"; - dir = 2 - }, -/area/awaymission/centcomAway/hangar) "ka" = ( /obj/structure/table, /obj/item/paper/ccaMemo, @@ -4071,9 +3806,7 @@ /mob/living/simple_animal/hostile/russian/ranged{ loot = list(/obj/effect/mob_spawn/human/corpse/russian/ranged) }, -/turf/simulated/shuttle/floor{ - icon_state = "floor2" - }, +/turf/simulated/floor/mineral/titanium/yellow, /area/awaymission/centcomAway/hangar) "kc" = ( /obj/machinery/door/airlock/centcom{ @@ -4150,15 +3883,6 @@ icon_state = "floor" }, /area/awaymission/centcomAway/general) -"km" = ( -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f9"; - dir = 2 - }, -/area/awaymission/centcomAway/hangar) "kn" = ( /obj/structure/table, /obj/item/clothing/gloves/color/yellow, @@ -4651,21 +4375,7 @@ /obj/structure/shuttle/engine/propulsion/burst{ dir = 8 }, -/turf/simulated/floor/plating, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f6"; - dir = 2 - }, -/area/awaymission/centcomAway/hangar) -"lt" = ( -/obj/structure/shuttle/engine/propulsion/burst{ - dir = 8 - }, -/turf/simulated/floor/plating, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f5"; - dir = 2 - }, +/turf/simulated/wall/mineral/titanium, /area/awaymission/centcomAway/hangar) "lu" = ( /obj/structure/flora/ausbushes, @@ -5774,7 +5484,7 @@ icon_state = "propulsion_r"; dir = 1 }, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/awaymission/centcomAway/thunderdome) "nV" = ( /obj/machinery/light, @@ -5787,14 +5497,14 @@ icon_state = "propulsion_l"; dir = 1 }, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/awaymission/centcomAway/thunderdome) "nX" = ( /obj/structure/shuttle/engine/propulsion{ icon_state = "propulsion"; dir = 1 }, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/awaymission/centcomAway/thunderdome) "nY" = ( /obj/structure/computerframe, @@ -6803,6 +6513,9 @@ icon_state = "dark" }, /area/awaymission/centcomAway/thunderdome) +"Cs" = ( +/turf/simulated/wall/mineral/titanium/nodiagonal, +/area/awaymission/centcomAway/hangar) "Di" = ( /obj/structure/chair{ dir = 4 @@ -6810,7 +6523,7 @@ /obj/structure/chair/comfy/shuttle{ dir = 4 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/awaymission/centcomAway/hangar) "JB" = ( /obj/effect/decal/warning_stripes/yellow, @@ -11146,10 +10859,10 @@ aa aW bn bx -bL -bL -bL -dh +bx +bx +bx +bx bn bo bo @@ -11174,7 +10887,7 @@ gX gX ls hD -lt +ls gX aW iM @@ -11277,10 +10990,10 @@ aW bn bw bK -bU +cU cQ -ck -dh +bx +bx bn cU bn @@ -11302,9 +11015,9 @@ jz gX gX gX -bP +bx hE -bP +bx gX aW iN @@ -11407,10 +11120,10 @@ aW bn bC bK -bU -bU -bU -bP +cU +cU +cU +bx bn bn bn @@ -11432,9 +11145,9 @@ jz gX gX gX -bP +bx Di -bP +bx oc aW lo @@ -11537,20 +11250,20 @@ aW bn by bK -cd -cR +bx +bx cA -dl -bL -bL -bL -bN -bL -bL -bL -bL -bL -fM +bx +bx +bx +bx +bx +bx +bx +bx +bx +bx +bx cU cU bn @@ -11562,9 +11275,9 @@ jz gX gX gX -jZ -hX -km +bx +dF +bx gX aW iP @@ -11665,23 +11378,23 @@ aa aa aW bn -bD -bN -ce +bx +bx +bx cq cq dn cY de dS -bP +bx dE dE dE dE dE -fO -fM +bx +bx cU cU bn @@ -11796,7 +11509,7 @@ aa aW bn bn -bM +bx bX cq bY @@ -11804,17 +11517,17 @@ dm kb df df -bP +bx bY bY bY bY bY -fO -bR -bL -bL -dh +bx +bx +bx +bx +bx bn bn jo @@ -11934,17 +11647,17 @@ do da df df -bP +bx dE ew bY dE dE -bP +bx eK ha hx -fz +dF bn bn bn @@ -11953,7 +11666,7 @@ gX gX ls hD -lt +ls gX gX aW @@ -12056,7 +11769,7 @@ aa aW bo bn -bO +bx cf cq bY @@ -12064,26 +11777,26 @@ cP dA cP dT -dl -bL -cR +Cs +bx +bx eD -eQ -bL -fP +bx +bx +bx cS cq fl -fA +dF bn bn jp jz gX gX -bP +bx hE -bP +bx gX gX aW @@ -12186,7 +11899,7 @@ aa aW bj bn -bP +bx ci cq bY @@ -12204,16 +11917,16 @@ fR bY fc fm -fA +dF bn bn bn jz gX gX -bP +bx Di -bP +bx gX gX iB @@ -12316,7 +12029,7 @@ aa aW bn bn -bM +bx cg cq bY @@ -12330,20 +12043,20 @@ cS bY cq ei -bO +bx dg cq hH -fA +dF bn bn bn jz gX gX -jZ -hF -km +bx +dF +bx gX oc aW @@ -12460,11 +12173,11 @@ dg bY cq fb -bP +bx eM fr hL -fB +dF bn bo bn @@ -12576,7 +12289,7 @@ aa aW bn bn -bO +bx bX cq bY @@ -12590,11 +12303,11 @@ bY bY cq fa -fO -bN -bL -bL -di +bx +bx +bx +bx +bx bn bn bn @@ -12706,8 +12419,8 @@ aa aW bn bx -bR -cn +bx +bx cq cq dr @@ -12720,8 +12433,8 @@ dr bY cq bX -fO -di +bx +bx bn bn bn @@ -12837,20 +12550,20 @@ aW bn bw bK -ck -cR +bx +bx cA -dq -bL -cR +bx +bx +bx bH -eg +bx dF -eg +bx bH -eQ -bL -di +bx +bx +bx bn bn bn @@ -12967,10 +12680,10 @@ aW bn bC bK -bU -bU -bU -bP +cU +cU +cU +bx bn dC bn @@ -13097,10 +12810,10 @@ aW bn by bK -bU +cU cT -cd -di +bx +bx bn bn bn @@ -13225,11 +12938,11 @@ aa aa aW bn -bD -bL -bL -bL -di +bx +bx +bx +bx +bx bn bn bn diff --git a/_maps/map_files/RandomZLevels/evil_santa.dmm b/_maps/map_files/RandomZLevels/evil_santa.dmm index 0a92eaa1b29..62b84545ee0 100644 --- a/_maps/map_files/RandomZLevels/evil_santa.dmm +++ b/_maps/map_files/RandomZLevels/evil_santa.dmm @@ -1,8 +1,6 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "aa" = ( -/turf/simulated/shuttle/wall{ - icon_state = "wall3" - }, +/turf/simulated/wall/indestructible/syndicate, /area/space) "ab" = ( /turf/simulated/mineral, @@ -271,55 +269,16 @@ }, /area/awaymission/challenge/main) "aP" = ( -/turf/simulated/floor/snow{ - carbon_dioxide = 21.8366; - nitrogen = 0; - oxygen = 82.1472; - temperature = 73 - }, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f6"; - dir = 2 - }, -/area/awaymission/challenge/main) -"aQ" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall12"; - dir = 2 - }, -/area/awaymission/challenge/main) -"aR" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall8"; - dir = 2 - }, +/turf/simulated/wall/mineral/titanium, /area/awaymission/challenge/main) "aS" = ( -/obj/machinery/door/unpowered/shuttle, +/obj/machinery/door/airlock/titanium, /obj/structure/fans/tiny, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ icon_state = "bar" }, /area/awaymission/challenge/main) -"aT" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall4"; - dir = 2 - }, -/area/awaymission/challenge/main) -"aU" = ( -/turf/simulated/floor/snow{ - carbon_dioxide = 21.8366; - nitrogen = 0; - oxygen = 82.1472; - temperature = 73 - }, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f10"; - dir = 2 - }, -/area/awaymission/challenge/main) "aV" = ( /turf/simulated/floor/plasteel{ icon_plating = "asteroid"; @@ -335,12 +294,6 @@ name = "Asteroid" }, /area/awaymission/challenge/main) -"aX" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall3"; - dir = 2 - }, -/area/awaymission/challenge/main) "aY" = ( /turf/simulated/floor/plasteel{ icon_state = "cafeteria"; @@ -360,12 +313,6 @@ name = "Asteroid" }, /area/awaymission/challenge/main) -"bb" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall1"; - dir = 2 - }, -/area/awaymission/challenge/main) "bc" = ( /obj/effect/decal/straw/medium, /obj/effect/decal/remains/human, @@ -398,36 +345,6 @@ dir = 2 }, /area/awaymission/challenge/main) -"bg" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall2"; - dir = 2 - }, -/area/awaymission/challenge/main) -"bh" = ( -/turf/simulated/floor/snow{ - carbon_dioxide = 21.8366; - nitrogen = 0; - oxygen = 82.1472; - temperature = 73 - }, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f5"; - dir = 2 - }, -/area/awaymission/challenge/main) -"bi" = ( -/turf/simulated/floor/snow{ - carbon_dioxide = 21.8366; - nitrogen = 0; - oxygen = 82.1472; - temperature = 73 - }, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f9"; - dir = 2 - }, -/area/awaymission/challenge/main) "bj" = ( /obj/structure/flora/rock, /turf/simulated/floor/snow{ @@ -547,12 +464,10 @@ /turf/simulated/floor/plasteel, /area/awaymission/challenge/main) "bD" = ( -/turf/simulated/shuttle/wall{ - icon_state = "wall3" - }, +/turf/simulated/wall/indestructible/syndicate, /area/awaymission/challenge/start) "bE" = ( -/obj/machinery/door/unpowered/shuttle, +/obj/machinery/door/airlock/titanium, /obj/structure/fans/tiny, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ @@ -570,7 +485,7 @@ /turf/simulated/floor/plasteel, /area/awaymission/challenge/start) "bG" = ( -/obj/machinery/door/unpowered/shuttle, +/obj/machinery/door/airlock/titanium, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, /area/awaymission/challenge/start) @@ -638,9 +553,7 @@ /turf/simulated/floor/bluegrid, /area/awaymission/challenge/start) "bR" = ( -/turf/simulated/shuttle/wall{ - icon_state = "wall3" - }, +/turf/simulated/wall/indestructible/syndicate, /area/awaymission/challenge/main) "bS" = ( /obj/machinery/atmospherics/unary/vent_pump{ @@ -824,40 +737,30 @@ /area/awaymission/challenge/start) "cq" = ( /obj/machinery/atmospherics/pipe/simple/hidden/universal, -/turf/simulated/shuttle/wall{ - icon_state = "wall3" - }, +/turf/simulated/wall/indestructible/syndicate, /area/awaymission/challenge/start) "cr" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 6 }, -/turf/simulated/shuttle/wall{ - icon_state = "wall3" - }, +/turf/simulated/wall/indestructible/syndicate, /area/awaymission/challenge/start) "cs" = ( /obj/machinery/atmospherics/pipe/simple/hidden/universal{ dir = 4 }, -/turf/simulated/shuttle/wall{ - icon_state = "wall3" - }, +/turf/simulated/wall/indestructible/syndicate, /area/awaymission/challenge/start) "ct" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/turf/simulated/shuttle/wall{ - icon_state = "wall3" - }, +/turf/simulated/wall/indestructible/syndicate, /area/awaymission/challenge/start) "cu" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 10; initialize_directions = 10 }, -/turf/simulated/shuttle/wall{ - icon_state = "wall3" - }, +/turf/simulated/wall/indestructible/syndicate, /area/awaymission/challenge/start) "cv" = ( /obj/machinery/atmospherics/unary/tank/air{ @@ -875,9 +778,7 @@ /turf/simulated/floor/plating/airless, /area/awaymission/challenge/start) "cy" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - on = 1 - }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel, /area/awaymission/challenge/start) @@ -2705,14 +2606,14 @@ ac ac ac aP -aX -bb +aP +aP aS bE aS -bg -aX -bh +aP +aP +aP ac ac ac @@ -2770,7 +2671,7 @@ ac ac ac ac -aQ +aP aY aZ aY @@ -2778,7 +2679,7 @@ aZ aY aZ aY -aQ +aP ac ac ac @@ -2836,7 +2737,7 @@ ac ac ac aG -aR +aP aZ aY aZ @@ -2844,7 +2745,7 @@ aY aZ aY aZ -aR +aP aG ac ac @@ -3100,7 +3001,7 @@ ac ac ac aG -aT +aP aZ aY aZ @@ -3108,7 +3009,7 @@ aY aZ aY aZ -aT +aP aG ac ac @@ -3166,7 +3067,7 @@ ac ac ac ac -aQ +aP aY aZ aY @@ -3174,7 +3075,7 @@ aZ aY aZ aY -aQ +aP ac ac ac @@ -3232,15 +3133,15 @@ ac aK aK ac -aU -aX -bb +aP +aP +aP aS bE aS -bg -aX -bi +aP +aP +aP ac ac ac diff --git a/_maps/map_files/RandomZLevels/moonoutpost19.dmm b/_maps/map_files/RandomZLevels/moonoutpost19.dmm index d7e3d89a005..cfe208e1557 100644 --- a/_maps/map_files/RandomZLevels/moonoutpost19.dmm +++ b/_maps/map_files/RandomZLevels/moonoutpost19.dmm @@ -1,9 +1,6 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "aa" = ( -/turf/unsimulated/wall{ - icon_state = "rock"; - name = "rock" - }, +/turf/simulated/wall/indestructible/rock, /area/awaycontent/a3{ always_unpowered = 1; ambientsounds = list('sound/ambience/ambimine.ogg'); @@ -2660,7 +2657,7 @@ icon_state = "weeds1" }, /obj/structure/bed/nest, -/obj/item/tank/oxygen, +/obj/item/tank/internals/oxygen, /obj/item/clothing/suit/space/syndicate/orange, /obj/item/clothing/mask/gas, /obj/item/clothing/head/helmet/space/syndicate/orange, @@ -5352,8 +5349,7 @@ /obj/effect/decal/cleanable/blood/oil{ color = "black" }, -/obj/item/storage/firstaid/regular{ - empty = 1; +/obj/item/storage/firstaid/regular/empty{ name = "First-Aid (empty)" }, /obj/item/healthanalyzer{ @@ -5968,7 +5964,7 @@ req_access_txt = "271" }, /obj/item/clothing/suit/storage/labcoat, -/obj/item/tank/air, +/obj/item/tank/internals/air, /obj/item/clothing/mask/gas, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, @@ -7810,32 +7806,7 @@ name = "MO19 Arrivals" }) "ld" = ( -/turf/simulated/floor/plating/asteroid/airless, -/turf/simulated/shuttle/wall{ - tag = "icon-swall_f6"; - icon_state = "swall_f6"; - dir = 2 - }, -/area/awaycontent/a1{ - has_gravity = 1; - name = "MO19 Arrivals" - }) -"le" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall12"; - dir = 2 - }, -/area/awaycontent/a1{ - has_gravity = 1; - name = "MO19 Arrivals" - }) -"lf" = ( -/turf/simulated/floor/plating/asteroid/airless, -/turf/simulated/shuttle/wall{ - dir = 3; - icon_state = "swall_f10"; - layer = 2 - }, +/turf/simulated/wall/mineral/titanium, /area/awaycontent/a1{ has_gravity = 1; name = "MO19 Arrivals" @@ -8083,50 +8054,6 @@ has_gravity = 1; name = "MO19 Arrivals" }) -"lz" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall14"; - dir = 2 - }, -/area/awaycontent/a1{ - has_gravity = 1; - name = "MO19 Arrivals" - }) -"lA" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall8"; - dir = 2 - }, -/area/awaycontent/a1{ - has_gravity = 1; - name = "MO19 Arrivals" - }) -"lB" = ( -/obj/structure/grille, -/obj/structure/window/full/reinforced, -/turf/simulated/shuttle/plating, -/area/awaycontent/a1{ - has_gravity = 1; - name = "MO19 Arrivals" - }) -"lC" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall4"; - dir = 2 - }, -/area/awaycontent/a1{ - has_gravity = 1; - name = "MO19 Arrivals" - }) -"lD" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall1"; - dir = 2 - }, -/area/awaycontent/a1{ - has_gravity = 1; - name = "MO19 Arrivals" - }) "lE" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel/airless{ @@ -8144,7 +8071,7 @@ icon_state = "burst_r"; tag = "icon-burst_r (WEST)" }, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/awaycontent/a1{ has_gravity = 1; name = "MO19 Arrivals" @@ -8207,7 +8134,7 @@ /obj/structure/window/reinforced{ dir = 8 }, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/awaycontent/a1{ has_gravity = 1; name = "MO19 Arrivals" @@ -8337,20 +8264,10 @@ has_gravity = 1; name = "MO19 Arrivals" }) -"lW" = ( -/turf/simulated/shuttle/floor, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f9"; - dir = 2 - }, -/area/awaycontent/a1{ - has_gravity = 1; - name = "MO19 Arrivals" - }) "lX" = ( /obj/structure/table, /obj/item/storage/lockbox, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/awaycontent/a1{ has_gravity = 1; name = "MO19 Arrivals" @@ -8358,18 +8275,7 @@ "lY" = ( /obj/structure/table, /obj/item/radio/off, -/turf/simulated/shuttle/floor{ - icon_state = "floor2" - }, -/area/awaycontent/a1{ - has_gravity = 1; - name = "MO19 Arrivals" - }) -"lZ" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall3"; - dir = 2 - }, +/turf/simulated/floor/mineral/titanium/yellow, /area/awaycontent/a1{ has_gravity = 1; name = "MO19 Arrivals" @@ -8379,9 +8285,7 @@ pixel_x = -32; pixel_y = 0 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor2" - }, +/turf/simulated/floor/mineral/titanium/yellow, /area/awaycontent/a1{ has_gravity = 1; name = "MO19 Arrivals" @@ -8393,13 +8297,13 @@ /obj/structure/chair/comfy/shuttle{ dir = 8 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/awaycontent/a1{ has_gravity = 1; name = "MO19 Arrivals" }) "mc" = ( -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/awaycontent/a1{ has_gravity = 1; name = "MO19 Arrivals" @@ -8408,7 +8312,7 @@ /obj/structure/chair/comfy/shuttle{ dir = 8 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/awaycontent/a1{ has_gravity = 1; name = "MO19 Arrivals" @@ -8421,14 +8325,14 @@ /obj/machinery/light/small{ dir = 1 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/awaycontent/a1{ has_gravity = 1; name = "MO19 Arrivals" }) "mf" = ( /obj/structure/closet/emcloset, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/awaycontent/a1{ has_gravity = 1; name = "MO19 Arrivals" @@ -8439,7 +8343,7 @@ icon_state = "burst_l"; tag = "icon-burst_l (WEST)" }, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/awaycontent/a1{ has_gravity = 1; name = "MO19 Arrivals" @@ -8560,7 +8464,7 @@ "mq" = ( /obj/structure/table, /obj/item/storage/box/donkpockets, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/awaycontent/a1{ has_gravity = 1; name = "MO19 Arrivals" @@ -8572,17 +8476,13 @@ /obj/structure/chair/comfy/shuttle{ dir = 1 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor2" - }, +/turf/simulated/floor/mineral/titanium/yellow, /area/awaycontent/a1{ has_gravity = 1; name = "MO19 Arrivals" }) "ms" = ( -/turf/simulated/shuttle/floor{ - icon_state = "floor2" - }, +/turf/simulated/floor/mineral/titanium/yellow, /area/awaycontent/a1{ has_gravity = 1; name = "MO19 Arrivals" @@ -8591,7 +8491,7 @@ /obj/effect/landmark{ name = "awaystart" }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/awaycontent/a1{ has_gravity = 1; name = "MO19 Arrivals" @@ -8603,7 +8503,7 @@ /obj/structure/chair/comfy/shuttle{ dir = 8 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/awaycontent/a1{ has_gravity = 1; name = "MO19 Arrivals" @@ -8615,9 +8515,7 @@ /obj/structure/window/reinforced{ dir = 1 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor2" - }, +/turf/simulated/floor/mineral/titanium/yellow, /area/awaycontent/a1{ has_gravity = 1; name = "MO19 Arrivals" @@ -8764,18 +8662,16 @@ }) "mH" = ( /obj/machinery/computer/shuttle, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/awaycontent/a1{ has_gravity = 1; name = "MO19 Arrivals" }) "mI" = ( -/obj/machinery/door/airlock/shuttle{ +/obj/machinery/door/airlock/titanium{ name = "Shuttle Cockpit" }, -/turf/simulated/shuttle/floor{ - icon_state = "floor2" - }, +/turf/simulated/floor/mineral/titanium/yellow, /area/awaycontent/a1{ has_gravity = 1; name = "MO19 Arrivals" @@ -8784,9 +8680,7 @@ /obj/effect/landmark{ name = "awaystart" }, -/turf/simulated/shuttle/floor{ - icon_state = "floor2" - }, +/turf/simulated/floor/mineral/titanium/yellow, /area/awaycontent/a1{ has_gravity = 1; name = "MO19 Arrivals" @@ -8801,18 +8695,16 @@ /obj/effect/landmark{ name = "awaystart" }, -/turf/simulated/shuttle/floor{ - icon_state = "floor2" - }, +/turf/simulated/floor/mineral/titanium/yellow, /area/awaycontent/a1{ has_gravity = 1; name = "MO19 Arrivals" }) "mL" = ( -/obj/machinery/door/airlock/shuttle{ +/obj/machinery/door/airlock/titanium{ name = "Shuttle Airlock" }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/plating, /area/awaycontent/a1{ has_gravity = 1; name = "MO19 Arrivals" @@ -8933,7 +8825,7 @@ /obj/structure/table, /obj/item/clipboard, /obj/item/pen, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/awaycontent/a1{ has_gravity = 1; name = "MO19 Arrivals" @@ -8943,18 +8835,7 @@ dir = 4 }, /obj/structure/chair/comfy/shuttle, -/turf/simulated/shuttle/floor{ - icon_state = "floor2" - }, -/area/awaycontent/a1{ - has_gravity = 1; - name = "MO19 Arrivals" - }) -"mY" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall2"; - dir = 2 - }, +/turf/simulated/floor/mineral/titanium/yellow, /area/awaycontent/a1{ has_gravity = 1; name = "MO19 Arrivals" @@ -8964,9 +8845,7 @@ dir = 4 }, /obj/structure/window/reinforced, -/turf/simulated/shuttle/floor{ - icon_state = "floor2" - }, +/turf/simulated/floor/mineral/titanium/yellow, /area/awaycontent/a1{ has_gravity = 1; name = "MO19 Arrivals" @@ -9016,29 +8895,9 @@ has_gravity = 1; name = "MO19 Arrivals" }) -"ne" = ( -/turf/simulated/floor/plating/asteroid/airless, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f5"; - dir = 2 - }, -/area/awaycontent/a1{ - has_gravity = 1; - name = "MO19 Arrivals" - }) -"nf" = ( -/turf/simulated/shuttle/floor, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f10"; - dir = 2 - }, -/area/awaycontent/a1{ - has_gravity = 1; - name = "MO19 Arrivals" - }) "ng" = ( /obj/structure/filingcabinet, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/awaycontent/a1{ has_gravity = 1; name = "MO19 Arrivals" @@ -9048,7 +8907,7 @@ /obj/structure/chair/comfy/shuttle{ dir = 8 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/awaycontent/a1{ has_gravity = 1; name = "MO19 Arrivals" @@ -9059,7 +8918,7 @@ pixel_y = -30 }, /obj/machinery/light/small, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/awaycontent/a1{ has_gravity = 1; name = "MO19 Arrivals" @@ -9119,15 +8978,6 @@ /obj/effect/decal/cleanable/dirt, /obj/item/trash/candy, /turf/simulated/floor/plating, -/area/awaycontent/a1{ - has_gravity = 1; - name = "MO19 Arrivals" - }) -"no" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall13"; - dir = 2 - }, /area/awaycontent/a1{ has_gravity = 1; name = "MO19 Arrivals" @@ -9193,16 +9043,6 @@ "nv" = ( /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel, -/area/awaycontent/a1{ - has_gravity = 1; - name = "MO19 Arrivals" - }) -"nw" = ( -/turf/simulated/floor/plating/asteroid/airless, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f9"; - dir = 2 - }, /area/awaycontent/a1{ has_gravity = 1; name = "MO19 Arrivals" @@ -10242,6 +10082,13 @@ }, /obj/item/clothing/under/suit_jacket/burgundy, /turf/simulated/floor/carpet, +/area/awaycontent/a1{ + has_gravity = 1; + name = "MO19 Arrivals" + }) +"xB" = ( +/obj/effect/spawner/window/shuttle, +/turf/simulated/floor/plating, /area/awaycontent/a1{ has_gravity = 1; name = "MO19 Arrivals" @@ -13627,10 +13474,10 @@ aZ aZ aZ ld -lB -lB -lB -ne +xB +xB +xB +ld aZ aZ aZ @@ -13740,12 +13587,12 @@ aZ aZ aZ ld -lW +ld mq mH mW -nf -ne +ld +ld aZ aZ dA @@ -13853,13 +13700,13 @@ dA aZ aZ aZ -le +ld lX mc md mc ng -le +ld aZ aZ dA @@ -13967,13 +13814,13 @@ eU eT aZ aZ -le +ld lY mr ms mX lY -le +ld aZ aZ dA @@ -14081,13 +13928,13 @@ kc eT aZ aZ -lz -lZ -lD +ld +ld +ld mI -mY -lZ -no +ld +ld +ld aZ aZ dA @@ -14195,13 +14042,13 @@ fr eU aZ aZ -le +ld ma ms ms ms ma -le +ld aZ aZ dA @@ -14309,13 +14156,13 @@ gi eU hJ aZ -lA +ld mb md ms md nh -lA +ld aZ aZ dA @@ -14423,13 +14270,13 @@ kh km hJ aZ -lB +xB mc mt mJ mt mc -lB +xB aZ aZ dA @@ -14537,13 +14384,13 @@ jW kw is aZ -lC +ld md mu mK mu md -lC +ld aZ aZ aZ @@ -14651,13 +14498,13 @@ jW kv is aZ -lA +ld me mt mJ mt ni -lA +ld aZ aZ dA @@ -14765,13 +14612,13 @@ kl kw is aZ -lB +xB md md ms md md -lB +xB aZ aZ dA @@ -14879,14 +14726,14 @@ ku kx hJ ld -lD +ld mf mc ms mc mf -mY -ne +ld +ld aZ dA dA @@ -14992,7 +14839,7 @@ jw li kw is -le +ld lK lK mv @@ -15000,7 +14847,7 @@ ms mZ lK lK -le +ld aZ dA dA @@ -15106,15 +14953,15 @@ jI kW kv is -lf +ld lF mg -lD +ld mL -mY +ld lF mg -nw +ld aZ dA dA diff --git a/_maps/map_files/RandomZLevels/spacebattle.dmm b/_maps/map_files/RandomZLevels/spacebattle.dmm index 12bd63adda5..41249533907 100644 --- a/_maps/map_files/RandomZLevels/spacebattle.dmm +++ b/_maps/map_files/RandomZLevels/spacebattle.dmm @@ -6,11 +6,7 @@ /turf/space, /area/space) "ac" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 8; - icon_state = "diagonalWall3" - }, +/turf/simulated/wall/mineral/plastitanium, /area/awaymission/spacebattle/syndicate2) "ad" = ( /obj/structure/shuttle/engine/propulsion{ @@ -26,7 +22,7 @@ icon_state = "propulsion"; dir = 1 }, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/awaymission/spacebattle/syndicate2) "af" = ( /obj/structure/shuttle/engine/propulsion{ @@ -36,18 +32,6 @@ }, /turf/space, /area/awaymission/spacebattle/syndicate2) -"ag" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 1; - icon_state = "diagonalWall3" - }, -/area/awaymission/spacebattle/syndicate2) -"ah" = ( -/turf/simulated/shuttle/wall{ - icon_state = "wall3" - }, -/area/awaymission/spacebattle/syndicate2) "ai" = ( /obj/structure/shuttle/engine/heater{ tag = "icon-heater (NORTH)"; @@ -55,91 +39,63 @@ dir = 1 }, /obj/structure/window/reinforced, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/awaymission/spacebattle/syndicate2) "aj" = ( -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/spacebattle/syndicate2) "ak" = ( /obj/machinery/door/airlock/external, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/plating, /area/awaymission/spacebattle/syndicate2) "al" = ( /mob/living/simple_animal/hostile/syndicate/ranged, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/spacebattle/syndicate2) "am" = ( /obj/structure/table/reinforced, /obj/item/clothing/suit/space/hardsuit/syndi, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/spacebattle/syndicate2) "an" = ( /obj/structure/table/reinforced, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/spacebattle/syndicate2) "ao" = ( /obj/machinery/sleeper, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/spacebattle/syndicate2) "ap" = ( /obj/effect/landmark{ name = "awaystart" }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/spacebattle/syndicate2) "aq" = ( /mob/living/simple_animal/hostile/syndicate/melee, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/spacebattle/syndicate2) "ar" = ( -/obj/machinery/door/unpowered/shuttle, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/obj/machinery/door/airlock/titanium, +/turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/spacebattle/syndicate2) "as" = ( /obj/structure/table/reinforced, /obj/item/grenade/empgrenade, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/spacebattle/syndicate2) "at" = ( /obj/structure/table/reinforced, /obj/item/ammo_casing/c10mm, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/spacebattle/syndicate2) "au" = ( /obj/structure/table/reinforced, /obj/item/gun/projectile/automatic/c20r, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/spacebattle/syndicate2) "av" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 8; - icon_state = "diagonalWall3" - }, +/turf/simulated/wall/mineral/plastitanium, /area/awaymission/spacebattle/syndicate3) "aw" = ( /obj/structure/shuttle/engine/propulsion{ @@ -147,7 +103,7 @@ icon_state = "propulsion_r"; dir = 1 }, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/awaymission/spacebattle/syndicate3) "ax" = ( /obj/structure/shuttle/engine/propulsion{ @@ -155,7 +111,7 @@ icon_state = "propulsion"; dir = 1 }, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/awaymission/spacebattle/syndicate3) "ay" = ( /obj/structure/shuttle/engine/propulsion{ @@ -163,27 +119,13 @@ icon_state = "propulsion_l"; dir = 1 }, -/turf/simulated/shuttle/plating, -/area/awaymission/spacebattle/syndicate3) -"az" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 1; - icon_state = "diagonalWall3" - }, +/turf/simulated/floor/plating/airless, /area/awaymission/spacebattle/syndicate3) "aA" = ( /obj/structure/table/reinforced, /obj/item/gun/projectile/automatic/pistol, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/spacebattle/syndicate2) -"aB" = ( -/turf/simulated/shuttle/wall{ - icon_state = "wall3" - }, -/area/awaymission/spacebattle/syndicate3) "aC" = ( /obj/structure/shuttle/engine/heater{ tag = "icon-heater (NORTH)"; @@ -191,90 +133,41 @@ dir = 1 }, /obj/structure/window/reinforced, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/awaymission/spacebattle/syndicate3) "aD" = ( -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/spacebattle/syndicate3) "aE" = ( /obj/machinery/door/airlock/external, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/plating, /area/awaymission/spacebattle/syndicate3) "aF" = ( /obj/effect/landmark{ name = "awaystart" }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/spacebattle/syndicate3) -"aG" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - icon_state = "diagonalWall3" - }, -/area/awaymission/spacebattle/syndicate2) "aH" = ( /obj/structure/chair/comfy/shuttle, /mob/living/simple_animal/hostile/syndicate, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/awaymission/spacebattle/syndicate2) -"aI" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 4; - icon_state = "diagonalWall3" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/spacebattle/syndicate2) "aJ" = ( /obj/structure/table/reinforced, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/spacebattle/syndicate3) "aK" = ( /obj/structure/table/reinforced, /obj/item/gun/projectile/automatic/pistol/deagle, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/spacebattle/syndicate3) "aL" = ( /obj/machinery/computer/shuttle, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/awaymission/spacebattle/syndicate2) -"aM" = ( -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/turf/simulated/shuttle/wall{ - dir = 8; - icon_state = "diagonalWall3" - }, -/area/awaymission/spacebattle/syndicate2) -"aN" = ( -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/turf/simulated/shuttle/wall{ - dir = 1; - icon_state = "diagonalWall3" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/spacebattle/syndicate2) "aO" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 8; - icon_state = "diagonalWall3" - }, +/turf/simulated/wall/mineral/plastitanium, /area/awaymission/spacebattle/syndicate1) "aP" = ( /obj/structure/shuttle/engine/propulsion{ @@ -282,7 +175,7 @@ icon_state = "propulsion_r"; dir = 1 }, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/awaymission/spacebattle/syndicate1) "aQ" = ( /obj/structure/shuttle/engine/propulsion{ @@ -290,7 +183,7 @@ icon_state = "propulsion"; dir = 1 }, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/awaymission/spacebattle/syndicate1) "aR" = ( /obj/structure/shuttle/engine/propulsion{ @@ -298,30 +191,12 @@ icon_state = "propulsion_l"; dir = 1 }, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/awaymission/spacebattle/syndicate1) -"aS" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 1; - icon_state = "diagonalWall3" - }, -/area/awaymission/spacebattle/syndicate1) -"aT" = ( -/obj/machinery/door/airlock/external, -/turf/simulated/shuttle/plating, -/area/awaymission/spacebattle/syndicate2) "aU" = ( /obj/machinery/sleeper, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/spacebattle/syndicate3) -"aV" = ( -/turf/simulated/shuttle/wall{ - icon_state = "wall3" - }, -/area/awaymission/spacebattle/syndicate1) "aW" = ( /obj/structure/shuttle/engine/heater{ tag = "icon-heater (NORTH)"; @@ -329,7 +204,7 @@ dir = 1 }, /obj/structure/window/reinforced, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/awaymission/spacebattle/syndicate1) "aX" = ( /obj/structure/window/reinforced, @@ -356,39 +231,29 @@ /turf/simulated/floor/plating/airless, /area/awaymission/spacebattle/syndicate2) "aZ" = ( -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/spacebattle/syndicate1) "ba" = ( /obj/structure/chair/comfy/shuttle{ dir = 4 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/spacebattle/syndicate2) "bb" = ( /obj/structure/chair/comfy/shuttle{ dir = 8 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/spacebattle/syndicate2) "bc" = ( /obj/machinery/door/airlock/external, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/plating, /area/awaymission/spacebattle/syndicate1) "bd" = ( /obj/effect/landmark{ name = "awaystart" }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/spacebattle/syndicate1) "be" = ( /obj/machinery/porta_turret{ @@ -396,48 +261,36 @@ emagged = 1; installation = /obj/item/gun/energy/lasercannon }, -/turf/simulated/floor/plating, +/turf/simulated/floor/plating/airless, /area/awaymission/spacebattle/syndicate2) "bf" = ( -/obj/machinery/door/unpowered/shuttle, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/obj/machinery/door/airlock/titanium, +/turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/spacebattle/syndicate3) "bg" = ( /obj/structure/table/reinforced, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/spacebattle/syndicate1) "bi" = ( /obj/structure/table/reinforced, /obj/item/clothing/gloves/combat, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/spacebattle/syndicate1) "bj" = ( /obj/machinery/sleeper, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/spacebattle/syndicate1) "bk" = ( /obj/structure/table/reinforced, /obj/item/clothing/head/helmet/swat, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/spacebattle/syndicate3) "bl" = ( /obj/machinery/computer/pod{ id_tags = list("spacebattlepod3"); name = "Hull Door Control" }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/spacebattle/syndicate2) "bm" = ( /obj/machinery/door/poddoor{ @@ -446,71 +299,30 @@ name = "Front Hull Door"; opacity = 1 }, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating, /area/awaymission/spacebattle/syndicate2) "bn" = ( -/obj/machinery/door/unpowered/shuttle, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/obj/machinery/door/airlock/titanium, +/turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/spacebattle/syndicate1) "bo" = ( /obj/structure/table/reinforced, /obj/item/grenade/spawnergrenade/manhacks, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/spacebattle/syndicate1) -"bp" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - icon_state = "diagonalWall3" - }, -/area/awaymission/spacebattle/syndicate3) "bq" = ( /obj/structure/chair/comfy/shuttle, /mob/living/simple_animal/hostile/syndicate, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/awaymission/spacebattle/syndicate3) -"br" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 4; - icon_state = "diagonalWall3" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/spacebattle/syndicate3) "bs" = ( /obj/machinery/computer/shuttle, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/awaymission/spacebattle/syndicate3) -"bt" = ( -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/turf/simulated/shuttle/wall{ - dir = 8; - icon_state = "diagonalWall3" - }, -/area/awaymission/spacebattle/syndicate3) -"bu" = ( -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/turf/simulated/shuttle/wall{ - dir = 1; - icon_state = "diagonalWall3" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/spacebattle/syndicate3) "bv" = ( /obj/structure/table/reinforced, /obj/item/clothing/head/helmet/swat, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/spacebattle/syndicate1) "bw" = ( /obj/machinery/porta_turret{ @@ -518,51 +330,16 @@ emagged = 1; installation = /obj/item/gun/energy/lasercannon }, -/turf/simulated/floor/plating, +/turf/simulated/floor/plating/airless, /area/awaymission/spacebattle/syndicate3) -"bx" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - icon_state = "diagonalWall3" - }, -/area/awaymission/spacebattle/syndicate1) "by" = ( /obj/structure/chair/comfy/shuttle, /mob/living/simple_animal/hostile/syndicate, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/awaymission/spacebattle/syndicate1) -"bz" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 4; - icon_state = "diagonalWall3" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/spacebattle/syndicate1) "bA" = ( /obj/machinery/computer/shuttle, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/awaymission/spacebattle/syndicate1) -"bB" = ( -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/turf/simulated/shuttle/wall{ - dir = 8; - icon_state = "diagonalWall3" - }, -/area/awaymission/spacebattle/syndicate1) -"bC" = ( -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/turf/simulated/shuttle/wall{ - dir = 1; - icon_state = "diagonalWall3" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/spacebattle/syndicate1) "bD" = ( /obj/machinery/porta_turret{ @@ -570,14 +347,10 @@ emagged = 1; installation = /obj/item/gun/energy/lasercannon }, -/turf/simulated/floor/plating, +/turf/simulated/floor/plating/airless, /area/awaymission/spacebattle/syndicate1) "bE" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 8; - icon_state = "diagonalWall3" - }, +/turf/simulated/wall/mineral/plastitanium, /area/awaymission/spacebattle/cruiser) "bF" = ( /obj/structure/shuttle/engine/propulsion{ @@ -585,11 +358,11 @@ icon_state = "propulsion_r"; dir = 1 }, -/turf/space, +/turf/simulated/floor/plating/airless, /area/awaymission/spacebattle/cruiser) "bG" = ( /obj/machinery/door/airlock/external, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating, /area/awaymission/spacebattle/cruiser) "bH" = ( /obj/structure/shuttle/engine/propulsion{ @@ -597,19 +370,7 @@ icon_state = "propulsion_l"; dir = 1 }, -/turf/space, -/area/awaymission/spacebattle/cruiser) -"bI" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 1; - icon_state = "diagonalWall3" - }, -/area/awaymission/spacebattle/cruiser) -"bJ" = ( -/turf/simulated/shuttle/wall{ - icon_state = "wall3" - }, +/turf/simulated/floor/plating/airless, /area/awaymission/spacebattle/cruiser) "bK" = ( /obj/structure/window/reinforced, @@ -624,9 +385,7 @@ /turf/simulated/floor/plating/airless, /area/awaymission/spacebattle/cruiser) "bL" = ( -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/spacebattle/cruiser) "bM" = ( /obj/structure/window/reinforced, @@ -644,53 +403,16 @@ /obj/structure/chair/comfy/shuttle{ dir = 4 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/spacebattle/cruiser) "bO" = ( /obj/structure/chair/comfy/shuttle{ dir = 8 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/spacebattle/cruiser) "bP" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - tag = "icon-swall_f6"; - icon_state = "swall_f6"; - dir = 2 - }, -/area/awaymission/spacebattle/cruiser) -"bQ" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall12"; - icon_state = "swall12"; - dir = 2 - }, -/area/awaymission/spacebattle/cruiser) -"bR" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall14"; - icon_state = "swall14" - }, -/area/awaymission/spacebattle/cruiser) -"bS" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall12"; - icon_state = "swall12" - }, -/area/awaymission/spacebattle/cruiser) -"bT" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 3; - icon_state = "swall_f10"; - layer = 2; - tag = "icon-swall_f10" - }, +/turf/simulated/wall/mineral/titanium, /area/awaymission/spacebattle/cruiser) "bU" = ( /obj/structure/shuttle/engine/propulsion{ @@ -698,7 +420,7 @@ icon_state = "burst_l"; dir = 4 }, -/turf/space, +/turf/simulated/floor/plating/airless, /area/awaymission/spacebattle/cruiser) "bV" = ( /obj/structure/shuttle/engine/heater{ @@ -709,10 +431,7 @@ /obj/structure/window/reinforced{ dir = 4 }, -/turf/simulated/floor/plasteel{ - tag = "icon-engine"; - icon_state = "engine" - }, +/turf/simulated/floor/plating/airless, /area/awaymission/spacebattle/cruiser) "bX" = ( /obj/effect/landmark/damageturf, @@ -723,41 +442,27 @@ id_tags = list("spacebattlepod"); name = "Hull Door Control" }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/spacebattle/cruiser) "bZ" = ( /turf/simulated/floor/plasteel, /area/awaymission/spacebattle/cruiser) "ca" = ( -/obj/machinery/door/unpowered/shuttle, +/obj/machinery/door/airlock/titanium, /turf/simulated/floor/plasteel, /area/awaymission/spacebattle/cruiser) -"cb" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall3"; - icon_state = "swall3" - }, -/area/awaymission/spacebattle/cruiser) "cc" = ( /obj/structure/shuttle/engine/propulsion{ tag = "icon-propulsion (EAST)"; icon_state = "propulsion"; dir = 4 }, -/turf/space, +/turf/simulated/floor/plating/airless, /area/awaymission/spacebattle/cruiser) "cd" = ( /obj/structure/table/reinforced, /turf/simulated/floor/plasteel, /area/awaymission/spacebattle/cruiser) -"ce" = ( -/turf/simulated/floor/plasteel, -/turf/simulated/shuttle/wall{ - icon_state = "diagonalWall3" - }, -/area/awaymission/spacebattle/cruiser) "cf" = ( /obj/machinery/door/poddoor{ density = 0; @@ -767,14 +472,7 @@ opacity = 1; tag = "icon-pdoor0" }, -/turf/simulated/shuttle/plating, -/area/awaymission/spacebattle/cruiser) -"cg" = ( -/turf/simulated/floor/plasteel, -/turf/simulated/shuttle/wall{ - dir = 4; - icon_state = "diagonalWall3" - }, +/turf/simulated/floor/plating, /area/awaymission/spacebattle/cruiser) "ch" = ( /mob/living/simple_animal/hostile/syndicate/melee/space, @@ -817,24 +515,6 @@ /obj/effect/decal/cleanable/blood, /turf/simulated/floor/plasteel, /area/awaymission/spacebattle/cruiser) -"cp" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall7"; - icon_state = "swall7" - }, -/area/awaymission/spacebattle/cruiser) -"cq" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swallc1"; - icon_state = "swallc1" - }, -/area/awaymission/spacebattle/cruiser) -"cr" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swallc2"; - icon_state = "swallc2" - }, -/area/awaymission/spacebattle/cruiser) "cs" = ( /obj/machinery/power/smes/magical{ desc = "A high-capacity superconducting magnetic energy storage (SMES) unit."; @@ -927,7 +607,7 @@ }, /area/awaymission/spacebattle/cruiser) "cG" = ( -/obj/machinery/door/unpowered/shuttle, +/obj/machinery/door/airlock/titanium, /turf/simulated/floor/plating, /area/awaymission/spacebattle/cruiser) "cH" = ( @@ -962,12 +642,6 @@ /obj/item/stack/sheet/metal, /turf/simulated/floor/plasteel, /area/awaymission/spacebattle/cruiser) -"cO" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swallc3"; - icon_state = "swallc3" - }, -/area/awaymission/spacebattle/cruiser) "cP" = ( /obj/effect/mob_spawn/human/engineer{ name = "Bill Sanchez" @@ -976,7 +650,7 @@ /turf/simulated/floor/plasteel, /area/awaymission/spacebattle/cruiser) "cQ" = ( -/obj/machinery/door/unpowered/shuttle, +/obj/machinery/door/airlock/titanium, /turf/simulated/floor/plasteel{ icon_state = "cafeteria"; dir = 2 @@ -992,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 @@ -1010,16 +684,7 @@ /turf/simulated/floor/plasteel, /area/awaymission/spacebattle/cruiser) "cV" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/awaymission/spacebattle/cruiser) "cW" = ( @@ -1039,20 +704,7 @@ id_tags = list("spacebattlepod2"); name = "Hull Door Control" }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/awaymission/spacebattle/cruiser) -"da" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced, -/turf/simulated/floor/plating, +/turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/spacebattle/cruiser) "db" = ( /obj/machinery/shieldgen{ @@ -1066,7 +718,7 @@ icon_state = "propulsion_r"; dir = 4 }, -/turf/space, +/turf/simulated/floor/plating/airless, /area/awaymission/spacebattle/cruiser) "dd" = ( /obj/effect/mob_spawn/human/engineer{ @@ -1108,20 +760,6 @@ icon_state = "bar" }, /area/awaymission/spacebattle/cruiser) -"dl" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall7"; - icon_state = "swall7"; - dir = 2 - }, -/area/awaymission/spacebattle/cruiser) -"dm" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall11"; - icon_state = "swall11"; - dir = 2 - }, -/area/awaymission/spacebattle/cruiser) "dn" = ( /obj/effect/mob_spawn/human/corpse/syndicatesoldier, /obj/item/gun/projectile/automatic/c20r, @@ -1137,34 +775,11 @@ opacity = 1; tag = "icon-pdoor0" }, -/turf/simulated/shuttle/plating, -/area/awaymission/spacebattle/cruiser) -"dq" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - tag = "icon-swall_f5"; - icon_state = "swall_f5"; - dir = 2 - }, +/turf/simulated/floor/plating, /area/awaymission/spacebattle/cruiser) "dr" = ( /obj/effect/decal/cleanable/blood, -/turf/simulated/shuttle/wall{ - tag = "icon-swall12"; - icon_state = "swall12" - }, -/area/awaymission/spacebattle/cruiser) -"ds" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall15"; - icon_state = "swall15" - }, -/area/awaymission/spacebattle/cruiser) -"dt" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall11"; - icon_state = "swall11" - }, +/turf/simulated/wall/mineral/titanium, /area/awaymission/spacebattle/cruiser) "du" = ( /obj/effect/mob_spawn/human/cook{ @@ -1216,38 +831,7 @@ /turf/simulated/floor/plating/airless, /area/awaymission/spacebattle/cruiser) "dC" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor/engine, -/area/awaymission/spacebattle/cruiser) -"dD" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced, -/turf/simulated/floor/engine, -/area/awaymission/spacebattle/cruiser) -"dE" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/floor/engine, -/area/awaymission/spacebattle/cruiser) -"dF" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/engine, /area/awaymission/spacebattle/cruiser) "dH" = ( @@ -1336,16 +920,6 @@ /obj/effect/decal/cleanable/blood, /turf/simulated/floor/plating/airless, /area/awaymission/spacebattle/cruiser) -"dW" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor/engine, -/area/awaymission/spacebattle/cruiser) "dX" = ( /obj/machinery/porta_turret{ dir = 8; @@ -1354,16 +928,6 @@ }, /turf/simulated/floor/engine, /area/awaymission/spacebattle/cruiser) -"dZ" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/awaymission/spacebattle/cruiser) "ea" = ( /obj/machinery/gateway{ dir = 9 @@ -1409,17 +973,6 @@ dir = 4 }, /area/awaymission/spacebattle/cruiser) -"ei" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor/engine, -/area/awaymission/spacebattle/cruiser) "ej" = ( /turf/simulated/floor/engine, /area/awaymission/spacebattle/cruiser) @@ -1450,23 +1003,7 @@ }, /area/awaymission/spacebattle/cruiser) "eo" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 8; - icon_state = "diagonalWall3" - }, -/area/awaymission/spacebattle/syndicate4) -"ep" = ( -/turf/simulated/shuttle/wall{ - icon_state = "wall3" - }, -/area/awaymission/spacebattle/syndicate4) -"eq" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 1; - icon_state = "diagonalWall3" - }, +/turf/simulated/wall/mineral/plastitanium, /area/awaymission/spacebattle/syndicate4) "er" = ( /obj/machinery/gateway{ @@ -1513,13 +1050,6 @@ dir = 4 }, /area/awaymission/spacebattle/cruiser) -"ez" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall3"; - icon_state = "swall3"; - dir = 2 - }, -/area/awaymission/spacebattle/cruiser) "eA" = ( /obj/structure/table/reinforced, /turf/simulated/floor/plasteel{ @@ -1541,19 +1071,6 @@ icon_state = "bluefull" }, /area/awaymission/spacebattle/cruiser) -"eD" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/awaymission/spacebattle/cruiser) "eE" = ( /mob/living/simple_animal/hostile/syndicate/melee/space, /turf/simulated/floor/plating/airless, @@ -1565,29 +1082,12 @@ /obj/effect/decal/cleanable/blood, /turf/simulated/floor/plating/airless, /area/awaymission/spacebattle/cruiser) -"eG" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall13"; - icon_state = "swall13"; - dir = 2 - }, -/area/awaymission/spacebattle/cruiser) -"eH" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swallc4"; - icon_state = "swallc4" - }, -/area/awaymission/spacebattle/cruiser) "eI" = ( -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/spacebattle/syndicate4) "eJ" = ( /obj/machinery/computer/shuttle, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/spacebattle/syndicate4) "eK" = ( /turf/simulated/floor/plasteel{ @@ -1612,30 +1112,16 @@ icon_state = "bluefull" }, /area/awaymission/spacebattle/cruiser) -"eO" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/awaymission/spacebattle/cruiser) "eP" = ( /obj/machinery/sleeper, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/spacebattle/syndicate4) "eQ" = ( /obj/structure/chair/comfy/shuttle{ dir = 1 }, /mob/living/simple_animal/hostile/syndicate, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/spacebattle/syndicate4) "eR" = ( /obj/structure/closet/crate, @@ -1734,16 +1220,14 @@ /area/awaymission/spacebattle/cruiser) "fh" = ( /obj/machinery/computer/security/telescreen, -/turf/simulated/shuttle/wall, +/turf/simulated/wall/mineral/titanium, /area/awaymission/spacebattle/cruiser) "fi" = ( /turf/space, /area/awaymission/spacebattle/cruiser) "fj" = ( /obj/machinery/door/airlock/external, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/plating, /area/awaymission/spacebattle/syndicate4) "fk" = ( /obj/structure/closet/crate, @@ -1846,7 +1330,7 @@ /area/awaymission/spacebattle/cruiser) "fG" = ( /obj/structure/closet/crate/internals, -/obj/item/tank/emergency_oxygen, +/obj/item/tank/internals/emergency_oxygen, /obj/item/storage/firstaid/o2, /turf/simulated/floor/plating, /area/awaymission/spacebattle/cruiser) @@ -1918,17 +1402,6 @@ /obj/effect/decal/cleanable/blood, /turf/simulated/floor/plasteel, /area/awaymission/spacebattle/cruiser) -"gm" = ( -/obj/structure/shuttle/engine/heater{ - tag = "icon-heater (WEST)"; - icon_state = "heater"; - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/shuttle/plating, -/area/awaymission/spacebattle/cruiser) "gn" = ( /obj/structure/closet/crate/secure/weapon, /obj/item/ammo_casing/a357, @@ -2006,31 +1479,11 @@ /obj/item/gun/projectile/shotgun/automatic/combat, /turf/simulated/floor/plasteel, /area/awaymission/spacebattle/cruiser) -"gz" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - icon_state = "diagonalWall3" - }, -/area/awaymission/spacebattle/syndicate4) -"gA" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 4; - icon_state = "diagonalWall3" - }, -/area/awaymission/spacebattle/syndicate4) "gB" = ( /obj/structure/closet/crate/secure/weapon, /obj/item/gun/energy/laser, /turf/simulated/floor/plating, /area/awaymission/spacebattle/cruiser) -"gD" = ( -/obj/effect/decal/cleanable/blood, -/turf/simulated/shuttle/wall{ - tag = "icon-swall3"; - icon_state = "swall3" - }, -/area/awaymission/spacebattle/cruiser) "gE" = ( /obj/effect/mob_spawn/human/doctor{ name = "Adam Smith" @@ -2081,18 +1534,14 @@ /turf/simulated/floor/plating/airless, /area/awaymission/spacebattle/syndicate7) "gM" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 1; - icon_state = "diagonalWall3" - }, +/turf/simulated/wall/mineral/plastitanium, /area/awaymission/spacebattle/syndicate7) "gN" = ( /obj/structure/shuttle/engine/heater, /obj/structure/window/reinforced{ dir = 1 }, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/awaymission/spacebattle/syndicate4) "gO" = ( /obj/structure/reagent_dispensers/beerkeg, @@ -2139,32 +1588,9 @@ icon_state = "blue" }, /area/awaymission/spacebattle/cruiser) -"gV" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced, -/turf/simulated/floor/plating, -/area/awaymission/spacebattle/cruiser) -"gW" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 8; - icon_state = "diagonalWall3" - }, -/area/awaymission/spacebattle/syndicate7) -"gX" = ( -/turf/simulated/shuttle/wall{ - icon_state = "wall3" - }, -/area/awaymission/spacebattle/syndicate7) "gY" = ( /obj/structure/shuttle/engine/propulsion, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/awaymission/spacebattle/syndicate4) "gZ" = ( /obj/item/pickaxe, @@ -2191,28 +1617,15 @@ /turf/simulated/floor/plating/airless, /area/awaymission/spacebattle/cruiser) "hd" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, +/obj/effect/spawner/window/plastitanium, /turf/simulated/floor/plating, /area/awaymission/spacebattle/syndicate7) "he" = ( /obj/structure/table/reinforced, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/spacebattle/syndicate7) "hf" = ( -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/spacebattle/syndicate7) "hg" = ( /obj/structure/shuttle/engine/heater{ @@ -2223,7 +1636,7 @@ /obj/structure/window/reinforced{ dir = 8 }, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/awaymission/spacebattle/syndicate7) "hh" = ( /obj/structure/shuttle/engine/propulsion{ @@ -2231,7 +1644,7 @@ icon_state = "propulsion_l"; tag = "icon-propulsion_l (WEST)" }, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/awaymission/spacebattle/syndicate7) "hi" = ( /obj/structure/largecrate, @@ -2239,7 +1652,7 @@ /area/awaymission/spacebattle/cruiser) "hj" = ( /obj/structure/closet/crate/secure/plasma, -/obj/item/tank/plasma, +/obj/item/tank/internals/plasma, /turf/simulated/floor/plating, /area/awaymission/spacebattle/cruiser) "hk" = ( @@ -2252,42 +1665,6 @@ /obj/item/clothing/suit/space/hardsuit, /turf/simulated/floor/plasteel, /area/awaymission/spacebattle/cruiser) -"hn" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/floor/engine, -/area/awaymission/spacebattle/cruiser) -"ho" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/floor/engine, -/area/awaymission/spacebattle/cruiser) -"hp" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/awaymission/spacebattle/syndicate7) "hr" = ( /obj/structure/largecrate, /mob/living/simple_animal/pet/dog/corgi/puppy, @@ -2300,11 +1677,11 @@ /area/awaymission/spacebattle/cruiser) "ht" = ( /obj/structure/closet/crate/medical, -/obj/item/tank/anesthetic, +/obj/item/tank/internals/anesthetic, /turf/simulated/floor/plating, /area/awaymission/spacebattle/cruiser) "hu" = ( -/obj/machinery/door/unpowered/shuttle, +/obj/machinery/door/airlock/titanium, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -2322,30 +1699,6 @@ icon_state = "white" }, /area/awaymission/spacebattle/cruiser) -"hy" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/floor/engine, -/area/awaymission/spacebattle/cruiser) -"hz" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 4; - icon_state = "diagonalWall3" - }, -/area/awaymission/spacebattle/syndicate7) -"hA" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall14"; - icon_state = "swall14"; - dir = 2 - }, -/area/awaymission/spacebattle/cruiser) "hB" = ( /obj/structure/table/reinforced, /turf/simulated/floor/plasteel{ @@ -2367,35 +1720,6 @@ }, /turf/simulated/floor/plasteel, /area/awaymission/spacebattle/cruiser) -"hG" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor/engine, -/area/awaymission/spacebattle/cruiser) -"hH" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/floor/engine, -/area/awaymission/spacebattle/cruiser) -"hI" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/turf/simulated/floor/engine, -/area/awaymission/spacebattle/cruiser) -"hJ" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/floor/engine, -/area/awaymission/spacebattle/cruiser) "hK" = ( /obj/effect/mob_spawn/human/engineer{ name = "Javier Wismer" @@ -2404,24 +1728,18 @@ /area/awaymission/spacebattle/cruiser) "hL" = ( /obj/machinery/computer/shuttle, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/spacebattle/syndicate7) "hM" = ( /obj/structure/chair/comfy/shuttle{ dir = 8 }, /mob/living/simple_animal/hostile/syndicate, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/spacebattle/syndicate7) "hN" = ( /obj/machinery/door/airlock/external, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/plating, /area/awaymission/spacebattle/syndicate7) "hO" = ( /obj/machinery/shower{ @@ -2462,26 +1780,12 @@ icon_state = "white" }, /area/awaymission/spacebattle/cruiser) -"hT" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - tag = "icon-swall_f9"; - icon_state = "swall_f9"; - dir = 2 - }, -/area/awaymission/spacebattle/cruiser) "hU" = ( -/obj/machinery/door/unpowered/shuttle, +/obj/machinery/door/airlock/titanium, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, /area/awaymission/spacebattle/cruiser) -"hV" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall1"; - icon_state = "swall1" - }, -/area/awaymission/spacebattle/cruiser) "hW" = ( /obj/item/storage/firstaid/regular, /turf/simulated/floor/plasteel{ @@ -2555,12 +1859,6 @@ icon_state = "white" }, /area/awaymission/spacebattle/cruiser) -"ig" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - icon_state = "diagonalWall3" - }, -/area/awaymission/spacebattle/syndicate7) "ih" = ( /obj/structure/sink{ dir = 4; @@ -2613,233 +1911,109 @@ /turf/space, /area/space/nearstation) "is" = ( -/turf/simulated/shuttle/wall{ - icon_state = "wall3" - }, -/area/space/nearstation) -"it" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 1; - icon_state = "diagonalWall3" - }, +/turf/simulated/wall/mineral/plastitanium, /area/space/nearstation) "iu" = ( /obj/machinery/sleeper, -/turf/simulated/floor/plasteel/airless{ - tag = "icon-floor4 (SOUTHWEST)"; - icon_state = "floor4"; - dir = 10 - }, +/turf/simulated/floor/mineral/plastitanium/red/airless, /area/space/nearstation) "iv" = ( -/turf/simulated/floor/plasteel/airless{ - tag = "icon-floor4 (SOUTHWEST)"; - icon_state = "floor4"; - dir = 10 - }, +/turf/simulated/floor/mineral/plastitanium/red/airless, /area/space/nearstation) "iw" = ( /obj/effect/mob_spawn/human/corpse/syndicatesoldier, -/turf/simulated/floor/plasteel/airless{ - tag = "icon-floor4 (SOUTHWEST)"; - icon_state = "floor4"; - dir = 10 - }, +/turf/simulated/floor/mineral/plastitanium/red/airless, /area/space/nearstation) "ix" = ( /obj/machinery/door/airlock/external, -/turf/simulated/floor/plasteel/airless{ - tag = "icon-floor4 (SOUTHWEST)"; - icon_state = "floor4"; - dir = 10 - }, +/turf/simulated/floor/plating/airless, /area/space/nearstation) "iy" = ( /obj/item/stack/rods, -/turf/simulated/floor/plasteel/airless{ - tag = "icon-floor4 (SOUTHWEST)"; - icon_state = "floor4"; - dir = 10 - }, +/turf/simulated/floor/mineral/plastitanium/red/airless, /area/space/nearstation) "iz" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 8; - icon_state = "diagonalWall3" - }, +/turf/simulated/wall/mineral/plastitanium, /area/awaymission/spacebattle/syndicate5) -"iA" = ( -/turf/simulated/shuttle/wall{ - icon_state = "wall3" - }, -/area/awaymission/spacebattle/syndicate5) -"iB" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 1; - icon_state = "diagonalWall3" - }, -/area/awaymission/spacebattle/syndicate5) -"iC" = ( -/obj/machinery/sleeper, -/turf/simulated/floor/plasteel/airless, -/area/space/nearstation) "iD" = ( -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/spacebattle/syndicate5) "iE" = ( /obj/machinery/computer/shuttle, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/spacebattle/syndicate5) -"iF" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - icon_state = "diagonalWall3" - }, -/area/space/nearstation) -"iG" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 4; - icon_state = "diagonalWall3" - }, -/area/space/nearstation) "iH" = ( /obj/machinery/sleeper, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/spacebattle/syndicate5) "iI" = ( /obj/structure/chair/comfy/shuttle{ dir = 1 }, /mob/living/simple_animal/hostile/syndicate, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/spacebattle/syndicate5) "iJ" = ( /obj/structure/shuttle/engine/heater, /obj/structure/window/reinforced{ dir = 1 }, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/space/nearstation) "iK" = ( /obj/structure/shuttle/engine/propulsion, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/space/nearstation) "iL" = ( /obj/machinery/door/airlock/external, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/awaymission/spacebattle/syndicate5) -"iM" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - icon_state = "diagonalWall3" - }, -/area/awaymission/spacebattle/syndicate5) -"iN" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 4; - icon_state = "diagonalWall3" - }, +/turf/simulated/floor/plating, /area/awaymission/spacebattle/syndicate5) "iO" = ( /obj/structure/shuttle/engine/heater, /obj/structure/window/reinforced{ dir = 1 }, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/awaymission/spacebattle/syndicate5) "iP" = ( /obj/structure/shuttle/engine/propulsion, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/awaymission/spacebattle/syndicate5) "iQ" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 8; - icon_state = "diagonalWall3" - }, -/area/awaymission/spacebattle/syndicate6) -"iR" = ( -/turf/simulated/shuttle/wall{ - icon_state = "wall3" - }, -/area/awaymission/spacebattle/syndicate6) -"iS" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 1; - icon_state = "diagonalWall3" - }, +/turf/simulated/wall/mineral/plastitanium, /area/awaymission/spacebattle/syndicate6) "iT" = ( -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/spacebattle/syndicate6) "iU" = ( /obj/machinery/computer/shuttle, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/spacebattle/syndicate6) "iV" = ( /obj/machinery/sleeper, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/spacebattle/syndicate6) "iW" = ( /obj/structure/chair/comfy/shuttle{ dir = 1 }, /mob/living/simple_animal/hostile/syndicate, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/spacebattle/syndicate6) "iX" = ( /obj/machinery/door/airlock/external, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/awaymission/spacebattle/syndicate6) -"iY" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - icon_state = "diagonalWall3" - }, -/area/awaymission/spacebattle/syndicate6) -"iZ" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 4; - icon_state = "diagonalWall3" - }, +/turf/simulated/floor/plating, /area/awaymission/spacebattle/syndicate6) "ja" = ( /obj/structure/shuttle/engine/heater, /obj/structure/window/reinforced{ dir = 1 }, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/awaymission/spacebattle/syndicate6) "jb" = ( /obj/structure/shuttle/engine/propulsion, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/awaymission/spacebattle/syndicate6) "jc" = ( /turf/simulated/floor/plating/asteroid/airless, @@ -2857,37 +2031,13 @@ /obj/machinery/door/airlock/plasma, /turf/simulated/wall/mineral/plasma, /area/awaymission/spacebattle/secret) -"nG" = ( -/obj/structure/window/reinforced, -/obj/structure/shuttle/engine/heater{ - tag = "icon-heater (NORTH)"; - icon_state = "heater"; - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/shuttle/plating, -/area/awaymission/spacebattle/cruiser) -"qC" = ( -/obj/structure/window/reinforced, -/obj/structure/shuttle/engine/heater{ - tag = "icon-heater (NORTH)"; - icon_state = "heater"; - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/shuttle/plating, -/area/awaymission/spacebattle/cruiser) "zS" = ( /obj/structure/shuttle/engine/propulsion{ dir = 4; icon_state = "propulsion_l"; tag = "icon-propulsion_l (WEST)" }, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/space/nearstation) "Jj" = ( /obj/structure/shuttle/engine/propulsion{ @@ -2895,7 +2045,7 @@ icon_state = "propulsion_l"; dir = 1 }, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/awaymission/spacebattle/syndicate2) "Jw" = ( /obj/structure/shuttle/engine/propulsion{ @@ -2903,31 +2053,15 @@ icon_state = "propulsion_r"; dir = 1 }, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/awaymission/spacebattle/syndicate2) -"JS" = ( -/obj/structure/shuttle/engine/propulsion{ - tag = "icon-propulsion_l (NORTH)"; - icon_state = "propulsion_l"; - dir = 1 - }, -/turf/simulated/shuttle/plating, -/area/awaymission/spacebattle/cruiser) -"JW" = ( -/obj/structure/shuttle/engine/propulsion{ - tag = "icon-propulsion_r (NORTH)"; - icon_state = "propulsion_r"; - dir = 1 - }, -/turf/simulated/shuttle/plating, -/area/awaymission/spacebattle/cruiser) "YV" = ( /obj/structure/shuttle/engine/propulsion{ dir = 8; icon_state = "burst_r"; tag = "icon-burst_r (EAST)" }, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/awaymission/spacebattle/cruiser) (1,1,1) = {" @@ -15649,13 +14783,13 @@ ab ab ab eo -ep -ep +eo +eo fj fj -ep -ep -gz +eo +eo +eo ab ab ab @@ -15905,15 +15039,15 @@ ab ab ab eo -ep +eo eI eI eI eI eI eP -ep -gz +eo +eo ab ab ab @@ -16161,7 +15295,7 @@ ab ab ab eo -ep +eo eP eI eI @@ -16170,8 +15304,8 @@ eI eI eI eP -ep -gz +eo +eo ab ab ab @@ -16417,7 +15551,7 @@ ab ab ab ab -ep +eo eI eI eI @@ -16428,8 +15562,8 @@ eI eI eI eP -ep -gz +eo +eo ab ab ab @@ -16674,7 +15808,7 @@ ab ab ab ab -ep +eo eJ eQ eI @@ -16931,7 +16065,7 @@ ab ab ab ab -ep +eo eI eI eI @@ -17188,7 +16322,7 @@ ab ab ab ab -ep +eo eI eI eI @@ -17445,7 +16579,7 @@ ab ab ab ab -ep +eo eJ eQ eI @@ -17702,7 +16836,7 @@ ab ab ab ab -ep +eo eI eI eI @@ -17713,8 +16847,8 @@ eI eI eI eP -ep -gA +eo +eo ab ab ab @@ -17959,8 +17093,8 @@ ab ab ab ab -eq -ep +eo +eo eP eI eI @@ -17969,8 +17103,8 @@ eI eI eI eP -ep -gA +eo +eo ab ab ab @@ -18217,16 +17351,16 @@ ab ab ab ab -eq -ep +eo +eo eI eI eI eI eI eP -ep -gA +eo +eo ab ab ab @@ -18475,14 +17609,14 @@ ab ab ab ab -eq -ep -ep +eo +eo +eo fj fj -ep -ep -gA +eo +eo +eo ab ab ab @@ -21223,29 +20357,29 @@ ab ab ab aO -aV -aV +aO +aO bc bc -aV -aV -aV -aV -aV -aV -aV -aV -aV -aV -aV -aV -aV -aV -aV -aV -aV -aV -bx +aO +aO +aO +aO +aO +aO +aO +aO +aO +aO +aO +aO +aO +aO +aO +aO +aO +aO +aO ab ab ab @@ -21342,13 +20476,13 @@ ab ab ab iz -iA -iA +iz +iz iL iL -iA -iA -iM +iz +iz +iz ab ab ab @@ -21485,26 +20619,26 @@ aZ aZ aZ bg -aV +aO bj aZ bj aZ bj aZ -aV +aO bg bo bo bg bg bv -aV +aO bj bj -aV -aV -bx +aO +aO +aO ab ab ab @@ -21553,7 +20687,7 @@ cc cc cc dc -dq +bP ab ab ab @@ -21582,7 +20716,7 @@ YV YV YV YV -dq +bP ab ab ab @@ -21598,15 +20732,15 @@ ab ab ab iz -iA +iz iD iD iD iD iD iH -iA -iM +iz +iz ab ab ab @@ -21742,30 +20876,30 @@ aZ aZ aZ bg -aV +aO aZ aZ aZ aZ aZ aZ -aV +aO bg aZ aZ aZ aZ aZ -aV +aO aZ aZ by bA -aV -aV -aV -aV -bx +aO +aO +aO +aO +aO ab ab ab @@ -21800,7 +20934,7 @@ ab ab ab ab -bQ +bP bV bV bV @@ -21810,7 +20944,7 @@ bV bV bV bV -bS +bP ab ab ab @@ -21829,17 +20963,17 @@ ab ab ab ab -bS -gm -gm -gm -gm -gm -gm -gm -gm -gm -bQ +bP +bV +bV +bV +bV +bV +bV +bV +bV +bV +bP ab ab ab @@ -21854,7 +20988,7 @@ ab ab ab iz -iA +iz iH iD iD @@ -21863,8 +20997,8 @@ iD iD iD iH -iA -iM +iz +iz ab ab ab @@ -21999,29 +21133,29 @@ aZ aZ aZ bg -aV +aO aZ aZ aZ aZ aZ aZ -aV +aO bg aZ aZ aZ aZ aZ -aV +aO aZ aZ by bA -aV -aV -aV -aV +aO +aO +aO +aO bD ab ab @@ -22057,7 +21191,7 @@ ab ab ab ab -bQ +bP bZ cd cd @@ -22067,7 +21201,7 @@ cs cd cd cd -bS +bP ab ab ab @@ -22086,7 +21220,7 @@ ab ab ab ab -bS +bP cd cd cd @@ -22096,7 +21230,7 @@ cs cd cd bZ -bQ +bP ab ab ab @@ -22110,7 +21244,7 @@ ab ab ab ab -iA +iz iD iD iD @@ -22121,8 +21255,8 @@ iD iD iD iH -iA -iM +iz +iz ab ab ab @@ -22256,31 +21390,31 @@ aZ aZ aZ bg -aV +aO aZ aZ aZ aZ aZ aZ -aV +aO bg aZ aZ aZ aZ aZ -aV +aO aZ aZ aZ -bB -aV -aV -aV -aV -aV -bx +aO +aO +aO +aO +aO +aO +aO ab ab ab @@ -22314,7 +21448,7 @@ ab ab ab ab -bQ +bP bX bZ bZ @@ -22324,7 +21458,7 @@ bZ bZ cN bZ -bS +bP ab ab ab @@ -22343,7 +21477,7 @@ ab ab ab ab -bS +bP bZ bZ bZ @@ -22353,7 +21487,7 @@ bZ bZ bZ ip -bQ +bP ab ab ab @@ -22367,7 +21501,7 @@ ab ab ab ab -iA +iz iE iI iD @@ -22513,25 +21647,25 @@ aZ aZ aZ bg -aV +aO bj aZ bj aZ aZ aZ -aV +aO bg bg bg bg aZ aZ -aV +aO aZ aZ aZ -aV +aO ab ab ab @@ -22565,15 +21699,15 @@ ab ab ab bE -bJ -bJ -bJ -bJ -bJ -bJ -bJ -bJ -ce +bE +bE +bE +bE +bE +bE +bE +bE +bE bZ bX bZ @@ -22600,7 +21734,7 @@ ab ab ab ab -bS +bP bZ bZ bZ @@ -22610,7 +21744,7 @@ bZ bZ bZ bZ -bQ +bP ab ab ab @@ -22624,7 +21758,7 @@ ab ab ab ab -iA +iz iD iD iD @@ -22770,25 +21904,25 @@ aZ aZ aZ bg -aV -aV -aV -aV -aV +aO +aO +aO +aO +aO bn bn -aV -aV -aV -aV -aV +aO +aO +aO +aO +aO bn bn -aV +aO aZ aZ aZ -aV +aO ab ab ab @@ -22830,15 +21964,15 @@ bN bN bL bY -bJ -ce +bE +bE bZ cI bZ bZ co co -bS +bP ab ab ab @@ -22857,7 +21991,7 @@ ab ab ab ab -bS +bP bZ bZ bZ @@ -22867,7 +22001,7 @@ bZ bZ bZ bZ -bQ +bP ab ab ab @@ -22881,7 +22015,7 @@ ab ab ab ab -iA +iz iD iD iD @@ -23095,7 +22229,7 @@ bZ cN bZ de -bS +bP ab ab ab @@ -23114,7 +22248,7 @@ ab ab ab ab -bS +bP de bZ bZ @@ -23124,7 +22258,7 @@ bZ bZ bZ bZ -bQ +bP ab ab ab @@ -23138,7 +22272,7 @@ ab ab ab ab -iA +iz iE iI iD @@ -23352,7 +22486,7 @@ bZ bZ bZ de -bS +bP ab ab ab @@ -23371,7 +22505,7 @@ ab ab ab ab -bS +bP de bZ bZ @@ -23381,7 +22515,7 @@ bZ bZ bZ bZ -bQ +bP ab ab ab @@ -23395,7 +22529,7 @@ ab ab ab ab -iA +iz iD iD iD @@ -23406,8 +22540,8 @@ iD iD iD iH -iA -iN +iz +iz ab ab ab @@ -23541,25 +22675,25 @@ aZ aZ aZ bg -aV -aV -aV -aV -aV +aO +aO +aO +aO +aO bn bn -aV -aV -aV -aV -aV +aO +aO +aO +aO +aO bn bn -aV +aO aZ aZ aZ -aV +aO ab ab ab @@ -23601,15 +22735,15 @@ bO bO bL bL -bJ -cg +bE +bE cu bX cJ bZ bZ de -bS +bP ab ab ab @@ -23628,7 +22762,7 @@ ab ab ab ab -bS +bP de bZ bZ @@ -23638,7 +22772,7 @@ bZ bZ bZ bZ -bQ +bP ab ab ab @@ -23652,8 +22786,8 @@ ab ab ab ab -iB -iA +iz +iz iH iD iD @@ -23662,8 +22796,8 @@ iD iD iD iH -iA -iN +iz +iz ab ab ab @@ -23798,25 +22932,25 @@ aZ aZ aZ bi -aV +aO bj aZ bj aZ aZ aZ -aV +aO bg bg bg bg aZ aZ -aV +aO aZ aZ aZ -aV +aO ab ab ab @@ -23849,16 +22983,16 @@ ab ab ab ab -bI -bJ -bJ -bJ -bJ -bJ -bJ -bJ -bJ -cg +bE +bE +bE +bE +bE +bE +bE +bE +bE +bE bX bZ bX @@ -23866,7 +23000,7 @@ bZ bZ co df -bS +bP ab ab ab @@ -23885,7 +23019,7 @@ ab ab ab ab -bS +bP df bZ bZ @@ -23895,7 +23029,7 @@ bZ bZ bZ bZ -bQ +bP ab ab ab @@ -23910,16 +23044,16 @@ ab ab ab ab -iB -iA +iz +iz iD iD iD iD iD iH -iA -iN +iz +iz ab ab ab @@ -24055,31 +23189,31 @@ aZ aZ aZ bg -aV +aO aZ aZ aZ aZ aZ aZ -aV +aO bg aZ aZ aZ aZ aZ -aV +aO aZ aZ aZ -bC -aV -aV -aV -aV -aV -bz +aO +aO +aO +aO +aO +aO +aO ab ab ab @@ -24113,7 +23247,7 @@ ab ab ab ab -bQ +bP bZ bZ bZ @@ -24123,7 +23257,7 @@ bZ cP bZ df -bS +bP ab ab ab @@ -24142,7 +23276,7 @@ ab ab ab ab -bS +bP df bZ bZ @@ -24152,7 +23286,7 @@ co bZ bZ im -bQ +bP ab ab ab @@ -24168,14 +23302,14 @@ ab ab ab ab -iB -iA -iA +iz +iz +iz iL iL -iA -iA -iN +iz +iz +iz ab ab ab @@ -24312,29 +23446,29 @@ aZ aZ aZ bg -aV +aO aZ aZ aZ aZ aZ aZ -aV +aO bg aZ aZ aZ aZ aZ -aV +aO aZ aZ by bA -aV -aV -aV -aV +aO +aO +aO +aO bD ab ab @@ -24370,7 +23504,7 @@ ab ab ab ab -bQ +bP bZ bZ bZ @@ -24380,7 +23514,7 @@ cN bZ bZ dg -bS +bP ab ab ab @@ -24399,7 +23533,7 @@ ab ab ab ab -bS +bP dg bZ bZ @@ -24409,7 +23543,7 @@ bZ bZ bZ bZ -bQ +bP ab ab ab @@ -24569,30 +23703,30 @@ aZ aZ aZ bg -aV +aO aZ aZ aZ aZ aZ aZ -aV +aO bg aZ aZ aZ aZ aZ -aV +aO aZ aZ by bA -aV -aV -aV -aV -bz +aO +aO +aO +aO +aO ab ab ab @@ -24627,7 +23761,7 @@ ab ab ab ab -bQ +bP bZ bZ bZ @@ -24637,7 +23771,7 @@ bZ bZ bZ dg -bS +bP ab ab ab @@ -24656,7 +23790,7 @@ ab ab ab ab -bS +bP dg bZ bZ @@ -24666,7 +23800,7 @@ bZ il bZ bZ -bQ +bP ab ab ab @@ -24826,26 +23960,26 @@ aZ aZ aZ bg -aV +aO bj aZ bj aZ bj aZ -aV +aO bg bg bg bg bg bg -aV +aO bj bj -aV -aV -bz +aO +aO +aO ab ab ab @@ -24884,7 +24018,7 @@ ab ab ab ab -bQ +bP bZ bZ bZ @@ -24894,7 +24028,7 @@ bZ bZ bZ dh -bS +bP ab ab ab @@ -24913,7 +24047,7 @@ ab ab ab ab -bS +bP dh bZ bZ @@ -24923,7 +24057,7 @@ bZ bZ bZ bZ -bQ +bP ab ab ab @@ -25077,30 +24211,30 @@ ab ab ab ab -aS -aV -aV +aO +aO +aO bc bc -aV -aV -aV -aV -aV -aV -aV -aV -aV -aV -aV -aV -aV -aV -aV -aV -aV -aV -bz +aO +aO +aO +aO +aO +aO +aO +aO +aO +aO +aO +aO +aO +aO +aO +aO +aO +aO +aO ab ab ab @@ -25141,7 +24275,7 @@ ab ab ab ab -bQ +bP bZ bZ bZ @@ -25151,7 +24285,7 @@ bZ bZ bZ dh -bS +bP ab ab ab @@ -25170,7 +24304,7 @@ ab ab ab ab -bS +bP dh bZ bZ @@ -25180,7 +24314,7 @@ bZ im bZ cI -bQ +bP ab ab ab @@ -25398,7 +24532,7 @@ ab ab ab ab -bQ +bP bZ bZ bZ @@ -25408,7 +24542,7 @@ cL cL cL dh -bS +bP ab ab ab @@ -25427,7 +24561,7 @@ ab ab ab ab -bS +bP dh bZ bZ @@ -25437,7 +24571,7 @@ bZ bX bZ cI -bQ +bP ab ab ab @@ -25655,7 +24789,7 @@ ab ab ab ab -bQ +bP bZ bZ bZ @@ -25665,7 +24799,7 @@ cL cL cL di -bS +bP ab ab ab @@ -25684,7 +24818,7 @@ ab ab ab ab -bS +bP di bZ bZ @@ -25694,7 +24828,7 @@ bZ cJ bX bX -bQ +bP ab ab ab @@ -25912,7 +25046,7 @@ ab ab ab ab -bQ +bP bZ bZ cn @@ -25922,7 +25056,7 @@ bZ bZ bZ di -bS +bP ab ab ab @@ -25941,7 +25075,7 @@ ab ab ab ab -bS +bP di bZ bZ @@ -25951,7 +25085,7 @@ bZ bZ dn bX -bQ +bP ab ab ab @@ -26169,7 +25303,7 @@ ab ab ab ab -bQ +bP bZ bZ co @@ -26179,7 +25313,7 @@ bZ bZ bZ di -bS +bP ab ab ab @@ -26198,7 +25332,7 @@ ab ab ab ab -bS +bP di bZ bZ @@ -26208,7 +25342,7 @@ bZ bX bX bX -bQ +bP ab ab ab @@ -26426,46 +25560,46 @@ ab ab ab ab -bR +bP ca ca -cp -cb -cb -cb -cb -cb -cb -ds -cb -cb -cb -cb -cb -cb -cb -cb -cb -cb -cb -cb -cb -cb -cb -cb -cb -cb -ds -cb -cb -cb -cb -cb -cb -cp +bP +bP +bP +bP +bP +bP +bP +bP +bP +bP +bP +bP +bP +bP +bP +bP +bP +bP +bP +bP +bP +bP +bP +bP +bP +bP +bP +bP +bP +bP +bP +bP +bP +bP ca ca -eG +bP ab ab ab @@ -26683,17 +25817,17 @@ ab ab ab ab -bQ +bP bZ bZ -bQ +bP cw cw cw cw cw cw -bQ +bP cH cH cH @@ -26712,17 +25846,17 @@ gO gO hi hr -bQ +bP hO hP hY hP hY hP -bQ +bP bZ bZ -bQ +bP ab ab ab @@ -26940,17 +26074,17 @@ ab ab ab ab -bQ +bP bZ bZ -bQ +bP bZ bZ bZ bZ bZ bZ -bQ +bP cH ea ek @@ -26969,17 +26103,17 @@ gO gO hi hi -bQ +bP hP hP hP hP hP hP -bQ +bP bZ bZ -bQ +bP ab ab ab @@ -27197,17 +26331,17 @@ ab ab ab ab -bQ +bP bZ bZ -bQ +bP cx bZ cx bZ cx bZ -bQ +bP cH eb el @@ -27226,17 +26360,17 @@ eR gZ hi hi -bQ +bP hQ hP hZ hP hQ hP -bQ +bP bZ bZ -bQ +bP ab ab ab @@ -27454,17 +26588,17 @@ ab ab ab ab -bQ +bP bZ bZ -bQ +bP bZ bZ bZ bZ bZ bZ -bQ +bP cH ec em @@ -27483,17 +26617,17 @@ cH cH hi hi -hA -cb -cb -cb -gD -hV +bP +bP +bP +bP +dr +bP hU -bQ +bP bZ bZ -bQ +bP ab ab ab @@ -27535,13 +26669,13 @@ ab ab ab iQ -iR -iR +iQ +iQ iX iX -iR -iR -iY +iQ +iQ +iQ ab ab ab @@ -27711,17 +26845,17 @@ ab ab ab ab -bQ +bP bZ bZ -bQ +bP cx bZ cx bZ cx bZ -bQ +bP cH cH cH @@ -27740,17 +26874,17 @@ cH cH hi hi -bQ +bP hR hU hP ic hP hP -bQ +bP im bZ -bQ +bP ab ab ab @@ -27791,15 +26925,15 @@ ab ab ab iQ -iR +iQ iT iT iT iT iT iV -iR -iY +iQ +iQ ab ab ab @@ -27968,17 +27102,17 @@ ab ab ab ab -bQ +bP bZ bZ -bQ +bP bZ bZ bZ bZ bZ bZ -bQ +bP dI cH cH @@ -27997,17 +27131,17 @@ cH cH hj hj -hA -cb -hV +bP +bP +bP hP hP hP hP -bQ +bP bZ bZ -bQ +bP ab ab ab @@ -28047,7 +27181,7 @@ ab ab ab iQ -iR +iQ iV iT iT @@ -28056,8 +27190,8 @@ iT iT iT iV -iR -iY +iQ +iQ ab ab ab @@ -28225,17 +27359,17 @@ ab ab ab ab -bQ +bP bZ bZ -bQ +bP cx cL cx bZ cx bZ -bQ +bP dJ dJ cH @@ -28254,17 +27388,17 @@ cH cH hj hj -bQ +bP hR hU hP hP hP hP -bQ +bP bZ bZ -bQ +bP ab ab ab @@ -28303,7 +27437,7 @@ ab ab ab ab -iR +iQ iT iT iT @@ -28314,8 +27448,8 @@ iT iT iT iV -iR -iY +iQ +iQ ab ab ab @@ -28482,17 +27616,17 @@ ab ab ab ab -bQ +bP bZ bZ -bQ +bP bZ bZ bZ bZ bZ bZ -bQ +bP dK ed cH @@ -28511,17 +27645,17 @@ cH cH eR eR -hA -cb -hV +bP +bP +bP hP hP hP hP -bQ +bP bZ bZ -bQ +bP ab ab ab @@ -28560,7 +27694,7 @@ ab ab ab ab -iR +iQ iU iW iT @@ -28739,17 +27873,17 @@ ab ab ab ab -bQ +bP bZ bZ -bQ +bP cx bZ cx bZ cx bZ -bQ +bP dL ee cH @@ -28768,17 +27902,17 @@ cH cH eR eR -bQ +bP hR hU hP hP hP hP -bQ +bP bZ bZ -bQ +bP ab ab ab @@ -28817,7 +27951,7 @@ ab ab ab ab -iR +iQ iT iT iT @@ -28996,17 +28130,17 @@ ab ab ab ab -bQ +bP bZ bZ -bQ +bP bZ bZ bZ bZ bZ bZ -bQ +bP dM dM cH @@ -29025,17 +28159,17 @@ cH cH eR eR -hA -cb -hV +bP +bP +bP hP hP hP hP -bQ +bP bZ bZ -bQ +bP ab ab ab @@ -29074,7 +28208,7 @@ ab ab ab ab -iR +iQ iT iT iT @@ -29253,17 +28387,17 @@ ab ab ab ab -bQ +bP bZ bZ -bQ +bP cx bZ cx bZ cx co -bQ +bP dM dM cH @@ -29282,17 +28416,17 @@ cH cH eR hs -bQ +bP hR hU ia id ia hP -bQ +bP bZ bZ -bQ +bP ab ab ab @@ -29331,7 +28465,7 @@ ab ab ab ab -iR +iQ iU iW iT @@ -29510,17 +28644,17 @@ ab ab ab ab -bQ +bP bZ bZ -bQ +bP bZ bZ bZ bZ bZ dj -bQ +bP dN dN cH @@ -29539,17 +28673,17 @@ cH cH hk hs -hA -cb -hV +bP +bP +bP hP hP hP hP -bQ +bP bZ bZ -bQ +bP ab ab ab @@ -29588,7 +28722,7 @@ ab ab ab ab -iR +iQ iT iT iT @@ -29599,8 +28733,8 @@ iT iT iT iV -iR -iZ +iQ +iQ ab ab ab @@ -29767,17 +28901,17 @@ ab ab ab ab -bQ +bP bZ bZ -bQ +bP cy bZ bZ bZ bZ co -bQ +bP dN dN cH @@ -29796,17 +28930,17 @@ cH cH hk ht -bQ +bP hR hU hP hP ih ih -bQ +bP bZ bZ -bQ +bP ab ab ab @@ -29845,8 +28979,8 @@ ab ab ab ab -iS -iR +iQ +iQ iV iT iT @@ -29855,8 +28989,8 @@ iT iT iT iV -iR -iZ +iQ +iQ ab ab ab @@ -30024,46 +29158,46 @@ ab ab ab ab -bS +bP bZ bZ -cq -cb -cb +bP +bP +bP ca ca -cb -cb -dt -cb -cb -cb -cb -cb -cb -cb +bP +bP +bP +bP +bP +bP +bP +bP +bP +bP ff ff ff ff -cb -gD -cb -cb -cb -cb -cb -dt -cb -cb +bP +dr +bP +bP +bP +bP +bP +bP +bP +bP ca ca -cb -cb -eH +bP +bP +bP bZ bZ -bQ +bP ab ab ab @@ -30103,16 +29237,16 @@ ab ab ab ab -iS -iR +iQ +iQ iT iT iT iT iT iV -iR -iZ +iQ +iQ ab ab ab @@ -30281,7 +29415,7 @@ ab ab ab ab -bQ +bP bZ bZ bZ @@ -30320,7 +29454,7 @@ bZ bZ bZ bZ -bQ +bP ab ab ab @@ -30361,14 +29495,14 @@ ab ab ab ab -iS -iR -iR +iQ +iQ +iQ iX iX -iR -iR -iZ +iQ +iQ +iQ ab ab ab @@ -30538,7 +29672,7 @@ ab ab ab ab -bQ +bP bZ bZ bZ @@ -30577,7 +29711,7 @@ bZ bZ bZ bZ -bQ +bP ab ab ab @@ -30795,46 +29929,46 @@ ab ab ab ab -bS +bP bZ ch -cr -cb -cb -cb -cp -cb -cb +bP +bP +bP +bP +bP +bP +bP ca ca -cb -cb -cb -cb -cb -cb -cO +bP +bP +bP +bP +bP +bP +bP bZ bZ -cr -cb -cb -cb -cb -cb -cb +bP +bP +bP +bP +bP +bP +bP hu hu -cb -cb -cb -cb -cb -cb -cO +bP +bP +bP +bP +bP +bP +bP bZ ch -bQ +bP ab ab ab @@ -31052,14 +30186,14 @@ ab ab ab ab -bS +bP bZ bZ -bS +bP cz cM cM -bQ +bP cX cX cX @@ -31070,10 +30204,10 @@ cX dO dO cX -bS +bP bZ bZ -bS +bP gr gF gF @@ -31088,10 +30222,10 @@ gF ie gF ii -bS +bP bZ bZ -bS +bP ab ab ab @@ -31309,10 +30443,10 @@ ab ab ab ab -bS +bP bZ bZ -bS +bP cA cM cM @@ -31327,10 +30461,10 @@ dv dQ eS en -bS +bP bZ bZ -bS +bP gs gF gF @@ -31345,10 +30479,10 @@ gF gF gF ik -bS +bP bZ bZ -bS +bP ab ab ab @@ -31566,14 +30700,14 @@ ab ab ab ab -bS +bP bZ bZ -bS +bP cB cM cM -bQ +bP cX dk cX @@ -31584,10 +30718,10 @@ dv dQ dQ en -bS +bP bZ bZ -bS +bP gs gF gF @@ -31602,10 +30736,10 @@ gF gF gF ik -bS +bP bZ bZ -bS +bP ab ab ab @@ -31823,10 +30957,10 @@ ab ab ab ab -bS +bP bZ bZ -bS +bP cC cM cM @@ -31841,10 +30975,10 @@ eu dR dR cX -bS +bP bZ bZ -bS +bP gt gF gF @@ -31859,10 +30993,10 @@ gF ie gF ii -bS +bP bZ bZ -bS +bP ab ab ab @@ -32080,10 +31214,10 @@ ab ab ab ab -bS +bP bZ bZ -bS +bP cD cM cM @@ -32098,10 +31232,10 @@ cX dO dO cX -bS +bP bZ bZ -bS +bP gu gF gF @@ -32116,10 +31250,10 @@ gF gF gF ik -bS +bP bZ bZ -bS +bP ab ab ab @@ -32337,10 +31471,10 @@ ab ab ab ab -bS +bP bZ bZ -bS +bP cE cM cM @@ -32355,10 +31489,10 @@ dv dP dQ en -bS +bP bZ bZ -bS +bP gv gF gF @@ -32373,10 +31507,10 @@ ib gF gF ik -bS +bP bZ bZ -bS +bP ab ab ab @@ -32594,10 +31728,10 @@ ab ab ab ab -bS +bP bZ bZ -bS +bP cF cM cM @@ -32612,10 +31746,10 @@ dv dQ eT en -bS +bP bZ bZ -bS +bP gs gF gF @@ -32630,10 +31764,10 @@ gR ie gF ii -bS +bP bZ bZ -bS +bP ab ab ab @@ -32851,10 +31985,10 @@ ab ab ab ab -bS +bP bZ bZ -bS +bP cF cM cM @@ -32869,10 +32003,10 @@ cX dR dR cX -bS +bP bZ bZ -bS +bP gr gF gF @@ -32887,10 +32021,10 @@ gF gF gF ik -bS +bP bZ bZ -bS +bP ab ab ab @@ -33108,46 +32242,46 @@ ab ab ab ab -bS +bP bZ bZ -cq -cb -cb -cb -cb -cb -cb -cb -cb -cb -cb -cb -cb -cb -cb -eH +bP +bP +bP +bP +bP +bP +bP +bP +bP +bP +bP +bP +bP +bP +bP +bP bZ bZ -cq -cb -cb -cb -cb -cb -cb -cb -cb -cb -cb -cb -cb -cb -cb -eH +bP +bP +bP +bP +bP +bP +bP +bP +bP +bP +bP +bP +bP +bP +bP +bP bZ bZ -bS +bP ab ab ab @@ -33365,7 +32499,7 @@ ab ab ab ab -bS +bP bZ bZ bZ @@ -33404,7 +32538,7 @@ bZ bZ bZ bZ -bS +bP ab ab ab @@ -33622,7 +32756,7 @@ ab ab ab ab -bS +bP bZ bZ bZ @@ -33661,7 +32795,7 @@ bZ bZ bZ bZ -bS +bP ab ab ab @@ -33879,46 +33013,46 @@ ab ab ab ab -bT -cb -cb -cp +bP +bP +bP +bP cG cG -cO +bP bZ bZ -cr -cb -cb -cb -cb -cb -cb -cb -cb -dl +bP +bP +bP +bP +bP +bP +bP +bP +bP +bP ca ca -dl -cb -cb -cb -cb -cb -cb -cb -cb -cO +bP +bP +bP +bP +bP +bP +bP +bP +bP +bP bZ bZ -cr +bP cG cG -cp -cb -cb -hT +bP +bP +bP +bP ab ab ab @@ -34139,13 +33273,13 @@ ab ab ab ab -bQ +bP cH cH -bS +bP bZ bZ -bS +bP dw dS dS @@ -34154,10 +33288,10 @@ ev ev ev fa -bS +bP fm fH -bS +bP gw gG gx @@ -34166,13 +33300,13 @@ gx gx fx hC -bS +bP bZ bZ -bS +bP cH cH -bQ +bP ab ab ab @@ -34396,13 +33530,13 @@ ab ab ab ab -bQ +bP cH cH -bS +bP bZ bZ -bS +bP dx bZ bZ @@ -34411,10 +33545,10 @@ ew bZ bZ fb -bS +bP fn fI -bS +bP gx gx gx @@ -34423,13 +33557,13 @@ gx gx gH gx -bS +bP bZ bZ -bS +bP cH cH -bQ +bP ab ab ab @@ -34653,13 +33787,13 @@ ab ab ab ab -bQ +bP cH cH -bS +bP bZ bZ -bS +bP dx bZ bZ @@ -34680,13 +33814,13 @@ gx gx gx gx -bS +bP bZ bZ -bS +bP cH cH -bQ +bP ab ab ab @@ -34910,13 +34044,13 @@ ab ab ab ab -bQ +bP cH cH -bS +bP bZ bZ -bS +bP dy bZ bZ @@ -34925,10 +34059,10 @@ bZ bZ bZ fb -bS +bP fp fH -bS +bP gx gx gx @@ -34937,13 +34071,13 @@ hb gx gx gx -bS +bP bZ bZ -bS +bP cH cH -bQ +bP ab ab ab @@ -35167,13 +34301,13 @@ ab ab ab ab -bQ +bP cH cH -bS +bP bZ bZ -bS +bP dz dT eg @@ -35182,10 +34316,10 @@ ey ey ey fc -bS +bP fm fK -bS +bP gx gx gx @@ -35194,13 +34328,13 @@ gx gx gx hD -bS +bP bZ bZ -bS +bP cH cH -bQ +bP ab ab ab @@ -35424,40 +34558,40 @@ ab ab ab ab -bQ +bP cH cH -bS +bP bZ bZ -bR -cb -cb -cb -dl -ez -ez -ez -ez -eH +bP +bP +bP +bP +bP +bP +bP +bP +bP +bP fm fL -cq -ez -ez -ez -ez -dl -ez -ez -ez -eG +bP +bP +bP +bP +bP +bP +bP +bP +bP +bP bZ bZ -bS +bP cH cH -bQ +bP ab ab ab @@ -35681,17 +34815,17 @@ ab ab ab ab -bT +bP cG cG -bS +bP bZ bZ -bS +bP de de de -bS +bP eA eK eK @@ -35704,17 +34838,17 @@ eK eK eK gT -bS +bP hl de de -bS +bP bZ bZ -bS +bP cG cG -hT +bP ab ab ab @@ -35941,14 +35075,14 @@ ab ab ab ab -bS +bP bZ bZ -bS +bP bZ bZ bZ -bS +bP eB eL eU @@ -35961,14 +35095,14 @@ bZ co bZ gU -bS +bP bZ bZ bZ -bS +bP bZ bZ -bS +bP ab ab ab @@ -36198,14 +35332,14 @@ ab ab ab ab -bS +bP bZ bZ -bS +bP bZ bZ bZ -bS +bP eB bZ bZ @@ -36218,14 +35352,14 @@ bZ bZ bZ gU -bS +bP ch bZ bZ -bS +bP bZ bZ -bS +bP ab ab ab @@ -36455,14 +35589,14 @@ ab ab ab ab -bS +bP bZ bZ -bS +bP bZ bZ bZ -bS +bP eB bZ bZ @@ -36475,14 +35609,14 @@ gy bZ bZ gU -bS +bP bZ bZ hE -bS +bP bZ bZ -bS +bP ab ab ab @@ -36618,29 +35752,29 @@ ab ab ab ac -ah -ah +ac +ac ak ak -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -aG +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac ab ab ab @@ -36712,14 +35846,14 @@ ab ab ab ab -bS +bP bZ bZ ca bZ bZ bZ -bS +bP eB bZ bZ @@ -36732,14 +35866,14 @@ bZ bZ bZ gU -bS +bP bZ bZ bZ ca bZ bZ -bS +bP ab ab ab @@ -36880,26 +36014,26 @@ aj aj aj am -ah +ac ao aj ao aj ao aj -ah +ac as an an an au an -ah +ac ao ao -ah -ah -aG +ac +ac +ac ab ab ab @@ -36969,14 +36103,14 @@ ab ab ab ab -bS +bP bZ bZ -bS +bP bZ bZ bZ -bS +bP eB co eV @@ -36989,14 +36123,14 @@ cU bZ bZ gU -bS +bP bZ bZ bZ -bS +bP bZ bZ -bS +bP ab ab ab @@ -37137,30 +36271,30 @@ aj aj aj am -ah +ac aj aj aj aj aj aj -ah +ac an aj aj aj aj aj -ah +ac aj aj aH aL -ah -ah -ah -ah -aG +ac +ac +ac +ac +ac ab ab ab @@ -37226,14 +36360,14 @@ ab ab ab ab -bS +bP bZ bZ -bS +bP bZ bZ bZ -bS +bP eB bZ eW @@ -37246,14 +36380,14 @@ bZ bZ bZ gU -bS +bP bZ ch bZ -bS +bP cY bZ -bS +bP ab ab ab @@ -37394,29 +36528,29 @@ aj aj aj an -ah +ac aj aj ap aj aj aj -ah +ac an aj aq aj aq aj -ah +ac aj aj aH aL -ah -ah -ah -ah +ac +ac +ac +ac be ab ab @@ -37483,14 +36617,14 @@ ab ab ab ab -bS +bP bZ bZ -bS +bP bZ bZ bZ -bS +bP eB eM eM @@ -37503,14 +36637,14 @@ bZ eM eM gU -bS +bP bZ bZ bZ -bS +bP bZ bZ -bS +bP ab ab ab @@ -37651,31 +36785,31 @@ aj aj aj an -ah +ac aj aj aj aj aj aj -ah +ac an aj aj aj aj aj -ah +ac aj aj aj -aM -ah -ah -ah -ah -ah -aG +ac +ac +ac +ac +ac +ac +ac ab ab ab @@ -37740,14 +36874,14 @@ ab ab ab ab -bS +bP bZ bZ -bS +bP cj ck cm -bS +bP eC eN eX @@ -37760,14 +36894,14 @@ eC gI gJ eC -bS +bP ct ck cK -bS +bP bZ bZ -bS +bP ab ab ab @@ -37908,35 +37042,35 @@ aj aj al an -ah +ac ao aj ao aj aj aj -ah +ac an at an an aj aj -ah -aj -aj -aj -ah ac -ah -ah -ah -ah -ah -ah -ah -ah -aG +aj +aj +aj +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac ab ab ab @@ -37997,34 +37131,34 @@ ab ab ab ab -bS +bP bZ bZ -bR -cb +bP +bP ca -cb -dt -eD -eO -eO -eO -eO -eO -eO -eO -eO -eO -eO -gV -dt -cb +bP +bP +cV +cV +cV +cV +cV +cV +cV +cV +cV +cV +cV +cV +bP +bP ca -cb -eG +bP +bP bZ bZ -bS +bP ab ab ab @@ -38165,25 +37299,25 @@ aj aj aj an -ah -ah -ah -ah -ah +ac +ac +ac +ac +ac ar ar -ah -ah -ah -ah -ah +ac +ac +ac +ac +ac ar ar -ah +ac al aj aj -ah +ac ad aX ba @@ -38193,8 +37327,8 @@ ba ba aj bl -ah -aG +ac +ac ab ab ab @@ -38254,10 +37388,10 @@ ab ab ab ab -bS +bP bZ bZ -bS +bP cW cW cW @@ -38278,10 +37412,10 @@ cW cW cW cW -bS +bP bZ bZ -bS +bP ab ab ab @@ -38441,7 +37575,7 @@ aj aj aj ak -aT +ak aj aj aj @@ -38511,10 +37645,10 @@ ab ab ab ab -bS +bP bZ cU -bS +bP cW cW cW @@ -38535,10 +37669,10 @@ cW cW cW cW -bS +bP bZ bZ -bS +bP ab ab ab @@ -38698,7 +37832,7 @@ aj aj aj ak -aT +ak aj aj aj @@ -38768,10 +37902,10 @@ ab ab ab ab -bS +bP bZ bZ -bS +bP cW cW cW @@ -38792,10 +37926,10 @@ cW cW cW cW -bS +bP bZ bZ -bS +bP ab ab ab @@ -38936,25 +38070,25 @@ aj aj aj an -ah -ah -ah -ah -ah +ac +ac +ac +ac +ac ar ar -ah -ah -ah -ah -ah +ac +ac +ac +ac +ac ar ar -ah +ac aj aj al -ah +ac af aY bb @@ -38964,8 +38098,8 @@ bb bb aj aj -ah -aI +ac +ac ab ab ab @@ -39025,10 +38159,10 @@ ab ab ab ab -bS +bP cU bZ -bS +bP cW cW cW @@ -39049,10 +38183,10 @@ cW cW cW cW -bS +bP bZ bZ -bS +bP ab ab ab @@ -39193,35 +38327,35 @@ aj aj al an -ah +ac ao aj ao aj aj aj -ah +ac an at an an aj aj -ah +ac aj aj aj -ah -ag -ah -ah -ah -ah -ah -ah -ah -ah -aI +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac ab ab ab @@ -39282,10 +38416,10 @@ ab ab ab ab -bS +bP bZ bZ -bS +bP dB dV cW @@ -39306,10 +38440,10 @@ cW cW cW cW -bS +bP bZ bZ -bS +bP ab ab ab @@ -39450,31 +38584,31 @@ aj aj aj an -ah +ac aj aj aj aj aj aj -ah +ac at aj aj aj aj aj -ah +ac aj aj aj -aN -ah -ah -ah -ah -ah -aI +ac +ac +ac +ac +ac +ac +ac ab ab ab @@ -39539,10 +38673,10 @@ ab ab ab ab -bS +bP bZ bZ -bS +bP cW cW cW @@ -39563,10 +38697,10 @@ cW cW cW cW -bS +bP bZ bZ -bS +bP ab ab ab @@ -39707,29 +38841,29 @@ aj aj aj an -ah +ac aj aj aj aq aj aq -ah +ac an aj ap aj aj aj -ah +ac aj aj aH aL -ah -ah -ah -ah +ac +ac +ac +ac be ab ab @@ -39796,10 +38930,10 @@ ab ab ab ab -bS +bP bZ bZ -bS +bP cW cW cW @@ -39820,10 +38954,10 @@ cW cW cW cW -bS +bP bZ bZ -bS +bP ab ab ab @@ -39964,30 +39098,30 @@ aj aj aj an -ah +ac aj aj aj aj aj aj -ah +ac an aj aj aj aj aj -ah +ac aj aj aH aL -ah -ah -ah -ah -aI +ac +ac +ac +ac +ac ab ab ab @@ -40053,10 +39187,10 @@ ab ab ab ab -bS +bP bZ bZ -bS +bP cW cW cW @@ -40077,10 +39211,10 @@ hc dB cW eE -bS +bP bZ bZ -bS +bP ab ab ab @@ -40221,26 +39355,26 @@ aj aj aj an -ah +ac ao aj ao aj ao aj -ah +ac an an an an an aA -ah +ac ao ao -ah -ah -aI +ac +ac +ac ab ab ab @@ -40310,10 +39444,10 @@ ab ab ab ab -bS +bP bZ bZ -bS +bP cW cW cW @@ -40334,10 +39468,10 @@ cW dB cW cW -bS +bP bZ bZ -bS +bP ab ab ab @@ -40472,30 +39606,30 @@ ab ab ab ab -ag -ah -ah +ac +ac +ac ak ak -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -aI +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac ab ab ab @@ -40567,10 +39701,10 @@ ab ab ab ab -bS +bP bZ bZ -bS +bP cW cW cW @@ -40591,10 +39725,10 @@ cW cW cW cW -bS +bP bZ bZ -bS +bP ab ab ab @@ -40824,10 +39958,10 @@ ab ab ab ab -bS +bP bZ bZ -bS +bP cW cW cW @@ -40848,10 +39982,10 @@ cW cW cW cW -bS +bP bZ bZ -bS +bP ab ab ab @@ -41081,10 +40215,10 @@ ab ab ab ab -bS +bP bZ bZ -bS +bP cW cW cW @@ -41105,10 +40239,10 @@ cW cW cW cW -bS +bP bZ bZ -bS +bP ab ab ab @@ -41338,10 +40472,10 @@ ab ab ab ab -bS +bP bZ bZ -bS +bP cW cW cW @@ -41362,10 +40496,10 @@ cW cW cW cW -bS +bP bZ bZ -bS +bP ab ab ab @@ -41595,10 +40729,10 @@ ab ab ab ab -bS +bP bZ bZ -bS +bP cW cW cW @@ -41619,10 +40753,10 @@ cW cW cW cW -bS +bP bZ bZ -bS +bP ab ab ab @@ -41852,10 +40986,10 @@ ab ab ab ab -bS +bP bZ bZ -bS +bP cW cW cW @@ -41876,10 +41010,10 @@ cW cW cW cW -bS +bP bZ bZ -bS +bP ab ab ab @@ -42109,10 +41243,10 @@ ab ab ab ab -bS +bP bZ bZ -bS +bP cW cW cW @@ -42133,10 +41267,10 @@ cW cW cW cW -bS +bP bZ bZ -bS +bP ab ab ab @@ -42366,34 +41500,34 @@ ab ab ab ab -bS +bP bZ bZ -cq -cb -cb -cb -cb -cb -cb -cb -cb -cO +bP +bP +bP +bP +bP +bP +bP +bP +bP +bP ab ab -cr -cb -cb -cb -cb -cb -cb -cb -cb -eH +bP +bP +bP +bP +bP +bP +bP +bP +bP +bP bZ bZ -bS +bP ab ab ab @@ -42623,7 +41757,7 @@ ab ab ab ab -bS +bP bZ bZ ca @@ -42635,10 +41769,10 @@ bZ bZ ch bZ -bS +bP ab ab -bS +bP bZ bZ bZ @@ -42650,7 +41784,7 @@ bZ ca bZ bZ -bS +bP ab ab ab @@ -42880,7 +42014,7 @@ ab ab ab ab -bS +bP bZ bZ ca @@ -42892,10 +42026,10 @@ bZ bZ bZ bZ -bS +bP ab ab -bS +bP bZ bZ bZ @@ -42907,7 +42041,7 @@ bZ ca bZ bZ -bS +bP ab ab ab @@ -43137,34 +42271,34 @@ ab ab ab ab -bT -cb -cb -dl -dl -dl -dl -dl -cO +bP +bP +bP +bP +bP +bP +bP +bP +bP bZ ch bZ -bS +bP ab ab -bS +bP bZ bZ bZ -cr -cp -cp -cp -cp -cp -cb -cb -hT +bP +bP +bP +bP +bP +bP +bP +bP +bP ab ab ab @@ -43397,28 +42531,28 @@ ab ab ab ab -bT -ds -ds -ds -ds -eG +bP +bP +bP +bP +bP +bP bZ bZ bZ -bS +bP ab ab -bS +bP bZ bZ bZ -bR -ds -ds -ds -ds -hT +bP +bP +bP +bP +bP +bP ab ab ab @@ -43655,26 +42789,26 @@ ab ab ab ab -cq -dm -dm -dm -eG +bP +bP +bP +bP +bP bZ bZ bZ -bS +bP ab ab -bS +bP bZ bZ bZ -bR -dt -dt -dt -eH +bP +bP +bP +bP +bP ab ab ab @@ -43913,25 +43047,25 @@ ab ab ab dC -dW -ei +dC +dC ej -bS +bP bZ bZ bZ -bS +bP ab ab -bS +bP bZ bZ bZ -bS +bP ej -hn -hy -hG +dC +dC +dC ab ab ab @@ -44169,26 +43303,26 @@ ab ab ab ab -dD +dC dX ej ej -bS +bP bZ bZ bZ -bS +bP ab ab -bS +bP bZ bZ bZ -bS +bP ej ej dX -hH +dC ab ab ab @@ -44426,26 +43560,26 @@ ab ab ab ab -dE -dW -ei +dC +dC +dC ej -bS +bP bZ bZ bZ -bS +bP ab ab -bS +bP bZ bZ bZ -bS +bP ej -hn -hy -hI +dC +dC +dC ab ab ab @@ -44683,26 +43817,26 @@ ab ab ab ab -dD +dC dX ej ej -bS +bP bZ bZ bZ -bS +bP ab ab -bS +bP bZ bZ bZ -bS +bP ej ej dX -hH +dC ab ab ab @@ -44940,26 +44074,26 @@ ab ab ab ab -dE -dW -ei +dC +dC +dC ej -bS +bP bZ bZ bZ -bS +bP ab ab -bS +bP bZ bZ bZ -bS +bP ej -hn -hy -hI +dC +dC +dC ab ab ab @@ -45197,26 +44331,26 @@ ab ab ab ab -dD +dC dX ej ej -bS +bP bZ bZ bZ -bS +bP ab ab -bS +bP bZ bZ bZ -bS +bP ej ej dX -hH +dC ab ab ab @@ -45454,26 +44588,26 @@ ab ab ab ab -dE -dW -ei +dC +dC +dC ej -bS +bP bZ bZ bZ -bS +bP ab ab -bS +bP bZ bZ bZ -bS +bP ej -ho -hy -hI +dC +dC +dC ab ab ab @@ -45711,26 +44845,26 @@ ab ab ab ab -dD +dC dX ej ej -bS +bP bZ bZ bZ -bS +bP ab ab -bS +bP bZ bZ bZ -bS +bP ej ej dX -hH +dC ab ab ab @@ -45755,7 +44889,7 @@ ix ix is is -iF +is ab ab ab @@ -45968,26 +45102,26 @@ ab ab ab ab -dE -dW -ei +dC +dC +dC ej -bS +bP bZ bZ bZ -bS +bP ab ab -bS +bP bZ bZ bZ -bS +bP ej -ho -hy -hI +dC +dC +dC ab ab ab @@ -46011,9 +45145,9 @@ iv iv iv iv -iC +iu +is is -iF ab ab ab @@ -46225,26 +45359,26 @@ ab ab ab ab -dD +dC dX ej ej -bS +bP bZ bZ bZ -bS +bP ab ab -bS +bP bZ bZ bZ -bS +bP ej ej dX -hH +dC ab ab ab @@ -46271,7 +45405,7 @@ iv iv iu is -iF +is ab ab ab @@ -46482,26 +45616,26 @@ ab ab ab ab -dE -dW -ei +dC +dC +dC ej -bS +bP bZ bZ bZ -bS +bP ab ab -bS +bP bZ bZ bZ -bS +bP ej -ho -hy -hI +dC +dC +dC ab ab ab @@ -46529,7 +45663,7 @@ iv iv iu is -iF +is ab ab ab @@ -46739,7 +45873,7 @@ ab ab ab ab -dD +dC dX ej ej @@ -46747,10 +45881,10 @@ ca bZ bZ bZ -bS +bP ab ab -bS +bP bZ bZ bZ @@ -46758,7 +45892,7 @@ ca ej ej dX -hH +dC ab ab ab @@ -46996,26 +46130,26 @@ ab ab ab ab -dE -dW -ei +dC +dC +dC ej -bS +bP bZ bZ bZ -bS +bP ab ab -bS +bP bZ bZ bZ -bS +bP ej -ho -hy -hI +dC +dC +dC ab ab ab @@ -47253,26 +46387,26 @@ ab ab ab ab -dD +dC dX ej ej -bS +bP bZ bZ bZ -bS +bP ab ab -bS +bP bZ bZ bZ -bS +bP ej ej dX -hH +dC ab ab ab @@ -47510,26 +46644,26 @@ ab ab ab ab -dE -dW -ei +dC +dC +dC ej -bS +bP bZ bZ bZ -bS +bP ab ab -bS +bP bZ bZ bZ -bS +bP ej -ho -hy -hI +dC +dC +dC ab ab ab @@ -47767,26 +46901,26 @@ ab ab ab ab -dD +dC dX ej ej -bS +bP bZ bZ bZ -bS +bP ab ab -bS +bP bZ bZ bZ -bS +bP ej ej dX -hH +dC ab ab ab @@ -47814,7 +46948,7 @@ iv iv iu is -iG +is ab ab ab @@ -48024,26 +47158,26 @@ ab ab ab ab -dE -dW -ei +dC +dC +dC ej -bS +bP bZ bZ bZ -bS +bP ab ab -bS +bP bZ bZ bZ -bS +bP ej -ho -hy -hI +dC +dC +dC ab ab ab @@ -48070,7 +47204,7 @@ iv iv iu is -iG +is ab ab ab @@ -48281,26 +47415,26 @@ ab ab ab ab -dD +dC dX ej ej -bS +bP bZ bZ bZ -bS +bP ab ab -bS +bP bZ bZ bZ -bS +bP ej ej dX -hH +dC ab ab ab @@ -48317,7 +47451,7 @@ ab ab ab ab -it +is is iv iv @@ -48326,7 +47460,7 @@ iv iv iu is -iG +is ab ab ab @@ -48538,26 +47672,26 @@ ab ab ab ab -dE -dW -ei +dC +dC +dC ej -bS +bP bZ bZ bZ -bS +bP ab ab -bS +bP bZ bZ bZ -bS +bP ej -ho -hy -hI +dC +dC +dC ab ab ab @@ -48575,14 +47709,14 @@ ab ab ab ab -it +is is is ix ix is is -iG +is ab ab ab @@ -48795,26 +47929,26 @@ ab ab ab ab -dD +dC dX ej ej -bS +bP bZ bZ bZ -bS +bP ab ab -bS +bP bZ bZ bZ -bS +bP ej ej dX -hH +dC ab ab ab @@ -49052,26 +48186,26 @@ ab ab ab ab -dE -dW -ei +dC +dC +dC ej -bS +bP bZ bZ bZ -bS +bP ab ab -bS +bP bZ bZ bZ -bS +bP ej -ho -hy -hI +dC +dC +dC ab ab ab @@ -49309,26 +48443,26 @@ ab ab ab ab -dD +dC dX ej ej -bS +bP bZ bZ bZ -bS +bP ab ab -bS +bP bZ bZ bZ -bS +bP ej ej dX -hH +dC ab ab ab @@ -49566,26 +48700,26 @@ ab ab ab ab -dF -dW -ei +dC +dC +dC ej -bS +bP bZ bZ bZ -bS +bP ab ab -bS +bP bZ bZ bZ -bS +bP ej -ho -hy -hJ +dC +dC +dC ab ab ab @@ -49823,26 +48957,26 @@ ab ab ab ab -cr -dl -dl -dl -eG +bP +bP +bP +bP +bP bZ bZ bZ -bS +bP ab ab -bS +bP bZ bZ bZ -bR -cp -cp -cp -cO +bP +bP +bP +bP +bP ab ab ab @@ -50000,29 +49134,29 @@ ab ab ab av -aB -aB +av +av aE aE -aB -aB -aB -aB -aB -aB -aB -aB -aB -aB -aB -aB -aB -aB -aB -aB -aB -aB -bp +av +av +av +av +av +av +av +av +av +av +av +av +av +av +av +av +av +av +av ab ab ab @@ -50080,27 +49214,27 @@ ab ab ab bP -ds -ds -ds -ds -eG +bP +bP +bP +bP +bP bZ bZ bZ -bS +bP ab ab -bS +bP bZ bZ bZ -bR -ds -ds -ds -ds -dq +bP +bP +bP +bP +bP +bP ab ab ab @@ -50262,26 +49396,26 @@ aD aD aD aJ -aB +av aU aD aU aD aU aD -aB +av aJ aJ aJ aJ aJ aJ -aB +av aU aU -aB -aB -bp +av +av +av ab ab ab @@ -50334,33 +49468,33 @@ ab ab ab bP -cb -cb -dm -dm -dm -dm -dm -eH +bP +bP +bP +bP +bP +bP +bP +bP bZ bZ bZ -bS +bP ab ab -bS +bP bZ bZ bZ -cq -dt -dt -dt -dt -dt -cb -cb -dq +bP +bP +bP +bP +bP +bP +bP +bP +bP ab ab ab @@ -50519,30 +49653,30 @@ aD aD aD aJ -aB +av aD aD aD aD aD aD -aB +av aJ aD aD aD aD aD -aB +av aD aD bq bs -aB -aB -aB -aB -bp +av +av +av +av +av ab ab ab @@ -50590,7 +49724,7 @@ ab ab ab ab -bS +bP bZ bZ bZ @@ -50602,10 +49736,10 @@ bZ bZ bZ bZ -bS +bP ab ab -bS +bP bZ bZ bZ @@ -50617,7 +49751,7 @@ bZ bZ bZ bZ -bS +bP ab ab ab @@ -50776,29 +49910,29 @@ aD aD aD aJ -aB +av aD aD aD aD aD aD -aB +av aJ aD aD aD aD aD -aB +av aD aD bq bs -aB -aB -aB -aB +av +av +av +av bw ab ab @@ -50847,7 +49981,7 @@ ab ab ab ab -bS +bP bZ bX bZ @@ -50859,10 +49993,10 @@ bZ bZ bZ bZ -bS +bP ab ab -bS +bP bZ bZ bZ @@ -50874,7 +50008,7 @@ bZ bZ bZ bZ -bS +bP ab ab ab @@ -51033,31 +50167,31 @@ aD aD aD aJ -aB +av aD aD aD aD aD aD -aB +av aJ aD aD aD aD aD -aB +av aD aD aD -bt -aB -aB -aB -aB -aB -bp +av +av +av +av +av +av +av ab ab ab @@ -51104,7 +50238,7 @@ ab ab ab ab -bS +bP bX bX bX @@ -51116,10 +50250,10 @@ bZ cU bZ bZ -bS +bP ab ab -bS +bP bZ bZ bZ @@ -51131,7 +50265,7 @@ bZ bZ bZ bZ -bS +bP ab ab ab @@ -51290,25 +50424,25 @@ aD aD aD aJ -aB +av aU aD aU aD aD aD -aB +av aJ aJ aJ aJ aD aD -aB +av aD aD aD -aB +av ab ab ab @@ -51356,15 +50490,15 @@ ab ab ab bE -bJ -bJ -bJ -bJ -bJ -bJ -bJ -bJ -ce +bE +bE +bE +bE +bE +bE +bE +bE +bE bX bZ bZ @@ -51373,10 +50507,10 @@ bZ bZ bZ bZ -bS +bP ab ab -bS +bP ch bZ bZ @@ -51388,7 +50522,7 @@ bZ bZ bZ bZ -bS +bP ab ab ab @@ -51547,25 +50681,25 @@ aD aD aD aK -aB -aB -aB -aB -aB +av +av +av +av +av bf bf -aB -aB -aB -aB -aB +av +av +av +av +av bf bf -aB +av aD aD aD -aB +av ab ab ab @@ -51612,8 +50746,8 @@ ab ab ab ab -JW -nG +bF +bK bN bN bN @@ -51621,8 +50755,8 @@ bN bN bL cZ -bJ -ce +bE +bE bX bZ bZ @@ -51630,10 +50764,10 @@ cN bZ bZ bZ -bS +bP ab ab -bS +bP bZ bZ bZ @@ -51645,7 +50779,7 @@ bZ bZ bZ bZ -bS +bP ab ab ab @@ -51887,10 +51021,10 @@ bZ bZ bZ bZ -bS +bP ab ab -bS +bP bZ bZ bZ @@ -51902,7 +51036,7 @@ hK bZ bZ bZ -bS +bP ab ab ab @@ -52144,10 +51278,10 @@ bZ bZ bZ cN -bS +bP ab ab -bS +bP bZ bZ bZ @@ -52159,7 +51293,7 @@ bZ bZ bZ bZ -bS +bP ab ab ab @@ -52318,25 +51452,25 @@ aD aD aD aJ -aB -aB -aB -aB -aB +av +av +av +av +av bf bf -aB -aB -aB -aB -aB +av +av +av +av +av bf bf -aB +av aD aD aD -aB +av ab ab ab @@ -52383,8 +51517,8 @@ ab ab ab ab -JS -qC +bH +bM bO bO bO @@ -52392,8 +51526,8 @@ bO bO bL bL -bJ -cg +bE +bE bZ bX bZ @@ -52401,10 +51535,10 @@ bZ dH bZ cU -bS +bP ab ab -bS +bP bZ bZ bZ @@ -52416,7 +51550,7 @@ bZ bZ bZ bZ -bS +bP ab ab ab @@ -52575,25 +51709,25 @@ aD aD aD aJ -aB +av aU aD aU aD aD aD -aB +av aJ aJ aJ aJ aD aD -aB +av aD aD aD -aB +av ab ab ab @@ -52640,16 +51774,16 @@ ab ab ab ab -bI -bJ -bJ -bJ -bJ -bJ -bJ -bJ -bJ -cg +bE +bE +bE +bE +bE +bE +bE +bE +bE +bE bZ bX bX @@ -52658,10 +51792,10 @@ bZ bZ bZ bZ -bS +bP ab ab -bS +bP bZ bZ bZ @@ -52673,7 +51807,7 @@ bZ bZ bZ bZ -bS +bP ab ab ab @@ -52832,31 +51966,31 @@ aD aD aD aJ -aB +av aD aD aD aD aD aD -aB +av aJ aD aD aD aD aD -aB +av aD aD aD -bu -aB -aB -aB -aB -aB -br +av +av +av +av +av +av +av ab ab ab @@ -52903,7 +52037,7 @@ ab ab ab ab -bS +bP bZ bX bZ @@ -52915,10 +52049,10 @@ bZ bZ bZ bZ -bS +bP ab ab -bS +bP bZ bZ bZ @@ -52930,7 +52064,7 @@ bZ bZ bZ bZ -bS +bP ab ab ab @@ -53089,29 +52223,29 @@ aD aD aD aJ -aB +av aD aD aD aD aD aD -aB +av aJ aD aD aD aD aD -aB +av aD aD bq bs -aB -aB -aB -aB +av +av +av +av bw ab ab @@ -53160,7 +52294,7 @@ ab ab ab ab -bS +bP bX bZ bZ @@ -53172,10 +52306,10 @@ bZ bZ bZ bZ -bS +bP ab ab -bS +bP bZ bZ bZ @@ -53187,7 +52321,7 @@ bZ bZ cY bZ -bS +bP ab ab ab @@ -53346,30 +52480,30 @@ aD aD aD aJ -aB +av aD aD aD aD aD aD -aB +av aJ aD aD aD aD aD -aB +av aD aD bq bs -aB -aB -aB -aB -br +av +av +av +av +av ab ab ab @@ -53417,7 +52551,7 @@ ab ab ab ab -bS +bP bZ bZ bZ @@ -53429,10 +52563,10 @@ bZ bZ bZ bZ -bS +bP ab ab -bS +bP bZ bZ bZ @@ -53444,7 +52578,7 @@ bZ bZ bZ bZ -bS +bP ab ab ab @@ -53603,26 +52737,26 @@ aD aD aD aJ -aB +av aU aD aU aD aU aD -aB +av bk aJ aJ aJ aJ aJ -aB +av aU aU -aB -aB -br +av +av +av ab ab ab @@ -53674,34 +52808,34 @@ ab ab ab ab -bS +bP +cV cV -da cG cV -dZ -dZ -dZ -da +cV +cV +cV +cV cG cV -da -bS +cV +bP ab ab -bS +bP +cV cV -da cG cV -dZ -dZ -dZ -da +cV +cV +cV +cV cG cV -da -bS +cV +bP ab ab ab @@ -53854,30 +52988,30 @@ ab ab ab ab -az -aB -aB +av +av +av aE aE -aB -aB -aB -aB -aB -aB -aB -aB -aB -aB -aB -aB -aB -aB -aB -aB -aB -aB -br +av +av +av +av +av +av +av +av +av +av +av +av +av +av +av +av +av +av +av ab ab ab @@ -53931,7 +53065,7 @@ ab ab ab ab -bS +bP cW cW cW @@ -53943,10 +53077,10 @@ cW cW cW cW -bS +bP ab ab -bS +bP cW cW cW @@ -53958,7 +53092,7 @@ cW cW cW cW -bS +bP ab ab ab @@ -54188,7 +53322,7 @@ ab ab ab ab -bT +bP cW db cW @@ -54203,7 +53337,7 @@ cW fi ab ab -bT +bP cW db cW @@ -54215,7 +53349,7 @@ db cW db cW -hT +bP ab ab ab @@ -61660,15 +60794,15 @@ ab ab ab ab -gW +gM hd -hp -hp -hp -hp -hp -hp -ig +hd +hd +hd +hd +hd +hd +gM ab ab ab @@ -61917,7 +61051,7 @@ ab ab ab ab -gX +gM he he he @@ -61925,7 +61059,7 @@ hL he he he -gX +gM ab ab ab @@ -62174,7 +61308,7 @@ ab ab ab gL -gX +gM hf hf hf @@ -62182,7 +61316,7 @@ hM hf hf hf -gX +gM gL ab ab @@ -62431,7 +61565,7 @@ ab ab ab gM -gX +gM hf hf hf @@ -62439,8 +61573,8 @@ hf hf hf hf -gX -hz +gM +gM ab ab ab @@ -62688,7 +61822,7 @@ ab ab ab ab -gX +gM hf hf hf @@ -62696,7 +61830,7 @@ hf hf hf hf -gX +gM ab ab ab @@ -62945,7 +62079,7 @@ ab ab ab ab -gX +gM hf hf hf @@ -62953,7 +62087,7 @@ hf hf hf hf -gX +gM ab ab ab @@ -63202,7 +62336,7 @@ ab ab ab ab -gX +gM hf hf hf @@ -63210,7 +62344,7 @@ hf hf hf hf -gX +gM ab ab ab @@ -63459,7 +62593,7 @@ ab ab ab ab -gX +gM hf hf hf @@ -63467,7 +62601,7 @@ hf hf hf hf -gX +gM ab ab ab @@ -63716,7 +62850,7 @@ ab ab ab ab -gX +gM hf hf hf @@ -63724,7 +62858,7 @@ hf hf hf hf -gX +gM ab ab ab @@ -63973,15 +63107,15 @@ ab ab ab ab -gX +gM hg hg -gX +gM hN -gX +gM hg hg -gX +gM ab ab ab @@ -64233,12 +63367,12 @@ ab gM hh hh -hz +gM ab gM hh hh -hz +gM ab ab ab diff --git a/_maps/map_files/RandomZLevels/spacehotel.dmm b/_maps/map_files/RandomZLevels/spacehotel.dmm deleted file mode 100644 index 16babf6aaf9..00000000000 --- a/_maps/map_files/RandomZLevels/spacehotel.dmm +++ /dev/null @@ -1,21457 +0,0 @@ -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"aa" = ( -/turf/unsimulated/wall{ - icon = 'icons/turf/mining.dmi'; - icon_state = "rock" - }, -/area/awaymission{ - name = "Snowland"; - requires_power = 0 - }) -"ab" = ( -/turf/unsimulated/wall/metal, -/area/awaymission/undersea{ - requires_power = 0 - }) -"ac" = ( -/turf/unsimulated/wall{ - icon = 'icons/turf/mining.dmi'; - icon_state = "rock" - }, -/area/awaymission/beach) -"ad" = ( -/turf/simulated/floor/plating/lava/smooth, -/area/awaymission) -"ae" = ( -/turf/unsimulated/wall/metal, -/area/awaymission{ - name = "Amazing Place"; - requires_power = 0 - }) -"af" = ( -/turf/unsimulated/wall{ - dynamic_lighting = 0; - icon = null - }, -/area/awaymission{ - name = "Amazing Place"; - requires_power = 0 - }) -"ag" = ( -/turf/template_noop, -/area/awaymission{ - name = "Amazing Place"; - requires_power = 0 - }) -"ah" = ( -/turf/template_noop, -/area/template_noop) -"ai" = ( -/turf/unsimulated/beach/water/deep/wood_floor{ - icon = 'icons/turf/shuttle.dmi'; - icon_state = "floor"; - name = "Pool Floor" - }, -/area/awaymission/undersea{ - requires_power = 0 - }) -"aj" = ( -/obj/machinery/light{ - dir = 1 - }, -/turf/unsimulated/beach/water/deep/wood_floor{ - icon = 'icons/turf/shuttle.dmi'; - icon_state = "floor"; - name = "Pool Floor" - }, -/area/awaymission/undersea{ - requires_power = 0 - }) -"ak" = ( -/obj/effect/decal{ - name = "rock"; - icon = 'icons/turf/mining.dmi'; - icon_state = "rock_side_w" - }, -/obj/effect/decal{ - name = "rock"; - icon = 'icons/turf/mining.dmi'; - icon_state = "rock_side_n" - }, -/turf/unsimulated/beach/sand, -/area/awaymission/beach) -"al" = ( -/obj/effect/decal{ - name = "rock"; - icon = 'icons/turf/mining.dmi'; - icon_state = "rock_side_e" - }, -/obj/effect/decal{ - name = "rock"; - icon = 'icons/turf/mining.dmi'; - icon_state = "rock_side_n" - }, -/turf/unsimulated/beach/sand, -/area/awaymission/beach) -"am" = ( -/turf/unsimulated/floor{ - icon_state = "floor" - }, -/area/awaymission{ - name = "Amazing Place"; - requires_power = 0 - }) -"an" = ( -/obj/effect/view_portal{ - id = "mazeland_111" - }, -/turf/unsimulated/floor{ - icon_state = "floor" - }, -/area/awaymission{ - name = "Amazing Place"; - requires_power = 0 - }) -"ao" = ( -/obj/effect/view_portal/visual{ - dir = 4; - dist = 2; - id = "mazeland_121"; - radius = 1 - }, -/turf/unsimulated/floor{ - icon_state = "floor" - }, -/area/awaymission{ - name = "Amazing Place"; - requires_power = 0 - }) -"ap" = ( -/obj/effect/view_portal/visual{ - dir = 1; - dist = 2; - id = "mazeland_332"; - radius = 1 - }, -/turf/unsimulated/floor{ - icon_state = "floor" - }, -/area/awaymission{ - name = "Amazing Place"; - requires_power = 0 - }) -"aq" = ( -/obj/effect/view_portal/visual{ - dir = 1; - dist = 5; - frustrum = 1; - id = "mazeland_room"; - radius = 0 - }, -/turf/unsimulated/floor{ - icon_state = "floor" - }, -/area/awaymission{ - name = "Amazing Place"; - requires_power = 0 - }) -"ar" = ( -/obj/effect/view_portal/visual{ - dir = 1; - dist = 2; - id = "mazeland_331"; - radius = 1 - }, -/turf/unsimulated/floor{ - icon_state = "floor" - }, -/area/awaymission{ - name = "Amazing Place"; - requires_power = 0 - }) -"as" = ( -/obj/effect/decal{ - name = "rock"; - icon = 'icons/turf/mining.dmi'; - icon_state = "rock_side_n" - }, -/turf/unsimulated/beach/sand, -/area/awaymission/beach) -"at" = ( -/turf/unsimulated/beach/sand, -/area/awaymission/beach) -"au" = ( -/obj/machinery/light{ - dir = 4; - icon_state = "tube1" - }, -/turf/unsimulated/floor{ - icon_state = "floor" - }, -/area/awaymission{ - name = "Amazing Place"; - requires_power = 0 - }) -"av" = ( -/obj/effect/view_portal{ - id = "mazeland_211" - }, -/turf/unsimulated/floor{ - icon_state = "floor" - }, -/area/awaymission{ - name = "Amazing Place"; - requires_power = 0 - }) -"aw" = ( -/obj/effect/view_portal{ - id = "mazeland" - }, -/obj/machinery/light{ - dir = 4; - icon_state = "tube1" - }, -/turf/unsimulated/floor{ - icon_state = "floor" - }, -/area/awaymission{ - name = "Amazing Place"; - requires_power = 0 - }) -"ax" = ( -/obj/effect/view_portal{ - id = "mazeland_411" - }, -/turf/unsimulated/floor{ - icon_state = "floor" - }, -/area/awaymission{ - name = "Amazing Place"; - requires_power = 0 - }) -"ay" = ( -/mob/living/simple_animal/hostile/retaliate/carp, -/turf/unsimulated/beach/water/deep/wood_floor{ - icon = 'icons/turf/shuttle.dmi'; - icon_state = "floor"; - name = "Pool Floor" - }, -/area/awaymission/undersea{ - requires_power = 0 - }) -"az" = ( -/obj/effect/view_portal{ - id = "mazeland_112" - }, -/turf/unsimulated/floor{ - icon_state = "floor" - }, -/area/awaymission{ - name = "Amazing Place"; - requires_power = 0 - }) -"aA" = ( -/obj/effect/view_portal/visual{ - dir = 4; - dist = 2; - id = "mazeland_122"; - radius = 1 - }, -/turf/unsimulated/floor{ - icon_state = "floor" - }, -/area/awaymission{ - name = "Amazing Place"; - requires_power = 0 - }) -"aB" = ( -/obj/effect/view_portal{ - id = "mazeland_31" - }, -/turf/unsimulated/floor{ - icon_state = "floor" - }, -/area/awaymission{ - name = "Amazing Place"; - requires_power = 0 - }) -"aC" = ( -/turf/unsimulated/wall/metal, -/area/awaymission{ - name = "Snowland"; - requires_power = 0 - }) -"aD" = ( -/turf/unsimulated/wall{ - dynamic_lighting = 0; - icon = null - }, -/area/awaymission{ - name = "Snowland"; - requires_power = 0 - }) -"aE" = ( -/obj/effect/decal{ - name = "rock"; - icon = 'icons/turf/mining.dmi'; - icon_state = "rock_side_w" - }, -/obj/effect/decal{ - name = "rock"; - icon = 'icons/turf/mining.dmi'; - icon_state = "rock_side_n" - }, -/obj/effect/decal{ - name = "rock"; - icon = 'icons/turf/mining.dmi'; - icon_state = "rock_side_s" - }, -/turf/unsimulated/beach/sand, -/area/awaymission/beach) -"aF" = ( -/obj/item/paper/hotel_scrap_5, -/turf/unsimulated/beach/sand, -/area/awaymission/beach) -"aG" = ( -/mob/living/simple_animal/hostile/pirate, -/turf/unsimulated/beach/sand, -/area/awaymission/beach) -"aH" = ( -/obj/effect/decal{ - name = "rock"; - icon = 'icons/turf/mining.dmi'; - icon_state = "rock_side_e" - }, -/turf/unsimulated/beach/sand, -/area/awaymission/beach) -"aI" = ( -/obj/structure/bed, -/obj/item/bedsheet, -/turf/unsimulated/floor{ - icon_state = "floor" - }, -/area/awaymission{ - name = "Amazing Place"; - requires_power = 0 - }) -"aJ" = ( -/obj/effect/view_portal/visual{ - dir = 1; - dist = 3; - id = "snowland_room"; - radius = 3 - }, -/turf/unsimulated/floor/snow, -/area/awaymission{ - name = "Snowland"; - requires_power = 0 - }) -"aK" = ( -/obj/effect/decal{ - name = "rock"; - icon = 'icons/turf/mining.dmi'; - icon_state = "rock_side_e" - }, -/obj/effect/decal{ - name = "rock"; - icon = 'icons/turf/mining.dmi'; - icon_state = "rock_side_n" - }, -/obj/effect/decal{ - name = "rock"; - icon = 'icons/turf/mining.dmi'; - icon_state = "rock_side_w" - }, -/mob/living/simple_animal/hostile/bear, -/turf/unsimulated/floor{ - icon_state = "asteroid"; - name = "cave" - }, -/area/awaymission{ - name = "Snowland"; - requires_power = 0 - }) -"aL" = ( -/obj/effect/decal{ - name = "rock"; - icon = 'icons/turf/mining.dmi'; - icon_state = "rock_side_w" - }, -/turf/unsimulated/beach/sand, -/area/awaymission/beach) -"aM" = ( -/obj/effect/decal/snow/sand/edge{ - name = "rough sand" - }, -/turf/unsimulated/beach/sand, -/area/awaymission/beach) -"aN" = ( -/obj/effect/view_portal/visual{ - dir = 8; - dist = 2; - id = "mazeland_111"; - radius = 1 - }, -/turf/unsimulated/floor{ - icon_state = "floor" - }, -/area/awaymission{ - name = "Amazing Place"; - requires_power = 0 - }) -"aO" = ( -/obj/effect/view_portal{ - id = "mazeland_121" - }, -/turf/unsimulated/floor{ - icon_state = "floor" - }, -/area/awaymission{ - name = "Amazing Place"; - requires_power = 0 - }) -"aP" = ( -/obj/machinery/light{ - dir = 8 - }, -/turf/unsimulated/floor{ - icon_state = "floor" - }, -/area/awaymission{ - name = "Amazing Place"; - requires_power = 0 - }) -"aQ" = ( -/obj/effect/view_portal/visual{ - dir = 8; - dist = 2; - id = "mazeland_31"; - radius = 1 - }, -/turf/unsimulated/floor{ - icon_state = "floor" - }, -/area/awaymission{ - name = "Amazing Place"; - requires_power = 0 - }) -"aR" = ( -/turf/unsimulated/wall/fakeglass{ - dir = 8; - icon_state = "fakewindows"; - opacity = 1 - }, -/area/awaymission{ - name = "Snowland"; - requires_power = 0 - }) -"aS" = ( -/turf/unsimulated/wall/fakeglass{ - dir = 4; - icon_state = "fakewindows"; - opacity = 0 - }, -/area/awaymission{ - name = "Snowland"; - requires_power = 0 - }) -"aT" = ( -/obj/effect/view_portal{ - id = "snowland" - }, -/obj/effect/decal/snow/sand/surround{ - icon_state = "gravsnow_surround"; - dir = 1 - }, -/turf/unsimulated/floor/snow, -/area/awaymission{ - name = "Snowland"; - requires_power = 0 - }) -"aU" = ( -/turf/unsimulated/wall/fakeglass{ - dir = 8; - icon_state = "fakewindows"; - opacity = 0 - }, -/area/awaymission{ - name = "Snowland"; - requires_power = 0 - }) -"aV" = ( -/turf/unsimulated/wall/fakeglass{ - dir = 4; - icon_state = "fakewindows"; - opacity = 1 - }, -/area/awaymission{ - name = "Snowland"; - requires_power = 0 - }) -"aW" = ( -/obj/effect/decal{ - name = "rock"; - icon = 'icons/turf/mining.dmi'; - icon_state = "rock_side_w" - }, -/obj/effect/decal{ - name = "rock"; - icon = 'icons/turf/mining.dmi'; - icon_state = "rock_side_n" - }, -/turf/unsimulated/floor{ - icon_state = "asteroid"; - name = "cave" - }, -/area/awaymission{ - name = "Snowland"; - requires_power = 0 - }) -"aX" = ( -/obj/effect/decal{ - name = "rock"; - icon = 'icons/turf/mining.dmi'; - icon_state = "rock_side_e" - }, -/obj/effect/decal{ - name = "rock"; - icon = 'icons/turf/mining.dmi'; - icon_state = "rock_side_s" - }, -/turf/unsimulated/floor{ - icon_state = "asteroid"; - name = "cave" - }, -/area/awaymission{ - name = "Snowland"; - requires_power = 0 - }) -"aY" = ( -/obj/machinery/light{ - dir = 8 - }, -/mob/living/simple_animal/hostile/retaliate/carp, -/turf/unsimulated/beach/water/deep/wood_floor{ - icon = 'icons/turf/shuttle.dmi'; - icon_state = "floor"; - name = "Pool Floor" - }, -/area/awaymission/undersea{ - requires_power = 0 - }) -"aZ" = ( -/obj/structure/ladder/unbreakable/dive_point/anchor{ - id = "weirddive"; - layer = 4.5 - }, -/turf/unsimulated/beach/water/deep/wood_floor{ - icon = 'icons/turf/shuttle.dmi'; - icon_state = "floor"; - name = "Pool Floor" - }, -/area/awaymission/undersea{ - requires_power = 0 - }) -"ba" = ( -/obj/machinery/light{ - dir = 4; - icon_state = "tube1" - }, -/turf/unsimulated/beach/water/deep/wood_floor{ - icon = 'icons/turf/shuttle.dmi'; - icon_state = "floor"; - name = "Pool Floor" - }, -/area/awaymission/undersea{ - requires_power = 0 - }) -"bb" = ( -/obj/effect/decal/snow/sand/edge{ - name = "rough sand"; - icon_state = "gravsnow_corner"; - dir = 4 - }, -/obj/structure/closet/athletic_mixed, -/turf/unsimulated/beach/sand, -/area/awaymission/beach) -"bc" = ( -/turf/unsimulated/wall{ - icon_state = "sandstone6" - }, -/area/awaymission/beach) -"bd" = ( -/turf/unsimulated/wall{ - icon_state = "sandstone12" - }, -/area/awaymission/beach) -"be" = ( -/turf/unsimulated/wall{ - icon_state = "sandstone10" - }, -/area/awaymission/beach) -"bf" = ( -/obj/effect/decal/snow/sand/edge{ - name = "rough sand"; - icon_state = "gravsnow_corner"; - dir = 8 - }, -/turf/unsimulated/beach/sand, -/area/awaymission/beach) -"bg" = ( -/obj/effect/decal{ - name = "rock"; - icon = 'icons/turf/mining.dmi'; - icon_state = "rock_side_e" - }, -/obj/effect/decal{ - name = "rock"; - icon = 'icons/turf/mining.dmi'; - icon_state = "rock_side_s" - }, -/turf/unsimulated/beach/sand, -/area/awaymission/beach) -"bh" = ( -/obj/effect/decal/snow/sand/edge{ - icon_state = "gravsnow_corner"; - dir = 1 - }, -/obj/effect/decal{ - name = "rock"; - icon = 'icons/turf/mining.dmi'; - icon_state = "rock_side_w" - }, -/obj/machinery/light{ - dir = 8 - }, -/turf/unsimulated/floor/snow, -/area/awaymission{ - name = "Snowland"; - requires_power = 0 - }) -"bi" = ( -/obj/effect/decal/snow/sand/edge{ - icon_state = "gravsnow_corner"; - dir = 1 - }, -/turf/unsimulated/floor/snow, -/area/awaymission{ - name = "Snowland"; - requires_power = 0 - }) -"bj" = ( -/turf/unsimulated/floor/snow, -/area/awaymission{ - name = "Snowland"; - requires_power = 0 - }) -"bk" = ( -/obj/effect/decal/snow/sand/edge{ - icon_state = "gravsnow_corner"; - dir = 1 - }, -/obj/effect/decal{ - name = "rock"; - icon = 'icons/turf/mining.dmi'; - icon_state = "rock_side_e" - }, -/obj/machinery/light{ - dir = 4; - icon_state = "tube1" - }, -/turf/unsimulated/floor/snow, -/area/awaymission{ - name = "Snowland"; - requires_power = 0 - }) -"bl" = ( -/obj/effect/decal{ - name = "rock"; - icon = 'icons/turf/mining.dmi'; - icon_state = "rock_side_w" - }, -/obj/effect/decal{ - name = "rock"; - icon = 'icons/turf/mining.dmi'; - icon_state = "rock_side_n" - }, -/obj/effect/decal/snow/clean/edge, -/turf/unsimulated/floor{ - icon_state = "asteroid"; - name = "cave" - }, -/area/awaymission{ - name = "Snowland"; - requires_power = 0 - }) -"bm" = ( -/obj/effect/decal{ - name = "rock"; - icon = 'icons/turf/mining.dmi'; - icon_state = "rock_side_e" - }, -/obj/effect/decal/snow/clean/edge{ - icon_state = "snow_corner"; - dir = 6 - }, -/turf/unsimulated/floor{ - icon_state = "asteroid"; - name = "cave" - }, -/area/awaymission{ - name = "Snowland"; - requires_power = 0 - }) -"bn" = ( -/obj/effect/decal/snow/sand/edge{ - name = "rough sand"; - icon_state = "gravsnow_corner"; - dir = 4 - }, -/obj/item/clothing/shoes/sandal, -/obj/item/clothing/shoes/sandal, -/obj/item/clothing/shoes/sandal, -/obj/structure/closet/crate, -/turf/unsimulated/beach/sand, -/area/awaymission/beach) -"bo" = ( -/turf/unsimulated/wall{ - icon_state = "sandstone3" - }, -/area/awaymission/beach) -"bp" = ( -/turf/unsimulated/wall{ - dynamic_lighting = 0; - icon = null - }, -/area/awaymission/beach) -"bq" = ( -/obj/item/beach_ball, -/turf/unsimulated/beach/sand, -/area/awaymission/beach) -"br" = ( -/obj/effect/view_portal/visual{ - dir = 8; - dist = 2; - id = "mazeland_212"; - radius = 1 - }, -/turf/unsimulated/floor{ - icon_state = "floor" - }, -/area/awaymission{ - name = "Amazing Place"; - requires_power = 0 - }) -"bs" = ( -/obj/effect/view_portal{ - id = "mazeland_122" - }, -/turf/unsimulated/floor{ - icon_state = "floor" - }, -/area/awaymission{ - name = "Amazing Place"; - requires_power = 0 - }) -"bt" = ( -/obj/effect/view_portal{ - id = "mazeland_212" - }, -/turf/unsimulated/floor{ - icon_state = "floor" - }, -/area/awaymission{ - name = "Amazing Place"; - requires_power = 0 - }) -"bu" = ( -/obj/effect/decal{ - name = "rock"; - icon = 'icons/turf/mining.dmi'; - icon_state = "rock_side_w" - }, -/obj/effect/decal{ - name = "rock"; - icon = 'icons/turf/mining.dmi'; - icon_state = "rock_side_n" - }, -/turf/unsimulated/floor/snow, -/area/awaymission{ - name = "Snowland"; - requires_power = 0 - }) -"bv" = ( -/obj/effect/decal{ - name = "rock"; - icon = 'icons/turf/mining.dmi'; - icon_state = "rock_side_e" - }, -/obj/effect/decal{ - name = "rock"; - icon = 'icons/turf/mining.dmi'; - icon_state = "rock_side_n" - }, -/turf/unsimulated/floor/snow, -/area/awaymission{ - name = "Snowland"; - requires_power = 0 - }) -"bw" = ( -/obj/effect/decal{ - name = "rock"; - icon = 'icons/turf/mining.dmi'; - icon_state = "rock_side_w" - }, -/turf/unsimulated/floor/snow, -/area/awaymission{ - name = "Snowland"; - requires_power = 0 - }) -"bx" = ( -/obj/effect/decal{ - name = "rock"; - icon = 'icons/turf/mining.dmi'; - icon_state = "rock_side_e" - }, -/turf/unsimulated/floor/snow, -/area/awaymission{ - name = "Snowland"; - requires_power = 0 - }) -"by" = ( -/obj/effect/decal{ - name = "rock"; - icon = 'icons/turf/mining.dmi'; - icon_state = "rock_side_w" - }, -/obj/effect/decal{ - name = "rock"; - icon = 'icons/turf/mining.dmi'; - icon_state = "rock_side_s" - }, -/turf/unsimulated/beach/sand, -/area/awaymission/beach) -"bz" = ( -/obj/effect/decal/snow/sand/edge{ - name = "rough sand"; - icon_state = "gravsnow_corner"; - dir = 4 - }, -/turf/unsimulated/beach/sand, -/area/awaymission/beach) -"bA" = ( -/turf/unsimulated/wall{ - icon_state = "sandstone1" - }, -/area/awaymission/beach) -"bB" = ( -/obj/effect/view_portal/visual{ - dir = 1; - dist = 3; - id = "beach_room"; - radius = 2 - }, -/turf/unsimulated/floor, -/area/awaymission/beach) -"bC" = ( -/mob/living/simple_animal/crab{ - faction = list("neutral","pirate") - }, -/turf/unsimulated/beach/sand, -/area/awaymission/beach) -"bE" = ( -/obj/effect/decal{ - name = "rock"; - icon = 'icons/turf/mining.dmi'; - icon_state = "rock_side_w" - }, -/obj/effect/decal{ - name = "rock"; - icon = 'icons/turf/mining.dmi'; - icon_state = "rock_side_n" - }, -/obj/structure/closet/crate/secure/loot, -/obj/effect/decal{ - name = "rock"; - icon = 'icons/turf/mining.dmi'; - icon_state = "rock_side_s" - }, -/turf/unsimulated/floor{ - icon_state = "asteroid"; - name = "cave" - }, -/area/awaymission{ - name = "Snowland"; - requires_power = 0 - }) -"bF" = ( -/obj/effect/decal{ - name = "rock"; - icon = 'icons/turf/mining.dmi'; - icon_state = "rock_side_e" - }, -/obj/effect/decal{ - name = "rock"; - icon = 'icons/turf/mining.dmi'; - icon_state = "rock_side_n" - }, -/turf/unsimulated/floor{ - icon_state = "asteroid"; - name = "cave" - }, -/area/awaymission{ - name = "Snowland"; - requires_power = 0 - }) -"bG" = ( -/obj/effect/decal{ - name = "rock"; - icon = 'icons/turf/mining.dmi'; - icon_state = "rock_side_n" - }, -/obj/effect/decal{ - name = "rock"; - icon = 'icons/turf/mining.dmi'; - icon_state = "rock_side_w" - }, -/turf/unsimulated/floor/snow, -/area/awaymission{ - name = "Snowland"; - requires_power = 0 - }) -"bH" = ( -/obj/effect/decal{ - name = "rock"; - icon = 'icons/turf/mining.dmi'; - icon_state = "rock_side_n" - }, -/turf/unsimulated/floor/snow, -/area/awaymission{ - name = "Snowland"; - requires_power = 0 - }) -"bI" = ( -/obj/effect/decal{ - name = "rock"; - icon = 'icons/turf/mining.dmi'; - icon_state = "rock_side_n" - }, -/obj/effect/decal{ - name = "rock"; - icon = 'icons/turf/mining.dmi'; - icon_state = "rock_side_e" - }, -/turf/unsimulated/floor/snow, -/area/awaymission{ - name = "Snowland"; - requires_power = 0 - }) -"bJ" = ( -/obj/effect/decal/snow/sand/edge{ - name = "rough sand"; - icon_state = "gravsnow_corner"; - dir = 1 - }, -/turf/unsimulated/beach/sand, -/area/awaymission/beach) -"bK" = ( -/obj/effect/decal/snow/sand/edge{ - name = "rough sand"; - icon_state = "gravsnow_corner"; - dir = 1 - }, -/obj/effect/view_portal{ - id = "beach" - }, -/turf/unsimulated/beach/sand, -/area/awaymission/beach) -"bL" = ( -/obj/effect/decal/snow/sand/edge{ - dir = 9; - icon_state = "gravsnow_corner"; - name = "rough sand" - }, -/turf/unsimulated/floor{ - icon_state = "asteroid"; - name = "cave" - }, -/area/awaymission) -"bM" = ( -/obj/effect/decal/snow/sand/edge{ - name = "rough sand"; - icon_state = "gravsnow_corner"; - dir = 1 - }, -/turf/unsimulated/floor{ - icon_state = "asteroid"; - name = "cave" - }, -/area/awaymission) -"bN" = ( -/obj/effect/decal/snow/sand/edge{ - dir = 5; - icon_state = "gravsnow_corner"; - name = "rough sand" - }, -/turf/unsimulated/floor{ - icon_state = "asteroid"; - name = "cave" - }, -/area/awaymission) -"bO" = ( -/obj/effect/view_portal{ - id = "mazeland_213" - }, -/turf/unsimulated/floor{ - icon_state = "floor" - }, -/area/awaymission{ - name = "Amazing Place"; - requires_power = 0 - }) -"bP" = ( -/obj/structure/toilet{ - pixel_y = 8 - }, -/obj/machinery/light, -/turf/unsimulated/floor{ - icon_state = "floor" - }, -/area/awaymission{ - name = "Amazing Place"; - requires_power = 0 - }) -"bQ" = ( -/obj/effect/view_portal{ - id = "mazeland_413" - }, -/turf/unsimulated/floor{ - icon_state = "floor" - }, -/area/awaymission{ - name = "Amazing Place"; - requires_power = 0 - }) -"bR" = ( -/obj/effect/decal{ - name = "rock"; - icon = 'icons/turf/mining.dmi'; - icon_state = "rock_side_w" - }, -/obj/effect/decal{ - name = "rock"; - icon = 'icons/turf/mining.dmi'; - icon_state = "rock_side_s" - }, -/obj/effect/decal/snow/clean/edge{ - icon_state = "snow_corner"; - dir = 6 - }, -/turf/unsimulated/floor{ - icon_state = "asteroid"; - name = "cave" - }, -/area/awaymission{ - name = "Snowland"; - requires_power = 0 - }) -"bS" = ( -/obj/effect/decal{ - name = "rock"; - icon = 'icons/turf/mining.dmi'; - icon_state = "rock_side_s" - }, -/obj/effect/decal{ - name = "rock"; - icon = 'icons/turf/mining.dmi'; - icon_state = "rock_side_n" - }, -/turf/unsimulated/floor/snow, -/area/awaymission{ - name = "Snowland"; - requires_power = 0 - }) -"bT" = ( -/obj/structure/flora/bush, -/turf/unsimulated/floor/snow, -/area/awaymission{ - name = "Snowland"; - requires_power = 0 - }) -"bU" = ( -/obj/structure/flora/grass/green, -/turf/unsimulated/floor/snow, -/area/awaymission{ - name = "Snowland"; - requires_power = 0 - }) -"bV" = ( -/turf/unsimulated/floor{ - icon_state = "asteroid"; - name = "cave" - }, -/area/awaymission) -"bW" = ( -/obj/effect/view_portal/visual{ - dir = 1; - dist = 7; - id = "mazeland_213"; - radius = 1 - }, -/turf/unsimulated/floor{ - icon_state = "floor" - }, -/area/awaymission{ - name = "Amazing Place"; - requires_power = 0 - }) -"bX" = ( -/obj/effect/view_portal/visual{ - dir = 1; - dist = 7; - id = "mazeland_413"; - radius = 1 - }, -/turf/unsimulated/floor{ - icon_state = "floor" - }, -/area/awaymission{ - name = "Amazing Place"; - requires_power = 0 - }) -"bY" = ( -/obj/effect/view_portal/visual{ - dist = 2; - id = "mazeland_131"; - radius = 1 - }, -/turf/unsimulated/floor{ - icon_state = "floor" - }, -/area/awaymission{ - name = "Amazing Place"; - requires_power = 0 - }) -"bZ" = ( -/obj/effect/view_portal{ - id = "mazeland_331" - }, -/turf/unsimulated/floor{ - icon_state = "floor" - }, -/area/awaymission{ - name = "Amazing Place"; - requires_power = 0 - }) -"ca" = ( -/obj/effect/view_portal{ - id = "mazeland_332" - }, -/turf/unsimulated/floor{ - icon_state = "floor" - }, -/area/awaymission{ - name = "Amazing Place"; - requires_power = 0 - }) -"cb" = ( -/obj/effect/view_portal/visual{ - dist = 2; - id = "mazeland_132"; - radius = 1 - }, -/turf/unsimulated/floor{ - icon_state = "floor" - }, -/area/awaymission{ - name = "Amazing Place"; - requires_power = 0 - }) -"cc" = ( -/obj/structure/window/reinforced/tinted, -/turf/unsimulated/beach/water/deep/wood_floor{ - icon = 'icons/turf/shuttle.dmi'; - icon_state = "floor"; - name = "Pool Floor" - }, -/area/awaymission/undersea{ - requires_power = 0 - }) -"cd" = ( -/obj/machinery/door/window/southright, -/turf/unsimulated/beach/water/deep/wood_floor{ - icon = 'icons/turf/shuttle.dmi'; - icon_state = "floor"; - name = "Pool Floor" - }, -/area/awaymission/undersea{ - requires_power = 0 - }) -"ce" = ( -/obj/structure/window/reinforced/tinted, -/obj/machinery/light, -/turf/unsimulated/beach/water/deep/wood_floor{ - icon = 'icons/turf/shuttle.dmi'; - icon_state = "floor"; - name = "Pool Floor" - }, -/area/awaymission/undersea{ - requires_power = 0 - }) -"cf" = ( -/obj/effect/light_emitter{ - invisibility = 101; - light_color = "#ffffc0"; - light_power = 2 - }, -/turf/unsimulated/floor{ - icon_state = "asteroid"; - name = "cave" - }, -/area/awaymission) -"cg" = ( -/obj/effect/decal/snow/sand/edge{ - name = "rough sand"; - icon_state = "gravsnow_corner"; - dir = 4 - }, -/turf/unsimulated/floor{ - icon_state = "asteroid"; - name = "cave" - }, -/area/awaymission) -"ch" = ( -/obj/effect/view_portal{ - id = "mazeland_131" - }, -/turf/unsimulated/floor{ - icon_state = "floor" - }, -/area/awaymission{ - name = "Amazing Place"; - requires_power = 0 - }) -"ci" = ( -/obj/effect/view_portal{ - id = "mazeland_132" - }, -/turf/unsimulated/floor{ - icon_state = "floor" - }, -/area/awaymission{ - name = "Amazing Place"; - requires_power = 0 - }) -"cj" = ( -/obj/effect/view_portal/visual{ - dir = 2; - dist = 7; - id = "mazeland_411"; - radius = 1 - }, -/turf/unsimulated/floor{ - icon_state = "floor" - }, -/area/awaymission{ - name = "Amazing Place"; - requires_power = 0 - }) -"ck" = ( -/obj/effect/view_portal/visual{ - dir = 2; - dist = 7; - id = "mazeland_211"; - radius = 1 - }, -/turf/unsimulated/floor{ - icon_state = "floor" - }, -/area/awaymission{ - name = "Amazing Place"; - requires_power = 0 - }) -"cl" = ( -/turf/unsimulated/wall/metal, -/area/awaymission/spacehotel) -"cm" = ( -/obj/structure/sink{ - icon_state = "sink"; - dir = 8; - pixel_x = -12; - pixel_y = 2 - }, -/obj/structure/mirror{ - dir = 8; - pixel_x = -28 - }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/awaymission/spacehotel) -"cn" = ( -/obj/structure/toilet{ - dir = 1 - }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/awaymission/spacehotel) -"co" = ( -/obj/machinery/door/window/eastleft, -/obj/machinery/button/windowtint{ - id = "room_n"; - pixel_y = -24; - range = 2 - }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/awaymission/spacehotel) -"cp" = ( -/obj/machinery/shower{ - dir = 8 - }, -/obj/structure/curtain/open/shower{ - anchored = 1; - opacity = 1 - }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - opacity = 1 - }, -/area/awaymission/spacehotel) -"cq" = ( -/obj/effect/decal/snow/sand/edge{ - name = "rough sand"; - icon_state = "gravsnow_corner"; - dir = 8 - }, -/turf/unsimulated/floor{ - icon_state = "asteroid"; - name = "cave" - }, -/area/awaymission) -"cr" = ( -/obj/item/candle/eternal, -/turf/unsimulated/floor{ - icon_state = "asteroid"; - name = "cave" - }, -/area/awaymission) -"cs" = ( -/obj/structure/mirror{ - dir = 8; - pixel_x = -28 - }, -/obj/structure/sink{ - icon_state = "sink"; - dir = 8; - pixel_x = -12; - pixel_y = 2 - }, -/turf/unsimulated/floor{ - icon_state = "floor" - }, -/area/awaymission{ - name = "Amazing Place"; - requires_power = 0 - }) -"ct" = ( -/obj/machinery/light{ - dir = 1 - }, -/turf/unsimulated/floor{ - icon_state = "floor" - }, -/area/awaymission{ - name = "Amazing Place"; - requires_power = 0 - }) -"cu" = ( -/obj/structure/mirror{ - dir = 4; - pixel_x = 28 - }, -/obj/structure/sink{ - dir = 4; - icon_state = "sink"; - pixel_x = 12; - pixel_y = 2 - }, -/turf/unsimulated/floor{ - icon_state = "floor" - }, -/area/awaymission{ - name = "Amazing Place"; - requires_power = 0 - }) -"cv" = ( -/obj/effect/decal{ - name = "rock"; - icon = 'icons/turf/mining.dmi'; - icon_state = "rock_side_w" - }, -/obj/effect/decal{ - name = "rock"; - icon = 'icons/turf/mining.dmi'; - icon_state = "rock_side_e" - }, -/obj/structure/closet/crate/secure/loot, -/obj/effect/decal{ - name = "rock"; - icon = 'icons/turf/mining.dmi'; - icon_state = "rock_side_n" - }, -/turf/unsimulated/floor{ - icon_state = "asteroid"; - name = "cave" - }, -/area/awaymission{ - name = "Snowland"; - requires_power = 0 - }) -"cw" = ( -/obj/structure/flora/tree/pine, -/turf/unsimulated/floor/snow, -/area/awaymission{ - name = "Snowland"; - requires_power = 0 - }) -"cx" = ( -/obj/effect/view_portal{ - id = "poolland" - }, -/obj/machinery/light/small, -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/awaymission/spacehotel) -"cy" = ( -/turf/unsimulated/floor, -/area/awaymission/undersea{ - requires_power = 0 - }) -"cz" = ( -/obj/effect/levelref{ - id = "lavaland"; - name = "lavaland" - }, -/obj/effect/light_emitter{ - invisibility = 101; - light_color = "#ffffc0"; - light_power = 2 - }, -/obj/effect/rune, -/turf/unsimulated/floor{ - icon_state = "asteroid"; - name = "cave" - }, -/area/awaymission) -"cA" = ( -/obj/effect/decal{ - name = "rock"; - icon = 'icons/turf/mining.dmi'; - icon_state = "rock_side_w" - }, -/obj/effect/decal{ - name = "rock"; - icon = 'icons/turf/mining.dmi'; - icon_state = "rock_side_n" - }, -/mob/living/simple_animal/hostile/bear, -/turf/unsimulated/floor{ - icon_state = "asteroid"; - name = "cave" - }, -/area/awaymission{ - name = "Snowland"; - requires_power = 0 - }) -"cB" = ( -/obj/effect/decal{ - name = "rock"; - icon = 'icons/turf/mining.dmi'; - icon_state = "rock_side_e" - }, -/turf/unsimulated/floor{ - icon_state = "asteroid"; - name = "cave" - }, -/area/awaymission{ - name = "Snowland"; - requires_power = 0 - }) -"cC" = ( -/obj/structure/flora/grass/both, -/turf/unsimulated/floor/snow, -/area/awaymission{ - name = "Snowland"; - requires_power = 0 - }) -"cD" = ( -/obj/effect/decal{ - name = "rock"; - icon = 'icons/turf/mining.dmi'; - icon_state = "rock_side_s" - }, -/turf/unsimulated/beach/sand, -/area/awaymission/beach) -"cE" = ( -/obj/effect/decal/snow/sand/edge{ - name = "rough sand"; - icon_state = "gravsnow_corner"; - dir = 10 - }, -/turf/unsimulated/floor{ - icon_state = "asteroid"; - name = "cave" - }, -/area/awaymission) -"cF" = ( -/obj/effect/decal{ - name = "rock"; - icon = 'icons/turf/mining.dmi'; - icon_state = "rock_side_w" - }, -/turf/unsimulated/floor{ - icon_state = "asteroid"; - name = "cave" - }, -/area/awaymission{ - name = "Snowland"; - requires_power = 0 - }) -"cG" = ( -/obj/effect/decal{ - name = "rock"; - icon = 'icons/turf/mining.dmi'; - icon_state = "rock_side_e" - }, -/obj/effect/decal/snow/clean/edge, -/turf/unsimulated/floor{ - icon_state = "asteroid"; - name = "cave" - }, -/area/awaymission{ - name = "Snowland"; - requires_power = 0 - }) -"cH" = ( -/obj/effect/decal{ - name = "rock"; - icon = 'icons/turf/mining.dmi'; - icon_state = "rock_side_w" - }, -/turf/unsimulated/beach/coastline, -/area/awaymission/beach) -"cI" = ( -/obj/effect/waterfall{ - dir = 1; - water_frequency = 104 - }, -/turf/unsimulated/beach/coastline, -/area/awaymission/beach) -"cJ" = ( -/turf/unsimulated/beach/coastline, -/area/awaymission/beach) -"cK" = ( -/obj/effect/waterfall{ - dir = 1; - water_frequency = 97 - }, -/turf/unsimulated/beach/coastline, -/area/awaymission/beach) -"cL" = ( -/obj/effect/waterfall{ - dir = 1; - water_frequency = 94 - }, -/turf/unsimulated/beach/coastline, -/area/awaymission/beach) -"cM" = ( -/obj/effect/waterfall{ - dir = 1; - water_frequency = 192 - }, -/turf/unsimulated/beach/coastline, -/area/awaymission/beach) -"cN" = ( -/obj/effect/decal{ - name = "rock"; - icon = 'icons/turf/mining.dmi'; - icon_state = "rock_side_e" - }, -/turf/unsimulated/beach/coastline/dense, -/area/awaymission/beach) -"cO" = ( -/turf/simulated/floor/chasm, -/area/awaymission) -"cP" = ( -/obj/effect/decal/snow/sand/edge{ - name = "rough sand"; - icon_state = "gravsnow_corner"; - dir = 6 - }, -/turf/unsimulated/floor{ - icon_state = "asteroid"; - name = "cave" - }, -/area/awaymission) -"cQ" = ( -/obj/effect/decal{ - name = "rock"; - icon = 'icons/turf/mining.dmi'; - icon_state = "rock_side_w" - }, -/obj/effect/decal/snow/clean/edge{ - icon_state = "snow_corner"; - dir = 6 - }, -/turf/unsimulated/floor{ - icon_state = "asteroid"; - name = "cave" - }, -/area/awaymission{ - name = "Snowland"; - requires_power = 0 - }) -"cR" = ( -/obj/machinery/poolcontroller/invisible/sea, -/turf/unsimulated/wall/metal, -/area/awaymission/undersea{ - requires_power = 0 - }) -"cS" = ( -/obj/effect/decal{ - name = "rock"; - icon = 'icons/turf/mining.dmi'; - icon_state = "rock_side_w" - }, -/turf/unsimulated/beach/water, -/area/awaymission/beach) -"cT" = ( -/turf/unsimulated/beach/water, -/area/awaymission/beach) -"cU" = ( -/obj/effect/decal{ - name = "rock"; - icon = 'icons/turf/mining.dmi'; - icon_state = "rock_side_e" - }, -/obj/effect/decal{ - name = "rock"; - icon = 'icons/turf/mining.dmi'; - icon_state = "rock_side_s" - }, -/turf/unsimulated/beach/water/dense, -/area/awaymission/beach) -"cV" = ( -/obj/effect/decal/snow/sand/edge{ - name = "rough sand" - }, -/turf/unsimulated/floor{ - icon_state = "asteroid"; - name = "cave" - }, -/area/awaymission) -"cW" = ( -/obj/effect/decal{ - name = "rock"; - icon = 'icons/turf/mining.dmi'; - icon_state = "rock_side_w" - }, -/obj/effect/decal{ - name = "rock"; - icon = 'icons/turf/mining.dmi'; - icon_state = "rock_side_s" - }, -/turf/unsimulated/floor/snow, -/area/awaymission{ - name = "Snowland"; - requires_power = 0 - }) -"cX" = ( -/obj/effect/decal{ - name = "rock"; - icon = 'icons/turf/mining.dmi'; - icon_state = "rock_side_s" - }, -/turf/unsimulated/floor/snow, -/area/awaymission{ - name = "Snowland"; - requires_power = 0 - }) -"cY" = ( -/obj/effect/decal{ - name = "rock"; - icon = 'icons/turf/mining.dmi'; - icon_state = "rock_side_w" - }, -/obj/effect/decal{ - name = "rock"; - icon = 'icons/turf/mining.dmi'; - icon_state = "rock_side_s" - }, -/turf/unsimulated/beach/water, -/area/awaymission/beach) -"cZ" = ( -/obj/effect/decal{ - name = "rock"; - icon = 'icons/turf/mining.dmi'; - icon_state = "rock_side_s" - }, -/turf/unsimulated/beach/water, -/area/awaymission/beach) -"da" = ( -/obj/effect/decal{ - name = "rock"; - icon = 'icons/turf/mining.dmi'; - icon_state = "rock_side_s" - }, -/obj/effect/decal{ - name = "rock"; - icon = 'icons/turf/mining.dmi'; - icon_state = "rock_side_e" - }, -/turf/unsimulated/beach/water, -/area/awaymission/beach) -"db" = ( -/obj/effect/decal{ - name = "rock"; - icon = 'icons/turf/mining.dmi'; - icon_state = "rock_side_s" - }, -/obj/effect/decal{ - name = "rock"; - icon = 'icons/turf/mining.dmi'; - icon_state = "rock_side_w" - }, -/turf/unsimulated/beach/water, -/area/awaymission/beach) -"dc" = ( -/obj/effect/decal{ - name = "rock"; - icon = 'icons/turf/mining.dmi'; - icon_state = "rock_side_e" - }, -/turf/unsimulated/beach/water, -/area/awaymission/beach) -"dd" = ( -/obj/effect/decal/snow/sand/edge{ - name = "rough sand"; - icon_state = "gravsnow_corner"; - dir = 8 - }, -/obj/effect/decal/snow/sand/edge{ - name = "rough sand"; - icon_state = "gravsnow_corner"; - dir = 4 - }, -/turf/unsimulated/floor{ - icon_state = "asteroid"; - name = "cave" - }, -/area/awaymission) -"de" = ( -/obj/effect/decal{ - name = "rock"; - icon = 'icons/turf/mining.dmi'; - icon_state = "rock_side_e" - }, -/obj/effect/decal{ - name = "rock"; - icon = 'icons/turf/mining.dmi'; - icon_state = "rock_side_s" - }, -/turf/unsimulated/floor/snow, -/area/awaymission{ - name = "Snowland"; - requires_power = 0 - }) -"df" = ( -/obj/item/mop, -/turf/unsimulated/beach/water/deep/wood_floor{ - icon = 'icons/turf/shuttle.dmi'; - icon_state = "floor"; - name = "Pool Floor" - }, -/area/awaymission/undersea{ - requires_power = 0 - }) -"dg" = ( -/obj/effect/decal{ - name = "rock"; - icon = 'icons/turf/mining.dmi'; - icon_state = "rock_side_e" - }, -/obj/effect/decal{ - name = "rock"; - icon = 'icons/turf/mining.dmi'; - icon_state = "rock_side_s" - }, -/turf/unsimulated/beach/water, -/area/awaymission/beach) -"dh" = ( -/obj/effect/decal/snow/sand/edge, -/turf/unsimulated/floor/snow, -/area/awaymission{ - name = "Snowland"; - requires_power = 0 - }) -"di" = ( -/obj/structure/mopbucket, -/turf/unsimulated/beach/water/deep/wood_floor{ - icon = 'icons/turf/shuttle.dmi'; - icon_state = "floor"; - name = "Pool Floor" - }, -/area/awaymission/undersea{ - requires_power = 0 - }) -"dj" = ( -/obj/effect/decal{ - name = "rock"; - icon = 'icons/turf/mining.dmi'; - icon_state = "rock_side_w" - }, -/obj/effect/decal/snow/sand/edge{ - name = "rough sand"; - icon_state = "gravsnow_corner"; - dir = 6 - }, -/turf/unsimulated/floor/snow, -/area/awaymission{ - name = "Snowland"; - requires_power = 0 - }) -"dk" = ( -/turf/simulated/floor/chasm, -/area/awaymission{ - name = "Snowland"; - requires_power = 0 - }) -"dl" = ( -/obj/effect/decal{ - name = "rock"; - icon = 'icons/turf/mining.dmi'; - icon_state = "rock_side_e" - }, -/obj/effect/decal/snow/sand/edge{ - name = "rough sand"; - icon_state = "gravsnow_corner"; - dir = 10 - }, -/turf/unsimulated/floor/snow, -/area/awaymission{ - name = "Snowland"; - requires_power = 0 - }) -"dm" = ( -/obj/effect/decal{ - name = "rock"; - icon = 'icons/turf/mining.dmi'; - icon_state = "rock_side_w" - }, -/turf/unsimulated/beach/water/edge_drop, -/area/awaymission/beach) -"dn" = ( -/turf/unsimulated/beach/water/drop, -/area/awaymission/beach) -"do" = ( -/obj/effect/decal{ - name = "rock"; - icon = 'icons/turf/mining.dmi'; - icon_state = "rock_side_e" - }, -/turf/unsimulated/beach/water/edge_drop, -/area/awaymission/beach) -"dp" = ( -/obj/effect/light_emitter{ - invisibility = 101; - light_color = "#ffffc0"; - light_power = 2 - }, -/obj/effect/decal{ - name = "rock"; - icon = 'icons/turf/mining.dmi'; - icon_state = "rock_side_w" - }, -/turf/simulated/floor/chasm, -/area/awaymission{ - name = "Snowland"; - requires_power = 0 - }) -"dq" = ( -/obj/effect/light_emitter{ - invisibility = 101; - light_color = "#ffffc0"; - light_power = 2 - }, -/turf/simulated/floor/chasm, -/area/awaymission{ - name = "Snowland"; - requires_power = 0 - }) -"dr" = ( -/obj/effect/light_emitter{ - invisibility = 101; - light_color = "#ffffc0"; - light_power = 2 - }, -/obj/effect/decal{ - name = "rock"; - icon = 'icons/turf/mining.dmi'; - icon_state = "rock_side_e" - }, -/turf/simulated/floor/chasm, -/area/awaymission{ - name = "Snowland"; - requires_power = 0 - }) -"ds" = ( -/obj/effect/decal{ - name = "rock"; - icon = 'icons/turf/mining.dmi'; - icon_state = "rock_side_w" - }, -/obj/effect/decal{ - name = "rock"; - icon = 'icons/turf/mining.dmi'; - icon_state = "rock_side_s" - }, -/turf/unsimulated/beach/water/deep/dense, -/area/awaymission/beach) -"dt" = ( -/obj/effect/decal{ - name = "rock"; - icon = 'icons/turf/mining.dmi'; - icon_state = "rock_side_s" - }, -/turf/unsimulated/beach/water/deep/dense, -/area/awaymission/beach) -"du" = ( -/turf/unsimulated/beach/water/deep/dense, -/area/awaymission/beach) -"dv" = ( -/obj/effect/decal{ - name = "rock"; - icon = 'icons/turf/mining.dmi'; - icon_state = "rock_side_e" - }, -/turf/unsimulated/beach/water/deep/dense, -/area/awaymission/beach) -"dw" = ( -/obj/effect/decal{ - name = "rock"; - icon = 'icons/turf/mining.dmi'; - icon_state = "rock_side_n" - }, -/turf/simulated/floor/chasm, -/area/awaymission{ - name = "Snowland"; - requires_power = 0 - }) -"dx" = ( -/obj/effect/decal{ - name = "rock"; - icon = 'icons/turf/mining.dmi'; - icon_state = "rock_side_n" - }, -/obj/effect/decal{ - name = "rock"; - icon = 'icons/turf/mining.dmi'; - icon_state = "rock_side_e" - }, -/turf/simulated/floor/chasm, -/area/awaymission{ - name = "Snowland"; - requires_power = 0 - }) -"dy" = ( -/obj/effect/decal{ - name = "rock"; - icon = 'icons/turf/mining.dmi'; - icon_state = "rock_side_w" - }, -/obj/effect/decal{ - name = "rock"; - icon = 'icons/turf/mining.dmi'; - icon_state = "rock_side_n" - }, -/turf/simulated/floor/chasm, -/area/awaymission{ - name = "Snowland"; - requires_power = 0 - }) -"dz" = ( -/obj/machinery/light{ - dir = 8 - }, -/turf/unsimulated/beach/water/deep/wood_floor{ - icon = 'icons/turf/shuttle.dmi'; - icon_state = "floor"; - name = "Pool Floor" - }, -/area/awaymission/undersea{ - requires_power = 0 - }) -"dA" = ( -/obj/structure/ladder/unbreakable/dive_point/anchor{ - layer = 4.5 - }, -/turf/unsimulated/beach/water/deep/wood_floor{ - icon = 'icons/turf/shuttle.dmi'; - icon_state = "floor"; - name = "Pool Floor" - }, -/area/awaymission/undersea{ - requires_power = 0 - }) -"dB" = ( -/obj/effect/decal{ - name = "rock"; - icon = 'icons/turf/mining.dmi'; - icon_state = "rock_side_w" - }, -/turf/unsimulated/beach/water/deep/dense, -/area/awaymission/beach) -"dC" = ( -/turf/unsimulated/beach/water/drop/dense, -/area/awaymission/beach) -"dD" = ( -/obj/effect/decal{ - name = "rock"; - icon = 'icons/turf/mining.dmi'; - icon_state = "rock_side_e" - }, -/obj/effect/decal{ - name = "rock"; - icon = 'icons/turf/mining.dmi'; - icon_state = "rock_side_s" - }, -/turf/unsimulated/beach/water/deep/dense, -/area/awaymission/beach) -"dE" = ( -/obj/effect/decal/snow/sand/edge{ - name = "rough sand" - }, -/obj/effect/decal/snow/sand/edge{ - name = "rough sand"; - icon_state = "gravsnow_corner"; - dir = 1 - }, -/turf/unsimulated/floor{ - icon_state = "asteroid"; - name = "cave" - }, -/area/awaymission) -"dF" = ( -/turf/simulated/floor/plating/lava/smooth, -/area/awaymission{ - name = "Snowland"; - requires_power = 0 - }) -"dG" = ( -/obj/effect/decal{ - name = "rock"; - icon = 'icons/turf/mining.dmi'; - icon_state = "rock_side_w" - }, -/turf/unsimulated/beach/water/drop/dense, -/area/awaymission/beach) -"dI" = ( -/obj/machinery/light, -/turf/unsimulated/beach/water/deep/wood_floor{ - icon = 'icons/turf/shuttle.dmi'; - icon_state = "floor"; - name = "Pool Floor" - }, -/area/awaymission/undersea{ - requires_power = 0 - }) -"dJ" = ( -/turf/unsimulated/wall{ - icon_state = "sandstone2" - }, -/area/awaymission) -"dK" = ( -/obj/effect/view_portal/visual{ - dist = 3; - id = "cultroom" - }, -/turf/template_noop, -/area/awaymission) -"dL" = ( -/turf/unsimulated/wall{ - icon_state = "sandstone5" - }, -/area/awaymission) -"dM" = ( -/turf/unsimulated/wall{ - icon_state = "sandstone12" - }, -/area/awaymission) -"dN" = ( -/turf/unsimulated/wall{ - icon_state = "sandstone9" - }, -/area/awaymission) -"dO" = ( -/turf/space, -/area/space) -"dP" = ( -/obj/effect/view_portal{ - id = "turbinespace" - }, -/turf/space, -/area/space/nearstation) -"dQ" = ( -/turf/unsimulated/wall, -/area/space/nearstation) -"dR" = ( -/turf/unsimulated/wall/fakeglass{ - dir = 8; - icon_state = "fakewindows"; - opacity = 0 - }, -/area/space/nearstation) -"dS" = ( -/turf/unsimulated/wall/fakeglass{ - icon_state = "fakewindows2"; - dir = 8 - }, -/area/space/nearstation) -"dT" = ( -/turf/unsimulated/wall/fakeglass{ - dir = 4; - icon_state = "fakewindows"; - opacity = 0 - }, -/area/space/nearstation) -"dU" = ( -/turf/unsimulated/wall/fakeglass{ - dir = 8; - icon_state = "fakewindows"; - opacity = 0 - }, -/area/awaymission/spacehotel) -"dV" = ( -/turf/unsimulated/wall/fakeglass{ - icon_state = "fakewindows2"; - dir = 8 - }, -/area/awaymission/spacehotel) -"dW" = ( -/turf/unsimulated/wall/fakeglass{ - dir = 4; - icon_state = "fakewindows"; - opacity = 0 - }, -/area/awaymission/spacehotel) -"dX" = ( -/turf/template_noop, -/area/awaymission/spacehotel) -"dY" = ( -/obj/machinery/camera{ - c_tag = "Room 110"; - c_tag_order = 999; - network = list("Hotel") - }, -/turf/template_noop, -/area/awaymission/spacehotel) -"dZ" = ( -/obj/machinery/camera{ - c_tag = "Room 111"; - c_tag_order = 999; - network = list("Hotel") - }, -/turf/template_noop, -/area/awaymission/spacehotel) -"ea" = ( -/obj/machinery/camera{ - c_tag = "Room 112"; - c_tag_order = 999; - network = list("Hotel") - }, -/turf/template_noop, -/area/awaymission/spacehotel) -"eb" = ( -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"ec" = ( -/obj/structure/toilet, -/obj/machinery/light/small{ - dir = 1 - }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/awaymission/spacehotel) -"ed" = ( -/obj/structure/closet/secure_closet/personal, -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/awaymission/spacehotel) -"ee" = ( -/obj/structure/closet/secure_closet/personal, -/obj/machinery/camera{ - c_tag = "Room X"; - c_tag_order = 999; - network = list("Hotel") - }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/awaymission/spacehotel) -"ef" = ( -/obj/machinery/camera{ - c_tag = "Room 210"; - c_tag_order = 999; - network = list("Hotel") - }, -/turf/template_noop, -/area/awaymission/spacehotel) -"eg" = ( -/obj/machinery/camera{ - c_tag = "Room 211"; - c_tag_order = 999; - network = list("Hotel") - }, -/turf/template_noop, -/area/awaymission/spacehotel) -"eh" = ( -/obj/machinery/camera{ - c_tag = "Room 212"; - c_tag_order = 999; - network = list("Hotel") - }, -/turf/template_noop, -/area/awaymission/spacehotel) -"ei" = ( -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/awaymission/spacehotel) -"ej" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/obj/item/paper/hotel_scrap_2, -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/awaymission/spacehotel) -"ek" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/awaymission/spacehotel) -"el" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/awaymission/spacehotel) -"em" = ( -/obj/effect/landmark/map_loader/hotel_room, -/turf/template_noop, -/area/awaymission/spacehotel) -"en" = ( -/obj/machinery/door/airlock, -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/awaymission/spacehotel) -"eo" = ( -/obj/structure/sink{ - icon_state = "sink"; - dir = 8; - pixel_x = -12; - pixel_y = 2 - }, -/obj/structure/mirror{ - pixel_x = -28 - }, -/obj/machinery/light{ - dir = 1 - }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/awaymission/spacehotel) -"ep" = ( -/obj/machinery/light{ - dir = 1 - }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/awaymission/spacehotel) -"eq" = ( -/obj/effect/decal/cleanable/flour{ - desc = "Probably." - }, -/obj/effect/decal/cleanable/pie_smudge, -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/awaymission/spacehotel) -"er" = ( -/obj/structure/mirror{ - pixel_x = 28 - }, -/obj/structure/sink{ - dir = 4; - icon_state = "sink"; - pixel_x = 12; - pixel_y = 2 - }, -/obj/machinery/light{ - dir = 1 - }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/awaymission/spacehotel) -"es" = ( -/obj/effect/decal/cleanable/flour{ - desc = "Probably." - }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/awaymission/spacehotel) -"et" = ( -/obj/effect/decal/cleanable/pie_smudge, -/obj/effect/decal/cleanable/flour{ - desc = "Probably." - }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/awaymission/spacehotel) -"eu" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/structure/mirror{ - pixel_x = 28 - }, -/obj/structure/sink{ - dir = 4; - icon_state = "sink"; - pixel_x = 12; - pixel_y = 2 - }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/awaymission/spacehotel) -"ev" = ( -/obj/machinery/door/unpowered/hotel_door{ - icon = 'icons/obj/doors/doorgold.dmi'; - id = 110 - }, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"ew" = ( -/obj/machinery/door/unpowered/hotel_door{ - icon = 'icons/obj/doors/doorgold.dmi'; - id = 111 - }, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"ex" = ( -/obj/machinery/door/unpowered/hotel_door{ - icon = 'icons/obj/doors/doorgold.dmi'; - id = 112 - }, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"ey" = ( -/obj/machinery/door/unpowered/hotel_door{ - icon = 'icons/obj/doors/doorgold.dmi'; - id = 210 - }, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"ez" = ( -/obj/machinery/door/unpowered/hotel_door{ - icon = 'icons/obj/doors/doorgold.dmi'; - id = 211 - }, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"eA" = ( -/obj/machinery/door/unpowered/hotel_door{ - icon = 'icons/obj/doors/doorgold.dmi'; - id = 212 - }, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"eB" = ( -/turf/unsimulated/wall/fakeglass{ - icon_state = "fakewindows"; - dir = 1 - }, -/area/space/nearstation) -"eC" = ( -/obj/machinery/light{ - dir = 1 - }, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"eD" = ( -/obj/machinery/light, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"eE" = ( -/turf/unsimulated/wall/fakeglass{ - icon_state = "fakewindows2"; - dir = 1 - }, -/area/space/nearstation) -"eF" = ( -/obj/structure/closet/crate/can, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"eG" = ( -/obj/machinery/light{ - dir = 4; - icon_state = "tube1" - }, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"eH" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/machinery/light{ - dir = 4; - icon_state = "tube1" - }, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"eI" = ( -/obj/machinery/light{ - dir = 8 - }, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"eJ" = ( -/obj/structure/chair/comfy, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"eK" = ( -/obj/structure/window/reinforced, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"eL" = ( -/turf/unsimulated/wall/fakeglass, -/area/space/nearstation) -"eM" = ( -/turf/unsimulated/floor{ - dir = 2; - icon_state = "whitebluecorner" - }, -/area/awaymission/spacehotel) -"eN" = ( -/turf/unsimulated/floor{ - dir = 2; - icon_state = "whiteblue" - }, -/area/awaymission/spacehotel) -"eO" = ( -/obj/machinery/light{ - dir = 4; - icon_state = "tube1" - }, -/turf/unsimulated/floor{ - dir = 8; - icon_state = "whitebluecorner" - }, -/area/awaymission/spacehotel) -"eP" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/structure/window/reinforced, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"eQ" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"eR" = ( -/turf/unsimulated/floor/upperlevel, -/area/awaymission/upperlevel) -"eS" = ( -/obj/machinery/light{ - dir = 4; - icon_state = "tube1" - }, -/turf/unsimulated/floor/upperlevel, -/area/awaymission/upperlevel) -"eT" = ( -/obj/machinery/door/unpowered/hotel_door{ - id = 107 - }, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"eU" = ( -/obj/machinery/door/unpowered/hotel_door{ - id = 108 - }, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"eV" = ( -/obj/machinery/door/unpowered/hotel_door{ - id = 109 - }, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"eW" = ( -/obj/effect/decal{ - icon = 'icons/turf/floors.dmi'; - icon_state = "wood_siding13"; - name = "wood siding" - }, -/turf/unsimulated/floor/grass, -/area/awaymission/spacehotel) -"eX" = ( -/turf/unsimulated/floor{ - dir = 4; - icon_state = "whiteblue" - }, -/area/awaymission/spacehotel) -"eY" = ( -/turf/simulated/shuttle/floor, -/area/awaymission/spacehotel) -"eZ" = ( -/obj/machinery/light{ - dir = 4; - icon_state = "tube1" - }, -/turf/unsimulated/floor{ - dir = 8; - icon_state = "whiteblue" - }, -/area/awaymission/spacehotel) -"fa" = ( -/obj/machinery/door/unpowered/hotel_door{ - id = 207 - }, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"fb" = ( -/obj/machinery/door/unpowered/hotel_door{ - id = 208 - }, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"fc" = ( -/obj/machinery/door/unpowered/hotel_door{ - id = 209 - }, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"fd" = ( -/obj/structure/window/reinforced{ - icon_state = "rwindow"; - dir = 8 - }, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"fe" = ( -/obj/machinery/camera{ - c_tag = "Room 107"; - c_tag_order = 999; - network = list("Hotel") - }, -/turf/template_noop, -/area/awaymission/spacehotel) -"ff" = ( -/obj/machinery/camera{ - c_tag = "Room 108"; - c_tag_order = 999; - network = list("Hotel") - }, -/turf/template_noop, -/area/awaymission/spacehotel) -"fg" = ( -/obj/machinery/camera{ - c_tag = "Room 109"; - c_tag_order = 999; - network = list("Hotel") - }, -/turf/template_noop, -/area/awaymission/spacehotel) -"fh" = ( -/obj/effect/decal{ - icon = 'icons/turf/floors.dmi'; - icon_state = "wood_siding12"; - name = "wood siding" - }, -/turf/unsimulated/floor/grass, -/area/awaymission/spacehotel) -"fi" = ( -/obj/structure/window/plasmabasic, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"fj" = ( -/turf/unsimulated/beach/water/drop, -/area/awaymission/spacehotel) -"fk" = ( -/obj/machinery/light{ - dir = 1 - }, -/turf/unsimulated/beach/water/drop, -/area/awaymission/spacehotel) -"fl" = ( -/turf/unsimulated/beach/water/deep, -/area/awaymission/spacehotel) -"fm" = ( -/turf/unsimulated/floor{ - dir = 8; - icon_state = "whiteblue" - }, -/area/awaymission/spacehotel) -"fn" = ( -/obj/machinery/camera{ - c_tag = "Room 207"; - c_tag_order = 999; - network = list("Hotel") - }, -/turf/template_noop, -/area/awaymission/spacehotel) -"fo" = ( -/obj/machinery/camera{ - c_tag = "Room 208"; - c_tag_order = 999; - network = list("Hotel") - }, -/turf/template_noop, -/area/awaymission/spacehotel) -"fp" = ( -/obj/machinery/camera{ - c_tag = "Room 209"; - c_tag_order = 999; - network = list("Hotel") - }, -/turf/template_noop, -/area/awaymission/spacehotel) -"fq" = ( -/obj/structure/window/plasmabasic{ - icon_state = "plasmawindow"; - dir = 4 - }, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"fr" = ( -/turf/unsimulated/beach/water{ - icon = 'icons/turf/floors.dmi'; - icon_state = "light_on" - }, -/area/awaymission/spacehotel) -"fs" = ( -/obj/structure/window/plasmabasic{ - icon_state = "plasmawindow"; - dir = 8 - }, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"ft" = ( -/turf/unsimulated/beach/water, -/area/awaymission/spacehotel) -"fu" = ( -/turf/unsimulated/wall/fakeglass{ - icon_state = "fakewindows3" - }, -/area/space/nearstation) -"fv" = ( -/obj/effect/landmark/map_loader/hotel_room{ - dir = 1 - }, -/turf/template_noop, -/area/awaymission/spacehotel) -"fw" = ( -/mob/living/simple_animal/hostile/retaliate/carp, -/turf/unsimulated/beach/water{ - icon = 'icons/turf/floors.dmi'; - icon_state = "light_on" - }, -/area/awaymission/spacehotel) -"fx" = ( -/obj/effect/landmark{ - name = "awaystart" - }, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"fy" = ( -/obj/structure/window/plasmabasic{ - icon_state = "plasmawindow"; - dir = 1 - }, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"fz" = ( -/obj/structure/mirror, -/turf/unsimulated/wall/metal, -/area/awaymission/spacehotel) -"fA" = ( -/obj/effect/decal{ - icon = 'icons/turf/floors.dmi'; - icon_state = "wood_siding14"; - name = "wood siding" - }, -/turf/unsimulated/floor/grass, -/area/awaymission/spacehotel) -"fB" = ( -/obj/machinery/light{ - dir = 8 - }, -/turf/unsimulated/beach/water/drop, -/area/awaymission/spacehotel) -"fC" = ( -/obj/structure/ladder/unbreakable/dive_point/buoy, -/obj/structure/ladder/unbreakable/dive_point/buoy{ - id = "weirddive"; - invisibility = 101 - }, -/turf/unsimulated/beach/water/deep, -/area/awaymission/spacehotel) -"fD" = ( -/obj/machinery/light{ - dir = 4; - icon_state = "tube1" - }, -/turf/unsimulated/beach/water/deep, -/area/awaymission/spacehotel) -"fE" = ( -/obj/machinery/light, -/obj/structure/window/reinforced{ - icon_state = "rwindow"; - dir = 1 - }, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"fF" = ( -/obj/structure/window/reinforced{ - icon_state = "rwindow"; - dir = 1 - }, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"fG" = ( -/obj/structure/closet/crate/can, -/obj/item/paper/crumpled/hotel_scrap_1, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"fH" = ( -/obj/effect/landmark{ - name = "awaystart" - }, -/turf/unsimulated/beach/water, -/area/awaymission/spacehotel) -"fI" = ( -/obj/machinery/door/unpowered/hotel_door{ - id = 104 - }, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"fJ" = ( -/obj/machinery/door/unpowered/hotel_door{ - id = 105 - }, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"fK" = ( -/obj/machinery/door/unpowered/hotel_door{ - id = 106 - }, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"fL" = ( -/obj/machinery/door/unpowered/hotel_door{ - id = 204 - }, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"fM" = ( -/obj/machinery/door/unpowered/hotel_door{ - id = 205 - }, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"fN" = ( -/obj/machinery/door/unpowered/hotel_door{ - id = 206 - }, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"fO" = ( -/obj/machinery/camera{ - c_tag = "Room 104"; - c_tag_order = 999; - network = list("Hotel") - }, -/turf/template_noop, -/area/awaymission/spacehotel) -"fP" = ( -/obj/machinery/camera{ - c_tag = "Room 105"; - c_tag_order = 999; - network = list("Hotel") - }, -/turf/template_noop, -/area/awaymission/spacehotel) -"fQ" = ( -/obj/machinery/camera{ - c_tag = "Room 106"; - c_tag_order = 999; - network = list("Hotel") - }, -/turf/template_noop, -/area/awaymission/spacehotel) -"fR" = ( -/obj/machinery/light, -/turf/unsimulated/beach/water/drop, -/area/awaymission/spacehotel) -"fS" = ( -/obj/machinery/camera{ - c_tag = "Room 204"; - c_tag_order = 999; - network = list("Hotel") - }, -/turf/template_noop, -/area/awaymission/spacehotel) -"fT" = ( -/obj/machinery/camera{ - c_tag = "Room 205"; - c_tag_order = 999; - network = list("Hotel") - }, -/turf/template_noop, -/area/awaymission/spacehotel) -"fU" = ( -/obj/machinery/camera{ - c_tag = "Room 206"; - c_tag_order = 999; - network = list("Hotel") - }, -/turf/template_noop, -/area/awaymission/spacehotel) -"fV" = ( -/obj/item/beach_ball, -/turf/simulated/shuttle/floor, -/area/awaymission/spacehotel) -"fW" = ( -/turf/unsimulated/wall/metal, -/area/awaymission) -"fX" = ( -/obj/effect/levelref{ - id = "hotel"; - name = "hotel level 1" - }, -/turf/unsimulated/floor{ - dir = 4; - icon_state = "whitebluecorner" - }, -/area/awaymission/spacehotel) -"fY" = ( -/turf/unsimulated/floor{ - dir = 1; - icon_state = "whiteblue" - }, -/area/awaymission/spacehotel) -"fZ" = ( -/obj/machinery/light{ - dir = 4; - icon_state = "tube1" - }, -/turf/unsimulated/floor{ - dir = 1; - icon_state = "whitebluecorner" - }, -/area/awaymission/spacehotel) -"ga" = ( -/obj/effect/levelref{ - id = "hotel"; - name = "hotel level 2" - }, -/turf/unsimulated/floor/upperlevel, -/area/awaymission/upperlevel) -"gb" = ( -/obj/structure/window/reinforced{ - icon_state = "rwindow"; - dir = 1 - }, -/obj/machinery/light{ - dir = 8 - }, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"gc" = ( -/obj/structure/window/reinforced{ - icon_state = "rwindow"; - dir = 1 - }, -/obj/structure/chair/sofa/left{ - icon_state = "sofaend_left"; - dir = 4 - }, -/obj/structure/window/reinforced{ - icon_state = "rwindow"; - dir = 8 - }, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"gd" = ( -/obj/structure/window/reinforced{ - icon_state = "rwindow"; - dir = 1 - }, -/obj/structure/table/wood, -/obj/machinery/light{ - dir = 1 - }, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"ge" = ( -/obj/structure/window/reinforced{ - icon_state = "rwindow"; - dir = 1 - }, -/obj/structure/chair/sofa/right{ - icon_state = "sofaend_right"; - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"gf" = ( -/obj/structure/window/reinforced{ - icon_state = "rwindow"; - dir = 1 - }, -/obj/structure/table/wood, -/obj/machinery/light{ - dir = 1 - }, -/obj/item/paper/hotel_scrap_3, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"gg" = ( -/obj/structure/chair{ - dir = 4 - }, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"gh" = ( -/obj/structure/table, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"gi" = ( -/obj/structure/chair{ - dir = 8 - }, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"gj" = ( -/obj/structure/chair/sofa{ - icon_state = "sofamiddle"; - dir = 4 - }, -/obj/structure/window/reinforced{ - icon_state = "rwindow"; - dir = 8 - }, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"gk" = ( -/obj/structure/table/wood, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"gl" = ( -/obj/structure/chair/sofa{ - icon_state = "sofamiddle"; - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"gm" = ( -/obj/structure/chair/sofa/right{ - icon_state = "sofaend_right"; - dir = 4 - }, -/obj/structure/window/reinforced{ - icon_state = "rwindow"; - dir = 8 - }, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"gn" = ( -/obj/structure/chair/sofa/left{ - icon_state = "sofaend_left"; - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"go" = ( -/obj/machinery/light{ - dir = 8 - }, -/turf/template_noop, -/area/awaymission/spacehotel) -"gp" = ( -/obj/structure/chair/stool, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"gq" = ( -/obj/machinery/light{ - dir = 4; - icon_state = "tube1" - }, -/obj/structure/closet/crate/can, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"gr" = ( -/obj/effect/landmark/map_loader/random{ - template_list = "light_floor_1.dmm;light_floor_2.dmm;light_floor_3.dmm" - }, -/turf/template_noop, -/area/awaymission/spacehotel) -"gs" = ( -/obj/machinery/light{ - dir = 4; - icon_state = "tube1" - }, -/turf/template_noop, -/area/awaymission/spacehotel) -"gt" = ( -/obj/machinery/door/unpowered/hotel_door{ - id = 101 - }, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"gu" = ( -/obj/machinery/door/unpowered/hotel_door{ - id = 102 - }, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"gv" = ( -/obj/machinery/door/unpowered/hotel_door{ - id = 103 - }, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"gw" = ( -/obj/structure/table/reinforced, -/turf/unsimulated/floor{ - icon_state = "cafeteria" - }, -/area/awaymission/spacehotel/kitchen) -"gx" = ( -/obj/machinery/door/unpowered/hotel_door{ - id = 201 - }, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"gy" = ( -/obj/machinery/door/unpowered/hotel_door{ - id = 202 - }, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"gz" = ( -/obj/machinery/door/unpowered/hotel_door{ - id = 203 - }, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"gA" = ( -/obj/machinery/camera{ - c_tag = "Room 101"; - c_tag_order = 999; - network = list("Hotel") - }, -/turf/template_noop, -/area/awaymission/spacehotel) -"gB" = ( -/obj/machinery/camera{ - c_tag = "Room 102"; - c_tag_order = 999; - network = list("Hotel") - }, -/turf/template_noop, -/area/awaymission/spacehotel) -"gC" = ( -/obj/machinery/camera{ - c_tag = "Room 103"; - c_tag_order = 999; - network = list("Hotel") - }, -/turf/template_noop, -/area/awaymission/spacehotel) -"gD" = ( -/turf/unsimulated/floor{ - icon_state = "cafeteria" - }, -/area/awaymission/spacehotel/kitchen) -"gF" = ( -/obj/machinery/camera{ - c_tag = "Room 201"; - c_tag_order = 999; - network = list("Hotel") - }, -/turf/template_noop, -/area/awaymission/spacehotel) -"gG" = ( -/obj/machinery/camera{ - c_tag = "Room 202"; - c_tag_order = 999; - network = list("Hotel") - }, -/turf/template_noop, -/area/awaymission/spacehotel) -"gH" = ( -/obj/machinery/camera{ - c_tag = "Room 203"; - c_tag_order = 999; - network = list("Hotel") - }, -/turf/template_noop, -/area/awaymission/spacehotel) -"gI" = ( -/obj/structure/chair/stool, -/turf/template_noop, -/area/awaymission/spacehotel) -"gJ" = ( -/obj/structure/closet/crate/can, -/obj/item/paper/crumpled/hotel_scrap_6, -/turf/template_noop, -/area/awaymission/spacehotel) -"gK" = ( -/turf/unsimulated/wall/fakeglass{ - icon_state = "fakewindows"; - dir = 1 - }, -/area/awaymission/spacehotel) -"gL" = ( -/obj/structure/table, -/obj/item/reagent_containers/food/condiment/enzyme{ - layer = 5 - }, -/turf/unsimulated/floor{ - icon_state = "cafeteria" - }, -/area/awaymission/spacehotel/kitchen) -"gM" = ( -/obj/structure/table, -/obj/item/reagent_containers/food/snacks/dough, -/turf/unsimulated/floor{ - icon_state = "cafeteria" - }, -/area/awaymission/spacehotel/kitchen) -"gN" = ( -/obj/structure/table, -/turf/unsimulated/floor{ - icon_state = "cafeteria" - }, -/area/awaymission/spacehotel/kitchen) -"gO" = ( -/obj/structure/table, -/obj/item/reagent_containers/food/snacks/rawsticks, -/turf/unsimulated/floor{ - icon_state = "cafeteria" - }, -/area/awaymission/spacehotel/kitchen) -"gP" = ( -/obj/structure/table/reinforced, -/turf/unsimulated/floor{ - icon_state = "whiteyellowfull" - }, -/area/awaymission/spacehotel) -"gQ" = ( -/turf/unsimulated/wall/fakeglass{ - icon_state = "fakewindows2"; - dir = 1 - }, -/area/awaymission/spacehotel) -"gR" = ( -/obj/structure/table, -/obj/item/reagent_containers/food/snacks/sliceable/cheesewheel, -/turf/unsimulated/floor{ - icon_state = "cafeteria" - }, -/area/awaymission/spacehotel/kitchen) -"gS" = ( -/obj/structure/table, -/obj/item/reagent_containers/glass/beaker{ - pixel_x = 5 - }, -/turf/unsimulated/floor{ - icon_state = "cafeteria" - }, -/area/awaymission/spacehotel/kitchen) -"gT" = ( -/obj/structure/table, -/obj/item/reagent_containers/food/condiment/saltshaker{ - pixel_x = -3; - pixel_y = 0 - }, -/obj/item/reagent_containers/food/condiment/peppermill{ - pixel_x = 3 - }, -/turf/unsimulated/floor{ - icon_state = "cafeteria" - }, -/area/awaymission/spacehotel/kitchen) -"gU" = ( -/obj/structure/table, -/obj/item/kitchen/rollingpin, -/turf/unsimulated/floor{ - icon_state = "cafeteria" - }, -/area/awaymission/spacehotel/kitchen) -"gV" = ( -/obj/structure/table, -/obj/item/reagent_containers/food/snacks/salmonmeat, -/turf/unsimulated/floor{ - icon_state = "cafeteria" - }, -/area/awaymission/spacehotel/kitchen) -"gW" = ( -/obj/structure/table, -/obj/item/book/manual/chef_recipes, -/turf/unsimulated/floor{ - icon_state = "cafeteria" - }, -/area/awaymission/spacehotel/kitchen) -"gX" = ( -/turf/unsimulated/floor{ - icon_state = "whiteyellowfull" - }, -/area/awaymission/spacehotel) -"gY" = ( -/obj/structure/table, -/turf/unsimulated/floor{ - icon_state = "whiteyellowfull" - }, -/area/awaymission/spacehotel) -"gZ" = ( -/obj/machinery/vending/coffee, -/turf/unsimulated/floor{ - icon_state = "whiteyellowfull" - }, -/area/awaymission/spacehotel) -"hb" = ( -/turf/unsimulated/wall/fakeglass, -/area/awaymission/spacehotel) -"hc" = ( -/obj/machinery/vending/dinnerware, -/turf/unsimulated/floor{ - icon_state = "cafeteria" - }, -/area/awaymission/spacehotel/kitchen) -"hd" = ( -/obj/machinery/light, -/turf/unsimulated/floor{ - icon_state = "cafeteria" - }, -/area/awaymission/spacehotel/kitchen) -"he" = ( -/obj/machinery/processor, -/turf/unsimulated/floor{ - icon_state = "cafeteria" - }, -/area/awaymission/spacehotel/kitchen) -"hf" = ( -/obj/machinery/chem_master/condimaster, -/turf/unsimulated/floor{ - icon_state = "cafeteria" - }, -/area/awaymission/spacehotel/kitchen) -"hg" = ( -/obj/structure/table, -/obj/machinery/reagentgrinder, -/turf/unsimulated/floor{ - icon_state = "cafeteria" - }, -/area/awaymission/spacehotel/kitchen) -"hh" = ( -/obj/structure/table, -/obj/machinery/kitchen_machine/microwave, -/turf/unsimulated/floor{ - icon_state = "cafeteria" - }, -/area/awaymission/spacehotel/kitchen) -"hi" = ( -/obj/structure/closet/crate/can, -/turf/unsimulated/floor{ - icon_state = "cafeteria" - }, -/area/awaymission/spacehotel/kitchen) -"hj" = ( -/obj/structure/closet/secure_closet/freezer/meat, -/turf/unsimulated/floor{ - icon_state = "cafeteria" - }, -/area/awaymission/spacehotel/kitchen) -"hk" = ( -/obj/structure/closet/secure_closet/freezer/fridge, -/turf/unsimulated/floor{ - icon_state = "cafeteria" - }, -/area/awaymission/spacehotel/kitchen) -"hl" = ( -/obj/structure/kitchenspike, -/turf/unsimulated/floor{ - icon_state = "cafeteria" - }, -/area/awaymission/spacehotel/kitchen) -"hm" = ( -/obj/machinery/vending/boozeomat, -/turf/unsimulated/floor{ - icon_state = "whiteyellowfull" - }, -/area/awaymission/spacehotel) -"hn" = ( -/obj/machinery/light, -/turf/unsimulated/floor{ - icon_state = "whiteyellowfull" - }, -/area/awaymission/spacehotel) -"ho" = ( -/obj/structure/table, -/obj/machinery/reagentgrinder, -/turf/unsimulated/floor{ - icon_state = "whiteyellowfull" - }, -/area/awaymission/spacehotel) -"hp" = ( -/obj/structure/table, -/obj/machinery/chem_dispenser/soda, -/turf/unsimulated/floor{ - icon_state = "whiteyellowfull" - }, -/area/awaymission/spacehotel) -"hq" = ( -/obj/structure/table, -/obj/machinery/chem_dispenser/beer, -/turf/unsimulated/floor{ - icon_state = "whiteyellowfull" - }, -/area/awaymission/spacehotel) -"hr" = ( -/obj/machinery/light, -/obj/structure/table, -/turf/unsimulated/floor{ - icon_state = "whiteyellowfull" - }, -/area/awaymission/spacehotel) -"hs" = ( -/obj/structure/closet/crate/can, -/turf/unsimulated/floor{ - icon_state = "whiteyellowfull" - }, -/area/awaymission/spacehotel) -"ht" = ( -/obj/machinery/door/airlock{ - name = "Kitchen"; - req_access_txt = "150" - }, -/obj/effect/decal/cleanable/blood/old, -/turf/unsimulated/floor, -/area/awaymission/spacehotel) -"hu" = ( -/obj/machinery/door/airlock{ - name = "Kitchen"; - req_access_txt = "150" - }, -/obj/effect/decal/cleanable/blood/old, -/turf/unsimulated/floor{ - icon_state = "whiteyellowfull" - }, -/area/awaymission/spacehotel) -"hv" = ( -/turf/unsimulated/floor, -/area/awaymission/spacehotel) -"hw" = ( -/turf/unsimulated/wall{ - dynamic_lighting = 0; - icon = null - }, -/area/awaymission/spacehotel) -"hx" = ( -/obj/effect/view_portal/visual{ - dir = 8; - dist = 0; - id = "hotel_11"; - radius = 0 - }, -/turf/unsimulated/floor, -/area/awaymission/spacehotel) -"hy" = ( -/obj/effect/view_portal{ - id = "hotel_21" - }, -/turf/unsimulated/floor{ - icon_state = "ramptop"; - dir = 4 - }, -/area/awaymission/spacehotel) -"hz" = ( -/obj/machinery/light{ - dir = 1 - }, -/turf/unsimulated/floor{ - icon_state = "rampbottom"; - dir = 4 - }, -/area/awaymission/spacehotel) -"hA" = ( -/turf/unsimulated/wall/fakeglass{ - icon_state = "fakewindows3" - }, -/area/awaymission/spacehotel) -"hB" = ( -/turf/unsimulated/floor{ - icon_state = "whiteyellow"; - dir = 1 - }, -/area/awaymission/spacehotel) -"hC" = ( -/obj/machinery/light{ - dir = 1 - }, -/turf/unsimulated/floor{ - icon_state = "whiteyellow"; - dir = 1 - }, -/area/awaymission/spacehotel) -"hD" = ( -/turf/unsimulated/floor{ - icon_state = "whiteyellowcorner"; - dir = 1 - }, -/area/awaymission/spacehotel) -"hE" = ( -/turf/unsimulated/floor{ - icon_state = "white" - }, -/area/awaymission/spacehotel) -"hF" = ( -/turf/unsimulated/floor{ - icon_state = "whiteyellowcorner"; - dir = 4 - }, -/area/awaymission/spacehotel) -"hG" = ( -/obj/structure/ladder/unbreakable{ - height = 1; - icon_state = "ladder10"; - id = "service" - }, -/turf/unsimulated/floor{ - icon_state = "whiteyellow"; - dir = 5 - }, -/area/awaymission/spacehotel) -"hH" = ( -/turf/unsimulated/floor{ - icon_state = "ramptop"; - dir = 4 - }, -/area/awaymission/spacehotel) -"hI" = ( -/obj/effect/view_portal{ - id = "hotel_11" - }, -/turf/unsimulated/floor{ - icon_state = "rampbottom"; - dir = 4 - }, -/area/awaymission/spacehotel) -"hJ" = ( -/obj/effect/view_portal/visual{ - dir = 4; - dist = 0; - id = "hotel_21"; - opacity = 0; - radius = 0 - }, -/turf/unsimulated/floor, -/area/awaymission/spacehotel) -"hK" = ( -/obj/machinery/light{ - dir = 1 - }, -/turf/unsimulated/floor/upperlevel, -/area/awaymission/upperlevel) -"hL" = ( -/obj/machinery/light/built{ - icon_state = "tube1"; - dir = 1 - }, -/turf/unsimulated/floor{ - icon_state = "whiteyellow"; - dir = 1 - }, -/area/awaymission/spacehotel) -"hM" = ( -/obj/effect/decal/cleanable/blood/old, -/turf/unsimulated/floor{ - icon_state = "whiteyellow"; - dir = 1 - }, -/area/awaymission/spacehotel) -"hN" = ( -/obj/effect/decal/cleanable/blood/old, -/obj/structure/ladder/unbreakable{ - height = 2; - icon_state = "ladder01"; - id = "service" - }, -/turf/unsimulated/floor{ - icon_state = "whiteyellow"; - dir = 5 - }, -/area/awaymission/spacehotel) -"hO" = ( -/obj/effect/view_portal/visual{ - dir = 8; - dist = 7; - id = "hotel_12"; - radius = 2 - }, -/turf/unsimulated/floor, -/area/awaymission/spacehotel) -"hP" = ( -/obj/effect/view_portal{ - id = "hotel_22" - }, -/turf/unsimulated/floor{ - icon_state = "ramptop"; - dir = 4 - }, -/area/awaymission/spacehotel) -"hQ" = ( -/turf/unsimulated/floor{ - icon_state = "rampbottom"; - dir = 4 - }, -/area/awaymission/spacehotel) -"hR" = ( -/obj/machinery/door/airlock/public/glass{ - name = "Employees Only"; - req_access_txt = "150" - }, -/turf/unsimulated/floor{ - dir = 8; - icon_state = "whitered" - }, -/area/awaymission/spacehotel) -"hS" = ( -/turf/unsimulated/floor{ - icon_state = "whiteyellow"; - dir = 4 - }, -/area/awaymission/spacehotel) -"hT" = ( -/obj/effect/view_portal{ - id = "hotel_12" - }, -/turf/unsimulated/floor{ - icon_state = "rampbottom"; - dir = 4 - }, -/area/awaymission/spacehotel) -"hU" = ( -/obj/effect/view_portal/visual{ - dir = 4; - dist = 0; - id = "hotel_22"; - opacity = 0; - radius = 0 - }, -/turf/unsimulated/floor, -/area/awaymission/spacehotel) -"hV" = ( -/obj/machinery/door/airlock/public/glass{ - icon_state = "door_locked"; - locked = 1; - name = "Employees Only"; - req_access_txt = "150" - }, -/turf/unsimulated/floor{ - dir = 8; - icon_state = "whitered" - }, -/area/awaymission/spacehotel) -"hW" = ( -/obj/effect/decal/cleanable/blood/old, -/turf/unsimulated/floor{ - icon_state = "white" - }, -/area/awaymission/spacehotel) -"hX" = ( -/obj/effect/view_portal/visual{ - dir = 8; - dist = 0; - id = "hotel_13"; - radius = 0 - }, -/turf/unsimulated/floor, -/area/awaymission/spacehotel) -"hY" = ( -/obj/effect/view_portal{ - id = "hotel_23" - }, -/turf/unsimulated/floor{ - icon_state = "ramptop"; - dir = 4 - }, -/area/awaymission/spacehotel) -"hZ" = ( -/obj/machinery/light, -/turf/unsimulated/floor{ - icon_state = "rampbottom"; - dir = 4 - }, -/area/awaymission/spacehotel) -"ia" = ( -/turf/unsimulated/floor{ - icon_state = "whiteyellow" - }, -/area/awaymission/spacehotel) -"ib" = ( -/turf/unsimulated/floor{ - icon_state = "whiteyellowcorner"; - dir = 8 - }, -/area/awaymission/spacehotel) -"ic" = ( -/turf/unsimulated/floor{ - icon_state = "whiteyellowcorner" - }, -/area/awaymission/spacehotel) -"id" = ( -/turf/unsimulated/floor{ - icon_state = "whiteyellow"; - dir = 6 - }, -/area/awaymission/spacehotel) -"ie" = ( -/turf/unsimulated/wall/fakeglass{ - dir = 1; - icon_state = "fakewindows2" - }, -/area/space/nearstation) -"if" = ( -/obj/effect/view_portal{ - id = "hotel_13" - }, -/turf/unsimulated/floor{ - icon_state = "rampbottom"; - dir = 4 - }, -/area/awaymission/spacehotel) -"ig" = ( -/obj/effect/view_portal/visual{ - dir = 4; - dist = 0; - id = "hotel_23"; - opacity = 0; - radius = 0 - }, -/turf/unsimulated/floor, -/area/awaymission/spacehotel) -"ih" = ( -/obj/effect/decal/cleanable/blood/old, -/turf/unsimulated/floor{ - icon_state = "whiteyellow" - }, -/area/awaymission/spacehotel) -"ii" = ( -/obj/machinery/door/airlock{ - name = "Supply"; - req_access_txt = "150" - }, -/turf/unsimulated/floor{ - icon_state = "floor" - }, -/area/awaymission/spacehotel) -"ij" = ( -/obj/machinery/door/airlock/public/glass{ - name = "Mail Room" - }, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"ik" = ( -/obj/machinery/door/airlock{ - name = "Security"; - req_access_txt = "150" - }, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"il" = ( -/obj/machinery/door/airlock{ - name = "Electrical Room"; - req_access_txt = "150" - }, -/obj/structure/cable/heavyduty{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/unsimulated/floor, -/area/awaymission/spacehotel) -"im" = ( -/obj/machinery/door/airlock{ - name = "Employees Only"; - req_access_txt = "150" - }, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"in" = ( -/obj/effect/decal/cleanable/blood/old, -/turf/unsimulated/wall/metal, -/area/awaymission/spacehotel) -"io" = ( -/obj/effect/decal/cleanable/blood/old, -/obj/structure/falsewall, -/turf/unsimulated/floor{ - name = "engraved floor"; - icon_state = "cult" - }, -/area/awaymission/spacehotel) -"ip" = ( -/turf/unsimulated/floor{ - icon_state = "floor" - }, -/area/awaymission/spacehotel) -"iq" = ( -/obj/structure/closet/crate/secure/loot, -/turf/unsimulated/floor{ - icon_state = "floor" - }, -/area/awaymission/spacehotel) -"ir" = ( -/obj/effect/decal/warning_stripes/west, -/turf/unsimulated/floor{ - icon_state = "floor" - }, -/area/awaymission/spacehotel) -"is" = ( -/obj/machinery/vending/cigarette, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"it" = ( -/obj/machinery/vending/sovietsoda, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"iu" = ( -/obj/structure/table, -/obj/machinery/computer/security/telescreen{ - desc = "Not used to spy on hotel rooms."; - dir = 4; - name = "Hotel Security Monitor"; - network = list("Hotel"); - use_power = 0 - }, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"iv" = ( -/obj/structure/chair{ - dir = 8 - }, -/obj/effect/decal/cleanable/flour{ - desc = "Probably." - }, -/obj/effect/decal/cleanable/pie_smudge, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"iw" = ( -/obj/structure/table, -/obj/machinery/computer/security/telescreen{ - desc = "Not used to spy on hotel rooms."; - name = "Hotel Security Monitor"; - network = list("Hotel"); - use_power = 0 - }, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"ix" = ( -/turf/unsimulated/floor/plating, -/area/awaymission/spacehotel) -"iy" = ( -/obj/item/stack/cable_coil/random, -/turf/unsimulated/floor/plating, -/area/awaymission/spacehotel) -"iz" = ( -/obj/structure/cable/heavyduty{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/unsimulated/floor/plating, -/area/awaymission/spacehotel) -"iA" = ( -/obj/machinery/computer/account_database, -/turf/unsimulated/floor/plating, -/area/awaymission/spacehotel) -"iB" = ( -/turf/unsimulated/floor/wood, -/area/awaymission/spacehotel) -"iC" = ( -/obj/structure/window/basic{ - icon_state = "window"; - dir = 8 - }, -/obj/structure/flora/ausbushes/fernybush, -/turf/unsimulated/floor/grass, -/area/awaymission/spacehotel) -"iD" = ( -/turf/unsimulated/wall{ - icon = 'icons/turf/walls/cult_wall.dmi'; - icon_state = "cult"; - desc = "The patterns engraved on the wall seem to shift as you try to focus on them. You feel sick" - }, -/area/awaymission/spacehotel) -"iE" = ( -/obj/effect/decal/cleanable/blood/old, -/turf/unsimulated/floor{ - name = "engraved floor"; - icon_state = "cult" - }, -/area/awaymission/spacehotel) -"iF" = ( -/obj/structure/closet/crate/plastic, -/turf/unsimulated/floor{ - icon_state = "floor" - }, -/area/awaymission/spacehotel) -"iG" = ( -/obj/machinery/vending/snack, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"iH" = ( -/obj/structure/chair{ - dir = 1 - }, -/obj/effect/decal/cleanable/flour{ - desc = "Probably." - }, -/obj/effect/decal/cleanable/pie_smudge, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"iI" = ( -/obj/structure/chair{ - dir = 1 - }, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"iJ" = ( -/obj/structure{ - desc = "It appears to be similar to a SMES."; - icon = 'icons/obj/power.dmi'; - icon_state = "smes"; - name = "WaffeCo PSU" - }, -/turf/unsimulated/floor/plating, -/area/awaymission/spacehotel) -"iK" = ( -/obj/structure{ - desc = "It appears to be some sort of generator."; - icon = 'icons/obj/power.dmi'; - icon_state = "teg"; - name = "WaffeCo PGU" - }, -/turf/unsimulated/floor/plating, -/area/awaymission/spacehotel) -"iL" = ( -/obj/machinery/power/supermatter_shard, -/turf/unsimulated/floor/plating, -/area/awaymission/spacehotel) -"iM" = ( -/obj/machinery/gateway{ - dir = 9 - }, -/obj/effect/decal/warning_stripes/northwest, -/turf/unsimulated/floor{ - icon_state = "floor" - }, -/area/awaymission/spacehotel) -"iN" = ( -/obj/machinery/gateway{ - dir = 1 - }, -/obj/effect/decal/warning_stripes/north, -/turf/unsimulated/floor{ - icon_state = "floor" - }, -/area/awaymission/spacehotel) -"iO" = ( -/obj/machinery/gateway{ - dir = 5 - }, -/obj/effect/decal/warning_stripes/northeast, -/turf/unsimulated/floor{ - icon_state = "floor" - }, -/area/awaymission/spacehotel) -"iP" = ( -/obj/structure/window/basic{ - icon_state = "window"; - dir = 8 - }, -/obj/structure/flora/grass/both, -/turf/unsimulated/floor/grass, -/area/awaymission/spacehotel) -"iQ" = ( -/turf/unsimulated/floor{ - name = "engraved floor"; - icon_state = "cult" - }, -/area/awaymission/spacehotel) -"iR" = ( -/obj/effect/gibspawner/human, -/obj/effect/decal/cleanable/blood/old, -/turf/unsimulated/floor{ - name = "engraved floor"; - icon_state = "cult" - }, -/area/awaymission/spacehotel) -"iS" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/poddoor/shutters/preopen, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"iT" = ( -/obj/machinery/vending/cola, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"iU" = ( -/obj/structure/table, -/obj/machinery/computer/security/telescreen{ - desc = "Not used to spy on hotel rooms."; - dir = 4; - name = "Hotel Security Monitor"; - network = list("Hotel"); - use_power = 0 - }, -/obj/machinery/light{ - dir = 8 - }, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"iV" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/turf/unsimulated/floor/plating, -/area/awaymission/spacehotel) -"iW" = ( -/obj/structure/cable/heavyduty{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/structure/cable/heavyduty{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/turf/unsimulated/floor/plating, -/area/awaymission/spacehotel) -"iX" = ( -/obj/structure/cable/heavyduty{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/unsimulated/floor/plating, -/area/awaymission/spacehotel) -"iY" = ( -/obj/structure/cable/heavyduty{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/cable/heavyduty{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/structure/cable/heavyduty{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/turf/unsimulated/floor/plating, -/area/awaymission/spacehotel) -"iZ" = ( -/obj/structure/cable/heavyduty{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/landmark/damageturf, -/turf/unsimulated/floor/plating, -/area/awaymission/spacehotel) -"ja" = ( -/obj/structure/cable/heavyduty{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/structure/cable/heavyduty{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/turf/unsimulated/floor/plating, -/area/awaymission/spacehotel) -"jb" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/turf/unsimulated/floor/plating, -/area/awaymission/spacehotel) -"jc" = ( -/obj/machinery/gateway{ - dir = 8 - }, -/obj/effect/decal/warning_stripes/west, -/turf/unsimulated/floor{ - icon_state = "floor" - }, -/area/awaymission/spacehotel) -"jd" = ( -/obj/machinery/gateway/centeraway{ - calibrated = 0 - }, -/turf/unsimulated/floor{ - icon_state = "floor" - }, -/area/awaymission/spacehotel) -"je" = ( -/obj/machinery/gateway{ - dir = 4 - }, -/obj/effect/decal/warning_stripes/east, -/turf/unsimulated/floor{ - icon_state = "floor" - }, -/area/awaymission/spacehotel) -"jf" = ( -/obj/structure/window/basic{ - icon_state = "window"; - dir = 8 - }, -/obj/structure/flora/rock, -/obj/structure/flora/grass/brown, -/turf/unsimulated/floor/grass, -/area/awaymission/spacehotel) -"jg" = ( -/obj/item/candle, -/obj/effect/decal/cleanable/blood/old, -/turf/unsimulated/floor{ - name = "engraved floor"; - icon_state = "cult" - }, -/area/awaymission/spacehotel) -"jh" = ( -/obj/effect/rune, -/obj/item/organ/internal/brain, -/turf/unsimulated/floor{ - name = "engraved floor"; - icon_state = "cult" - }, -/area/awaymission/spacehotel) -"ji" = ( -/obj/item/candle, -/turf/unsimulated/floor{ - name = "engraved floor"; - icon_state = "cult" - }, -/area/awaymission/spacehotel) -"jj" = ( -/obj/item/tome, -/turf/unsimulated/floor{ - name = "engraved floor"; - icon_state = "cult" - }, -/area/awaymission/spacehotel) -"jk" = ( -/obj/structure/closet/crate/critter, -/turf/unsimulated/floor{ - icon_state = "floor" - }, -/area/awaymission/spacehotel) -"jl" = ( -/obj/machinery/door/airlock/public/glass{ - name = "Lobby" - }, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"jn" = ( -/obj/structure{ - desc = "It appears to be similar to a SMES."; - icon = 'icons/obj/power.dmi'; - icon_state = "smes"; - name = "WaffeCo PSU" - }, -/obj/effect/landmark/damageturf, -/turf/unsimulated/floor/plating, -/area/awaymission/spacehotel) -"jo" = ( -/obj/effect/decal/remains/human, -/obj/item/clothing/head/soft/red, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"jp" = ( -/obj/item/toy/prize/honk, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"jq" = ( -/obj/item/toy/spinningtoy, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"jr" = ( -/obj/item/grown/bananapeel, -/obj/item/toy/spinningtoy, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"js" = ( -/obj/structure/barricade/wooden, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"jt" = ( -/obj/machinery/door/airlock/public/glass, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"ju" = ( -/obj/machinery/gateway{ - dir = 10 - }, -/obj/effect/decal/warning_stripes/southwest, -/turf/unsimulated/floor{ - icon_state = "floor" - }, -/area/awaymission/spacehotel) -"jv" = ( -/obj/machinery/gateway, -/obj/effect/decal/warning_stripes/south, -/turf/unsimulated/floor{ - icon_state = "floor" - }, -/area/awaymission/spacehotel) -"jw" = ( -/obj/machinery/gateway{ - dir = 6 - }, -/obj/effect/decal/warning_stripes/southeast, -/turf/unsimulated/floor{ - icon_state = "floor" - }, -/area/awaymission/spacehotel) -"jx" = ( -/obj/structure/window/basic{ - icon_state = "window"; - dir = 8 - }, -/obj/structure/flora/ausbushes/palebush, -/turf/unsimulated/floor/grass, -/area/awaymission/spacehotel) -"jy" = ( -/obj/item/flashlight/lantern{ - on = 1 - }, -/turf/unsimulated/floor{ - name = "engraved floor"; - icon_state = "cult" - }, -/area/awaymission/spacehotel) -"jz" = ( -/obj/effect/rune, -/turf/unsimulated/floor{ - name = "engraved floor"; - icon_state = "cult" - }, -/area/awaymission/spacehotel) -"jA" = ( -/obj/structure/chair/comfy, -/obj/item/soulstone, -/obj/effect/decal/cleanable/blood/old, -/obj/effect/decal/remains/human, -/obj/effect/view_portal{ - id = "cultroom" - }, -/turf/unsimulated/floor{ - name = "engraved floor"; - icon_state = "cult" - }, -/area/awaymission/spacehotel) -"jB" = ( -/obj/effect/gibspawner/human, -/turf/unsimulated/floor{ - name = "engraved floor"; - icon_state = "cult" - }, -/area/awaymission/spacehotel) -"jC" = ( -/obj/machinery/atm{ - pixel_y = 32 - }, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"jD" = ( -/obj/effect/decal/warning_stripes/white/hollow, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"jE" = ( -/obj/item/paper/pamphlet{ - pixel_x = -8; - pixel_y = 4 - }, -/obj/structure/table/reinforced, -/obj/item/paper/pamphlet/hotel{ - pixel_x = 8; - pixel_y = 8 - }, -/obj/item/paper/pamphlet/hotel{ - pixel_x = 8; - pixel_y = 4 - }, -/obj/item/paper/pamphlet/hotel{ - pixel_x = 8 - }, -/obj/item/paper/pamphlet/hotel{ - pixel_x = 8; - pixel_y = -4 - }, -/obj/item/paper/pamphlet/hotel{ - pixel_x = 8; - pixel_y = -8 - }, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel/reception) -"jF" = ( -/obj/item/latexballon, -/obj/item/latexballon, -/obj/structure/table/glass, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel/reception) -"jG" = ( -/obj/structure/rack, -/obj/item/key, -/obj/item/key, -/obj/item/key, -/obj/item/key, -/obj/item/key, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel/reception) -"jH" = ( -/obj/structure/chair/comfy, -/obj/effect/decal/cleanable/flour{ - desc = "Probably." - }, -/obj/effect/decal/cleanable/pie_smudge, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"jI" = ( -/obj/structure/chair/comfy, -/obj/effect/decal/cleanable/flour{ - desc = "Probably." - }, -/obj/effect/decal/cleanable/flour{ - desc = "Probably." - }, -/obj/effect/decal/cleanable/pie_smudge, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"jJ" = ( -/obj/structure/cable/heavyduty{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/turf/unsimulated/floor/plating, -/area/awaymission/spacehotel) -"jK" = ( -/obj/structure/cable/heavyduty{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/structure/cable/heavyduty{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/turf/unsimulated/floor/plating, -/area/awaymission/spacehotel) -"jL" = ( -/obj/structure/cable/heavyduty{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/turf/unsimulated/floor/plating, -/area/awaymission/spacehotel) -"jM" = ( -/obj/effect/decal/remains/human, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"jN" = ( -/obj/item/trash/candle, -/obj/item/trash/candle, -/obj/item/trash/candle, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"jO" = ( -/obj/structure/window/basic{ - icon_state = "window"; - dir = 8 - }, -/obj/structure/flora/bush, -/turf/unsimulated/floor/grass, -/area/awaymission/spacehotel) -"jP" = ( -/obj/item/restraints/legcuffs, -/turf/unsimulated/floor{ - name = "engraved floor"; - icon_state = "cult" - }, -/area/awaymission/spacehotel) -"jQ" = ( -/obj/structure/closet/crate/secure/unknownchemicals, -/turf/unsimulated/floor{ - icon_state = "floor" - }, -/area/awaymission/spacehotel) -"jR" = ( -/obj/structure/closet/crate/can, -/obj/item/paper/crumpled/hotel_scrap_7, -/turf/unsimulated/floor{ - icon_state = "floor" - }, -/area/awaymission/spacehotel) -"jS" = ( -/obj/structure/table/reinforced, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel/reception) -"jT" = ( -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel/reception) -"jU" = ( -/obj/structure/table, -/obj/machinery/computer/security/telescreen{ - desc = "Not used to spy on hotel rooms."; - dir = 1; - name = "Hotel Security Monitor"; - network = list("Hotel"); - use_power = 0 - }, -/obj/machinery/light, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"jV" = ( -/obj/structure/table, -/obj/machinery/computer/security/telescreen{ - desc = "Not used to spy on hotel rooms."; - dir = 1; - name = "Hotel Security Monitor"; - network = list("Hotel"); - use_power = 0 - }, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"jW" = ( -/obj/machinery/light/small, -/turf/unsimulated/floor/plating, -/area/awaymission/spacehotel) -"jX" = ( -/obj/item/toy/sword, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"jY" = ( -/obj/item/target/syndicate, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"jZ" = ( -/obj/item/trash/sosjerky, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"ka" = ( -/obj/item/gun/projectile/shotgun/toy/crossbow, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"kb" = ( -/obj/machinery/space_heater, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"kc" = ( -/obj/machinery/door/airlock{ - name = "Supply Closet" - }, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"kd" = ( -/obj/machinery/door/airlock/public/glass{ - name = "Gateway" - }, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"ke" = ( -/obj/item/melee/cultblade, -/turf/unsimulated/floor{ - name = "engraved floor"; - icon_state = "cult" - }, -/area/awaymission/spacehotel) -"kf" = ( -/obj/item/kitchen/knife/butcher{ - blood_DNA = list("1e+009" = "O-") - }, -/obj/effect/decal/cleanable/blood/old, -/turf/unsimulated/floor{ - name = "engraved floor"; - icon_state = "cult" - }, -/area/awaymission/spacehotel) -"kg" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/structure/chair/sofa/left{ - icon_state = "sofaend_left"; - dir = 4 - }, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"kh" = ( -/obj/effect/hotel_controller, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"ki" = ( -/obj/item/pen, -/obj/structure/table/reinforced, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel/reception) -"kj" = ( -/obj/structure/chair{ - dir = 8 - }, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel/reception) -"kk" = ( -/obj/machinery/light{ - dir = 4; - icon_state = "tube1" - }, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel/reception) -"kl" = ( -/obj/structure/chair/sofa{ - icon_state = "sofamiddle"; - dir = 4 - }, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"km" = ( -/obj/item/clipboard, -/obj/item/paper, -/obj/structure/table/reinforced, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel/reception) -"ko" = ( -/obj/structure/filingcabinet/filingcabinet, -/obj/machinery/light{ - dir = 4; - icon_state = "tube1" - }, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel/reception) -"kp" = ( -/obj/structure/filingcabinet/filingcabinet, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel/reception) -"kq" = ( -/obj/structure/chair/sofa/corner{ - dir = 4 - }, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"kr" = ( -/obj/structure/chair/sofa{ - dir = 1 - }, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"ks" = ( -/obj/machinery/light, -/obj/structure/chair/sofa/left{ - dir = 1 - }, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"kt" = ( -/obj/machinery/light, -/obj/structure/chair/sofa/right{ - dir = 1 - }, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"ku" = ( -/obj/structure/chair/sofa/left{ - dir = 1 - }, -/obj/effect/decal/warning_stripes/white/hollow, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel) -"kv" = ( -/obj/item/paper_bin, -/obj/structure/table/glass, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel/reception) -"kw" = ( -/obj/structure/table/glass, -/turf/unsimulated/floor/carpet, -/area/awaymission/spacehotel/reception) -"kx" = ( -/turf/unsimulated/wall/fakeglass{ - dir = 10; - icon_state = "fakewindows" - }, -/area/space/nearstation) -"ky" = ( -/turf/unsimulated/wall/fakeglass{ - dir = 4; - icon_state = "fakewindows"; - opacity = 1 - }, -/area/space/nearstation) -"kz" = ( -/obj/machinery/door/airlock/external{ - name = "Arrival Airlock" - }, -/turf/unsimulated/floor/plating, -/area/awaymission/spacehotel) -"kA" = ( -/turf/unsimulated/wall/fakeglass{ - icon_state = "fakewindows"; - dir = 8 - }, -/area/space/nearstation) -"kB" = ( -/turf/unsimulated/wall/fakeglass{ - icon_state = "fakewindows"; - dir = 6 - }, -/area/space/nearstation) -"kC" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall_s6"; - dir = 2 - }, -/area/awaymission) -"kD" = ( -/obj/effect/decal/cleanable/blood/old, -/turf/simulated/shuttle/wall{ - icon_state = "swall12"; - dir = 2 - }, -/area/awaymission) -"kE" = ( -/turf/unsimulated/wall/fakeglass{ - icon_state = "fakewindows"; - dir = 8 - }, -/area/awaymission) -"kF" = ( -/turf/unsimulated/wall/fakeglass{ - icon_state = "fakewindows2"; - dir = 8 - }, -/area/awaymission) -"kG" = ( -/turf/unsimulated/wall/fakeglass{ - dir = 4; - icon_state = "fakewindows"; - opacity = 1 - }, -/area/awaymission) -"kH" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall12"; - dir = 2 - }, -/area/awaymission) -"kI" = ( -/obj/machinery/door/unpowered/shuttle, -/turf/simulated/shuttle/plating, -/area/awaymission) -"kJ" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall_s10"; - dir = 2 - }, -/area/awaymission) -"kK" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall_s6"; - dir = 2 - }, -/area/space/nearstation) -"kL" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall12"; - dir = 2 - }, -/area/space/nearstation) -"kM" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall_s10"; - dir = 2 - }, -/area/space/nearstation) -"kN" = ( -/turf/unsimulated/wall/fakeglass{ - icon_state = "fakewindows3" - }, -/area/awaymission) -"kO" = ( -/obj/effect/decal/cleanable/blood/old, -/turf/simulated/shuttle/wall{ - icon_state = "swallc4"; - dir = 2 - }, -/area/awaymission) -"kP" = ( -/obj/effect/decal/remains/human, -/turf/simulated/shuttle/floor, -/area/awaymission) -"kQ" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 8 - }, -/turf/simulated/shuttle/floor, -/area/awaymission) -"kR" = ( -/obj/item/paper/hotel_scrap_4, -/obj/structure/chair/comfy/shuttle{ - dir = 8 - }, -/turf/simulated/shuttle/floor, -/area/awaymission) -"kS" = ( -/turf/simulated/shuttle/floor, -/area/awaymission) -"kT" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/shuttle/floor, -/area/awaymission) -"kU" = ( -/obj/structure/shuttle/engine/heater{ - icon_state = "heater"; - dir = 4 - }, -/turf/simulated/shuttle/plating, -/area/awaymission) -"kV" = ( -/obj/structure/shuttle/engine/propulsion{ - dir = 4; - icon_state = "propulsion" - }, -/turf/simulated/shuttle/plating, -/area/awaymission) -"kW" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swallc4"; - dir = 2 - }, -/area/space/nearstation) -"kX" = ( -/turf/simulated/shuttle/wall/interior, -/area/space/nearstation) -"kY" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall3" - }, -/area/space/nearstation) -"kZ" = ( -/obj/structure/shuttle/engine/propulsion{ - dir = 4; - icon_state = "propulsion" - }, -/turf/simulated/shuttle/plating, -/area/space/nearstation) -"la" = ( -/obj/effect/decal/remains/human, -/obj/effect/decal/cleanable/blood/old, -/obj/structure/chair/comfy/shuttle{ - dir = 8 - }, -/turf/simulated/shuttle/floor, -/area/awaymission) -"lb" = ( -/obj/machinery/door/airlock/public/glass, -/turf/simulated/shuttle/floor, -/area/awaymission) -"lc" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/effect/decal/remains/human, -/obj/effect/decal/cleanable/blood/old, -/turf/simulated/shuttle/floor, -/area/awaymission) -"ld" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall_s5"; - dir = 2 - }, -/area/awaymission) -"le" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swallc1"; - dir = 2 - }, -/area/awaymission) -"lf" = ( -/obj/effect/decal/remains/human, -/obj/structure/chair/comfy/shuttle{ - dir = 8 - }, -/turf/simulated/shuttle/floor, -/area/awaymission) -"lg" = ( -/obj/effect/decal/cleanable/blood/old, -/obj/structure/chair/comfy/shuttle{ - dir = 8 - }, -/turf/simulated/shuttle/floor, -/area/awaymission) -"lh" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall_s5"; - dir = 2 - }, -/area/space/nearstation) -"li" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swallc1"; - dir = 2 - }, -/area/space/nearstation) -"lj" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall_s9"; - dir = 2 - }, -/area/awaymission) -"lk" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall_s9"; - dir = 2 - }, -/area/space/nearstation) -"ll" = ( -/obj/machinery/shower{ - dir = 8 - }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/awaymission{ - name = "Amazing Place"; - requires_power = 0 - }) -"lm" = ( -/obj/structure/curtain/open/shower, -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/awaymission{ - name = "Amazing Place"; - requires_power = 0 - }) -"ln" = ( -/obj/item/paper/hotel_scrap_8, -/turf/unsimulated/floor{ - name = "engraved floor"; - icon_state = "cult" - }, -/area/awaymission/spacehotel) -"VG" = ( -/obj/effect/decal{ - name = "rock"; - icon = 'icons/turf/mining.dmi'; - icon_state = "rock_side_w" - }, -/obj/machinery/poolcontroller/invisible, -/turf/unsimulated/beach/water/deep/dense, -/area/awaymission/beach) - -(1,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -dw -dk -dk -dF -dF -dF -dF -dF -dF -dF -dF -dF -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -"} -(2,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -bE -aa -aa -aa -aa -cA -cF -cQ -cW -aa -aa -aa -aa -aa -dw -dk -dk -dF -dF -dF -dF -dF -dF -dF -dF -dF -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -"} -(3,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -bF -bR -aa -aa -cv -cB -cG -bj -cX -aa -aa -aa -aa -aa -dw -dk -dk -dF -dF -dF -dF -dF -dF -dF -dF -dF -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -"} -(4,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -bS -aa -aa -aa -aa -aa -bH -bj -cW -aa -aa -aa -aa -dx -dk -dk -dF -dF -dF -dF -dF -dF -dF -dF -dF -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -"} -(5,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -bG -bj -bw -bw -bw -bw -bw -bj -bj -bj -bw -cW -aa -aa -aa -dw -dk -dk -dF -dF -dF -dF -dF -dF -dF -dF -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -"} -(6,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -bH -bj -bj -bj -bj -bj -bj -bj -bj -bj -bj -cX -aa -aa -aa -dw -dk -dk -dF -dF -dF -dF -dF -dF -dF -dF -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -"} -(7,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -bH -bT -bj -bj -bj -bj -bj -bj -bj -cw -cC -cX -aa -aa -aa -dw -dk -dk -dF -dF -dF -dF -dF -dF -dF -dF -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dQ -dQ -dQ -dQ -dQ -dQ -dQ -dO -dO -dO -dQ -dQ -dQ -dO -dQ -dQ -dQ -dO -dO -dO -dQ -dQ -dQ -dO -dQ -dQ -dQ -dO -dO -dO -dQ -dQ -dQ -dO -dQ -dQ -dQ -dO -dO -dO -dQ -dQ -dQ -dO -dQ -dQ -dQ -dQ -dQ -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -"} -(8,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -bH -bj -bj -bj -cw -bj -bj -bj -bj -bj -bj -cX -aa -aa -dy -dk -dk -dF -dF -dF -dF -dF -dF -dF -dF -dF -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dQ -cl -cl -cl -cl -cl -cl -eB -eE -eL -cl -cl -cl -fu -cl -cl -cl -eB -eE -eL -cl -cl -cl -fu -cl -cl -cl -eB -eE -eL -cl -cl -cl -fu -cl -cl -cl -eB -eE -eL -cl -cl -cl -fu -cl -cl -cl -cl -dQ -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -"} -(9,1,1) = {" -aa -aa -aa -aa -aC -aC -aC -aa -bu -bj -bj -bj -bj -bj -bj -bj -bj -bj -bj -bj -cX -aa -aa -dw -dk -dk -dF -dF -dF -dF -dF -dF -dF -dF -dF -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dQ -cl -dX -dX -dX -dX -cl -eb -eF -eb -cl -dX -dX -dX -dX -dX -cl -eb -fG -eb -cl -dX -dX -dX -dX -dX -cl -eb -eF -eb -cl -dX -dX -dX -dX -dX -cl -hv -hv -hv -cl -ip -ip -ip -ip -ip -jQ -cl -dQ -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -"} -(10,1,1) = {" -aa -aa -aa -aa -aD -aD -aR -bh -bj -bj -bU -bj -bj -bj -bj -bj -cw -bj -bj -bj -bj -dj -dp -dk -dk -dF -dF -dF -dF -dF -dF -dF -dF -dF -dF -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dQ -cl -dX -dX -dX -dX -cl -eb -eb -eb -cl -fe -dX -dX -dX -dX -cl -eb -eb -eb -cl -fO -dX -dX -dX -dX -cl -eb -eb -eb -cl -gA -dX -dX -dX -dX -cl -hv -hv -hv -cl -ip -ip -ip -jk -ip -ip -cl -dQ -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -"} -(11,1,1) = {" -aa -aa -aa -aa -aD -aD -aS -bi -bj -bj -bj -bj -bj -bj -bj -bj -bj -bj -bj -bU -dh -dk -dq -dk -dF -dF -dF -dF -dF -dF -dF -dF -dF -dF -dF -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dQ -cl -dX -dX -dX -dX -cl -eb -eb -eb -eT -dX -dX -fv -dX -dX -cl -eb -eb -eb -fI -dX -dX -fv -dX -dX -cl -eb -eb -eb -gt -dX -dX -fv -dX -dX -cl -hv -hv -hv -cl -ip -iF -ip -ip -ip -ip -cl -dQ -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -"} -(12,1,1) = {" -aa -aa -aa -aa -aD -aJ -aT -bj -bj -bj -bj -bj -bj -bU -bj -bj -bj -bj -bj -bj -dh -dk -dq -dk -dF -dF -dF -dF -dF -dF -dF -dF -dF -dF -dF -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dO -dR -dX -dX -dX -dX -cl -eb -eb -eb -cl -dX -dX -dX -dX -dX -cl -eb -eb -eb -cl -dX -dX -dX -dX -dX -cl -eb -eb -eb -cl -dX -dX -dX -dX -dX -cl -hv -hv -hv -cl -ip -ip -ip -ip -ip -ip -cl -dQ -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -"} -(13,1,1) = {" -aa -aa -aa -aa -aD -aD -aU -bi -bj -bj -bj -bj -bj -bj -bj -bj -bj -bj -bj -bj -bj -dl -dr -dk -dk -dF -dF -dF -dF -dF -dF -dF -dF -dF -dF -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dO -dS -dY -dX -em -dX -ev -eb -eb -eb -cl -dX -dX -dX -dX -dX -cl -eb -eb -eb -cl -dX -dX -dX -dX -dX -cl -eb -eb -eb -cl -dX -dX -dX -dX -dX -cl -hv -hv -hv -cl -ip -ip -iq -ip -iF -ip -cl -dQ -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -"} -(14,1,1) = {" -aa -aa -aa -aa -aD -aD -aV -bk -bj -bj -bj -bj -bj -bj -cC -bj -bj -bj -bj -bj -cX -aa -aa -dw -dk -dk -dF -dF -dF -dF -dF -dF -dF -dF -dF -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dO -dT -dX -dX -dX -dX -cl -eC -eb -eD -cl -cl -cl -cl -cl -cl -cl -eb -eb -eD -cl -cl -cl -cl -cl -cl -cl -eb -eb -eD -cl -cl -cl -cl -cl -cl -cl -hv -hv -hv -cl -ip -ip -ip -ip -ip -ip -cl -dQ -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -"} -(15,1,1) = {" -aa -aa -aa -aa -aC -aC -aC -aa -bv -bj -bj -bj -bj -bj -bj -bj -bj -bU -bj -bj -cX -aa -aa -dw -dk -dk -dF -dF -dF -dF -dF -dF -dF -dF -dF -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dQ -cl -dX -dX -dX -dX -cl -eb -eb -eb -cl -dX -dX -dX -dX -dX -cl -eb -eb -eb -cl -dX -dX -dX -dX -dX -cl -eb -eb -eb -cl -dX -dX -dX -dX -dX -cl -hw -hw -hw -cl -ip -iq -ip -ip -ip -ip -cl -dQ -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -"} -(16,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -bH -bj -bj -bj -bj -bj -bj -bj -bj -bj -bj -cX -aa -aa -dw -dk -dk -dF -dF -dF -dF -dF -dF -dF -dF -dF -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dQ -cl -dX -dX -dX -dX -cl -eb -eb -eb -cl -ff -dX -dX -dX -dX -cl -eb -eb -eb -cl -fP -dX -dX -dX -dX -cl -eb -eb -eb -cl -gB -dX -dX -dX -dX -cl -hx -hO -hX -cl -ip -ip -ip -ip -iq -ip -cl -dQ -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -"} -(17,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -bH -bT -bj -bj -bj -cw -bj -bj -bj -bj -bj -cX -aa -aa -dx -dk -dk -dF -dF -dF -dF -dF -dF -dF -dF -dF -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dQ -cl -dX -dX -dX -dX -cl -eb -eb -eb -eU -dX -dX -fv -dX -dX -cl -eb -eb -eb -fJ -dX -dX -fv -dX -dX -cl -eb -eb -eb -gu -dX -dX -fv -dX -dX -cl -hy -hP -hY -cl -iq -ip -ip -ip -ip -ip -cl -dQ -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -"} -(18,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -bl -bw -bj -bj -bj -bj -bj -bj -bj -bj -bj -cw -bj -de -aa -aa -aa -dw -dk -dk -dF -dF -dF -dF -dF -dF -dF -dF -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dQ -cl -cl -cl -cl -cl -cl -eb -eb -eb -cl -dX -dX -dX -dX -dX -cl -eb -eb -eb -cl -dX -dX -dX -dX -dX -cl -eb -eb -eb -cl -dX -dX -dX -dX -dX -cl -hz -hQ -hZ -cl -ip -ip -ip -ip -ip -ip -cl -dQ -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -"} -(19,1,1) = {" -aa -aa -aa -aa -aa -aa -aW -bm -bx -bj -bj -bj -bj -bj -bj -bj -bj -bj -bj -cX -aa -aa -aa -aa -dw -dk -dk -dF -dF -dF -dF -dF -dF -dF -dF -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dQ -cl -dX -dX -dX -dX -cl -eb -eb -eb -cl -dX -dX -dX -dX -dX -cl -eb -eb -eb -cl -dX -dX -dX -dX -dX -cl -eb -eb -eb -cl -dX -dX -dX -dX -dX -cl -eb -eb -eb -cl -ip -ip -ip -ip -ip -ip -cl -dQ -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -"} -(20,1,1) = {" -aa -aa -aa -aa -aa -aK -aX -aa -aa -bI -bj -bU -bj -bj -bj -bj -bj -cC -bj -cX -aa -aa -aa -aa -dw -dk -dk -dF -dF -dF -dF -dF -dF -dF -dF -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dQ -cl -dX -dX -dX -dX -cl -eC -eb -eD -cl -cl -cl -cl -cl -cl -cl -eb -eb -eD -cl -cl -cl -cl -cl -cl -cl -eb -eb -eD -cl -cl -cl -cl -cl -cl -cl -eb -eb -eb -ii -ip -ip -ip -ip -ip -jR -cl -dQ -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -"} -(21,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -bv -bx -bx -bx -bx -bx -bj -bj -bj -cX -aa -aa -aa -aa -dw -dk -dk -dF -dF -dF -dF -dF -dF -dF -dF -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dQ -cl -dX -dX -dX -dX -cl -eb -eb -eb -cl -dX -dX -dX -dX -dX -cl -eb -eb -eb -cl -dX -dX -dX -dX -dX -cl -eb -eb -eb -cl -dX -dX -dX -dX -dX -cl -eb -eb -eb -cl -ir -ir -ir -ir -ir -ir -cl -dQ -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -"} -(22,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -bv -bx -bx -de -aa -aa -aa -aa -dw -dk -dk -dF -dF -dF -dF -dF -dF -dF -dF -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dO -dR -dX -dX -dX -dX -cl -eb -eb -eb -cl -fg -dX -dX -dX -dX -cl -eb -eb -eb -cl -fQ -dX -dX -dX -dX -cl -eb -eb -eb -cl -gC -dX -dX -dX -dX -cl -eC -eb -eD -cl -cl -cl -iS -iS -cl -cl -cl -dQ -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -"} -(23,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -dw -dk -dk -dF -dF -dF -dF -dF -dF -dF -dF -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dO -dS -dZ -dX -em -dX -ew -eb -eb -eb -eV -dX -dX -fv -dX -dX -cl -eb -eb -eb -fK -dX -dX -fv -dX -dX -cl -eb -eb -eb -gv -dX -dX -fv -dX -dX -cl -eb -eb -eb -cl -eb -eI -eb -eb -eI -eb -cl -dQ -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -"} -(24,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -cl -cl -cy -cy -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dO -dT -dX -dX -dX -dX -cl -eb -eb -eb -cl -dX -dX -dX -dX -dX -cl -eb -eb -eb -cl -dX -dX -dX -dX -dX -cl -eb -eb -eb -cl -dX -dX -dX -dX -dX -cl -eb -eb -eb -ij -eb -eb -eb -eb -eb -eb -cl -dQ -dO -dO -dO -dO -dO -kC -kN -ld -dO -dO -dO -dO -dO -dO -dO -dO -"} -(25,1,1) = {" -ab -ai -ai -ai -ai -ai -aY -ai -ai -ai -ai -cc -cm -cl -cy -cy -cR -ab -ai -ai -ai -ai -ai -dz -ai -ai -ai -ai -ai -ab -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dQ -cl -dX -dX -dX -dX -cl -eb -eb -eb -cl -dX -dX -dX -dX -dX -cl -eb -eb -eb -cl -dX -dX -dX -dX -dX -cl -eb -eb -eb -cl -dX -dX -dX -dX -dX -cl -eb -eb -eb -cl -eb -eb -eb -eb -eb -eb -cl -dQ -dO -dO -dO -dO -dO -kN -la -kN -dO -dO -dO -dO -dO -dO -dO -dO -"} -(26,1,1) = {" -ab -ai -ai -ai -ai -ai -ai -ai -ai -ai -ai -cc -cn -cl -cy -cy -ab -ab -ai -ai -di -ai -ai -ai -ai -ai -ai -ai -ai -ab -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dQ -cl -dX -dX -dX -dX -cl -eb -eb -eb -cl -cl -cl -cl -cl -cl -cl -eb -eb -eb -cl -cl -cl -cl -cl -cl -cl -eb -eb -eb -cl -cl -cl -cl -cl -cl -cl -eC -eb -eD -cl -cl -cl -cl -cl -ij -ij -cl -cl -eB -eE -kx -dO -kC -kO -lb -le -ld -dO -dO -dO -dO -dO -dO -dO -"} -(27,1,1) = {" -ab -ai -ai -ai -ai -ai -ai -ai -ai -ai -ai -cd -co -cl -cl -cy -ab -ab -ai -ai -ai -ai -ai -ai -ai -ai -ai -ai -ai -ab -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dQ -cl -dX -dX -dX -dX -cl -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -is -is -is -cl -eb -eb -kg -kl -kl -kq -dS -dO -kD -kP -kS -kS -kH -dO -dO -dO -dO -dO -dO -dO -"} -(28,1,1) = {" -ab -aj -ai -ai -ai -ai -ai -ai -ai -ai -ai -ce -cp -cx -cl -cy -ab -ab -aj -df -ai -ai -ai -ai -ai -ai -ai -ai -dI -ab -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dQ -cl -cl -cl -cl -cl -cl -eb -eb -eb -eb -eb -eb -eb -eb -fx -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -cl -eb -eb -eb -eb -eb -kr -dS -dO -kE -kQ -kS -kQ -kE -dO -dO -dO -dO -dO -dO -dO -"} -(29,1,1) = {" -ab -ai -ai -ay -ai -ai -ai -ai -ai -ai -ai -ai -cl -cl -cl -cy -ab -ab -ai -ai -ai -ai -ai -ai -ai -ai -ai -ai -ai -ab -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dQ -cl -dX -dX -dX -dX -cl -eb -eb -eb -eW -fh -fh -fh -fh -fh -fA -eb -eb -eb -eW -fh -fh -fh -fh -fh -fA -eb -eb -eb -eW -fh -fh -fh -fh -fh -fA -eb -eb -eb -eb -eb -eb -eb -cl -jC -eb -eb -eb -eb -kr -dS -dO -kF -kR -kS -la -kF -dO -dO -dO -dO -dO -dO -dO -"} -(30,1,1) = {" -ab -ai -ai -ai -ai -ai -aZ -ai -ai -ai -ai -ai -ab -cy -cy -cy -ab -ab -ai -ai -ai -ai -ai -dA -ai -ai -ai -ai -ai -ab -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dQ -cl -dX -dX -dX -dX -cl -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -fx -eb -eb -eb -eb -eb -eb -eb -eb -eb -cl -eb -eb -fx -fx -eb -kr -ky -dO -kG -kQ -kS -kQ -kG -dO -dO -dO -dO -dO -dO -dO -"} -(31,1,1) = {" -ab -ai -ai -ai -ai -ai -ba -ai -ai -ai -ai -ai -ab -cy -cy -cy -ab -ab -ai -ai -ai -ai -ai -ba -ai -ai -ai -ai -ai -ab -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dQ -cl -dX -dX -dX -dX -cl -eb -eG -eb -eb -eb -fq -fq -fq -eb -eb -eb -eG -eb -eb -eb -fq -fq -fq -eb -eb -eb -eG -eb -eb -eb -fq -fq -fq -eb -eb -eb -eG -eb -eb -eb -eb -eb -cl -eC -eb -fx -fx -eb -ks -cl -dQ -kH -kS -kS -kS -kH -dO -dO -dO -dO -dO -dO -dO -"} -(32,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -cy -cy -cy -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dO -dR -dX -dX -dX -dX -cl -eD -cl -eC -eb -fi -fr -fr -fr -fy -eb -eD -cl -eC -eb -fi -fr -fr -fr -fy -eb -eD -cl -eC -eb -fi -fr -fr -fr -fy -eb -eD -cl -eC -eb -eb -eb -eb -jl -eb -eb -fx -fx -eb -eb -kz -kz -kI -kS -kQ -kS -kD -dO -dO -dO -dO -dO -dO -dO -"} -(33,1,1) = {" -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dO -dS -ea -dX -em -dX -ex -eb -eH -eb -eb -fi -fr -fw -fr -fy -eb -eb -eH -eb -eb -fi -fr -fw -fr -fy -eb -eb -eH -eb -eb -fi -fr -fw -fr -fy -eb -eb -eH -eb -eb -eb -eb -eb -cl -eb -eb -eb -eb -eb -eb -cl -cl -kH -kS -kQ -kP -kD -dO -dO -dO -dO -dO -dO -dO -"} -(34,1,1) = {" -ac -ac -ac -ac -aE -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dO -dT -dX -dX -dX -dX -cl -eD -cl -eC -eb -fi -fr -fr -fr -fy -eb -eD -cl -eC -eb -fi -fr -fr -fr -fy -eb -eD -cl -eC -eb -fi -fr -fr -fr -fy -eb -eD -cl -eC -eb -eb -eb -eb -jl -eb -eb -kh -eb -eb -eb -kz -kz -kI -kS -kQ -kS -kD -dO -dO -dO -dO -dO -dO -dO -"} -(35,1,1) = {" -ac -ac -ac -ac -as -aL -aL -aL -by -ac -ac -ac -ac -ak -by -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dQ -cl -dX -dX -dX -dX -cl -eb -eI -eb -eb -eb -fs -fs -fs -eb -eb -eb -eI -eb -eb -eb -fs -fs -fs -eb -eb -eb -eI -eb -eb -eb -fs -fs -fs -eb -eb -eb -eI -eb -eb -eb -eb -eb -cl -eC -eb -eb -eb -eb -kt -cl -dQ -kH -kS -kS -kS -kH -dO -dO -dO -dO -dO -dO -dO -"} -(36,1,1) = {" -ac -ac -ac -ac -as -at -at -at -at -aL -aL -aL -aL -at -cD -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dQ -cl -dX -dX -dX -dX -cl -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -cl -jD -jD -jD -jD -jD -ku -kA -dO -kE -kQ -kS -lf -kE -dO -dO -dO -dO -dO -dO -dO -"} -(37,1,1) = {" -ac -ac -ac -ac -as -at -at -at -at -at -at -at -at -at -at -cH -cS -cY -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dQ -cl -dX -dX -dX -dX -cl -eb -eb -eb -eW -fh -fh -fh -fh -fh -fA -eb -eb -eb -eW -fh -fh -fh -fh -fh -fA -eb -eb -eb -eW -fh -fh -fh -fh -fh -fA -eb -eb -eb -eb -eb -eb -eb -cl -jE -jS -ki -km -jS -jS -dS -dO -kF -kQ -kS -lg -kF -dO -dO -dO -dO -dO -dO -dO -"} -(38,1,1) = {" -ac -ac -ac -ac -as -at -at -at -at -at -at -at -at -at -at -cI -cT -cT -db -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dQ -cl -cl -cl -cl -cl -cl -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -cl -jF -jT -kj -kj -jT -kv -dS -dO -kG -kQ -kS -kQ -kG -dO -dO -dO -dO -dO -dO -dO -"} -(39,1,1) = {" -ac -ac -ac -ac -as -at -at -at -at -at -bC -at -at -at -at -cJ -cT -cT -cZ -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dQ -cl -eb -eb -eb -eb -cl -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -cl -eb -cl -eb -cl -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -it -iG -iT -cl -jG -jT -kk -ko -kp -kw -dS -dO -kH -kT -lc -kT -kH -dO -dO -dO -dO -dO -dO -dO -"} -(40,1,1) = {" -ac -ac -ac -ak -at -at -at -at -at -at -at -at -at -at -at -cJ -cT -cT -cT -cS -cY -ac -ac -ac -ac -ac -ac -ac -ac -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dQ -cl -eb -cl -cl -cl -cl -eC -eb -eM -eX -eX -eX -eX -eX -eX -eX -eX -eX -eX -eX -eX -eX -fX -eI -eb -eI -eb -eI -eb -gw -gw -gK -gQ -gQ -hb -cl -hA -hR -hA -cl -cl -cl -cl -cl -cl -ik -in -cl -eB -ie -kB -dO -kJ -kU -kU -kU -lj -dO -dO -dO -dO -dO -dO -dO -"} -(41,1,1) = {" -ac -ac -ac -as -at -at -at -at -at -at -at -at -at -at -at -cJ -cT -cT -cT -cT -cZ -ac -ac -ac -ac -ac -ac -ac -ac -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dQ -cl -cl -cl -cl -eo -cl -eb -eb -eN -eY -eY -eY -eY -eY -eY -eY -eY -eY -eY -eY -eY -eY -fY -eb -gg -eb -gg -eb -gp -gw -gD -gD -gD -gD -hc -cl -hB -hE -ia -cl -iu -iu -iU -iu -eb -eb -cl -dQ -dO -dO -dO -dO -dO -kV -kV -kV -dO -dO -dO -dO -dO -dO -dO -dO -"} -(42,1,1) = {" -ac -ac -ac -as -at -at -bb -bn -bz -at -at -at -at -at -at -cJ -cT -cT -cT -cT -cT -dm -ds -ac -ac -ac -ac -ac -ac -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dQ -cl -ec -ei -en -ei -cl -eb -eb -eN -eY -fj -fj -fj -fj -fj -fB -fj -fj -fj -fj -fj -eY -fY -eb -gh -eb -gh -eb -gp -gw -gD -gD -gD -gD -hd -cl -hB -hE -ia -cl -iv -gi -iv -gi -eb -eb -cl -dQ -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -"} -(43,1,1) = {" -ac -ac -ac -as -at -aM -bc -bo -bA -bJ -at -at -at -at -at -cJ -cT -cT -cT -cT -cT -dn -dt -ac -ac -ac -ac -ac -ac -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dQ -cl -cl -cl -cl -ei -cl -eb -eJ -eN -eY -fj -ft -ft -ft -ft -ft -ft -ft -ft -ft -fj -eY -fY -eb -gi -eb -gi -eb -gp -gw -gD -gL -gR -gD -he -cl -hB -hE -ib -cl -eb -eb -eb -eb -eb -eb -cl -dQ -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -"} -(44,1,1) = {" -ac -ac -ak -at -at -aM -bd -bp -bB -bK -at -at -at -at -at -cK -cT -cT -cT -cT -cT -dn -du -dB -ds -ac -ac -ac -ac -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dQ -cl -ec -ei -en -ei -cl -eb -eb -eN -eY -fj -ft -ft -ft -ft -ft -ft -ft -ft -ft -fj -fV -fY -eb -gg -eb -gg -eb -gp -gw -gD -gM -gS -gD -hf -cl -hB -hE -hE -ik -eb -eb -eb -eb -eJ -jU -cl -dQ -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -"} -(45,1,1) = {" -ac -ac -as -at -at -aM -be -bo -bA -bJ -at -at -at -at -at -cJ -cT -cT -cT -cT -cT -dn -du -du -dC -dG -dB -dB -VG -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dQ -cl -cl -cl -cl -ei -cl -eb -eb -eN -eY -fj -ft -ft -ft -ft -ft -ft -ft -ft -ft -fj -eY -fY -eb -gh -eb -gh -eb -gp -gw -gD -gN -gT -gD -hg -cl -hC -hE -ic -cl -eb -eb -eb -eb -jH -jV -cl -dQ -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -"} -(46,1,1) = {" -ac -ak -at -at -at -at -bf -bf -bf -at -at -at -bq -at -at -cJ -cT -cT -cT -cT -cT -dn -du -du -du -du -dv -dv -dv -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dQ -cl -ed -ej -cl -ei -cl -eb -eJ -eN -eY -fj -ft -ft -ft -ft -ft -ft -fH -ft -ft -fj -eY -fY -eb -gi -eb -gi -eb -gp -gw -gD -gM -gU -gD -hh -cl -hB -hE -ia -cl -iw -iH -eb -eb -eJ -jV -cl -dQ -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -"} -(47,1,1) = {" -ac -al -at -at -at -at -at -at -at -at -at -at -at -at -at -cL -cT -cT -cT -cT -cT -dn -du -dC -dv -dD -ac -ac -ac -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dQ -cl -ed -ei -cl -ep -cl -eC -eb -eN -eY -fj -ft -ft -ft -ft -ft -ft -ft -ft -ft -fj -eY -fY -eb -gg -eb -gg -eb -gp -gw -gD -gD -gD -gD -gD -cl -hB -hE -ia -cl -iw -iI -eb -eb -jI -jV -cl -dQ -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -"} -(48,1,1) = {" -ac -ac -as -at -at -at -at -at -bC -at -at -at -at -at -at -cJ -cT -cT -cT -cT -cT -dn -du -dt -ac -ac -ac -ac -ac -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dQ -cl -ed -ei -cl -ei -ei -eb -eb -eN -eY -fj -ft -ft -ft -ft -ft -ft -ft -ft -ft -fj -eY -fY -eb -gh -eb -gh -eb -gp -gw -gD -gD -gD -gD -hd -cl -hD -hE -ia -cl -iw -iI -eG -eb -jH -jV -cl -dQ -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -"} -(49,1,1) = {" -ac -ac -as -at -aF -at -at -at -at -at -at -at -at -at -at -cJ -cT -cT -cT -cT -cT -do -dv -dD -ac -ac -ac -ac -ac -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dQ -cl -ee -ei -en -ei -ei -eb -eJ -eN -eY -fk -fj -fj -fj -fj -fj -fj -fj -fj -fj -fR -eY -fY -eb -gi -eb -gi -eb -gp -gw -gD -gD -gD -gD -gD -ht -hE -hE -ia -cl -cl -cl -cl -cl -cl -cl -cl -dQ -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -"} -(50,1,1) = {" -ac -ac -as -at -at -at -at -at -at -at -at -at -at -at -at -cK -cT -cT -cT -cT -cZ -ac -ac -ac -ac -ac -ac -ac -ac -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dQ -cl -ed -ei -cl -ei -ei -eb -eb -eN -eY -fl -fl -fl -fl -fl -fl -fl -fl -fl -fl -fl -eY -fY -eb -gg -eb -gg -eb -gp -gw -gD -gD -gD -gD -hd -cl -hF -hE -ia -cl -ix -iJ -iV -iJ -ix -iJ -cl -dQ -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -"} -(51,1,1) = {" -ac -ac -as -at -at -at -at -bq -at -at -at -at -at -at -at -cJ -cT -cT -cT -cT -da -ac -ac -ac -ac -ac -ac -ac -ac -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dQ -cl -ed -ei -cl -ep -cl -eC -eb -eN -eY -fl -fl -fl -fl -fl -fl -fl -fl -fl -fl -fl -eY -fY -eb -gh -eb -gh -eb -gp -gw -gD -gD -gD -gD -gD -cl -hB -hE -ia -cl -ix -iK -iW -iK -jJ -iK -cl -dQ -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -"} -(52,1,1) = {" -ac -ac -al -at -aG -at -at -at -at -at -at -at -at -at -at -cM -cT -cT -dc -dg -ac -ac -ac -ac -ac -ac -ac -ac -ac -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dQ -cl -ed -ek -cl -ei -cl -eb -eJ -eN -eY -fl -fl -fl -fl -fl -fl -fl -fl -fl -fl -fl -eY -fY -eb -gi -eb -gi -eb -gp -gw -gD -gM -gV -gD -hi -cl -hB -hE -ia -cl -iy -iJ -iX -jn -iX -iJ -cl -dQ -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -"} -(53,1,1) = {" -ac -ac -ac -as -at -at -at -at -at -at -at -at -at -at -at -cJ -cT -cZ -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dQ -cl -cl -cl -cl -ei -cl -eb -eb -eN -eY -fl -fl -fl -fl -fl -fl -fl -fl -fl -fl -fl -eY -fY -eb -gg -eb -gg -eb -gp -gw -gD -gN -gN -gD -hj -cl -hC -hE -ia -cl -ix -iL -iX -iL -iX -iL -cl -dQ -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -"} -(54,1,1) = {" -ac -ac -ac -as -at -at -at -at -at -at -at -at -at -at -at -cJ -cT -da -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dQ -cl -ec -ei -en -eq -cl -eb -eb -eN -eY -fl -fl -fl -fl -fl -fl -fl -fl -fl -fl -fl -eY -fY -eb -gh -eb -gh -eb -gp -gw -gD -gO -gW -gD -hk -cl -hB -hE -ia -il -iz -iz -iY -iz -jK -jW -cl -dQ -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -"} -(55,1,1) = {" -ac -ac -ac -al -aH -at -at -aH -aH -aH -aH -aH -aH -at -at -cN -cU -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dQ -cl -cl -cl -cl -eq -cl -eb -eJ -eN -eY -fl -fl -fl -fl -fl -fC -fl -fl -fl -fl -fl -eY -fY -eb -gi -eb -gi -eb -gp -gw -gD -gN -gN -gD -hl -cl -hB -hE -ia -cl -ix -iL -iX -iL -iX -iL -cl -dQ -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -"} -(56,1,1) = {" -ac -ac -ac -ac -ac -al -bg -ac -ac -ac -ac -ac -ac -al -bg -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dQ -cl -ec -ei -en -ei -cl -eb -eb -eN -eY -fl -fl -fl -fl -fl -fD -fl -fl -fl -fl -fl -eY -fY -eb -gg -eb -gg -eb -gp -gw -gD -gN -gN -gD -gD -cl -hB -hE -ia -cl -ix -iJ -iZ -iJ -iX -iJ -cl -dQ -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -"} -(57,1,1) = {" -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dQ -cl -cl -cl -cl -er -cl -eb -eb -eN -eY -eY -eY -eY -eY -eY -eY -eY -eY -eY -eY -eY -eY -fY -eb -gh -eb -gh -eb -gp -gw -gD -gD -gD -gD -hd -cl -hC -hE -ia -cl -ix -iK -ja -iK -jL -iK -cl -dQ -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -"} -(58,1,1) = {" -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dQ -cl -cl -cl -cl -cl -cl -eC -eb -eO -eZ -fm -fm -fm -fm -fm -fm -fm -fm -fm -fm -fm -eZ -fZ -eb -gi -eb -gi -eb -gq -gw -gD -gD -gD -gD -hc -cl -hG -hS -id -cl -iA -iJ -jb -iJ -ix -iJ -cl -dQ -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -"} -(59,1,1) = {" -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dQ -dQ -dQ -dQ -dQ -dQ -cl -cl -cl -cl -cl -eB -eE -eE -eE -eE -eE -eE -eE -eE -eE -eL -fW -fW -eB -eE -eE -eE -eL -cl -cl -cl -cl -cl -cl -cl -cl -eB -eE -eL -cl -cl -cl -cl -cl -cl -cl -cl -dQ -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -"} -(60,1,1) = {" -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dQ -dQ -dQ -dQ -dQ -dQ -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dQ -dQ -dO -dO -dO -dO -dO -dQ -dQ -dQ -dQ -dQ -dQ -dQ -dQ -dO -dO -dO -dQ -dQ -dQ -dQ -dQ -dQ -dQ -dQ -dQ -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -"} -(61,1,1) = {" -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -"} -(62,1,1) = {" -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -"} -(63,1,1) = {" -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -"} -(64,1,1) = {" -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dP -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -"} -(65,1,1) = {" -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -"} -(66,1,1) = {" -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -"} -(67,1,1) = {" -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -bL -cq -cq -cE -cO -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -"} -(68,1,1) = {" -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -bL -bV -bV -bV -bV -cq -cE -cO -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -"} -(69,1,1) = {" -ad -ad -ad -ad -ad -ad -ad -ad -ad -bL -bV -bV -bV -bV -bV -bV -cV -cO -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dQ -dQ -dQ -dQ -dQ -dQ -dQ -dO -dO -dO -dQ -dQ -dQ -dO -dQ -dQ -dQ -dO -dO -dO -dQ -dQ -dQ -dO -dQ -dQ -dQ -dO -dO -dO -dQ -dQ -dQ -dO -dQ -dQ -dQ -dO -dO -dO -dO -dO -dO -dQ -dQ -dQ -dQ -dQ -dQ -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -"} -(70,1,1) = {" -ad -ad -ad -ad -ad -ad -ad -ad -ad -bM -bV -cf -bV -bV -bV -cf -bV -cE -cO -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dQ -cl -cl -cl -cl -cl -cl -eB -eE -eL -cl -cl -cl -fu -cl -fz -cl -eB -eE -eL -cl -cl -cl -fu -cl -cl -cl -eB -eE -eL -cl -cl -cl -fu -cl -fz -cl -eB -eE -ie -ie -ie -eL -cl -cl -cl -cl -cl -dQ -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -"} -(71,1,1) = {" -ad -ad -ad -ad -ad -ad -ad -ad -ad -bM -bV -bV -bV -cr -bV -bV -bV -cV -cO -ad -bL -dd -dd -cE -cO -ad -ad -ad -dJ -dL -cO -ad -ad -ad -ad -ad -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dQ -cl -dX -dX -dX -dX -cl -eb -eF -eb -cl -dX -dX -dX -dX -dX -cl -eb -eF -eb -cl -dX -dX -dX -dX -dX -cl -eb -eF -eb -cl -dX -dX -dX -dX -dX -cl -eb -eb -eb -eb -eb -eb -cl -jo -eb -eb -cl -dQ -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -"} -(72,1,1) = {" -ad -ad -ad -ad -ad -ad -ad -ad -ad -bN -bV -bV -cr -cz -cr -bV -bV -bV -dd -dd -cP -cO -ad -dE -cO -bL -dd -dd -dK -dM -cO -ad -ad -ad -ad -ad -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dQ -cl -dX -dX -dX -dX -cl -eb -eb -eb -cl -fn -dX -dX -dX -dX -cl -eb -eb -eb -cl -fS -dX -dX -dX -dX -cl -eb -eb -eb -cl -gF -dX -dX -dX -dX -cl -eC -eb -eb -eb -eb -eD -cl -jp -jM -jX -cl -dQ -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -"} -(73,1,1) = {" -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -bM -bV -bV -cr -bV -bV -bV -cV -cO -ad -ad -ad -ad -bN -dd -cP -cO -ad -dJ -dN -cO -ad -ad -ad -ad -ad -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dQ -cl -dX -dX -dX -dX -cl -eb -eb -eb -fa -dX -dX -fv -dX -dX -cl -eb -eb -eb -fL -dX -dX -fv -dX -dX -cl -eb -eb -eb -gx -dX -dX -fv -dX -dX -cl -eb -eb -eb -eb -eb -eb -cl -eb -jN -jY -cl -dQ -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -"} -(74,1,1) = {" -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -bM -cf -bV -bV -bV -cf -bV -cP -cO -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dO -dR -dX -dX -dX -dX -cl -eb -eb -eb -cl -dX -dX -dX -dX -dX -cl -eb -eb -eb -cl -dX -dX -dX -dX -dX -cl -eb -eb -eb -cl -dX -dX -dX -dX -dX -cl -eb -eb -eb -eb -eb -eb -cl -eb -eb -jZ -cl -dQ -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -"} -(75,1,1) = {" -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -bM -bV -bV -bV -bV -bV -cV -cO -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dO -dS -ef -dX -em -dX -ey -eb -eb -eb -cl -dX -dX -dX -dX -dX -cl -eb -eb -eb -cl -dX -dX -dX -dX -dX -cl -eb -eb -eb -cl -dX -dX -dX -dX -dX -cl -eb -eb -eb -eb -eb -eb -cl -eb -eb -ka -cl -dQ -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -"} -(76,1,1) = {" -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -bN -cg -cg -bV -bV -bV -cP -cO -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dO -dT -dX -dX -dX -dX -cl -eb -eb -eD -cl -cl -cl -cl -cl -cl -cl -eb -eb -eD -cl -cl -cl -cl -cl -cl -cl -eb -eb -eD -cl -cl -cl -cl -cl -cl -cl -eC -eb -eb -eb -eb -eD -cl -eb -jq -eb -cl -dQ -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -"} -(77,1,1) = {" -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -bN -cg -cP -cO -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dQ -cl -dX -dX -dX -dX -cl -eb -eb -eb -cl -dX -dX -dX -dX -dX -cl -eb -eb -eb -cl -dX -dX -dX -dX -dX -cl -eb -eb -eb -cl -dX -dX -dX -dX -dX -cl -hH -hH -hH -fF -eb -eb -cl -jq -eb -jY -cl -dQ -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -"} -(78,1,1) = {" -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dQ -cl -dX -dX -dX -dX -cl -eb -eb -eb -cl -fo -dX -dX -dX -dX -cl -eb -eb -eb -cl -fT -dX -dX -dX -dX -cl -eb -eb -eb -cl -gG -dX -dX -dX -dX -cl -hI -hT -if -fF -eb -eb -cl -eb -eb -eb -cl -dQ -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -"} -(79,1,1) = {" -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dQ -cl -dX -dX -dX -dX -cl -eb -eb -eb -fb -dX -dX -fv -dX -dX -cl -eb -eb -eb -fM -dX -dX -fv -dX -dX -cl -eb -eb -eb -gy -dX -dX -fv -dX -dX -cl -hJ -hU -ig -fF -eb -eb -cl -eb -eb -eb -cl -dQ -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -"} -(80,1,1) = {" -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dQ -cl -cl -cl -cl -cl -cl -eb -eb -eb -cl -dX -dX -dX -dX -dX -cl -eb -eb -eb -cl -dX -dX -dX -dX -dX -cl -eb -eb -eb -cl -dX -dX -dX -dX -dX -cl -hK -eR -eR -fF -eb -eD -cl -eb -eb -jq -cl -dQ -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -"} -(81,1,1) = {" -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dQ -cl -dX -dX -dX -dX -cl -eb -eb -eb -cl -dX -dX -dX -dX -dX -cl -eb -eb -eb -cl -dX -dX -dX -dX -dX -cl -eb -eb -eb -cl -dX -dX -dX -dX -dX -cl -eR -eR -eR -fF -eb -eb -cl -eb -eb -eb -cl -dQ -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -"} -(82,1,1) = {" -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dQ -cl -dX -dX -dX -dX -cl -eb -eb -eD -cl -cl -cl -cl -cl -cl -cl -eb -eb -eD -cl -cl -cl -cl -cl -cl -cl -eb -eb -eD -cl -cl -cl -cl -cl -cl -cl -eR -eR -eR -fF -eb -eb -cl -eb -jr -eb -cl -dQ -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -"} -(83,1,1) = {" -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dQ -cl -dX -dX -dX -dX -cl -eb -eb -eb -cl -dX -dX -dX -dX -dX -cl -eb -eb -eb -cl -dX -dX -dX -dX -dX -cl -eb -eb -eb -cl -dX -dX -dX -dX -dX -cl -eR -eR -eR -fF -eb -eb -cl -jr -eb -kb -cl -dQ -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -"} -(84,1,1) = {" -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dO -dR -dX -dX -dX -dX -cl -eb -eb -eb -cl -fp -dX -dX -dX -dX -cl -eb -eb -eb -cl -fU -dX -dX -dX -dX -cl -eb -eb -eb -cl -gH -dX -dX -dX -dX -cl -hK -eR -eR -fF -eb -eD -cl -eb -eb -kb -cl -dQ -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -"} -(85,1,1) = {" -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dO -dS -eg -dX -em -dX -ez -eb -eb -eb -fc -dX -dX -fv -dX -dX -cl -eb -eb -eb -fN -dX -dX -fv -dX -dX -cl -eb -eb -eb -gz -dX -dX -fv -dX -dX -cl -eR -eR -eR -fF -eb -eb -cl -eb -eb -eb -cl -dQ -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -"} -(86,1,1) = {" -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dO -dT -dX -dX -dX -dX -cl -eb -eb -eb -cl -dX -dX -dX -dX -dX -cl -eb -eb -eb -cl -dX -dX -dX -dX -dX -cl -eb -eb -eb -cl -dX -dX -dX -dX -dX -cl -eR -eR -eR -fF -eb -eb -cl -js -js -js -cl -dQ -dO -dO -dO -dO -dO -kK -kY -lh -dO -dO -dO -dO -dO -dO -dO -dO -"} -(87,1,1) = {" -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dQ -cl -dX -dX -dX -dX -cl -eb -eb -eb -cl -dX -dX -dX -dX -dX -cl -eb -eb -eb -cl -dX -dX -dX -dX -dX -cl -eb -eb -eb -cl -dX -dX -dX -dX -dX -cl -eR -eR -eR -fF -eb -eb -cl -js -js -js -cl -dQ -dO -dO -dO -dO -dO -kL -kX -kL -dO -dO -dO -dO -dO -dO -dO -dO -"} -(88,1,1) = {" -ae -am -au -am -ae -af -ae -af -ae -ag -ag -ag -ag -ag -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dQ -cl -dX -dX -dX -dX -cl -eb -eb -eb -cl -cl -cl -cl -cl -cl -cl -eb -eb -eb -cl -cl -cl -cl -cl -cl -cl -eb -eb -eb -cl -cl -cl -cl -cl -cl -cl -hK -eR -eR -fF -eb -eD -cl -cl -cl -kc -cl -cl -eB -eE -kx -dO -kK -kW -kX -li -lh -dO -dO -dO -dO -dO -dO -dO -"} -(89,1,1) = {" -ae -am -ae -am -ae -aN -ae -br -ae -ae -ae -ae -ae -ae -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dQ -cl -dX -dX -dX -dX -cl -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -fd -fd -fd -eb -eb -eb -is -cl -eb -eb -eI -eb -eb -eb -dS -dO -kL -kX -kX -kX -kL -dO -dO -dO -dO -dO -dO -dO -"} -(90,1,1) = {" -ae -an -ae -az -ae -aO -ae -bs -ae -af -bW -ch -cs -ae -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dQ -cl -cl -cl -cl -cl -cl -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -is -cl -eb -eb -eb -eb -eb -eb -dS -dO -kL -kX -kX -kX -kL -dO -dO -dO -dO -dO -dO -dO -"} -(91,1,1) = {" -ae -ao -ae -aA -ae -am -ae -am -ae -ae -ae -ae -ct -ae -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dQ -cl -dX -dX -dX -dX -cl -eb -eb -eb -eW -fh -fh -fh -fh -fh -fA -eb -eb -eb -eW -fh -fh -fh -fh -fh -fA -eb -eb -eb -eW -fh -fh -fh -fh -fh -fA -eb -eb -eb -eb -eb -eb -is -cl -eb -eb -eb -eb -eb -eb -dS -dO -kL -kX -kX -kX -kL -dO -dO -dO -dO -dO -dO -dO -"} -(92,1,1) = {" -ae -af -ae -af -ae -am -aP -am -ae -af -bX -ci -cu -ae -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dQ -cl -dX -dX -dX -dX -cl -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -cl -eb -eb -eb -eb -eb -eb -ky -dO -kL -kX -kX -kX -kL -dO -dO -dO -dO -dO -dO -dO -"} -(93,1,1) = {" -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dQ -cl -dX -dX -dX -dX -cl -eb -eG -eb -eQ -eQ -eQ -eQ -eQ -eQ -eQ -eb -eG -eb -eQ -eQ -eQ -eQ -eQ -eQ -eQ -eb -eG -eb -eQ -eQ -eQ -eQ -eQ -eQ -eQ -eb -eG -eb -eb -eb -eb -eb -cl -eC -eb -eb -eb -eb -eD -cl -dQ -kL -kX -kX -kX -kL -dO -dO -dO -dO -dO -dO -dO -"} -(94,1,1) = {" -af -ap -av -am -aI -aP -am -am -am -bO -bY -af -ag -ag -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dO -dU -dX -dX -dX -dX -cl -eD -cl -eP -eR -eR -eR -eR -eR -eR -eR -fE -cl -eP -eR -eR -eR -eR -eR -eR -eR -fE -cl -eP -eR -eR -eR -eR -eR -eR -eR -fE -cl -eC -eb -eb -eb -eb -jt -eb -eb -eb -eb -eb -eb -cl -dQ -kL -kX -kX -kX -kL -dO -dO -dO -dO -dO -dO -dO -"} -(95,1,1) = {" -ae -ae -ae -ae -ae -am -ae -ae -ae -ae -ae -ae -ae -ag -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dO -dV -eh -dX -em -dX -eA -eb -eH -eK -eR -eR -eR -eR -eR -eR -eR -fF -eH -eK -eR -eR -eR -eR -eR -eR -eR -fF -eH -eK -eR -eR -eR -eR -eR -eR -eR -fF -eH -eb -eb -eb -eb -eb -cl -eb -eb -eb -eb -eb -eb -cl -dQ -kL -kX -kX -kX -kL -dO -dO -dO -dO -dO -dO -dO -"} -(96,1,1) = {" -af -aq -aw -am -ae -am -au -am -ae -am -bZ -cj -af -ag -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dO -dW -dX -dX -dX -dX -cl -eD -cl -eP -eR -eR -eR -eR -eR -eR -eR -fE -cl -eP -eR -eR -eR -eR -eR -eR -eR -fE -cl -eP -eR -eR -eR -eR -eR -eR -eR -fE -cl -eC -eb -eb -eb -eb -jt -eb -eb -eb -eb -eb -eb -cl -dQ -kL -kX -kX -kX -kL -dO -dO -dO -dO -dO -dO -dO -"} -(97,1,1) = {" -ae -ae -ae -am -ae -ae -ae -am -ae -bP -ae -ae -ae -ag -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dQ -cl -dX -dX -dX -dX -cl -eb -eI -eb -fd -fd -fd -fd -fd -fd -fd -eb -eI -eb -fd -fd -fd -fd -fd -fd -fd -eb -eI -eb -fd -fd -fd -fd -fd -fd -fd -eb -eI -eb -eb -eb -eb -eb -cl -eC -eb -eb -eb -eb -eD -cl -dQ -kL -kX -kX -kX -kL -dO -dO -dO -dO -dO -dO -dO -"} -(98,1,1) = {" -ag -ag -ae -aB -ae -af -ae -bt -ae -am -ca -ck -af -ag -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dQ -cl -dX -dX -dX -dX -cl -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -cl -eb -eb -eb -eb -eb -eb -kA -dO -kL -kX -kX -kX -kL -dO -dO -dO -dO -dO -dO -dO -"} -(99,1,1) = {" -ag -ag -ae -aA -ae -aQ -ae -aA -ae -ae -ae -ae -ae -ag -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dQ -cl -dX -dX -dX -dX -cl -eb -eb -eb -eW -fh -fh -fh -fh -fh -fA -eb -eb -eb -eW -fh -fh -fh -fh -fh -fA -eb -eb -eb -eW -fh -fh -fh -fh -fh -fA -eb -eb -eb -eb -eb -eb -eb -cl -eb -eb -eb -eb -eb -eb -dS -dO -kL -kX -kX -kX -kL -dO -dO -dO -dO -dO -dO -dO -"} -(100,1,1) = {" -ag -ag -ae -af -ae -am -ae -af -ae -ag -ag -ag -ag -ag -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dQ -cl -cl -cl -cl -cl -cl -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -cl -eb -eb -eb -eb -eb -eb -dS -dO -kL -kX -kX -kX -kL -dO -dO -dO -dO -dO -dO -dO -"} -(101,1,1) = {" -ag -ag -ae -ae -ae -am -ae -ae -ae -ae -ag -ag -ag -ag -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dQ -cl -eb -eb -eb -eb -cl -eb -eb -eQ -eQ -eQ -eQ -eQ -eQ -eQ -eQ -eQ -eQ -eQ -eQ -eQ -eQ -eQ -cl -eb -cl -eb -cl -eb -cl -eb -eb -eb -eb -eb -eb -eb -eb -eb -eb -it -iG -iT -cl -eb -eb -eb -eb -eb -eb -dS -dO -kL -kX -kX -kX -kL -dO -dO -dO -dO -dO -dO -dO -"} -(102,1,1) = {" -ag -ag -ae -am -aP -am -ae -ll -lm -ae -ag -ag -ag -ag -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dQ -cl -eb -cl -cl -cl -cl -eC -eK -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -ga -gb -eb -eI -dX -go -dX -go -dX -gP -gP -gK -hb -cl -hA -hV -hA -cl -cl -cl -cl -cl -cl -kd -in -cl -eB -ie -kB -dO -kM -kY -kY -kY -lk -dO -dO -dO -dO -dO -dO -dO -"} -(103,1,1) = {" -ae -ae -ae -am -ae -ae -ae -ae -am -ae -ae -ae -ag -ag -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dQ -cl -cl -cl -cl -eo -cl -eb -eK -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -gc -gj -gm -dX -dX -dX -dX -gI -gP -gX -gZ -hm -cl -hB -hE -ia -cl -eb -eb -eI -eb -eb -eb -cl -dQ -dO -dO -dO -dO -dO -kZ -kZ -kZ -dO -dO -dO -dO -dO -dO -dO -dO -"} -(104,1,1) = {" -af -ar -ax -am -am -au -am -am -am -bQ -cb -af -ag -ag -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dQ -cl -ec -ei -en -ei -cl -eb -eK -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -gd -gk -gk -dX -dX -dX -dX -gI -gP -gX -gX -hn -cl -hB -hE -ia -cl -iB -iB -iB -iB -iB -eb -cl -dQ -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -"} -(105,1,1) = {" -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ag -ag -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dQ -cl -cl -cl -cl -ei -cl -eb -eK -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -ge -gl -gn -dX -dX -dX -dX -gI -gP -gX -gX -gX -cl -hB -hE -ib -cl -iB -iM -jc -ju -iB -eb -cl -dQ -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -"} -(106,1,1) = {" -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dQ -cl -ec -ei -en -es -cl -eb -eK -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -gc -gj -gm -dX -dX -dX -dX -gI -gP -gX -gX -gX -cl -hB -hE -hE -im -iB -iN -jd -jv -iB -eD -cl -dQ -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -"} -(107,1,1) = {" -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dQ -cl -cl -cl -cl -et -cl -eb -eK -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -gd -gk -gk -dX -dX -dX -dX -gI -gP -gX -gX -ho -cl -hL -hE -ic -cl -iB -iO -je -jw -iB -eb -cl -dQ -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -"} -(108,1,1) = {" -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dQ -cl -ed -el -cl -ei -cl -eb -eK -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -ge -gl -gn -dX -dX -dX -dX -gI -gP -gX -gX -hp -cl -hB -hE -ia -cl -iB -iB -iB -iB -iB -eb -cl -dQ -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -"} -(109,1,1) = {" -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dQ -cl -ed -ei -cl -ep -cl -eC -eK -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -gc -gj -gm -dX -dX -dX -dX -gI -gP -gX -gX -hq -cl -hB -hE -ia -cl -eb -eb -eG -eb -eb -eb -cl -dQ -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -"} -(110,1,1) = {" -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dQ -cl -ed -ei -cl -ei -ei -eb -eK -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -gd -gk -gk -dX -dX -dX -dX -gI -gP -gX -gX -hr -cl -hD -hE -ia -cl -iC -iP -jf -jx -jO -iC -cl -dQ -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -"} -(111,1,1) = {" -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dQ -cl -ee -ei -en -ei -ei -eb -eK -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -ge -gl -gn -dX -dX -gr -dX -gI -gP -gX -gX -gX -hu -hE -hE -ia -cl -cl -cl -cl -cl -cl -cl -cl -dQ -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -"} -(112,1,1) = {" -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dQ -cl -ed -ei -cl -ei -ei -eb -eK -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -gc -gj -gm -dX -dX -dX -dX -gI -gP -gX -gX -hr -cl -hF -hE -ia -cl -iD -iD -iD -iQ -iD -iD -cl -dQ -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -"} -(113,1,1) = {" -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dQ -cl -ed -ei -cl -ep -cl -eC -eK -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -gd -gk -gk -dX -dX -dX -dX -gI -gP -gX -gX -hq -cl -hB -hE -ia -in -iD -ln -iQ -jy -iQ -ke -cl -dQ -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -"} -(114,1,1) = {" -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dQ -cl -ed -ek -cl -ei -cl -eb -eK -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -ge -gl -gn -dX -dX -dX -dX -gI -gP -gX -gX -hp -cl -hB -hE -ia -io -iE -iR -iQ -iQ -iQ -jB -cl -dQ -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -"} -(115,1,1) = {" -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dQ -cl -cl -cl -cl -ei -cl -eb -eK -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -gc -gj -gm -dX -dX -dX -dX -gI -gP -gX -gX -gY -cl -hL -hE -ih -in -iD -iQ -jg -jz -ji -iQ -cl -dQ -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -"} -(116,1,1) = {" -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dQ -cl -ec -ei -en -ei -cl -eb -eK -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -gf -gk -gk -dX -dX -dX -dX -gI -gP -gX -gX -gY -cl -hB -hW -ih -cl -iD -iD -jh -jA -jz -iQ -cl -dQ -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -"} -(117,1,1) = {" -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dQ -cl -cl -cl -cl -ei -cl -eb -eK -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -ge -gl -gn -dX -dX -dX -dX -gI -gP -gX -gX -hs -cl -hM -hW -ia -cl -iD -iD -ji -jz -ji -kf -cl -dQ -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -"} -(118,1,1) = {" -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dQ -cl -ec -ei -en -ei -cl -eb -eK -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -gc -gj -gm -dX -dX -dX -dX -gI -gP -gX -gX -gX -cl -hB -hW -ih -cl -iD -iD -iQ -iQ -jy -iQ -cl -dQ -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -"} -(119,1,1) = {" -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dQ -cl -cl -cl -cl -eu -cl -eb -eK -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -gd -gk -gk -dX -dX -dX -dX -gI -gP -gX -gX -hn -cl -hL -hW -ia -cl -iD -iD -iQ -jB -jP -iD -cl -dQ -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -"} -(120,1,1) = {" -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dQ -cl -cl -cl -cl -cl -cl -eC -eK -eS -eS -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -eR -eS -eS -ge -gl -gn -dX -dX -gs -dX -gJ -gP -gY -gZ -hm -cl -hN -hS -id -cl -iD -iQ -jj -iQ -iQ -iD -cl -dQ -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -"} -(121,1,1) = {" -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dQ -dQ -dQ -dQ -dQ -dQ -cl -cl -cl -cl -cl -eB -eE -eE -eE -eE -eE -eE -eE -eE -eE -eL -cl -cl -eB -eE -eE -eE -eL -cl -cl -cl -cl -cl -cl -cl -cl -eB -eE -eL -cl -cl -cl -cl -cl -cl -cl -cl -dQ -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -"} -(122,1,1) = {" -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dQ -dQ -dQ -dQ -dQ -dQ -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dQ -dQ -dO -dO -dO -dO -dO -dQ -dQ -dQ -dQ -dQ -dQ -dQ -dQ -dO -dO -dO -dQ -dQ -dQ -dQ -dQ -dQ -dQ -dQ -dQ -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -"} -(123,1,1) = {" -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -"} -(124,1,1) = {" -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -"} -(125,1,1) = {" -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -"} -(126,1,1) = {" -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -"} -(127,1,1) = {" -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -"} -(128,1,1) = {" -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -ah -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -dO -"} diff --git a/_maps/map_files/RandomZLevels/stationCollision.dmm b/_maps/map_files/RandomZLevels/stationCollision.dmm index d56e1f6e539..e6c7bfcd7b0 100644 --- a/_maps/map_files/RandomZLevels/stationCollision.dmm +++ b/_maps/map_files/RandomZLevels/stationCollision.dmm @@ -142,16 +142,7 @@ /turf/simulated/floor/plasteel, /area/awaymission/northblock) "aC" = ( -/turf/simulated/shuttle/wall{ - icon_state = "wall3" - }, -/area/awaymission/syndishuttle) -"aD" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 1; - icon_state = "diagonalWall3" - }, +/turf/simulated/wall/mineral/plastitanium, /area/awaymission/syndishuttle) "aE" = ( /obj/machinery/door/airlock/engineering, @@ -177,7 +168,7 @@ icon_state = "burst_l"; tag = "icon-burst_l (EAST)" }, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/awaymission/syndishuttle) "aJ" = ( /turf/simulated/floor/plating/airless, @@ -205,12 +196,6 @@ }, /turf/simulated/floor/plating/airless, /area/awaymission/syndishuttle) -"aQ" = ( -/turf/simulated/floor/plating/airless, -/turf/simulated/shuttle/wall{ - icon_state = "diagonalWall3" - }, -/area/awaymission/syndishuttle) "aR" = ( /obj/structure/closet/secure_closet/engineering_personal, /obj/effect/landmark/damageturf, @@ -244,18 +229,10 @@ /obj/machinery/portable_atmospherics/canister/toxins{ destroyed = 1 }, -/turf/simulated/shuttle/plating, -/area/awaymission/syndishuttle) -"aY" = ( -/turf/simulated/shuttle/plating, -/turf/simulated/shuttle/wall{ - icon_state = "diagonalWall3" - }, +/turf/simulated/floor/plating, /area/awaymission/syndishuttle) "aZ" = ( -/turf/simulated/shuttle/wall{ - icon_state = "wall3" - }, +/turf/simulated/wall/mineral/plastitanium, /area/space/nearstation) "ba" = ( /turf/simulated/wall, @@ -272,10 +249,10 @@ /area/awaymission/northblock) "be" = ( /obj/structure/shuttle/engine/heater, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating, /area/awaymission/syndishuttle) "bf" = ( -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating, /area/awaymission/syndishuttle) "bg" = ( /turf/simulated/floor/plasteel/airless{ @@ -333,7 +310,7 @@ /area/awaymission/northblock) "bp" = ( /obj/structure/shuttle/engine/router, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating, /area/awaymission/syndishuttle) "bq" = ( /obj/structure/shuttle/engine/heater{ @@ -341,11 +318,11 @@ icon_state = "heater"; dir = 8 }, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating, /area/awaymission/syndishuttle) "br" = ( /obj/item/storage/toolbox/syndicate, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating, /area/awaymission/syndishuttle) "bs" = ( /obj/structure/lattice, @@ -353,7 +330,7 @@ /area/awaymission/syndishuttle) "bt" = ( /obj/machinery/door/airlock/centcom, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating, /area/awaymission/syndishuttle) "bu" = ( /turf/simulated/floor/plasteel/airless{ @@ -376,7 +353,7 @@ /area/awaymission/research) "by" = ( /obj/machinery/portable_atmospherics/canister/toxins, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating, /area/awaymission/syndishuttle) "bz" = ( /obj/structure/table, @@ -415,13 +392,6 @@ dir = 1 }, /area/awaymission/northblock) -"bE" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 4; - icon_state = "diagonalWall3" - }, -/area/awaymission/syndishuttle) "bF" = ( /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel, @@ -532,14 +502,7 @@ icon_state = "heater"; dir = 1 }, -/turf/simulated/shuttle/plating, -/area/awaymission/syndishuttle) -"bW" = ( -/turf/simulated/shuttle/plating, -/turf/simulated/shuttle/wall{ - dir = 8; - icon_state = "diagonalWall3" - }, +/turf/simulated/floor/plating, /area/awaymission/syndishuttle) "bX" = ( /turf/simulated/floor/plasteel/airless{ @@ -741,7 +704,7 @@ icon_state = "burst_l"; tag = "icon-burst_l (EAST)" }, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/awaymission/research) "cz" = ( /obj/structure/shuttle/engine/heater{ @@ -756,7 +719,7 @@ /obj/structure/window/reinforced{ dir = 1 }, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/awaymission/research) "cA" = ( /turf/simulated/floor/plasteel{ @@ -769,13 +732,6 @@ icon_state = "dark" }, /area/awaymission/research) -"cD" = ( -/turf/simulated/floor/plating/airless, -/turf/simulated/shuttle/wall{ - dir = 8; - icon_state = "diagonalWall3" - }, -/area/awaymission/syndishuttle) "cE" = ( /obj/structure/window/reinforced{ dir = 8 @@ -839,7 +795,7 @@ /obj/structure/window/reinforced{ dir = 1 }, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/awaymission/research) "cL" = ( /obj/effect/decal/remains/human{ @@ -1488,21 +1444,11 @@ /area/awaymission/northblock) "eh" = ( /obj/machinery/sleeper, -/turf/simulated/shuttle/floor{ - icon_state = "floor4"; - nitrogen = 0.01; - oxygen = 0.01; - temperature = 2.7 - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/syndishuttle) "ei" = ( /obj/machinery/vending/snack, -/turf/simulated/shuttle/floor{ - icon_state = "floor4"; - nitrogen = 0.01; - oxygen = 0.01; - temperature = 2.7 - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/syndishuttle) "ej" = ( /obj/structure/cable{ @@ -1522,9 +1468,7 @@ }, /area/awaymission/research) "el" = ( -/obj/machinery/atmospherics/unary/cold_sink/freezer{ - current_temperature = 80 - }, +/obj/machinery/atmospherics/unary/thermomachine/freezer, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -1555,12 +1499,7 @@ /area/awaymission/northblock) "ep" = ( /obj/machinery/vending/cigarette, -/turf/simulated/shuttle/floor{ - icon_state = "floor4"; - nitrogen = 0.01; - oxygen = 0.01; - temperature = 2.7 - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/syndishuttle) "eq" = ( /obj/structure/chair/office/light{ @@ -1571,12 +1510,7 @@ /area/awaymission/northblock) "er" = ( /obj/machinery/vending/cola, -/turf/simulated/shuttle/floor{ - icon_state = "floor4"; - nitrogen = 0.01; - oxygen = 0.01; - temperature = 2.7 - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/syndishuttle) "es" = ( /obj/machinery/door/airlock/command, @@ -1638,12 +1572,7 @@ /area/awaymission/northblock) "ex" = ( /obj/machinery/vending/coffee, -/turf/simulated/shuttle/floor{ - icon_state = "floor4"; - nitrogen = 0.01; - oxygen = 0.01; - temperature = 2.7 - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/syndishuttle) "ey" = ( /obj/machinery/light{ @@ -1717,7 +1646,7 @@ dir = 1 }, /obj/structure/window/reinforced, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/awaymission/research) "eI" = ( /obj/structure/window/reinforced{ @@ -1731,29 +1660,14 @@ /area/awaymission/northblock) "eJ" = ( /obj/structure/closet/syndicate, -/turf/simulated/shuttle/floor{ - icon_state = "floor4"; - nitrogen = 0.01; - oxygen = 0.01; - temperature = 2.7 - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/syndishuttle) "eK" = ( -/turf/simulated/shuttle/floor{ - icon_state = "floor4"; - nitrogen = 0.01; - oxygen = 0.01; - temperature = 2.7 - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/syndishuttle) "eL" = ( /obj/machinery/door/airlock/centcom, -/turf/simulated/shuttle/floor{ - icon_state = "floor4"; - nitrogen = 0.01; - oxygen = 0.01; - temperature = 2.7 - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/syndishuttle) "eM" = ( /obj/machinery/light/small, @@ -1859,21 +1773,11 @@ desc = "A dark little medical robot. She looks somewhat underwhelmed."; name = "Nightingale" }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4"; - nitrogen = 0.01; - oxygen = 0.01; - temperature = 2.7 - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/syndishuttle) "eX" = ( /obj/structure/table, -/turf/simulated/shuttle/floor{ - icon_state = "floor4"; - nitrogen = 0.01; - oxygen = 0.01; - temperature = 2.7 - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/syndishuttle) "eY" = ( /obj/effect/landmark/burnturf, @@ -1944,44 +1848,24 @@ /obj/structure/chair/comfy/shuttle{ dir = 4 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4"; - nitrogen = 0.01; - oxygen = 0.01; - temperature = 2.7 - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/syndishuttle) "fg" = ( /obj/structure/chair/comfy/shuttle{ dir = 8 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4"; - nitrogen = 0.01; - oxygen = 0.01; - temperature = 2.7 - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/syndishuttle) "fh" = ( /obj/structure/table, /obj/item/paper/sc_safehint_paper_shuttle, -/turf/simulated/shuttle/floor{ - icon_state = "floor4"; - nitrogen = 0.01; - oxygen = 0.01; - temperature = 2.7 - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/syndishuttle) "fi" = ( /obj/machinery/sleeper{ dir = 1 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4"; - nitrogen = 0.01; - oxygen = 0.01; - temperature = 2.7 - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/syndishuttle) "fj" = ( /obj/machinery/door/airlock/gold{ @@ -2226,79 +2110,15 @@ /turf/simulated/wall/cult, /area/awaymission/midblock) "fJ" = ( -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/grille, -/turf/simulated/floor/plating, -/area/awaymission/midblock) -"fK" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/grille, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/awaymission/midblock) "fL" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - tag = "icon-swall_f6"; - icon_state = "swall_f6"; - dir = 2 - }, -/area/awaymission/arrivalblock) -"fM" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall14"; - icon_state = "swall14"; - dir = 2 - }, +/turf/simulated/wall/mineral/titanium, /area/awaymission/arrivalblock) "fN" = ( -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/grille, -/turf/simulated/shuttle/plating, -/area/awaymission/arrivalblock) -"fO" = ( -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/grille, -/turf/simulated/shuttle/plating, -/area/awaymission/arrivalblock) -"fP" = ( -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/grille, -/turf/simulated/shuttle/plating, -/area/awaymission/arrivalblock) -"fQ" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 3; - icon_state = "swall_f10"; - layer = 2; - tag = "icon-swall_f10" - }, +/obj/effect/spawner/window/shuttle, +/turf/simulated/floor/plating, /area/awaymission/arrivalblock) "fR" = ( /obj/item/paper{ @@ -2353,40 +2173,14 @@ icon_state = "dark" }, /area/awaymission/midblock) -"fY" = ( -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/grille, -/turf/simulated/floor/plating, -/area/awaymission/midblock) -"fZ" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall3"; - icon_state = "swall3"; - dir = 2 - }, -/area/awaymission/arrivalblock) -"ga" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall1"; - icon_state = "swall1"; - dir = 2 - }, -/area/awaymission/arrivalblock) "gb" = ( -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/awaymission/arrivalblock) "gc" = ( /obj/structure/chair/comfy/shuttle{ dir = 1 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/awaymission/arrivalblock) "gd" = ( /obj/structure/chair/comfy/brown{ @@ -2507,50 +2301,11 @@ icon_state = "dark" }, /area/awaymission/midblock) -"gv" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/grille, -/turf/simulated/floor/plating, -/area/awaymission/midblock) -"gw" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/grille, -/turf/simulated/shuttle/plating, -/area/awaymission/arrivalblock) "gx" = ( /obj/machinery/status_display{ pixel_y = 32 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, -/area/awaymission/arrivalblock) -"gy" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/grille, -/obj/structure/window/reinforced, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/mineral/titanium, /area/awaymission/arrivalblock) "gz" = ( /turf/simulated/wall, @@ -2663,23 +2418,11 @@ icon_state = "chapel" }, /area/awaymission/midblock) -"gQ" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/grille, -/turf/simulated/shuttle/plating, -/area/awaymission/arrivalblock) "gR" = ( -/obj/machinery/door/unpowered/shuttle{ +/obj/machinery/door/airlock/titanium{ name = "Shuttle Airlock" }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/plating, /area/awaymission/arrivalblock) "gS" = ( /obj/machinery/door/airlock/external{ @@ -2846,42 +2589,8 @@ icon_state = "chapel" }, /area/awaymission/midblock) -"hn" = ( -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/grille, -/turf/simulated/shuttle/plating, -/area/awaymission/arrivalblock) -"ho" = ( -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/shuttle/plating, -/area/awaymission/arrivalblock) "hp" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/awaymission/arrivalblock) "hq" = ( @@ -2909,14 +2618,6 @@ "hu" = ( /turf/simulated/floor/plasteel, /area/awaymission/arrivalblock) -"hv" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - tag = "icon-swall_f5"; - icon_state = "swall_f5"; - dir = 2 - }, -/area/awaymission/arrivalblock) "hw" = ( /obj/structure/window/reinforced, /turf/simulated/floor/plasteel, @@ -2985,16 +2686,6 @@ }, /turf/simulated/floor/plasteel, /area/awaymission/midblock) -"hE" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/shuttle/plating, -/area/awaymission/arrivalblock) "hF" = ( /turf/simulated/floor/plasteel{ icon_state = "red"; @@ -3066,48 +2757,12 @@ /obj/effect/decal/cleanable/blood/splatter, /turf/simulated/floor/plasteel, /area/awaymission/midblock) -"hR" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - tag = "icon-swall_f9"; - icon_state = "swall_f9"; - dir = 2 - }, -/area/awaymission/arrivalblock) "hS" = ( /obj/machinery/light/small, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/awaymission/midblock) -"hT" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/grille, -/turf/simulated/floor/plating, -/area/awaymission/midblock) -"hU" = ( -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/grille, -/turf/simulated/floor/plating, -/area/awaymission/midblock) -"hV" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/grille, -/turf/simulated/floor/plating, -/area/awaymission/arrivalblock) "hW" = ( /obj/effect/decal/cleanable/blood/splatter, /obj/item/ammo_casing/c10mm, @@ -3338,54 +2993,11 @@ }, /turf/simulated/floor/plasteel, /area/awaymission/midblock) -"iC" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/item/shard{ - icon_state = "medium" - }, -/obj/item/stack/rods, -/turf/simulated/floor/plating, -/area/awaymission/arrivalblock) "iD" = ( /obj/effect/decal/remains/human, /obj/item/ammo_casing/c10mm, /turf/simulated/floor/plasteel, /area/awaymission/arrivalblock) -"iE" = ( -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/awaymission/arrivalblock) -"iF" = ( -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/grille, -/turf/simulated/floor/plating, -/area/awaymission/arrivalblock) -"iG" = ( -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/awaymission/arrivalblock) "iH" = ( /obj/machinery/door/airlock/security, /turf/simulated/floor/plasteel, @@ -3404,14 +3016,6 @@ /obj/machinery/door/airlock/public/glass, /turf/simulated/floor/plasteel, /area/awaymission/midblock) -"iK" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/grille, -/obj/item/shard, -/turf/simulated/shuttle/plating, -/area/awaymission/arrivalblock) "iL" = ( /obj/item/shard{ icon_state = "small" @@ -3502,13 +3106,6 @@ "iY" = ( /turf/simulated/wall, /area/awaymission/southblock) -"iZ" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/grille, -/turf/simulated/floor/plating, -/area/awaymission/arrivalblock) "ja" = ( /obj/structure/closet/wardrobe/orange, /turf/simulated/floor/plasteel{ @@ -3535,14 +3132,14 @@ icon_state = "propulsion_r" }, /obj/structure/shuttle/engine/propulsion, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/awaymission/arrivalblock) "je" = ( /turf/space, /area/awaymission/arrivalblock) "jf" = ( /obj/structure/shuttle/engine/propulsion, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/awaymission/arrivalblock) "jg" = ( /obj/structure/shuttle/engine/propulsion{ @@ -3558,7 +3155,7 @@ icon_state = "propulsion_l" }, /obj/structure/shuttle/engine/propulsion, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/awaymission/arrivalblock) "jh" = ( /obj/structure/cable{ @@ -3682,32 +3279,7 @@ /turf/simulated/wall, /area/awaymission/gateroom) "jv" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced, -/obj/structure/grille, -/turf/simulated/floor/plating, -/area/awaymission/southblock) -"jw" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced, -/obj/structure/grille, -/turf/simulated/floor/plating, -/area/awaymission/southblock) -"jx" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/grille, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/awaymission/southblock) "jy" = ( @@ -3845,27 +3417,6 @@ }, /turf/simulated/floor/wood, /area/awaymission/southblock) -"jT" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/grille, -/turf/simulated/floor/plating, -/area/awaymission/southblock) -"jU" = ( -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/grille, -/turf/simulated/floor/plating, -/area/awaymission/arrivalblock) "jV" = ( /obj/effect/decal/cleanable/blood/splatter, /obj/item/ammo_casing/c10mm, @@ -3992,29 +3543,7 @@ /obj/structure/window/reinforced{ dir = 1 }, -/turf/simulated/shuttle/plating, -/area/awaymission/arrivalblock) -"km" = ( -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/grille, -/turf/simulated/floor/plating, -/area/awaymission/arrivalblock) -"kn" = ( -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/grille, -/turf/simulated/floor/plating, +/turf/simulated/floor/plating/airless, /area/awaymission/arrivalblock) "ko" = ( /obj/machinery/door/airlock/external{ @@ -4092,7 +3621,7 @@ dir = 1 }, /obj/structure/window/reinforced, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/awaymission/arrivalblock) "kB" = ( /obj/structure/shuttle/engine/propulsion{ @@ -4101,7 +3630,7 @@ dir = 1 }, /obj/structure/window/reinforced, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/awaymission/arrivalblock) "kC" = ( /obj/machinery/suit_storage_unit/standard_unit, @@ -4199,23 +3728,17 @@ /obj/structure/chair/comfy/shuttle{ dir = 4 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/awaymission/arrivalblock) "kP" = ( /obj/structure/chair/comfy/shuttle, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/awaymission/arrivalblock) "kQ" = ( /obj/structure/chair/comfy/shuttle{ dir = 8 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/awaymission/arrivalblock) "kR" = ( /turf/simulated/floor/plasteel{ @@ -4341,54 +3864,6 @@ dir = 4 }, /area/awaymission/southblock) -"lm" = ( -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/grille, -/turf/simulated/floor/plating, -/area/awaymission/southblock) -"ln" = ( -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/grille, -/turf/simulated/floor/plating, -/area/awaymission/southblock) -"lo" = ( -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/grille, -/turf/simulated/floor/plating, -/area/awaymission/southblock) -"lq" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall12"; - icon_state = "swall12"; - dir = 2 - }, -/area/awaymission/arrivalblock) -"lr" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/shuttle/plating, -/area/awaymission/arrivalblock) "lt" = ( /obj/structure/closet/crate/hydroponics, /turf/simulated/floor/plasteel, @@ -4414,7 +3889,7 @@ dir = 1 }, /obj/effect/decal/remains/human, -/obj/item/tank/anesthetic, +/obj/item/tank/internals/anesthetic, /obj/item/clothing/mask/breath, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -4667,6 +4142,21 @@ }, /turf/simulated/floor/plasteel, /area/awaymission/gateroom) +"GR" = ( +/turf/simulated/floor/mineral/plastitanium/red/airless, +/area/awaymission/syndishuttle) +"It" = ( +/obj/machinery/door/airlock/centcom, +/turf/simulated/floor/mineral/plastitanium/red/airless, +/area/awaymission/syndishuttle) +"JP" = ( +/obj/structure/shuttle/engine/propulsion{ + dir = 8; + icon_state = "burst_l"; + tag = "icon-burst_l (EAST)" + }, +/turf/simulated/floor/plating, +/area/awaymission/syndishuttle) (1,1,1) = {" aa @@ -4691,11 +4181,11 @@ aa aa aC aC -aI -aI -aI -aI -aI +JP +JP +JP +JP +JP aC aC aa @@ -4777,21 +4267,21 @@ aa aa aa fL -fZ -gw -gQ -hn -fZ -fZ -fZ -gw -gQ -hn -fZ -fZ -fZ -fZ -ga +fL +fN +fN +fN +fL +fL +fL +fN +fN +fN +fL +fL +fL +fL +fL aa aa aa @@ -4821,15 +4311,15 @@ aa aa aa aa -aD -aY +aC +aC bf bq bq bq bf -bW -bE +aC +aC aa aa aa @@ -4842,8 +4332,8 @@ aa aa aa aa -fM -ga +fL +fL gx gb gc @@ -4888,13 +4378,13 @@ aa aa aa aa -aD -aY +aC +aC br bf by -bW -bE +aC +aC aa aa aa @@ -4955,11 +4445,11 @@ aa aa aa aa -aD +aC aC bt aC -bE +aC aa aa aa @@ -4974,7 +4464,7 @@ aa aa aa aa -fO +fN gc gb gb @@ -5040,7 +4530,7 @@ aa aa aa aa -fP +fN gb gb gb @@ -5106,8 +4596,8 @@ aj af aa aa -fM -ga +fL +fL gx gb gc @@ -5150,7 +4640,7 @@ aa aa aa aa -aD +aC aC aC aC @@ -5160,7 +4650,7 @@ aC aC aC aC -bE +aC aa af af @@ -5172,22 +4662,22 @@ aj aj aa aa -fQ -fZ -gy +fL +fL +fN gR -ho -fZ -fZ -fZ -gw -iK -hn -fZ -fZ -fZ -fZ -ga +fN +fL +fL +fL +fN +fN +fN +fL +fL +fL +fL +fL aa aa aa @@ -5217,7 +4707,7 @@ aa aa aa aa -aD +aC aC eh eK @@ -5225,7 +4715,7 @@ eK eK fi aC -bE +aC aa aa af @@ -5243,15 +4733,15 @@ aa gz gS hp -hE -hV -hV -iC +hp +hp +hp +hp iL -iZ -hE -hV -jU +hp +hp +hp +hp gz aa aa @@ -5318,12 +4808,12 @@ hu iD hu jV -km +hp +fL +fL +fL +fL fL -fZ -fZ -fZ -hv aa aa aa @@ -5384,12 +4874,12 @@ il il hq iD -kn +hp kA kO kO kO -lq +fL aa aa aa @@ -5455,7 +4945,7 @@ gR kP gb gc -lr +fN aa aa aa @@ -5479,7 +4969,7 @@ ad aa aa aa -aD +aC aJ aP aC @@ -5489,7 +4979,7 @@ eK eX eX aC -bq +aP aJ af aj @@ -5516,12 +5006,12 @@ ja gz jz hW -km +hp kB kQ kQ kQ -lq +fL aa aa aa @@ -5547,7 +5037,7 @@ ag af af aK -aQ +aC aC ex eK @@ -5555,7 +5045,7 @@ eK fh eK aC -cD +aC af af aj @@ -5576,18 +5066,18 @@ hu hu hY io -iE +hp iO jb gz jA hu -kn -fQ -fZ -fZ -fZ -hR +hp +fL +fL +fL +fL +fL aa aa aa @@ -5613,7 +5103,7 @@ ak ak af aa -aD +aC aC eJ eK @@ -5642,7 +5132,7 @@ hu hG hY io -iF +hp iO jb gz @@ -5708,7 +5198,7 @@ eu hH hZ io -iG +hp iO jc gz @@ -5881,10 +5371,10 @@ aa aa aC aC -eK +GR +aC aC aC -bE af cQ aq @@ -5947,9 +5437,9 @@ aa ba aa aK -eK +GR +aC aC -bE af aq af @@ -6013,7 +5503,7 @@ ak aa aq aK -eK +GR aC af ci @@ -6079,7 +5569,7 @@ af af aj aC -eK +GR aC aj aj @@ -6145,7 +5635,7 @@ af aj aF aC -eK +GR aK aq aq @@ -6211,8 +5701,8 @@ af aj bc bs -eL -bE +It +aC aq aq cR @@ -7830,7 +7320,7 @@ jQ jQ jQ kw -lm +jv aa aa aa @@ -7889,14 +7379,14 @@ aa aa aa aa -jw +jv jQ ix jQ jQ ix jQ -ln +jv aa aa aa @@ -7955,14 +7445,14 @@ aa aa aa aa -jx -jT -jT -jT -jT -jT -jT -lo +jv +jv +jv +jv +jv +jv +jv +jv aa aa aa @@ -8207,14 +7697,14 @@ bx aa aa aa -fK -fY +fJ +fJ fX gP hm fX -hT -hU +fJ +fJ aa aa aa @@ -8274,12 +7764,12 @@ aa aa aa aa -fK -gv -gv -gv -gv -hU +fJ +fJ +fJ +fJ +fJ +fJ aa aa aa diff --git a/_maps/map_files/RandomZLevels/terrorspiders.dmm b/_maps/map_files/RandomZLevels/terrorspiders.dmm index 903698004dc..e540f5a9246 100644 --- a/_maps/map_files/RandomZLevels/terrorspiders.dmm +++ b/_maps/map_files/RandomZLevels/terrorspiders.dmm @@ -1,9 +1,6 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "aa" = ( -/turf/unsimulated/wall{ - icon_state = "rock"; - name = "rock" - }, +/turf/simulated/wall/indestructible/rock, /area/awaymission/UO71/outside) "ab" = ( /turf/simulated/mineral/random/labormineral, @@ -256,11 +253,8 @@ }, /area/awaymission/UO71/plaza) "aL" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -889,11 +883,8 @@ /turf/simulated/floor/carpet, /area/awaymission/UO71/plaza) "ct" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /obj/structure/bed, /obj/item/bedsheet, @@ -909,11 +900,8 @@ /turf/simulated/floor/carpet, /area/awaymission/UO71/plaza) "cv" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /obj/machinery/door_control{ id = "awaydorm1"; @@ -1565,11 +1553,8 @@ /area/awaymission/UO71/plaza) "eb" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -1898,11 +1883,8 @@ }, /area/awaymission/UO71/plaza) "eK" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -1910,11 +1892,8 @@ }, /area/awaymission/UO71/plaza) "eL" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -2151,11 +2130,8 @@ pixel_y = -23; req_access = null }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /obj/structure/dresser, /turf/simulated/floor/carpet, @@ -2391,11 +2367,8 @@ /turf/simulated/wall/r_wall, /area/awaymission/UO71/prince) "fQ" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel, /area/awaymission/UO71/centralhall) @@ -2851,11 +2824,8 @@ }, /area/awaymission/UO71/gateway) "gT" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /obj/structure/chair{ icon_state = "chair"; @@ -2915,11 +2885,8 @@ /turf/simulated/floor/plasteel, /area/awaymission/UO71/gateway) "hb" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /obj/structure/table, /obj/item/paper/pamphlet, @@ -2927,11 +2894,8 @@ /turf/simulated/floor/plasteel, /area/awaymission/UO71/gateway) "hc" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -3434,11 +3398,8 @@ }, /area/awaymission/UO71/science) "ij" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel, @@ -3481,11 +3442,8 @@ }, /area/awaymission/UO71/centralhall) "ip" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /obj/structure/disposalpipe/segment{ dir = 2; @@ -4004,11 +3962,8 @@ /area/awaymission/UO71/gateway) "jI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -4405,11 +4360,8 @@ }, /area/awaymission/UO71/centralhall) "kx" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "bar" @@ -4615,11 +4567,8 @@ /area/awaymission/UO71/science) "kR" = ( /obj/structure/closet/firecloset, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /obj/effect/decal/warning_stripes/southwest, /turf/simulated/floor/plasteel{ @@ -4691,11 +4640,8 @@ }, /area/awaymission/UO71/science) "kZ" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -5116,11 +5062,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 2; @@ -5329,11 +5272,8 @@ }, /area/awaymission/UO71/science) "ma" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /turf/simulated/floor/plasteel, /area/awaymission/UO71/centralhall) @@ -5905,11 +5845,8 @@ /turf/simulated/floor/plasteel, /area/awaymission/UO71/centralhall) "ni" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /obj/machinery/door_control{ id = "awaydorm5"; @@ -5949,11 +5886,8 @@ /turf/simulated/floor/carpet, /area/awaymission/UO71/centralhall) "nl" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /obj/structure/bed, /obj/item/bedsheet, @@ -7199,11 +7133,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /obj/machinery/firealarm{ dir = 1; @@ -7439,11 +7370,8 @@ }, /area/awaymission/UO71/science) "pG" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 5; @@ -7554,10 +7482,7 @@ /turf/simulated/floor/plating, /area/awaymission/UO71/eng) "pT" = ( -/turf/simulated/shuttle/wall{ - dir = 4; - icon_state = "wall3" - }, +/turf/simulated/wall/indestructible/syndicate, /area/awaymission/UO71/loot) "pU" = ( /obj/structure/cable{ @@ -7719,11 +7644,8 @@ /turf/simulated/floor/carpet, /area/awaymission/UO71/centralhall) "qm" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/carpet, /area/awaymission/UO71/centralhall) @@ -7746,11 +7668,8 @@ /turf/simulated/floor/carpet, /area/awaymission/UO71/centralhall) "qo" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /obj/structure/bed, /obj/item/bedsheet, @@ -7897,10 +7816,8 @@ }, /area/awaymission/UO71/science) "qC" = ( -/obj/machinery/atmospherics/unary/cold_sink/freezer{ - current_temperature = 80; - dir = 2; - on = 1 +/obj/machinery/atmospherics/unary/thermomachine/freezer/on/server{ + dir = 2 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -8290,10 +8207,7 @@ /area/awaymission/UO71/science) "rn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/shuttle/wall{ - dir = 4; - icon_state = "wall3" - }, +/turf/simulated/wall/indestructible/syndicate, /area/awaymission/UO71/bridge) "ro" = ( /obj/effect/decal/cleanable/dirt, @@ -8476,11 +8390,11 @@ dir = 1 }, /obj/structure/table, -/obj/item/tank/emergency_oxygen{ +/obj/item/tank/internals/emergency_oxygen{ pixel_x = -8; pixel_y = 0 }, -/obj/item/tank/emergency_oxygen{ +/obj/item/tank/internals/emergency_oxygen{ pixel_x = -8; pixel_y = 0 }, @@ -8661,10 +8575,7 @@ }, /area/awaymission/UO71/medical) "sa" = ( -/turf/simulated/shuttle/wall{ - dir = 4; - icon_state = "wall3" - }, +/turf/simulated/wall/indestructible/syndicate, /area/awaymission/UO71/bridge) "sb" = ( /obj/structure/table, @@ -8680,11 +8591,8 @@ }, /area/awaymission/UO71/medical) "sc" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -8699,10 +8607,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/shuttle/wall{ - dir = 4; - icon_state = "wall3" - }, +/turf/simulated/wall/indestructible/syndicate, /area/awaymission/UO71/bridge) "sf" = ( /obj/structure/table, @@ -8747,11 +8652,8 @@ }, /area/awaymission/UO71/centralhall) "sk" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, @@ -8919,11 +8821,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -9164,10 +9063,7 @@ /area/awaymission/UO71/eng) "sN" = ( /obj/effect/decal/cleanable/dirt, -/turf/simulated/shuttle/wall{ - dir = 4; - icon_state = "wall3" - }, +/turf/simulated/wall/indestructible/syndicate, /area/awaymission/UO71/loot) "sO" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow{ @@ -9680,11 +9576,8 @@ /turf/simulated/floor/plasteel, /area/awaymission/UO71/centralhall) "tR" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, @@ -9714,11 +9607,8 @@ }, /area/awaymission/UO71/eng) "tU" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 6; @@ -9775,11 +9665,8 @@ /obj/machinery/atmospherics/pipe/simple/visible/purple{ dir = 6 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel, /area/awaymission/UO71/eng) @@ -10142,11 +10029,8 @@ }, /area/awaymission/UO71/eng) "uI" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /obj/machinery/door_control{ desc = "A remote control-switch for the engineering security doors."; @@ -11032,7 +10916,7 @@ /turf/simulated/wall, /area/awaymission/UO71/mining) "ww" = ( -/obj/machinery/atmospherics/unary/cold_sink/freezer{ +/obj/machinery/atmospherics/unary/thermomachine/freezer{ dir = 4 }, /turf/simulated/floor/plasteel{ @@ -11192,11 +11076,8 @@ /turf/simulated/floor/plasteel, /area/awaymission/UO71/mining) "wM" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -11301,11 +11182,8 @@ /turf/simulated/floor/carpet, /area/awaymission/UO71/mining) "xa" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /obj/structure/bed, /obj/item/bedsheet, @@ -11498,11 +11376,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -11747,11 +11622,8 @@ /turf/simulated/floor/carpet, /area/awaymission/UO71/mining) "xP" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /obj/structure/closet/secure_closet{ desc = "It's a secure locker for personnel. The first card swiped gains control."; @@ -11984,11 +11856,8 @@ /turf/simulated/floor/plasteel, /area/awaymission/UO71/mining) "yg" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /obj/effect/landmark/damageturf, /obj/effect/decal/cleanable/dirt, @@ -12243,11 +12112,8 @@ /turf/simulated/floor/plating, /area/awaymission/UO71/mining) "yJ" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/plasteel, /area/awaymission/UO71/mining) @@ -12344,10 +12210,7 @@ /area/awaymission/UO71/queen) "yY" = ( /obj/structure/sign/biohazard, -/turf/simulated/shuttle/wall{ - dir = 4; - icon_state = "wall3" - }, +/turf/simulated/wall/indestructible/syndicate, /area/awaymission/UO71/prince) "yZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -12363,23 +12226,14 @@ /turf/simulated/wall/rust, /area/awaymission/UO71/mining) "zc" = ( -/turf/simulated/shuttle/wall{ - dir = 4; - icon_state = "wall3" - }, +/turf/simulated/wall/indestructible/syndicate, /area/awaymission/UO71/outside) "zd" = ( -/turf/unsimulated/wall{ - icon_state = "rock"; - name = "rock" - }, +/turf/simulated/wall/indestructible/rock, /area/awaymission/UO71/queen) "ze" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/unsimulated/wall{ - icon_state = "rock"; - name = "rock" - }, +/turf/simulated/wall/indestructible/rock, /area/awaymission/UO71/queen) "zf" = ( /turf/simulated/floor/plasteel, @@ -12750,10 +12604,7 @@ /turf/simulated/floor/vault, /area/awaymission/UO71/prince) "Lf" = ( -/turf/unsimulated/wall{ - icon_state = "rock"; - name = "rock" - }, +/turf/simulated/wall/indestructible/rock, /area/awaymission/UO71/loot) "Lw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -12833,10 +12684,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/shuttle/wall{ - dir = 4; - icon_state = "wall3" - }, +/turf/simulated/wall/indestructible/syndicate, /area/awaymission/UO71/outside) "Vz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ diff --git a/_maps/map_files/RandomZLevels/undergroundoutpost45.dmm b/_maps/map_files/RandomZLevels/undergroundoutpost45.dmm index f83e5381463..cb3cd4abde8 100644 --- a/_maps/map_files/RandomZLevels/undergroundoutpost45.dmm +++ b/_maps/map_files/RandomZLevels/undergroundoutpost45.dmm @@ -1,9 +1,6 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "aa" = ( -/turf/unsimulated/wall{ - icon_state = "rock"; - name = "rock" - }, +/turf/simulated/wall/indestructible/rock, /area/awaycontent/a7{ always_unpowered = 1; has_gravity = 1; @@ -31,39 +28,7 @@ name = "UO45 Central Hall" }) "ae" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swallc2"; - icon_state = "swallc2"; - dir = 2 - }, -/area/awaycontent/a1{ - has_gravity = 1; - name = "UO45 Central Hall" - }) -"af" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall12"; - dir = 2 - }, -/area/awaycontent/a1{ - has_gravity = 1; - name = "UO45 Central Hall" - }) -"ag" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swallc1"; - icon_state = "swallc1"; - dir = 2 - }, -/area/awaycontent/a1{ - has_gravity = 1; - name = "UO45 Central Hall" - }) -"ah" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall3"; - dir = 2 - }, +/turf/simulated/wall/mineral/titanium, /area/awaycontent/a1{ has_gravity = 1; name = "UO45 Central Hall" @@ -218,25 +183,6 @@ has_gravity = 1; name = "UO45 Central Hall" }) -"av" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swallc3"; - icon_state = "swallc3"; - dir = 2 - }, -/area/awaycontent/a1{ - has_gravity = 1; - name = "UO45 Central Hall" - }) -"aw" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall8"; - dir = 2 - }, -/area/awaycontent/a1{ - has_gravity = 1; - name = "UO45 Central Hall" - }) "ax" = ( /obj/effect/landmark/burnturf, /turf/simulated/floor/plating, @@ -248,25 +194,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, -/area/awaycontent/a1{ - has_gravity = 1; - name = "UO45 Central Hall" - }) -"az" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall4"; - dir = 2 - }, -/area/awaycontent/a1{ - has_gravity = 1; - name = "UO45 Central Hall" - }) -"aA" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swallc4"; - icon_state = "swallc4"; - dir = 2 - }, /area/awaycontent/a1{ has_gravity = 1; name = "UO45 Central Hall" @@ -603,11 +530,8 @@ name = "UO45 Central Hall" }) "bg" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /obj/effect/landmark{ name = "awaystart" @@ -1511,11 +1435,8 @@ name = "UO45 Central Hall" }) "cK" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /obj/structure/bed, /obj/item/bedsheet, @@ -1539,11 +1460,8 @@ name = "UO45 Central Hall" }) "cM" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /obj/machinery/door_control{ id = "awaydorm1"; @@ -1802,11 +1720,8 @@ name = "UO45 Central Hall" }) "dk" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /obj/effect/landmark/damageturf, /turf/simulated/floor/plating, @@ -2247,11 +2162,8 @@ name = "UO45 Central Hall" }) "dS" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 5; @@ -2534,11 +2446,8 @@ }) "er" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel, /area/awaycontent/a1{ @@ -3198,11 +3107,8 @@ name = "UO45 Central Hall" }) "fr" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -3213,11 +3119,8 @@ name = "UO45 Central Hall" }) "fs" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -3539,11 +3442,8 @@ pixel_y = -23; req_access = null }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /obj/structure/dresser, /turf/simulated/floor/carpet, @@ -3858,11 +3758,8 @@ name = "UO45 Crew Quarters" }) "gt" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel, /area/awaycontent/a2{ @@ -4506,11 +4403,8 @@ name = "UO45 Gateway" }) "hx" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /obj/structure/chair{ tag = "icon-chair (WEST)"; @@ -4612,11 +4506,8 @@ name = "UO45 Research" }) "hF" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -5237,11 +5128,8 @@ name = "UO45 Research" }) "iD" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /obj/structure/table, /obj/item/paper/pamphlet, @@ -5313,11 +5201,8 @@ name = "UO45 Crew Quarters" }) "iK" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /obj/structure/disposalpipe/segment{ dir = 2; @@ -5950,7 +5835,7 @@ name = "scientist's locker"; req_access_txt = "201" }, -/obj/item/tank/air, +/obj/item/tank/internals/air, /obj/item/clothing/mask/gas, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -6002,11 +5887,8 @@ }) "jK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -6418,11 +6300,8 @@ name = "UO45 Gateway" }) "kn" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel, @@ -6473,11 +6352,8 @@ name = "UO45 Crew Quarters" }) "ks" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "bar" @@ -6901,11 +6777,8 @@ name = "UO45 Research" }) "kV" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -7441,11 +7314,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 2; @@ -7708,11 +7578,8 @@ name = "UO45 Research" }) "lQ" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /turf/simulated/floor/plasteel, /area/awaycontent/a2{ @@ -8504,11 +8371,8 @@ name = "UO45 Crew Quarters" }) "mY" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /obj/machinery/door_control{ id = "awaydorm5"; @@ -8558,11 +8422,8 @@ name = "UO45 Crew Quarters" }) "nb" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /obj/structure/bed, /obj/item/bedsheet, @@ -9932,11 +9793,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /obj/machinery/firealarm/no_alarm{ dir = 1; @@ -10263,11 +10121,8 @@ name = "UO45 Research" }) "pf" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 5; @@ -10318,11 +10173,8 @@ name = "security officer's locker"; req_access_txt = "201" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /obj/item/restraints/handcuffs, /obj/item/flash, @@ -10745,11 +10597,8 @@ name = "UO45 Crew Quarters" }) "pS" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/carpet, /area/awaycontent/a2{ @@ -10785,11 +10634,8 @@ name = "UO45 Crew Quarters" }) "pV" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /obj/structure/bed, /obj/item/bedsheet, @@ -10930,10 +10776,8 @@ name = "UO45 Engineering" }) "qg" = ( -/obj/machinery/atmospherics/unary/cold_sink/freezer{ - current_temperature = 80; - dir = 2; - on = 1 +/obj/machinery/atmospherics/unary/thermomachine/freezer/on/server{ + dir = 2 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -11765,11 +11609,11 @@ dir = 1 }, /obj/structure/table, -/obj/item/tank/emergency_oxygen{ +/obj/item/tank/internals/emergency_oxygen{ pixel_x = -8; pixel_y = 0 }, -/obj/item/tank/emergency_oxygen{ +/obj/item/tank/internals/emergency_oxygen{ pixel_x = -8; pixel_y = 0 }, @@ -12097,11 +11941,8 @@ name = "UO45 Research" }) "rI" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -12359,11 +12200,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -13460,11 +13298,8 @@ name = "UO45 Crew Quarters" }) "tv" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, @@ -13473,11 +13308,8 @@ name = "UO45 Crew Quarters" }) "tw" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /obj/structure/sign/securearea{ pixel_y = -32 @@ -13578,11 +13410,8 @@ /obj/machinery/atmospherics/pipe/simple/visible/purple{ dir = 6 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel, /area/awaycontent/a3{ @@ -13903,11 +13732,8 @@ name = "UO45 Engineering" }) "ub" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /obj/machinery/door_control{ desc = "A remote control-switch for the engineering security doors."; @@ -14063,11 +13889,8 @@ name = "UO45 Engineering" }) "um" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -14429,11 +14252,8 @@ name = "UO45 Engineering" }) "uP" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, @@ -15299,11 +15119,8 @@ name = "UO45 Mining" }) "we" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /obj/structure/bed, /obj/item/bedsheet, @@ -15572,11 +15389,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -15640,11 +15454,8 @@ name = "UO45 Mining" }) "wC" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, @@ -15953,11 +15764,8 @@ name = "UO45 Mining" }) "wX" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /obj/structure/closet/secure_closet{ desc = "It's a secure locker for personnel. The first card swiped gains control."; @@ -16349,11 +16157,8 @@ name = "UO45 Mining" }) "xz" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /obj/effect/landmark/burnturf, /turf/simulated/floor/plasteel, @@ -16528,11 +16333,8 @@ name = "UO45 Mining" }) "xO" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/plasteel, /area/awaycontent/a4{ @@ -25659,10 +25461,10 @@ ac ac ad ae -ah -ah -ah -av +ae +ae +ae +ae am aG aH @@ -25808,11 +25610,11 @@ ac ac ac ad -af +ae ai aj al -aw +ae am aF aH @@ -25958,7 +25760,7 @@ ac ac ac ad -af +ae ai ap ao @@ -26108,7 +25910,7 @@ ac ac ac ad -af +ae at ak as @@ -26258,11 +26060,11 @@ ac ac ac ad -af +ae at aq au -az +ae ad aH aM @@ -26408,11 +26210,11 @@ ac ac ac ad -ag -ah -ah -ah -aA +ae +ae +ae +ae +ae am aI aH diff --git a/_maps/map_files/RandomZLevels/wildwest.dmm b/_maps/map_files/RandomZLevels/wildwest.dmm index b9110dabaca..50a7074a7a9 100644 --- a/_maps/map_files/RandomZLevels/wildwest.dmm +++ b/_maps/map_files/RandomZLevels/wildwest.dmm @@ -3,7 +3,7 @@ /turf/space, /area/space) "ab" = ( -/turf/simulated/shuttle/wall, +/turf/simulated/wall/indestructible/riveted, /area/awaymission/wwvault) "ac" = ( /turf/simulated/floor/engine/cult, @@ -13,7 +13,7 @@ /turf/simulated/floor/engine/cult, /area/awaymission/wwvault) "ae" = ( -/turf/simulated/shuttle/plating{ +/turf/simulated/floor{ tag = "icon-cultdamage5"; icon_state = "cultdamage5" }, @@ -23,7 +23,7 @@ /turf/simulated/floor/engine/cult, /area/awaymission/wwvault) "ag" = ( -/turf/simulated/shuttle/plating{ +/turf/simulated/floor{ tag = "icon-bcircuitoff"; icon_state = "bcircuitoff" }, @@ -40,13 +40,13 @@ /turf/simulated/wall/cult, /area/awaymission/wwvault) "aj" = ( -/turf/simulated/shuttle/plating{ +/turf/simulated/floor{ tag = "icon-cultdamage3"; icon_state = "cultdamage3" }, /area/awaymission/wwvault) "ak" = ( -/turf/simulated/shuttle/plating{ +/turf/simulated/floor{ tag = "icon-cultdamage6"; icon_state = "cultdamage6" }, @@ -57,7 +57,7 @@ /area/awaymission/wwvault) "am" = ( /mob/living/simple_animal/hostile/faithless, -/turf/simulated/shuttle/plating{ +/turf/simulated/floor{ tag = "icon-bcircuitoff"; icon_state = "bcircuitoff" }, @@ -68,24 +68,24 @@ layer = 1; name = "Blocker" }, -/turf/simulated/shuttle/wall, +/turf/simulated/wall/indestructible/riveted, /area/awaymission/wwvault) "ao" = ( -/turf/simulated/shuttle/plating{ +/turf/simulated/floor{ tag = "icon-gcircuitoff"; icon_state = "gcircuitoff" }, /area/awaymission/wwvault) "ap" = ( /obj/machinery/wish_granter_dark, -/turf/simulated/shuttle/plating{ +/turf/simulated/floor{ tag = "icon-gcircuitoff"; icon_state = "gcircuitoff" }, /area/awaymission/wwvault) "aq" = ( /obj/structure/cult/pylon, -/turf/simulated/shuttle/plating{ +/turf/simulated/floor{ tag = "icon-gcircuitoff"; icon_state = "gcircuitoff" }, @@ -94,7 +94,7 @@ /obj/machinery/gateway{ dir = 9 }, -/turf/simulated/shuttle/plating{ +/turf/simulated/floor{ tag = "icon-gcircuitoff"; icon_state = "gcircuitoff" }, @@ -103,7 +103,7 @@ /obj/machinery/gateway{ dir = 5 }, -/turf/simulated/shuttle/plating{ +/turf/simulated/floor{ tag = "icon-gcircuitoff"; icon_state = "gcircuitoff" }, @@ -112,7 +112,7 @@ /obj/machinery/gateway{ dir = 1 }, -/turf/simulated/shuttle/plating{ +/turf/simulated/floor{ tag = "icon-gcircuitoff"; icon_state = "gcircuitoff" }, @@ -121,7 +121,7 @@ /obj/machinery/gateway{ dir = 8 }, -/turf/simulated/shuttle/plating{ +/turf/simulated/floor{ tag = "icon-gcircuitoff"; icon_state = "gcircuitoff" }, @@ -130,7 +130,7 @@ /obj/machinery/gateway{ dir = 4 }, -/turf/simulated/shuttle/plating{ +/turf/simulated/floor{ tag = "icon-gcircuitoff"; icon_state = "gcircuitoff" }, @@ -139,7 +139,7 @@ /obj/machinery/gateway/centeraway{ calibrated = 0 }, -/turf/simulated/shuttle/plating{ +/turf/simulated/floor{ tag = "icon-gcircuitoff"; icon_state = "gcircuitoff" }, @@ -148,7 +148,7 @@ /obj/machinery/gateway{ dir = 10 }, -/turf/simulated/shuttle/plating{ +/turf/simulated/floor{ tag = "icon-gcircuitoff"; icon_state = "gcircuitoff" }, @@ -157,34 +157,34 @@ /obj/machinery/gateway{ dir = 6 }, -/turf/simulated/shuttle/plating{ +/turf/simulated/floor{ tag = "icon-gcircuitoff"; icon_state = "gcircuitoff" }, /area/awaymission/wwvault) "az" = ( /obj/machinery/gateway, -/turf/simulated/shuttle/plating{ +/turf/simulated/floor{ tag = "icon-gcircuitoff"; icon_state = "gcircuitoff" }, /area/awaymission/wwvault) "aA" = ( /obj/effect/meatgrinder, -/turf/simulated/shuttle/plating{ +/turf/simulated/floor{ tag = "icon-gcircuitoff"; icon_state = "gcircuitoff" }, /area/awaymission/wwvault) "aB" = ( /obj/structure/cult/pylon, -/turf/simulated/shuttle/plating{ +/turf/simulated/floor{ tag = "icon-bcircuitoff"; icon_state = "bcircuitoff" }, /area/awaymission/wwvault) "aC" = ( -/turf/simulated/shuttle/plating{ +/turf/simulated/floor{ tag = "icon-cultdamage2"; icon_state = "cultdamage2" }, @@ -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" @@ -2564,143 +2564,46 @@ }, /turf/simulated/mineral, /area/awaymission/wwmines) -"hh" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall12"; - icon_state = "swall12" - }, -/area/awaymission/wwrefine) "hi" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - tag = "icon-swall_f6"; - icon_state = "swall_f6"; - dir = 2 - }, +/turf/simulated/wall/mineral/titanium, /area/awaymission/wwrefine) "hj" = ( -/obj/machinery/door/unpowered/shuttle, -/turf/simulated/shuttle{ - tag = "icon-floor2"; - icon_state = "floor2" - }, +/obj/machinery/door/airlock/titanium, +/turf/simulated/floor/plating, /area/awaymission/wwrefine) "hk" = ( /obj/effect/decal/cleanable/blood/splatter, /obj/machinery/light/small, /turf/simulated/floor/wood, /area/awaymission/wwmines) -"hl" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall8"; - icon_state = "swall8" - }, -/area/awaymission/wwrefine) -"hm" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall4"; - icon_state = "swall4" - }, -/area/awaymission/wwrefine) -"hn" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 3; - icon_state = "swall_f10"; - layer = 2; - tag = "icon-swall_f10" - }, -/area/awaymission/wwrefine) "ho" = ( /obj/structure/chair/comfy/shuttle, -/turf/simulated/shuttle{ - tag = "icon-floor2"; - icon_state = "floor2" - }, +/turf/simulated/floor/mineral/titanium/yellow, /area/awaymission/wwrefine) "hp" = ( /obj/structure/table/wood, /obj/machinery/light/small, /turf/simulated/floor/wood, /area/awaymission/wwmines) -"hq" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall3"; - icon_state = "swall3" - }, -/area/awaymission/wwrefine) "hr" = ( -/turf/simulated/shuttle{ - tag = "icon-floor2"; - icon_state = "floor2" - }, -/area/awaymission/wwrefine) -"hs" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swallc1"; - icon_state = "swallc1" - }, -/area/awaymission/wwrefine) -"ht" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - tag = "icon-swall_f5"; - icon_state = "swall_f5"; - dir = 2 - }, +/turf/simulated/floor/mineral/titanium/yellow, /area/awaymission/wwrefine) "hu" = ( /obj/effect/mob_spawn/human/miner, -/turf/simulated/shuttle{ - tag = "icon-floor2"; - icon_state = "floor2" - }, -/area/awaymission/wwrefine) -"hv" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swallc2"; - icon_state = "swallc2" - }, -/area/awaymission/wwrefine) -"hw" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - tag = "icon-swall_f9"; - icon_state = "swall_f9"; - dir = 2 - }, +/turf/simulated/floor/mineral/titanium/yellow, /area/awaymission/wwrefine) "hy" = ( /obj/structure/table/reinforced, /obj/item/clothing/suit/space/syndicate/black/orange, /obj/item/clothing/head/helmet/space/syndicate/black/orange, /obj/item/clothing/mask/gas/syndicate, -/obj/item/tank/oxygen, +/obj/item/tank/internals/oxygen, /obj/item/clothing/shoes/magboots, -/turf/simulated/shuttle{ - tag = "icon-floor2"; - icon_state = "floor2" - }, +/turf/simulated/floor/mineral/titanium/yellow, /area/awaymission/wwrefine) "hz" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - tag = "icon-fwindow"; - icon_state = "fwindow" - }, -/turf/simulated/shuttle{ - tag = "icon-floor2"; - icon_state = "floor2" - }, +/obj/effect/spawner/window/shuttle, +/turf/simulated/floor/plating, /area/awaymission/wwrefine) "hA" = ( /obj/machinery/door/poddoor/multi_tile/four_tile_ver, @@ -17086,10 +16989,10 @@ aa aa aa hi -hq -hq -hq -ht +hi +hi +hi +hi aa aa aa @@ -17342,15 +17245,15 @@ ew aa aa aa -hh +hi ho ho ho -hs -hq -hq -hq -ht +hi +hi +hi +hi +hi aa aa aa @@ -17599,7 +17502,7 @@ eQ eS eS gf -hl +hi ho ho ho @@ -17607,7 +17510,7 @@ hu hr hr hy -hh +hi aa aa aa @@ -18113,7 +18016,7 @@ fH eS eS gf -hm +hi ho ho ho @@ -18121,7 +18024,7 @@ hr hr hr hy -hh +hi aa aa aa @@ -18370,15 +18273,15 @@ fK aa aa aa -hh +hi ho ho ho -hv -hq -hq -hq -hw +hi +hi +hi +hi +hi aa aa aa @@ -18627,11 +18530,11 @@ ez aa aa aa -hn -hq -hq -hq -hw +hi +hi +hi +hi +hi aa aa aa diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm index d7ce034ee74..332f6a22e6c 100644 --- a/_maps/map_files/cyberiad/cyberiad.dmm +++ b/_maps/map_files/cyberiad/cyberiad.dmm @@ -6,12 +6,6 @@ /obj/structure/lattice, /turf/space, /area/space/nearstation) -"aaw" = ( -/obj/machinery/computer/camera_advanced/shuttle_docker/syndicate, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) "aaQ" = ( /obj/docking_port/stationary/whiteship{ dir = 8; @@ -27,81 +21,6 @@ }, /turf/space, /area/space) -"abG" = ( -/obj/machinery/porta_turret/syndicate, -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 8; - icon_state = "diagonalWall3" - }, -/area/shuttle/syndicate) -"abH" = ( -/obj/machinery/door/poddoor/shutters{ - density = 0; - dir = 2; - icon_state = "open"; - id_tag = "syndieshutters"; - name = "Blast Shutters"; - opacity = 0 - }, -/obj/structure/grille, -/obj/structure/shuttle/window{ - dir = 2; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "window5_mid"; - tag = "icon-window5_mid" - }, -/turf/simulated/shuttle/plating, -/area/shuttle/syndicate) -"abI" = ( -/turf/simulated/shuttle/wall{ - icon_state = "wall3" - }, -/area/shuttle/syndicate) -"abJ" = ( -/obj/machinery/door/poddoor/shutters{ - density = 0; - dir = 2; - icon_state = "open"; - id_tag = "syndieshutters"; - name = "Blast Shutters"; - opacity = 0 - }, -/obj/structure/grille, -/obj/structure/shuttle/window{ - dir = 2; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "window5_end"; - tag = "icon-window5_end" - }, -/turf/simulated/shuttle/plating, -/area/shuttle/syndicate) -"abK" = ( -/obj/machinery/door/poddoor/shutters{ - density = 0; - dir = 2; - icon_state = "open"; - id_tag = "syndieshutters"; - name = "Blast Shutters"; - opacity = 0 - }, -/obj/structure/grille, -/obj/structure/shuttle/window{ - dir = 1; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "window5_end"; - tag = "icon-window5_end (NORTH)" - }, -/turf/simulated/shuttle/plating, -/area/shuttle/syndicate) -"abL" = ( -/obj/machinery/porta_turret/syndicate, -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 1; - icon_state = "diagonalWall3" - }, -/area/shuttle/syndicate) "abM" = ( /obj/structure/lattice, /turf/simulated/floor/plating/airless, @@ -124,45 +43,6 @@ /obj/structure/lattice, /turf/simulated/floor/plating/airless, /area/space/nearstation) -"abQ" = ( -/turf/simulated/shuttle/wall{ - dir = 4; - icon_state = "wall3" - }, -/area/shuttle/syndicate) -"abT" = ( -/obj/machinery/computer/camera_advanced/shuttle_docker/vox, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"abU" = ( -/obj/structure/table, -/obj/machinery/kitchen_machine/microwave, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"abV" = ( -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"abW" = ( -/obj/structure/table, -/obj/machinery/door_control{ - id = "syndieshutters"; - name = "remote shutter control"; - req_access_txt = "150" - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"abX" = ( -/obj/machinery/computer/shuttle/syndicate, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) "abY" = ( /obj/machinery/camera/motion{ c_tag = "Armory Exterior"; @@ -171,12 +51,6 @@ }, /turf/space, /area/security/securearmoury) -"abZ" = ( -/obj/structure/computerframe, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) "aca" = ( /obj/effect/decal/warning_stripes/northwest, /turf/simulated/floor/plasteel{ @@ -197,31 +71,6 @@ }, /turf/simulated/floor/plasteel, /area/security/range) -"acd" = ( -/obj/structure/table, -/obj/item/storage/box/syndidonkpockets, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"ace" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 1 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"acf" = ( -/obj/machinery/light/spot{ - dir = 4; - icon_state = "tube1"; - tag = "icon-tube1 (EAST)" - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) "acg" = ( /turf/simulated/floor/plasteel{ icon_state = "floorgrime" @@ -250,36 +99,6 @@ icon_state = "dark" }, /area/security/securearmoury) -"ack" = ( -/obj/structure/table, -/obj/item/stack/sheet/glass{ - amount = 10 - }, -/obj/item/multitool, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"acl" = ( -/obj/machinery/light/spot, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"acm" = ( -/obj/item/radio/intercom/syndicate{ - pixel_y = -28 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"acn" = ( -/obj/structure/closet/syndicate/personal, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) "aco" = ( /obj/effect/decal/warning_stripes/southwest, /obj/effect/decal/cleanable/dirt, @@ -295,29 +114,6 @@ /obj/item/target/syndicate, /turf/simulated/floor/plasteel, /area/security/range) -"acq" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - icon_state = "diagonalWall3" - }, -/area/shuttle/syndicate) -"acr" = ( -/obj/machinery/door/window{ - dir = 2; - name = "Cockpit"; - req_access_txt = "150" - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"acs" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 4; - icon_state = "diagonalWall3" - }, -/area/shuttle/syndicate) "act" = ( /obj/effect/decal/warning_stripes/southeast, /turf/simulated/floor/plasteel{ @@ -359,21 +155,6 @@ icon_state = "freezerfloor" }, /area/security/main) -"acz" = ( -/obj/structure/table, -/obj/item/stack/cable_coil, -/obj/item/crowbar/red, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"acA" = ( -/obj/structure/table, -/obj/item/storage/box/zipties, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) "acB" = ( /obj/machinery/shower{ dir = 8; @@ -453,22 +234,6 @@ icon_state = "floorgrime" }, /area/security/armoury) -"acI" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 4 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"acJ" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 8 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) "acK" = ( /obj/effect/decal/warning_stripes/east, /obj/effect/decal/warning_stripes/west, @@ -516,16 +281,6 @@ }, /turf/simulated/floor/plasteel, /area/security/range) -"acN" = ( -/obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 2; - frequency = 1331; - id_tag = "synd_pump" - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) "acO" = ( /obj/machinery/magnetic_controller{ autolink = 1; @@ -545,12 +300,6 @@ }, /turf/simulated/floor/plasteel, /area/security/range) -"acQ" = ( -/obj/machinery/atmospherics/pipe/manifold4w/hidden, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) "acR" = ( /obj/machinery/door/airlock{ name = "Toilet"; @@ -569,20 +318,6 @@ icon_state = "freezerfloor" }, /area/security/main) -"acT" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 8; - icon_state = "diagonalWall3" - }, -/area/shuttle/syndicate) -"acU" = ( -/obj/machinery/porta_turret/syndicate, -/turf/simulated/shuttle/wall{ - dir = 4; - icon_state = "wall3" - }, -/area/shuttle/syndicate) "acV" = ( /obj/item/restraints/handcuffs/pinkcuffs, /turf/simulated/floor/plating, @@ -661,49 +396,6 @@ icon_state = "floorgrime" }, /area/security/armoury) -"adc" = ( -/obj/machinery/door/airlock/external{ - frequency = 1331; - icon_state = "door_locked"; - id_tag = "synd_inner"; - locked = 1; - name = "Ship External Access"; - req_access = null; - req_access_txt = "150" - }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5; - icon_state = "intact" - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"add" = ( -/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ - frequency = 1331; - id_tag = "vox_west_control"; - pixel_x = 24; - req_access_txt = "152"; - tag_airpump = "vox_west_vent"; - tag_chamber_sensor = "vox_west_sensor"; - tag_exterior_door = "vox_northwest_lock"; - tag_interior_door = "vox_southwest_lock" - }, -/turf/simulated/shuttle/plating/vox, -/area/shuttle/vox) -"ade" = ( -/obj/machinery/suit_storage_unit/syndicate/secure, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"adf" = ( -/obj/structure/closet/syndicate/nuclear, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) "adg" = ( /obj/structure/window/reinforced{ dir = 1; @@ -802,7 +494,6 @@ name = "Bathroom"; req_access_txt = "0" }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, @@ -885,65 +576,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/security/range) -"ady" = ( -/obj/structure/chair/stool, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"adz" = ( -/obj/structure/table, -/obj/item/aicard, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"adA" = ( -/obj/structure/sign/securearea{ - desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; - icon_state = "space"; - layer = 4; - name = "EXTERNAL AIRLOCK"; - pixel_x = 0 - }, -/turf/simulated/shuttle/wall{ - icon_state = "wall3" - }, -/area/shuttle/syndicate) "adB" = ( -/obj/machinery/door/airlock/external{ - frequency = 1331; - icon_state = "door_locked"; - id_tag = "synd_outer"; - locked = 0; - name = "Ship External Access"; - req_access = null; - req_access_txt = "150" - }, -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "open"; - id_tag = "smindicate"; - name = "Outer Airlock"; - opacity = 0 - }, -/obj/machinery/door_control{ - id = "smindicate"; - name = "External Door Control"; - pixel_x = -26; - pixel_y = -2; - req_access_txt = "150" - }, -/obj/docking_port/mobile{ - dheight = 9; - dir = 2; - dwidth = 5; - height = 22; - id = "syndicate"; - name = "syndicate infiltrator"; - roundstart_move = "syndicate_away"; - width = 18 - }, /obj/docking_port/stationary{ dheight = 9; dir = 2; @@ -953,15 +586,8 @@ name = "northwest of station"; width = 18 }, -/turf/simulated/shuttle/plating, -/area/shuttle/syndicate) -"adC" = ( /turf/space, -/turf/simulated/shuttle/wall{ - dir = 1; - icon_state = "diagonalWall3" - }, -/area/shuttle/syndicate) +/area/space) "adD" = ( /obj/structure/cable{ d1 = 4; @@ -1062,19 +688,6 @@ icon_state = "floorgrime" }, /area/security/prisonershuttle) -"adL" = ( -/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ - frequency = 1331; - id_tag = "vox_east_control"; - pixel_x = -24; - req_access_txt = "152"; - tag_airpump = "vox_east_vent"; - tag_chamber_sensor = "vox_east_sensor"; - tag_exterior_door = "vox_northeast_lock"; - tag_interior_door = "vox_southeast_lock" - }, -/turf/simulated/shuttle/plating/vox, -/area/shuttle/vox) "adM" = ( /obj/machinery/computer/prisoner{ req_access = null; @@ -1085,16 +698,9 @@ icon_state = "alarm0"; pixel_x = 24 }, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, /turf/simulated/floor/plasteel, /area/security/prisonershuttle) "adN" = ( -/obj/item/decorations/sticky_decorations/flammable/tinsel/red{ - pixel_y = 19 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "barber" @@ -1155,72 +761,16 @@ }, /turf/simulated/floor/plasteel, /area/security/range) -"adS" = ( -/obj/machinery/light/spot{ - dir = 8; - icon_state = "tube1"; - tag = "icon-tube1 (WEST)" - }, -/obj/machinery/suit_storage_unit/syndicate/secure, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"adT" = ( -/obj/structure/table, -/obj/item/grenade/plastic/c4{ - pixel_x = 2; - pixel_y = 1 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"adU" = ( -/obj/machinery/light/spot{ - dir = 8; - icon_state = "tube1"; - tag = "icon-tube1 (WEST)" - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"adV" = ( -/obj/machinery/door/airlock/hatch{ - frequency = 1331; - icon_state = "door_locked"; - id_tag = "vox_southwest_lock"; - locked = 1; - req_access_txt = "152"; - req_one_access = null; - req_one_access_txt = "0" - }, -/turf/simulated/shuttle/plating/vox, -/area/shuttle/vox) -"adW" = ( -/obj/machinery/atmospherics/unary/tank/air{ - dir = 2 - }, -/turf/simulated/shuttle/wall{ - dir = 4; - icon_state = "wall3" - }, -/area/shuttle/syndicate) "adX" = ( +/obj/structure/chair/stool, /obj/structure/cable{ d1 = 1; d2 = 4; icon_state = "1-4" }, -/obj/item/gift, -/obj/item/clothing/head/cowboyhat/black, -/obj/structure/snow, -/obj/item/toy/figure/secofficer, -/obj/item/gun/projectile/automatic/toy/pistol, -/obj/item/clothing/head/helmet/justice, -/obj/item/nanomob_card, -/obj/item/ammo_box/magazine/toy/pistol, +/obj/effect/landmark/start{ + name = "Detective" + }, /turf/simulated/floor/plasteel, /area/security/main) "adY" = ( @@ -1230,7 +780,6 @@ icon_state = "2-8"; tag = "" }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "redcorner" @@ -1294,10 +843,6 @@ dir = 4; pixel_x = 24 }, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, /turf/simulated/floor/plasteel, /area/security/prisonershuttle) "aee" = ( @@ -1384,9 +929,6 @@ pixel_x = 0; pixel_y = 30 }, -/obj/item/decorations/sticky_decorations/flammable/christmas_stocking{ - pixel_y = 17 - }, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "red" @@ -1439,18 +981,6 @@ icon_state = "floorgrime" }, /area/security/prisonershuttle) -"aen" = ( -/obj/machinery/door/airlock/hatch{ - frequency = 1331; - icon_state = "door_locked"; - id_tag = "vox_southeast_lock"; - locked = 1; - req_access_txt = "152"; - req_one_access = null; - req_one_access_txt = "0" - }, -/turf/simulated/shuttle/plating/vox, -/area/shuttle/vox) "aeo" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -1495,38 +1025,10 @@ tag = "icon-whiteblue (NORTH)" }, /area/security/medbay) -"aes" = ( -/obj/machinery/door/window{ - dir = 4; - name = "Equipment Room"; - req_access_txt = "150" - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"aet" = ( -/obj/machinery/access_button{ - command = "cycle_interior"; - frequency = 1331; - master_tag = "synd_airlock"; - name = "interior access button"; - pixel_x = 25; - pixel_y = 25; - req_access_txt = "0" - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) "aeu" = ( /obj/effect/decal/warning_stripes/north, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -1555,21 +1057,8 @@ icon_state = "floorgrime" }, /area/security/armoury) -"aex" = ( -/obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/sit, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate_sit) "aey" = ( /obj/machinery/computer/brigcells, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, -/obj/structure/snow{ - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "darkred" @@ -1627,16 +1116,14 @@ }, /obj/effect/decal/warning_stripes/east, /obj/structure/rack, -/obj/item/tank/oxygen, +/obj/item/tank/internals/oxygen, /obj/item/tank/jetpack/oxygen, -/obj/item/decorations/sticky_decorations/flammable/tinsel/red{ - pixel_y = 19 - }, /turf/simulated/floor/plasteel, /area/security/podbay) "aeF" = ( /obj/machinery/door/airlock/external{ id_tag = "laborcamp_home"; + locked = 1; name = "Labor Camp Airlock"; req_access_txt = "2" }, @@ -1773,31 +1260,9 @@ tag = "icon-whitehall (WEST)" }, /area/security/medbay) -"aeP" = ( -/obj/machinery/door/window{ - base_state = "right"; - dir = 4; - icon_state = "right"; - name = "Equipment Room"; - req_access_txt = "150" - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"aeQ" = ( -/obj/effect/spawner/window/reinforced, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) "aeR" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" @@ -1846,7 +1311,6 @@ dir = 8; pixel_x = -24 }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkred" @@ -1989,35 +1453,19 @@ /area/security/medbay) "afe" = ( /obj/effect/decal/warning_stripes/north, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/security/securearmoury) "aff" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/plasteel, /area/security/prisonershuttle) -"afg" = ( -/obj/item/radio/intercom/syndicate{ - pixel_x = -28 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) "afh" = ( /obj/machinery/hologram/holopad, /obj/structure/cable{ @@ -2062,7 +1510,6 @@ shock_proof = 0 }, /obj/machinery/photocopier, -/obj/structure/snow, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkred" @@ -2084,10 +1531,6 @@ pixel_y = -28; req_access_txt = "2" }, -/obj/structure/snow{ - dir = 10; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -2106,10 +1549,6 @@ /obj/effect/landmark/start{ name = "Brig Physician" }, -/obj/structure/snow{ - dir = 10; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel, /area/security/main) "afo" = ( @@ -2192,9 +1631,6 @@ /area/security/medbay) "afv" = ( /obj/structure/closet/secure_closet/brigdoc, -/obj/item/decorations/sticky_decorations/flammable/christmas_stocking{ - pixel_x = 19 - }, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "whiteblue"; @@ -2220,119 +1656,16 @@ icon_state = "redcorner" }, /area/security/main) -"afy" = ( -/obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/sst, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate_elite) -"afz" = ( -/obj/machinery/recharge_station/upgraded, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"afA" = ( -/obj/machinery/portable_atmospherics/canister/oxygen, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"afB" = ( -/obj/structure/table, -/obj/machinery/cell_charger, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"afC" = ( -/obj/structure/table, -/obj/machinery/recharger{ - pixel_y = 0 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"afD" = ( -/obj/machinery/vending/wallmed/syndicate{ - pixel_x = -30 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"afE" = ( -/obj/structure/table, -/obj/item/stock_parts/cell/high{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/stock_parts/cell/high, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"afF" = ( -/obj/structure/table, -/obj/item/screwdriver{ - pixel_y = 9 - }, -/obj/item/assembly/voice{ - pixel_y = 3 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"afG" = ( -/obj/structure/table, -/obj/item/wrench, -/obj/item/assembly/infra, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"afH" = ( -/obj/structure/table, -/obj/item/assembly/prox_sensor{ - pixel_x = -8; - pixel_y = 4 - }, -/obj/item/assembly/prox_sensor{ - pixel_x = -8; - pixel_y = 4 - }, -/obj/item/assembly/signaler, -/obj/item/assembly/signaler, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"afI" = ( -/obj/structure/table, -/obj/item/weldingtool/largetank, -/obj/item/multitool, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) "afJ" = ( /obj/effect/landmark/start{ name = "Security Officer" }, -/obj/structure/chair/stool, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/security/main) "afK" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/obj/structure/snow{ - dir = 8; - icon_state = "snow_surround" - }, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "red" @@ -2358,12 +1691,8 @@ /obj/item/spacepod_key{ id = 100000 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/carpet, /area/security/hos) @@ -2379,43 +1708,6 @@ "afO" = ( /turf/simulated/floor/plating/airless, /area/space/nearstation) -"afP" = ( -/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/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"afQ" = ( -/obj/machinery/door/window/westright{ - name = "Tool Storage"; - req_access_txt = "150" - }, -/obj/machinery/light/spot{ - dir = 1; - icon_state = "tube1"; - tag = "icon-tube1 (NORTH)" - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"afR" = ( -/obj/structure/table, -/obj/item/storage/toolbox/syndicate, -/obj/item/crowbar/red, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) "afS" = ( /obj/structure/closet/secure_closet/brig, /obj/machinery/camera{ @@ -2499,62 +1791,7 @@ tag = "icon-whiteblue (WEST)" }, /area/security/medbay) -"afZ" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 8; - icon_state = "diagonalWall3" - }, -/area/shuttle/vox) -"aga" = ( -/obj/machinery/door/airlock/hatch{ - frequency = 1331; - icon_state = "door_locked"; - id_tag = "vox_northwest_lock"; - locked = 1; - req_access_txt = "152"; - req_one_access = null; - req_one_access_txt = "0" - }, -/turf/simulated/shuttle/plating/vox, -/area/shuttle/vox) -"agb" = ( -/obj/machinery/access_button{ - command = "cycle_exterior"; - frequency = 1331; - master_tag = "vox_west_control"; - req_one_access_txt = "152" - }, -/turf/simulated/shuttle/wall{ - icon_state = "wall3" - }, -/area/shuttle/vox) -"agc" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 1; - icon_state = "diagonalWall3" - }, -/area/shuttle/vox) "agd" = ( -/obj/machinery/door/airlock/hatch{ - frequency = 1331; - icon_state = "door_locked"; - id_tag = "vox_northeast_lock"; - locked = 1; - req_access_txt = "152"; - req_one_access = null; - req_one_access_txt = "0" - }, -/obj/docking_port/mobile{ - dir = 2; - dwidth = 2; - height = 18; - id = "skipjack"; - name = "Vox Skipjack"; - roundstart_move = "skipjack_away"; - width = 19 - }, /obj/docking_port/stationary{ dir = 2; dwidth = 2; @@ -2563,70 +1800,8 @@ name = "northeast of SS13"; width = 19 }, -/turf/simulated/shuttle/plating/vox, -/area/shuttle/vox) -"age" = ( -/obj/machinery/access_button{ - command = "cycle_exterior"; - frequency = 1331; - master_tag = "vox_east_control"; - req_access_txt = "152" - }, -/turf/simulated/shuttle/wall{ - icon_state = "wall3" - }, -/area/shuttle/vox) -"agf" = ( -/obj/machinery/light/spot{ - dir = 8; - icon_state = "tube1"; - tag = "icon-tube1 (WEST)" - }, -/obj/machinery/sleeper/syndie{ - dir = 4 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"agg" = ( -/obj/machinery/door/window{ - base_state = "right"; - dir = 4; - icon_state = "right"; - name = "Infirmary"; - req_access_txt = "150" - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"agh" = ( -/obj/machinery/door/window{ - dir = 8; - name = "Tool Storage"; - req_access_txt = "150" - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"agi" = ( -/obj/structure/closet/crate/internals, -/obj/item/tank/oxygen/red, -/obj/item/clothing/mask/gas, -/obj/item/tank/oxygen/red, -/obj/item/clothing/mask/gas, -/obj/item/tank/oxygen/red, -/obj/item/clothing/mask/gas, -/obj/item/tank/oxygen/red, -/obj/item/clothing/mask/gas, -/obj/item/tank/oxygen/red, -/obj/item/clothing/mask/gas, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) +/turf/space, +/area/space) "agj" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable{ @@ -2769,26 +1944,6 @@ icon_state = "darkredcorners" }, /area/security/brig) -"agw" = ( -/turf/simulated/shuttle/wall{ - dir = 4; - icon_state = "wall3" - }, -/area/shuttle/vox) -"agx" = ( -/obj/machinery/airlock_sensor{ - frequency = 1331; - id_tag = "vox_west_sensor"; - pixel_x = 25; - req_access_txt = "152" - }, -/obj/machinery/light/spot{ - dir = 4; - icon_state = "tube1"; - tag = "icon-tube1 (EAST)" - }, -/turf/simulated/shuttle/plating/vox, -/area/shuttle/vox) "agy" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -2797,164 +1952,14 @@ icon_state = "floorgrime" }, /area/security/prisonershuttle) -"agz" = ( -/obj/machinery/door/poddoor/shutters{ - density = 0; - dir = 2; - icon_state = "open"; - id_tag = "voxshutters"; - name = "Blast Shutters"; - opacity = 0 - }, -/obj/structure/grille, -/obj/structure/shuttle/window{ - dir = 2; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "window5_end"; - tag = "icon-window5_end" - }, -/turf/simulated/shuttle/plating/vox, -/area/shuttle/vox) -"agA" = ( -/obj/machinery/door/poddoor/shutters{ - density = 0; - dir = 2; - icon_state = "open"; - id_tag = "voxshutters"; - name = "Blast Shutters"; - opacity = 0 - }, -/obj/structure/grille, -/obj/structure/shuttle/window{ - dir = 1; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "window5_end"; - tag = "icon-window5_end (NORTH)" - }, -/turf/simulated/shuttle/plating/vox, -/area/shuttle/vox) -"agB" = ( -/obj/machinery/door/poddoor/shutters{ - density = 0; - dir = 2; - icon_state = "open"; - id_tag = "voxshutters"; - name = "Blast Shutters"; - opacity = 0 - }, -/obj/structure/grille, -/obj/structure/shuttle/window{ - dir = 2; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "window5_mid"; - tag = "icon-window5_mid" - }, -/turf/simulated/shuttle/plating/vox, -/area/shuttle/vox) -"agC" = ( -/obj/machinery/airlock_sensor{ - frequency = 1331; - id_tag = "vox_east_sensor"; - pixel_x = -25; - req_access_txt = "152" - }, -/obj/machinery/light/spot{ - dir = 8; - icon_state = "tube1"; - tag = "icon-tube1 (WEST)" - }, -/turf/simulated/shuttle/plating/vox, -/area/shuttle/vox) "agD" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/obj/structure/snow{ - dir = 10; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/security/warden) -"agE" = ( -/obj/structure/table/glass, -/obj/item/storage/backpack/duffel/syndie/surgery_fake, -/obj/item/circular_saw, -/obj/item/surgicaldrill, -/obj/item/clothing/gloves/color/latex/nitrile, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"agF" = ( -/obj/machinery/iv_drip, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"agG" = ( -/obj/structure/table, -/obj/item/reagent_containers/syringe/charcoal, -/obj/item/reagent_containers/syringe/charcoal{ - pixel_y = 2 - }, -/obj/item/reagent_containers/syringe/charcoal{ - pixel_y = 4 - }, -/obj/item/gun/syringe/syndicate, -/obj/item/storage/firstaid/regular, -/obj/item/storage/firstaid/adv, -/obj/item/storage/box/syndie_kit/bonerepair, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"agH" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"agI" = ( -/obj/machinery/door/window{ - dir = 1; - name = "Secure Storage"; - req_access_txt = "150" - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"agJ" = ( -/obj/structure/table, -/obj/item/radio/beacon/syndicate/bomb{ - pixel_y = 5 - }, -/obj/item/radio/beacon/syndicate/bomb, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"agK" = ( -/obj/structure/table, -/obj/item/grenade/syndieminibomb{ - pixel_x = 4; - pixel_y = 2; - pixel_z = 0 - }, -/obj/item/grenade/syndieminibomb{ - pixel_x = -1 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) "agL" = ( /obj/structure/cable{ d1 = 4; @@ -2962,16 +1967,8 @@ icon_state = "4-8"; pixel_x = 0 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 - }, -/obj/structure/snow{ - dir = 8; - icon_state = "snow_corner" +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -2986,10 +1983,6 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/snow{ - dir = 1; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -3157,10 +2150,6 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/obj/structure/snow{ - dir = 8; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel, /area/security/seceqstorage) "agY" = ( @@ -3172,46 +2161,10 @@ tag = "icon-redfull (NORTHWEST)" }, /area/security/main) -"agZ" = ( -/turf/simulated/shuttle/wall{ - icon_state = "wall3" - }, -/area/shuttle/vox) -"aha" = ( -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"ahb" = ( -/obj/machinery/door/airlock/external{ - id_tag = "s_docking_airlock"; - name = "Shuttle Hatch"; - req_access_txt = "109" - }, -/obj/structure/fans/tiny, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/specops) -"ahc" = ( -/obj/machinery/computer/shuttle/vox, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"ahd" = ( -/obj/structure/table, -/obj/machinery/door_control{ - id = "voxshutters"; - name = "remote shutter control"; - req_access_txt = "152" - }, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) "ahe" = ( /obj/structure/chair/stool, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 2; @@ -3226,44 +2179,14 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 - }, -/obj/structure/snow{ - icon_state = "snow_corner" +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "red" }, /area/security/main) -"ahg" = ( -/obj/structure/mirror{ - pixel_x = 28 - }, -/obj/structure/sink{ - dir = 4; - icon_state = "sink"; - pixel_x = 11; - pixel_y = 0 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"ahh" = ( -/obj/effect/landmark{ - name = "Nuclear-Bomb" - }, -/obj/machinery/light/spot, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) "ahj" = ( /obj/structure/disposalpipe/segment{ dir = 2; @@ -3286,17 +2209,6 @@ icon_state = "darkredcorners" }, /area/security/brig) -"ahl" = ( -/obj/machinery/access_button{ - command = "cycle_interior"; - frequency = 1331; - master_tag = "vox_west_control"; - req_one_access_txt = "152" - }, -/turf/simulated/shuttle/wall{ - icon_state = "wall3" - }, -/area/shuttle/vox) "ahm" = ( /obj/structure/table/wood, /obj/item/book/manual/sop_security, @@ -3306,139 +2218,15 @@ }, /turf/simulated/floor/carpet, /area/security/hos) -"ahn" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 4; - icon_state = "diagonalWall3" - }, -/area/shuttle/vox) -"aho" = ( -/obj/machinery/door/poddoor/shutters{ - density = 0; - dir = 8; - icon_state = "open"; - id_tag = "voxshutters"; - name = "Blast Shutters"; - opacity = 0 - }, -/obj/structure/grille, -/obj/structure/shuttle/window{ - dir = 8; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "window5_end"; - tag = "icon-window5_end (WEST)" - }, -/turf/simulated/shuttle/plating/vox, -/area/shuttle/vox) -"ahp" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 4 - }, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"ahq" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 1 - }, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"ahr" = ( -/obj/machinery/door/poddoor/shutters{ - density = 0; - dir = 4; - icon_state = "open"; - id_tag = "voxshutters"; - name = "Blast Shutters"; - opacity = 0 - }, -/obj/structure/grille, -/obj/structure/shuttle/window{ - dir = 8; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "window5_end"; - tag = "icon-window5_end (WEST)" - }, -/turf/simulated/shuttle/plating/vox, -/area/shuttle/vox) -"ahs" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - icon_state = "diagonalWall3" - }, -/area/shuttle/vox) -"aht" = ( -/obj/machinery/access_button{ - command = "cycle_interior"; - frequency = 1331; - master_tag = "vox_east_control"; - req_one_access_txt = "152" - }, -/turf/simulated/shuttle/wall{ - icon_state = "wall3" - }, -/area/shuttle/vox) "ahu" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "white" }, /area/security/medbay) -"ahv" = ( -/obj/structure/closet/crate/medical, -/obj/item/reagent_containers/glass/bottle/morphine, -/obj/item/storage/box/beakers, -/obj/item/robot_parts/l_arm, -/obj/item/robot_parts/r_arm, -/obj/item/clothing/mask/surgical, -/obj/item/reagent_containers/iv_bag/blood/OMinus, -/obj/item/tank/anesthetic, -/obj/item/clothing/mask/breath/medical, -/obj/item/robot_parts/l_leg, -/obj/item/robot_parts/r_leg, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"ahw" = ( -/obj/machinery/optable, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"ahy" = ( -/obj/structure/shuttle/engine/heater, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/shuttle/plating, -/area/shuttle/syndicate) -"ahz" = ( -/obj/structure/computerframe, -/obj/item/paper/synditele, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"ahA" = ( -/obj/machinery/teleport/station, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"ahB" = ( -/obj/machinery/teleport/hub/upgraded, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) "ahC" = ( /obj/structure/cable{ d1 = 1; @@ -3470,10 +2258,6 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/snow{ - dir = 5; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkredcorners" @@ -3525,71 +2309,6 @@ icon_state = "white" }, /area/security/medbay) -"ahJ" = ( -/obj/machinery/door/poddoor/shutters{ - density = 0; - dir = 8; - icon_state = "open"; - id_tag = "voxshutters"; - name = "Blast Shutters"; - opacity = 0 - }, -/obj/structure/grille, -/obj/structure/shuttle/window{ - dir = 4; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "window5_end"; - tag = "icon-window5_end (EAST)" - }, -/turf/simulated/shuttle/plating/vox, -/area/shuttle/vox) -"ahK" = ( -/obj/machinery/light/spot, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"ahL" = ( -/obj/item/clothing/head/collectable/petehat{ - desc = "It smells faintly of reptile."; - name = "fancy leader hat" - }, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"ahM" = ( -/obj/machinery/door/poddoor/shutters{ - density = 0; - dir = 4; - icon_state = "open"; - id_tag = "voxshutters"; - name = "Blast Shutters"; - opacity = 0 - }, -/obj/structure/grille, -/obj/structure/shuttle/window{ - dir = 4; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "window5_end"; - tag = "icon-window5_end (EAST)" - }, -/turf/simulated/shuttle/plating/vox, -/area/shuttle/vox) -"ahN" = ( -/obj/structure/shuttle/engine/propulsion{ - icon_state = "propulsion_l"; - tag = "icon-propulsion_l" - }, -/turf/simulated/shuttle/plating, -/area/shuttle/syndicate) -"ahO" = ( -/obj/structure/shuttle/engine/propulsion, -/turf/simulated/shuttle/plating, -/area/shuttle/syndicate) -"ahP" = ( -/obj/structure/shuttle/engine/propulsion{ - icon_state = "propulsion_r"; - tag = "icon-propulsion_r" - }, -/turf/simulated/shuttle/plating, -/area/shuttle/syndicate) "ahQ" = ( /obj/machinery/alarm{ pixel_y = 23 @@ -3696,21 +2415,11 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel, /area/security/seceqstorage) -"ahZ" = ( -/obj/machinery/door/airlock/hatch{ - req_access_txt = "152" - }, -/turf/simulated/shuttle/plating/vox, -/area/shuttle/vox) "aia" = ( /obj/structure/reagent_dispensers/fueltank, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -3738,12 +2447,8 @@ "aic" = ( /obj/effect/decal/warning_stripes/north, /obj/machinery/space_heater, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel, /area/security/podbay) @@ -3839,16 +2544,6 @@ icon_state = "red" }, /area/security/armoury) -"ail" = ( -/turf/simulated/shuttle/plating/vox, -/area/shuttle/vox) -"aim" = ( -/obj/machinery/light{ - dir = 4; - icon_state = "tube1" - }, -/turf/simulated/shuttle/plating/vox, -/area/shuttle/vox) "ain" = ( /obj/machinery/flasher/portable, /obj/structure/window/reinforced{ @@ -4020,12 +2715,8 @@ name = "station intercom (General)"; pixel_y = 25 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /turf/simulated/floor/plasteel, /area/security/prisonlockers) @@ -4091,24 +2782,6 @@ tag = "icon-vault (WEST)" }, /area/security/securearmoury) -"aiC" = ( -/obj/machinery/door/poddoor/shutters{ - density = 0; - dir = 8; - icon_state = "open"; - id_tag = "voxshutters"; - name = "Blast Shutters"; - opacity = 0 - }, -/obj/structure/grille, -/obj/structure/shuttle/window{ - dir = 4; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "window5_mid"; - tag = "icon-window5 (EAST)" - }, -/turf/simulated/shuttle/plating/vox, -/area/shuttle/vox) "aiD" = ( /obj/machinery/status_display{ density = 0; @@ -4126,97 +2799,6 @@ icon_state = "darkredcorners" }, /area/security/brig) -"aiE" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/table, -/obj/machinery/recharger{ - pixel_y = 0 - }, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"aiF" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/table, -/obj/machinery/cell_charger, -/obj/item/weed_extract, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"aiG" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/table, -/mob/living/simple_animal/bot/floorbot{ - on = 0 - }, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"aiH" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/table, -/obj/item/broken_device, -/obj/item/robot_parts/chest, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"aiI" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/table, -/obj/item/pickaxe, -/obj/item/storage/firstaid/toxin, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"aiJ" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/table, -/obj/item/scalpel, -/obj/item/stack/cable_coil, -/obj/item/storage/firstaid/regular, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"aiK" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/table, -/obj/item/circular_saw, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"aiL" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/optable, -/obj/item/organ/internal/brain, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"aiM" = ( -/obj/machinery/door/poddoor/shutters{ - density = 0; - dir = 4; - icon_state = "open"; - id_tag = "voxshutters"; - name = "Blast Shutters"; - opacity = 0 - }, -/obj/structure/grille, -/obj/structure/shuttle/window{ - dir = 4; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "window5_mid"; - tag = "icon-window5 (EAST)" - }, -/turf/simulated/shuttle/plating/vox, -/area/shuttle/vox) "aiN" = ( /obj/structure/rack, /obj/item/gun/energy/gun{ @@ -4357,10 +2939,6 @@ pixel_y = -25 }, /obj/machinery/light, -/obj/structure/snow{ - dir = 1; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkredcorners" @@ -4491,14 +3069,6 @@ icon_state = "barber" }, /area/security/permabrig) -"ajd" = ( -/obj/item/storage/toolbox/syndicate, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"aje" = ( -/obj/item/skeleton/r_arm, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) "ajf" = ( /obj/structure/table, /obj/item/paper_bin{ @@ -4721,79 +3291,13 @@ /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/engine/vacuum, /area/security/podbay) -"ajz" = ( -/obj/machinery/atmospherics/unary/tank/nitrogen{ - dir = 1 - }, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"ajA" = ( -/obj/machinery/portable_atmospherics/canister/toxins, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"ajB" = ( -/obj/machinery/portable_atmospherics/canister/nitrogen, -/obj/machinery/light/spot, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"ajC" = ( -/obj/structure/rack, -/obj/item/rcd, -/obj/item/rcd_ammo, -/obj/item/rcd_ammo, -/obj/item/rcd_ammo, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"ajD" = ( -/obj/structure/rack, -/obj/item/tank/nitrogen, -/obj/item/tank/nitrogen, -/obj/item/tank/nitrogen, -/obj/item/tank/nitrogen, -/obj/item/tank/nitrogen, -/obj/item/tank/nitrogen, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"ajE" = ( -/obj/structure/rack, -/obj/item/clothing/accessory/storage/black_vest, -/obj/item/clothing/suit/space/vox/carapace, -/obj/item/clothing/head/helmet/space/vox/carapace, -/obj/item/clothing/mask/breath, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"ajF" = ( -/obj/structure/rack, -/obj/item/gun/dartgun/vox/raider, -/obj/item/gun/dartgun/vox/medical, -/obj/item/dart_cartridge, -/obj/item/dart_cartridge, -/obj/item/dart_cartridge, -/obj/item/dart_cartridge, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"ajG" = ( -/obj/machinery/sleeper/upgraded{ - dir = 4 - }, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"ajH" = ( -/obj/machinery/bodyscanner, -/obj/machinery/light/spot, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) "ajJ" = ( /obj/structure/sign/poster/official/random{ pixel_x = 0; pixel_y = 32 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -5026,36 +3530,6 @@ icon_state = "darkredcorners" }, /area/security/brig) -"ajY" = ( -/obj/structure/shuttle/engine/heater, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/shuttle/plating, -/area/shuttle/vox) -"ajZ" = ( -/obj/structure/rack, -/obj/item/clothing/accessory/storage/black_vest, -/obj/item/clothing/suit/space/vox/medic, -/obj/item/clothing/head/helmet/space/vox/medic, -/obj/item/clothing/mask/breath, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"aka" = ( -/obj/structure/rack, -/obj/item/pneumatic_cannon, -/obj/item/harpoon, -/obj/item/harpoon, -/obj/item/harpoon, -/obj/item/harpoon, -/obj/item/tank/nitrogen, -/obj/machinery/light/spot{ - dir = 4; - icon_state = "tube1"; - tag = "icon-tube1 (EAST)" - }, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) "akb" = ( /obj/structure/cable{ d1 = 2; @@ -5277,25 +3751,6 @@ }, /turf/simulated/floor/engine, /area/security/podbay) -"akp" = ( -/obj/structure/shuttle/engine/propulsion{ - icon_state = "propulsion_l"; - tag = "icon-propulsion_l" - }, -/turf/simulated/shuttle/plating, -/area/shuttle/vox) -"akq" = ( -/obj/structure/rack, -/obj/item/clothing/accessory/storage/black_vest, -/obj/item/clothing/suit/space/vox/pressure, -/obj/item/clothing/head/helmet/space/vox/pressure, -/obj/item/clothing/mask/breath, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"akr" = ( -/obj/structure/rack, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) "aks" = ( /obj/structure/cable{ d1 = 1; @@ -5339,7 +3794,16 @@ /area/security/securearmoury) "akv" = ( /obj/structure/table, -/obj/structure/snow, +/obj/item/taperecorder{ + pixel_y = 0 + }, +/obj/machinery/light_switch{ + pixel_x = -25 + }, +/obj/item/radio/intercom/department/security{ + pixel_x = 0; + pixel_y = 28 + }, /turf/simulated/floor/plasteel, /area/security/main) "akw" = ( @@ -5377,14 +3841,6 @@ }, /turf/simulated/floor/engine, /area/security/podbay) -"akA" = ( -/obj/structure/rack, -/obj/item/clothing/accessory/storage/black_vest, -/obj/item/clothing/suit/space/vox/stealth, -/obj/item/clothing/head/helmet/space/vox/stealth, -/obj/item/clothing/mask/breath, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) "akB" = ( /turf/simulated/wall/r_wall, /area/security/range) @@ -5433,21 +3889,10 @@ icon_state = "0-2"; pixel_y = 1 }, -/obj/item/gift, -/obj/item/clothing/head/cowboyhat/pink, -/obj/structure/snow, -/obj/item/toy/figure/hos, -/obj/item/toy/prize/gygax, -/obj/item/nanomob_card, -/obj/item/gun/projectile/automatic/toy, -/obj/item/ammo_box/magazine/toy/smg, /turf/simulated/floor/plasteel, /area/security/main) "akG" = ( /obj/structure/chair/stool, -/obj/item/decorations/sticky_decorations/flammable/tinsel/red{ - pixel_y = 19 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "barber" @@ -5538,16 +3983,6 @@ }, /turf/simulated/floor/plasteel, /area/security/permabrig) -"akP" = ( -/obj/structure/grille, -/obj/structure/shuttle/window{ - dir = 1; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "window5_end"; - tag = "icon-window5_end (NORTH)" - }, -/turf/simulated/shuttle/plating/vox, -/area/shuttle/vox) "akQ" = ( /obj/structure/cable{ d1 = 4; @@ -5562,16 +3997,6 @@ tag = "icon-stage_stairs" }, /area/security/permabrig) -"akR" = ( -/obj/structure/grille, -/obj/structure/shuttle/window{ - dir = 2; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "window5_end"; - tag = "icon-window5_end" - }, -/turf/simulated/shuttle/plating/vox, -/area/shuttle/vox) "akS" = ( /obj/structure/bed, /turf/simulated/floor/plasteel{ @@ -5675,12 +4100,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /obj/structure/cable{ d1 = 4; @@ -5909,6 +4330,17 @@ }, /area/security/brig) "alp" = ( +/obj/structure/table, +/obj/item/ashtray/bronze{ + pixel_x = -1; + pixel_y = 1 + }, +/obj/item/storage/fancy/cigarettes/cigpack_robust, +/obj/machinery/alarm{ + dir = 4; + icon_state = "alarm0"; + pixel_x = -22 + }, /obj/machinery/light{ dir = 8 }, @@ -5917,11 +4349,6 @@ dir = 4; network = list("SS13") }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/red{ - pixel_y = 19 - }, -/obj/structure/flora/tree/pine/xmas, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/security/main) "alq" = ( @@ -5931,7 +4358,6 @@ icon_state = "4-8"; pixel_x = 0 }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "redcorner" @@ -5979,7 +4405,6 @@ icon_state = "4-8"; pixel_x = 0 }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ icon_state = "red" }, @@ -5993,24 +4418,6 @@ /obj/structure/grille, /turf/space, /area/space/nearstation) -"alx" = ( -/obj/item/broken_bottle, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"aly" = ( -/obj/machinery/portable_atmospherics/canister/oxygen, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"alz" = ( -/obj/item/tank/emergency_oxygen, -/obj/item/clothing/mask/breath, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"alA" = ( -/obj/item/clothing/head/bearpelt, -/obj/item/xenos_claw, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) "alB" = ( /turf/simulated/floor/plasteel, /area/security/range) @@ -6042,6 +4449,15 @@ /obj/structure/closet/secure_closet/brig, /turf/simulated/floor/plasteel, /area/security/prisonlockers) +"alF" = ( +/obj/structure/chair{ + dir = 8 + }, +/obj/effect/landmark/start{ + name = "Security Officer" + }, +/turf/simulated/floor/plasteel, +/area/security/main) "alG" = ( /obj/machinery/vending/cigarette, /obj/machinery/status_display{ @@ -6050,7 +4466,6 @@ pixel_x = -32; pixel_y = 0 }, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/security/main) "alH" = ( @@ -6109,12 +4524,8 @@ /obj/machinery/light_switch{ pixel_y = -25 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -6234,7 +4645,6 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/snow, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -6326,9 +4736,6 @@ dir = 1; on = 1 }, -/obj/item/decorations/sticky_decorations/flammable/christmas_stocking{ - pixel_y = 17 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "red" @@ -6339,9 +4746,6 @@ /obj/machinery/alarm{ pixel_y = 23 }, -/obj/item/decorations/sticky_decorations/flammable/christmas_stocking{ - pixel_y = 17 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "red" @@ -6372,9 +4776,6 @@ name = "station intercom (General)"; pixel_y = 25 }, -/obj/item/decorations/sticky_decorations/flammable/christmas_stocking{ - pixel_y = 17 - }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "red" @@ -6389,12 +4790,8 @@ pixel_x = 0; pixel_y = -28 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -6405,31 +4802,6 @@ /obj/structure/lattice, /turf/space, /area/space/nearstation) -"ami" = ( -/obj/structure/chair{ - dir = 4 - }, -/obj/item/clothing/mask/breath, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"amj" = ( -/obj/item/clothing/head/collectable/xenom, -/obj/item/clothing/head/chicken, -/obj/item/aiModule/syndicate, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"amk" = ( -/obj/item/stack/spacecash/c1000, -/obj/item/stack/spacecash/c500, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"aml" = ( -/obj/item/stack/spacecash/c50, -/obj/structure/chair/comfy/shuttle{ - dir = 8 - }, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) "amm" = ( /obj/structure/cable{ d1 = 1; @@ -6437,27 +4809,20 @@ icon_state = "1-2"; tag = "" }, -/obj/structure/snow{ - dir = 1; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "red" }, /area/security/main) "amn" = ( +/obj/structure/table/reinforced, +/obj/item/folder/red{ + pixel_y = 3 + }, +/obj/item/book/manual/sop_legal, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, -/obj/structure/table/reinforced, -/obj/item/taperecorder{ - pixel_y = 0 - }, -/obj/structure/snow{ - dir = 1; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel, /area/security/main) "amo" = ( @@ -6501,11 +4866,12 @@ /turf/simulated/floor/plating, /area/security/main) "amr" = ( -/obj/structure/chair/stool, -/obj/effect/landmark/start{ - name = "Detective" +/obj/structure/chair/comfy/black{ + dir = 4 + }, +/obj/effect/landmark/start{ + name = "Head of Security" }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "redfull"; @@ -6517,12 +4883,8 @@ pixel_x = -25; pixel_y = 0 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /turf/simulated/floor/plating, /area/security/permabrig) @@ -6610,9 +4972,6 @@ dir = 2; network = list("SS13") }, -/obj/structure/snow{ - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkred" @@ -6637,9 +4996,6 @@ pixel_x = 0; pixel_y = 32 }, -/obj/item/decorations/sticky_decorations/flammable/christmas_stocking{ - pixel_y = 17 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkred" @@ -6656,14 +5012,6 @@ /area/security/warden) "amE" = ( /obj/machinery/computer/prisoner, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, -/obj/structure/snow{ - dir = 6; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "darkred" @@ -6745,7 +5093,6 @@ /turf/simulated/floor/plating, /area/maintenance/fsmaint) "amM" = ( -/obj/structure/snow, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "red" @@ -6772,17 +5119,12 @@ }, /area/security/main) "amO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/table/reinforced, -/obj/item/ashtray/bronze{ - pixel_x = -1; - pixel_y = 1 - }, -/obj/item/storage/fancy/cigarettes/cigpack_robust, -/obj/structure/snow{ - dir = 8; - icon_state = "snow_corner" +/obj/item/folder/red{ + pixel_y = 3 }, +/obj/item/book/manual/security_space_law, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/security/main) "amP" = ( @@ -6830,10 +5172,6 @@ dir = 8; network = list("SS13") }, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -6893,23 +5231,6 @@ icon_state = "green" }, /area/security/permabrig) -"amY" = ( -/obj/structure/AIcore, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"amZ" = ( -/obj/item/stack/spacecash/c200, -/obj/item/stack/spacecash/c50, -/obj/machinery/light/spot, -/obj/structure/chair/comfy/shuttle{ - dir = 1 - }, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"ana" = ( -/obj/item/storage/box/zipties, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) "anb" = ( /obj/structure/chair{ dir = 4 @@ -6953,6 +5274,11 @@ /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plating, /area/security/permabrig) +"anf" = ( +/turf/simulated/floor/plasteel{ + icon_state = "floorgrime" + }, +/area/security/permabrig) "ang" = ( /obj/structure/cable{ d1 = 1; @@ -6981,12 +5307,8 @@ /turf/simulated/floor/plasteel, /area/security/prisonlockers) "anj" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /turf/simulated/floor/plating, /area/security/permabrig) @@ -7107,9 +5429,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/obj/structure/snow{ - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -7163,10 +5482,6 @@ initialize_directions = 11; level = 1 }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/red{ - pixel_y = 19 - }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -7179,10 +5494,6 @@ dir = 4; level = 1 }, -/obj/structure/snow{ - dir = 4; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -7202,10 +5513,6 @@ d2 = 8; icon_state = "1-8" }, -/obj/structure/snow{ - dir = 4; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -7249,7 +5556,6 @@ name = "Warden's Desk"; req_access_txt = "3" }, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/security/warden) "anE" = ( @@ -7259,7 +5565,6 @@ icon_state = "4-8"; pixel_x = 0 }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkred" @@ -7341,9 +5646,6 @@ /area/security/main) "anM" = ( /obj/structure/chair/stool, -/obj/effect/landmark/start{ - name = "Head of Security" - }, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "redfull"; @@ -7351,12 +5653,8 @@ }, /area/security/main) "anN" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /turf/simulated/floor/plasteel, /area/security/permabrig) @@ -7399,7 +5697,6 @@ dir = 4; level = 1 }, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/security/main) "anR" = ( @@ -7418,10 +5715,6 @@ dir = 4; level = 1 }, -/obj/structure/snow{ - dir = 4; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel, /area/security/main) "anS" = ( @@ -7429,7 +5722,6 @@ dir = 4; level = 1 }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "red" @@ -7449,22 +5741,17 @@ }, /area/security/permabrig) "anU" = ( +/obj/structure/table/reinforced, +/obj/item/folder/red{ + pixel_y = 3 + }, +/obj/item/book/manual/sop_security, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1; initialize_directions = 11; level = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/table/reinforced, -/obj/item/book/manual/sop_legal, -/obj/item/book/manual/security_space_law, -/obj/item/folder/red{ - pixel_y = 3 - }, -/obj/structure/snow{ - dir = 8; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel, /area/security/main) "anV" = ( @@ -7534,9 +5821,6 @@ dir = 1; in_use = 1 }, -/obj/structure/snow{ - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "cult"; @@ -7657,12 +5941,8 @@ }, /area/security/lobby) "aol" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -7752,7 +6032,6 @@ d2 = 4; icon_state = "1-4" }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -7768,7 +6047,6 @@ /obj/effect/landmark/start{ name = "Warden" }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -7789,7 +6067,6 @@ /obj/machinery/hologram/holopad, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/snow, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -7801,9 +6078,6 @@ icon_state = "4-8"; pixel_x = 0 }, -/obj/structure/snow{ - icon_state = "snow_surround" - }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -7813,10 +6087,6 @@ /obj/effect/landmark/start{ name = "Warden" }, -/obj/structure/snow{ - dir = 6; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -7834,11 +6104,6 @@ /area/security/prison/cell_block/A) "aox" = ( /obj/machinery/computer/secure_data, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkred" @@ -7962,9 +6227,17 @@ d2 = 4; icon_state = "1-4" }, -/obj/structure/snow{ - dir = 4; - icon_state = "snow_corner" +/turf/simulated/floor/plasteel, +/area/security/main) +"aoI" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + pixel_x = 0 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/plasteel, /area/security/main) @@ -8012,7 +6285,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/security/main) "aoM" = ( @@ -8025,7 +6297,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "redcorner" @@ -8037,19 +6308,14 @@ d2 = 8; icon_state = "1-8" }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "redcorner" }, /area/security/main) "aoO" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /obj/structure/cable{ d1 = 1; @@ -8080,12 +6346,6 @@ initialize_directions = 11; level = 1 }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/red{ - pixel_y = 19 - }, -/obj/structure/snow{ - icon_state = "snow_surround" - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "red" @@ -8099,11 +6359,6 @@ "aoR" = ( /obj/structure/table, /obj/item/storage/fancy/donut_box, -/obj/item/book/manual/sop_security, -/obj/item/folder/red{ - pixel_y = 3 - }, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/security/main) "aoS" = ( @@ -8154,7 +6409,7 @@ /area/security/prisonlockers) "aoW" = ( /obj/machinery/power/treadmill{ - dir = 4 + dir = 8 }, /obj/machinery/treadmill_monitor{ id = "Cell 3"; @@ -8276,7 +6531,6 @@ pixel_x = -28; pixel_y = -10 }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "darkred" @@ -8288,7 +6542,6 @@ pixel_x = -3; pixel_y = 5 }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "darkred" @@ -8299,15 +6552,12 @@ /obj/item/book/manual/sop_legal, /obj/item/paper/armory, /obj/item/clipboard, -/obj/structure/snow, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "darkred" }, /area/security/warden) "aph" = ( -/obj/item/decorations/sticky_decorations/flammable/snowman, -/obj/structure/snow, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "darkred" @@ -8317,7 +6567,6 @@ /obj/structure/table/reinforced, /obj/item/folder/red, /obj/item/megaphone, -/obj/structure/snow, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "darkred" @@ -8325,7 +6574,6 @@ /area/security/warden) "apj" = ( /obj/structure/table/reinforced, -/obj/structure/snow, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "darkred" @@ -8335,11 +6583,6 @@ /obj/machinery/computer/security{ network = list("SS13","Research Outpost","Mining Outpost") }, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "darkred" @@ -8419,57 +6662,6 @@ icon_state = "solarpanel" }, /area/solar/auxstarboard) -"apr" = ( -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall12" - }, -/area/shuttle/trade/sol) -"aps" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall_f6"; - tag = "icon-swall_f6" - }, -/area/shuttle/trade/sol) -"apt" = ( -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall14" - }, -/area/shuttle/trade/sol) -"apu" = ( -/obj/structure/window/full/shuttle, -/obj/structure/grille, -/obj/machinery/door/poddoor/shutters{ - density = 0; - dir = 2; - icon_state = "open"; - id_tag = "trader_privacy"; - name = "Privacy Shutters"; - opacity = 0 - }, -/turf/simulated/shuttle/plating, -/area/shuttle/trade/sol) -"apv" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall_f10" - }, -/area/shuttle/trade/sol) -"apw" = ( -/obj/effect/spawner/lootdrop/trade_sol/civ, -/obj/structure/closet, -/turf/simulated/shuttle/floor, -/area/shuttle/trade/sol) -"apx" = ( -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall3" - }, -/area/shuttle/trade/sol) "apy" = ( /obj/machinery/door/window/brigdoor/southleft{ dir = 8; @@ -8595,9 +6787,6 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/item/decorations/sticky_decorations/flammable/christmas_stocking{ - pixel_y = -16 - }, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "red" @@ -8617,9 +6806,6 @@ /area/security/main) "apJ" = ( /obj/structure/closet/secure_closet/security, -/obj/item/decorations/sticky_decorations/flammable/christmas_stocking{ - pixel_y = -16 - }, /turf/simulated/floor/plasteel{ icon_state = "red" }, @@ -8635,9 +6821,6 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/decorations/sticky_decorations/flammable/christmas_stocking{ - pixel_y = -16 - }, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "red" @@ -8647,14 +6830,6 @@ /obj/structure/table, /obj/item/storage/fancy/donut_box, /obj/machinery/light, -/obj/item/reagent_containers/food/snacks/candy/confectionery/toffee{ - pixel_x = -10 - }, -/obj/item/reagent_containers/food/snacks/candy/confectionery/toffee{ - pixel_x = 9 - }, -/obj/item/reagent_containers/food/snacks/candy/confectionery/toffee, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/security/main) "apN" = ( @@ -8666,7 +6841,6 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/security/main) "apO" = ( @@ -8676,7 +6850,6 @@ /obj/effect/landmark/start{ name = "Security Pod Pilot" }, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/security/main) "apP" = ( @@ -8729,7 +6902,6 @@ name = "Security Office"; req_access_txt = "63" }, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/security/main) "apU" = ( @@ -8848,83 +7020,10 @@ /obj/structure/sign/securearea, /turf/simulated/floor/plating/airless, /area/security/podbay) -"aqf" = ( -/obj/structure/shuttle/engine/propulsion{ - dir = 8; - icon_state = "burst_l" - }, -/turf/simulated/shuttle/plating, -/area/shuttle/trade/sol) -"aqg" = ( -/obj/machinery/light/spot{ - dir = 1; - icon_state = "tube1"; - tag = "icon-tube1 (NORTH)" - }, -/obj/effect/spawner/lootdrop/trade_sol/donksoft, -/obj/structure/closet, -/turf/simulated/shuttle/floor, -/area/shuttle/trade/sol) -"aqh" = ( -/obj/effect/spawner/lootdrop/trade_sol/minerals, -/obj/structure/closet, -/turf/simulated/shuttle/floor, -/area/shuttle/trade/sol) -"aqi" = ( -/obj/machinery/door/airlock/shuttle/glass{ - name = "trader shuttle airlock"; - req_access_txt = "160"; - security_level = 6 - }, -/turf/simulated/shuttle/floor, -/area/shuttle/trade/sol) -"aqj" = ( -/obj/machinery/light/spot{ - dir = 1; - icon_state = "tube1"; - tag = "icon-tube1 (NORTH)" - }, -/turf/simulated/shuttle/floor, -/area/shuttle/trade/sol) -"aqk" = ( -/obj/machinery/door_control{ - id = "soltrader_north"; - name = "Trade Deposits Door"; - normaldoorcontrol = 1; - pixel_x = 24; - pixel_y = -8; - req_access_txt = "160" - }, -/obj/machinery/door_control{ - id = "trader_privacy"; - name = "Privacy Shutters Control"; - pixel_x = 24; - pixel_y = 8; - req_access_txt = "160" - }, -/turf/simulated/shuttle/floor, -/area/shuttle/trade/sol) -"aql" = ( -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall8"; - tag = "icon-swall12" - }, -/area/shuttle/trade/sol) -"aqm" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swallc2" - }, -/area/shuttle/trade/sol) "aqn" = ( /obj/item/flag/sec, /turf/simulated/floor/plating, /area/maintenance/fsmaint) -"aqo" = ( -/obj/structure/shuttle/window, -/obj/structure/grille, -/turf/simulated/shuttle/plating, -/area/shuttle/trade/sol) "aqp" = ( /obj/structure/lattice, /obj/structure/grille{ @@ -9092,7 +7191,6 @@ name = "Security Office"; req_access_txt = "63" }, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/security/main) "aqE" = ( @@ -9276,12 +7374,8 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "bcarpet05" @@ -9323,13 +7417,6 @@ /area/security/brig) "aqY" = ( /obj/structure/chair/stool, -/obj/item/decorations/sticky_decorations/flammable/tinsel/red{ - pixel_y = 19 - }, -/obj/structure/snow{ - dir = 10; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "cult"; @@ -9340,6 +7427,29 @@ /obj/structure/lattice/catwalk, /turf/space, /area/solar/auxstarboard) +"ara" = ( +/obj/structure/table/reinforced, +/obj/item/folder{ + pixel_x = -4 + }, +/obj/item/folder/red{ + pixel_y = 3 + }, +/obj/item/folder/blue{ + pixel_x = 5 + }, +/obj/item/folder/yellow{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/stamp/law, +/obj/item/pen/multi, +/turf/simulated/floor/plasteel{ + dir = 2; + icon_state = "cult"; + tag = "icon-cult" + }, +/area/lawoffice) "arb" = ( /obj/structure/cable, /obj/structure/lattice/catwalk, @@ -9367,42 +7477,6 @@ }, /turf/simulated/floor/plating, /area/security/lobby) -"ard" = ( -/obj/structure/shuttle/engine/propulsion{ - dir = 8; - icon_state = "propulsion" - }, -/turf/simulated/shuttle/plating, -/area/shuttle/trade/sol) -"are" = ( -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "open"; - id_tag = "soltradeship_north"; - name = "Security Doors"; - opacity = 0 - }, -/obj/machinery/door/airlock/shuttle/glass{ - id_tag = "soltrader_north"; - name = "trader shuttle airlock"; - req_access_txt = "160"; - security_level = 6 - }, -/turf/simulated/shuttle/floor, -/area/shuttle/trade/sol) -"arf" = ( -/obj/effect/spawner/lootdrop/trade_sol/sci, -/obj/structure/closet, -/turf/simulated/shuttle/floor, -/area/shuttle/trade/sol) -"arg" = ( -/obj/effect/spawner/lootdrop/trade_sol/med, -/obj/structure/closet, -/turf/simulated/shuttle/floor, -/area/shuttle/trade/sol) -"arh" = ( -/turf/simulated/shuttle/floor, -/area/shuttle/trade/sol) "ari" = ( /obj/structure/cable{ d1 = 1; @@ -9490,12 +7564,8 @@ }, /area/security/prison/cell_block/A) "aro" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 2; @@ -9619,7 +7689,6 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "redcorner" @@ -9690,10 +7759,6 @@ dir = 5; level = 1 }, -/obj/structure/snow{ - dir = 8; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel, /area/security/processing) "arA" = ( @@ -9715,12 +7780,8 @@ pixel_x = -24; pixel_y = 23 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /turf/simulated/floor/plasteel, /area/security/permabrig) @@ -9752,9 +7813,6 @@ pixel_x = 25; pixel_y = -7 }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/red{ - pixel_y = 19 - }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "redcorner" @@ -9767,9 +7825,6 @@ icon_state = "2-8"; tag = "" }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/red{ - pixel_y = 19 - }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "redcorner" @@ -9971,19 +8026,6 @@ /obj/structure/lattice/catwalk, /turf/space, /area/solar/auxport) -"arV" = ( -/obj/structure/shuttle/engine/propulsion{ - dir = 8; - icon_state = "burst_r" - }, -/turf/simulated/shuttle/plating, -/area/shuttle/trade/sol) -"arW" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 4 - }, -/turf/simulated/shuttle/floor, -/area/shuttle/trade/sol) "arX" = ( /obj/structure/cable{ d2 = 2; @@ -9997,32 +8039,6 @@ icon_state = "solarpanel" }, /area/solar/auxport) -"arY" = ( -/obj/machinery/light/spot, -/turf/simulated/shuttle/floor, -/area/shuttle/trade/sol) -"arZ" = ( -/obj/machinery/atm{ - pixel_x = 0; - pixel_y = 32 - }, -/obj/structure/chair/comfy/shuttle{ - dir = 8 - }, -/turf/simulated/shuttle/floor, -/area/shuttle/trade/sol) -"asa" = ( -/obj/effect/spawner/window/reinforced, -/obj/machinery/door/poddoor/shutters{ - density = 0; - dir = 2; - icon_state = "open"; - id_tag = "trader_privacy"; - name = "Privacy Shutters"; - opacity = 0 - }, -/turf/simulated/shuttle/floor, -/area/shuttle/trade/sol) "asb" = ( /obj/structure/lattice/catwalk, /turf/space, @@ -10133,6 +8149,10 @@ icon_state = "dark" }, /area/security/brig) +"asl" = ( +/obj/structure/chair/stool, +/turf/simulated/floor/plasteel, +/area/security/permabrig) "asm" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -10224,10 +8244,6 @@ /obj/item/radio/intercom/department/security{ pixel_x = -28 }, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, /turf/simulated/floor/plasteel, /area/security/permabrig) "ast" = ( @@ -10266,10 +8282,6 @@ dir = 4; pixel_x = 0 }, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, /turf/simulated/floor/plasteel, /area/security/permabrig) "asv" = ( @@ -10309,10 +8321,6 @@ pixel_x = 0; pixel_y = 30 }, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, /turf/simulated/floor/plasteel, /area/security/permabrig) "asx" = ( @@ -10467,12 +8475,8 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -10535,9 +8539,6 @@ dir = 4; level = 1 }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/red{ - pixel_y = 19 - }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -10558,21 +8559,6 @@ icon_state = "dark" }, /area/security/podbay) -"asJ" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall_f5"; - tag = "icon-swall_f5" - }, -/area/shuttle/trade/sol) -"asK" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall_f9" - }, -/area/shuttle/trade/sol) "asL" = ( /obj/structure/cable{ d1 = 4; @@ -10613,7 +8599,6 @@ /turf/space, /area/solar/auxport) "asN" = ( -/obj/structure/snow, /turf/simulated/floor/carpet, /area/lawoffice) "asO" = ( @@ -10621,11 +8606,6 @@ req_access = null; req_access_txt = "2" }, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "cult"; @@ -10633,16 +8613,9 @@ }, /area/lawoffice) "asP" = ( -/obj/structure/chair/comfy/green{ +/obj/structure/chair/comfy/brown{ dir = 1 }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/red{ - pixel_y = 19 - }, -/obj/structure/snow{ - dir = 8; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "cult"; @@ -10670,43 +8643,6 @@ icon_state = "darkred" }, /area/security/lobby) -"asS" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall_f6" - }, -/area/shuttle/siberia) -"asT" = ( -/obj/structure/grille, -/obj/structure/window/full/shuttle{ - dir = 10; - icon_state = "9" - }, -/turf/simulated/floor/plating, -/area/shuttle/siberia) -"asU" = ( -/obj/structure/grille, -/obj/structure/window/full/shuttle{ - icon_state = "window4" - }, -/turf/simulated/floor/plating, -/area/shuttle/siberia) -"asV" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall_f10"; - tag = "icon-swall_f10" - }, -/area/shuttle/siberia) -"asW" = ( -/obj/structure/grille, -/obj/structure/window/full/shuttle{ - icon_state = "window8" - }, -/turf/simulated/floor/plating, -/area/shuttle/siberia) "asX" = ( /obj/machinery/computer/secure_data, /turf/simulated/floor/plasteel{ @@ -10806,6 +8742,19 @@ icon_state = "bluecorner" }, /area/hallway/primary/fore) +"atd" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "redcorner" + }, +/area/security/prison/cell_block/A) "ate" = ( /obj/structure/closet/secure_closet/brig{ id = "Cell 3"; @@ -10817,16 +8766,8 @@ }, /area/security/prison/cell_block/A) "atf" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 - }, -/obj/structure/snow{ - dir = 8; - icon_state = "snow_surround" +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/carpet, /area/lawoffice) @@ -10857,12 +8798,6 @@ /obj/structure/chair{ dir = 1 }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/red{ - pixel_y = 19 - }, -/obj/structure/snow{ - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "redcorner" @@ -10899,10 +8834,6 @@ /obj/structure/table, /obj/item/flashlight/lamp, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/structure/snow{ - dir = 8; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel, /area/security/processing) "atm" = ( @@ -10925,9 +8856,6 @@ icon_state = "2-8"; tag = "" }, -/obj/structure/snow{ - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel, /area/security/processing) "atn" = ( @@ -10952,9 +8880,6 @@ pixel_y = 0; tag = "" }, -/obj/structure/snow{ - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel, /area/security/processing) "ato" = ( @@ -11027,16 +8952,8 @@ /turf/simulated/floor/plating, /area/maintenance/fsmaint) "atv" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 - }, -/obj/structure/snow{ - dir = 6; - icon_state = "snow_corner" +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /turf/simulated/floor/plasteel, /area/security/processing) @@ -11204,38 +9121,6 @@ /obj/item/reagent_containers/spray/plantbgone, /turf/simulated/floor/plasteel, /area/security/permabrig) -"atI" = ( -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall3" - }, -/area/shuttle/siberia) -"atJ" = ( -/obj/structure/table, -/obj/item/folder/red, -/obj/item/restraints/handcuffs, -/obj/machinery/light{ - dir = 4; - icon_state = "tube1" - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/siberia) -"atK" = ( -/obj/machinery/computer/shuttle/labor, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/siberia) -"atL" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 1 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/siberia) "atN" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable{ @@ -11405,12 +9290,8 @@ pixel_x = 0; pixel_y = 32 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -11626,16 +9507,8 @@ tag = "" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 - }, -/obj/structure/snow{ - dir = 6; - icon_state = "snow_corner" +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -11675,93 +9548,36 @@ /turf/simulated/floor/plating, /area/maintenance/fsmaint) "auq" = ( -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall12"; - tag = "icon-swall12" - }, +/turf/simulated/wall/mineral/titanium, /area/shuttle/pod_3) "aur" = ( /obj/structure/filingcabinet/employment, -/obj/structure/snow, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "cult"; tag = "icon-cult" }, /area/lawoffice) -"aus" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall_f10" - }, -/area/shuttle/pod_3) "aut" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, -/obj/structure/snow{ - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "cult"; tag = "icon-cult" }, /area/lawoffice) -"auu" = ( -/obj/machinery/mineral/labor_claim_console{ - machinedir = 2; - pixel_x = 30; - pixel_y = 30 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/siberia) -"auv" = ( -/obj/structure/grille, -/obj/structure/window/full/shuttle, -/turf/simulated/floor/plating, -/area/shuttle/siberia) -"auw" = ( -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/siberia) -"aux" = ( -/obj/machinery/flasher_button{ - id = "gulagshuttleflasher"; - name = "Flash Control"; - pixel_x = 0; - pixel_y = -26; - req_access_txt = "1" - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/siberia) "auy" = ( /obj/machinery/door/airlock/external{ id_tag = "laborcamp_home"; + locked = 1; name = "Labor Camp Airlock"; req_access_txt = "2" }, /obj/structure/fans/tiny, /turf/simulated/floor/plating, /area/security/prisonershuttle) -"auz" = ( -/obj/machinery/door/airlock/shuttle{ - id_tag = "s_docking_airlock"; - name = "Labor Shuttle Airlock"; - req_access_txt = "2" - }, -/obj/structure/fans/tiny, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/siberia) "auA" = ( /obj/machinery/door/airlock/external{ frequency = 1450; @@ -12096,7 +9912,6 @@ /obj/item/radio/intercom/department/security{ pixel_x = -28 }, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/security/processing) "auU" = ( @@ -12123,7 +9938,6 @@ pixel_x = 24 }, /obj/structure/cable, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/security/processing) "auX" = ( @@ -12136,7 +9950,6 @@ pixel_y = 0; tag = "" }, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/security/processing) "auY" = ( @@ -12274,9 +10087,6 @@ pixel_x = 0; tag = "" }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/red{ - pixel_y = 19 - }, /turf/simulated/floor/plasteel, /area/security/permabrig) "avl" = ( @@ -12396,7 +10206,7 @@ /obj/structure/chair/comfy/shuttle{ dir = 4 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/pod_3) "avq" = ( /turf/simulated/floor/plating, @@ -12433,11 +10243,11 @@ id = "pod3"; name = "escape pod 3" }, -/obj/machinery/door/airlock/shuttle{ +/obj/machinery/door/airlock/titanium{ id_tag = "s_docking_airlock"; name = "Escape Pod Hatch" }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/pod_3) "avu" = ( /obj/machinery/status_display{ @@ -12450,36 +10260,12 @@ /obj/structure/chair/comfy/shuttle{ dir = 4 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/pod_3) -"avv" = ( -/obj/machinery/door/airlock/external{ - name = "Labor Shuttle Airlock"; - req_access_txt = "2" - }, -/turf/simulated/shuttle/floor{ - icon = 'icons/turf/floors.dmi'; - icon_state = "dark" - }, -/area/shuttle/siberia) "avw" = ( -/obj/structure/grille, -/obj/structure/window/full/shuttle, -/turf/simulated/shuttle/plating, +/obj/effect/spawner/window/shuttle, +/turf/simulated/floor/plating, /area/shuttle/pod_3) -"avx" = ( -/obj/machinery/mineral/stacking_machine/laborstacker{ - input_dir = 2; - output_dir = 1 - }, -/turf/simulated/shuttle/floor{ - icon = 'icons/turf/floors.dmi'; - icon_state = "dark" - }, -/area/shuttle/siberia) -"avy" = ( -/turf/simulated/shuttle/wall, -/area/shuttle/siberia) "avz" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable{ @@ -12499,16 +10285,9 @@ /area/security/processing) "avA" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/snow{ - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel, /area/security/processing) "avB" = ( -/obj/structure/snow{ - dir = 4; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "redcorner" @@ -12700,10 +10479,6 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/obj/structure/snow{ - dir = 8; - icon_state = "snow_surround" - }, /turf/simulated/floor/carpet, /area/lawoffice) "avO" = ( @@ -12728,12 +10503,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /turf/simulated/floor/plasteel, /area/security/lobby) @@ -12748,7 +10519,6 @@ network = list("SS13") }, /obj/machinery/photocopier, -/obj/structure/snow, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "cult"; @@ -12762,7 +10532,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "cult"; @@ -12771,7 +10540,6 @@ /area/lawoffice) "avS" = ( /obj/machinery/hologram/holopad, -/obj/structure/snow, /turf/simulated/floor/carpet, /area/lawoffice) "avT" = ( @@ -12783,10 +10551,6 @@ dir = 4; level = 1 }, -/obj/structure/snow{ - dir = 8; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel, /area/security/lobby) "avV" = ( @@ -12812,13 +10576,24 @@ dir = 4; level = 1 }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "cult"; tag = "icon-cult" }, /area/lawoffice) +"avX" = ( +/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, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/security/prison/cell_block/A) "avY" = ( /turf/simulated/floor/plasteel{ dir = 4; @@ -12923,7 +10698,6 @@ pixel_x = 0; tag = "" }, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/security/processing) "awf" = ( @@ -12939,7 +10713,6 @@ req_access = null; req_access_txt = "63" }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "redcorner" @@ -12989,7 +10762,6 @@ pixel_x = 0; tag = "" }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "redcorner" @@ -13009,7 +10781,6 @@ icon_state = "2-8"; tag = "" }, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/security/processing) "awk" = ( @@ -13033,13 +10804,6 @@ "awl" = ( /turf/simulated/wall, /area/maintenance/fsmaint) -"awm" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall_f9" - }, -/area/shuttle/pod_3) "awn" = ( /obj/structure/cable{ d1 = 2; @@ -13059,96 +10823,8 @@ level = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/security/processing) -"awo" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 8; - icon_state = "diagonalWall3" - }, -/area/shuttle/syndicate_elite) -"awp" = ( -/obj/structure/shuttle/engine/propulsion{ - dir = 1; - icon_state = "propulsion"; - tag = "icon-propulsion (NORTH)" - }, -/turf/simulated/shuttle/plating, -/area/shuttle/syndicate_elite) -"awq" = ( -/obj/structure/shuttle/engine/propulsion{ - dir = 1; - icon_state = "propulsion_r"; - tag = "icon-propulsion_r (NORTH)" - }, -/turf/simulated/shuttle/plating, -/area/shuttle/syndicate_elite) -"awr" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 1; - icon_state = "diagonalWall3" - }, -/area/shuttle/syndicate_elite) -"aws" = ( -/obj/structure/shuttle/engine/propulsion{ - dir = 1; - icon_state = "propulsion_l"; - tag = "icon-propulsion_l (NORTH)" - }, -/turf/simulated/shuttle/plating, -/area/shuttle/syndicate_elite) -"awt" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 8; - icon_state = "diagonalWall3" - }, -/area/shuttle/syndicate_sit) -"awu" = ( -/obj/structure/shuttle/engine/propulsion{ - dir = 1; - icon_state = "propulsion"; - tag = "icon-propulsion (NORTH)" - }, -/turf/simulated/shuttle/plating, -/area/shuttle/syndicate_sit) -"awv" = ( -/obj/structure/shuttle/engine/propulsion{ - dir = 1; - icon_state = "propulsion_r"; - tag = "icon-propulsion_r (NORTH)" - }, -/turf/simulated/shuttle/plating, -/area/shuttle/syndicate_sit) -"aww" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 1; - icon_state = "diagonalWall3" - }, -/area/shuttle/syndicate_sit) -"awx" = ( -/obj/structure/shuttle/engine/propulsion{ - dir = 1; - icon_state = "propulsion_l"; - tag = "icon-propulsion_l (NORTH)" - }, -/turf/simulated/shuttle/plating, -/area/shuttle/syndicate_sit) -"awy" = ( -/obj/machinery/mineral/labor_claim_console{ - machinedir = 1; - pixel_x = 30; - pixel_y = 0 - }, -/turf/simulated/shuttle/floor, -/area/shuttle/siberia) -"awz" = ( -/turf/simulated/shuttle/floor, -/area/shuttle/siberia) "awA" = ( /obj/machinery/hologram/holopad, /obj/structure/cable{ @@ -13170,10 +10846,6 @@ d2 = 8; icon_state = "2-8" }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/red{ - pixel_y = 19 - }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "redcorner" @@ -13214,7 +10886,6 @@ pixel_x = 0; pixel_y = -22 }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "redcorner" @@ -13235,6 +10906,11 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/maintenance/fsmaint) +"awG" = ( +/turf/simulated/floor/plasteel{ + icon_state = "grimy" + }, +/area/security/detectives_office) "awH" = ( /obj/structure/table, /obj/item/dice/d20, @@ -13279,20 +10955,6 @@ tag = "icon-stage_stairs" }, /area/security/prison/cell_block/A) -"awM" = ( -/obj/machinery/sleeper/syndie{ - dir = 4 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate_elite) -"awN" = ( -/obj/machinery/sleeper/syndie, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate_elite) "awO" = ( /obj/machinery/hydroponics/constructable, /obj/machinery/ai_status_display{ @@ -13534,61 +11196,11 @@ /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/maintenance/fsmaint) -"axi" = ( -/turf/simulated/shuttle/wall{ - dir = 4; - icon_state = "wall3" - }, -/area/shuttle/syndicate_elite) -"axj" = ( -/obj/structure/window/reinforced, -/obj/structure/shuttle/engine/heater{ - dir = 1; - icon_state = "heater"; - tag = "icon-heater (NORTH)" - }, -/turf/simulated/shuttle/plating, -/area/shuttle/syndicate_elite) -"axk" = ( -/turf/simulated/shuttle/wall{ - dir = 4; - icon_state = "wall3" - }, -/area/shuttle/syndicate_sit) -"axl" = ( -/obj/structure/window/reinforced, -/obj/structure/shuttle/engine/heater{ - dir = 1; - icon_state = "heater"; - tag = "icon-heater (NORTH)" - }, -/turf/simulated/shuttle/plating, -/area/shuttle/syndicate_sit) -"axm" = ( -/obj/machinery/flasher{ - id = "gulagshuttleflasher"; - pixel_x = 25 - }, -/obj/machinery/light{ - dir = 4; - icon_state = "tube1" - }, -/obj/structure/chair/comfy/shuttle{ - dir = 8 - }, -/turf/simulated/shuttle/floor, -/area/shuttle/siberia) "axn" = ( /obj/structure/lattice, /obj/item/stack/cable_coil, /turf/space, /area/space/nearstation) -"axo" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 4 - }, -/turf/simulated/shuttle/floor, -/area/shuttle/siberia) "axp" = ( /obj/structure/bookcase, /obj/item/book/manual/sop_engineering, @@ -13633,10 +11245,6 @@ dir = 9; pixel_y = 0 }, -/obj/structure/snow{ - dir = 1; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "cult"; @@ -13908,7 +11516,6 @@ /area/security/prison/cell_block/A) "axK" = ( /obj/structure/disposalpipe/segment, -/obj/structure/snow, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "darkredcorners" @@ -13940,10 +11547,6 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, -/obj/structure/snow{ - dir = 4; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkredcorners" @@ -13957,7 +11560,6 @@ pixel_y = 0; tag = "" }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "redcorner" @@ -13970,7 +11572,6 @@ req_access = null; req_access_txt = "63" }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "redcorner" @@ -13983,8 +11584,6 @@ pixel_x = 0; pixel_y = -28 }, -/obj/item/decorations/sticky_decorations/flammable/snowman, -/obj/structure/snow, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "redcorner" @@ -13997,7 +11596,6 @@ icon_state = "1-2"; tag = "" }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "redcorner" @@ -14011,7 +11609,6 @@ pixel_y = 0; tag = "" }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "redcorner" @@ -14026,7 +11623,6 @@ icon_state = "1-2"; pixel_y = 0 }, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/security/processing) "axU" = ( @@ -14050,7 +11646,6 @@ pixel_y = 0; tag = "" }, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/security/processing) "axV" = ( @@ -14131,20 +11726,6 @@ /turf/simulated/floor/plating, /area/maintenance/fsmaint) "ayh" = ( -/obj/machinery/door/airlock/shuttle{ - id_tag = "s_docking_airlock"; - name = "Labor Shuttle Airlock"; - req_access_txt = "0" - }, -/obj/docking_port/mobile{ - dir = 8; - dwidth = 2; - height = 5; - id = "laborcamp"; - name = "labor camp shuttle"; - rebuildable = 1; - width = 9 - }, /obj/docking_port/stationary{ dir = 8; dwidth = 2; @@ -14153,9 +11734,8 @@ name = "fore bay 1"; width = 9 }, -/obj/structure/fans/tiny, -/turf/simulated/shuttle/floor, -/area/shuttle/siberia) +/turf/space, +/area/space) "ayi" = ( /obj/structure/lattice, /obj/structure/grille/broken, @@ -14168,21 +11748,6 @@ icon_state = "redcorner" }, /area/security/lobby) -"ayk" = ( -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate_sit) -"ayl" = ( -/obj/effect/decal/remains/human, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate_sit) -"aym" = ( -/obj/structure/closet/crate, -/turf/simulated/shuttle/floor, -/area/shuttle/siberia) "ayn" = ( /obj/structure/disposalpipe/segment, /obj/machinery/door_timer/cell_5{ @@ -14191,12 +11756,8 @@ pixel_x = 32; pixel_y = 0 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 2; @@ -14221,10 +11782,6 @@ /obj/item/taperecorder{ pixel_y = 0 }, -/obj/structure/snow{ - dir = 10; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel, /area/security/processing) "ayr" = ( @@ -14234,28 +11791,6 @@ }, /area/security/prison/cell_block/A) "ays" = ( -/obj/machinery/door/airlock/external{ - id_tag = "s_docking_airlock"; - name = "Shuttle Airlock"; - req_access_txt = "150" - }, -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "open"; - id_tag = "syndicate_sit_1"; - name = "Side Hull Door"; - opacity = 0; - req_access_txt = "150" - }, -/obj/docking_port/mobile{ - dir = 8; - dwidth = 3; - height = 5; - id = "sit"; - name = "SIT shuttle"; - roundstart_move = "sit_away"; - width = 11 - }, /obj/docking_port/stationary{ dir = 8; dwidth = 3; @@ -14264,16 +11799,8 @@ name = "Cyberiad Arrivals"; width = 11 }, -/obj/structure/fans/tiny, -/obj/machinery/door_control{ - id = "syndicate_sit_1"; - name = "Blast Doors"; - pixel_x = 0; - pixel_y = -23; - req_access_txt = "150" - }, -/turf/simulated/shuttle/plating, -/area/shuttle/syndicate_sit) +/turf/space, +/area/space) "ayt" = ( /obj/structure/table, /obj/item/storage/box/evidence, @@ -14291,12 +11818,8 @@ /turf/simulated/floor/plasteel, /area/security/permabrig) "ayv" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /obj/item/radio/intercom{ frequency = 1459; @@ -14374,7 +11897,6 @@ }, /obj/item/pen/multi, /obj/item/reagent_containers/food/drinks/flask/detflask, -/obj/structure/snow, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -14480,7 +12002,6 @@ pixel_y = 0 }, /obj/machinery/vending/coffee/free, -/obj/structure/snow, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "cult"; @@ -14488,11 +12009,7 @@ }, /area/lawoffice) "ayI" = ( -/obj/structure/chair/comfy/red, -/obj/structure/snow{ - dir = 10; - icon_state = "snow_corner" - }, +/obj/structure/chair/comfy/brown, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "cult"; @@ -14646,12 +12163,8 @@ icon_state = "4-8"; pixel_y = 0 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "bcarpet05" @@ -14735,8 +12248,6 @@ }, /area/security/prison/cell_block/A) "ayV" = ( -/obj/item/decorations/sticky_decorations/flammable/snowman, -/obj/structure/snow, /turf/simulated/floor/carpet, /area/security/detectives_office) "ayW" = ( @@ -14745,10 +12256,6 @@ dir = 4; pixel_x = 24 }, -/obj/structure/snow{ - dir = 1; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkredcorners" @@ -14787,10 +12294,6 @@ /area/security/processing) "ayZ" = ( /obj/machinery/computer/shuttle/labor, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, /turf/simulated/floor/plasteel, /area/security/prisonershuttle) "aza" = ( @@ -14837,75 +12340,10 @@ icon_state = "1-2"; pixel_y = 0 }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/security/interrogation) -"aze" = ( -/obj/machinery/light/spot{ - dir = 8; - icon_state = "tube1"; - tag = "icon-tube1 (WEST)" - }, -/obj/structure/chair/comfy/shuttle{ - dir = 4 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate_elite) -"azf" = ( -/obj/machinery/light/spot{ - dir = 8; - icon_state = "tube1"; - tag = "icon-tube1 (WEST)" - }, -/obj/structure/window/reinforced, -/obj/structure/chair/comfy/shuttle{ - dir = 4 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate_sit) -"azg" = ( -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate_elite) -"azh" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 8 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate_elite) -"azi" = ( -/obj/machinery/door/window/brigdoor{ - dir = 2; - name = "Cell Door"; - req_access_txt = "150" - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate_sit) -"azj" = ( -/obj/structure/window/reinforced, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate_sit) -"azk" = ( -/obj/structure/shuttle/engine/heater, -/obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 - }, -/turf/simulated/shuttle/plating, -/area/shuttle/siberia) "azl" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ dir = 8 @@ -14917,7 +12355,7 @@ dir = 1 }, /obj/item/clothing/suit/fire/firefighter, -/obj/item/tank/oxygen, +/obj/item/tank/internals/oxygen, /obj/item/clothing/mask/gas, /obj/item/extinguisher, /obj/item/clothing/head/hardhat/red, @@ -15104,7 +12542,6 @@ icon_state = "4-8"; tag = "" }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "cult"; @@ -15122,10 +12559,6 @@ d2 = 4; icon_state = "0-4" }, -/obj/structure/snow{ - dir = 5; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "cult"; @@ -15138,10 +12571,6 @@ d2 = 8; icon_state = "2-8" }, -/obj/structure/snow{ - dir = 1; - icon_state = "snow_surround" - }, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "cult"; @@ -15419,10 +12848,6 @@ pixel_y = 0 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/snow{ - dir = 1; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -15459,13 +12884,6 @@ /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/maintenance/auxsolarport) -"aAe" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall_f5" - }, -/area/shuttle/siberia) "aAf" = ( /turf/simulated/wall, /area/maintenance/abandonedbar) @@ -15473,31 +12891,6 @@ /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/maintenance/abandonedbar) -"aAh" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 4 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate_elite) -"aAi" = ( -/obj/machinery/computer/camera_advanced/shuttle_docker/ert, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/specops) -"aAj" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall_f9" - }, -/area/shuttle/siberia) -"aAk" = ( -/obj/structure/shuttle/engine/propulsion, -/turf/simulated/shuttle/plating, -/area/shuttle/siberia) "aAl" = ( /obj/machinery/door/airlock/external{ frequency = 1379; @@ -15549,6 +12942,11 @@ icon_state = "bcarpet05" }, /area/security/permabrig) +"aAr" = ( +/turf/simulated/floor/plasteel{ + icon_state = "bcarpet05" + }, +/area/security/permabrig) "aAs" = ( /obj/structure/cable{ d1 = 1; @@ -15626,15 +13024,11 @@ /area/security/lobby) "aAA" = ( /obj/machinery/power/treadmill{ - dir = 4 + dir = 8 }, /obj/structure/cable/yellow, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /obj/machinery/treadmill_monitor{ id = "Cell 5"; @@ -15649,12 +13043,8 @@ dir = 8; pixel_x = -24 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -15673,13 +13063,6 @@ /area/security/interrogation) "aAD" = ( /obj/structure/closet/lawcloset, -/obj/item/decorations/sticky_decorations/flammable/christmas_stocking{ - pixel_y = -16 - }, -/obj/structure/snow{ - dir = 1; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "cult"; @@ -15722,9 +13105,6 @@ }, /area/lawoffice) "aAF" = ( -/obj/structure/snow{ - icon_state = "snow_surround" - }, /turf/simulated/floor/plasteel, /area/security/processing) "aAG" = ( @@ -15734,10 +13114,6 @@ /obj/effect/landmark/start{ name = "Internal Affairs Agent" }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/red{ - pixel_y = 19 - }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "cult"; @@ -15750,10 +13126,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/snow{ - dir = 4; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "cult"; @@ -15828,9 +13200,6 @@ pixel_x = 28; pixel_y = 5 }, -/obj/structure/snow{ - icon_state = "snow_corner" - }, /turf/simulated/floor/carpet, /area/magistrateoffice) "aAO" = ( @@ -15865,12 +13234,8 @@ /turf/simulated/floor/plating, /area/maintenance/fsmaint) "aAR" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -16091,14 +13456,6 @@ /obj/item/trash/candle, /turf/simulated/floor/plating, /area/maintenance/abandonedbar) -"aBk" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 4 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate_sit) "aBm" = ( /obj/item/stack/rods, /turf/space, @@ -16223,12 +13580,6 @@ }, /turf/simulated/floor/plating, /area/security/prisonershuttle) -"aBD" = ( -/obj/machinery/portable_atmospherics/canister/oxygen, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate_elite) "aBE" = ( /obj/effect/spawner/window/reinforced, /obj/machinery/atmospherics/pipe/simple/hidden{ @@ -16267,30 +13618,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/auxsolarport) -"aBG" = ( -/obj/machinery/door/airlock/external{ - id_tag = "s_docking_airlock"; - name = "Shuttle Airlock"; - req_access_txt = "150" - }, -/obj/machinery/door_control{ - id = "syndicate_sit_1"; - name = "Blast Doors"; - pixel_x = -25; - pixel_y = 0; - req_access_txt = "150" - }, -/obj/structure/fans/tiny, -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "open"; - id_tag = "syndicate_sit_1"; - name = "Front Hull Door"; - opacity = 0; - req_access_txt = "150" - }, -/turf/simulated/shuttle/plating, -/area/shuttle/syndicate_sit) "aBH" = ( /obj/item/soap, /obj/machinery/light/small{ @@ -16500,10 +13827,6 @@ pixel_x = -25; pixel_y = 0 }, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "cult"; @@ -16533,17 +13856,12 @@ /obj/structure/table/reinforced, /obj/item/book/manual/security_space_law, /obj/item/pen/multi/gold, -/obj/structure/snow, /turf/simulated/floor/carpet, /area/magistrateoffice) "aCj" = ( /obj/structure/table/reinforced, /obj/item/stamp/magistrate, /obj/item/paper_bin/nanotrasen, -/obj/structure/snow{ - dir = 6; - icon_state = "snow_corner" - }, /turf/simulated/floor/carpet, /area/magistrateoffice) "aCk" = ( @@ -16560,10 +13878,6 @@ /area/magistrateoffice) "aCl" = ( /obj/structure/closet/secure_closet/magistrate, -/obj/item/decorations/sticky_decorations/flammable/christmas_stocking{ - pixel_y = 17 - }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "cult"; @@ -16577,14 +13891,9 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, -/obj/structure/snow, /turf/simulated/floor/carpet, /area/magistrateoffice) "aCn" = ( @@ -16594,7 +13903,6 @@ icon_state = "2-8" }, /obj/machinery/atmospherics/unary/vent_pump/on, -/obj/structure/snow, /turf/simulated/floor/carpet, /area/magistrateoffice) "aCo" = ( @@ -16634,7 +13942,7 @@ /area/security/prison/cell_block/A) "aCr" = ( /obj/machinery/power/treadmill{ - dir = 4 + dir = 8 }, /obj/machinery/treadmill_monitor{ id = "Cell 4"; @@ -16686,11 +13994,6 @@ pixel_y = 0; tag = "" }, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "green" @@ -16698,12 +14001,8 @@ /area/bridge) "aCv" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -16758,28 +14057,6 @@ /turf/simulated/floor/plating, /area/maintenance/fsmaint) "aCB" = ( -/obj/machinery/door/airlock/external{ - id_tag = "s_docking_airlock"; - name = "Shuttle Airlock"; - req_access_txt = "150" - }, -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "open"; - id_tag = "syndicate_elite"; - name = "Side Hull Door"; - opacity = 0; - req_access_txt = "150" - }, -/obj/docking_port/mobile{ - dir = 4; - dwidth = 7; - height = 5; - id = "sst"; - name = "SST shuttle"; - roundstart_move = "sst_away"; - width = 11 - }, /obj/docking_port/stationary{ dir = 4; dwidth = 7; @@ -16788,9 +14065,8 @@ name = "Near Cyberiad Arrivals"; width = 11 }, -/obj/structure/fans/tiny, -/turf/simulated/shuttle/plating, -/area/shuttle/syndicate_elite) +/turf/space, +/area/space) "aCC" = ( /obj/effect/spawner/window/reinforced, /obj/machinery/atmospherics/pipe/simple/hidden, @@ -16941,16 +14217,6 @@ icon_state = "wood-broken" }, /area/maintenance/abandonedbar) -"aCT" = ( -/obj/machinery/light/spot{ - dir = 8; - icon_state = "tube1"; - tag = "icon-tube1 (WEST)" - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate_elite) "aCU" = ( /obj/item/stack/sheet/mineral/plasma{ amount = 10 @@ -16980,22 +14246,6 @@ /obj/item/storage/fancy/cigarettes/cigpack_shadyjims, /turf/simulated/floor/plating, /area/maintenance/abandonedbar) -"aCX" = ( -/obj/structure/chair/comfy/shuttle, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate_elite) -"aCY" = ( -/obj/machinery/light/spot{ - dir = 8; - icon_state = "tube1"; - tag = "icon-tube1 (WEST)" - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate_sit) "aCZ" = ( /obj/structure/disposalpipe/segment, /obj/machinery/light{ @@ -17097,12 +14347,6 @@ /obj/structure/chair/office/dark{ dir = 1 }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/red{ - pixel_y = 19 - }, -/obj/structure/snow{ - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "cult"; @@ -17120,10 +14364,6 @@ /obj/structure/chair/comfy/black{ dir = 1 }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/red{ - pixel_y = 19 - }, -/obj/structure/snow, /turf/simulated/floor/carpet, /area/magistrateoffice) "aDk" = ( @@ -17254,10 +14494,6 @@ d2 = 4; icon_state = "0-4" }, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, /turf/simulated/floor/plating, /area/maintenance/auxsolarport) "aDv" = ( @@ -17454,7 +14690,6 @@ d2 = 4; icon_state = "2-4" }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "cult"; @@ -17485,9 +14720,6 @@ icon_state = "4-8"; tag = "" }, -/obj/structure/snow{ - icon_state = "snow_surround" - }, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "cult"; @@ -17550,27 +14782,10 @@ icon_state = "4-8"; tag = "" }, -/obj/structure/snow, /turf/simulated/floor/carpet, /area/magistrateoffice) -"aEe" = ( -/obj/machinery/computer/shuttle/sst, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate_elite) -"aEf" = ( -/obj/structure/table, -/obj/item/stack/sheet/metal, -/obj/item/clothing/glasses/welding, -/obj/item/weldingtool, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate_sit) "aEg" = ( /obj/structure/filingcabinet, -/obj/structure/snow, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "cult"; @@ -17604,14 +14819,9 @@ /turf/simulated/wall, /area/hallway/primary/fore) "aEk" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, -/obj/structure/snow, /turf/simulated/floor/carpet, /area/security/detectives_office) "aEl" = ( @@ -17640,9 +14850,6 @@ pixel_x = 25; pixel_y = 25 }, -/obj/structure/snow{ - icon_state = "snow_corner" - }, /turf/simulated/floor/carpet, /area/security/detectives_office) "aEo" = ( @@ -17807,37 +15014,10 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/obj/structure/snow{ - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, /area/security/detectives_office) -"aEB" = ( -/obj/machinery/door/airlock/external{ - id_tag = "s_docking_airlock"; - name = "Shuttle Airlock"; - req_access_txt = "150" - }, -/obj/machinery/door_control{ - id = "syndicate_elite"; - name = "Blast Doors"; - pixel_x = -25; - pixel_y = 0; - req_access_txt = "150" - }, -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "open"; - id_tag = "syndicate_elite"; - name = "Front Hull Door"; - opacity = 0; - req_access_txt = "150" - }, -/obj/structure/fans/tiny, -/turf/simulated/shuttle/plating, -/area/shuttle/syndicate_elite) "aEC" = ( /obj/structure/chair/stool, /turf/simulated/floor/plating, @@ -18053,24 +15233,6 @@ "aFd" = ( /turf/simulated/wall/r_wall, /area/maintenance/abandonedbar) -"aFe" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - icon_state = "diagonalWall3" - }, -/area/shuttle/syndicate_elite) -"aFf" = ( -/turf/simulated/shuttle/wall{ - icon_state = "wall3" - }, -/area/shuttle/syndicate_elite) -"aFg" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 4; - icon_state = "diagonalWall3" - }, -/area/shuttle/syndicate_elite) "aFh" = ( /obj/machinery/light{ dir = 8; @@ -18082,11 +15244,6 @@ tag = "icon-stage_stairs" }, /area/crew_quarters/courtroom) -"aFi" = ( -/turf/simulated/shuttle/wall{ - icon_state = "wall3" - }, -/area/shuttle/syndicate_sit) "aFj" = ( /obj/machinery/light{ dir = 4; @@ -18098,12 +15255,6 @@ tag = "icon-stage_stairs" }, /area/crew_quarters/courtroom) -"aFk" = ( -/obj/machinery/computer/shuttle/sit, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate_sit) "aFl" = ( /obj/structure/cable{ d1 = 1; @@ -18126,7 +15277,6 @@ pixel_y = -24 }, /obj/structure/cable, -/obj/structure/snow, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "cult"; @@ -18148,7 +15298,6 @@ dir = 1; pixel_y = -24 }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "cult"; @@ -18166,7 +15315,6 @@ dir = 5; level = 1 }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "cult"; @@ -18182,7 +15330,6 @@ pixel_x = -3; pixel_y = 7 }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "cult"; @@ -18203,7 +15350,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "cult"; @@ -18214,7 +15360,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "cult"; @@ -18233,7 +15378,6 @@ /obj/machinery/newscaster{ pixel_y = -32 }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "cult"; @@ -18241,12 +15385,8 @@ }, /area/magistrateoffice) "aFu" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 2; @@ -18327,7 +15467,6 @@ /obj/structure/table/wood, /obj/item/book/manual/security_space_law, /obj/item/clothing/glasses/sunglasses, -/obj/structure/snow, /turf/simulated/floor/carpet, /area/security/detectives_office) "aFC" = ( @@ -18341,10 +15480,6 @@ d2 = 8; icon_state = "2-8" }, -/obj/structure/snow{ - dir = 6; - icon_state = "snow_corner" - }, /turf/simulated/floor/carpet, /area/security/detectives_office) "aFD" = ( @@ -18359,10 +15494,6 @@ /obj/item/radio/intercom/department/security{ pixel_x = 28 }, -/obj/structure/snow{ - dir = 8; - icon_state = "snow_corner" - }, /turf/simulated/floor/carpet, /area/security/detectives_office) "aFE" = ( @@ -18574,22 +15705,6 @@ /obj/effect/spawner/lootdrop/maintenance, /turf/simulated/floor/plating, /area/maintenance/fpmaint) -"aGf" = ( -/turf/simulated/floor/plating/airless, -/area/shuttle/syndicate_elite) -"aGg" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - icon_state = "diagonalWall3" - }, -/area/shuttle/syndicate_sit) -"aGh" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 4; - icon_state = "diagonalWall3" - }, -/area/shuttle/syndicate_sit) "aGi" = ( /obj/effect/spawner/random_spawners/wall_rusted_maybe, /turf/simulated/wall, @@ -18668,6 +15783,14 @@ icon_state = "red" }, /area/crew_quarters/courtroom) +"aGt" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/wood, +/area/crew_quarters/courtroom) "aGu" = ( /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/wood, @@ -18694,10 +15817,6 @@ icon_state = "4-8"; tag = "" }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/red{ - pixel_y = 19 - }, -/obj/structure/snow, /turf/simulated/floor/carpet, /area/security/detectives_office) "aGz" = ( @@ -18717,7 +15836,6 @@ d2 = 4; icon_state = "2-4" }, -/obj/structure/snow, /turf/simulated/floor/carpet, /area/security/detectives_office) "aGA" = ( @@ -18743,13 +15861,6 @@ icon_state = "4-8"; tag = "" }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/red{ - pixel_y = 19 - }, -/obj/structure/snow{ - dir = 10; - icon_state = "snow_corner" - }, /turf/simulated/floor/carpet, /area/security/detectives_office) "aGC" = ( @@ -18781,20 +15892,12 @@ pixel_x = 0; pixel_y = 32 }, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, /area/security/detectives_office) "aGF" = ( /obj/machinery/computer/secure_data, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -18896,6 +15999,9 @@ /turf/simulated/floor/carpet/arcade, /area/crew_quarters/arcade) "aGP" = ( +/obj/structure/chair/comfy/black{ + dir = 4 + }, /obj/machinery/camera{ c_tag = "Arcade"; dir = 2; @@ -18905,9 +16011,6 @@ dir = 2; pixel_y = 24 }, -/obj/structure/chair/comfy/red{ - dir = 4 - }, /turf/simulated/floor/carpet/arcade, /area/crew_quarters/arcade) "aGQ" = ( @@ -18917,7 +16020,7 @@ /turf/simulated/floor/carpet/arcade, /area/crew_quarters/arcade) "aGR" = ( -/obj/structure/chair/comfy/green{ +/obj/structure/chair/comfy/black{ dir = 8 }, /turf/simulated/floor/carpet/arcade, @@ -18971,10 +16074,6 @@ pixel_x = 0; pixel_y = 32 }, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, /turf/simulated/floor/plating, /area/maintenance/auxsolarstarboard) "aGV" = ( @@ -19030,7 +16129,7 @@ /area/maintenance/fsmaint2) "aHc" = ( /obj/structure/rack, -/obj/item/tank/emergency_oxygen/engi, +/obj/item/tank/internals/emergency_oxygen/engi, /turf/simulated/floor/plating, /area/maintenance/fsmaint2) "aHd" = ( @@ -19108,14 +16207,9 @@ /turf/simulated/wall, /area/maintenance/fpmaint2) "aHo" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, -/obj/structure/snow, /turf/simulated/floor/carpet, /area/crew_quarters/courtroom) "aHp" = ( @@ -19193,10 +16287,6 @@ pixel_x = 0 }, /obj/structure/window/reinforced, -/obj/structure/snow{ - dir = 4; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "redcorner" @@ -19371,7 +16461,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/snow, /turf/simulated/floor/carpet, /area/security/detectives_office) "aHX" = ( @@ -19379,10 +16468,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/snow{ - dir = 10; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -19409,12 +16494,8 @@ }, /area/security/detectives_office) "aIa" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /turf/simulated/floor/carpet/arcade, /area/crew_quarters/arcade) @@ -19547,6 +16628,7 @@ /turf/simulated/wall, /area/lawoffice) "aIp" = ( +/obj/structure/chair/comfy/black, /obj/effect/landmark/start{ name = "Civilian" }, @@ -19558,7 +16640,6 @@ icon_state = "alarm0"; pixel_x = -22 }, -/obj/structure/chair/comfy/green, /turf/simulated/floor/carpet/arcade, /area/crew_quarters/arcade) "aIq" = ( @@ -19616,7 +16697,7 @@ /area/crew_quarters/arcade) "aIv" = ( /obj/structure/rack, -/obj/item/tank/air, +/obj/item/tank/internals/air, /turf/simulated/floor/plating, /area/maintenance/fsmaint2) "aIw" = ( @@ -19778,9 +16859,6 @@ /area/hallway/primary/fore) "aIP" = ( /obj/structure/closet/secure_closet/clown, -/obj/item/decorations/sticky_decorations/flammable/christmas_stocking{ - pixel_x = -17 - }, /turf/simulated/floor/wood, /area/clownoffice) "aIQ" = ( @@ -19831,10 +16909,6 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/structure/snow{ - dir = 10; - icon_state = "snow_corner" - }, /turf/simulated/floor/carpet, /area/crew_quarters/courtroom) "aIY" = ( @@ -19850,7 +16924,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/snow, /turf/simulated/floor/carpet, /area/crew_quarters/courtroom) "aJa" = ( @@ -19941,7 +17014,6 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/obj/structure/snow, /turf/simulated/floor/carpet, /area/crew_quarters/courtroom) "aJj" = ( @@ -19971,7 +17043,6 @@ icon_state = "1-8"; tag = "" }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -19981,7 +17052,6 @@ /obj/machinery/light_switch{ pixel_y = -25 }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -20005,7 +17075,6 @@ pixel_x = 0; pixel_y = -30 }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -20016,11 +17085,6 @@ icon_state = "alarm0"; pixel_y = -22 }, -/obj/structure/snow, -/obj/item/gift, -/obj/item/toy/figure/detective, -/obj/item/gun/projectile/revolver/capgun, -/obj/item/lighter/zippo/engraved, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -20217,12 +17281,8 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel, /area/crew_quarters/courtroom) @@ -20249,38 +17309,15 @@ /turf/simulated/floor/plating, /area/maintenance/fpmaint) "aJP" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall_f6" - }, -/area/shuttle/pod_1) -"aJQ" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall_f10" - }, +/turf/simulated/wall/mineral/titanium, /area/shuttle/pod_1) "aJR" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall_f6" - }, +/turf/simulated/wall/mineral/titanium, /area/shuttle/pod_2) "aJS" = ( -/obj/structure/window/full/shuttle, -/obj/structure/grille, -/turf/simulated/shuttle/plating, +/obj/effect/spawner/window/shuttle, +/turf/simulated/floor/plating, /area/shuttle/pod_1) -"aJT" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall_f10" - }, -/area/shuttle/pod_2) "aJU" = ( /obj/machinery/meter, /obj/structure/cable{ @@ -20294,9 +17331,8 @@ /turf/simulated/floor/plating, /area/maintenance/fpmaint2) "aJV" = ( -/obj/structure/window/full/shuttle, -/obj/structure/grille, -/turf/simulated/shuttle/plating, +/obj/effect/spawner/window/shuttle, +/turf/simulated/floor/plating, /area/shuttle/pod_2) "aJW" = ( /turf/simulated/floor/wood{ @@ -20399,21 +17435,15 @@ pixel_x = -32; pixel_y = 0 }, -/obj/structure/snow{ - dir = 6; - icon_state = "snow_corner" - }, /turf/simulated/floor/carpet, /area/crew_quarters/courtroom) "aKk" = ( /obj/structure/table/wood, /obj/item/folder/blue, /obj/item/megaphone, -/obj/structure/snow, /turf/simulated/floor/carpet, /area/crew_quarters/courtroom) "aKl" = ( -/obj/structure/snow, /turf/simulated/floor/carpet, /area/crew_quarters/courtroom) "aKm" = ( @@ -20435,10 +17465,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/snow{ - dir = 10; - icon_state = "snow_corner" - }, /turf/simulated/floor/carpet, /area/crew_quarters/courtroom) "aKr" = ( @@ -20488,10 +17514,6 @@ /area/crew_quarters/courtroom) "aKw" = ( /obj/structure/filingcabinet/chestdrawer, -/obj/item/decorations/sticky_decorations/flammable/tinsel/red{ - pixel_y = 19 - }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "cult"; @@ -20512,7 +17534,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "cult"; @@ -20554,9 +17575,6 @@ /obj/structure/closet/secure_closet/detective, /obj/item/restraints/handcuffs, /obj/item/flash, -/obj/item/decorations/sticky_decorations/flammable/christmas_stocking{ - pixel_y = -16 - }, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -20634,7 +17652,7 @@ /turf/simulated/floor/plating, /area/maintenance/fsmaint) "aKI" = ( -/obj/structure/chair/comfy/red{ +/obj/structure/chair/comfy/black{ dir = 1 }, /turf/simulated/floor/carpet/arcade, @@ -20772,12 +17790,6 @@ /obj/item/coin/iron, /turf/simulated/floor/plating, /area/maintenance/fsmaint2) -"aLa" = ( -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall3" - }, -/area/shuttle/pod_1) "aLb" = ( /obj/machinery/status_display{ density = 0; @@ -20792,7 +17804,7 @@ /obj/structure/chair/comfy/shuttle{ dir = 1 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/pod_1) "aLc" = ( /obj/structure/closet, @@ -20802,12 +17814,6 @@ "aLd" = ( /turf/simulated/wall/r_wall, /area/hallway/secondary/entry) -"aLe" = ( -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall3" - }, -/area/shuttle/pod_2) "aLf" = ( /obj/machinery/status_display{ density = 0; @@ -20822,7 +17828,7 @@ /obj/structure/chair/comfy/shuttle{ dir = 1 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/pod_2) "aLg" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -20840,7 +17846,6 @@ req_access = null; req_access_txt = "4" }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -21052,8 +18057,16 @@ /turf/simulated/floor/plating, /area/maintenance/fpmaint2) "aLz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden, -/turf/simulated/wall, +/obj/machinery/door/airlock/external{ + frequency = 1379; + icon_state = "door_locked"; + id_tag = "engineering_east_inner"; + locked = 1; + name = "Engineering External Access"; + req_access = null; + req_access_txt = "10;13" + }, +/turf/simulated/floor/plating, /area/engine/engineering) "aLA" = ( /turf/simulated/wall, @@ -21076,10 +18089,6 @@ /area/maintenance/fpmaint) "aLE" = ( /obj/machinery/hologram/holopad, -/obj/structure/snow{ - dir = 6; - icon_state = "snow_corner" - }, /turf/simulated/floor/carpet, /area/magistrateoffice) "aLF" = ( @@ -21145,14 +18154,12 @@ dir = 4; network = list("SS13") }, -/obj/structure/snow, /turf/simulated/floor/carpet, /area/crew_quarters/courtroom) "aLO" = ( /obj/structure/table/wood, /obj/item/gavelblock, /obj/item/gavelhammer, -/obj/structure/snow, /turf/simulated/floor/carpet, /area/crew_quarters/courtroom) "aLP" = ( @@ -21169,12 +18176,10 @@ pixel_y = 0; req_one_access_txt = "74;3" }, -/obj/structure/snow, /turf/simulated/floor/carpet, /area/crew_quarters/courtroom) "aLR" = ( /obj/machinery/hologram/holopad, -/obj/structure/snow, /turf/simulated/floor/carpet, /area/crew_quarters/courtroom) "aLS" = ( @@ -21182,7 +18187,6 @@ dir = 4; icon_state = "tube1" }, -/obj/structure/snow, /turf/simulated/floor/carpet, /area/crew_quarters/courtroom) "aLT" = ( @@ -21463,7 +18467,7 @@ /obj/structure/chair/comfy/shuttle{ dir = 1 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/pod_1) "aMq" = ( /turf/simulated/wall, @@ -21483,7 +18487,7 @@ /obj/structure/chair/comfy/shuttle{ dir = 1 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/pod_2) "aMu" = ( /obj/effect/spawner/window/reinforced, @@ -21627,12 +18631,13 @@ /turf/simulated/floor/plating, /area/maintenance/fsmaint2) "aMM" = ( -/obj/machinery/light/small{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 5; + tag = "icon-intact-y (NORTHWEST)" + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" }, -/obj/structure/closet/walllocker/emerglocker/north, -/obj/machinery/atmospherics/pipe/simple/hidden, -/turf/simulated/floor/plating, /area/engine/engineering) "aMN" = ( /obj/machinery/atmospherics/pipe/simple/visible/purple{ @@ -21728,10 +18733,6 @@ pixel_x = -32; pixel_y = 0 }, -/obj/structure/snow{ - dir = 5; - icon_state = "snow_corner" - }, /turf/simulated/floor/carpet, /area/crew_quarters/courtroom) "aNb" = ( @@ -21742,7 +18743,6 @@ /obj/item/reagent_containers/glass/beaker/waterbottle{ pixel_x = 5 }, -/obj/structure/snow, /turf/simulated/floor/carpet, /area/crew_quarters/courtroom) "aNc" = ( @@ -21767,7 +18767,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/snow, /turf/simulated/floor/carpet, /area/crew_quarters/courtroom) "aNf" = ( @@ -21839,7 +18838,6 @@ icon_state = "4-8"; tag = "" }, -/obj/structure/snow, /turf/simulated/floor/carpet, /area/crew_quarters/courtroom) "aNm" = ( @@ -21876,10 +18874,6 @@ d2 = 2; icon_state = "0-2" }, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, /turf/simulated/floor/bluegrid, /area/maintenance/electrical) "aNr" = ( @@ -21890,12 +18884,8 @@ /area/maintenance/electrical) "aNs" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plating, /area/maintenance/electrical) @@ -21904,11 +18894,11 @@ id = "pod1"; name = "escape pod 1" }, -/obj/machinery/door/airlock/shuttle{ +/obj/machinery/door/airlock/titanium{ id_tag = "s_docking_airlock"; name = "Escape Pod Hatch" }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/pod_1) "aNu" = ( /obj/effect/decal/warning_stripes/yellow/hollow, @@ -21931,11 +18921,11 @@ id = "pod2"; name = "escape pod 2" }, -/obj/machinery/door/airlock/shuttle{ +/obj/machinery/door/airlock/titanium{ id_tag = "s_docking_airlock"; name = "Escape Pod Hatch" }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/pod_2) "aNz" = ( /obj/machinery/access_button{ @@ -22068,12 +19058,8 @@ }, /area/hallway/primary/fore) "aNL" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /turf/simulated/floor/plasteel{ dir = 2; @@ -22179,12 +19165,8 @@ /area/maintenance/fsmaint) "aNV" = ( /obj/structure/chair/stool, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -22217,9 +19199,6 @@ /obj/structure/disposalpipe/trunk{ dir = 4 }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/green{ - pixel_y = 19 - }, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "barber" @@ -22349,9 +19328,6 @@ /area/maintenance/fsmaint2) "aOl" = ( /obj/effect/spawner/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 - }, /obj/machinery/door/poddoor{ density = 0; icon_state = "open"; @@ -22362,6 +19338,10 @@ /obj/machinery/atmospherics/pipe/simple/visible/cyan{ level = 2 }, +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 4; + level = 2 + }, /turf/simulated/floor/plating, /area/atmos) "aOm" = ( @@ -22414,6 +19394,15 @@ }, /turf/simulated/floor/plating, /area/maintenance/fpmaint) +"aOu" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + pixel_y = 0 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/courtroom) "aOv" = ( /obj/machinery/door/airlock/maintenance{ name = "Courtroom Maintenance"; @@ -22442,10 +19431,6 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/structure/snow{ - dir = 9; - icon_state = "snow_corner" - }, /turf/simulated/floor/carpet, /area/crew_quarters/courtroom) "aOx" = ( @@ -22460,7 +19445,6 @@ icon_state = "1-8"; tag = "" }, -/obj/structure/snow, /turf/simulated/floor/carpet, /area/crew_quarters/courtroom) "aOy" = ( @@ -22469,10 +19453,6 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/structure/snow{ - dir = 1; - icon_state = "snow_corner" - }, /turf/simulated/floor/carpet, /area/crew_quarters/courtroom) "aOz" = ( @@ -22597,10 +19577,6 @@ name = "Courtroom Privacy Shutters"; opacity = 0 }, -/obj/structure/snow{ - dir = 8; - icon_state = "snow_corner" - }, /turf/simulated/floor/wood, /area/crew_quarters/courtroom) "aOP" = ( @@ -22620,9 +19596,9 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/atmospherics/binary/volume_pump/on{ - dir = 8; - name = "Space Loop Out" +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 4; + level = 2 }, /turf/simulated/floor/plasteel, /area/atmos) @@ -22643,10 +19619,6 @@ /area/maintenance/fpmaint2) "aOV" = ( /obj/structure/computerframe, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, /turf/simulated/floor/plating, /area/maintenance/fpmaint2) "aOW" = ( @@ -22852,10 +19824,6 @@ d2 = 8; icon_state = "2-8" }, -/obj/structure/snow{ - dir = 8; - icon_state = "snow_corner" - }, /turf/simulated/floor/wood, /area/crew_quarters/courtroom) "aPz" = ( @@ -22865,7 +19833,6 @@ icon_state = "1-4"; tag = "90Curve" }, -/obj/structure/snow, /turf/simulated/floor/wood, /area/crew_quarters/courtroom) "aPA" = ( @@ -23092,12 +20059,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/maintenance/fsmaint) -"aPV" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 8 - }, -/turf/simulated/shuttle/floor, -/area/shuttle/trade/sol) "aPW" = ( /obj/structure/mirror{ icon_state = "mirror_broke"; @@ -23594,19 +20555,6 @@ /turf/simulated/floor/plating, /area/maintenance/electrical) "aQX" = ( -/obj/docking_port/mobile{ - dir = 8; - dwidth = 4; - height = 11; - id = "trade_sol"; - name = "sol trade shuttle"; - roundstart_move = "trade_sol_base"; - width = 9 - }, -/obj/machinery/door/airlock/shuttle/glass{ - id_tag = "s_docking_airlock"; - req_one_access_txt = "0" - }, /obj/docking_port/stationary{ dir = 8; dwidth = 4; @@ -23615,8 +20563,8 @@ name = "port bay 4 at Cyberiad"; width = 9 }, -/turf/simulated/shuttle/floor, -/area/shuttle/trade/sol) +/turf/space, +/area/space) "aQY" = ( /obj/structure/chair/stool, /turf/simulated/floor/plating, @@ -23625,12 +20573,8 @@ /obj/effect/landmark{ name = "JoinLateCryo" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /turf/simulated/floor/plasteel{ icon_state = "whitegreenfull"; @@ -23782,11 +20726,7 @@ /area/maintenance/fpmaint) "aRm" = ( /obj/structure/shuttle/engine/propulsion/burst, -/turf/simulated/floor/plating, -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall_f5" - }, +/turf/simulated/wall/mineral/titanium, /area/shuttle/pod_1) "aRn" = ( /obj/structure/cable{ @@ -23931,14 +20871,6 @@ icon_state = "bluecorner" }, /area/hallway/primary/starboard/west) -"aRz" = ( -/obj/structure/shuttle/engine/propulsion/burst, -/turf/simulated/floor/plating, -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall_f9" - }, -/area/shuttle/pod_1) "aRA" = ( /obj/structure/cable{ d1 = 1; @@ -24074,15 +21006,15 @@ d2 = 4; icon_state = "0-4" }, +/obj/structure/chair/comfy/brown{ + dir = 4 + }, /obj/machinery/power/apc{ dir = 1; name = "north bump"; pixel_x = 0; pixel_y = 24 }, -/obj/structure/chair/comfy/red{ - dir = 4 - }, /turf/simulated/floor/carpet, /area/crew_quarters/bar) "aRM" = ( @@ -24101,19 +21033,15 @@ dir = 2; pixel_y = 24 }, -/obj/structure/chair/comfy/green{ +/obj/structure/chair/comfy/brown{ dir = 8 }, /turf/simulated/floor/carpet, /area/crew_quarters/bar) "aRO" = ( /obj/effect/decal/warning_stripes/southwest, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry) @@ -24133,10 +21061,6 @@ /area/crew_quarters/courtroom) "aRR" = ( /obj/structure/reagent_dispensers/water_cooler, -/obj/structure/snow{ - dir = 1; - icon_state = "snow_corner" - }, /turf/simulated/floor/wood, /area/crew_quarters/courtroom) "aRS" = ( @@ -24162,11 +21086,7 @@ /area/hallway/secondary/entry) "aRV" = ( /obj/structure/shuttle/engine/propulsion/burst, -/turf/simulated/floor/plating, -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall_f5" - }, +/turf/simulated/wall/mineral/titanium, /area/shuttle/pod_2) "aRW" = ( /obj/machinery/light{ @@ -24187,14 +21107,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/maintenance/fsmaint2) -"aRY" = ( -/obj/structure/shuttle/engine/propulsion/burst, -/turf/simulated/floor/plating, -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall_f9" - }, -/area/shuttle/pod_2) "aRZ" = ( /obj/structure/table, /obj/machinery/cell_charger, @@ -24594,12 +21506,8 @@ /turf/simulated/floor/plasteel, /area/hallway/primary/fore) "aST" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -24614,7 +21522,7 @@ /turf/simulated/floor/plasteel, /area/hallway/primary/starboard/east) "aSW" = ( -/obj/structure/chair/comfy/green, +/obj/structure/chair/comfy/beige, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -24711,12 +21619,8 @@ /turf/simulated/floor/plating, /area/maintenance/fpmaint) "aTi" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -24780,12 +21684,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -24983,12 +21883,8 @@ }, /area/crew_quarters/dorms) "aTK" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 6; @@ -25065,12 +21961,8 @@ /area/ai_monitored/storage/eva) "aTQ" = ( /obj/effect/decal/warning_stripes/east, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -25086,7 +21978,10 @@ "aTS" = ( /obj/structure/disposalpipe/trunk, /obj/machinery/disposal, -/obj/structure/snow, +/obj/structure/extinguisher_cabinet{ + pixel_x = -5; + pixel_y = 30 + }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "whiteblue"; @@ -25094,8 +21989,7 @@ }, /area/medical/reception) "aTT" = ( -/obj/structure/table, -/obj/structure/snow, +/obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "whiteblue"; @@ -25103,10 +21997,11 @@ }, /area/medical/reception) "aTU" = ( +/obj/structure/table, +/obj/item/reagent_containers/food/drinks/britcup, /obj/machinery/newscaster{ pixel_y = 32 }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ icon_state = "whitebluefull"; tag = "icon-whitebluefull" @@ -25119,28 +22014,21 @@ /obj/item/radio/intercom/department/medbay{ pixel_y = 25 }, -/obj/structure/table, -/obj/item/storage/box/cups{ - pixel_x = 6; - pixel_y = 6 +/obj/structure/chair/comfy/teal{ + dir = 4 + }, +/obj/effect/landmark/start{ + name = "Civilian" }, -/obj/item/roller, -/obj/structure/snow, /turf/simulated/floor/plasteel{ icon_state = "whitebluefull"; tag = "icon-whitebluefull" }, /area/medical/reception) "aTW" = ( -/obj/structure/table, -/obj/item/reagent_containers/food/drinks/britcup, -/obj/machinery/vending/wallmed{ - name = "Emergency NanoMed"; - pixel_x = 0; - pixel_y = 28; - req_access_txt = "0" +/obj/structure/chair/comfy/teal{ + dir = 4 }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ icon_state = "whitebluefull"; tag = "icon-whitebluefull" @@ -25155,16 +22043,12 @@ /turf/simulated/floor/plating, /area/maintenance/fsmaint2) "aTY" = ( +/obj/structure/chair/comfy/teal{ + dir = 8 + }, /obj/machinery/alarm{ pixel_y = 25 }, -/obj/structure/chair/comfy/green{ - dir = 4 - }, -/obj/effect/landmark/start{ - name = "Civilian" - }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ icon_state = "whitebluefull"; tag = "icon-whitebluefull" @@ -25404,9 +22288,6 @@ icon_state = "2-4" }, /obj/machinery/atmospherics/unary/vent_pump/on, -/obj/item/decorations/sticky_decorations/flammable/tinsel/yellow{ - pixel_y = 19 - }, /turf/simulated/floor/wood, /area/clownoffice) "aUB" = ( @@ -25551,10 +22432,6 @@ }, /obj/structure/table, /obj/item/folder/white, -/obj/structure/snow{ - dir = 8; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel{ icon_state = "whitebluefull"; tag = "icon-whitebluefull" @@ -25579,12 +22456,6 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/item/gift, -/obj/structure/snow, -/obj/item/toy/figure/assistant, -/obj/item/toy/syndicateballoon, -/obj/item/toy/sword, -/obj/item/nanomob_card, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -25771,7 +22642,6 @@ }, /obj/structure/table/wood, /obj/item/instrument/eguitar, -/obj/structure/snow, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -25780,7 +22650,7 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/structure/snow, +/obj/structure/table/wood, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -25815,8 +22685,8 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/item/decorations/sticky_decorations/flammable/snowman, -/obj/structure/snow, +/obj/structure/table/wood, +/obj/item/instrument/piano_synth, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -26017,7 +22887,6 @@ /area/maintenance/fpmaint) "aVG" = ( /obj/machinery/vending/coffee, -/obj/structure/snow, /turf/simulated/floor/wood, /area/crew_quarters/bar) "aVH" = ( @@ -26157,12 +23026,6 @@ icon_state = "dark" }, /area/ai_monitored/storage/eva) -"aVS" = ( -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall12" - }, -/area/shuttle/arrival/station) "aVT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -26173,54 +23036,21 @@ /obj/machinery/light_switch{ pixel_y = -25 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/wood, /area/clownoffice) "aVV" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall_f6"; - tag = "icon-swall_f6" - }, -/area/shuttle/arrival/station) -"aVW" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall_f10"; - tag = "icon-swall_f10" - }, +/turf/simulated/wall/mineral/titanium, /area/shuttle/arrival/station) "aVX" = ( -/obj/machinery/door/unpowered/shuttle, -/turf/simulated/shuttle/floor, +/obj/machinery/door/airlock/titanium, +/turf/simulated/floor/plating, /area/shuttle/arrival/station) "aVY" = ( -/obj/structure/window/full/shuttle{ - icon_state = "window4" - }, -/obj/structure/grille, -/turf/simulated/shuttle/plating, -/area/shuttle/arrival/station) -"aVZ" = ( -/obj/structure/window/full/shuttle{ - icon_state = "window8" - }, -/obj/structure/grille, -/turf/simulated/shuttle/plating, -/area/shuttle/arrival/station) -"aWa" = ( -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall14" - }, +/obj/effect/spawner/window/shuttle, +/turf/simulated/floor/plating, /area/shuttle/arrival/station) "aWb" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -26284,10 +23114,6 @@ /obj/machinery/computer/security{ network = list("SS13","Research Outpost","Mining Outpost") }, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "red" @@ -26314,10 +23140,6 @@ name = "Security Requests Console"; pixel_y = 30 }, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "red" @@ -26693,13 +23515,16 @@ }, /turf/simulated/floor/plasteel, /area/medical/chemistry) +"aWT" = ( +/turf/simulated/floor/plasteel{ + icon_state = "vault"; + tag = "icon-vault" + }, +/area/crew_quarters/dorms) "aWU" = ( /obj/structure/window/reinforced{ dir = 8 }, -/obj/structure/table/wood, -/obj/item/instrument/piano_synth, -/obj/structure/snow, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -26714,7 +23539,6 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -26904,26 +23728,16 @@ /obj/structure/fans/tiny, /turf/simulated/floor/plating, /area/chapel/main) -"aXm" = ( -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall11" - }, -/area/shuttle/arrival/station) "aXn" = ( /obj/structure/shuttle/engine/propulsion{ dir = 4; icon_state = "burst_r" }, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/shuttle/arrival/station) "aXo" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 2; @@ -26931,12 +23745,6 @@ tag = "icon-cult" }, /area/chapel/office) -"aXp" = ( -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall7" - }, -/area/shuttle/arrival/station) "aXq" = ( /obj/structure/cable{ d2 = 2; @@ -26960,46 +23768,46 @@ name = "HONKsquad" }, /obj/structure/closet/walllocker/emerglocker/north, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) "aXs" = ( -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) "aXt" = ( /obj/machinery/computer/arcade, /obj/machinery/light{ dir = 1 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) "aXu" = ( /obj/structure/closet/wardrobe/black, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) "aXv" = ( /obj/structure/closet/wardrobe/xenos, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) "aXw" = ( /obj/structure/closet/wardrobe/mixed, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) "aXx" = ( /obj/structure/closet/wardrobe/grey, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) "aXy" = ( /obj/structure/closet/walllocker/emerglocker/north, /obj/machinery/light{ dir = 1 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) "aXz" = ( /obj/effect/landmark{ name = "HONKsquad" }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) "aXA" = ( /obj/structure/cable{ @@ -27007,12 +23815,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -27069,12 +23873,8 @@ icon_state = "1-4"; tag = "" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel, /area/hallway/secondary/construction{ @@ -27137,9 +23937,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/red{ - pixel_y = 19 - }, /turf/simulated/floor/plasteel, /area/storage/primary) "aXN" = ( @@ -27315,7 +24112,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/spawner/lootdrop/maintenance, -/obj/item/tank/emergency_oxygen, +/obj/item/tank/internals/emergency_oxygen, /turf/simulated/floor/plating, /area/maintenance/fpmaint) "aYc" = ( @@ -27345,18 +24142,12 @@ /area/crew_quarters/bar) "aYf" = ( /obj/machinery/computer/card, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "green" }, /area/bridge) "aYg" = ( -/obj/structure/snow, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "greencorner" @@ -27386,15 +24177,8 @@ /turf/simulated/floor/plasteel, /area/storage/primary) "aYj" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 - }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/green{ - pixel_y = 19 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel, /area/storage/primary) @@ -27454,15 +24238,8 @@ }, /area/security/armoury) "aYn" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 - }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/green{ - pixel_y = 19 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /turf/simulated/floor/plasteel, /area/storage/office) @@ -27502,9 +24279,6 @@ /obj/structure/closet/wardrobe/coroner, /obj/item/reagent_containers/glass/bottle/reagent/formaldehyde, /obj/item/reagent_containers/dropper, -/obj/item/decorations/sticky_decorations/flammable/christmas_stocking{ - pixel_y = 17 - }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -27545,9 +24319,6 @@ /obj/item/storage/fancy/cigarettes, /obj/item/lighter/zippo, /obj/item/pen/multi, -/obj/item/enginepicker{ - layer = 3.1 - }, /obj/item/paper_bin/nanotrasen, /obj/item/paper/tcommskey, /turf/simulated/floor/plasteel{ @@ -27658,13 +24429,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/hallway/primary/fore) -"aYD" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall_f6" - }, -/area/shuttle/escape) "aYE" = ( /obj/machinery/door/firedoor, /turf/simulated/floor/plasteel{ @@ -27686,13 +24450,6 @@ icon_state = "dark" }, /area/chapel/main) -"aYH" = ( -/obj/machinery/computer/crew, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "darkblue" - }, -/area/shuttle/escape) "aYI" = ( /obj/machinery/computer/cryopod{ density = 0; @@ -27742,23 +24499,12 @@ dir = 1; on = 1 }, -/obj/structure/chair/comfy/shuttle{ - dir = 8 - }, -/turf/simulated/shuttle/floor, +/obj/structure/chair/comfy/shuttle, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) "aYM" = ( -/turf/simulated/shuttle/floor, -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall_f9" - }, -/area/shuttle/arrival/station) -"aYN" = ( -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall3" - }, +/obj/structure/chair/comfy/shuttle, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) "aYO" = ( /obj/structure/disposalpipe/segment{ @@ -27791,13 +24537,8 @@ dir = 4; icon_state = "propulsion" }, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/shuttle/arrival/station) -"aYU" = ( -/obj/structure/grille, -/obj/structure/window/full/shuttle, -/turf/simulated/floor/plating, -/area/shuttle/escape) "aYV" = ( /obj/structure/shuttle/engine/heater{ dir = 4; @@ -27806,7 +24547,7 @@ /obj/structure/window/reinforced{ dir = 8 }, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/shuttle/arrival/station) "aYW" = ( /obj/structure/cable{ @@ -27862,7 +24603,7 @@ /obj/structure/chair/comfy/shuttle{ dir = 8 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium, /area/shuttle/arrival/station) "aZa" = ( /obj/structure/table/reinforced, @@ -27986,12 +24727,8 @@ }, /area/security/nuke_storage) "aZl" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 5; @@ -28075,9 +24812,6 @@ /area/crew_quarters/dorms) "aZu" = ( /obj/machinery/hologram/holopad, -/obj/item/decorations/sticky_decorations/flammable/tinsel/green{ - pixel_y = 19 - }, /turf/simulated/floor/carpet, /area/crew_quarters/dorms) "aZv" = ( @@ -28119,9 +24853,6 @@ /obj/structure/chair{ dir = 4 }, -/obj/effect/landmark/start{ - name = "Civilian" - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "arrival" @@ -28135,10 +24866,6 @@ /area/crew_quarters/dorms) "aZB" = ( /obj/machinery/computer/card/minor/ce, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -28152,6 +24879,9 @@ /area/crew_quarters/dorms) "aZD" = ( /obj/effect/decal/warning_stripes/white, +/obj/effect/landmark/start{ + name = "Civilian" + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -28177,10 +24907,6 @@ }, /area/chapel/main) "aZG" = ( -/obj/structure/snow{ - dir = 1; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -28308,6 +25034,10 @@ icon_state = "dark" }, /area/medical/morgue) +"aZV" = ( +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "aZW" = ( /obj/structure/cable{ d1 = 1; @@ -28461,12 +25191,8 @@ }, /area/gateway) "ban" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -28584,9 +25310,6 @@ "baA" = ( /obj/structure/rack, /obj/item/storage/fancy/candle_box/full, -/obj/item/decorations/sticky_decorations/flammable/tinsel/green{ - pixel_y = 19 - }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "vault" @@ -28653,8 +25376,8 @@ dir = 8; layer = 2.9 }, -/obj/item/tank/emergency_oxygen/engi, -/obj/item/tank/emergency_oxygen/engi, +/obj/item/tank/internals/emergency_oxygen/engi, +/obj/item/tank/internals/emergency_oxygen/engi, /obj/item/clothing/mask/gas, /obj/item/clothing/mask/gas{ pixel_x = -3; @@ -28801,41 +25524,11 @@ /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/engine/vacuum, /area/escapepodbay) -"baW" = ( -/obj/structure/table/reinforced, -/obj/item/paper_bin, -/obj/item/pen, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "vault" - }, -/area/shuttle/escape) -"baX" = ( -/obj/structure/table/reinforced, -/obj/item/folder/red, -/obj/item/restraints/handcuffs, -/obj/item/flash, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/shuttle/escape) -"baY" = ( -/obj/machinery/computer/robotics, -/turf/simulated/floor/plasteel{ - dir = 9; - icon_state = "darkblue" - }, -/area/shuttle/escape) -"baZ" = ( -/obj/structure/window/full/shuttle, -/obj/structure/grille, -/turf/simulated/shuttle/plating, -/area/shuttle/arrival/station) "bba" = ( /obj/effect/landmark{ name = "Observer-Start" }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) "bbb" = ( /obj/structure/cable{ @@ -29158,9 +25851,6 @@ dir = 4; icon_state = "tube1" }, -/obj/item/decorations/sticky_decorations/flammable/christmas_stocking{ - pixel_x = 19 - }, /turf/simulated/floor/plasteel{ dir = 4; icon_plating = "plating"; @@ -29290,7 +25980,11 @@ /obj/machinery/portable_atmospherics/canister/nitrogen{ anchored = 1 }, -/turf/simulated/floor/engine/n2, +/turf/simulated/floor/engine{ + name = "n2 floor"; + nitrogen = 100000; + oxygen = 0 + }, /area/atmos) "bbN" = ( /obj/effect/decal/warning_stripes/northeast, @@ -29342,7 +26036,7 @@ /area/maintenance/fpmaint) "bbT" = ( /obj/structure/rack, -/obj/item/tank/oxygen, +/obj/item/tank/internals/oxygen, /turf/simulated/floor/plating, /area/maintenance/fpmaint) "bbU" = ( @@ -29385,15 +26079,6 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plating, /area/maintenance/fsmaint2) -"bbW" = ( -/obj/structure/disposalpipe/sortjunction{ - dir = 4; - icon_state = "pipe-j2s"; - name = "Chapel"; - sortType = 17 - }, -/turf/simulated/wall, -/area/crew_quarters/kitchen) "bbX" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1; @@ -29526,9 +26211,6 @@ dir = 4; icon_state = "pipe-c" }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/red{ - pixel_y = 19 - }, /turf/simulated/floor/wood, /area/library) "bcj" = ( @@ -29599,27 +26281,20 @@ pixel_x = 0; pixel_y = 32 }, -/obj/item/decorations/sticky_decorations/flammable/christmas_stocking{ - pixel_y = 17 - }, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, /area/chapel/office) "bcr" = ( -/turf/simulated/shuttle/floor, -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall_f10" +/obj/structure/chair/comfy/shuttle{ + dir = 1 }, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) "bcs" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/green{ - pixel_y = 19 - }, /turf/simulated/floor/wood, /area/library) "bct" = ( @@ -29701,6 +26376,11 @@ icon_state = "arrival" }, /area/crew_quarters/dorms) +"bcz" = ( +/turf/simulated/floor/plasteel{ + icon_state = "grimy" + }, +/area/chapel/office) "bcA" = ( /obj/effect/spawner/lootdrop/maintenance, /obj/structure/cable{ @@ -29725,9 +26405,6 @@ /obj/machinery/light_switch{ pixel_y = 25 }, -/obj/structure/snow{ - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -29737,9 +26414,6 @@ pixel_x = -5; pixel_y = 30 }, -/obj/structure/snow{ - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -29791,27 +26465,6 @@ /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel, /area/escapepodbay) -"bcJ" = ( -/obj/structure/table/reinforced, -/obj/machinery/recharger, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "vault" - }, -/area/shuttle/escape) -"bcK" = ( -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/shuttle/escape) -"bcL" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 1 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/shuttle/escape) "bcM" = ( /obj/structure/extinguisher_cabinet{ pixel_x = -5; @@ -29822,9 +26475,9 @@ "bcN" = ( /obj/machinery/light, /obj/structure/chair/comfy/shuttle{ - dir = 8 + dir = 1 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) "bcO" = ( /obj/item/radio/intercom{ @@ -29833,12 +26486,8 @@ pixel_x = 0; pixel_y = 28 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /turf/simulated/floor/carpet/black, /area/chapel/office) @@ -30048,7 +26697,7 @@ /obj/machinery/door/poddoor{ density = 0; icon_state = "open"; - id_tag = "bridge blast"; + id_tag = "bridge blast west"; name = "Bridge Blast Doors"; opacity = 0 }, @@ -30279,8 +26928,8 @@ tag = "icon-bulb1 (EAST)" }, /obj/structure/rack, -/obj/item/tank/emergency_oxygen, -/obj/item/tank/emergency_oxygen/engi{ +/obj/item/tank/internals/emergency_oxygen, +/obj/item/tank/internals/emergency_oxygen/engi{ pixel_x = 2; pixel_y = -2 }, @@ -30303,7 +26952,11 @@ /obj/machinery/portable_atmospherics/canister/air{ anchored = 1 }, -/turf/simulated/floor/engine/air, +/turf/simulated/floor/engine{ + name = "air floor"; + nitrogen = 10580; + oxygen = 2644 + }, /area/atmos) "bdH" = ( /obj/effect/landmark/start{ @@ -30337,12 +26990,6 @@ pixel_y = 25 }, /obj/structure/closet/chefcloset, -/obj/item/decorations/sticky_decorations/flammable/christmas_stocking{ - pixel_y = 17 - }, -/obj/structure/snow{ - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -30421,7 +27068,7 @@ /obj/machinery/door/poddoor{ density = 0; icon_state = "open"; - id_tag = "bridge blast"; + id_tag = "bridge blast east"; name = "Bridge Blast Doors"; opacity = 0 }, @@ -30639,12 +27286,8 @@ d2 = 4; icon_state = "2-4" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -30695,14 +27338,6 @@ icon_state = "dark" }, /area/ai_monitored/storage/eva) -"beh" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall_f5"; - tag = "icon-swall_f5" - }, -/area/shuttle/arrival/station) "bei" = ( /obj/structure/table, /obj/item/book/manual/hydroponics_pod_people, @@ -30711,12 +27346,6 @@ icon_state = "hydrofloor" }, /area/hydroponics) -"bej" = ( -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall13" - }, -/area/shuttle/arrival/station) "bek" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/wood, @@ -30775,7 +27404,7 @@ name = "station intercom (General)"; pixel_y = -28 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) "bet" = ( /obj/structure/chair{ @@ -30784,9 +27413,6 @@ /obj/effect/landmark/start{ name = "Chaplain" }, -/obj/structure/snow{ - icon_state = "snow_corner" - }, /turf/simulated/floor/carpet/black, /area/chapel/office) "beu" = ( @@ -30829,33 +27455,21 @@ name = "Arrival Shuttle Requests Console"; pixel_y = -30 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) "bey" = ( /obj/structure/shuttle/engine/propulsion{ dir = 4; icon_state = "burst_l" }, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/shuttle/arrival/station) "bez" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/carpet, /area/crew_quarters/mrchangs) -"beC" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 8 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/shuttle/escape) "beE" = ( /obj/machinery/light/small{ dir = 4 @@ -30864,26 +27478,22 @@ pixel_x = 25; pixel_y = 0 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, /area/crew_quarters/toilet) "beF" = ( -/obj/structure/chair/comfy/green{ +/obj/structure/chair/comfy/brown{ dir = 4 }, /turf/simulated/floor/carpet, /area/crew_quarters/bar) "beG" = ( /obj/machinery/light, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) "beH" = ( /obj/structure/disposalpipe/segment, @@ -30896,12 +27506,8 @@ /obj/item/radio/intercom{ pixel_y = -30 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/wood, /area/crew_quarters/bar) @@ -31259,12 +27865,12 @@ }, /area/crew_quarters/bar) "bfl" = ( +/obj/structure/chair/comfy/brown{ + dir = 8 + }, /obj/machinery/light{ dir = 4 }, -/obj/structure/chair/comfy/red{ - dir = 8 - }, /turf/simulated/floor/carpet, /area/crew_quarters/bar) "bfm" = ( @@ -31491,9 +28097,6 @@ d2 = 8; icon_state = "0-8" }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/yellow{ - pixel_y = 19 - }, /turf/simulated/floor/wood, /area/clownoffice) "bfB" = ( @@ -31504,7 +28107,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -31521,15 +28123,12 @@ pixel_x = 0; tag = "" }, -/obj/item/decorations/sticky_decorations/flammable/christmas_stocking{ - pixel_y = 17 - }, /turf/simulated/floor/plasteel{ icon_state = "hydrofloor" }, /area/hydroponics) "bfE" = ( -/mob/living/simple_animal/hostile/retaliate/goat, +/mob/living/simple_animal/hostile/retaliate/goat/chef, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -31546,9 +28145,6 @@ /obj/machinery/atmospherics/binary/pump{ dir = 1 }, -/obj/item/decorations/sticky_decorations/flammable/christmas_stocking{ - pixel_y = 17 - }, /turf/simulated/floor/plasteel{ icon_state = "hydrofloor" }, @@ -31658,9 +28254,6 @@ icon_state = "1-8"; tag = "" }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/green{ - pixel_y = 19 - }, /turf/simulated/floor/plasteel{ icon_state = "hydrofloor" }, @@ -31761,10 +28354,6 @@ pixel_x = -24; shock_proof = 0 }, -/obj/structure/snow{ - dir = 6; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -31786,10 +28375,6 @@ pixel_y = 10 }, /obj/item/eftpos, -/obj/structure/snow{ - dir = 10; - icon_state = "snow_corner" - }, /turf/simulated/floor/carpet/black, /area/chapel/office) "bgb" = ( @@ -31818,14 +28403,6 @@ }, /turf/simulated/floor/engine, /area/escapepodbay) -"bge" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall_f9"; - tag = "icon-swall_f9" - }, -/area/shuttle/arrival/station) "bgf" = ( /obj/structure/table/wood, /obj/item/candle, @@ -32012,12 +28589,8 @@ /turf/simulated/floor/plasteel, /area/hallway/primary/port) "bgB" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry) @@ -32443,12 +29016,9 @@ /turf/simulated/floor/plating, /area/maintenance/fsmaint2) "bhv" = ( -/obj/structure/chair/comfy/red{ +/obj/structure/chair/comfy/beige{ dir = 8 }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/green{ - pixel_y = 19 - }, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -32501,15 +29071,10 @@ /area/storage/office) "bhA" = ( /obj/machinery/hologram/holopad, -/obj/structure/snow, /turf/simulated/floor/carpet/black, /area/chapel/office) "bhB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/snow{ - dir = 6; - icon_state = "snow_corner" - }, /turf/simulated/floor/carpet/black, /area/chapel/office) "bhC" = ( @@ -32756,25 +29321,13 @@ initialize_directions = 11; level = 1 }, -/obj/structure/snow{ - dir = 4; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, /area/crew_quarters/kitchen) "bhX" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 - }, -/obj/structure/snow{ - dir = 10; - icon_state = "snow_corner" +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" @@ -32807,9 +29360,6 @@ dir = 8; pixel_x = -24 }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/green{ - pixel_y = 19 - }, /turf/simulated/floor/wood, /area/library) "bib" = ( @@ -32820,12 +29370,6 @@ icon_state = "hydrofloor" }, /area/hydroponics) -"bic" = ( -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall3" - }, -/area/shuttle/escape) "bid" = ( /obj/machinery/vending/snack, /obj/effect/decal/warning_stripes/northwest, @@ -32839,12 +29383,8 @@ pixel_x = 0; tag = "" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /turf/simulated/floor/plasteel{ icon_state = "hydrofloor" @@ -32859,9 +29399,6 @@ tag = "" }, /obj/structure/closet/secure_closet/hydroponics, -/obj/item/decorations/sticky_decorations/flammable/christmas_stocking{ - pixel_y = 17 - }, /turf/simulated/floor/plasteel{ icon_state = "hydrofloor" }, @@ -32896,20 +29433,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood, /area/library) -"bim" = ( -/obj/machinery/status_display, -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall12" - }, -/area/shuttle/escape) -"bin" = ( -/obj/machinery/door/airlock/command/glass{ - name = "Escape Shuttle Cockpit"; - req_access_txt = "19" - }, -/turf/simulated/floor/plasteel, -/area/shuttle/escape) "bio" = ( /obj/effect/spawner/lootdrop/maintenance, /obj/structure/cable{ @@ -32927,10 +29450,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/snow{ - dir = 4; - icon_state = "snow_corner" - }, /turf/simulated/floor/plating, /area/maintenance/fsmaint2) "bip" = ( @@ -32973,7 +29492,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -32998,7 +29516,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/snow, /turf/simulated/floor/plating, /area/maintenance/fsmaint2) "bis" = ( @@ -33008,10 +29525,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/green{ - pixel_y = 19 - }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -33043,7 +29556,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -33052,7 +29564,6 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -33064,7 +29575,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -33281,12 +29791,8 @@ /turf/simulated/floor/carpet, /area/crew_quarters/mrchangs) "biS" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -33314,8 +29820,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/item/decorations/sticky_decorations/flammable/snowman, -/obj/structure/snow, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -33343,10 +29847,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/obj/structure/snow{ - dir = 6; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -33395,10 +29895,6 @@ initialize_directions = 10; level = 1 }, -/obj/structure/snow{ - dir = 10; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -33489,9 +29985,6 @@ /area/clownoffice) "bjf" = ( /obj/structure/reagent_dispensers/beerkeg, -/obj/item/decorations/sticky_decorations/flammable/christmas_stocking{ - pixel_y = 17 - }, /turf/simulated/floor/wood, /area/crew_quarters/bar) "bjg" = ( @@ -33602,7 +30095,6 @@ /obj/structure/disposalpipe/trunk{ dir = 1 }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -33676,12 +30168,6 @@ /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/hydroponics) -"bjC" = ( -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall12" - }, -/area/shuttle/escape) "bjD" = ( /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ @@ -33696,12 +30182,6 @@ /obj/machinery/photocopier, /turf/simulated/floor/wood, /area/library) -"bjG" = ( -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall13" - }, -/area/shuttle/escape) "bjI" = ( /obj/item/twohanded/required/kirbyplants, /obj/machinery/light_switch{ @@ -33711,12 +30191,6 @@ icon_state = "dark" }, /area/chapel/main) -"bjJ" = ( -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "blue" - }, -/area/shuttle/escape) "bjK" = ( /obj/machinery/computer/security/telescreen/entertainment{ pixel_x = 32 @@ -34007,9 +30481,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/red{ - pixel_y = 19 - }, /turf/simulated/floor/wood, /area/library) "bko" = ( @@ -34115,7 +30586,6 @@ /area/hallway/primary/central/nw) "bkx" = ( /obj/machinery/door/firedoor, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/crew_quarters/locker) "bky" = ( @@ -34299,9 +30769,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/green{ - pixel_y = 19 - }, /turf/simulated/floor/wood, /area/library) "bkM" = ( @@ -34330,25 +30797,21 @@ }, /area/crew_quarters/bar) "bkQ" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/wood, /area/library) "bkR" = ( +/obj/machinery/door/firedoor, +/obj/effect/decal/warning_stripes/yellow, /obj/machinery/door/poddoor{ density = 0; icon_state = "open"; - id_tag = "bridge blast"; + id_tag = "bridge blast west"; name = "Bridge Blast Doors"; opacity = 0 }, -/obj/machinery/door/firedoor, -/obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, /area/bridge) "bkS" = ( @@ -34472,13 +30935,13 @@ }, /area/hydroponics) "bld" = ( +/obj/structure/chair/comfy/black{ + dir = 4 + }, /obj/machinery/firealarm{ dir = 8; pixel_x = -24 }, -/obj/structure/chair/comfy/green{ - dir = 4 - }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -34634,21 +31097,15 @@ }, /turf/simulated/floor/carpet, /area/crew_quarters/bar) -"blv" = ( -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "neutralcorner" - }, -/area/shuttle/escape) "blw" = ( +/obj/structure/chair/comfy/black{ + dir = 4 + }, /obj/item/radio/intercom{ frequency = 1459; name = "station intercom (General)"; pixel_x = -28 }, -/obj/structure/chair/comfy/red{ - dir = 4 - }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -34675,15 +31132,6 @@ /obj/structure/table/wood, /turf/simulated/floor/carpet, /area/chapel/main) -"blA" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "bot" - }, -/area/shuttle/escape) "blB" = ( /obj/structure/sign/securearea{ desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; @@ -34696,21 +31144,6 @@ /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry) -"blC" = ( -/obj/structure/table/reinforced, -/obj/machinery/recharger, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "redcorner" - }, -/area/shuttle/escape) -"blD" = ( -/obj/structure/grille, -/obj/structure/window/full/shuttle{ - icon_state = "16" - }, -/turf/simulated/floor/plating, -/area/shuttle/escape) "blE" = ( /obj/machinery/status_display{ layer = 4; @@ -34865,7 +31298,7 @@ /obj/machinery/door/poddoor{ density = 0; icon_state = "open"; - id_tag = "bridge blast"; + id_tag = "bridge blast north"; name = "Bridge Blast Doors"; opacity = 0 }, @@ -34874,10 +31307,6 @@ d2 = 4; icon_state = "0-4" }, -/obj/structure/cable{ - d2 = 8; - icon_state = "0-8" - }, /turf/simulated/floor/plating, /area/bridge) "blV" = ( @@ -34900,23 +31329,26 @@ /obj/machinery/door/poddoor{ density = 0; icon_state = "open"; - id_tag = "bridge blast"; + id_tag = "bridge blast north"; name = "Bridge Blast Doors"; opacity = 0 }, /obj/effect/spawner/window/reinforced, /obj/structure/cable{ - d2 = 8; - icon_state = "0-8" - }, -/obj/structure/cable{ - d2 = 4; - icon_state = "0-4" + icon_state = "0-4"; + d2 = 4 }, /obj/machinery/status_display{ density = 0; layer = 4 }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + pixel_x = 0; + tag = "" + }, /turf/simulated/floor/plating, /area/bridge) "blZ" = ( @@ -34926,7 +31358,7 @@ /obj/machinery/door/poddoor{ density = 0; icon_state = "open"; - id_tag = "bridge blast"; + id_tag = "bridge blast north"; name = "Bridge Blast Doors"; opacity = 0 }, @@ -34935,10 +31367,6 @@ d2 = 8; icon_state = "0-8" }, -/obj/structure/cable{ - d2 = 4; - icon_state = "0-4" - }, /turf/simulated/floor/plating, /area/bridge) "bmb" = ( @@ -34952,22 +31380,25 @@ /obj/machinery/door/poddoor{ density = 0; icon_state = "open"; - id_tag = "bridge blast"; + id_tag = "bridge blast north"; name = "Bridge Blast Doors"; opacity = 0 }, /obj/effect/spawner/window/reinforced, /obj/structure/cable{ + icon_state = "0-2"; + d2 = 2 + }, +/obj/structure/cable{ + d1 = 2; d2 = 8; - icon_state = "0-8" + icon_state = "2-8"; + tag = "" }, /obj/structure/cable{ + d1 = 2; d2 = 4; - icon_state = "0-4" - }, -/obj/structure/cable{ - d2 = 2; - icon_state = "0-2" + icon_state = "2-4" }, /turf/simulated/floor/plating, /area/bridge) @@ -35092,12 +31523,9 @@ /turf/simulated/floor/plating, /area/hallway/secondary/exit) "bmo" = ( -/obj/structure/chair/comfy/red{ +/obj/structure/chair/comfy/beige{ dir = 1 }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/green{ - pixel_y = 19 - }, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -35212,9 +31640,6 @@ /turf/simulated/floor/plasteel, /area/hallway/primary/port) "bmA" = ( -/obj/item/decorations/sticky_decorations/flammable/tinsel/green{ - pixel_y = 19 - }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -35289,6 +31714,9 @@ /turf/simulated/floor/plating, /area/maintenance/fsmaint2) "bmI" = ( +/obj/structure/chair/comfy/black{ + dir = 4 + }, /obj/structure/cable{ d2 = 2; icon_state = "0-2" @@ -35299,9 +31727,6 @@ pixel_x = -24; shock_proof = 0 }, -/obj/structure/chair/comfy/green{ - dir = 4 - }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -35344,6 +31769,12 @@ icon_state = "darkred" }, /area/hallway/secondary/exit) +"bmM" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "bmN" = ( /obj/structure/cable{ d1 = 1; @@ -35443,16 +31874,6 @@ }, /turf/simulated/floor/plasteel, /area/hallway/primary/central/nw) -"bmX" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 4 - }, -/turf/simulated/shuttle/floor4, -/area/shuttle/escape) -"bmY" = ( -/obj/structure/chair/comfy/shuttle, -/turf/simulated/shuttle/floor4, -/area/shuttle/escape) "bmZ" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -35471,13 +31892,6 @@ }, /turf/simulated/floor/plasteel, /area/hallway/primary/central/north) -"bnb" = ( -/obj/structure/grille, -/obj/structure/window/full/shuttle{ - icon_state = "8" - }, -/turf/simulated/floor/plating, -/area/shuttle/escape) "bnd" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -35516,7 +31930,6 @@ }, /obj/machinery/hologram/holopad, /obj/effect/decal/warning_stripes/southeastcorner, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/crew_quarters/locker) "bnh" = ( @@ -35687,8 +32100,8 @@ dir = 8; layer = 2.9 }, -/obj/item/tank/emergency_oxygen, -/obj/item/tank/emergency_oxygen, +/obj/item/tank/internals/emergency_oxygen, +/obj/item/tank/internals/emergency_oxygen, /obj/item/clothing/mask/breath, /obj/item/clothing/mask/breath, /obj/machinery/light_switch{ @@ -35718,22 +32131,14 @@ /obj/machinery/light_switch{ pixel_y = 28 }, -/obj/structure/snow{ - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel, /area/crew_quarters/locker) "bnB" = ( /obj/machinery/vending/cola, -/obj/structure/snow{ - dir = 6; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel, /area/crew_quarters/locker) "bnC" = ( /obj/machinery/vending/artvend, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/crew_quarters/locker) "bnD" = ( @@ -35751,15 +32156,10 @@ /area/civilian/pet_store) "bnF" = ( /obj/machinery/vending/clothing, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/crew_quarters/locker) "bnG" = ( /obj/machinery/vending/autodrobe, -/obj/structure/snow{ - dir = 10; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel, /area/crew_quarters/locker) "bnH" = ( @@ -35831,11 +32231,6 @@ /area/crew_quarters/bar) "bnR" = ( /obj/machinery/computer/atmos_alert, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "yellow" @@ -35856,7 +32251,6 @@ pixel_y = 4 }, /obj/item/storage/box/ids, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/bridge) "bnV" = ( @@ -35868,11 +32262,6 @@ icon_state = "0-2"; pixel_y = 1 }, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "yellow" @@ -35880,11 +32269,6 @@ /area/bridge) "bnW" = ( /obj/machinery/computer/station_alert, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ dir = 0; icon_state = "yellow" @@ -35892,11 +32276,6 @@ /area/bridge) "bnX" = ( /obj/machinery/computer/communications, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ dir = 0; icon_state = "blue" @@ -35904,11 +32283,6 @@ /area/bridge) "bnY" = ( /obj/machinery/computer/shuttle/labor, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "blue" @@ -35918,8 +32292,8 @@ /obj/structure/closet/emcloset, /obj/item/clothing/mask/breath, /obj/item/clothing/mask/breath, -/obj/item/tank/emergency_oxygen, -/obj/item/tank/emergency_oxygen, +/obj/item/tank/internals/emergency_oxygen, +/obj/item/tank/internals/emergency_oxygen, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkred" @@ -35927,11 +32301,6 @@ /area/hallway/secondary/exit) "boa" = ( /obj/machinery/computer/shuttle/mining, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "blue" @@ -35996,7 +32365,6 @@ name = "Kitchen"; req_access_txt = "28" }, -/obj/item/reagent_containers/food/snacks/candy/candycane, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "cafeteria"; @@ -36010,7 +32378,6 @@ /obj/item/assembly/timer, /obj/item/assembly/signaler, /obj/item/assembly/signaler, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/bridge) "boi" = ( @@ -36020,9 +32387,6 @@ icon_state = "1-2"; tag = "" }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/red{ - pixel_y = 19 - }, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "cafeteria"; @@ -36191,7 +32555,6 @@ /obj/effect/landmark/start{ name = "Cargo Technician" }, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/quartermaster/office) "boy" = ( @@ -36288,9 +32651,9 @@ /area/crew_quarters/bar) "boI" = ( /obj/machinery/door/airlock/external{ - aiControlDisabled = 0; hackProof = 1; id_tag = "emergency_home"; + locked = 1; name = "Escape Airlock" }, /turf/simulated/floor/plating, @@ -36298,15 +32661,6 @@ "boJ" = ( /turf/simulated/floor/carpet, /area/chapel/main) -"boK" = ( -/obj/machinery/door/airlock/shuttle{ - aiControlDisabled = 1; - hackProof = 1; - id_tag = "s_docking_airlock"; - name = "Shuttle Hatch" - }, -/turf/simulated/floor/plasteel, -/area/shuttle/escape) "boL" = ( /turf/simulated/floor/plasteel{ dir = 2; @@ -36329,7 +32683,6 @@ /area/crew_quarters/bar) "boN" = ( /obj/machinery/gibber, -/obj/structure/snow, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -36342,7 +32695,6 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -36367,7 +32719,6 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/snow, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -36384,7 +32735,6 @@ /area/hallway/secondary/entry) "boS" = ( /obj/structure/closet/crate/freezer, -/obj/structure/snow, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -36401,12 +32751,8 @@ /area/crew_quarters/mrchangs) "boV" = ( /obj/structure/closet/crate/freezer, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "hydrofloor" @@ -36483,7 +32829,6 @@ /obj/effect/landmark{ name = "lightsout" }, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/crew_quarters/locker) "bpe" = ( @@ -36507,7 +32852,6 @@ icon_state = "pipe-j1"; tag = "icon-pipe-j1 (EAST)" }, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/hallway/primary/port) "bph" = ( @@ -36617,8 +32961,6 @@ /turf/simulated/floor/plasteel, /area/storage/tools) "bpo" = ( -/obj/item/decorations/sticky_decorations/flammable/snowman, -/obj/structure/snow, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "yellowcorner" @@ -36647,7 +32989,6 @@ icon_state = "1-2"; tag = "" }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "yellowcorner" @@ -36657,25 +32998,6 @@ /obj/structure/table/reinforced, /obj/item/flash, /obj/item/flash, -/obj/structure/snow, -/turf/simulated/floor/plasteel, -/area/bridge) -"bps" = ( -/obj/structure/chair{ - dir = 1 - }, -/obj/machinery/door_control{ - id = "bridge blast"; - name = "Bridge Blast Door Control"; - pixel_x = 28; - pixel_y = -2; - req_access_txt = "19" - }, -/obj/machinery/keycard_auth{ - pixel_x = 29; - pixel_y = 8 - }, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/bridge) "bpt" = ( @@ -36689,7 +33011,6 @@ /obj/item/book/manual/sop_command, /obj/item/aicard, /obj/item/multitool, -/obj/structure/snow, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "blue" @@ -36703,12 +33024,8 @@ pixel_x = 0; tag = "" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -36717,7 +33034,31 @@ /area/hallway/primary/central/north) "bpw" = ( /obj/structure/table/reinforced, -/obj/structure/snow, +/obj/machinery/door_control{ + id = "bridge blast east"; + name = "East Bridge Blast Door Control"; + pixel_x = 6; + pixel_y = -2; + req_access_txt = "19" + }, +/obj/machinery/door_control{ + id = "bridge blast west"; + name = "West Bridge Blast Door Control"; + pixel_x = -6; + pixel_y = -2; + req_access_txt = "19" + }, +/obj/machinery/door_control{ + id = "bridge blast north"; + name = "North Bridge Blast Door Control"; + pixel_x = 6; + pixel_y = 8; + req_access_txt = "19" + }, +/obj/machinery/keycard_auth{ + pixel_x = -6; + pixel_y = 8 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "blue" @@ -36731,7 +33072,6 @@ pixel_y = 0; tag = "" }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "greencorner" @@ -36777,7 +33117,6 @@ "bpB" = ( /obj/structure/table/reinforced, /obj/item/storage/fancy/donut_box, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/bridge) "bpC" = ( @@ -36898,7 +33237,6 @@ name = "Kitchen"; req_access_txt = "28" }, -/obj/item/reagent_containers/food/snacks/candy/cotton/bad_rainbow, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "cafeteria"; @@ -36955,9 +33293,6 @@ /area/crew_quarters/kitchen) "bpT" = ( /obj/machinery/hologram/holopad, -/obj/item/decorations/sticky_decorations/flammable/tinsel/red{ - pixel_y = 19 - }, /turf/simulated/floor/carpet, /area/crew_quarters/mrchangs) "bpU" = ( @@ -36983,12 +33318,8 @@ /area/hydroponics) "bpX" = ( /obj/effect/decal/warning_stripes/northwest, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry) @@ -37083,12 +33414,11 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/crew_quarters/locker) "bqi" = ( /obj/structure/table/wood, -/obj/item/clothing/head/cakehat, +/obj/item/kitchen/utensil/fork, /turf/simulated/floor/wood, /area/crew_quarters/bar) "bqj" = ( @@ -37106,9 +33436,6 @@ icon_state = "wooden_chair_wings"; tag = "icon-wooden_chair_wings (WEST)" }, -/obj/effect/landmark/start{ - name = "Civilian" - }, /turf/simulated/floor/wood, /area/crew_quarters/bar) "bql" = ( @@ -37154,20 +33481,6 @@ }, /turf/simulated/floor/plating, /area/hallway/secondary/exit) -"bqo" = ( -/obj/structure/grille, -/obj/structure/window/full/shuttle{ - icon_state = "15" - }, -/turf/simulated/floor/plating, -/area/shuttle/escape) -"bqp" = ( -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall7"; - tag = "icon-swall7" - }, -/area/shuttle/escape) "bqq" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -37214,9 +33527,20 @@ /obj/structure/closet/wardrobe/white, /turf/simulated/floor/plasteel, /area/crew_quarters/locker) +"bqv" = ( +/obj/structure/chair/stool, +/turf/simulated/floor/plasteel, +/area/crew_quarters/locker) "bqw" = ( -/obj/structure/snow, -/obj/item/a_gift, +/obj/structure/table, +/obj/item/storage/toolbox/mechanical{ + pixel_x = -2; + pixel_y = -1 + }, +/turf/simulated/floor/plasteel, +/area/crew_quarters/locker) +"bqx" = ( +/obj/structure/table, /turf/simulated/floor/plasteel, /area/crew_quarters/locker) "bqy" = ( @@ -37265,10 +33589,6 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/snow{ - dir = 1; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "cafeteria"; @@ -37323,9 +33643,6 @@ }, /area/hydroponics) "bqJ" = ( -/obj/item/decorations/sticky_decorations/flammable/tinsel/red{ - pixel_y = 19 - }, /turf/simulated/floor/plasteel, /area/storage/tools) "bqK" = ( @@ -37361,10 +33678,6 @@ req_access = null; req_access_txt = "2" }, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "red" @@ -37375,11 +33688,6 @@ /obj/machinery/alarm{ pixel_y = 26 }, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "red" @@ -37394,14 +33702,6 @@ dir = 2; network = list("SS13") }, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, -/obj/structure/snow{ - dir = 4; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel{ dir = 0; icon_state = "red" @@ -37412,7 +33712,9 @@ /obj/machinery/recharger{ pixel_y = 0 }, -/obj/structure/snow, +/turf/simulated/floor/plasteel, +/area/bridge) +"bqS" = ( /turf/simulated/floor/plasteel, /area/bridge) "bqT" = ( @@ -37423,20 +33725,12 @@ }, /area/chapel/main) "bqU" = ( -/obj/item/decorations/sticky_decorations/flammable/tinsel/green{ - pixel_y = 19 - }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "bluecorner" }, /area/bridge) "bqV" = ( -/obj/item/decorations/sticky_decorations/flammable/tinsel/red{ - pixel_y = 19 - }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "bluecorner" @@ -37456,22 +33750,15 @@ pixel_y = 0; tag = "" }, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/bridge) "bqY" = ( /obj/structure/table/reinforced, /obj/item/storage/firstaid/regular, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/bridge) "bqZ" = ( /obj/machinery/computer/shuttle/mining, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "brown" @@ -37483,11 +33770,6 @@ icon_state = "tube1" }, /obj/machinery/computer/security/mining, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "brown" @@ -37504,11 +33786,6 @@ pixel_x = 0; pixel_y = 32 }, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "brown" @@ -37522,8 +33799,8 @@ /obj/structure/closet/emcloset, /obj/item/clothing/mask/breath, /obj/item/clothing/mask/breath, -/obj/item/tank/emergency_oxygen, -/obj/item/tank/emergency_oxygen, +/obj/item/tank/internals/emergency_oxygen, +/obj/item/tank/internals/emergency_oxygen, /obj/machinery/light{ dir = 8 }, @@ -37556,19 +33833,30 @@ dir = 4; network = list("SS13") }, -/obj/machinery/gameboard, -/obj/structure/snow, /turf/simulated/floor/wood, /area/crew_quarters/bar) "brg" = ( -/obj/structure/snow{ - dir = 10; - icon_state = "snow_corner" +/obj/structure/chair/wood/wings{ + dir = 8; + icon_state = "wooden_chair_wings"; + tag = "icon-wooden_chair_wings (WEST)" + }, +/obj/effect/landmark/start{ + name = "Civilian" }, /turf/simulated/floor/wood, /area/crew_quarters/bar) "brh" = ( /obj/structure/disposalpipe/segment, +/obj/structure/table/wood, +/obj/item/taperecorder{ + pixel_y = 0 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) +"bri" = ( +/obj/structure/table/wood, +/obj/item/dice/d20, /turf/simulated/floor/wood, /area/crew_quarters/bar) "brj" = ( @@ -37698,7 +33986,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/crew_quarters/locker) "brw" = ( @@ -37713,7 +34000,7 @@ /turf/simulated/floor/wood, /area/library) "bry" = ( -/obj/structure/chair/comfy/red, +/obj/structure/chair/comfy/black, /turf/simulated/floor/wood, /area/library) "brz" = ( @@ -37792,6 +34079,7 @@ /area/library) "brH" = ( /obj/structure/table/wood, +/obj/item/clothing/head/cakehat, /turf/simulated/floor/wood, /area/crew_quarters/bar) "brI" = ( @@ -37812,12 +34100,6 @@ /turf/simulated/floor/plasteel, /area/hallway/primary/central/nw) "brK" = ( -/obj/docking_port/mobile/emergency{ - dir = 4; - dwidth = 11; - height = 18; - width = 29 - }, /obj/docking_port/stationary{ dir = 4; dwidth = 11; @@ -37826,17 +34108,8 @@ name = "emergency evac bay"; width = 29 }, -/obj/machinery/door/airlock/shuttle{ - aiControlDisabled = 1; - hackProof = 1; - id_tag = "s_docking_airlock"; - name = "Shuttle Hatch" - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/shuttle/escape) +/turf/space, +/area/space) "brL" = ( /obj/machinery/light/small, /turf/simulated/floor/plating, @@ -37849,36 +34122,8 @@ /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, /area/crew_quarters/locker) -"brO" = ( -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall12" - }, -/area/shuttle/transport) -"brP" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall_f10" - }, -/area/shuttle/transport) -"brQ" = ( -/obj/structure/shuttle/window, -/obj/structure/grille, -/turf/simulated/shuttle/plating, -/area/shuttle/transport) -"brR" = ( -/obj/structure/grille, -/obj/structure/shuttle/window, -/turf/simulated/shuttle/plating, -/area/shuttle/transport) "brS" = ( /obj/machinery/computer/crew, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ dir = 0; icon_state = "green" @@ -37892,12 +34137,8 @@ /turf/simulated/floor/wood, /area/security/vacantoffice) "brV" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/wood, /area/crew_quarters/bar) @@ -37940,12 +34181,8 @@ }, /area/hydroponics) "bsa" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -38001,8 +34238,11 @@ /turf/simulated/floor/plasteel, /area/crew_quarters/locker) "bsg" = ( -/obj/structure/flora/tree/pine/xmas, -/obj/structure/snow, +/obj/structure/table, +/obj/item/clothing/head/soft/grey{ + pixel_x = -2; + pixel_y = 3 + }, /turf/simulated/floor/plasteel, /area/crew_quarters/locker) "bsh" = ( @@ -38120,10 +34360,6 @@ }, /area/bridge) "bsw" = ( -/obj/structure/snow{ - dir = 1; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "redcorner" @@ -38137,10 +34373,6 @@ /obj/effect/landmark{ name = "Marauder Entry" }, -/obj/structure/snow{ - dir = 9; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel, /area/bridge) "bsz" = ( @@ -38157,7 +34389,6 @@ icon_state = "4-8"; tag = "" }, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/bridge) "bsA" = ( @@ -38170,15 +34401,10 @@ /obj/effect/landmark{ name = "Marauder Entry" }, -/obj/structure/snow{ - dir = 5; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel, /area/bridge) "bsB" = ( /obj/machinery/atmospherics/unary/vent_pump/on, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/crew_quarters/locker) "bsC" = ( @@ -38194,7 +34420,6 @@ icon_state = "4-8"; tag = "" }, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/bridge) "bsD" = ( @@ -38207,7 +34432,6 @@ icon_state = "4-8"; tag = "" }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "browncorner"; @@ -38221,17 +34445,9 @@ icon_state = "4-8"; tag = "" }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/green{ - pixel_y = 19 - }, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/bridge) "bsG" = ( -/obj/structure/snow{ - dir = 1; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "browncorner"; @@ -38248,10 +34464,6 @@ /obj/structure/chair{ dir = 1 }, -/obj/structure/snow{ - dir = 9; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel, /area/bridge) "bsI" = ( @@ -38294,12 +34506,8 @@ /obj/machinery/light_switch{ pixel_x = -24 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/wood, /area/civilian/pet_store) @@ -38483,21 +34691,35 @@ /turf/simulated/wall, /area/hallway/primary/starboard/east) "btf" = ( -/obj/structure/snow{ +/obj/structure/chair/wood/wings{ dir = 4; - icon_state = "snow_corner" + icon_state = "wooden_chair_wings"; + tag = "icon-wooden_chair_wings (EAST)" }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" +/obj/effect/landmark/start{ + name = "Civilian" }, -/area/hallway/primary/fore) +/turf/simulated/floor/wood, +/area/crew_quarters/bar) +"btg" = ( +/obj/item/reagent_containers/food/condiment/peppermill{ + pixel_x = 2; + pixel_y = 6 + }, +/obj/structure/table/wood, +/obj/item/reagent_containers/food/condiment/saltshaker{ + pixel_x = -2; + pixel_y = 4 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "bth" = ( /obj/structure/table/wood, /obj/item/paper, /turf/simulated/floor/wood, /area/library) "bti" = ( -/obj/structure/chair/comfy/green{ +/obj/structure/chair/comfy/black{ dir = 8 }, /turf/simulated/floor/wood, @@ -38521,18 +34743,20 @@ dir = 4; icon_state = "pipe-c" }, +/obj/structure/chair/wood/wings, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) +"btn" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/table/wood, +/obj/item/dice, /turf/simulated/floor/wood, /area/crew_quarters/bar) "bto" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - pixel_y = 0 - }, -/obj/structure/snow, +/obj/structure/table/wood, +/obj/item/deck/cards, /turf/simulated/floor/wood, -/area/crew_quarters/courtroom) +/area/crew_quarters/bar) "btp" = ( /turf/simulated/floor/plasteel{ icon_state = "rampbottom"; @@ -38543,19 +34767,18 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/chair/wood/wings{ - dir = 4; - icon_state = "wooden_chair_wings"; - tag = "icon-wooden_chair_wings (EAST)" - }, -/obj/effect/landmark/start{ - name = "Civilian" - }, /turf/simulated/floor/wood, /area/crew_quarters/bar) "btr" = ( /obj/structure/table/wood, -/obj/item/kitchen/utensil/fork, +/obj/item/reagent_containers/food/condiment/saltshaker{ + pixel_x = -2; + pixel_y = 4 + }, +/obj/item/reagent_containers/food/condiment/peppermill{ + pixel_x = 2; + pixel_y = 6 + }, /turf/simulated/floor/wood, /area/crew_quarters/bar) "bts" = ( @@ -38567,33 +34790,11 @@ icon_state = "white" }, /area/maintenance/asmaint2) -"btt" = ( -/obj/item/twohanded/required/kirbyplants, -/obj/machinery/light{ - dir = 8; - icon_state = "tube1" - }, -/turf/simulated/floor/plasteel, -/area/shuttle/escape) -"btu" = ( -/obj/item/twohanded/required/kirbyplants, -/obj/machinery/light{ - dir = 4; - icon_state = "tube1" - }, -/turf/simulated/floor/plasteel, -/area/shuttle/escape) -"btv" = ( -/turf/simulated/shuttle/floor, -/turf/simulated/shuttle/wall/interior{ - icon_state = "swall_f9"; - tag = "icon-swall_f9" - }, -/area/shuttle/transport) "btw" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/chair/wood/wings, /turf/simulated/floor/wood, /area/crew_quarters/bar) "btx" = ( @@ -38601,31 +34802,14 @@ dir = 8; icon_state = "pipe-c" }, +/obj/structure/chair/wood/wings{ + dir = 4; + icon_state = "wooden_chair_wings"; + tag = "icon-wooden_chair_wings (EAST)" + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/table/wood, -/obj/item/kitchen/utensil/fork, /turf/simulated/floor/wood, /area/crew_quarters/bar) -"bty" = ( -/obj/machinery/light/spot{ - dir = 1; - icon_state = "tube1"; - tag = "icon-tube1 (NORTH)" - }, -/obj/structure/chair/comfy/shuttle{ - dir = 4 - }, -/turf/simulated/shuttle/floor, -/area/shuttle/transport) -"btz" = ( -/obj/machinery/light/spot{ - dir = 1; - icon_state = "tube1"; - tag = "icon-tube1 (NORTH)" - }, -/obj/structure/chair/comfy/shuttle, -/turf/simulated/shuttle/floor, -/area/shuttle/transport) "btA" = ( /obj/structure/cable{ d1 = 2; @@ -38644,14 +34828,6 @@ }, /turf/simulated/floor/wood, /area/security/vacantoffice) -"btC" = ( -/obj/machinery/computer/shuttle/ferry/request, -/turf/simulated/shuttle/floor, -/area/shuttle/transport) -"btD" = ( -/obj/structure/chair/comfy/shuttle, -/turf/simulated/shuttle/floor, -/area/shuttle/transport) "btE" = ( /obj/machinery/power/apc{ dir = 4; @@ -38740,9 +34916,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/red{ - pixel_y = 19 - }, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "cafeteria"; @@ -38771,15 +34944,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 - }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/green{ - pixel_y = 19 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 2; @@ -38921,27 +35087,22 @@ /turf/simulated/floor/plasteel, /area/hallway/secondary/entry) "bug" = ( +/obj/structure/table, +/obj/item/storage/toolbox/mechanical{ + pixel_x = -2; + pixel_y = -1 + }, /obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/structure/snow, -/obj/item/a_gift, /turf/simulated/floor/plasteel, /area/crew_quarters/locker) "buh" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 - }, -/obj/structure/snow{ - dir = 8; - icon_state = "snow_corner" +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /turf/simulated/floor/plasteel, /area/crew_quarters/locker) @@ -38976,12 +35137,8 @@ /turf/simulated/floor/plasteel, /area/hallway/primary/central/nw) "bun" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -38995,33 +35152,22 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 - }, -/obj/structure/snow{ - dir = 1; - icon_state = "snow_surround" +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /turf/simulated/floor/plasteel, /area/bridge) "bup" = ( /obj/machinery/atmospherics/unary/vent_pump/on, -/obj/structure/snow{ - dir = 1; - icon_state = "snow_surround" - }, /turf/simulated/floor/plasteel, /area/bridge) "buq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/table/wood, -/obj/item/reagent_containers/food/snacks/stew{ - pixel_x = 16 +/obj/structure/chair/wood/wings{ + dir = 4; + icon_state = "wooden_chair_wings"; + tag = "icon-wooden_chair_wings (EAST)" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/wood, /area/crew_quarters/bar) "bur" = ( @@ -39192,12 +35338,8 @@ /turf/simulated/floor/plasteel, /area/hallway/secondary/exit) "buI" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -39207,9 +35349,6 @@ /obj/effect/landmark/start{ name = "Chef" }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/red{ - pixel_y = 19 - }, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "cafeteria"; @@ -39258,6 +35397,11 @@ }, /turf/simulated/floor/carpet, /area/crew_quarters/mrchangs) +"buN" = ( +/obj/structure/table/wood, +/obj/item/candle, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "buO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -39281,6 +35425,23 @@ icon_state = "dark" }, /area/hydroponics) +"buQ" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/chair/wood/wings{ + dir = 1; + icon_state = "wooden_chair_wings"; + tag = "icon-wooden_chair_wings (NORTH)" + }, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) +"buR" = ( +/obj/structure/chair/wood/wings{ + dir = 1; + icon_state = "wooden_chair_wings"; + tag = "icon-wooden_chair_wings (NORTH)" + }, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "buS" = ( /obj/structure/cable{ d1 = 1; @@ -39421,18 +35582,6 @@ /turf/simulated/floor/plasteel, /area/hallway/primary/starboard/east) "bvf" = ( -/obj/machinery/door/airlock/shuttle{ - id_tag = "s_docking_airlock" - }, -/obj/docking_port/mobile{ - dir = 8; - dwidth = 2; - height = 12; - id = "ferry"; - name = "ferry shuttle"; - roundstart_move = "ferry_away"; - width = 5 - }, /obj/docking_port/stationary{ dir = 8; dwidth = 2; @@ -39441,8 +35590,8 @@ name = "port bay 3"; width = 5 }, -/turf/simulated/shuttle/floor, -/area/shuttle/transport) +/turf/space, +/area/space) "bvg" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -39469,28 +35618,16 @@ }, /turf/simulated/floor/plasteel, /area/hallway/primary/starboard/east) -"bvi" = ( -/obj/machinery/door/airlock/shuttle{ - id_tag = "s_docking_airlock" - }, -/turf/simulated/shuttle/floor, -/area/shuttle/transport) -"bvj" = ( -/turf/simulated/shuttle/floor, -/area/shuttle/transport) "bvk" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/plasteel, /area/crew_quarters/locker) "bvl" = ( /obj/machinery/door/airlock/external{ - id_tag = "ferry_home" + id_tag = "ferry_home"; + locked = 1 }, /turf/simulated/floor/plating, /area/hallway/secondary/entry) @@ -39512,9 +35649,6 @@ icon_state = "tube1" }, /obj/structure/filingcabinet/chestdrawer, -/obj/item/decorations/sticky_decorations/flammable/tinsel/red{ - pixel_y = 19 - }, /turf/simulated/floor/wood, /area/security/vacantoffice) "bvp" = ( @@ -39522,11 +35656,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, -/obj/structure/table, -/obj/item/clothing/head/soft/grey{ - pixel_x = -2; - pixel_y = 3 - }, /turf/simulated/floor/plasteel, /area/crew_quarters/locker) "bvq" = ( @@ -39543,30 +35672,28 @@ "bvs" = ( /turf/simulated/wall, /area/crew_quarters/locker/locker_toilet) +"bvt" = ( +/obj/structure/table, +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plasteel, +/area/crew_quarters/locker) "bvu" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/crew_quarters/locker) "bvv" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/table, -/obj/item/storage/toolbox/mechanical{ - pixel_x = -2; - pixel_y = -1 - }, -/obj/structure/snow{ - dir = 5; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel, /area/crew_quarters/locker) "bvw" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/green{ - pixel_y = 19 - }, /turf/simulated/floor/plasteel, /area/storage/tools) "bvx" = ( @@ -39589,12 +35716,8 @@ /turf/simulated/floor/plating, /area/maintenance/port) "bvz" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel, /area/storage/tools) @@ -39629,10 +35752,6 @@ /obj/effect/landmark{ name = "Marauder Entry" }, -/obj/structure/snow{ - dir = 5; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel, /area/bridge) "bvD" = ( @@ -39700,12 +35819,8 @@ /turf/simulated/wall, /area/storage/tools) "bvL" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel, /area/hallway/primary/central/ne) @@ -39724,7 +35839,6 @@ name = "Chapel Office"; req_access_txt = "22" }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -39765,7 +35879,6 @@ }, /obj/structure/table/reinforced, /obj/effect/decal/warning_stripes/yellow/hollow, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/quartermaster/office) "bvR" = ( @@ -39797,7 +35910,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/crew_quarters/locker) "bvT" = ( @@ -39816,13 +35928,6 @@ initialize_directions = 11; level = 1 }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/green{ - pixel_y = 19 - }, -/obj/structure/snow{ - dir = 4; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel, /area/crew_quarters/locker) "bvU" = ( @@ -39866,8 +35971,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/snow, -/obj/item/a_gift, /turf/simulated/floor/plasteel, /area/crew_quarters/locker) "bvX" = ( @@ -39875,10 +35978,6 @@ /area/turret_protected/ai_upload) "bvY" = ( /obj/structure/filingcabinet/filingcabinet, -/obj/structure/snow{ - dir = 1; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "blue" @@ -39900,8 +35999,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/snow, -/obj/item/a_gift, /turf/simulated/floor/plasteel, /area/crew_quarters/locker) "bwa" = ( @@ -39916,7 +36013,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/crew_quarters/locker) "bwb" = ( @@ -39940,8 +36036,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/snow, -/obj/item/a_gift, /turf/simulated/floor/plasteel, /area/crew_quarters/locker) "bwc" = ( @@ -39965,10 +36059,6 @@ initialize_directions = 10; level = 1 }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/red{ - pixel_y = 19 - }, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/crew_quarters/locker) "bwe" = ( @@ -40086,10 +36176,6 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/snow{ - dir = 8; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel, /area/crew_quarters/locker) "bwr" = ( @@ -40102,9 +36188,6 @@ /obj/structure/disposalpipe/trunk{ dir = 8 }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/red{ - pixel_y = 19 - }, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "cafeteria"; @@ -40189,24 +36272,17 @@ /turf/simulated/floor/plasteel, /area/hallway/primary/central/nw) "bwC" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/food/snacks/chocolatebar, -/obj/structure/snow, -/turf/simulated/floor/wood, +/obj/structure/flora/ausbushes/stalkybush, +/obj/structure/flora/ausbushes/grassybush, +/obj/structure/flora/ausbushes/brflowers, +/turf/simulated/floor/grass, /area/hallway/secondary/exit) "bwD" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/chocolate, -/obj/structure/snow, -/turf/simulated/floor/wood, +/obj/structure/flora/ausbushes/pointybush, +/obj/structure/flora/ausbushes/lavendergrass, +/obj/structure/flora/ausbushes/ywflowers, +/turf/simulated/floor/grass, /area/hallway/secondary/exit) -"bwE" = ( -/turf/simulated/shuttle/floor, -/turf/simulated/shuttle/wall/interior{ - icon_state = "swall_f10"; - tag = "icon-swall_f10" - }, -/area/shuttle/transport) "bwF" = ( /obj/machinery/light{ dir = 1; @@ -40219,28 +36295,6 @@ tag = "icon-whitebluecorner" }, /area/medical/medbay2) -"bwG" = ( -/obj/structure/closet/crate, -/obj/machinery/light/spot, -/turf/simulated/shuttle/floor, -/area/shuttle/transport) -"bwH" = ( -/obj/structure/closet/crate, -/turf/simulated/shuttle/floor, -/area/shuttle/transport) -"bwI" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 1 - }, -/turf/simulated/shuttle/floor, -/area/shuttle/transport) -"bwJ" = ( -/obj/machinery/light/spot, -/obj/structure/chair/comfy/shuttle{ - dir = 1 - }, -/turf/simulated/shuttle/floor, -/area/shuttle/transport) "bwK" = ( /obj/machinery/meter, /obj/machinery/atmospherics/pipe/manifold/visible{ @@ -40311,13 +36365,6 @@ }, /area/crew_quarters/locker/locker_toilet) "bwR" = ( -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "open"; - id_tag = "bridge blast"; - name = "Bridge Blast Doors"; - opacity = 0 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -40332,6 +36379,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/door/poddoor{ + density = 0; + icon_state = "open"; + id_tag = "bridge blast west"; + name = "Bridge Blast Doors"; + opacity = 0 + }, /turf/simulated/floor/plasteel, /area/bridge) "bwS" = ( @@ -40592,10 +36646,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/snow{ - dir = 1; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel{ dir = 0; icon_state = "blue" @@ -40645,8 +36695,7 @@ }, /area/bridge) "bxx" = ( -/obj/structure/flora/tree/pine/xmas, -/obj/structure/snow, +/obj/machinery/computer/arcade, /turf/simulated/floor/wood, /area/crew_quarters/bar) "bxy" = ( @@ -40669,10 +36718,10 @@ }, /area/crew_quarters/dorms) "bxz" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/h_chocolate, -/obj/structure/snow, -/turf/simulated/floor/wood, +/obj/structure/flora/ausbushes/leafybush, +/obj/structure/flora/ausbushes/grassybush, +/obj/structure/flora/ausbushes/ppflowers, +/turf/simulated/floor/grass, /area/hallway/secondary/exit) "bxA" = ( /obj/structure/closet/fireaxecabinet{ @@ -40708,10 +36757,6 @@ initialize_directions = 11; level = 1 }, -/obj/structure/snow{ - dir = 1; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel{ dir = 0; icon_state = "blue" @@ -40912,13 +36957,13 @@ /turf/simulated/floor/wood, /area/library) "bxR" = ( +/obj/structure/chair/comfy/black{ + dir = 4 + }, /obj/machinery/light/small, /obj/effect/landmark/start{ name = "Civilian" }, -/obj/structure/chair/comfy/red{ - dir = 4 - }, /turf/simulated/floor/wood, /area/library) "bxS" = ( @@ -40927,12 +36972,12 @@ /turf/simulated/floor/wood, /area/library) "bxT" = ( +/obj/structure/chair/comfy/black{ + dir = 8 + }, /obj/effect/landmark/start{ name = "Civilian" }, -/obj/structure/chair/comfy/green{ - dir = 8 - }, /turf/simulated/floor/wood, /area/library) "bxU" = ( @@ -40953,17 +36998,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/snow{ - dir = 5; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel{ dir = 0; icon_state = "blue" }, /area/bridge) "bxV" = ( -/obj/structure/chair/comfy/red{ +/obj/structure/chair/comfy/black{ dir = 4 }, /turf/simulated/floor/wood, @@ -41013,7 +37054,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "bluecorner" @@ -41076,13 +37116,6 @@ }, /turf/simulated/floor/plasteel, /area/bridge) -"byd" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall_f9" - }, -/area/shuttle/transport) "bye" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 9 @@ -41091,13 +37124,6 @@ /turf/simulated/floor/plating, /area/maintenance/port) "byf" = ( -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "open"; - id_tag = "bridge blast"; - name = "Bridge Blast Doors"; - opacity = 0 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -41115,6 +37141,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/door/poddoor{ + density = 0; + icon_state = "open"; + id_tag = "bridge blast east"; + name = "Bridge Blast Doors"; + opacity = 0 + }, /turf/simulated/floor/plasteel, /area/bridge) "byg" = ( @@ -41344,6 +37377,14 @@ }, /turf/simulated/wall, /area/quartermaster/office) +"byD" = ( +/obj/structure/chair/wood/wings{ + dir = 4; + icon_state = "wooden_chair_wings"; + tag = "icon-wooden_chair_wings (EAST)" + }, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "byE" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -41360,11 +37401,10 @@ }, /area/hallway/primary/central/west) "byG" = ( +/obj/machinery/photocopier, /obj/structure/sign/poster/official/random{ pixel_x = -32 }, -/obj/structure/table, -/obj/structure/snow, /turf/simulated/floor/wood, /area/bridge/meeting_room) "byH" = ( @@ -41374,10 +37414,6 @@ pixel_x = 0; pixel_y = 24 }, -/obj/structure/snow, -/obj/item/nanomob_card, -/obj/item/a_gift, -/obj/item/twohanded/dualsaber/toy, /turf/simulated/floor/wood, /area/bridge/meeting_room) "byI" = ( @@ -41387,8 +37423,6 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/photocopier, -/obj/structure/snow, /turf/simulated/floor/wood, /area/bridge/meeting_room) "byJ" = ( @@ -41403,11 +37437,6 @@ dir = 2; network = list("SS13") }, -/obj/structure/table, -/obj/machinery/recharger{ - pixel_y = 4 - }, -/obj/structure/snow, /turf/simulated/floor/wood, /area/bridge/meeting_room) "byK" = ( @@ -41421,10 +37450,6 @@ /obj/machinery/light_switch{ pixel_y = 27 }, -/obj/structure/table, -/obj/item/book/manual/sop_general, -/obj/item/storage/fancy/donut_box, -/obj/structure/snow, /turf/simulated/floor/wood, /area/bridge/meeting_room) "byL" = ( @@ -41438,20 +37463,11 @@ pixel_x = 0; pixel_y = 24 }, -/obj/structure/table, -/obj/item/hand_labeler, -/obj/item/stack/packageWrap, -/obj/item/assembly/timer, -/obj/structure/snow, /turf/simulated/floor/wood, /area/bridge/meeting_room) "byM" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -41664,9 +37680,6 @@ /turf/simulated/wall, /area/crew_quarters/bar) "bzf" = ( -/obj/item/decorations/sticky_decorations/flammable/tinsel/green{ - pixel_y = 19 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitecorner" @@ -41727,12 +37740,21 @@ icon_state = "dark" }, /area/chapel/main) +"bzm" = ( +/obj/machinery/light{ + dir = 4; + icon_state = "tube1" + }, +/obj/structure/flora/ausbushes/pointybush, +/obj/structure/flora/ausbushes/lavendergrass, +/obj/structure/flora/ausbushes/ywflowers, +/turf/simulated/floor/grass, +/area/hallway/secondary/exit) "bzn" = ( /obj/machinery/disposal, /obj/structure/disposalpipe/trunk{ dir = 1 }, -/obj/structure/snow, /turf/simulated/floor/wood, /area/crew_quarters/bar) "bzo" = ( @@ -41742,7 +37764,6 @@ icon_state = "wooden_chair_wings"; tag = "icon-wooden_chair_wings (EAST)" }, -/obj/structure/snow, /turf/simulated/floor/wood, /area/crew_quarters/bar) "bzp" = ( @@ -41756,10 +37777,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/carpet, /area/library) -"bzq" = ( -/obj/item/twohanded/required/kirbyplants, -/turf/simulated/floor/plasteel, -/area/shuttle/escape) "bzr" = ( /obj/item/radio/intercom{ frequency = 1459; @@ -41769,12 +37786,8 @@ /turf/simulated/floor/plasteel, /area/hallway/secondary/entry) "bzs" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit) @@ -41900,10 +37913,6 @@ /area/hallway/secondary/exit) "bzE" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/snow{ - dir = 5; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel, /area/quartermaster/office) "bzF" = ( @@ -41950,9 +37959,6 @@ name = "station intercom (General)"; pixel_y = 25 }, -/obj/structure/snow{ - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "arrival" @@ -41978,15 +37984,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 - }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/green{ - pixel_y = 19 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/carpet, /area/security/vacantoffice) @@ -42003,11 +38002,10 @@ }, /area/hallway/primary/central/west) "bzN" = ( -/obj/structure/flora/tree/pine/xmas, -/obj/item/decorations/sticky_decorations/flammable/tinsel/red{ - pixel_y = 19 +/obj/machinery/recharger{ + pixel_y = 4 }, -/obj/structure/snow, +/obj/structure/table, /turf/simulated/floor/wood, /area/bridge/meeting_room) "bzO" = ( @@ -42018,9 +38016,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/red{ - pixel_y = 19 - }, /turf/simulated/floor/carpet, /area/security/vacantoffice) "bzQ" = ( @@ -42073,10 +38068,6 @@ /obj/structure/disposalpipe/trunk{ dir = 1 }, -/obj/structure/snow{ - dir = 5; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel, /area/crew_quarters/locker) "bzV" = ( @@ -42085,10 +38076,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/obj/structure/snow{ - dir = 1; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel, /area/crew_quarters/locker) "bzW" = ( @@ -42114,8 +38101,11 @@ /obj/machinery/vending/cigarette, /turf/simulated/floor/wood, /area/crew_quarters/captain) +"bzY" = ( +/turf/simulated/floor/wood, +/area/crew_quarters/captain) "bzZ" = ( -/obj/structure/chair/comfy/red{ +/obj/structure/chair/comfy/brown{ dir = 4 }, /turf/simulated/floor/carpet, @@ -42130,10 +38120,6 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/obj/structure/snow{ - dir = 8; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel, /area/crew_quarters/locker) "bAc" = ( @@ -42141,15 +38127,15 @@ /turf/simulated/floor/wood, /area/crew_quarters/captain) "bAd" = ( +/obj/structure/chair/comfy/brown{ + dir = 8 + }, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/chair/comfy/green{ - dir = 8 - }, /turf/simulated/floor/carpet, /area/crew_quarters/captain) "bAe" = ( @@ -42291,6 +38277,13 @@ }, /turf/simulated/floor/plating, /area/maintenance/port) +"bAv" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/public/glass{ + name = "Diner" + }, +/turf/simulated/floor/plasteel, +/area/crew_quarters/bar) "bAw" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -42430,10 +38423,6 @@ /turf/simulated/floor/plasteel, /area/hallway/secondary/exit) "bAJ" = ( -/obj/structure/snow{ - dir = 6; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "green" @@ -42443,6 +38432,12 @@ /obj/structure/sign/poster/official/random, /turf/simulated/wall, /area/hallway/secondary/exit) +"bAL" = ( +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "green" + }, +/area/hallway/secondary/exit) "bAM" = ( /obj/structure/cable{ d1 = 1; @@ -42460,49 +38455,19 @@ }, /turf/simulated/floor/plating, /area/hallway/secondary/exit) -"bAQ" = ( -/obj/structure/shuttle/engine/propulsion{ - dir = 8; - icon_state = "burst_l" +"bAO" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" }, -/turf/simulated/shuttle/plating, -/area/shuttle/specops) -"bAR" = ( -/turf/simulated/shuttle/wall{ - icon_state = "wall3" - }, -/area/shuttle/specops) -"bAS" = ( -/obj/machinery/recharger/wallcharger{ - pixel_x = 4; - pixel_y = 32 - }, -/obj/machinery/light/spot{ - dir = 1; - icon_state = "tube1"; - tag = "icon-tube1 (NORTH)" - }, -/obj/structure/chair/comfy/shuttle, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/specops) -"bAT" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 1; - icon_state = "diagonalWall3" - }, -/area/shuttle/specops) +/turf/simulated/floor/plating, +/area/engine/engineering) "bAU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5; level = 1 }, -/obj/structure/snow{ - dir = 10; - icon_state = "snow_corner" - }, /turf/simulated/floor/wood, /area/crew_quarters/bar) "bAV" = ( @@ -42670,13 +38635,6 @@ /area/quartermaster/office) "bBo" = ( /obj/machinery/hologram/holopad, -/obj/item/decorations/sticky_decorations/flammable/tinsel/red{ - pixel_y = 19 - }, -/obj/structure/snow{ - dir = 8; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel, /area/quartermaster/office) "bBp" = ( @@ -42742,15 +38700,18 @@ /area/security/vacantoffice) "bBu" = ( /obj/structure/table/wood, -/obj/item/book/manual/security_space_law, -/obj/structure/snow, +/obj/item/radio/intercom/command, /turf/simulated/floor/carpet, /area/bridge/meeting_room) "bBv" = ( -/obj/structure/chair/comfy/green{ +/obj/item/book/manual/security_space_law, +/obj/structure/table/wood, +/turf/simulated/floor/carpet, +/area/bridge/meeting_room) +"bBw" = ( +/obj/structure/chair/comfy/black{ dir = 8 }, -/obj/structure/snow, /turf/simulated/floor/carpet, /area/bridge/meeting_room) "bBx" = ( @@ -42886,12 +38847,6 @@ /area/medical/reception) "bBM" = ( /obj/structure/disposalpipe/segment, -/obj/item/gift, -/obj/structure/snow, -/obj/item/toy/figure/md, -/obj/item/toy/therapy, -/obj/item/toy/foamblade, -/obj/item/nanomob_card, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "white" @@ -42940,20 +38895,6 @@ icon_state = "barber" }, /area/crew_quarters/locker) -"bBR" = ( -/obj/structure/grille, -/obj/structure/window/full/shuttle{ - icon_state = "14" - }, -/turf/simulated/floor/plating, -/area/shuttle/escape) -"bBS" = ( -/obj/structure/grille, -/obj/structure/window/full/shuttle{ - icon_state = "17" - }, -/turf/simulated/floor/plating, -/area/shuttle/escape) "bBU" = ( /obj/structure/window/reinforced{ dir = 1 @@ -42964,68 +38905,6 @@ icon_state = "barber" }, /area/crew_quarters/locker) -"bBX" = ( -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall14"; - tag = "icon-swall14" - }, -/area/shuttle/escape) -"bBZ" = ( -/obj/machinery/recharger/wallcharger{ - pixel_x = 4; - pixel_y = 32 - }, -/obj/structure/chair/comfy/shuttle, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/specops) -"bCa" = ( -/obj/structure/shuttle/engine/propulsion{ - dir = 8; - icon_state = "propulsion" - }, -/turf/simulated/shuttle/plating, -/area/shuttle/specops) -"bCb" = ( -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/specops) -"bCc" = ( -/obj/machinery/computer/security/telescreen{ - desc = "Used for watching the Special Ops team."; - name = "Spec Ops Monitor"; - network = list("ERT"); - pixel_y = 30 - }, -/obj/machinery/computer/shuttle/ert, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/specops) -"bCd" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/shuttle/engine/heater{ - dir = 8; - icon_state = "heater" - }, -/turf/unsimulated/floor, -/area/shuttle/specops) -"bCe" = ( -/obj/machinery/camera{ - c_tag = "CentComm Special Ops. Shuttle"; - dir = 2; - network = list("ERT","CentComm") - }, -/obj/structure/chair/comfy/shuttle, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/specops) "bCf" = ( /turf/simulated/wall, /area/maintenance/disposal) @@ -43038,20 +38917,6 @@ /turf/simulated/wall, /area/maintenance/disposal) "bCi" = ( -/obj/machinery/door/airlock/external{ - id_tag = "s_docking_airlock"; - name = "Shuttle Hatch"; - req_access_txt = "109" - }, -/obj/docking_port/mobile{ - dir = 8; - dwidth = 2; - height = 11; - id = "specops"; - name = "ert shuttle"; - roundstart_move = "specops_away"; - width = 5 - }, /obj/docking_port/stationary{ dir = 8; dwidth = 2; @@ -43060,9 +38925,8 @@ name = "port bay 2"; width = 5 }, -/obj/structure/fans/tiny, -/turf/simulated/shuttle/plating, -/area/shuttle/specops) +/turf/space, +/area/space) "bCj" = ( /obj/effect/decal/cleanable/fungus, /turf/simulated/wall, @@ -43073,14 +38937,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/port) -"bCl" = ( -/obj/machinery/computer/security{ - network = list("SS13","Research Outpost","Mining Outpost") - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/specops) "bCm" = ( /obj/machinery/door/airlock{ name = "Unit 3" @@ -43225,20 +39081,11 @@ icon_state = "wooden_chair_wings"; tag = "icon-wooden_chair_wings (WEST)" }, -/obj/structure/snow{ - dir = 10; - icon_state = "snow_corner" - }, /turf/simulated/floor/wood, /area/crew_quarters/bar) "bCC" = ( -/obj/structure/chair/comfy/red{ - dir = 8 - }, -/obj/structure/snow{ - dir = 8; - icon_state = "snow_surround" - }, +/obj/item/folder/blue, +/obj/structure/table/wood, /turf/simulated/floor/carpet, /area/bridge/meeting_room) "bCD" = ( @@ -43247,9 +39094,6 @@ /area/bridge/meeting_room) "bCE" = ( /obj/structure/filingcabinet/filingcabinet, -/obj/structure/snow{ - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "arrival" @@ -43261,18 +39105,15 @@ icon_state = "alarm0"; pixel_x = -22 }, -/obj/structure/snow{ - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "browncorner" }, /area/hallway/primary/central/west) "bCG" = ( +/obj/item/pen, /obj/structure/table/wood, -/obj/item/folder/blue, -/obj/structure/snow, +/obj/item/paper_bin/nanotrasen, /turf/simulated/floor/carpet, /area/bridge/meeting_room) "bCH" = ( @@ -43304,25 +39145,7 @@ dir = 1; network = list("SS13") }, -/obj/structure/table/wood, -/obj/item/candle{ - pixel_y = -5 - }, -/obj/item/decorations/sticky_decorations/flammable/mistletoe{ - pixel_y = 10 - }, -/obj/item/kitchen/utensil/fork{ - pixel_x = 8 - }, -/obj/item/reagent_containers/food/condiment/saltshaker{ - pixel_x = -7; - pixel_y = 4 - }, -/obj/item/reagent_containers/food/condiment/peppermill{ - pixel_x = -3; - pixel_y = 6 - }, -/obj/structure/snow, +/obj/machinery/gameboard, /turf/simulated/floor/wood, /area/crew_quarters/bar) "bCJ" = ( @@ -43342,10 +39165,6 @@ pixel_x = 0; pixel_y = -21 }, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, /turf/simulated/floor/bluegrid, /area/turret_protected/ai_upload) "bCL" = ( @@ -43354,10 +39173,6 @@ pixel_x = 0; pixel_y = -28 }, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, /turf/simulated/floor/bluegrid, /area/turret_protected/ai_upload) "bCM" = ( @@ -43399,9 +39214,6 @@ /area/crew_quarters/captain) "bCQ" = ( /mob/living/simple_animal/pet/dog/fox/Renault, -/obj/item/decorations/sticky_decorations/flammable/tinsel/green{ - pixel_y = 19 - }, /turf/simulated/floor/carpet, /area/crew_quarters/captain) "bCR" = ( @@ -43409,12 +39221,21 @@ /turf/simulated/floor/wood, /area/library) "bCS" = ( -/obj/machinery/light/small, -/obj/structure/chair/comfy/green{ +/obj/structure/chair/comfy/black{ dir = 8 }, +/obj/machinery/light/small, /turf/simulated/floor/wood, /area/library) +"bCT" = ( +/obj/structure/chair{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + dir = 0; + icon_state = "green" + }, +/area/hallway/secondary/exit) "bCU" = ( /obj/structure/cable{ d1 = 1; @@ -43435,27 +39256,34 @@ /turf/simulated/floor/wood, /area/crew_quarters/captain) "bCW" = ( +/obj/structure/table, /obj/machinery/light{ dir = 8; icon_state = "tube1" }, +/obj/item/storage/box/cups{ + pixel_x = 6; + pixel_y = 6 + }, /obj/machinery/vending/wallmed{ name = "Emergency NanoMed"; pixel_x = -25; pixel_y = 0; req_access_txt = "0" }, -/obj/structure/flora/tree/pine/xmas, -/obj/item/decorations/sticky_decorations/flammable/tinsel/blue{ - pixel_y = 19 - }, -/obj/structure/snow, +/obj/item/roller, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whiteblue"; tag = "icon-whiteblue (WEST)" }, /area/medical/reception) +"bCX" = ( +/turf/simulated/floor/plasteel{ + dir = 0; + icon_state = "green" + }, +/area/hallway/secondary/exit) "bCY" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable{ @@ -43492,17 +39320,12 @@ }, /area/hallway/primary/starboard/west) "bDc" = ( +/obj/structure/reagent_dispensers/water_cooler, /obj/machinery/status_display{ layer = 4; pixel_x = -32; pixel_y = 0 }, -/obj/item/gift, -/obj/structure/snow, -/obj/item/toy/figure/virologist, -/obj/item/toy/therapy, -/obj/item/toy/plushie/deer, -/obj/item/nanomob_card, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "whiteblue"; @@ -43516,7 +39339,6 @@ pixel_y = -32 }, /obj/machinery/light, -/obj/structure/snow, /turf/simulated/floor/plasteel{ icon_state = "whiteblue"; tag = "icon-whiteblue" @@ -43553,9 +39375,6 @@ /obj/structure/chair/office/light{ dir = 8 }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/blue{ - pixel_y = 19 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whiteyellow" @@ -43589,6 +39408,16 @@ icon_state = "white" }, /area/medical/chemistry) +"bDk" = ( +/obj/structure/chair{ + dir = 1 + }, +/obj/machinery/light, +/turf/simulated/floor/plasteel{ + dir = 0; + icon_state = "green" + }, +/area/hallway/secondary/exit) "bDl" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ @@ -43613,23 +39442,22 @@ /obj/effect/landmark/start{ name = "Chemist" }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/blue{ - pixel_y = 19 - }, /turf/simulated/floor/plasteel, /area/medical/chemistry) "bDo" = ( -/obj/item/gift, -/obj/structure/snow, -/obj/item/nanomob_card, -/obj/item/toy/figure/hop, -/obj/item/toy/figure/ian, -/obj/item/toy/plushie/corgi, -/obj/item/toy/plushie/girly_corgi, +/obj/item/assembly/timer, +/obj/structure/table, +/obj/item/stack/packageWrap, +/obj/item/hand_labeler, /turf/simulated/floor/wood, /area/bridge/meeting_room) "bDp" = ( -/obj/structure/snow, +/obj/machinery/status_display{ + density = 0; + layer = 4; + pixel_x = 0; + pixel_y = -32 + }, /turf/simulated/floor/plasteel{ dir = 0; icon_state = "green" @@ -43649,9 +39477,8 @@ }, /area/hallway/primary/starboard/east) "bDs" = ( -/obj/structure/snow{ - dir = 8; - icon_state = "snow_corner" +/obj/structure/chair/comfy/black{ + dir = 4 }, /turf/simulated/floor/carpet, /area/bridge/meeting_room) @@ -43717,12 +39544,11 @@ /turf/simulated/floor/plasteel, /area/quartermaster/storage) "bDy" = ( -/obj/structure/snow, +/obj/structure/table, +/obj/item/book/manual/sop_general, +/obj/item/storage/fancy/donut_box, /turf/simulated/floor/wood, /area/bridge/meeting_room) -"bDz" = ( -/turf/simulated/shuttle/floor4, -/area/shuttle/escape) "bDA" = ( /turf/simulated/floor/plasteel{ icon_state = "bluecorner" @@ -43730,7 +39556,8 @@ /area/hallway/primary/starboard/west) "bDC" = ( /obj/machinery/door/airlock/external{ - id_tag = "specops_home" + id_tag = "specops_home"; + locked = 1 }, /turf/simulated/floor/plating, /area/hallway/secondary/entry) @@ -43745,16 +39572,6 @@ /obj/structure/window/reinforced, /turf/simulated/floor/plating, /area/maintenance/disposal) -"bDG" = ( -/obj/machinery/light/spot{ - dir = 8; - icon_state = "tube1"; - tag = "icon-tube1 (WEST)" - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/specops) "bDH" = ( /obj/structure/table/glass, /obj/item/storage/box/beakers{ @@ -43877,10 +39694,6 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/snow{ - dir = 8; - icon_state = "snow_corner" - }, /turf/simulated/floor/wood, /area/bridge/meeting_room) "bDT" = ( @@ -43996,7 +39809,6 @@ pixel_y = 7 }, /obj/structure/table/reinforced, -/obj/structure/snow, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "arrival" @@ -44082,11 +39894,17 @@ icon_state = "freezerfloor" }, /area/crew_quarters/locker/locker_toilet) +"bEs" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + tag = "" + }, +/turf/simulated/floor/wood, +/area/crew_quarters/captain) "bEt" = ( /obj/machinery/optable, -/obj/item/decorations/sticky_decorations/flammable/tinsel/blue{ - pixel_y = 19 - }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -44128,11 +39946,7 @@ }, /area/medical/morgue) "bEy" = ( -/obj/structure/sign/redcross{ - desc = "The Star of Life, a symbol of Medical Aid."; - icon_state = "lifestar"; - name = "Medbay" - }, +/obj/structure/sign/lifestar, /turf/simulated/wall, /area/medical/reception) "bEz" = ( @@ -44172,12 +39986,8 @@ /area/quartermaster/storage) "bEC" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel, /area/quartermaster/storage) @@ -44224,23 +40034,6 @@ icon_state = "purple" }, /area/hallway/primary/starboard/east) -"bEK" = ( -/obj/machinery/computer/communications, -/obj/item/radio/intercom/specops{ - pixel_y = -28 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/specops) -"bEL" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 1 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/specops) "bEM" = ( /turf/simulated/floor/plasteel{ dir = 6; @@ -44251,21 +40044,8 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/obj/item/gift, -/obj/structure/snow, -/obj/item/nanomob_card, -/obj/item/toy/figure/captain, -/obj/item/toy/nuke, -/obj/item/toy/plushie/orange_fox, /turf/simulated/floor/wood, /area/bridge/meeting_room) -"bER" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 4; - icon_state = "diagonalWall3" - }, -/area/shuttle/specops) "bES" = ( /obj/structure/grille, /obj/structure/window/reinforced{ @@ -44292,13 +40072,10 @@ /turf/simulated/floor/wood, /area/crew_quarters/captain) "bEV" = ( +/obj/structure/chair/comfy/black, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/green{ - pixel_y = 19 - }, -/obj/structure/snow, /turf/simulated/floor/carpet, /area/bridge/meeting_room) "bEW" = ( @@ -44325,7 +40102,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/snow, /turf/simulated/floor/carpet, /area/bridge/meeting_room) "bFa" = ( @@ -44378,12 +40154,8 @@ /turf/simulated/floor/bluegrid, /area/turret_protected/ai_upload) "bFg" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/wood, /area/crew_quarters/captain) @@ -44510,7 +40282,6 @@ pixel_y = -32 }, /obj/effect/decal/cleanable/dirt, -/obj/item/decorations/sticky_decorations/flammable/snowman, /turf/simulated/floor/plasteel, /area/quartermaster/storage) "bFr" = ( @@ -44551,7 +40322,6 @@ dir = 8; icon_state = "pipe-c" }, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/quartermaster/office) "bFu" = ( @@ -44607,17 +40377,12 @@ }, /obj/effect/decal/warning_stripes/yellow/partial, /obj/effect/decal/warning_stripes/arrow, -/obj/structure/snow{ - dir = 1; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel, /area/quartermaster/office) "bFy" = ( /obj/structure/chair{ dir = 4 }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "arrival" @@ -44694,10 +40459,6 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/snow{ - dir = 4; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit) "bFI" = ( @@ -44706,10 +40467,6 @@ icon_state = "alarm0"; pixel_y = -22 }, -/obj/structure/snow{ - dir = 1; - icon_state = "snow_corner" - }, /turf/simulated/floor/wood, /area/bridge/meeting_room) "bFJ" = ( @@ -44720,31 +40477,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "asteroid"; - tag = "icon-asteroid (NORTH)" - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "siding2"; - tag = "icon-siding2 (NORTH)" - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "siding1"; - tag = "icon-siding1 (NORTH)" - }, +/turf/simulated/floor/grass, /area/hydroponics) "bFK" = ( /obj/machinery/computer/communications, -/obj/item/decorations/sticky_decorations/flammable/tinsel/green{ - pixel_y = 19 - }, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, /turf/simulated/floor/wood, /area/crew_quarters/captain) "bFL" = ( @@ -44973,8 +40709,6 @@ }, /area/assembly/robotics) "bGd" = ( -/obj/structure/reagent_dispensers/water_cooler, -/obj/structure/snow, /turf/simulated/floor/plasteel{ icon_state = "whiteblue"; tag = "icon-whiteblue" @@ -44984,17 +40718,15 @@ /obj/effect/decal/warning_stripes/blue/partial{ dir = 1 }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "white" }, /area/medical/reception) "bGf" = ( -/obj/structure/chair/comfy/red{ +/obj/structure/chair/comfy/teal{ dir = 1 }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ icon_state = "whiteblue"; tag = "icon-whiteblue" @@ -45015,7 +40747,6 @@ name = "Quarantine Lockdown"; opacity = 0 }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "whiteblue"; @@ -45023,7 +40754,9 @@ }, /area/medical/paramedic) "bGh" = ( -/obj/structure/snow, +/obj/structure/chair{ + dir = 8 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "green" @@ -45045,7 +40778,6 @@ dir = 8; icon_state = "pipe-c" }, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit) "bGk" = ( @@ -45053,12 +40785,8 @@ dir = 8; icon_state = "tube1" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" @@ -45089,6 +40817,15 @@ }, /turf/simulated/floor/plasteel, /area/crew_quarters/locker) +"bGo" = ( +/obj/structure/chair{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "green" + }, +/area/hallway/secondary/exit) "bGp" = ( /obj/machinery/atmospherics/pipe/simple/insulated{ dir = 6 @@ -45111,10 +40848,6 @@ name = "Quarantine Lockdown"; opacity = 0 }, -/obj/structure/snow{ - dir = 1; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whiteblue"; @@ -45141,10 +40874,6 @@ /obj/machinery/alarm{ pixel_y = 25 }, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -45333,12 +41062,6 @@ /obj/effect/decal/warning_stripes/northeastcorner, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit) -"bGJ" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 1 - }, -/turf/simulated/shuttle/floor4, -/area/shuttle/escape) "bGK" = ( /obj/effect/spawner/window/reinforced, /obj/machinery/door/poddoor{ @@ -45393,13 +41116,6 @@ /obj/effect/overlay/coconut, /turf/simulated/floor/beach/sand, /area/hallway/secondary/exit) -"bGP" = ( -/obj/structure/shuttle/engine/propulsion{ - dir = 8; - icon_state = "burst_r" - }, -/turf/simulated/shuttle/plating, -/area/shuttle/specops) "bGQ" = ( /obj/machinery/mineral/stacking_unit_console{ machinedir = 8 @@ -45541,10 +41257,6 @@ /turf/simulated/floor/plating, /area/maintenance/disposal) "bHg" = ( -/obj/structure/chair/comfy/red{ - dir = 4 - }, -/obj/structure/snow, /turf/simulated/floor/wood, /area/bridge/meeting_room) "bHh" = ( @@ -45568,12 +41280,8 @@ /turf/simulated/floor/wood, /area/bridge/meeting_room) "bHk" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -45599,10 +41307,6 @@ pixel_y = 4 }, /obj/structure/table/reinforced, -/obj/structure/snow{ - dir = 9; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "arrival" @@ -45623,10 +41327,6 @@ /area/hallway/primary/central/east) "bHp" = ( /obj/machinery/hologram/holopad, -/obj/structure/snow{ - dir = 5; - icon_state = "snow_corner" - }, /turf/simulated/floor/wood, /area/bridge/meeting_room) "bHq" = ( @@ -45703,10 +41403,6 @@ /area/maintenance/port) "bHw" = ( /obj/machinery/computer/card, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, /turf/simulated/floor/wood, /area/crew_quarters/captain) "bHx" = ( @@ -45789,9 +41485,6 @@ /obj/item/storage/box/gloves{ pixel_y = 8 }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/blue{ - pixel_y = 19 - }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -45980,12 +41673,8 @@ /area/hallway/secondary/exit) "bHW" = ( /obj/effect/decal/warning_stripes/west, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry) @@ -46013,7 +41702,6 @@ /area/engine/equipmentstorage) "bHZ" = ( /obj/machinery/vending/tool, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/engine/equipmentstorage) "bIa" = ( @@ -46100,10 +41788,6 @@ name = "Quarantine Lockdown"; opacity = 0 }, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "whiteblue"; @@ -46279,27 +41963,14 @@ dir = 1; icon_state = "pipe-c" }, -/obj/structure/snow{ - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel, /area/quartermaster/storage) -"bIx" = ( -/obj/structure/shuttle/engine/heater, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/shuttle/plating, -/area/shuttle/escape) "bIy" = ( /obj/item/radio/intercom{ frequency = 1459; name = "station intercom (General)"; pixel_x = 28 }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/purple{ - pixel_y = 19 - }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -46311,23 +41982,10 @@ }, /turf/simulated/floor/plasteel, /area/quartermaster/storage) -"bIA" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall_f5" - }, -/area/shuttle/escape) "bIB" = ( /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/maintenance/disposal) -"bIC" = ( -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall11" - }, -/area/shuttle/escape) "bID" = ( /obj/effect/decal/warning_stripes/north, /obj/structure/disposalpipe/segment{ @@ -46335,19 +41993,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/disposal) -"bIE" = ( -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall7" - }, -/area/shuttle/escape) -"bIF" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall_f9" - }, -/area/shuttle/escape) "bIG" = ( /obj/machinery/camera{ c_tag = "Cargo Delivery Office"; @@ -46359,10 +42004,6 @@ pixel_x = -24 }, /obj/machinery/telepad_cargo, -/obj/structure/snow{ - dir = 6; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "brown" @@ -46383,17 +42024,12 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, -/obj/structure/snow{ - dir = 10; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel, /area/quartermaster/office) "bIK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/quartermaster/office) "bIL" = ( @@ -46476,10 +42112,6 @@ /area/hallway/primary/central/east) "bIS" = ( /obj/structure/closet/secure_closet/cargotech, -/obj/item/decorations/sticky_decorations/flammable/christmas_stocking{ - pixel_y = 17 - }, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/quartermaster/storage) "bIT" = ( @@ -46505,12 +42137,16 @@ pixel_y = 3 }, /obj/item/hand_labeler, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/quartermaster/storage) "bIV" = ( /obj/structure/table, -/obj/structure/snow, +/obj/item/clothing/head/soft, +/obj/item/stamp/granted{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/clothing/head/soft, /turf/simulated/floor/plasteel, /area/quartermaster/storage) "bIW" = ( @@ -46528,10 +42164,6 @@ pixel_x = 0; pixel_y = 32 }, -/obj/item/decorations/sticky_decorations/flammable/christmas_stocking{ - pixel_y = 17 - }, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/quartermaster/storage) "bIY" = ( @@ -46543,13 +42175,6 @@ name = "station intercom (General)"; pixel_y = 25 }, -/obj/item/clothing/head/soft, -/obj/item/stamp/granted{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/clothing/head/soft, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/quartermaster/storage) "bIZ" = ( @@ -46560,7 +42185,6 @@ dir = 2; pixel_y = 24 }, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/quartermaster/storage) "bJa" = ( @@ -46626,7 +42250,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/quartermaster/storage) "bJg" = ( @@ -46908,10 +42531,6 @@ icon_state = "2-8"; tag = "" }, -/obj/structure/snow{ - dir = 1; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel{ icon_state = "whitebluefull"; tag = "icon-whitebluefull" @@ -46928,7 +42547,6 @@ icon_state = "alarm0"; pixel_x = -22 }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "brown" @@ -46963,27 +42581,15 @@ name = "Bridge Requests Console"; pixel_y = -30 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, -/obj/structure/snow, /turf/simulated/floor/wood, /area/bridge/meeting_room) "bJH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/red{ - pixel_y = 19 - }, -/obj/structure/snow{ - dir = 8; - icon_state = "snow_corner" - }, /turf/simulated/floor/carpet, /area/bridge/meeting_room) "bJI" = ( @@ -47004,10 +42610,6 @@ /area/bridge/meeting_room) "bJJ" = ( /obj/machinery/computer/crew, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -47074,8 +42676,6 @@ dir = 1; pixel_y = -24 }, -/obj/machinery/computer/arcade, -/obj/structure/snow, /turf/simulated/floor/wood, /area/crew_quarters/bar) "bJR" = ( @@ -47151,9 +42751,6 @@ /area/crew_quarters/bar) "bJW" = ( /obj/structure/closet/wardrobe/chemistry_white, -/obj/item/decorations/sticky_decorations/flammable/tinsel/blue{ - pixel_y = 19 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whiteyellow" @@ -47340,10 +42937,6 @@ /obj/structure/reagent_dispensers/watertank, /turf/simulated/floor/plating, /area/maintenance/asmaint2) -"bKm" = ( -/obj/structure/shuttle/engine/propulsion, -/turf/simulated/shuttle/plating, -/area/shuttle/escape) "bKn" = ( /obj/machinery/shower{ dir = 8; @@ -47370,7 +42963,8 @@ /area/toxins/lab) "bKp" = ( /obj/machinery/door/airlock/external{ - id_tag = "admin_home" + id_tag = "admin_home"; + locked = 1 }, /turf/simulated/floor/plating, /area/hallway/secondary/entry) @@ -47441,7 +43035,6 @@ /area/quartermaster/storage) "bKA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/quartermaster/storage) "bKB" = ( @@ -47452,7 +43045,6 @@ /obj/machinery/conveyor_switch/oneway{ id = "packageExternal" }, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/quartermaster/office) "bKD" = ( @@ -47525,10 +43117,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/snow{ - dir = 5; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "brown" @@ -47567,9 +43155,6 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/item/decorations/sticky_decorations/flammable/tinsel/red{ - pixel_y = 19 - }, /turf/simulated/floor/wood, /area/crew_quarters/captain) "bKM" = ( @@ -47577,9 +43162,6 @@ /obj/item/radio/intercom/private{ pixel_x = -28 }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/green{ - pixel_y = 19 - }, /turf/simulated/floor/wood, /area/crew_quarters/captain) "bKN" = ( @@ -47729,12 +43311,8 @@ /turf/simulated/floor/wood, /area/bridge/meeting_room) "bLb" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -47787,12 +43365,8 @@ }, /area/medical/morgue) "bLk" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -47825,21 +43399,7 @@ dir = 4 }, /mob/living/simple_animal/pig, -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "asteroid"; - tag = "icon-asteroid (NORTH)" - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "siding1"; - tag = "icon-siding1 (NORTH)" - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "siding2"; - tag = "icon-siding2 (NORTH)" - }, +/turf/simulated/floor/grass, /area/hydroponics) "bLo" = ( /obj/structure/disposalpipe/segment, @@ -47864,10 +43424,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/snow{ - dir = 5; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit) "bLq" = ( @@ -47880,10 +43436,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, -/obj/structure/snow{ - dir = 8; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit) "bLr" = ( @@ -47901,7 +43453,6 @@ initialize_directions = 10; level = 1 }, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit) "bLs" = ( @@ -47938,13 +43489,6 @@ opacity = 0 }, /obj/machinery/computer/med_data, -/obj/item/decorations/sticky_decorations/flammable/tinsel/blue{ - pixel_y = 19 - }, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whiteblue"; @@ -47966,9 +43510,6 @@ /obj/effect/landmark/start{ name = "Chemist" }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/blue{ - pixel_y = 19 - }, /turf/simulated/floor/plasteel{ icon_state = "whitebluefull"; tag = "icon-whitebluefull" @@ -48055,8 +43596,8 @@ /area/hallway/secondary/entry) "bLD" = ( /obj/structure/closet/secure_closet/reagents, -/obj/item/decorations/sticky_decorations/flammable/christmas_stocking{ - pixel_x = -17 +/obj/structure/disaster_counter/chemistry{ + pixel_x = -32 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -48248,21 +43789,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "asteroid"; - tag = "icon-asteroid (NORTH)" - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "siding1"; - tag = "icon-siding1 (NORTH)" - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "siding2"; - tag = "icon-siding2 (NORTH)" - }, +/turf/simulated/floor/grass, /area/hydroponics) "bLV" = ( /obj/item/storage/firstaid/o2{ @@ -48398,9 +43925,6 @@ initialize_directions = 11; level = 1 }, -/obj/structure/snow{ - icon_state = "snow_corner" - }, /turf/simulated/floor/plating, /area/maintenance/port) "bMi" = ( @@ -48411,7 +43935,6 @@ pixel_y = 24; req_access_txt = "31" }, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/quartermaster/storage) "bMj" = ( @@ -48420,19 +43943,11 @@ }, /obj/machinery/computer/rdconsole/core, /obj/effect/decal/warning_stripes/southwest, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, /turf/simulated/floor/plasteel, /area/toxins/lab) "bMk" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /turf/simulated/floor/plasteel, /area/quartermaster/office) @@ -48457,37 +43972,14 @@ dir = 8; pixel_x = -24 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 - }, -/obj/structure/snow{ - dir = 1; - icon_state = "snow_corner" +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "browncorner" }, /area/hallway/primary/central/west) -"bMo" = ( -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall12"; - tag = "icon-swall12" - }, -/area/shuttle/supply) -"bMp" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall_f6"; - tag = "icon-swall_f6" - }, -/area/shuttle/supply) "bMq" = ( /obj/machinery/light{ dir = 1 @@ -48496,17 +43988,8 @@ pixel_y = 27 }, /obj/machinery/hologram/holopad, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/quartermaster/storage) -"bMr" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall_f10"; - tag = "icon-swall_f10" - }, -/area/shuttle/supply) "bMs" = ( /turf/simulated/wall, /area/maintenance/maintcentral) @@ -48539,10 +44022,6 @@ d2 = 4; icon_state = "1-4" }, -/obj/structure/snow{ - dir = 9; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel, /area/quartermaster/storage) "bMx" = ( @@ -48561,16 +44040,6 @@ icon_state = "brown" }, /area/quartermaster/office) -"bMz" = ( -/obj/item/decorations/sticky_decorations/flammable/tinsel/red{ - pixel_y = 19 - }, -/obj/structure/snow{ - dir = 5; - icon_state = "snow_corner" - }, -/turf/simulated/floor/plasteel, -/area/bridge) "bMA" = ( /obj/machinery/mineral/ore_redemption, /turf/simulated/floor/plasteel, @@ -48597,10 +44066,6 @@ /obj/machinery/computer/account_database{ anchored = 1 }, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, /turf/simulated/floor/plasteel, /area/bridge/meeting_room) "bME" = ( @@ -48619,7 +44084,6 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/snow, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -48737,9 +44201,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/red{ - pixel_y = 19 - }, /turf/simulated/floor/wood, /area/crew_quarters/captain) "bMP" = ( @@ -48981,11 +44442,7 @@ }, /area/medical/morgue) "bNe" = ( -/obj/structure/sign/redcross{ - desc = "The Star of Life, a symbol of Medical Aid."; - icon_state = "lifestar"; - name = "Medbay" - }, +/obj/structure/sign/lifestar, /turf/simulated/wall/r_wall, /area/medical/chemistry) "bNf" = ( @@ -49193,9 +44650,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/purple{ - pixel_y = 19 - }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -49265,10 +44719,6 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/snow{ - dir = 1; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit) "bNx" = ( @@ -49305,12 +44755,6 @@ /area/medical/reception) "bNA" = ( /obj/effect/decal/warning_stripes/northeast, -/obj/item/radio/intercom{ - frequency = 1459; - name = "station intercom (General)"; - pixel_x = -28; - pixel_y = 22 - }, /turf/simulated/floor/plasteel, /area/medical/chemistry) "bNB" = ( @@ -49395,12 +44839,10 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/snow, /turf/simulated/floor/plating, /area/maintenance/port) "bNI" = ( /obj/machinery/atmospherics/unary/vent_pump/on, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/quartermaster/storage) "bNJ" = ( @@ -49431,9 +44873,6 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/blue{ - pixel_y = 19 - }, /turf/simulated/floor/plasteel{ icon_state = "whitebluefull"; tag = "icon-whitebluefull" @@ -49641,9 +45080,6 @@ }, /turf/simulated/floor/plating, /area/hallway/secondary/entry) -"bOc" = ( -/turf/simulated/shuttle/floor, -/area/shuttle/supply) "bOd" = ( /obj/machinery/door/poddoor{ id_tag = "trash"; @@ -49653,21 +45089,6 @@ /obj/structure/fans/tiny, /turf/simulated/floor/plating, /area/maintenance/disposal) -"bOe" = ( -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall3"; - tag = "icon-swall3" - }, -/area/shuttle/supply) -"bOf" = ( -/obj/machinery/light/spot{ - dir = 1; - icon_state = "tube1"; - tag = "icon-tube1 (NORTH)" - }, -/turf/simulated/shuttle/floor, -/area/shuttle/supply) "bOg" = ( /obj/machinery/camera{ c_tag = "Cargo Recieving Dock"; @@ -49692,6 +45113,20 @@ /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel, /area/quartermaster/storage) +"bOh" = ( +/obj/structure/cable{ + 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/quartermaster/storage) "bOi" = ( /obj/structure/cable{ d1 = 4; @@ -49735,7 +45170,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/quartermaster/storage) "bOl" = ( @@ -49834,10 +45268,6 @@ name = "station intercom (General)"; pixel_y = 25 }, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, /turf/simulated/floor/plasteel, /area/quartermaster/office) "bOu" = ( @@ -49947,10 +45377,6 @@ pixel_x = -22; pixel_y = 4 }, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "blue" @@ -50007,12 +45433,8 @@ /turf/simulated/floor/plating, /area/engine/gravitygenerator) "bOF" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 2; @@ -50026,12 +45448,8 @@ d2 = 4; icon_state = "2-4" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -50180,9 +45598,6 @@ /turf/simulated/wall, /area/medical/chemistry) "bOV" = ( -/obj/item/decorations/sticky_decorations/flammable/tinsel/blue{ - pixel_y = 19 - }, /turf/simulated/floor/plasteel{ icon_state = "whitebluefull"; tag = "icon-whitebluefull" @@ -50391,12 +45806,8 @@ }) "bPl" = ( /obj/effect/decal/warning_stripes/north, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /turf/simulated/floor/plasteel, /area/toxins/lab) @@ -50415,9 +45826,6 @@ /obj/structure/disposalpipe/trunk{ dir = 8 }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/purple{ - pixel_y = 19 - }, /turf/simulated/floor/plasteel, /area/assembly/robotics) "bPo" = ( @@ -50466,25 +45874,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit) -"bPv" = ( -/obj/structure/shuttle/engine/propulsion{ - dir = 8; - icon_state = "propulsion"; - tag = "icon-propulsion (EAST)" - }, -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall_f6" - }, -/area/shuttle/transport) "bPw" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/plating, /area/maintenance/disposal) @@ -50627,11 +46019,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/disposal) -"bPI" = ( -/turf/simulated/shuttle/wall{ - icon_state = "wall3" - }, -/area/shuttle/administration) "bPJ" = ( /obj/structure/cable{ d2 = 8; @@ -50674,13 +46061,6 @@ icon_state = "white" }, /area/medical/chemistry) -"bPL" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 8; - icon_state = "diagonalWall3" - }, -/area/shuttle/administration) "bPM" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ @@ -50694,21 +46074,6 @@ }, /area/crew_quarters/kitchen) "bPN" = ( -/obj/machinery/door/airlock/external{ - id_tag = "s_docking_airlock"; - name = "Shuttle Hatch"; - req_access_txt = "106" - }, -/obj/docking_port/mobile{ - dir = 2; - dwidth = 8; - height = 15; - id = "admin"; - name = "administration shuttle"; - roundstart_move = "admin_away"; - timid = 1; - width = 18 - }, /obj/docking_port/stationary{ dir = 2; dwidth = 9; @@ -50718,10 +46083,8 @@ timid = 1; width = 19 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) +/turf/space, +/area/space) "bPO" = ( /obj/machinery/conveyor_switch/oneway{ id = "QMLoad2" @@ -50729,12 +46092,9 @@ /turf/simulated/floor/plasteel, /area/quartermaster/storage) "bPP" = ( -/obj/structure/snow{ - dir = 6; - icon_state = "snow_corner" - }, -/turf/simulated/floor/carpet/black, -/area/chapel/office) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel, +/area/quartermaster/storage) "bPQ" = ( /obj/effect/decal/warning_stripes/arrow{ dir = 4; @@ -50746,13 +46106,6 @@ }, /turf/simulated/floor/plasteel, /area/quartermaster/storage) -"bPR" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 1; - icon_state = "diagonalWall3" - }, -/area/shuttle/administration) "bPS" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -50770,18 +46123,6 @@ }, /turf/simulated/floor/plating, /area/quartermaster/storage) -"bPU" = ( -/obj/structure/shuttle/engine/propulsion{ - dir = 8; - icon_state = "propulsion"; - tag = "icon-propulsion (EAST)" - }, -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall_f5" - }, -/area/shuttle/transport) "bPV" = ( /obj/effect/landmark/start{ name = "Cargo Technician" @@ -50789,9 +46130,6 @@ /obj/structure/chair/office/dark{ dir = 4 }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/green{ - pixel_y = 19 - }, /turf/simulated/floor/plasteel, /area/quartermaster/office) "bPW" = ( @@ -50804,7 +46142,6 @@ pixel_x = 5; pixel_y = 30 }, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/quartermaster/storage) "bPY" = ( @@ -50813,10 +46150,6 @@ pixel_y = 32 }, /obj/effect/decal/warning_stripes/west, -/obj/structure/snow{ - dir = 5; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel, /area/quartermaster/storage) "bPZ" = ( @@ -50856,7 +46189,6 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/quartermaster/storage) "bQd" = ( @@ -50994,12 +46326,8 @@ icon_state = "4-8"; pixel_x = 0 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/plasteel, /area/quartermaster/office) @@ -51174,9 +46502,6 @@ dir = 8 }, /obj/machinery/disposal, -/obj/item/decorations/sticky_decorations/flammable/tinsel/blue{ - pixel_y = 19 - }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whiteyellow" @@ -51200,9 +46525,6 @@ /area/medical/biostorage) "bQC" = ( /obj/structure/closet/secure_closet/medical3, -/obj/item/decorations/sticky_decorations/flammable/tinsel/blue{ - pixel_y = 19 - }, /turf/simulated/floor/plasteel{ icon_state = "whitebluefull"; tag = "icon-whitebluefull" @@ -51590,12 +46912,8 @@ /turf/simulated/floor/plasteel, /area/hallway/primary/central/se) "bRh" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /obj/structure/cable{ d1 = 1; @@ -51659,16 +46977,13 @@ /area/assembly/robotics) "bRm" = ( /obj/structure/table, -/obj/item/storage/firstaid/regular{ - empty = 1; +/obj/item/storage/firstaid/regular/empty{ name = "First-Aid (empty)" }, -/obj/item/storage/firstaid/regular{ - empty = 1; +/obj/item/storage/firstaid/regular/empty{ name = "First-Aid (empty)" }, -/obj/item/storage/firstaid/regular{ - empty = 1; +/obj/item/storage/firstaid/regular/empty{ name = "First-Aid (empty)" }, /obj/item/healthanalyzer, @@ -51774,33 +47089,6 @@ icon_state = "white" }, /area/medical/medbay2) -"bRu" = ( -/obj/machinery/vending/boozeomat, -/turf/simulated/shuttle/wall{ - icon_state = "wall3" - }, -/area/shuttle/administration) -"bRv" = ( -/obj/structure/table/reinforced, -/obj/machinery/chem_dispenser/beer, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) -"bRw" = ( -/obj/structure/table/reinforced, -/obj/item/storage/box/drinkingglasses, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) -"bRx" = ( -/obj/structure/table/reinforced, -/obj/machinery/chem_dispenser/soda, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) "bRy" = ( /obj/structure/chair/stool, /obj/effect/landmark/start{ @@ -51832,35 +47120,6 @@ icon_state = "white" }, /area/assembly/robotics) -"bRA" = ( -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) -"bRB" = ( -/obj/machinery/cell_charger, -/obj/structure/table, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) -"bRC" = ( -/obj/item/storage/toolbox/mechanical, -/obj/item/multitool, -/obj/structure/table, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) -"bRD" = ( -/obj/structure/table, -/obj/machinery/recharger{ - pixel_y = 4 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) "bRE" = ( /obj/machinery/firealarm{ dir = 4; @@ -51898,12 +47157,6 @@ }, /turf/simulated/floor/plasteel, /area/assembly/robotics) -"bRG" = ( -/turf/simulated/shuttle/wall{ - dir = 4; - icon_state = "wall3" - }, -/area/shuttle/administration) "bRH" = ( /obj/machinery/door/airlock/maintenance{ req_access_txt = "12" @@ -51928,13 +47181,6 @@ }, /turf/simulated/floor/plating, /area/quartermaster/storage) -"bRJ" = ( -/obj/structure/plasticflaps/mining, -/obj/machinery/conveyor/east{ - id = "QMLoad2" - }, -/turf/simulated/shuttle/plating, -/area/shuttle/supply) "bRK" = ( /obj/machinery/door/poddoor{ id_tag = "QMLoaddoor2"; @@ -51960,10 +47206,6 @@ /area/quartermaster/office) "bRN" = ( /obj/machinery/computer/supplycomp, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, /turf/simulated/floor/plasteel, /area/quartermaster/office) "bRO" = ( @@ -52003,12 +47245,8 @@ pixel_y = 0 }, /obj/effect/decal/warning_stripes/southeast, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -52086,12 +47324,8 @@ }, /area/hallway/primary/central/sw) "bSa" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit) @@ -52120,10 +47354,6 @@ /area/hallway/secondary/exit) "bSd" = ( /obj/machinery/computer/card, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "blue" @@ -52133,10 +47363,6 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/obj/structure/snow{ - dir = 5; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel, /area/quartermaster/storage) "bSf" = ( @@ -52165,7 +47391,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/quartermaster/storage) "bSh" = ( @@ -52194,7 +47419,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/quartermaster/storage) "bSk" = ( @@ -52241,7 +47465,6 @@ initialize_directions = 11; level = 1 }, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/quartermaster/storage) "bSn" = ( @@ -52347,11 +47570,7 @@ /area/medical/medbay2) "bSu" = ( /obj/effect/spawner/window/reinforced, -/obj/structure/sign/redcross{ - desc = "The Star of Life, a symbol of Medical Aid."; - icon_state = "lifestar"; - name = "Medbay" - }, +/obj/structure/sign/lifestar, /obj/machinery/door/poddoor{ density = 0; icon_state = "open"; @@ -52450,7 +47669,7 @@ }, /area/medical/genetics_cloning) "bSC" = ( -/obj/machinery/atmospherics/unary/cold_sink/freezer, +/obj/machinery/atmospherics/unary/thermomachine/freezer, /obj/machinery/alarm{ pixel_y = 25 }, @@ -52541,7 +47760,7 @@ pixel_x = 4; pixel_y = 4 }, -/obj/item/tank/anesthetic, +/obj/item/tank/internals/anesthetic, /obj/item/clothing/mask/breath/medical, /obj/item/reagent_containers/spray/cleaner{ desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back."; @@ -52727,9 +47946,6 @@ pixel_y = -24; req_access_txt = "29" }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/purple{ - pixel_y = 19 - }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -52838,7 +48054,6 @@ name = "Research and Development Desk"; req_access_txt = "47" }, -/obj/item/reagent_containers/food/snacks/candy/confectionery/caramel_nougat, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -52897,16 +48112,6 @@ }, /turf/simulated/floor/plasteel, /area/hallway/primary/central/sw) -"bTl" = ( -/obj/machinery/light/spot{ - dir = 4; - icon_state = "tube1"; - tag = "icon-tube1 (EAST)" - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) "bTm" = ( /obj/structure/table, /obj/item/pod_parts/core, @@ -52915,49 +48120,8 @@ pixel_y = 12 }, /obj/item/gps, -/obj/structure/snow{ - dir = 6; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel, /area/engine/mechanic_workshop) -"bTn" = ( -/obj/machinery/door/poddoor/preopen{ - id_tag = "adminshuttleblast"; - name = "Blast Doors"; - req_access_txt = "101" - }, -/obj/machinery/door/airlock/centcom{ - id_tag = "adminshuttle"; - name = "General Access"; - opacity = 1; - req_access_txt = "101" - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) -"bTo" = ( -/obj/machinery/light/spot{ - dir = 8; - icon_state = "tube1"; - tag = "icon-tube1 (WEST)" - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) -"bTp" = ( -/obj/item/stack/sheet/metal, -/obj/structure/table, -/obj/item/stack/sheet/glass{ - pixel_x = 4; - pixel_y = 4 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) "bTq" = ( /turf/simulated/floor/plating, /area/quartermaster/storage) @@ -52965,6 +48129,7 @@ /obj/machinery/door/firedoor, /obj/machinery/door/airlock/external{ id_tag = "supply_home"; + locked = 1; name = "Cargo Docking Hatch"; req_access_txt = "31" }, @@ -52979,14 +48144,6 @@ /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, /area/quartermaster/storage) -"bTt" = ( -/obj/machinery/door/airlock/external{ - id_tag = "s_docking_airlock"; - name = "Shuttle Hatch"; - req_access_txt = "31" - }, -/turf/simulated/shuttle/floor, -/area/shuttle/supply) "bTu" = ( /obj/machinery/conveyor_switch/oneway{ id = "QMLoad" @@ -53185,12 +48342,8 @@ /area/crew_quarters/heads) "bTL" = ( /obj/structure/closet/paramedic, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -53202,12 +48355,8 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -53279,15 +48428,8 @@ }, /area/medical/chemistry) "bTU" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 - }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/blue{ - pixel_y = 19 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /turf/simulated/floor/plasteel{ icon_state = "whitebluefull"; @@ -53313,12 +48455,8 @@ /turf/simulated/floor/plasteel, /area/assembly/chargebay) "bTX" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel, /area/assembly/robotics) @@ -53365,9 +48503,6 @@ }, /area/medical/genetics_cloning) "bUc" = ( -/obj/item/decorations/sticky_decorations/flammable/tinsel/blue{ - pixel_y = 19 - }, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, @@ -53486,9 +48621,6 @@ initialize_directions = 10; level = 1 }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/red{ - pixel_y = 19 - }, /turf/simulated/floor/plasteel, /area/quartermaster/office) "bUo" = ( @@ -53508,9 +48640,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/green{ - pixel_y = 19 - }, /turf/simulated/floor/carpet, /area/crew_quarters/heads) "bUr" = ( @@ -53580,12 +48709,8 @@ /turf/simulated/floor/plasteel, /area/engine/gravitygenerator) "bUw" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/plasteel, /area/engine/gravitygenerator) @@ -53616,18 +48741,18 @@ /area/engine/gravitygenerator) "bUA" = ( /obj/structure/table, -/obj/item/tank/emergency_oxygen/nitrogen{ +/obj/item/tank/internals/emergency_oxygen/nitrogen{ pixel_x = 5; pixel_y = 5 }, -/obj/item/tank/emergency_oxygen/nitrogen{ +/obj/item/tank/internals/emergency_oxygen/nitrogen{ pixel_x = 5 }, -/obj/item/tank/emergency_oxygen/plasma{ +/obj/item/tank/internals/emergency_oxygen/plasma{ pixel_x = -5; pixel_y = 5 }, -/obj/item/tank/emergency_oxygen/plasma{ +/obj/item/tank/internals/emergency_oxygen/plasma{ pixel_x = -5 }, /turf/simulated/floor/plasteel{ @@ -53644,12 +48769,8 @@ dir = 1; network = list("SS13") }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/carpet, /area/crew_quarters/captain/bedroom) @@ -53671,9 +48792,6 @@ dir = 8; pixel_x = -24 }, -/obj/item/decorations/sticky_decorations/flammable/christmas_stocking{ - pixel_y = -16 - }, /turf/simulated/floor/carpet, /area/crew_quarters/captain/bedroom) "bUE" = ( @@ -53689,10 +48807,6 @@ name = "Robotics Operating Computer" }, /obj/machinery/light, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -53765,8 +48879,8 @@ /area/hallway/primary/central/se) "bUM" = ( /obj/structure/closet/crate/freezer, -/obj/item/tank/emergency_oxygen/engi/empty, -/obj/item/tank/emergency_oxygen/engi/empty, +/obj/item/tank/internals/emergency_oxygen/engi/empty, +/obj/item/tank/internals/emergency_oxygen/engi/empty, /obj/item/reagent_containers/iv_bag/blood/AMinus, /obj/item/reagent_containers/iv_bag/blood/APlus, /obj/item/reagent_containers/iv_bag/blood/BMinus, @@ -53937,12 +49051,8 @@ }, /area/hallway/primary/central/sw) "bVa" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/carpet, /area/crew_quarters/heads) @@ -53980,44 +49090,6 @@ }, /turf/simulated/floor/plasteel, /area/crew_quarters/heads) -"bVe" = ( -/obj/machinery/kitchen_machine/microwave/upgraded, -/obj/structure/table, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) -"bVf" = ( -/obj/machinery/door/window/northright{ - name = "bar" - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) -"bVg" = ( -/obj/structure/table, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) -"bVh" = ( -/obj/item/ashtray/glass, -/obj/structure/table, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) -"bVi" = ( -/obj/item/storage/fancy/cigarettes/dromedaryco, -/obj/item/lighter/zippo{ - pixel_x = 5 - }, -/obj/structure/table, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) "bVj" = ( /obj/machinery/hologram/holopad, /obj/structure/cable{ @@ -54071,38 +49143,6 @@ }, /turf/simulated/floor/plasteel, /area/quartermaster/storage) -"bVm" = ( -/obj/machinery/light/spot{ - dir = 8; - icon_state = "tube1"; - tag = "icon-tube1 (WEST)" - }, -/turf/simulated/shuttle/floor, -/area/shuttle/supply) -"bVn" = ( -/obj/machinery/light/spot{ - dir = 4; - icon_state = "tube1"; - tag = "icon-tube1 (EAST)" - }, -/obj/machinery/door_control{ - id = "QMLoaddoor2"; - layer = 3; - name = "Loading Doors"; - pixel_x = 24; - pixel_y = 8; - req_access_txt = "0" - }, -/obj/machinery/door_control{ - id = "QMLoaddoor"; - layer = 3; - name = "Loading Doors"; - pixel_x = 24; - pixel_y = -8; - req_access_txt = "0" - }, -/turf/simulated/shuttle/floor, -/area/shuttle/supply) "bVo" = ( /obj/machinery/status_display{ layer = 4; @@ -54179,9 +49219,6 @@ /area/quartermaster/office) "bVu" = ( /obj/structure/closet/secure_closet/hop2, -/obj/item/decorations/sticky_decorations/flammable/christmas_stocking{ - pixel_x = -17 - }, /turf/simulated/floor/plasteel, /area/crew_quarters/heads) "bVv" = ( @@ -54224,12 +49261,8 @@ /turf/simulated/floor/plasteel, /area/crew_quarters/heads) "bVz" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/plasteel, /area/assembly/chargebay) @@ -54280,9 +49313,6 @@ pixel_x = 4; pixel_y = 0 }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/purple{ - pixel_y = 19 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitecorner" @@ -54629,12 +49659,8 @@ dir = 4; icon_state = "tube1" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel, /area/hallway/primary/central/se) @@ -54660,9 +49686,6 @@ pixel_y = 0 }, /obj/structure/closet/secure_closet/roboticist, -/obj/item/decorations/sticky_decorations/flammable/christmas_stocking{ - pixel_x = -17 - }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -54943,10 +49966,6 @@ /area/medical/genetics_cloning) "bWC" = ( /obj/machinery/computer/cloning, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, @@ -54985,63 +50004,11 @@ icon_state = "freezerfloor" }, /area/medical/genetics_cloning) -"bWG" = ( -/obj/structure/shuttle/engine/heater{ - dir = 8; - icon_state = "heater"; - tag = "icon-heater (WEST)" - }, -/obj/structure/window/plasmareinforced{ - color = "#FF0000"; - dir = 4 - }, -/turf/simulated/shuttle/wall{ - icon_state = "wall3" - }, -/area/shuttle/administration) "bWH" = ( /turf/simulated/floor/plasteel{ icon_state = "stairs-l" }, /area/hallway/primary/central/ne) -"bWI" = ( -/obj/structure/reagent_dispensers/fueltank, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) -"bWJ" = ( -/obj/structure/reagent_dispensers/watertank, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) -"bWK" = ( -/obj/machinery/recharge_station/upgraded, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) -"bWL" = ( -/obj/machinery/mecha_part_fabricator/upgraded, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) -"bWM" = ( -/obj/machinery/autolathe/upgraded{ - hacked = 1 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) -"bWN" = ( -/obj/structure/dispenser, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) "bWO" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/mining/glass{ @@ -55062,12 +50029,6 @@ /turf/simulated/floor/plasteel, /area/quartermaster/storage) "bWP" = ( -/obj/machinery/door/airlock/external{ - id_tag = "s_docking_airlock"; - name = "Shuttle Hatch"; - req_access_txt = "31" - }, -/obj/docking_port/mobile/supply, /obj/docking_port/stationary{ dir = 8; dwidth = 5; @@ -55076,15 +50037,8 @@ name = "supply bay"; width = 12 }, -/turf/simulated/shuttle/floor, -/area/shuttle/supply) -"bWQ" = ( -/obj/structure/plasticflaps/mining, -/obj/machinery/conveyor/west{ - id = "QMLoad" - }, -/turf/simulated/shuttle/plating, -/area/shuttle/supply) +/turf/space, +/area/space) "bWR" = ( /obj/structure/cable{ d1 = 1; @@ -55127,24 +50081,22 @@ /area/hallway/primary/central/sw) "bWT" = ( /obj/machinery/computer/arcade, +/obj/machinery/status_display{ + density = 0; + layer = 4; + pixel_x = 0; + pixel_y = 32 + }, /turf/simulated/floor/plasteel, /area/engine/break_room) "bWU" = ( /obj/machinery/light, /obj/machinery/computer/merch, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, /turf/simulated/floor/plasteel, /area/quartermaster/office) "bWV" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/plasteel, /area/quartermaster/storage) @@ -55210,10 +50162,6 @@ pixel_x = -24; pixel_y = 0 }, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "blue" @@ -55224,10 +50172,6 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -55448,9 +50392,6 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/red{ - pixel_y = 19 - }, /turf/simulated/floor/plasteel, /area/teleporter) "bXx" = ( @@ -55464,9 +50405,6 @@ pixel_x = -24; shock_proof = 0 }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/green{ - pixel_y = 19 - }, /turf/simulated/floor/plasteel, /area/teleporter) "bXy" = ( @@ -55629,14 +50567,16 @@ }, /area/medical/sleeper) "bXK" = ( -/obj/item/twohanded/required/kirbyplants, /obj/machinery/firealarm{ dir = 8; pixel_x = -24 }, -/turf/simulated/floor/plasteel{ - icon_state = "freezerfloor" +/obj/machinery/shower{ + dir = 4; + icon_state = "shower" }, +/obj/effect/decal/warning_stripes/blue/hollow, +/turf/simulated/floor/plasteel/dark, /area/medical/cryo) "bXL" = ( /obj/structure/table/glass, @@ -55663,7 +50603,6 @@ /turf/simulated/floor/plating, /area/medical/genetics) "bXO" = ( -/obj/item/twohanded/required/kirbyplants, /obj/machinery/power/apc{ cell_type = 15000; dir = 4; @@ -55674,9 +50613,11 @@ d2 = 2; icon_state = "0-2" }, -/turf/simulated/floor/plasteel{ - icon_state = "freezerfloor" +/obj/machinery/shower{ + dir = 8 }, +/obj/effect/decal/warning_stripes/blue/hollow, +/turf/simulated/floor/plasteel/dark, /area/medical/cryo) "bXP" = ( /obj/structure/disposalpipe/segment, @@ -55879,12 +50820,8 @@ /turf/simulated/floor/plasteel, /area/hallway/primary/central/se) "bYd" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -55900,12 +50837,8 @@ }, /area/medical/medbay2) "bYf" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -55915,12 +50848,8 @@ /area/medical/medbay2) "bYg" = ( /obj/machinery/atmospherics/pipe/simple/hidden, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" @@ -56035,12 +50964,8 @@ /turf/simulated/floor/plasteel, /area/escapepodbay) "bYr" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel, /area/quartermaster/storage) @@ -56053,12 +50978,6 @@ tag = "icon-whiteblue (NORTH)" }, /area/medical/sleeper) -"bYt" = ( -/obj/machinery/door/airlock/public/glass, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) "bYu" = ( /obj/machinery/door/firedoor, /obj/machinery/door/poddoor{ @@ -56080,13 +50999,6 @@ tag = "icon-whiteblue (WEST)" }, /area/medical/reception) -"bYv" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 4; - icon_state = "diagonalWall3" - }, -/area/shuttle/administration) "bYw" = ( /obj/machinery/door/poddoor{ id_tag = "QMLoaddoor"; @@ -56154,12 +51066,8 @@ }, /area/medical/sleeper) "bYD" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel, /area/quartermaster/office) @@ -56423,7 +51331,7 @@ /area/teleporter) "bZc" = ( /obj/structure/rack, -/obj/item/tank/oxygen, +/obj/item/tank/internals/oxygen, /obj/item/clothing/mask/gas, /turf/simulated/floor/plating, /area/teleporter) @@ -56588,6 +51496,7 @@ dir = 2; icon_state = "pipe-c" }, +/obj/effect/decal/warning_stripes/blue/partial, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, @@ -56606,9 +51515,6 @@ dir = 1 }, /obj/machinery/hologram/holopad, -/obj/item/decorations/sticky_decorations/flammable/tinsel/blue{ - pixel_y = 19 - }, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, @@ -56628,6 +51534,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/effect/decal/warning_stripes/blue/partial, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, @@ -56681,10 +51588,6 @@ pixel_x = -32; pixel_y = -8 }, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "darkblue" @@ -57176,10 +52079,6 @@ pixel_x = -2; pixel_y = 30 }, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "cafeteria"; @@ -57299,37 +52198,6 @@ /area/medical/research{ name = "Research Division" }) -"cae" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - icon_state = "diagonalWall3" - }, -/area/shuttle/administration) -"caf" = ( -/obj/machinery/vending/snack, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) -"cag" = ( -/obj/machinery/vending/cola, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) -"cah" = ( -/obj/machinery/vending/coffee, -/obj/machinery/light/spot, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) -"cai" = ( -/obj/machinery/vending/cigarette, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) "caj" = ( /obj/machinery/camera{ c_tag = "Research Hallway West"; @@ -57347,12 +52215,6 @@ /area/medical/research{ name = "Research Division" }) -"cak" = ( -/obj/machinery/computer/communications, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) "cal" = ( /obj/structure/extinguisher_cabinet{ pixel_x = -5; @@ -57394,38 +52256,12 @@ /area/quartermaster/qm) "cap" = ( /obj/machinery/computer/supplycomp, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, /turf/simulated/floor/plasteel, /area/quartermaster/qm) "caq" = ( /obj/machinery/computer/security/mining, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, /turf/simulated/floor/plasteel, /area/quartermaster/qm) -"car" = ( -/obj/machinery/door/poddoor/shutters{ - density = 0; - dir = 4; - icon_state = "open"; - id_tag = "adminshuttleshutters"; - name = "Blast Shutters"; - opacity = 0 - }, -/obj/structure/grille, -/obj/structure/shuttle/window{ - dir = 8; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "window5_end"; - tag = "icon-window5_end (WEST)" - }, -/turf/simulated/floor/plating, -/area/shuttle/administration) "cas" = ( /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, @@ -57449,10 +52285,6 @@ dir = 4; icon_state = "tube1" }, -/obj/structure/snow{ - dir = 6; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel, /area/quartermaster/qm) "cau" = ( @@ -57803,10 +52635,6 @@ /area/medical/medbay2) "caR" = ( /obj/machinery/computer/crew, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkblue" @@ -57882,10 +52710,6 @@ "caX" = ( /obj/machinery/computer/scan_consolenew, /obj/structure/window/reinforced, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitepurplefull"; @@ -57937,12 +52761,8 @@ /turf/simulated/floor/plating, /area/maintenance/asmaint2) "cbb" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel, /area/escapepodbay) @@ -57991,12 +52811,8 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -58015,12 +52831,8 @@ }, /obj/structure/closet/radiation, /obj/machinery/light, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/plasteel, /area/engine/gravitygenerator) @@ -58048,10 +52860,6 @@ }) "cbl" = ( /obj/machinery/computer/teleporter, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, /turf/simulated/floor/plating, /area/teleporter) "cbm" = ( @@ -58117,10 +52925,6 @@ /area/crew_quarters/hor) "cbq" = ( /obj/machinery/computer/robotics, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "cafeteria"; @@ -58203,14 +53007,6 @@ /obj/effect/decal/warning_stripes/northwest, /turf/simulated/floor/plasteel/airless, /area/toxins/test_area) -"cbx" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 4 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) "cby" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/medical/glass{ @@ -58237,56 +53033,6 @@ }, /turf/simulated/floor/plasteel, /area/quartermaster/office) -"cbA" = ( -/obj/machinery/door/poddoor/shutters{ - density = 0; - dir = 4; - icon_state = "open"; - id_tag = "adminshuttleshutters"; - name = "Blast Shutters"; - opacity = 0 - }, -/obj/structure/grille, -/obj/structure/shuttle/window{ - dir = 4; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "window5_mid"; - tag = "icon-window5 (EAST)" - }, -/turf/simulated/floor/plating, -/area/shuttle/administration) -"cbB" = ( -/turf/simulated/shuttle/floor, -/turf/simulated/shuttle/wall/interior{ - icon_state = "swall_f10"; - tag = "icon-swall_f10" - }, -/area/shuttle/supply) -"cbC" = ( -/obj/machinery/light/spot, -/turf/simulated/shuttle/floor, -/area/shuttle/supply) -"cbD" = ( -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall7"; - tag = "icon-swall7" - }, -/area/shuttle/supply) -"cbE" = ( -/turf/simulated/shuttle/floor, -/turf/simulated/shuttle/wall/interior{ - icon_state = "swall_f6"; - tag = "icon-swall_f6" - }, -/area/shuttle/supply) -"cbF" = ( -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall11"; - tag = "icon-swall11" - }, -/area/shuttle/supply) "cbG" = ( /obj/structure/lattice, /obj/structure/sign/securearea{ @@ -58355,17 +53101,9 @@ /obj/effect/landmark/start{ name = "Quartermaster" }, -/obj/structure/snow{ - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel, /area/quartermaster/qm) "cbM" = ( -/obj/item/decorations/sticky_decorations/flammable/tinsel/green{ - pixel_y = 19 - }, -/obj/item/decorations/sticky_decorations/flammable/snowman, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/quartermaster/qm) "cbN" = ( @@ -58413,7 +53151,6 @@ pixel_x = 28 }, /obj/structure/disposalpipe/segment, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/quartermaster/qm) "cbS" = ( @@ -58515,8 +53252,8 @@ /area/medical/genetics_cloning) "cca" = ( /obj/structure/closet/crate/freezer, -/obj/item/tank/emergency_oxygen/engi/empty, -/obj/item/tank/emergency_oxygen/engi/empty, +/obj/item/tank/internals/emergency_oxygen/engi/empty, +/obj/item/tank/internals/emergency_oxygen/engi/empty, /obj/item/reagent_containers/iv_bag/blood/AMinus, /obj/item/reagent_containers/iv_bag/blood/APlus, /obj/item/reagent_containers/iv_bag/blood/BMinus, @@ -58831,8 +53568,7 @@ /obj/machinery/computer/security/telescreen{ desc = "Used for watching the RD's goons from the safety of his office."; name = "Research Monitor"; - network = list("Research","Research Outpost","RD"); - pixel_x = 0; + network = list("Research","MiniSat","RD"); pixel_y = 2 }, /obj/structure/table/glass, @@ -58909,7 +53645,7 @@ }, /area/medical/cryo) "ccy" = ( -/obj/machinery/atmospherics/unary/cold_sink/freezer{ +/obj/machinery/atmospherics/unary/thermomachine/freezer{ dir = 1 }, /obj/machinery/camera{ @@ -59002,11 +53738,7 @@ }, /area/medical/medbay2) "ccD" = ( -/obj/structure/sign/redcross{ - desc = "The Star of Life, a symbol of Medical Aid."; - icon_state = "lifestar"; - name = "Medbay" - }, +/obj/structure/sign/lifestar, /turf/simulated/wall, /area/medical/cryo) "ccE" = ( @@ -59104,9 +53836,6 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/snow{ - icon_state = "snow_corner" - }, /turf/simulated/floor/wood, /area/blueshield) "ccL" = ( @@ -59157,9 +53886,6 @@ name = "station intercom (General)"; pixel_y = 25 }, -/obj/item/decorations/sticky_decorations/flammable/christmas_stocking{ - pixel_x = -17 - }, /turf/simulated/floor/plasteel, /area/janitor) "ccP" = ( @@ -59168,9 +53894,6 @@ /turf/simulated/floor/plasteel, /area/escapepodbay) "ccQ" = ( -/obj/item/decorations/sticky_decorations/flammable/tinsel/blue{ - pixel_y = 19 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitepurple"; @@ -59189,8 +53912,8 @@ "ccS" = ( /obj/structure/closet/emcloset, /obj/item/clothing/mask/breath, -/obj/item/tank/emergency_oxygen, -/obj/item/tank/emergency_oxygen, +/obj/item/tank/internals/emergency_oxygen, +/obj/item/tank/internals/emergency_oxygen, /obj/item/clothing/mask/breath, /obj/effect/decal/warning_stripes/yellow/hollow, /obj/effect/decal/warning_stripes/east, @@ -59327,11 +54050,7 @@ }, /area/engine/gravitygenerator) "cdb" = ( -/obj/machinery/atmospherics/unary/cold_sink/freezer{ - current_temperature = 80; - dir = 2; - on = 1 - }, +/obj/machinery/atmospherics/unary/thermomachine/freezer/on/server, /obj/item/radio/intercom{ broadcasting = 0; name = "station intercom (General)"; @@ -59396,10 +54115,6 @@ /area/crew_quarters/hor) "cdg" = ( /obj/machinery/computer/mecha, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "cafeteria"; @@ -59433,12 +54148,8 @@ }, /area/crew_quarters/hor) "cdj" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -59456,18 +54167,6 @@ icon_state = "white" }, /area/crew_quarters/hor) -"cdl" = ( -/obj/machinery/dna_scannernew/upgraded, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, -/area/shuttle/administration) -"cdm" = ( -/obj/machinery/computer/cloning, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, -/area/shuttle/administration) "cdn" = ( /obj/structure/cable{ d1 = 1; @@ -59481,23 +54180,6 @@ icon_state = "white" }, /area/medical/genetics) -"cdo" = ( -/obj/machinery/computer/scan_consolenew, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, -/area/shuttle/administration) -"cdp" = ( -/obj/machinery/clonepod/upgraded, -/obj/machinery/light/spot{ - dir = 1; - icon_state = "tube1"; - tag = "icon-tube1 (NORTH)" - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, -/area/shuttle/administration) "cdq" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/medical/glass{ @@ -59529,62 +54211,6 @@ icon_state = "freezerfloor" }, /area/medical/genetics_cloning) -"cdr" = ( -/obj/machinery/computer/camera_advanced/shuttle_docker/admin{ - name = "NTV Argos shuttle navigation computer" - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) -"cds" = ( -/obj/machinery/door/poddoor/shutters{ - density = 0; - dir = 4; - icon_state = "open"; - id_tag = "adminshuttleshutters"; - name = "Blast Shutters"; - opacity = 0 - }, -/obj/structure/grille, -/obj/structure/shuttle/window{ - dir = 4; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "window5_end"; - tag = "icon-window5_end (EAST)" - }, -/turf/simulated/floor/plating, -/area/shuttle/administration) -"cdt" = ( -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall15"; - tag = "icon-swall15" - }, -/area/shuttle/supply) -"cdu" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/shuttle/engine/heater, -/turf/simulated/shuttle/plating, -/area/shuttle/supply) -"cdv" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall_f5"; - tag = "icon-swall_f5" - }, -/area/shuttle/supply) -"cdw" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall_f9"; - tag = "icon-swall_f9" - }, -/area/shuttle/supply) "cdx" = ( /obj/structure/chair/office/dark{ dir = 8 @@ -59605,9 +54231,6 @@ pixel_x = -30; pixel_y = 0 }, -/obj/item/reagent_containers/food/snacks/candy/confectionery/rice, -/obj/item/reagent_containers/food/snacks/candy/confectionery/rice, -/obj/item/reagent_containers/food/snacks/candy/confectionery/rice, /turf/simulated/floor/plasteel, /area/quartermaster/miningdock) "cdz" = ( @@ -59632,9 +54255,6 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/snow{ - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel, /area/quartermaster/miningdock) "cdB" = ( @@ -59677,7 +54297,6 @@ pixel_x = 2; pixel_y = 6 }, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/quartermaster/qm) "cdE" = ( @@ -59686,16 +54305,11 @@ c_tag = "Quartermaster's Office"; dir = 8 }, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/quartermaster/qm) "cdF" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 5; @@ -59705,20 +54319,10 @@ name = "Research Division" }) "cdG" = ( -/obj/structure/table, -/obj/machinery/status_display{ - density = 0; - layer = 4; - pixel_x = 0; - pixel_y = 32 - }, -/obj/item/reagent_containers/food/snacks/candy/confectionery/nougat{ - pixel_x = -7 - }, -/obj/item/reagent_containers/food/snacks/candy/confectionery/nougat, -/obj/item/reagent_containers/food/snacks/candy/confectionery/nougat{ - pixel_x = 8 +/obj/machinery/shower{ + pixel_y = 8 }, +/obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, /area/engine/break_room) "cdH" = ( @@ -59766,9 +54370,6 @@ /obj/effect/landmark/start{ name = "Research Director" }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/purple{ - pixel_y = 19 - }, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "cafeteria"; @@ -59779,12 +54380,8 @@ /turf/simulated/floor/plasteel, /area/hallway/primary/central/south) "cdO" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -59813,12 +54410,8 @@ /turf/simulated/floor/plasteel, /area/quartermaster/qm) "cdR" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /turf/simulated/floor/plasteel, /area/quartermaster/qm) @@ -59985,9 +54578,6 @@ /area/medical/medbay2) "cej" = ( /obj/structure/filingcabinet/chestdrawer, -/obj/item/decorations/sticky_decorations/flammable/tinsel/blue{ - pixel_y = 19 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkblue" @@ -60001,9 +54591,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/blue{ - pixel_y = 19 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkblue" @@ -60014,9 +54601,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/item/decorations/sticky_decorations/flammable/tinsel/blue{ - pixel_y = 19 - }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkblue" @@ -60178,10 +54762,6 @@ icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, -/obj/structure/snow{ - dir = 5; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel, /area/quartermaster/storage) "ceF" = ( @@ -60306,11 +54886,6 @@ icon_state = "white" }, /area/crew_quarters/hor) -"ceR" = ( -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, -/area/shuttle/administration) "ceS" = ( /obj/machinery/alarm{ dir = 8; @@ -60354,50 +54929,6 @@ }, /turf/simulated/floor/plasteel, /area/hallway/primary/central/se) -"ceU" = ( -/obj/structure/shuttle/engine/propulsion, -/turf/simulated/shuttle/plating, -/area/shuttle/supply) -"ceV" = ( -/obj/structure/shuttle/engine/propulsion{ - icon_state = "burst_l"; - tag = "icon-burst_l" - }, -/turf/simulated/shuttle/plating, -/area/shuttle/supply) -"ceW" = ( -/obj/structure/shuttle/engine/propulsion{ - icon_state = "burst_r"; - tag = "icon-burst_r" - }, -/turf/simulated/shuttle/plating, -/area/shuttle/supply) -"ceX" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall_f6" - }, -/area/shuttle/mining) -"ceY" = ( -/obj/structure/window/full/shuttle, -/obj/structure/grille, -/turf/simulated/shuttle/plating, -/area/shuttle/mining) -"ceZ" = ( -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall12" - }, -/area/shuttle/mining) -"cfa" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall_f10"; - tag = "icon-swall_f10" - }, -/area/shuttle/mining) "cfb" = ( /turf/simulated/floor/plasteel, /area/quartermaster/miningdock) @@ -60406,10 +54937,6 @@ /obj/effect/landmark/start{ name = "Shaft Miner" }, -/obj/structure/snow{ - dir = 10; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel, /area/quartermaster/miningdock) "cfd" = ( @@ -60419,10 +54946,6 @@ pixel_y = 7 }, /obj/item/megaphone, -/obj/structure/snow{ - dir = 4; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel, /area/quartermaster/qm) "cfe" = ( @@ -60438,9 +54961,6 @@ pixel_y = -4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/snow{ - icon_state = "snow_surround" - }, /turf/simulated/floor/plasteel, /area/quartermaster/qm) "cff" = ( @@ -60455,13 +54975,6 @@ dir = 4; network = list("SS13") }, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, -/obj/structure/snow{ - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel, /area/quartermaster/miningdock) "cfg" = ( @@ -60471,7 +54984,6 @@ pixel_x = 24 }, /obj/structure/disposalpipe/segment, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/quartermaster/qm) "cfh" = ( @@ -60502,12 +55014,8 @@ /turf/simulated/floor/plasteel, /area/hallway/primary/central/sw) "cfj" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -60710,9 +55218,6 @@ pixel_x = 0; pixel_y = 25 }, -/obj/item/decorations/sticky_decorations/flammable/christmas_stocking{ - pixel_y = 17 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitebluecorner"; @@ -60835,9 +55340,6 @@ pixel_x = 0; pixel_y = 25 }, -/obj/item/decorations/sticky_decorations/flammable/christmas_stocking{ - pixel_y = 17 - }, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "whitebluecorner"; @@ -61058,7 +55560,6 @@ icon_state = "2-8"; tag = "" }, -/obj/item/toy/cattoy, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkbluecorners" @@ -61155,18 +55656,10 @@ /obj/machinery/light_switch{ pixel_y = -23 }, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, /turf/simulated/floor/plasteel/dark, /area/toxins/server) "cgg" = ( /obj/machinery/computer/message_monitor, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, /turf/simulated/floor/plasteel/dark, /area/toxins/server) "cgh" = ( @@ -61298,9 +55791,6 @@ /obj/machinery/atmospherics/pipe/simple/insulated, /turf/simulated/wall/r_wall, /area/toxins/mixing) -"cgu" = ( -/turf/simulated/wall/r_wall/coated, -/area/toxins/mixing) "cgv" = ( /obj/machinery/photocopier, /turf/simulated/floor/plasteel{ @@ -61309,74 +55799,21 @@ tag = "icon-cafeteria (NORTHEAST)" }, /area/crew_quarters/hor) -"cgw" = ( -/obj/machinery/bodyscanner, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, -/area/shuttle/administration) "cgy" = ( /obj/machinery/door/poddoor{ id_tag = "ToxinsVenting"; name = "Toxins Venting Bay Door"; use_power = 0 }, -/turf/simulated/floor/engine/insulated/vacuum, +/turf/simulated/floor/engine/vacuum, /area/toxins/mixing) -"cgz" = ( -/obj/structure/window/plasmareinforced{ - color = "#FF0000"; - dir = 8 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) -"cgA" = ( -/obj/machinery/light/spot{ - dir = 4; - icon_state = "tube1"; - tag = "icon-tube1 (EAST)" - }, -/obj/structure/chair/comfy/shuttle{ - dir = 8 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) -"cgB" = ( -/obj/structure/table, -/turf/simulated/shuttle/floor, -/area/shuttle/mining) -"cgC" = ( -/obj/machinery/computer/shuttle/mining, -/turf/simulated/shuttle/floor, -/area/shuttle/mining) -"cgD" = ( -/obj/structure/table, -/obj/machinery/light/small{ - dir = 1 - }, -/turf/simulated/shuttle/floor, -/area/shuttle/mining) "cgE" = ( /turf/simulated/wall/r_wall, /area/toxins/launch{ name = "Toxins Launch Room" }) -"cgF" = ( -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall3" - }, -/area/shuttle/mining) "cgG" = ( /obj/structure/closet/wardrobe/miner, -/obj/structure/snow{ - dir = 4; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "brown" @@ -61384,10 +55821,6 @@ /area/quartermaster/miningdock) "cgH" = ( /obj/machinery/computer/shuttle/mining, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "brown" @@ -61455,12 +55888,8 @@ icon_state = "pipe-j2"; tag = "icon-pipe-j1 (WEST)" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -61486,7 +55915,6 @@ name = "Quartermaster"; req_access_txt = "41" }, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/quartermaster/qm) "cgO" = ( @@ -61494,12 +55922,8 @@ dir = 5; icon_state = "intact" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" @@ -61519,10 +55943,6 @@ d2 = 8; icon_state = "0-8" }, -/obj/structure/snow{ - dir = 8; - icon_state = "snow_surround" - }, /turf/simulated/floor/plasteel, /area/quartermaster/qm) "cgQ" = ( @@ -61736,9 +56156,6 @@ d2 = 4; icon_state = "0-4" }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/blue{ - pixel_y = 19 - }, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "darkblue" @@ -61759,9 +56176,6 @@ tag = "" }, /obj/machinery/hologram/holopad, -/obj/item/decorations/sticky_decorations/flammable/tinsel/blue{ - pixel_y = 19 - }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "darkblue" @@ -61799,9 +56213,6 @@ tag = "" }, /obj/machinery/hologram/holopad, -/obj/item/decorations/sticky_decorations/flammable/tinsel/blue{ - pixel_y = 19 - }, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "darkblue" @@ -61827,9 +56238,6 @@ d2 = 8; icon_state = "0-8" }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/blue{ - pixel_y = 19 - }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "darkblue" @@ -61890,12 +56298,8 @@ dir = 9; icon_state = "intact" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel/dark, /area/toxins/server) @@ -61949,9 +56353,6 @@ /obj/structure/closet/secure_closet/CMO, /obj/item/clothing/mask/gas, /obj/item/storage/briefcase, -/obj/item/decorations/sticky_decorations/flammable/christmas_stocking{ - pixel_y = -16 - }, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "darkblue" @@ -62036,10 +56437,6 @@ icon_state = "alarm0"; pixel_x = 24 }, -/obj/structure/snow{ - dir = 8; - icon_state = "snow_corner" - }, /turf/simulated/floor/wood, /area/ntrep) "chI" = ( @@ -62172,9 +56569,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/purple{ - pixel_y = 19 - }, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "cafeteria"; @@ -62279,10 +56673,6 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/obj/structure/snow{ - dir = 6; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel, /area/quartermaster/miningdock) "chY" = ( @@ -62301,19 +56691,19 @@ /obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{ dir = 4 }, -/turf/simulated/wall/r_wall/coated, +/turf/simulated/wall/r_wall, /area/toxins/mixing) "cia" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 4 }, -/turf/simulated/floor/engine/insulated/vacuum, +/turf/simulated/floor/engine/vacuum, /area/toxins/mixing) "cib" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 10 }, -/turf/simulated/floor/engine/insulated/vacuum, +/turf/simulated/floor/engine/vacuum, /area/toxins/mixing) "cic" = ( /obj/effect/spawner/window/reinforced, @@ -62337,26 +56727,6 @@ icon_state = "white" }, /area/toxins/mixing) -"cig" = ( -/obj/machinery/sleeper/upgraded{ - dir = 4 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, -/area/shuttle/administration) -"cih" = ( -/obj/machinery/chem_master, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, -/area/shuttle/administration) -"cii" = ( -/obj/machinery/chem_dispenser, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, -/area/shuttle/administration) "cij" = ( /obj/structure/sign/securearea{ desc = "A warning sign which reads 'BOMB RANGE"; @@ -62364,43 +56734,6 @@ }, /turf/simulated/wall/r_wall, /area/toxins/test_area) -"cik" = ( -/obj/machinery/door/airlock/centcom{ - id_tag = "adminshuttle"; - name = "Holding Cell"; - opacity = 1; - req_access_txt = "104" - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) -"cil" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 8 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) -"cim" = ( -/turf/simulated/shuttle/floor, -/area/shuttle/mining) -"cin" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 1 - }, -/turf/simulated/shuttle/floor, -/area/shuttle/mining) -"cio" = ( -/obj/machinery/door/window/brigdoor/westleft{ - color = "#d70000"; - req_access_txt = "104" - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) "cip" = ( /obj/effect/decal/warning_stripes/northwest, /turf/simulated/floor/plasteel, @@ -62418,7 +56751,6 @@ /obj/effect/landmark/start{ name = "Shaft Miner" }, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/quartermaster/miningdock) "cis" = ( @@ -62434,7 +56766,6 @@ level = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/quartermaster/miningdock) "cit" = ( @@ -62451,36 +56782,20 @@ /area/quartermaster/miningdock) "ciu" = ( /obj/machinery/atmospherics/unary/vent_pump/on, -/obj/item/decorations/sticky_decorations/flammable/tinsel/red{ - pixel_y = 19 - }, -/obj/structure/snow{ - dir = 6; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel, /area/quartermaster/qm) "civ" = ( /obj/machinery/hologram/holopad, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/item/decorations/sticky_decorations/flammable/tinsel/red{ - pixel_y = 19 - }, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/quartermaster/qm) "ciw" = ( /obj/structure/closet/secure_closet/quartermaster, -/obj/item/decorations/sticky_decorations/flammable/christmas_stocking{ - pixel_y = -16 - }, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/quartermaster/qm) "cix" = ( /obj/structure/table, /obj/item/coin/silver, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/quartermaster/qm) "ciy" = ( @@ -62510,7 +56825,6 @@ dir = 4; icon_state = "tube1" }, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/quartermaster/qm) "ciA" = ( @@ -62567,10 +56881,6 @@ icon_state = "1-2" }, /obj/machinery/computer/operating, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkblue" @@ -62629,10 +56939,6 @@ icon_state = "1-2" }, /obj/machinery/computer/operating, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkblue" @@ -62913,15 +57219,10 @@ pixel_x = 32 }, /obj/machinery/photocopier, -/obj/structure/snow{ - dir = 8; - icon_state = "snow_corner" - }, /turf/simulated/floor/wood, /area/blueshield) "cjd" = ( /obj/machinery/photocopier, -/obj/structure/snow, /turf/simulated/floor/wood, /area/ntrep) "cje" = ( @@ -62932,16 +57233,10 @@ /obj/item/folder, /obj/item/pen/multi/fountain, /obj/item/stamp/rep, -/obj/structure/snow, /turf/simulated/floor/carpet, /area/ntrep) "cjf" = ( /obj/structure/table/wood, -/obj/structure/snow, -/obj/item/a_gift, -/obj/item/id_decal/centcom, -/obj/item/gun/projectile/shotgun/toy/tommygun, -/obj/item/ammo_box/magazine/internal/shot/toy/tommygun, /turf/simulated/floor/carpet, /area/ntrep) "cjg" = ( @@ -62954,10 +57249,6 @@ pixel_x = 24; pixel_y = 0 }, -/obj/structure/snow{ - dir = 10; - icon_state = "snow_corner" - }, /turf/simulated/floor/wood, /area/ntrep) "cjh" = ( @@ -62968,12 +57259,8 @@ icon_state = "2-8"; tag = "" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel, /area/hallway/primary/central/south) @@ -63106,12 +57393,8 @@ /turf/simulated/floor/plating, /area/maintenance/asmaint) "cjt" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -63142,9 +57425,6 @@ /obj/item/clothing/under/rank/medical/blue, /obj/item/clothing/under/rank/medical/green, /obj/item/clothing/under/rank/medical/purple, -/obj/item/decorations/sticky_decorations/flammable/christmas_stocking{ - pixel_y = 17 - }, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "cafeteria"; @@ -63365,12 +57645,8 @@ dir = 1; pixel_y = -24 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel/dark/telecomms, /area/toxins/server_coldroom) @@ -63487,9 +57763,6 @@ dir = 1; pixel_y = -24 }, -/obj/item/decorations/sticky_decorations/flammable/christmas_stocking{ - pixel_y = -16 - }, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "cafeteria"; @@ -63521,7 +57794,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/quartermaster/miningdock) "cjV" = ( @@ -63543,7 +57815,7 @@ /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 9 }, -/turf/simulated/floor/engine/insulated/vacuum, +/turf/simulated/floor/engine/vacuum, /area/toxins/mixing) "cjY" = ( /obj/structure/cable{ @@ -63570,12 +57842,6 @@ /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plasteel/airless, /area/toxins/test_area) -"ckd" = ( -/obj/machinery/iv_drip, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, -/area/shuttle/administration) "cke" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 4 @@ -63584,70 +57850,9 @@ frequency = 1222; id_tag = "burn_sensor" }, -/turf/simulated/floor/engine/insulated/vacuum, +/turf/simulated/floor/engine/vacuum, /area/toxins/mixing) -"ckf" = ( -/obj/machinery/light/spot{ - dir = 4; - icon_state = "tube1"; - tag = "icon-tube1 (EAST)" - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, -/area/shuttle/administration) -"ckg" = ( -/obj/structure/table, -/obj/item/storage/box/handcuffs, -/obj/machinery/light/spot{ - dir = 8; - icon_state = "tube1"; - tag = "icon-tube1 (WEST)" - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) -"ckh" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 1 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) -"cki" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/turf/simulated/shuttle/floor, -/area/shuttle/mining) -"ckj" = ( -/obj/structure/window/plasmareinforced{ - color = "#FF0000"; - dir = 8 - }, -/obj/structure/chair/comfy/shuttle{ - dir = 1 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) "ckk" = ( -/obj/machinery/door/airlock/shuttle{ - id_tag = "s_docking_airlock"; - req_access_txt = "48" - }, -/obj/docking_port/mobile{ - dir = 8; - dwidth = 3; - height = 5; - id = "mining"; - name = "mining shuttle"; - rebuildable = 1; - width = 7 - }, /obj/docking_port/stationary{ dir = 8; dwidth = 3; @@ -63656,12 +57861,12 @@ name = "mining shuttle bay"; width = 7 }, -/obj/structure/fans/tiny, -/turf/simulated/shuttle/floor, -/area/shuttle/mining) +/turf/space, +/area/space) "ckl" = ( /obj/machinery/door/airlock/external{ id_tag = "mining_home"; + locked = 1; name = "Mining Dock Airlock"; req_access_txt = "48" }, @@ -63671,6 +57876,7 @@ "ckm" = ( /obj/machinery/door/airlock/external{ id_tag = "mining_home"; + locked = 1; name = "Mining Dock Airlock"; req_access_txt = "48" }, @@ -63690,7 +57896,6 @@ pixel_x = 24 }, /obj/structure/disposalpipe/segment, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/quartermaster/miningdock) "ckp" = ( @@ -63720,7 +57925,6 @@ initialize_directions = 11; level = 1 }, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/quartermaster/miningdock) "ckr" = ( @@ -63754,10 +57958,6 @@ }, /area/medical/surgery2) "ckt" = ( -/obj/structure/snow{ - dir = 6; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel{ icon_state = "bcarpet05" }, @@ -63790,7 +57990,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/quartermaster/qm) "cky" = ( @@ -63914,7 +58113,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/quartermaster/qm) "ckH" = ( @@ -63929,7 +58127,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/quartermaster/qm) "ckI" = ( @@ -63973,10 +58170,6 @@ /obj/structure/sign/poster/random{ pixel_x = -32 }, -/obj/structure/snow{ - dir = 5; - icon_state = "snow_corner" - }, /turf/simulated/floor/wood, /area/ntrep) "ckN" = ( @@ -64132,12 +58325,8 @@ "clb" = ( /obj/structure/table/glass, /obj/machinery/computer/med_data/laptop, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -64240,9 +58429,6 @@ icon_state = "2-4"; tag = "" }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/blue{ - pixel_y = 19 - }, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "cafeteria"; @@ -64268,9 +58454,6 @@ pixel_x = 25; pixel_y = 0 }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/blue{ - pixel_y = 19 - }, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "cafeteria"; @@ -64335,7 +58518,6 @@ dir = 4; pixel_x = 24 }, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/quartermaster/miningdock) "cls" = ( @@ -64348,8 +58530,6 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/item/decorations/sticky_decorations/flammable/snowman, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/quartermaster/miningdock) "clt" = ( @@ -64371,7 +58551,6 @@ /obj/machinery/light_switch{ pixel_x = -27 }, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/quartermaster/qm) "clw" = ( @@ -64396,7 +58575,7 @@ id = "toxinsigniter"; pixel_x = -20 }, -/turf/simulated/floor/engine/insulated/vacuum, +/turf/simulated/floor/engine/vacuum, /area/toxins/mixing) "cly" = ( /obj/structure/disposalpipe/segment, @@ -64411,7 +58590,7 @@ /turf/simulated/floor/plating, /area/maintenance/apmaint) "clz" = ( -/turf/simulated/floor/engine/insulated/vacuum, +/turf/simulated/floor/engine/vacuum, /area/toxins/mixing) "clA" = ( /obj/structure/closet/emcloset, @@ -64424,46 +58603,6 @@ }, /turf/simulated/floor/plating/airless, /area/toxins/test_area) -"clC" = ( -/obj/structure/table, -/obj/item/bonegel, -/obj/item/bonesetter, -/obj/item/hemostat, -/obj/item/cautery, -/obj/item/surgicaldrill, -/obj/item/circular_saw, -/obj/item/scalpel, -/obj/item/retractor, -/obj/item/FixOVein, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, -/area/shuttle/administration) -"clD" = ( -/obj/machinery/optable, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, -/area/shuttle/administration) -"clE" = ( -/obj/machinery/vending/medical, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, -/area/shuttle/administration) -"clF" = ( -/obj/machinery/light, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) -"clG" = ( -/obj/structure/table, -/obj/item/storage/lockbox/mindshield, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) "clH" = ( /obj/machinery/camera{ c_tag = "Research Toxins Test Chamber North"; @@ -64474,17 +58613,6 @@ }, /turf/simulated/floor/plasteel/airless, /area/toxins/test_area) -"clI" = ( -/obj/structure/table, -/obj/item/storage/box/chemimp{ - pixel_x = 4; - pixel_y = 3 - }, -/obj/item/storage/box/trackimp, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) "clJ" = ( /obj/item/stack/ore/silver, /obj/item/stack/ore/silver, @@ -64720,10 +58848,6 @@ /obj/item/reagent_containers/food/drinks/bottle/whiskey, /obj/item/reagent_containers/food/drinks/drinkingglass, /obj/item/reagent_containers/food/drinks/drinkingglass, -/obj/structure/snow{ - dir = 8; - icon_state = "snow_corner" - }, /turf/simulated/floor/wood, /area/blueshield) "cmh" = ( @@ -64732,13 +58856,6 @@ dir = 4; pixel_x = 24 }, -/obj/item/decorations/sticky_decorations/flammable/christmas_stocking{ - pixel_y = -16 - }, -/obj/structure/snow{ - dir = 1; - icon_state = "snow_corner" - }, /turf/simulated/floor/wood, /area/ntrep) "cmi" = ( @@ -64965,10 +59082,6 @@ /obj/machinery/light{ dir = 4 }, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "cafeteria"; @@ -65032,13 +59145,6 @@ "cmD" = ( /obj/structure/table, /obj/item/reagent_containers/food/drinks/britcup, -/obj/item/reagent_containers/food/snacks/candy/confectionery/caramel{ - pixel_y = 10 - }, -/obj/item/reagent_containers/food/snacks/candy/confectionery/caramel{ - pixel_y = 5 - }, -/obj/item/reagent_containers/food/snacks/candy/confectionery/caramel, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "cafeteria"; @@ -65087,7 +59193,6 @@ "cmK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/snow, /turf/simulated/floor/plasteel{ icon_state = "bcarpet05" }, @@ -65100,9 +59205,6 @@ "cmM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/snow{ - icon_state = "snow_corner" - }, /turf/simulated/floor/carpet, /area/ntrep) "cmN" = ( @@ -65181,9 +59283,6 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/green{ - pixel_y = 19 - }, /turf/simulated/floor/plasteel, /area/janitor) "cmU" = ( @@ -65193,12 +59292,8 @@ icon_state = "1-8"; tag = "" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel, /area/janitor) @@ -65327,30 +59422,6 @@ /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/maintenance/apmaint) -"cnh" = ( -/obj/structure/closet/crate, -/turf/simulated/shuttle/floor, -/area/shuttle/mining) -"cni" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/shuttle/engine/heater, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/shuttle/plating, -/area/shuttle/mining) -"cnj" = ( -/obj/structure/ore_box, -/obj/machinery/light/small{ - dir = 4 - }, -/turf/simulated/shuttle/floor, -/area/shuttle/mining) "cnk" = ( /obj/structure/sign/securearea{ desc = "A warning sign which reads 'BOMB RANGE"; @@ -65380,9 +59451,6 @@ /area/maintenance/apmaint) "cno" = ( /obj/structure/closet/secure_closet/miner, -/obj/item/decorations/sticky_decorations/flammable/christmas_stocking{ - pixel_y = -16 - }, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "brown" @@ -65456,7 +59524,6 @@ /area/toxins/explab_chamber) "cnu" = ( /obj/structure/chair/office/dark, -/obj/structure/snow, /turf/simulated/floor/carpet, /area/ntrep) "cnv" = ( @@ -65567,7 +59634,7 @@ }) "cnE" = ( /obj/machinery/atmospherics/unary/passive_vent, -/turf/simulated/floor/engine/insulated/vacuum, +/turf/simulated/floor/engine/vacuum, /area/toxins/mixing) "cnF" = ( /obj/structure/sign/biohazard{ @@ -65586,12 +59653,8 @@ name = "\improper Virology Lobby" }) "cnG" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/plasteel, /area/quartermaster/miningdock) @@ -65695,10 +59758,6 @@ /area/medical/medbreak) "cnQ" = ( /obj/machinery/computer/med_data, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "cafeteria"; @@ -65746,10 +59805,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/snow{ - dir = 1; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel, /area/quartermaster/miningdock) "cnU" = ( @@ -66009,7 +60064,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ icon_state = "bcarpet05" }, @@ -66018,10 +60072,6 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/obj/structure/snow{ - dir = 6; - icon_state = "snow_corner" - }, /turf/simulated/floor/wood, /area/blueshield) "com" = ( @@ -66031,7 +60081,6 @@ pixel_y = 0 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/snow, /turf/simulated/floor/plasteel{ icon_state = "bcarpet05" }, @@ -66040,10 +60089,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/snow{ - dir = 10; - icon_state = "snow_corner" - }, /turf/simulated/floor/carpet, /area/ntrep) "coo" = ( @@ -66052,7 +60097,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/obj/structure/snow, /turf/simulated/floor/carpet, /area/ntrep) "cop" = ( @@ -66060,12 +60104,8 @@ pixel_x = 29; pixel_y = -1 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/wood, /area/ntrep) @@ -66093,12 +60133,8 @@ /area/maintenance/asmaint) "cot" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" @@ -66143,12 +60179,8 @@ /turf/simulated/floor/engine, /area/toxins/explab_chamber) "coy" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/engine, /area/toxins/explab_chamber) @@ -66175,12 +60207,8 @@ "coB" = ( /obj/effect/decal/cleanable/blood/oil, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/plasteel, /area/toxins/storage) @@ -66256,7 +60284,13 @@ pixel_y = 0 }, /obj/machinery/alarm{ - pixel_y = 25 + pixel_y = 31 + }, +/obj/machinery/driver_button{ + dir = 2; + id_tag = "toxinsdriver"; + pixel_y = 22; + range = 18 }, /turf/simulated/floor/plasteel, /area/toxins/launch{ @@ -66266,10 +60300,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/snow{ - dir = 10; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel{ icon_state = "bcarpet05" }, @@ -66311,22 +60341,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ icon_state = "bcarpet05" }, /area/blueshield) -"coN" = ( -/obj/structure/shuttle/engine/propulsion/burst, -/turf/simulated/shuttle/plating, -/area/shuttle/mining) -"coO" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall_f5" - }, -/area/shuttle/mining) "coP" = ( /obj/structure/table/glass, /obj/machinery/light/small{ @@ -66336,13 +60354,6 @@ icon_state = "freezerfloor" }, /area/maintenance/apmaint) -"coQ" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall_f9" - }, -/area/shuttle/mining) "coR" = ( /obj/structure/cable{ d1 = 1; @@ -66366,12 +60377,8 @@ icon_state = "alarm0"; pixel_x = 24 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/wood, /area/blueshield) @@ -66379,17 +60386,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/snow, /turf/simulated/floor/carpet, /area/ntrep) "coV" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/obj/structure/snow{ - dir = 6; - icon_state = "snow_corner" - }, /turf/simulated/floor/wood, /area/ntrep) "coW" = ( @@ -66397,7 +60399,6 @@ dir = 9; pixel_y = 0 }, -/obj/structure/snow, /turf/simulated/floor/carpet, /area/ntrep) "coX" = ( @@ -66410,7 +60411,6 @@ pixel_x = 7; pixel_y = 4 }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ icon_state = "bcarpet05" }, @@ -66425,7 +60425,6 @@ name = "Desk Door"; req_access_txt = "67" }, -/obj/structure/snow, /turf/simulated/floor/wood, /area/blueshield) "coZ" = ( @@ -66604,7 +60603,6 @@ }, /obj/item/paper/blueshield, /obj/item/book/manual/sop_command, -/obj/structure/snow, /turf/simulated/floor/plasteel{ icon_state = "bcarpet05" }, @@ -66661,11 +60659,7 @@ }, /area/hallway/primary/aft) "cpj" = ( -/obj/structure/sign/redcross{ - desc = "The Star of Life, a symbol of Medical Aid."; - icon_state = "lifestar"; - name = "Medbay" - }, +/obj/structure/sign/lifestar, /turf/simulated/wall, /area/maintenance/genetics) "cpk" = ( @@ -66712,12 +60706,8 @@ pixel_x = 11; pixel_y = 0 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -66732,12 +60722,8 @@ pixel_x = -12; pixel_y = 0 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -67159,8 +61145,6 @@ /obj/structure/table, /obj/item/clipboard, /obj/item/book/manual/experimentor, -/obj/item/reagent_containers/food/snacks/candy/confectionery/caramel_nougat, -/obj/structure/snow, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "whitepurple"; @@ -67169,14 +61153,6 @@ /area/toxins/explab) "cpW" = ( /obj/machinery/computer/rdconsole/experiment, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, -/obj/structure/snow{ - dir = 4; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitepurple"; @@ -67350,10 +61326,6 @@ sensors = list("burn_sensor" = "Burn Mix") }, /obj/effect/decal/warning_stripes/north, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -67382,7 +61354,7 @@ dir = 1; in_use = 1 }, -/obj/machinery/atmospherics/unary/cold_sink/freezer, +/obj/machinery/atmospherics/unary/thermomachine/freezer, /obj/effect/decal/warning_stripes/northwestcorner, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -67466,18 +61438,11 @@ name = "Toxins Launch Room" }) "cqq" = ( -/obj/machinery/driver_button{ - dir = 2; - id_tag = "toxinsdriver"; - pixel_y = 24; - range = 18 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/structure/disaster_counter/toxins{ + pixel_y = 32 }, /turf/simulated/floor/plasteel, /area/toxins/launch{ @@ -67725,31 +61690,26 @@ /obj/effect/landmark/start{ name = "Blueshield" }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/green{ - pixel_y = 19 - }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ icon_state = "bcarpet05" }, /area/blueshield) "cqJ" = ( /obj/structure/table/wood, -/obj/structure/snow, -/obj/item/a_gift, -/obj/item/id_decal/centcom, -/obj/item/gun/projectile/automatic/toy, -/obj/item/ammo_box/magazine/toy/smg, +/turf/simulated/floor/plasteel{ + icon_state = "bcarpet05" + }, +/area/blueshield) +"cqK" = ( +/obj/structure/chair/comfy/black{ + dir = 8 + }, /turf/simulated/floor/plasteel{ icon_state = "bcarpet05" }, /area/blueshield) "cqL" = ( /obj/item/flag/nt, -/obj/structure/snow{ - dir = 8; - icon_state = "snow_corner" - }, /turf/simulated/floor/wood, /area/blueshield) "cqM" = ( @@ -67763,6 +61723,12 @@ tag = "icon-whitehall (WEST)" }, /area/medical/virology) +"cqO" = ( +/obj/structure/chair/comfy/black{ + dir = 4 + }, +/turf/simulated/floor/carpet, +/area/ntrep) "cqP" = ( /obj/structure/cable{ d1 = 4; @@ -67792,10 +61758,6 @@ /obj/effect/landmark/start{ name = "Nanotrasen Representative" }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/red{ - pixel_y = 19 - }, -/obj/structure/snow, /turf/simulated/floor/carpet, /area/ntrep) "cqR" = ( @@ -67806,10 +61768,6 @@ name = "Blueshield Requests Console"; pixel_x = -30 }, -/obj/structure/snow{ - dir = 5; - icon_state = "snow_corner" - }, /turf/simulated/floor/wood, /area/blueshield) "cqS" = ( @@ -67820,7 +61778,6 @@ }, /obj/item/paper/ntrep, /obj/item/paper_bin/nanotrasen, -/obj/structure/snow, /turf/simulated/floor/carpet, /area/ntrep) "cqT" = ( @@ -67832,7 +61789,6 @@ name = "NT Representative Requests Console"; pixel_x = 30 }, -/obj/structure/snow, /turf/simulated/floor/wood, /area/ntrep) "cqU" = ( @@ -67993,9 +61949,6 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/blue{ - pixel_y = 19 - }, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "darkblue" @@ -68005,9 +61958,6 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/blue{ - pixel_y = 19 - }, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "darkblue" @@ -68188,9 +62138,6 @@ pixel_x = 24 }, /obj/effect/decal/warning_stripes/southeastcorner, -/obj/item/decorations/sticky_decorations/flammable/tinsel/blue{ - pixel_y = 19 - }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitegreen"; @@ -68210,9 +62157,6 @@ /obj/effect/landmark/start{ name = "Virologist" }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/blue{ - pixel_y = 19 - }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -68371,9 +62315,6 @@ }, /area/toxins/mixing) "crL" = ( -/obj/structure/snow{ - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -68385,10 +62326,6 @@ /obj/effect/landmark/start{ name = "Scientist" }, -/obj/structure/snow{ - dir = 6; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -68412,11 +62349,6 @@ /area/toxins/mixing) "crO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/snow, -/obj/item/toy/figure/chemist, -/obj/item/a_gift, -/obj/item/nanomob_card, -/obj/item/toy/figure/syndie, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -68500,12 +62432,8 @@ /turf/simulated/floor/plasteel, /area/hallway/primary/aft) "crV" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 2; @@ -68555,12 +62483,8 @@ dir = 1; pixel_y = -22 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 6; @@ -68568,12 +62492,8 @@ }, /area/medical/ward) "csa" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 2; @@ -68586,15 +62506,8 @@ /obj/effect/landmark/start{ name = "Medical Doctor" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 - }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/blue{ - pixel_y = 19 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /turf/simulated/floor/plasteel{ dir = 2; @@ -68650,12 +62563,8 @@ pixel_x = 0; pixel_y = 32 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -68804,10 +62713,6 @@ /area/maintenance/apmaint) "csv" = ( /obj/machinery/atmospherics/unary/vent_pump/on, -/obj/structure/snow{ - dir = 10; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -68833,14 +62738,6 @@ pixel_y = -24; req_access_txt = "67" }, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, -/obj/structure/snow{ - dir = 1; - icon_state = "snow_corner" - }, /turf/simulated/floor/wood, /area/blueshield) "csy" = ( @@ -68849,9 +62746,6 @@ dir = 8; pixel_x = -24 }, -/obj/item/decorations/sticky_decorations/flammable/christmas_stocking{ - pixel_y = -16 - }, /turf/simulated/floor/wood, /area/blueshield) "csz" = ( @@ -68866,10 +62760,6 @@ pixel_x = 0; pixel_y = -32 }, -/obj/structure/snow{ - dir = 5; - icon_state = "snow_corner" - }, /turf/simulated/floor/wood, /area/blueshield) "csA" = ( @@ -68879,7 +62769,6 @@ name = "Science Requests Console"; pixel_y = 30 }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -68898,7 +62787,6 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/toxins/storage) "csC" = ( @@ -68918,14 +62806,6 @@ pixel_y = -24; req_access_txt = "73" }, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, -/obj/structure/snow{ - dir = 9; - icon_state = "snow_corner" - }, /turf/simulated/floor/wood, /area/ntrep) "csD" = ( @@ -68945,16 +62825,11 @@ pixel_x = 0; pixel_y = -32 }, -/obj/structure/snow, /turf/simulated/floor/wood, /area/ntrep) "csF" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -69006,12 +62881,8 @@ tag = "" }, /obj/machinery/light, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 2; @@ -69084,10 +62955,6 @@ /obj/machinery/computer/monitor{ name = "Grid Power Monitoring Computer" }, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "caution" @@ -69117,9 +62984,6 @@ /obj/structure/table/glass, /obj/item/storage/box/monkeycubes/wolpincubes, /obj/item/storage/box/monkeycubes/farwacubes, -/obj/machinery/light/small{ - dir = 1 - }, /obj/machinery/alarm{ dir = 4; icon_state = "alarm0"; @@ -69144,12 +63008,8 @@ pixel_x = 0; tag = "" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -69548,7 +63408,6 @@ pixel_x = 0; tag = "" }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -69568,10 +63427,6 @@ tag = "" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/snow{ - dir = 4; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -69590,7 +63445,6 @@ tag = "" }, /obj/machinery/hologram/holopad, -/obj/structure/snow, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -69628,7 +63482,6 @@ icon_state = "2-8"; tag = "" }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -69993,10 +63846,6 @@ pixel_x = 27 }, /obj/machinery/computer/security/engineering, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "caution" @@ -70209,12 +64058,8 @@ /obj/machinery/alarm{ pixel_y = 25 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -70266,9 +64111,6 @@ pixel_x = -32; pixel_y = 0 }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/blue{ - pixel_y = 19 - }, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "whitegreen"; @@ -70288,12 +64130,6 @@ /area/medical/virology/lab{ name = "\improper Virology Lobby" }) -"cuH" = ( -/obj/structure/chair/stool/bar, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) "cuI" = ( /obj/structure/bed, /obj/structure/disposalpipe/segment, @@ -70336,10 +64172,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/snow{ - dir = 5; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -70372,7 +64204,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -70389,11 +64220,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/snow, -/obj/item/toy/figure/geneticist, -/obj/item/a_gift, -/obj/item/nanomob_card, -/obj/item/toy/plushie/nukeplushie, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -70411,8 +64237,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/flora/tree/pine/xmas, -/obj/structure/snow, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -70448,7 +64272,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -70471,7 +64294,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -70482,7 +64304,6 @@ }, /obj/structure/table, /obj/item/storage/toolbox/mechanical, -/obj/item/reagent_containers/food/snacks/candy/confectionery/caramel_nougat, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -70505,7 +64326,6 @@ }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/structure/snow, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -70537,7 +64357,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -70731,10 +64550,7 @@ /turf/simulated/floor/plating/airless, /area/toxins/test_area) "cvt" = ( -/turf/simulated/shuttle/wall{ - dir = 4; - icon_state = "wall3" - }, +/turf/simulated/wall/indestructible/riveted, /area/toxins/test_area) "cvu" = ( /obj/structure/table, @@ -71016,12 +64832,8 @@ pixel_y = 2 }, /obj/machinery/light/small, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" @@ -71032,8 +64844,6 @@ name = "station intercom (General)"; pixel_y = -28 }, -/obj/item/decorations/sticky_decorations/flammable/snowman, -/obj/structure/snow, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -71159,9 +64969,6 @@ dir = 4; level = 1 }, -/obj/item/decorations/sticky_decorations/flammable/christmas_stocking{ - pixel_y = 17 - }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "whitegreen"; @@ -71259,10 +65066,6 @@ dir = 2; icon_state = "pipe-c" }, -/obj/structure/snow{ - dir = 5; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -71270,7 +65073,6 @@ "cwm" = ( /obj/machinery/light, /obj/machinery/telepad_cargo, -/obj/structure/snow, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -71577,10 +65379,6 @@ /area/storage/tech) "cwR" = ( /obj/machinery/computer/station_alert, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, /turf/simulated/floor/plasteel, /area/engine/controlroom) "cwS" = ( @@ -71766,10 +65564,6 @@ name = "Tank Monitor"; sensors = list("n2_sensor" = "Nitrogen", "o2_sensor" = "Oxygen", "co2_sensor" = "Carbon Dioxide", "tox_sensor" = "Toxins", "n2o_sensor" = "Nitrous Oxide", "waste_sensor" = "Gas Mix Tank") }, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "caution" @@ -71878,12 +65672,8 @@ /turf/simulated/floor/plasteel, /area/engine/controlroom) "cxr" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel, /area/engine/controlroom) @@ -72008,10 +65798,6 @@ icon_state = "2-8"; tag = "" }, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, /turf/simulated/floor/plasteel, /area/atmos/control) "cxD" = ( @@ -72347,7 +66133,6 @@ req_access_txt = "32"; req_one_access_txt = "0" }, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/engine/equipmentstorage) "cyi" = ( @@ -72707,10 +66492,6 @@ tag = "" }, /obj/machinery/computer/atmos_alert, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, /turf/simulated/floor/plasteel, /area/atmos/control) "cyR" = ( @@ -72759,8 +66540,8 @@ /area/medical/virology) "cyV" = ( /obj/structure/closet/crate/freezer, -/obj/item/tank/emergency_oxygen/engi/empty, -/obj/item/tank/emergency_oxygen/engi/empty, +/obj/item/tank/internals/emergency_oxygen/engi/empty, +/obj/item/tank/internals/emergency_oxygen/engi/empty, /obj/item/reagent_containers/iv_bag/blood/AMinus, /obj/item/reagent_containers/iv_bag/blood/APlus, /obj/item/reagent_containers/iv_bag/blood/BMinus, @@ -72958,7 +66739,7 @@ /turf/simulated/floor/plating, /area/storage/tech) "czo" = ( -/obj/item/tank/oxygen, +/obj/item/tank/internals/oxygen, /turf/simulated/floor/plating, /area/maintenance/asmaint) "czp" = ( @@ -73159,15 +66940,11 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/simulated/wall/r_wall/coated, +/turf/simulated/wall/r_wall, /area/maintenance/incinerator) "czG" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /mob/living/carbon/human/monkey, /turf/simulated/floor/plasteel{ @@ -73192,12 +66969,8 @@ c_tag = "Virology Module North"; network = list("SS13") }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -73247,7 +67020,7 @@ dir = 8; icon_state = "pipe-c" }, -/turf/simulated/wall/r_wall/coated, +/turf/simulated/wall/r_wall, /area/maintenance/incinerator) "czQ" = ( /obj/machinery/atmospherics/binary/pump{ @@ -73349,12 +67122,8 @@ pixel_y = 2 }, /obj/effect/decal/warning_stripes/northwest, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -73456,10 +67225,6 @@ /area/toxins/xenobiology) "cAg" = ( /obj/machinery/computer/atmos_alert, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "caution" @@ -73472,10 +67237,6 @@ name = "Distribution and Waste Monitor"; sensors = list("mair_in_meter" = "Mixed Air In", "air_sensor" = "Mixed Air Supply Tank", "mair_out_meter" = "Mixed Air Out", "dloop_atm_meter" = "Distribution Loop", "wloop_atm_meter" = "Waste Loop") }, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, /turf/simulated/floor/plasteel, /area/engine/controlroom) "cAi" = ( @@ -73559,12 +67320,8 @@ }, /area/construction) "cAp" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -73783,12 +67540,8 @@ /turf/simulated/floor/plating, /area/maintenance/asmaint) "cAJ" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plating, /area/storage/tech) @@ -73878,12 +67631,8 @@ "cAT" = ( /obj/structure/table, /obj/item/mounted/frame/apc_frame, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /turf/simulated/floor/plasteel, /area/engine/controlroom) @@ -73907,7 +67656,7 @@ /obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 }, -/turf/simulated/wall/r_wall/coated, +/turf/simulated/wall/r_wall, /area/maintenance/incinerator) "cAY" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -73989,7 +67738,7 @@ pixel_x = 0; pixel_y = 32 }, -/turf/simulated/floor/engine/insulated, +/turf/simulated/floor/engine, /area/maintenance/incinerator) "cBh" = ( /obj/item/wrench, @@ -74000,7 +67749,7 @@ id_tag = "disvent"; name = "Incinerator Vent" }, -/turf/simulated/floor/engine/insulated, +/turf/simulated/floor/engine, /area/maintenance/incinerator) "cBj" = ( /obj/machinery/atmospherics/binary/pump{ @@ -74013,7 +67762,7 @@ /obj/structure/sign/fire{ pixel_y = 32 }, -/turf/simulated/floor/engine/insulated, +/turf/simulated/floor/engine, /area/maintenance/incinerator) "cBk" = ( /obj/structure/sign/securearea, @@ -74199,12 +67948,8 @@ /turf/simulated/floor/plating, /area/maintenance/asmaint2) "cBy" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -74467,9 +68212,6 @@ dir = 1; on = 1 }, -/obj/item/decorations/sticky_decorations/flammable/christmas_stocking{ - pixel_y = 17 - }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -74482,9 +68224,6 @@ network = list("Research","SS13"); pixel_x = 0 }, -/obj/item/decorations/sticky_decorations/flammable/christmas_stocking{ - pixel_y = 17 - }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -74564,13 +68303,13 @@ }, /area/toxins/misc_lab) "cCl" = ( -/obj/machinery/newscaster{ - pixel_y = 34 - }, /obj/machinery/light{ dir = 1; on = 1 }, +/obj/structure/disaster_counter/scichem{ + pixel_y = 32 + }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "vault"; @@ -74592,6 +68331,9 @@ /area/toxins/misc_lab) "cCn" = ( /obj/machinery/chem_heater, +/obj/machinery/newscaster{ + pixel_y = 34 + }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "vault"; @@ -74632,7 +68374,7 @@ /turf/simulated/wall/r_wall, /area/maintenance/asmaint2) "cCq" = ( -/turf/simulated/floor/engine/insulated, +/turf/simulated/floor/engine, /area/maintenance/incinerator) "cCr" = ( /obj/structure/cable{ @@ -74688,7 +68430,7 @@ /obj/machinery/igniter{ id = "Incinerator" }, -/turf/simulated/floor/engine/insulated, +/turf/simulated/floor/engine, /area/maintenance/incinerator) "cCx" = ( /obj/machinery/door/airlock/public/glass{ @@ -74709,7 +68451,7 @@ pixel_x = 0; pixel_y = -23 }, -/turf/simulated/floor/engine/insulated, +/turf/simulated/floor/engine, /area/maintenance/incinerator) "cCy" = ( /obj/machinery/door/airlock/public/glass{ @@ -74729,7 +68471,7 @@ pixel_x = 0; pixel_y = -22 }, -/turf/simulated/floor/engine/insulated, +/turf/simulated/floor/engine, /area/maintenance/incinerator) "cCz" = ( /obj/effect/decal/remains/human{ @@ -75356,6 +69098,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, +/obj/item/radio/intercom{ + name = "station intercom (General)"; + pixel_y = -28 + }, /turf/simulated/floor/plasteel, /area/engine/controlroom) "cDB" = ( @@ -75429,15 +69175,7 @@ }, /area/toxins/misc_lab) "cDI" = ( -/obj/item/radio/intercom{ - name = "station intercom (General)"; - pixel_y = -28 - }, /obj/machinery/computer/drone_control, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, /turf/simulated/floor/plasteel, /area/engine/controlroom) "cDJ" = ( @@ -75511,7 +69249,7 @@ pressure_checks = 2; pump_direction = 0 }, -/turf/simulated/floor/engine/insulated, +/turf/simulated/floor/engine, /area/maintenance/incinerator) "cDQ" = ( /obj/structure/closet/toolcloset, @@ -75549,7 +69287,7 @@ /obj/structure/sign/fire{ pixel_y = -32 }, -/turf/simulated/floor/engine/insulated, +/turf/simulated/floor/engine, /area/maintenance/incinerator) "cDV" = ( /obj/machinery/door_control{ @@ -75681,12 +69419,8 @@ /turf/simulated/floor/wood, /area/medical/psych) "cEh" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /obj/structure/disposalpipe/segment{ dir = 8; @@ -75740,12 +69474,8 @@ }, /obj/machinery/light, /obj/effect/decal/warning_stripes/southwestcorner, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -75913,12 +69643,8 @@ }, /area/toxins/xenobiology) "cEI" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /turf/simulated/floor/engine, /area/engine/mechanic_workshop) @@ -75942,10 +69668,6 @@ }, /obj/machinery/computer/podtracker, /obj/effect/decal/warning_stripes/east, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, /turf/simulated/floor/plasteel, /area/engine/mechanic_workshop) "cEL" = ( @@ -76061,9 +69783,6 @@ /obj/machinery/light/small, /turf/simulated/floor/plating/airless, /area/toxins/test_area) -"cEU" = ( -/turf/simulated/wall/r_wall/coated, -/area/maintenance/incinerator) "cEV" = ( /obj/machinery/light{ dir = 1 @@ -76371,12 +70090,8 @@ }, /area/medical/virology) "cFy" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -76385,12 +70100,8 @@ }, /area/medical/virology) "cFz" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "whitegreenfull"; @@ -76410,10 +70121,10 @@ /area/medical/psych) "cFC" = ( /obj/effect/spawner/window/reinforced, -/obj/structure/cable/yellow{ - d1 = 0; +/obj/structure/cable{ d2 = 2; - icon_state = "0-2" + icon_state = "0-2"; + pixel_y = 1 }, /turf/simulated/floor/plating, /area/engine/chiefs_office) @@ -76457,12 +70168,8 @@ pixel_x = 0; tag = "" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -76536,7 +70243,6 @@ /obj/item/assembly/timer, /obj/item/assembly/timer, /obj/item/assembly/timer, -/obj/item/reagent_containers/food/snacks/candy/confectionery/caramel_nougat, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -76558,12 +70264,8 @@ }, /area/toxins/misc_lab) "cFJ" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -76666,9 +70368,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/snow{ - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -76864,7 +70563,6 @@ dir = 1; pixel_y = -24 }, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/engine/mechanic_workshop) "cGi" = ( @@ -76977,10 +70675,6 @@ pixel_y = 32 }, /obj/machinery/computer/station_alert, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, /turf/simulated/floor/plasteel, /area/engine/break_room) "cGu" = ( @@ -76988,7 +70682,10 @@ dir = 4; icon_state = "tube1" }, -/obj/structure/table, +/obj/machinery/shower{ + pixel_y = 8 + }, +/obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, /area/engine/break_room) "cGv" = ( @@ -77032,12 +70729,8 @@ dir = 8; icon_state = "tube1" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -77128,16 +70821,8 @@ /area/engine/mechanic_workshop) "cGE" = ( /obj/effect/decal/warning_stripes/southeast, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 - }, -/obj/structure/snow{ - dir = 6; - icon_state = "snow_corner" +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel, /area/engine/mechanic_workshop) @@ -77147,14 +70832,6 @@ /area/engine/mechanic_workshop) "cGG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/snow{ - dir = 4; - icon_state = "snow_corner" - }, -/obj/structure/snow{ - dir = 8; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -77169,7 +70846,6 @@ req_one_access_txt = "0" }, /obj/machinery/cell_charger, -/obj/structure/snow, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -77181,7 +70857,6 @@ /obj/effect/landmark/start{ name = "Mechanic" }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -77250,12 +70925,8 @@ pixel_y = 0; tag = "" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 2; @@ -77298,9 +70969,6 @@ /obj/machinery/light{ dir = 8 }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/red{ - pixel_y = 19 - }, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -77376,15 +71044,11 @@ /obj/effect/landmark/start{ name = "Chief Engineer" }, -/obj/structure/cable/yellow{ +/obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8" - }, -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 8; - icon_state = "2-8" + icon_state = "4-8"; + pixel_y = 0 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -77415,20 +71079,27 @@ /area/gateway) "cHa" = ( /obj/effect/spawner/window/reinforced, -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/structure/cable/yellow{ - d1 = 0; - d2 = 8; - icon_state = "0-8" - }, -/obj/structure/cable/yellow{ +/obj/structure/cable{ d1 = 1; + d2 = 4; + icon_state = "1-4"; + tag = "" + }, +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4"; + tag = "" + }, +/obj/structure/cable{ + d2 = 4; + icon_state = "0-4" + }, +/obj/structure/cable{ + d1 = 4; d2 = 8; - icon_state = "1-8" + icon_state = "4-8"; + pixel_y = 0 }, /turf/simulated/floor/plating, /area/engine/chiefs_office) @@ -77440,14 +71111,11 @@ pixel_y = 0 }, /obj/machinery/computer/station_alert, -/obj/structure/cable/yellow{ +/obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8" - }, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 + icon_state = "4-8"; + pixel_y = 0 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -77455,12 +71123,8 @@ }, /area/engine/chiefs_office) "cHc" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 2; @@ -77508,10 +71172,8 @@ /turf/simulated/floor/plasteel, /area/hallway/primary/aft) "cHh" = ( -/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, /area/engine/engineering) @@ -77530,7 +71192,7 @@ /area/hallway/primary/aft) "cHk" = ( /obj/effect/spawner/window/reinforced, -/obj/structure/cable/yellow, +/obj/structure/cable, /turf/simulated/floor/plating, /area/engine/chiefs_office) "cHl" = ( @@ -77667,9 +71329,6 @@ /obj/structure/chair/office/dark{ dir = 1 }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/yellow{ - pixel_y = 19 - }, /turf/simulated/floor/plasteel, /area/atmos/control) "cHz" = ( @@ -77715,9 +71374,6 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/obj/structure/snow{ - icon_state = "snow_surround" - }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -77760,12 +71416,8 @@ /turf/simulated/floor/plasteel, /area/hallway/primary/aft) "cHH" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/plasteel, /area/hallway/primary/aft) @@ -77893,9 +71545,6 @@ "cHS" = ( /obj/structure/table, /obj/item/book/manual/supermatter_engine, -/obj/structure/snow{ - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel, /area/engine/break_room) "cHT" = ( @@ -77903,7 +71552,6 @@ dir = 2; icon_state = "pipe-c" }, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/engine/break_room) "cHU" = ( @@ -77930,9 +71578,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/yellow{ - pixel_y = 19 - }, /turf/simulated/floor/plasteel, /area/engine/break_room) "cHW" = ( @@ -77966,10 +71611,6 @@ frequency = 1439; pixel_y = 23 }, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, /turf/simulated/floor/plasteel, /area/atmos/control) "cHZ" = ( @@ -78000,18 +71641,16 @@ /obj/structure/chair{ dir = 1 }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/structure/cable/yellow{ +/obj/structure/cable{ d1 = 2; - d2 = 4; - icon_state = "2-4" + d2 = 8; + icon_state = "2-8" }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/yellow{ - pixel_y = 19 +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + pixel_y = 0 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -78025,8 +71664,7 @@ pixel_x = 24; shock_proof = 1 }, -/obj/structure/cable/yellow{ - d1 = 0; +/obj/structure/cable{ d2 = 8; icon_state = "0-8" }, @@ -78063,9 +71701,6 @@ initialize_directions = 10; level = 1 }, -/obj/structure/chair/comfy/red{ - dir = 8 - }, /turf/simulated/floor/plasteel, /area/engine/break_room) "cIi" = ( @@ -78118,12 +71753,8 @@ /turf/simulated/floor/plating, /area/maintenance/asmaint) "cIp" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /turf/simulated/floor/plasteel, /area/atmos/control) @@ -78163,17 +71794,17 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/structure/cable/yellow{ +/obj/structure/cable, +/obj/structure/cable{ d1 = 1; d2 = 4; icon_state = "1-4" }, -/obj/structure/cable/yellow, +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, /turf/simulated/floor/plating, /area/engine/chiefs_office) "cIx" = ( @@ -78219,8 +71850,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/cable/yellow{ - d1 = 0; +/obj/structure/cable{ d2 = 8; icon_state = "0-8" }, @@ -78261,12 +71891,8 @@ pixel_y = 2 }, /obj/effect/decal/warning_stripes/southwest, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -78496,12 +72122,8 @@ /turf/simulated/floor/plasteel, /area/toxins/xenobiology) "cIV" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel, /area/engine/break_room) @@ -78512,6 +72134,9 @@ /turf/simulated/floor/plasteel, /area/engine/break_room) "cIX" = ( +/obj/structure/chair/comfy/black{ + dir = 8 + }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8; initialize_directions = 11; @@ -78520,9 +72145,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/obj/structure/chair/comfy/green{ - dir = 8 - }, /turf/simulated/floor/plasteel, /area/engine/break_room) "cIY" = ( @@ -78722,9 +72344,9 @@ layer = 2.9 }, /obj/item/clothing/suit/storage/hazardvest, -/obj/item/tank/emergency_oxygen/engi, +/obj/item/tank/internals/emergency_oxygen/engi, /obj/item/clothing/suit/storage/hazardvest, -/obj/item/tank/emergency_oxygen/engi, +/obj/item/tank/internals/emergency_oxygen/engi, /obj/item/clothing/mask/gas, /obj/item/clothing/mask/gas{ pixel_x = -3; @@ -78742,10 +72364,6 @@ /area/engine/break_room) "cJp" = ( /obj/machinery/computer/atmoscontrol, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, /turf/simulated/floor/plasteel, /area/atmos/control) "cJq" = ( @@ -78753,10 +72371,6 @@ dir = 5; level = 1 }, -/obj/structure/snow{ - dir = 8; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel, /area/engine/break_room) "cJr" = ( @@ -78851,30 +72465,16 @@ dir = 8; pixel_x = -24 }, -/obj/machinery/computer/monitor{ - name = "Engine Power Monitoring Computer" - }, -/obj/structure/cable/yellow{ - d2 = 4; - icon_state = "0-4" - }, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, +/obj/machinery/computer/sm_monitor, /turf/simulated/floor/plasteel, /area/engine/engineering) "cJC" = ( -/obj/machinery/power/port_gen/pacman, -/obj/structure/cable/yellow{ +/obj/structure/dispenser, +/obj/structure/cable{ d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" + d2 = 2; + icon_state = "1-2"; + tag = "" }, /turf/simulated/floor/plasteel, /area/engine/engineering) @@ -78951,21 +72551,13 @@ /turf/simulated/floor/plasteel, /area/atmos/control) "cJI" = ( -/obj/machinery/light_switch{ - pixel_x = -27 - }, /obj/machinery/status_display{ density = 0; layer = 4; pixel_x = 0; pixel_y = 32 }, -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/turf/simulated/floor/plasteel, +/turf/simulated/wall, /area/engine/engineering) "cJJ" = ( /obj/structure/table/reinforced, @@ -79009,9 +72601,6 @@ pixel_x = -25 }, /obj/effect/decal/warning_stripes/northwest, -/obj/item/decorations/sticky_decorations/flammable/christmas_stocking{ - pixel_y = -16 - }, /turf/simulated/floor/plasteel, /area/atmos/control) "cJN" = ( @@ -79113,18 +72702,19 @@ }, /turf/simulated/floor/plating/airless, /area/engine/mechanic_workshop) +"cJV" = ( +/turf/simulated/floor/plasteel, +/area/engine/mechanic_workshop) "cJW" = ( /obj/structure/window/reinforced{ dir = 8 }, /obj/item/twohanded/required/kirbyplants, -/obj/structure/snow, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/engine/mechanic_workshop) "cJX" = ( -/obj/structure/snow, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -79190,7 +72780,6 @@ /obj/item/folder/yellow, /obj/item/pen, /obj/item/book/manual/sop_engineering, -/obj/structure/snow, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -79333,12 +72922,8 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -79475,10 +73060,6 @@ pixel_x = 30; pixel_y = 0 }, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, /turf/simulated/floor/plasteel, /area/atmos/control) "cKA" = ( @@ -79525,15 +73106,6 @@ /obj/structure/closet/secure_closet/reagents, /turf/simulated/floor/plating, /area/maintenance/genetics) -"cKH" = ( -/obj/machinery/power/smes/engineering, -/obj/structure/cable/yellow{ - d1 = 0; - d2 = 2; - icon_state = "0-2" - }, -/turf/simulated/floor/plasteel, -/area/engine/engineering) "cKI" = ( /obj/structure/cable{ d1 = 1; @@ -79579,12 +73151,8 @@ /area/maintenance/aft) "cKK" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel, /area/assembly/assembly_line) @@ -79679,10 +73247,10 @@ dir = 8; layer = 2.9 }, -/obj/item/tank/emergency_oxygen/engi, +/obj/item/tank/internals/emergency_oxygen/engi, /obj/item/clothing/suit/storage/hazardvest, /obj/item/clothing/suit/storage/hazardvest, -/obj/item/tank/emergency_oxygen/engi, +/obj/item/tank/internals/emergency_oxygen/engi, /obj/item/clothing/mask/gas, /obj/item/clothing/mask/gas{ pixel_x = -3; @@ -79719,14 +73287,13 @@ /turf/simulated/floor/plating, /area/toxins/xenobiology) "cKX" = ( +/obj/structure/chair/comfy/black{ + dir = 8 + }, /obj/machinery/firealarm{ dir = 4; pixel_x = 24 }, -/obj/structure/snow{ - dir = 10; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel, /area/engine/break_room) "cKY" = ( @@ -79913,7 +73480,6 @@ /obj/item/stack/sheet/mineral/plasma{ amount = 30 }, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/engine/mechanic_workshop) "cLs" = ( @@ -79923,7 +73489,6 @@ pixel_x = 0; pixel_y = -22 }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "dark"; @@ -79940,7 +73505,6 @@ dir = 8 }, /obj/machinery/vending/coffee, -/obj/structure/snow, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -79951,11 +73515,6 @@ pixel_y = -28 }, /obj/machinery/computer/rdconsole/mechanics, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -79976,9 +73535,6 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/obj/item/decorations/sticky_decorations/flammable/christmas_stocking{ - pixel_y = -16 - }, /turf/simulated/floor/plasteel, /area/atmos/control) "cLx" = ( @@ -80039,10 +73595,6 @@ /obj/structure/computerframe, /obj/effect/decal/cleanable/cobweb2, /obj/effect/decal/cleanable/dirt, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, /turf/simulated/floor/plasteel, /area/assembly/assembly_line) "cLF" = ( @@ -80075,9 +73627,6 @@ /obj/machinery/light, /obj/structure/closet/secure_closet/atmos_personal, /obj/effect/decal/warning_stripes/north, -/obj/item/decorations/sticky_decorations/flammable/christmas_stocking{ - pixel_y = -16 - }, /turf/simulated/floor/plasteel, /area/atmos/control) "cLK" = ( @@ -80174,10 +73723,6 @@ "cLS" = ( /obj/machinery/computer/security/engineering, /obj/effect/decal/warning_stripes/northeast, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, /turf/simulated/floor/plasteel, /area/atmos) "cLT" = ( @@ -80588,12 +74133,6 @@ icon_state = "arrival" }, /area/hallway/primary/aft) -"cMM" = ( -/obj/machinery/hologram/holopad, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/storage/secure) "cMN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/universal{ dir = 4 @@ -80672,12 +74211,8 @@ }, /area/toxins/xenobiology) "cMT" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /turf/simulated/floor/engine, /area/toxins/test_chamber) @@ -80718,7 +74253,6 @@ /area/engine/break_room) "cMX" = ( /obj/item/twohanded/required/kirbyplants, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/engine/break_room) "cMY" = ( @@ -80732,17 +74266,9 @@ /turf/simulated/floor/plasteel, /area/atmos/control) "cMZ" = ( -/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, +/obj/effect/spawner/window/reinforced/plasma, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plating, /area/engine/engineering) "cNa" = ( /obj/machinery/light, @@ -80808,25 +74334,13 @@ /turf/simulated/floor/plating, /area/maintenance/asmaint) "cNj" = ( +/obj/effect/decal/warning_stripes/north, /obj/structure/cable/yellow{ d1 = 2; d2 = 4; icon_state = "2-4" }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/plasteel, -/area/engine/engineering) -"cNk" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/engine, /area/engine/engineering) "cNl" = ( /obj/structure/window/reinforced{ @@ -81143,29 +74657,23 @@ /obj/effect/landmark/start{ name = "Station Engineer" }, -/obj/structure/chair/comfy/red{ +/obj/structure/chair/comfy/black{ dir = 4 }, -/obj/structure/snow{ - dir = 6; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel, /area/engine/break_room) "cNP" = ( /obj/structure/table, /obj/item/folder/yellow, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/engine/break_room) "cNQ" = ( /obj/effect/landmark/start{ name = "Life Support Specialist" }, -/obj/structure/chair/comfy/green{ +/obj/structure/chair/comfy/black{ dir = 8 }, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/engine/break_room) "cNR" = ( @@ -81215,39 +74723,27 @@ /turf/simulated/wall, /area/engine/break_room) "cNV" = ( -/obj/structure/cable{ - d2 = 4; - icon_state = "0-4" +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/plasteel{ + icon_state = "dark" }, -/obj/machinery/power/smes/engineering, -/obj/effect/decal/warning_stripes/northwest, -/turf/simulated/floor/plasteel, /area/engine/engineering) "cNW" = ( -/obj/effect/decal/warning_stripes/east, -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, +/obj/effect/decal/warning_stripes/north, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/engine, /area/engine/engineering) "cNX" = ( -/obj/machinery/power/terminal{ - dir = 4 +/obj/machinery/light_switch{ + pixel_x = -27 }, -/obj/structure/cable/yellow{ - d1 = 0; - d2 = 8; - icon_state = "0-8" +/turf/simulated/floor/plasteel{ + icon_state = "dark" }, -/obj/effect/decal/warning_stripes/east, -/turf/simulated/floor/plasteel, /area/engine/engineering) "cNY" = ( /obj/machinery/atmospherics/pipe/simple/visible/universal, @@ -81258,27 +74754,14 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/assembly/assembly_line) -"cOa" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/turf/simulated/floor/plasteel, -/area/engine/engineering) "cOb" = ( -/obj/structure/cable{ - d2 = 4; - icon_state = "0-4" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9; + pixel_y = 0 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" }, -/obj/machinery/power/smes/engineering, -/obj/effect/decal/warning_stripes/west, -/turf/simulated/floor/plasteel, /area/engine/engineering) "cOc" = ( /obj/machinery/alarm{ @@ -81295,20 +74778,6 @@ icon_state = "yellowcorner" }, /area/hallway/primary/aft) -"cOd" = ( -/obj/effect/decal/warning_stripes/west, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/turf/simulated/floor/plasteel, -/area/engine/engineering) "cOe" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -81321,10 +74790,6 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/snow{ - dir = 4; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel, /area/engine/break_room) "cOf" = ( @@ -81341,30 +74806,27 @@ /obj/item/t_scanner, /turf/simulated/floor/plasteel, /area/engine/break_room) -"cOg" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/plasteel, -/area/engine/engineering) "cOh" = ( /obj/structure/table, /obj/item/paper_bin{ pixel_x = 1; pixel_y = 9 }, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/engine/break_room) "cOi" = ( +/obj/effect/decal/warning_stripes/southwest, /obj/structure/cable/yellow{ - d1 = 2; + d1 = 4; d2 = 8; - icon_state = "2-8" + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" }, -/turf/simulated/floor/plasteel, /area/engine/engineering) "cOj" = ( /obj/structure/cable{ @@ -81394,7 +74856,6 @@ pixel_y = 0 }, /obj/machinery/vending/cigarette, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/engine/break_room) "cOm" = ( @@ -81631,12 +75092,8 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /turf/simulated/floor/plasteel, /area/atmos/distribution) @@ -81687,10 +75144,9 @@ /obj/effect/landmark/start{ name = "Station Engineer" }, -/obj/structure/chair/comfy/red{ +/obj/structure/chair/comfy/black{ dir = 8 }, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/engine/break_room) "cOO" = ( @@ -81733,7 +75189,6 @@ /area/toxins/xenobiology) "cOS" = ( /obj/structure/table, -/obj/item/reagent_containers/food/snacks/candy/confectionery/caramel_nougat, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -81803,7 +75258,6 @@ pixel_y = 4 }, /obj/item/book/manual/sop_engineering, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/engine/break_room) "cPa" = ( @@ -81862,15 +75316,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/genetics) -"cPg" = ( -/obj/structure/cable{ - d2 = 4; - icon_state = "0-4" - }, -/obj/machinery/power/smes/engineering, -/obj/effect/decal/warning_stripes/southwest, -/turf/simulated/floor/plasteel, -/area/engine/engineering) "cPh" = ( /obj/structure/cable{ d1 = 4; @@ -81896,10 +75341,6 @@ sensors = list("tox_sensor" = "Tank") }, /obj/effect/decal/warning_stripes/east, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, /turf/simulated/floor/plasteel, /area/atmos) "cPj" = ( @@ -81915,8 +75356,8 @@ /turf/simulated/floor/plating, /area/maintenance/aft) "cPk" = ( -/obj/machinery/floodlight, /obj/effect/decal/warning_stripes/east, +/obj/machinery/field/generator, /turf/simulated/floor/plating, /area/storage/secure) "cPl" = ( @@ -82002,8 +75443,6 @@ /obj/machinery/light_switch{ pixel_x = 27 }, -/obj/structure/flora/tree/pine/xmas, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/engine/equipmentstorage) "cPr" = ( @@ -82231,10 +75670,6 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, -/obj/structure/snow{ - dir = 5; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel, /area/engine/equipmentstorage) "cPO" = ( @@ -82258,7 +75693,6 @@ /obj/item/radio/intercom{ pixel_x = 28 }, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/engine/equipmentstorage) "cPQ" = ( @@ -82281,12 +75715,8 @@ /turf/simulated/floor/plasteel, /area/atmos) "cPT" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel, /area/atmos) @@ -82319,32 +75749,16 @@ /turf/simulated/floor/plasteel, /area/atmos/distribution) "cPX" = ( -/obj/machinery/camera{ - c_tag = "Engineering SMES"; - dir = 8; - network = list("SS13"); - pixel_x = 0; - pixel_y = 0 +/obj/structure/closet/radiation, +/turf/simulated/floor/plasteel{ + icon_state = "dark" }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, -/obj/effect/decal/warning_stripes/north, -/turf/simulated/floor/plasteel, /area/engine/engineering) "cPY" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/machinery/computer/camera_advanced/xenobio, -/obj/item/decorations/sticky_decorations/flammable/tinsel/purple{ - pixel_y = 19 - }, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -82372,23 +75786,6 @@ /obj/structure/lattice/catwalk, /turf/space, /area/solar/port) -"cQb" = ( -/obj/machinery/particle_accelerator/control_box, -/obj/structure/cable/yellow, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, -/turf/simulated/floor/plating, -/area/engine/engineering) -"cQc" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/obj/structure/closet/firecloset, -/obj/effect/decal/warning_stripes/northeast, -/turf/simulated/floor/plasteel, -/area/engine/engineering) "cQe" = ( /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 4; @@ -82447,6 +75844,7 @@ /area/atmos/distribution) "cQj" = ( /obj/effect/decal/warning_stripes/east, +/obj/machinery/shieldgen, /turf/simulated/floor/plating, /area/storage/secure) "cQk" = ( @@ -82458,13 +75856,6 @@ icon_state = "pipe-c" }, /obj/machinery/computer/camera_advanced/xenobio, -/obj/item/decorations/sticky_decorations/flammable/tinsel/purple{ - pixel_y = 19 - }, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -82647,12 +76038,8 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -82660,31 +76047,49 @@ }, /area/engine/chiefs_office) "cQF" = ( +/obj/effect/decal/warning_stripes/north, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/effect/decal/warning_stripes/west, -/turf/simulated/floor/plasteel, +/obj/structure/table/reinforced, +/obj/item/tank/internals/emergency_oxygen/engi, +/obj/item/clothing/gloves/color/black, +/obj/item/clothing/glasses/meson/engine, +/turf/simulated/floor/engine, /area/engine/engineering) "cQG" = ( +/obj/effect/decal/warning_stripes/north, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/effect/decal/warning_stripes/east, -/turf/simulated/floor/plasteel, +/obj/structure/table/reinforced, +/obj/item/clothing/suit/radiation, +/obj/item/clothing/head/radiation, +/obj/item/clothing/glasses/meson, +/turf/simulated/floor/engine, /area/engine/engineering) "cQH" = ( -/obj/effect/decal/warning_stripes/east, -/turf/simulated/floor/plasteel, +/obj/machinery/power/terminal{ + dir = 1; + icon_state = "term" + }, +/obj/effect/decal/warning_stripes/south, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/cable/yellow{ + d2 = 4; + icon_state = "0-4" + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, /area/engine/engineering) "cQI" = ( /obj/machinery/door_control{ @@ -82727,8 +76132,8 @@ }, /area/engine/chiefs_office) "cQJ" = ( -/obj/machinery/field/generator, /obj/effect/decal/warning_stripes/east, +/obj/machinery/power/emitter, /turf/simulated/floor/plating, /area/storage/secure) "cQK" = ( @@ -82791,20 +76196,11 @@ /obj/item/stack/sheet/glass{ amount = 50 }, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/engine/equipmentstorage) "cQP" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 - }, -/obj/structure/snow{ - dir = 1; - icon_state = "snow_surround" +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /turf/simulated/floor/plasteel, /area/engine/equipmentstorage) @@ -82873,21 +76269,23 @@ /turf/simulated/floor/plasteel, /area/atmos) "cQV" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "open"; - id_tag = "Singularity"; - name = "Singularity Blast Doors"; - opacity = 0 - }, +/obj/effect/decal/warning_stripes/north, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/obj/structure/table/reinforced, +/obj/item/storage/toolbox/mechanical{ + pixel_y = 5 + }, +/obj/item/flashlight{ + pixel_x = 1; + pixel_y = 5 + }, +/obj/item/rpd, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/engine, /area/engine/engineering) "cQW" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow{ @@ -82929,23 +76327,6 @@ }, /turf/simulated/floor/plasteel, /area/atmos/distribution) -"cQY" = ( -/obj/machinery/door/airlock/external{ - frequency = 1379; - icon_state = "door_locked"; - id_tag = "engineering_west_inner"; - locked = 1; - name = "Engineering External Access"; - req_access = null; - req_access_txt = "10;13" - }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/plating, -/area/engine/engineering) "cQZ" = ( /obj/structure/grille, /turf/simulated/wall/r_wall, @@ -82960,19 +76341,12 @@ /turf/simulated/floor/plasteel, /area/atmos/distribution) "cRb" = ( -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "open"; - id_tag = "Singularity"; - name = "Singularity Blast Doors"; - opacity = 0 - }, -/obj/structure/cable/yellow{ +/obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/turf/simulated/floor/plating, +/turf/simulated/floor/engine, /area/engine/engineering) "cRc" = ( /obj/effect/spawner/window/reinforced, @@ -83024,49 +76398,40 @@ /turf/space, /area/solar/port) "cRf" = ( -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "open"; - id_tag = "Singularity"; - name = "Singularity Blast Doors"; - opacity = 0 +/obj/effect/decal/warning_stripes/south, +/obj/machinery/atmospherics/pipe/simple/visible/green{ + dir = 4; + level = 2 }, -/obj/structure/sign/securearea{ - desc = "A warning sign which reads 'RADIOACTIVE AREA'"; - icon_state = "radiation"; - name = "RADIOACTIVE AREA"; - pixel_x = 32; - pixel_y = 0 - }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/plating, +/obj/machinery/meter, +/turf/simulated/floor/engine, /area/engine/engineering) "cRg" = ( -/obj/machinery/atmospherics/unary/portables_connector, -/obj/machinery/portable_atmospherics/canister/air, -/obj/effect/decal/warning_stripes/south, +/obj/machinery/access_button{ + command = "cycle_interior"; + frequency = 1379; + master_tag = "engineering_east_airlock"; + name = "interior access button"; + pixel_x = -20; + pixel_y = -20; + req_access_txt = "10;13" + }, +/obj/structure/cable{ + d1 = 1; + d2 = 4; + icon_state = "1-4"; + tag = "90Curve" + }, /turf/simulated/floor/plasteel, /area/engine/engineering) "cRh" = ( -/obj/machinery/door/airlock/external{ - frequency = 1379; - icon_state = "door_locked"; - id_tag = "engineering_east_inner"; - locked = 1; - name = "Engineering External Access"; - req_access = null; - req_access_txt = "10;13" +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 4; + level = 2 }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/turf/simulated/floor/plasteel{ + icon_state = "dark" }, -/turf/simulated/floor/plating, /area/engine/engineering) "cRi" = ( /obj/machinery/portable_atmospherics/canister/carbon_dioxide, @@ -83140,53 +76505,46 @@ }, /area/toxins/xenobiology) "cRo" = ( -/obj/structure/sign/securearea{ - desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; - icon_state = "space"; - layer = 4; - name = "EXTERNAL AIRLOCK"; - pixel_x = 32 - }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/machinery/light/small{ + dir = 4 }, +/obj/structure/closet/walllocker/emerglocker/north, +/obj/machinery/atmospherics/unary/portables_connector, +/obj/machinery/portable_atmospherics/canister/air, /turf/simulated/floor/plating, /area/engine/engineering) "cRp" = ( -/obj/machinery/power/rad_collector{ - anchored = 1 +/obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 6 + }, +/obj/item/wrench, +/turf/simulated/floor/plasteel{ + icon_state = "dark" }, -/obj/structure/cable/yellow, -/turf/simulated/floor/plating, /area/engine/engineering) "cRq" = ( -/obj/machinery/power/rad_collector{ - anchored = 1 - }, -/obj/item/tank/plasma, -/obj/structure/cable/yellow, -/turf/simulated/floor/plating, -/area/engine/engineering) -"cRr" = ( -/obj/machinery/light, -/obj/effect/decal/warning_stripes/south, -/turf/simulated/floor/plasteel, -/area/engine/engineering) -"cRs" = ( -/obj/structure/sign/securearea{ - desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; - icon_state = "space"; - layer = 4; - name = "EXTERNAL AIRLOCK"; - pixel_x = -32 - }, +/obj/effect/decal/warning_stripes/east, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/visible/green, +/turf/simulated/floor/engine, +/area/engine/engineering) +"cRr" = ( +/obj/machinery/door/airlock/engineering/glass{ + name = "Supermatter Engine Room"; + req_access_txt = "10"; + req_one_access_txt = "0" + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + pixel_y = 0 + }, /turf/simulated/floor/plating, /area/engine/engineering) "cRt" = ( @@ -83217,21 +76575,13 @@ }, /area/toxins/xenobiology) "cRw" = ( -/obj/machinery/access_button{ - command = "cycle_interior"; - frequency = 1379; - master_tag = "engineering_west_airlock"; - name = "interior access button"; - pixel_x = -20; - pixel_y = -20; - req_access_txt = "10;13" +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + pixel_y = 0 }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/effect/decal/warning_stripes/south, +/obj/machinery/light, /turf/simulated/floor/plasteel, /area/engine/engineering) "cRx" = ( @@ -83364,25 +76714,20 @@ /area/maintenance/aft) "cRJ" = ( /obj/effect/spawner/window/reinforced, -/obj/structure/cable/yellow{ +/obj/structure/cable{ + d2 = 4; + icon_state = "0-4" + }, +/obj/structure/cable{ d1 = 1; d2 = 4; icon_state = "1-4" }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/cable/yellow{ +/obj/structure/cable{ d1 = 2; d2 = 4; icon_state = "2-4" }, -/obj/structure/cable/yellow{ - d2 = 4; - icon_state = "0-4" - }, /turf/simulated/floor/plating, /area/engine/chiefs_office) "cRK" = ( @@ -83397,24 +76742,26 @@ }, /area/assembly/assembly_line) "cRL" = ( -/obj/structure/cable/yellow{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8" + icon_state = "4-8"; + pixel_y = 0 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/engine/chiefs_office) "cRM" = ( -/obj/structure/cable/yellow{ +/obj/machinery/suit_storage_unit/ce, +/obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8" + icon_state = "4-8"; + pixel_y = 0 }, -/obj/machinery/suit_storage_unit/ce, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -83448,6 +76795,12 @@ level = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8"; + tag = "" + }, /turf/simulated/floor/plasteel, /area/engine/equipmentstorage) "cRP" = ( @@ -83477,10 +76830,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/snow{ - dir = 1; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel, /area/engine/equipmentstorage) "cRT" = ( @@ -83521,7 +76870,6 @@ /obj/item/stack/rods{ amount = 50 }, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/engine/equipmentstorage) "cRV" = ( @@ -83530,10 +76878,6 @@ initialize_directions = 11; level = 1 }, -/obj/structure/snow{ - dir = 4; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel, /area/engine/equipmentstorage) "cRW" = ( @@ -83552,8 +76896,6 @@ /turf/simulated/floor/plating, /area/maintenance/asmaint) "cRX" = ( -/obj/item/decorations/sticky_decorations/flammable/snowman, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/engine/equipmentstorage) "cRY" = ( @@ -83616,7 +76958,6 @@ pixel_y = 32 }, /obj/machinery/vending/engivend, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/engine/equipmentstorage) "cSb" = ( @@ -83655,41 +76996,13 @@ /turf/simulated/floor/plating, /area/maintenance/asmaint2) "cSh" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/toxins/xenobiology) -"cSi" = ( -/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ - frequency = 1379; - id_tag = "engineering_west_airlock"; - pixel_x = 25; - req_access_txt = "10;13"; - tag_airpump = "engineering_west_pump"; - tag_chamber_sensor = "engineering_west_sensor"; - tag_exterior_door = "engineering_west_outer"; - tag_interior_door = "engineering_west_inner" - }, -/obj/machinery/airlock_sensor{ - frequency = 1379; - id_tag = "engineering_west_sensor"; - pixel_x = 25; - pixel_y = 12 - }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/plating, -/area/engine/engineering) "cSk" = ( /obj/structure/cable{ d1 = 1; @@ -83738,12 +77051,8 @@ /turf/simulated/floor/plasteel, /area/atmos/distribution) "cSp" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /turf/simulated/floor/plasteel, /area/engine/engineering) @@ -83815,8 +77124,15 @@ }, /area/atmos) "cSv" = ( -/obj/effect/decal/warning_stripes/south, -/turf/simulated/floor/plasteel, +/obj/effect/decal/warning_stripes/northwest, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + pixel_y = 0 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/engine, /area/engine/engineering) "cSw" = ( /turf/simulated/floor/engine{ @@ -83826,137 +77142,63 @@ }, /area/atmos) "cSx" = ( -/obj/machinery/door_control{ - id = "Singularity"; - name = "Singularity Blast Doors"; - pixel_x = 25; - pixel_y = 0; - req_access_txt = "10" - }, -/obj/effect/decal/warning_stripes/northeastcorner, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/effect/decal/warning_stripes/south, -/turf/simulated/floor/plasteel, -/area/engine/engineering) -"cSy" = ( -/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ - frequency = 1379; - id_tag = "engineering_east_airlock"; - pixel_x = -25; - req_access_txt = "10;13"; - tag_airpump = "engineering_east_pump"; - tag_chamber_sensor = "engineering_east_sensor"; - tag_exterior_door = "engineering_east_outer"; - tag_interior_door = "engineering_east_inner" - }, -/obj/machinery/airlock_sensor{ - frequency = 1379; - id_tag = "engineering_east_sensor"; - pixel_x = -25; - pixel_y = 12 - }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/plating, -/area/engine/engineering) -"cSz" = ( -/obj/machinery/door/airlock/external{ - frequency = 1379; - icon_state = "door_locked"; - id_tag = "engineering_west_outer"; - locked = 1; - name = "Engineering External Access"; - req_access = null; - req_access_txt = "10;13" - }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/plating, -/area/engine/engineering) -"cSA" = ( -/obj/effect/spawner/window/reinforced, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/plating, -/area/engine/engineering) -"cSB" = ( -/obj/machinery/door/airlock/external{ - frequency = 1379; - icon_state = "door_locked"; - id_tag = "engineering_east_outer"; - locked = 1; - name = "Engineering External Access"; - req_access = null; - req_access_txt = "10;13" - }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/plating, -/area/engine/engineering) -"cSC" = ( -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/structure/grille, -/turf/simulated/floor/plating/airless, -/area/engine/engineering) -"cSD" = ( -/obj/item/extinguisher, -/obj/machinery/access_button{ - command = "cycle_exterior"; - frequency = 1379; - master_tag = "engineering_west_airlock"; - name = "exterior access button"; - pixel_x = 20; - pixel_y = 20; - req_access_txt = "10;13" - }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/turf/simulated/floor/plating/airless, -/area/engine/engineering) -"cSE" = ( -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/turf/simulated/floor/plating/airless, -/area/space/nearstation) -"cSF" = ( -/obj/structure/cable/yellow{ +/obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8" + icon_state = "4-8"; + pixel_y = 0 }, -/turf/simulated/floor/plating/airless, -/area/space/nearstation) +/turf/simulated/floor/engine, +/area/engine/engineering) +"cSA" = ( +/obj/machinery/door/airlock/engineering/glass{ + heat_proof = 1; + name = "Supermatter Chamber"; + req_access_txt = "10"; + req_one_access_txt = "0" + }, +/turf/simulated/floor/engine, +/area/engine/supermatter) +"cSE" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/binary/pump/on{ + dir = 8; + name = "Gas to Cooling Loop" + }, +/turf/simulated/floor/engine, +/area/engine/engineering) +"cSF" = ( +/obj/effect/decal/warning_stripes/east, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/visible/green{ + dir = 4; + tag = "icon-manifold-g (NORTH)" + }, +/turf/simulated/floor/engine, +/area/engine/engineering) "cSG" = ( /obj/structure/table/reinforced, /obj/machinery/photocopier/faxmachine{ department = "Chief Engineer's Office" }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -83971,18 +77213,8 @@ }, /area/toxins/xenobiology) "cSI" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/turf/simulated/floor/plating/airless, -/area/space/nearstation) +/turf/simulated/floor/engine, +/area/engine/supermatter) "cSJ" = ( /obj/structure/cable{ d1 = 1; @@ -84005,22 +77237,30 @@ /turf/simulated/floor/plating, /area/maintenance/asmaint2) "cSM" = ( -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 8; - icon_state = "2-8" +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/turf/simulated/floor/plating/airless, -/area/space/nearstation) +/obj/machinery/atmospherics/binary/pump{ + dir = 8; + name = "Mix to Gas" + }, +/turf/simulated/floor/engine, +/area/engine/engineering) "cSN" = ( -/obj/structure/chair/stool, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + pixel_y = 0 + }, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/effect/decal/warning_stripes/south, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/engine, /area/engine/engineering) "cSO" = ( /obj/structure/table, @@ -84043,12 +77283,6 @@ pixel_x = 0; tag = "" }, -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8"; - tag = "" - }, /turf/simulated/floor/plasteel, /area/engine/equipmentstorage) "cSP" = ( @@ -84068,10 +77302,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/snow{ - dir = 1; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel, /area/engine/equipmentstorage) "cSQ" = ( @@ -84173,10 +77403,6 @@ /obj/machinery/atmospherics/pipe/simple/visible/universal{ dir = 4 }, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, /turf/simulated/floor/plasteel, /area/atmos) "cTa" = ( @@ -84227,14 +77453,14 @@ name = "Robotics Operating Computer"; stat = 1 }, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/assembly/assembly_line) +"cTe" = ( +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plasteel, +/area/engine/equipmentstorage) "cTf" = ( /obj/machinery/newscaster{ pixel_x = 0; @@ -84312,13 +77538,12 @@ }, /area/atmos) "cTm" = ( -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 8; - icon_state = "2-8" +/obj/machinery/atmospherics/unary/portables_connector{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" }, -/obj/structure/grille, -/turf/simulated/floor/plating/airless, /area/engine/engineering) "cTn" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow{ @@ -84374,31 +77599,23 @@ /turf/simulated/floor/plating, /area/atmos/distribution) "cTs" = ( -/obj/item/wrench, -/obj/machinery/access_button{ - command = "cycle_exterior"; - frequency = 1379; - master_tag = "engineering_east_airlock"; - name = "exterior access button"; - pixel_x = -20; - pixel_y = 20; - req_access_txt = "10;13" +/obj/machinery/atmospherics/pipe/manifold/visible{ + dir = 1 }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 4; - icon_state = "1-4" +/turf/simulated/floor/plasteel{ + icon_state = "dark" }, -/turf/simulated/floor/plating/airless, /area/engine/engineering) "cTt" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/machinery/light{ + dir = 4 + }, +/obj/machinery/atmospherics/unary/portables_connector{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" }, -/obj/structure/grille, -/turf/simulated/floor/plating/airless, /area/engine/engineering) "cTu" = ( /obj/machinery/computer/general_air_control/large_tank_control{ @@ -84408,10 +77625,6 @@ output_tag = "waste_out"; sensors = list("waste_sensor" = "Tank") }, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "green" @@ -84440,108 +77653,62 @@ }, /area/atmos) "cTx" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/plating/airless, -/area/space/nearstation) -"cTy" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/cable/yellow{ +/obj/effect/decal/warning_stripes/southwestcorner, +/obj/structure/cable{ d1 = 1; d2 = 4; icon_state = "1-4" }, -/obj/structure/grille, -/turf/simulated/floor/plating/airless, -/area/engine/engineering) -"cTz" = ( -/obj/machinery/power/emitter{ - anchored = 1; - dir = 4; - state = 2 - }, -/obj/structure/cable/yellow{ - d1 = 0; - d2 = 8; - icon_state = "0-8" - }, -/turf/simulated/floor/plating/airless, +/turf/simulated/floor/engine, /area/engine/engineering) "cTA" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 8; - icon_state = "1-8" +/obj/machinery/atmospherics/unary/thermomachine/freezer{ + dir = 8 }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/turf/simulated/floor/plasteel{ + icon_state = "dark" }, -/obj/structure/grille, -/turf/simulated/floor/plating/airless, /area/engine/engineering) "cTB" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance, /turf/simulated/floor/plating, /area/maintenance/asmaint) -"cTC" = ( -/obj/machinery/power/emitter{ - anchored = 1; - dir = 8; - state = 2 - }, -/obj/structure/cable/yellow{ - d2 = 4; - icon_state = "0-4" - }, -/turf/simulated/floor/plating/airless, -/area/engine/engineering) "cTD" = ( -/obj/structure/cable/yellow{ +/obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 4; - icon_state = "1-4" +/obj/machinery/atmospherics/binary/pump/on{ + dir = 4; + name = "Cooling Loop to Gas" }, -/turf/simulated/floor/plating/airless, -/area/space/nearstation) +/turf/simulated/floor/engine, +/area/engine/engineering) "cTE" = ( -/obj/machinery/power/tesla_coil{ - anchored = 1 +/obj/effect/decal/warning_stripes/east, +/obj/machinery/atmospherics/pipe/manifold/visible/yellow{ + dir = 4; + level = 2 }, -/obj/structure/cable/yellow{ - d1 = 0; - d2 = 8; - icon_state = "0-8" +/obj/machinery/light{ + dir = 4 }, -/turf/simulated/floor/plating/airless, -/area/space/nearstation) +/turf/simulated/floor/engine, +/area/engine/engineering) "cTF" = ( -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/structure/cable/yellow{ +/obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/turf/simulated/floor/plating/airless, -/area/space/nearstation) +/obj/machinery/atmospherics/binary/pump{ + dir = 4; + name = "Gas to Mix" + }, +/turf/simulated/floor/engine, +/area/engine/engineering) "cTG" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/engineering/glass{ @@ -84624,8 +77791,11 @@ initialize_directions = 10; level = 1 }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/yellow{ - pixel_y = 19 +/obj/structure/cable{ + d1 = 1; + d2 = 4; + icon_state = "1-4"; + tag = "90Curve" }, /turf/simulated/floor/plasteel{ dir = 8; @@ -84642,13 +77812,6 @@ /turf/simulated/floor/plasteel, /area/engine/equipmentstorage) "cTO" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - pixel_y = 0; - tag = "" - }, /obj/structure/table, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -84957,15 +78120,18 @@ /turf/simulated/floor/plasteel, /area/engine/engineering) "cUl" = ( -/obj/machinery/power/tesla_coil{ - anchored = 1 +/obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/pipe/manifold/visible/cyan{ + dir = 8; + initialize_directions = 11; + level = 2 }, -/obj/structure/cable/yellow{ - d2 = 4; - icon_state = "0-4" +/obj/machinery/meter, +/obj/machinery/light{ + dir = 8 }, -/turf/simulated/floor/plating/airless, -/area/space/nearstation) +/turf/simulated/floor/engine, +/area/engine/engineering) "cUm" = ( /obj/structure/reagent_dispensers/fueltank, /obj/structure/cable{ @@ -84979,48 +78145,11 @@ }, /turf/simulated/floor/plasteel, /area/engine/equipmentstorage) -"cUn" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/structure/grille, -/turf/simulated/floor/plating/airless, -/area/engine/engineering) "cUo" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 8; - icon_state = "1-8" +/obj/structure/closet/firecloset, +/turf/simulated/floor/plasteel{ + icon_state = "dark" }, -/obj/structure/grille, -/turf/simulated/floor/plating/airless, -/area/engine/engineering) -"cUp" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/structure/grille, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/plating/airless, -/area/engine/engineering) -"cUq" = ( -/obj/machinery/light{ - dir = 4; - icon_state = "tube1" - }, -/obj/structure/grille, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/plating/airless, /area/engine/engineering) "cUr" = ( /obj/item/bikehorn/rubberducky, @@ -85042,6 +78171,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8"; + tag = "" + }, /turf/simulated/floor/plasteel, /area/engine/equipmentstorage) "cUt" = ( @@ -85061,8 +78196,14 @@ /obj/item/rcd_ammo, /obj/item/rcd_ammo, /obj/item/rcd_ammo, -/obj/item/stock_parts/cell/high/plus, -/obj/item/stock_parts/cell/high/plus, +/obj/item/stock_parts/cell/high{ + charge = 100; + maxcharge = 15000 + }, +/obj/item/stock_parts/cell/high{ + charge = 100; + maxcharge = 15000 + }, /obj/item/clothing/glasses/meson{ pixel_y = 4 }, @@ -85092,10 +78233,6 @@ /area/atmos) "cUy" = ( /obj/machinery/computer/atmos_alert, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -85119,22 +78256,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/asmaint) -"cUB" = ( -/obj/machinery/door_control{ - id = "Singularity"; - name = "Singularity Blast Doors"; - pixel_x = -25; - pixel_y = 0; - req_access_txt = "10" - }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/effect/decal/warning_stripes/west, -/turf/simulated/floor/plasteel, -/area/engine/engineering) "cUC" = ( /obj/structure/cable{ d1 = 1; @@ -85154,45 +78275,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/maintenance/asmaint) -"cUD" = ( -/obj/structure/grille, -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4"; - tag = "" - }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/plating/airless, -/area/engine/engineering) -"cUE" = ( -/obj/structure/grille, -/obj/structure/cable{ - d1 = 1; - d2 = 8; - icon_state = "1-8"; - tag = "" - }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/plating/airless, -/area/engine/engineering) -"cUF" = ( -/obj/structure/grille, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/turf/simulated/floor/plating/airless, -/area/engine/engineering) "cUG" = ( /obj/structure/disposalpipe/segment{ dir = 2; @@ -85205,56 +78287,15 @@ }, /turf/simulated/floor/plating, /area/maintenance/asmaint) -"cUH" = ( -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/turf/simulated/floor/plating/airless, -/area/engine/engineering) -"cUI" = ( -/obj/structure/grille, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/plating/airless, -/area/engine/engineering) -"cUJ" = ( -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/turf/simulated/floor/plating/airless, -/area/engine/engineering) -"cUK" = ( -/obj/structure/grille, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/turf/simulated/floor/plating/airless, -/area/engine/engineering) -"cUL" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/plating/airless, -/area/engine/engineering) "cUM" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 4; - icon_state = "1-4" +/obj/structure/rack, +/obj/item/wrench, +/obj/item/weldingtool, +/obj/item/clothing/head/welding, +/turf/simulated/floor/plasteel{ + icon_state = "dark" }, -/turf/simulated/floor/plating/airless, -/area/space/nearstation) +/area/engine/engineering) "cUN" = ( /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 4; @@ -85267,19 +78308,6 @@ }, /turf/simulated/floor/plasteel, /area/atmos/distribution) -"cUO" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/turf/simulated/floor/plating/airless, -/area/space/nearstation) "cUP" = ( /obj/structure/window/reinforced{ dir = 8 @@ -85302,20 +78330,12 @@ /turf/simulated/floor/plasteel, /area/toxins/xenobiology) "cUQ" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 8; - icon_state = "1-8" +/obj/structure/rack, +/obj/item/crowbar, +/obj/item/flashlight, +/turf/simulated/floor/plasteel{ + icon_state = "dark" }, -/turf/simulated/floor/plating/airless, -/area/space/nearstation) -"cUR" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/turf/simulated/floor/plating/airless, /area/engine/engineering) "cUS" = ( /obj/machinery/atmospherics/binary/valve/digital{ @@ -85332,14 +78352,6 @@ /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/medical/virology) -"cUU" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/turf/simulated/floor/plating/airless, -/area/engine/engineering) "cUV" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/simple/hidden/green{ @@ -85390,14 +78402,6 @@ icon_state = "white" }, /area/toxins/xenobiology) -"cVa" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/plating/airless, -/area/engine/engineering) "cVb" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/maintenance{ @@ -85423,17 +78427,6 @@ }, /turf/simulated/floor/plasteel, /area/maintenance/aft) -"cVc" = ( -/obj/machinery/door_control{ - id = "Singularity"; - name = "Singularity Blast Doors"; - pixel_x = 25; - pixel_y = 0; - req_access_txt = "10" - }, -/obj/effect/decal/warning_stripes/east, -/turf/simulated/floor/plasteel, -/area/engine/engineering) "cVd" = ( /turf/simulated/floor/plating, /area/maintenance/portsolar) @@ -85485,10 +78478,6 @@ /obj/machinery/light_switch{ pixel_x = -27 }, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, /turf/simulated/floor/plasteel, /area/engine/engineering) "cVi" = ( @@ -85516,6 +78505,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + pixel_x = 0; + tag = "" + }, /turf/simulated/floor/plasteel, /area/engine/engineering) "cVl" = ( @@ -85525,10 +78521,6 @@ track = 0 }, /obj/structure/cable, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, /turf/simulated/floor/plating, /area/maintenance/portsolar) "cVm" = ( @@ -85586,43 +78578,32 @@ /turf/simulated/floor/plasteel, /area/engine/engineering) "cVp" = ( -/obj/machinery/door_control{ - id = "Singularity"; - name = "Singularity Blast Doors"; - pixel_x = -25; - pixel_y = 0; - req_access_txt = "10" +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + pixel_y = 0 }, -/obj/effect/decal/warning_stripes/northwestcorner, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/obj/effect/decal/warning_stripes/south, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/engine, /area/engine/engineering) "cVq" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + pixel_y = 0 }, -/obj/effect/decal/warning_stripes/south, -/turf/simulated/floor/plasteel, -/area/engine/engineering) -"cVr" = ( -/obj/machinery/atmospherics/unary/portables_connector, -/obj/machinery/portable_atmospherics/canister/air, -/obj/effect/decal/warning_stripes/southeast, -/turf/simulated/floor/plasteel, +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/turf/simulated/floor/engine, /area/engine/engineering) "cVs" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /obj/structure/disposalpipe/segment{ dir = 8; icon_state = "pipe-c" @@ -85633,38 +78614,35 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, /turf/simulated/floor/plasteel, /area/engine/engineering) "cVt" = ( +/obj/structure/chair{ + dir = 8 + }, +/obj/machinery/light{ + dir = 4 + }, /obj/effect/landmark/start{ name = "Civilian" }, -/obj/structure/snow{ - dir = 4; - icon_state = "snow_surround" - }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "green" }, /area/hallway/secondary/exit) "cVu" = ( -/obj/machinery/access_button{ - command = "cycle_interior"; - frequency = 1379; - master_tag = "engineering_east_airlock"; - name = "interior access button"; - pixel_x = -20; - pixel_y = -20; - req_access_txt = "10;13" +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/turf/simulated/floor/plasteel{ + icon_state = "dark" }, -/obj/effect/decal/warning_stripes/south, -/turf/simulated/floor/plasteel, /area/engine/engineering) "cVv" = ( /obj/structure/sink{ @@ -85681,25 +78659,13 @@ }, /area/crew_quarters/toilet) "cVw" = ( -/obj/item/stack/cable_coil{ - pixel_x = 3; - pixel_y = -7 +/obj/effect/decal/warning_stripes/south, +/obj/machinery/atmospherics/pipe/simple/visible/green{ + dir = 4; + level = 2 }, -/obj/item/stack/cable_coil{ - pixel_x = 3; - pixel_y = -7 - }, -/obj/item/crowbar, -/obj/machinery/light_switch{ - pixel_x = -27 - }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/effect/decal/warning_stripes/west, -/turf/simulated/floor/plasteel, +/obj/machinery/light, +/turf/simulated/floor/engine, /area/engine/engineering) "cVx" = ( /obj/structure/disposalpipe/segment{ @@ -85711,59 +78677,38 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + pixel_x = 0; + tag = "" + }, /turf/simulated/floor/plasteel, /area/engine/engineering) "cVy" = ( +/obj/effect/decal/warning_stripes/south, +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 4; + level = 2 + }, +/obj/machinery/meter, +/obj/machinery/light, +/obj/structure/disaster_counter/supermatter{ + pixel_y = -32 + }, +/turf/simulated/floor/engine, +/area/engine/engineering) +"cVB" = ( /obj/structure/sign/securearea{ desc = "A warning sign which reads 'RADIOACTIVE AREA'"; icon_state = "radiation"; name = "RADIOACTIVE AREA"; - pixel_x = 32; + pixel_x = 0; pixel_y = 0 }, -/obj/effect/decal/warning_stripes/east, -/turf/simulated/floor/plasteel, -/area/engine/engineering) -"cVz" = ( -/obj/machinery/pipedispenser, -/obj/effect/decal/warning_stripes/east, -/turf/simulated/floor/plating, -/area/storage/secure) -"cVA" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, -/obj/structure/closet/crate/internals, -/obj/effect/decal/warning_stripes/west, -/turf/simulated/floor/plating, -/area/storage/secure) -"cVB" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/effect/decal/warning_stripes/west, -/turf/simulated/floor/plasteel, -/area/engine/engineering) -"cVC" = ( -/obj/structure/closet/crate, -/obj/item/stack/sheet/metal{ - amount = 50 - }, -/obj/item/stack/rods{ - amount = 50 - }, -/obj/item/stack/sheet/glass{ - amount = 50 - }, -/obj/item/airlock_electronics, -/obj/item/airlock_electronics, -/obj/item/stock_parts/cell/high/plus, -/obj/effect/decal/warning_stripes/west, -/turf/simulated/floor/plating, -/area/storage/secure) +/turf/simulated/wall/r_wall, +/area/engine/supermatter) "cVD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -85785,15 +78730,6 @@ }, /turf/simulated/floor/plasteel, /area/engine/engineering) -"cVG" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/effect/decal/warning_stripes/southwest, -/turf/simulated/floor/plasteel, -/area/engine/engineering) "cVH" = ( /obj/structure/cable{ d1 = 4; @@ -85858,15 +78794,14 @@ /turf/simulated/floor/plating, /area/atmos/distribution) "cVN" = ( -/obj/item/wirecutters, -/obj/structure/cable/yellow{ - d1 = 2; +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable{ + d1 = 1; d2 = 8; - icon_state = "2-8" + icon_state = "1-8" }, -/obj/effect/decal/warning_stripes/south, -/turf/simulated/floor/plasteel, -/area/engine/engineering) +/turf/simulated/floor/engine, +/area/engine/supermatter) "cVO" = ( /obj/effect/spawner/window/reinforced, /obj/machinery/atmospherics/pipe/simple/visible/cyan{ @@ -85911,108 +78846,53 @@ /turf/simulated/floor/plating, /area/atmos/distribution) "cVS" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/effect/decal/cleanable/dirt, +/obj/machinery/alarm/engine{ + dir = 4; + pixel_x = -22 }, -/obj/effect/decal/warning_stripes/south, -/turf/simulated/floor/plasteel, -/area/engine/engineering) +/obj/machinery/power/apc{ + cell_type = 25000; + dir = 1; + name = "Engineering Engine Super APC"; + pixel_x = 0; + pixel_y = 24; + shock_proof = 1 + }, +/obj/machinery/atmospherics/binary/pump{ + dir = 1; + name = "Gas to Filter" + }, +/obj/structure/cable{ + d2 = 4; + icon_state = "0-4" + }, +/turf/simulated/floor/engine, +/area/engine/supermatter) "cVT" = ( -/obj/effect/decal/warning_stripes/southeast, -/turf/simulated/floor/plasteel, -/area/engine/engineering) +/obj/structure/sign/fire, +/turf/simulated/wall/r_wall, +/area/engine/supermatter) "cVU" = ( /obj/effect/spawner/window/reinforced, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/cable/yellow{ +/obj/structure/cable{ d2 = 4; icon_state = "0-4" }, /turf/simulated/floor/plating, /area/engine/chiefs_office) "cVV" = ( -/obj/item/decorations/sticky_decorations/flammable/tinsel/red{ - pixel_y = 19 - }, -/obj/structure/snow, -/turf/simulated/floor/wood, +/obj/structure/flora/ausbushes/genericbush, +/turf/simulated/floor/grass, /area/hallway/secondary/exit) -"cVW" = ( -/obj/machinery/shieldgen, -/obj/effect/decal/warning_stripes/east, -/turf/simulated/floor/plating, -/area/storage/secure) -"cVX" = ( -/obj/structure/closet/crate{ - name = "solar pack crate" - }, -/obj/item/solar_assembly, -/obj/item/solar_assembly, -/obj/item/solar_assembly, -/obj/item/solar_assembly, -/obj/item/solar_assembly, -/obj/item/solar_assembly, -/obj/item/solar_assembly, -/obj/item/solar_assembly, -/obj/item/solar_assembly, -/obj/item/solar_assembly, -/obj/item/solar_assembly, -/obj/item/solar_assembly, -/obj/item/solar_assembly, -/obj/item/circuitboard/solar_control, -/obj/item/tracker_electronics, -/obj/item/paper/solar, -/obj/machinery/light/small{ - dir = 4 - }, -/obj/effect/decal/warning_stripes/west, -/turf/simulated/floor/plating, -/area/storage/secure) -"cVY" = ( -/obj/machinery/the_singularitygen{ - anchored = 0 - }, -/obj/effect/decal/warning_stripes/east, -/turf/simulated/floor/plating, -/area/storage/secure) -"cVZ" = ( -/obj/machinery/power/port_gen/pacman, -/obj/effect/decal/warning_stripes/west, -/turf/simulated/floor/plating, -/area/storage/secure) -"cWa" = ( -/obj/effect/decal/warning_stripes/west, -/obj/machinery/suit_storage_unit/engine, -/turf/simulated/floor/plating, -/area/storage/secure) -"cWb" = ( -/obj/machinery/power/emitter, -/obj/effect/decal/warning_stripes/east, -/turf/simulated/floor/plating, -/area/storage/secure) -"cWd" = ( -/obj/structure/closet/firecloset, -/obj/effect/decal/warning_stripes/west, -/turf/simulated/floor/plating, -/area/storage/secure) -"cWe" = ( -/obj/effect/decal/warning_stripes/northeastcorner, -/turf/simulated/floor/plasteel, -/area/engine/engineering) "cWf" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/machinery/door/firedoor, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /obj/machinery/door/airlock/command/glass{ id_tag = "ceofficedoor"; name = "Chief Engineer"; @@ -86020,6 +78900,12 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + pixel_y = 0 + }, /turf/simulated/floor/plasteel, /area/engine/chiefs_office) "cWg" = ( @@ -86030,6 +78916,18 @@ icon_state = "white" }, /area/toxins/xenobiology) +"cWh" = ( +/obj/structure/chair{ + dir = 4 + }, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "green" + }, +/area/hallway/secondary/exit) "cWi" = ( /obj/effect/spawner/window/reinforced, /obj/machinery/door/poddoor{ @@ -86130,25 +79028,6 @@ icon_state = "white" }, /area/toxins/xenobiology) -"cWs" = ( -/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/engine/engineering) -"cWt" = ( -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel, -/area/engine/engineering) "cWu" = ( /obj/machinery/navbeacon{ codes_txt = "delivery"; @@ -86201,6 +79080,12 @@ d2 = 8; icon_state = "2-8" }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + pixel_y = 0 + }, /turf/simulated/floor/plasteel, /area/engine/engineering) "cWz" = ( @@ -86216,10 +79101,6 @@ d2 = 4; icon_state = "0-4" }, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, /turf/simulated/floor/plasteel, /area/engine/engineering) "cWA" = ( @@ -86247,9 +79128,6 @@ /obj/structure/closet/secure_closet/engineering_chief{ req_access_txt = "0" }, -/obj/item/decorations/sticky_decorations/flammable/christmas_stocking{ - pixel_x = -17 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -86259,15 +79137,6 @@ /obj/item/clothing/glasses/sunglasses/yeah, /turf/simulated/floor/beach/sand, /area/hallway/secondary/exit) -"cWF" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/engineering/glass{ - name = "Engine Room"; - req_access_txt = "10"; - req_one_access_txt = null - }, -/turf/simulated/floor/plasteel, -/area/engine/engineering) "cWG" = ( /obj/machinery/door/window/southleft{ base_state = "left"; @@ -86351,21 +79220,12 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /turf/simulated/floor/plasteel, /area/engine/engineering) "cWN" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8; initialize_directions = 11; @@ -86384,16 +79244,6 @@ }, /turf/simulated/floor/plasteel, /area/atmos) -"cWP" = ( -/obj/machinery/power/terminal{ - dir = 8 - }, -/obj/structure/cable/yellow{ - d2 = 4; - icon_state = "0-4" - }, -/turf/simulated/floor/plasteel, -/area/engine/engineering) "cWQ" = ( /obj/structure/flora/tree/palm, /obj/item/clothing/head/soft/rainbow, @@ -86582,24 +79432,6 @@ tag = "icon-stage_stairs" }, /area/hallway/primary/starboard/east) -"cXi" = ( -/obj/machinery/hologram/holopad, -/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/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/engine/engineering) "cXj" = ( /turf/simulated/floor/plasteel{ dir = 8; @@ -86655,6 +79487,13 @@ icon_state = "purple" }, /area/hallway/secondary/exit) +"cXp" = ( +/obj/structure/chair, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "green" + }, +/area/hallway/secondary/exit) "cXq" = ( /obj/structure/cable{ d2 = 2; @@ -86677,6 +79516,18 @@ }, /turf/simulated/floor/plating, /area/maintenance/asmaint) +"cXs" = ( +/obj/machinery/status_display{ + density = 0; + layer = 4; + pixel_x = 0; + pixel_y = 32 + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "green" + }, +/area/hallway/secondary/exit) "cXt" = ( /obj/structure/cable{ d1 = 1; @@ -86719,10 +79570,6 @@ /area/toxins/xenobiology) "cXw" = ( /obj/machinery/computer/station_alert, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, /turf/simulated/floor/plasteel, /area/engine/engineering) "cXx" = ( @@ -86788,25 +79635,6 @@ icon_state = "white" }, /area/toxins/xenobiology) -"cXC" = ( -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 - }, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/engineering/glass{ - name = "Engine Room"; - req_access_txt = "10"; - req_one_access_txt = null - }, -/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) "cXD" = ( /obj/structure/cable{ d1 = 1; @@ -86816,20 +79644,7 @@ }, /turf/simulated/floor/plasteel, /area/engine/engineering) -"cXE" = ( -/obj/effect/decal/warning_stripes/south, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11; - level = 1 - }, -/turf/simulated/floor/plasteel, -/area/engine/engineering) "cXF" = ( -/obj/effect/decal/warning_stripes/southeastcorner, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel, @@ -86856,25 +79671,6 @@ icon_state = "neutralfull" }, /area/engine/chiefs_office) -"cXH" = ( -/obj/effect/decal/warning_stripes/southwestcorner, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/engine/engineering) -"cXI" = ( -/obj/machinery/vending/wallmed{ - name = "Emergency NanoMed"; - pixel_x = 0; - pixel_y = -32; - req_access_txt = "0" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/turf/simulated/floor/plasteel, -/area/engine/engineering) "cXJ" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -86904,45 +79700,26 @@ /turf/simulated/floor/plasteel, /area/engine/equipmentstorage) "cXM" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/turf/simulated/floor/plasteel, -/area/engine/engineering) -"cXN" = ( -/obj/machinery/door/firedoor, /obj/machinery/door/airlock/engineering/glass{ - name = "Engine Room"; - req_access_txt = "10"; - req_one_access_txt = null + name = "SMES Room"; + req_access_txt = "32"; + req_one_access_txt = "0" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 + dir = 10 }, /turf/simulated/floor/plasteel, /area/engine/engineering) "cXO" = ( -/obj/machinery/light{ - dir = 8 +/obj/machinery/shower{ + dir = 4; + icon_state = "shower" }, -/obj/item/decorations/sticky_decorations/flammable/snowman, -/obj/structure/snow, +/obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, /area/atmos) "cXP" = ( @@ -86974,12 +79751,6 @@ dir = 4; network = list("SS13") }, -/obj/structure/dispenser, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /obj/machinery/door_control{ desc = "A remote control-switch for secure storage."; id = "Secure Storage"; @@ -86988,6 +79759,12 @@ pixel_y = 0; req_access_txt = "56" }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + tag = "" + }, /turf/simulated/floor/plasteel, /area/engine/engineering) "cXT" = ( @@ -87074,25 +79851,28 @@ output_tag = "n2o_out"; sensors = list("n2o_sensor" = "Tank") }, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "escape" }, /area/atmos) -"cYe" = ( -/obj/structure/snow{ - dir = 5; - icon_state = "snow_corner" +"cYd" = ( +/obj/structure/chair, +/obj/machinery/light{ + dir = 1; + on = 1 }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "green" }, /area/hallway/secondary/exit) +"cYe" = ( +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "green" + }, +/area/hallway/secondary/exit) "cYf" = ( /obj/machinery/air_sensor{ frequency = 1441; @@ -87144,22 +79924,9 @@ /turf/simulated/floor/plating, /area/maintenance/asmaint) "cYm" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "open"; - id_tag = "Singularity"; - name = "Singularity Blast Doors"; - opacity = 0 - }, -/obj/machinery/door/airlock/engineering/glass{ - name = "Engine Room"; - req_access_txt = "10"; - req_one_access_txt = null - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plating, +/obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/hologram/holopad, +/turf/simulated/floor/plasteel, /area/engine/engineering) "cYn" = ( /obj/structure/cable{ @@ -87172,19 +79939,9 @@ /turf/simulated/floor/plasteel, /area/hallway/secondary/exit) "cYo" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/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, +/turf/simulated/wall/r_wall, /area/engine/engineering) "cYp" = ( /obj/structure/chair{ @@ -87199,11 +79956,6 @@ }, /area/hallway/secondary/exit) "cYq" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, @@ -87212,54 +79964,57 @@ }, /area/storage/secure) "cYr" = ( -/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 }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + pixel_y = 0 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/storage/secure) "cYs" = ( -/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 }, +/obj/structure/cable{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/storage/secure) "cYv" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8"; + tag = "" + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + tag = "" + }, /turf/simulated/floor/plasteel, /area/engine/engineering) "cYw" = ( @@ -87287,7 +80042,11 @@ pixel_x = -25; pixel_y = -8 }, -/obj/structure/lattice/catwalk, +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 4; + level = 2 + }, +/obj/structure/lattice, /turf/space, /area/space/nearstation) "cYC" = ( @@ -87296,67 +80055,29 @@ id_tag = "Secure Storage"; name = "Secure Storage Blast Doors" }, -/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 }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + pixel_y = 0 + }, /turf/simulated/floor/plating, /area/storage/secure) "cYD" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11; - level = 1 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9; pixel_y = 0 }, -/turf/simulated/floor/plasteel, -/area/engine/engineering) -"cYE" = ( -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 4; - icon_state = "2-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 + dir = 9 }, -/turf/simulated/floor/plasteel, -/area/engine/engineering) -"cYF" = ( -/obj/structure/closet/radiation, -/obj/structure/extinguisher_cabinet{ - pixel_x = 27; - pixel_y = 0 - }, -/obj/effect/decal/warning_stripes/southeastcorner, -/turf/simulated/floor/plasteel, -/area/engine/engineering) -"cYG" = ( -/obj/machinery/hologram/holopad, -/obj/effect/decal/warning_stripes/northwest, +/obj/structure/closet/secure_closet/engineering_electrical, /turf/simulated/floor/plasteel, /area/engine/engineering) "cYH" = ( @@ -87456,27 +80177,15 @@ }, /area/hallway/primary/central/west) "cYQ" = ( -/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 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 - }, -/turf/simulated/floor/plasteel, +/obj/effect/spawner/window/reinforced/plasma, +/turf/simulated/floor/plating, /area/engine/engineering) "cYR" = ( /obj/structure/disposalpipe/segment{ dir = 8; icon_state = "pipe-c" }, -/turf/simulated/wall/r_wall, +/turf/simulated/wall, /area/engine/engineering) "cYS" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -87502,6 +80211,11 @@ icon_state = "1-2"; tag = "" }, +/obj/structure/sign/securearea{ + desc = "A warning sign which reads 'HIGH VOLTAGE'"; + icon_state = "shock"; + name = "HIGH VOLTAGE" + }, /turf/simulated/wall/r_wall, /area/engine/engineering) "cYV" = ( @@ -87513,32 +80227,13 @@ /obj/machinery/atmospherics/pipe/manifold4w/visible, /turf/simulated/floor/plasteel, /area/atmos) -"cYX" = ( -/obj/structure/sign/securearea{ - desc = "A warning sign which reads 'HIGH VOLTAGE'"; - icon_state = "shock"; - name = "HIGH VOLTAGE" - }, -/turf/simulated/wall/r_wall, -/area/engine/engineering) "cYY" = ( -/obj/machinery/light{ - dir = 1 +/obj/machinery/door/airlock/engineering/glass{ + name = "Supermatter Engine Room"; + req_access_txt = "10"; + req_one_access_txt = "0" }, -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/effect/decal/warning_stripes/north, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/engine/engineering) -"cYZ" = ( -/obj/effect/decal/warning_stripes/northeast, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plating, /area/engine/engineering) "cZa" = ( /obj/structure/table, @@ -87600,31 +80295,6 @@ }, /turf/simulated/floor/plating, /area/atmos) -"cZf" = ( -/obj/machinery/camera{ - c_tag = "Engineering Particle Accelerator"; - dir = 2; - network = list("Singularity","SS13"); - pixel_x = 23 - }, -/obj/machinery/light{ - dir = 1 - }, -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/effect/decal/warning_stripes/north, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 - }, -/turf/simulated/floor/plasteel, -/area/engine/engineering) "cZg" = ( /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 4; @@ -87677,21 +80347,6 @@ icon_state = "bluecorner" }, /area/hallway/secondary/exit) -"cZl" = ( -/obj/structure/closet/radiation, -/obj/structure/extinguisher_cabinet{ - pixel_x = -27; - pixel_y = 0 - }, -/obj/machinery/light/small{ - dir = 8 - }, -/obj/effect/decal/warning_stripes/southwestcorner, -/turf/simulated/floor/plasteel{ - dir = 9; - icon_state = "yellow" - }, -/area/engine/engineering) "cZm" = ( /obj/structure/chair{ dir = 8 @@ -87717,8 +80372,8 @@ /obj/structure/closet/emcloset, /obj/item/clothing/mask/breath, /obj/item/clothing/mask/breath, -/obj/item/tank/emergency_oxygen, -/obj/item/tank/emergency_oxygen, +/obj/item/tank/internals/emergency_oxygen, +/obj/item/tank/internals/emergency_oxygen, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "purple" @@ -87857,16 +80512,6 @@ icon_state = "bluecorner" }, /area/hallway/secondary/exit) -"cZE" = ( -/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/engine/engineering) "cZF" = ( /obj/effect/decal/cleanable/fungus, /turf/simulated/wall/r_wall, @@ -87927,31 +80572,9 @@ "cZM" = ( /turf/simulated/wall, /area/engine/engineering) -"cZN" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 - }, -/turf/simulated/floor/plasteel, -/area/engine/engineering) "cZO" = ( -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 - }, -/turf/simulated/floor/plasteel, +/obj/effect/decal/warning_stripes/northwest, +/turf/simulated/floor/engine, /area/engine/engineering) "cZP" = ( /obj/machinery/camera{ @@ -87959,41 +80582,33 @@ network = list("SS13") }, /obj/machinery/computer/security/telescreen{ - desc = "Used for watching the singularity chamber."; + desc = "A telescreen that connects to the engine's camera network."; dir = 8; layer = 4; - name = "Singularity Engine Telescreen"; - network = list("Singularity"); + name = "Engine Monitor"; + network = list("engine"); pixel_x = 0; pixel_y = 30 }, /turf/simulated/floor/plasteel, /area/engine/engineering) "cZQ" = ( +/obj/effect/decal/warning_stripes/northeast, /obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/cable/yellow{ - d1 = 1; + d1 = 4; d2 = 8; - icon_state = "1-8" + icon_state = "4-8" }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 4; - icon_state = "1-4" +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8; + initialize_directions = 11; + level = 1 }, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/engine, /area/engine/engineering) "cZR" = ( +/obj/effect/decal/warning_stripes/north, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -88001,10 +80616,10 @@ }, /obj/structure/cable/yellow{ d1 = 2; - d2 = 8; - icon_state = "2-8" + d2 = 4; + icon_state = "2-4" }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/engine, /area/engine/engineering) "cZS" = ( /turf/simulated/wall/r_wall, @@ -88064,8 +80679,9 @@ /obj/machinery/atmospherics/pipe/simple/visible/yellow{ level = 2 }, -/obj/machinery/atmospherics/unary/portables_connector{ - dir = 4 +/obj/machinery/atmospherics/binary/pump{ + dir = 4; + name = "Mix to Engine" }, /turf/simulated/floor/plasteel, /area/atmos) @@ -88085,35 +80701,34 @@ /turf/simulated/floor/plasteel, /area/hallway/secondary/exit) "dab" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, /obj/structure/cable{ d1 = 1; d2 = 8; icon_state = "1-8"; tag = "" }, -/turf/simulated/wall/r_wall, +/obj/machinery/power/port_gen/pacman, +/obj/effect/decal/warning_stripes/north, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, /area/engine/engineering) "dac" = ( -/obj/effect/spawner/window/reinforced, /obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - pixel_x = 0; - tag = "" + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/effect/decal/warning_stripes/northwest, +/turf/simulated/floor/plasteel{ + icon_state = "dark" }, -/turf/simulated/floor/plating, /area/engine/engineering) "dad" = ( /obj/structure/lattice, -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 10 +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 10; + level = 2 }, /turf/space, /area/space/nearstation) @@ -88158,21 +80773,6 @@ }, /turf/simulated/floor/plasteel, /area/atmos) -"dai" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 - }, -/turf/simulated/floor/plasteel, -/area/engine/engineering) "daj" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 1; @@ -88190,7 +80790,7 @@ /turf/simulated/floor/plasteel, /area/hallway/secondary/exit) "dal" = ( -/obj/machinery/hologram/holopad, +/obj/effect/spawner/window/reinforced/plasma, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -88199,7 +80799,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plating, /area/engine/engineering) "dam" = ( /obj/machinery/newscaster{ @@ -88244,33 +80844,31 @@ /turf/simulated/floor/plating, /area/escapepodbay) "dau" = ( -/obj/structure/cable{ - d2 = 2; - icon_state = "0-2"; - pixel_y = 1 +/obj/machinery/power/terminal{ + dir = 1; + icon_state = "term" }, -/obj/machinery/power/apc{ - dir = 4; - pixel_x = 24 +/obj/effect/decal/warning_stripes/south, +/obj/structure/cable/yellow{ + d1 = 0; + d2 = 8; + icon_state = "0-8" }, -/turf/simulated/floor/plating, -/area/maintenance/storage) +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/engine/engineering) "dav" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/atmos) "daw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, -/obj/structure/snow{ - dir = 8; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel, /area/atmos) "day" = ( @@ -88278,7 +80876,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/atmos) "daz" = ( @@ -88415,24 +81012,32 @@ /turf/simulated/floor/plating, /area/maintenance/genetics) "daK" = ( +/obj/structure/closet/crate, +/obj/item/stack/sheet/metal{ + amount = 50 + }, +/obj/item/stack/rods{ + amount = 50 + }, +/obj/item/stack/sheet/glass{ + amount = 50 + }, +/obj/item/airlock_electronics, +/obj/item/airlock_electronics, +/obj/item/stock_parts/cell/high{ + charge = 100; + maxcharge = 15000 + }, +/obj/effect/decal/warning_stripes/west, /obj/machinery/light_switch{ pixel_x = 27 }, -/obj/machinery/suit_storage_unit/engine, +/obj/item/stack/sheet/mineral/plasma{ + amount = 30 + }, +/obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plating, /area/storage/secure) -"daL" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - pixel_y = 0 - }, -/turf/simulated/floor/plating, -/area/maintenance/storage) "daM" = ( /obj/machinery/atmospherics/pipe/simple/visible/purple, /turf/simulated/floor/plasteel, @@ -88457,19 +81062,11 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/obj/structure/snow{ - dir = 8; - icon_state = "snow_surround" - }, /turf/simulated/floor/plasteel, /area/atmos) "daR" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel, /area/atmos) @@ -88511,10 +81108,8 @@ /turf/simulated/floor/plating, /area/maintenance/asmaint) "daV" = ( -/obj/machinery/atmospherics/unary/cold_sink/freezer{ - dir = 8; - icon_state = "freezer_0"; - tag = "" +/obj/machinery/atmospherics/unary/thermomachine/freezer{ + dir = 8 }, /turf/simulated/floor/plasteel, /area/atmos) @@ -88559,7 +81154,7 @@ dir = 4; level = 2 }, -/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction, +/obj/machinery/atmospherics/pipe/simple/visible/yellow, /turf/space, /area/space/nearstation) "dbb" = ( @@ -88638,10 +81233,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/asmaint) -"dbl" = ( -/obj/machinery/floodlight, -/turf/simulated/floor/plating, -/area/storage/secure) "dbm" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -88696,10 +81287,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/engine/engineering) -"dbs" = ( -/obj/structure/closet/secure_closet/engineering_electrical, -/turf/simulated/floor/plasteel, -/area/engine/engineering) "dbt" = ( /obj/machinery/light/small{ dir = 8 @@ -88709,26 +81296,9 @@ dir = 4; network = list("SS13") }, -/obj/machinery/floodlight, +/obj/machinery/field/generator, /turf/simulated/floor/plating, /area/storage/secure) -"dbu" = ( -/obj/machinery/power/emitter{ - anchored = 1; - dir = 4; - state = 2 - }, -/obj/structure/cable{ - d2 = 8; - icon_state = "0-8" - }, -/obj/machinery/camera/emp_proof{ - c_tag = "Engineering Singularity West"; - dir = 4; - network = list("Singularity","SS13") - }, -/turf/simulated/floor/plating/airless, -/area/engine/engineering) "dbv" = ( /obj/machinery/portable_atmospherics/canister/oxygen, /obj/machinery/light_switch{ @@ -88764,11 +81334,17 @@ /turf/simulated/floor/plating, /area/maintenance/asmaint2) "dby" = ( +/obj/machinery/power/apc{ + dir = 4; + pixel_x = 24 + }, /obj/structure/cable{ - d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "0-2"; + pixel_y = 1 + }, +/obj/machinery/light/small{ + dir = 8 }, /turf/simulated/floor/plating, /area/maintenance/storage) @@ -88802,16 +81378,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/asmaint) -"dbB" = ( -/obj/structure/sign/securearea{ - desc = "A warning sign which reads 'RADIOACTIVE AREA'"; - icon_state = "radiation"; - name = "RADIOACTIVE AREA"; - pixel_x = 32; - pixel_y = 0 - }, -/turf/simulated/wall/r_wall, -/area/engine/engineering) "dbC" = ( /obj/machinery/light/small{ dir = 1 @@ -88850,35 +81416,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/asmaint) -"dbF" = ( -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "open"; - id_tag = "Singularity"; - name = "Singularity Shutters"; - opacity = 0 - }, -/obj/effect/spawner/window/reinforced, -/turf/simulated/floor/plating, -/area/engine/engineering) -"dbG" = ( -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "open"; - id_tag = "Singularity"; - name = "Singularity Shutters"; - opacity = 0 - }, -/obj/effect/spawner/window/reinforced, -/obj/structure/sign/securearea{ - desc = "A warning sign which reads 'RADIOACTIVE AREA'"; - icon_state = "radiation"; - name = "RADIOACTIVE AREA"; - pixel_x = 32; - pixel_y = 0 - }, -/turf/simulated/floor/plating, -/area/engine/engineering) "dbH" = ( /obj/structure/window/reinforced{ dir = 8 @@ -88887,19 +81424,18 @@ /obj/structure/reagent_dispensers/watertank, /turf/simulated/floor/plasteel, /area/escapepodbay) -"dbI" = ( -/obj/structure/lattice, -/obj/machinery/atmospherics/pipe/simple/heat_exchanging, -/turf/space, -/area/space/nearstation) "dbJ" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 8; - icon_state = "1-8"; - tag = "" +/obj/machinery/power/terminal{ + dir = 1; + icon_state = "term" + }, +/obj/structure/cable/yellow{ + d2 = 4; + icon_state = "0-4" + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" }, -/turf/simulated/wall/r_wall, /area/engine/engineering) "dbK" = ( /obj/machinery/camera{ @@ -88908,7 +81444,7 @@ network = list("SS13") }, /obj/structure/reagent_dispensers/fueltank, -/obj/structure/snow, +/obj/effect/decal/warning_stripes/yellow/partial, /turf/simulated/floor/plasteel, /area/atmos) "dbL" = ( @@ -88919,7 +81455,6 @@ tag = "" }, /obj/structure/reagent_dispensers/watertank/high, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/atmos) "dbM" = ( @@ -88963,23 +81498,6 @@ /obj/structure/lattice, /turf/space, /area/space/nearstation) -"dbQ" = ( -/obj/machinery/power/emitter{ - anchored = 1; - dir = 8; - state = 2 - }, -/obj/structure/cable{ - d2 = 4; - icon_state = "0-4" - }, -/obj/machinery/camera/emp_proof{ - c_tag = "Engineering Singularity East"; - dir = 8; - network = list("Singularity","SS13") - }, -/turf/simulated/floor/plating/airless, -/area/engine/engineering) "dbR" = ( /obj/structure/disposaloutlet{ dir = 4 @@ -89084,16 +81602,11 @@ /turf/simulated/floor/plating, /area/maintenance/asmaint) "dcf" = ( -/obj/machinery/power/tesla_coil{ - anchored = 1 +/obj/structure/girder, +/turf/simulated/floor/plasteel{ + icon_state = "dark" }, -/obj/structure/cable{ - d2 = 2; - icon_state = "0-2"; - pixel_y = 1 - }, -/turf/simulated/floor/plating/airless, -/area/space/nearstation) +/area/engine/engineering) "dcg" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable{ @@ -89123,22 +81636,16 @@ /area/engine/break_room) "dck" = ( /obj/machinery/hologram/holopad, -/obj/structure/snow{ - dir = 1; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit) "dcl" = ( -/obj/machinery/light/small{ - dir = 8 +/obj/structure/sign/securearea{ + desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; + icon_state = "space"; + layer = 4; + name = "EXTERNAL AIRLOCK"; + pixel_x = -32 }, -/obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 1; - frequency = 1379; - id_tag = "engineering_west_pump" - }, -/obj/structure/closet/walllocker/emerglocker/north, /turf/simulated/floor/plating, /area/engine/engineering) "dcm" = ( @@ -89162,9 +81669,9 @@ icon_state = "1-4"; tag = "" }, -/obj/structure/snow{ - dir = 4; - icon_state = "snow_corner" +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 10; + level = 2 }, /turf/simulated/floor/plating, /area/maintenance/storage) @@ -89196,12 +81703,8 @@ /turf/simulated/wall/r_wall, /area/maintenance/storage) "dcr" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -89215,7 +81718,9 @@ /area/maintenance/asmaint) "dct" = ( /obj/machinery/portable_atmospherics/scrubber, -/obj/structure/snow, +/obj/machinery/light{ + dir = 8 + }, /turf/simulated/floor/plasteel, /area/atmos) "dcu" = ( @@ -89291,12 +81796,12 @@ /turf/simulated/floor/plasteel, /area/maintenance/turbine) "dcB" = ( +/obj/structure/chair/comfy/black{ + dir = 4 + }, /obj/effect/landmark/start{ name = "Life Support Specialist" }, -/obj/structure/chair/comfy/green{ - dir = 4 - }, /turf/simulated/floor/plasteel, /area/engine/break_room) "dcC" = ( @@ -89311,15 +81816,11 @@ /turf/simulated/floor/plating, /area/maintenance/asmaint) "dcE" = ( -/obj/effect/landmark/start{ - name = "Life Support Specialist" - }, -/obj/structure/chair/comfy/red{ +/obj/structure/chair/comfy/black{ dir = 8 }, -/obj/structure/snow{ - dir = 6; - icon_state = "snow_corner" +/obj/effect/landmark/start{ + name = "Life Support Specialist" }, /turf/simulated/floor/plasteel, /area/engine/break_room) @@ -89388,13 +81889,10 @@ tag = "" }, /obj/machinery/portable_atmospherics/scrubber, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/atmos) "dcN" = ( -/obj/effect/landmark{ - name = "blobstart" - }, +/obj/machinery/shieldgen, /turf/simulated/floor/plating, /area/storage/secure) "dcO" = ( @@ -89435,7 +81933,7 @@ dir = 4; level = 2 }, -/obj/machinery/atmospherics/pipe/simple/heat_exchanging, +/obj/machinery/atmospherics/pipe/simple/visible/yellow, /turf/space, /area/space/nearstation) "dcT" = ( @@ -89480,21 +81978,11 @@ }, /turf/simulated/floor/plating, /area/quartermaster/storage) -"dcZ" = ( -/obj/machinery/bodyscanner, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) "dda" = ( /obj/machinery/atmospherics/binary/valve, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/maintenance/turbine) -"ddb" = ( -/obj/structure/particle_accelerator/end_cap, -/turf/simulated/floor/plating, -/area/engine/engineering) "ddc" = ( /obj/structure/chair, /obj/item/storage/fancy/cigarettes, @@ -89592,7 +82080,6 @@ /area/maintenance/turbine) "ddm" = ( /obj/machinery/portable_atmospherics/pump, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/atmos) "ddn" = ( @@ -89620,10 +82107,6 @@ id = "incineratorturbine" }, /obj/effect/decal/cleanable/dirt, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, /turf/simulated/floor/plasteel, /area/maintenance/turbine) "ddq" = ( @@ -89642,7 +82125,6 @@ icon_state = "1-2"; tag = "" }, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/atmos) "ddt" = ( @@ -89763,7 +82245,7 @@ }, /obj/structure/lattice/catwalk, /turf/space, -/area/space) +/area/space/nearstation) "ddD" = ( /obj/item/wrench, /obj/structure/lattice/catwalk, @@ -89892,8 +82374,19 @@ /turf/space, /area/solar/starboard) "ddS" = ( -/obj/structure/particle_accelerator/fuel_chamber, -/turf/simulated/floor/plating, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + pixel_y = 0 + }, +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8"; + tag = "" + }, +/turf/simulated/floor/engine, /area/engine/engineering) "ddT" = ( /obj/structure/cable{ @@ -90049,14 +82542,11 @@ icon_state = "1-2"; tag = "" }, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/atmos) "dei" = ( -/obj/machinery/atmospherics/unary/heat_reservoir/heater{ - dir = 8; - icon_state = "freezer_0"; - tag = "" +/obj/machinery/atmospherics/unary/thermomachine/heater{ + dir = 8 }, /turf/simulated/floor/plasteel, /area/atmos) @@ -90082,15 +82572,6 @@ icon_state = "caution" }, /area/atmos) -"del" = ( -/obj/structure/lattice, -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ - dir = 4; - level = 2 - }, -/obj/machinery/atmospherics/pipe/simple/heat_exchanging, -/turf/space, -/area/space/nearstation) "dem" = ( /turf/simulated/floor/engine/co2, /area/atmos) @@ -90139,13 +82620,6 @@ /obj/structure/table, /turf/simulated/floor/plating, /area/maintenance/asmaint) -"des" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/obj/machinery/field/generator, -/turf/simulated/floor/plating, -/area/storage/secure) "det" = ( /obj/structure/cable{ d1 = 2; @@ -90193,26 +82667,21 @@ /turf/simulated/floor/plasteel, /area/maintenance/turbine) "dex" = ( -/obj/machinery/status_display{ - density = 0; - layer = 4; - pixel_x = 0; - pixel_y = -32 +/obj/effect/decal/warning_stripes/south, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 8; + icon_state = "1-8" }, -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "open"; - id_tag = "Engineering"; - name = "Engineering Security Doors"; - opacity = 0 +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 4; + icon_state = "1-4" }, -/obj/machinery/door/airlock/maintenance{ - name = "Atmospherics Maintenance"; - req_access_txt = "10"; - req_one_access_txt = null +/turf/simulated/floor/plasteel{ + icon_state = "dark" }, -/turf/simulated/floor/plating, -/area/maintenance/storage) +/area/engine/engineering) "dey" = ( /obj/machinery/atmospherics/pipe/simple/visible, /obj/effect/decal/cleanable/dirt, @@ -90223,26 +82692,56 @@ /area/maintenance/turbine) "dez" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/plasteel, /area/maintenance/turbine) "deA" = ( -/obj/structure/chair/stool, -/turf/simulated/floor/plasteel, +/obj/effect/decal/warning_stripes/south, +/obj/machinery/atmospherics/pipe/manifold/visible/green{ + dir = 1; + tag = "icon-manifold-g (NORTH)" + }, +/obj/machinery/camera{ + c_tag = "Engineering Supermatter Fore"; + dir = 1; + network = list("SS13","engine"); + pixel_x = 23 + }, +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -24 + }, +/turf/simulated/floor/engine, /area/engine/engineering) "deB" = ( -/obj/structure/particle_accelerator/power_box, -/turf/simulated/floor/plating, +/obj/effect/decal/warning_stripes/south, +/obj/machinery/atmospherics/binary/pump/on{ + dir = 8; + name = "Gas to Filter" + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0 + }, +/turf/simulated/floor/engine, /area/engine/engineering) "deC" = ( -/obj/item/screwdriver, -/turf/simulated/floor/plasteel, +/obj/effect/decal/warning_stripes/south, +/obj/machinery/atmospherics/pipe/manifold/visible/cyan{ + dir = 1 + }, +/obj/machinery/door_control{ + id = "engsm"; + name = "Radiation Shutters Control"; + pixel_y = -24; + req_access_txt = "10"; + req_one_access = null + }, +/turf/simulated/floor/engine, /area/engine/engineering) "deD" = ( /obj/structure/cable{ @@ -90260,7 +82759,6 @@ icon_state = "1-2"; pixel_y = 0 }, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/atmos) "deE" = ( @@ -90273,14 +82771,9 @@ /turf/simulated/wall/r_wall, /area/maintenance/starboardsolar) "deF" = ( -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "open"; - id_tag = "Singularity"; - name = "Singularity Blast Doors"; - opacity = 0 - }, -/turf/simulated/floor/plating, +/obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/engine, /area/engine/engineering) "deG" = ( /obj/machinery/atmospherics/pipe/simple/visible/purple, @@ -90291,7 +82784,6 @@ pixel_x = 0; tag = "" }, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/atmos) "deH" = ( @@ -90299,15 +82791,10 @@ /obj/machinery/atmospherics/pipe/simple/visible/purple{ dir = 4 }, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/atmos) "deI" = ( /obj/machinery/atmospherics/pipe/manifold/visible/purple, -/obj/structure/snow{ - dir = 10; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel, /area/atmos) "deJ" = ( @@ -90347,7 +82834,6 @@ name = "Atmospherics Maintenance"; req_access_txt = "24" }, -/obj/structure/snow, /turf/simulated/floor/plating, /area/maintenance/storage) "deM" = ( @@ -90361,7 +82847,6 @@ d2 = 8; icon_state = "1-8" }, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/atmos) "deN" = ( @@ -90393,7 +82878,6 @@ pixel_x = -24; shock_proof = 1 }, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/atmos) "deP" = ( @@ -90451,10 +82935,6 @@ output_tag = "co2_out"; sensors = list("co2_sensor" = "Tank") }, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "caution" @@ -90471,6 +82951,10 @@ name = "EXTERNAL AIRLOCK"; pixel_x = 32 }, +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 5; + tag = "icon-intact-y (NORTHWEST)" + }, /turf/simulated/floor/plating, /area/maintenance/storage) "deX" = ( @@ -90519,10 +83003,6 @@ /obj/effect/spawner/lootdrop/maintenance, /turf/simulated/floor/plating, /area/maintenance/asmaint2) -"dfe" = ( -/obj/machinery/pipedispenser/disposal, -/turf/simulated/floor/plating, -/area/storage/secure) "dff" = ( /obj/machinery/door/airlock/maintenance, /obj/structure/cable{ @@ -90574,10 +83054,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/starboardsolar) -"dfk" = ( -/obj/structure/reagent_dispensers/fueltank, -/turf/simulated/floor/plating, -/area/engine/engineering) "dfl" = ( /obj/structure/cable{ d1 = 2; @@ -90629,15 +83105,17 @@ d2 = 4; icon_state = "0-4" }, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, /turf/simulated/floor/plating, /area/maintenance/starboardsolar) "dfo" = ( -/obj/effect/spawner/window/reinforced, -/turf/simulated/floor/plating, +/obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/manifold/visible/red{ + dir = 4 + }, +/obj/machinery/meter, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, /area/engine/engineering) "dfp" = ( /obj/structure/sign/securearea{ @@ -90655,20 +83133,36 @@ /turf/simulated/floor/plating, /area/maintenance/starboardsolar) "dfq" = ( -/obj/structure/particle_accelerator/particle_emitter/left, -/turf/simulated/floor/plating, -/area/engine/engineering) +/obj/machinery/atmospherics/pipe/simple/visible/green, +/turf/simulated/wall/r_wall, +/area/engine/supermatter) "dfr" = ( -/obj/structure/particle_accelerator/particle_emitter/center, -/turf/simulated/floor/plating, -/area/engine/engineering) +/obj/machinery/door/airlock/engineering/glass{ + heat_proof = 1; + name = "Supermatter Chamber"; + req_access_txt = "10"; + req_one_access_txt = "0" + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0 + }, +/turf/simulated/floor/engine, +/area/engine/supermatter) "dfs" = ( -/obj/structure/particle_accelerator/particle_emitter/right, -/turf/simulated/floor/plating, -/area/engine/engineering) +/obj/machinery/atmospherics/pipe/simple/visible/cyan, +/turf/simulated/wall/r_wall, +/area/engine/supermatter) "dft" = ( -/obj/structure/reagent_dispensers/watertank, -/turf/simulated/floor/plating, +/obj/effect/decal/warning_stripes/east, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/firealarm{ + dir = 4; + pixel_x = 24 + }, +/turf/simulated/floor/engine, /area/engine/engineering) "dfu" = ( /obj/machinery/camera{ @@ -90739,18 +83233,8 @@ /area/maintenance/storage) "dfy" = ( /obj/structure/chair/stool, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/atmos) -"dfz" = ( -/obj/structure/sign/securearea{ - desc = "A warning sign which reads 'HIGH VOLTAGE'"; - icon_state = "shock"; - name = "HIGH VOLTAGE"; - pixel_y = 32 - }, -/turf/simulated/wall/r_wall, -/area/engine/engineering) "dfA" = ( /obj/machinery/firealarm{ dir = 2; @@ -90964,9 +83448,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/asmaint2) -"dfV" = ( -/turf/simulated/floor/plating, -/area/storage/secure) "dgb" = ( /obj/machinery/light, /turf/simulated/floor/plasteel{ @@ -91002,10 +83483,6 @@ }, /turf/simulated/floor/plasteel, /area/atmos) -"dgh" = ( -/obj/machinery/atmospherics/unary/portables_connector, -/turf/simulated/floor/plasteel, -/area/atmos) "dgi" = ( /obj/machinery/atmospherics/unary/portables_connector{ dir = 4 @@ -91042,12 +83519,8 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /turf/simulated/floor/plasteel, /area/teleporter) @@ -91083,7 +83556,6 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/visible/purple, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/atmos) "dgs" = ( @@ -91097,10 +83569,6 @@ pixel_y = 4 }, /obj/item/radio, -/obj/structure/snow{ - dir = 9; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel, /area/atmos) "dgt" = ( @@ -91118,13 +83586,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/asmaint2) -"dgz" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/obj/machinery/shieldgen, -/turf/simulated/floor/plating, -/area/storage/secure) "dgA" = ( /obj/item/stack/sheet/cardboard, /turf/simulated/floor/plating, @@ -91137,29 +83598,21 @@ /obj/structure/shuttle/engine/propulsion/burst{ dir = 8 }, -/turf/simulated/floor/plating, -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall_f6"; - tag = "icon-swall_f6" - }, +/turf/simulated/wall/mineral/titanium, /area/shuttle/pod_4) "dgE" = ( -/obj/machinery/power/grounding_rod{ - anchored = 1 +/obj/effect/decal/warning_stripes/east, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/turf/simulated/floor/plating/airless, -/area/space/nearstation) -"dgG" = ( -/obj/structure/sign/securearea{ - desc = "A warning sign which reads 'RADIOACTIVE AREA'"; - icon_state = "radiation"; - name = "RADIOACTIVE AREA"; - pixel_x = 0; - pixel_y = 0 +/obj/machinery/light{ + dir = 4 }, -/turf/simulated/wall/r_wall, -/area/maintenance/storage) +/obj/machinery/atmospherics/pipe/simple/visible/green, +/turf/simulated/floor/engine, +/area/engine/engineering) "dgH" = ( /obj/machinery/newscaster{ pixel_y = -32 @@ -91181,24 +83634,16 @@ /turf/simulated/floor/plating, /area/maintenance/storage) "dgJ" = ( -/obj/machinery/status_display{ - density = 0; - layer = 4; - pixel_x = 0; - pixel_y = 32 +/obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/camera{ + c_tag = "Engineering Supermatter Port"; + dir = 4; + network = list("SS13","engine"); + pixel_x = 0 }, -/turf/simulated/floor/plating/airless, -/area/space/nearstation) -"dgK" = ( -/obj/effect/spawner/lootdrop/trade_sol/sec, -/obj/structure/closet, -/turf/simulated/shuttle/floor, -/area/shuttle/trade/sol) -"dgL" = ( -/obj/effect/spawner/lootdrop/trade_sol/eng, -/obj/structure/closet, -/turf/simulated/shuttle/floor, -/area/shuttle/trade/sol) +/turf/simulated/floor/engine, +/area/engine/engineering) "dgM" = ( /obj/item/radio/intercom{ dir = 8; @@ -91208,10 +83653,6 @@ /obj/machinery/atmospherics/pipe/simple/visible/purple{ dir = 5 }, -/obj/structure/snow{ - dir = 9; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel, /area/atmos) "dgN" = ( @@ -91224,16 +83665,6 @@ }, /turf/simulated/floor/plasteel, /area/atmos) -"dgO" = ( -/obj/machinery/atmospherics/pipe/simple/visible/green{ - dir = 4; - level = 2 - }, -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ - level = 2 - }, -/turf/simulated/floor/plasteel, -/area/atmos) "dgP" = ( /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 4; @@ -91322,75 +83753,24 @@ /obj/item/caution, /turf/simulated/floor/plating, /area/maintenance/asmaint) -"dhb" = ( -/obj/machinery/flasher{ - id = "soltraderflash"; - pixel_y = -28 - }, -/obj/structure/chair/comfy/shuttle{ - dir = 8 - }, -/turf/simulated/shuttle/floor, -/area/shuttle/trade/sol) "dhc" = ( /obj/structure/lattice, /obj/structure/lattice, /turf/space, /area/space/nearstation) -"dhe" = ( -/obj/machinery/computer/shuttle/trade/sol, -/obj/machinery/door_control{ - id = "soltrader_south"; - name = "Trade Deposits Door"; - normaldoorcontrol = 1; - pixel_x = 24; - pixel_y = 8; - req_access_txt = "160" - }, -/obj/machinery/flasher_button{ - id = "soltraderflash"; - pixel_x = 24; - pixel_y = -8 - }, -/turf/simulated/shuttle/floor, -/area/shuttle/trade/sol) "dhf" = ( -/obj/structure/closet/radiation, -/turf/simulated/floor/plating, -/area/storage/secure) -"dhg" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swallc3" +/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ + dir = 6; + icon_state = "intact"; + tag = "icon-intact (SOUTHEAST)" }, -/area/shuttle/trade/sol) -"dhh" = ( -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "open"; - id_tag = "soltradeship_south"; - name = "Security Doors"; - opacity = 0 - }, -/obj/machinery/door/airlock/shuttle/glass{ - id_tag = "soltrader_south"; - name = "trader shuttle airlock"; - req_access_txt = "160"; - security_level = 6 - }, -/turf/simulated/shuttle/floor, -/area/shuttle/trade/sol) -"dhi" = ( -/obj/effect/spawner/lootdrop/trade_sol/largeitem, -/turf/simulated/shuttle/floor, -/area/shuttle/trade/sol) +/obj/structure/lattice, +/turf/space, +/area/space/nearstation) "dhj" = ( /obj/effect/decal/warning_stripes/north, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /turf/simulated/floor/plating, /area/turret_protected/aisat_interior) @@ -91404,34 +83784,13 @@ /obj/item/poster/random_contraband, /turf/simulated/floor/plating, /area/maintenance/asmaint) -"dhl" = ( -/obj/machinery/light/spot, -/obj/effect/spawner/lootdrop/trade_sol/serv, -/obj/structure/closet, -/turf/simulated/shuttle/floor, -/area/shuttle/trade/sol) -"dhm" = ( -/obj/effect/spawner/lootdrop/trade_sol/vehicle, -/turf/simulated/shuttle/floor, -/area/shuttle/trade/sol) -"dhn" = ( -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall13" - }, -/area/shuttle/trade/sol) "dho" = ( -/obj/machinery/camera/emp_proof{ - c_tag = "Engineering Singularity North-West"; - dir = 2; - network = list("Singularity","SS13"); - pixel_x = 20; - pixel_y = 0 +/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{ + dir = 8; + icon_state = "intact"; + tag = "icon-intact (WEST)" }, -/obj/machinery/power/grounding_rod{ - anchored = 1 - }, -/turf/simulated/floor/plating/airless, +/turf/simulated/wall/r_wall, /area/engine/engineering) "dhp" = ( /obj/machinery/light_switch{ @@ -91518,15 +83877,13 @@ }, /area/crew_quarters/toilet) "dhv" = ( -/obj/machinery/camera/emp_proof{ - c_tag = "Engineering Singularity North-East"; - dir = 2; - network = list("Singularity","SS13") +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 4 }, -/obj/machinery/power/grounding_rod{ - anchored = 1 +/obj/machinery/meter, +/turf/simulated/floor/plasteel{ + icon_state = "dark" }, -/turf/simulated/floor/plating/airless, /area/engine/engineering) "dhw" = ( /obj/machinery/door/airlock{ @@ -91539,9 +83896,6 @@ /area/crew_quarters/toilet) "dhx" = ( /obj/machinery/light, -/obj/machinery/atmospherics/binary/volume_pump/on{ - name = "Space Loop In" - }, /turf/simulated/floor/plasteel, /area/atmos) "dhy" = ( @@ -91577,10 +83931,6 @@ /obj/machinery/atmospherics/pipe/simple/visible/green{ level = 2 }, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, /turf/simulated/floor/plasteel{ icon_state = "red" }, @@ -91608,10 +83958,6 @@ output_tag = "o2_out"; sensors = list("o2_sensor" = "Tank") }, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, /turf/simulated/floor/plasteel{ dir = 0; icon_state = "blue" @@ -91644,10 +83990,6 @@ pressure_setting = 2000; sensors = list("air_sensor" = "Tank") }, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, /turf/simulated/floor/plasteel{ icon_state = "arrival" }, @@ -91760,17 +84102,6 @@ icon_state = "freezerfloor" }, /area/crew_quarters/toilet) -"dhT" = ( -/obj/structure/shuttle/engine/propulsion/burst{ - dir = 8 - }, -/turf/simulated/floor/plating, -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall_f5"; - tag = "icon-swall_f5" - }, -/area/shuttle/pod_4) "dhV" = ( /obj/structure/sink/kitchen{ pixel_y = 28 @@ -91802,8 +84133,12 @@ /turf/simulated/floor/plating, /area/maintenance/asmaint2) "dib" = ( -/turf/simulated/floor/plating/airless, -/area/engine/engineering) +/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ + dir = 10 + }, +/obj/structure/lattice, +/turf/space, +/area/space/nearstation) "dic" = ( /obj/structure/rack, /obj/effect/decal/cleanable/cobweb2, @@ -91902,18 +84237,6 @@ icon_state = "dark" }, /area/gateway) -"dio" = ( -/obj/effect/spawner/window/reinforced, -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "open"; - id_tag = "atmos"; - name = "Atmos Blast Door"; - opacity = 0 - }, -/obj/machinery/atmospherics/pipe/simple/visible, -/turf/simulated/floor/plating, -/area/atmos) "dip" = ( /obj/effect/spawner/window/reinforced, /obj/machinery/door/poddoor{ @@ -92013,12 +84336,6 @@ icon_state = "blue" }, /area/hallway/primary/central/north) -"diy" = ( -/obj/structure/chair/comfy/shuttle, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate_sit) "diz" = ( /obj/machinery/light/small, /obj/machinery/camera/motion{ @@ -92143,12 +84460,8 @@ pixel_y = 25; req_access_txt = "17;75" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 2 }, /turf/simulated/floor/plasteel{ dir = 5; @@ -92217,10 +84530,6 @@ icon_state = "grimy" }, /area/turret_protected/aisat_interior) -"diP" = ( -/obj/effect/decal/warning_stripes/west, -/turf/simulated/floor/plating/airless, -/area/engine/engineering) "diQ" = ( /obj/machinery/bluespace_beacon, /obj/effect/decal/warning_stripes/east, @@ -92236,10 +84545,6 @@ tag = "icon-vault (NORTHEAST)" }, /area/turret_protected/aisat_interior) -"diR" = ( -/obj/effect/decal/warning_stripes/east, -/turf/simulated/floor/plating/airless, -/area/engine/engineering) "diU" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/simple/visible/green{ @@ -92254,48 +84559,11 @@ }, /turf/space, /area/space/nearstation) -"diW" = ( -/obj/structure/lattice, -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 5 - }, -/turf/space, -/area/space/nearstation) -"diX" = ( -/obj/structure/lattice, -/obj/machinery/atmospherics/pipe/simple/visible/green{ - level = 2 - }, -/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{ - dir = 4 - }, -/turf/space, -/area/space/nearstation) -"diY" = ( -/obj/structure/lattice, -/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ - dir = 4 - }, -/turf/space, -/area/space/nearstation) -"diZ" = ( -/obj/structure/lattice, -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ - level = 2 - }, -/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ - dir = 4 - }, -/turf/space, -/area/space/nearstation) "dja" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/simple/visible/cyan{ level = 2 }, -/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ - dir = 4 - }, /turf/space, /area/space/nearstation) "djb" = ( @@ -92353,20 +84621,14 @@ pixel_y = 24 }, /obj/structure/table/reinforced, -/obj/item/toy/xmas_cracker, -/obj/item/toy/xmas_cracker, -/obj/item/toy/xmas_cracker, -/obj/item/toy/xmas_cracker, -/obj/item/toy/xmas_cracker, -/obj/item/toy/xmas_cracker, -/obj/item/storage/fancy/crayons, -/obj/item/wirecutters, -/obj/item/stack/tape_roll, -/obj/item/stack/tape_roll, -/obj/item/paper{ - info = "Here are the materials needed to create decorations for the holidays. Please use them at your discretion to create a nice, warm atmosphere to spread the holiday cheer."; - name = "Dearest Bartender" +/obj/item/stack/packageWrap, +/obj/item/book/manual/sop_service, +/obj/item/pen/blue{ + pixel_x = 0; + pixel_y = 4 }, +/obj/item/book/manual/barman_recipes, +/obj/item/lighter/zippo, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -92456,12 +84718,19 @@ }, /area/turret_protected/aisat_interior) "djq" = ( -/obj/machinery/field/generator{ - anchored = 1; - state = 2 +/obj/effect/decal/warning_stripes/east, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/turf/simulated/floor/plating/airless, -/area/space/nearstation) +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + dir = 2; + id_tag = "engsm"; + name = "Radiation Chamber Shutters" + }, +/turf/simulated/floor/plating, +/area/engine/supermatter) "djr" = ( /obj/structure/closet/emcloset, /turf/simulated/floor/plating, @@ -92495,8 +84764,13 @@ /turf/simulated/floor/grass, /area/hydroponics) "djv" = ( -/obj/item/multitool, -/turf/simulated/floor/plating/airless, +/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{ + dir = 8; + icon_state = "intact"; + tag = "icon-intact (WEST)" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/wall/r_wall, /area/engine/engineering) "djw" = ( /obj/structure/window/reinforced{ @@ -92524,11 +84798,6 @@ }, /turf/simulated/floor/grass, /area/hydroponics) -"djy" = ( -/obj/structure/lattice, -/obj/item/wirecutters, -/turf/space, -/area/space/nearstation) "djz" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance{ @@ -92642,12 +84911,8 @@ pixel_y = 0; tag = "" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -92844,15 +85109,6 @@ icon_state = "darkbluecorners" }, /area/turret_protected/aisat_interior) -"dkc" = ( -/obj/machinery/power/emitter, -/obj/machinery/camera{ - c_tag = "Engineering Secure Storage South"; - dir = 4; - network = list("SS13") - }, -/turf/simulated/floor/plating, -/area/storage/secure) "dkd" = ( /obj/machinery/light_switch{ pixel_y = 27 @@ -92926,12 +85182,8 @@ pixel_y = 0; req_access_txt = "75" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -92943,7 +85195,11 @@ frequency = 1441; id_tag = "n2_sensor" }, -/turf/simulated/floor/engine/n2, +/turf/simulated/floor/engine{ + name = "n2 floor"; + nitrogen = 100000; + oxygen = 0 + }, /area/atmos) "dki" = ( /obj/machinery/atmospherics/unary/outlet_injector{ @@ -92951,9 +85207,14 @@ frequency = 1441; icon_state = "on"; id = "n2_in"; - on = 1 + on = 1; + volume_rate = 200 + }, +/turf/simulated/floor/engine{ + name = "n2 floor"; + nitrogen = 100000; + oxygen = 0 }, -/turf/simulated/floor/engine/n2, /area/atmos) "dkj" = ( /obj/effect/spawner/window/reinforced, @@ -92972,7 +85233,11 @@ pressure_checks = 2; pump_direction = 0 }, -/turf/simulated/floor/engine/n2, +/turf/simulated/floor/engine{ + name = "n2 floor"; + nitrogen = 100000; + oxygen = 0 + }, /area/atmos) "dkl" = ( /obj/item/radio/intercom{ @@ -93063,7 +85328,11 @@ id_tag = "air_sensor"; output = 7 }, -/turf/simulated/floor/engine/air, +/turf/simulated/floor/engine{ + name = "air floor"; + nitrogen = 10580; + oxygen = 2644 + }, /area/atmos) "dkv" = ( /mob/living/simple_animal/mouse, @@ -93075,9 +85344,14 @@ frequency = 1441; icon_state = "on"; id = "o2_in"; - on = 1 + on = 1; + volume_rate = 200 + }, +/turf/simulated/floor/engine{ + name = "air floor"; + nitrogen = 10580; + oxygen = 2644 }, -/turf/simulated/floor/engine/air, /area/atmos) "dkx" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume{ @@ -93091,7 +85365,11 @@ pressure_checks = 2; pump_direction = 0 }, -/turf/simulated/floor/engine/air, +/turf/simulated/floor/engine{ + name = "air floor"; + nitrogen = 10580; + oxygen = 2644 + }, /area/atmos) "dky" = ( /obj/machinery/camera{ @@ -93105,21 +85383,37 @@ /turf/simulated/floor/plasteel, /area/hallway/primary/central/ne) "dkz" = ( -/obj/effect/decal/warning_stripes/northwest, -/turf/simulated/floor/plating/airless, -/area/space/nearstation) +/obj/effect/decal/warning_stripes/east, +/obj/machinery/atmospherics/trinary/filter/flipped{ + dir = 4; + filter_type = -1 + }, +/turf/simulated/floor/engine, +/area/engine/engineering) "dkA" = ( -/obj/effect/decal/warning_stripes/north, -/turf/simulated/floor/plating/airless, -/area/space/nearstation) +/obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/engine/engineering) "dkB" = ( -/obj/effect/decal/warning_stripes/northeast, -/turf/simulated/floor/plating/airless, -/area/space/nearstation) +/obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/trinary/filter/flipped{ + dir = 4; + filter_type = -1 + }, +/turf/simulated/floor/engine, +/area/engine/engineering) "dkC" = ( -/obj/item/crowbar, -/turf/space, -/area/space/nearstation) +/obj/machinery/atmospherics/trinary/filter/flipped{ + dir = 4; + filter_type = -1 + }, +/turf/simulated/floor/engine, +/area/engine/engineering) "dkD" = ( /obj/machinery/newscaster{ pixel_y = 32 @@ -93214,13 +85508,12 @@ dir = 4 }, /obj/structure/table/reinforced, -/obj/item/book/manual/barman_recipes, -/obj/item/stack/packageWrap, -/obj/item/book/manual/sop_service, -/obj/item/lighter/zippo, -/obj/item/pen/blue{ - pixel_x = 0; - pixel_y = 4 +/obj/item/phone{ + attack_verb = list("bounced a check off","checked-out","tipped"); + desc = "Also known as a cash register, or, more commonly, \"robbery magnet\". It's old and rusty, clearly non-functional and decorative only."; + icon = 'icons/obj/machines/pos.dmi'; + icon_state = "pos"; + name = "point of sale" }, /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -93258,7 +85551,11 @@ /turf/simulated/floor/carpet, /area/crew_quarters/bar) "dkO" = ( -/turf/simulated/floor/engine/n2, +/turf/simulated/floor/engine{ + name = "n2 floor"; + nitrogen = 100000; + oxygen = 0 + }, /area/atmos) "dkP" = ( /obj/machinery/atmospherics/unary/portables_connector{ @@ -93284,10 +85581,6 @@ dir = 8 }, /obj/structure/kitchenspike, -/obj/structure/snow{ - dir = 10; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -93311,12 +85604,8 @@ pixel_y = 0; tag = "" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5; @@ -93331,7 +85620,11 @@ name = "\improper AI Satellite Atmospherics" }) "dkV" = ( -/turf/simulated/floor/engine/air, +/turf/simulated/floor/engine{ + name = "air floor"; + nitrogen = 10580; + oxygen = 2644 + }, /area/atmos) "dkW" = ( /obj/machinery/door/firedoor, @@ -93512,18 +85805,19 @@ name = "\improper AI Satellite Service" }) "dle" = ( -/obj/effect/decal/warning_stripes/west, -/obj/item/wrench, -/turf/simulated/floor/plating/airless, -/area/space/nearstation) -"dlf" = ( -/obj/item/radio/beacon/engine/tesling, -/turf/simulated/floor/plating/airless, -/area/space/nearstation) +/obj/effect/decal/warning_stripes/southeast, +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 4 + }, +/turf/simulated/floor/engine, +/area/engine/engineering) "dlg" = ( -/obj/effect/decal/warning_stripes/east, -/turf/simulated/floor/plating/airless, -/area/space/nearstation) +/obj/effect/decal/warning_stripes/southwest, +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 4 + }, +/turf/simulated/floor/engine, +/area/engine/engineering) "dlh" = ( /obj/machinery/door/airlock/external{ frequency = 1450; @@ -93580,12 +85874,9 @@ /obj/machinery/atmospherics/pipe/simple/visible/purple, /turf/simulated/floor/plating, /area/maintenance/turbine) -"dlm" = ( -/turf/simulated/wall/r_wall/coated, -/area/maintenance/turbine) "dln" = ( /obj/machinery/atmospherics/pipe/simple/visible, -/turf/simulated/wall/r_wall/coated, +/turf/simulated/wall/r_wall, /area/maintenance/turbine) "dlo" = ( /obj/effect/decal/warning_stripes/east, @@ -93596,12 +85887,8 @@ pixel_y = 0; tag = "" }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 5; @@ -93675,16 +85962,17 @@ pixel_x = 32; pixel_y = 0 }, -/obj/item/decorations/sticky_decorations/flammable/googlyeyes{ - pixel_y = 8 - }, /turf/simulated/floor/plasteel{ icon_state = "darkbluecorners" }, /area/turret_protected/aisat_interior) "dlv" = ( /obj/machinery/light/small, -/turf/simulated/floor/engine/n2, +/turf/simulated/floor/engine{ + name = "n2 floor"; + nitrogen = 100000; + oxygen = 0 + }, /area/atmos) "dlw" = ( /obj/machinery/light/small, @@ -93692,7 +85980,11 @@ /area/atmos) "dlx" = ( /obj/machinery/light/small, -/turf/simulated/floor/engine/air, +/turf/simulated/floor/engine{ + name = "air floor"; + nitrogen = 10580; + oxygen = 2644 + }, /area/atmos) "dly" = ( /obj/structure/cable{ @@ -93711,7 +86003,7 @@ name = "Turbine Interior Airlock"; req_access_txt = "32" }, -/turf/simulated/floor/engine/insulated, +/turf/simulated/floor/engine, /area/maintenance/turbine) "dlz" = ( /obj/structure/closet/toolcloset, @@ -93742,22 +86034,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/maintenance/asmaint2) -"dlE" = ( -/obj/item/weldingtool, -/turf/space, -/area/space/nearstation) -"dlF" = ( -/obj/effect/decal/warning_stripes/southwest, -/turf/simulated/floor/plating/airless, -/area/space/nearstation) -"dlG" = ( -/obj/effect/decal/warning_stripes/south, -/turf/simulated/floor/plating/airless, -/area/space/nearstation) -"dlH" = ( -/obj/effect/decal/warning_stripes/southeast, -/turf/simulated/floor/plating/airless, -/area/space/nearstation) "dlI" = ( /obj/structure/lattice, /obj/machinery/atmospherics/binary/pump/on, @@ -93878,7 +86154,7 @@ /obj/structure/sign/fire{ pixel_x = -32 }, -/turf/simulated/floor/engine/insulated, +/turf/simulated/floor/engine, /area/maintenance/turbine) "dlW" = ( /obj/machinery/atmospherics/binary/pump{ @@ -93898,7 +86174,7 @@ /obj/structure/sign/fire{ pixel_x = 32 }, -/turf/simulated/floor/engine/insulated, +/turf/simulated/floor/engine, /area/maintenance/turbine) "dlX" = ( /obj/structure/cable{ @@ -93907,7 +86183,7 @@ icon_state = "1-2"; tag = "" }, -/turf/simulated/floor/engine/insulated, +/turf/simulated/floor/engine, /area/maintenance/turbine) "dlY" = ( /obj/machinery/atmospherics/pipe/simple/visible/purple, @@ -93921,9 +86197,6 @@ /obj/effect/decal/cleanable/ash, /turf/simulated/floor/plating, /area/maintenance/asmaint2) -"dma" = ( -/turf/simulated/wall/r_wall/coated, -/area/maintenance/asmaint) "dmb" = ( /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plating, @@ -94007,19 +86280,15 @@ name = "Turbine Exterior Airlock"; req_access_txt = "32" }, -/turf/simulated/floor/engine/insulated, +/turf/simulated/floor/engine, /area/maintenance/turbine) "dmi" = ( /obj/structure/disposalpipe/segment{ dir = 1; icon_state = "pipe-c" }, -/turf/simulated/wall/r_wall/coated, +/turf/simulated/wall/r_wall, /area/maintenance/asmaint) -"dmj" = ( -/obj/item/radio, -/turf/simulated/floor/plating/airless, -/area/engine/engineering) "dmk" = ( /obj/structure/sign/securearea{ pixel_x = 32; @@ -94151,7 +86420,7 @@ frequency = 1443; id = "air_in" }, -/turf/simulated/floor/engine/insulated, +/turf/simulated/floor/engine, /area/maintenance/turbine) "dmz" = ( /obj/machinery/atmospherics/unary/vent_pump{ @@ -94166,7 +86435,7 @@ /obj/structure/sign/vacuum{ pixel_y = -30 }, -/turf/simulated/floor/engine/insulated, +/turf/simulated/floor/engine, /area/maintenance/turbine) "dmA" = ( /obj/structure/cable{ @@ -94178,7 +86447,7 @@ /obj/machinery/igniter{ id = "gasturbine" }, -/turf/simulated/floor/engine/insulated, +/turf/simulated/floor/engine, /area/maintenance/turbine) "dmB" = ( /obj/effect/spawner/window/reinforced, @@ -94190,14 +86459,14 @@ /turf/simulated/floor/plating, /area/turret_protected/aisat_interior) "dmD" = ( -/turf/simulated/wall/r_wall/coated, +/turf/simulated/wall/r_wall, /area/space/nearstation) "dmE" = ( /obj/machinery/door/poddoor{ id_tag = "auxiliaryturbinevent"; name = "Auxiliary Turbine Vent" }, -/turf/simulated/floor/engine/insulated, +/turf/simulated/floor/engine, /area/maintenance/turbine) "dmF" = ( /obj/structure/lattice, @@ -94296,7 +86565,7 @@ comp_id = "incineratorturbine"; dir = 1 }, -/turf/simulated/floor/engine/insulated, +/turf/simulated/floor/engine, /area/maintenance/turbine) "dmP" = ( /obj/structure/cable{ @@ -94374,12 +86643,8 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 5; @@ -94413,9 +86678,6 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/snow{ - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "dark"; @@ -94449,7 +86711,6 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/snow, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "dark"; @@ -94485,7 +86746,7 @@ "dne" = ( /obj/structure/cable, /obj/machinery/power/turbine, -/turf/simulated/floor/engine/insulated, +/turf/simulated/floor/engine, /area/maintenance/turbine) "dnf" = ( /obj/structure/cable{ @@ -94500,7 +86761,6 @@ level = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/snow, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "dark"; @@ -94521,14 +86781,19 @@ dir = 4; pixel_x = 24 }, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + dir = 5; + icon_state = "dark"; + tag = "icon-vault (NORTHEAST)" + }, +/area/turret_protected/ai) +"dni" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "dark"; @@ -94548,7 +86813,6 @@ initialize_directions = 11; level = 1 }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "dark"; @@ -94566,7 +86830,6 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "dark"; @@ -94587,7 +86850,6 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/snow, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "dark"; @@ -94627,10 +86889,6 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/snow{ - dir = 1; - icon_state = "snow_surround" - }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "dark"; @@ -94652,16 +86910,6 @@ tag = "icon-vault (NORTHEAST)" }, /area/turret_protected/ai) -"dns" = ( -/obj/structure/sign/securearea{ - desc = "A warning sign which reads 'RADIOACTIVE AREA'"; - icon_state = "radiation"; - name = "RADIOACTIVE AREA"; - pixel_x = 0; - pixel_y = 0 - }, -/turf/simulated/wall/r_wall, -/area/engine/engineering) "dnt" = ( /obj/structure/cable{ d1 = 1; @@ -94691,7 +86939,6 @@ /area/turret_protected/ai) "dnu" = ( /obj/structure/kitchenspike, -/obj/structure/snow, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -94711,10 +86958,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/snow{ - dir = 1; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "dark"; @@ -94723,7 +86966,7 @@ /area/turret_protected/ai) "dnx" = ( /obj/structure/sign/fire, -/turf/simulated/wall/r_wall/coated, +/turf/simulated/wall/r_wall, /area/maintenance/turbine) "dny" = ( /obj/structure/cable{ @@ -94815,12 +87058,8 @@ /turf/simulated/floor/grass, /area/hydroponics) "dnF" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 5; @@ -94854,7 +87093,7 @@ id_tag = "turbinevent"; name = "Turbine Vent" }, -/turf/simulated/floor/engine/insulated, +/turf/simulated/floor/engine, /area/maintenance/turbine) "dnJ" = ( /obj/machinery/access_button{ @@ -94918,9 +87157,6 @@ pixel_y = 0 }, /obj/item/book/codex_gigas, -/obj/item/decorations/sticky_decorations/flammable/christmas_stocking{ - pixel_y = 17 - }, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "cult"; @@ -95160,10 +87396,6 @@ /obj/machinery/light{ dir = 1 }, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "red" @@ -95292,57 +87524,8 @@ /turf/simulated/wall, /area/engine/controlroom) "dou" = ( -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall12"; - tag = "icon-swall12" - }, +/turf/simulated/wall/mineral/titanium, /area/shuttle/pod_4) -"dov" = ( -/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ - frequency = 1331; - id_tag = "synd_airlock"; - pixel_x = 25; - req_access_txt = "150"; - tag_airpump = "synd_pump"; - tag_chamber_sensor = "synd_sensor"; - tag_exterior_door = "synd_outer"; - tag_interior_door = "synd_inner" - }, -/obj/machinery/airlock_sensor{ - frequency = 1331; - id_tag = "synd_sensor"; - pixel_x = 25; - pixel_y = 12; - req_access_txt = "150" - }, -/obj/machinery/light{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 4 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) -"dow" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall_f10" - }, -/area/shuttle/pod_4) -"dox" = ( -/obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 1; - frequency = 1331; - id_tag = "synd_pump" - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) "doy" = ( /obj/machinery/light/small{ dir = 1 @@ -95361,23 +87544,9 @@ }, /area/turret_protected/aisat_interior) "doz" = ( -/obj/structure/grille, -/obj/structure/window/full/shuttle, -/turf/simulated/shuttle/plating, +/obj/effect/spawner/window/shuttle, +/turf/simulated/floor/plating, /area/shuttle/pod_4) -"doA" = ( -/obj/structure/rack, -/obj/item/clothing/suit/space/syndicate/black/red, -/obj/item/clothing/head/helmet/space/syndicate/black/red, -/obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 1; - frequency = 1331; - id_tag = "synd_pump" - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate) "doB" = ( /obj/structure/table/wood, /obj/machinery/alarm{ @@ -95425,7 +87594,7 @@ /obj/structure/chair/comfy/shuttle{ dir = 4 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/pod_4) "doK" = ( /obj/machinery/light, @@ -95439,11 +87608,11 @@ id = "pod4"; name = "escape pod 4" }, -/obj/machinery/door/airlock/shuttle{ +/obj/machinery/door/airlock/titanium{ id_tag = "s_docking_airlock"; name = "Escape Pod Hatch" }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/pod_4) "doM" = ( /obj/machinery/status_display{ @@ -95456,7 +87625,7 @@ /obj/structure/chair/comfy/shuttle{ dir = 4 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/pod_4) "doN" = ( /obj/machinery/computer/station_alert, @@ -95465,23 +87634,12 @@ icon_state = "alarm0"; pixel_x = -22 }, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "dark"; tag = "icon-vault (NORTHEAST)" }, /area/turret_protected/aisat_interior) -"doV" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall_f9" - }, -/area/shuttle/pod_4) "doW" = ( /obj/structure/cable{ d1 = 4; @@ -95524,10 +87682,6 @@ /area/turret_protected/aisat_interior) "dpb" = ( /obj/machinery/computer/teleporter, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, /turf/simulated/floor/plating, /area/turret_protected/aisat_interior) "dpd" = ( @@ -95569,14 +87723,6 @@ tag = "icon-vault (NORTHEAST)" }, /area/turret_protected/aisat_interior) -"dpi" = ( -/obj/structure/chair/comfy/red{ - dir = 1 - }, -/turf/simulated/floor/plasteel{ - icon_state = "grimy" - }, -/area/hallway/secondary/entry) "dpl" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow, /obj/structure/rack, @@ -95696,10 +87842,6 @@ d2 = 2; icon_state = "0-2" }, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, /turf/simulated/floor/plating, /area/aisat/entrance{ name = "\improper AI Satellite Atmospherics" @@ -95856,9 +87998,6 @@ /obj/machinery/porta_turret{ dir = 4 }, -/obj/item/decorations/sticky_decorations/flammable/googlyeyes{ - pixel_y = 8 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault"; @@ -95891,9 +88030,6 @@ pixel_x = -32; pixel_y = 0 }, -/obj/item/decorations/sticky_decorations/flammable/googlyeyes{ - pixel_y = 8 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkbluecorners" @@ -95917,9 +88053,6 @@ /obj/machinery/porta_turret{ dir = 8 }, -/obj/item/decorations/sticky_decorations/flammable/googlyeyes{ - pixel_y = 8 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault"; @@ -95947,9 +88080,6 @@ installation = /obj/item/gun/energy/gun; name = "hallway turret" }, -/obj/item/decorations/sticky_decorations/flammable/googlyeyes{ - pixel_y = 8 - }, /turf/simulated/floor/bluegrid, /area/aisat{ name = "\improper AI Satellite Hallway" @@ -95964,9 +88094,6 @@ installation = /obj/item/gun/energy/gun; name = "hallway turret" }, -/obj/item/decorations/sticky_decorations/flammable/googlyeyes{ - pixel_y = 8 - }, /turf/simulated/floor/bluegrid, /area/aisat{ name = "\improper AI Satellite Hallway" @@ -96035,10 +88162,6 @@ /obj/structure/chair{ dir = 8 }, -/obj/structure/snow{ - dir = 6; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "dark"; @@ -96048,10 +88171,6 @@ "drt" = ( /obj/structure/table/reinforced, /obj/item/folder, -/obj/structure/snow{ - dir = 6; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "dark"; @@ -96077,7 +88196,6 @@ pixel_y = 0 }, /obj/structure/chair/office/dark, -/obj/structure/snow, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "dark"; @@ -96116,9 +88234,6 @@ /obj/machinery/porta_turret{ dir = 4 }, -/obj/item/decorations/sticky_decorations/flammable/googlyeyes{ - pixel_y = 8 - }, /turf/simulated/floor/bluegrid, /area/turret_protected/ai) "drK" = ( @@ -96127,10 +88242,6 @@ initialize_directions = 10; level = 1 }, -/obj/structure/snow{ - dir = 1; - icon_state = "snow_corner" - }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "dark"; @@ -96141,25 +88252,24 @@ /obj/machinery/porta_turret{ dir = 8 }, -/obj/item/decorations/sticky_decorations/flammable/googlyeyes{ - pixel_y = 8 - }, /turf/simulated/floor/bluegrid, /area/turret_protected/ai) "drN" = ( /turf/simulated/wall, /area/turret_protected/ai) "drO" = ( -/obj/structure/chair/wood/wings{ +/obj/machinery/light{ dir = 4; - icon_state = "wooden_chair_wings"; - tag = "icon-wooden_chair_wings (EAST)" + icon_state = "tube1" }, -/obj/structure/snow{ - icon_state = "snow_surround" +/obj/machinery/status_display{ + density = 0; + layer = 4; + pixel_x = 32; + pixel_y = 0 }, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) +/turf/simulated/floor/bluegrid, +/area/turret_protected/ai) "drP" = ( /obj/structure/cable{ d1 = 1; @@ -96173,7 +88283,6 @@ req_access = null; req_access_txt = "16" }, -/obj/item/toy/plushie/ipcplushie, /turf/simulated/floor/bluegrid, /area/turret_protected/ai) "drQ" = ( @@ -96410,9 +88519,15 @@ tag = "icon-stage_stairs" }, /area/maintenance/asmaint2) -"dsw" = ( -/turf/simulated/floor/mech_bay_recharge_floor, -/area/shuttle/escape) +"dsx" = ( +/obj/machinery/firealarm{ + dir = 4; + pixel_x = 24 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/engine/engineering) "dsy" = ( /obj/machinery/light/small{ dir = 4 @@ -96448,11 +88563,6 @@ "dsH" = ( /obj/machinery/disposal, /obj/structure/disposalpipe/trunk, -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, /turf/simulated/floor/plasteel, /area/engine/engineering) "dsI" = ( @@ -96468,17 +88578,15 @@ pixel_y = 24; shock_proof = 1 }, -/obj/structure/cable/yellow{ - d2 = 4; - icon_state = "0-4" +/obj/structure/cable{ + d2 = 2; + icon_state = "0-2"; + pixel_y = 1 }, /turf/simulated/floor/plasteel, /area/engine/engineering) "dsK" = ( /obj/machinery/suit_storage_unit/engine, -/obj/item/decorations/sticky_decorations/flammable/christmas_stocking{ - pixel_y = 17 - }, /turf/simulated/floor/plasteel, /area/engine/engineering) "dsL" = ( @@ -96517,26 +88625,22 @@ /turf/simulated/floor/plating, /area/maintenance/aft) "dsP" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/engine/engineering) "dsT" = ( -/obj/structure/cable/yellow{ +/obj/machinery/photocopier, +/obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8" + icon_state = "4-8"; + pixel_y = 0 + }, +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" }, -/obj/machinery/photocopier, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -96565,15 +88669,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/aft) -"dsX" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/plasteel, -/area/engine/engineering) "dsY" = ( /obj/structure/chair, /turf/simulated/floor/plasteel, @@ -96607,6 +88702,9 @@ dir = 4 }, /obj/structure/closet/wardrobe/atmospherics_yellow, +/obj/machinery/light{ + dir = 8 + }, /turf/simulated/floor/plasteel, /area/atmos) "dtk" = ( @@ -96634,18 +88732,18 @@ /obj/machinery/suit_storage_unit/atmos, /turf/simulated/floor/plasteel, /area/atmos) +"dto" = ( +/obj/effect/decal/warning_stripes/south, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/turf/simulated/floor/engine, +/area/engine/engineering) "dtp" = ( /obj/structure/table, /obj/item/clothing/glasses/welding, /obj/item/clothing/glasses/welding, /obj/item/clothing/glasses/welding, -/obj/item/storage/belt/utility, -/obj/item/storage/belt/utility, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /turf/simulated/floor/plasteel, /area/engine/engineering) "dtq" = ( @@ -96655,14 +88753,8 @@ pixel_y = -22 }, /obj/structure/table, -/obj/item/stack/sheet/mineral/plasma{ - amount = 30 - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, +/obj/item/storage/belt/utility, +/obj/item/storage/belt/utility, /turf/simulated/floor/plasteel, /area/engine/engineering) "dts" = ( @@ -96673,13 +88765,12 @@ pixel_y = 24; shock_proof = 1 }, -/obj/structure/cable/yellow{ - d1 = 0; - d2 = 2; - icon_state = "0-2" - }, /obj/effect/decal/warning_stripes/south, /obj/structure/reagent_dispensers/watertank, +/obj/structure/cable{ + d2 = 4; + icon_state = "0-4" + }, /turf/simulated/floor/plating, /area/storage/secure) "dtt" = ( @@ -96693,6 +88784,11 @@ }, /obj/effect/decal/warning_stripes/south, /obj/structure/reagent_dispensers/fueltank, +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, /turf/simulated/floor/plating, /area/storage/secure) "dtv" = ( @@ -96701,15 +88797,36 @@ dir = 8; pixel_x = -24 }, -/obj/structure/snow, /turf/simulated/floor/plasteel, /area/atmos) "dtw" = ( +/obj/structure/closet/crate{ + name = "solar pack crate" + }, +/obj/item/solar_assembly, +/obj/item/solar_assembly, +/obj/item/solar_assembly, +/obj/item/solar_assembly, +/obj/item/solar_assembly, +/obj/item/solar_assembly, +/obj/item/solar_assembly, +/obj/item/solar_assembly, +/obj/item/solar_assembly, +/obj/item/solar_assembly, +/obj/item/solar_assembly, +/obj/item/solar_assembly, +/obj/item/solar_assembly, +/obj/item/circuitboard/solar_control, +/obj/item/tracker_electronics, +/obj/item/paper/solar, /obj/machinery/light/small{ dir = 4 }, /obj/effect/decal/warning_stripes/west, -/obj/machinery/suit_storage_unit/engine, +/obj/machinery/firealarm{ + dir = 4; + pixel_x = 24 + }, /turf/simulated/floor/plating, /area/storage/secure) "duq" = ( @@ -96718,65 +88835,45 @@ }, /turf/space, /area/space/nearstation) -"dvh" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/snow{ - icon_state = "snow_surround" +"duK" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) -"dwn" = ( -/obj/item/flag/med, /turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "cmo" + icon_state = "dark" }, -/area/shuttle/escape) -"dzR" = ( -/obj/structure/snow{ - dir = 10; - icon_state = "snow_corner" - }, -/turf/simulated/floor/plasteel, -/area/hallway/secondary/exit) +/area/engine/engineering) "dEP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /turf/simulated/wall/r_wall, /area/maintenance/fsmaint) -"dHM" = ( -/obj/machinery/light{ - dir = 1; - on = 1 +"dLF" = ( +/obj/machinery/door/firedoor, +/obj/effect/decal/warning_stripes/yellow, +/obj/machinery/door/poddoor{ + density = 0; + icon_state = "open"; + id_tag = "bridge blast east"; + name = "Bridge Blast Doors"; + opacity = 0 }, -/turf/simulated/floor/plasteel{ - icon_state = "neutral" - }, -/area/shuttle/escape) -"dLi" = ( +/turf/simulated/floor/plasteel, +/area/bridge) +"dQa" = ( +/obj/effect/decal/warning_stripes/west, +/turf/simulated/floor/engine, +/area/engine/engineering) +"dQp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/snow{ - dir = 10; - icon_state = "snow_corner" +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8; + initialize_directions = 11; + level = 1 }, /turf/simulated/floor/plasteel, -/area/atmos) -"dMw" = ( -/obj/structure/snow{ - icon_state = "snow_corner" - }, -/turf/simulated/floor/plasteel, -/area/atmos) -"dNE" = ( -/obj/structure/snow{ - icon_state = "snow_corner" - }, -/turf/simulated/floor/plasteel{ - icon_state = "freezerfloor" - }, -/area/security/main) +/area/engine/engineering) "dQC" = ( /obj/machinery/atmospherics/pipe/simple/hidden/yellow, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -96788,26 +88885,6 @@ }, /turf/simulated/floor/bluegrid, /area/tcommsat/chamber) -"dSc" = ( -/obj/structure/reagent_dispensers/watertank, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "bot" - }, -/area/shuttle/escape) -"dSC" = ( -/obj/structure/snow, -/turf/simulated/floor/plasteel{ - icon_state = "grimy" - }, -/area/chapel/office) -"dUh" = ( -/obj/machinery/status_display, -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall3" - }, -/area/shuttle/escape) "dVs" = ( /obj/effect/spawner/window/reinforced, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -96816,165 +88893,151 @@ }, /turf/simulated/floor/plating, /area/crew_quarters/dorms) -"eap" = ( -/obj/item/decorations/sticky_decorations/flammable/tinsel/red{ - pixel_y = 19 +"edp" = ( +/obj/machinery/power/terminal{ + dir = 1; + icon_state = "term" + }, +/obj/machinery/camera{ + c_tag = "Engineering SMES"; + dir = 8; + network = list("SS13"); + pixel_x = 0; + pixel_y = 0 + }, +/obj/structure/cable/yellow{ + d1 = 0; + d2 = 8; + icon_state = "0-8" }, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whitecorner" + icon_state = "dark" }, -/area/hallway/primary/starboard/west) -"egY" = ( -/obj/machinery/atmospherics/pipe/simple/visible/purple, -/obj/structure/snow{ - dir = 10; - icon_state = "snow_corner" +/area/engine/engineering) +"egO" = ( +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 9 }, -/turf/simulated/floor/plasteel, -/area/atmos) -"eiU" = ( -/obj/structure/cable{ +/turf/simulated/wall/r_wall, +/area/engine/supermatter) +"ejU" = ( +/turf/space, +/area/space/nearstation) +"ema" = ( +/obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/engine, +/area/engine/engineering) +"erU" = ( +/obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/turf/simulated/floor/engine, +/area/engine/supermatter) +"esG" = ( +/obj/effect/decal/warning_stripes/northwestcorner, +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 9; + level = 2 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/turf/simulated/floor/engine, +/area/engine/engineering) +"euu" = ( +/obj/machinery/atmospherics/pipe/manifold/visible{ + dir = 8 }, -/turf/simulated/floor/plasteel, -/area/quartermaster/storage) -"ejx" = ( -/obj/structure/snow{ - dir = 1; - icon_state = "snow_surround" - }, -/turf/simulated/floor/plasteel, -/area/crew_quarters/locker) -"eoC" = ( -/obj/item/decorations/sticky_decorations/flammable/tinsel/red{ - pixel_y = 19 - }, -/turf/simulated/floor/carpet, -/area/chapel/main) -"epP" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/snow, /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/security/warden) -"ese" = ( -/obj/structure/cable{ +/area/engine/engineering) +"euD" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow, +/turf/simulated/floor/plating, +/area/maintenance/storage) +"eDs" = ( +/obj/effect/decal/warning_stripes/west, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + dir = 2; + id_tag = "engsm"; + name = "Radiation Chamber Shutters" + }, +/turf/simulated/floor/plating, +/area/engine/supermatter) +"eJr" = ( +/obj/effect/decal/warning_stripes/west, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/structure/cable/yellow{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, -/obj/structure/snow{ - dir = 10; - icon_state = "snow_corner" +/obj/machinery/atmospherics/pipe/manifold/visible/cyan{ + dir = 8; + initialize_directions = 11; + level = 2 }, -/turf/simulated/floor/plasteel, -/area/atmos) -"esI" = ( -/obj/structure/table/reinforced, -/obj/item/storage/firstaid/regular, -/obj/machinery/light{ - dir = 1; - on = 1 - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "redcorner" - }, -/area/shuttle/escape) -"esS" = ( -/obj/structure/table/reinforced, -/obj/item/phone{ - attack_verb = list("bounced a check off","checked-out","tipped"); - desc = "Also known as a cash register, or, more commonly, \"robbery magnet\". It's old and rusty, clearly non-functional and decorative only."; - icon = 'icons/obj/machines/pos.dmi'; - icon_state = "pos"; - name = "point of sale" - }, -/turf/simulated/floor/plasteel{ - icon_state = "grimy" - }, -/area/crew_quarters/bar) -"etR" = ( -/obj/structure/snow{ - icon_state = "snow_corner" - }, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) -"evY" = ( -/obj/item/decorations/sticky_decorations/flammable/snowman, -/obj/structure/snow, -/turf/simulated/floor/plasteel{ - icon_state = "bcarpet05" - }, -/area/blueshield) -"eyt" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/public/glass{ - name = "Diner" - }, -/obj/structure/snow, -/turf/simulated/floor/plasteel, -/area/crew_quarters/bar) -"eEt" = ( -/turf/simulated/floor/plasteel, -/area/engine/equipmentstorage) -"eEX" = ( -/obj/item/decorations/sticky_decorations/flammable/snowman, -/obj/structure/snow, -/turf/simulated/floor/wood, -/area/hallway/secondary/exit) -"eGK" = ( -/obj/machinery/light{ - dir = 4; - icon_state = "tube1" - }, -/obj/machinery/status_display{ - density = 0; - layer = 4; - pixel_x = 32; - pixel_y = 0 - }, -/turf/simulated/floor/bluegrid, -/area/turret_protected/ai) -"eHF" = ( -/obj/item/decorations/sticky_decorations/flammable/snowman, -/turf/simulated/floor/plasteel, -/area/crew_quarters/heads) +/obj/machinery/meter, +/turf/simulated/floor/engine, +/area/engine/engineering) "eJA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, /turf/simulated/wall, /area/maintenance/fsmaint) -"eML" = ( -/turf/simulated/floor/plasteel{ - icon_state = "grimy" +"eMw" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + pixel_y = 0 }, -/area/security/detectives_office) -"eSM" = ( -/obj/structure/snow, -/turf/simulated/floor/plasteel{ - icon_state = "bcarpet05" +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/area/blueshield) +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/engine/engineering) +"ePY" = ( +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/engine/engineering) +"eQo" = ( +/obj/effect/decal/warning_stripes/west, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood/oil, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + dir = 2; + id_tag = "engsm"; + name = "Radiation Chamber Shutters" + }, +/turf/simulated/floor/plating, +/area/engine/supermatter) "eTE" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ req_access_txt = "0" @@ -96986,6 +89049,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/crew_quarters/dorms) +"fdg" = ( +/obj/structure/reflector/single{ + anchored = 1; + dir = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/engine/engineering) "fes" = ( /obj/structure/chair{ dir = 4 @@ -96993,26 +89065,12 @@ /obj/machinery/computer/mob_battle_terminal/red, /turf/simulated/floor/plasteel, /area/crew_quarters/dorms) -"feB" = ( -/obj/structure/snow{ - dir = 8; - icon_state = "snow_surround" +"ffY" = ( +/obj/machinery/atmospherics/pipe/simple/visible/universal{ + dir = 4 }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "green" - }, -/area/hallway/secondary/exit) -"fgD" = ( -/obj/machinery/alarm{ - pixel_y = 22 - }, -/obj/structure/snow{ - dir = 10; - icon_state = "snow_corner" - }, -/turf/simulated/floor/plasteel, -/area/security/main) +/turf/simulated/wall/r_wall, +/area/engine/supermatter) "fho" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -97021,85 +89079,21 @@ }, /turf/simulated/floor/plasteel, /area/crew_quarters/dorms) -"fjG" = ( -/obj/item/decorations/sticky_decorations/flammable/tinsel/green{ - pixel_y = 19 - }, -/obj/structure/snow, -/turf/simulated/floor/plasteel, -/area/quartermaster/storage) -"fnn" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - pixel_x = 0; - tag = "" - }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/red{ - pixel_y = 19 - }, -/turf/simulated/floor/carpet, -/area/library) -"fnB" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/snow{ - dir = 8; - icon_state = "snow_corner" - }, -/turf/simulated/floor/plasteel, -/area/hallway/primary/port) -"fpb" = ( -/turf/simulated/floor/plasteel{ - icon_state = "whitebluefull"; - tag = "icon-whitebluefull" - }, -/area/medical/biostorage) -"fpO" = ( -/turf/simulated/floor/plasteel{ - icon_state = "neutral" - }, -/area/shuttle/escape) -"frt" = ( -/obj/item/decorations/sticky_decorations/flammable/tinsel/green{ - pixel_y = 19 - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "green" - }, -/area/hallway/primary/starboard/west) -"fuP" = ( -/obj/structure/snow{ +"fqV" = ( +/obj/effect/decal/warning_stripes/north, +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ dir = 6; - icon_state = "snow_corner" + initialize_directions = 6; + level = 2 }, -/turf/simulated/floor/plasteel, -/area/engine/mechanic_workshop) -"fwM" = ( -/obj/structure/snow{ - dir = 8; - icon_state = "snow_corner" +/turf/simulated/floor/engine, +/area/engine/engineering) +"fvP" = ( +/obj/effect/landmark{ + name = "HONKsquad" }, -/turf/simulated/floor/plasteel, -/area/hallway/primary/starboard/west) -"fyM" = ( -/obj/structure/table/reinforced, -/obj/item/clothing/gloves/color/latex/nitrile, -/obj/item/clothing/mask/breath, -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "cmo" - }, -/area/shuttle/escape) -"fzb" = ( -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "browncorner" - }, -/area/shuttle/escape) +/turf/simulated/floor/mineral/titanium, +/area/shuttle/arrival/station) "fAw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/yellow, /obj/machinery/tcomms/core/station, @@ -97110,44 +89104,29 @@ }, /turf/simulated/floor/plasteel/dark, /area/tcommsat/chamber) -"fCH" = ( -/obj/structure/snow, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "green" +"fFY" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 }, -/area/hallway/secondary/exit) -"fGr" = ( -/obj/structure/sign/greencross, -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall12" - }, -/area/shuttle/escape) -"fGD" = ( -/obj/machinery/status_display{ - pixel_y = -32 - }, -/obj/structure/chair/comfy/shuttle{ - dir = 1 - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "bot" - }, -/area/shuttle/escape) -"fHf" = ( -/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, /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/security/prison/cell_block/A) +/area/engine/engineering) +"fKd" = ( +/obj/effect/spawner/window/reinforced/plasma, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/engine/engineering) +"fPU" = ( +/obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 4 + }, +/obj/machinery/meter, +/turf/simulated/floor/engine, +/area/engine/engineering) "fRL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/item/radio/intercom{ @@ -97155,192 +89134,86 @@ }, /turf/simulated/floor/plasteel, /area/crew_quarters/dorms) -"fTX" = ( -/obj/structure/snow, -/obj/item/a_gift, -/obj/item/a_gift, -/obj/item/nanomob_card, -/turf/simulated/floor/carpet/black, -/area/chapel/office) -"fUo" = ( +"fWP" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 4 + }, +/turf/simulated/floor/engine, +/area/engine/engineering) +"fYe" = ( /obj/machinery/light, -/obj/structure/chair/comfy/shuttle{ +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/engine/engineering) +"gei" = ( +/obj/effect/decal/warning_stripes/north, +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 4; + level = 2 + }, +/obj/machinery/light{ dir = 1 }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "bot" +/turf/simulated/floor/engine, +/area/engine/engineering) +"ggO" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 4; + level = 2 }, -/area/shuttle/escape) -"fWZ" = ( -/turf/simulated/floor/plasteel, -/area/engine/mechanic_workshop) -"fYr" = ( -/obj/structure/chair/sofa{ - dir = 1 - }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/red{ - pixel_y = 19 - }, -/obj/structure/snow, -/turf/simulated/floor/wood, -/area/hallway/secondary/exit) -"fYH" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/firedoor, -/obj/machinery/door/poddoor/shutters{ - density = 0; - dir = 8; - icon_state = "open"; - id_tag = "kitchenbar"; - name = "Kitchen Shutters"; - opacity = 0 - }, -/obj/machinery/door/window/eastleft{ - base_state = "right"; - icon_state = "right"; - name = "Kitchen"; - req_access_txt = "28" - }, -/obj/item/reagent_containers/food/snacks/candy/gummybear/wtf, -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "cafeteria"; - tag = "icon-cafeteria (NORTHEAST)" - }, -/area/crew_quarters/kitchen) -"fZO" = ( -/obj/structure/table/reinforced, -/obj/item/storage/backpack/medic, -/obj/item/storage/belt/medical, -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "cmo" - }, -/area/shuttle/escape) -"gap" = ( -/obj/structure/table/reinforced, -/turf/simulated/shuttle/floor4, -/area/shuttle/escape) -"gdQ" = ( -/obj/item/gift, -/obj/structure/snow, -/obj/item/toy/figure/scientist, -/obj/item/nanomob_card, -/obj/item/toy/plushie/slimeplushie, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/toxins/explab) +/obj/structure/lattice/catwalk, +/turf/space, +/area/space/nearstation) "ghD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, /turf/simulated/floor/plasteel, /area/crew_quarters/dorms) -"gkX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +"gmW" = ( +/obj/machinery/power/emitter{ + anchored = 1; + dir = 4; + state = 2 }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/purple{ - pixel_y = 19 +/obj/structure/cable{ + d2 = 8; + icon_state = "0-8" + }, +/turf/simulated/floor/plating, +/area/engine/engineering) +"gAm" = ( +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 4; + icon_state = "2-4" }, /turf/simulated/floor/plasteel{ - icon_state = "white" + icon_state = "dark" }, -/area/toxins/xenobiology) -"gmY" = ( -/obj/structure/chair/comfy/shuttle, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "bot" - }, -/area/shuttle/escape) -"gpk" = ( -/obj/structure/snow, -/obj/item/a_gift, -/obj/item/toy/figure/engineer, -/obj/item/toy/spinningtoy, -/obj/item/toy/carpplushie/dragon, -/obj/item/nanomob_card, -/turf/simulated/floor/plasteel, -/area/engine/equipmentstorage) -"gqt" = ( -/obj/structure/snow, -/turf/simulated/floor/carpet, -/area/ntrep) -"grx" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/firedoor, -/obj/machinery/door/poddoor/shutters{ - density = 0; - dir = 8; - icon_state = "open"; - id_tag = "kitchenbar"; - name = "Kitchen Shutters"; - opacity = 0 - }, -/obj/machinery/door/window/eastleft{ - base_state = "right"; - icon_state = "right"; - name = "Kitchen"; - req_access_txt = "28" - }, -/obj/item/reagent_containers/food/snacks/candy/jellybean/wtf, -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "cafeteria"; - tag = "icon-cafeteria (NORTHEAST)" - }, -/area/crew_quarters/kitchen) -"gvu" = ( -/obj/structure/snow{ - dir = 5; - icon_state = "snow_corner" - }, -/turf/simulated/floor/plasteel, -/area/quartermaster/miningdock) -"gxv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/area/engine/engineering) +"gCE" = ( /obj/structure/cable{ d1 = 1; - d2 = 2; - icon_state = "1-2" + d2 = 8; + icon_state = "1-8" }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "redcorner" - }, -/area/security/prison/cell_block/A) -"gyR" = ( -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whiteblue"; - tag = "icon-whiteblue (NORTH)" - }, -/area/shuttle/escape) -"gyU" = ( -/obj/structure/chair/stool, -/obj/structure/snow, /turf/simulated/floor/plasteel, -/area/crew_quarters/locker) -"gAw" = ( -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "barber" +/area/engine/engineering) +"gDJ" = ( +/obj/effect/decal/warning_stripes/north, +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 4; + level = 2 }, -/area/security/permabrig) -"gAT" = ( -/obj/item/decorations/sticky_decorations/flammable/tinsel/red{ - pixel_y = 19 - }, -/turf/simulated/floor/wood, -/area/security/vacantoffice) -"gDP" = ( -/obj/structure/snow, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) +/turf/simulated/floor/engine, +/area/engine/engineering) "gFG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -97351,18 +89224,35 @@ }, /turf/simulated/floor/plasteel, /area/crew_quarters/dorms) -"gGg" = ( -/obj/structure/snow, -/turf/simulated/floor/wood, -/area/hallway/secondary/exit) -"gLx" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +"gHg" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/turf/simulated/floor/wood, -/area/crew_quarters/courtroom) +/obj/machinery/camera{ + c_tag = "Supermatter Chamber"; + dir = 2; + network = list("engine"); + pixel_x = 23 + }, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 5 + }, +/turf/simulated/floor/engine, +/area/engine/supermatter) +"gLY" = ( +/obj/machinery/atmospherics/unary/outlet_injector{ + dir = 1; + frequency = 1441; + icon_state = "on"; + id = "engine-waste_out"; + name = "engine outlet injector"; + on = 1; + volume_rate = 200 + }, +/turf/simulated/floor/plating/airless, +/area/engine/engineering) "gMZ" = ( /obj/machinery/atmospherics/pipe/simple/insulated{ dir = 6 @@ -97381,125 +89271,24 @@ }, /turf/simulated/floor/plating, /area/toxins/mixing) -"gOo" = ( -/obj/structure/snow, -/turf/simulated/floor/plasteel, -/area/quartermaster/miningdock) -"gQy" = ( -/obj/structure/snow, -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "cult"; - tag = "icon-cult" +"gSS" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 9; + tag = "icon-intact-y (NORTHWEST)" }, -/area/magistrateoffice) -"gQL" = ( -/obj/machinery/computer/card, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" +/obj/structure/lattice/catwalk, +/turf/space, +/area/space/nearstation) +"hbq" = ( +/obj/effect/decal/warning_stripes/west, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/area/shuttle/administration) -"gSs" = ( -/obj/item/decorations/sticky_decorations/flammable/tinsel/green{ - pixel_y = 19 - }, -/obj/structure/bonfire/dense, -/obj/structure/snow, -/turf/simulated/floor/wood, -/area/hallway/secondary/exit) -"gUP" = ( -/obj/structure/flora/tree/pine/xmas, -/obj/structure/snow{ - dir = 5; - icon_state = "snow_corner" - }, -/turf/simulated/floor/plasteel{ - icon_state = "vault"; - tag = "icon-vault" - }, -/area/crew_quarters/dorms) -"gWg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/snow, -/turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "dark"; - tag = "icon-vault (NORTHEAST)" - }, -/area/turret_protected/ai) -"haz" = ( -/obj/structure/chair/stool, -/obj/structure/snow{ - dir = 1; - icon_state = "snow_corner" - }, -/turf/simulated/floor/plasteel, -/area/atmos) -"haB" = ( -/obj/item/decorations/sticky_decorations/flammable/tinsel/blue{ - pixel_y = 19 - }, -/obj/item/decorations/sticky_decorations/flammable/snowman, -/obj/structure/snow, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "white" - }, -/area/medical/reception) -"haF" = ( -/obj/structure/snow{ - dir = 1; - icon_state = "snow_corner" - }, -/turf/simulated/floor/plasteel, -/area/quartermaster/storage) -"hcT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) -"heR" = ( -/obj/structure/table/wood, -/obj/item/paper_bin/nanotrasen, -/obj/item/pen, -/obj/structure/snow{ - dir = 1; - icon_state = "snow_surround" - }, -/turf/simulated/floor/carpet, -/area/bridge/meeting_room) -"hlm" = ( -/obj/effect/decal/warning_stripes/white/hollow, -/obj/structure/snow{ - dir = 1; - icon_state = "snow_corner" - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/crew_quarters/dorms) -"hlT" = ( -/obj/item/decorations/sticky_decorations/flammable/tinsel/blue{ - pixel_y = 19 - }, -/obj/structure/snow{ - icon_state = "snow_corner" - }, -/obj/structure/snow{ - dir = 1; - icon_state = "snow_corner" - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "white" - }, -/area/medical/reception) -"hnS" = ( -/obj/structure/chair/sofa, -/obj/structure/snow, -/turf/simulated/floor/wood, -/area/hallway/secondary/exit) +/obj/machinery/atmospherics/pipe/simple/visible/cyan, +/turf/simulated/floor/engine, +/area/engine/engineering) "hsy" = ( /obj/machinery/atmospherics/pipe/simple/insulated{ dir = 4 @@ -97521,18 +89310,19 @@ }, /turf/simulated/floor/plating, /area/toxins/mixing) -"hxa" = ( +"hxf" = ( +/obj/machinery/door/airlock/engineering/glass{ + name = "Laser Room"; + req_access_txt = "10"; + req_one_access_txt = "0" + }, /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, -/obj/structure/chair/comfy/red{ - dir = 8 - }, -/turf/simulated/floor/carpet, -/area/crew_quarters/captain) +/turf/simulated/floor/plating, +/area/engine/engineering) "hyv" = ( /obj/structure/cable, /obj/machinery/power/apc{ @@ -97545,202 +89335,114 @@ }, /turf/simulated/floor/bluegrid, /area/tcommsat/chamber) -"hCY" = ( -/obj/item/decorations/sticky_decorations/flammable/tinsel/yellow{ - pixel_y = 19 - }, -/turf/simulated/floor/plasteel, -/area/engine/break_room) -"hDe" = ( +"hNT" = ( +/obj/effect/decal/warning_stripes/southeast, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/engine, +/area/engine/engineering) +"hPB" = ( +/obj/machinery/power/smes/engineering, /obj/structure/cable{ - d1 = 4; d2 = 8; - icon_state = "4-8" + icon_state = "0-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/turf/simulated/floor/plasteel{ + icon_state = "dark" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/area/engine/engineering) +"hQW" = ( +/obj/effect/decal/warning_stripes/south, +/obj/machinery/atmospherics/pipe/manifold/visible/cyan{ + dir = 1 }, -/obj/structure/snow{ - dir = 4; - icon_state = "snow_corner" - }, -/obj/structure/snow{ +/turf/simulated/floor/engine, +/area/engine/engineering) +"idF" = ( +/obj/effect/decal/warning_stripes/south, +/obj/machinery/atmospherics/trinary/filter/flipped{ dir = 8; - icon_state = "snow_corner" + filter_type = -1 }, -/turf/simulated/floor/plasteel, -/area/quartermaster/storage) -"hED" = ( -/obj/item/decorations/sticky_decorations/flammable/snowman, -/obj/structure/snow, -/turf/simulated/floor/plasteel, -/area/engine/break_room) -"hFn" = ( -/obj/structure/table, -/obj/item/storage/toolbox/mechanical{ - pixel_x = -2; - pixel_y = -1 +/turf/simulated/floor/engine, +/area/engine/engineering) +"ieI" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/binary/pump{ + name = "Gas to Chamber" }, -/obj/structure/snow, -/turf/simulated/floor/plasteel, -/area/crew_quarters/locker) -"hHC" = ( -/obj/structure/chair{ +/turf/simulated/floor/engine, +/area/engine/supermatter) +"ihJ" = ( +/obj/machinery/atmospherics/trinary/filter/flipped{ + dir = 4; + filter_type = 2 + }, +/turf/simulated/floor/engine, +/area/engine/engineering) +"ihW" = ( +/obj/effect/decal/warning_stripes/west, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/machinery/atmospherics/binary/pump{ + dir = 1; + name = "Mix Bypass" + }, +/turf/simulated/floor/engine, +/area/engine/engineering) +"ioM" = ( +/obj/structure/window/plasmareinforced{ dir = 8 }, -/obj/effect/landmark/start{ - name = "Security Officer" +/obj/machinery/power/rad_collector{ + anchored = 1 }, -/obj/structure/snow{ - dir = 8; - icon_state = "snow_corner" +/obj/machinery/atmospherics/pipe/manifold/visible/supply{ + dir = 4; + initialize_directions = 11 }, -/turf/simulated/floor/plasteel, -/area/security/main) -"hJi" = ( -/turf/simulated/floor/plasteel{ - icon_state = "whiteblue"; - tag = "icon-whiteblue" +/obj/structure/cable/yellow{ + d2 = 4; + icon_state = "0-4" }, -/area/shuttle/escape) -"hLc" = ( -/obj/structure/snow{ - dir = 9; - icon_state = "snow_corner" - }, -/turf/simulated/floor/bluegrid, -/area/turret_protected/ai) -"iau" = ( -/obj/structure/closet/crate/internals, -/obj/item/clothing/mask/breath, -/obj/item/clothing/mask/breath, -/obj/item/clothing/mask/breath, -/obj/item/clothing/mask/breath, -/obj/item/tank/emergency_oxygen/engi, -/obj/item/tank/emergency_oxygen/engi, -/obj/item/tank/emergency_oxygen/engi, -/obj/item/tank/emergency_oxygen/engi, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "bot" - }, -/area/shuttle/escape) -"idV" = ( +/turf/simulated/floor/engine, +/area/engine/supermatter) +"itF" = ( /obj/structure/cable{ d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" + d2 = 4; + icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/snow, -/turf/simulated/floor/plasteel{ - icon_state = "white" +/turf/simulated/floor/plating, +/area/engine/engineering) +"ivi" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 }, -/area/medical/research{ - name = "Research Division" - }) -"ihL" = ( -/obj/structure/snow{ - dir = 9; - icon_state = "snow_corner" - }, -/turf/simulated/floor/plasteel, -/area/hallway/secondary/exit) -"ihP" = ( -/obj/structure/snow{ - dir = 1; - icon_state = "snow_corner" - }, -/turf/simulated/floor/plasteel, -/area/quartermaster/miningdock) -"ioI" = ( -/obj/structure/reagent_dispensers/fueltank/chem{ - pixel_x = -32; - pixel_y = 0 - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "bot" - }, -/area/shuttle/escape) -"iqh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/snow{ - dir = 1; - icon_state = "snow_corner" - }, -/turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "dark"; - tag = "icon-vault (NORTHEAST)" - }, -/area/turret_protected/ai) -"iwt" = ( -/obj/machinery/computer/station_alert, -/obj/structure/sign/poster/official/nanotrasen_logo{ - pixel_x = 32; - pixel_y = 0 - }, -/turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "darkyellow" - }, -/area/shuttle/escape) -"iwP" = ( -/obj/structure/chair/comfy/green{ - dir = 8 - }, -/turf/simulated/floor/plasteel{ - icon_state = "grimy" - }, -/area/hallway/secondary/entry) -"iyx" = ( -/obj/structure/chair/sofa/corner, -/obj/structure/snow, -/turf/simulated/floor/wood, -/area/hallway/secondary/exit) -"iyH" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/snow, -/obj/item/gift, -/obj/item/toy/figure/cmo, -/obj/item/toy/prize/odysseus, -/obj/item/toy/plushie/tuxedo_cat, -/obj/item/nanomob_card, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "white" - }, -/area/medical/reception) +/turf/simulated/wall/r_wall, +/area/engine/engineering) "izn" = ( /obj/machinery/atmospherics/unary/passive_vent{ dir = 1 }, /turf/simulated/floor/plating/airless, /area/space/nearstation) -"iCr" = ( -/obj/machinery/light{ - dir = 1; - on = 1 +"iBS" = ( +/obj/effect/decal/warning_stripes/northeast, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 }, -/obj/structure/chair/comfy/shuttle, -/turf/simulated/shuttle/floor4, -/area/shuttle/escape) -"iDx" = ( -/obj/effect/decal/warning_stripes/yellow/hollow, -/obj/structure/snow{ - dir = 1; - icon_state = "snow_corner" +/turf/simulated/floor/engine, +/area/engine/engineering) +"iEE" = ( +/obj/effect/spawner/window/reinforced/plasma, +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 10 }, -/turf/simulated/floor/plasteel, -/area/quartermaster/storage) +/turf/simulated/floor/plating, +/area/engine/engineering) "iJf" = ( /obj/machinery/atmospherics/pipe/simple/insulated, /obj/machinery/door/poddoor{ @@ -97760,26 +89462,6 @@ }, /turf/simulated/floor/plating, /area/toxins/mixing) -"iLE" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - pixel_x = 0 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/snow, -/turf/simulated/floor/plasteel, -/area/security/main) -"iMO" = ( -/obj/structure/snow{ - dir = 4; - icon_state = "snow_corner" - }, -/turf/simulated/floor/bluegrid, -/area/turret_protected/ai) "iNz" = ( /obj/machinery/atmospherics/pipe/simple/insulated{ dir = 4 @@ -97788,158 +89470,103 @@ /area/toxins/launch{ name = "Toxins Launch Room" }) -"iPL" = ( -/obj/structure/sign/greencross, -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall3" +"iRc" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, -/area/shuttle/escape) -"iRt" = ( -/obj/structure/snow, -/turf/simulated/floor/wood, -/area/blueshield) -"iRU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/snow{ - dir = 1; - icon_state = "snow_corner" - }, -/turf/simulated/floor/plasteel, -/area/quartermaster/storage) -"iSS" = ( -/obj/structure/snow{ - dir = 8; - icon_state = "snow_corner" - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/chapel/main) +/turf/simulated/floor/engine, +/area/engine/supermatter) "iUc" = ( /turf/simulated/wall/r_wall, /area/tcommsat/chamber) -"iXO" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - pixel_x = 0; - tag = "" +"iXI" = ( +/obj/effect/decal/warning_stripes/east, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 4; + icon_state = "1-4" }, -/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/simple/hidden/supply{ - dir = 4 - }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/purple{ - pixel_y = 19 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/research{ - name = "Research Division" - }) +/obj/machinery/atmospherics/pipe/simple/visible/green, +/turf/simulated/floor/engine, +/area/engine/engineering) "iZs" = ( /obj/effect/spawner/window/reinforced, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/crew_quarters/dorms) -"jbf" = ( -/turf/simulated/floor/plasteel{ +"jbt" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + pixel_y = 0 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/engine, +/area/engine/engineering) +"jeb" = ( +/obj/structure/cable{ + d2 = 8; + icon_state = "0-8" + }, +/turf/simulated/floor/plating, +/area/engine/engineering) +"jnm" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/engine/engineering) +"jsQ" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/binary/pump{ dir = 8; - icon_state = "brown" + name = "Atmos to Loop" }, -/area/shuttle/escape) -"jjr" = ( -/obj/structure/snow{ - icon_state = "snow_corner" - }, -/turf/simulated/floor/plasteel, -/area/hallway/secondary/exit) -"jlo" = ( -/obj/item/decorations/sticky_decorations/flammable/snowman, -/obj/structure/snow, -/turf/simulated/floor/carpet, -/area/ntrep) -"jnJ" = ( -/obj/machinery/light/spot{ - dir = 1; - icon_state = "tube1"; - tag = "icon-tube1 (NORTH)" - }, -/obj/machinery/door_control{ - id = "adminshuttleblast"; - name = "Blast door control"; - pixel_x = -5; - pixel_y = 35; - req_access = list(101); - req_access_txt = "0" - }, -/obj/machinery/door_control{ - id = "adminshuttleshutters"; - name = "Shutter control"; - pixel_x = 5; - pixel_y = 35; - req_access = list(101); - req_access_txt = "0" - }, -/obj/structure/chair/comfy/shuttle{ - dir = 4 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) -"jrK" = ( -/obj/item/gift, -/obj/item/clothing/head/cowboyhat/white, -/obj/structure/snow, -/obj/item/toy/figure/warden, -/obj/item/toy/prize/durand, -/obj/item/nanomob_card, -/obj/item/gun/projectile/shotgun/toy, -/obj/item/ammo_box/magazine/internal/shot/toy, -/turf/simulated/floor/plasteel, -/area/security/main) -"jGi" = ( -/obj/item/decorations/sticky_decorations/flammable/snowman, -/obj/structure/snow, -/turf/simulated/floor/carpet, -/area/lawoffice) -"jJe" = ( -/obj/structure/snow, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "green" - }, -/area/hallway/secondary/exit) -"jJT" = ( -/obj/structure/table/reinforced, -/obj/item/storage/fancy/donut_box, -/turf/simulated/shuttle/floor4, -/area/shuttle/escape) -"jMO" = ( -/obj/structure/snow{ - dir = 8; - icon_state = "snow_corner" - }, -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "yellowcorner" - }, -/area/hallway/primary/aft) -"jMV" = ( -/obj/structure/bed/roller, -/obj/machinery/iv_drip, -/turf/simulated/floor/plasteel{ +/turf/simulated/floor/engine, +/area/engine/engineering) +"jve" = ( +/obj/effect/decal/warning_stripes/east, +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 4; - icon_state = "whiteblue"; - tag = "icon-whiteblue (EAST)" + level = 2 }, -/area/shuttle/escape) +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/engine, +/area/engine/engineering) +"jyO" = ( +/turf/simulated/floor/mineral/titanium, +/area/shuttle/arrival/station) +"jzn" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/engine/engineering) +"jMw" = ( +/obj/machinery/door/airlock/titanium, +/turf/simulated/floor/mineral/titanium, +/area/shuttle/arrival/station) "jPN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/computer/mob_battle_terminal/blue{ @@ -97969,31 +89596,42 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/maintenance/aft) -"jSU" = ( -/obj/structure/snow, -/obj/item/a_gift, -/obj/item/nanomob_card, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) -"kaG" = ( -/obj/structure/table/reinforced, -/obj/item/reagent_containers/iv_bag/blood/random, -/obj/item/reagent_containers/iv_bag/blood/random, -/obj/item/reagent_containers/iv_bag/blood/random, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "whiteblue"; - tag = "icon-whiteblue (EAST)" +"jUZ" = ( +/obj/structure/window/plasmareinforced{ + dir = 4 }, -/area/shuttle/escape) -"kcF" = ( -/obj/structure/flora/ausbushes/grassybush, -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/ausbushes/sunnybush, -/obj/structure/window/full/shuttle, -/turf/simulated/floor/grass, -/area/shuttle/escape) +/obj/machinery/power/rad_collector{ + anchored = 1 + }, +/obj/structure/cable/yellow{ + d1 = 0; + d2 = 8; + icon_state = "0-8" + }, +/obj/machinery/atmospherics/pipe/manifold/visible/scrubbers{ + dir = 1 + }, +/turf/simulated/floor/engine, +/area/engine/supermatter) +"kbU" = ( +/obj/machinery/door/airlock/external{ + frequency = 1379; + icon_state = "door_locked"; + id_tag = "engineering_east_outer"; + locked = 1; + name = "Engineering External Access"; + req_access = null; + req_access_txt = "10;13" + }, +/turf/simulated/floor/plating, +/area/engine/engineering) +"kcS" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9; + level = 1 + }, +/turf/simulated/wall/r_wall, +/area/engine/engineering) "kiu" = ( /obj/structure/table/wood, /obj/item/deck/cards, @@ -98012,135 +89650,41 @@ }, /turf/simulated/floor/plasteel, /area/crew_quarters/dorms) -"kmj" = ( -/obj/structure/chair/sofa/right{ - dir = 8 +"kwt" = ( +/obj/machinery/door/poddoor{ + density = 0; + icon_state = "open"; + id_tag = "bridge blast north"; + name = "Bridge Blast Doors"; + opacity = 0 }, -/obj/structure/snow, -/turf/simulated/floor/wood, -/area/hallway/secondary/exit) -"koB" = ( -/obj/structure/snow, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "darkredcorners" +/obj/effect/spawner/window/reinforced, +/obj/structure/cable{ + icon_state = "0-4"; + d2 = 4 }, -/area/security/brig) -"ksw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + pixel_x = 0; + tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/snow, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/research{ - name = "Research Division" - }) -"ksF" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 8 - }, -/turf/simulated/shuttle/floor4, -/area/shuttle/escape) -"ktV" = ( -/obj/structure/snow{ - dir = 1; - icon_state = "snow_corner" - }, -/turf/simulated/floor/plasteel, -/area/hallway/secondary/exit) -"kvd" = ( -/obj/structure/chair/wood/wings{ - dir = 8; - icon_state = "wooden_chair_wings"; - tag = "icon-wooden_chair_wings (WEST)" - }, -/obj/structure/snow{ - dir = 8; - icon_state = "snow_corner" - }, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) -"kyW" = ( -/obj/structure/table, -/obj/item/weldingtool/largetank{ - pixel_x = 4; - pixel_y = -4 - }, -/obj/item/clothing/glasses/welding{ - pixel_y = 10 - }, -/obj/machinery/light/small{ - dir = 4; - pixel_y = 8 - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "bot" - }, -/area/shuttle/escape) -"kBs" = ( -/obj/structure/snow{ - dir = 8; - icon_state = "snow_corner" - }, -/turf/simulated/floor/plasteel, -/area/quartermaster/storage) -"kCz" = ( -/obj/effect/decal/warning_stripes/west, -/obj/structure/closet/firecloset, /turf/simulated/floor/plating, -/area/storage/secure) -"kCR" = ( -/obj/machinery/light{ - dir = 1; - on = 1 - }, -/obj/structure/chair/comfy/shuttle, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "bot" - }, -/area/shuttle/escape) -"kHU" = ( -/obj/structure/table/reinforced, -/obj/item/storage/toolbox/mechanical, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "vault" - }, -/area/shuttle/escape) -"kHX" = ( -/obj/structure/snow{ - dir = 5; - icon_state = "snow_corner" - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "green" - }, -/area/hallway/secondary/exit) +/area/bridge) "kIR" = ( /obj/structure/lattice/catwalk, /obj/machinery/atmospherics/pipe/simple/hidden/yellow, /turf/space, /area/space/nearstation) -"kJO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/snow, -/turf/simulated/floor/plasteel, -/area/quartermaster/office) -"kJW" = ( -/obj/structure/chair/sofa/left{ - dir = 4 +"kLx" = ( +/obj/effect/spawner/window/reinforced/plasma, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4; + level = 1 }, -/obj/structure/snow, -/turf/simulated/floor/wood, -/area/hallway/secondary/exit) +/turf/simulated/floor/plating, +/area/engine/engineering) "kLF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -98151,20 +89695,25 @@ }, /turf/simulated/floor/plasteel, /area/crew_quarters/dorms) -"kMV" = ( -/obj/structure/table, -/obj/machinery/cell_charger, -/obj/item/stock_parts/cell/high, -/obj/machinery/light/small{ - dir = 8; - icon_state = "bulb1"; - tag = "icon-bulb1 (WEST)" +"kLR" = ( +/obj/effect/decal/warning_stripes/northeast, +/obj/machinery/atmospherics/pipe/manifold/visible/cyan{ + dir = 1 }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "bot" +/turf/simulated/floor/engine, +/area/engine/engineering) +"kNq" = ( +/obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 }, -/area/shuttle/escape) +/obj/machinery/alarm{ + dir = 4; + icon_state = "alarm0"; + pixel_x = -22 + }, +/turf/simulated/floor/engine, +/area/engine/engineering) "kNZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4; @@ -98179,132 +89728,41 @@ /obj/structure/lattice, /turf/space, /area/space/nearstation) -"kPl" = ( -/obj/item/storage/firstaid/o2, -/obj/structure/table, -/turf/simulated/floor/plasteel, -/area/shuttle/escape) -"kQD" = ( -/obj/structure/snow, -/obj/item/decorations/sticky_decorations/flammable/snowman, -/turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "dark"; - tag = "icon-vault (NORTHEAST)" +"kUA" = ( +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 10 }, -/area/turret_protected/ai) -"kTw" = ( -/turf/simulated/floor/carpet, -/area/bridge/meeting_room) -"kTV" = ( +/turf/simulated/floor/plasteel, +/area/atmos) +"kUR" = ( +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 5 + }, +/turf/simulated/wall/r_wall, +/area/engine/supermatter) +"kYw" = ( /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0 }, -/obj/structure/snow{ - dir = 1; - icon_state = "snow_corner" +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 10 }, -/turf/simulated/floor/plasteel, -/area/hallway/secondary/exit) -"kUs" = ( -/obj/machinery/computer/atmos_alert, -/turf/simulated/floor/plasteel{ - dir = 6; - icon_state = "darkyellow" - }, -/area/shuttle/escape) -"law" = ( -/obj/machinery/ai_status_display, -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall3" - }, -/area/shuttle/escape) -"lax" = ( -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "redcorner" - }, -/area/shuttle/escape) -"laU" = ( -/obj/structure/table/wood, -/obj/item/deck/cards, -/obj/item/dice/d20, -/obj/item/dice, -/obj/item/taperecorder{ - pixel_y = 0 - }, -/obj/structure/snow{ - icon_state = "snow_corner" - }, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) -"ldp" = ( -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "bot" - }, -/area/shuttle/escape) -"leU" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall_f10" - }, -/area/shuttle/escape) -"lgQ" = ( -/turf/simulated/floor/wood, -/area/crew_quarters/captain) -"ljp" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/effect/landmark{ - name = "Marauder Entry" - }, -/obj/structure/snow{ - dir = 9; - icon_state = "snow_corner" - }, -/turf/simulated/floor/plasteel, -/area/bridge) -"ljD" = ( -/obj/item/decorations/sticky_decorations/flammable/tinsel/red{ - pixel_y = 19 - }, -/turf/simulated/floor/wood, -/area/maintenance/abandonedbar) +/turf/simulated/floor/engine, +/area/engine/engineering) "lkw" = ( /obj/machinery/light{ dir = 8 }, /turf/simulated/floor/plasteel, /area/crew_quarters/dorms) -"lkY" = ( -/obj/machinery/sleeper{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "cmo" - }, -/area/shuttle/escape) -"lmr" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ - level = 2 - }, -/obj/structure/snow{ - dir = 1; - icon_state = "snow_corner" - }, +"lnQ" = ( +/obj/effect/decal/warning_stripes/yellow/partial, /turf/simulated/floor/plasteel, -/area/atmos) +/area/engine/break_room) "lop" = ( /obj/structure/chair{ dir = 8 @@ -98314,307 +89772,191 @@ }, /turf/simulated/floor/plasteel, /area/crew_quarters/dorms) -"lqp" = ( -/obj/structure/chair/wood/wings, -/obj/structure/snow{ - dir = 10; - icon_state = "snow_corner" +"lqF" = ( +/obj/effect/decal/warning_stripes/east, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/engine, +/area/engine/engineering) +"lrJ" = ( +/obj/structure/window/plasmareinforced{ + dir = 4 }, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) -"ltW" = ( -/obj/item/decorations/sticky_decorations/flammable/tinsel/purple{ - pixel_y = 19 +/obj/machinery/power/rad_collector{ + anchored = 1 }, -/turf/simulated/floor/plasteel{ - icon_state = "white" +/obj/machinery/atmospherics/pipe/manifold/visible/scrubbers{ + dir = 8; + initialize_directions = 11 + }, +/obj/structure/cable/yellow{ + d1 = 0; + d2 = 8; + icon_state = "0-8" + }, +/turf/simulated/floor/engine, +/area/engine/supermatter) +"lzm" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/visible/yellow, +/turf/simulated/floor/plating, +/area/maintenance/storage) +"lAr" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 4; + icon_state = "1-4" }, -/area/toxins/misc_lab) -"luD" = ( /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/structure/snow{ - dir = 10; - icon_state = "snow_corner" +/turf/simulated/floor/plating, +/area/engine/engineering) +"lKP" = ( +/obj/structure/reflector/single{ + anchored = 1; + dir = 4 }, -/turf/simulated/floor/wood, -/area/crew_quarters/courtroom) -"lvS" = ( -/obj/structure/table/reinforced, -/obj/item/folder{ - pixel_x = -4 - }, -/obj/item/folder/red{ - pixel_y = 3 - }, -/obj/item/folder/blue{ - pixel_x = 5 - }, -/obj/item/folder/yellow{ - pixel_x = 2; - pixel_y = 2 - }, -/obj/item/stamp/law, -/obj/item/pen/multi, /turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "cult"; - tag = "icon-cult" + icon_state = "dark" }, -/area/lawoffice) -"lxD" = ( -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "neutral" - }, -/area/shuttle/escape) -"lJY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/item/decorations/sticky_decorations/flammable/snowman, -/obj/structure/snow, -/turf/simulated/floor/plasteel, -/area/quartermaster/office) -"lKx" = ( -/turf/simulated/floor/plasteel{ - icon_state = "floorgrime" - }, -/area/security/permabrig) -"lKS" = ( -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "cmo" - }, -/area/shuttle/escape) +/area/engine/engineering) "lLC" = ( /obj/machinery/alarm{ dir = 4; icon_state = "alarm0"; pixel_x = -22 }, -/obj/structure/snow, +/obj/effect/decal/warning_stripes/yellow/partial{ + dir = 1; + icon_state = "3" + }, /turf/simulated/floor/plasteel, /area/atmos) -"lLQ" = ( -/obj/machinery/computer/emergency_shuttle, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "darkblue" - }, -/area/shuttle/escape) -"lPZ" = ( -/obj/item/decorations/sticky_decorations/flammable/tinsel/green{ - pixel_y = 19 - }, -/turf/simulated/floor/carpet, -/area/chapel/main) "lQS" = ( /obj/structure/shuttle/engine/propulsion/burst{ dir = 8 }, -/turf/simulated/floor/plating, -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall_f6"; - tag = "icon-swall_f6" - }, +/turf/simulated/wall/mineral/titanium, /area/shuttle/pod_3) -"lTc" = ( -/obj/item/decorations/sticky_decorations/flammable/tinsel/red{ - pixel_y = 19 +"lVr" = ( +/obj/machinery/atmospherics/pipe/simple/visible/supply{ + dir = 10 }, -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "cult"; - tag = "icon-cult" +/turf/simulated/wall/r_wall, +/area/engine/supermatter) +"lXg" = ( +/obj/effect/decal/warning_stripes/west, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 8; + icon_state = "1-8" }, -/area/magistrateoffice) -"mam" = ( -/obj/structure/snow, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "white" +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/area/medical/reception) -"mkp" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/food/snacks/chocolateegg, -/obj/structure/snow, -/turf/simulated/floor/wood, -/area/hallway/secondary/exit) +/obj/machinery/atmospherics/pipe/simple/visible/cyan, +/turf/simulated/floor/engine, +/area/engine/engineering) "mkE" = ( /obj/machinery/atmospherics/pipe/simple/hidden/yellow, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 4; - name = "standard air scrubber"; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /obj/machinery/light, /turf/simulated/floor/bluegrid, /area/tcommsat/chamber) -"mpx" = ( -/obj/machinery/door/airlock/medical/glass{ - id_tag = null; - name = "Escape Shuttle Infirmary"; - req_access_txt = "0" +"mrw" = ( +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 5 }, -/obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, -/area/shuttle/escape) -"msR" = ( -/obj/structure/closet/crate/medical, -/obj/item/storage/firstaid/regular, -/obj/item/storage/firstaid/o2{ - pixel_x = 2; - pixel_y = -2 - }, -/obj/item/storage/firstaid/toxin{ - pixel_x = -2; - pixel_y = 4 - }, -/obj/machinery/light/small, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "bot" - }, -/area/shuttle/escape) -"mtS" = ( +/area/atmos) +"mtc" = ( +/obj/machinery/power/smes/engineering, /obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" + d2 = 8; + icon_state = "0-8" + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + pixel_y = 0 }, -/turf/simulated/floor/wood, -/area/crew_quarters/captain) -"mxT" = ( -/obj/machinery/sleeper, /turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "cmo" + icon_state = "dark" }, -/area/shuttle/escape) +/area/engine/engineering) +"mtr" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5; + level = 1 + }, +/turf/simulated/wall/r_wall, +/area/engine/engineering) +"mvx" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/wall/r_wall, +/area/engine/engineering) "mzv" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1; - scrub_Toxins = 0 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel, /area/crew_quarters/dorms) -"mzR" = ( -/obj/structure/snow, -/turf/simulated/floor/plasteel, -/area/engine/break_room) -"mzT" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/snow{ - dir = 6; - icon_state = "snow_corner" +"mAG" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 2 }, -/turf/simulated/floor/plasteel, -/area/quartermaster/office) -"mGt" = ( -/obj/structure/closet/crate/engineering, -/obj/item/storage/toolbox/electrical{ - pixel_x = -4; - pixel_y = 4 - }, -/obj/item/storage/toolbox/emergency, -/obj/item/storage/toolbox/mechanical{ - pixel_x = 4; - pixel_y = -4 - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "bot" - }, -/area/shuttle/escape) -"mLi" = ( -/obj/structure/snow, -/obj/item/decorations/sticky_decorations/flammable/snowman, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) -"mMw" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 8 - }, -/turf/simulated/shuttle/floor4/vox, -/area/shuttle/vox) -"mQF" = ( -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/shuttle/escape) -"mSl" = ( -/obj/structure/chair/wood/wings{ +/turf/simulated/floor/plating/airless, +/area/engine/engineering) +"mTX" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 4; - icon_state = "wooden_chair_wings"; - tag = "icon-wooden_chair_wings (EAST)" - }, -/obj/effect/landmark/start{ - name = "Civilian" - }, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) -"mVw" = ( -/obj/machinery/door/firedoor, -/obj/structure/snow, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/research{ - name = "Research Division" - }) -"mXd" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ - dir = 6; - initialize_directions = 6; level = 2 }, -/obj/structure/snow, -/turf/simulated/floor/plasteel, -/area/atmos) -"naH" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 4 +/turf/simulated/wall/r_wall, +/area/maintenance/storage) +"mWa" = ( +/obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/binary/pump{ + dir = 1; + name = "External Gas to Loop" }, -/turf/simulated/floor/plasteel, -/area/shuttle/escape) +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/engine/engineering) +"mYL" = ( +/obj/effect/decal/warning_stripes/southeastcorner, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/visible/green{ + dir = 6 + }, +/turf/simulated/floor/engine, +/area/engine/engineering) "nhb" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, /turf/simulated/wall/r_wall, /area/maintenance/fsmaint) -"nkG" = ( -/obj/structure/snow, -/obj/item/a_gift, -/obj/item/toy/figure/ce, -/obj/item/toy/carpplushie/gold, -/obj/item/toy/blink, -/obj/item/nanomob_card, -/turf/simulated/floor/plasteel, -/area/engine/equipmentstorage) -"npO" = ( -/obj/structure/cable{ - 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 - }, -/obj/structure/snow, -/turf/simulated/floor/plasteel, -/area/quartermaster/storage) +"nic" = ( +/obj/effect/spawner/window/reinforced/plasma, +/turf/simulated/floor/plating, +/area/engine/supermatter) "nqX" = ( /obj/structure/table, /obj/item/paper{ @@ -98624,46 +89966,17 @@ }, /turf/simulated/floor/plasteel, /area/crew_quarters/dorms) -"nrk" = ( -/obj/structure/snow{ - dir = 1; - icon_state = "snow_surround" +"nwJ" = ( +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "green" +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 4 }, -/area/hallway/secondary/exit) -"ntp" = ( -/obj/structure/table/reinforced, -/obj/machinery/cell_charger, -/obj/item/stock_parts/cell/high, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "vault" - }, -/area/shuttle/escape) -"nua" = ( -/obj/structure/snow{ - dir = 5; - icon_state = "snow_corner" - }, -/turf/simulated/floor/wood, -/area/ntrep) -"nvl" = ( -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralcorner" - }, -/area/shuttle/escape) -"nAk" = ( -/obj/item/decorations/sticky_decorations/flammable/tinsel/red{ - pixel_y = 19 - }, -/obj/item/decorations/sticky_decorations/flammable/snowman, -/obj/structure/snow, -/turf/simulated/floor/carpet, -/area/magistrateoffice) +/turf/simulated/floor/engine, +/area/engine/engineering) "nCT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -98675,133 +89988,74 @@ }, /turf/simulated/floor/plasteel, /area/crew_quarters/dorms) -"nFM" = ( -/obj/machinery/door/airlock/external{ - id_tag = "s_docking_airlock" +"nFa" = ( +/obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 4; + level = 2 + }, +/obj/machinery/camera{ + c_tag = "Engineering Supermatter Aft"; + dir = 2; + network = list("SS13","engine"); + pixel_x = 23 }, -/obj/structure/fans/tiny, -/turf/simulated/floor/plasteel, -/area/shuttle/escape) -"nGo" = ( -/obj/item/gift, -/obj/structure/snow, -/obj/item/toy/figure/clown, -/obj/item/toy/prize/honk, -/obj/item/toy/crayon/mime, -/obj/item/nanomob_card, /turf/simulated/floor/plasteel{ - icon_state = "vault"; - tag = "icon-vault" + icon_state = "dark" }, -/area/crew_quarters/dorms) -"nHW" = ( -/obj/structure/chair/comfy/shuttle{ +/area/engine/engineering) +"nFg" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "bot" + icon_state = "dark" }, -/area/shuttle/escape) -"nIj" = ( -/obj/machinery/door/airlock/medical/glass{ - id_tag = null; - name = "Escape Shuttle Infirmary"; - req_access_txt = "0" - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/shuttle/escape) -"nLS" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - pixel_y = 0 - }, -/obj/structure/snow{ - dir = 5; - icon_state = "snow_corner" - }, -/turf/simulated/floor/wood, -/area/crew_quarters/courtroom) +/area/engine/engineering) +"nLT" = ( +/obj/effect/decal/warning_stripes/north, +/turf/simulated/floor/engine, +/area/engine/engineering) "nMi" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 9 }, /turf/space, /area/space/nearstation) -"nMD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/snow, -/turf/simulated/floor/plasteel, -/area/atmos) -"nOb" = ( -/obj/structure/window/reinforced{ +"nPw" = ( +/obj/effect/spawner/window/reinforced/plasma, +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 4; + level = 2 + }, +/turf/simulated/floor/plating, +/area/engine/engineering) +"nSi" = ( +/obj/effect/decal/warning_stripes/southwest, +/obj/structure/closet/crate/can, +/turf/simulated/floor/engine, +/area/engine/engineering) +"nSm" = ( +/obj/effect/decal/warning_stripes/east, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/machinery/atmospherics/binary/pump{ + dir = 2; + name = "Cooling Loop Bypass" + }, +/turf/simulated/floor/engine, +/area/engine/engineering) +"nTG" = ( +/obj/machinery/light{ dir = 1 }, -/obj/item/gift, -/obj/structure/snow, -/obj/item/toy/figure/mime, -/obj/item/toy/prize/seraph, -/obj/item/toy/crayon/rainbow, -/obj/item/nanomob_card, /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/crew_quarters/dorms) -"nOr" = ( -/obj/machinery/atmospherics/pipe/simple/visible/purple, -/obj/structure/snow{ - dir = 1; - icon_state = "snow_corner" - }, -/turf/simulated/floor/plasteel, -/area/atmos) -"nRM" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - pixel_x = 0; - tag = "" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/snow{ - dir = 9; - icon_state = "snow_corner" - }, -/turf/simulated/floor/plasteel, -/area/bridge) -"nRP" = ( -/obj/structure/table, -/obj/item/storage/firstaid, -/obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, -/area/shuttle/escape) -"nSR" = ( -/obj/effect/landmark/start{ - name = "Station Engineer" - }, -/obj/structure/chair/comfy/red{ - dir = 4 - }, -/obj/structure/snow, -/turf/simulated/floor/plasteel, -/area/engine/break_room) -"nVM" = ( -/turf/simulated/floor/plasteel{ - icon_state = "neutralcorner" - }, -/area/shuttle/escape) +/area/engine/engineering) "nXr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/status_display{ @@ -98811,107 +90065,31 @@ }, /turf/simulated/floor/plasteel, /area/crew_quarters/dorms) -"obW" = ( -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/shuttle/escape) -"ofR" = ( -/obj/item/decorations/sticky_decorations/flammable/tinsel/green{ - pixel_y = 19 - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "caution" - }, -/area/crew_quarters/dorms) -"ook" = ( -/obj/structure/snow, -/turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "dark"; - tag = "icon-vault (NORTHEAST)" - }, -/area/turret_protected/ai) -"opx" = ( -/obj/effect/landmark/start{ - name = "Station Engineer" - }, -/obj/structure/chair/comfy/green{ - dir = 8 - }, -/obj/structure/snow, -/turf/simulated/floor/plasteel, -/area/engine/break_room) -"oqm" = ( -/obj/item/decorations/sticky_decorations/flammable/snowman, -/obj/structure/snow, -/turf/simulated/floor/plasteel, -/area/quartermaster/storage) -"oqQ" = ( -/obj/machinery/light, -/obj/structure/chair/comfy/shuttle{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/shuttle/escape) -"osF" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - pixel_y = 0 - }, -/turf/simulated/floor/wood, -/area/crew_quarters/courtroom) -"otC" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/snow{ - dir = 4; - icon_state = "snow_corner" - }, -/turf/simulated/floor/plasteel, -/area/engine/equipmentstorage) +"omz" = ( +/turf/simulated/wall/r_wall, +/area/engine/supermatter) "oyv" = ( /obj/machinery/hologram/holopad, -/obj/item/decorations/sticky_decorations/flammable/tinsel/red{ - pixel_y = 19 - }, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "neutralcorner" }, /area/crew_quarters/dorms) -"oDA" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 8 - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "bot" - }, -/area/shuttle/escape) -"oKO" = ( -/obj/structure/snow, -/turf/simulated/floor/plasteel, -/area/security/main) -"oNH" = ( -/obj/structure/disposalpipe/segment{ +"oAS" = ( +/obj/effect/decal/warning_stripes/south, +/obj/machinery/atmospherics/pipe/simple/visible/red{ dir = 4 }, -/obj/structure/snow{ - dir = 6; - icon_state = "snow_corner" +/turf/simulated/floor/engine, +/area/engine/engineering) +"oBR" = ( +/obj/structure/reflector/double{ + anchored = 1 }, -/turf/simulated/floor/plasteel, -/area/hallway/primary/port) -"oOM" = ( -/obj/structure/snow, -/turf/simulated/floor/wood, -/area/crew_quarters/courtroom) +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/engine/engineering) "oOZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/yellow, /turf/simulated/wall/r_wall, @@ -98942,148 +90120,55 @@ tag = "icon-vault (NORTHEAST)" }, /area/tcommsat/chamber) -"oQO" = ( -/obj/structure/snow{ - dir = 9; - icon_state = "snow_corner" - }, -/turf/simulated/floor/plasteel, -/area/quartermaster/storage) -"oRw" = ( -/obj/item/decorations/sticky_decorations/flammable/tinsel/green{ - pixel_y = 19 - }, -/obj/structure/flora/tree/pine/xmas, -/obj/structure/snow, -/turf/simulated/floor/plasteel, -/area/quartermaster/storage) -"oRL" = ( -/obj/structure/snow{ - dir = 10; - icon_state = "snow_corner" - }, -/turf/simulated/floor/plasteel{ - dir = 0; - icon_state = "green" - }, -/area/hallway/secondary/exit) -"oRM" = ( -/obj/structure/table/reinforced, -/obj/machinery/recharger, -/turf/simulated/shuttle/floor4, -/area/shuttle/escape) -"oUw" = ( -/obj/structure/table/reinforced, -/obj/machinery/light{ - dir = 8; - icon_state = "tube1" - }, -/obj/item/reagent_containers/food/drinks/mug/med, -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "cmo" - }, -/area/shuttle/escape) -"oUJ" = ( -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/plasteel, -/area/engine/equipmentstorage) -"oWs" = ( -/obj/item/gift, -/obj/structure/snow, -/obj/item/toy/figure/qm, -/obj/item/toy/prize/fireripley, -/obj/item/nanomob_card, -/turf/simulated/floor/plasteel, -/area/quartermaster/storage) -"oZV" = ( -/obj/machinery/door/airlock/centcom{ - id_tag = "adminshuttle"; - name = "Medbay"; - opacity = 1; - req_access_txt = "101" - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) -"pdr" = ( -/obj/machinery/door/airlock/security/glass{ - name = "Escape Shuttle Cell"; - req_access_txt = "2" - }, -/turf/simulated/shuttle/floor4, -/area/shuttle/escape) -"pfa" = ( -/obj/item/decorations/sticky_decorations/flammable/tinsel/red{ - pixel_y = 19 - }, -/obj/structure/snow, -/turf/simulated/floor/plasteel{ - icon_state = "grimy" - }, -/area/chapel/office) -"pgr" = ( -/obj/structure/snow{ - icon_state = "snow_corner" - }, -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "cult"; - tag = "icon-cult" - }, -/area/lawoffice) -"pjK" = ( -/obj/structure/snow, -/turf/simulated/floor/plasteel, -/area/quartermaster/storage) -"pmA" = ( +"oSI" = ( +/obj/effect/decal/warning_stripes/south, /obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/binary/valve{ + dir = 4; + name = "Output to Waste" + }, +/turf/simulated/floor/engine, +/area/engine/engineering) +"paA" = ( +/obj/effect/decal/warning_stripes/southwest, +/turf/simulated/floor/engine, +/area/engine/engineering) +"phw" = ( +/obj/machinery/power/supermatter_crystal/engine, +/turf/simulated/floor/engine, +/area/engine/supermatter) +"piF" = ( +/obj/effect/decal/warning_stripes/east, +/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 - }, -/obj/structure/snow{ - dir = 1; - icon_state = "snow_surround" - }, -/turf/simulated/floor/plasteel, -/area/crew_quarters/locker) -"pqc" = ( +/obj/item/tank/internals/plasma, /obj/effect/decal/cleanable/dirt, -/obj/structure/snow, -/turf/simulated/floor/plasteel, -/area/security/processing) -"pwN" = ( -/obj/machinery/door_control{ - id = "adminshuttleblast"; - name = "blast door control"; - pixel_x = -30; - req_access_txt = "101" +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + dir = 2; + id_tag = "engsm"; + name = "Radiation Chamber Shutters" }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) +/turf/simulated/floor/plating, +/area/engine/supermatter) "pwU" = ( /obj/effect/landmark/battle_mob_point, /turf/simulated/floor/engine, /area/holodeck/alphadeck) -"pyk" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/table/wood, -/obj/item/reagent_containers/food/snacks/sliceable/turkey{ - pixel_y = 8 +"pxP" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/obj/item/reagent_containers/food/snacks/turkeyslice, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) +/turf/simulated/floor/plasteel, +/area/engine/engineering) "pzr" = ( /obj/structure/cable{ d1 = 4; @@ -99104,333 +90189,8 @@ }, /turf/simulated/floor/plating, /area/maintenance/aft) -"pDb" = ( -/obj/structure/chair/wood/wings{ - dir = 4; - icon_state = "wooden_chair_wings"; - tag = "icon-wooden_chair_wings (EAST)" - }, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) -"pDl" = ( -/obj/structure/table/reinforced, -/obj/item/storage/fancy/donut_box, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/shuttle/escape) -"pGQ" = ( -/obj/machinery/mech_bay_recharge_port, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "bot" - }, -/area/shuttle/escape) -"pKw" = ( -/obj/structure/chair/comfy/green{ - dir = 1 - }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/red{ - pixel_y = 19 - }, -/turf/simulated/floor/plasteel{ - icon_state = "grimy" - }, -/area/hallway/secondary/entry) -"pUZ" = ( -/obj/item/decorations/sticky_decorations/flammable/snowman, -/obj/structure/snow, -/turf/simulated/floor/plasteel{ - icon_state = "grimy" - }, -/area/chapel/office) -"pWt" = ( -/obj/machinery/dna_scannernew, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/blue{ - pixel_y = 19 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whitepurplefull"; - tag = "icon-whitepurple (WEST)" - }, -/area/medical/genetics) -"pXx" = ( -/obj/structure/snow{ - dir = 10; - icon_state = "snow_corner" - }, -/turf/simulated/floor/plasteel, -/area/crew_quarters/locker) -"pZO" = ( -/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ - dir = 10 - }, -/turf/space, -/area/space/nearstation) -"qau" = ( -/obj/structure/chair/sofa/left{ - dir = 8 - }, -/obj/structure/snow, -/turf/simulated/floor/wood, -/area/hallway/secondary/exit) -"qdA" = ( -/obj/machinery/computer/secure_data, -/turf/simulated/floor/plasteel{ - dir = 10; - icon_state = "darkred" - }, -/area/shuttle/escape) -"qeu" = ( -/obj/item/decorations/sticky_decorations/flammable/snowman, -/obj/structure/snow{ - dir = 10; - icon_state = "snow_corner" - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/toxins/explab) -"qgG" = ( -/obj/machinery/door/airlock/external{ - id_tag = "s_docking_airlock"; - name = "Shuttle Hatch"; - req_access_txt = "101" - }, -/obj/structure/fans/tiny, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) -"qig" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/snow{ - icon_state = "snow_corner" - }, -/turf/simulated/floor/plasteel, -/area/hallway/secondary/exit) -"qkV" = ( -/obj/structure/snow{ - dir = 5; - icon_state = "snow_corner" - }, -/turf/simulated/floor/wood, -/area/crew_quarters/courtroom) -"qnb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/snow, -/turf/simulated/floor/carpet, -/area/bridge/meeting_room) -"qpX" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/shuttle/escape) -"qqe" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/snow{ - dir = 5; - icon_state = "snow_corner" - }, -/turf/simulated/floor/plasteel, -/area/quartermaster/miningdock) -"qsu" = ( -/obj/structure/snow{ - dir = 6; - icon_state = "snow_corner" - }, -/turf/simulated/floor/carpet, -/area/ntrep) -"qsT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/turf/simulated/wall, -/area/crew_quarters/dorms) -"qtT" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/snow{ - dir = 4; - icon_state = "snow_corner" - }, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) -"quH" = ( -/obj/structure/snow, -/turf/simulated/floor/bluegrid, -/area/turret_protected/ai) -"qxC" = ( -/obj/structure/table/reinforced, -/obj/item/storage/firstaid/o2{ - pixel_x = -3; - pixel_y = -3 - }, -/obj/item/storage/firstaid/regular, -/obj/item/storage/firstaid/regular{ - pixel_x = 3; - pixel_y = 3 - }, -/turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "whiteblue"; - tag = "icon-whiteblue (NORTHEAST)" - }, -/area/shuttle/escape) -"qFa" = ( -/obj/item/decorations/sticky_decorations/flammable/tinsel/green{ - pixel_y = 19 - }, -/turf/simulated/floor/wood{ - broken = 1; - icon_state = "wood-broken" - }, -/area/maintenance/abandonedbar) -"qFg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/crew_quarters/dorms) -"qJu" = ( -/obj/machinery/door/airlock/shuttle/glass{ - name = "Emergency Airlock Access"; - req_one_access_txt = "2;19" - }, -/turf/simulated/floor/plasteel, -/area/shuttle/escape) -"qKW" = ( -/obj/structure/chair{ - dir = 4 - }, -/obj/structure/snow, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "redcorner" - }, -/area/security/processing) -"qOo" = ( -/obj/structure/chair{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel, -/area/crew_quarters/dorms) -"qPF" = ( -/obj/structure/snow, -/turf/simulated/floor/plasteel, -/area/hallway/primary/starboard/west) -"qQm" = ( -/obj/item/decorations/sticky_decorations/flammable/tinsel/green{ - pixel_y = 19 - }, -/turf/simulated/floor/wood, -/area/crew_quarters/captain) -"qQU" = ( -/obj/structure/snow, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "browncorner" - }, -/area/hallway/primary/central/west) -"qRM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/snow{ - dir = 1; - icon_state = "snow_corner" - }, -/turf/simulated/floor/plasteel, -/area/hallway/primary/starboard/west) -"qSE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/red{ - pixel_y = 19 - }, -/obj/structure/snow{ - dir = 8; - icon_state = "snow_surround" - }, -/turf/simulated/floor/carpet, -/area/bridge/meeting_room) -"qUv" = ( -/obj/machinery/atmospherics/pipe/simple/heat_exchanging, -/turf/space, -/area/space/nearstation) -"qWE" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/purple{ - pixel_y = 19 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/toxins/lab) -"qZf" = ( -/obj/structure/snow{ - dir = 8; - icon_state = "snow_surround" - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "white" - }, -/area/medical/reception) -"qZB" = ( -/obj/structure/snow{ - dir = 4; - icon_state = "snow_corner" - }, -/turf/simulated/floor/plasteel, -/area/hallway/secondary/exit) -"qZX" = ( -/obj/item/decorations/sticky_decorations/flammable/tinsel/red{ - pixel_y = 19 - }, -/obj/item/gift, -/obj/structure/snow, -/obj/item/toy/figure/cargotech, -/obj/item/toy/prize/deathripley, -/obj/item/nanomob_card, -/turf/simulated/floor/plasteel, -/area/quartermaster/storage) -"rat" = ( -/obj/structure/snow{ - icon_state = "snow_corner" - }, -/turf/simulated/floor/wood, -/area/crew_quarters/courtroom) -"rbV" = ( -/obj/structure/table/wood, -/obj/item/radio/intercom/command, -/obj/structure/snow, -/turf/simulated/floor/carpet, -/area/bridge/meeting_room) -"rdi" = ( +"pMd" = ( +/obj/structure/closet/secure_closet/engineering_personal, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -99438,147 +90198,199 @@ pixel_x = 0; tag = "" }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/green{ - pixel_y = 19 +/turf/simulated/floor/plasteel, +/area/engine/equipmentstorage) +"pOj" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 }, -/turf/simulated/floor/carpet, -/area/library) -"reA" = ( -/obj/item/radio/intercom{ - dir = 8; - name = "station intercom (General)"; - pixel_x = -28 +/turf/simulated/wall/r_wall, +/area/engine/engineering) +"pTj" = ( +/obj/structure/window/plasmareinforced{ + dir = 8 }, -/obj/structure/chair/comfy/shuttle{ +/obj/machinery/power/rad_collector{ + anchored = 1 + }, +/obj/machinery/atmospherics/pipe/simple/visible/supply{ + dir = 9 + }, +/obj/structure/cable/yellow{ + d2 = 4; + icon_state = "0-4" + }, +/turf/simulated/floor/engine, +/area/engine/supermatter) +"pUZ" = ( +/obj/effect/landmark{ + name = "blobstart" + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/storage/secure) +"pZO" = ( +/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ + dir = 10 + }, +/turf/space, +/area/space/nearstation) +"qcg" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + pixel_y = 0 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/turf/simulated/shuttle/floor4, -/area/shuttle/escape) -"rlX" = ( -/obj/item/stack/sheet/metal{ - amount = 50 - }, -/obj/item/stack/sheet/metal{ - amount = 50 - }, -/obj/item/stack/sheet/metal{ - amount = 50 - }, -/obj/item/stack/sheet/metal{ - amount = 50 - }, -/obj/item/stack/sheet/metal{ - amount = 50 - }, -/obj/item/stack/sheet/glass{ - amount = 50 - }, -/obj/item/stack/sheet/glass{ - amount = 50 - }, -/obj/item/stack/sheet/glass{ - amount = 50 - }, -/obj/item/stack/sheet/glass{ - amount = 50 - }, -/obj/item/stack/sheet/glass{ - amount = 50 - }, -/obj/item/stack/sheet/wood{ - amount = 30 - }, -/obj/item/stack/sheet/wood{ - amount = 30 - }, -/obj/item/stack/sheet/wood{ - amount = 30 - }, -/obj/structure/table, -/turf/simulated/floor/plating, -/area/storage/secure) -"rss" = ( -/obj/structure/snow, -/turf/simulated/floor/plasteel, -/area/quartermaster/office) -"rzz" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/firedoor, -/obj/machinery/door/poddoor/shutters{ - density = 0; +/turf/simulated/floor/engine, +/area/engine/engineering) +"qmX" = ( +/obj/effect/decal/warning_stripes/east, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8; - icon_state = "open"; - id_tag = "kitchenbar"; - name = "Kitchen Shutters"; - opacity = 0 + initialize_directions = 11; + level = 1 }, -/obj/machinery/door/window{ - dir = 4; - name = "Kitchen"; - req_access_txt = "28" +/turf/simulated/floor/engine, +/area/engine/engineering) +"qnM" = ( +/obj/effect/decal/warning_stripes/east, +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/engine, +/area/engine/engineering) +"qoT" = ( +/obj/structure/table, +/obj/item/clothing/gloves/color/black, +/obj/item/clothing/gloves/color/black, +/obj/item/clothing/gloves/color/black, +/obj/item/pipe_painter, +/obj/item/pipe_painter, +/obj/item/clothing/glasses/welding, +/obj/item/clothing/glasses/welding, +/turf/simulated/floor/plasteel, +/area/atmos) +"qpq" = ( +/obj/structure/reflector/box{ + anchored = 1; + dir = 1 }, -/obj/item/reagent_containers/food/snacks/candy/jawbreaker, /turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/engine/engineering) +"qsT" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/wall, +/area/crew_quarters/dorms) +"qvX" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/turf/simulated/wall/r_wall, +/area/engine/engineering) +"qCB" = ( +/obj/effect/decal/warning_stripes/west, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ dir = 2; - icon_state = "cafeteria"; - tag = "icon-cafeteria (NORTHEAST)" + id_tag = "engsm"; + name = "Radiation Chamber Shutters" }, -/area/crew_quarters/kitchen) -"rAt" = ( -/obj/structure/extinguisher_cabinet, -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall3" +/turf/simulated/floor/plating, +/area/engine/supermatter) +"qFg" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/area/shuttle/escape) -"rEw" = ( -/obj/machinery/computer/shuttle/admin{ - name = "NTV Argos shuttle console" +/turf/simulated/floor/plasteel, +/area/crew_quarters/dorms) +"qIn" = ( +/obj/structure/table, +/obj/item/stack/sheet/metal/fifty, +/turf/simulated/floor/plasteel{ + icon_state = "dark" }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" +/area/engine/engineering) +"qOo" = ( +/obj/structure/chair{ + dir = 4 }, -/area/shuttle/administration) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel, +/area/crew_quarters/dorms) +"qUv" = ( +/obj/machinery/atmospherics/pipe/simple/heat_exchanging, +/turf/space, +/area/space/nearstation) +"rhs" = ( +/obj/effect/decal/warning_stripes/west, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/visible/cyan, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/engine, +/area/engine/engineering) +"rlm" = ( +/obj/machinery/atmospherics/pipe/manifold/visible, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/engine/engineering) +"rlX" = ( +/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ + dir = 5; + icon_state = "intact"; + tag = "icon-intact (NORTHEAST)" + }, +/obj/structure/lattice, +/turf/space, +/area/space/nearstation) +"rmT" = ( +/obj/effect/decal/warning_stripes/northwest, +/obj/machinery/atmospherics/pipe/manifold/visible/cyan{ + dir = 1 + }, +/turf/simulated/floor/engine, +/area/engine/engineering) +"rzU" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + tag = "" + }, +/obj/effect/decal/warning_stripes/yellow/partial{ + dir = 4; + icon_state = "3" + }, +/turf/simulated/floor/plasteel, +/area/atmos) "rFd" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/crew_quarters/dorms) -"rGB" = ( -/obj/structure/closet/crate, -/obj/item/storage/toolbox/emergency, -/obj/item/storage/toolbox/emergency, -/obj/item/flashlight/flare, -/obj/item/flashlight/flare, -/obj/item/crowbar, -/obj/item/wrench, -/obj/item/radio, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "bot" - }, -/area/shuttle/escape) -"rHe" = ( -/obj/structure/snow{ - dir = 8; - icon_state = "snow_corner" - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "darkredcorners" - }, -/area/security/brig) "rIF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/wall, /area/crew_quarters/dorms) -"rSv" = ( -/obj/structure/shuttle/engine/propulsion{ - dir = 8; - icon_state = "propulsion_l"; - tag = "icon-propulsion_l (EAST)" - }, -/turf/space, -/area/shuttle/administration) "rTy" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -99606,138 +90418,85 @@ tag = "icon-vault (NORTHEAST)" }, /area/turret_protected/aisat_interior) -"rXk" = ( -/obj/structure/snow{ - dir = 8; - icon_state = "snow_corner" +"rWB" = ( +/obj/effect/decal/warning_stripes/southeast, +/obj/machinery/atmospherics/binary/valve/digital/open{ + dir = 4; + name = "Output Release" }, -/turf/simulated/floor/plasteel{ - icon_state = "bcarpet05" - }, -/area/blueshield) -"rYq" = ( -/obj/machinery/door/airlock/centcom{ - id_tag = "adminshuttle"; - name = "Bridge"; - opacity = 1; - req_access_txt = "101" - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) -"sbp" = ( -/turf/simulated/shuttle/wall{ - icon_state = "wall3" - }, -/area/shuttle/escape) -"set" = ( -/obj/structure/snow{ - dir = 1; - icon_state = "snow_corner" - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "barber" - }, -/area/crew_quarters/locker) -"sfN" = ( -/obj/structure/snow{ - dir = 1; - icon_state = "snow_corner" - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/chapel/main) -"siD" = ( -/obj/item/decorations/sticky_decorations/flammable/snowman, -/obj/structure/snow, -/turf/simulated/floor/plasteel, -/area/security/main) -"slj" = ( -/obj/item/decorations/sticky_decorations/flammable/tinsel/yellow{ - pixel_y = 19 - }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/engine, /area/engine/engineering) -"stO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +"rWS" = ( +/obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/snow{ - dir = 10; - icon_state = "snow_corner" - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/research{ - name = "Research Division" - }) -"sug" = ( -/obj/structure/chair/comfy/green{ - dir = 4 - }, -/turf/simulated/floor/carpet, -/area/crew_quarters/captain) -"suo" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/table/wood, -/obj/structure/snow{ - dir = 1; - icon_state = "snow_corner" - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/crew_quarters/dorms) -"sBH" = ( -/obj/structure/closet/secure_closet/medical3, -/turf/simulated/floor/plasteel{ - icon_state = "whitebluefull"; - tag = "icon-whitebluefull" - }, -/area/medical/biostorage) -"sCf" = ( -/obj/structure/cable{ +/turf/simulated/floor/engine, +/area/engine/engineering) +"scM" = ( +/obj/effect/decal/warning_stripes/southwestcorner, +/obj/structure/cable/yellow{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/item/decorations/sticky_decorations/flammable/snowman, -/turf/simulated/floor/wood, -/area/bridge/meeting_room) -"sDw" = ( -/obj/structure/flora/ausbushes/grassybush, -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/ausbushes/ywflowers, -/obj/structure/flora/ausbushes/fernybush, -/obj/structure/window/full/shuttle, -/turf/simulated/floor/grass, -/area/shuttle/escape) +/obj/machinery/atmospherics/pipe/manifold/visible/cyan{ + dir = 1 + }, +/turf/simulated/floor/engine, +/area/engine/engineering) +"shz" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + pixel_y = 0 + }, +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 5; + tag = "icon-intact-y (NORTHWEST)" + }, +/obj/machinery/meter, +/turf/simulated/floor/engine, +/area/engine/engineering) +"sud" = ( +/obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/atmospherics/unary/portables_connector{ + dir = 1 + }, +/obj/machinery/portable_atmospherics/canister/nitrogen, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/engine/engineering) "sHt" = ( /turf/simulated/floor/engine, /area/holodeck/alphadeck) -"sNK" = ( -/obj/item/decorations/sticky_decorations/flammable/snowman, -/obj/structure/snow, -/turf/simulated/floor/plasteel, -/area/bridge) -"sOc" = ( -/obj/item/decorations/sticky_decorations/flammable/snowman, -/obj/structure/snow, -/turf/simulated/floor/plasteel, -/area/crew_quarters/locker) +"sIy" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 4; + level = 2 + }, +/obj/structure/lattice, +/turf/space, +/area/space/nearstation) +"sJK" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/effect/decal/warning_stripes/west, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/engine/engineering) +"sKE" = ( +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 6 + }, +/turf/simulated/wall/r_wall, +/area/engine/supermatter) "sPb" = ( /obj/machinery/alarm{ pixel_y = 24 @@ -99748,428 +90507,133 @@ }, /turf/simulated/floor/plasteel, /area/crew_quarters/dorms) -"sPV" = ( -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "browncorner"; - tag = "icon-browncorner (EAST)" - }, -/area/shuttle/escape) -"sTZ" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/green{ - pixel_y = 19 - }, -/turf/simulated/floor/plasteel, -/area/crew_quarters/dorms) -"sUK" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 8 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/syndicate_sit) -"sUY" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/red{ - pixel_y = 19 - }, -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "caution" - }, -/area/crew_quarters/dorms) -"sVn" = ( -/obj/item/decorations/sticky_decorations/flammable/tinsel/blue{ - pixel_y = 19 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/chemistry) -"sVQ" = ( -/turf/simulated/floor/plasteel{ +"sZP" = ( +/obj/machinery/power/emitter{ + anchored = 1; dir = 8; - icon_state = "browncorner" + state = 2 }, -/area/shuttle/escape) -"sVX" = ( -/obj/item/decorations/sticky_decorations/flammable/tinsel/green{ - pixel_y = 19 +/obj/structure/cable{ + d2 = 4; + icon_state = "0-4" }, -/obj/structure/snow, -/turf/simulated/floor/plasteel, -/area/quartermaster/office) +/turf/simulated/floor/plating, +/area/engine/engineering) "tbC" = ( /obj/structure/chair{ dir = 4 }, /turf/simulated/floor/plasteel, /area/crew_quarters/dorms) -"tcd" = ( -/obj/structure/chair/comfy/red, -/turf/simulated/floor/plasteel{ - icon_state = "grimy" - }, -/area/hallway/secondary/entry) -"tdh" = ( -/obj/item/twohanded/required/kirbyplants, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "redcorner" - }, -/area/shuttle/escape) -"tku" = ( -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "neutralcorner" - }, -/area/shuttle/escape) -"tlj" = ( -/obj/structure/chair/sofa/right{ - dir = 4 - }, -/obj/structure/snow, -/turf/simulated/floor/wood, -/area/hallway/secondary/exit) -"tmg" = ( -/obj/structure/snow{ - dir = 6; - icon_state = "snow_corner" - }, -/turf/simulated/floor/wood, -/area/crew_quarters/courtroom) -"tmo" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, +"tbU" = ( /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; - pixel_x = 0; - tag = "" + pixel_y = 0 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/light{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/snow, /turf/simulated/floor/plasteel{ - icon_state = "showroomfloor" + icon_state = "dark" }, -/area/crew_quarters/kitchen) -"tob" = ( -/obj/item/decorations/sticky_decorations/flammable/tinsel/green{ - pixel_y = 19 +/area/engine/engineering) +"tky" = ( +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 4 }, -/turf/simulated/floor/carpet, -/area/security/vacantoffice) -"toq" = ( /turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "brown" + icon_state = "dark" }, -/area/shuttle/escape) -"trn" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/area/engine/engineering) +"tlR" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/engine/engineering) +"ttp" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red{ dir = 4 }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/green{ - pixel_y = 19 - }, -/turf/simulated/floor/plasteel, -/area/storage/primary) -"tsU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/green{ - pixel_y = 19 - }, -/obj/structure/snow{ - dir = 1; - icon_state = "snow_corner" - }, -/turf/simulated/floor/carpet, -/area/bridge/meeting_room) -"tuN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/snow{ - dir = 8; - icon_state = "snow_corner" - }, -/turf/simulated/floor/plasteel, -/area/hallway/primary/central/west) -"txa" = ( -/obj/machinery/atmospherics/pipe/simple/visible/purple, -/obj/structure/snow{ - dir = 8; - icon_state = "snow_corner" - }, -/turf/simulated/floor/plasteel, -/area/atmos) -"txC" = ( -/obj/structure/chair/wood/wings{ - dir = 1; - icon_state = "wooden_chair_wings"; - tag = "icon-wooden_chair_wings (NORTH)" - }, -/obj/structure/snow, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) -"tBt" = ( -/obj/item/gift, -/obj/structure/snow, -/obj/item/toy/figure/bartender, -/obj/item/toy/katana, -/obj/item/id_decal/silver, -/obj/item/nanomob_card, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) -"tBT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/blue{ - pixel_y = 19 - }, +/turf/simulated/wall/r_wall, +/area/engine/engineering) +"tDn" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - icon_state = "white" + icon_state = "dark" }, -/area/medical/sleeper) -"tDj" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ - dir = 4; - level = 2 +/area/engine/engineering) +"tPd" = ( +/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ + frequency = 1379; + id_tag = "engineering_east_airlock"; + pixel_x = -25; + req_access_txt = "10;13"; + tag_airpump = "engineering_east_pump"; + tag_chamber_sensor = "engineering_east_sensor"; + tag_exterior_door = "engineering_east_outer"; + tag_interior_door = "engineering_east_inner" }, -/obj/structure/snow{ - dir = 8; - icon_state = "snow_corner" +/obj/machinery/airlock_sensor{ + frequency = 1379; + id_tag = "engineering_east_sensor"; + pixel_x = -25; + pixel_y = 12 }, -/turf/simulated/floor/plasteel, -/area/atmos) -"tEg" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/obj/structure/snow, -/turf/simulated/floor/plasteel, -/area/atmos) -"tGI" = ( -/obj/structure/table/wood, -/obj/structure/snow, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) -"tHd" = ( -/obj/structure/chair/stool, -/obj/structure/snow{ - dir = 4; - icon_state = "snow_surround" - }, -/turf/simulated/floor/plasteel, -/area/crew_quarters/locker) -"tIz" = ( -/obj/machinery/computer/mech_bay_power_console, -/turf/simulated/floor/plasteel, -/area/shuttle/escape) -"tKz" = ( -/obj/item/gift, -/obj/structure/snow, -/obj/item/toy/figure/miner, -/obj/item/toy/prize/ripley, -/obj/item/nanomob_card, -/turf/simulated/floor/plasteel, -/area/quartermaster/storage) -"tKB" = ( -/obj/structure/snow{ - dir = 1; - icon_state = "snow_surround" - }, -/turf/simulated/floor/plasteel, -/area/quartermaster/storage) -"tPa" = ( -/obj/structure/snow{ - dir = 5; - icon_state = "snow_corner" - }, -/turf/simulated/floor/plasteel, -/area/quartermaster/office) -"tQs" = ( -/obj/structure/snow{ - dir = 8; - icon_state = "snow_corner" - }, -/turf/simulated/floor/plasteel{ - icon_state = "grimy" - }, -/area/security/detectives_office) -"tSs" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/green{ - pixel_y = 19 - }, -/obj/structure/snow{ - dir = 5; - icon_state = "snow_corner" - }, -/turf/simulated/floor/carpet, -/area/bridge/meeting_room) -"tYi" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel, -/area/quartermaster/storage) -"udn" = ( -/obj/structure/cable{ +/turf/simulated/floor/plating, +/area/engine/engineering) +"tQJ" = ( +/obj/effect/decal/warning_stripes/north, +/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 - }, -/obj/structure/snow{ - dir = 8; - icon_state = "snow_corner" - }, -/turf/simulated/floor/plasteel, -/area/quartermaster/storage) -"ufT" = ( -/obj/item/radio/intercom/department/security{ - pixel_y = 33 - }, -/obj/machinery/light_switch{ - pixel_y = 27 - }, -/obj/structure/snow, -/turf/simulated/floor/plasteel, -/area/security/main) -"ugr" = ( -/obj/structure/snow{ - icon_state = "snow_corner" - }, -/turf/simulated/floor/plasteel, -/area/engine/break_room) -"uiW" = ( -/obj/structure/chair/wood/wings{ - dir = 8; - icon_state = "wooden_chair_wings"; - tag = "icon-wooden_chair_wings (WEST)" - }, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) -"uom" = ( -/turf/simulated/floor/plasteel, -/area/shuttle/escape) -"urE" = ( +/obj/structure/table/reinforced, +/obj/item/clothing/suit/radiation, +/obj/item/clothing/head/radiation, +/obj/item/clothing/glasses/meson, +/obj/item/geiger_counter, +/obj/item/geiger_counter, +/turf/simulated/floor/engine, +/area/engine/engineering) +"ubz" = ( +/obj/structure/table, +/obj/item/rpd, /turf/simulated/floor/plasteel{ - icon_state = "bcarpet05" + icon_state = "dark" }, -/area/security/permabrig) -"usf" = ( -/obj/machinery/computer/communications, -/turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "darkblue" - }, -/area/shuttle/escape) -"ute" = ( -/obj/structure/snow{ - dir = 5; - icon_state = "snow_corner" - }, -/turf/simulated/floor/plasteel, -/area/engine/equipmentstorage) -"utw" = ( -/obj/structure/shuttle/engine/propulsion/burst{ - dir = 8 +/area/engine/engineering) +"ufc" = ( +/obj/structure/cable{ + d2 = 4; + icon_state = "0-4" }, /turf/simulated/floor/plating, -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall_f5"; - tag = "icon-swall_f5" +/area/engine/engineering) +"uqo" = ( +/obj/structure/sign/securearea{ + desc = "A warning sign which reads 'HIGH VOLTAGE'"; + icon_state = "shock"; + name = "HIGH VOLTAGE" }, -/area/shuttle/pod_3) -"uww" = ( -/obj/structure/chair{ - dir = 8 - }, -/obj/effect/landmark/start{ - name = "Security Officer" - }, -/turf/simulated/floor/plasteel, -/area/security/main) +/turf/simulated/wall/r_wall, +/area/engine/supermatter) "uxy" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 4 }, /turf/space, /area/space/nearstation) -"uxA" = ( -/obj/machinery/computer/security{ - network = list("SS13","Research Outpost","Mining Outpost","Telecomms") - }, -/obj/structure/sign/poster/official/nanotrasen_logo{ - pixel_x = -32; - pixel_y = 0 - }, -/turf/simulated/floor/plasteel{ - dir = 9; - icon_state = "darkred" - }, -/area/shuttle/escape) -"uyo" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - pixel_x = 0; - tag = "" - }, -/obj/item/gift, -/obj/structure/snow, -/obj/item/toy/figure/rd, -/obj/item/toy/plushie/face_hugger, -/obj/item/toy/prize/phazon, -/obj/item/nanomob_card, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/toxins/explab) -"uBM" = ( -/obj/structure/shuttle/engine/propulsion{ - dir = 8; - icon_state = "propulsion_r"; - tag = "icon-propulsion_r (EAST)" - }, -/turf/space, -/area/shuttle/administration) +"uBJ" = ( +/obj/effect/decal/warning_stripes/south, +/obj/machinery/atmospherics/pipe/manifold/visible/red, +/obj/machinery/meter, +/turf/simulated/floor/engine, +/area/engine/engineering) "uDK" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 5; @@ -100178,96 +90642,102 @@ }, /turf/space, /area/space/nearstation) -"uGR" = ( -/obj/structure/snow, -/turf/simulated/floor/plasteel, -/area/engine/mechanic_workshop) -"uNG" = ( -/obj/item/decorations/sticky_decorations/flammable/tinsel/red{ - pixel_y = 19 +"uTu" = ( +/obj/structure/window/plasmareinforced{ + dir = 8 }, -/turf/simulated/floor/carpet, -/area/crew_quarters/dorms) -"uOv" = ( -/obj/structure/chair/comfy/green{ - dir = 4 +/obj/machinery/power/rad_collector{ + anchored = 1 }, -/obj/structure/snow, -/turf/simulated/floor/wood, -/area/bridge/meeting_room) -"uPv" = ( -/obj/structure/chair/sofa/corner{ - dir = 4 +/obj/structure/cable/yellow{ + d2 = 4; + icon_state = "0-4" }, -/obj/structure/snow, -/turf/simulated/floor/wood, -/area/hallway/secondary/exit) -"uXX" = ( -/obj/machinery/light{ - dir = 8; - icon_state = "tube1" +/obj/machinery/atmospherics/pipe/manifold/visible/supply{ + dir = 1 }, -/turf/simulated/floor/plasteel, -/area/shuttle/escape) -"uYV" = ( +/turf/simulated/floor/engine, +/area/engine/supermatter) +"uVt" = ( +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/floor/engine, +/area/engine/engineering) +"uZx" = ( /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/turf/simulated/floor/plasteel, -/area/quartermaster/storage) -"uZi" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/item/gift, -/obj/structure/snow, -/obj/item/toy/figure/roboticist, -/obj/item/toy/plushie/ipcplushie, -/obj/item/nanomob_card, -/obj/item/toy/plushie/robo_corgi, +/obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel{ - icon_state = "white" + icon_state = "dark" }, -/area/toxins/explab) -"vdt" = ( -/obj/effect/decal/warning_stripes/blue/partial{ +/area/engine/engineering) +"vaH" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/effect/decal/warning_stripes/west, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/engine/engineering) +"vdo" = ( +/obj/effect/decal/warning_stripes/north, +/obj/machinery/atmospherics/pipe/manifold/visible/cyan{ dir = 1 }, -/obj/structure/snow{ - dir = 8; - icon_state = "snow_corner" +/turf/simulated/floor/engine, +/area/engine/engineering) +"vhd" = ( +/obj/structure/window/plasmareinforced{ + dir = 4 }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "white" +/obj/machinery/power/rad_collector{ + anchored = 1 }, -/area/medical/reception) -"vfX" = ( -/obj/item/decorations/sticky_decorations/flammable/tinsel/purple{ - pixel_y = 19 +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 5 }, -/obj/structure/snow, -/turf/simulated/floor/plasteel{ - icon_state = "white" +/obj/structure/cable/yellow{ + d1 = 0; + d2 = 8; + icon_state = "0-8" }, -/area/toxins/explab) -"viw" = ( -/obj/item/decorations/sticky_decorations/flammable/snowman, -/obj/structure/snow, -/turf/simulated/floor/wood, -/area/crew_quarters/courtroom) -"vum" = ( -/obj/structure/snow{ - dir = 8; - icon_state = "snow_corner" +/turf/simulated/floor/engine, +/area/engine/supermatter) +"vmA" = ( +/obj/effect/decal/warning_stripes/east, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/turf/simulated/floor/plasteel, -/area/hallway/secondary/exit) +/obj/effect/decal/cleanable/dirt, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + dir = 2; + id_tag = "engsm"; + name = "Radiation Chamber Shutters" + }, +/turf/simulated/floor/plating, +/area/engine/supermatter) "vup" = ( /obj/machinery/atmospherics/pipe/simple/insulated{ dir = 10 @@ -100275,25 +90745,22 @@ /obj/structure/lattice, /turf/space, /area/space/nearstation) -"vzE" = ( -/obj/structure/snow, -/turf/simulated/floor/plasteel, -/area/bridge) -"vAc" = ( -/obj/item/decorations/sticky_decorations/flammable/tinsel/green{ - pixel_y = 19 +"vBs" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 10; + level = 2 }, /turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "cafeteria"; - tag = "icon-cafeteria (NORTHEAST)" + icon_state = "dark" }, -/area/crew_quarters/kitchen) -"vDR" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/snow, -/turf/simulated/floor/plasteel, -/area/quartermaster/office) +/area/engine/engineering) +"vCL" = ( +/obj/effect/spawner/window/reinforced/plasma, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/turf/simulated/floor/plating, +/area/engine/engineering) "vFZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -100310,115 +90777,39 @@ /obj/machinery/light/small, /turf/simulated/floor/plasteel, /area/crew_quarters/dorms) -"vGW" = ( -/obj/item/radio/intercom{ - dir = 4; - name = "Station Intercom (General)"; - pixel_x = 29; - pixel_y = -30 - }, -/obj/structure/bed/roller, -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "cmo" - }, -/area/shuttle/escape) -"vIP" = ( -/obj/item/decorations/sticky_decorations/flammable/snowman, -/obj/structure/snow, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "browncorner" - }, -/area/hallway/primary/central/west) -"vJw" = ( -/obj/item/twohanded/required/kirbyplants, -/obj/structure/extinguisher_cabinet{ - pixel_x = 28 - }, -/turf/simulated/floor/plasteel{ - icon_state = "neutralcorner" - }, -/area/shuttle/escape) -"vKh" = ( -/obj/item/decorations/sticky_decorations/flammable/tinsel/purple{ - pixel_y = 19 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/toxins/lab) -"vMh" = ( -/obj/item/radio/intercom{ - dir = 4; - name = "Station Intercom (General)"; - pixel_x = 29; - pixel_y = -60 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/shuttle/escape) -"vRF" = ( -/obj/structure/snow{ - dir = 1; - icon_state = "snow_corner" - }, -/turf/simulated/floor/plasteel, -/area/hallway/primary/starboard/west) -"vSW" = ( -/obj/structure/table/reinforced, -/obj/item/folder{ - pixel_x = -4 - }, -/obj/item/folder/red{ - pixel_y = 3 - }, -/obj/item/folder/blue{ - pixel_x = 5 - }, -/obj/item/folder/yellow{ - pixel_x = 2; - pixel_y = 2 - }, -/obj/item/stamp/law, -/obj/item/pen/multi, -/obj/structure/snow, -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "cult"; - tag = "icon-cult" - }, -/area/lawoffice) +"vOB" = ( +/obj/machinery/atmospherics/pipe/simple/heat_exchanging, +/obj/structure/lattice, +/turf/space, +/area/space/nearstation) "vUG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /turf/simulated/wall, /area/maintenance/fsmaint) -"vVC" = ( -/obj/structure/closet/fireaxecabinet{ - pixel_x = 32; - pixel_y = 0 +"vWF" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/obj/machinery/light{ - dir = 1; - on = 1 +/obj/machinery/atmospherics/pipe/simple/visible/supply{ + dir = 9 }, -/obj/structure/chair/comfy/shuttle, +/turf/simulated/floor/engine, +/area/engine/supermatter) +"vXQ" = ( +/obj/structure/table, +/obj/item/stack/cable_coil{ + pixel_x = 3; + pixel_y = -7 + }, +/obj/item/stack/cable_coil, /turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "neutralcorner" + icon_state = "dark" }, -/area/shuttle/escape) -"vVP" = ( -/obj/structure/snow, -/turf/simulated/floor/plasteel, -/area/crew_quarters/locker) -"vYr" = ( -/obj/structure/snow, -/turf/simulated/floor/plasteel, -/area/engine/equipmentstorage) +/area/engine/engineering) "wbr" = ( /obj/structure/cable{ d1 = 2; @@ -100434,206 +90825,57 @@ }, /turf/simulated/floor/plasteel/dark, /area/tcommsat/chamber) -"wco" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) -"wep" = ( -/obj/structure/snow{ - dir = 6; - icon_state = "snow_corner" - }, -/turf/simulated/floor/plasteel, -/area/engine/break_room) "whv" = ( /obj/machinery/computer/HolodeckControl, -/obj/item/decorations/sticky_decorations/flammable/holly{ - pixel_x = -8; - pixel_y = 7 - }, /turf/simulated/floor/plasteel, /area/crew_quarters/dorms) -"wjY" = ( -/obj/structure/snow{ - dir = 10; - icon_state = "snow_corner" - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/research{ - name = "Research Division" - }) -"wkg" = ( -/obj/machinery/door/airlock/command/glass{ - name = "Escape Shuttle Cockpit"; - req_access_txt = "0"; - req_one_access_txt = "2;19" - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/shuttle/escape) -"wlq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +"wiS" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/red{ - pixel_y = 19 - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "neutral" - }, -/area/hallway/secondary/entry) -"wlw" = ( -/obj/structure/chair/sofa{ - dir = 1 - }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/green{ - pixel_y = 19 - }, -/obj/structure/snow, -/turf/simulated/floor/wood, -/area/hallway/secondary/exit) -"woy" = ( -/obj/structure/snow{ - dir = 6; - icon_state = "snow_corner" - }, -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "cult"; - tag = "icon-cult" - }, -/area/magistrateoffice) -"wsp" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/purple{ - pixel_y = 19 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/assembly/robotics) -"wwt" = ( -/obj/structure/table, -/obj/item/toy/xmas_cracker{ - pixel_x = -6; - pixel_y = 5 - }, -/obj/item/toy/xmas_cracker, -/obj/structure/snow{ - dir = 8; - icon_state = "snow_surround" - }, -/turf/simulated/floor/plasteel, -/area/crew_quarters/locker) -"wxQ" = ( -/obj/machinery/light, -/obj/structure/chair/comfy/shuttle{ - dir = 8 +/turf/simulated/floor/engine, +/area/engine/supermatter) +"wnU" = ( +/obj/machinery/alarm{ + dir = 4; + icon_state = "alarm0"; + pixel_x = -22 }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/shuttle/escape) -"wya" = ( -/obj/effect/landmark/start{ - name = "Station Engineer" - }, -/obj/structure/chair/comfy/green{ - dir = 4 - }, -/obj/structure/snow, -/turf/simulated/floor/plasteel, -/area/engine/break_room) -"wGT" = ( -/obj/machinery/meter, -/obj/machinery/atmospherics/pipe/simple/visible/purple{ - dir = 4 - }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/yellow{ - pixel_y = 19 - }, -/turf/simulated/floor/plasteel, -/area/atmos) -"wHx" = ( -/obj/machinery/door/airlock/shuttle/glass{ - name = "Shuttle Cargo Hatch" - }, -/turf/simulated/floor/plasteel, -/area/shuttle/escape) -"wIF" = ( -/obj/item/decorations/sticky_decorations/flammable/tinsel/purple{ - pixel_y = 19 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/assembly/robotics) -"wLB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/snow{ - dir = 8; - icon_state = "snow_corner" - }, -/turf/simulated/floor/carpet, -/area/bridge/meeting_room) -"wNF" = ( -/obj/structure/snow{ - icon_state = "snow_corner" - }, -/turf/simulated/floor/plasteel{ - dir = 0; - icon_state = "green" - }, -/area/hallway/secondary/exit) -"wOS" = ( -/obj/structure/table, -/obj/item/clothing/gloves/color/black, -/obj/item/clothing/gloves/color/black, -/obj/item/clothing/gloves/color/black, -/obj/item/pipe_painter, -/obj/item/pipe_painter, -/obj/item/clothing/glasses/welding, -/obj/item/clothing/glasses/welding, -/turf/simulated/floor/plasteel, -/area/atmos) -"wRQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/area/engine/engineering) +"wEY" = ( /obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + pixel_y = 0 + }, +/obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/structure/snow{ - dir = 1; - icon_state = "snow_corner" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" +/turf/simulated/floor/engine, +/area/engine/engineering) +"wFO" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 }, -/area/crew_quarters/courtroom) -"wTD" = ( -/obj/structure/snow{ - dir = 4; - icon_state = "snow_corner" - }, -/turf/simulated/floor/plasteel, -/area/crew_quarters/locker) +/turf/simulated/wall/r_wall, +/area/engine/engineering) +"wGJ" = ( +/obj/machinery/status_display, +/turf/simulated/wall/r_wall, +/area/engine/supermatter) +"wQr" = ( +/obj/machinery/light, +/turf/simulated/floor/plating, +/area/engine/engineering) "wVD" = ( /obj/effect/landmark/start{ name = "Shaft Miner" @@ -100643,31 +90885,6 @@ icon_state = "brown" }, /area/quartermaster/miningdock) -"xan" = ( -/obj/structure/snow{ - dir = 8; - icon_state = "snow_corner" - }, -/obj/structure/snow{ - dir = 1; - icon_state = "snow_corner" - }, -/obj/item/a_gift, -/obj/item/nanomob_card, -/turf/simulated/floor/plasteel{ - icon_state = "vault"; - tag = "icon-vault" - }, -/area/crew_quarters/dorms) -"xbw" = ( -/obj/structure/snow, -/obj/item/a_gift, -/obj/item/toy/figure/atmos, -/obj/item/toy/minimeteor, -/obj/item/toy/carpplushie/electric, -/obj/item/nanomob_card, -/turf/simulated/floor/plasteel, -/area/engine/equipmentstorage) "xcB" = ( /obj/structure/chair{ dir = 8 @@ -100686,100 +90903,41 @@ }, /turf/simulated/floor/plasteel, /area/crew_quarters/dorms) -"xgx" = ( -/obj/structure/chair/stool, -/obj/item/decorations/sticky_decorations/flammable/tinsel/red{ - pixel_y = 19 +"xjG" = ( +/obj/effect/decal/warning_stripes/south, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/turf/simulated/floor/plasteel{ - icon_state = "floorgrime" +/obj/machinery/atmospherics/pipe/simple/visible/universal{ + dir = 4 }, -/area/security/permabrig) -"xgN" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = 28 - }, -/obj/machinery/light/small{ - dir = 4; - pixel_y = 8 - }, -/turf/simulated/floor/plasteel{ - dir = 6; - icon_state = "whiteblue"; - tag = "icon-whiteblue (SOUTHEAST)" - }, -/area/shuttle/escape) +/turf/simulated/floor/engine, +/area/engine/engineering) "xlr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, /turf/simulated/floor/plasteel, /area/crew_quarters/dorms) -"xlz" = ( -/obj/machinery/light{ - dir = 8; - icon_state = "tube1" - }, -/obj/structure/chair/comfy/shuttle{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "bot" - }, -/area/shuttle/escape) -"xnj" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 8 - }, -/obj/machinery/light{ - dir = 4; - icon_state = "tube1" - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "bot" - }, -/area/shuttle/escape) -"xpD" = ( -/obj/item/decorations/sticky_decorations/flammable/tinsel/blue{ - pixel_y = 19 - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "white" - }, -/area/medical/reception) -"xpY" = ( -/obj/structure/chair/sofa/corner{ +"xuG" = ( +/obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/atmospherics/unary/portables_connector{ dir = 1 }, -/obj/structure/snow, -/turf/simulated/floor/wood, -/area/hallway/secondary/exit) -"xtk" = ( -/obj/structure/bed/roller, +/obj/machinery/portable_atmospherics/canister, /turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "cmo" + icon_state = "dark" }, -/area/shuttle/escape) -"xux" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/snow, -/turf/simulated/floor/plasteel, -/area/quartermaster/storage) -"xvD" = ( -/obj/structure/snow, -/turf/simulated/floor/plasteel, -/area/hallway/secondary/exit) -"xxP" = ( -/obj/structure/chair{ - dir = 1 +/area/engine/engineering) +"xwz" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4; + level = 1 }, -/obj/structure/snow, -/turf/simulated/floor/plasteel, -/area/bridge) +/turf/simulated/wall/r_wall, +/area/engine/engineering) "xyo" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -100790,13 +90948,6 @@ }, /turf/simulated/floor/plasteel, /area/crew_quarters/dorms) -"xzc" = ( -/obj/structure/chair/sofa/corner{ - dir = 8 - }, -/obj/structure/snow, -/turf/simulated/floor/wood, -/area/hallway/secondary/exit) "xAw" = ( /obj/machinery/atmospherics/pipe/manifold/visible{ dir = 8 @@ -100804,44 +90955,20 @@ /obj/structure/lattice, /turf/space, /area/space/nearstation) -"xBQ" = ( -/obj/item/radio/intercom{ - dir = 8; - name = "station intercom (General)"; - pixel_x = -28 +"xGn" = ( +/obj/effect/decal/warning_stripes/southeastcorner, +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" }, -/obj/machinery/recharge_station, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "bot" - }, -/area/shuttle/escape) -"xBR" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = -28 - }, -/obj/machinery/recharge_station, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "bot" - }, -/area/shuttle/escape) -"xHS" = ( -/obj/item/gift, -/obj/structure/snow, -/obj/item/toy/figure/chef, -/obj/item/toy/minigibber, -/obj/item/id_decal/emag, -/obj/item/nanomob_card, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) -"xTB" = ( -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "browncorner"; - tag = "icon-browncorner (EAST)" - }, -/area/shuttle/escape) +/turf/simulated/floor/engine, +/area/engine/engineering) +"xOn" = ( +/obj/effect/decal/warning_stripes/northeastcorner, +/obj/machinery/atmospherics/pipe/simple/visible/yellow, +/turf/simulated/floor/engine, +/area/engine/engineering) "xVt" = ( /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ @@ -100857,97 +90984,48 @@ }, /turf/space, /area/space/nearstation) -"xWp" = ( -/obj/item/decorations/sticky_decorations/flammable/tinsel/red{ - pixel_y = 19 - }, -/turf/simulated/floor/plasteel{ - icon_state = "floorgrime" - }, -/area/security/permabrig) -"xXs" = ( -/obj/effect/decal/warning_stripes/north, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4; - level = 1 - }, -/obj/item/decorations/sticky_decorations/flammable/tinsel/red{ - pixel_y = 19 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/ai_monitored/storage/eva) -"xXS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/snow{ - icon_state = "snow_corner" - }, -/turf/simulated/floor/plasteel, -/area/hallway/secondary/exit) -"ydk" = ( -/obj/structure/snow{ - dir = 5; - icon_state = "snow_corner" - }, -/turf/simulated/floor/plasteel, -/area/hallway/primary/starboard/west) -"yeP" = ( -/obj/machinery/door_control{ - id = "adminshuttleblast"; - name = "blast door control"; - pixel_x = -30; - req_access_txt = "101" - }, -/obj/machinery/light{ +"xWO" = ( +/obj/effect/decal/warning_stripes/east, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/camera{ + c_tag = "Engineering Supermatter Starboard"; dir = 8; - icon_state = "tube1" + network = list("SS13","engine"); + pixel_x = 0 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" +/turf/simulated/floor/engine, +/area/engine/engineering) +"ykt" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Atmospherics Maintenance"; + req_access_txt = "10"; + req_one_access_txt = null }, -/area/shuttle/administration) -"ylx" = ( -/obj/machinery/door/airlock/centcom{ - id_tag = "adminshuttle"; - name = "Workshop"; - opacity = 1; - req_access_txt = "101" +/obj/machinery/door/poddoor{ + density = 0; + icon_state = "open"; + id_tag = "Engineering"; + name = "Engineering Security Doors"; + opacity = 0 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) -"ylU" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 4; + level = 2 }, +/turf/simulated/floor/plating, +/area/maintenance/storage) +"ylS" = ( /obj/structure/cable{ d1 = 2; d2 = 8; icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 4; + level = 2 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/snow{ - icon_state = "snow_corner" - }, -/turf/simulated/floor/plasteel, -/area/hallway/primary/port) +/turf/simulated/floor/engine, +/area/engine/engineering) (1,1,1) = {" aaa @@ -106702,15 +96780,15 @@ aaa aaa aaa aaa -aps -aqf -ard -aqf -ard -arV -ard -arV -asJ +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -106959,15 +97037,15 @@ aaa aaa aaa aaa -apt -apx -apx -apx -apx -apx -apx -apx -dhn +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -107216,15 +97294,15 @@ aaa aaa aaa aaa -apr -apw -arh -arf -arh -dgK -arh -dhi -apr +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -107473,15 +97551,15 @@ aaa aaa aaa aaa -apu -aqh -arh -arg -arh -dgL -arh -dhm -apu +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -107730,15 +97808,15 @@ aaa aaa aaa aaa -apr -aqg -arh -arh -arh -arh -arh -dhl -apr +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -107987,15 +98065,15 @@ aaa aaa aaa aaa -apr -arh -arh -arh -arh -arh -arW -arh -apr +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -108244,15 +98322,15 @@ aaa aaa aaa aaa -apr -arh -aqk -arW -arW -arW -dhe -arh -apr +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -108501,15 +98579,15 @@ aaa aaa aaa aaa -apr -aqi -aqm -asa -asa -asa -dhg -aqi -apr +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -108758,15 +98836,15 @@ aaa aaa aaa aaa -apr -arh -aql -arZ -aPV -dhb -aql -arh -apr +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -109015,15 +99093,15 @@ aaa aaa aaa aaa -apu -aqj -are -arh -arh -arh -dhh -arY -apu +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -109272,21 +99350,21 @@ aaa aaa aaa aaa -apv -apx -apx -aqo +aaa +aaa +aaa +aaa aQX -aqo -apx -apx -asK +aaa +aaa +aaa +aaa aaa aVV -aXp -baZ -aXp -beh +aVV +aVY +aVV +aVV aaa aaa aab @@ -109312,15 +99390,15 @@ aaa aaa aaa aaa -bPL -rSv -uBM -cae aaa -bPL -rSv -uBM -cae +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -109539,11 +99617,11 @@ aab aab aaa aaa -aWa +aVV aYM -aXs +jyO bcr -bej +aVV aaa aaa aab @@ -109552,9 +99630,6 @@ aaa aaa aaa aaa -bPv -bvi -bPU aaa aaa aaa @@ -109568,17 +99643,20 @@ aaa aaa aaa aaa -bPL -bPI -bWG -bWG -bPI -bPI -bPI -bWG -bWG -bPI -cae +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -109796,11 +99874,11 @@ aab aLd aaa aaa -aVS +aVV aYL -aXs +jyO bcN -aVS +aVV aaa aaa bjQ @@ -109808,35 +99886,35 @@ aab aaa aaa aaa -bPv -btv -bvj -bwE -bPU -aaa -bAQ -bCa -bCa -bCa -bGP aaa aaa aaa aaa aaa -bPL -bPI -bVe -bRA -bRA -caf -bPI -cdl -ceR -ceR -cig -bPI -cae +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -110053,48 +100131,48 @@ aMs aLd aaa aVV -aXm -aYN -aVX -aYN -aXm -beh +aVV +aVV +jMw +aVV +aVV +aVV aaa aLd aMs aSd aSd aLd -brO -bty -bvj -bwG -brO aaa -bAR -bCd -bCd -bCd -bAR +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa bjQ aaa aaa aaa -bPL -bRu -bRA -bVf -bRA -bRA -cag -bPI -cdm -ceR -ceR -ceR -ckd -bPI -cae +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -110299,8 +100377,8 @@ aaa aaa aaa aJP -aLa -aLa +aJP +aJP aRm aOP aMs @@ -110309,49 +100387,49 @@ aMB aSd aSd aSd -aVS +aVV aXr +fvP +fvP +fvP aXz -aXz -aXz -aXz -aVS +aVV aSd aSd aSd blB boL aLd -brO -btC -bvj -bwH -brO aaa -bAR -bCc -bDG -bEK -bAR +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aLd aaa aaa aaa -bPI -bRv -bRA -bVg -cuH -bRA -cah -bPI -cdp -ceR -ceR -ceR -ceR -clC -bPI +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -110579,36 +100657,36 @@ bgy aSf boP aSd -brQ -btD -bvj -bwI -brQ +aaa +aaa +aaa +aaa +aaa bjQ -bAR -aAi -bCb -bCl -bAR +aaa +aaa +aaa +aaa +aaa aSd aaa aaa aaa -bPI -bRw -bRA -bVh -cuH -bRA -cai -bPI -cdl -ceR -cgw -cih -ceR -clD -bPI +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -110812,10 +100890,10 @@ aaa aaa aaa aaa -aJQ -aLa -aLa -aRz +aJP +aJP +aJP +aRm aOR aQa aMd @@ -110823,49 +100901,49 @@ aMD aSd aSd aSd -aVS +aVV aXt aXs aXs aXs beG -aVS +aVV aSd aSd aSd blE boL aSd -brO -btD -bvj -bwI -brO +aaa +aaa +aaa +aaa +aaa aLd -bAR -bCe -bCb -bEL -bAR +aaa +aaa +aaa +aaa +aaa aSd aaa aaa aaa -bPI -bRx -bTl -bVi -cuH -bRA -bRA -bPI -cdo -ceR -ceR -cii -ckf -clE -bPI +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -111024,15 +101102,15 @@ aaa aaa aaa aaa -acT -abQ -abQ -abQ -abQ -abQ -abQ -abQ -acq +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -111080,49 +101158,49 @@ aME aTo aUl aSd -aVS +aVV aXu aYZ aYZ aYZ bes -aVS +aVV aSd bid aTo bmS boL aSd -brO -btz -bvj -bwJ -brO +aaa +aaa +aaa +aaa +aaa aSd -ahb -bCb -bCb -bEL -bAR +aaa +aaa +aaa +aaa +aaa aSd aSd aSd aSd -bPI -bRG -bRG -bRG -bRG -bYt -bRG -bRG -bRG -oZV -bRG -bRG -bRG -bRG -bPI +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -111275,21 +101353,21 @@ aaa aaa aaa aaa -acT -abQ -abQ -abQ -abQ -abQ -abI -afz -abV -agf -agE -abV -ahw -ahy -ahN +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -111327,8 +101405,8 @@ aaa aaa aaa aJR -aLe -aLe +aJR +aJR aRV aOP aMs @@ -111350,36 +101428,36 @@ aSf aSf bsd aSd -brO -btD -bvj -bwI -brO +aaa +aaa +aaa +aaa +aaa aSd -ahb -bCb -bCb -bEL -bAR +aaa +aaa +aaa +aaa +aaa aSd bGm bLY bKp -qgG -yeP -bTn -pwN -bRA -bRA -bRA -bTo -bRA -bRA -bRA -bRA -bRA -bRA -bPI +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -111532,21 +101610,21 @@ aaa aaa aaa aaa -abI -ade -ade -adS -ade -ade -abI -afz -abV -abV -abV -abV -dcZ -ahy -ahO +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -111594,49 +101672,49 @@ aSf aSf aUn aSd -aVZ +aVY aXw aYZ aYZ aYZ aXs -aVZ +aVY aSd bjT aSf aSf bsh aSd -brR -btD -bvj -bwI -brR +aaa +aaa +aaa +aaa +aaa aSd -bAR -bBZ -bCb -bEL -bAR +aaa +aaa +aaa +aaa +aaa aSd bGl bLX bKp bPN -bRA -bTn -bRA -bRA -bRA -bRA -bRA -bRA -bRA -bRA -bRA -bRA -clF -bPI +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -111789,21 +101867,6 @@ aaa aaa aaa aaa -abI -abV -abV -abV -abV -abV -abI -afA -abV -abV -agF -ahg -abV -ahy -ahP aaa aaa aaa @@ -111826,24 +101889,39 @@ aaa aaa aaa aaa -awo -axi -axi -axi -axi -axi -axi +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aCB -axi -aFe aaa aaa aaa aaa -aJT -aLe -aLe -aRY +aaa +aaa +aJR +aJR +aJR +aRV aOR aQa aPQ @@ -111851,49 +101929,49 @@ aRd aTp aUm aSd -aVS +aVV aXx aXs aXs aXs bex -aVS +aVV aSd bjS aTp brc bsh aSd -brO -btD -bvj -bwI -brO +aaa +aaa +aaa +aaa +aaa aMs -bAR -bAS -bCb -bEL -bAR +aaa +aaa +aaa +aaa +aaa aSd bKp bKp bOb -bPI -bRG -bRG -ylx -bRG -bRG -bRG -rYq -bRG -bRG -bRG -cik -bRG -bRG -bPI +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -112039,28 +102117,6 @@ aaa aaa aaa aaa -abG -abQ -abQ -abQ -acq -aaa -aaa -abI -abV -ady -abV -abV -abV -abI -afB -ady -abV -ahv -abQ -abQ -abQ -acs aaa aaa aaa @@ -112083,17 +102139,39 @@ aaa aaa aaa aaa -awq -axj -awM -aze -aAh -aAh -aCT -aCX -afy -aFf -aFe +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aab aab aab @@ -112108,49 +102186,49 @@ aMD aSd aSd aSd -aVS +aVV aXy aYZ aYZ aYZ beG -aVS +aVV aSd aSd aSd blE bsh aSd -brO -btz -bvj -bwJ -brO +aaa +aaa +aaa +aaa +aaa aMs -bAT -bAR -bCb -bAR -bER +aaa +aaa +aaa +aaa +aaa aSd aMd bLZ aSd -bPI -bRB -bTo -bRA -bWI -bPI -gQL -bRA -bRA -bPI -bRA -bRA -ckg -clG -bPI +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -112296,25 +102374,6 @@ aaa aaa aaa aaa -abI -abU -acd -ack -abI -aaa -aaa -abI -adf -adz -adT -abV -abV -abI -afC -abV -abV -agG -abI aaa aaa aaa @@ -112340,17 +102399,36 @@ aaa aaa aaa aaa -awp -axj -azg -azg -azg -azg -azg -azg -azg -aEB -aGf +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -112367,9 +102445,9 @@ aOQ aRU aVX aXz -aXz -aXz -aXz +fvP +fvP +fvP aXz aVX bgy @@ -112378,36 +102456,36 @@ bgy aSf bsj aSd -brP -brQ +aaa +aaa bvf -brQ -byd +aaa +aaa aMs aaa -bAT +aaa bCi -bER +aaa aaa aSd aMd bLZ aSd -bPI -bRC -bRA -bRA -bWJ -bPI -jnJ -cbx -cbx -bPI -bRA -bRA -bRA -clI -bPI +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -112553,27 +102631,6 @@ aaa aaa aaa aaa -abJ -abV -abV -acl -abI -abQ -abQ -abQ -abQ -abQ -abQ -aes -aeP -abI -abQ -afP -agg -abQ -abQ -abQ -acq aaa aaa aaa @@ -112597,17 +102654,38 @@ aaa aaa aaa aaa -aws -axj -awN -azh -azh -azh -aBD -aCX -aEe -aFf -aFg +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa doE aII @@ -112622,13 +102700,13 @@ aRe aSd aSd aSd -aWa -aXp +aVV +aVV aYV aYV aYV -aXp -bej +aVV +aVV aSd aSd aSd @@ -112650,21 +102728,21 @@ aSd aMd bLZ aSd -bPI -bRD -bRA -bRA -bWK -bPI -cak -rEw -cdr -bPI -bRA -bRA -bRA -bRA -bPI +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -112810,27 +102888,6 @@ aaa aaa aaa aaa -abH -aaw -abV -abV -abI -acz -acI -acI -acI -acI -adU -abV -abV -afg -afD -abV -abV -agH -abV -ahy -ahN aaa aaa aaa @@ -112854,16 +102911,37 @@ aaa aaa aaa aaa -awr -axi -axi -axi -axi -axi -axi -axi -axi -aFg +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aEM @@ -112879,13 +102957,13 @@ aME aRO aSd aUZ -aVW +aVV aXn aYT aYT aYT bey -bge +aVV aUZ aSd bpX @@ -112907,21 +102985,21 @@ aSd aMd bMa bjQ -bPR -bPI -bTp -bRA -bRA -bPI -car -cbA -cds -bPI -cgz -cio -ckj -bPI -bYv +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -113067,27 +103145,27 @@ aaa aaa aaa aaa -abH -abX -ace -abV -acr -abV -abV -abV -abV -abV -abV -abV -abV -abV -abV -abV -abV -agI -ahh -ahy -ahO +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -113165,19 +103243,19 @@ bmS bMb aLd aaa -bPI -bWL -bRA -bWM -bPI aaa aaa aaa -bPI -bRA -bRA -ckh -bPI +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -113324,27 +103402,27 @@ aaa aaa aaa aaa -abH -abW -abV -acm -abI -acA -acJ -acJ -acJ -acJ -acf -aet -abV -abV -abV -abV -abV -agH -abV -ahy -ahP +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -113422,19 +103500,19 @@ aSf bLZ aSd aaa -bPR -bPI -bTl -bWN -bPI aaa aaa aaa -bPI -cgA -cil -bPI -bYv +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -113581,27 +103659,27 @@ aaa aaa aaa aaa -abK -abZ -abV -abV -abI -abQ -abQ -acU -abQ -abQ -adW -adc -aeQ -abI -abQ -afQ -agh -abQ -abQ -abQ -acs +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -113680,17 +103758,17 @@ bMc aSd aaa aaa -bPR -bRG -bRG -bYv aaa aaa aaa -bPR -bRG -bRG -bYv +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -113838,25 +103916,25 @@ aaa aaa aaa aaa -abI -abZ -acf -acn -abI aaa aaa aaa aaa -abI -acN -acQ -dox -abI -afE -abV -abV -agJ -abI +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -114095,28 +104173,28 @@ aaa aaa aaa aaa -abL -abQ -abQ -abQ -acs +aaa +aaa +aaa +aaa +aaa aaa aaa aaa aaa adB -acN -acQ -dox -abI -afF -ady -abV -agK -abQ -abQ -abQ -acq +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -114361,19 +104439,19 @@ aaa aaa aaa aaa -adA -acN -dov -doA -abI -afG -abV -abV -abV -abV -ahz -ahy -ahN +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -114427,16 +104505,16 @@ aZW bcX bgu bhL -tcd +aSW bgj bjO -pKw +bmo brk aSf bqr buX btF -gAT +brU bBt btF bqr @@ -114618,19 +104696,19 @@ aaa aaa aaa aaa -adC -abQ -abQ -abQ -abI -afH -ady -abV -abV -abV -ahA -ahy -ahO +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -114693,7 +104771,7 @@ bpF bqr btF btG -tob +bvn bBH btF bqr @@ -114879,15 +104957,15 @@ aaa aaa aaa aaa -abI -afI -afR -agi -abV -abV -ahB -ahy -ahP +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -114944,7 +105022,7 @@ bhN aSW bhm bhm -dpi +bmo brl bss bqr @@ -115136,15 +105214,15 @@ aaa aaa aaa aaa -adC -abQ -abQ -abQ -abQ -abQ -abQ -abQ -acs +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -115200,9 +105278,9 @@ bgB bhO aSY bhv -iwP +bhv aSY -wlq +brk boT bqr btF @@ -116760,17 +106838,17 @@ bET bGV bMf bKw -bMp -bOe -bOe -bOe -bOe -bOe -bOe -bOe -bOe -cbD -cdv +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -117017,18 +107095,18 @@ bKh bKW bMd bKF -bMo -bOc -bOc -bOc -bOc -bVm -bOc -bOc -bOc -cbB -cdt -ceV +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -117274,18 +107352,18 @@ bvs bGW bDQ bKw -bMo -bOc -bOc -bOc -bOc -bOc -bOc -bOc -bOc -bOc -cdu -ceU +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -117302,7 +107380,7 @@ czF cBi cBi cBi -cEU +cwx aaa aaa aaa @@ -117476,17 +107554,17 @@ aaa aaa aaa aaa -awt -axk -axk -axk -axk -axk -axk -axk -axk -aFi -aGg +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aII aDB aEJ @@ -117531,18 +107609,18 @@ bwP bGW bDQ bKw -bMo -bOf -bOc -bOc -bOc -bOc -bOc -bOc -bOc -cbC -cdu -ceU +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -117559,7 +107637,7 @@ czF cBg cCw cDP -cEU +cwx aaa aaa aaa @@ -117733,17 +107811,17 @@ aaa aaa aaa aaa -awv -axl -ayk -azf -aEf -aBk -aBk -aCY -diy -aFk -aFi +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aGn aGn aGn @@ -117788,18 +107866,18 @@ bEW bGW bDQ bKw -bMo -bOc -bOc -bOc -bOc -bOc -bOc -bOc -bOc -bOc -cdu -ceU +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -117816,7 +107894,7 @@ czF cAX cCx cAX -cEU +cwx aaa aaa aaa @@ -117990,17 +108068,17 @@ aaa aaa aaa aaa -awu -axl -ayl -azj -ayk -ayk -ayk -ayk -ayk -ayk -aBG +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aGn aOT aHS @@ -118030,7 +108108,7 @@ biJ bkg blM bnr -wTD +bnD bnD bvk bnD @@ -118045,18 +108123,18 @@ byn bGW bDQ bKF -bMo -bOc -bOc -bOc -bOc -bVn -bOc -bOc -bOc -cbE -cdt -ceW +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -118073,7 +108151,7 @@ czF cBj cCq cDU -cEU +cwx aaa aaa aaa @@ -118247,17 +108325,17 @@ aaa aaa aaa aaa -awx -axl -ayk -azi -sUK -sUK -sUK -ayk -diy -aex -aFi +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aGn aDD aEL @@ -118302,17 +108380,17 @@ bKq bGW bDQ bKw -bMr -bOe -bOe -bRJ -bTt -bOe +aaa +aaa +aaa +aaa +aaa +aaa bWP -bWQ -bOe -cbF -cdw +aaa +aaa +aaa +aaa aaa aaa aaa @@ -118330,7 +108408,7 @@ czP cAX cCy cAX -cEU +cwx aaa aaa aaa @@ -118504,17 +108582,17 @@ aaa aaa aaa aaa -aww -axk -axk -axk -axk -axk -axk +aaa +aaa +aaa +aaa +aaa +aaa +aaa ays -axk -aFi -aGh +aaa +aaa +aaa aGn aGn aGn @@ -118544,9 +108622,9 @@ biJ bki blM bnB -vVP -gyU -tHd +bnD +bqv +bqv bvS bvs bvs @@ -118791,7 +108869,7 @@ aGn aUy aVi aWn -trn +aXM aXQ aXQ bde @@ -118801,9 +108879,9 @@ biJ bkb blM bnC -vVP -bqw +bnD bqw +bqx bvZ bzU bBQ @@ -119055,15 +109133,15 @@ bcT aVi bgz biJ -oNH +bkg bkx -sOc -vVP -vVP +bnD +bnD +bqx bsg bvW -vVP -set +bnD +bwT byp bzy blM @@ -119305,21 +109383,21 @@ aGn aUy aVi aWo -trn +aXM aXQ bbm bdg aVi bgz -ylU +blO bpg bqh brv brv bug -bug +bvt bwb -ejx +bnD bBU bwT bzA @@ -119569,12 +109647,12 @@ bdh aVi bgz biJ -fnB +bkg blM bnF bpd -vVP -sOc +bqv +bqv bwa bng blM @@ -119829,10 +109907,10 @@ biJ bkf blM bnG -vVP -gyU -gyU -pmA +bnD +bnD +bnD +bwa bAb brN brN @@ -119846,7 +109924,7 @@ bMh bNH bQc bSg -haF +bKz bRR bKz bXd @@ -120049,7 +110127,7 @@ aab abN abN aqs -lKx +anf atz avf awO @@ -120086,9 +110164,9 @@ blH bkg blM bnH -pXx -hFn -wwt +bnD +bnD +bnD bwd bzV bst @@ -120102,8 +110180,8 @@ bxb bxb bxb bMq -npO -iDx +bOh +bHh bRR bHh bXd @@ -120112,13 +110190,13 @@ dcY bKB aaa aaa -ceX -cgF -ceY -cgF -ceY -cgF -coO +aaa +aaa +aaa +aaa +aaa +aaa +aaa aab cng coL @@ -120305,8 +110383,8 @@ aab aab abN anc -lKx -lKx +anf +anf atH avi ado @@ -120357,10 +110435,10 @@ bCk bKy bxb bIV -oRw -tKz -npO -iDx +bKz +bKz +bOh +bHh bRR bHh bXd @@ -120369,13 +110447,13 @@ dcY bKB aaa aaa -ceZ -cgB -cim -cki -cin -cnh -ceZ +aaa +aaa +aaa +aaa +aaa +aaa +aaa aab cng coS @@ -120562,11 +110640,11 @@ abN abN abN amX -lKx +anf asj atD avh -lKx +anf ado azp aAn @@ -120614,10 +110692,10 @@ bJy bKG bxb bIU -qZX -oWs +bKz +bKz bSj -iDx +bHh bRR bHh bXe @@ -120626,13 +110704,13 @@ dcY bKB aaa aaa -ceY -cgC -cin -cim -cin -cni -coN +aaa +aaa +aaa +aaa +aaa +aaa +aaa aab cng ctU @@ -120819,8 +110897,8 @@ abN ajc adN ado -lKx -ado +anf +asl atQ avk awU @@ -120871,9 +110949,9 @@ bCk bFd bxb bIY -fjG -tKB -hDe +bKz +bKz +bOh bPO bRR bKz @@ -120883,13 +110961,13 @@ dcY bKB aaa aaa -ceZ -cgD -cim -cim -cin -cnj -ceZ +aaa +aaa +aaa +aaa +aaa +aaa +aaa aab cgQ ctU @@ -121128,10 +111206,10 @@ bJB bKH bxb bIX -pjK -oqm -npO -haF +bKz +bKz +bOh +bKz bPQ bKz bXd @@ -121140,13 +111218,13 @@ bUC bxb cbG aaa -cfa -cgF -ceY +aaa +aaa +aaa ckk -ceY -cgF -coQ +aaa +aaa +aaa aab cgQ ctV @@ -121331,17 +111409,17 @@ aaa aab abN ajg -gAw +adN ado -lKx +anf asr atS avm -lKx -lKx -lKx -urE -urE +anf +anf +anf +aAr +aAr aCE aPi aPi @@ -121385,14 +111463,14 @@ bCk bnK bxb bIS -pjK -pjK +bKz +bKz bOk ceE -uYV -uYV +bJf +bJf bXg -uYV +bJf bYE bxb aab @@ -121588,16 +111666,16 @@ aaa aab abN ajf -xgx -lKx +akL +anf aqM abN asg avl abN ayx -xWp -lKx +anf +anf aBJ abN aDG @@ -121645,9 +111723,9 @@ bIZ bNI bKA bSm -xux -iRU -tYi +bPP +bPP +bPP bXf bYr bKz @@ -121845,7 +111923,7 @@ aaa aaa abN aji -xgx +akL ado abN abN @@ -121853,7 +111931,7 @@ atZ avo abN abN -lKx +anf akL aBL abN @@ -121901,8 +111979,8 @@ bIw bJf bJf bMw -udn -kBs +bOh +bKz bRL bQf bQf @@ -122156,9 +112234,9 @@ byw bFp bFm bMi -oQO +bKz bQg -eiU +bOh bKz bxb bRo @@ -122189,7 +112267,7 @@ cEW cEJ cFM cGD -fWZ +cJV bTm cEY cLm @@ -122346,15 +112424,15 @@ aaa aaa aaa aaa -asS -atI -auv -atI -atI -auv -atI -atI -aAe +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aab abN @@ -122446,7 +112524,7 @@ cEW cEL cFP cGF -fuP +cJV cLr cEY cLm @@ -122603,15 +112681,15 @@ aaa aaa aaa aaa -asU -atK -auw -avv -awz -axo -aym -azk -aAk +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa abN @@ -122703,7 +112781,7 @@ cEW cEK cFO cGE -uGR +cJV cGh cEY cLm @@ -122860,15 +112938,15 @@ aaa aaa aaa aaa -asT -atL -aux -avy -awz -awz -awz -azk -aAk +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aab @@ -122941,7 +113019,7 @@ cbI cdy cff cir -ihP +cfb cfb cnS cno @@ -123117,15 +113195,15 @@ aaa aaa aaa aaa -asW -atJ -auu -avx -awy -axm -awz -azk -aAk +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aab @@ -123197,8 +113275,8 @@ cam cbH cdx chX -gOo -gvu +cfb +cfb cfb cnS cno @@ -123374,15 +113452,15 @@ aaa aaa aaa aaa -asV -atI -auz -atI -atI -atI +aaa +aaa +aaa +aaa +aaa +aaa ayh -atI -aAj +aaa +aaa aaa aab aab @@ -123456,7 +113534,7 @@ cdA cis ckq cls -qqe +cls cnU cno cam @@ -123987,7 +114065,7 @@ cwF cvo cER cGc -jMO +cnA cJZ cLy cLi @@ -124206,11 +114284,11 @@ bvJ bxd byl bzF -mzT -vDR -vDR +bzF +bzF +bzF bFt -tPa +bBn bMk bNV bzJ @@ -124281,8 +114359,8 @@ aaa aaa aaa aaa -aaa -aaa +amW +amW aaa aaa aaa @@ -124463,11 +114541,11 @@ bvJ bxf byB bzI -sVX +bBn bIK -lJY -kJO -kJO +bzE +bzE +bzE bzE bNX bVH @@ -124515,32 +114593,32 @@ cUc cRG cNB cLi -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +aab +aab +aab +aab +aab +aab +aab +aab +aab +aab +aab +aab +aab +aab +amW +amW +amW +amW +amW +amW +amW aaa aab -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +dmD +amW +amW aaa aaa aaa @@ -124722,9 +114800,9 @@ byB bzH bBo bIJ -rss +bBn box -rss +bBn bKC bFx bMA @@ -124780,24 +114858,24 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -afO aab aaa aaa aaa aaa aaa +amW +dmD +dmD +dmD +dmD +dmD +amW aaa -aaa +aab +dmD +dmD +amW aaa aaa aaa @@ -125037,23 +115115,23 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa aab -aaa -aaa -aaa -aaa -aaa -aaa -aaa +aab +aab +aab +aab +aab +amW +amW +amW +amW +amW +amW +amW +aab +aab +aab +aab aaa aaa aaa @@ -125294,22 +115372,22 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -afO -afO aab aaa aaa aaa +aab aaa aaa +aab +aaa +aaa +aab +aaa +aaa +aaa +aab +aaa aaa aaa aaa @@ -125493,9 +115571,9 @@ bEj bzM bBq bCF -qQU -qQU -vIP +bEj +bEj +bEj bMn bKS bMJ @@ -125552,22 +115630,22 @@ dar dar dar dar -dar -dar -dar -dar -dar -dar -dar -dar -afO +aaa +aaa +aaa +aab +aaa +aaa +aab +aaa +aaa aab aaa abp aaa -aaa -aaa -aaa +amW +amW +amW aaa aaa aaa @@ -125720,7 +115798,7 @@ aIW aKj aLN aNa -osF +aOu aEl aEl aEl @@ -125750,9 +115828,9 @@ bDO bDO bGZ bDO -tuN -tuN -tuN +bDO +bDO +bDO bMm bNY bQn @@ -125804,27 +115882,27 @@ cUX cZw dar dbt -dbl -dcN ddG -des -dfe -dfV -dgz -dhf -rlX -diK +dcN djs -dkc +diK dar aab +aab +dhf +rlX +dhf +vOB +vOB +vOB +vOB +vOB +rlX aaa aaa -aaa -aaa -aaa -aaa -aaa +amW +dmD +amW aaa aaa aaa @@ -125973,11 +116051,11 @@ aDL aBn aGs aHy -tmg +aAp aKl aLQ aKl -nLS +aOu aPx aRP aEl @@ -126060,28 +116138,28 @@ cNB pzr cZw dar -dbl +ddG cPk cQj cQJ cQJ -cVz -cQj -cVW -cVY -cQj -cWb -cWb -cQj dar +aaa +aaa +djb +djb +djb +dhf +vOB +vOB +vOB +vOB +djc aab -aaa -aaa -aaa -aaa -aaa -aaa -aaa +aab +amW +dmD +amW aaa aaa aaa @@ -126220,7 +116298,7 @@ aqY asN asN asN -jGi +asN asN azA aAD @@ -126228,14 +116306,14 @@ aCb aDa aDL aFh -rat -oOM -viw +aAp +aAp +aAp aKk aLO aNb -bto -qkV +aOu +aAp aRM aEl aVD @@ -126319,26 +116397,26 @@ cSU dar dts cYq -dcP -dcP -dcP -dcP -dcP -cMM -dcP -dcP -dcP +pUZ dcP dcP dar -aab -aab -aaa -aaa aaa aaa +djb +djb +djb +dib +vOB +vOB +vOB +vOB +rlX aaa aaa +amW +dmD +amW aaa aaa aaa @@ -126473,7 +116551,7 @@ aig ajO ald aKs -pgr +aKs asN atf avS @@ -126485,8 +116563,8 @@ aCc aDd aDM aFl -gLx -luD +aGt +aGt aIZ aIZ aIZ @@ -126542,7 +116620,7 @@ cgS ciA clR col -iRt +clR coY cqR csy @@ -126577,25 +116655,25 @@ dar dtt cYs cZG -cZG -cZG -cZG dcr dcP -dcP -dcP -dcP -dcP -dcP dar -alw aab aab -aaa -aaa -aaa -aaa -aaa +djb +djb +djb +dhf +vOB +vOB +vOB +vOB +djc +aab +aab +amW +dmD +amW aaa aaa aaa @@ -126730,13 +116808,13 @@ aie ajM alc aob -lvS +ara asP aut avR axr ayI -vSW +ara aAG aCb aDc @@ -126777,7 +116855,7 @@ bxl byH bEN bHg -uOv +bHg bJG bxl bxl @@ -126799,7 +116877,7 @@ cgU ciB ckt cok -evY +ckt coX cqI csx @@ -126836,24 +116914,24 @@ cYr dcP daK dtw -cVA -cVC -cVX -cVZ -cWa -dtw -cWd -kCz dar -alw -alw -aab -aab -aab aaa aaa +djb +djb +djb +dib +vOB +vOB +vOB +vOB +rlX aaa aaa +amW +dmD +amW +aaa aaa aaa aaa @@ -127033,8 +117111,8 @@ bwg bxl byI bEZ -rbV -heR +bDs +bDs bJH bJa bxl @@ -127082,8 +117160,8 @@ cKb cOX cSU dsI -cVj -cVj +pxP +gCE cVj cVx dtq @@ -127094,23 +117172,23 @@ cZL dar dar dar -dar -dar -dar -dar -dar -dar -dar -dar cSU cSU -cSU -cSU -cSU -cSU -dns +djb +djb +djb +dhf +vOB +vOB +vOB +vOB +djc aab aab +amW +dmD +amW +aaa aaa aaa aaa @@ -127292,7 +117370,7 @@ byJ bEV bBu bCG -tSs +bJH bFF bxl bMB @@ -127311,12 +117389,12 @@ cft ciC cgV ciD -rXk -rXk +ckt +ckt coH -eSM -eSM -iRt +ckt +cqK +clR ctR aaa cwQ @@ -127340,37 +117418,37 @@ cOX cSU dsH dsP -dsX -dsX +dsP +dsP cVs cJC -cKH +cXD cXS cYv -cVj +cXD cRg aLz dcl -daG -cSU -cSC -cTt -cTy -cTt -cUn -cSU -cSU -cSU -cSC -cTt -cUD -cUF -cSU -cSU +tPd +kbU +djb +djb +djb +dib +vOB +vOB +vOB +vOB +rlX aaa aaa +amW +dmD +amW aaa aaa +aab +aaa aaa aaa aaa @@ -127511,7 +117589,7 @@ azE aIl aCe aDi -woy +aDi aFo aIl aHC @@ -127546,10 +117624,10 @@ bwV bmc bxm byL -qSE +bEV bBv bCC -qnb +bJH bFI bxl bxl @@ -127596,38 +117674,38 @@ cKb cPh cSU dsK -cOg +cVj cSl dbr cVF -cOg -cWP cVj -cYE -cHh +cVj +cVj +cXx +cVj cRw -cQY +cSU cRo -cSi -cSz -cSD -dib -cTz -dib -cTm -cTt -cUp -cTt -cUo -dib -dbu -cUI +daj cSU -cYX -cSU -aaa -aaa -aaa +djb +dib +djc +dhf +vOB +vOB +vOB +vOB +djc +aab +aab +amW +amW +amW +aab +aab +aab +aab aaa aaa aaa @@ -127803,10 +117881,10 @@ bwU bwc bxm byK -tsU -bDs -kTw -wLB +bEZ +bBw +bBw +bJH bKJ bxm bMD @@ -127818,7 +117896,7 @@ bVb bVM bXp bXa -eHF +bVv bMG cdX cfx @@ -127853,40 +117931,40 @@ cKb cOX cSU dsK -cOg +cVj cVj cVj cVD -cWs -cWN cWH +cWN +dQp cYD -cZN +cYQ cRr cSU -dfz +cSU cSU cSU dho -dib -diP +pOj +cMZ djv -dib -dib -dib -dib -dib -dmj -diP -cUH -cUL -cUR -cSU -cSU +cMZ +cMZ +mtr aaa aaa aaa aaa +aab +aaa +aaa +aaa +aaa +aab +aaa +aaa +aaa aaa aaa aaa @@ -128024,7 +118102,7 @@ ayM aIl aIl aCg -lTc +aDi aDU aFq azF @@ -128061,7 +118139,7 @@ bAC bCw bDS bFa -sCf +bHj bHj bJI bKK @@ -128110,38 +118188,38 @@ cKb cOX cSU dsL -cOg +cVj cSp cTH cTH -cWt -cXi +cTH +cXJ cHh cMZ -cNk +cMZ cSv deF -dfk -cSU +deF +deF dgJ -afO -aaa -aab -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aab -aaa -aaa -cUH -cUR +ema +kNq +rWS +fPU +dQa +nSi +qvX +mtr +cSU +cSU +cSU +cSU +cSU cSU aaa -aaa +amW +amW +amW aaa aaa aaa @@ -128340,11 +118418,11 @@ ciS cgY ciG ckw -qsu +ckw coU -jlo -gqt -nua +ckw +cqO +ckv cgW cvy cwW @@ -128367,38 +118445,38 @@ cKb cOX cSU dsK -cOg +cVj dsY dta dtk -slj +cVj cWS dbr -dbr +ivi cZO cVq cRb -cRp -dfo -afO +cRb +cRb +cRb cSE -cTx -cTx +cRb +cRb cTD +cRb cTx -cTx -cTD -cTx -cTx -cTD -cTx -cTx +paA +mvx +vXQ +ePY +wnU +ePY cUM -aab -cVa cSU aaa -aaa +amW +dmD +amW aaa aaa aaa @@ -128558,7 +118636,7 @@ bbS aEN aRw biM -xXs +bat beg dbO aRw @@ -128569,7 +118647,7 @@ blU bnU bpr bqR -bMz +bqS bxu bvV bvX @@ -128624,38 +118702,38 @@ cKb cPj cSU dsK -cOg +cVj dsY dtb dtl -slj +cVj cXy cVj -cVj +kLx cNj cSN -cRb +mYL +cRq cRq -dfo dgE cSF -afO -afO +iXI +nSm cTE -afO -afO -cTE -afO -afO -cTE -afO -afO -cSF -aab -cVa +xOn +shz +dto +fKd +tlR +tlR +cVu +ePY +ePY cSU aaa -aaa +amW +dmD +amW aaa aaa aaa @@ -128795,11 +118873,11 @@ ayN azF aAN aCi -nAk +aCf aCn aFr aKx -wRQ +aHG aHG aKv aLX @@ -128822,11 +118900,11 @@ aRw bgU bna bkz -blU +kwt bnR bpo -vzE -vzE +bqS +bqS bxr bvX bvX @@ -128887,33 +118965,33 @@ cRR cRR cWC cXx -dbs -cYF +cVj +kLx cNW cSx cRf cRp -dfo -dfo -cSF -afO +xuG +wGJ +vmA +piF djq -aaa -aaa -djq -aaa -aaa -aaa -aaa -djq -afO -cSF -aab -cVa +wGJ +nLT +ylS +xjG +hxf +jzn +lAr +lAr +itF +wQr cSU -aaa -aaa -aaa +aab +amW +dmD +amW +aab aaa aaa aaa @@ -129052,7 +119130,7 @@ ayP aIl aIl aCl -gQy +aDi aEg aFt aIl @@ -129081,8 +119159,8 @@ bne bpv blY bnW -xxP -vzE +bpt +bqS bsy bxA bvX @@ -129142,34 +119220,34 @@ cRM cWD cXG cYL -cWF -cXC -dbB -cSU +cVj +cXx +cVj +wFO cQV -cSU -cSU +jbt +idF dfo -dfo -dfo -cSF -afO -aaa -aaa -aaa -aab -aaa -dlE -aaa -aaa -aaa -dcf -cUO -aab -cVa +xuG +sKE +gHg +erU +erU +omz +fqV +ihJ +oAS +cYQ +daG +jeb +gmW +gmW +daG cSU aaa -aaa +amW +dmD +amW aaa aaa aaa @@ -129293,7 +119371,7 @@ agt amA any aot -epP +amy alT agM ash @@ -129336,7 +119414,7 @@ diw bhb bnd bkz -blU +kwt bnV bpq buo @@ -129401,32 +119479,32 @@ cTI cVU cVj cXx -dbF -cYG +cVj +cSU cQF -cUB +cSx cVw cVB -cVG -dfo -cSF -afO -aaa -aaa -aab -aab -aab -aab -aab -aaa -aaa -afO -cSF -aaa -cVa +omz +ffY +jUZ +lrJ +vhd +omz +gei +fWP +oAS cSU -aaa -aaa +nTG +ePY +ePY +ePY +ePY +cSU +aab +amW +dmD +amW aaa aaa aaa @@ -129593,7 +119671,7 @@ bdv bhc bnh bkz -bma +kwt bnY bpu bqU @@ -129658,32 +119736,32 @@ cTM cWf cWH cXF -dbF +cVj cYY -cOa -cQb +cNW +cSx deA dfq cVS -dfo -cSF -afO -aaa -aaa -aab +egO +iRc +iRc +iRc +uqo +kLR dkz dle -dlF -aab -aab -djq -afO -cSF -aaa -cVa +cYQ +oBR +ePY +ePY +fdg +ePY cSU aaa -aaa +amW +dmD +amW aaa aaa aaa @@ -129850,10 +119928,10 @@ bhd biI bnf bkB -bma +kwt bnX -bps -sNK +bpt +bqS bsz bxC bAD @@ -129914,33 +119992,33 @@ aYt cId cIw cVj -cXE +cXx cYm cYQ -ddb +cNW ddS deB dfr cVN cSA cSI -afO -aaa -aaa -aab +phw +cSI +nic +nFa dkA -dlf -dlG -aab -aaa -aaa +dkA +cYQ +qpq +ePY +qpq dcf -cUO -aaa -cVa +ePY cSU aaa -aaa +amW +dmD +amW aaa aaa aaa @@ -130107,11 +120185,11 @@ bhV biK bnj bkz -bma +kwt boa bpw bqV -ljp +bsA bxO bvX bxt @@ -130171,33 +120249,33 @@ aZB cIe cIy cSl -cXH -dbG -cZf -cNk +cVF cVj +cYY +cNW +cSx deC dfs -cSv -dfo -cSF -afO -djq -djy -aab +ieI +kUR +wiS +wiS +wiS +cVT +rmT dkB dlg -dlH -aab -aaa -aaa -afO -cSF -aaa -cVa +cYQ +ePY +ePY +ePY +lKP +ePY cSU -aaa -aaa +aab +amW +dmD +amW aaa aaa aaa @@ -130364,7 +120442,7 @@ bdw bgW bni bkC -bma +kwt aYf aYg bup @@ -130429,32 +120507,32 @@ cRR cYI cZP cXx -dbF -cYZ -cQG -cVc -cVy -cQH -cVT -dfo -cSF -afO -aaa -aaa -aab -aab -aab -aab -aab -aaa -aaa -afO -cSF -aaa -cVa +cVj cSU -aaa -aaa +tQJ +cSx +cVy +omz +cVT +ffY +uTu +ioM +pTj +omz +gei +fWP +oAS +cSU +nTG +ePY +ePY +ePY +ePY +cSU +aab +amW +dmD +amW aaa aaa aaa @@ -130598,7 +120676,7 @@ aAx aEm aFA aFA -btf +aFw aJj aKA awl @@ -130623,8 +120701,8 @@ bnk bpy blY brS -xxP -vzE +bpt +bqS bvC bxY bvX @@ -130678,40 +120756,40 @@ cOY cOf cOy cPo -eEt -cUt +cRX cUt +pMd cWB cXL cYJ cWM cXJ +cVj cSU -cSU -cQV -cSU -cSU -dfo -dfo -dfo -cSF -afO -aaa -aaa -aaa +cQG +qcg +hQW +mWa +sud +lVr +vWF +erU +erU +omz +vdo dkC -aaa -aab -aaa -aaa -aaa -dcf -cUO -aab -cVa +oAS +cYQ +daG +ufc +sZP +ufc +daG cSU aaa -aaa +amW +dmD +amW aaa aaa aaa @@ -130845,7 +120923,7 @@ aow apz ata auN -fHf +avX awJ ayT azK @@ -130942,34 +121020,34 @@ cSJ cTN cWj cWI -cXI -cSU -cZl -cOd +cXF +cVj +cYQ +cNW cVp -cRb -cRp -dfo -dfo -cSF -afO -djq -aaa -aaa -aaa -aaa -djq -aaa -aaa -djq -afO -cSF -aab -cVa +hQW +mWa +sud +wGJ +eDs +eQo +qCB +wGJ +gDJ +nwJ +oSI +hxf +jzn +jnm +jnm +bAO +wQr cSU -aaa -aaa -aaa +aab +amW +dmD +amW +aab aaa aaa aaa @@ -131188,44 +121266,44 @@ cHX dcj dcj dcj -wep +dcj cHT bHY -otC +cTe cPO -oUJ +cTe cRQ cWJ cPO cYR -cZM -cXN -cSU cVj +cXx +cVj +cYQ cZR -cVq -cRb -cRp -dfo -dgE -cSF -afO -afO +wEY +scM +hbq +hbq +rhs +eJr +lXg +ihW cUl -afO -afO -cUl -afO -afO -cUl -afO -afO -cSF -aab -cVa +esG +kYw +uBJ +vCL +tDn +tDn +nFg +ePY +ePY cSU -aaa -aaa +aab +amW +dmD +amW aaa aaa aaa @@ -131357,12 +121435,12 @@ alM awK aoW arn -gxv +atd auP -fHf +avX axG ayU -gxv +atd azx aCr aHE @@ -131397,7 +121475,7 @@ bmc bmc bqZ bsE -nRM +bwU bvU bxv byS @@ -131445,8 +121523,8 @@ cHV cIV dcB cNO -wya -nSR +cNO +cNO cQN cSa cPN @@ -131454,35 +121532,35 @@ cUv cRP cSO cTO -cYM +cZM cJI cXM cYo -cZE +cYo cZQ -cVq +uVt +jsQ +cRb +cRb cRb -cRp -dfo -afO cSM -cTx -cTx +cRb +cRb cTF -cTx -cTx -cTF -cTx -cTx -cTF -cTx -cTx +cRb +xGn +rWB +xwz +qIn +ePY +dsx +ePY cUQ -aab -cVa cSU -aaa -aaa +aab +amW +dmD +amW aaa aaa aaa @@ -131706,40 +121784,40 @@ cOZ cOh cQN bHZ -vYr -ute +cRX +cRX cRT cWL cTT cYM cNX -cNX -cNX -cWe +duK +ePY +cYQ dal -cSv -deF +iBS +jve dft +lqF +xWO +qnM +lqF +lqF +qnM +qmX +hNT +ttp +kcS +cSU +cSU +cSU +cSU cSU -dgJ -afO -aaa -aab -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -cUJ -cUU cSU aaa -aaa +amW +amW +amW aaa aaa aaa @@ -131916,7 +121994,7 @@ bwc bxv byT bFg -lgQ +bzY bIO bJK bKL @@ -131960,43 +122038,43 @@ cIW dcE cNQ cON -opx +cON cQN -nkG cRX -vYr +cRX +cRX cRS cWK cTP cYM cNV cOb -cPg +ePY cPX -dai -cSv -cSU -dfz +dal +cYY +nPw +cZM cSU cSU dhv -dib -diR -dib -dib -dib -dib -dib -dib -dib -diR -cUJ -cUL -cUU -cSU -cSU +ePY +ePY +tky +fFY +ubz +iEE +mAG +gLY aaa aaa +aab +aaa +aaa +aaa +aaa +aab +aaa aaa aaa aaa @@ -132173,7 +122251,7 @@ bmc bxv byW bzZ -sug +bzZ bCP bEh bFK @@ -132211,50 +122289,50 @@ cCJ cvI cHQ cdG -hCY +lnQ cHX -ugr -mzR -mzR -hED -mzR +dcj +dcj +dcj +dcj +dcj cyh -gpk -xbw +cRX +cRX cQP cRV cSY cUs -cYX +cYM dac -dac -dac -cZM +vaH +uZx +sJK cOi cVu cRh -cRs -cSy -cSB +ePY +cYQ +ePY cTs -dib -cTC -dib -cSC -cTt -cUq -cTt -cUn -dib -dbQ -cUI -cSU -cYX +euu +euu +rlm +ePY +fYe cSU aaa aaa aaa -aaa +aab +aab +aab +aab +aab +aab +aab +aab +aab aaa aaa aaa @@ -132398,7 +122476,7 @@ aEq aFE aGC aHZ -tQs +awG aKB axe aNU @@ -132426,7 +122504,7 @@ aaa bmc bdP byf -bkR +dLF bxv byV bAa @@ -132468,7 +122546,7 @@ cCa cDR cHQ cGu -hCY +lnQ cIh cIX cJq @@ -132484,35 +122562,35 @@ cSP cUm cYU dab -dab +mtc dbJ -cQc +mtc cQH -cVr -aLz +ePY +vBs aMM -daj -cSU +cYY +dsx cTm cTt cTA -cTt +cTA cUo +cPX cSU -cSU -cSU -cTm -cTt -cUE -cUK -cSU -cSU -cSU +aaa +aaa +aab +aaa +aab +aaa +dcq +dcq +dcq dcq dcq dcq dcq -dgG aaa aaa aaa @@ -132655,7 +122733,7 @@ aEt axe aGF aIb -eML +awG aKD axe aNU @@ -132687,11 +122765,11 @@ bwg bxv byY bAd -hxa +bAd bCU -mtS -mtS -mtS +bEs +bEs +bEs bMR bLd bQD @@ -132741,13 +122819,13 @@ cTj cUx cZS dcq -ddr -dcq -dcq +tbU +gAm +eMw dex dcq dcq -dcq +ykt dcq dcq dcq @@ -132943,11 +123021,11 @@ byr bwf bxv byX -lgQ -lgQ -lgQ +bzY +bzY +bzY bEk -lgQ +bzY bLf bMQ bLd @@ -132998,23 +123076,23 @@ cSZ dtc cWp dcq -ddr -ddr -cZF +hPB +edp +hPB dau -daL +cZF dby dcn -ddr -ddr -deP -ddr -ddr -ddr -deP -ddr -ddr -ddr +euD +euD +lzm +euD +euD +euD +lzm +euD +euD +euD deW dgI doo @@ -133205,7 +123283,7 @@ bBE bCV bEv doB -qQm +bzY bMS bOy bQM @@ -133253,7 +123331,7 @@ cSd cOF cTk dfF -wOS +qoT dcq dcq dcq @@ -133272,7 +123350,7 @@ dcq dcq dcq dcq -dcq +mTX don dcq dfx @@ -133282,7 +123360,7 @@ dcq dcq dgC doL -dhT +dgC dcq aaa aaa @@ -133412,9 +123490,9 @@ aso atE auE avA -pqc +avA arv -qKW +ayp awi axQ aAx @@ -133510,7 +123588,7 @@ cSd cSd cWT cXQ -dMw +cSd lLC cXO dbK @@ -133529,7 +123607,7 @@ cQZ cQZ cQZ cQZ -dcq +mTX dok dcq dfu @@ -133692,7 +123770,7 @@ aQp aSB aTI aWE -uNG +aZv aZv bce bef @@ -133768,8 +123846,8 @@ cVI cWU cXV cVI -ese -tEg +cVI +rzU dbL dcL dds @@ -133777,7 +123855,7 @@ deh deD deM dgs -wGT +deH dhB dik diU @@ -133786,7 +123864,7 @@ dki dkO dkO cQZ -dcq +mTX ddr dcq dfC @@ -133916,9 +123994,9 @@ anA akv alp alG -oKO +aoJ anQ -iLE +aoI aoR aqA ago @@ -134026,14 +124104,14 @@ cTq cUz cEr cEr -dLi -nMD -nMD +cEr +cEr +cEr dav daQ deH dfy -haz +dfy dgN dhA dij @@ -134043,7 +124121,7 @@ dkh bbM dlv cQZ -dcq +mTX dfm dcq dfA @@ -134051,9 +124129,9 @@ dfT dcq aaa dcq -dow +dou doz -doV +dou dcq aaa aaa @@ -134172,10 +124250,10 @@ anA anA akF adX -jrK +aoJ amM anQ -iLE +aoI apM apR ahC @@ -134203,7 +124281,7 @@ aDP aDP aDP aQr -sUY +aSB aTR aWF aZt @@ -134284,13 +124362,13 @@ cXR cYT cZU daM -txa -egY +daM +daM day -nOr +daM deI -mXd -lmr +deQ +dgg dgP dhC dip @@ -134301,7 +124379,7 @@ dkO dkO cQZ cYz -doE +aaa dcq dfE dgd @@ -134309,7 +124387,7 @@ dgc aaa aaa aaa -aaa +ejU aaa aaa aaa @@ -134427,7 +124505,7 @@ acx acE acE anA -ufT +aoJ alq afK amr @@ -134546,19 +124624,19 @@ daN daw daR deJ -tDj -dgh -dgO +dfF +cSd +dgQ dhx -dio -diW -cQZ -cQZ -cQZ -cQZ -cQZ -doE +dhI aab +cQZ +cQZ +cQZ +cQZ +cQZ +sIy +aaa dcq dfD dgc @@ -134682,9 +124760,9 @@ aaa anA acB acB -dNE +acw adp -oKO +aoJ alu amn amO @@ -134735,11 +124813,11 @@ bja bkM bcU bok -lqp +bmq brf -txC -gDP -tGI +bmq +bmq +bmq bxx aUS bAh @@ -134808,14 +124886,14 @@ cSd dgR dhE dit -diX +diU djB dkq dkT dkT cQZ -doE -aab +sIy +aaa aaa dmW aaa @@ -134941,15 +125019,15 @@ anA anA anA anA -fgD +aoJ adY amm amN ahf aoN -siD +aoJ apT -koB +ago aiU aFL alS @@ -134992,12 +125070,12 @@ aZR bkM bmr brT +btf +btf +bmq +byD +bmq bmq -brg -gDP -jSU -tBt -xHS aUS bAi bHt @@ -135005,7 +125083,7 @@ bAi bEp aTS bBM -iyH +bBM bGg bJC bLw @@ -135065,14 +125143,14 @@ cSd dgQ dhD dhI -diY +aab cTo dkp bbO dlw cQZ -doE -aab +sIy +aaa aaa dmW aaa @@ -135199,14 +125277,14 @@ anA acV anH akI -hHC -uww +alF +alF amQ -uww +alF afn apO anx -rHe +aqX aiW akC avF @@ -135249,11 +125327,11 @@ boc bkP bmr brV +btg +bqi +bmq +buN bmq -pDb -drO -jSU -mLi aVG aUS cMK @@ -135261,7 +125339,7 @@ bHy bAk bEp aTV -haB +bDf bGd bGi bJJ @@ -135309,7 +125387,7 @@ cRk cVO cWY cYa -cZc +cYV cZY daP daP @@ -135322,13 +125400,13 @@ dgt dgP dhF dip -diZ +diV djB dks dkT dkT cQZ -doE +sIy aab aab dmX @@ -135505,12 +125583,12 @@ aYd bnQ bkO bmr -wco +bmM +brg +brg +bmq +bqk bmq -laU -tGI -gDP -gDP bJQ aUS bAk @@ -135518,7 +125596,7 @@ bHy bCZ bEp aTU -mam +bDf bDd bEp bIq @@ -135566,8 +125644,8 @@ cRj cVM cWX cSd -cSd -cSd +kUA +mrw daV daV daV @@ -135579,14 +125657,14 @@ cXW dgQ cSd dhI -diY -cQZ -cQZ -cQZ -cQZ -cQZ -doE aab +cQZ +cQZ +cQZ +cQZ +cQZ +sIy +aaa aaa dmW aaa @@ -135762,20 +125840,20 @@ aZR bop bkO bmr -wco +bmM bmq -uiW -kvd -brg -gDP -gDP -eyt -vRF +bmq +bmq +bmq +bmq +bmq +bAv +bAk bHy bAk bEp aTY -qZf +bDf bGf bIh bJL @@ -135842,8 +125920,8 @@ dkw dkV dkV cQZ -doE -aab +sIy +aaa aaa dmW aaa @@ -136002,7 +126080,7 @@ aJf aGN aPf aQz -sTZ +aSD aUJ aWL aZz @@ -136017,22 +126095,22 @@ aUS dji biS bom -esS +bkO bmr -wco +bmM btm brh -brh -qtT -dvh +btn +buQ +aZV bzn bsN -ydk +bAk bHy bDA bEq aTW -hlT +bDf bGe bGq bDe @@ -136046,7 +126124,7 @@ cbv caA caA bXJ -tBT +caE cca caA cfA @@ -136093,14 +126171,14 @@ cXU dgV dhG dhI -diY +aab cTo dku bdG dlx cQZ -doE -aab +sIy +aaa aaa dmW aaa @@ -136276,21 +126354,21 @@ dkL boH bpC bmr -wco +bmM btw +bri +bto +buR bmq -etR -mLi -gDP -gDP -eyt -qPF -qRM +bmq +bAv +bAk +bHy bDb bEy aUP -xpD -vdt +bDf +bGe bJA bLv bTQ @@ -136356,7 +126434,7 @@ dkx dkV dkV cQZ -doE +ggO doE doE ddC @@ -136535,14 +126613,14 @@ bjm bmq brW btq -pDb -mSl -brg -gDP +bmq +bmq +bmq +bmq bzo bze -qPF -qRM +bAk +bHy bDb bEp aUO @@ -136607,13 +126685,13 @@ cYb dgW dhI dhI -djb +aab cQZ cQZ cQZ cQZ cQZ -doE +ggO aab aaa dmW @@ -136776,8 +126854,8 @@ aQv aSM aVo aWU -suo -ofR +aWU +bbv aSD beW aOI @@ -136793,12 +126871,12 @@ bqy brX btx buq -pyk -hcT +buq +buq bAU bCI aUS -fwM +bAk bHy bDb aTL @@ -136854,23 +126932,23 @@ aab cZh dad dba -dbI +djE dcS -dbI -del -dbI +djE +dba +djE dcS -dbI -dbI -dbI -dbI -djc -aab -aab -aab -aab -aab -doE +djE +djE +djE +djE +djE +djE +djE +djE +djE +djE +gSS aab aaa dmW @@ -137032,7 +127110,7 @@ aPf aQv aSM aUT -xan +aWT aZC bbu bdf @@ -137051,7 +127129,7 @@ bmq bqi brH btr -bmq +bqi bAH bCB aUS @@ -137159,7 +127237,7 @@ drg dro drt drv -iMO +dry dnr dny dnz @@ -137289,7 +127367,7 @@ aFI aZs aSM aVp -gUP +aWT aZD bbu bdl @@ -137306,9 +127384,9 @@ bdT bnm bmq bqk -uiW bqk -bmq +bqk +bqk bAV bmq aUS @@ -137416,7 +127494,7 @@ drf drq dnl drv -ook +drE dnw drQ drN @@ -137545,9 +127623,9 @@ aFI aFI aQE aSM -nOb -nGo -hlm +aUT +aWT +aZC bbu bdj bfr @@ -137820,9 +127898,9 @@ bdT bmj bog bpN -fYH -rzz -grx +bog +bpN +bog bPM bdT bdT @@ -137927,11 +128005,11 @@ dqw dqw dqw dnc -gWg -kQD +dni +drE drv -ook -iqh +drE +dni drR drN drN @@ -138187,7 +128265,7 @@ drg dnh drA drv -quH +dry drK drB dnA @@ -138328,7 +128406,7 @@ bbh bdT bdM bhX -tmo +biU boS bdT bmt @@ -138345,7 +128423,7 @@ bHy bAk bEo aWO -sVn +bSn bSn bOG bLF @@ -138444,13 +128522,13 @@ drf drf drf drf -hLc -eGK +dry +drO drM dry drE drM -eGK +drO dry drf drf @@ -139102,12 +129180,12 @@ djt bjd boV bpG -bbW +bdT boj btJ bus bsS -vAc +bof bof bxH bzf @@ -139367,7 +129445,7 @@ bsV buJ bof bxJ -eap +bzf bAk bHy bAk @@ -139379,7 +129457,7 @@ bEu bLV bOR bQC -sBH +bQC bNK bXA bZJ @@ -139438,10 +129516,10 @@ dev dez ddi ddq -dlm -dlm -dlm -dlm +dgS +dgS +dgS +dgS dmD doE doE @@ -139621,7 +129699,7 @@ boo btM brm bsU -vAc +bof bof bxI bzf @@ -139699,8 +129777,8 @@ dln dlV dln dmy -dlm -dlm +dgS +dgS dnx aaa doE @@ -139881,7 +129959,7 @@ bof bof bof bxJ -eap +bzf bAk bHy bAk @@ -139893,7 +129971,7 @@ bEu bMY bOV bQE -fpb +bOV cby cuo bZP @@ -140099,7 +130177,7 @@ axg axh lQS avt -utw +lQS dEP sHt sHt @@ -140213,8 +130291,8 @@ dln dlW dln dmz -dlm -dlm +dgS +dgS dnx aaa doE @@ -140466,11 +130544,11 @@ dgT djK dgT dgT -dlm -dlm -dlm +dgS +dgS +dgS dmE -dlm +dgS ddD doE doE @@ -140725,7 +130803,7 @@ dkr dkP dkP csL -dma +cBP aab aaa aab @@ -140868,9 +130946,9 @@ awl doE avM doE -aus +auq avw -awm +auq aaa aaa aaa @@ -140983,7 +131061,7 @@ dkQ dlp dlM dmi -dma +cBP aab aab aaa @@ -141167,7 +131245,7 @@ brr brr bxL bzj -frt +bAr bHy bAk bEu @@ -142452,7 +132530,7 @@ byM bru bxL bzj -frt +bAr bHy bJh bEu @@ -142984,7 +133062,7 @@ bUJ bVZ bXv bYk -pWt +bZB caX bWi clp @@ -144277,9 +134355,9 @@ clo cow coi cpV -vfX -uyo -uZi +crL +ctw +cuK cvT cpR cxO @@ -144537,7 +134615,7 @@ cpR csA ctB cuO -gdQ +crL cpR cxO cAe @@ -145027,7 +135105,7 @@ bHI bwv bEA bGA -wIF +bId bNh bPa bRy @@ -145049,7 +135127,7 @@ clp cod cpY crP -qeu +crL cuS cpR cxI @@ -145275,7 +135353,7 @@ bcp btV bry bth -rdi +buV blj bxS bau @@ -145563,7 +135641,7 @@ coB chI crj cbj -mVw +ctv cuX bIi cpI @@ -145799,7 +135877,7 @@ bwv bEJ bGB bIc -wsp +bNJ bId bRz bId @@ -145820,7 +135898,7 @@ coA ceK cri csB -idV +bYm cuV bIi cxi @@ -146046,7 +136124,7 @@ bau bpY buy btj -fnn +buV blj bxV bau @@ -146077,8 +136155,8 @@ cmV cmV chT cbj -wjY -ksw +bLR +cvF bIi cxU cxT @@ -146303,7 +136381,7 @@ bau bqc bkQ btb -rdi +buV blj bxW bau @@ -146335,7 +136413,7 @@ cmV cbj cbj ctC -stO +cvF bIi cxM cxT @@ -146560,7 +136638,7 @@ boy bcp brA btl -fnn +buV blj bCS bau @@ -146817,7 +136895,7 @@ bau bqd brB brG -rdi +buV blj bCR bau @@ -147064,7 +137142,7 @@ aXd baz bcw bet -fTX +bcx biw baz aYP @@ -147324,7 +137402,7 @@ ber bga bis bvN -sfN +bcD bld blw bmI @@ -147811,7 +137889,7 @@ aaa aaa aAg aBc -qFa +aBV aCQ aDX aEV @@ -147834,7 +137912,7 @@ aXk aXe baI bcx -bPP +bcx bhA bix bgg @@ -147861,7 +137939,7 @@ bMj bPz bRp bTg -iXO +bWn bLR bYh bZT @@ -147896,7 +137974,7 @@ cKs cNI cQt cOS -gkX +cSH cQu cxN cEH @@ -148091,14 +138169,14 @@ aYx aXo baz bcC -dSC -pUZ -dSC +bcz +bcz +bcz baz bjD bpO blz -eoC +boJ boJ boJ boJ @@ -148348,14 +138426,14 @@ aYP aYP baz bcB -pfa -dSC -dSC +bcz +bcz +bcz baz bjA bpM blx -lPZ +boJ boJ boJ bxB @@ -148369,7 +138447,7 @@ bwv bEM bGK bIv -qWE +bKi bKx bMt bUi @@ -148612,7 +138690,7 @@ baz bjI bpO blz -eoC +boJ boJ boJ boJ @@ -148862,7 +138940,7 @@ aYz bay aZl bcF -iSS +bcD bhC bcD bjs @@ -148882,7 +138960,7 @@ bHR bDq bED bGC -vKh +bIp bKi bLW bIp @@ -148911,7 +138989,7 @@ bGG cyR cAP cBZ -ltW +cDw cDb cEt cFE @@ -149096,7 +139174,7 @@ aaa aaa aAg aBj -ljD +aBg aCV aEa aFb @@ -149168,7 +139246,7 @@ cxS cBx cAP cCh -ltW +cDw cDr cDw cFI @@ -149425,7 +139503,7 @@ cxZ cyR cAP cCb -ltW +cDw cDe cDw cHw @@ -150161,10 +140239,10 @@ bsP buH bBd buH -qig +buH bGj dck -qZB +bmm bmm bmm bBc @@ -150417,12 +140495,12 @@ bEG bsO bmm bBc -qZB +bmm bAJ bGh cVt bGh -kHX +bAJ bmm bBc cYw @@ -150673,14 +140751,14 @@ aab bEG bta bmm -xXS -bDp -xpY -tlj -gGg -kJW -uPv -cYe +bBc +bCX +bAK +bjR +bjR +bjR +bEF +cXs bBc cYw cZk @@ -150695,11 +140773,11 @@ cjA aYS aaa dbP -cgu +cgs chZ chZ -cgu -cgu +cgs +cgs cqg crI csg @@ -150931,13 +141009,13 @@ bjR bzO bzs bBh -oRL -hnS +bCT +bjR bwD cVV -bxz -wlw -jJe +bwD +bjR +cXp bLp bNu bxX @@ -151188,13 +141266,13 @@ bjR btc bmm bBc -wNF -hnS +bDk +bjR bwC -gSs -mkp -fYr -jJe +bzd +bwC +bjR +cYd bLr bNw bPu @@ -151445,13 +141523,13 @@ bjR bzO bzw bBi -wNF -hnS +bCT +bjR bxz -cVV -bwD -wlw -nrk +bzm +bxz +bjR +cXp bLq bNv boD @@ -151702,14 +141780,14 @@ bEG btd bmm bBc -wNF -iyx -qau -eEX -kmj -xzc -jJe -kTV +bDp +bEF +bjR +bjR +bjR +bAK +cYe +cYk cYw cZm cZm @@ -151723,11 +141801,11 @@ ccS aYS aaa dbX -cgu -cgu -cgu -cgu -cgu +cgs +cgs +cgs +cgs +cgs cql crK csg @@ -151959,13 +142037,13 @@ bEG bEG buT bBc -jjr -fCH -feB -fCH -fCH -fCH -ihL +bmm +bAL +bGo +cWh +bGo +bAL +bmm cYk cYw bjR @@ -152216,12 +142294,12 @@ brd bEG bEG bBc -jjr -xvD -ktV -dzR -xvD -ihL +bmm +bmm +bmm +bmm +bmm +bmm bmm cYk cYw @@ -152474,10 +142552,10 @@ bvP bzx bBl bmm -vum bmm -bzd -vum +bmm +bmm +bmm bmm bmm cYk @@ -154266,29 +144344,29 @@ aaa aaa aaa aaa -aYD -bic -bic -bic -boK -bqp +aaa +aaa +aaa +aaa +aaa +aaa brK -bic -bqo -bnb -blD -bic -boK -bic -boK -bic -bic -bqo -blD -bic -bic -bIE -bIA +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -154523,30 +144601,30 @@ aaa aaa aaa aaa -bjC -gap -reA -bmX -bDz -bjC -uom -btt -blA -blA -blA -bzq -uom -uXX -uom -bzq -blA -blA -blA -xlz -iau -bjC -bIx -bKm +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -154780,30 +144858,30 @@ aaa aaa aaa aaa -aYU -bmY -bDz -bDz -bDz -pdr -fpO -obW -obW -obW -obW -obW -obW -obW -obW -obW -obW -obW -obW -obW -nHW -bBR -bIx -bKm +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -154973,18 +145051,6 @@ aaa aaa aaa aaa -afZ -agw -agw -agw -agZ -agZ -aho -aiC -ahJ -agw -agw -ahs aaa aaa aaa @@ -155036,31 +145102,43 @@ aaa aaa aaa aaa -aYD -bjG -iCr -bDz -bDz -bGJ -bBR -fpO -obW -oDA -oDA -oDA -oDA -oDA -obW -oDA -oDA -oDA -oDA -oDA -obW -nHW -bBS -bIx -bKm +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -155230,18 +145308,6 @@ aaa aaa aaa aaa -agb -ail -ail -adV -ail -ail -ail -aha -aha -ajz -ajY -akp aaa aaa aaa @@ -155289,35 +145355,47 @@ aaa aaa aaa aaa -aYD -bic -aYU -bic -bIC -bjG -bmY -bDz -bDz -bGJ -bBS -fpO -obW -kcF -dUh -sDw -rAt -kcF -obW -sDw -rAt -kcF -law -sDw -obW -nHW -bjC -sbp -sbp +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -155487,18 +145565,6 @@ aaa aaa aaa aaa -aga -agx -add -ahl -agZ -agZ -ail -aiE -aha -ajA -ajY -akp aaa aaa aaa @@ -155546,35 +145612,47 @@ aaa aaa aaa aaa -bjC -baW -bcJ -uxA -qdA -bjC -jJT -ksF -bDz -oRM -bjC -fpO -obW -blA -blA -blA -blA -blA -obW -blA -naH -blA -blA -blA -obW -nHW -bjC -bIx -bKm +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -155744,18 +145822,6 @@ aaa aaa aaa aaa -agc -agw -agw -ahn -aaa -agZ -ail -aiF -aha -ajB -agZ -ahn aaa aaa aaa @@ -155803,35 +145869,47 @@ aaa aaa aaa aaa -aYU -baX -bcK -beC -wxQ -bBX -bic -aYU -pdr -bic -bjG -dHM -obW -obW -obW -obW -obW -obW -obW -obW -obW -obW -obW -obW -obW -nHW -aYU -bIx -bKm +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -156006,12 +146084,6 @@ aaa aaa aaa aaa -agZ -ail -aiG -aha -ajC -agZ aaa aaa aaa @@ -156060,35 +146132,41 @@ aaa aaa aaa aaa -aYU -baY -bcL -bcK -bcK -bim -esI -blC -lax -tdh -aYU -fpO -obW -oDA -oDA -oDA -oDA -oDA -obW -oDA -oDA -oDA -oDA -oDA -obW -nHW -bjC -sbp -sbp +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -156260,15 +146338,6 @@ aaa aaa aaa aaa -afZ -aho -ahJ -agZ -ail -aiH -ajd -ajD -agZ aaa aaa aaa @@ -156317,35 +146386,44 @@ aaa aaa aaa aaa -aYU -aYH -bcL -bcK -bcK -bin -bjJ -obW -obW -fpO -wkg -fpO -obW -kcF -law -sDw -rAt -kcF -obW -sDw -rAt -kcF -dUh -sDw -obW -nHW -bBR -bIx -bKm +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -156516,22 +146594,6 @@ aaa aaa aaa aaa -afZ -agZ -ahp -ahp -agZ -ail -agw -agw -agw -agw -agw -agw -agw -agw -agw -ahs aaa aaa aaa @@ -156574,35 +146636,51 @@ aaa aaa aaa aaa -aYU -lLQ -bcL -bcK -bcK -bin -bjJ -obW -obW -fpO -wkg -fpO -obW -blA -blA -blA -blA -blA -obW -blA -blA -blA -blA -blA -obW -nHW -bBS -bIx -bKm +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -156772,24 +146850,6 @@ aaa aaa aaa aaa -afZ -agw -aha -aha -aha -agZ -ail -ahZ -aha -ajE -ajZ -akq -akA -akR -alx -ami -agZ -ahs aaa aaa aaa @@ -156831,35 +146891,53 @@ aaa aaa aaa aaa -aYU -usf -bcL -vMh -bcK -bim -vVC -blv -nVM -vJw -aYU -fpO -obW -obW -obW -obW -obW -obW -obW -obW -obW -obW -obW -obW -obW -nHW -bjC -sbp -sbp +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -157030,23 +147108,6 @@ aaa aaa aaa aaa -agz -abT -aha -ahK -agZ -agw -agZ -aha -aha -aha -aha -aha -akP -aly -amj -amY -agZ aaa aaa aaa @@ -157088,35 +147149,52 @@ aaa aaa aaa aaa -aYU -pDl -bcK -qpX -oqQ -bBX -bic -qJu -qJu -bic -bjG -iau -btu -uom -uom -oDA -oDA -oDA -xnj -oDA -oDA -obW -obW -oDA -xnj -iau -aYU -bIx -bKm +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -157287,23 +147365,6 @@ aaa aaa aaa aaa -agB -ahc -ahq -ahL -ahZ -aim -ahZ -aha -aha -aha -aha -aha -ahZ -aha -aha -amZ -agZ aaa aaa aaa @@ -157345,35 +147406,52 @@ aaa aaa aaa aaa -bjC -ntp -kHU -iwt -kUs -bjC -kPl -nVM -blv -nRP -bBX -bic -bic -wHx -wHx -bic -bic -bic -bqp -iPL -aYU -nIj -nIj -aYU -dUh -bic -bjG -bIx -bKm +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -157544,23 +147622,6 @@ aaa aaa aaa aaa -agA -ahd -aha -aha -agZ -agw -agZ -aha -aha -aha -aha -aha -akR -alz -amk -ana -agZ aaa aaa aaa @@ -157602,35 +147663,52 @@ aaa aaa aaa aaa -leU -bic -aYU -bic -bqp -bjG -kCR -fpO -lxD -fUo -bjC -pGQ -ioI -uom -uom -kMV -xBQ -xBR -bjC -lkY -gyR -mQF -mQF -hJi -oUw -fZO -bjC -sbp -sbp +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -157800,24 +147878,6 @@ aaa aaa aaa aaa -agc -agw -aha -aha -aha -agZ -ail -ahZ -aha -ajF -aka -akr -akr -akP -alA -aml -agZ -ahn aaa aaa aaa @@ -157863,31 +147923,49 @@ aaa aaa aaa aaa -leU -bjG -gmY -fpO -lxD -fGD -bjC -dsw -fzb -toq -toq -toq -toq -sPV -mpx -lKS -gyR -mQF -mQF -hJi -lKS -xtk -bBR -bIx -bKm +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -158058,22 +148136,6 @@ aaa aaa aaa aaa -agc -agZ -mMw -mMw -agZ -ail -agw -agw -agw -agw -agw -agw -agw -agw -agw -ahn aaa aaa aaa @@ -158121,30 +148183,46 @@ aaa aaa aaa aaa -aYU -gmY -fpO -lxD -nHW -bjC -tIz -sVQ -jbf -jbf -jbf -jbf -xTB -mpx -lKS -gyR -mQF -mQF -hJi -lKS -vGW -bBS -bIx -bKm +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -158316,15 +148394,6 @@ aaa aaa aaa aaa -agc -ahr -ahM -agZ -ail -aiI -aha -ajG -agZ aaa aaa aaa @@ -158378,30 +148447,39 @@ aaa aaa aaa aaa -bjC -iau -nvl -tku -iau -bjC -kyW -ldp -dSc -iau -rGB -mGt -msR -fGr -mxT -xgN -jMV -kaG -qxC -dwn -fyM -bjC -bIx -bKm +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -158576,12 +148654,6 @@ aaa aaa aaa aaa -agZ -ail -aiJ -aha -aha -agZ aaa aaa aaa @@ -158635,29 +148707,35 @@ aaa aaa aaa aaa -leU -aYU -nFM -nFM -aYU -bIC -bic -bqo -bnb -bnb -bnb -blD -bic -bIC -bic -bic -bqo -bnb -bnb -blD -bic -bIC -bIF +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -158828,18 +148906,18 @@ aaa aaa aaa aaa -afZ -agw -agw -ahs aaa -agZ -ail -aiK -aje -ajH -agZ -ahs +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -159086,17 +149164,17 @@ aaa aaa aaa agd -agC -adL -aht -agZ -agZ -ail -aiL -aha -aha -ajY -akp +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -159342,18 +149420,18 @@ aaa aaa aaa aaa -age -ail -ail -aen -ail -ail -ail -aha -aha -ajz -ajY -akp +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -159599,18 +149677,18 @@ aaa aaa aaa aaa -agc -agw -agw -agw -agZ -agZ -ahr -aiM -ahM -agw -agw -ahn +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa diff --git a/_maps/map_files/debug/smoothing.dmm b/_maps/map_files/debug/smoothing.dmm index 93922accf21..e57c9e182a9 100644 --- a/_maps/map_files/debug/smoothing.dmm +++ b/_maps/map_files/debug/smoothing.dmm @@ -27,7 +27,7 @@ /area/centcom) "i" = ( /obj/effect/landmark/start, -/turf/unsimulated/floor, +/turf/simulated/floor/plating, /area/start) "j" = ( /obj/effect/landmark{ diff --git a/_maps/map_files/generic/Lavaland.dmm b/_maps/map_files/generic/Lavaland.dmm index 5cd635ed1d1..f69ecd1cce4 100644 --- a/_maps/map_files/generic/Lavaland.dmm +++ b/_maps/map_files/generic/Lavaland.dmm @@ -78,8 +78,8 @@ /area/lavaland/surface/outdoors) "ao" = ( /obj/machinery/computer/shuttle/labor/one_way{ - icon_state = "computer"; - dir = 4 + dir = 4; + icon_state = "computer" }, /obj/effect/decal/cleanable/cobweb, /turf/simulated/floor/plasteel, @@ -778,6 +778,21 @@ /turf/simulated/floor/plating, /area/mine/production) "bO" = ( +/obj/machinery/door/airlock/titanium{ + id_tag = "s_docking_airlock"; + name = "Labor Shuttle Airlock"; + req_access_txt = "0" + }, +/obj/docking_port/mobile{ + dir = 8; + dwidth = 2; + height = 5; + id = "laborcamp"; + name = "labor camp shuttle"; + rebuildable = 1; + width = 9 + }, +/obj/structure/fans/tiny, /obj/docking_port/stationary{ area_type = /area/lavaland/surface/outdoors; dir = 8; @@ -788,8 +803,8 @@ turf_type = /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface; width = 9 }, -/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, -/area/lavaland/surface/outdoors/explored) +/turf/simulated/floor/plating, +/area/shuttle/siberia) "bP" = ( /obj/item/radio/beacon, /obj/effect/turf_decal/tile/purple{ @@ -896,8 +911,8 @@ }, /obj/effect/decal/cleanable/cobweb, /obj/machinery/computer/prisoner{ - icon_state = "computer"; - dir = 1 + dir = 1; + icon_state = "computer" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -2441,8 +2456,8 @@ dir = 2 }, /obj/machinery/computer/mech_bay_power_console{ - icon_state = "computer"; - dir = 1 + dir = 1; + icon_state = "computer" }, /turf/simulated/floor/plasteel, /area/mine/production) @@ -2688,6 +2703,20 @@ /turf/simulated/floor/plasteel, /area/mine/living_quarters) "fJ" = ( +/obj/machinery/door/airlock/titanium{ + id_tag = "s_docking_airlock"; + req_access_txt = "48" + }, +/obj/docking_port/mobile{ + dir = 8; + dwidth = 3; + height = 5; + id = "mining"; + name = "mining shuttle"; + rebuildable = 1; + width = 7 + }, +/obj/structure/fans/tiny, /obj/docking_port/stationary{ area_type = /area/lavaland/surface/outdoors; dir = 8; @@ -2698,8 +2727,8 @@ turf_type = /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface; width = 7 }, -/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, -/area/lavaland/surface/outdoors) +/turf/simulated/floor/plating, +/area/shuttle/mining) "fK" = ( /obj/structure/table, /obj/machinery/reagentgrinder, @@ -3233,12 +3262,36 @@ }, /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) +"hf" = ( +/obj/machinery/flasher_button{ + id = "gulagshuttleflasher"; + name = "Flash Control"; + pixel_x = 0; + pixel_y = -26; + req_access_txt = "1" + }, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/siberia) "hg" = ( /obj/structure/stone_tile/surrounding, /obj/structure/stone_tile/center/cracked, /mob/living/simple_animal/hostile/megafauna/legion, /turf/simulated/floor/indestructible/boss, /area/lavaland/surface/outdoors) +"hj" = ( +/obj/machinery/flasher{ + id = "gulagshuttleflasher"; + pixel_x = 25 + }, +/obj/machinery/light{ + dir = 4; + icon_state = "tube1" + }, +/obj/structure/chair/comfy/shuttle{ + dir = 8 + }, +/turf/simulated/floor/mineral/titanium, +/area/shuttle/siberia) "hs" = ( /obj/structure/stone_tile/block{ dir = 1 @@ -3633,6 +3686,9 @@ /obj/structure/stone_tile/center/cracked, /turf/simulated/floor/plating/lava/smooth/lava_land_surface, /area/lavaland/surface/outdoors) +"kI" = ( +/turf/simulated/wall/mineral/titanium, +/area/shuttle/siberia) "kJ" = ( /obj/structure/stone_tile/surrounding_tile{ dir = 4 @@ -4263,6 +4319,13 @@ }, /turf/simulated/floor/indestructible/boss, /area/lavaland/surface/outdoors) +"nT" = ( +/obj/machinery/mineral/stacking_machine/laborstacker{ + input_dir = 2; + output_dir = 1 + }, +/turf/simulated/floor/plasteel/dark, +/area/shuttle/siberia) "on" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -4294,6 +4357,17 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/mine/living_quarters) +"pq" = ( +/turf/simulated/floor/mineral/titanium, +/area/shuttle/siberia) +"pt" = ( +/obj/machinery/mineral/labor_claim_console{ + machinedir = 2; + pixel_x = 30; + pixel_y = 30 + }, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/siberia) "qw" = ( /obj/effect/decal/cleanable/dirt, /obj/item/cigbutt, @@ -4319,6 +4393,12 @@ icon_state = "brown" }, /area/mine/laborcamp) +"qL" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 1 + }, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/siberia) "qT" = ( /turf/simulated/wall/rust, /area/mine/laborcamp) @@ -4411,6 +4491,10 @@ }, /turf/simulated/floor/plasteel, /area/mine/laborcamp) +"tb" = ( +/obj/effect/spawner/window/shuttle, +/turf/simulated/floor/plating, +/area/shuttle/mining) "tj" = ( /obj/effect/decal/cleanable/ash, /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, @@ -4473,8 +4557,8 @@ dir = 8 }, /turf/simulated/floor/wood{ - tag = "icon-wood-broken6"; - icon_state = "wood-broken6" + icon_state = "wood-broken6"; + tag = "icon-wood-broken6" }, /area/mine/laborcamp) "ug" = ( @@ -4491,6 +4575,13 @@ /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/mine/laborcamp) +"vk" = ( +/obj/machinery/door/airlock/titanium{ + name = "Labor Shuttle Airlock"; + req_access_txt = "2" + }, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/siberia) "vq" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel, @@ -4535,14 +4626,30 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel/dark, /area/mine/laborcamp) +"wt" = ( +/obj/structure/shuttle/engine/propulsion, +/turf/simulated/floor/plating/airless, +/area/shuttle/siberia) "wD" = ( /obj/effect/decal/remains/human, /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) +"wP" = ( +/obj/structure/shuttle/engine/heater, +/obj/structure/window/reinforced{ + dir = 1; + layer = 2.9 + }, +/turf/simulated/floor/plating/airless, +/area/shuttle/siberia) "wY" = ( /obj/item/clothing/mask/gas/clown_hat, /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) +"xo" = ( +/obj/structure/shuttle/engine/propulsion/burst, +/turf/simulated/floor/plating/airless, +/area/shuttle/mining) "xx" = ( /obj/machinery/light/small{ dir = 1 @@ -4559,6 +4666,9 @@ }, /turf/simulated/floor/plasteel, /area/mine/production) +"xC" = ( +/turf/simulated/wall/mineral/titanium, +/area/shuttle/mining) "xL" = ( /obj/machinery/atmospherics/unary/outlet_injector/on{ dir = 4; @@ -4567,6 +4677,13 @@ /obj/structure/lattice/catwalk, /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/mine/laborcamp) +"xM" = ( +/obj/structure/ore_box, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/mineral/titanium/blue, +/area/shuttle/mining) "xR" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -4621,6 +4738,9 @@ /obj/machinery/hologram/holopad, /turf/simulated/floor/plasteel, /area/mine/production) +"Bg" = ( +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/siberia) "BD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -4639,6 +4759,13 @@ }, /turf/simulated/floor/plasteel, /area/mine/living_quarters) +"BY" = ( +/obj/machinery/computer/shuttle/labor, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/siberia) +"Cf" = ( +/turf/simulated/floor/mineral/titanium, +/area/shuttle/mining) "Cy" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -4646,6 +4773,14 @@ icon_state = "brown" }, /area/mine/laborcamp) +"CF" = ( +/obj/structure/closet/crate, +/turf/simulated/floor/mineral/titanium/blue, +/area/shuttle/mining) +"CK" = ( +/obj/structure/closet/crate, +/turf/simulated/floor/mineral/titanium, +/area/shuttle/siberia) "CT" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -4676,8 +4811,8 @@ dir = 8 }, /turf/simulated/floor/wood{ - tag = "icon-wood-broken6"; - icon_state = "wood-broken6" + icon_state = "wood-broken6"; + tag = "icon-wood-broken6" }, /area/mine/laborcamp) "DX" = ( @@ -4739,8 +4874,8 @@ /obj/item/bedsheet/orange, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/wood{ - tag = "icon-wood-broken7"; - icon_state = "wood-broken7" + icon_state = "wood-broken7"; + tag = "icon-wood-broken7" }, /area/mine/laborcamp) "FO" = ( @@ -4763,6 +4898,15 @@ icon_state = "brown" }, /area/mine/laborcamp) +"FW" = ( +/obj/machinery/door/airlock/titanium{ + id_tag = "s_docking_airlock"; + name = "Labor Shuttle Airlock"; + req_access_txt = "2" + }, +/obj/structure/fans/tiny, +/turf/simulated/floor/plating, +/area/shuttle/siberia) "Gp" = ( /obj/structure/sign/poster/contraband/clown, /turf/simulated/wall/rust, @@ -4828,6 +4972,13 @@ /obj/machinery/vending/cola/free, /turf/simulated/floor/plasteel/dark, /area/mine/laborcamp) +"Iv" = ( +/obj/structure/table, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/mineral/titanium/blue, +/area/shuttle/mining) "IK" = ( /obj/structure/toilet{ dir = 8 @@ -4837,6 +4988,19 @@ }, /turf/simulated/floor/plasteel/freezer, /area/mine/living_quarters) +"IZ" = ( +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/shuttle/engine/heater, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/simulated/floor/plating/airless, +/area/shuttle/mining) "Jl" = ( /obj/effect/spawner/window/reinforced, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -4853,8 +5017,8 @@ network = list("Labor Camp") }, /turf/simulated/floor/wood{ - tag = "icon-wood-broken3"; - icon_state = "wood-broken3" + icon_state = "wood-broken3"; + tag = "icon-wood-broken3" }, /area/mine/laborcamp) "JQ" = ( @@ -4873,6 +5037,12 @@ /obj/machinery/vending/sustenance, /turf/simulated/floor/plasteel/dark, /area/mine/laborcamp) +"JX" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/mineral/titanium, +/area/shuttle/mining) "JZ" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, @@ -4901,6 +5071,14 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel/white, /area/mine/laborcamp) +"KR" = ( +/obj/machinery/mineral/labor_claim_console{ + machinedir = 1; + pixel_x = 30; + pixel_y = 0 + }, +/turf/simulated/floor/mineral/titanium, +/area/shuttle/siberia) "Lz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -4973,8 +5151,8 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/wood{ - tag = "icon-wood-broken3"; - icon_state = "wood-broken3" + icon_state = "wood-broken3"; + tag = "icon-wood-broken3" }, /area/mine/laborcamp) "NG" = ( @@ -4992,6 +5170,14 @@ }, /turf/simulated/floor/plasteel/white, /area/mine/laborcamp) +"NP" = ( +/obj/machinery/computer/shuttle/mining, +/turf/simulated/floor/mineral/titanium/blue, +/area/shuttle/mining) +"NW" = ( +/obj/effect/spawner/window/shuttle, +/turf/simulated/floor/plating, +/area/shuttle/siberia) "NZ" = ( /obj/structure/toilet, /obj/effect/decal/cleanable/cobweb, @@ -5052,6 +5238,10 @@ icon_state = "brown" }, /area/mine/laborcamp) +"Rs" = ( +/obj/structure/table, +/turf/simulated/floor/mineral/titanium/blue, +/area/shuttle/mining) "Ss" = ( /obj/structure/rack, /obj/item/storage/bag/ore, @@ -5124,6 +5314,12 @@ }, /turf/simulated/floor/plasteel, /area/mine/production) +"Uy" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/turf/simulated/floor/mineral/titanium, +/area/shuttle/siberia) "UQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -5145,6 +5341,12 @@ icon_state = "brown" }, /area/mine/laborcamp) +"Vu" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 1 + }, +/turf/simulated/floor/mineral/titanium/blue, +/area/shuttle/mining) "Vv" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -5172,8 +5374,8 @@ /area/mine/production) "VJ" = ( /obj/machinery/computer/secure_data{ - icon_state = "computer"; - dir = 1 + dir = 1; + icon_state = "computer" }, /turf/simulated/floor/plasteel{ dir = 1; @@ -5184,8 +5386,8 @@ /obj/structure/bed, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/wood{ - tag = "icon-wood-broken7"; - icon_state = "wood-broken7" + icon_state = "wood-broken7"; + tag = "icon-wood-broken7" }, /area/mine/laborcamp) "VO" = ( @@ -5195,6 +5397,12 @@ icon_state = "brown" }, /area/mine/laborcamp) +"Wo" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 1 + }, +/turf/simulated/floor/mineral/titanium, +/area/shuttle/mining) "Wt" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -5205,6 +5413,16 @@ /obj/machinery/hologram/holopad, /turf/simulated/floor/plasteel, /area/mine/eva) +"Wx" = ( +/obj/structure/table, +/obj/item/folder/red, +/obj/item/restraints/handcuffs, +/obj/machinery/light{ + dir = 4; + icon_state = "tube1" + }, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/siberia) "WJ" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/visible/cyan{ @@ -8580,15 +8798,15 @@ aj aw aw aw -aD -aD -aD -aD -aD -aD -aD -aD -aD +kI +kI +NW +kI +kI +NW +kI +kI +kI aw aj aj @@ -8837,15 +9055,15 @@ aw aw aw aw -aD -aD -aD -aD -aD -aD -aD -aD -aD +NW +BY +Bg +vk +pq +Uy +CK +wP +wt aw aw ab @@ -9094,15 +9312,15 @@ aw aw aw aw -aD -aD -aD -aD -aD -aD -aD -aD -aD +NW +qL +hf +kI +pq +pq +pq +wP +wt aw aw aw @@ -9351,15 +9569,15 @@ aj aw aw aw -aD -aD -aD -aD -aD -aD -aD -aD -aD +NW +Wx +pt +nT +KR +hj +pq +wP +wt aw aj aj @@ -9608,15 +9826,15 @@ qT aw aw aw -aD -aD -aD -aD -aD -aD +kI +kI +FW +kI +kI +kI bO -aD -aD +kI +kI xL ab aj @@ -18094,13 +18312,13 @@ aj aj aj ab -ab -ab -ab -ab -ab -ab -ab +xC +xC +tb +xC +tb +xC +xC ab aj aj @@ -18351,13 +18569,13 @@ aj aj ab ab -ab -ab -ab -ab -ab -ab -ab +xC +Rs +Cf +JX +Vu +CF +xC ab aj aj @@ -18608,13 +18826,13 @@ ab aj ab ab -ab -ab -ab -ab -ab -ab -ab +tb +NP +Wo +Cf +Vu +IZ +xo ab ab aj @@ -18865,13 +19083,13 @@ aj aj aj ab -ab -ab -ab -ab -ab -ab -ab +xC +Iv +Cf +Cf +Vu +xM +xC ab ab aj @@ -19122,13 +19340,13 @@ aj aj aj ab -ab -ab -ab +xC +xC +tb fJ -ab -ab -ab +tb +xC +xC ab aj aj diff --git a/_maps/map_files/cyberiad/z2.dmm b/_maps/map_files/generic/centcomm.dmm similarity index 72% rename from _maps/map_files/cyberiad/z2.dmm rename to _maps/map_files/generic/centcomm.dmm index df9c4bfa81c..6c9d3a41b19 100644 --- a/_maps/map_files/cyberiad/z2.dmm +++ b/_maps/map_files/generic/centcomm.dmm @@ -1,92 +1,60 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "aa" = ( -/turf/unsimulated/wall{ - tag = "icon-iron6"; - icon_state = "iron6" - }, +/turf/simulated/wall/indestructible/riveted, /area/space) "ab" = ( -/turf/unsimulated/floor/snow, +/turf/simulated/floor/plating/asteroid/snow/airless, /area/syndicate_mothership) "ac" = ( /obj/structure/flora/grass/brown, -/turf/unsimulated/floor/snow, -/area/syndicate_mothership) -"ad" = ( -/obj/structure/flora/bush, -/turf/unsimulated/floor/snow, +/turf/simulated/floor/plating/asteroid/snow/airless, /area/syndicate_mothership) "ae" = ( /obj/structure/flora/tree/pine{ pixel_x = 1 }, -/turf/unsimulated/floor/snow, +/turf/simulated/floor/plating/asteroid/snow/airless, /area/syndicate_mothership) "af" = ( /obj/structure/window/reinforced, -/turf/unsimulated/wall{ - tag = "icon-iron12"; - icon_state = "iron12" - }, +/turf/simulated/wall/indestructible/riveted, /area/space) "ag" = ( -/turf/unsimulated/floor/snow, -/turf/unsimulated/floor/snow{ - icon_state = "gravsnow_corner" - }, +/obj/item/toy/figure/syndie, +/turf/simulated/floor/plating/asteroid/snow/airless, /area/syndicate_mothership) -"ah" = ( -/turf/unsimulated/wall{ - tag = "icon-iron14"; - icon_state = "iron14" - }, -/area/space) "ai" = ( /obj/item/radio/intercom/syndicate{ pixel_x = 32; pixel_y = 0 }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) "aj" = ( /obj/structure/rack/holorack, /obj/item/clothing/under/dress/dress_saloon, /obj/item/clothing/head/hairflower, /turf/simulated/floor/holofloor{ - tag = "icon-cult"; + dir = 2; icon_state = "cult"; - dir = 2 + tag = "icon-cult" }, /area/holodeck/source_theatre) "ak" = ( /obj/structure/window/reinforced{ dir = 4 }, -/turf/unsimulated/wall{ - tag = "icon-iron3"; - icon_state = "iron3" - }, +/turf/simulated/wall/indestructible/riveted, /area/space) "al" = ( /obj/effect/landmark/costume/random, /obj/structure/rack/holorack, /turf/simulated/floor/holofloor{ - tag = "icon-cult"; + dir = 2; icon_state = "cult"; - dir = 2 + tag = "icon-cult" }, /area/holodeck/source_theatre) -"am" = ( -/obj/structure/flora/ausbushes/brflowers, -/turf/simulated/floor/holofloor/grass, -/turf/simulated/floor/holofloor{ - tag = "icon-wood_siding2 (EAST)"; - icon_state = "wood_siding2"; - dir = 4 - }, -/area/holodeck/source_picnicarea) "an" = ( /obj/structure/window/reinforced{ dir = 4 @@ -94,18 +62,15 @@ /obj/structure/window/reinforced{ dir = 8 }, -/turf/unsimulated/wall{ - tag = "icon-iron3"; - icon_state = "iron3" - }, +/turf/simulated/wall/indestructible/riveted, /area/space) "ao" = ( /obj/structure/chair/stool/holostool, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/holofloor{ - tag = "icon-asteroid"; + dir = 2; icon_state = "asteroid"; - dir = 2 + tag = "icon-asteroid" }, /area/holodeck/source_picnicarea) "ap" = ( @@ -120,9 +85,10 @@ /area/space) "ar" = ( /turf/simulated/floor/holofloor{ - tag = "icon-asteroid"; + dir = 2; + icon = 'icons/turf/floors/plating.dmi'; icon_state = "asteroid"; - dir = 2 + tag = "icon-asteroid" }, /area/holodeck/source_desert) "as" = ( @@ -134,27 +100,18 @@ }, /area/holodeck/source_knightarena) "at" = ( -/turf/unsimulated/wall, +/turf/simulated/wall/indestructible/riveted, /area/vox_station) "au" = ( -/turf/unsimulated/floor/vox, +/turf/simulated/floor/plasteel/dark/nitrogen, /area/vox_station) "av" = ( /obj/structure/table/holotable/wood, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/holofloor{ - tag = "icon-asteroid"; + dir = 2; icon_state = "asteroid"; - dir = 2 - }, -/area/holodeck/source_picnicarea) -"aw" = ( -/obj/structure/flora/ausbushes/ywflowers, -/turf/simulated/floor/holofloor/grass, -/turf/simulated/floor/holofloor{ - tag = "icon-wood_siding2 (EAST)"; - icon_state = "wood_siding2"; - dir = 4 + tag = "icon-asteroid" }, /area/holodeck/source_picnicarea) "ax" = ( @@ -165,7 +122,7 @@ /area/holodeck/source_wildlife) "ay" = ( /obj/machinery/vox_win_button, -/turf/unsimulated/floor/vox{ +/turf/simulated/floor/plasteel/dark/nitrogen{ icon_state = "light_on" }, /area/vox_station) @@ -186,8 +143,8 @@ }, /area/holodeck/source_burntest) "aB" = ( -/obj/machinery/door/airlock/shuttle, -/turf/simulated/shuttle/plating, +/obj/machinery/door/airlock/titanium, +/turf/simulated/floor/plating, /area/centcom/evac) "aC" = ( /turf/simulated/floor/holofloor{ @@ -205,63 +162,47 @@ /obj/structure/window/reinforced{ dir = 8 }, -/turf/unsimulated/wall{ - tag = "icon-iron3"; - icon_state = "iron3" - }, +/turf/simulated/wall/indestructible/riveted, /area/space) "aF" = ( /obj/structure/flora/ausbushes/grassybush, /turf/simulated/floor/holofloor/grass, -/turf/simulated/floor/holofloor{ - tag = "icon-wood_siding5"; - icon_state = "wood_siding5"; - dir = 2 - }, -/area/holodeck/source_picnicarea) -"aG" = ( -/obj/structure/flora/ausbushes/grassybush, -/turf/simulated/floor/holofloor/grass, -/turf/simulated/floor/holofloor{ - tag = "icon-wood_siding9"; - icon_state = "wood_siding9"; - dir = 2 - }, /area/holodeck/source_picnicarea) "aH" = ( /obj/structure/chair/stool/holostool, /turf/simulated/floor/holofloor{ - tag = "icon-carpet7-3 (EAST)"; + dir = 4; icon_state = "carpet7-3"; - dir = 4 + tag = "icon-carpet7-3 (EAST)" }, /area/holodeck/source_theatre) "aI" = ( /obj/machinery/door/airlock/centcom, -/turf/unsimulated/floor/vox, +/turf/simulated/floor/plasteel/dark/nitrogen, /area/vox_station) "aJ" = ( /obj/structure/girder/displaced, -/turf/unsimulated/floor/vox, +/turf/simulated/floor/plasteel/dark/nitrogen, /area/vox_station) "aK" = ( /obj/structure/closet/crate, -/turf/unsimulated/floor/vox, +/turf/simulated/floor/plasteel/dark/nitrogen, /area/vox_station) "aL" = ( /obj/structure/flora/ausbushes/fullgrass, /turf/simulated/floor/holofloor{ - tag = "icon-asteroid"; + dir = 2; + icon = 'icons/turf/floors/plating.dmi'; icon_state = "asteroid"; - dir = 2 + tag = "icon-asteroid" }, /area/holodeck/source_desert) "aM" = ( /obj/structure/chair/stool/holostool, /turf/simulated/floor/holofloor{ - tag = "icon-carpet15-15 (EAST)"; + dir = 4; icon_state = "carpet15-15"; - dir = 4 + tag = "icon-carpet15-15 (EAST)" }, /area/holodeck/source_theatre) "aN" = ( @@ -269,9 +210,9 @@ /area/space) "aO" = ( /turf/simulated/floor/holofloor{ - tag = "icon-cult"; + dir = 2; icon_state = "cult"; - dir = 2 + tag = "icon-cult" }, /area/holodeck/source_theatre) "aP" = ( @@ -305,35 +246,17 @@ "aS" = ( /obj/structure/chair/stool/holostool, /turf/simulated/floor/holofloor{ - tag = "icon-carpet11-12 (EAST)"; + dir = 4; icon_state = "carpet11-12"; - dir = 4 + tag = "icon-carpet11-12 (EAST)" }, /area/holodeck/source_theatre) -"aT" = ( -/obj/structure/flora/ausbushes/grassybush, -/turf/simulated/floor/holofloor/grass, -/turf/simulated/floor/holofloor{ - tag = "icon-wood_siding6"; - icon_state = "wood_siding6"; - dir = 2 - }, -/area/holodeck/source_picnicarea) -"aU" = ( -/obj/structure/flora/ausbushes/grassybush, -/turf/simulated/floor/holofloor/grass, -/turf/simulated/floor/holofloor{ - tag = "icon-wood_siding10"; - icon_state = "wood_siding10"; - dir = 2 - }, -/area/holodeck/source_picnicarea) "aV" = ( /obj/structure/chair/stool/holostool, /turf/simulated/floor/holofloor{ - tag = "icon-carpet5-1 (EAST)"; + dir = 4; icon_state = "carpet5-1"; - dir = 4 + tag = "icon-carpet5-1 (EAST)" }, /area/holodeck/source_theatre) "aW" = ( @@ -345,156 +268,156 @@ "aX" = ( /obj/structure/flora/ausbushes/sparsegrass, /turf/simulated/floor/holofloor{ - tag = "icon-asteroid"; + dir = 2; + icon = 'icons/turf/floors/plating.dmi'; icon_state = "asteroid"; - dir = 2 + tag = "icon-asteroid" }, /area/holodeck/source_desert) "aY" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/holofloor{ - tag = "icon-asteroid"; + dir = 2; icon_state = "asteroid"; - dir = 2 + tag = "icon-asteroid" }, /area/holodeck/source_picnicarea) "aZ" = ( /obj/structure/chair/stool/holostool, /turf/simulated/floor/holofloor{ - tag = "icon-carpet13-5 (EAST)"; + dir = 4; icon_state = "carpet13-5"; - dir = 4 + tag = "icon-carpet13-5 (EAST)" }, /area/holodeck/source_theatre) "ba" = ( /obj/structure/chair/stool/holostool, /turf/simulated/floor/holofloor{ - tag = "icon-carpet9-4 (EAST)"; + dir = 4; icon_state = "carpet9-4"; - dir = 4 + tag = "icon-carpet9-4 (EAST)" }, /area/holodeck/source_theatre) "bb" = ( /obj/structure/table/holotable/wood, /turf/simulated/floor/holofloor{ - tag = "icon-grimy"; + dir = 2; icon_state = "grimy"; - dir = 2 + tag = "icon-grimy" }, /area/holodeck/source_meetinghall) "bc" = ( /obj/structure/chair/stool/holostool, /turf/simulated/floor/holofloor{ - tag = "icon-carpet6-0 (EAST)"; + dir = 4; icon_state = "carpet6-0"; - dir = 4 + tag = "icon-carpet6-0 (EAST)" }, /area/holodeck/source_meetinghall) "bd" = ( /turf/simulated/floor/holofloor{ - tag = "icon-asteroid7"; + dir = 2; + icon = 'icons/turf/floors/plating.dmi'; icon_state = "asteroid7"; - dir = 2 + tag = "icon-asteroid7" }, /area/holodeck/source_desert) "be" = ( /obj/machinery/computer/shuttle/ert, -/turf/unsimulated/floor{ - icon_state = "grimy" - }, +/turf/simulated/floor/plasteel/grimy, /area/centcom/specops) "bf" = ( /obj/structure/chair/stool/holostool, /turf/simulated/floor/holofloor{ - tag = "icon-carpet14-0 (EAST)"; + dir = 4; icon_state = "carpet14-0"; - dir = 4 + tag = "icon-carpet14-0 (EAST)" }, /area/holodeck/source_meetinghall) "bg" = ( /obj/structure/chair/stool/holostool, /turf/simulated/floor/holofloor{ - tag = "icon-carpet10-0 (EAST)"; + dir = 4; icon_state = "carpet10-0"; - dir = 4 + tag = "icon-carpet10-0 (EAST)" }, /area/holodeck/source_meetinghall) "bh" = ( /obj/structure/kitchenspike, -/turf/unsimulated/floor/vox, +/turf/simulated/floor/plasteel/dark/nitrogen, /area/vox_station) "bi" = ( /obj/structure/table/wood, -/turf/unsimulated/floor/vox, +/turf/simulated/floor/plasteel/dark/nitrogen, /area/vox_station) "bj" = ( /obj/structure/chair/stool/holostool, /turf/simulated/floor/holofloor{ - tag = "icon-carpet7-0 (EAST)"; + dir = 4; icon_state = "carpet7-0"; - dir = 4 + tag = "icon-carpet7-0 (EAST)" }, /area/holodeck/source_meetinghall) "bk" = ( /obj/machinery/door/airlock/centcom{ opacity = 1 }, -/turf/unsimulated/floor/vox, +/turf/simulated/floor/plasteel/dark/nitrogen, /area/vox_station) "bl" = ( -/turf/unsimulated/floor/plating/vox, +/turf/simulated/floor/plating/nitrogen, /area/vox_station) "bm" = ( /obj/structure/chair/stool/holostool, /turf/simulated/floor/holofloor{ - tag = "icon-carpet15-0 (EAST)"; + dir = 4; icon_state = "carpet15-0"; - dir = 4 + tag = "icon-carpet15-0 (EAST)" }, /area/holodeck/source_meetinghall) "bn" = ( /turf/simulated/floor/holofloor{ - tag = "icon-carpet6-2 (EAST)"; + dir = 4; icon_state = "carpet6-2"; - dir = 4 + tag = "icon-carpet6-2 (EAST)" }, /area/holodeck/source_theatre) "bo" = ( /turf/simulated/floor/holofloor{ - tag = "icon-wood (EAST)"; + dir = 4; icon_state = "wood"; - dir = 4 + tag = "icon-wood (EAST)" }, /area/holodeck/source_theatre) "bp" = ( /obj/structure/chair/stool/holostool, /turf/simulated/floor/holofloor{ - tag = "icon-carpet11-0 (EAST)"; + dir = 4; icon_state = "carpet11-0"; - dir = 4 + tag = "icon-carpet11-0 (EAST)" }, /area/holodeck/source_meetinghall) "bq" = ( /turf/simulated/floor/holofloor{ - tag = "icon-carpet14-10 (EAST)"; + dir = 4; icon_state = "carpet14-10"; - dir = 4 + tag = "icon-carpet14-10 (EAST)" }, /area/holodeck/source_theatre) "br" = ( /obj/structure/chair/stool/holostool, /turf/simulated/floor/holofloor{ - tag = "icon-carpet5-0 (EAST)"; + dir = 4; icon_state = "carpet5-0"; - dir = 4 + tag = "icon-carpet5-0 (EAST)" }, /area/holodeck/source_meetinghall) "bs" = ( /obj/structure/chair/stool/holostool, /turf/simulated/floor/holofloor{ - tag = "icon-carpet13-0 (EAST)"; + dir = 4; icon_state = "carpet13-0"; - dir = 4 + tag = "icon-carpet13-0 (EAST)" }, /area/holodeck/source_meetinghall) "bt" = ( @@ -510,67 +433,17 @@ "bv" = ( /obj/structure/chair/stool/holostool, /turf/simulated/floor/holofloor{ - tag = "icon-carpet9-0 (EAST)"; + dir = 4; icon_state = "carpet9-0"; - dir = 4 + tag = "icon-carpet9-0 (EAST)" }, /area/holodeck/source_meetinghall) -"bw" = ( -/obj/structure/flora/ausbushes/brflowers, -/turf/simulated/floor/holofloor/grass, -/turf/simulated/floor/holofloor{ - tag = "icon-wood_siding1"; - icon_state = "wood_siding1"; - dir = 2 - }, -/area/holodeck/source_picnicarea) -"bx" = ( -/obj/structure/flora/ausbushes/ywflowers, -/turf/simulated/floor/holofloor/grass, -/turf/simulated/floor/holofloor{ - tag = "icon-wood_siding1"; - icon_state = "wood_siding1"; - dir = 2 - }, -/area/holodeck/source_picnicarea) -"by" = ( -/obj/structure/flora/tree/pine{ - pixel_x = 1 - }, -/turf/unsimulated/floor/snow, -/turf/unsimulated/floor/snow{ - tag = "icon-gravsnow_corner (SOUTHWEST)"; - icon_state = "gravsnow_corner"; - dir = 10 - }, -/area/syndicate_mothership) "bz" = ( -/obj/structure/flora/grass/brown, -/turf/unsimulated/floor/snow, -/turf/unsimulated/floor/snow{ - tag = "icon-gravsnow_corner (EAST)"; - icon_state = "gravsnow_corner"; - dir = 4 +/obj/machinery/porta_turret/syndicate{ + dir = 6 }, -/area/syndicate_mothership) -"bA" = ( -/obj/structure/flora/grass/brown, -/turf/unsimulated/floor/snow, -/turf/unsimulated/floor/snow{ - tag = "icon-gravsnow_corner (SOUTHWEST)"; - icon_state = "gravsnow_corner"; - dir = 10 - }, -/area/syndicate_mothership) -"bB" = ( -/obj/structure/flora/tree/pine{ - pixel_x = 1 - }, -/turf/unsimulated/floor/snow, -/turf/unsimulated/floor/snow{ - icon_state = "gravsnow_corner" - }, -/area/syndicate_mothership) +/turf/simulated/wall/mineral/plastitanium, +/area/shuttle/syndicate) "bC" = ( /turf/simulated/floor/holofloor{ dir = 4; @@ -579,40 +452,7 @@ /area/holodeck/source_emptycourt) "bD" = ( /obj/machinery/porta_turret/syndicate/pod, -/turf/simulated/floor/pod, -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 8; - icon_state = "diagonalWall3" - }, -/area/shuttle/assault_pod) -"bE" = ( -/obj/machinery/porta_turret/syndicate/pod, -/turf/simulated/floor/pod, -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 1; - icon_state = "diagonalWall3" - }, -/area/shuttle/assault_pod) -"bF" = ( -/obj/machinery/porta_turret/syndicate/pod, -/turf/simulated/floor/pod, -/turf/space, -/turf/simulated/shuttle/wall{ - tag = "icon-diagonalWall3"; - icon_state = "diagonalWall3"; - dir = 2 - }, -/area/shuttle/assault_pod) -"bG" = ( -/obj/machinery/porta_turret/syndicate/pod, -/turf/simulated/floor/pod, -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 4; - icon_state = "diagonalWall3" - }, +/turf/simulated/wall/mineral/plastitanium, /area/shuttle/assault_pod) "bH" = ( /obj/structure/flora/ausbushes/brflowers, @@ -627,19 +467,7 @@ /area/holodeck/source_knightarena) "bJ" = ( /obj/structure/flora/bush, -/turf/unsimulated/floor/snow, -/turf/unsimulated/floor/snow{ - tag = "icon-gravsnow_corner (NORTH)"; - icon_state = "gravsnow_corner"; - dir = 1 - }, -/area/syndicate_mothership) -"bK" = ( -/obj/structure/flora/tree/pine, -/turf/unsimulated/floor/snow, -/turf/unsimulated/floor/snow{ - icon_state = "gravsnow_corner" - }, +/turf/simulated/floor/plating/asteroid/snow/airless, /area/syndicate_mothership) "bL" = ( /obj/docking_port/stationary/transit{ @@ -659,37 +487,21 @@ /area/holodeck/source_emptycourt) "bN" = ( /obj/structure/flora/grass/brown, -/turf/unsimulated/floor/snow, -/turf/unsimulated/floor/snow{ - icon_state = "gravsnow_corner" - }, +/turf/simulated/wall/indestructible/rock/snow, /area/syndicate_mothership) "bO" = ( /obj/structure/window/reinforced{ dir = 1 }, -/turf/unsimulated/floor{ - icon_state = "engine" - }, -/turf/unsimulated/wall{ - dir = 1; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "diagonalWall3" - }, +/turf/simulated/wall/indestructible/syndicate, /area/admin) -"bP" = ( -/obj/structure/window/reinforced{ - dir = 1 +"bR" = ( +/obj/structure/table, +/obj/machinery/recharger{ + pixel_y = 4 }, -/turf/unsimulated/floor{ - icon_state = "engine" - }, -/turf/unsimulated/wall{ - dir = 8; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "diagonalWall3" - }, -/area/admin) +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/administration) "bT" = ( /obj/structure/holowindow{ dir = 1 @@ -708,76 +520,59 @@ icon_state = "green" }, /area/holodeck/source_emptycourt) -"bZ" = ( -/turf/unsimulated/wall, -/area/space) +"bY" = ( +/obj/structure/chair/comfy/shuttle, +/turf/simulated/floor/mineral/titanium, +/area/shuttle/transport) "ca" = ( /turf/simulated/floor/holofloor{ dir = 6; icon_state = "green" }, /area/holodeck/source_emptycourt) -"cb" = ( -/turf/unsimulated/wall{ - tag = "icon-iron5"; - icon_state = "iron5" - }, -/area/space) "cc" = ( /obj/structure/window/reinforced{ dir = 1 }, -/turf/unsimulated/wall{ - tag = "icon-iron12"; - icon_state = "iron12" - }, +/turf/simulated/wall/indestructible/riveted, /area/space) "cd" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ dir = 1 }, -/turf/unsimulated/wall{ - tag = "icon-iron12"; - icon_state = "iron12" - }, +/turf/simulated/wall/indestructible/riveted, /area/space) "ce" = ( /obj/structure/window/reinforced{ dir = 1 }, /obj/structure/window/reinforced, -/turf/unsimulated/wall{ - tag = "icon-iron12"; - icon_state = "iron12" - }, -/area/space) -"cf" = ( -/turf/unsimulated/wall{ - tag = "icon-iron11"; - icon_state = "iron11" - }, +/turf/simulated/wall/indestructible/riveted, /area/space) "ch" = ( /turf/simulated/floor/holofloor/space, /area/holodeck/source_space) +"ci" = ( +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/syndicate_elite) "cj" = ( -/turf/unsimulated/wall, +/turf/simulated/wall/indestructible/riveted, /area/centcom/ferry) "ck" = ( /turf/space/transit, /area/space) "cl" = ( /turf/simulated/floor/holofloor{ - tag = "icon-snow"; - icon_state = "snow" + icon_state = "snow"; + tag = "icon-snow" }, /area/holodeck/source_snowfield) "cm" = ( /turf/simulated/floor/holofloor{ - tag = "icon-grimy"; + dir = 2; icon_state = "grimy"; - dir = 2 + tag = "icon-grimy" }, /area/holodeck/source_meetinghall) "cn" = ( @@ -790,14 +585,10 @@ /obj/machinery/computer/cryopod{ pixel_y = 32 }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/centcom/specops) "cp" = ( -/turf/unsimulated/floor{ - name = "plating" - }, +/turf/simulated/floor/plating/airless, /area/centcom/ferry) "cq" = ( /turf/simulated/floor/holofloor{ @@ -806,16 +597,30 @@ }, /area/holodeck/source_basketball) "cr" = ( -/turf/unsimulated/floor{ - name = "plating" +/turf/simulated/wall/mineral/titanium, +/area/shuttle/transport) +"cs" = ( +/turf/space, +/area/syndicate_mothership) +"ct" = ( +/turf/simulated/floor/plasteel{ + icon_state = "neutralcorner" }, -/area/space) +/area/shuttle/escape) "cu" = ( /turf/simulated/floor/holofloor{ dir = 8; icon_state = "red" }, /area/holodeck/source_thunderdomecourt) +"cv" = ( +/obj/machinery/door/airlock/external{ + id_tag = "s_docking_airlock"; + name = "Shuttle Hatch"; + req_access_txt = "31" + }, +/turf/simulated/floor/plating, +/area/shuttle/supply) "cw" = ( /turf/simulated/floor/holofloor{ dir = 1; @@ -830,6 +635,11 @@ icon_state = "red" }, /area/holodeck/source_boxingcourt) +"cy" = ( +/obj/structure/table, +/obj/item/storage/box/zipties, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/syndicate) "cz" = ( /obj/docking_port/stationary/transit{ dir = 8; @@ -844,22 +654,31 @@ "cA" = ( /obj/structure/flora/grass/both, /turf/simulated/floor/holofloor{ - tag = "icon-snow"; - icon_state = "snow" + icon_state = "snow"; + tag = "icon-snow" }, /area/holodeck/source_snowfield) "cB" = ( /turf/simulated/floor/holofloor{ - tag = "icon-asteroid3 (EAST)"; + dir = 4; + icon = 'icons/turf/floors/plating.dmi'; icon_state = "asteroid3"; - dir = 4 + tag = "icon-asteroid3 (EAST)" }, /area/holodeck/source_desert) +"cC" = ( +/obj/machinery/door/window{ + dir = 2; + name = "Cockpit"; + req_access_txt = "150" + }, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/syndicate) "cD" = ( /turf/simulated/floor/holofloor{ - tag = "icon-carpetsymbol (SOUTHEAST)"; + dir = 6; icon_state = "carpetsymbol"; - dir = 6 + tag = "icon-carpetsymbol (SOUTHEAST)" }, /area/holodeck/source_meetinghall) "cE" = ( @@ -874,20 +693,25 @@ icon_state = "red" }, /area/holodeck/source_basketball) +"cG" = ( +/obj/machinery/cell_charger, +/obj/structure/table, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/administration) "cH" = ( /obj/machinery/computer/shuttle/ferry, -/turf/unsimulated/floor{ - name = "plating" - }, +/turf/simulated/floor/plating, /area/centcom/evac) -"cJ" = ( -/turf/unsimulated/wall/fakeglass, -/area/centcom/ferry) +"cI" = ( +/obj/structure/shuttle/engine/propulsion{ + dir = 8; + icon_state = "propulsion" + }, +/turf/simulated/floor/plating/airless, +/area/shuttle/specops) "cK" = ( /obj/machinery/computer/shuttle/admin, -/turf/unsimulated/floor{ - name = "plating" - }, +/turf/simulated/floor/plating, /area/centcom/evac) "cL" = ( /turf/simulated/floor/holofloor{ @@ -911,97 +735,61 @@ "cO" = ( /obj/structure/flora/tree/pine, /turf/simulated/floor/holofloor{ - tag = "icon-snow"; - icon_state = "snow" + icon_state = "snow"; + tag = "icon-snow" }, /area/holodeck/source_snowfield) +"cP" = ( +/turf/simulated/floor/plasteel{ + icon_state = "whiteblue"; + tag = "icon-whiteblue" + }, +/area/shuttle/escape) "cQ" = ( /turf/simulated/floor/holofloor{ dir = 1; icon_state = "red" }, /area/holodeck/source_basketball) -"cR" = ( -/turf/unsimulated/wall/fakeglass{ - tag = "icon-fakewindows2 (WEST)"; - icon_state = "fakewindows2"; - dir = 8 - }, -/area/ninja/holding) "cS" = ( -/turf/unsimulated/wall/fakeglass{ - tag = "icon-fakewindows (WEST)"; - icon_state = "fakewindows"; - dir = 8 - }, -/area/ninja/holding) -"cT" = ( -/turf/unsimulated/wall/fakeglass{ - tag = "icon-fakewindows (EAST)"; - icon_state = "fakewindows"; - dir = 4 - }, +/turf/simulated/wall/indestructible/fakeglass, /area/ninja/holding) "cU" = ( -/turf/unsimulated/wall{ - desc = "The door appears to be locked tightly."; - icon = 'icons/obj/doors/airlocks/hatch/centcom.dmi'; - icon_state = "closed"; - name = "Locked Door" - }, +/turf/simulated/wall/indestructible/fakedoor, /area/ninja/holding) "cV" = ( -/turf/unsimulated/wall{ - desc = "The door appears to be locked tightly."; - icon = 'icons/obj/doors/airlocks/hatch/centcom.dmi'; - icon_state = "closed"; - name = "Locked Door" - }, +/turf/simulated/wall/indestructible/fakedoor, /area/ninja/outpost) "cW" = ( /obj/machinery/light/spot{ - tag = "icon-tube1 (NORTH)"; + dir = 1; icon_state = "tube1"; - dir = 1 - }, -/turf/unsimulated/floor{ - icon_state = "dark" + tag = "icon-tube1 (NORTH)" }, +/turf/simulated/floor/plasteel/dark, /area/ninja/outpost) "cX" = ( /obj/structure/table, /obj/machinery/kitchen_machine/microwave/upgraded, /obj/machinery/light/spot{ - tag = "icon-tube1 (NORTH)"; + dir = 1; icon_state = "tube1"; - dir = 1 - }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 + tag = "icon-tube1 (NORTH)" }, +/turf/simulated/floor/plasteel/freezer, /area/ninja/holding) "cY" = ( /obj/structure/closet/secure_closet/bar{ req_access_txt = "25" }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, +/turf/simulated/floor/plasteel/freezer, /area/ninja/holding) "cZ" = ( -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, +/turf/simulated/floor/plasteel/freezer, /area/ninja/holding) "da" = ( /obj/structure/reagent_dispensers/beerkeg, -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, +/turf/simulated/floor/plasteel/freezer, /area/ninja/holding) "db" = ( /obj/structure/table, @@ -1021,68 +809,56 @@ pixel_x = 3; pixel_y = 3 }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, +/turf/simulated/floor/plasteel/freezer, /area/ninja/holding) "dc" = ( /obj/machinery/vending/boozeomat, -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, +/turf/simulated/floor/plasteel/freezer, /area/ninja/holding) "dd" = ( /obj/structure/rack, /obj/item/kitchen/knife/ritual, -/turf/unsimulated/floor{ - icon_state = "chapel" - }, +/turf/simulated/floor/wood, /area/wizard_station) "de" = ( /obj/structure/rack, /obj/item/toy/sword, /obj/item/gun/projectile/revolver/capgun, -/turf/unsimulated/floor{ - icon_state = "cafeteria"; - dir = 2 +/turf/simulated/floor/plasteel{ + icon_state = "cafeteria" }, /area/ninja/holding) "df" = ( /obj/structure/rack, /obj/item/camera, /obj/machinery/light/spot{ - tag = "icon-tube1 (NORTH)"; + dir = 1; icon_state = "tube1"; - dir = 1 + tag = "icon-tube1 (NORTH)" }, -/turf/unsimulated/floor{ - icon_state = "cafeteria"; - dir = 2 +/turf/simulated/floor/plasteel{ + icon_state = "cafeteria" }, /area/ninja/holding) "dg" = ( /obj/machinery/computer/arcade, -/turf/unsimulated/floor{ - icon_state = "cafeteria"; - dir = 2 +/turf/simulated/floor/plasteel{ + icon_state = "cafeteria" }, /area/ninja/holding) "dh" = ( /obj/machinery/prize_counter, -/turf/unsimulated/floor{ - icon_state = "cafeteria"; - dir = 2 +/turf/simulated/floor/plasteel{ + icon_state = "cafeteria" }, /area/ninja/holding) "di" = ( /obj/machinery/light/spot{ - tag = "icon-tube1 (NORTH)"; + dir = 1; icon_state = "tube1"; - dir = 1 + tag = "icon-tube1 (NORTH)" }, -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, /area/ninja/holding) "dj" = ( /turf/simulated/floor/holofloor{ @@ -1093,10 +869,22 @@ "dk" = ( /obj/structure/flora/grass/green, /turf/simulated/floor/holofloor{ - tag = "icon-snow"; - icon_state = "snow" + icon_state = "snow"; + tag = "icon-snow" }, /area/holodeck/source_snowfield) +"do" = ( +/obj/machinery/door/airlock/hatch{ + frequency = 1331; + icon_state = "door_locked"; + id_tag = "vox_southeast_lock"; + locked = 1; + req_access_txt = "152"; + req_one_access = null; + req_one_access_txt = "0" + }, +/turf/simulated/floor/plating/nitrogen, +/area/shuttle/vox) "dp" = ( /turf/simulated/floor/holofloor{ dir = 2; @@ -1129,10 +917,7 @@ "dw" = ( /obj/structure/table, /obj/machinery/kitchen_machine/microwave/upgraded, -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, +/turf/simulated/floor/plasteel/freezer, /area/ninja/holding) "dx" = ( /obj/structure/table, @@ -1140,29 +925,24 @@ pixel_x = 4; pixel_y = 6 }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, +/turf/simulated/floor/plasteel/freezer, /area/ninja/holding) "dy" = ( -/turf/unsimulated/floor{ - icon_state = "cafeteria"; - dir = 2 +/turf/simulated/floor/plasteel{ + icon_state = "cafeteria" }, /area/ninja/holding) "dz" = ( /obj/structure/chair/stool, -/turf/unsimulated/floor{ - icon_state = "cafeteria"; - dir = 2 +/turf/simulated/floor/plasteel{ + icon_state = "cafeteria" }, /area/ninja/holding) "dA" = ( /obj/structure/flora/tree/dead, /turf/simulated/floor/holofloor{ - tag = "icon-snow"; - icon_state = "snow" + icon_state = "snow"; + tag = "icon-snow" }, /area/holodeck/source_snowfield) "dE" = ( @@ -1173,9 +953,7 @@ /obj/item/restraints/legcuffs/beartrap, /obj/item/sleeping_carp_scroll, /obj/item/twohanded/bostaff, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/tdome/arena_source) "dF" = ( /obj/structure/rack, @@ -1185,9 +963,7 @@ /obj/item/restraints/legcuffs/beartrap, /obj/item/sleeping_carp_scroll, /obj/item/twohanded/bostaff, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/tdome/arena_source) "dG" = ( /turf/simulated/floor/holofloor{ @@ -1203,9 +979,7 @@ /obj/item/restraints/legcuffs/beartrap, /obj/item/sleeping_carp_scroll, /obj/item/twohanded/bostaff, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/tdome/arena) "dI" = ( /obj/structure/rack, @@ -1215,9 +989,7 @@ /obj/item/restraints/legcuffs/beartrap, /obj/item/sleeping_carp_scroll, /obj/item/twohanded/bostaff, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/tdome/arena) "dJ" = ( /turf/simulated/floor/holofloor{ @@ -1237,6 +1009,12 @@ icon_state = "red" }, /area/holodeck/source_boxingcourt) +"dN" = ( +/obj/machinery/vending/wallmed/syndicate{ + pixel_x = -30 + }, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/syndicate) "dO" = ( /turf/simulated/floor/holofloor{ dir = 4; @@ -1244,70 +1022,46 @@ }, /area/holodeck/source_boxingcourt) "dP" = ( -/turf/unsimulated/wall/fakeglass{ - dir = 1; - icon_state = "fakewindows"; - tag = "icon-fakewindows (WEST)" - }, +/turf/simulated/wall/indestructible/fakeglass, /area/ninja/outpost) "dQ" = ( /obj/machinery/light/spot{ - tag = "icon-tube1 (NORTH)"; + dir = 1; icon_state = "tube1"; - dir = 1 - }, -/turf/unsimulated/floor{ - icon_state = "grimy" + tag = "icon-tube1 (NORTH)" }, +/turf/simulated/floor/plasteel/grimy, /area/ninja/outpost) "dR" = ( /obj/structure/table, /obj/machinery/recharger{ pixel_y = 0 }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, +/turf/simulated/floor/plasteel/freezer, /area/ninja/holding) "dS" = ( /obj/structure/table, /obj/item/reagent_containers/food/drinks/shaker, -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, +/turf/simulated/floor/plasteel/freezer, /area/ninja/holding) "dT" = ( /obj/structure/table, /obj/item/lighter/zippo, -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, +/turf/simulated/floor/plasteel/freezer, /area/ninja/holding) "dU" = ( /obj/structure/table, -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, +/turf/simulated/floor/plasteel/freezer, /area/ninja/holding) "dV" = ( /obj/structure/table, /obj/item/dice/d20, -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, +/turf/simulated/floor/plasteel/freezer, /area/ninja/holding) "dW" = ( /obj/structure/table, /obj/item/reagent_containers/food/drinks/cans/cola, -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, +/turf/simulated/floor/plasteel/freezer, /area/ninja/holding) "dX" = ( /obj/docking_port/stationary/transit{ @@ -1351,35 +1105,19 @@ }, /obj/item/clothing/under/suit_jacket, /obj/item/clothing/suit/wcoat, -/turf/unsimulated/floor{ - icon_state = "cafeteria"; - dir = 2 +/turf/simulated/floor/plasteel{ + icon_state = "cafeteria" }, /area/ninja/holding) "ee" = ( /obj/structure/chair/stool/bar, -/turf/unsimulated/floor{ - icon_state = "cafeteria"; - dir = 2 +/turf/simulated/floor/plasteel{ + icon_state = "cafeteria" }, /area/ninja/holding) -"ef" = ( -/turf/unsimulated/floor/snow, -/turf/simulated/shuttle/wall{ - dir = 8; - icon_state = "diagonalWall3" - }, -/area/syndicate_mothership) -"eg" = ( -/turf/unsimulated/floor/snow, -/turf/simulated/shuttle/wall{ - dir = 1; - icon_state = "diagonalWall3" - }, -/area/syndicate_mothership) "eh" = ( /obj/structure/flora/tree/pine, -/turf/unsimulated/floor/snow, +/turf/simulated/floor/plating/asteroid/snow/airless, /area/syndicate_mothership) "ei" = ( /turf/space, @@ -1389,9 +1127,7 @@ id_tag = "sit_away"; req_access_txt = "150" }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) "el" = ( /turf/simulated/floor/holofloor{ @@ -1410,17 +1146,15 @@ /obj/effect/landmark{ name = "Syndicate-Spawn" }, -/turf/unsimulated/floor{ - icon_state = "bar"; - dir = 2 +/turf/simulated/floor/plasteel{ + icon_state = "bar" }, /area/syndicate_mothership) "eo" = ( /obj/structure/rack, /obj/item/storage/fancy/crayons, -/turf/unsimulated/floor{ - icon_state = "cafeteria"; - dir = 2 +/turf/simulated/floor/plasteel{ + icon_state = "cafeteria" }, /area/ninja/holding) "ep" = ( @@ -1428,9 +1162,8 @@ /obj/structure/window/reinforced{ dir = 4 }, -/turf/unsimulated/floor{ - icon_state = "cafeteria"; - dir = 2 +/turf/simulated/floor/plasteel{ + icon_state = "cafeteria" }, /area/ninja/holding) "eq" = ( @@ -1438,22 +1171,20 @@ dir = 4; icon_state = "tube1" }, -/turf/unsimulated/floor{ - icon_state = "bar"; - dir = 2 +/turf/simulated/floor/plasteel{ + icon_state = "bar" }, /area/syndicate_mothership) "eu" = ( /obj/structure/chair/stool, /obj/machinery/computer/security/telescreen{ - name = "Entertainment monitor"; desc = "Damn, they better have /tg/thechannel on these things."; icon_state = "entertainment"; + name = "Entertainment monitor"; pixel_y = -30 }, -/turf/unsimulated/floor{ - icon_state = "cafeteria"; - dir = 2 +/turf/simulated/floor/plasteel{ + icon_state = "cafeteria" }, /area/ninja/holding) "ev" = ( @@ -1464,37 +1195,24 @@ /obj/structure/window/reinforced{ dir = 4 }, -/turf/unsimulated/floor{ - icon_state = "cafeteria"; - dir = 2 +/turf/simulated/floor/plasteel{ + icon_state = "cafeteria" }, /area/ninja/holding) "ex" = ( /obj/item/flag/syndi, -/turf/unsimulated/floor{ - icon_state = "bar"; - dir = 2 +/turf/simulated/floor/plasteel{ + icon_state = "bar" }, /area/syndicate_mothership) "ey" = ( -/turf/unsimulated/floor{ - dir = 2; - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/syndicate_mothership) "ez" = ( /obj/item/radio/intercom/syndicate{ pixel_x = -28 }, -/turf/unsimulated/floor{ - dir = 2; - icon_state = "wood" - }, -/area/syndicate_mothership) -"eA" = ( -/turf/unsimulated/floor{ - name = "plating" - }, +/turf/simulated/floor/wood, /area/syndicate_mothership) "eB" = ( /turf/simulated/floor/holofloor{ @@ -1508,6 +1226,37 @@ icon_state = "green" }, /area/holodeck/source_basketball) +"eE" = ( +/obj/machinery/door/airlock/external{ + frequency = 1331; + icon_state = "door_locked"; + id_tag = "synd_inner"; + locked = 1; + name = "Ship External Access"; + req_access = null; + req_access_txt = "150" + }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 5; + icon_state = "intact" + }, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/syndicate) +"eF" = ( +/obj/structure/reagent_dispensers/watertank, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "bot" + }, +/area/shuttle/escape) +"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; @@ -1552,16 +1301,14 @@ /area/holodeck/source_thunderdomecourt) "eO" = ( /obj/machinery/vending/cigarette, -/turf/unsimulated/floor{ - icon_state = "cafeteria"; - dir = 2 +/turf/simulated/floor/plasteel{ + icon_state = "cafeteria" }, /area/ninja/holding) "eP" = ( /obj/structure/table, -/turf/unsimulated/floor{ - icon_state = "cafeteria"; - dir = 2 +/turf/simulated/floor/plasteel{ + icon_state = "cafeteria" }, /area/ninja/holding) "eQ" = ( @@ -1570,9 +1317,8 @@ "eR" = ( /obj/structure/chair/stool, /obj/machinery/light/spot, -/turf/unsimulated/floor{ - icon_state = "cafeteria"; - dir = 2 +/turf/simulated/floor/plasteel{ + icon_state = "cafeteria" }, /area/ninja/holding) "eS" = ( @@ -1580,59 +1326,68 @@ /obj/structure/window/reinforced{ dir = 4 }, -/turf/unsimulated/floor{ - icon_state = "cafeteria"; - dir = 2 +/turf/simulated/floor/plasteel{ + icon_state = "cafeteria" }, /area/ninja/holding) "eT" = ( /obj/machinery/light/spot{ - tag = "icon-tube1 (NORTH)"; + dir = 1; icon_state = "tube1"; - dir = 1 + tag = "icon-tube1 (NORTH)" }, /obj/machinery/computer/syndicate_depot/teleporter, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) "eU" = ( -/turf/unsimulated/wall/fakeglass{ - dir = 1; - icon_state = "fakewindows"; - tag = "icon-fakewindows (WEST)" - }, +/turf/simulated/wall/indestructible/opsglass, /area/syndicate_mothership) "eV" = ( +/obj/machinery/door/airlock/external{ + id_tag = "s_docking_airlock"; + name = "Shuttle Airlock"; + req_access_txt = "150" + }, +/obj/machinery/door/poddoor{ + density = 0; + icon_state = "open"; + id_tag = "syndicate_sit_1"; + name = "Side Hull Door"; + opacity = 0; + req_access_txt = "150" + }, +/obj/docking_port/mobile{ + dir = 8; + dwidth = 3; + height = 5; + id = "sit"; + name = "SIT shuttle"; + roundstart_move = null; + width = 11 + }, +/obj/structure/fans/tiny, +/obj/machinery/door_control{ + id = "syndicate_sit_1"; + name = "Blast Doors"; + pixel_x = 0; + pixel_y = -23; + req_access_txt = "150" + }, /obj/docking_port/stationary{ dir = 8; dwidth = 3; height = 5; id = "sit_away"; name = "Syndicate Base"; + turf_type = /turf/simulated/floor/plating/asteroid/snow/airless; width = 11 }, -/turf/unsimulated/floor{ - name = "plating" - }, -/area/syndicate_mothership) -"eW" = ( -/turf/unsimulated/wall{ - tag = "icon-iron13"; - icon_state = "iron13" - }, -/area/space) -"eX" = ( -/turf/unsimulated/wall{ - tag = "icon-iron9"; - icon_state = "iron9" - }, -/area/space) +/turf/simulated/floor/plating, +/area/shuttle/syndicate_sit) "eY" = ( /obj/effect/decal/warning_stripes/yellow, -/turf/unsimulated/floor{ - icon_state = "cafeteria"; - dir = 2 +/turf/simulated/floor/plasteel{ + icon_state = "cafeteria" }, /area/ninja/holding) "eZ" = ( @@ -1640,63 +1395,73 @@ id_tag = "sst_away"; req_access_txt = "150" }, -/turf/unsimulated/floor{ - name = "plating" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) "fa" = ( /obj/effect/landmark{ name = "Syndicate-Spawn" }, -/turf/unsimulated/floor{ - dir = 2; - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/syndicate_mothership) "fb" = ( /obj/effect/landmark{ name = "Holding Facility" }, /obj/machinery/light/spot{ - tag = "icon-tube1 (WEST)"; + dir = 8; icon_state = "tube1"; - dir = 8 - }, -/turf/unsimulated/floor{ - icon_state = "engine" + tag = "icon-tube1 (WEST)" }, +/turf/simulated/floor/engine, /area/ninja/holding) "fc" = ( +/obj/machinery/door/airlock/external{ + id_tag = "s_docking_airlock"; + name = "Shuttle Airlock"; + req_access_txt = "150" + }, +/obj/machinery/door/poddoor{ + density = 0; + icon_state = "open"; + id_tag = "syndicate_elite"; + name = "Side Hull Door"; + opacity = 0; + req_access_txt = "150" + }, +/obj/docking_port/mobile{ + dir = 4; + dwidth = 7; + height = 5; + id = "sst"; + name = "SST shuttle"; + roundstart_move = null; + width = 11 + }, +/obj/structure/fans/tiny, /obj/docking_port/stationary{ dir = 4; dwidth = 7; height = 5; id = "sst_away"; name = "Syndicate Base"; + turf_type = /turf/simulated/floor/plating/asteroid/snow/airless; width = 11 }, -/turf/unsimulated/floor{ - name = "plating" - }, -/area/syndicate_mothership) +/turf/simulated/floor/plating, +/area/shuttle/syndicate_elite) "fd" = ( /obj/item/flag/syndi, -/turf/unsimulated/floor{ - dir = 2; - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/syndicate_mothership) "fe" = ( /obj/machinery/cryopod/right, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/centcom/specops) "ff" = ( -/turf/unsimulated/wall, +/turf/simulated/wall/indestructible/wood, /area/ninja/outpost) "fg" = ( -/turf/unsimulated/wall, +/turf/simulated/wall/indestructible/wood, /area/ninja/holding) "fh" = ( /obj/structure/sign/double/map/left{ @@ -1705,78 +1470,52 @@ /obj/machinery/light, /obj/structure/rack/skeletal_bar/left, /obj/item/reagent_containers/food/drinks/bottle/vodka, -/turf/unsimulated/floor{ - dir = 2; - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/syndicate_mothership) "fi" = ( /obj/machinery/computer/shuttle/syndicate/recall, -/turf/unsimulated/floor{ - dir = 2; - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/syndicate_mothership) "fj" = ( /obj/structure/bookcase{ name = "Forbidden Knowledge" }, -/turf/unsimulated/floor{ - dir = 8; - icon_state = "wood" - }, +/turf/simulated/floor/engine/cult, /area/wizard_station) "fk" = ( /obj/structure/bookcase{ name = "Forbidden Knowledge" }, /obj/effect/decal/cleanable/cobweb, -/turf/unsimulated/floor{ - dir = 8; - icon_state = "wood" - }, +/turf/simulated/floor/engine/cult, /area/wizard_station) "fl" = ( /obj/machinery/cryopod, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/centcom/specops) "fm" = ( -/turf/unsimulated/wall, +/turf/simulated/wall/indestructible/riveted, /area/centcom/gamma) "fn" = ( /obj/machinery/computer/library/checkout, /obj/structure/table/wood, -/turf/unsimulated/floor{ - dir = 8; - icon_state = "wood" - }, +/turf/simulated/floor/engine/cult, /area/wizard_station) "fo" = ( -/turf/unsimulated/floor{ - dir = 8; - icon_state = "wood" - }, +/turf/simulated/floor/engine/cult, /area/wizard_station) "fp" = ( /obj/machinery/vending/snack/free, -/turf/unsimulated/floor{ - dir = 8; - icon_state = "wood" - }, +/turf/simulated/floor/engine/cult, /area/wizard_station) "fq" = ( /obj/machinery/vending/magivend, /obj/machinery/light/spot{ - tag = "icon-tube1 (NORTH)"; + dir = 1; icon_state = "tube1"; - dir = 1 - }, -/turf/unsimulated/floor{ - dir = 8; - icon_state = "wood" + tag = "icon-tube1 (NORTH)" }, +/turf/simulated/floor/engine/cult, /area/wizard_station) "fr" = ( /obj/structure/closet{ @@ -1794,42 +1533,42 @@ /obj/item/clothing/suit/wizrobe, /obj/item/clothing/shoes/sandal, /obj/item/clothing/shoes/sandal, -/turf/unsimulated/floor{ - dir = 9; - icon_state = "carpetside" - }, +/turf/simulated/floor/carpet, /area/wizard_station) "fs" = ( /obj/structure/bed, /obj/item/bedsheet/wiz, -/turf/unsimulated/floor{ - dir = 5; - icon_state = "carpetside" - }, +/turf/simulated/floor/carpet, /area/wizard_station) "ft" = ( /obj/structure/mirror/magic{ pixel_y = 28 }, -/turf/unsimulated/floor{ - dir = 1; - icon_state = "carpetside" - }, +/turf/simulated/floor/carpet, /area/wizard_station) "fu" = ( -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/ninja/outpost) "fv" = ( /obj/structure/ninjatele{ pixel_y = 25 }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/ninja/outpost) "fw" = ( +/obj/docking_port/mobile{ + dir = 8; + dwidth = 4; + height = 11; + id = "trade_sol"; + name = "sol trade shuttle"; + roundstart_move = null; + width = 9 + }, +/obj/machinery/door/airlock/titanium/glass{ + id_tag = "s_docking_airlock"; + req_one_access_txt = "0" + }, /obj/docking_port/stationary{ dir = 8; dwidth = 4; @@ -1838,103 +1577,66 @@ name = "docking bay 2 at Jupiter Station"; width = 9 }, -/turf/space, -/area/space) +/turf/simulated/floor/mineral/titanium/blue, +/area/shuttle/trade/sol) "fx" = ( -/turf/unsimulated/floor{ - dir = 8; - icon_state = "carpetside" - }, -/area/wizard_station) -"fy" = ( -/turf/unsimulated/floor{ - dir = 4; - icon_state = "carpetside" - }, +/turf/simulated/floor/carpet, /area/wizard_station) "fz" = ( /obj/effect/landmark/start{ name = "wizard" }, -/turf/unsimulated/floor{ - icon_state = "carpet"; - dir = 2 - }, +/turf/simulated/floor/carpet, /area/wizard_station) "fA" = ( /obj/structure/bookcase{ name = "bookcase (Tactics)" }, -/turf/unsimulated/floor{ - dir = 8; - icon_state = "wood" - }, +/turf/simulated/floor/engine/cult, /area/wizard_station) "fB" = ( /obj/item/radio/intercom/syndicate{ pixel_x = 28 }, -/turf/unsimulated/floor{ - dir = 8; - icon_state = "wood" - }, +/turf/simulated/floor/engine/cult, /area/wizard_station) "fC" = ( /obj/structure/table/wood, -/turf/unsimulated/floor{ - dir = 10; - icon_state = "carpetside" - }, +/turf/simulated/floor/carpet, /area/wizard_station) "fD" = ( /obj/structure/table/wood, /obj/effect/landmark{ name = "Teleport-Scroll" }, -/turf/unsimulated/floor{ - dir = 6; - icon_state = "carpetside" - }, -/area/wizard_station) -"fE" = ( -/turf/unsimulated/floor{ - dir = 2; - icon_state = "carpetside" - }, +/turf/simulated/floor/carpet, /area/wizard_station) "fF" = ( /obj/effect/spawner/window/reinforced, -/turf/unsimulated/floor{ - icon_state = "floor" - }, +/turf/simulated/floor/plating, /area/centcom/gamma) "fG" = ( /obj/machinery/door/poddoor{ id_tag = "thunderdomeaxe"; name = "Axe Supply" }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/tdome/arena_source) "fH" = ( -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, /area/ninja/holding) "fI" = ( /obj/effect/overlay/palmtree_r, /obj/effect/overlay/coconut, -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, /area/ninja/holding) "fJ" = ( /obj/structure/chair/comfy/purp, -/turf/unsimulated/floor{ - dir = 8; - icon_state = "wood" - }, +/turf/simulated/floor/engine/cult, /area/wizard_station) "fK" = ( /obj/effect/overlay/palmtree_l, -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, /area/ninja/holding) "fL" = ( /obj/machinery/computer/cryopod{ @@ -1942,24 +1644,19 @@ pixel_x = 0; pixel_y = 32 }, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/trader_station/sol) "fM" = ( /obj/machinery/door/poddoor{ id_tag = "thunderdomegen"; name = "General Supply" }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/tdome/arena_source) "fN" = ( /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 8 + dir = 8; + icon_state = "red" }, /area/tdome/arena_source) "fO" = ( @@ -1967,40 +1664,29 @@ id_tag = "thunderdome"; name = "Thunderdome Blast Door" }, -/turf/unsimulated/floor{ - name = "plating" - }, +/turf/simulated/floor/plating, /area/tdome/arena_source) "fP" = ( /turf/simulated/floor/plasteel{ - icon_state = "green"; - dir = 4 + dir = 4; + icon_state = "green" }, /area/tdome/arena_source) "fQ" = ( /obj/structure/bookcase, -/turf/unsimulated/floor{ - dir = 8; - icon_state = "wood" - }, +/turf/simulated/floor/engine/cult, /area/wizard_station) "fR" = ( /obj/structure/chair/comfy/purp{ dir = 4 }, -/turf/unsimulated/floor{ - dir = 8; - icon_state = "wood" - }, +/turf/simulated/floor/engine/cult, /area/wizard_station) "fS" = ( /obj/structure/table/wood, /obj/item/dice/d20, /obj/item/dice, -/turf/unsimulated/floor{ - dir = 8; - icon_state = "wood" - }, +/turf/simulated/floor/engine/cult, /area/wizard_station) "fT" = ( /turf/simulated/floor/holofloor{ @@ -2013,10 +1699,7 @@ /obj/machinery/recharger{ pixel_y = 0 }, -/turf/unsimulated/floor{ - dir = 8; - icon_state = "wood" - }, +/turf/simulated/floor/engine/cult, /area/wizard_station) "fV" = ( /obj/machinery/power/apc{ @@ -2032,71 +1715,50 @@ pixel_x = -32; pixel_y = 0 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/gamma/space) "fW" = ( /obj/machinery/light/spot{ - tag = "icon-tube1 (WEST)"; - icon_state = "tube1"; - dir = 8 - }, -/turf/unsimulated/floor{ dir = 8; - icon_state = "wood" + icon_state = "tube1"; + tag = "icon-tube1 (WEST)" }, +/turf/simulated/floor/engine/cult, /area/wizard_station) "fX" = ( /obj/structure/table/wood, /obj/item/stack/spacecash, -/turf/unsimulated/floor{ - dir = 8; - icon_state = "wood" - }, +/turf/simulated/floor/engine/cult, /area/wizard_station) "fY" = ( /obj/structure/table/wood, /obj/item/reagent_containers/food/drinks/mugwort, -/turf/unsimulated/floor{ - dir = 8; - icon_state = "wood" - }, +/turf/simulated/floor/engine/cult, /area/wizard_station) "fZ" = ( /obj/machinery/cryopod/right, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/trader_station/sol) "ga" = ( /obj/machinery/light/spot{ - tag = "icon-tube1 (WEST)"; + dir = 8; icon_state = "tube1"; - dir = 8 - }, -/turf/unsimulated/floor{ - icon_state = "dark" + tag = "icon-tube1 (WEST)" }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) "gb" = ( /obj/machinery/light/spot{ - tag = "icon-tube1 (EAST)"; + dir = 4; icon_state = "tube1"; - dir = 4 - }, -/turf/unsimulated/floor{ - icon_state = "dark" + tag = "icon-tube1 (EAST)" }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) "gc" = ( /obj/machinery/light, /obj/machinery/cryopod/right, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/trader_station/sol) "gd" = ( /obj/structure/rack, @@ -2106,38 +1768,19 @@ /obj/item/clothing/suit/wizrobe/magusred, /obj/item/clothing/head/wizard/magus, /obj/item/twohanded/staff, -/turf/unsimulated/floor{ - icon_state = "grimy" - }, +/turf/simulated/floor/wood, /area/wizard_station) -"ge" = ( -/turf/unsimulated/floor/snow, -/turf/simulated/shuttle/wall{ - icon_state = "diagonalWall3" - }, -/area/syndicate_mothership) "gf" = ( /obj/item/camera, -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, /area/ninja/holding) "gg" = ( /obj/machinery/light/spot{ - tag = "icon-tube1 (NORTH)"; + dir = 1; icon_state = "tube1"; - dir = 1 - }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, -/area/syndicate_mothership) -"gh" = ( -/turf/unsimulated/floor{ - icon_state = "dark" - }, -/turf/simulated/shuttle/wall{ - dir = 4; - icon_state = "diagonalWall3" + tag = "icon-tube1 (NORTH)" }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) "gi" = ( /obj/effect/decal/warning_stripes/southeastcorner, @@ -2151,65 +1794,33 @@ id = "flash"; name = "Thunderdome Flash" }, -/turf/simulated/floor/bluegrid, +/turf/simulated/floor/plasteel, /area/tdome/arena_source) "gl" = ( /obj/item/flag/wiz, -/turf/unsimulated/floor{ - dir = 8; - icon_state = "wood" - }, +/turf/simulated/floor/engine/cult, /area/wizard_station) -"gm" = ( -/turf/unsimulated/floor{ - icon_state = "dark" - }, -/turf/simulated/shuttle/wall{ - tag = "icon-diagonalWall3"; - icon_state = "diagonalWall3"; - dir = 2 - }, -/area/syndicate_mothership) "gn" = ( /obj/machinery/camera{ - pixel_x = 10; + c_tag = "Thunderdome Arena"; network = list("Thunderdome"); - c_tag = "Thunderdome Arena" + pixel_x = 10 }, -/turf/simulated/floor/bluegrid, +/turf/simulated/floor/plasteel, /area/tdome/arena_source) -"go" = ( -/turf/unsimulated/wall/fakeglass{ - tag = "icon-fakewindows2 (WEST)"; - icon_state = "fakewindows2"; - dir = 8 - }, -/area/wizard_station) "gp" = ( -/turf/unsimulated/wall/fakeglass{ - tag = "icon-fakewindows (WEST)"; - icon_state = "fakewindows"; - dir = 8 +/turf/simulated/wall/indestructible/fakeglass{ + color = "#008000" }, /area/wizard_station) "gq" = ( /obj/item/trash/raisins, -/turf/unsimulated/floor{ - dir = 8; - icon_state = "wood" - }, +/turf/simulated/floor/engine/cult, /area/wizard_station) "gr" = ( /obj/item/beach_ball, /turf/simulated/floor/beach/sand, /area/holodeck/source_beach) -"gs" = ( -/turf/unsimulated/wall/fakeglass{ - tag = "icon-fakewindows (NORTHEAST)"; - icon_state = "fakewindows"; - dir = 5 - }, -/area/wizard_station) "gt" = ( /obj/docking_port/stationary/transit{ dir = 8; @@ -2226,20 +1837,14 @@ "gv" = ( /obj/structure/table/reinforced, /obj/structure/kitchenspike, -/turf/unsimulated/floor{ - dir = 4; - icon_state = "chapel" - }, +/turf/simulated/floor/wood, /area/wizard_station) "gw" = ( /obj/structure/showcase, /obj/structure/window/reinforced/clockwork{ dir = 8 }, -/turf/unsimulated/floor{ - dir = 1; - icon_state = "chapel" - }, +/turf/simulated/floor/wood, /area/wizard_station) "gx" = ( /obj/effect/decal/warning_stripes/south, @@ -2248,67 +1853,25 @@ "gy" = ( /obj/effect/decal/cleanable/cobweb2, /obj/structure/showcase, -/turf/unsimulated/floor{ - dir = 4; - icon_state = "chapel" - }, -/area/wizard_station) -"gz" = ( -/obj/structure/table/reinforced, -/obj/structure/kitchenspike, -/turf/unsimulated/floor{ - dir = 1; - icon_state = "chapel" - }, +/turf/simulated/floor/wood, /area/wizard_station) "gA" = ( /obj/structure/window/reinforced{ dir = 4 }, /obj/machinery/sleeper/upgraded, -/turf/unsimulated/floor{ - icon_state = "grimy" - }, +/turf/simulated/floor/plasteel/grimy, /area/ninja/outpost) -"gB" = ( -/turf/unsimulated/floor/snow, -/turf/simulated/shuttle/wall{ - dir = 4; - icon_state = "diagonalWall3" - }, -/area/syndicate_mothership) "gC" = ( -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, +/turf/simulated/floor/grass, /area/wizard_station) "gD" = ( /obj/effect/decal/remains/human, -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, -/area/wizard_station) -"gE" = ( -/turf/unsimulated/wall/fakeglass{ - tag = "icon-fakewindows2 (NORTH)"; - icon_state = "fakewindows2"; - dir = 1 - }, -/area/wizard_station) -"gF" = ( -/turf/unsimulated/floor{ - dir = 8; - icon_state = "chapel" - }, +/turf/simulated/floor/grass, /area/wizard_station) "gG" = ( /mob/living/carbon/human/monkey, -/turf/unsimulated/floor{ - dir = 8; - icon_state = "chapel" - }, +/turf/simulated/floor/wood, /area/wizard_station) "gH" = ( /obj/docking_port/stationary/transit{ @@ -2323,18 +1886,14 @@ /area/space) "gI" = ( /obj/machinery/vending/syndisnack, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) "gJ" = ( /obj/machinery/door/poddoor{ id_tag = "thunderdomehea"; name = "Heavy Supply" }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/tdome/arena_source) "gK" = ( /obj/item/beach_ball/holoball, @@ -2344,38 +1903,16 @@ /mob/living/simple_animal/hostile/creature{ name = "Experiment 35b" }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, +/turf/simulated/floor/grass, /area/wizard_station) -"gM" = ( -/turf/unsimulated/floor{ - dir = 4; - icon_state = "chapel" - }, -/area/wizard_station) -"gN" = ( -/turf/unsimulated/floor{ - dir = 1; - icon_state = "chapel" - }, -/area/wizard_station) -"gO" = ( -/turf/unsimulated/wall/fakeglass, -/area/ninja/outpost) "gP" = ( /obj/effect/landmark{ name = "ninjastart" }, -/turf/unsimulated/floor{ - icon_state = "grimy" - }, +/turf/simulated/floor/plasteel/grimy, /area/ninja/outpost) "gQ" = ( -/turf/unsimulated/floor{ - icon_state = "grimy" - }, +/turf/simulated/floor/plasteel/grimy, /area/ninja/outpost) "gR" = ( /obj/structure/rack, @@ -2389,13 +1926,11 @@ pixel_x = 3; pixel_y = -30 }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/tdome/arena_source) "gS" = ( /obj/item/beach_ball, -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, /area/ninja/holding) "gT" = ( /obj/structure/rack, @@ -2409,24 +1944,16 @@ pixel_x = 3; pixel_y = -30 }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/tdome/arena_source) "gU" = ( /obj/effect/decal/cleanable/molten_object, -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, +/turf/simulated/floor/grass, /area/wizard_station) "gV" = ( /obj/item/trash/chips, /obj/machinery/light/spot, -/turf/unsimulated/floor{ - dir = 8; - icon_state = "wood" - }, +/turf/simulated/floor/engine/cult, /area/wizard_station) "gW" = ( /obj/structure/rack, @@ -2434,23 +1961,11 @@ /obj/structure/window/reinforced/clockwork{ dir = 8 }, -/turf/unsimulated/floor{ - dir = 8; - icon_state = "chapel" - }, -/area/wizard_station) -"gX" = ( -/obj/effect/decal/cleanable/blood, -/turf/unsimulated/floor{ - dir = 8; - icon_state = "chapel" - }, +/turf/simulated/floor/wood, /area/wizard_station) "gY" = ( /obj/machinery/vending/syndicigs, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) "gZ" = ( /obj/docking_port/stationary/transit{ @@ -2498,11 +2013,11 @@ /turf/space/transit, /area/space) "he" = ( -/turf/unsimulated/beach/coastline, +/turf/simulated/floor/beach/away/coastline, /area/ninja/holding) "hf" = ( /obj/item/clothing/head/collectable/paper, -/turf/unsimulated/beach/coastline, +/turf/simulated/floor/beach/away/coastline, /area/ninja/holding) "hg" = ( /obj/effect/decal/warning_stripes/south, @@ -2530,154 +2045,76 @@ height = 18; id = "emergency_syndicate"; name = "404 Not Found"; - turf_type = /turf/unsimulated/floor/snow; + turf_type = /turf/simulated/floor/plating/asteroid/snow/airless; width = 29 }, -/turf/unsimulated/floor/snow, -/area/syndicate_mothership) -"hj" = ( -/turf/unsimulated/floor/snow, -/turf/unsimulated/floor/snow{ - tag = "icon-gravsnow_corner (EAST)"; - icon_state = "gravsnow_corner"; - dir = 4 - }, +/turf/simulated/floor/plating/asteroid/snow/airless, /area/syndicate_mothership) "hl" = ( /obj/machinery/door/airlock/external{ id_tag = "syndicate_away"; req_access_txt = "150" }, -/turf/unsimulated/floor{ - icon_state = "bar"; - dir = 2 - }, -/area/syndicate_mothership) -"hm" = ( -/turf/unsimulated/floor/snow, -/turf/unsimulated/floor/snow{ - tag = "icon-gravsnow_corner (WEST)"; - icon_state = "gravsnow_corner"; - dir = 8 +/turf/simulated/floor/plasteel{ + icon_state = "bar" }, /area/syndicate_mothership) "hn" = ( -/turf/unsimulated/floor{ - icon_state = "bar"; - dir = 2 - }, -/area/syndicate_mothership) -"ho" = ( -/turf/unsimulated/wall/fakeglass{ - icon_state = "fakewindows"; - dir = 1 +/turf/simulated/floor/plasteel{ + icon_state = "bar" }, /area/syndicate_mothership) "hq" = ( -/turf/unsimulated/floor/snow, -/turf/unsimulated/floor/snow{ - tag = "icon-gravsnow_corner (SOUTHEAST)"; - icon_state = "gravsnow_corner"; - dir = 6 - }, -/area/syndicate_mothership) -"hr" = ( -/turf/unsimulated/wall/fakeglass{ - dir = 0; - icon_state = "fakewindows"; - tag = "icon-fakewindows (EAST)" - }, -/area/syndicate_mothership) -"hs" = ( -/turf/unsimulated/floor/snow, -/turf/unsimulated/floor/snow{ - tag = "icon-gravsnow_corner (SOUTHWEST)"; - icon_state = "gravsnow_corner"; - dir = 10 - }, -/area/syndicate_mothership) -"hu" = ( -/turf/unsimulated/wall/fakeglass{ - icon_state = "fakewindows"; - dir = 8 - }, +/obj/item/disk/plantgene, +/turf/simulated/floor/plating/asteroid/snow/airless, /area/syndicate_mothership) +"ht" = ( +/obj/structure/rack, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/vox) "hv" = ( -/turf/unsimulated/beach/water, +/turf/simulated/floor/beach/away/water, /area/ninja/holding) "hw" = ( /obj/machinery/light/spot, -/turf/unsimulated/beach/water, +/turf/simulated/floor/beach/away/water, /area/ninja/holding) "hx" = ( /obj/effect/decal/warning_stripes/southwestcorner, /turf/simulated/floor/plating/airless, /area/syndicate_mothership) -"hy" = ( -/turf/unsimulated/wall/fakeglass{ - tag = "icon-fakewindows (EAST)"; - icon_state = "fakewindows"; - dir = 4 - }, -/area/syndicate_mothership) -"hz" = ( -/turf/unsimulated/wall/fakeglass{ - tag = "icon-fakewindows2 (WEST)"; - icon_state = "fakewindows2"; - dir = 8 - }, -/area/syndicate_mothership) "hA" = ( /obj/machinery/door/airlock/hatch/syndicate{ name = "Shuttle Dock" }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) "hB" = ( /obj/machinery/light{ dir = 1; on = 1 }, -/turf/unsimulated/floor{ - icon_state = "bar"; - dir = 2 +/turf/simulated/floor/plasteel{ + icon_state = "bar" }, /area/syndicate_mothership) "hC" = ( /obj/effect/spawner/window/reinforced, -/turf/unsimulated/floor{ - name = "plating" - }, +/turf/simulated/floor/plating, /area/ninja/holding) "hD" = ( /obj/machinery/light{ dir = 4 }, -/turf/unsimulated/floor{ - icon_state = "bar"; - dir = 2 - }, -/area/syndicate_mothership) -"hE" = ( -/turf/unsimulated/floor/snow, -/turf/unsimulated/floor/snow{ - icon_state = "gravsnow_corner" - }, -/turf/unsimulated/floor/snow{ - tag = "icon-gravsnow_corner (NORTH)"; - icon_state = "gravsnow_corner"; - dir = 1 +/turf/simulated/floor/plasteel{ + icon_state = "bar" }, /area/syndicate_mothership) "hF" = ( /obj/effect/landmark{ name = "Holding Facility" }, -/turf/unsimulated/floor{ - icon_state = "engine" - }, +/turf/simulated/floor/engine, /area/ninja/holding) "hG" = ( /obj/machinery/light{ @@ -2685,52 +2122,38 @@ }, /turf/simulated/floor/plating/airless, /area/syndicate_mothership) -"hI" = ( -/turf/unsimulated/floor/snow, -/turf/unsimulated/floor/snow{ - tag = "icon-gravsnow_corner (NORTH)"; - icon_state = "gravsnow_corner"; - dir = 1 - }, -/area/syndicate_mothership) -"hK" = ( -/turf/unsimulated/floor/snow, -/turf/unsimulated/floor/snow{ - tag = "icon-gravsnow_corner (NORTHEAST)"; - icon_state = "gravsnow_corner"; - dir = 5 - }, -/area/syndicate_mothership) -"hM" = ( -/turf/unsimulated/wall/fakeglass{ - dir = 8; - icon_state = "fakewindows3"; - tag = "icon-fakewindows (WEST)" - }, -/area/syndicate_mothership) "hN" = ( /obj/structure/sign/double/map/left{ pixel_y = 32 }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) "hO" = ( /obj/machinery/washing_machine, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) +"hP" = ( +/obj/machinery/computer/communications, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/administration) "hQ" = ( /obj/structure/table, /obj/item/storage/fancy/crayons, /obj/item/storage/fancy/crayons, -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, +/turf/simulated/floor/plasteel/freezer, /area/syndicate_mothership) +"hR" = ( +/obj/machinery/bodyscanner, +/obj/machinery/light/spot, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/vox) +"hU" = ( +/obj/structure/AIcore, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/vox) +"hV" = ( +/turf/simulated/floor/mineral/titanium, +/area/shuttle/trade/sol) "hX" = ( /obj/item/storage/fancy/crayons, /obj/machinery/light{ @@ -2739,26 +2162,56 @@ }, /obj/structure/table, /obj/item/storage/fancy/crayons, -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, +/turf/simulated/floor/plasteel/freezer, /area/syndicate_mothership) +"hY" = ( +/obj/structure/shuttle/engine/propulsion{ + icon_state = "propulsion_l"; + tag = "icon-propulsion_l" + }, +/turf/simulated/floor/plating/airless, +/area/shuttle/syndicate) +"ic" = ( +/obj/structure/closet/fireaxecabinet{ + pixel_x = 32; + pixel_y = 0 + }, +/obj/machinery/light{ + dir = 1; + on = 1 + }, +/obj/structure/chair/comfy/shuttle, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "neutralcorner" + }, +/area/shuttle/escape) +"id" = ( +/turf/simulated/floor/plasteel{ + dir = 2; + icon_state = "browncorner" + }, +/area/shuttle/escape) "ie" = ( /obj/machinery/washing_machine, -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, +/turf/simulated/floor/plasteel/freezer, /area/syndicate_mothership) +"ig" = ( +/obj/structure/bed/roller, +/obj/machinery/iv_drip, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "whiteblue"; + tag = "icon-whiteblue (EAST)" + }, +/area/shuttle/escape) "ih" = ( -/turf/unsimulated/wall, +/turf/simulated/wall/indestructible/uranium, /area/wizard_station) "ii" = ( /obj/machinery/computer/shuttle/syndicate/recall, -/turf/unsimulated/floor{ - icon_state = "bar"; - dir = 2 +/turf/simulated/floor/plasteel{ + icon_state = "bar" }, /area/syndicate_mothership) "ij" = ( @@ -2767,33 +2220,27 @@ pixel_y = 25 }, /obj/item/twohanded/required/kirbyplants, -/turf/unsimulated/floor{ - icon_state = "bar"; - dir = 2 +/turf/simulated/floor/plasteel{ + icon_state = "bar" }, /area/syndicate_mothership) "ik" = ( /obj/machinery/vending/syndicigs, -/turf/unsimulated/floor{ - icon_state = "bar"; - dir = 2 +/turf/simulated/floor/plasteel{ + icon_state = "bar" }, /area/syndicate_mothership) "il" = ( /obj/machinery/vending/syndisnack, -/turf/unsimulated/floor{ - icon_state = "bar"; - dir = 2 +/turf/simulated/floor/plasteel{ + icon_state = "bar" }, /area/syndicate_mothership) "im" = ( /obj/structure/urinal{ pixel_y = 28 }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, +/turf/simulated/floor/plasteel/freezer, /area/syndicate_mothership) "in" = ( /obj/item/mop, @@ -2801,10 +2248,7 @@ pixel_x = 28 }, /obj/item/twohanded/required/kirbyplants, -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, +/turf/simulated/floor/plasteel/freezer, /area/syndicate_mothership) "io" = ( /obj/item/soap/syndie, @@ -2812,37 +2256,25 @@ /obj/machinery/light{ dir = 1 }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, +/turf/simulated/floor/plasteel/freezer, /area/syndicate_mothership) "ip" = ( /obj/machinery/light/spot, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership/jail) "iq" = ( /obj/structure/noticeboard{ pixel_x = -32 }, /obj/item/paper/syndimemo, -/turf/unsimulated/floor{ - icon_state = "bar"; - dir = 2 +/turf/simulated/floor/plasteel{ + icon_state = "bar" }, /area/syndicate_mothership) "is" = ( /mob/living/simple_animal/pet/dog/fox/Syndifox, -/turf/unsimulated/floor{ - icon_state = "bar"; - dir = 2 - }, -/area/syndicate_mothership) -"it" = ( -/turf/simulated/shuttle/wall{ - icon_state = "wall3" +/turf/simulated/floor/plasteel{ + icon_state = "bar" }, /area/syndicate_mothership) "iu" = ( @@ -2850,31 +2282,22 @@ /turf/simulated/floor/plating/airless, /area/syndicate_mothership) "iv" = ( -/turf/simulated/shuttle/wall{ - icon_state = "wall3" - }, +/turf/simulated/wall/mineral/plastitanium, /area/shuttle/assault_pod) "iw" = ( /obj/structure/rack, /obj/item/clothing/under/plasmaman/wizard, /obj/item/clothing/head/helmet/space/plasmaman/wizard, /obj/item/clothing/mask/breath, -/obj/item/tank/plasma/plasmaman/belt/full, -/turf/unsimulated/floor{ - icon_state = "grimy" - }, +/obj/item/tank/internals/plasmaman/belt/full, +/turf/simulated/floor/wood, /area/wizard_station) "ix" = ( /obj/machinery/sleeper/syndie, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) "iy" = ( -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, +/turf/simulated/floor/plasteel/freezer, /area/syndicate_mothership) "iz" = ( /obj/machinery/door/airlock/centcom{ @@ -2882,9 +2305,8 @@ opacity = 1; req_access_txt = "150" }, -/turf/unsimulated/floor{ - icon_state = "bar"; - dir = 2 +/turf/simulated/floor/plasteel{ + icon_state = "bar" }, /area/syndicate_mothership) "iA" = ( @@ -2897,28 +2319,23 @@ pixel_x = 11; pixel_y = 0 }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, +/turf/simulated/floor/plasteel/freezer, /area/syndicate_mothership) "iB" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, -/turf/unsimulated/floor{ - icon_state = "bar"; - dir = 2 +/turf/simulated/floor/plasteel{ + icon_state = "bar" }, /area/syndicate_mothership) "iC" = ( /obj/structure/table/wood, /obj/item/pizzabox, /obj/item/paicard/syndicate, -/turf/unsimulated/floor{ - icon_state = "bar"; - dir = 2 +/turf/simulated/floor/plasteel{ + icon_state = "bar" }, /area/syndicate_mothership) "iD" = ( @@ -2927,16 +2344,13 @@ pixel_x = -2; pixel_y = 5 }, -/turf/unsimulated/floor{ - icon_state = "bar"; - dir = 2 +/turf/simulated/floor/plasteel{ + icon_state = "bar" }, /area/syndicate_mothership) "iE" = ( /obj/structure/closet/syndicate/sst, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) "iF" = ( /obj/structure/toilet{ @@ -2951,15 +2365,21 @@ opacity = 1; req_access_txt = "150" }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, +/turf/simulated/floor/plasteel/freezer, /area/syndicate_mothership) "iG" = ( /obj/effect/decal/warning_stripes/southwest, /turf/simulated/floor/plating/airless, /area/syndicate_mothership) +"iH" = ( +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/syndicate) "iI" = ( /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plating/airless, @@ -2971,18 +2391,10 @@ }, /turf/simulated/floor/plating/airless, /area/syndicate_mothership) -"iK" = ( -/turf/unsimulated/wall/fakeglass{ - tag = "icon-fakewindows (NORTHWEST)"; - icon_state = "fakewindows"; - dir = 9 - }, -/area/syndicate_mothership) "iL" = ( /obj/item/twohanded/required/kirbyplants, -/turf/unsimulated/floor{ - icon_state = "bar"; - dir = 2 +/turf/simulated/floor/plasteel{ + icon_state = "bar" }, /area/syndicate_mothership) "iM" = ( @@ -2995,9 +2407,8 @@ pixel_x = -6; pixel_y = 6 }, -/turf/unsimulated/floor{ - icon_state = "bar"; - dir = 2 +/turf/simulated/floor/plasteel{ + icon_state = "bar" }, /area/syndicate_mothership) "iN" = ( @@ -3006,9 +2417,8 @@ pixel_x = -5; pixel_y = 5 }, -/turf/unsimulated/floor{ - icon_state = "bar"; - dir = 2 +/turf/simulated/floor/plasteel{ + icon_state = "bar" }, /area/syndicate_mothership) "iP" = ( @@ -3020,31 +2430,22 @@ }, /turf/simulated/floor/plating, /area/shuttle/assault_pod) -"iR" = ( -/turf/unsimulated/wall/fakeglass{ - tag = "icon-fakewindows2 (NORTH)"; - icon_state = "fakewindows2"; - dir = 1 +"iQ" = ( +/obj/machinery/light{ + dir = 1; + on = 1 }, -/area/syndicate_mothership) +/turf/simulated/floor/plasteel{ + icon_state = "neutral" + }, +/area/shuttle/escape) "iS" = ( -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/assault_pod) "iT" = ( /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plating/airless, /area/syndicate_mothership) -"iU" = ( -/obj/machinery/door/poddoor{ - id_tag = "nukeop_ready"; - name = "Shuttle Dock Door" - }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, -/area/syndicate_mothership) "iV" = ( /turf/simulated/floor/plating, /area/syndicate_mothership) @@ -3060,9 +2461,8 @@ /area/syndicate_mothership) "iY" = ( /mob/living/simple_animal/pet/cat/Syndi, -/turf/unsimulated/floor{ - icon_state = "bar"; - dir = 2 +/turf/simulated/floor/plasteel{ + icon_state = "bar" }, /area/syndicate_mothership) "iZ" = ( @@ -3070,12 +2470,10 @@ id_tag = "syndicate_away"; req_access_txt = "150" }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel, /area/syndicate_mothership) "ja" = ( -/turf/unsimulated/wall, +/turf/simulated/wall/indestructible/riveted, /area/tdome/arena) "jb" = ( /obj/machinery/igniter/on, @@ -3084,26 +2482,16 @@ "jc" = ( /turf/simulated/floor/plasteel, /area/tdome/arena) -"jd" = ( -/turf/unsimulated/wall/fakeglass{ - tag = "icon-fakewindows (WEST)"; - icon_state = "fakewindows"; - dir = 8 - }, -/area/syndicate_mothership) "je" = ( -/turf/unsimulated/floor{ - icon_state = "grimy" - }, +/turf/simulated/floor/wood, /area/wizard_station) "jf" = ( /obj/structure/chair/stool/bar, /obj/effect/landmark{ name = "Syndicate-Spawn" }, -/turf/unsimulated/floor{ - icon_state = "bar"; - dir = 2 +/turf/simulated/floor/plasteel{ + icon_state = "bar" }, /area/syndicate_mothership) "jg" = ( @@ -3115,18 +2503,15 @@ req_access_txt = "151" }, /obj/item/twohanded/required/kirbyplants, -/turf/unsimulated/floor{ - icon_state = "bar"; - dir = 2 +/turf/simulated/floor/plasteel{ + icon_state = "bar" }, /area/syndicate_mothership) "jh" = ( /obj/structure/sign/double/map/right{ pixel_y = 32 }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) "ji" = ( /obj/machinery/door_control{ @@ -3136,22 +2521,15 @@ pixel_y = -2; req_access_txt = "150" }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) "jj" = ( /obj/machinery/computer/shuttle/syndicate/drop_pod, -/turf/simulated/shuttle/wall{ - icon_state = "wall3" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/assault_pod) "jk" = ( /obj/structure/table/wood, -/turf/unsimulated/floor{ - dir = 2; - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/syndicate_mothership) "jl" = ( /obj/structure/rack, @@ -3160,48 +2538,35 @@ /obj/item/clothing/suit/armor/tdome/red, /obj/item/clothing/head/helmet/thunderdome, /obj/item/melee/energy/sword/saber/red, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/tdome/arena_source) "jm" = ( /obj/structure/table/wood, /obj/item/storage/box/drinkingglasses, /obj/item/reagent_containers/food/drinks/bottle/rum, -/turf/unsimulated/floor{ - dir = 2; - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/syndicate_mothership) "jn" = ( /obj/structure/table/wood, /obj/item/syndicatedetonator, -/turf/unsimulated/floor{ - dir = 2; - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/syndicate_mothership) "jo" = ( /obj/structure/table/wood, /obj/item/toy/nuke, -/turf/unsimulated/floor{ - dir = 2; - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/syndicate_mothership) "jp" = ( /turf/simulated/floor/plasteel, /area/tdome/arena_source) "jq" = ( /obj/machinery/light/spot{ - tag = "icon-tube1 (EAST)"; + dir = 4; icon_state = "tube1"; - dir = 4 + tag = "icon-tube1 (EAST)" }, /obj/structure/closet/syndicate/sst, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) "jr" = ( /obj/structure/rack, @@ -3210,29 +2575,23 @@ /obj/item/clothing/suit/armor/tdome/green, /obj/item/clothing/head/helmet/thunderdome, /obj/item/melee/energy/sword/saber/green, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/tdome/arena_source) "js" = ( /obj/structure/table/reinforced, /obj/item/syndicatedetonator, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) "jt" = ( /obj/machinery/light/small{ - tag = "icon-bulb1 (EAST)"; + dir = 4; icon_state = "bulb1"; - dir = 4 + tag = "icon-bulb1 (EAST)" }, /obj/structure/chair/comfy/shuttle{ dir = 8 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/assault_pod) "ju" = ( /obj/effect/decal/warning_stripes/northeast, @@ -3244,16 +2603,14 @@ /area/syndicate_mothership) "jw" = ( /obj/machinery/light/small{ - tag = "icon-bulb1 (WEST)"; + dir = 8; icon_state = "bulb1"; - dir = 8 + tag = "icon-bulb1 (WEST)" }, /obj/structure/chair/comfy/shuttle{ dir = 4 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/assault_pod) "jx" = ( /obj/effect/decal/warning_stripes/northwest, @@ -3286,16 +2643,14 @@ name = "\improper FOURTH WALL"; pixel_x = -32 }, -/turf/unsimulated/floor/snow, +/turf/simulated/floor/plating/asteroid/snow/airless, /area/syndicate_mothership) "jC" = ( /obj/machinery/door/poddoor/impassable{ id_tag = "sit_tele"; name = "Teleporter" }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) "jD" = ( /obj/structure/table/reinforced, @@ -3310,9 +2665,7 @@ /obj/item/healthupgrade{ pixel_x = 6 }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) "jE" = ( /obj/structure/rack, @@ -3320,9 +2673,7 @@ /obj/item/clothing/shoes/sandal/marisa, /obj/item/clothing/head/wizard/marisa, /obj/item/twohanded/staff/broom, -/turf/unsimulated/floor{ - icon_state = "grimy" - }, +/turf/simulated/floor/wood, /area/wizard_station) "jF" = ( /obj/structure/table/reinforced, @@ -3334,9 +2685,7 @@ pixel_y = -1 }, /obj/item/multitool, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) "jG" = ( /obj/machinery/light/spot, @@ -3348,10 +2697,21 @@ pixel_y = 4 }, /obj/item/radio/beacon/syndicate/bomb, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /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, +/area/shuttle/syndicate) "jI" = ( /turf/space, /area/adminconstruction) @@ -3370,10 +2730,7 @@ name = "Uplink Management Control"; req_access_txt = "151" }, -/turf/unsimulated/floor{ - dir = 2; - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/syndicate_mothership) "jO" = ( /obj/structure/sign/double/map/right{ @@ -3381,38 +2738,35 @@ }, /obj/structure/rack/skeletal_bar/right, /obj/item/reagent_containers/food/drinks/bottle/gin, -/turf/unsimulated/floor{ - dir = 2; - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/syndicate_mothership) "jP" = ( -/turf/unsimulated/wall/abductor{ +/turf/simulated/wall/indestructible/abductor{ icon_state = "alien21" }, /area/abductor_ship) "jQ" = ( -/turf/unsimulated/wall/abductor{ +/turf/simulated/wall/indestructible/abductor{ icon_state = "alien20" }, /area/abductor_ship) "jR" = ( -/turf/unsimulated/wall/abductor{ +/turf/simulated/wall/indestructible/abductor{ icon_state = "alien23" }, /area/abductor_ship) "jS" = ( -/turf/unsimulated/wall/abductor{ +/turf/simulated/wall/indestructible/abductor{ icon_state = "alien22" }, /area/abductor_ship) "jT" = ( -/turf/unsimulated/wall/abductor{ +/turf/simulated/wall/indestructible/abductor{ icon_state = "alien24" }, /area/abductor_ship) "jU" = ( -/turf/unsimulated/wall/abductor{ +/turf/simulated/wall/indestructible/abductor{ icon_state = "alien16" }, /area/abductor_ship) @@ -3420,10 +2774,10 @@ /obj/machinery/abductor/experiment{ team = 1 }, -/turf/unsimulated/floor/abductor, +/turf/simulated/floor/plating/abductor, /area/abductor_ship) "jW" = ( -/turf/unsimulated/wall/abductor{ +/turf/simulated/wall/indestructible/abductor{ icon_state = "alien17" }, /area/abductor_ship) @@ -3431,21 +2785,21 @@ /obj/machinery/abductor/pad{ team = 1 }, -/turf/unsimulated/floor/abductor, +/turf/simulated/floor/plating/abductor, /area/abductor_ship) "jY" = ( /obj/machinery/abductor/console{ team = 1 }, -/turf/unsimulated/floor/abductor, +/turf/simulated/floor/plating/abductor, /area/abductor_ship) "jZ" = ( -/turf/unsimulated/wall/abductor{ +/turf/simulated/wall/indestructible/abductor{ icon_state = "alien19" }, /area/abductor_ship) "ka" = ( -/turf/unsimulated/wall/abductor{ +/turf/simulated/wall/indestructible/abductor{ icon_state = "alien18" }, /area/abductor_ship) @@ -3454,51 +2808,43 @@ name = "Equipment Room"; req_access_txt = "150" }, -/turf/unsimulated/floor{ - icon_state = "bar"; - dir = 2 +/turf/simulated/floor/plasteel{ + icon_state = "bar" }, /area/syndicate_mothership) "kd" = ( -/turf/unsimulated/floor{ - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/centcom/gamma) "ke" = ( /obj/structure/rack, -/obj/item/tank/emergency_oxygen/vox, +/obj/item/tank/internals/emergency_oxygen/double/vox, /obj/item/clothing/mask/breath/vox, -/turf/unsimulated/floor{ - icon_state = "grimy" - }, +/turf/simulated/floor/wood, /area/wizard_station) "kf" = ( /obj/machinery/light/spot, -/turf/unsimulated/floor{ - icon_state = "grimy" - }, +/turf/simulated/floor/wood, /area/wizard_station) -"kj" = ( -/turf/unsimulated/floor{ - dir = 2; - icon_state = "stage_stairs" +"kh" = ( +/obj/machinery/door/airlock/command/glass{ + name = "Escape Shuttle Cockpit"; + req_access_txt = "19" }, +/turf/simulated/floor/plasteel, +/area/shuttle/escape) +"kj" = ( +/turf/simulated/floor/plasteel/stairs/old, /area/syndicate_mothership) "kk" = ( /obj/machinery/door/poddoor/impassable{ id_tag = "sst_tele"; name = "Teleporter" }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) "kl" = ( /obj/machinery/vending/tool, -/turf/unsimulated/floor{ - tag = "icon-dark"; - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) "km" = ( /obj/machinery/door/airlock/centcom{ @@ -3512,179 +2858,146 @@ /area/shuttle/assault_pod) "kn" = ( /obj/machinery/sleeper/syndie{ - icon_state = "sleeper_s-open"; - dir = 2 - }, -/turf/unsimulated/floor{ - icon_state = "dark" + dir = 2; + icon_state = "sleeper_s-open" }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) "kp" = ( /obj/machinery/light/spot{ - tag = "icon-tube1 (NORTH)"; + dir = 1; icon_state = "tube1"; - dir = 1 + tag = "icon-tube1 (NORTH)" }, /obj/machinery/sleeper/syndie{ - icon_state = "sleeper_s-open"; - dir = 2 - }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, -/area/syndicate_mothership) -"kq" = ( -/turf/unsimulated/floor{ - tag = "icon-dark"; - icon_state = "dark" + dir = 2; + icon_state = "sleeper_s-open" }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) "kr" = ( -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) "ks" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 - }, -/turf/unsimulated/floor{ - tag = "icon-dark"; - icon_state = "dark" + dir = 8; + icon_state = "tube1" }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) "kt" = ( /obj/machinery/abductor/experiment{ team = 4 }, -/turf/unsimulated/floor/abductor, +/turf/simulated/floor/plating/abductor, /area/abductor_ship) "ku" = ( /obj/machinery/abductor/pad{ team = 4 }, -/turf/unsimulated/floor/abductor, +/turf/simulated/floor/plating/abductor, /area/abductor_ship) "kv" = ( /obj/machinery/abductor/console{ team = 4 }, -/turf/unsimulated/floor/abductor, +/turf/simulated/floor/plating/abductor, /area/abductor_ship) "kw" = ( -/turf/unsimulated/wall/abductor{ +/turf/simulated/wall/indestructible/abductor{ icon_state = "alien14" }, /area/abductor_ship) "kx" = ( -/turf/unsimulated/floor/abductor, +/turf/simulated/floor/plating/abductor, /area/abductor_ship) "ky" = ( /obj/machinery/computer/camera_advanced/abductor{ team = 1 }, -/turf/unsimulated/floor/abductor, +/turf/simulated/floor/plating/abductor, /area/abductor_ship) "kz" = ( -/turf/unsimulated/wall/abductor{ +/turf/simulated/wall/indestructible/abductor{ icon_state = "alien15" }, /area/abductor_ship) "kA" = ( /obj/structure/closet/abductor, -/turf/unsimulated/floor/abductor, +/turf/simulated/floor/plating/abductor, /area/abductor_ship) -"kB" = ( -/turf/simulated/floor/bluegrid, -/area/tdome/arena_source) -"kC" = ( -/obj/structure/chair/stool, -/turf/unsimulated/floor{ - tag = "icon-dark"; - icon_state = "dark" - }, -/area/syndicate_mothership) "kD" = ( /obj/machinery/computer/camera_advanced/abductor{ team = 4 }, -/turf/unsimulated/floor/abductor, +/turf/simulated/floor/plating/abductor, /area/abductor_ship) "kE" = ( -/turf/unsimulated/wall/abductor{ +/turf/simulated/wall/indestructible/abductor{ icon_state = "alien12" }, /area/abductor_ship) "kF" = ( /obj/effect/landmark/abductor/scientist, -/turf/unsimulated/floor/abductor, +/turf/simulated/floor/plating/abductor, /area/abductor_ship) "kG" = ( /obj/structure/table/abductor, /obj/item/retractor/alien, /obj/item/hemostat/alien, -/turf/unsimulated/floor/abductor, +/turf/simulated/floor/plating/abductor, /area/abductor_ship) "kH" = ( /obj/effect/landmark/abductor/agent, -/turf/unsimulated/floor/abductor, +/turf/simulated/floor/plating/abductor, /area/abductor_ship) "kI" = ( /obj/machinery/optable/abductor, -/turf/unsimulated/floor/abductor, +/turf/simulated/floor/plating/abductor, /area/abductor_ship) "kJ" = ( /obj/structure/closet/syndicate/personal, -/turf/unsimulated/floor{ - icon_state = "vault"; - dir = 8 - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) "kK" = ( /obj/structure/table, /obj/item/storage/fancy/crayons, /obj/machinery/light/spot{ - tag = "icon-tube1 (NORTH)"; + dir = 1; icon_state = "tube1"; - dir = 1 - }, -/turf/unsimulated/floor{ - icon_state = "dark" + tag = "icon-tube1 (NORTH)" }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) "kL" = ( /obj/structure/table, /obj/item/gun/energy/ionrifle, -/turf/unsimulated/floor{ - tag = "icon-dark"; - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) "kM" = ( -/turf/unsimulated/wall/abductor{ +/turf/simulated/wall/indestructible/abductor{ icon_state = "alien13" }, /area/abductor_ship) "kN" = ( /obj/structure/table/abductor, /obj/item/storage/box/alienhandcuffs, -/turf/unsimulated/floor/abductor, +/turf/simulated/floor/plating/abductor, /area/abductor_ship) "kO" = ( /obj/effect/landmark/abductor/scientist{ team = 4 }, -/turf/unsimulated/floor/abductor, +/turf/simulated/floor/plating/abductor, /area/abductor_ship) "kP" = ( /obj/effect/landmark/abductor/agent{ team = 4 }, -/turf/unsimulated/floor/abductor, +/turf/simulated/floor/plating/abductor, /area/abductor_ship) "kQ" = ( -/turf/unsimulated/wall/abductor{ +/turf/simulated/wall/indestructible/abductor{ icon_state = "alien10" }, /area/abductor_ship) @@ -3693,10 +3006,10 @@ /obj/item/paper/abductor, /obj/item/scalpel/alien, /obj/item/cautery/alien, -/turf/unsimulated/floor/abductor, +/turf/simulated/floor/plating/abductor, /area/abductor_ship) "kS" = ( -/turf/unsimulated/wall/abductor{ +/turf/simulated/wall/indestructible/abductor{ icon_state = "alien11" }, /area/abductor_ship) @@ -3708,55 +3021,40 @@ /obj/structure/mirror{ pixel_x = -28 }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) "kU" = ( -/turf/unsimulated/wall/abductor{ +/turf/simulated/wall/indestructible/abductor{ icon_state = "alien6" }, /area/abductor_ship) "kV" = ( /obj/machinery/abductor/gland_dispenser, -/turf/unsimulated/floor/abductor, +/turf/simulated/floor/plating/abductor, /area/abductor_ship) "kW" = ( /obj/structure/table, -/turf/unsimulated/floor{ - icon_state = "carpet"; - dir = 2 - }, +/turf/simulated/floor/carpet, /area/centcom/control) "kX" = ( /obj/structure/closet/secure_closet/personal, /obj/machinery/light/spot{ - tag = "icon-tube1 (EAST)"; + dir = 4; icon_state = "tube1"; - dir = 4 - }, -/turf/unsimulated/floor{ - icon_state = "carpet"; - dir = 2 + tag = "icon-tube1 (EAST)" }, +/turf/simulated/floor/carpet, /area/centcom/control) "kY" = ( -/turf/unsimulated/floor{ - icon_state = "carpet"; - dir = 2 - }, +/turf/simulated/floor/carpet, /area/centcom/control) "kZ" = ( /obj/structure/bed, /obj/item/bedsheet, -/turf/unsimulated/floor{ - icon_state = "carpet"; - dir = 2 - }, +/turf/simulated/floor/carpet, /area/centcom/control) "la" = ( -/turf/unsimulated/floor{ - tag = "icon-redyellowfull"; +/turf/simulated/floor/plasteel{ icon_state = "redyellowfull" }, /area/centcom/control) @@ -3766,36 +3064,30 @@ opacity = 1; req_access_txt = "102" }, -/turf/unsimulated/floor{ - icon_state = "bar"; - dir = 2 - }, +/turf/simulated/floor/carpet, /area/centcom/control) "lc" = ( /obj/structure/chair/stool, /obj/structure/sign/poster/random{ pixel_y = 32 }, -/turf/unsimulated/floor{ - icon_state = "bar"; - dir = 2 +/turf/simulated/floor/plasteel{ + icon_state = "bar" }, /area/centcom/control) "ld" = ( /obj/machinery/atm{ pixel_y = 24 }, -/turf/unsimulated/floor{ - icon_state = "bar"; - dir = 2 +/turf/simulated/floor/plasteel{ + icon_state = "bar" }, /area/centcom/control) "le" = ( /obj/item/reagent_containers/food/drinks/cans/cola, /obj/structure/table, -/turf/unsimulated/floor{ - tag = "icon-redyellowfull"; - icon_state = "redyellowfull" +/turf/simulated/floor/plasteel{ + icon_state = "bar" }, /area/centcom/control) "lf" = ( @@ -3804,35 +3096,30 @@ pixel_y = 6 }, /obj/structure/table, -/turf/unsimulated/floor{ - tag = "icon-redyellowfull"; - icon_state = "redyellowfull" +/turf/simulated/floor/plasteel{ + icon_state = "bar" }, /area/centcom/control) "lg" = ( /obj/structure/mirror{ pixel_x = 28 }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) "lh" = ( -/turf/unsimulated/floor{ - icon_state = "bar"; - dir = 2 +/turf/simulated/floor/plasteel{ + icon_state = "bar" }, /area/centcom/control) "li" = ( -/turf/unsimulated/wall/abductor{ +/turf/simulated/wall/indestructible/abductor{ icon_state = "alien7" }, /area/abductor_ship) "lj" = ( /obj/structure/chair/stool, -/turf/unsimulated/floor{ - icon_state = "bar"; - dir = 2 +/turf/simulated/floor/plasteel{ + icon_state = "bar" }, /area/centcom/control) "lk" = ( @@ -3842,28 +3129,27 @@ /obj/item/FixOVein/alien, /obj/item/bonesetter/alien, /obj/item/bonegel/alien, -/turf/unsimulated/floor/abductor, +/turf/simulated/floor/plating/abductor, /area/abductor_ship) "ll" = ( -/turf/unsimulated/wall/abductor{ +/turf/simulated/wall/indestructible/abductor{ icon_state = "alien9" }, /area/abductor_ship) "lm" = ( -/turf/unsimulated/wall/abductor{ +/turf/simulated/wall/indestructible/abductor{ icon_state = "alien8" }, /area/abductor_ship) "ln" = ( -/turf/unsimulated/wall/abductor{ +/turf/simulated/wall/indestructible/abductor{ icon_state = "alien2" }, /area/abductor_ship) "lo" = ( /obj/structure/reagent_dispensers/beerkeg, -/turf/unsimulated/floor{ - icon_state = "cafeteria"; - dir = 2 +/turf/simulated/floor/plasteel{ + icon_state = "cafeteria" }, /area/centcom/control) "lp" = ( @@ -3871,99 +3157,78 @@ req_access = null; req_access_txt = "102" }, -/turf/unsimulated/floor{ - icon_state = "cafeteria"; - dir = 2 +/turf/simulated/floor/plasteel{ + icon_state = "cafeteria" }, /area/centcom/control) "lq" = ( /obj/structure/reagent_dispensers/beerkeg, /obj/machinery/light/spot{ - tag = "icon-tube1 (NORTH)"; + dir = 1; icon_state = "tube1"; - dir = 1 + tag = "icon-tube1 (NORTH)" }, -/turf/unsimulated/floor{ - icon_state = "cafeteria"; - dir = 2 +/turf/simulated/floor/plasteel{ + icon_state = "cafeteria" }, /area/centcom/control) "lr" = ( /obj/structure/kitchenspike, -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, +/turf/simulated/floor/plasteel/freezer, /area/centcom/control) "ls" = ( /obj/effect/decal/cleanable/blood, -/turf/unsimulated/floor{ - icon_state = "chapel" - }, +/turf/simulated/floor/wood, /area/wizard_station) "lt" = ( /obj/machinery/gibber, -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, +/turf/simulated/floor/plasteel/freezer, /area/centcom/control) -"lu" = ( -/turf/unsimulated/floor{ - icon_state = "chapel" - }, -/area/wizard_station) "lv" = ( /obj/machinery/light/spot{ - tag = "icon-tube1 (NORTH)"; + dir = 1; icon_state = "tube1"; - dir = 1 - }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 + tag = "icon-tube1 (NORTH)" }, +/turf/simulated/floor/plasteel/freezer, /area/centcom/control) "lw" = ( /obj/structure/table, /obj/machinery/juicer{ pixel_y = 6 }, -/turf/unsimulated/floor{ - tag = "icon-redyellowfull"; - icon_state = "redyellowfull" +/turf/simulated/floor/plasteel{ + icon_state = "bar" }, /area/centcom/control) "lx" = ( /obj/item/reagent_containers/food/drinks/cans/beer, /obj/structure/table, -/turf/unsimulated/floor{ - tag = "icon-redyellowfull"; - icon_state = "redyellowfull" +/turf/simulated/floor/plasteel{ + icon_state = "bar" }, /area/centcom/control) "ly" = ( -/turf/unsimulated/wall/abductor, +/turf/simulated/wall/indestructible/abductor, /area/abductor_ship) "lz" = ( -/turf/unsimulated/wall/abductor{ +/turf/simulated/wall/indestructible/abductor{ icon_state = "alien4" }, /area/abductor_ship) "lA" = ( -/turf/unsimulated/wall/abductor{ +/turf/simulated/wall/indestructible/abductor{ icon_state = "alien3" }, /area/abductor_ship) "lB" = ( /obj/structure/piano, -/turf/unsimulated/floor{ - tag = "icon-redyellowfull"; +/turf/simulated/floor/plasteel{ icon_state = "redyellowfull" }, /area/centcom/control) "lC" = ( -/turf/unsimulated/wall, +/turf/simulated/wall/indestructible/riveted, /area/tdome/arena_source) "lD" = ( /obj/machinery/igniter/on, @@ -3974,139 +3239,126 @@ /turf/simulated/floor/plasteel, /area/tdome/arena_source) "lF" = ( -/turf/unsimulated/wall/abductor{ +/turf/simulated/wall/indestructible/abductor{ icon_state = "alien5" }, /area/abductor_ship) "lG" = ( /obj/structure/chair/stool, /obj/machinery/light/spot{ - tag = "icon-tube1 (EAST)"; + dir = 4; icon_state = "tube1"; - dir = 4 + tag = "icon-tube1 (EAST)" }, -/turf/unsimulated/floor{ - tag = "icon-redyellowfull"; +/turf/simulated/floor/plasteel{ icon_state = "redyellowfull" }, /area/centcom/control) "lH" = ( -/turf/unsimulated/floor{ - icon_state = "cafeteria"; - dir = 2 +/turf/simulated/floor/plasteel{ + icon_state = "cafeteria" }, /area/centcom/control) "lI" = ( /obj/structure/closet/secure_closet/freezer/meat{ req_access_txt = "102" }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, +/turf/simulated/floor/plasteel/freezer, /area/centcom/control) "lJ" = ( /obj/machinery/chem_master/condimaster{ name = "CondiMaster Neo"; pixel_x = -5 }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, +/turf/simulated/floor/plasteel/freezer, /area/centcom/control) "lK" = ( -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, +/turf/simulated/floor/plasteel/freezer, /area/centcom/control) "lL" = ( /obj/machinery/abductor/experiment{ team = 2 }, -/turf/unsimulated/floor/abductor, +/turf/simulated/floor/plating/abductor, /area/abductor_ship) "lM" = ( /obj/machinery/abductor/pad{ team = 2 }, -/turf/unsimulated/floor/abductor, +/turf/simulated/floor/plating/abductor, /area/abductor_ship) "lN" = ( /obj/machinery/abductor/console{ team = 2 }, -/turf/unsimulated/floor/abductor, +/turf/simulated/floor/plating/abductor, /area/abductor_ship) "lO" = ( /obj/machinery/abductor/experiment{ team = 3 }, -/turf/unsimulated/floor/abductor, +/turf/simulated/floor/plating/abductor, /area/abductor_ship) "lP" = ( /obj/machinery/abductor/pad{ team = 3 }, -/turf/unsimulated/floor/abductor, +/turf/simulated/floor/plating/abductor, /area/abductor_ship) "lQ" = ( /obj/machinery/abductor/console{ team = 3 }, -/turf/unsimulated/floor/abductor, +/turf/simulated/floor/plating/abductor, /area/abductor_ship) "lR" = ( /obj/machinery/computer/camera_advanced/abductor{ team = 2 }, -/turf/unsimulated/floor/abductor, +/turf/simulated/floor/plating/abductor, /area/abductor_ship) "lS" = ( /obj/machinery/computer/camera_advanced/abductor{ team = 3 }, -/turf/unsimulated/floor/abductor, +/turf/simulated/floor/plating/abductor, /area/abductor_ship) "lT" = ( /obj/effect/landmark/abductor/scientist{ team = 2 }, -/turf/unsimulated/floor/abductor, +/turf/simulated/floor/plating/abductor, /area/abductor_ship) "lU" = ( /obj/effect/landmark/abductor/agent{ team = 2 }, -/turf/unsimulated/floor/abductor, +/turf/simulated/floor/plating/abductor, /area/abductor_ship) "lV" = ( /obj/effect/landmark/abductor/scientist{ team = 3 }, -/turf/unsimulated/floor/abductor, +/turf/simulated/floor/plating/abductor, /area/abductor_ship) "lW" = ( /obj/structure/table, /obj/item/reagent_containers/food/drinks/shaker, -/turf/unsimulated/floor{ - icon_state = "cafeteria"; - dir = 2 +/turf/simulated/floor/plasteel{ + icon_state = "cafeteria" }, /area/centcom/control) "lX" = ( /obj/structure/table, -/turf/unsimulated/floor{ - icon_state = "cafeteria"; - dir = 2 +/turf/simulated/floor/plasteel{ + icon_state = "cafeteria" }, /area/centcom/control) "lY" = ( /obj/effect/landmark/abductor/agent{ team = 3 }, -/turf/unsimulated/floor/abductor, +/turf/simulated/floor/plating/abductor, /area/abductor_ship) "lZ" = ( /obj/machinery/door/airlock/centcom{ @@ -4114,32 +3366,17 @@ opacity = 1; req_access_txt = "102" }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, +/turf/simulated/floor/plasteel/freezer, /area/centcom/control) -"ma" = ( -/turf/space, -/turf/unsimulated/wall{ - dir = 1; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "diagonalWall3" - }, -/area/centcom/control) -"mb" = ( -/turf/unsimulated/wall/fakeglass, -/area/wizard_station) "mc" = ( /obj/structure/chair/stool, -/turf/unsimulated/floor{ - icon_state = "cafeteria"; - dir = 2 +/turf/simulated/floor/plasteel{ + icon_state = "cafeteria" }, /area/centcom/control) "md" = ( /obj/structure/extinguisher_cabinet, -/turf/unsimulated/wall, +/turf/simulated/wall/indestructible/riveted, /area/centcom/gamma) "me" = ( /obj/structure/table, @@ -4147,9 +3384,8 @@ pixel_x = 0; pixel_y = 10 }, -/turf/unsimulated/floor{ - icon_state = "cafeteria"; - dir = 2 +/turf/simulated/floor/plasteel{ + icon_state = "cafeteria" }, /area/centcom/control) "mf" = ( @@ -4158,31 +3394,31 @@ dir = 2; network = list("ERT","CentComm") }, -/turf/unsimulated/floor{ - icon_state = "vault"; - dir = 1 +/turf/simulated/floor/plasteel/dark{ + dir = 1; + icon_state = "vault" }, /area/centcom/specops) "mg" = ( -/turf/unsimulated/floor{ - icon_state = "vault"; - dir = 1 +/turf/simulated/floor/plasteel/dark{ + dir = 1; + icon_state = "vault" }, /area/centcom/specops) "mh" = ( /obj/item/radio/intercom/specops{ pixel_y = 25 }, -/turf/unsimulated/floor{ - icon_state = "vault"; - dir = 1 +/turf/simulated/floor/plasteel/dark{ + dir = 1; + icon_state = "vault" }, /area/centcom/specops) "mi" = ( /obj/machinery/recharge_station/upgraded, -/turf/unsimulated/floor{ - icon_state = "vault"; - dir = 1 +/turf/simulated/floor/plasteel/dark{ + dir = 1; + icon_state = "vault" }, /area/centcom/specops) "mj" = ( @@ -4191,9 +3427,9 @@ dir = 2; network = list("ERT","CentComm") }, -/turf/unsimulated/floor{ - icon_state = "vault"; - dir = 1 +/turf/simulated/floor/plasteel/dark{ + dir = 1; + icon_state = "vault" }, /area/centcom/specops) "mk" = ( @@ -4203,21 +3439,19 @@ pixel_y = 3 }, /obj/item/kitchen/rollingpin, -/turf/unsimulated/floor{ - icon_state = "cafeteria"; - dir = 2 +/turf/simulated/floor/plasteel{ + icon_state = "cafeteria" }, /area/centcom/control) "ml" = ( /obj/structure/table, /obj/machinery/light/spot{ - tag = "icon-tube1 (EAST)"; + dir = 4; icon_state = "tube1"; - dir = 4 + tag = "icon-tube1 (EAST)" }, -/turf/unsimulated/floor{ - icon_state = "cafeteria"; - dir = 2 +/turf/simulated/floor/plasteel{ + icon_state = "cafeteria" }, /area/centcom/control) "mm" = ( @@ -4225,9 +3459,7 @@ id_tag = "ASSAULT3"; name = "Launch Bay #3" }, -/turf/unsimulated/floor{ - name = "plating" - }, +/turf/simulated/floor/plating, /area/centcom/specops) "mn" = ( /obj/machinery/mass_driver{ @@ -4237,14 +3469,12 @@ name = "gravpult" }, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/centcom/specops) "mo" = ( -/turf/unsimulated/floor{ - icon_state = "vault"; - dir = 5 +/turf/simulated/floor/plasteel/dark{ + dir = 5; + icon_state = "vault" }, /area/centcom/specops) "mp" = ( @@ -4252,31 +3482,26 @@ id_tag = "ASSAULT"; name = "Assault Armor" }, -/turf/unsimulated/floor{ - icon_state = "vault"; - dir = 1 - }, +/turf/simulated/floor/plasteel/dark, /area/centcom/specops) "mq" = ( /obj/structure/sign/poster/random{ pixel_x = -32 }, -/turf/unsimulated/floor{ - icon_state = "bar"; - dir = 2 +/turf/simulated/floor/plasteel{ + icon_state = "bar" }, /area/centcom/control) "mr" = ( -/turf/unsimulated/wall, +/turf/simulated/wall/indestructible/riveted, /area/trader_station/sol) "ms" = ( /obj/item/reagent_containers/food/condiment/saltshaker{ pixel_x = -6 }, /obj/structure/table, -/turf/unsimulated/floor{ - tag = "icon-redyellowfull"; - icon_state = "redyellowfull" +/turf/simulated/floor/plasteel{ + icon_state = "bar" }, /area/centcom/control) "mt" = ( @@ -4284,64 +3509,45 @@ name = "Syndicate-Infiltrator"; tag = "Commando" }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) "mu" = ( /obj/machinery/vending/dinnerware{ req_access_txt = "102" }, -/turf/unsimulated/floor{ - icon_state = "cafeteria"; - dir = 2 +/turf/simulated/floor/plasteel{ + icon_state = "cafeteria" }, /area/centcom/control) "mv" = ( /obj/machinery/light/spot, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) "mw" = ( /obj/structure/table, /obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/food/condiment/enzyme, -/turf/unsimulated/floor{ - icon_state = "cafeteria"; - dir = 2 +/turf/simulated/floor/plasteel{ + icon_state = "cafeteria" }, /area/centcom/control) "mx" = ( /obj/structure/table, /obj/machinery/kitchen_machine/microwave/upgraded, -/turf/unsimulated/floor{ - icon_state = "cafeteria"; - dir = 2 +/turf/simulated/floor/plasteel{ + icon_state = "cafeteria" }, /area/centcom/control) "my" = ( /obj/structure/filingcabinet/filingcabinet, -/turf/unsimulated/floor{ - dir = 9; - icon_state = "carpetside" - }, -/area/centcom/control) -"mz" = ( -/obj/structure/filingcabinet/filingcabinet, -/turf/unsimulated/floor{ - dir = 5; - icon_state = "carpetside" - }, +/turf/simulated/floor/carpet, /area/centcom/control) "mA" = ( /obj/machinery/door/poddoor{ id_tag = "ASSAULT2"; name = "Launch Bay #2" }, -/turf/unsimulated/floor{ - name = "plating" - }, +/turf/simulated/floor/plating, /area/centcom/specops) "mB" = ( /obj/machinery/mass_driver{ @@ -4351,9 +3557,7 @@ name = "gravpult" }, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/centcom/specops) "mC" = ( /obj/machinery/door/airlock/centcom{ @@ -4361,26 +3565,31 @@ opacity = 1; req_access_txt = "114" }, -/turf/unsimulated/floor{ - icon_state = "bar"; - dir = 2 +/turf/simulated/floor/plasteel{ + icon_state = "bar" }, /area/centcom/control) "mD" = ( /obj/machinery/vending/cigarette, -/turf/unsimulated/floor{ - icon_state = "bar"; - dir = 2 +/turf/simulated/floor/plasteel{ + icon_state = "bar" }, /area/centcom/control) +"mE" = ( +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/table, +/obj/item/pickaxe, +/obj/item/storage/firstaid/toxin, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/vox) "mF" = ( /obj/machinery/light/spot, /obj/structure/chair{ dir = 1 }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership/jail) "mG" = ( /obj/machinery/access_button{ @@ -4391,29 +3600,31 @@ pixel_y = 24; req_access_txt = "150" }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) +"mH" = ( +/obj/structure/table, +/obj/machinery/door_control{ + id = "syndieshutters"; + name = "remote shutter control"; + req_access_txt = "150" + }, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/syndicate) "mI" = ( /obj/structure/flora/ausbushes/brflowers, -/turf/unsimulated/floor{ - icon_state = "grass1"; - name = "grass" - }, +/turf/simulated/floor/grass, /area/centcom/control) +"mJ" = ( +/obj/structure/chair{ + dir = 4 + }, +/obj/item/clothing/mask/breath, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/vox) "mK" = ( /obj/structure/flora/ausbushes/reedbush, -/turf/unsimulated/floor{ - icon_state = "grass1"; - name = "grass" - }, -/area/centcom/control) -"mL" = ( -/turf/unsimulated/floor{ - dir = 1; - icon_state = "carpet15-11" - }, +/turf/simulated/floor/grass, /area/centcom/control) "mM" = ( /obj/structure/table/wood, @@ -4421,116 +3632,68 @@ pixel_y = 5 }, /obj/item/pen/multi, -/turf/unsimulated/floor{ - dir = 9; - icon_state = "carpetside" - }, +/turf/simulated/floor/carpet, /area/centcom/control) "mN" = ( /obj/machinery/computer/bsa_control/admin, -/turf/unsimulated/floor{ - dir = 5; - icon_state = "carpetside" - }, +/turf/simulated/floor/carpet, /area/centcom/control) "mO" = ( /obj/structure/chair/office/dark{ dir = 4 }, -/turf/unsimulated/floor{ - dir = 8; - icon_state = "carpet15-14"; - tag = "icon-carpet (WEST)" - }, +/turf/simulated/floor/carpet, /area/centcom/control) "mP" = ( /obj/machinery/computer/pod/deathsquad, -/turf/unsimulated/floor{ - icon_state = "vault"; - dir = 1 +/turf/simulated/floor/plasteel/dark{ + dir = 1; + icon_state = "vault" }, /area/centcom/specops) -"mQ" = ( -/obj/structure/table, -/turf/unsimulated/floor{ - dir = 9; - icon_state = "carpetside" - }, -/area/centcom/control) "mR" = ( /obj/machinery/sleeper/upgraded, /obj/machinery/light/spot{ - tag = "icon-tube1 (EAST)"; + dir = 4; icon_state = "tube1"; - dir = 4 - }, -/turf/unsimulated/floor{ - dir = 5; - icon_state = "carpetside" - }, -/area/centcom/control) -"mS" = ( -/turf/unsimulated/floor{ - dir = 1; - icon_state = "carpetside" + tag = "icon-tube1 (EAST)" }, +/turf/simulated/floor/carpet, /area/centcom/control) "mT" = ( /obj/structure/mirror{ pixel_y = 28 }, -/turf/unsimulated/floor{ - dir = 8; - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/centcom/control) "mU" = ( -/turf/unsimulated/floor{ - dir = 8; - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/centcom/control) "mV" = ( /obj/machinery/computer/card/centcom, -/turf/unsimulated/floor{ - dir = 8; - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/centcom/control) "mW" = ( /obj/machinery/vending/cola, -/turf/unsimulated/floor{ - icon_state = "bar"; - dir = 2 +/turf/simulated/floor/plasteel{ + icon_state = "bar" }, /area/centcom/control) "mX" = ( /obj/structure/flora/ausbushes/fernybush, -/turf/unsimulated/floor{ - icon_state = "grass1"; - name = "grass" - }, +/turf/simulated/floor/grass, /area/centcom/control) "mY" = ( /obj/structure/flora/ausbushes/ywflowers, -/turf/unsimulated/floor{ - icon_state = "grass1"; - name = "grass" - }, +/turf/simulated/floor/grass, /area/centcom/control) "mZ" = ( /obj/structure/flora/ausbushes/stalkybush, -/turf/unsimulated/floor{ - icon_state = "grass1"; - name = "grass" - }, +/turf/simulated/floor/grass, /area/centcom/control) "na" = ( /obj/structure/flora/ausbushes/sparsegrass, -/turf/unsimulated/floor{ - icon_state = "grass1"; - name = "grass" - }, +/turf/simulated/floor/grass, /area/centcom/control) "nc" = ( /obj/machinery/door/airlock/centcom{ @@ -4548,23 +3711,11 @@ /area/centcom/gamma) "nd" = ( /obj/structure/flora/ausbushes/lavendergrass, -/turf/unsimulated/floor{ - icon_state = "grass1"; - name = "grass" - }, +/turf/simulated/floor/grass, /area/centcom/control) "ne" = ( /obj/structure/flora/ausbushes/fullgrass, -/turf/unsimulated/floor{ - icon_state = "grass1"; - name = "grass" - }, -/area/centcom/control) -"nf" = ( -/turf/unsimulated/floor{ - dir = 2; - icon_state = "carpet15-5" - }, +/turf/simulated/floor/grass, /area/centcom/control) "ng" = ( /obj/structure/table/wood, @@ -4575,35 +3726,22 @@ /obj/item/photo{ name = "butts" }, -/turf/unsimulated/floor{ - dir = 10; - icon_state = "carpetside" - }, +/turf/simulated/floor/carpet, /area/centcom/control) "nh" = ( /obj/machinery/computer/communications, -/turf/unsimulated/floor{ - dir = 6; - icon_state = "carpetside" - }, -/area/centcom/control) -"ni" = ( -/turf/unsimulated/floor{ - dir = 2; - icon_state = "carpetside" - }, +/turf/simulated/floor/carpet, /area/centcom/control) "nj" = ( -/turf/unsimulated/wall, +/obj/effect/baseturf_helper/asteroid/snow, +/turf/simulated/wall/indestructible/rock/snow, /area/syndicate_mothership) "nk" = ( /obj/machinery/door/poddoor{ id_tag = "ASSAULT1"; name = "Launch Bay #1" }, -/turf/unsimulated/floor{ - name = "plating" - }, +/turf/simulated/floor/plating, /area/centcom/specops) "nl" = ( /obj/machinery/mass_driver{ @@ -4613,57 +3751,24 @@ name = "gravpult" }, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/centcom/specops) -"nm" = ( -/obj/structure/bed, -/obj/item/bedsheet, -/turf/unsimulated/floor{ - dir = 10; - icon_state = "carpetside" - }, -/area/centcom/control) -"nn" = ( -/turf/unsimulated/floor{ - dir = 6; - icon_state = "carpetside" - }, -/area/centcom/control) "no" = ( /obj/machinery/sleeper{ dir = 4 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/centcom/evac) -"np" = ( -/obj/machinery/door/airlock/centcom{ - name = "Living Quarters"; - opacity = 1; - req_access_txt = "102" - }, -/turf/unsimulated/floor{ - dir = 2; - icon_state = "carpetsymbol" - }, -/area/centcom/control) "nq" = ( /obj/structure/table/wood, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) "nr" = ( /obj/item/radio/intercom/syndicate{ pixel_x = -32; pixel_y = 0 }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) "ns" = ( /obj/machinery/door_control{ @@ -4673,9 +3778,7 @@ pixel_y = -2; req_access_txt = "150" }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) "nt" = ( /obj/structure/mirror{ @@ -4685,23 +3788,18 @@ name = "Syndicate-Infiltrator"; tag = "Commando" }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) "nu" = ( /obj/structure/table, /obj/item/card/id/centcom, /obj/machinery/light/spot{ - tag = "icon-tube1 (EAST)"; + dir = 4; icon_state = "tube1"; - dir = 4 + tag = "icon-tube1 (EAST)" }, /obj/item/door_remote/centcomm, -/turf/unsimulated/floor{ - dir = 8; - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/centcom/control) "nv" = ( /obj/structure/table/reinforced, @@ -4712,9 +3810,7 @@ pixel_x = -9; pixel_y = 10 }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) "nw" = ( /obj/machinery/door/airlock/centcom{ @@ -4722,40 +3818,17 @@ opacity = 1; req_access_txt = "107" }, -/turf/unsimulated/floor{ - icon_state = "carpet1-0" - }, +/turf/simulated/floor/carpet, /area/centcom/control) "nx" = ( /obj/machinery/door/airlock/hatch/syndicate/command, /obj/machinery/door/poddoor/impassable{ id_tag = "commandcenter" }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) -"ny" = ( -/turf/space, -/turf/unsimulated/wall{ - dir = 4; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "diagonalWall3" - }, -/area/centcom/control) -"nz" = ( -/turf/unsimulated/wall/fakeglass{ - tag = "icon-fakewindows (EAST)"; - icon_state = "fakewindows"; - dir = 4 - }, -/area/centcom/control) "nA" = ( -/turf/unsimulated/wall/fakeglass{ - tag = "icon-fakewindows (WEST)"; - icon_state = "fakewindows"; - dir = 8 - }, +/turf/simulated/wall/indestructible/fakeglass, /area/centcom/control) "nB" = ( /obj/machinery/door/poddoor/shutters{ @@ -4763,46 +3836,40 @@ id_tag = "commandcenter"; name = "Privacy Shutters" }, -/turf/unsimulated/wall/fakeglass{ - dir = 8; - icon_state = "fakewindows3"; - tag = "icon-fakewindows (WEST)" - }, +/turf/simulated/wall/indestructible/opsglass, /area/syndicate_mothership) "nC" = ( -/turf/unsimulated/floor{ - icon_state = "green"; - dir = 8 +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "green" }, /area/centcom/control) "nD" = ( -/turf/unsimulated/floor{ - icon_state = "green"; - dir = 1 +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "green" }, /area/centcom/control) "nE" = ( -/turf/unsimulated/floor{ - icon_state = "greencorner"; - dir = 4 +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "greencorner" }, /area/centcom/control) "nF" = ( /obj/machinery/computer/shuttle/sit, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) "nG" = ( -/turf/unsimulated/floor{ - icon_state = "greencorner"; - dir = 1 +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "greencorner" }, /area/centcom/control) "nH" = ( -/turf/unsimulated/floor{ - icon_state = "green"; - dir = 4 +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "green" }, /area/centcom/control) "nI" = ( @@ -4821,18 +3888,14 @@ pixel_y = 6; req_access_txt = "153" }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) "nJ" = ( /obj/machinery/door/poddoor{ id_tag = "ASSAULT0"; name = "Launch Bay #0" }, -/turf/unsimulated/floor{ - name = "plating" - }, +/turf/simulated/floor/plating, /area/centcom/specops) "nK" = ( /obj/machinery/camera{ @@ -4846,15 +3909,11 @@ /obj/effect/decal/warning_stripes/arrow{ dir = 8 }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/centcom/specops) "nL" = ( /obj/machinery/computer/shuttle/sst, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) "nM" = ( /obj/structure/table/reinforced, @@ -4886,9 +3945,7 @@ pixel_y = -4; req_access_txt = "153" }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) "nN" = ( /obj/machinery/mass_driver{ @@ -4898,144 +3955,89 @@ name = "gravpult" }, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/centcom/specops) "nO" = ( /obj/item/radio/intercom/specops{ pixel_y = -28 }, -/turf/unsimulated/floor{ - icon_state = "vault"; - dir = 1 +/turf/simulated/floor/plasteel/dark{ + dir = 1; + icon_state = "vault" }, /area/centcom/specops) "nP" = ( /obj/machinery/mech_bay_recharge_port/upgraded/unsimulated{ - icon_state = "recharge_port"; - dir = 8 - }, -/turf/unsimulated/floor{ - name = "plating" + dir = 8; + icon_state = "recharge_port" }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) -"nQ" = ( -/obj/machinery/door/poddoor/impassable{ - id_tag = "GRAVPULTS"; - name = "Gravity Catapults" - }, -/turf/unsimulated/floor{ - icon_state = "vault"; - dir = 1 - }, -/area/centcom/specops) "nR" = ( /obj/machinery/door/poddoor/impassable{ id_tag = "GRAVPULTS"; name = "Gravity Catapults" }, -/turf/unsimulated/floor{ - icon_state = "vault"; - dir = 5 - }, +/turf/simulated/floor/plasteel/dark, /area/centcom/specops) "nS" = ( /obj/mecha/combat/marauder/mauler/loaded, /obj/effect/decal/warning_stripes/red/hollow, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) "nT" = ( /obj/machinery/door/poddoor/impassable{ id_tag = "ASSAULT"; name = "Assault Armor" }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/centcom/specops) "nU" = ( -/turf/unsimulated/floor{ - icon_state = "greencorner"; - dir = 8 +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "greencorner" }, /area/centcom/control) -"nV" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall12"; - icon_state = "swall12"; - dir = 2 - }, -/area/shuttle/escape) "nW" = ( /obj/effect/decal/warning_stripes/blue, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) +"nY" = ( +/obj/machinery/optable, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/syndicate) "ob" = ( /obj/effect/landmark{ name = "Syndicate-Infiltrator-Leader"; tag = "Commando" }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) "oc" = ( /obj/effect/landmark/shuttle_import, /turf/space, /area/space) "od" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall_s6"; - dir = 2 - }, -/area/shuttle/escape) -"oe" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall_s10"; - dir = 2 - }, +/turf/simulated/wall/mineral/titanium, /area/shuttle/escape) "of" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall_s6"; - dir = 2 - }, +/turf/simulated/wall/mineral/titanium, /area/shuttle/gamma/space) "og" = ( -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/escape) -"oh" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall12"; - icon_state = "swall12"; - dir = 2 - }, -/area/shuttle/gamma/space) -"oi" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall_s10"; - dir = 2 - }, -/area/shuttle/gamma/space) "oj" = ( /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 1 + dir = 1; + icon_state = "red" }, /area/centcom/gamma) "ok" = ( /obj/machinery/porta_turret/centcom/pulse, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 9 + dir = 9; + icon_state = "red" }, /area/centcom/gamma) "ol" = ( @@ -5047,8 +4049,8 @@ /obj/structure/table/reinforced, /obj/item/paper, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 1 + dir = 1; + icon_state = "red" }, /area/centcom/gamma) "om" = ( @@ -5056,34 +4058,28 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 1 + dir = 1; + icon_state = "red" }, /area/centcom/gamma) "on" = ( -/turf/unsimulated/floor{ - icon_state = "light_on" - }, +/turf/simulated/floor/light, /area/centcom/specops) "oo" = ( /obj/machinery/shuttle_manipulator, -/turf/unsimulated/floor{ - icon_state = "light_on" - }, +/turf/simulated/floor/light, /area/centcom/specops) "op" = ( /obj/machinery/light/spot, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/escape) "oq" = ( /obj/structure/chair/office/dark{ dir = 8 }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 1 + dir = 1; + icon_state = "red" }, /area/centcom/gamma) "or" = ( @@ -5096,15 +4092,15 @@ req_access = list(114) }, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 1 + dir = 1; + icon_state = "red" }, /area/centcom/gamma) "os" = ( /obj/machinery/porta_turret/centcom/pulse, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 5 + dir = 5; + icon_state = "red" }, /area/centcom/gamma) "ot" = ( @@ -5118,9 +4114,7 @@ dir = 2; network = list("ERT","CentComm") }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/centcom/specops) "ou" = ( /obj/effect/landmark{ @@ -5129,9 +4123,9 @@ /obj/effect/landmark{ name = "Commando" }, -/turf/unsimulated/floor{ - icon_state = "vault"; - dir = 1 +/turf/simulated/floor/plasteel/dark{ + dir = 8; + icon_state = "vault" }, /area/centcom/specops) "ov" = ( @@ -5146,39 +4140,19 @@ dir = 2; network = list("ERT","CentComm") }, -/turf/unsimulated/floor{ - icon_state = "vault"; - dir = 1 +/turf/simulated/floor/plasteel/dark{ + dir = 8; + icon_state = "vault" }, /area/centcom/specops) "ow" = ( -/turf/unsimulated/wall/fakeglass{ - dir = 8; - icon_state = "fakewindows3"; - tag = "icon-fakewindows (WEST)" - }, +/turf/simulated/wall/indestructible/fakeglass, /area/centcom/specops) -"ox" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall3"; - icon_state = "swall3"; - dir = 2 - }, -/area/shuttle/escape) -"oy" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall3"; - icon_state = "swall3"; - dir = 2 - }, -/area/shuttle/gamma/space) "oz" = ( /obj/structure/chair/office/dark{ dir = 1 }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) "oA" = ( /obj/machinery/door/poddoor/shutters{ @@ -5186,11 +4160,7 @@ id_tag = "commandcenter"; name = "Privacy Shutters" }, -/turf/unsimulated/wall/fakeglass{ - dir = 8; - icon_state = "fakewindows3"; - tag = "icon-fakewindows (WEST)" - }, +/turf/simulated/wall/indestructible/opsglass, /area/syndicate_mothership) "oB" = ( /obj/structure/closet/secure_closet/guncabinet, @@ -5207,13 +4177,11 @@ pixel_y = 32 }, /obj/machinery/light/spot{ - tag = "icon-tube1 (WEST)"; + dir = 8; icon_state = "tube1"; - dir = 8 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" + tag = "icon-tube1 (WEST)" }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/gamma/space) "oC" = ( /obj/structure/closet/secure_closet/guncabinet, @@ -5221,30 +4189,27 @@ /obj/item/gun/energy/sniperrifle, /obj/item/gun/energy/sniperrifle, /obj/machinery/light/spot{ - tag = "icon-tube1 (EAST)"; + dir = 4; icon_state = "tube1"; - dir = 4 + tag = "icon-tube1 (EAST)" }, /obj/machinery/ai_status_display{ pixel_y = 32 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/gamma/space) "oD" = ( /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 8 + dir = 8; + icon_state = "red" }, /area/centcom/gamma) "oE" = ( /obj/effect/spawner/window/reinforced, -/turf/unsimulated/floor{ - tag = "icon-red (EAST)"; - icon_state = "red"; - dir = 4 +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "red" }, /area/centcom/gamma) "oF" = ( @@ -5253,28 +4218,24 @@ opacity = 1; req_access_txt = "109" }, -/turf/unsimulated/floor{ - icon_state = "vault"; - dir = 8 - }, +/turf/simulated/floor/plasteel/dark, /area/centcom/specops) "oG" = ( -/turf/unsimulated/floor{ - icon_state = "vault"; - dir = 8 +/turf/simulated/floor/plasteel/dark{ + dir = 8; + icon_state = "vault" }, /area/centcom/specops) "oH" = ( /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 8 + dir = 8; + icon_state = "red" }, /area/centcom/gamma) "oI" = ( -/turf/unsimulated/floor{ - tag = "icon-red (EAST)"; - icon_state = "red"; - dir = 4 +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "red" }, /area/centcom/gamma) "oJ" = ( @@ -5291,31 +4252,8 @@ /obj/item/gun/projectile/automatic/pistol{ name = "pistol" }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/gamma/space) -"oK" = ( -/turf/unsimulated/wall/fakeglass{ - tag = "icon-fakewindows2 (WEST)"; - icon_state = "fakewindows2"; - dir = 8 - }, -/area/centcom/specops) -"oL" = ( -/turf/unsimulated/wall/fakeglass{ - tag = "icon-fakewindows (WEST)"; - icon_state = "fakewindows"; - dir = 8 - }, -/area/centcom/specops) -"oM" = ( -/turf/unsimulated/wall/fakeglass{ - tag = "icon-fakewindows (EAST)"; - icon_state = "fakewindows"; - dir = 4 - }, -/area/centcom/specops) "oN" = ( /obj/machinery/door/airlock/centcom{ name = "Team Storage"; @@ -5323,9 +4261,7 @@ req_access_txt = "109" }, /obj/effect/decal/warning_stripes/yellow, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/centcom/specops) "oO" = ( /obj/machinery/door/poddoor{ @@ -5343,14 +4279,14 @@ /area/centcom/gamma) "oP" = ( /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 10 + dir = 10; + icon_state = "red" }, /area/centcom/gamma) "oQ" = ( /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 6 + dir = 6; + icon_state = "red" }, /area/centcom/gamma) "oR" = ( @@ -5358,10 +4294,7 @@ id_tag = "SPECOPS"; name = "Ready Room" }, -/turf/unsimulated/floor{ - icon_state = "vault"; - dir = 8 - }, +/turf/simulated/floor/plasteel/dark, /area/centcom/specops) "oS" = ( /obj/machinery/door/airlock/centcom{ @@ -5370,9 +4303,7 @@ req_access_txt = "109" }, /obj/effect/decal/warning_stripes/yellow, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/centcom/specops) "oT" = ( /turf/simulated/floor/plasteel{ @@ -5386,9 +4317,7 @@ req_access_txt = "109" }, /obj/effect/decal/warning_stripes/yellow, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/centcom/control) "oV" = ( /obj/machinery/door/airlock/centcom{ @@ -5396,18 +4325,14 @@ opacity = 1; req_access_txt = "113" }, -/turf/unsimulated/floor{ - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/centcom/control) "oW" = ( /obj/structure/closet/secure_closet/guncabinet, /obj/item/gun/energy/gun/nuclear, /obj/item/gun/energy/gun/nuclear, /obj/item/gun/energy/gun/nuclear, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/gamma/space) "oX" = ( /obj/machinery/door/airlock/external{ @@ -5415,12 +4340,10 @@ name = "Shuttle Hatch"; req_access_txt = "109" }, -/turf/unsimulated/floor{ - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/centcom/control) "oY" = ( -/obj/machinery/door/airlock/shuttle, +/obj/machinery/door/airlock/titanium, /obj/docking_port/mobile/emergency/backup{ dwidth = 9; roundstart_move = null @@ -5433,18 +4356,14 @@ name = "Backup Shuttle Dock"; width = 8 }, -/turf/unsimulated/floor{ - icon_state = "floor" - }, +/turf/simulated/floor/plating, /area/shuttle/escape) "pa" = ( /obj/structure/sign/securearea{ pixel_x = 32; pixel_y = 0 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/gamma/space) "pb" = ( /obj/machinery/camera{ @@ -5452,9 +4371,7 @@ dir = 8; network = list("ERT","CentComm") }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/centcom/specops) "pc" = ( /obj/effect/forcefield{ @@ -5467,11 +4384,7 @@ id_tag = "specopsoffice"; name = "Privacy Shutters" }, -/turf/unsimulated/wall/fakeglass{ - dir = 8; - icon_state = "fakewindows3"; - tag = "icon-fakewindows (WEST)" - }, +/turf/simulated/wall/indestructible/fakeglass, /area/centcom/specops) "pd" = ( /obj/machinery/door/airlock/centcom{ @@ -5483,10 +4396,7 @@ id_tag = "specopsoffice"; name = "Super Privacy Shutters" }, -/turf/unsimulated/floor{ - icon_state = "vault"; - dir = 8 - }, +/turf/simulated/floor/plasteel/dark, /area/centcom/specops) "pe" = ( /obj/machinery/door/airlock/centcom{ @@ -5495,32 +4405,23 @@ req_access_txt = "104" }, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/centcom/specops) "pf" = ( -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/gamma/space) "ph" = ( /obj/machinery/recharger/wallcharger{ pixel_x = 32 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/gamma/space) "pj" = ( /obj/structure/window/reinforced{ dir = 1 }, /obj/structure/flora/ausbushes, -/turf/unsimulated/floor{ - icon_state = "grass1"; - name = "grass" - }, +/turf/simulated/floor/grass, /area/centcom/specops) "pk" = ( /obj/structure/closet/secure_closet/guncabinet, @@ -5528,35 +4429,25 @@ /obj/item/ammo_casing/rocket, /obj/item/ammo_casing/rocket, /obj/item/gun/rocketlauncher, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/gamma/space) "pl" = ( /obj/structure/window/reinforced{ dir = 1 }, /obj/structure/flora/ausbushes/fernybush, -/turf/unsimulated/floor{ - icon_state = "grass1"; - name = "grass" - }, +/turf/simulated/floor/grass, /area/centcom/specops) "pm" = ( /obj/structure/window/reinforced{ dir = 1 }, /obj/structure/flora/ausbushes/leafybush, -/turf/unsimulated/floor{ - icon_state = "grass1"; - name = "grass" - }, +/turf/simulated/floor/grass, /area/centcom/specops) "pn" = ( -/obj/machinery/door/airlock/shuttle, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/obj/machinery/door/airlock/titanium, +/turf/simulated/floor/plating, /area/shuttle/gamma/space) "po" = ( /obj/structure/table/reinforced, @@ -5567,9 +4458,7 @@ /obj/item/kitchen/knife/combat, /obj/item/kitchen/knife/combat, /obj/item/kitchen/knife/combat, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/gamma/space) "pq" = ( /obj/structure/cable{ @@ -5583,9 +4472,7 @@ pixel_x = 0 }, /obj/machinery/mech_bay_recharge_port/upgraded, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/gamma/space) "ps" = ( /obj/structure/cable{ @@ -5593,17 +4480,13 @@ icon_state = "0-8" }, /obj/machinery/computer/mech_bay_power_console, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/gamma/space) "pt" = ( -/obj/machinery/door/airlock/shuttle{ +/obj/machinery/door/airlock/titanium{ req_access_txt = "0" }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/plating, /area/shuttle/gamma/space) "pu" = ( /obj/mecha/combat/durand/loaded{ @@ -5615,16 +4498,14 @@ icon_state = "4-8"; pixel_x = 0 }, -/turf/simulated/floor/mech_bay_recharge_floor, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/gamma/space) "pv" = ( /obj/machinery/door/poddoor/impassable{ id_tag = "CCTELE"; name = "Specops Teleporter" }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/centcom/specops) "pw" = ( /obj/machinery/door/poddoor/shutters{ @@ -5632,34 +4513,14 @@ id_tag = "specopsoffice"; name = "Privacy Shutters" }, -/turf/unsimulated/wall/fakeglass{ - dir = 1; - icon_state = "fakewindows"; - tag = "icon-fakewindows (WEST)" - }, +/turf/simulated/wall/indestructible/fakeglass, /area/centcom/specops) -"px" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall_s5"; - dir = 2 - }, -/area/shuttle/gamma/space) -"py" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall_s9"; - dir = 2 - }, -/area/shuttle/gamma/space) "pz" = ( -/turf/unsimulated/floor{ - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/syndicate_mothership) "pA" = ( /obj/machinery/light, -/turf/unsimulated/floor{ - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/syndicate_mothership) "pB" = ( /obj/structure/table/reinforced, @@ -5670,60 +4531,25 @@ pixel_x = 3; pixel_y = 3 }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, -/area/centcom/specops) -"pC" = ( -/obj/machinery/door/poddoor/shutters{ - dir = 8; - id_tag = "specopsoffice"; - name = "Privacy Shutters" - }, -/turf/unsimulated/wall/fakeglass{ - tag = "icon-fakewindows2 (NORTH)"; - icon_state = "fakewindows2"; - dir = 1 - }, +/turf/simulated/floor/plasteel/dark, /area/centcom/specops) "pD" = ( -/turf/unsimulated/floor{ - dir = 9; - icon_state = "carpetside" - }, -/area/centcom/specops) -"pE" = ( -/turf/unsimulated/floor{ - dir = 5; - icon_state = "carpetside" - }, -/area/centcom/specops) -"pF" = ( -/turf/unsimulated/wall/fakeglass, -/area/syndicate_mothership) -"pG" = ( -/turf/unsimulated/floor{ - dir = 1; - icon_state = "carpetside" - }, +/turf/simulated/floor/carpet, /area/centcom/specops) "pH" = ( -/turf/unsimulated/floor{ - icon_state = "green"; - dir = 9 +/turf/simulated/floor/plasteel{ + dir = 9; + icon_state = "green" }, /area/centcom/control) "pI" = ( -/turf/unsimulated/floor{ - icon_state = "green"; - dir = 5 +/turf/simulated/floor/plasteel{ + dir = 5; + icon_state = "green" }, /area/centcom/control) "pJ" = ( -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, +/turf/simulated/floor/plasteel/freezer, /area/centcom/specops) "pK" = ( /obj/machinery/camera{ @@ -5731,10 +4557,7 @@ dir = 2; network = list("ERT","CentComm") }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, +/turf/simulated/floor/plasteel/freezer, /area/centcom/specops) "pL" = ( /obj/machinery/door/airlock/centcom{ @@ -5742,17 +4565,7 @@ opacity = 1; req_access_txt = "0" }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, -/area/centcom/specops) -"pM" = ( -/obj/machinery/door/poddoor/shutters{ - dir = 8; - id_tag = "specopsoffice"; - name = "Privacy Shutters" - }, -/turf/unsimulated/wall/fakeglass, +/turf/simulated/floor/plasteel/dark, /area/centcom/specops) "pN" = ( /obj/machinery/door_control{ @@ -5783,68 +4596,52 @@ req_access_txt = "114" }, /obj/structure/table/wood, -/turf/unsimulated/floor{ - dir = 8; - icon_state = "carpetside" - }, +/turf/simulated/floor/carpet, /area/centcom/specops) "pO" = ( /obj/item/radio/intercom/specops, /obj/structure/table/wood, -/turf/unsimulated/floor{ - dir = 4; - icon_state = "carpetside" - }, +/turf/simulated/floor/carpet, /area/centcom/specops) "pP" = ( /obj/machinery/computer/security/telescreen{ - name = "Special Ops. Monitor"; desc = "Used for watching the Special Ops."; + name = "Special Ops. Monitor"; network = list("ERT") }, /obj/structure/table/wood, -/turf/unsimulated/floor{ - icon_state = "carpet"; - dir = 2 - }, +/turf/simulated/floor/carpet, /area/centcom/specops) "pQ" = ( /obj/structure/closet/secure_closet/brig, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/centcom/specops) +"pR" = ( +/obj/machinery/computer/station_alert, +/obj/structure/sign/poster/official/nanotrasen_logo{ + pixel_x = 32; + pixel_y = 0 + }, +/turf/simulated/floor/plasteel{ + dir = 5; + icon_state = "darkyellow" + }, +/area/shuttle/escape) "pS" = ( /obj/machinery/door/airlock/centcom{ name = "Telecommunications"; opacity = 1; req_access_txt = "107" }, -/turf/unsimulated/floor{ - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/centcom/control) -"pT" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall_s5"; - dir = 2 - }, -/area/shuttle/escape) -"pU" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall_s9"; - dir = 2 - }, -/area/shuttle/escape) "pV" = ( /obj/machinery/camera{ c_tag = "CentComm Special Ops. Ready Room South"; dir = 1; network = list("ERT","CentComm") }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/centcom/specops) "pW" = ( /obj/machinery/newscaster{ @@ -5852,9 +4649,7 @@ pixel_x = 0; pixel_y = -27 }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/centcom/specops) "pX" = ( /obj/machinery/door_control{ @@ -5885,16 +4680,7 @@ req_access_txt = "114" }, /obj/structure/table/wood, -/turf/unsimulated/floor{ - dir = 8; - icon_state = "carpetside" - }, -/area/centcom/specops) -"pY" = ( -/turf/unsimulated/floor{ - dir = 4; - icon_state = "carpetside" - }, +/turf/simulated/floor/carpet, /area/centcom/specops) "pZ" = ( /obj/structure/chair/comfy/black{ @@ -5903,10 +4689,7 @@ /obj/effect/landmark{ name = "ERT Director" }, -/turf/unsimulated/floor{ - icon_state = "carpet"; - dir = 2 - }, +/turf/simulated/floor/carpet, /area/centcom/specops) "qb" = ( /obj/structure/sink{ @@ -5920,45 +4703,15 @@ pixel_x = 32; pixel_y = 0 }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, +/turf/simulated/floor/plasteel/freezer, /area/centcom/specops) -"qc" = ( -/obj/effect/spawner/window/reinforced, -/turf/unsimulated/floor{ - icon_state = "floor" - }, -/area/centcom/evac) "qd" = ( /obj/machinery/door/airlock/external{ id_tag = "specops_away"; name = "Shuttle Hatch"; req_access_txt = "109" }, -/turf/unsimulated/floor{ - icon_state = "vault"; - dir = 5 - }, -/area/centcom/specops) -"qe" = ( -/turf/unsimulated/floor{ - dir = 10; - icon_state = "carpetside" - }, -/area/centcom/specops) -"qf" = ( -/turf/unsimulated/floor{ - dir = 6; - icon_state = "carpetside" - }, -/area/centcom/specops) -"qg" = ( -/turf/unsimulated/floor{ - dir = 2; - icon_state = "carpetside" - }, +/turf/simulated/floor/plasteel/dark, /area/centcom/specops) "qh" = ( /obj/structure/holowindow, @@ -5967,13 +4720,11 @@ icon_state = "red" }, /area/holodeck/source_thunderdomecourt) -"qj" = ( -/turf/unsimulated/wall/fakeglass{ - dir = 1; - icon_state = "fakewindows"; - tag = "icon-fakewindows (WEST)" - }, -/area/centcom/specops) +"qi" = ( +/obj/machinery/portable_atmospherics/canister/nitrogen, +/obj/machinery/light/spot, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/vox) "qk" = ( /obj/item/gun/projectile/automatic/pistol/m1911, /obj/item/ammo_box/magazine/m45, @@ -5993,53 +4744,37 @@ /obj/item/storage/box/handcuffs, /obj/item/storage/box/flashbangs, /obj/item/clothing/mask/gas, -/obj/item/tank/emergency_oxygen/double, +/obj/item/tank/internals/emergency_oxygen/double, /obj/item/radio/headset/ert{ pixel_x = 6; pixel_y = -6 }, -/turf/unsimulated/floor{ - icon_state = "grimy" - }, +/turf/simulated/floor/plasteel/grimy, /area/centcom/specops) "ql" = ( -/turf/unsimulated/wall{ - icon = 'icons/obj/library.dmi'; - icon_state = "book-5"; - name = "bookcase (Tactics)" - }, -/area/centcom/specops) -"qm" = ( -/turf/unsimulated/wall{ - icon = 'icons/obj/library.dmi'; - icon_state = "book-5"; - name = "bookcase (Reports)" - }, +/obj/structure/bookcase/random, +/turf/simulated/floor/plasteel/grimy, /area/centcom/specops) "qo" = ( -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, +/turf/simulated/floor/plasteel/white, /area/centcom/evac) "qq" = ( -/turf/unsimulated/floor{ - icon_state = "green"; - dir = 10 +/turf/simulated/floor/plasteel{ + dir = 10; + icon_state = "green" }, /area/centcom/control) "qr" = ( -/turf/unsimulated/floor{ - icon_state = "green"; - dir = 6 +/turf/simulated/floor/plasteel{ + dir = 6; + icon_state = "green" }, /area/centcom/control) "qs" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, +/turf/simulated/floor/plasteel/white, /area/centcom/evac) "qu" = ( /obj/machinery/door/airlock/centcom{ @@ -6047,18 +4782,13 @@ opacity = 1; req_access_txt = "0" }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, +/turf/simulated/floor/plasteel/freezer, /area/centcom/specops) "qv" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ dir = 1 }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, +/turf/simulated/floor/plasteel/white, /area/centcom/evac) "qw" = ( /obj/machinery/door/airlock/centcom{ @@ -6066,9 +4796,7 @@ opacity = 1; req_access_txt = "101" }, -/turf/unsimulated/floor{ - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/centcom/control) "qx" = ( /obj/effect/forcefield{ @@ -6076,11 +4804,7 @@ layer = 1; name = "Blocker" }, -/turf/unsimulated/wall/fakeglass{ - dir = 8; - icon_state = "fakewindows3"; - tag = "icon-fakewindows (WEST)" - }, +/turf/simulated/wall/indestructible/fakeglass, /area/centcom/specops) "qy" = ( /obj/machinery/door/airlock/centcom{ @@ -6088,19 +4812,13 @@ opacity = 1; req_access_txt = "0" }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, +/turf/simulated/floor/plasteel/freezer, /area/centcom/bathroom) "qz" = ( /obj/structure/toilet{ dir = 4 }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, +/turf/simulated/floor/plasteel/freezer, /area/centcom/bathroom) "qA" = ( /obj/structure/mirror{ @@ -6109,10 +4827,7 @@ /obj/structure/sink{ pixel_y = 15 }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, +/turf/simulated/floor/plasteel/freezer, /area/centcom/bathroom) "qB" = ( /obj/structure/sink{ @@ -6121,10 +4836,7 @@ /obj/structure/mirror{ pixel_y = 32 }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, +/turf/simulated/floor/plasteel/freezer, /area/centcom/bathroom) "qC" = ( /obj/machinery/shower{ @@ -6134,10 +4846,7 @@ tag = "icon-shower (EAST)" }, /obj/structure/curtain/open/shower/centcom, -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, +/turf/simulated/floor/plasteel/freezer, /area/centcom/bathroom) "qD" = ( /obj/machinery/shower{ @@ -6147,101 +4856,76 @@ tag = "icon-shower (WEST)" }, /obj/structure/curtain/open/shower/centcom, -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, +/turf/simulated/floor/plasteel/freezer, /area/centcom/bathroom) "qE" = ( -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, +/turf/simulated/floor/plasteel/freezer, /area/centcom/bathroom) "qF" = ( /turf/simulated/floor/mech_bay_recharge_floor, /area/syndicate_mothership) "qG" = ( /obj/machinery/computer/mech_bay_power_console, -/turf/unsimulated/floor, +/turf/simulated/floor/plating, /area/syndicate_mothership) "qH" = ( -/turf/unsimulated/floor{ - icon_state = "green"; - dir = 9 +/turf/simulated/floor/plasteel{ + dir = 9; + icon_state = "green" }, /area/centcom/evac) "qI" = ( -/turf/unsimulated/wall, +/turf/simulated/wall/indestructible/riveted, /area/centcom/suppy) "qJ" = ( -/turf/unsimulated/floor{ - icon_state = "greencorner"; - dir = 1 +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "greencorner" }, /area/centcom/evac) "qK" = ( /obj/structure/toilet{ dir = 8 }, -/turf/unsimulated/floor{ - icon_state = "platingdmg3" - }, +/turf/simulated/floor/plating, /area/centcom) "qL" = ( -/turf/unsimulated/floor{ - icon_state = "green"; - dir = 5 +/turf/simulated/floor/plasteel{ + dir = 5; + icon_state = "green" }, /area/centcom/evac) "qM" = ( -/turf/unsimulated/floor{ - icon_state = "greencorner"; - dir = 4 +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "greencorner" }, /area/centcom/evac) -"qN" = ( -/obj/structure/toilet{ - dir = 8 - }, -/turf/unsimulated/floor{ - name = "plating" - }, -/area/centcom) "qO" = ( /obj/effect/decal/cleanable/cobweb2, /obj/structure/toilet{ dir = 8 }, -/turf/unsimulated/floor{ - name = "plating" - }, +/turf/simulated/floor/plating, /area/centcom) "qP" = ( /obj/effect/decal/cleanable/blood, /obj/structure/toilet{ dir = 8 }, -/turf/unsimulated/floor{ - name = "plating" - }, +/turf/simulated/floor/plating, /area/centcom) "qQ" = ( /obj/structure/toilet{ dir = 8 }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, +/turf/simulated/floor/plasteel/freezer, /area/centcom/specops) "qR" = ( /obj/effect/landmark{ name = "prisonwarp" }, -/turf/unsimulated/floor{ - name = "plating" - }, +/turf/simulated/floor/plating, /area/centcom) "qS" = ( /obj/machinery/door/airlock/centcom{ @@ -6250,30 +4934,14 @@ req_access_txt = "104" }, /obj/effect/decal/warning_stripes/yellow, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/centcom/specops) "qT" = ( /obj/effect/decal/cleanable/blood, -/turf/unsimulated/floor{ - name = "plating" - }, +/turf/simulated/floor/plating, /area/centcom) "qU" = ( -/turf/unsimulated/floor{ - icon_state = "panelscorched" - }, -/area/centcom) -"qV" = ( -/turf/unsimulated/floor{ - name = "plating" - }, -/area/centcom) -"qW" = ( -/turf/unsimulated/floor{ - icon_state = "platingdmg3" - }, +/turf/simulated/floor/plating, /area/centcom) "qX" = ( /obj/machinery/door/poddoor{ @@ -6283,9 +4951,9 @@ name = "Security Doors"; opacity = 0 }, -/turf/unsimulated/floor{ - icon_state = "green"; - dir = 8 +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "green" }, /area/centcom/evac) "qY" = ( @@ -6303,22 +4971,33 @@ name = "security checkpoint"; req_access_txt = "104" }, -/turf/unsimulated/floor{ - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/centcom/evac) "qZ" = ( -/turf/unsimulated/floor{ - icon_state = "green"; - dir = 4 +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "green" }, /area/centcom/evac) "ra" = ( -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/centcom) "rb" = ( +/obj/machinery/door/airlock/external{ + id_tag = "s_docking_airlock"; + name = "Shuttle Hatch"; + req_access_txt = "109" + }, +/obj/docking_port/mobile{ + dir = 8; + dwidth = 2; + height = 11; + id = "specops"; + name = "ert shuttle"; + roundstart_move = null; + width = 5 + }, +/obj/structure/fans/tiny, /obj/docking_port/stationary{ dir = 8; dwidth = 2; @@ -6327,21 +5006,11 @@ name = "centcom bay 3"; width = 5 }, -/turf/space, -/area/space) +/turf/simulated/floor/plating, +/area/shuttle/specops) "rc" = ( /obj/effect/decal/cleanable/blood, -/turf/unsimulated/floor{ - icon_state = "dark" - }, -/area/centcom) -"rd" = ( -/obj/effect/landmark{ - name = "prisonwarp" - }, -/turf/unsimulated/floor{ - icon_state = "panelscorched" - }, +/turf/simulated/floor/plasteel/dark, /area/centcom) "re" = ( /obj/machinery/door/airlock/centcom{ @@ -6349,15 +5018,12 @@ opacity = 1; req_access_txt = "0" }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, +/turf/simulated/floor/plasteel/freezer, /area/centcom/bathroom) "rf" = ( -/turf/unsimulated/floor{ - icon_state = "green"; - dir = 8 +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "green" }, /area/centcom/evac) "rg" = ( @@ -6365,25 +5031,7 @@ /obj/effect/landmark{ name = "prisonwarp" }, -/turf/unsimulated/floor{ - name = "plating" - }, -/area/centcom) -"rh" = ( -/obj/structure/toilet{ - dir = 8 - }, -/turf/unsimulated/floor{ - icon_state = "platingdmg1" - }, -/area/centcom) -"ri" = ( -/obj/structure/toilet{ - dir = 8 - }, -/turf/unsimulated/floor{ - icon_state = "floorscorched2" - }, +/turf/simulated/floor/plating, /area/centcom) "rj" = ( /obj/machinery/door/window/westright{ @@ -6391,18 +5039,14 @@ req_access_txt = "104" }, /obj/structure/table, -/turf/unsimulated/floor{ - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/centcom/evac) "rk" = ( /obj/machinery/door/window/eastleft{ name = "security checkpoint"; req_access_txt = "104" }, -/turf/unsimulated/floor{ - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/centcom/evac) "rl" = ( /obj/structure/sink{ @@ -6414,15 +5058,12 @@ /obj/structure/mirror{ pixel_x = 32 }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, +/turf/simulated/floor/plasteel/freezer, /area/centcom/bathroom) "rm" = ( -/turf/unsimulated/floor{ - icon_state = "green"; - dir = 10 +/turf/simulated/floor/plasteel{ + dir = 10; + icon_state = "green" }, /area/centcom/evac) "rn" = ( @@ -6442,19 +5083,16 @@ opacity = 1; req_access_txt = "0" }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, +/turf/simulated/floor/plasteel/freezer, /area/centcom/bathroom) "rp" = ( /obj/machinery/door/poddoor{ id_tag = "CentComPort"; name = "Security Doors" }, -/turf/unsimulated/floor{ - icon_state = "green"; - dir = 8 +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "green" }, /area/centcom/evac) "rq" = ( @@ -6463,51 +5101,31 @@ name = "security checkpoint"; req_access_txt = "104" }, -/turf/unsimulated/floor{ - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/centcom/evac) "rr" = ( /obj/structure/flora/ausbushes/lavendergrass, -/turf/unsimulated/floor{ - icon_state = "grass1"; - name = "grass" - }, +/turf/simulated/floor/grass, /area/centcom/evac) "rs" = ( /obj/structure/flora/ausbushes/stalkybush, -/turf/unsimulated/floor{ - icon_state = "grass1"; - name = "grass" - }, +/turf/simulated/floor/grass, /area/centcom/evac) "rt" = ( /obj/structure/flora/ausbushes/pointybush, -/turf/unsimulated/floor{ - icon_state = "grass1"; - name = "grass" - }, +/turf/simulated/floor/grass, /area/centcom/evac) "ru" = ( /obj/structure/flora/ausbushes/ywflowers, -/turf/unsimulated/floor{ - icon_state = "grass1"; - name = "grass" - }, +/turf/simulated/floor/grass, /area/centcom/evac) "rv" = ( /obj/structure/flora/ausbushes/brflowers, -/turf/unsimulated/floor{ - icon_state = "grass1"; - name = "grass" - }, +/turf/simulated/floor/grass, /area/centcom/evac) "rw" = ( /obj/structure/flora/ausbushes/sparsegrass, -/turf/unsimulated/floor{ - icon_state = "grass1"; - name = "grass" - }, +/turf/simulated/floor/grass, /area/centcom/evac) "rx" = ( /obj/machinery/door/airlock/centcom{ @@ -6515,41 +5133,29 @@ opacity = 1; req_access_txt = "0" }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, +/turf/simulated/floor/plasteel/freezer, /area/centcom/evac) "ry" = ( -/turf/unsimulated/floor{ - icon_state = "green"; - dir = 1 +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "green" }, /area/centcom/evac) "rz" = ( /obj/machinery/computer/communications, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/centcom/specops) "rA" = ( /obj/machinery/teleport/station, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/centcom/specops) "rB" = ( /obj/machinery/computer/teleporter, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/centcom/specops) "rC" = ( /obj/structure/flora/ausbushes, -/turf/unsimulated/floor{ - icon_state = "grass1"; - name = "grass" - }, +/turf/simulated/floor/grass, /area/centcom/evac) "rD" = ( /obj/machinery/door/airlock/centcom{ @@ -6557,20 +5163,14 @@ opacity = 1; req_access_txt = "0" }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, +/turf/simulated/floor/plasteel/freezer, /area/centcom/bathroom) "rE" = ( -/turf/unsimulated/wall, +/turf/simulated/wall/indestructible/riveted, /area/start) "rF" = ( /obj/structure/flora/ausbushes/leafybush, -/turf/unsimulated/floor{ - icon_state = "grass1"; - name = "grass" - }, +/turf/simulated/floor/grass, /area/centcom/evac) "rG" = ( /obj/machinery/door/airlock/external{ @@ -6579,59 +5179,45 @@ hackProof = 1; icon_state = "door_locked"; id_tag = "emergency_away"; - locked = 1; name = "Arrival Airlock"; req_access = null; req_access_txt = "0" }, -/turf/unsimulated/floor{ - name = "plating" - }, +/turf/simulated/floor/plating, /area/centcom/evac) "rH" = ( /obj/effect/landmark/start, -/turf/unsimulated/floor, +/turf/simulated/floor/plating, /area/start) "rI" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall_s6"; - icon_state = "swall_s6"; - dir = 2 - }, +/turf/simulated/wall/mineral/titanium, /area/centcom/evac) "rJ" = ( /obj/structure/shuttle/engine/propulsion{ - tag = "icon-propulsion (NORTH)"; + dir = 1; icon_state = "propulsion"; - dir = 1 + tag = "icon-propulsion (NORTH)" }, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/centcom/evac) "rK" = ( -/turf/unsimulated/wall/splashscreen, +/turf/simulated/wall/indestructible/splashscreen, /area/start) "rL" = ( /obj/structure/shuttle/engine/propulsion{ - tag = "icon-propulsion_r (NORTH)"; + dir = 1; icon_state = "propulsion_r"; - dir = 1 - }, -/turf/simulated/shuttle/plating, -/area/centcom/evac) -"rM" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall_s10"; - icon_state = "swall_s10"; - dir = 2 + tag = "icon-propulsion_r (NORTH)" }, +/turf/simulated/floor/plating/airless, /area/centcom/evac) "rN" = ( /obj/structure/shuttle/engine/propulsion{ - tag = "icon-propulsion_l (NORTH)"; + dir = 1; icon_state = "propulsion_l"; - dir = 1 + tag = "icon-propulsion_l (NORTH)" }, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/centcom/evac) "rO" = ( /obj/docking_port/stationary{ @@ -6655,42 +5241,17 @@ }, /turf/space, /area/space) -"rQ" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall3"; - icon_state = "swall3"; - dir = 2 - }, -/area/centcom/evac) "rR" = ( /obj/structure/window/reinforced, /obj/structure/shuttle/engine/heater{ - tag = "icon-heater (NORTH)"; + dir = 1; icon_state = "heater"; - dir = 1 - }, -/turf/simulated/shuttle/plating, -/area/centcom/evac) -"rS" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall7"; - icon_state = "swall7"; - dir = 2 - }, -/area/centcom/evac) -"rT" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall12"; - icon_state = "swall12"; - dir = 2 + tag = "icon-heater (NORTH)" }, +/turf/simulated/floor/plating/airless, /area/centcom/evac) "rU" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall11"; - icon_state = "swall11"; - dir = 2 - }, +/turf/simulated/wall/mineral/titanium/nodiagonal, /area/centcom/evac) "rV" = ( /obj/structure/sign/securearea{ @@ -6700,9 +5261,21 @@ name = "EXTERNAL AIRLOCK"; pixel_x = 0 }, -/turf/unsimulated/wall, +/turf/simulated/wall/indestructible/riveted, /area/centcom/evac) "rW" = ( +/obj/docking_port/mobile/emergency{ + dir = 4; + dwidth = 11; + height = 18; + width = 29 + }, +/obj/machinery/door/airlock/titanium{ + aiControlDisabled = 1; + hackProof = 1; + id_tag = "s_docking_airlock"; + name = "Shuttle Hatch" + }, /obj/docking_port/stationary{ dir = 4; dwidth = 11; @@ -6711,29 +5284,10 @@ name = "emergency centcom"; width = 29 }, -/turf/space, -/area/space) -"rX" = ( -/turf/simulated/shuttle/floor, -/turf/simulated/shuttle/wall{ - tag = "icon-swall_f9"; - icon_state = "swall_f9"; - dir = 2 - }, -/area/centcom/evac) -"rY" = ( -/turf/simulated/shuttle/plating, -/turf/simulated/shuttle/wall{ - tag = "icon-swall_f6"; - icon_state = "swall_f6"; - dir = 2 - }, -/area/centcom/evac) +/turf/simulated/floor/plating, +/area/shuttle/escape) "rZ" = ( -/turf/simulated/shuttle/floor{ - tag = "icon-floor2"; - icon_state = "floor2" - }, +/turf/simulated/floor/mineral/titanium/yellow, /area/centcom/evac) "sa" = ( /obj/structure/table, @@ -6742,7 +5296,7 @@ pixel_x = -2; pixel_y = 4 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/centcom/evac) "sb" = ( /obj/structure/table, @@ -6751,7 +5305,7 @@ pixel_y = 4 }, /obj/item/storage/firstaid/toxin, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/centcom/evac) "sc" = ( /obj/structure/table, @@ -6763,24 +5317,7 @@ pixel_x = -2; pixel_y = 4 }, -/turf/simulated/shuttle/floor, -/area/centcom/evac) -"sd" = ( -/turf/simulated/shuttle/floor, -/turf/simulated/shuttle/wall{ - tag = "icon-swall_f5"; - icon_state = "swall_f5"; - dir = 2 - }, -/area/centcom/evac) -"se" = ( -/turf/simulated/shuttle/plating, -/turf/simulated/shuttle/wall{ - dir = 3; - icon_state = "swall_f10"; - layer = 2; - tag = "icon-swall_f10" - }, +/turf/simulated/floor/mineral/titanium/blue, /area/centcom/evac) "sf" = ( /obj/structure/closet/secure_closet/brig, @@ -6789,9 +5326,7 @@ dir = 8; network = list("ERT","CentComm") }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/centcom/specops) "sg" = ( /obj/machinery/vending/wallmed{ @@ -6800,14 +5335,7 @@ pixel_y = 0; req_access_txt = "0" }, -/turf/simulated/shuttle/floor, -/area/centcom/evac) -"sh" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall1"; - icon_state = "swall1"; - dir = 2 - }, +/turf/simulated/floor/mineral/titanium/blue, /area/centcom/evac) "si" = ( /obj/machinery/vending/wallmed{ @@ -6816,99 +5344,58 @@ pixel_y = 0; req_access_txt = "0" }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/centcom/evac) "sj" = ( -/turf/unsimulated/floor{ - icon_state = "greencorner"; - dir = 8 - }, -/area/centcom/evac) -"sk" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall_s5"; - icon_state = "swall_s5"; - dir = 2 - }, -/area/centcom/evac) -"sl" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall_s9"; - icon_state = "swall_s9"; - dir = 2 +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "greencorner" }, /area/centcom/evac) "sm" = ( /obj/structure/flora/ausbushes/grassybush, -/turf/unsimulated/floor{ - icon_state = "grass1"; - name = "grass" - }, +/turf/simulated/floor/grass, /area/centcom/evac) "sn" = ( /obj/structure/chair/comfy/shuttle{ dir = 4 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/centcom/evac) "so" = ( /obj/machinery/vending/boozeomat, -/turf/unsimulated/floor{ - dir = 8; - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/centcom/evac) "sp" = ( /obj/structure/table, /obj/item/reagent_containers/food/drinks/cans/cola, -/turf/unsimulated/floor{ - dir = 8; - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/centcom/evac) "sq" = ( -/turf/unsimulated/wall, +/turf/simulated/wall/indestructible/riveted, /area/centcom/control) "sr" = ( -/turf/unsimulated/floor{ - dir = 8; - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/centcom/evac) "ss" = ( /obj/structure/chair/stool/bar, -/turf/unsimulated/floor{ - dir = 8; - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/centcom/evac) "st" = ( /obj/structure/closet/secure_closet/bar{ req_access = null; req_access_txt = "0" }, -/turf/unsimulated/floor{ - dir = 8; - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/centcom/evac) "su" = ( /obj/effect/spawner/window/reinforced, -/turf/unsimulated/floor{ - name = "plating" - }, -/area/centcom/control) -"sv" = ( -/obj/effect/spawner/window/reinforced, -/turf/unsimulated/floor, +/turf/simulated/floor/plating, /area/centcom/control) "sw" = ( /obj/structure/table, /obj/item/lighter/zippo, -/turf/unsimulated/floor{ - dir = 8; - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/centcom/evac) "sx" = ( /obj/machinery/door/airlock/centcom{ @@ -6916,41 +5403,30 @@ opacity = 1; req_access_txt = "0" }, -/turf/unsimulated/floor{ - dir = 8; - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/centcom/evac) "sy" = ( /obj/machinery/computer/secure_data, /obj/machinery/light/spot{ - tag = "icon-tube1 (WEST)"; + dir = 8; icon_state = "tube1"; - dir = 8 - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" + tag = "icon-tube1 (WEST)" }, +/turf/simulated/floor/mineral/plastitanium/red, /area/centcom/evac) "sz" = ( /obj/structure/reagent_dispensers/beerkeg, -/turf/unsimulated/floor{ - dir = 8; - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/centcom/evac) "sA" = ( /obj/structure/table, /obj/item/reagent_containers/food/drinks/shaker, -/turf/unsimulated/floor{ - dir = 8; - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/centcom/evac) "sB" = ( -/turf/unsimulated/floor{ - icon_state = "green"; - dir = 6 +/turf/simulated/floor/plasteel{ + dir = 6; + icon_state = "green" }, /area/centcom/evac) "sC" = ( @@ -6961,9 +5437,7 @@ name = "Security Desk"; req_access_txt = "104" }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/centcom/evac) "sD" = ( /obj/docking_port/stationary{ @@ -6982,16 +5456,11 @@ opacity = 1; req_access_txt = "106" }, -/turf/unsimulated/floor{ - icon_state = "floor" - }, +/turf/simulated/floor/plating, /area/centcom/evac) "sF" = ( /obj/structure/flora/ausbushes/fullgrass, -/turf/unsimulated/floor{ - icon_state = "grass1"; - name = "grass" - }, +/turf/simulated/floor/grass, /area/centcom/evac) "sG" = ( /obj/item/storage/firstaid/regular{ @@ -7003,44 +5472,29 @@ pixel_y = 4 }, /obj/structure/table/reinforced, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/centcom/evac) "sH" = ( -/turf/unsimulated/wall/fakeglass{ - icon_state = "fakewindows"; - dir = 1 - }, +/turf/simulated/wall/indestructible/fakeglass, /area/centcom/ferry) "sI" = ( /obj/machinery/vending/boozeomat{ req_access_txt = "102" }, -/turf/unsimulated/wall, -/area/centcom/control) -"sJ" = ( -/turf/unsimulated/wall/fakeglass{ - icon_state = "fakewindows2"; - dir = 1 +/turf/simulated/floor/plasteel{ + icon_state = "cafeteria" }, -/area/centcom/ferry) +/area/centcom/control) "sK" = ( /obj/structure/flora/ausbushes/fernybush, -/turf/unsimulated/floor{ - icon_state = "grass1"; - name = "grass" - }, +/turf/simulated/floor/grass, /area/centcom/evac) "sL" = ( /obj/machinery/door/airlock/hatch{ name = "Infirmary"; req_access_txt = "0" }, -/turf/simulated/shuttle/floor{ - tag = "icon-floor2"; - icon_state = "floor2" - }, +/turf/simulated/floor/mineral/titanium/yellow, /area/centcom/evac) "sM" = ( /obj/docking_port/stationary{ @@ -7058,25 +5512,11 @@ req_access = null; req_access_txt = "112" }, -/turf/unsimulated/floor{ - icon_state = "white" - }, +/turf/simulated/floor/plasteel/white, /area/tdome) "sO" = ( -/turf/unsimulated/wall{ - desc = "The door appears to be locked tightly."; - icon = 'icons/obj/doors/airlocks/hatch/centcom.dmi'; - icon_state = "closed"; - name = "Locked Door" - }, +/turf/simulated/wall/indestructible/fakedoor, /area/tdome) -"sP" = ( -/turf/unsimulated/wall/fakeglass{ - tag = "icon-fakewindows (SOUTHEAST)"; - icon_state = "fakewindows"; - dir = 6 - }, -/area/centcom/ferry) "sQ" = ( /obj/structure/sign/securearea{ desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; @@ -7085,10 +5525,7 @@ name = "EXTERNAL AIRLOCK"; pixel_x = 0 }, -/turf/unsimulated/wall/fakeglass{ - icon_state = "fakewindows"; - dir = 8 - }, +/turf/simulated/wall/indestructible/fakeglass, /area/centcom/ferry) "sR" = ( /obj/machinery/door/airlock/centcom{ @@ -7096,9 +5533,7 @@ opacity = 1; req_access_txt = "0" }, -/turf/unsimulated/floor{ - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/centcom/evac) "sS" = ( /obj/machinery/vending/wallmed{ @@ -7107,28 +5542,22 @@ pixel_y = 0; req_access_txt = "0" }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/centcom/evac) "sT" = ( /obj/machinery/vending/cigarette, -/turf/unsimulated/floor{ - tag = "icon-redbluefull (WEST)"; - icon_state = "redbluefull"; - dir = 8 +/turf/simulated/floor/plasteel{ + icon_state = "redbluefull" }, /area/tdome/tdomeobserve) "sU" = ( /obj/structure/table{ - icon_state = "tabledir"; - dir = 2 + dir = 2; + icon_state = "tabledir" }, /obj/item/reagent_containers/food/drinks/cans/cola, -/turf/unsimulated/floor{ - tag = "icon-redbluefull (WEST)"; - icon_state = "redbluefull"; - dir = 8 +/turf/simulated/floor/plasteel{ + icon_state = "redbluefull" }, /area/tdome/tdomeobserve) "sV" = ( @@ -7138,28 +5567,22 @@ /obj/item/reagent_containers/food/drinks/cans/beer, /obj/item/lighter/zippo, /obj/item/storage/fancy/cigarettes, -/turf/unsimulated/floor{ - tag = "icon-redbluefull (WEST)"; - icon_state = "redbluefull"; - dir = 8 +/turf/simulated/floor/plasteel{ + icon_state = "redbluefull" }, /area/tdome/tdomeobserve) "sW" = ( /obj/structure/reagent_dispensers/beerkeg, -/turf/unsimulated/floor{ - tag = "icon-redbluefull (WEST)"; - icon_state = "redbluefull"; - dir = 8 +/turf/simulated/floor/plasteel{ + icon_state = "redbluefull" }, /area/tdome/tdomeobserve) "sX" = ( -/turf/unsimulated/wall, +/turf/simulated/wall/indestructible/riveted, /area/centcom/specops) "sY" = ( -/turf/unsimulated/floor{ - tag = "icon-redbluefull (WEST)"; - icon_state = "redbluefull"; - dir = 8 +/turf/simulated/floor/plasteel{ + icon_state = "redbluefull" }, /area/tdome/tdomeobserve) "sZ" = ( @@ -7169,21 +5592,29 @@ network = list("Thunderdome"); pixel_y = 30 }, -/turf/unsimulated/floor{ - tag = "icon-redbluefull (WEST)"; - icon_state = "redbluefull"; - dir = 8 +/turf/simulated/floor/plasteel{ + icon_state = "redbluefull" }, /area/tdome/tdomeobserve) "ta" = ( /obj/machinery/vending/coffee, -/turf/unsimulated/floor{ - tag = "icon-redbluefull (WEST)"; - icon_state = "redbluefull"; - dir = 8 +/turf/simulated/floor/plasteel{ + icon_state = "redbluefull" }, /area/tdome/tdomeobserve) "tb" = ( +/obj/machinery/door/airlock/titanium{ + id_tag = "s_docking_airlock" + }, +/obj/docking_port/mobile{ + dir = 8; + dwidth = 2; + height = 12; + id = "ferry"; + name = "ferry shuttle"; + roundstart_move = null; + width = 5 + }, /obj/docking_port/stationary{ dir = 8; dwidth = 2; @@ -7192,14 +5623,10 @@ name = "centcom bay 2"; width = 5 }, -/turf/space, -/area/space) +/turf/simulated/floor/plating, +/area/shuttle/transport) "tc" = ( -/turf/unsimulated/floor{ - tag = "icon-warndark (EAST)"; - icon_state = "warndark"; - dir = 4 - }, +/turf/simulated/floor/plating, /area/centcom/ferry) "td" = ( /obj/machinery/door/airlock/external{ @@ -7207,51 +5634,45 @@ name = "Ferry Airlock"; req_access_txt = "0" }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plating, /area/centcom/ferry) "te" = ( /obj/machinery/atmospherics/unary/cryo_cell, /turf/simulated/floor/plasteel{ - tag = "icon-whiteblue (NORTHWEST)"; + dir = 9; icon_state = "whiteblue"; - dir = 9 + tag = "icon-whiteblue (NORTHWEST)" }, /area/centcom/evac) "tf" = ( /turf/simulated/floor/plasteel{ - tag = "icon-whiteblue (NORTH)"; + dir = 1; icon_state = "whiteblue"; - dir = 1 + tag = "icon-whiteblue (NORTH)" }, /area/centcom/evac) "tg" = ( /obj/machinery/atmospherics/unary/cryo_cell, /turf/simulated/floor/plasteel{ - tag = "icon-whiteblue (NORTH)"; + dir = 1; icon_state = "whiteblue"; - dir = 1 + tag = "icon-whiteblue (NORTH)" }, /area/centcom/evac) "th" = ( /obj/effect/landmark{ name = "Marauder Exit" }, -/turf/unsimulated/floor{ - name = "plating" - }, +/turf/simulated/floor/plating/airless, /area/centcom/specops) "ti" = ( -/turf/unsimulated/floor{ - name = "plating" - }, +/turf/simulated/floor/plating/airless, /area/centcom/specops) "tj" = ( /turf/simulated/floor/plasteel{ - tag = "icon-whiteblue (NORTHEAST)"; + dir = 5; icon_state = "whiteblue"; - dir = 5 + tag = "icon-whiteblue (NORTHEAST)" }, /area/centcom/evac) "tk" = ( @@ -7262,41 +5683,31 @@ req_access_txt = "0" }, /obj/machinery/vending/snack, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/centcom/evac) "tl" = ( /obj/structure/chair, /obj/effect/landmark{ name = "tdomeobserve" }, -/turf/unsimulated/floor{ - tag = "icon-redbluefull (WEST)"; - icon_state = "redbluefull"; - dir = 8 +/turf/simulated/floor/plasteel{ + icon_state = "redbluefull" }, /area/tdome/tdomeobserve) "tm" = ( /obj/machinery/vending/snack, -/turf/unsimulated/floor{ - tag = "icon-redbluefull (WEST)"; - icon_state = "redbluefull"; - dir = 8 +/turf/simulated/floor/plasteel{ + icon_state = "redbluefull" }, /area/tdome/tdomeobserve) -"tn" = ( -/turf/unsimulated/wall/fakeglass{ - icon_state = "fakewindows"; - dir = 5 - }, -/area/centcom/ferry) "to" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ dir = 8 }, /turf/simulated/floor/plasteel{ - tag = "icon-whiteblue (WEST)"; + dir = 8; icon_state = "whiteblue"; - dir = 8 + tag = "icon-whiteblue (WEST)" }, /area/centcom/evac) "tp" = ( @@ -7304,22 +5715,13 @@ dir = 9; icon_state = "intact" }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, +/turf/simulated/floor/plasteel/white, /area/centcom/evac) "tq" = ( /turf/simulated/floor/plasteel{ - tag = "icon-whiteblue (EAST)"; + dir = 4; icon_state = "whiteblue"; - dir = 4 - }, -/area/centcom/evac) -"tr" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall14"; - icon_state = "swall14"; - dir = 2 + tag = "icon-whiteblue (EAST)" }, /area/centcom/evac) "ts" = ( @@ -7327,15 +5729,12 @@ name = "Cockpit"; req_access_txt = "106" }, -/turf/simulated/shuttle/floor{ - tag = "icon-floor2"; - icon_state = "floor2" - }, +/turf/simulated/floor/mineral/titanium/yellow, /area/centcom/evac) "tt" = ( /obj/structure/table{ - icon_state = "tabledir"; - dir = 9 + dir = 9; + icon_state = "tabledir" }, /obj/item/storage/box/donkpockets{ pixel_x = 3; @@ -7353,16 +5752,12 @@ pixel_x = 3; pixel_y = 3 }, -/turf/unsimulated/floor{ - icon_state = "white" - }, +/turf/simulated/floor/plasteel/white, /area/tdome) "tu" = ( /obj/item/camera, -/turf/unsimulated/floor{ - tag = "icon-redbluefull (WEST)"; - icon_state = "redbluefull"; - dir = 8 +/turf/simulated/floor/plasteel{ + icon_state = "redbluefull" }, /area/tdome/tdomeobserve) "tv" = ( @@ -7371,9 +5766,9 @@ initialize_directions = 10 }, /turf/simulated/floor/plasteel{ - tag = "icon-whiteblue (EAST)"; + dir = 4; icon_state = "whiteblue"; - dir = 4 + tag = "icon-whiteblue (EAST)" }, /area/centcom/evac) "tw" = ( @@ -7385,9 +5780,9 @@ name = "Canister: \[O2] (CRYO)" }, /turf/simulated/floor/plasteel{ - tag = "icon-whiteblue (SOUTHWEST)"; + dir = 10; icon_state = "whiteblue"; - dir = 10 + tag = "icon-whiteblue (SOUTHWEST)" }, /area/centcom/evac) "tx" = ( @@ -7421,13 +5816,13 @@ }, /area/centcom/evac) "tz" = ( -/obj/machinery/atmospherics/unary/cold_sink/freezer{ +/obj/machinery/atmospherics/unary/thermomachine/freezer{ dir = 1 }, /turf/simulated/floor/plasteel{ - tag = "icon-whiteblue (SOUTHEAST)"; + dir = 6; icon_state = "whiteblue"; - dir = 6 + tag = "icon-whiteblue (SOUTHEAST)" }, /area/centcom/evac) "tA" = ( @@ -7444,25 +5839,7 @@ }, /area/centcom/evac) "tB" = ( -/turf/unsimulated/wall/fakeglass{ - tag = "icon-fakewindows (WEST)"; - icon_state = "fakewindows"; - dir = 8 - }, -/area/tdome) -"tC" = ( -/turf/unsimulated/wall/fakeglass{ - tag = "icon-fakewindows2 (WEST)"; - icon_state = "fakewindows2"; - dir = 8 - }, -/area/tdome) -"tD" = ( -/turf/unsimulated/wall/fakeglass{ - tag = "icon-fakewindows (EAST)"; - icon_state = "fakewindows"; - dir = 4 - }, +/turf/simulated/wall/indestructible/fakeglass, /area/tdome) "tE" = ( /obj/machinery/door/airlock/external{ @@ -7471,9 +5848,7 @@ opacity = 0; req_access_txt = "106" }, -/turf/unsimulated/floor{ - name = "plating" - }, +/turf/simulated/floor/plating, /area/centcom/evac) "tF" = ( /obj/structure/table, @@ -7481,18 +5856,31 @@ req_access = null; req_access_txt = "106" }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/centcom/evac) "tG" = ( /obj/machinery/door/poddoor{ id_tag = "thunderdomeaxe"; name = "Axe Supply" }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/tdome/arena) "tH" = ( +/obj/machinery/door/airlock/external{ + id_tag = "s_docking_airlock"; + name = "Shuttle Hatch"; + req_access_txt = "106" + }, +/obj/docking_port/mobile{ + dir = 2; + dwidth = 8; + height = 15; + id = "admin"; + name = "administration shuttle"; + roundstart_move = null; + timid = 1; + width = 18 + }, /obj/docking_port/stationary{ dir = 2; dwidth = 9; @@ -7502,29 +5890,19 @@ timid = 1; width = 19 }, -/turf/space, -/area/space) -"tI" = ( -/obj/structure/grille, -/obj/structure/window/full/shuttle{ - dir = 10; - icon_state = "9" - }, /turf/simulated/floor/plating, -/area/centcom/evac) +/area/shuttle/administration) "tJ" = ( /obj/machinery/door/poddoor{ id_tag = "thunderdomegen"; name = "General Supply" }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/tdome/arena) "tK" = ( /turf/simulated/floor/plasteel{ - icon_state = "red"; - dir = 8 + dir = 8; + icon_state = "red" }, /area/tdome/arena) "tL" = ( @@ -7532,50 +5910,44 @@ id_tag = "thunderdome"; name = "Thunderdome Blast Door" }, -/turf/unsimulated/floor{ - name = "plating" - }, +/turf/simulated/floor/plating, /area/tdome/arena) "tM" = ( /turf/simulated/floor/plasteel{ - icon_state = "green"; - dir = 4 + dir = 4; + icon_state = "green" }, /area/tdome/arena) "tN" = ( /obj/machinery/camera{ - pixel_x = 11; - pixel_y = -9; + c_tag = "Thunderdome Red Team"; network = list("Thunderdome"); - c_tag = "Thunderdome Red Team" + pixel_x = 11; + pixel_y = -9 }, /obj/effect/landmark{ name = "tdome2" }, -/turf/unsimulated/floor{ - name = "plating" - }, +/turf/simulated/floor/plating, /area/tdome/tdome2) "tO" = ( /obj/machinery/flasher{ id = "flash"; name = "Thunderdome Flash" }, -/turf/simulated/floor/bluegrid, +/turf/simulated/floor/plasteel, /area/tdome/arena) "tP" = ( /obj/machinery/camera{ - pixel_x = 12; - pixel_y = -10; + c_tag = "Thunderdome Green Team"; network = list("Thunderdome"); - c_tag = "Thunderdome Green Team" + pixel_x = 12; + pixel_y = -10 }, /obj/effect/landmark{ name = "tdome1" }, -/turf/unsimulated/floor{ - name = "plating" - }, +/turf/simulated/floor/plating, /area/tdome/tdome1) "tQ" = ( /obj/docking_port/stationary/transit{ @@ -7590,26 +5962,22 @@ /turf/space/transit/horizontal, /area/space) "tR" = ( -/turf/unsimulated/floor{ - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/centcom/control) "tS" = ( /obj/machinery/camera{ - pixel_x = 10; + c_tag = "Thunderdome Arena"; network = list("Thunderdome"); - c_tag = "Thunderdome Arena" + pixel_x = 10 }, -/turf/simulated/floor/bluegrid, +/turf/simulated/floor/plasteel, /area/tdome/arena) "tT" = ( /obj/machinery/door/poddoor{ id_tag = "thunderdomehea"; name = "Heavy Supply" }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/tdome/arena) "tU" = ( /obj/structure/rack, @@ -7623,9 +5991,7 @@ pixel_x = 3; pixel_y = -30 }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/tdome/arena) "tV" = ( /obj/structure/rack, @@ -7639,11 +6005,15 @@ pixel_x = 3; pixel_y = -30 }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/tdome/arena) "tW" = ( +/obj/machinery/door/airlock/external{ + id_tag = "s_docking_airlock"; + name = "Shuttle Hatch"; + req_access_txt = "31" + }, +/obj/docking_port/mobile/supply, /obj/docking_port/stationary{ dir = 8; dwidth = 5; @@ -7652,13 +6022,11 @@ name = "supply centcom"; width = 12 }, -/turf/space, -/area/space) +/turf/simulated/floor/plating, +/area/shuttle/supply) "tX" = ( -/turf/unsimulated/floor{ - tag = "icon-redyellowfull (NORTHEAST)"; - icon_state = "redyellowfull"; - dir = 5 +/turf/simulated/floor/plasteel{ + icon_state = "redyellowfull" }, /area/tdome/tdomeadmin) "tY" = ( @@ -7668,19 +6036,15 @@ /obj/effect/landmark{ name = "tdomeadmin" }, -/turf/unsimulated/floor{ - tag = "icon-redyellowfull (NORTHEAST)"; - icon_state = "redyellowfull"; - dir = 5 +/turf/simulated/floor/plasteel{ + icon_state = "redyellowfull" }, /area/tdome/tdomeadmin) "tZ" = ( /obj/structure/table, /obj/item/reagent_containers/food/drinks/drinkingglass/devilskiss, -/turf/unsimulated/floor{ - tag = "icon-redyellowfull (NORTHEAST)"; - icon_state = "redyellowfull"; - dir = 5 +/turf/simulated/floor/plasteel{ + icon_state = "redyellowfull" }, /area/tdome/tdomeadmin) "ua" = ( @@ -7694,29 +6058,27 @@ pixel_y = 0; req_access_txt = "104" }, -/turf/unsimulated/floor{ - tag = "icon-redyellowfull (NORTHEAST)"; - icon_state = "redyellowfull"; - dir = 5 +/turf/simulated/floor/plasteel{ + icon_state = "redyellowfull" }, /area/tdome/tdomeadmin) "ub" = ( /obj/structure/chair/comfy/black{ dir = 1 }, -/turf/unsimulated/floor{ - tag = "icon-redyellowfull (NORTHEAST)"; - icon_state = "redyellowfull"; - dir = 5 +/turf/simulated/floor/plasteel{ + icon_state = "redyellowfull" }, /area/tdome/tdomeadmin) "uc" = ( -/turf/unsimulated/floor{ +/turf/simulated/floor/plasteel{ + dir = 2; icon_state = "greencorner" }, /area/centcom/control) "ud" = ( -/turf/unsimulated/floor{ +/turf/simulated/floor/plasteel{ + dir = 0; icon_state = "green" }, /area/centcom/control) @@ -7727,32 +6089,24 @@ network = list("Thunderdome"); pixel_y = -30 }, -/turf/unsimulated/floor{ - tag = "icon-redyellowfull (NORTHEAST)"; - icon_state = "redyellowfull"; - dir = 5 +/turf/simulated/floor/plasteel{ + icon_state = "redyellowfull" }, /area/tdome/tdomeadmin) "uf" = ( /obj/machinery/portable_atmospherics/canister/oxygen, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/centcom/specops) "ug" = ( /obj/machinery/portable_atmospherics/canister/air, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/centcom/specops) "uh" = ( /obj/structure/reagent_dispensers/water_cooler, /obj/structure/window/reinforced{ dir = 8 }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/centcom/specops) "ui" = ( /obj/structure/table, @@ -7765,14 +6119,10 @@ pixel_y = 5; req_access_txt = "104" }, -/turf/unsimulated/floor{ - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/tdome/tdomeadmin) "uj" = ( -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/centcom/specops) "uk" = ( /obj/structure/table, @@ -7785,9 +6135,7 @@ pixel_y = 5; req_access_txt = "104" }, -/turf/unsimulated/floor{ - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/tdome/tdomeadmin) "ul" = ( /obj/structure/table, @@ -7800,9 +6148,7 @@ pixel_y = 5; req_access_txt = "104" }, -/turf/unsimulated/floor{ - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/tdome/tdomeadmin) "um" = ( /obj/structure/table, @@ -7812,9 +6158,7 @@ /obj/item/radio/intercom/specops{ pixel_y = 25 }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/centcom/specops) "un" = ( /obj/docking_port/stationary/transit{ @@ -7829,12 +6173,7 @@ /turf/space/transit/horizontal, /area/space) "uo" = ( -/turf/unsimulated/wall{ - desc = "The door appears to be locked tightly."; - icon = 'icons/obj/doors/airlocks/hatch/centcom.dmi'; - icon_state = "closed"; - name = "Locked Door" - }, +/turf/simulated/wall/indestructible/fakedoor, /area/centcom) "up" = ( /obj/effect/forcefield{ @@ -7842,11 +6181,7 @@ layer = 1; name = "Blocker" }, -/turf/unsimulated/wall/fakeglass{ - dir = 8; - icon_state = "fakewindows3"; - tag = "icon-fakewindows (WEST)" - }, +/turf/simulated/wall/indestructible/opsglass, /area/centcom) "uq" = ( /obj/machinery/camera{ @@ -7854,147 +6189,55 @@ dir = 2; network = list("ERT","CentComm") }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/centcom) "ur" = ( -/turf/space, -/turf/unsimulated/wall{ - dir = 8; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "diagonalWall3" - }, -/area/admin) -"us" = ( -/turf/space, -/turf/unsimulated/wall{ - dir = 1; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "diagonalWall3" - }, +/turf/simulated/wall/indestructible/syndicate, /area/admin) "ut" = ( /obj/machinery/computer/message_monitor, -/turf/unsimulated/floor{ - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/centcom/control) "uu" = ( -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, -/turf/unsimulated/wall{ - dir = 2; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "window5_end"; - name = "window"; - opacity = 0; - tag = "icon-window5_end" - }, +/turf/simulated/wall/indestructible/opsglass, /area/admin) "uv" = ( -/turf/unsimulated/floor{ - icon_state = "gcircuit" - }, +/turf/simulated/floor/greengrid, /area/centcom/control) "uw" = ( /mob/living/silicon/decoy{ name = "A.L.I.C.E." }, -/turf/unsimulated/floor{ - icon_state = "gcircuit" - }, +/turf/simulated/floor/greengrid, /area/centcom/control) "uy" = ( /obj/machinery/computer/card/centcom, -/turf/unsimulated/floor{ - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/centcom/control) "uz" = ( /obj/machinery/computer/card, -/turf/unsimulated/floor{ - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/centcom/control) -"uA" = ( -/turf/unsimulated/wall{ - tag = "icon-wall3 (NORTH)"; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "wall3"; - dir = 1 - }, -/area/admin) -"uB" = ( -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, -/turf/unsimulated/wall{ - dir = 2; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "window5_mid"; - name = "window"; - opacity = 0; - tag = "icon-window5_mid" - }, -/area/admin) -"uC" = ( -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, -/turf/unsimulated/wall{ - dir = 1; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "window5_end"; - name = "window"; - opacity = 0; - tag = "icon-window5_end (NORTH)" - }, -/area/admin) "uD" = ( -/turf/space, -/turf/unsimulated/wall{ - dir = 1; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "diagonalWall3" - }, +/turf/simulated/wall/indestructible/syndicate, /area/space) -"uE" = ( -/turf/unsimulated/wall{ - tag = "icon-wall3 (EAST)"; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "wall3"; - dir = 4 - }, -/area/admin) "uF" = ( /obj/structure/table/reinforced, /obj/item/radio/intercom/specops, -/turf/unsimulated/floor{ - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/centcom/control) "uG" = ( /obj/item/radio/intercom/specops{ pixel_y = 25 }, -/turf/unsimulated/floor{ - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/centcom/control) "uH" = ( /obj/structure/rack, /obj/item/clothing/head/bandana, /obj/item/clothing/head/ushanka, /obj/item/clothing/head/helmet/roman/legionaire, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/admin) "uI" = ( /obj/structure/rack, @@ -8008,10 +6251,7 @@ pixel_x = 3; pixel_y = -3 }, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/admin) "uJ" = ( /obj/structure/rack, @@ -8019,10 +6259,7 @@ pixel_x = 3; pixel_y = -3 }, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/admin) "uK" = ( /obj/structure/rack, @@ -8035,10 +6272,7 @@ pixel_x = 3; pixel_y = -3 }, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/admin) "uL" = ( /obj/structure/rack, @@ -8051,10 +6285,7 @@ pixel_x = 3; pixel_y = -3 }, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/admin) "uM" = ( /obj/structure/rack, @@ -8067,10 +6298,7 @@ pixel_x = 3; pixel_y = -3 }, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/admin) "uN" = ( /obj/structure/rack, @@ -8080,61 +6308,32 @@ /obj/item/storage/backpack/duffel/science, /obj/item/storage/backpack/duffel/syndie/ammo, /obj/item/storage/backpack/duffel/syndie/med, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/admin) "uO" = ( /obj/structure/table/reinforced, /obj/item/radio/intercom/specops, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/centcom/specops) "uP" = ( /obj/structure/table/reinforced, /obj/effect/landmark{ name = "nukecode" }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/centcom/specops) "uQ" = ( /obj/structure/table/reinforced, /obj/item/paper, /obj/item/pen, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/centcom/specops) "uR" = ( /obj/structure/table/reinforced, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/centcom/specops) -"uS" = ( -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, -/turf/unsimulated/wall{ - desc = "This window appears to be reinforced, it looks nearly impossible to break."; - dir = 8; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "window5_end"; - name = "window"; - opacity = 0; - tag = "icon-window5_end (WEST)" - }, -/area/admin) "uT" = ( -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/admin) "uU" = ( /obj/structure/rack, @@ -8147,10 +6346,7 @@ pixel_x = 3; pixel_y = -3 }, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/admin) "uV" = ( /obj/structure/rack, @@ -8159,29 +6355,12 @@ pixel_x = 3; pixel_y = -3 }, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/admin) "uW" = ( /obj/structure/urinal, -/turf/unsimulated/wall, +/turf/simulated/wall/indestructible/riveted, /area/centcom/specops) -"uX" = ( -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, -/turf/unsimulated/wall{ - dir = 4; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "window5_mid"; - name = "window"; - opacity = 0; - tag = "icon-window5 (EAST)" - }, -/area/admin) "uY" = ( /obj/structure/rack, /obj/item/clothing/mask/chameleon{ @@ -8193,10 +6372,7 @@ pixel_x = 3; pixel_y = -3 }, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/admin) "uZ" = ( /obj/structure/rack, @@ -8206,19 +6382,14 @@ }, /obj/item/clothing/glasses/hud/health/sunglasses, /obj/item/clothing/glasses/hud/security/sunglasses, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/admin) "va" = ( /obj/structure/table/reinforced, /obj/effect/landmark{ name = "Commando_Manual" }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/centcom/specops) "vb" = ( /obj/structure/rack, @@ -8231,10 +6402,7 @@ pixel_x = 3; pixel_y = -3 }, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/admin) "vc" = ( /obj/structure/rack, @@ -8256,27 +6424,18 @@ pixel_x = 3; pixel_y = -3 }, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/admin) "vd" = ( -/turf/unsimulated/floor{ - icon_state = "grimy" - }, +/turf/simulated/floor/plasteel/grimy, /area/centcom/specops) "ve" = ( /obj/machinery/photocopier, -/turf/unsimulated/floor{ - icon_state = "grimy" - }, +/turf/simulated/floor/plasteel/grimy, /area/centcom/specops) "vf" = ( /obj/machinery/computer/secure_data, -/turf/unsimulated/floor{ - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/centcom/control) "vg" = ( /obj/structure/rack, @@ -8289,30 +6448,11 @@ pixel_x = 3; pixel_y = -3 }, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, -/area/admin) -"vh" = ( -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, -/turf/unsimulated/wall{ - dir = 2; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "window5"; - name = "window"; - opacity = 0; - tag = "icon-window5" - }, +/turf/simulated/floor/plasteel, /area/admin) "vi" = ( /obj/machinery/computer/med_data, -/turf/unsimulated/floor{ - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/centcom/control) "vj" = ( /obj/structure/rack, @@ -8325,10 +6465,7 @@ pixel_x = 3; pixel_y = -3 }, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/admin) "vk" = ( /obj/structure/rack, @@ -8341,68 +6478,35 @@ pixel_x = 3; pixel_y = -3 }, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/admin) "vl" = ( /obj/mecha/combat/marauder/loaded, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/admin) "vm" = ( /obj/mecha/combat/marauder/seraph/loaded, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/admin) "vn" = ( /obj/structure/cable{ - icon_state = "0-2"; - d2 = 2 + d2 = 2; + icon_state = "0-2" }, /obj/machinery/mech_bay_recharge_port/upgraded, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/admin) "vo" = ( /obj/mecha/combat/honker/loaded, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/admin) "vp" = ( /obj/machinery/computer/mech_bay_power_console, /obj/structure/cable{ - icon_state = "0-2"; - d2 = 2 - }, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, -/area/admin) -"vq" = ( -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, -/turf/unsimulated/wall{ - desc = "This window appears to be reinforced, it looks nearly impossible to break."; - dir = 4; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "window5_end"; - name = "window"; - opacity = 0; - tag = "icon-window5 (EAST)" + d2 = 2; + icon_state = "0-2" }, +/turf/simulated/floor/plasteel, /area/admin) "vr" = ( /obj/structure/rack, @@ -8415,42 +6519,29 @@ pixel_x = 3; pixel_y = -3 }, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/admin) "vs" = ( /obj/machinery/computer/security{ network = list("SS13","Telecomms","Research Outpost","Mining Outpost","ERT","CentComm","Thunderdome") }, -/turf/unsimulated/floor{ - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/centcom/control) "vt" = ( /obj/machinery/computer/station_alert, -/turf/unsimulated/floor{ - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/centcom/control) "vu" = ( /obj/machinery/computer/communications, -/turf/unsimulated/floor{ - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/centcom/control) "vv" = ( /obj/machinery/computer/robotics, -/turf/unsimulated/floor{ - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/centcom/control) "vw" = ( /obj/machinery/computer/crew, -/turf/unsimulated/floor{ - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/centcom/control) "vx" = ( /obj/structure/rack, @@ -8463,10 +6554,7 @@ pixel_x = 3; pixel_y = -3 }, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/admin) "vy" = ( /obj/structure/rack, @@ -8479,10 +6567,7 @@ pixel_x = 3; pixel_y = -3 }, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/admin) "vz" = ( /obj/structure/rack, @@ -8504,10 +6589,7 @@ pixel_x = 3; pixel_y = -3 }, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/admin) "vA" = ( /obj/structure/rack, @@ -8520,10 +6602,7 @@ pixel_x = 3; pixel_y = -3 }, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/admin) "vB" = ( /obj/item/mecha_parts/mecha_equipment/cable_layer, @@ -8532,19 +6611,8 @@ /obj/item/mecha_parts/mecha_equipment/rcd, /obj/item/mecha_parts/mecha_equipment/extinguisher, /obj/structure/closet/crate, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/admin) -"vC" = ( -/turf/space, -/turf/unsimulated/wall{ - dir = 2; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "diagonalWall3" - }, -/area/space) "vD" = ( /obj/structure/rack, /obj/item/radio/headset/heads/captain{ @@ -8560,10 +6628,7 @@ pixel_x = 6; pixel_y = -6 }, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/admin) "vE" = ( /obj/structure/rack, @@ -8577,40 +6642,25 @@ pixel_y = -3 }, /obj/item/storage/belt/champion/wrestling, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/admin) "vF" = ( /obj/mecha/combat/marauder/mauler/loaded, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/admin) "vG" = ( /obj/mecha/combat/gygax/dark/loaded, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/admin) "vH" = ( /obj/structure/mecha_wreckage/phazon, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/admin) "vI" = ( /obj/structure/mirror{ pixel_y = -30 }, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/admin) "vJ" = ( /obj/structure/rack, @@ -8623,10 +6673,7 @@ pixel_x = -6; pixel_y = 6 }, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/admin) "vK" = ( /obj/structure/rack, @@ -8659,18 +6706,13 @@ pixel_x = -3; pixel_y = 3 }, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/admin) "vL" = ( /obj/item/radio/intercom/specops{ pixel_y = -28 }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/centcom/specops) "vM" = ( /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser, @@ -8683,117 +6725,31 @@ /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/flashbang/clusterbang, /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/scattershot, /obj/structure/closet/crate, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/admin) "vN" = ( /obj/machinery/door/airlock/hatch{ name = "Clothing Storage"; req_access_txt = "0" }, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/admin) "vO" = ( /obj/machinery/door/airlock/hatch{ name = "Mecha Room"; req_access_txt = "0" }, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, -/area/admin) -"vP" = ( -/turf/space, -/turf/unsimulated/wall{ - dir = 4; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "diagonalWall3" - }, -/area/admin) -"vQ" = ( -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, -/turf/unsimulated/wall{ - dir = 2; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "window5_mid"; - name = "window"; - opacity = 0; - tag = "icon-window5_mid" - }, -/area/admin) -"vR" = ( -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, -/turf/unsimulated/wall{ - dir = 2; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "window5_end"; - name = "window"; - opacity = 0; - tag = "icon-window5_end" - }, +/turf/simulated/floor/plasteel, /area/admin) "vS" = ( /obj/machinery/newscaster/security_unit{ pixel_x = -32 }, -/turf/unsimulated/floor{ - icon_state = "grimy" - }, +/turf/simulated/floor/plasteel/grimy, /area/centcom/specops) -"vT" = ( -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, -/turf/unsimulated/wall{ - dir = 1; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "window5_end"; - name = "window"; - opacity = 0; - tag = "icon-window5_end (NORTH)" - }, -/area/admin) -"vU" = ( -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, -/turf/simulated/shuttle/wall{ - tag = "icon-diagonalWall3 (EAST)"; - icon_state = "diagonalWall3"; - dir = 4 - }, -/area/admin) -"vV" = ( -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, -/turf/simulated/shuttle/wall{ - tag = "icon-diagonalWall3"; - icon_state = "diagonalWall3"; - dir = 2 - }, -/area/admin) "vW" = ( /obj/machinery/chem_master, -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, +/turf/simulated/floor/plasteel/freezer, /area/admin) "vX" = ( /obj/structure/table, @@ -8802,33 +6758,21 @@ /obj/item/reagent_containers/glass/beaker/bluespace, /obj/item/reagent_containers/glass/beaker/bluespace, /obj/item/reagent_containers/glass/beaker/bluespace, -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, +/turf/simulated/floor/plasteel/freezer, /area/admin) "vY" = ( -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, +/turf/simulated/floor/plasteel/freezer, /area/admin) "vZ" = ( /obj/structure/table, /obj/machinery/reagentgrinder, -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, +/turf/simulated/floor/plasteel/freezer, /area/admin) "wa" = ( /obj/structure/table, /obj/item/storage/pill_bottle/random_drug_bottle, /obj/item/reagent_containers/glass/bottle/adminordrazine, -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, +/turf/simulated/floor/plasteel/freezer, /area/admin) "wb" = ( /obj/machinery/door/airlock/external, @@ -8839,68 +6783,36 @@ name = "Security Doors"; opacity = 0 }, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/admin) "wc" = ( /obj/machinery/door/airlock/hatch{ name = "External Airlock"; req_access_txt = "0" }, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/admin) "wd" = ( /obj/machinery/chem_dispenser{ desc = "It appears Fox is doing more fruit chemistry today!"; hackedcheck = 1 }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, +/turf/simulated/floor/plasteel/freezer, /area/admin) "we" = ( /turf/space, /area/centcom/specops) -"wf" = ( -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, -/turf/unsimulated/wall{ - desc = "This window appears to be reinforced, it looks nearly impossible to break."; - dir = 8; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "window5_end"; - name = "window"; - opacity = 0; - tag = "icon-window5_end (WEST)" - }, -/area/admin) "wh" = ( /obj/machinery/recharge_station/upgraded, -/turf/unsimulated/floor{ - icon_state = "grimy" - }, +/turf/simulated/floor/plasteel/grimy, /area/centcom/specops) "wi" = ( /obj/structure/chair/stool, -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, +/turf/simulated/floor/plasteel/freezer, /area/admin) "wj" = ( /obj/structure/reagent_dispensers/fueltank, -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, +/turf/simulated/floor/plasteel/freezer, /area/admin) "wk" = ( /obj/docking_port/stationary/transit{ @@ -8919,43 +6831,11 @@ name = "Armory"; req_access_txt = "0" }, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, -/area/admin) -"wm" = ( -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, -/turf/unsimulated/wall{ - dir = 1; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "diagonalWall3" - }, +/turf/simulated/floor/plasteel, /area/admin) "wn" = ( /obj/machinery/chem_heater, -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, -/area/admin) -"wo" = ( -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, -/turf/unsimulated/wall{ - desc = "This window appears to be reinforced, it looks nearly impossible to break."; - dir = 4; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "window5_end"; - name = "window"; - opacity = 0; - tag = "icon-window5 (EAST)" - }, +/turf/simulated/floor/plasteel/freezer, /area/admin) "wp" = ( /obj/item/storage/box/syringes, @@ -8981,22 +6861,8 @@ /obj/item/ammo_casing/shotgun/dart, /obj/item/ammo_casing/shotgun/dart, /obj/item/ammo_casing/shotgun/dart, -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, +/turf/simulated/floor/plasteel/freezer, /area/admin) -"wq" = ( -/turf/space, -/turf/unsimulated/wall{ - dir = 2; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "diagonalWall3" - }, -/area/admin) -"wr" = ( -/turf/unsimulated/wall/fakeglass, -/area/centcom/specops) "ws" = ( /obj/structure/rack, /obj/item/ammo_box/magazine/m10mm, @@ -9015,10 +6881,7 @@ pixel_x = 3; pixel_y = -3 }, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/admin) "wt" = ( /obj/structure/rack, @@ -9033,10 +6896,7 @@ pixel_x = 3; pixel_y = -3 }, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/admin) "wu" = ( /obj/structure/rack, @@ -9051,10 +6911,7 @@ pixel_x = 3; pixel_y = -3 }, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/admin) "wv" = ( /obj/structure/rack, @@ -9069,17 +6926,11 @@ pixel_x = 3; pixel_y = -3 }, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/admin) "ww" = ( /obj/machinery/vending/liberationstation, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/admin) "wx" = ( /obj/structure/rack, @@ -9090,10 +6941,7 @@ pixel_x = 3; pixel_y = -3 }, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/admin) "wy" = ( /obj/structure/rack, @@ -9108,10 +6956,7 @@ pixel_x = 3; pixel_y = -3 }, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/admin) "wz" = ( /obj/structure/table, @@ -9122,10 +6967,7 @@ /obj/item/reagent_containers/food/snacks/grown/citrus/orange, /obj/item/reagent_containers/food/snacks/grown/corn, /obj/item/reagent_containers/food/snacks/grown/mushroom/amanita, -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, +/turf/simulated/floor/plasteel/freezer, /area/admin) "wA" = ( /obj/structure/table, @@ -9135,10 +6977,7 @@ /obj/item/reagent_containers/glass/beaker/bluespace, /obj/item/reagent_containers/glass/beaker/bluespace, /obj/item/storage/box/autoinjectors, -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, +/turf/simulated/floor/plasteel/freezer, /area/admin) "wB" = ( /obj/structure/table, @@ -9155,13 +6994,10 @@ /obj/item/grenade/chem_grenade/large, /obj/item/grenade/chem_grenade/large, /obj/item/grenade/chem_grenade/large, -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, +/turf/simulated/floor/plasteel/freezer, /area/admin) "wC" = ( -/turf/unsimulated/wall, +/turf/simulated/wall/indestructible/riveted, /area/centcom/bathroom) "wD" = ( /obj/structure/table, @@ -9180,10 +7016,7 @@ /obj/item/assembly/prox_sensor, /obj/item/assembly/prox_sensor, /obj/item/assembly/prox_sensor, -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, +/turf/simulated/floor/plasteel/freezer, /area/admin) "wE" = ( /obj/docking_port/stationary/transit{ @@ -9195,34 +7028,6 @@ }, /turf/space/transit/horizontal, /area/space) -"wF" = ( -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, -/turf/unsimulated/wall{ - dir = 4; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "window5"; - name = "window"; - opacity = 0; - tag = "icon-window5 (EAST)" - }, -/area/admin) -"wG" = ( -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, -/turf/unsimulated/wall{ - dir = 2; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "window5"; - name = "window"; - opacity = 0; - tag = "icon-window5" - }, -/area/admin) "wH" = ( /obj/machinery/door/poddoor{ density = 0; @@ -9235,10 +7040,7 @@ name = "Chem Lab"; req_access_txt = "0" }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, +/turf/simulated/floor/plasteel/freezer, /area/admin) "wI" = ( /obj/structure/rack, @@ -9251,10 +7053,7 @@ pixel_x = 3; pixel_y = -3 }, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/admin) "wJ" = ( /obj/structure/rack, @@ -9273,13 +7072,10 @@ pixel_x = 3; pixel_y = -3 }, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/admin) "wK" = ( -/turf/unsimulated/wall, +/turf/simulated/wall/indestructible/riveted, /area/centcom/evac) "wL" = ( /obj/structure/rack, @@ -9288,10 +7084,7 @@ pixel_x = 3; pixel_y = -3 }, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/admin) "wM" = ( /obj/structure/mirror{ @@ -9299,22 +7092,14 @@ pixel_x = 0; pixel_y = -32 }, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/admin) "wN" = ( -/turf/unsimulated/floor{ - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/centcom/evac) "wO" = ( /obj/machinery/optable, -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, +/turf/simulated/floor/plasteel/freezer, /area/admin) "wP" = ( /obj/structure/table, @@ -9322,16 +7107,10 @@ /obj/item/shard, /obj/item/kitchen/knife, /obj/item/storage/firstaid/tactical, -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, +/turf/simulated/floor/plasteel/freezer, /area/admin) "wQ" = ( -/turf/unsimulated/floor{ - dir = 1; - icon_state = "carpetside" - }, +/turf/simulated/floor/carpet, /area/admin) "wR" = ( /obj/structure/table, @@ -9344,18 +7123,12 @@ pixel_y = 24; req_access_txt = "0" }, -/turf/unsimulated/floor{ - dir = 9; - icon_state = "carpetside" - }, +/turf/simulated/floor/carpet, /area/admin) "wS" = ( /obj/machinery/computer/secure_data, /obj/item/paper/sop, -/turf/unsimulated/floor{ - dir = 5; - icon_state = "carpetside" - }, +/turf/simulated/floor/carpet, /area/admin) "wT" = ( /obj/structure/rack, @@ -9364,59 +7137,30 @@ pixel_x = 6; pixel_y = -6 }, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, -/area/admin) -"wU" = ( -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, -/turf/unsimulated/wall{ - dir = 8; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "diagonalWall3" - }, +/turf/simulated/floor/plasteel, /area/admin) "wV" = ( /obj/effect/decal/cleanable/blood, -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, +/turf/simulated/floor/plasteel/freezer, /area/admin) "wW" = ( /obj/structure/table, /obj/item/stack/cable_coil, /obj/item/stack/rods, /obj/item/pen, -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, +/turf/simulated/floor/plasteel/freezer, /area/admin) "wX" = ( /obj/structure/chair/office/dark, -/turf/unsimulated/floor{ - icon_state = "carpet"; - dir = 2 - }, +/turf/simulated/floor/carpet, /area/admin) "wY" = ( /obj/machinery/computer/communications, -/turf/unsimulated/floor{ - dir = 8; - icon_state = "carpetside" - }, +/turf/simulated/floor/carpet, /area/admin) "wZ" = ( /obj/machinery/computer/med_data, -/turf/unsimulated/floor{ - dir = 4; - icon_state = "carpetside" - }, +/turf/simulated/floor/carpet, /area/admin) "xa" = ( /obj/structure/rack, @@ -9425,10 +7169,7 @@ pixel_x = 3; pixel_y = -3 }, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/admin) "xb" = ( /obj/structure/rack, @@ -9437,10 +7178,7 @@ pixel_x = 3; pixel_y = -3 }, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/admin) "xc" = ( /obj/structure/rack, @@ -9449,14 +7187,11 @@ pixel_y = -3 }, /obj/item/katana, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/admin) "xd" = ( /obj/effect/spawner/window/reinforced, -/turf/unsimulated/floor, +/turf/simulated/floor/plating, /area/centcom/evac) "xe" = ( /obj/structure/rack, @@ -9468,34 +7203,22 @@ pixel_x = 3; pixel_y = -3 }, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/admin) "xf" = ( /obj/structure/table, /obj/random/toolbox, /obj/random/bomb_supply, /obj/machinery/syndicatebomb/badmin/clown, -/turf/unsimulated/floor{ - tag = "icon-dark"; - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/admin) "xg" = ( /obj/structure/table, /obj/item/storage/toolbox/syndicate, -/turf/unsimulated/floor{ - tag = "icon-dark"; - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/admin) "xh" = ( -/turf/unsimulated/floor{ - tag = "icon-dark"; - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/admin) "xi" = ( /obj/structure/table, @@ -9503,20 +7226,14 @@ /obj/item/rcd_ammo, /obj/item/rcd_ammo, /obj/item/storage/pill_bottle/random_drug_bottle, -/turf/unsimulated/floor{ - tag = "icon-dark"; - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/admin) "xj" = ( /obj/structure/table, /obj/item/scalpel, /obj/item/bonesetter, /obj/item/bonegel, -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, +/turf/simulated/floor/plasteel/freezer, /area/admin) "xk" = ( /obj/structure/table, @@ -9526,10 +7243,7 @@ /obj/item/storage/box/mousetraps, /obj/item/storage/fancy/cigarettes, /obj/item/pen, -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, +/turf/simulated/floor/plasteel/freezer, /area/admin) "xl" = ( /obj/structure/table, @@ -9537,29 +7251,20 @@ name = "security checkpoint"; req_access_txt = "0" }, -/turf/unsimulated/floor{ - dir = 2; - icon_state = "carpetside" - }, +/turf/simulated/floor/carpet, /area/admin) "xm" = ( /obj/structure/table, /obj/structure/window/reinforced, /obj/item/paper_bin, /obj/item/pen, -/turf/unsimulated/floor{ - dir = 10; - icon_state = "carpetside" - }, +/turf/simulated/floor/carpet, /area/admin) "xn" = ( /obj/structure/table, /obj/structure/window/reinforced, /obj/machinery/recharger, -/turf/unsimulated/floor{ - dir = 6; - icon_state = "carpetside" - }, +/turf/simulated/floor/carpet, /area/admin) "xo" = ( /obj/structure/rack, @@ -9571,10 +7276,7 @@ pixel_x = -3; pixel_y = 3 }, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/admin) "xp" = ( /obj/machinery/recharger/wallcharger{ @@ -9586,91 +7288,34 @@ pixel_x = 3; pixel_y = -3 }, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/admin) "xq" = ( /obj/structure/table, -/obj/item/tank/oxygen/yellow, +/obj/item/tank/internals/oxygen/yellow, /obj/random/bomb_supply, /obj/item/clothing/under/rebeloutfit, /obj/item/clothing/suit/poncho/ponchoshame, /obj/item/clothing/head/sombrero/shamebrero, -/turf/unsimulated/floor{ - tag = "icon-dark"; - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/admin) "xr" = ( /obj/machinery/door/airlock/hatch{ name = "Tool Storage"; req_access_txt = "0" }, -/turf/unsimulated/floor{ - tag = "icon-dark"; - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/admin) "xs" = ( /obj/structure/table, /obj/item/FixOVein, /obj/item/retractor, /obj/item/cautery, -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, +/turf/simulated/floor/plasteel/freezer, /area/admin) "xt" = ( /obj/structure/kitchenspike, -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, -/area/admin) -"xu" = ( -/turf/unsimulated/floor{ - dir = 8; - icon_state = "wood" - }, -/turf/unsimulated/wall{ - dir = 2; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "window5_mid"; - name = "window"; - opacity = 0; - tag = "icon-window5_mid" - }, -/area/admin) -"xv" = ( -/turf/unsimulated/floor{ - dir = 8; - icon_state = "wood" - }, -/turf/unsimulated/wall{ - dir = 2; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "window5_end"; - name = "window"; - opacity = 0; - tag = "icon-window5_end" - }, -/area/admin) -"xw" = ( -/turf/unsimulated/floor{ - dir = 8; - icon_state = "wood" - }, -/turf/unsimulated/wall{ - dir = 1; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "window5_end"; - name = "window"; - opacity = 0; - tag = "icon-window5_end (NORTH)" - }, +/turf/simulated/floor/plasteel/freezer, /area/admin) "xx" = ( /obj/structure/rack, @@ -9679,10 +7324,7 @@ pixel_x = 3; pixel_y = -3 }, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/admin) "xy" = ( /obj/structure/rack, @@ -9691,17 +7333,8 @@ pixel_x = 3; pixel_y = -3 }, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/admin) -"xz" = ( -/obj/effect/spawner/window/reinforced, -/turf/unsimulated/floor{ - name = "plating" - }, -/area/centcom/evac) "xA" = ( /obj/structure/rack, /obj/item/twohanded/knighthammer{ @@ -9713,10 +7346,7 @@ pixel_x = 3; pixel_y = -3 }, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/admin) "xB" = ( /obj/machinery/recharger/wallcharger{ @@ -9728,20 +7358,14 @@ pixel_x = 3; pixel_y = -3 }, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/admin) "xC" = ( /obj/structure/table, /obj/random/tool, /obj/item/clothing/gloves/color/yellow, /obj/item/pinpointer/advpinpointer, -/turf/unsimulated/floor{ - tag = "icon-dark"; - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/admin) "xD" = ( /obj/structure/table, @@ -9753,10 +7377,7 @@ /obj/item/grenade/syndieminibomb{ pixel_x = -1 }, -/turf/unsimulated/floor{ - tag = "icon-dark"; - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/admin) "xE" = ( /obj/structure/table, @@ -9764,28 +7385,19 @@ pixel_y = 0 }, /obj/item/toy/cards/deck/syndicate/black, -/turf/unsimulated/floor{ - tag = "icon-dark"; - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/admin) "xF" = ( /obj/structure/table, /obj/item/surgicaldrill, /obj/item/stack/medical/bruise_pack/advanced, -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, +/turf/simulated/floor/plasteel/freezer, /area/admin) "xG" = ( /obj/structure/table, /obj/item/hemostat, /obj/item/circular_saw, -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, +/turf/simulated/floor/plasteel/freezer, /area/admin) "xH" = ( /obj/machinery/door/poddoor{ @@ -9800,38 +7412,10 @@ name = "Operating Theater"; req_access_txt = "0" }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, -/area/admin) -"xI" = ( -/turf/unsimulated/floor{ - dir = 8; - icon_state = "wood" - }, -/turf/unsimulated/wall{ - dir = 4; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "diagonalWall3" - }, +/turf/simulated/floor/plasteel/freezer, /area/admin) "xJ" = ( -/turf/unsimulated/floor{ - dir = 8; - icon_state = "wood" - }, -/area/admin) -"xK" = ( -/turf/unsimulated/floor{ - dir = 8; - icon_state = "wood" - }, -/turf/unsimulated/wall{ - dir = 2; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "diagonalWall3" - }, +/turf/simulated/floor/wood, /area/admin) "xL" = ( /turf/simulated/floor/plasteel{ @@ -9839,106 +7423,40 @@ icon_state = "neutralfull" }, /area/adminconstruction) -"xM" = ( -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, -/turf/unsimulated/wall{ - dir = 4; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "diagonalWall3" - }, -/area/admin) -"xN" = ( -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, -/turf/unsimulated/wall{ - dir = 2; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "diagonalWall3" - }, -/area/admin) "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" }, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/admin) -"xP" = ( -/turf/unsimulated/wall/fakeglass{ - tag = "icon-fakewindows (EAST)"; - icon_state = "fakewindows"; - dir = 4 - }, -/area/trader_station/sol) "xQ" = ( -/turf/unsimulated/wall/fakeglass{ - tag = "icon-fakewindows (WEST)"; - icon_state = "fakewindows"; - dir = 8 - }, +/turf/simulated/wall/indestructible/fakeglass, /area/trader_station/sol) "xR" = ( -/turf/unsimulated/wall/fakeglass{ - tag = "icon-fakewindows (WEST)"; - icon_state = "fakewindows"; - dir = 8 - }, -/area/vox_station) -"xS" = ( -/turf/unsimulated/wall/fakeglass{ - tag = "icon-fakewindows2 (WEST)"; - icon_state = "fakewindows2"; - dir = 8 - }, -/area/vox_station) -"xT" = ( -/turf/unsimulated/wall/fakeglass{ - tag = "icon-fakewindows (EAST)"; - icon_state = "fakewindows"; - dir = 4 - }, +/turf/simulated/wall/indestructible/fakeglass, /area/vox_station) "xU" = ( /obj/machinery/computer/crew, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/admin) "xV" = ( /obj/machinery/computer/supplycomp/public, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/admin) "xW" = ( /obj/machinery/computer/rdservercontrol{ badmin = 1; name = "Master R&D Server Controller" }, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/admin) "xX" = ( /obj/machinery/computer/security{ network = list("SS13","Telecomms","Research Outpost","Mining Outpost","ERT","CentComm","Thunderdome") }, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/admin) "xY" = ( /obj/structure/table, @@ -9951,23 +7469,15 @@ pixel_x = 3; pixel_y = 3 }, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/admin) "xZ" = ( /obj/structure/table, -/turf/unsimulated/floor{ - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/centcom/evac) "ya" = ( /obj/machinery/r_n_d/server/centcom, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/admin) "yb" = ( /obj/structure/table, @@ -9983,78 +7493,41 @@ pixel_x = 3; pixel_y = 3 }, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, -/area/admin) -"yc" = ( -/turf/unsimulated/floor{ - dir = 8; - icon_state = "wood" - }, -/turf/unsimulated/wall{ - dir = 2; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "window5"; - name = "window"; - opacity = 0; - tag = "icon-window5" - }, +/turf/simulated/floor/plasteel, /area/admin) "yd" = ( /obj/structure/chair/comfy/black, -/turf/unsimulated/floor{ - dir = 8; - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/admin) "ye" = ( /obj/machinery/computer/shuttle/trade/sol, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/trader_station/sol) "yf" = ( /obj/effect/spawner/window/reinforced, -/turf/unsimulated/floor, +/turf/simulated/floor/plating, /area/centcom/bathroom) "yg" = ( /obj/effect/decal/warning_stripes/southeastcorner, -/turf/unsimulated/floor{ - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/centcom/evac) "yh" = ( /obj/machinery/vending/snack, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/trader_station/sol) "yi" = ( /obj/machinery/computer/card/centcom, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/admin) "yj" = ( /obj/machinery/computer/card, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/admin) "yk" = ( /obj/structure/chair/comfy/black{ dir = 1 }, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/admin) "yl" = ( /obj/machinery/door/airlock/public/glass{ @@ -10068,20 +7541,14 @@ name = "Security Doors"; opacity = 0 }, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/admin) "ym" = ( /obj/effect/landmark{ name = "aroomwarp"; tag = "" }, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/admin) "yn" = ( /obj/machinery/door/airlock/hatch{ @@ -10089,248 +7556,146 @@ name = "Gambling Den"; req_access_txt = "0" }, -/turf/unsimulated/floor{ - dir = 8; - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/admin) "yo" = ( /obj/structure/table/wood, /obj/item/toy/cards/deck/syndicate, -/turf/unsimulated/floor{ - dir = 8; - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/admin) "yp" = ( /obj/structure/table/wood, -/turf/unsimulated/floor{ - dir = 8; - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/admin) "yq" = ( /obj/item/flag/nt, -/turf/unsimulated/floor{ - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/centcom/evac) "yr" = ( /obj/effect/decal/warning_stripes/east, -/turf/unsimulated/floor{ - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/centcom/evac) "ys" = ( /obj/structure/table/wood, /obj/item/reagent_containers/food/drinks/drinkingglass/devilskiss, -/turf/unsimulated/floor{ - dir = 8; - icon_state = "wood" - }, -/area/admin) -"yt" = ( -/turf/unsimulated/floor{ - name = "plating" - }, -/area/centcom/evac) -"yu" = ( -/turf/unsimulated/floor{ - dir = 8; - icon_state = "wood" - }, -/turf/unsimulated/wall{ - desc = "This window appears to be reinforced, it looks nearly impossible to break."; - dir = 8; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "window5_end"; - name = "window"; - opacity = 0; - tag = "icon-window5_end (WEST)" - }, +/turf/simulated/floor/wood, /area/admin) "yv" = ( -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating, /area/centcom/evac) "yw" = ( /obj/machinery/light{ dir = 4; icon_state = "tube1" }, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/trader_station/sol) "yx" = ( -/turf/unsimulated/floor{ +/turf/simulated/floor/plasteel{ dir = 8; icon_state = "browncorner" }, /area/trader_station/sol) "yy" = ( /obj/structure/closet/emcloset, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/centcom/evac) "yz" = ( /obj/structure/chair/comfy/black{ dir = 8 }, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/admin) "yA" = ( /obj/structure/chair/stool, -/turf/unsimulated/floor{ - dir = 8; - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/admin) "yB" = ( /obj/structure/table/wood, /obj/item/lighter/zippo/engraved, /obj/item/storage/fancy/cigarettes/dromedaryco, -/turf/unsimulated/floor{ - dir = 8; - icon_state = "wood" - }, -/area/admin) -"yC" = ( -/turf/unsimulated/floor{ - dir = 8; - icon_state = "wood" - }, -/turf/unsimulated/wall{ - desc = "This window appears to be reinforced, it looks nearly impossible to break."; - dir = 4; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "window5_end"; - name = "window"; - opacity = 0; - tag = "icon-window5 (EAST)" - }, +/turf/simulated/floor/wood, /area/admin) "yD" = ( /obj/machinery/door/airlock/external{ id_tag = "trade_sol_base"; name = "Docking Port" }, -/turf/unsimulated/floor/plating, +/turf/simulated/floor/plating, /area/trader_station/sol) -"yF" = ( -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" +"yE" = ( +/obj/machinery/door/poddoor{ + id_tag = "nukeop_ready"; + name = "Shuttle Dock Door" }, +/turf/simulated/floor/plasteel, +/area/syndicate_mothership) +"yF" = ( +/turf/simulated/floor/plasteel, /area/trader_station/sol) "yG" = ( /obj/machinery/door/airlock/external{ name = "Arrival Airlock" }, -/turf/unsimulated/floor{ - name = "plating" - }, +/turf/simulated/floor/plating, /area/centcom/evac) "yH" = ( /obj/effect/decal/warning_stripes/northeastcorner, -/turf/unsimulated/floor{ - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/centcom/evac) "yI" = ( -/turf/unsimulated/floor{ +/turf/simulated/floor/plasteel{ dir = 8; icon_state = "brown" }, /area/trader_station/sol) "yJ" = ( /obj/machinery/computer/communications, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/admin) "yK" = ( /obj/structure/chair/comfy/black, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, -/area/admin) -"yL" = ( -/turf/unsimulated/floor{ - dir = 8; - icon_state = "wood" - }, -/turf/unsimulated/wall{ - dir = 1; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "diagonalWall3" - }, +/turf/simulated/floor/plasteel, /area/admin) "yM" = ( -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/centcom/evac) -"yN" = ( -/turf/unsimulated/floor{ - dir = 8; - icon_state = "wood" - }, -/turf/unsimulated/wall{ - dir = 8; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "diagonalWall3" - }, -/area/admin) "yO" = ( -/turf/unsimulated/floor{ +/turf/simulated/floor/plasteel{ dir = 1; icon_state = "browncorner" }, /area/trader_station/sol) "yP" = ( /obj/machinery/computer/atmos_alert, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/admin) "yQ" = ( -/turf/unsimulated/floor{ +/turf/simulated/floor/plasteel{ + dir = 0; icon_state = "green" }, /area/centcom/evac) "yR" = ( /obj/machinery/computer/message_monitor, /obj/item/paper/monitorkey, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/admin) "yS" = ( /obj/machinery/computer/account_database{ name = "Admin Accounts Database" }, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/admin) "yT" = ( /obj/machinery/door/airlock/maintenance_hatch{ req_access_txt = "106" }, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating, /area/centcom/evac) "yU" = ( /obj/machinery/computer/secure_data, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/admin) "yV" = ( /obj/structure/table, @@ -10342,47 +7707,33 @@ pixel_y = 0; req_access_txt = "0" }, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/admin) "yW" = ( /obj/structure/table/reinforced, /obj/item/paper_bin, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/centcom/evac) "yX" = ( /obj/structure/table/reinforced, /obj/machinery/recharger{ pixel_y = 0 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/centcom/evac) "yY" = ( /obj/structure/table/reinforced, /obj/item/pen, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/centcom/evac) "yZ" = ( /obj/structure/table/reinforced, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/centcom/evac) "za" = ( /obj/structure/table, /obj/item/gun/projectile/automatic/pistol, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/admin) "zb" = ( /obj/structure/table, @@ -10390,14 +7741,11 @@ /obj/item/reagent_containers/food/drinks/cans/adminbooze, /obj/item/reagent_containers/food/drinks/cans/badminbrew, /obj/item/reagent_containers/food/drinks/cans/madminmalt, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/admin) "zc" = ( /obj/machinery/computer/arcade, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/centcom/evac) "zd" = ( /obj/machinery/door/airlock/hatch{ @@ -10405,33 +7753,22 @@ name = "Dojo"; req_access_txt = "0" }, -/turf/unsimulated/floor{ - tag = "icon-dark"; - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/admin) "ze" = ( /obj/machinery/door/airlock/public/glass{ name = "Shuttle Bay"; req_access_txt = "0" }, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/admin) "zf" = ( /obj/structure/showcase, -/turf/unsimulated/floor{ - tag = "icon-dark"; - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/admin) "zh" = ( /obj/machinery/computer/card, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/centcom/evac) "zi" = ( /obj/structure/table/holotable, @@ -10449,18 +7786,13 @@ /obj/effect/landmark{ name = "traderstart_sol" }, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/trader_station/sol) "zk" = ( /obj/structure/table/reinforced, /obj/item/clipboard, /obj/item/stamp/granted, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/centcom/evac) "zl" = ( /obj/item/storage/toolbox/syndicate{ @@ -10475,10 +7807,7 @@ dir = 1 }, /obj/structure/table/wood, -/turf/unsimulated/floor{ - tag = "icon-dark"; - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/admin) "zm" = ( /obj/structure/window/reinforced{ @@ -10489,29 +7818,19 @@ }, /obj/item/grenade/clusterbuster/smoke, /obj/structure/table/wood, -/turf/unsimulated/floor{ - tag = "icon-dark"; - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/admin) -"zn" = ( -/turf/unsimulated/wall/fakeglass{ - icon_state = "fakewindows2"; - dir = 1 - }, -/area/trader_station/sol) "zr" = ( -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/centcom/evac) +"zs" = ( +/obj/effect/spawner/lootdrop/trade_sol/largeitem, +/turf/simulated/floor/mineral/titanium, +/area/shuttle/trade/sol) "zt" = ( /obj/structure/table/wood, /obj/item/dice/d20, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/trader_station/sol) "zu" = ( /obj/structure/chair/comfy/brown{ @@ -10520,10 +7839,7 @@ /obj/effect/landmark{ name = "traderstart_sol" }, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/trader_station/sol) "zv" = ( /obj/structure/window/reinforced{ @@ -10532,10 +7848,7 @@ /obj/structure/window/reinforced, /obj/structure/table/wood, /obj/item/sleeping_carp_scroll, -/turf/unsimulated/floor{ - tag = "icon-dark"; - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/admin) "zw" = ( /obj/structure/window/reinforced{ @@ -10544,45 +7857,31 @@ /obj/structure/window/reinforced, /obj/structure/table/wood, /obj/item/twohanded/bostaff, -/turf/unsimulated/floor{ - tag = "icon-dark"; - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/admin) "zx" = ( /obj/structure/table, /obj/item/storage/box/handcuffs, /obj/item/flash, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/centcom/evac) "zy" = ( /obj/structure/table/wood, /obj/item/paper_bin, /obj/item/pen, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/trader_station/sol) "zz" = ( /obj/structure/ninjatele{ pixel_x = -28 }, -/turf/unsimulated/floor{ - tag = "icon-dark"; - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/admin) "zA" = ( /obj/structure/ninjatele{ pixel_x = 28 }, -/turf/unsimulated/floor{ - tag = "icon-dark"; - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/admin) "zC" = ( /obj/structure/chair/comfy/brown{ @@ -10594,75 +7893,42 @@ /obj/machinery/light{ dir = 4 }, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/trader_station/sol) -"zD" = ( -/turf/unsimulated/floor{ - tag = "icon-dark"; - icon_state = "dark" +"zG" = ( +/obj/machinery/door/airlock/hatch{ + frequency = 1331; + icon_state = "door_locked"; + id_tag = "vox_northwest_lock"; + locked = 1; + req_access_txt = "152"; + req_one_access = null; + req_one_access_txt = "0" }, -/turf/unsimulated/wall{ - dir = 1; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "diagonalWall3" - }, -/area/admin) -"zE" = ( -/turf/unsimulated/floor{ - tag = "icon-dark"; - icon_state = "dark" - }, -/turf/unsimulated/wall{ - dir = 8; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "diagonalWall3" - }, -/area/admin) -"zF" = ( -/turf/unsimulated/wall/fakeglass{ - dir = 0; - icon_state = "fakewindows"; - tag = "icon-fakewindows (EAST)" - }, -/area/trader_station/sol) +/turf/simulated/floor/plating/nitrogen, +/area/shuttle/vox) "zH" = ( /obj/machinery/vending/cola, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/centcom/evac) "zI" = ( /obj/effect/decal/cleanable/blood, /obj/structure/toilet{ dir = 8 }, -/turf/unsimulated/floor{ - tag = "icon-dark"; - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/admin) "zJ" = ( /obj/structure/bed, -/turf/unsimulated/floor{ - tag = "icon-dark"; - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/admin) "zK" = ( /obj/effect/decal/cleanable/fungus, -/turf/unsimulated/wall{ - tag = "icon-wall3 (EAST)"; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "wall3"; - dir = 4 - }, +/turf/simulated/wall/indestructible/syndicate, /area/admin) "zL" = ( /obj/item/flag/syndi, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) "zM" = ( /obj/machinery/door/window{ @@ -10670,9 +7936,7 @@ name = "Suit Storage"; req_access_txt = "0" }, -/turf/unsimulated/floor{ - icon_state = "engine" - }, +/turf/simulated/floor/engine, /area/admin) "zN" = ( /obj/machinery/door/poddoor/shutters{ @@ -10680,49 +7944,52 @@ id_tag = "commandcenter"; name = "Privacy Shutters" }, -/turf/unsimulated/wall/fakeglass{ - dir = 8; - icon_state = "fakewindows3"; - tag = "icon-fakewindows (WEST)" - }, +/turf/simulated/wall/indestructible/opsglass, /area/syndicate_mothership) "zO" = ( /obj/structure/closet/secure_closet/personal/patient, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/centcom/evac) "zP" = ( /obj/machinery/door/airlock{ name = "Toilet"; req_access_txt = "0" }, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/trader_station/sol) "zQ" = ( -/obj/structure/grille, -/obj/structure/window/full/shuttle{ - icon_state = "16" - }, +/obj/effect/spawner/window/shuttle, /turf/simulated/floor/plating, /area/centcom/evac) "zR" = ( /obj/machinery/vending/coffee, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/centcom/evac) "zS" = ( /obj/machinery/light{ dir = 8 }, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/trader_station/sol) "zT" = ( +/obj/machinery/door/airlock/hatch{ + frequency = 1331; + icon_state = "door_locked"; + id_tag = "vox_northeast_lock"; + locked = 1; + req_access_txt = "152"; + req_one_access = null; + req_one_access_txt = "0" + }, +/obj/docking_port/mobile{ + dir = 2; + dwidth = 2; + height = 18; + id = "skipjack"; + name = "Vox Skipjack"; + roundstart_move = null; + width = 19 + }, /obj/docking_port/stationary{ dir = 2; dwidth = 2; @@ -10731,60 +7998,34 @@ name = "vox bay 1"; width = 19 }, -/turf/space, -/area/space) +/turf/simulated/floor/plating/nitrogen, +/area/shuttle/vox) "zU" = ( /obj/machinery/door/window/southleft{ name = "Cell B"; req_access_txt = "101" }, -/turf/unsimulated/floor{ - tag = "icon-dark"; - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/admin) -"zV" = ( -/obj/structure/grille, -/obj/structure/window/full/shuttle, -/turf/simulated/floor/plating, -/area/centcom/evac) "zW" = ( -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, -/area/centcom/evac) -"zX" = ( -/obj/structure/grille, -/obj/structure/window/full/shuttle{ - icon_state = "15" - }, -/turf/simulated/floor/plating, +/turf/simulated/floor/mineral/titanium, /area/centcom/evac) "zY" = ( /obj/structure/window/reinforced, -/turf/unsimulated/floor{ - tag = "icon-dark"; - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/admin) "zZ" = ( /obj/structure/urinal{ pixel_y = 28 }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, +/turf/simulated/floor/plasteel/freezer, /area/trader_station/sol) "Aa" = ( /obj/item/mop, /obj/structure/mirror{ pixel_x = 28 }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, +/turf/simulated/floor/plasteel/freezer, /area/trader_station/sol) "Ab" = ( /obj/structure/mopbucket, @@ -10792,98 +8033,39 @@ dir = 1 }, /obj/item/soap, -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, +/turf/simulated/floor/plasteel/freezer, /area/trader_station/sol) "Ac" = ( /obj/machinery/iv_drip, -/turf/unsimulated/floor{ - tag = "icon-dark"; - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/admin) "Ad" = ( /obj/machinery/vending/medical, -/turf/unsimulated/floor{ - tag = "icon-dark"; - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/admin) "Ae" = ( /obj/structure/chair, /obj/effect/decal/cleanable/blood, -/turf/unsimulated/floor{ - tag = "icon-dark"; - icon_state = "dark" - }, -/area/admin) -"Af" = ( -/turf/unsimulated/floor{ - tag = "icon-dark"; - icon_state = "dark" - }, -/turf/unsimulated/wall{ - dir = 4; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "diagonalWall3" - }, -/area/admin) -"Ag" = ( -/turf/unsimulated/floor{ - tag = "icon-dark"; - icon_state = "dark" - }, -/turf/unsimulated/wall{ - dir = 2; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "diagonalWall3" - }, +/turf/simulated/floor/plasteel/dark, /area/admin) "Ah" = ( /obj/structure/table/reinforced, /obj/item/clothing/suit/straight_jacket, -/turf/unsimulated/floor{ - tag = "icon-dark"; - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/admin) "Ai" = ( /obj/structure/table/reinforced, /obj/item/storage/box/handcuffs, -/turf/unsimulated/floor{ - tag = "icon-dark"; - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/admin) "Aj" = ( /obj/structure/table/reinforced, /obj/item/clothing/glasses/sunglasses/blindfold, /obj/item/clothing/mask/muzzle, -/turf/unsimulated/floor{ - tag = "icon-dark"; - icon_state = "dark" - }, -/area/admin) -"Ak" = ( -/turf/unsimulated/floor{ - icon_state = "engine" - }, -/turf/unsimulated/wall{ - dir = 4; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "window5"; - name = "window"; - opacity = 0; - tag = "icon-window5 (EAST)" - }, +/turf/simulated/floor/plasteel/dark, /area/admin) "Al" = ( -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, +/turf/simulated/floor/plasteel/freezer, /area/trader_station/sol) "Am" = ( /obj/structure/mirror{ @@ -10895,70 +8077,24 @@ pixel_x = 11; pixel_y = 0 }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, +/turf/simulated/floor/plasteel/freezer, /area/trader_station/sol) -"An" = ( -/turf/unsimulated/wall/fakeglass{ - icon_state = "fakewindows"; - dir = 8 - }, -/area/trader_station/sol) -"Ao" = ( -/turf/unsimulated/wall/fakeglass{ - tag = "icon-fakewindows2 (WEST)"; - icon_state = "fakewindows2"; - dir = 8 - }, -/area/trader_station/sol) -"Ar" = ( -/turf/unsimulated/floor{ - tag = "icon-dark"; - icon_state = "dark" - }, -/turf/unsimulated/wall{ - dir = 4; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "window5"; - name = "window"; - opacity = 0; - tag = "icon-window5 (EAST)" - }, -/area/admin) +"Ap" = ( +/turf/simulated/floor/plating/airless, +/area/shuttle/syndicate_elite) "As" = ( /obj/machinery/door/airlock/hatch{ desc = "Uh oh. You'd better hope you aren't going in here!"; name = "Prisoner Treatment" }, -/turf/unsimulated/floor{ - tag = "icon-dark"; - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/admin) "At" = ( /obj/machinery/door/airlock/hatch{ desc = "Uh oh. You'd better hope you aren't going in here!"; name = "Detainment" }, -/turf/unsimulated/floor{ - tag = "icon-dark"; - icon_state = "dark" - }, -/area/admin) -"Au" = ( -/turf/unsimulated/floor{ - icon_state = "engine" - }, -/turf/unsimulated/wall{ - dir = 2; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "window5"; - name = "window"; - opacity = 0; - tag = "icon-window5" - }, +/turf/simulated/floor/plasteel/dark, /area/admin) "Av" = ( /obj/structure/toilet{ @@ -10973,65 +8109,53 @@ opacity = 1; req_access_txt = "0" }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - dir = 2 - }, +/turf/simulated/floor/plasteel/freezer, /area/trader_station/sol) "Aw" = ( -/turf/unsimulated/wall, +/turf/simulated/wall/indestructible/syndicate, /area/centcom) +"Ax" = ( +/obj/structure/window/reinforced, +/obj/structure/shuttle/engine/heater{ + dir = 1; + icon_state = "heater"; + tag = "icon-heater (NORTH)" + }, +/turf/simulated/floor/plating/airless, +/area/shuttle/syndicate_elite) "Ay" = ( /obj/structure/table/reinforced, /obj/item/melee/classic_baton/telescopic, /obj/item/paper/Court, /obj/item/pen, -/turf/unsimulated/floor{ - tag = "icon-dark"; - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/admin) "Az" = ( /obj/structure/table/reinforced, /obj/item/storage/box/mousetraps, /obj/item/storage/box/trackimp, -/turf/unsimulated/floor{ - tag = "icon-dark"; - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/admin) "AA" = ( /obj/structure/table/reinforced, /obj/item/scalpel, -/turf/unsimulated/floor{ - tag = "icon-dark"; - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/admin) "AB" = ( /obj/structure/table/reinforced, /obj/item/storage/box/grenades, -/turf/unsimulated/floor{ - tag = "icon-dark"; - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/admin) "AC" = ( /obj/structure/table/reinforced, /obj/item/storage/box/flashbangs, /obj/item/storage/box/flashes, -/turf/unsimulated/floor{ - tag = "icon-dark"; - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/admin) "AD" = ( /obj/structure/table/reinforced, /obj/item/storage/box/teargas, -/turf/unsimulated/floor{ - tag = "icon-dark"; - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/admin) "AE" = ( /obj/machinery/door/window{ @@ -11039,29 +8163,20 @@ name = "Cell A"; req_access_txt = "101" }, -/turf/unsimulated/floor{ - tag = "icon-dark"; - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/admin) "AF" = ( /obj/structure/window/reinforced{ dir = 1; layer = 2.9 }, -/turf/unsimulated/floor{ - tag = "icon-dark"; - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/admin) "AG" = ( /obj/structure/toilet{ dir = 8 }, -/turf/unsimulated/floor{ - tag = "icon-dark"; - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/admin) "AI" = ( /obj/machinery/door/airlock/hatch{ @@ -11075,19 +8190,13 @@ name = "Security Doors"; opacity = 0 }, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/admin) "AJ" = ( /obj/structure/rack, /obj/item/tank/jetpack/oxygen, /obj/item/tank/jetpack/oxygen, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/admin) "AK" = ( /obj/structure/rack, @@ -11097,10 +8206,7 @@ /obj/item/clothing/mask/breath, /obj/item/clothing/head/helmet/space, /obj/item/clothing/head/helmet/space, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/admin) "AL" = ( /obj/structure/rack, @@ -11109,267 +8215,192 @@ pixel_x = -6; pixel_y = 6 }, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/admin) "AM" = ( /obj/structure/table, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/centcom/evac) "AN" = ( /obj/structure/table, /obj/item/hand_labeler, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/centcom/evac) "AO" = ( /obj/structure/table, /obj/random/powercell, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/admin) "AP" = ( /obj/structure/table, /obj/random/tool, /obj/random/bomb_supply, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/admin) "AQ" = ( /obj/structure/table, /obj/item/storage/toolbox/mechanical, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/admin) "AR" = ( /obj/structure/table, /obj/random/technology_scanner, /obj/random/tech_supply, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/admin) "AS" = ( /obj/machinery/computer/teleporter, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/admin) "AT" = ( /obj/structure/table, /obj/item/clothing/gloves/color/yellow, /obj/random/bomb_supply, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/admin) "AU" = ( /obj/machinery/teleport/hub/upgraded{ admin_usage = 1 }, /obj/effect/decal/warning_stripes/yellow, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/admin) "AV" = ( /obj/machinery/teleport/station, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/admin) "AW" = ( /obj/structure/table, /obj/item/storage/toolbox/electrical, -/turf/unsimulated/floor{ - tag = "icon-floor"; - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/admin) "AX" = ( /obj/machinery/door/poddoor/impassable{ id_tag = "commandcenter" }, /obj/machinery/door/airlock/hatch/syndicate/command, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) "AY" = ( /obj/machinery/light/spot{ - tag = "icon-tube1 (WEST)"; + dir = 8; icon_state = "tube1"; - dir = 8 + tag = "icon-tube1 (WEST)" }, /obj/machinery/pdapainter, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) "AZ" = ( /obj/structure/table, /obj/machinery/light/spot{ - tag = "icon-tube1 (EAST)"; + dir = 4; icon_state = "tube1"; - dir = 4 + tag = "icon-tube1 (EAST)" }, /obj/item/storage/backpack/satchel, /obj/item/storage/backpack/satchel, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) "Ba" = ( /obj/machinery/light/spot{ - tag = "icon-tube1 (WEST)"; + dir = 8; icon_state = "tube1"; - dir = 8 + tag = "icon-tube1 (WEST)" }, /obj/machinery/vending/tool, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) "Bb" = ( /obj/machinery/computer/crew, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/centcom/evac) "Bc" = ( /obj/machinery/computer/communications, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/centcom/evac) "Bd" = ( /obj/machinery/vending/coffee/free, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) "Be" = ( /obj/structure/table, /obj/item/storage/backpack/industrial, /obj/item/storage/backpack/industrial, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) "Bf" = ( /obj/structure/table, /obj/item/radio, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/centcom/evac) "Bg" = ( /obj/structure/table/wood, /obj/item/syndicatedetonator, -/turf/unsimulated/floor{ - dir = 1; - icon_state = "carpetside" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) "Bh" = ( /obj/structure/table, /obj/item/storage/backpack/medic, /obj/item/storage/backpack/medic, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) "Bi" = ( /obj/structure/table, /obj/item/stamp/captain, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/centcom/evac) "Bj" = ( /obj/machinery/computer{ name = "EMERGENCY SHUTTLE COMPUTER" }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/centcom/evac) "Bk" = ( /obj/structure/table, /obj/item/clipboard, /obj/item/pen, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/centcom/evac) "Bl" = ( /obj/structure/table, /obj/item/paper_bin, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/centcom/evac) "Bm" = ( /obj/structure/table, /obj/item/storage/backpack/science, /obj/item/storage/backpack/science, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) "Bn" = ( /obj/machinery/door/airlock/hatch/syndicate, -/turf/unsimulated/floor{ - icon_state = "bar"; - dir = 2 +/turf/simulated/floor/plasteel{ + icon_state = "bar" }, /area/syndicate_mothership) "Bo" = ( /obj/structure/table/wood, /obj/item/radio/intercom/syndicate, -/turf/unsimulated/floor{ - dir = 9; - icon_state = "carpetside" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) "Bp" = ( /obj/structure/table/wood, /obj/item/reagent_containers/food/drinks/drinkingglass/devilskiss, -/turf/unsimulated/floor{ - dir = 5; - icon_state = "carpetside" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) -"Bq" = ( -/obj/structure/grille, -/obj/structure/window/full/shuttle{ - icon_state = "window4" - }, -/turf/simulated/floor/plating, -/area/centcom/evac) "Br" = ( /obj/structure/chair/office/dark, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) -"Bs" = ( -/obj/structure/grille, -/obj/structure/window/full/shuttle{ - icon_state = "17" - }, -/turf/simulated/floor/plating, -/area/centcom/evac) "Bt" = ( /obj/structure/chair/comfy/red{ - icon_state = "comfychair"; - dir = 1 + dir = 1; + icon_state = "comfychair" }, /obj/effect/landmark{ name = "Syndicate Officer" }, -/turf/unsimulated/floor{ - dir = 2; - icon_state = "carpetside" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) "Bu" = ( /obj/structure/table/wood, @@ -11378,23 +8409,15 @@ name = "Privacy Shutters"; req_access_txt = "153" }, -/turf/unsimulated/floor{ - dir = 10; - icon_state = "carpetside" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) "Bv" = ( /obj/machinery/computer/camera_advanced, -/turf/unsimulated/floor{ - dir = 6; - icon_state = "carpetside" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) "Bw" = ( /obj/structure/table/reinforced, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) "Bx" = ( /obj/structure/chair/stool, @@ -11402,17 +8425,13 @@ name = "Syndicate-Commando"; tag = "Commando" }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) "By" = ( /obj/machinery/computer/shuttle/syndicate{ name = "Nuclear Operatives Shuttle Console" }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) "Bz" = ( /obj/structure/table/reinforced, @@ -11430,38 +8449,28 @@ pixel_y = 6; req_access_txt = "153" }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) "BA" = ( /obj/structure/displaycase/stechkin, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) "BB" = ( /obj/structure/closet/secure_closet/syndicate_officer, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) "BC" = ( /obj/machinery/door/poddoor/impassable{ id_tag = "sst_mechbay"; name = "Mech Bay" }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) "BD" = ( /obj/machinery/door/airlock/hatch/syndicate{ name = "Holding Cell" }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) "BE" = ( /obj/structure/rack, @@ -11469,25 +8478,19 @@ /obj/item/storage/backpack/duffel/syndie/ammo/shotgun, /obj/item/gun/projectile/automatic/shotgun/bulldog, /obj/item/gun/projectile/automatic/shotgun/bulldog, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) "BF" = ( /obj/machinery/door/poddoor/impassable{ id_tag = "sst_armory"; name = "Armory" }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) "BG" = ( /obj/mecha/combat/gygax/dark/loaded, /obj/effect/decal/warning_stripes/red/hollow, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) "BH" = ( /obj/structure/rack, @@ -11501,9 +8504,7 @@ /obj/item/ammo_box/magazine/smgm45, /obj/item/gun/projectile/automatic/c20r, /obj/item/gun/projectile/automatic/c20r, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) "BI" = ( /obj/structure/rack, @@ -11512,17 +8513,13 @@ /obj/item/ammo_box/magazine/sniper_rounds/penetrator, /obj/item/ammo_box/magazine/sniper_rounds/haemorrhage, /obj/item/gun/projectile/automatic/sniper_rifle/syndicate, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) "BJ" = ( /obj/structure/rack, /obj/item/gun/medbeam, /obj/item/clothing/glasses/hud/health/night, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) "BK" = ( /obj/structure/rack, @@ -11532,15 +8529,11 @@ /obj/item/ammo_casing/rocket, /obj/item/ammo_casing/rocket, /obj/item/gun/rocketlauncher, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) "BL" = ( /obj/structure/reagent_dispensers/fueltank, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) "BM" = ( /obj/machinery/door/airlock/hatch/syndicate{ @@ -11549,9 +8542,7 @@ /obj/machinery/door/poddoor/impassable{ id_tag = "sit_ready" }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) "BN" = ( /obj/machinery/door/airlock/hatch/syndicate{ @@ -11560,114 +8551,119 @@ /obj/machinery/door/poddoor/impassable{ id_tag = "sst_ready" }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) "BO" = ( /obj/machinery/bluespace_beacon/syndicate/infiltrator, /obj/effect/decal/warning_stripes/yellow, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) "BQ" = ( /obj/machinery/mech_bay_recharge_port/upgraded/unsimulated, -/turf/unsimulated/floor, +/turf/simulated/floor/plating, /area/syndicate_mothership) "BR" = ( /obj/machinery/mech_bay_recharge_port/upgraded/unsimulated, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/centcom/specops) "BS" = ( /obj/structure/chair{ dir = 8 }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) "BT" = ( /obj/machinery/door/window/northleft{ name = "cell door"; req_access_txt = "150" }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) "BU" = ( /obj/structure/window/reinforced{ dir = 1 }, /obj/machinery/computer/arcade/orion_trail, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) "BV" = ( /obj/structure/chair, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) "BW" = ( /obj/structure/chair/stool, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) "BX" = ( /obj/structure/table/wood, /obj/item/paper_bin, /obj/item/pen/red, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) "BY" = ( /obj/structure/bed, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) "BZ" = ( /obj/structure/closet/secure_closet{ req_access_txt = "150" }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) "Ca" = ( /obj/machinery/door/window/northleft{ name = "Out"; req_access_txt = "150" }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) "Cb" = ( /obj/machinery/door/window/northright{ name = "In"; req_access_txt = "150" }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) "Cc" = ( /obj/machinery/door/poddoor/impassable{ id_tag = "nukeop_base" }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) "Cd" = ( +/obj/machinery/door/airlock/external{ + frequency = 1331; + icon_state = "door_locked"; + id_tag = "synd_outer"; + locked = 0; + name = "Ship External Access"; + req_access = null; + req_access_txt = "150" + }, +/obj/machinery/door/poddoor{ + density = 0; + icon_state = "open"; + id_tag = "smindicate"; + name = "Outer Airlock"; + opacity = 0 + }, +/obj/machinery/door_control{ + id = "smindicate"; + name = "External Door Control"; + pixel_x = -26; + pixel_y = -2; + req_access_txt = "150" + }, +/obj/docking_port/mobile{ + dheight = 9; + dir = 2; + dwidth = 5; + height = 22; + id = "syndicate"; + name = "syndicate infiltrator"; + roundstart_move = null; + width = 18 + }, /obj/docking_port/stationary{ area_type = /area/syndicate_mothership; dheight = 9; @@ -11676,17 +8672,38 @@ height = 22; id = "syndicate_away"; name = "syndicate base"; - turf_type = /turf/unsimulated/floor/snow; + turf_type = /turf/simulated/floor/plating/asteroid/snow/airless; width = 18 }, -/turf/unsimulated/floor/snow, -/area/syndicate_mothership) +/turf/simulated/floor/plating, +/area/shuttle/syndicate) "Cf" = ( /obj/structure/kitchenspike, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership/jail) +"Ch" = ( +/obj/structure/table, +/obj/item/storage/box/chemimp{ + pixel_x = 4; + pixel_y = 3 + }, +/obj/item/storage/box/trackimp, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/administration) +"Cl" = ( +/obj/structure/table, +/obj/item/assembly/prox_sensor{ + pixel_x = -8; + pixel_y = 4 + }, +/obj/item/assembly/prox_sensor{ + pixel_x = -8; + pixel_y = 4 + }, +/obj/item/assembly/signaler, +/obj/item/assembly/signaler, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/syndicate) "Cm" = ( /obj/structure/table/holotable, /turf/simulated/floor/holofloor{ @@ -11694,11 +8711,24 @@ icon_state = "red" }, /area/holodeck/source_thunderdomecourt) +"Cw" = ( +/obj/machinery/access_button{ + command = "cycle_interior"; + frequency = 1331; + master_tag = "vox_west_control"; + req_one_access_txt = "152" + }, +/turf/simulated/wall/mineral/plastitanium, +/area/shuttle/vox) +"Cz" = ( +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "brown" + }, +/area/shuttle/escape) "CD" = ( /obj/structure/table/wood, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership/jail) "CF" = ( /turf/simulated/floor/holofloor{ @@ -11706,12 +8736,82 @@ icon_state = "blue" }, /area/holodeck/source_knightarena) +"CG" = ( +/obj/structure/table/reinforced, +/obj/item/storage/box/drinkingglasses, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/administration) +"CH" = ( +/turf/simulated/floor/mech_bay_recharge_floor, +/area/shuttle/escape) +"CO" = ( +/obj/machinery/door/window{ + base_state = "right"; + dir = 4; + icon_state = "right"; + name = "Equipment Room"; + req_access_txt = "150" + }, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/syndicate) "CR" = ( /turf/simulated/floor/holofloor{ dir = 8; icon_state = "green" }, /area/holodeck/source_boxingcourt) +"CT" = ( +/obj/item/clothing/head/bearpelt, +/obj/item/xenos_claw, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/vox) +"CV" = ( +/obj/structure/table/reinforced, +/obj/item/clothing/gloves/color/latex/nitrile, +/obj/item/clothing/mask/breath, +/turf/simulated/floor/plasteel{ + dir = 2; + icon_state = "cmo" + }, +/area/shuttle/escape) +"CX" = ( +/obj/machinery/door/airlock/hatch{ + frequency = 1331; + icon_state = "door_locked"; + id_tag = "vox_southwest_lock"; + locked = 1; + req_access_txt = "152"; + req_one_access = null; + req_one_access_txt = "0" + }, +/turf/simulated/floor/plating/nitrogen, +/area/shuttle/vox) +"De" = ( +/obj/effect/landmark{ + name = "Nuclear-Bomb" + }, +/obj/machinery/light/spot, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/syndicate) +"Dg" = ( +/obj/structure/computerframe, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/syndicate) +"Dk" = ( +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "browncorner" + }, +/area/shuttle/escape) +"Dl" = ( +/obj/machinery/door/airlock/centcom{ + id_tag = "adminshuttle"; + name = "Medbay"; + opacity = 1; + req_access_txt = "101" + }, +/turf/simulated/floor/mineral/titanium, +/area/shuttle/administration) "Dp" = ( /obj/structure/table/holotable, /obj/item/clothing/head/helmet/thunderdome, @@ -11723,9 +8823,72 @@ icon_state = "red" }, /area/holodeck/source_thunderdomecourt) +"Dr" = ( +/obj/machinery/teleport/station, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/syndicate) +"Du" = ( +/obj/machinery/door_control{ + id = "adminshuttleblast"; + name = "blast door control"; + pixel_x = -30; + req_access_txt = "101" + }, +/obj/machinery/light{ + dir = 8; + icon_state = "tube1" + }, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/administration) "Dv" = ( /turf/space, /area/admin) +"Dx" = ( +/obj/structure/extinguisher_cabinet, +/turf/simulated/wall/mineral/titanium, +/area/shuttle/escape) +"Dy" = ( +/obj/machinery/door/airlock/centcom{ + id_tag = "adminshuttle"; + name = "Workshop"; + opacity = 1; + req_access_txt = "101" + }, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/administration) +"Dz" = ( +/obj/structure/closet/syndicate/nuclear, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/syndicate) +"DB" = ( +/obj/structure/table/reinforced, +/obj/machinery/recharger, +/turf/simulated/floor/mineral/plastitanium/red/brig, +/area/shuttle/escape) +"DC" = ( +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/syndicate) +"DE" = ( +/obj/structure/rack, +/obj/item/clothing/accessory/storage/black_vest, +/obj/item/clothing/suit/space/vox/stealth, +/obj/item/clothing/head/helmet/space/vox/stealth, +/obj/item/clothing/mask/breath, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/vox) +"DF" = ( +/obj/structure/table, +/obj/item/bonegel, +/obj/item/bonesetter, +/obj/item/hemostat, +/obj/item/cautery, +/obj/item/surgicaldrill, +/obj/item/circular_saw, +/obj/item/scalpel, +/obj/item/retractor, +/obj/item/FixOVein, +/turf/simulated/floor/mineral/titanium, +/area/shuttle/administration) "DG" = ( /obj/machinery/embedded_controller/radio/airlock/access_controller{ frequency = 1441; @@ -11737,17 +8900,46 @@ tag_exterior_door = "syndicate_jail_airlock_external"; tag_interior_door = "syndicate_jail_airlock_internal" }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) -"DL" = ( -/turf/unsimulated/wall/fakeglass{ - dir = 8; - icon_state = "fakewindows3"; - tag = "icon-fakewindows (WEST)" +"DH" = ( +/obj/machinery/sleeper{ + dir = 4 }, -/area/syndicate_mothership/jail) +/turf/simulated/floor/plasteel{ + dir = 2; + icon_state = "cmo" + }, +/area/shuttle/escape) +"DI" = ( +/obj/structure/shuttle/engine/propulsion{ + dir = 8; + icon_state = "propulsion_r"; + tag = "icon-propulsion_r (EAST)" + }, +/turf/simulated/floor/plating/airless, +/area/shuttle/administration) +"DK" = ( +/obj/structure/plasticflaps/mining, +/obj/machinery/conveyor/east{ + id = "QMLoad2" + }, +/turf/simulated/floor/plating, +/area/shuttle/supply) +"DP" = ( +/obj/machinery/light/spot{ + dir = 1; + icon_state = "tube1"; + tag = "icon-tube1 (NORTH)" + }, +/obj/effect/spawner/lootdrop/trade_sol/donksoft, +/obj/structure/closet, +/turf/simulated/floor/mineral/titanium, +/area/shuttle/trade/sol) +"DW" = ( +/obj/structure/shuttle/engine/propulsion, +/turf/simulated/floor/plating/airless, +/area/shuttle/escape) "DX" = ( /turf/simulated/floor/mech_bay_recharge_floor, /area/admin) @@ -11755,10 +8947,44 @@ /obj/machinery/door/airlock/hatch/syndicate{ name = "Torture Room" }, -/turf/unsimulated/floor{ +/turf/simulated/floor/plasteel/dark, +/area/syndicate_mothership/jail) +"DZ" = ( +/obj/machinery/portable_atmospherics/canister/toxins, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/vox) +"Ea" = ( +/obj/structure/extinguisher_cabinet{ + pixel_x = 28 + }, +/obj/machinery/light/small{ + dir = 4; + pixel_y = 8 + }, +/turf/simulated/floor/plasteel{ + dir = 6; + icon_state = "whiteblue"; + tag = "icon-whiteblue (SOUTHEAST)" + }, +/area/shuttle/escape) +"Ed" = ( +/obj/machinery/computer/camera_advanced/shuttle_docker/vox, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/vox) +"Ef" = ( +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/shuttle/escape) +"Eh" = ( +/obj/machinery/light, +/obj/structure/chair/comfy/shuttle{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/syndicate_mothership/jail) +/area/shuttle/escape) "Ei" = ( /obj/structure/holohoop{ dir = 1 @@ -11768,28 +8994,208 @@ icon_state = "green" }, /area/holodeck/source_basketball) +"Eo" = ( +/obj/machinery/chem_master, +/turf/simulated/floor/mineral/titanium, +/area/shuttle/administration) +"Es" = ( +/obj/machinery/iv_drip, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/syndicate) +"Et" = ( +/obj/structure/shuttle/engine/propulsion{ + icon_state = "propulsion_r"; + tag = "icon-propulsion_r" + }, +/turf/simulated/floor/plating/airless, +/area/shuttle/syndicate) "Ew" = ( /turf/simulated/floor/holofloor{ - tag = "icon-carpet2-0 (EAST)"; + dir = 4; icon_state = "carpet2-0"; - dir = 4 + tag = "icon-carpet2-0 (EAST)" }, /area/holodeck/source_theatre) +"Ex" = ( +/obj/structure/shuttle/engine/propulsion{ + icon_state = "burst_r"; + tag = "icon-burst_r" + }, +/turf/simulated/floor/plating/airless, +/area/shuttle/supply) "Ez" = ( /turf/simulated/floor/holofloor{ - tag = "icon-carpet8-0 (EAST)"; + dir = 4; icon_state = "carpet8-0"; - dir = 4 + tag = "icon-carpet8-0 (EAST)" }, /area/holodeck/source_meetinghall) +"EA" = ( +/obj/structure/table/reinforced, +/obj/machinery/chem_dispenser/soda, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/administration) "ED" = ( /obj/structure/toilet{ dir = 8 }, -/turf/unsimulated/floor{ +/turf/simulated/floor/plasteel/dark, +/area/syndicate_mothership/jail) +"EE" = ( +/obj/structure/closet/crate/internals, +/obj/item/clothing/mask/breath, +/obj/item/clothing/mask/breath, +/obj/item/clothing/mask/breath, +/obj/item/clothing/mask/breath, +/obj/item/tank/internals/emergency_oxygen/engi, +/obj/item/tank/internals/emergency_oxygen/engi, +/obj/item/tank/internals/emergency_oxygen/engi, +/obj/item/tank/internals/emergency_oxygen/engi, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "bot" + }, +/area/shuttle/escape) +"EF" = ( +/obj/structure/shuttle/engine/propulsion{ + dir = 1; + icon_state = "propulsion_r"; + tag = "icon-propulsion_r (NORTH)" + }, +/turf/simulated/floor/plating/airless, +/area/shuttle/syndicate_sit) +"EG" = ( +/obj/machinery/computer/cloning, +/turf/simulated/floor/mineral/titanium, +/area/shuttle/administration) +"EI" = ( +/obj/structure/dispenser, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/administration) +"EK" = ( +/obj/item/radio/intercom/syndicate{ + pixel_x = -28 + }, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/syndicate) +"EL" = ( +/obj/machinery/sleeper/syndie, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/syndicate_elite) +"EM" = ( +/obj/item/radio/intercom{ + dir = 8; + name = "station intercom (General)"; + pixel_x = -28 + }, +/obj/machinery/recharge_station, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "bot" + }, +/area/shuttle/escape) +"EP" = ( +/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ + frequency = 1331; + id_tag = "synd_airlock"; + pixel_x = 25; + req_access_txt = "150"; + tag_airpump = "synd_pump"; + tag_chamber_sensor = "synd_sensor"; + tag_exterior_door = "synd_outer"; + tag_interior_door = "synd_inner" + }, +/obj/machinery/airlock_sensor{ + frequency = 1331; + id_tag = "synd_sensor"; + pixel_x = 25; + pixel_y = 12; + req_access_txt = "150" + }, +/obj/machinery/light{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 4 + }, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/syndicate) +"ET" = ( +/obj/structure/closet/crate, +/obj/machinery/light/spot, +/turf/simulated/floor/mineral/titanium, +/area/shuttle/transport) +"EU" = ( +/obj/structure/table, +/obj/item/stack/cable_coil, +/obj/item/crowbar/red, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/syndicate) +"EV" = ( +/obj/machinery/light{ + dir = 1; + on = 1 + }, +/obj/structure/chair/comfy/shuttle, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "bot" + }, +/area/shuttle/escape) +"EW" = ( +/turf/simulated/floor/plating/nitrogen, +/area/shuttle/vox) +"EX" = ( +/obj/structure/table/reinforced, +/obj/item/storage/fancy/donut_box, +/turf/simulated/floor/mineral/plastitanium/red/brig, +/area/shuttle/escape) +"EY" = ( +/obj/machinery/door/poddoor{ + density = 0; + icon_state = "open"; + id_tag = "soltradeship_south"; + name = "Security Doors"; + opacity = 0 + }, +/obj/machinery/door/airlock/titanium/glass{ + id_tag = "soltrader_south"; + name = "trader shuttle airlock"; + req_access_txt = "160"; + security_level = 6 + }, +/turf/simulated/floor/mineral/titanium/blue, +/area/shuttle/trade/sol) +"Fb" = ( +/obj/machinery/door/poddoor/preopen{ + id_tag = "adminshuttleblast"; + name = "Blast Doors"; + req_access_txt = "101" + }, +/obj/machinery/door/airlock/centcom{ + id_tag = "adminshuttle"; + name = "General Access"; + opacity = 1; + req_access_txt = "101" + }, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/administration) +"Fc" = ( +/obj/machinery/door/window{ + dir = 4; + name = "Equipment Room"; + req_access_txt = "150" + }, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/syndicate) +"Fd" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/syndicate_mothership/jail) +/area/shuttle/escape) "Fe" = ( /obj/structure/table/holotable, /turf/simulated/floor/holofloor{ @@ -11797,6 +9203,99 @@ icon_state = "blue" }, /area/holodeck/source_knightarena) +"Fg" = ( +/obj/machinery/flasher{ + id = "soltraderflash"; + pixel_y = -28 + }, +/obj/structure/chair/comfy/shuttle{ + dir = 8 + }, +/turf/simulated/floor/mineral/titanium/blue, +/area/shuttle/trade/sol) +"Fi" = ( +/obj/effect/spawner/window/plastitanium, +/turf/simulated/floor/plating/nitrogen, +/area/shuttle/vox) +"Fk" = ( +/obj/structure/chair/comfy/shuttle, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "bot" + }, +/area/shuttle/escape) +"Fm" = ( +/obj/machinery/door/poddoor/shutters{ + density = 0; + dir = 2; + icon_state = "open"; + id_tag = "voxshutters"; + name = "Blast Shutters"; + opacity = 0 + }, +/obj/effect/spawner/window/plastitanium, +/turf/simulated/floor/plating/nitrogen, +/area/shuttle/vox) +"Fn" = ( +/obj/structure/grille, +/obj/structure/window/full/shuttle{ + icon_state = "17" + }, +/turf/simulated/floor/plating, +/area/shuttle/escape) +"Fo" = ( +/obj/structure/closet/crate/internals, +/obj/item/tank/internals/oxygen/red, +/obj/item/clothing/mask/gas, +/obj/item/tank/internals/oxygen/red, +/obj/item/clothing/mask/gas, +/obj/item/tank/internals/oxygen/red, +/obj/item/clothing/mask/gas, +/obj/item/tank/internals/oxygen/red, +/obj/item/clothing/mask/gas, +/obj/item/tank/internals/oxygen/red, +/obj/item/clothing/mask/gas, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/syndicate) +"Fp" = ( +/obj/machinery/door/airlock/titanium{ + aiControlDisabled = 1; + hackProof = 1; + id_tag = "s_docking_airlock"; + name = "Shuttle Hatch" + }, +/turf/simulated/floor/plating, +/area/shuttle/escape) +"Fq" = ( +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/table, +/obj/machinery/recharger{ + pixel_y = 0 + }, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/vox) +"Fr" = ( +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/table, +/obj/machinery/cell_charger, +/obj/item/weed_extract, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/vox) +"Ft" = ( +/obj/structure/shuttle/engine/propulsion{ + dir = 8; + icon_state = "burst_l" + }, +/turf/simulated/floor/plating/airless, +/area/shuttle/specops) +"Fu" = ( +/obj/machinery/light/spot, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/vox) "Fx" = ( /obj/structure/table/holotable, /turf/simulated/floor/holofloor{ @@ -11804,6 +9303,24 @@ icon_state = "red" }, /area/holodeck/source_knightarena) +"Fy" = ( +/obj/structure/table, +/obj/machinery/cell_charger, +/obj/item/stock_parts/cell/high, +/obj/machinery/light/small{ + dir = 8; + icon_state = "bulb1"; + tag = "icon-bulb1 (WEST)" + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "bot" + }, +/area/shuttle/escape) +"FA" = ( +/obj/machinery/chem_dispenser, +/turf/simulated/floor/mineral/titanium, +/area/shuttle/administration) "FF" = ( /obj/structure/table/holotable, /turf/simulated/floor/holofloor{ @@ -11811,137 +9328,306 @@ icon_state = "green" }, /area/holodeck/source_thunderdomecourt) +"FG" = ( +/obj/machinery/light/spot{ + dir = 1; + icon_state = "tube1"; + tag = "icon-tube1 (NORTH)" + }, +/turf/simulated/floor/mineral/titanium/blue, +/area/shuttle/supply) +"FJ" = ( +/obj/machinery/computer/secure_data, +/turf/simulated/floor/plasteel{ + dir = 10; + icon_state = "darkred" + }, +/area/shuttle/escape) "FL" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/indestructible/syndicate, /area/adminconstruction) +"FM" = ( +/obj/machinery/light, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/administration) +"FO" = ( +/obj/item/stack/spacecash/c50, +/obj/structure/chair/comfy/shuttle{ + dir = 8 + }, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/vox) +"FP" = ( +/obj/structure/table, +/obj/item/screwdriver{ + pixel_y = 9 + }, +/obj/item/assembly/voice{ + pixel_y = 3 + }, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/syndicate) +"FR" = ( +/obj/machinery/door/window/northright{ + name = "bar" + }, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/administration) +"FZ" = ( +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "neutral" + }, +/area/shuttle/escape) "Ga" = ( /obj/machinery/computer/shuttle/ert, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/centcom/specops) +"Gd" = ( +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/shuttle/engine/heater, +/turf/simulated/floor/plating/airless, +/area/shuttle/supply) +"Ge" = ( +/obj/structure/table, +/obj/machinery/cell_charger, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/syndicate) +"Gf" = ( +/obj/machinery/computer/communications, +/turf/simulated/floor/plasteel{ + dir = 5; + icon_state = "darkblue" + }, +/area/shuttle/escape) "Gg" = ( /turf/simulated/floor/holofloor{ - tag = "icon-asteroid11 (EAST)"; + dir = 4; + icon = 'icons/turf/floors/plating.dmi'; icon_state = "asteroid11"; - dir = 4 + tag = "icon-asteroid11 (EAST)" }, /area/holodeck/source_desert) +"Gi" = ( +/obj/item/skeleton/r_arm, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/vox) +"Gn" = ( +/obj/structure/shuttle/engine/propulsion{ + dir = 8; + icon_state = "burst_r" + }, +/turf/simulated/floor/plating/airless, +/area/shuttle/specops) +"Gs" = ( +/obj/machinery/access_button{ + command = "cycle_interior"; + frequency = 1331; + master_tag = "synd_airlock"; + name = "interior access button"; + pixel_x = 25; + pixel_y = 25; + req_access_txt = "0" + }, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/syndicate) "Gu" = ( /obj/structure/bed, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership/jail) -"Gx" = ( -/turf/simulated/floor/holofloor{ - tag = "icon-wood (EAST)"; - icon_state = "wood"; +"Gv" = ( +/obj/item/stack/sheet/metal, +/obj/structure/table, +/obj/item/stack/sheet/glass{ + pixel_x = 4; + pixel_y = 4 + }, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/administration) +"Gy" = ( +/obj/structure/table/reinforced, +/obj/item/storage/toolbox/mechanical, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "vault" + }, +/area/shuttle/escape) +"GA" = ( +/turf/simulated/wall/mineral/plastitanium, +/area/shuttle/syndicate_sit) +"GD" = ( +/obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/sst, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/syndicate_elite) +"GJ" = ( +/obj/effect/spawner/lootdrop/trade_sol/civ, +/obj/structure/closet, +/turf/simulated/floor/mineral/titanium, +/area/shuttle/trade/sol) +"GL" = ( +/obj/structure/table/reinforced, +/obj/machinery/light{ + dir = 8; + icon_state = "tube1" + }, +/obj/item/reagent_containers/food/drinks/mug/med, +/turf/simulated/floor/plasteel{ + dir = 2; + icon_state = "cmo" + }, +/area/shuttle/escape) +"GQ" = ( +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/machinery/optable, +/obj/item/organ/internal/brain, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/vox) +"GU" = ( +/turf/simulated/floor/mineral/plastitanium/red/brig, +/area/shuttle/escape) +"GX" = ( +/obj/structure/chair/comfy/shuttle{ dir = 4 }, -/turf/simulated/floor/holofloor{ - tag = "icon-siding1"; - icon_state = "siding1"; - dir = 2 +/turf/simulated/floor/plasteel, +/area/shuttle/escape) +"GY" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 1 }, -/area/holodeck/source_theatre) -"GP" = ( -/turf/unsimulated/floor{ - icon_state = "gcircuit" - }, -/area/admin) +/turf/simulated/floor/mineral/plastitanium/red/brig, +/area/shuttle/escape) "GZ" = ( -/obj/machinery/door/airlock/hatch/syndicate{ - autoclose = 0; - frequency = 1441; - id_tag = "syndicate_jail_airlock_internal"; - locked = 1; - name = "Syndicate Jail Internal Airlock" +/obj/machinery/computer/security/telescreen{ + desc = "Used for watching the Special Ops team."; + name = "Spec Ops Monitor"; + network = list("ERT"); + pixel_y = 30 }, -/obj/machinery/door/airlock/hatch/syndicate{ - autoclose = 0; - frequency = 1441; - id_tag = "syndicate_jail_airlock_internal"; - locked = 1; - name = "Syndicate Jail Internal Airlock" - }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, -/area/syndicate_mothership/jail) +/obj/machinery/computer/shuttle/ert, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/specops) +"Ha" = ( +/obj/structure/table, +/obj/machinery/kitchen_machine/microwave, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/syndicate) "Hb" = ( /obj/structure/window/reinforced{ dir = 1 }, -/turf/unsimulated/floor{ - icon_state = "engine" - }, +/turf/simulated/floor/engine, /area/admin) +"He" = ( +/turf/simulated/floor/mineral/titanium/blue, +/area/shuttle/transport) +"Hf" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 8 + }, +/obj/machinery/light{ + dir = 4; + icon_state = "tube1" + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "bot" + }, +/area/shuttle/escape) "Hg" = ( /obj/structure/rack, /obj/item/clothing/suit/space/space_ninja, -/turf/unsimulated/floor{ - icon_state = "engine" - }, +/turf/simulated/floor/engine, /area/admin) "Hh" = ( -/turf/unsimulated/floor{ - icon_state = "engine" - }, +/turf/simulated/floor/engine, /area/admin) "Hi" = ( /obj/structure/rack, /obj/item/clothing/head/helmet/space/space_ninja, -/turf/unsimulated/floor{ - icon_state = "engine" - }, +/turf/simulated/floor/engine, /area/admin) "Hj" = ( -/turf/unsimulated/wall, +/turf/simulated/wall/indestructible/riveted, /area/tdome) +"Hk" = ( +/obj/machinery/door_control{ + id = "adminshuttleblast"; + name = "blast door control"; + pixel_x = -30; + req_access_txt = "101" + }, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/administration) +"Ho" = ( +/obj/machinery/teleport/hub/upgraded, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/syndicate) "Hp" = ( /turf/simulated/floor/holofloor{ - tag = "icon-rampbottom"; + dir = 2; icon_state = "rampbottom"; - dir = 2 + tag = "icon-rampbottom" }, /area/holodeck/source_theatre) +"Hq" = ( +/obj/structure/table/reinforced, +/obj/machinery/recharger, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "vault" + }, +/area/shuttle/escape) "Hr" = ( -/turf/unsimulated/wall, +/turf/simulated/wall/indestructible/syndicate, /area/syndicate_mothership/jail) "Hu" = ( /obj/structure/rack, /obj/item/clothing/gloves/space_ninja, -/turf/unsimulated/floor{ - icon_state = "engine" - }, +/turf/simulated/floor/engine, /area/admin) "Hv" = ( /obj/structure/rack, /obj/item/katana/energy, /obj/item/clothing/mask/gas/space_ninja, -/turf/unsimulated/floor{ - icon_state = "engine" - }, +/turf/simulated/floor/engine, /area/admin) "Hw" = ( /obj/structure/rack, /obj/item/clothing/shoes/space_ninja, -/turf/unsimulated/floor{ - icon_state = "engine" - }, +/turf/simulated/floor/engine, /area/admin) -"Hy" = ( -/turf/unsimulated/floor{ - icon_state = "white" +"Hx" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 4 }, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/syndicate_elite) +"Hy" = ( +/turf/simulated/floor/plasteel/white, /area/tdome) "Hz" = ( /obj/machinery/gibber, -/turf/unsimulated/floor{ - icon_state = "white" - }, +/turf/simulated/floor/plasteel/white, /area/tdome) +"HG" = ( +/obj/structure/table, +/obj/item/weldingtool/largetank, +/obj/item/multitool, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/syndicate) +"HH" = ( +/obj/machinery/light{ + dir = 1; + on = 1 + }, +/obj/structure/chair/comfy/shuttle, +/turf/simulated/floor/mineral/plastitanium/red/brig, +/area/shuttle/escape) "HJ" = ( /obj/structure/table/holotable, /obj/item/clothing/suit/armor/riot/knight/red, @@ -11952,51 +9638,71 @@ icon_state = "red" }, /area/holodeck/source_knightarena) +"HM" = ( +/turf/simulated/wall/mineral/plastitanium, +/area/shuttle/syndicate) "HN" = ( /obj/machinery/light/spot{ - tag = "icon-tube1 (NORTH)"; + dir = 1; icon_state = "tube1"; - dir = 1 - }, -/turf/unsimulated/floor{ - icon_state = "dark" + tag = "icon-tube1 (NORTH)" }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership/jail) +"HP" = ( +/obj/machinery/door/airlock/security/glass{ + name = "Escape Shuttle Cell"; + req_access_txt = "2" + }, +/turf/simulated/floor/mineral/plastitanium/red/brig, +/area/shuttle/escape) "HR" = ( /obj/structure/closet/secure_closet/freezer/meat{ req_access_txt = "112" }, -/turf/unsimulated/floor{ - icon_state = "white" - }, +/turf/simulated/floor/plasteel/white, /area/tdome) "HS" = ( /obj/structure/closet/secure_closet/freezer/fridge{ req_access_txt = "112" }, -/turf/unsimulated/floor{ - icon_state = "white" - }, +/turf/simulated/floor/plasteel/white, /area/tdome) "HU" = ( /obj/effect/decal/remains/human, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership/jail) +"HW" = ( +/obj/structure/shuttle/engine/propulsion, +/turf/simulated/floor/plating/airless, +/area/shuttle/supply) "HY" = ( /obj/structure/table, /obj/machinery/kitchen_machine/microwave/upgraded, -/turf/unsimulated/floor{ - icon_state = "white" - }, +/turf/simulated/floor/plasteel/white, /area/tdome) "HZ" = ( /obj/structure/table/reinforced, -/turf/unsimulated/floor{ - icon_state = "white" - }, +/turf/simulated/floor/plasteel/white, /area/tdome) +"Ic" = ( +/obj/machinery/light{ + dir = 8; + icon_state = "tube1" + }, +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "bot" + }, +/area/shuttle/escape) +"Id" = ( +/obj/effect/spawner/lootdrop/trade_sol/med, +/obj/structure/closet, +/turf/simulated/floor/mineral/titanium, +/area/shuttle/trade/sol) "Ii" = ( /obj/structure/rack, /obj/item/clothing/under/color/red, @@ -12004,19 +9710,28 @@ /obj/item/clothing/suit/armor/tdome/red, /obj/item/clothing/head/helmet/thunderdome, /obj/item/melee/energy/sword/saber/red, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/tdome/arena) +"Ij" = ( +/obj/item/twohanded/required/kirbyplants, +/obj/machinery/light{ + dir = 4; + icon_state = "tube1" + }, +/turf/simulated/floor/plasteel, +/area/shuttle/escape) "Ik" = ( -/turf/unsimulated/floor{ - name = "plating" - }, +/turf/simulated/floor/plating, /area/tdome/tdome2) -"Io" = ( -/turf/unsimulated/floor{ - name = "plating" +"Il" = ( +/obj/machinery/computer/communications, +/obj/item/radio/intercom/specops{ + pixel_y = -28 }, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/specops) +"Io" = ( +/turf/simulated/floor/plating, /area/tdome/tdome1) "Ip" = ( /obj/structure/rack, @@ -12025,34 +9740,23 @@ /obj/item/clothing/suit/armor/tdome/green, /obj/item/clothing/head/helmet/thunderdome, /obj/item/melee/energy/sword/saber/green, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/tdome/arena) "Ir" = ( /obj/effect/landmark{ name = "tdome2" }, -/turf/unsimulated/floor{ - name = "plating" - }, +/turf/simulated/floor/plating, /area/tdome/tdome2) "Is" = ( /obj/effect/landmark{ name = "tdome1" }, -/turf/unsimulated/floor{ - name = "plating" - }, +/turf/simulated/floor/plating, /area/tdome/tdome1) -"Iw" = ( -/turf/simulated/floor/bluegrid, -/area/tdome/arena) "Iz" = ( /obj/structure/chair/stool, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership/jail) "IA" = ( /obj/structure/table/wood, @@ -12074,20 +9778,49 @@ req_access_txt = "150"; specialfunctions = 4 }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership/jail) "IE" = ( /obj/structure/holowindow{ dir = 1 }, /turf/simulated/floor/holofloor{ - tag = "icon-asteroid7"; + dir = 2; icon_state = "asteroid7"; - dir = 2 + tag = "icon-asteroid7" }, /area/holodeck/source_knightarena) +"IF" = ( +/obj/machinery/vending/boozeomat, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/administration) +"IH" = ( +/obj/structure/table/reinforced, +/obj/item/storage/firstaid/o2{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/item/storage/firstaid/regular, +/obj/item/storage/firstaid/regular{ + pixel_x = 3; + pixel_y = 3 + }, +/turf/simulated/floor/plasteel{ + dir = 5; + icon_state = "whiteblue"; + tag = "icon-whiteblue (NORTHEAST)" + }, +/area/shuttle/escape) +"II" = ( +/obj/machinery/door/airlock/centcom{ + name = "Living Quarters"; + opacity = 1; + req_access_txt = "102" + }, +/turf/simulated/floor/plasteel{ + icon_state = "bar" + }, +/area/centcom/control) "IK" = ( /obj/structure/table/holotable, /obj/item/clothing/head/helmet/thunderdome, @@ -12099,30 +9832,176 @@ icon_state = "green" }, /area/holodeck/source_thunderdomecourt) -"IS" = ( -/turf/unsimulated/floor{ - icon_state = "floor" +"IO" = ( +/obj/structure/table, +/obj/item/grenade/syndieminibomb{ + pixel_x = 4; + pixel_y = 2; + pixel_z = 0 }, +/obj/item/grenade/syndieminibomb{ + pixel_x = -1 + }, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/syndicate) +"IP" = ( +/obj/structure/mirror{ + pixel_x = 28 + }, +/obj/structure/sink{ + dir = 4; + icon_state = "sink"; + pixel_x = 11; + pixel_y = 0 + }, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/syndicate) +"IR" = ( +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "browncorner"; + tag = "icon-browncorner (EAST)" + }, +/area/shuttle/escape) +"IS" = ( +/turf/simulated/floor/plasteel, /area/tdome/tdomeadmin) "IU" = ( /turf/simulated/floor/holofloor{ - tag = "icon-carpet10-8 (EAST)"; + dir = 4; icon_state = "carpet10-8"; - dir = 4 + tag = "icon-carpet10-8 (EAST)" }, /area/holodeck/source_theatre) +"IV" = ( +/obj/machinery/vending/cigarette, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/administration) +"IW" = ( +/obj/structure/table/glass, +/obj/item/storage/backpack/duffel/syndie/surgery_fake, +/obj/item/circular_saw, +/obj/item/surgicaldrill, +/obj/item/clothing/gloves/color/latex/nitrile, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/syndicate) +"IX" = ( +/obj/machinery/door/airlock/hatch{ + req_access_txt = "152" + }, +/turf/simulated/floor/plating/nitrogen, +/area/shuttle/vox) +"IZ" = ( +/obj/structure/table, +/obj/item/storage/lockbox/mindshield, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/administration) +"Jb" = ( +/obj/item/radio/intercom{ + dir = 4; + name = "Station Intercom (General)"; + pixel_x = 29; + pixel_y = -60 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/shuttle/escape) +"Jg" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 8 + }, +/turf/simulated/floor/mineral/titanium/blue, +/area/shuttle/trade/sol) +"Ji" = ( +/obj/structure/plasticflaps/mining, +/obj/machinery/conveyor/west{ + id = "QMLoad" + }, +/turf/simulated/floor/plating, +/area/shuttle/supply) +"Jn" = ( +/obj/machinery/light/spot{ + dir = 8; + icon_state = "tube1"; + tag = "icon-tube1 (WEST)" + }, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/administration) +"Jo" = ( +/obj/item/twohanded/required/kirbyplants, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "redcorner" + }, +/area/shuttle/escape) +"Jr" = ( +/obj/machinery/atmospherics/pipe/manifold4w/hidden, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/syndicate) +"Jv" = ( +/obj/structure/rack, +/obj/item/clothing/accessory/storage/black_vest, +/obj/item/clothing/suit/space/vox/pressure, +/obj/item/clothing/head/helmet/space/vox/pressure, +/obj/item/clothing/mask/breath, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/vox) +"Jw" = ( +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "bot" + }, +/area/shuttle/escape) +"Jx" = ( +/turf/simulated/floor/plasteel{ + dir = 2; + icon_state = "cmo" + }, +/area/shuttle/escape) +"Jz" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/vox) "JC" = ( /obj/structure/chair/stool, /obj/item/clothing/head/bandana{ pixel_y = -10 }, /obj/item/clothing/glasses/sunglasses, -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, /area/ninja/holding) "JD" = ( /obj/structure/chair/stool, -/turf/unsimulated/beach/sand, +/turf/simulated/floor/beach/away/sand, /area/ninja/holding) +"JE" = ( +/obj/machinery/sleeper/upgraded{ + dir = 4 + }, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/vox) +"JH" = ( +/obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/sit, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/syndicate_sit) +"JM" = ( +/obj/machinery/door/airlock/centcom{ + id_tag = "adminshuttle"; + name = "Bridge"; + opacity = 1; + req_access_txt = "101" + }, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/administration) +"JO" = ( +/obj/machinery/computer/security{ + network = list("SS13","Research Outpost","Mining Outpost") + }, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/specops) "JU" = ( /obj/structure/holowindow{ dir = 1 @@ -12132,86 +10011,284 @@ icon_state = "blue" }, /area/holodeck/source_knightarena) +"JV" = ( +/obj/machinery/computer/camera_advanced/shuttle_docker/ert, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/specops) +"Kb" = ( +/obj/machinery/light/spot, +/turf/simulated/floor/mineral/titanium/blue, +/area/shuttle/trade/sol) +"Kc" = ( +/obj/machinery/bodyscanner, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/syndicate) +"Kd" = ( +/turf/simulated/floor/plasteel{ + icon_state = "neutral" + }, +/area/shuttle/escape) +"Kp" = ( +/turf/simulated/floor/mineral/titanium/blue, +/area/shuttle/trade/sol) "Kq" = ( /obj/structure/chair/comfy/red, /obj/effect/landmark{ name = "voxstart" }, -/turf/unsimulated/floor/vox, +/turf/simulated/floor/plasteel/dark/nitrogen, /area/vox_station) +"Kr" = ( +/obj/structure/table, +/obj/item/aicard, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/syndicate) +"Ku" = ( +/obj/structure/table/reinforced, +/obj/machinery/chem_dispenser/beer, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/administration) "Kv" = ( /obj/structure/chair/stool, /obj/effect/landmark{ name = "voxstart" }, -/turf/unsimulated/floor/vox, +/turf/simulated/floor/plasteel/dark/nitrogen, /area/vox_station) +"Kw" = ( +/obj/structure/table, +/obj/machinery/recharger{ + pixel_y = 0 + }, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/syndicate) +"Kx" = ( +/obj/structure/chair/comfy/shuttle, +/turf/simulated/floor/mineral/plastitanium/red/brig, +/area/shuttle/escape) +"Ky" = ( +/obj/machinery/door/poddoor/shutters{ + density = 0; + dir = 4; + icon_state = "open"; + id_tag = "adminshuttleshutters"; + name = "Blast Shutters"; + opacity = 0 + }, +/obj/effect/spawner/window/plastitanium, +/turf/simulated/floor/plating, +/area/shuttle/administration) "KA" = ( /obj/structure/chair/sofa/left, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/escape) "KB" = ( /obj/structure/table/wood, /obj/machinery/kitchen_machine/microwave, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership/jail) +"KC" = ( +/obj/machinery/access_button{ + command = "cycle_interior"; + frequency = 1331; + master_tag = "vox_east_control"; + req_one_access_txt = "152" + }, +/turf/simulated/wall/mineral/plastitanium, +/area/shuttle/vox) +"KD" = ( +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/vox) +"KF" = ( +/obj/item/radio/intercom{ + dir = 8; + name = "station intercom (General)"; + pixel_x = -28 + }, +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/turf/simulated/floor/mineral/plastitanium/red/brig, +/area/shuttle/escape) +"KJ" = ( +/obj/effect/spawner/lootdrop/trade_sol/minerals, +/obj/structure/closet, +/turf/simulated/floor/mineral/titanium, +/area/shuttle/trade/sol) "KK" = ( /obj/machinery/tcomms/relay/cc, -/turf/unsimulated/floor{ - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/centcom/control) +"KL" = ( +/obj/structure/window/plasmareinforced{ + color = "#FF0000"; + dir = 8 + }, +/obj/structure/chair/comfy/shuttle{ + dir = 1 + }, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/administration) +"KM" = ( +/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/syndicate_elite) +"KN" = ( +/obj/machinery/recharger/wallcharger{ + pixel_x = 4; + pixel_y = 32 + }, +/obj/machinery/light/spot{ + dir = 1; + icon_state = "tube1"; + tag = "icon-tube1 (NORTH)" + }, +/obj/structure/chair/comfy/shuttle, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/specops) +"KO" = ( +/obj/item/storage/box/zipties, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/vox) +"KQ" = ( +/obj/structure/chair/comfy/shuttle, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/syndicate_elite) "KR" = ( /obj/machinery/light/small, /obj/structure/chair/comfy/shuttle{ dir = 1 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/assault_pod) +"KS" = ( +/obj/item/storage/toolbox/mechanical, +/obj/item/multitool, +/obj/structure/table, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/administration) +"KT" = ( +/obj/item/storage/toolbox/syndicate, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/vox) "KW" = ( /obj/machinery/light/small{ dir = 1 }, /obj/structure/chair/comfy/shuttle, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/assault_pod) "KX" = ( /obj/structure/chair/comfy/shuttle{ dir = 4 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/assault_pod) "KY" = ( /obj/structure/chair/comfy/shuttle{ dir = 8 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/assault_pod) +"KZ" = ( +/obj/structure/shuttle/engine/propulsion/burst{ + dir = 8 + }, +/turf/simulated/wall/mineral/titanium, +/area/shuttle/transport) +"Lb" = ( +/obj/item/radio/intercom/syndicate{ + pixel_y = -28 + }, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/syndicate) +"Lc" = ( +/obj/structure/computerframe, +/obj/item/paper/synditele, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/syndicate) +"Ld" = ( +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/administration) "Lf" = ( /turf/simulated/floor/holofloor{ - tag = "icon-asteroid8 (EAST)"; + dir = 4; + icon = 'icons/turf/floors/plating.dmi'; icon_state = "asteroid8"; - dir = 4 + tag = "icon-asteroid8 (EAST)" }, /area/holodeck/source_desert) +"Li" = ( +/obj/machinery/light/spot{ + dir = 4; + icon_state = "tube1"; + tag = "icon-tube1 (EAST)" + }, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/administration) +"Lj" = ( +/obj/machinery/light/spot{ + dir = 8; + icon_state = "tube1"; + tag = "icon-tube1 (WEST)" + }, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/syndicate) "Ll" = ( /turf/simulated/floor/holofloor{ dir = 8; icon_state = "green" }, /area/holodeck/source_emptycourt) +"Lm" = ( +/obj/machinery/door/poddoor/shutters{ + density = 0; + dir = 4; + icon_state = "open"; + id_tag = "voxshutters"; + name = "Blast Shutters"; + opacity = 0 + }, +/obj/effect/spawner/window/plastitanium, +/turf/simulated/floor/plating/nitrogen, +/area/shuttle/vox) +"Ln" = ( +/obj/machinery/door/airlock/titanium/glass{ + name = "trader shuttle airlock"; + req_access_txt = "160"; + security_level = 6 + }, +/turf/simulated/floor/mineral/titanium/blue, +/area/shuttle/trade/sol) +"Lp" = ( +/obj/structure/table/reinforced, +/obj/item/reagent_containers/iv_bag/blood/random, +/obj/item/reagent_containers/iv_bag/blood/random, +/obj/item/reagent_containers/iv_bag/blood/random, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "whiteblue"; + tag = "icon-whiteblue (EAST)" + }, +/area/shuttle/escape) +"Lt" = ( +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/specops) +"Lx" = ( +/obj/structure/shuttle/engine/propulsion{ + dir = 1; + icon_state = "propulsion_r"; + tag = "icon-propulsion_r (NORTH)" + }, +/turf/simulated/floor/plating/airless, +/area/shuttle/syndicate_elite) "Lz" = ( /obj/structure/holowindow{ dir = 1 @@ -12221,13 +10298,43 @@ icon_state = "green" }, /area/holodeck/source_thunderdomecourt) +"LB" = ( +/obj/structure/table, +/obj/item/storage/box/handcuffs, +/obj/machinery/light/spot{ + dir = 8; + icon_state = "tube1"; + tag = "icon-tube1 (WEST)" + }, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/administration) +"LD" = ( +/obj/structure/table, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/administration) +"LF" = ( +/obj/machinery/door/window/brigdoor/westleft{ + color = "#d70000"; + req_access_txt = "104" + }, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/administration) "LG" = ( /turf/simulated/floor/holofloor{ - tag = "icon-carpet1-0 (EAST)"; + dir = 4; icon_state = "carpet1-0"; - dir = 4 + tag = "icon-carpet1-0 (EAST)" }, /area/holodeck/source_theatre) +"LH" = ( +/obj/structure/table/reinforced, +/obj/item/storage/backpack/medic, +/obj/item/storage/belt/medical, +/turf/simulated/floor/plasteel{ + dir = 2; + icon_state = "cmo" + }, +/area/shuttle/escape) "LL" = ( /obj/structure/holowindow, /turf/simulated/floor/holofloor{ @@ -12235,94 +10342,416 @@ icon_state = "red" }, /area/holodeck/source_knightarena) +"LO" = ( +/obj/machinery/autolathe/upgraded{ + hacked = 1 + }, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/administration) +"LR" = ( +/obj/machinery/computer/emergency_shuttle, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "darkblue" + }, +/area/shuttle/escape) "LZ" = ( /obj/mecha/combat/marauder/seraph/loaded, /obj/effect/decal/warning_stripes/yellow, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/centcom/specops) +"Mc" = ( +/obj/structure/closet/crate/medical, +/obj/item/storage/firstaid/regular, +/obj/item/storage/firstaid/o2{ + pixel_x = 2; + pixel_y = -2 + }, +/obj/item/storage/firstaid/toxin{ + pixel_x = -2; + pixel_y = 4 + }, +/obj/machinery/light/small, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "bot" + }, +/area/shuttle/escape) +"Mf" = ( +/obj/structure/rack, +/obj/item/clothing/accessory/storage/black_vest, +/obj/item/clothing/suit/space/vox/medic, +/obj/item/clothing/head/helmet/space/vox/medic, +/obj/item/clothing/mask/breath, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/vox) +"Mi" = ( +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/syndicate_sit) "Mo" = ( /obj/structure/table, /obj/item/circular_saw, /obj/item/surgicaldrill{ pixel_y = 5 }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership/jail) +"Mq" = ( +/obj/machinery/door/airlock/external{ + id_tag = "s_docking_airlock"; + name = "Shuttle Airlock"; + req_access_txt = "150" + }, +/obj/machinery/door_control{ + id = "syndicate_elite"; + name = "Blast Doors"; + pixel_x = -25; + pixel_y = 0; + req_access_txt = "150" + }, +/obj/machinery/door/poddoor{ + density = 0; + icon_state = "open"; + id_tag = "syndicate_elite"; + name = "Front Hull Door"; + opacity = 0; + req_access_txt = "150" + }, +/obj/structure/fans/tiny, +/turf/simulated/floor/plating, +/area/shuttle/syndicate_elite) +"Mt" = ( +/obj/machinery/door/airlock/external{ + id_tag = "s_docking_airlock"; + name = "Shuttle Hatch"; + req_access_txt = "109" + }, +/obj/structure/fans/tiny, +/turf/simulated/floor/plating, +/area/shuttle/specops) +"Mu" = ( +/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/area/shuttle/syndicate) +"Mw" = ( +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/table, +/obj/item/scalpel, +/obj/item/stack/cable_coil, +/obj/item/storage/firstaid/regular, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/vox) +"My" = ( +/obj/item/twohanded/required/kirbyplants, +/obj/structure/extinguisher_cabinet{ + pixel_x = 28 + }, +/turf/simulated/floor/plasteel{ + icon_state = "neutralcorner" + }, +/area/shuttle/escape) +"Mz" = ( +/obj/structure/table, +/obj/item/stack/sheet/metal, +/obj/item/clothing/glasses/welding, +/obj/item/weldingtool, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/syndicate_sit) +"MB" = ( +/obj/machinery/light/spot{ + dir = 1; + icon_state = "tube1"; + tag = "icon-tube1 (NORTH)" + }, +/turf/simulated/floor/mineral/titanium/blue, +/area/shuttle/trade/sol) +"ME" = ( +/obj/structure/chair/stool/bar, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/administration) +"MF" = ( +/obj/machinery/door/airlock/centcom{ + id_tag = "adminshuttle"; + name = "Holding Cell"; + opacity = 1; + req_access_txt = "104" + }, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/administration) "MG" = ( /obj/effect/landmark{ name = "syndieprisonwarp" }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership/jail) +"MH" = ( +/obj/structure/shuttle/engine/propulsion, +/turf/simulated/floor/plating/airless, +/area/shuttle/syndicate) +"MI" = ( +/obj/item/twohanded/required/kirbyplants, +/obj/machinery/light{ + dir = 8; + icon_state = "tube1" + }, +/turf/simulated/floor/plasteel, +/area/shuttle/escape) +"MN" = ( +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/table, +/obj/item/circular_saw, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/vox) +"MP" = ( +/obj/machinery/door/airlock/titanium/glass{ + name = "Shuttle Cargo Hatch" + }, +/turf/simulated/floor/plasteel, +/area/shuttle/escape) "MR" = ( /turf/simulated/floor/holofloor{ - tag = "icon-asteroid1 (EAST)"; + dir = 4; + icon = 'icons/turf/floors/plating.dmi'; icon_state = "asteroid1"; - dir = 4 + tag = "icon-asteroid1 (EAST)" }, /area/holodeck/source_desert) -"Nv" = ( -/obj/machinery/light/spot{ - tag = "icon-tube1 (EAST)"; - icon_state = "tube1"; +"MT" = ( +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "blue" + }, +/area/shuttle/escape) +"MV" = ( +/obj/structure/chair/comfy/shuttle{ dir = 4 }, -/turf/unsimulated/floor{ - icon_state = "dark" +/turf/simulated/floor/mineral/plastitanium/red/brig, +/area/shuttle/escape) +"MY" = ( +/obj/item/tank/internals/emergency_oxygen, +/obj/item/clothing/mask/breath, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/vox) +"MZ" = ( +/obj/machinery/light/spot, +/obj/structure/chair/comfy/shuttle{ + dir = 1 }, +/turf/simulated/floor/mineral/titanium, +/area/shuttle/transport) +"Nb" = ( +/obj/machinery/light/spot{ + dir = 8; + icon_state = "tube1"; + tag = "icon-tube1 (WEST)" + }, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/syndicate_sit) +"Nd" = ( +/turf/simulated/wall/indestructible/rock/snow, +/area/syndicate_mothership) +"Ng" = ( +/obj/structure/window/plasmareinforced{ + color = "#FF0000"; + dir = 8 + }, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/administration) +"Nl" = ( +/obj/machinery/clonepod/upgraded, +/obj/machinery/light/spot{ + dir = 1; + icon_state = "tube1"; + tag = "icon-tube1 (NORTH)" + }, +/turf/simulated/floor/mineral/titanium, +/area/shuttle/administration) +"Nn" = ( +/obj/machinery/computer/crew, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "darkblue" + }, +/area/shuttle/escape) +"No" = ( +/obj/structure/rack, +/obj/item/rcd, +/obj/item/rcd_ammo, +/obj/item/rcd_ammo, +/obj/item/rcd_ammo, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/vox) +"Nr" = ( +/obj/structure/reagent_dispensers/watertank, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/administration) +"Nv" = ( +/obj/machinery/light/spot{ + dir = 4; + icon_state = "tube1"; + tag = "icon-tube1 (EAST)" + }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership/jail) +"Nx" = ( +/obj/structure/flora/ausbushes/grassybush, +/obj/structure/flora/ausbushes/lavendergrass, +/obj/structure/flora/ausbushes/ywflowers, +/obj/structure/flora/ausbushes/fernybush, +/obj/structure/window/full/shuttle, +/turf/simulated/floor/grass, +/area/shuttle/escape) +"Ny" = ( +/obj/machinery/optable, +/turf/simulated/floor/mineral/titanium, +/area/shuttle/administration) "Nz" = ( /obj/effect/decal/warning_stripes/northwest, -/turf/unsimulated/floor{ - name = "plating" - }, +/turf/simulated/floor/plating/airless, /area/centcom/control) +"NA" = ( +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralcorner" + }, +/area/shuttle/escape) +"NB" = ( +/obj/machinery/light{ + dir = 4; + icon_state = "tube1" + }, +/turf/simulated/floor/plating/nitrogen, +/area/shuttle/vox) +"NC" = ( +/obj/item/ashtray/glass, +/obj/structure/table, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/administration) +"ND" = ( +/obj/structure/table/reinforced, +/obj/machinery/recharger, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "redcorner" + }, +/area/shuttle/escape) +"NE" = ( +/obj/structure/rack, +/obj/item/clothing/accessory/storage/black_vest, +/obj/item/clothing/suit/space/vox/carapace, +/obj/item/clothing/head/helmet/space/vox/carapace, +/obj/item/clothing/mask/breath, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/vox) "NF" = ( /obj/machinery/bsa/full/admin/east, /obj/effect/decal/warning_stripes/north, -/turf/unsimulated/floor{ - name = "plating" - }, +/turf/simulated/floor/plating/airless, /area/centcom/control) "NG" = ( /obj/effect/decal/cleanable/blood, /obj/effect/landmark{ name = "syndieprisonwarp" }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership/jail) "NI" = ( /obj/effect/decal/warning_stripes/north, -/turf/unsimulated/floor{ - name = "plating" - }, +/turf/simulated/floor/plating/airless, /area/centcom/control) "NJ" = ( /obj/effect/decal/warning_stripes/northeast, -/turf/unsimulated/floor{ - name = "plating" - }, +/turf/simulated/floor/plating/airless, /area/centcom/control) +"NL" = ( +/obj/machinery/porta_turret/syndicate{ + dir = 9 + }, +/turf/simulated/wall/mineral/plastitanium, +/area/shuttle/syndicate) +"NM" = ( +/obj/structure/table, +/obj/item/storage/box/syndidonkpockets, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/syndicate) +"NN" = ( +/obj/machinery/door/poddoor/shutters{ + density = 0; + dir = 8; + icon_state = "open"; + id_tag = "voxshutters"; + name = "Blast Shutters"; + opacity = 0 + }, +/obj/effect/spawner/window/plastitanium, +/turf/simulated/floor/plating/nitrogen, +/area/shuttle/vox) +"NP" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/shuttle/engine/heater{ + dir = 8; + icon_state = "heater" + }, +/turf/simulated/floor/plating/airless, +/area/shuttle/specops) "NW" = ( -/turf/unsimulated/wall/fakeglass{ - icon_state = "fakewindows"; +/turf/simulated/wall/indestructible/opsglass, +/area/syndicate_mothership/jail) +"NY" = ( +/obj/machinery/light/spot{ + dir = 1; + icon_state = "tube1"; + tag = "icon-tube1 (NORTH)" + }, +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/turf/simulated/floor/mineral/titanium, +/area/shuttle/transport) +"NZ" = ( +/obj/structure/chair/comfy/shuttle{ dir = 1 }, -/area/syndicate_mothership/jail) +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/syndicate) +"Oe" = ( +/turf/simulated/floor/plasteel, +/area/shuttle/escape) +"Of" = ( +/obj/machinery/door/airlock/titanium/glass{ + name = "Emergency Airlock Access"; + req_one_access_txt = "2;19" + }, +/turf/simulated/floor/plasteel, +/area/shuttle/escape) "Oh" = ( /obj/effect/decal/warning_stripes/southwest, -/turf/unsimulated/floor{ - name = "plating" - }, +/turf/simulated/floor/plating/airless, /area/centcom/control) +"Oj" = ( +/obj/machinery/computer/camera_advanced/shuttle_docker/syndicate, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/syndicate) +"Ok" = ( +/obj/structure/closet/crate, +/obj/item/storage/toolbox/emergency, +/obj/item/storage/toolbox/emergency, +/obj/item/flashlight/flare, +/obj/item/flashlight/flare, +/obj/item/crowbar, +/obj/item/wrench, +/obj/item/radio, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "bot" + }, +/area/shuttle/escape) "Ol" = ( /obj/structure/holohoop, /turf/simulated/floor/holofloor{ @@ -12338,21 +10767,15 @@ locked = 1; name = "Syndicate Jail Internal Airlock" }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership/jail) "Oq" = ( /obj/effect/decal/warning_stripes/south, -/turf/unsimulated/floor{ - name = "plating" - }, +/turf/simulated/floor/plating/airless, /area/centcom/control) "Or" = ( /obj/effect/decal/warning_stripes/southeast, -/turf/unsimulated/floor{ - name = "plating" - }, +/turf/simulated/floor/plating/airless, /area/centcom/control) "Ot" = ( /obj/machinery/door/airlock/hatch/syndicate{ @@ -12362,17 +10785,72 @@ locked = 1; name = "Syndicate Jail External Airlock" }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) "Ov" = ( /obj/structure/kitchenspike, /obj/effect/decal/cleanable/blood, -/turf/unsimulated/floor{ +/turf/simulated/floor/plasteel/dark, +/area/syndicate_mothership/jail) +"Ow" = ( +/obj/machinery/iv_drip, +/turf/simulated/floor/mineral/titanium, +/area/shuttle/administration) +"Oy" = ( +/obj/machinery/door/airlock/medical/glass{ + id_tag = null; + name = "Escape Shuttle Infirmary"; + req_access_txt = "0" + }, +/obj/effect/decal/warning_stripes/south, +/turf/simulated/floor/plasteel, +/area/shuttle/escape) +"Oz" = ( +/obj/machinery/light{ + dir = 8; + icon_state = "tube1" + }, +/turf/simulated/floor/plasteel, +/area/shuttle/escape) +"OA" = ( +/obj/structure/table, +/obj/item/storage/firstaid, +/obj/effect/decal/warning_stripes/yellow/hollow, +/turf/simulated/floor/plasteel, +/area/shuttle/escape) +"OB" = ( +/obj/machinery/access_button{ + command = "cycle_exterior"; + frequency = 1331; + master_tag = "vox_west_control"; + req_one_access_txt = "152" + }, +/turf/simulated/wall/mineral/plastitanium, +/area/shuttle/vox) +"OE" = ( +/obj/structure/closet/syndicate/personal, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/syndicate) +"OF" = ( +/obj/structure/shuttle/engine/propulsion{ + dir = 8; + icon_state = "burst_r" + }, +/turf/simulated/floor/plating/airless, +/area/shuttle/trade/sol) +"OG" = ( +/obj/item/broken_bottle, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/vox) +"OJ" = ( +/obj/machinery/light, +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/syndicate_mothership/jail) +/area/shuttle/escape) "OP" = ( /obj/effect/decal/warning_stripes/yellow/partial{ dir = 8 @@ -12380,63 +10858,264 @@ /obj/effect/decal/warning_stripes/arrow{ dir = 8 }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/centcom/specops) +"OQ" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 8 + }, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/syndicate_elite) "OT" = ( /turf/simulated/floor/holofloor{ - tag = "icon-asteroid2 (EAST)"; + dir = 4; + icon = 'icons/turf/floors/plating.dmi'; icon_state = "asteroid2"; - dir = 4 + tag = "icon-asteroid2 (EAST)" }, /area/holodeck/source_desert) +"OZ" = ( +/obj/machinery/light/spot, +/turf/simulated/floor/mineral/titanium/blue, +/area/shuttle/supply) +"Pg" = ( +/obj/structure/extinguisher_cabinet{ + pixel_x = -28 + }, +/obj/machinery/recharge_station, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "bot" + }, +/area/shuttle/escape) +"Ph" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 8 + }, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/syndicate_sit) +"Pj" = ( +/obj/machinery/kitchen_machine/microwave/upgraded, +/obj/structure/table, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/administration) +"Pl" = ( +/obj/machinery/light/spot{ + dir = 8; + icon_state = "tube1"; + tag = "icon-tube1 (WEST)" + }, +/obj/machinery/suit_storage_unit/syndicate/secure, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/syndicate) "Pn" = ( /obj/mecha/combat/marauder/loaded, /obj/effect/decal/warning_stripes/yellow, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/centcom/specops) +"Po" = ( +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/table, +/obj/item/broken_device, +/obj/item/robot_parts/chest, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/vox) +"Pq" = ( +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "redcorner" + }, +/area/shuttle/escape) "Pr" = ( /obj/structure/chair/office/dark, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership/jail) +"Px" = ( +/obj/machinery/door/airlock/public/glass, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/administration) +"PD" = ( +/obj/structure/shuttle/engine/propulsion{ + dir = 8; + icon_state = "propulsion" + }, +/turf/simulated/floor/plating/airless, +/area/shuttle/trade/sol) +"PE" = ( +/obj/structure/table, +/obj/item/stack/sheet/glass{ + amount = 10 + }, +/obj/item/multitool, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/syndicate) +"PF" = ( +/obj/structure/rack, +/obj/item/pneumatic_cannon, +/obj/item/harpoon, +/obj/item/harpoon, +/obj/item/harpoon, +/obj/item/harpoon, +/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, +/area/shuttle/vox) +"PG" = ( +/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ + frequency = 1331; + id_tag = "vox_west_control"; + pixel_x = 24; + req_access_txt = "152"; + tag_airpump = "vox_west_vent"; + tag_chamber_sensor = "vox_west_sensor"; + tag_exterior_door = "vox_northwest_lock"; + tag_interior_door = "vox_southwest_lock" + }, +/turf/simulated/floor/plating/nitrogen, +/area/shuttle/vox) "PJ" = ( /obj/effect/decal/warning_stripes/west, -/turf/unsimulated/floor{ - name = "plating" - }, +/turf/simulated/floor/plating, /area/centcom/specops) -"Qc" = ( -/turf/unsimulated/wall/fakeglass{ - tag = "icon-fakewindows (SOUTHEAST)"; - icon_state = "fakewindows"; - dir = 6 +"PM" = ( +/obj/machinery/status_display, +/turf/simulated/wall/mineral/titanium, +/area/shuttle/escape) +"PN" = ( +/obj/machinery/door/airlock/external{ + id_tag = "s_docking_airlock"; + name = "Shuttle Hatch"; + req_access_txt = "101" }, -/area/syndicate_mothership/jail) +/obj/structure/fans/tiny, +/turf/simulated/floor/plating, +/area/shuttle/administration) +"PO" = ( +/obj/structure/table, +/obj/item/stock_parts/cell/high{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/stock_parts/cell/high, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/syndicate) +"PS" = ( +/obj/effect/spawner/lootdrop/trade_sol/eng, +/obj/structure/closet, +/turf/simulated/floor/mineral/titanium, +/area/shuttle/trade/sol) +"PT" = ( +/obj/structure/closet/crate/engineering, +/obj/item/storage/toolbox/electrical{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/item/storage/toolbox/emergency, +/obj/item/storage/toolbox/mechanical{ + pixel_x = 4; + pixel_y = -4 + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "bot" + }, +/area/shuttle/escape) +"PU" = ( +/obj/machinery/computer/shuttle/sit, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/syndicate_sit) +"PX" = ( +/obj/item/radio/intercom{ + dir = 4; + name = "Station Intercom (General)"; + pixel_x = 29; + pixel_y = -30 + }, +/obj/structure/bed/roller, +/turf/simulated/floor/plasteel{ + dir = 2; + icon_state = "cmo" + }, +/area/shuttle/escape) +"Qa" = ( +/obj/machinery/mech_bay_recharge_port, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "bot" + }, +/area/shuttle/escape) +"Qe" = ( +/obj/structure/shuttle/engine/propulsion{ + dir = 1; + icon_state = "propulsion_l"; + tag = "icon-propulsion_l (NORTH)" + }, +/turf/simulated/floor/plating/airless, +/area/shuttle/syndicate_elite) +"Qf" = ( +/obj/machinery/portable_atmospherics/canister/oxygen, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/syndicate_elite) +"Qh" = ( +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/table, +/mob/living/simple_animal/bot/floorbot{ + on = 0 + }, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/vox) +"Qm" = ( +/obj/machinery/door/window{ + dir = 8; + name = "Tool Storage"; + req_access_txt = "150" + }, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/syndicate) "Qr" = ( -/obj/effect/landmark/ai_multicam_room, -/turf/unsimulated/ai_visible, -/area/ai_multicam_room) +/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/area/shuttle/administration) "Qt" = ( /obj/machinery/poolcontroller/invisible, -/turf/unsimulated/beach/water, +/turf/simulated/floor/beach/away/water, /area/ninja/holding) "Qu" = ( /obj/effect/decal/cleanable/blood, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership/jail) "Qv" = ( /obj/machinery/door/window/westleft, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership/jail) +"Qw" = ( +/obj/structure/table, +/obj/item/reagent_containers/syringe/charcoal, +/obj/item/reagent_containers/syringe/charcoal{ + pixel_y = 2 + }, +/obj/item/reagent_containers/syringe/charcoal{ + pixel_y = 4 + }, +/obj/item/gun/syringe/syndicate, +/obj/item/storage/firstaid/regular, +/obj/item/storage/firstaid/adv, +/obj/item/storage/box/syndie_kit/bonerepair, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/syndicate) +"Qy" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/syndicate_sit) "QB" = ( /obj/structure/table/holotable, /obj/item/clothing/gloves/boxing/hologlove, @@ -12445,18 +11124,52 @@ icon_state = "red" }, /area/holodeck/source_boxingcourt) +"QD" = ( +/obj/machinery/door/airlock/medical/glass{ + id_tag = null; + name = "Escape Shuttle Infirmary"; + req_access_txt = "0" + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralfull" + }, +/area/shuttle/escape) "QE" = ( /obj/structure/chair/sofa/right, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/escape) +"QG" = ( +/obj/structure/table/reinforced, +/obj/machinery/cell_charger, +/obj/item/stock_parts/cell/high, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "vault" + }, +/area/shuttle/escape) +"QH" = ( +/obj/structure/reagent_dispensers/fueltank/chem{ + pixel_x = -32; + pixel_y = 0 + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "bot" }, /area/shuttle/escape) "QI" = ( /obj/structure/chair/sofa, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/escape) +"QK" = ( +/obj/machinery/light/spot{ + dir = 8; + icon_state = "tube1"; + tag = "icon-tube1 (WEST)" + }, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/specops) "QL" = ( /obj/structure/table, /obj/item/kitchen/knife/butcher, @@ -12464,74 +11177,331 @@ /obj/item/clothing/mask/muzzle{ pixel_y = 8 }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership/jail) "QQ" = ( /turf/simulated/floor/holofloor{ - tag = "icon-asteroid6"; + dir = 2; + icon = 'icons/turf/floors/plating.dmi'; icon_state = "asteroid6"; - dir = 2 + tag = "icon-asteroid6" }, /area/holodeck/source_desert) +"QR" = ( +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 2; + frequency = 1331; + id_tag = "synd_pump" + }, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/syndicate) "QT" = ( /obj/structure/flora/ausbushes/ywflowers, /turf/simulated/floor/holofloor/grass, /area/holodeck/source_picnicarea) +"QU" = ( +/obj/machinery/door/poddoor/shutters{ + density = 0; + dir = 2; + icon_state = "open"; + id_tag = "syndieshutters"; + name = "Blast Shutters"; + opacity = 0 + }, +/obj/effect/spawner/window/plastitanium, +/turf/simulated/floor/plating, +/area/shuttle/syndicate) "QV" = ( /obj/item/clothing/under/rainbow, /obj/item/clothing/glasses/sunglasses_fake, /turf/simulated/floor/beach/sand, /area/holodeck/source_beach) +"Rb" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "bot" + }, +/area/shuttle/escape) +"Rc" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 1 + }, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/administration) +"Re" = ( +/obj/machinery/light/spot{ + dir = 8; + icon_state = "tube1"; + tag = "icon-tube1 (WEST)" + }, +/obj/machinery/sleeper/syndie{ + dir = 4 + }, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/syndicate) "Rf" = ( /obj/structure/chair{ dir = 1 }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/centcom/specops) -"Ri" = ( -/turf/unsimulated/wall/fakeglass{ - tag = "icon-fakewindows (NORTHEAST)"; - icon_state = "fakewindows"; - dir = 5 +"Rg" = ( +/obj/structure/window/reinforced, +/obj/structure/shuttle/engine/heater{ + dir = 1; + icon_state = "heater"; + tag = "icon-heater (NORTH)" }, -/area/syndicate_mothership/jail) +/turf/simulated/floor/plating/airless, +/area/shuttle/syndicate_sit) "Rj" = ( /obj/structure/flora/ausbushes/sparsegrass, /turf/simulated/floor/holofloor/grass, /area/holodeck/source_picnicarea) +"Rk" = ( +/obj/machinery/recharger/wallcharger{ + pixel_x = 4; + pixel_y = 32 + }, +/obj/structure/chair/comfy/shuttle, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/specops) +"Rl" = ( +/obj/machinery/porta_turret/syndicate{ + dir = 5 + }, +/turf/simulated/wall/mineral/plastitanium, +/area/shuttle/syndicate) +"Rn" = ( +/obj/machinery/light/spot{ + dir = 4; + icon_state = "tube1"; + tag = "icon-tube1 (EAST)" + }, +/obj/machinery/door_control{ + id = "QMLoaddoor2"; + layer = 3; + name = "Loading Doors"; + pixel_x = 24; + pixel_y = 8; + req_access_txt = "0" + }, +/obj/machinery/door_control{ + id = "QMLoaddoor"; + layer = 3; + name = "Loading Doors"; + pixel_x = 24; + pixel_y = -8; + req_access_txt = "0" + }, +/turf/simulated/floor/mineral/titanium/blue, +/area/shuttle/supply) +"Rp" = ( +/turf/simulated/wall/mineral/plastitanium, +/area/shuttle/administration) +"Rq" = ( +/obj/item/stack/spacecash/c1000, +/obj/item/stack/spacecash/c500, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/vox) +"Rs" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/shuttle/escape) +"Rw" = ( +/obj/structure/table/reinforced, +/obj/item/folder/red, +/obj/item/restraints/handcuffs, +/obj/item/flash, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/shuttle/escape) +"Rx" = ( +/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ + frequency = 1331; + id_tag = "vox_east_control"; + pixel_x = -24; + req_access_txt = "152"; + tag_airpump = "vox_east_vent"; + tag_chamber_sensor = "vox_east_sensor"; + tag_exterior_door = "vox_northeast_lock"; + tag_interior_door = "vox_southeast_lock" + }, +/turf/simulated/floor/plating/nitrogen, +/area/shuttle/vox) +"Ry" = ( +/obj/machinery/bodyscanner, +/turf/simulated/floor/mineral/titanium, +/area/shuttle/administration) "RD" = ( /obj/effect/decal/warning_stripes/south, -/turf/unsimulated/floor{ - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/centcom/control) +"RF" = ( +/obj/structure/shuttle/engine/propulsion{ + dir = 1; + icon_state = "propulsion"; + tag = "icon-propulsion (NORTH)" + }, +/turf/simulated/floor/plating/airless, +/area/shuttle/syndicate_sit) +"RJ" = ( +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "brown" + }, +/area/shuttle/escape) +"RL" = ( +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "neutralcorner" + }, +/area/shuttle/escape) +"RO" = ( +/obj/machinery/light/spot, +/obj/effect/spawner/lootdrop/trade_sol/serv, +/obj/structure/closet, +/turf/simulated/floor/mineral/titanium, +/area/shuttle/trade/sol) +"RR" = ( +/obj/machinery/door/window/brigdoor{ + dir = 2; + name = "Cell Door"; + req_access_txt = "150" + }, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/syndicate_sit) "RU" = ( /obj/effect/overlay/palmtree_l, /obj/effect/overlay/coconut, /turf/simulated/floor/beach/sand, /area/holodeck/source_beach) -"RX" = ( -/turf/unsimulated/wall{ - tag = "icon-iron10"; - icon_state = "iron10" +"RY" = ( +/obj/machinery/vending/medical, +/turf/simulated/floor/mineral/titanium, +/area/shuttle/administration) +"RZ" = ( +/obj/effect/spawner/window/reinforced, +/obj/machinery/door/poddoor/shutters{ + density = 0; + dir = 2; + icon_state = "open"; + id_tag = "trader_privacy"; + name = "Privacy Shutters"; + opacity = 0 }, -/area/space) +/turf/simulated/floor/mineral/titanium/blue, +/area/shuttle/trade/sol) "Sa" = ( /obj/structure/chair/office/dark, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/centcom/specops) +"Sb" = ( +/obj/machinery/sleeper/upgraded{ + dir = 4 + }, +/turf/simulated/floor/mineral/titanium, +/area/shuttle/administration) +"Sf" = ( +/turf/simulated/wall/mineral/plastitanium, +/area/shuttle/escape) +"Sj" = ( +/obj/structure/rack, +/obj/item/clothing/suit/space/syndicate/black/red, +/obj/item/clothing/head/helmet/space/syndicate/black/red, +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 1; + frequency = 1331; + id_tag = "synd_pump" + }, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/syndicate) +"Sl" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 8 + }, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/vox) +"Sn" = ( +/obj/structure/sign/securearea{ + desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; + icon_state = "space"; + layer = 4; + name = "EXTERNAL AIRLOCK"; + pixel_x = 0 + }, +/turf/simulated/wall/mineral/plastitanium, +/area/shuttle/syndicate) +"So" = ( +/turf/simulated/wall/mineral/plastitanium, +/area/shuttle/syndicate_elite) +"Sp" = ( +/obj/item/flag/med, +/turf/simulated/floor/plasteel{ + dir = 2; + icon_state = "cmo" + }, +/area/shuttle/escape) +"Sq" = ( +/obj/structure/chair/comfy/shuttle, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/syndicate_sit) "Ss" = ( /turf/simulated/floor/holofloor{ dir = 4; icon_state = "red" }, /area/holodeck/source_knightarena) +"St" = ( +/obj/machinery/computer/mech_bay_power_console, +/turf/simulated/floor/plasteel, +/area/shuttle/escape) +"Su" = ( +/obj/structure/table/reinforced, +/turf/simulated/floor/mineral/plastitanium/red/brig, +/area/shuttle/escape) +"Sv" = ( +/obj/machinery/atmospherics/unary/tank/air{ + dir = 2 + }, +/turf/simulated/wall/mineral/plastitanium, +/area/shuttle/syndicate) +"Sy" = ( +/obj/machinery/porta_turret/syndicate{ + dir = 10 + }, +/turf/simulated/wall/mineral/plastitanium, +/area/shuttle/syndicate) +"SA" = ( +/obj/machinery/computer/shuttle/vox, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/vox) +"SB" = ( +/obj/structure/table, +/obj/item/wrench, +/obj/item/assembly/infra, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/syndicate) +"SF" = ( +/obj/machinery/computer/scan_consolenew, +/turf/simulated/floor/mineral/titanium, +/area/shuttle/administration) +"SH" = ( +/obj/machinery/light/spot{ + dir = 8; + icon_state = "tube1"; + tag = "icon-tube1 (WEST)" + }, +/turf/simulated/floor/mineral/titanium/blue, +/area/shuttle/supply) "SI" = ( /obj/machinery/door/airlock/hatch/syndicate{ damage_deflection = 75; @@ -12539,10 +11509,30 @@ locked = 1; name = "Syndicate Jail" }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership/jail) +"SJ" = ( +/obj/item/twohanded/required/kirbyplants, +/turf/simulated/floor/plasteel, +/area/shuttle/escape) +"SN" = ( +/obj/machinery/sleeper/syndie{ + dir = 4 + }, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/syndicate_elite) +"SP" = ( +/obj/structure/shuttle/engine/propulsion{ + icon_state = "burst_l"; + tag = "icon-burst_l" + }, +/turf/simulated/floor/plating/airless, +/area/shuttle/supply) +"ST" = ( +/obj/effect/spawner/lootdrop/trade_sol/sci, +/obj/structure/closet, +/turf/simulated/floor/mineral/titanium, +/area/shuttle/trade/sol) "SY" = ( /obj/structure/table/holotable, /obj/item/clothing/suit/armor/riot/knight/blue, @@ -12558,33 +11548,25 @@ admin_usage = 1 }, /obj/effect/decal/warning_stripes/yellow, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/centcom/specops) "Tf" = ( /obj/structure/chair/comfy/black{ dir = 4 }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/centcom/specops) "Tg" = ( /obj/structure/chair/office/dark{ dir = 8 }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/centcom/specops) "Ti" = ( /obj/structure/chair/office/dark{ dir = 8 }, -/turf/unsimulated/floor{ - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/centcom/control) "Tk" = ( /obj/structure/holowindow, @@ -12592,53 +11574,182 @@ /area/holodeck/source_thunderdomecourt) "Tl" = ( /obj/structure/chair/office/dark, -/turf/unsimulated/floor{ - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/centcom/control) "Tm" = ( /obj/structure/chair/office/dark{ dir = 4 }, -/turf/unsimulated/floor{ - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/centcom/control) +"Tn" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 8 + }, +/turf/simulated/floor/mineral/plastitanium/red/brig, +/area/shuttle/escape) +"To" = ( +/obj/structure/table, +/obj/item/grenade/plastic/c4{ + pixel_x = 2; + pixel_y = 1 + }, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/syndicate) +"Tw" = ( +/obj/structure/statue/uranium/nuke, +/turf/simulated/floor/plating/asteroid/snow/airless, +/area/syndicate_mothership) +"Ty" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 8 + }, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/syndicate) "Tz" = ( /turf/simulated/floor/holofloor{ dir = 4; icon_state = "red" }, /area/holodeck/source_thunderdomecourt) +"TA" = ( +/obj/machinery/computer/security{ + network = list("SS13","Research Outpost","Mining Outpost","Telecomms") + }, +/obj/structure/sign/poster/official/nanotrasen_logo{ + pixel_x = -32; + pixel_y = 0 + }, +/turf/simulated/floor/plasteel{ + dir = 9; + icon_state = "darkred" + }, +/area/shuttle/escape) +"TC" = ( +/obj/effect/spawner/window/shuttle, +/turf/simulated/floor/plating, +/area/shuttle/transport) +"TD" = ( +/turf/simulated/wall/mineral/plastitanium, +/area/shuttle/vox) +"TE" = ( +/obj/structure/rack, +/obj/item/tank/internals/nitrogen, +/obj/item/tank/internals/nitrogen, +/obj/item/tank/internals/nitrogen, +/obj/item/tank/internals/nitrogen, +/obj/item/tank/internals/nitrogen, +/obj/item/tank/internals/nitrogen, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/vox) +"TF" = ( +/obj/structure/shuttle/engine/propulsion{ + dir = 8; + icon_state = "burst_l" + }, +/turf/simulated/floor/plating/airless, +/area/shuttle/trade/sol) "TQ" = ( /obj/structure/holowindow, /turf/simulated/floor/holofloor{ - tag = "icon-asteroid7"; + dir = 2; icon_state = "asteroid7"; - dir = 2 + tag = "icon-asteroid7" }, /area/holodeck/source_knightarena) +"TR" = ( +/obj/machinery/recharge_station/upgraded, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/syndicate) +"TT" = ( +/obj/structure/flora/ausbushes/grassybush, +/obj/structure/flora/ausbushes/lavendergrass, +/obj/structure/flora/ausbushes/ppflowers, +/obj/structure/flora/ausbushes/sunnybush, +/obj/structure/window/full/shuttle, +/turf/simulated/floor/grass, +/area/shuttle/escape) +"TU" = ( +/obj/machinery/ai_status_display, +/turf/simulated/wall/mineral/titanium, +/area/shuttle/escape) "TX" = ( /turf/simulated/floor/holofloor{ dir = 8; icon_state = "green" }, /area/holodeck/source_thunderdomecourt) +"TY" = ( +/obj/structure/shuttle/engine/heater, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/plating/airless, +/area/shuttle/escape) +"Ub" = ( +/obj/machinery/light, +/obj/structure/chair/comfy/shuttle{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "bot" + }, +/area/shuttle/escape) +"Ud" = ( +/obj/effect/decal/remains/human, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/syndicate_sit) "Uf" = ( /obj/structure/chair/office/dark{ dir = 1 }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/centcom/specops) +"Ug" = ( +/obj/item/storage/fancy/cigarettes/dromedaryco, +/obj/item/lighter/zippo{ + pixel_x = 5 + }, +/obj/structure/table, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/administration) +"Ui" = ( +/obj/effect/spawner/window/shuttle, +/turf/simulated/floor/plating, +/area/shuttle/escape) +"Uj" = ( +/obj/structure/closet/crate, +/turf/simulated/floor/mineral/titanium, +/area/shuttle/transport) +"Uo" = ( +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 1; + frequency = 1331; + id_tag = "synd_pump" + }, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/syndicate) +"Us" = ( +/obj/machinery/door/window{ + dir = 1; + name = "Secure Storage"; + req_access_txt = "150" + }, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/syndicate) "Uv" = ( /turf/simulated/floor/holofloor{ - tag = "icon-asteroid5"; + dir = 2; + icon = 'icons/turf/floors/plating.dmi'; icon_state = "asteroid5"; - dir = 2 + tag = "icon-asteroid5" }, /area/holodeck/source_desert) +"Uw" = ( +/obj/machinery/computer/shuttle/syndicate, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/syndicate) "Uy" = ( /obj/structure/table/holotable, /obj/machinery/readybutton{ @@ -12649,13 +11760,50 @@ icon_state = "green" }, /area/holodeck/source_thunderdomecourt) +"Uz" = ( +/obj/structure/table, +/obj/item/storage/toolbox/syndicate, +/obj/item/crowbar/red, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/syndicate) +"UA" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/syndicate) +"UC" = ( +/obj/machinery/light/spot{ + dir = 8; + icon_state = "tube1"; + tag = "icon-tube1 (WEST)" + }, +/obj/structure/window/reinforced, +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/syndicate_sit) +"UD" = ( +/obj/machinery/door/window{ + base_state = "right"; + dir = 4; + icon_state = "right"; + name = "Infirmary"; + req_access_txt = "150" + }, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/syndicate) +"UG" = ( +/obj/effect/spawner/lootdrop/trade_sol/sec, +/obj/structure/closet, +/turf/simulated/floor/mineral/titanium, +/area/shuttle/trade/sol) "UH" = ( /obj/structure/chair{ dir = 1 }, -/turf/unsimulated/floor{ - icon_state = "grimy" - }, +/turf/simulated/floor/plasteel/grimy, /area/centcom/specops) "UI" = ( /turf/simulated/floor/holofloor{ @@ -12663,20 +11811,37 @@ icon_state = "blue" }, /area/holodeck/source_knightarena) +"UJ" = ( +/obj/machinery/computer/shuttle/sst, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/syndicate_elite) "UK" = ( /turf/simulated/floor/holofloor{ - tag = "icon-carpet3-0 (EAST)"; + dir = 4; icon_state = "carpet3-0"; - dir = 4 + tag = "icon-carpet3-0 (EAST)" }, /area/holodeck/source_theatre) "UM" = ( /obj/structure/flora/grass/brown, /turf/simulated/floor/holofloor{ - tag = "icon-snow"; - icon_state = "snow" + icon_state = "snow"; + tag = "icon-snow" }, /area/holodeck/source_snowfield) +"UN" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/administration) +"UP" = ( +/turf/simulated/wall/mineral/titanium/nodiagonal, +/area/shuttle/trade/sol) +"UT" = ( +/obj/machinery/recharge_station/upgraded, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/administration) "UV" = ( /obj/structure/holowindow, /turf/simulated/floor/holofloor{ @@ -12684,130 +11849,321 @@ icon_state = "red" }, /area/holodeck/source_thunderdomecourt) -"UZ" = ( -/turf/unsimulated/wall/fakeglass{ - icon_state = "fakewindows"; - dir = 8 +"Va" = ( +/obj/machinery/camera{ + c_tag = "CentComm Special Ops. Shuttle"; + dir = 2; + network = list("ERT","CentComm") }, -/area/syndicate_mothership/jail) +/obj/structure/chair/comfy/shuttle, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/specops) "Vc" = ( -/turf/unsimulated/ai_visible, -/area/ai_multicam_room) +/obj/structure/closet/crate/medical, +/obj/item/reagent_containers/glass/bottle/morphine, +/obj/item/storage/box/beakers, +/obj/item/robot_parts/l_arm, +/obj/item/robot_parts/r_arm, +/obj/item/clothing/mask/surgical, +/obj/item/reagent_containers/iv_bag/blood/OMinus, +/obj/item/tank/internals/anesthetic, +/obj/item/clothing/mask/breath/medical, +/obj/item/robot_parts/l_leg, +/obj/item/robot_parts/r_leg, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/syndicate) +"Vd" = ( +/obj/machinery/door/window/westright{ + name = "Tool Storage"; + req_access_txt = "150" + }, +/obj/machinery/light/spot{ + dir = 1; + icon_state = "tube1"; + tag = "icon-tube1 (NORTH)" + }, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/syndicate) +"Ve" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "bot" + }, +/area/shuttle/escape) +"Vi" = ( +/obj/structure/shuttle/engine/propulsion{ + dir = 1; + icon_state = "propulsion_l"; + tag = "icon-propulsion_l (NORTH)" + }, +/turf/simulated/floor/plating/airless, +/area/shuttle/syndicate_sit) +"Vj" = ( +/turf/simulated/floor/mineral/titanium, +/area/shuttle/administration) +"Vk" = ( +/obj/machinery/door/airlock/hatch{ + req_access_txt = "152" + }, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/vox) "Vm" = ( /obj/structure/table/wood, /obj/item/storage/box/donkpockets, -/turf/unsimulated/floor{ +/turf/simulated/floor/plasteel/dark, +/area/syndicate_mothership/jail) +"Vn" = ( +/obj/item/storage/firstaid/o2, +/obj/structure/table, +/turf/simulated/floor/plasteel, +/area/shuttle/escape) +"Vo" = ( +/obj/machinery/suit_storage_unit/syndicate/secure, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/syndicate) +"Vq" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/syndicate_mothership/jail) -"Vz" = ( -/turf/unsimulated/wall, -/area/ai_multicam_room) +/area/shuttle/escape) +"Vr" = ( +/obj/machinery/computer/camera_advanced/shuttle_docker/admin{ + name = "NTV Argos shuttle navigation computer" + }, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/administration) +"Vs" = ( +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/shuttle/escape) +"Vw" = ( +/obj/machinery/portable_atmospherics/canister/oxygen, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/vox) "VA" = ( /obj/effect/decal/warning_stripes/northwest, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/centcom/specops) "VB" = ( /obj/effect/decal/warning_stripes/northeast, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/centcom/specops) "VC" = ( /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/centcom/specops) "VD" = ( /obj/effect/decal/warning_stripes/southwest, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/centcom/specops) "VE" = ( /obj/effect/decal/warning_stripes/southeast, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/centcom/specops) +"VH" = ( +/obj/machinery/dna_scannernew/upgraded, +/turf/simulated/floor/mineral/titanium, +/area/shuttle/administration) +"VI" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 1 + }, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/specops) "VJ" = ( /obj/structure/chair, -/turf/unsimulated/floor{ - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/centcom/evac) +"VK" = ( +/obj/structure/shuttle/engine/propulsion{ + icon_state = "propulsion_l"; + tag = "icon-propulsion_l" + }, +/turf/simulated/floor/plating/airless, +/area/shuttle/vox) +"VN" = ( +/turf/simulated/wall/mineral/titanium, +/area/shuttle/trade/sol) "VO" = ( /obj/structure/chair/comfy/purp{ dir = 1 }, -/turf/unsimulated/floor{ - dir = 8; - icon_state = "wood" - }, +/turf/simulated/floor/engine/cult, /area/wizard_station) +"VP" = ( +/obj/machinery/computer/card, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/administration) +"VQ" = ( +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "neutralcorner" + }, +/area/shuttle/escape) +"VS" = ( +/obj/machinery/computer/atmos_alert, +/turf/simulated/floor/plasteel{ + dir = 6; + icon_state = "darkyellow" + }, +/area/shuttle/escape) +"VU" = ( +/obj/effect/spawner/window/plastitanium, +/turf/simulated/floor/plating, +/area/shuttle/syndicate) +"VY" = ( +/obj/machinery/light/spot, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/syndicate) "VZ" = ( /turf/simulated/floor/holofloor{ - tag = "icon-asteroid7"; + dir = 2; icon_state = "asteroid7"; - dir = 2 + tag = "icon-asteroid7" }, /area/holodeck/source_knightarena) "Wa" = ( /obj/structure/bed, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/centcom/specops) +"Wb" = ( +/obj/item/clothing/head/collectable/petehat{ + desc = "It smells faintly of reptile."; + name = "fancy leader hat" + }, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/vox) +"Wc" = ( +/obj/machinery/computer/shuttle/admin{ + name = "NTV Argos shuttle console" + }, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/administration) "Wd" = ( /obj/structure/chair{ dir = 8 }, -/turf/unsimulated/floor{ - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/centcom/evac) "We" = ( /obj/structure/chair{ dir = 4 }, -/turf/unsimulated/floor{ - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/centcom/evac) "Wf" = ( /obj/structure/chair/stool, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/centcom/evac) +"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{ + dir = 8; + icon_state = "neutralfull" + }, +/area/shuttle/escape) "Wk" = ( /obj/structure/chair/comfy/shuttle{ dir = 1 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/centcom/evac) "Wl" = ( /obj/structure/chair/comfy/shuttle{ dir = 4 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/centcom/evac) -"WA" = ( -/turf/unsimulated/floor{ - icon_state = "dark" +"Wm" = ( +/obj/structure/table, +/obj/item/weldingtool/largetank{ + pixel_x = 4; + pixel_y = -4 }, +/obj/item/clothing/glasses/welding{ + pixel_y = 10 + }, +/obj/machinery/light/small{ + dir = 4; + pixel_y = 8 + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "bot" + }, +/area/shuttle/escape) +"Wp" = ( +/obj/machinery/light/spot{ + dir = 1; + icon_state = "tube1"; + tag = "icon-tube1 (NORTH)" + }, +/obj/structure/chair/comfy/shuttle, +/turf/simulated/floor/mineral/titanium, +/area/shuttle/transport) +"Wt" = ( +/obj/structure/shuttle/engine/heater, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/plating/airless, +/area/shuttle/vox) +"Wz" = ( +/obj/machinery/portable_atmospherics/canister/oxygen, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/syndicate) +"WA" = ( +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership/jail) +"WD" = ( +/obj/structure/table/reinforced, +/obj/item/storage/firstaid/regular, +/obj/machinery/light{ + dir = 1; + on = 1 + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "redcorner" + }, +/area/shuttle/escape) "WI" = ( /obj/structure/chair/comfy/shuttle{ dir = 8 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/centcom/evac) +"WL" = ( +/obj/machinery/light/spot{ + dir = 4; + icon_state = "tube1"; + tag = "icon-tube1 (EAST)" + }, +/obj/structure/chair/comfy/shuttle{ + dir = 8 + }, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/administration) +"WN" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "bot" + }, +/area/shuttle/escape) "WP" = ( /obj/structure/table/holotable, /obj/machinery/readybutton, @@ -12816,29 +12172,78 @@ icon_state = "blue" }, /area/holodeck/source_knightarena) +"WR" = ( +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "browncorner"; + tag = "icon-browncorner (EAST)" + }, +/area/shuttle/escape) "WU" = ( /obj/structure/chair/comfy/shuttle, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/centcom/evac) "WW" = ( /obj/structure/flora/ausbushes/pointybush, -/turf/unsimulated/floor{ - icon_state = "grass1"; - name = "grass" - }, +/turf/simulated/floor/grass, /area/centcom/control) -"Xj" = ( -/obj/structure/bed, -/turf/unsimulated/floor{ - icon_state = "floorscorched2" +"WY" = ( +/obj/machinery/computer/shuttle/ferry/request, +/turf/simulated/floor/mineral/titanium, +/area/shuttle/transport) +"Xi" = ( +/obj/machinery/light/spot{ + dir = 1; + icon_state = "tube1"; + tag = "icon-tube1 (NORTH)" }, -/area/centcom) +/obj/machinery/door_control{ + id = "adminshuttleblast"; + name = "Blast door control"; + pixel_x = -5; + pixel_y = 35; + req_access = list(101); + req_access_txt = "0" + }, +/obj/machinery/door_control{ + id = "adminshuttleshutters"; + name = "Shutter control"; + pixel_x = 5; + pixel_y = 35; + req_access = list(101); + req_access_txt = "0" + }, +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/administration) +"Xl" = ( +/obj/structure/reagent_dispensers/fueltank, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/administration) "Xm" = ( /obj/effect/decal/cleanable/dirt, -/turf/unsimulated/floor{ - icon_state = "floor" - }, +/turf/simulated/floor/plasteel, /area/centcom) +"Xo" = ( +/obj/machinery/door_control{ + id = "soltrader_north"; + name = "Trade Deposits Door"; + normaldoorcontrol = 1; + pixel_x = 24; + pixel_y = -8; + req_access_txt = "160" + }, +/obj/machinery/door_control{ + id = "trader_privacy"; + name = "Privacy Shutters Control"; + pixel_x = 24; + pixel_y = 8; + req_access_txt = "160" + }, +/turf/simulated/floor/mineral/titanium/blue, +/area/shuttle/trade/sol) "Xq" = ( /obj/structure/table, /obj/item/radio/electropack{ @@ -12849,21 +12254,83 @@ frequency = 1449; pixel_x = 8 }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership/jail) "Xr" = ( /obj/structure/bed, -/turf/unsimulated/floor{ - name = "plating" - }, +/turf/simulated/floor/plating, /area/centcom) +"Xs" = ( +/obj/machinery/door/airlock/external{ + id_tag = "s_docking_airlock"; + name = "Shuttle Airlock"; + req_access_txt = "150" + }, +/obj/machinery/door_control{ + id = "syndicate_sit_1"; + name = "Blast Doors"; + pixel_x = -25; + pixel_y = 0; + req_access_txt = "150" + }, +/obj/structure/fans/tiny, +/obj/machinery/door/poddoor{ + density = 0; + icon_state = "open"; + id_tag = "syndicate_sit_1"; + name = "Front Hull Door"; + opacity = 0; + req_access_txt = "150" + }, +/turf/simulated/floor/plating, +/area/shuttle/syndicate_sit) +"Xw" = ( +/obj/structure/rack, +/obj/item/gun/dartgun/vox/raider, +/obj/item/gun/dartgun/vox/medical, +/obj/item/dart_cartridge, +/obj/item/dart_cartridge, +/obj/item/dart_cartridge, +/obj/item/dart_cartridge, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/vox) +"Xx" = ( +/obj/structure/shuttle/engine/propulsion{ + dir = 8; + icon_state = "propulsion_l"; + tag = "icon-propulsion_l (EAST)" + }, +/turf/simulated/floor/plating/airless, +/area/shuttle/administration) +"XB" = ( +/obj/machinery/atmospherics/unary/tank/nitrogen{ + dir = 1 + }, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/vox) +"XC" = ( +/obj/machinery/light/spot{ + dir = 4; + icon_state = "tube1"; + tag = "icon-tube1 (EAST)" + }, +/turf/simulated/floor/mineral/titanium, +/area/shuttle/administration) +"XG" = ( +/obj/structure/bed/roller, +/turf/simulated/floor/plasteel{ + dir = 2; + icon_state = "cmo" + }, +/area/shuttle/escape) +"XH" = ( +/turf/simulated/floor/mineral/titanium/blue, +/area/shuttle/supply) "XJ" = ( /obj/machinery/light/spot{ - tag = "icon-tube1 (WEST)"; + dir = 8; icon_state = "tube1"; - dir = 8 + tag = "icon-tube1 (WEST)" }, /obj/machinery/access_button{ command = "cycle_interior"; @@ -12874,9 +12341,7 @@ pixel_y = -8; req_access_txt = "150" }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership/jail) "XL" = ( /obj/structure/table/abductor, @@ -12885,19 +12350,47 @@ /obj/item/FixOVein/alien, /obj/item/surgicaldrill/alien, /obj/item/circular_saw/alien, -/turf/unsimulated/floor/abductor, +/turf/simulated/floor/plating/abductor, /area/abductor_ship) "XM" = ( /obj/structure/bed/abductor, -/turf/unsimulated/floor/abductor, +/turf/simulated/floor/plating/abductor, /area/abductor_ship) +"XS" = ( +/obj/machinery/access_button{ + command = "cycle_exterior"; + frequency = 1331; + master_tag = "vox_east_control"; + req_access_txt = "152" + }, +/turf/simulated/wall/mineral/plastitanium, +/area/shuttle/vox) "XT" = ( /turf/simulated/floor/holofloor{ - tag = "icon-carpet4-0 (EAST)"; + dir = 4; icon_state = "carpet4-0"; - dir = 4 + tag = "icon-carpet4-0 (EAST)" }, /area/holodeck/source_meetinghall) +"XW" = ( +/turf/simulated/floor/plating, +/area/centcom/specops) +"XY" = ( +/obj/item/clothing/head/collectable/xenom, +/obj/item/clothing/head/chicken, +/obj/item/aiModule/syndicate, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/vox) +"Ya" = ( +/obj/machinery/atm{ + pixel_x = 0; + pixel_y = 32 + }, +/obj/structure/chair/comfy/shuttle{ + dir = 8 + }, +/turf/simulated/floor/mineral/titanium/blue, +/area/shuttle/trade/sol) "Yc" = ( /obj/structure/table/holotable, /obj/machinery/readybutton{ @@ -12908,9 +12401,64 @@ icon_state = "red" }, /area/holodeck/source_thunderdomecourt) +"Yf" = ( +/obj/machinery/vending/coffee, +/obj/machinery/light/spot, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/administration) +"Yg" = ( +/obj/machinery/door/poddoor{ + density = 0; + icon_state = "open"; + id_tag = "soltradeship_north"; + name = "Security Doors"; + opacity = 0 + }, +/obj/machinery/door/airlock/titanium/glass{ + id_tag = "soltrader_north"; + name = "trader shuttle airlock"; + req_access_txt = "160"; + security_level = 6 + }, +/turf/simulated/floor/mineral/titanium/blue, +/area/shuttle/trade/sol) +"Yi" = ( +/turf/simulated/wall/indestructible/syndicate, +/area/syndicate_mothership) +"Yk" = ( +/obj/machinery/door/airlock/external{ + id_tag = "s_docking_airlock" + }, +/obj/structure/fans/tiny, +/turf/simulated/floor/plasteel, +/area/shuttle/escape) +"Yl" = ( +/obj/machinery/light/spot{ + dir = 4; + icon_state = "tube1"; + tag = "icon-tube1 (EAST)" + }, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/syndicate) +"Yn" = ( +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralfull" + }, +/area/shuttle/escape) "Yp" = ( /turf/simulated/floor/beach/water, /area/holodeck/source_beach) +"Yu" = ( +/obj/machinery/vending/snack, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/administration) +"Yv" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 8 + }, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/administration) "Yx" = ( /obj/machinery/door/airlock/hatch/syndicate{ damage_deflection = 75; @@ -12918,27 +12466,229 @@ locked = 1; name = "Syndicate Jail Cell" }, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership/jail) +"Yz" = ( +/obj/effect/spawner/lootdrop/trade_sol/vehicle, +/turf/simulated/floor/mineral/titanium, +/area/shuttle/trade/sol) +"YA" = ( +/turf/simulated/wall/mineral/plastitanium, +/area/shuttle/specops) +"YC" = ( +/obj/effect/spawner/window/shuttle, +/turf/simulated/floor/plating, +/area/shuttle/trade/sol) +"YH" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 1 + }, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/vox) +"YK" = ( +/turf/simulated/wall/indestructible/opsglass, +/area/centcom) +"YM" = ( +/turf/simulated/wall/mineral/titanium, +/area/shuttle/supply) +"YR" = ( +/obj/structure/chair/stool, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/syndicate) +"YU" = ( +/obj/machinery/status_display{ + pixel_y = -32 + }, +/obj/structure/chair/comfy/shuttle{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "bot" + }, +/area/shuttle/escape) +"YV" = ( +/obj/machinery/computer/shuttle/trade/sol, +/obj/machinery/door_control{ + id = "soltrader_south"; + name = "Trade Deposits Door"; + normaldoorcontrol = 1; + pixel_x = 24; + pixel_y = 8; + req_access_txt = "160" + }, +/obj/machinery/flasher_button{ + id = "soltraderflash"; + pixel_x = 24; + pixel_y = -8 + }, +/turf/simulated/floor/mineral/titanium/blue, +/area/shuttle/trade/sol) +"YW" = ( +/obj/machinery/computer/robotics, +/turf/simulated/floor/plasteel{ + dir = 9; + icon_state = "darkblue" + }, +/area/shuttle/escape) +"YX" = ( +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "whiteblue"; + tag = "icon-whiteblue (NORTH)" + }, +/area/shuttle/escape) +"Za" = ( +/obj/structure/shuttle/engine/heater{ + dir = 8; + icon_state = "heater"; + tag = "icon-heater (WEST)" + }, +/obj/structure/window/plasmareinforced{ + color = "#FF0000"; + dir = 4 + }, +/turf/simulated/floor/plating/airless, +/area/shuttle/administration) +"Zd" = ( +/obj/structure/table/reinforced, +/obj/item/paper_bin, +/obj/item/pen, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "vault" + }, +/area/shuttle/escape) +"Ze" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/turf/simulated/floor/mineral/titanium, +/area/shuttle/trade/sol) +"Zf" = ( +/obj/machinery/mecha_part_fabricator/upgraded, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/administration) +"Zi" = ( +/obj/machinery/sleeper, +/turf/simulated/floor/plasteel{ + dir = 2; + icon_state = "cmo" + }, +/area/shuttle/escape) +"Zk" = ( +/obj/structure/table, +/obj/machinery/door_control{ + id = "voxshutters"; + name = "remote shutter control"; + req_access_txt = "152" + }, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/vox) +"Zn" = ( +/obj/structure/table, +/obj/item/radio/beacon/syndicate/bomb{ + pixel_y = 5 + }, +/obj/item/radio/beacon/syndicate/bomb, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/syndicate) +"Zs" = ( +/obj/machinery/airlock_sensor{ + frequency = 1331; + id_tag = "vox_east_sensor"; + pixel_x = -25; + req_access_txt = "152" + }, +/obj/machinery/light/spot{ + dir = 8; + icon_state = "tube1"; + tag = "icon-tube1 (WEST)" + }, +/turf/simulated/floor/plating/nitrogen, +/area/shuttle/vox) +"Zu" = ( +/obj/machinery/vending/cola, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/administration) "Zv" = ( /turf/simulated/floor/beach/coastline, /area/holodeck/source_beach) -"ZE" = ( -/turf/unsimulated/wall/fakeglass, -/area/syndicate_mothership/jail) +"Zx" = ( +/obj/structure/table/reinforced, +/obj/item/storage/fancy/donut_box, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/shuttle/escape) +"ZC" = ( +/obj/structure/window/reinforced, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/syndicate_sit) +"ZD" = ( +/obj/structure/shuttle/engine/heater, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/plating/airless, +/area/shuttle/syndicate) +"ZH" = ( +/obj/machinery/airlock_sensor{ + frequency = 1331; + id_tag = "vox_west_sensor"; + pixel_x = 25; + req_access_txt = "152" + }, +/obj/machinery/light/spot{ + dir = 4; + icon_state = "tube1"; + tag = "icon-tube1 (EAST)" + }, +/turf/simulated/floor/plating/nitrogen, +/area/shuttle/vox) +"ZI" = ( +/obj/item/stack/spacecash/c200, +/obj/item/stack/spacecash/c50, +/obj/machinery/light/spot, +/obj/structure/chair/comfy/shuttle{ + dir = 1 + }, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/shuttle/vox) +"ZK" = ( +/obj/machinery/light/spot{ + dir = 8; + icon_state = "tube1"; + tag = "icon-tube1 (WEST)" + }, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/syndicate_elite) +"ZP" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 1 + }, +/turf/simulated/floor/mineral/titanium, +/area/shuttle/transport) +"ZQ" = ( +/obj/structure/sign/greencross, +/turf/simulated/wall/mineral/titanium, +/area/shuttle/escape) "ZR" = ( /turf/simulated/floor/holofloor{ dir = 10; icon_state = "green" }, /area/holodeck/source_emptycourt) +"ZV" = ( +/obj/structure/grille, +/obj/structure/window/full/shuttle{ + icon_state = "14" + }, +/turf/simulated/floor/plating, +/area/shuttle/escape) "ZZ" = ( /obj/structure/closet/secure_closet/contractor, -/turf/unsimulated/floor{ - icon_state = "dark" - }, +/turf/simulated/floor/plasteel/dark, /area/syndicate_mothership/jail) (1,1,1) = {" @@ -25928,12 +25678,12 @@ aN aN fm of -oy -oy -oy +of +of +of pn -oy -px +of +of fm aN aN @@ -26184,13 +25934,13 @@ th aN th fm -oh +of oB pf pf pf fV -oh +of fm aN aN @@ -26441,13 +26191,13 @@ ti sX ti fm -oh +of oJ pf pk pf pq -oh +of fm aN aN @@ -26698,13 +26448,13 @@ ti sX ti fm -oh +of oW pf po pf pu -oh +of fm aN aN @@ -26734,7 +26484,7 @@ sV tl sY tl -tC +tB jc jc jc @@ -26742,7 +26492,7 @@ jc jc jc jc -tC +tB tY tX sO @@ -26955,13 +26705,13 @@ ti sX ti fm -oh +of oC ph pf pa ps -oh +of fm aN aN @@ -26991,7 +26741,7 @@ sU tl sY tl -tC +tB jc jc jc @@ -26999,7 +26749,7 @@ jc jc jc jc -tC +tB tY tX Hj @@ -27009,12 +26759,12 @@ aN aN Aw Aw -Aw -Aw +YK +YK ra rc -Aw -Aw +YK +YK Aw Aw aN @@ -27212,13 +26962,13 @@ ti sX ti fm -oi -oy -oy +of +of +of pt -oy -oy -py +of +of +of fm aN aN @@ -27248,7 +26998,7 @@ sV tl tu tl -tC +tB jc jc jc @@ -27256,7 +27006,7 @@ jc jc jc jc -tC +tB tY ue Hj @@ -27271,7 +27021,7 @@ uo ra ra uo -rd +qR Xr Aw aN @@ -27505,7 +27255,7 @@ sW tl sY tl -tC +tB jc jc jc @@ -27513,7 +27263,7 @@ jc jc jc jc -tC +tB tY tX Hj @@ -27522,14 +27272,14 @@ aN aN aN Aw -qN +qK qT up ra ra up -qW -qN +qU +qK Aw aN aN @@ -27762,7 +27512,7 @@ sZ tl sY tl -tC +tB jc jc jc @@ -27770,7 +27520,7 @@ jc jc jc jc -tC +tB tY IS Hj @@ -27780,12 +27530,12 @@ aN aN Aw Aw -Aw -Aw +YK +YK uq ra -Aw -Aw +YK +YK Aw Aw aN @@ -28019,15 +27769,15 @@ sY sY sY sY -tC +tB jc jc jc -Iw -Iw jc jc -tC +jc +jc +tB tZ IS ui @@ -28276,7 +28026,7 @@ sY sY sY sY -tC +tB jc jc jc @@ -28284,7 +28034,7 @@ tO tS jc jc -tC +tB ub IS ul @@ -28299,8 +28049,8 @@ up ra ra up -qW -qN +qU +qK Aw aN aN @@ -28533,15 +28283,15 @@ sY sY sY sY -tC +tB jc jc jc -Iw -Iw jc jc -tC +jc +jc +tB ua IS uk @@ -28551,12 +28301,12 @@ aN aN Aw Aw -Aw -Aw +YK +YK uq ra -Aw -Aw +YK +YK Aw Aw aN @@ -28746,13 +28496,13 @@ aN aN aN sX -ti +XW sX -ti +XW sX -ti +XW sX -ti +XW fm or kd @@ -28790,7 +28540,7 @@ sZ tl sY tl -tC +tB jc jc jc @@ -28798,7 +28548,7 @@ jc jc jc jc -tC +tB tY IS Hj @@ -28807,7 +28557,7 @@ aN aN aN Aw -Xj +Xr qR uo ra @@ -29003,13 +28753,13 @@ aN aN aN sX -ti +XW sX -ti +XW sX -ti +XW sX -ti +XW fm oq kd @@ -29047,7 +28797,7 @@ sW tl sY tl -tC +tB jc jc jc @@ -29055,7 +28805,7 @@ jc jc jc jc -tC +tB tY tX Hj @@ -29065,13 +28815,13 @@ aN aN Aw qP -qV +qU up ra ra up -qV -rh +qU +qK Aw aN aN @@ -29260,13 +29010,13 @@ aN aN aN sX -ti +XW sX -ti +XW sX -ti +XW sX -ti +XW fm oj fF @@ -29304,7 +29054,7 @@ sY tl tu tl -tC +tB jc jc jc @@ -29312,7 +29062,7 @@ jc jc jc jc -tC +tB tY ue Hj @@ -29322,12 +29072,12 @@ aN aN Aw Aw -Aw -Aw +YK +YK ra ra -Aw -Aw +YK +YK Aw Aw aN @@ -29561,7 +29311,7 @@ sW tl sY tl -tC +tB jc jc jc @@ -29569,7 +29319,7 @@ jc jc jc jc -tC +tB tY tX Hj @@ -29794,11 +29544,11 @@ sX sX aN aN -aN -aN -aN -aN -aN +Ft +cI +cI +cI +Gn sX aN aN @@ -29818,7 +29568,7 @@ sY tl sY tl -tC +tB jc jc jc @@ -29826,7 +29576,7 @@ jc jc jc jc -tC +tB tY tX sO @@ -29835,14 +29585,14 @@ aN aN aN Aw -qN -qW +qK +qU up ra ra up qT -ri +qK Aw aN aN @@ -30051,11 +29801,11 @@ pV sX aN aN -aN -aN -aN -aN -aN +YA +NP +NP +NP +YA sX aN aN @@ -30075,7 +29825,7 @@ ta tm sY sY -tD +tB jb tM tM @@ -30083,7 +29833,7 @@ tM tM tM jb -tD +tB tX tX Hj @@ -30308,11 +30058,11 @@ pW sX aN aN -aN -aN -aN -aN -aN +YA +GZ +QK +Il +YA sX aN aN @@ -30552,7 +30302,7 @@ mg mg mg mg -nQ +nR uj uj uj @@ -30565,11 +30315,11 @@ uj sX aN aN -aN -aN -aN -aN -aN +YA +JV +Lt +JO +YA sX aN aN @@ -30820,13 +30570,13 @@ uR Uf uj sX -qj -wr -aN -aN -aN -aN -aN +ow +ow +YA +Va +Lt +VI +YA sX aN aN @@ -31079,11 +30829,11 @@ uj qd VA VD -aN -aN -aN -aN -aN +Mt +Lt +Lt +VI +YA sX aN aN @@ -31336,11 +31086,11 @@ uj qd VB VE -aN -aN -aN -aN -aN +Mt +Lt +Lt +VI +YA sX aN aN @@ -31591,13 +31341,13 @@ uj uj vL sX -qj -wr -aN -aN -aN -aN -aN +ow +ow +YA +Rk +Lt +VI +YA sX aN aN @@ -31850,11 +31600,11 @@ Ga sX we we -aN -aN -aN -aN -aN +YA +KN +Lt +VI +YA sX aN aN @@ -32101,17 +31851,17 @@ sX oR sX pw -pC -pM +pw +pw sX sX sX sX -aN -aN -aN -aN -aN +YA +YA +Lt +YA +YA sX aN aN @@ -32354,7 +32104,7 @@ sX sX ou oG -oL +ow VC sX vd @@ -32365,9 +32115,9 @@ vS qk sX aN -aN +YA rb -aN +YA aN sX aN @@ -32604,21 +32354,21 @@ sq kW kZ sq -mQ -nm +kW +kZ sq aN sX ou oG -oK +ow VC pc vd pD pN pX -qe +pD vd sX sX @@ -32861,21 +32611,21 @@ sq kY kY sq -mS -ni +kY +kY nA aN sX ou oG -oK +ow VC pd vd -pG +pD pP pZ -qg +pD wh sX Wa @@ -33119,20 +32869,20 @@ kX kY sq mR -nn -nz +kY +nA aN sX ou oG -oK +ow VC pc vd -pE +pD pO -pY -qf +pD +pD ql sX uj @@ -33369,20 +33119,20 @@ sq sq lb sq -sv -sv +su +su sq sq lb sq sq -np +lb sq aN sX ov oG -oK +ow VC sX ve @@ -33390,7 +33140,7 @@ vd be UH vd -qm +ql sX qx qS @@ -33418,17 +33168,17 @@ aN aN aN qI -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN +YM +YM +YM +YM +YM +YM +YM +YM +YM +YM +YM aN qI aN @@ -33639,7 +33389,7 @@ aN sX ou oG -oK +ow VC sX sX @@ -33675,18 +33425,18 @@ cj cj cj qI -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN +YM +XH +XH +XH +XH +SH +XH +XH +XH +XH +YM +SP qI aN aN @@ -33891,12 +33641,12 @@ lh sq mU mU -nz +nA aN sX um Rf -oM +ow VC pe VC @@ -33924,26 +33674,26 @@ aN aN cj cp -cp +KZ cr -aN cr -cp +cr +KZ cp cj qI -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN +YM +XH +XH +XH +XH +XH +XH +XH +XH +XH +Gd +HW qI aN aN @@ -34182,25 +33932,25 @@ aN cj cp cr -aN -aN -aN +NY +He +ET cr cp cj qI -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN +YM +FG +XH +XH +XH +XH +XH +XH +XH +OZ +Gd +HW qI aN aN @@ -34438,26 +34188,26 @@ aN aN cj cp -aN -aN -aN -aN -aN +cr +WY +He +Uj +cr cp cj qI -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN +YM +XH +XH +XH +XH +XH +XH +XH +XH +XH +Gd +HW qI aN aN @@ -34651,7 +34401,7 @@ aN aN aN aN -sv +su le lw lh @@ -34695,26 +34445,26 @@ aN aN cj cp -aN -aN -aN -aN -aN +cr +bY +He +ZP +cr cp cj qI -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN +YM +XH +XH +XH +XH +Rn +XH +XH +XH +XH +YM +Ex qI aN aN @@ -34908,7 +34658,7 @@ aN aN aN aN -sv +su lj lj lh @@ -34952,25 +34702,25 @@ aN aN cj cp -aN -aN -aN -aN -aN +TC +bY +He +ZP +TC cp cj qI -aN -aN -aN -aN -aN -aN +YM +YM +YM +DK +cv +YM tW -aN -aN -aN -aN +Ji +YM +YM +YM aN qI aN @@ -35165,7 +34915,7 @@ aN aN aN aN -sv +su lh lh lh @@ -35209,11 +34959,11 @@ aN aN cj cp -aN -aN -aN -aN -aN +cr +bY +He +ZP +cr cp cj qI @@ -35466,11 +35216,11 @@ wK wK cj cp -aN -aN -aN -aN -aN +cr +Wp +He +MZ +cr cp cj wK @@ -35689,7 +35439,7 @@ lh lh lh lh -lb +II tR tR tR @@ -35723,25 +35473,25 @@ sz sz cj cp -aN -aN -aN -aN -aN +cr +bY +He +ZP +cr cp cj aN aN aN +Rp +Xx +DI +Rp aN -aN -aN -aN -aN -aN -aN -aN -aN +Rp +Xx +DI +Rp aN aN aN @@ -35980,26 +35730,26 @@ sr sr cj cp -aN -aN -aN -aN -aN +TC +bY +He +ZP +TC cp cj aN aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN +Rp +Rp +Za +Za +Rp +Rp +Rp +Za +Za +Rp +Rp aN aN aN @@ -36237,27 +35987,27 @@ sA sr cj cp -aN -aN -aN -aN -aN +cr +bY +He +ZP +cr cp cj -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN +Rp +Rp +Rp +Pj +Ld +Ld +Yu +Rp +VH +Vj +Vj +Sb +Rp +Rp aN aN aN @@ -36494,28 +36244,28 @@ ss sr cj cp -aN -aN -aN -aN -aN +cr +Wp +He +MZ +cr cp cj -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN +Rp +IF +Ld +FR +Ld +Ld +Zu +Rp +EG +Vj +Vj +Vj +Ow +Rp +Rp aN aN aN @@ -36752,27 +36502,27 @@ sr cj cp cr -aN +TC tb -aN +TC cr cp cj -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN +Rp +Ku +Ld +LD +ME +Ld +Yf +Rp +Nl +Vj +Vj +Vj +Vj +DF +Rp aN aN aN @@ -36993,8 +36743,8 @@ sq qJ xd rj -xz -xz +xd +xd ry We We @@ -37015,21 +36765,21 @@ sQ cp cp cj -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN +Rp +CG +Ld +NC +ME +Ld +IV +Rp +VH +Vj +Ry +Eo +Vj +Ny +Rp aN aN aN @@ -37265,28 +37015,28 @@ wK wK cj sH -sJ -sP +sH +sH tc -tn -sJ -cJ +sH +sH +sH cj -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN +Rp +EA +Li +Ug +ME +Ld +Ld +Rp +SF +Vj +Vj +FA +XC +RY +Rp aN aN aN @@ -37507,8 +37257,8 @@ sq qM xd rk -xz -xz +xd +xd ry Wd Wd @@ -37520,30 +37270,30 @@ rf rf rm wK -yt -yt -yt -yt -yt -yt -yt -yt +yv +yv +yv +yv +yv +yv +yv +yv wK -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN +Rp +Rp +Rp +Rp +Rp +Px +Rp +Rp +Rp +Dl +Rp +Rp +Rp +Rp +Rp aN aN aN @@ -37764,7 +37514,7 @@ sq qL qZ qZ -xz +xd qH qJ We @@ -37777,30 +37527,30 @@ wN wN yQ sE -yt -yt -yt -yt -yt -yt -yt -yt +yv +yv +yv +yv +yv +yv +yv +yv tE -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN +PN +Du +Fb +Hk +Ld +Ld +Ld +Jn +Ld +Ld +Ld +Ld +Ld +Ld +Rp aN aN aN @@ -38034,30 +37784,30 @@ qZ qZ sB wK -yt -yt -yt -yt -yt -yt -yt -yt +yv +yv +yv +yv +yv +yv +yv +yv tE tH -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN +Ld +Fb +Ld +Ld +Ld +Ld +Ld +Ld +Ld +Ld +Ld +Ld +FM +Rp aN aN aN @@ -38279,10 +38029,10 @@ aN aN aN wK -xz xd xd -xz +xd +xd rV yG rV @@ -38296,25 +38046,25 @@ wK wK wK cH -yt -yt +yv +yv cK wK -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN +Rp +Rp +Rp +Dy +Rp +Rp +Rp +JM +Rp +Rp +Rp +MF +Rp +Rp +Rp aN aN aN @@ -38541,11 +38291,11 @@ rC rF rs xd -yt +yv xd sm xd -yt +yv wK sF rr @@ -38557,21 +38307,21 @@ wK wK wK wK -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN +Rp +cG +Jn +Ld +Xl +Rp +VP +Ld +Ld +Rp +Ld +Ld +LB +IZ +Rp aN aN aN @@ -38766,13 +38516,13 @@ aN aN aN aN -ma +ei sq sq sq my -mL -nf +kY +kY nw tR tR @@ -38795,8 +38545,8 @@ aN wK rr wK -xz -xz +xd +xd wK yG wK @@ -38804,8 +38554,8 @@ wK wK yG wK -xz -xz +xd +xd wK sK wK @@ -38814,21 +38564,21 @@ to to tw wK -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN +Rp +KS +Ld +Ld +Nr +Rp +Xi +UN +UN +Rp +Ld +Ld +Ld +Ch +Rp aN aN aN @@ -39024,12 +38774,12 @@ aN aN aN aN -ma +ei sq sq -mz +my mO -ni +kY sq nH nH @@ -39051,7 +38801,7 @@ aN aN wK ru -xz +xd xZ wN yq @@ -39063,29 +38813,29 @@ wN yq wN xZ -xz -qc +xd +xd wK tg tp qv ty wK -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN +Rp +bR +Ld +Ld +UT +Rp +hP +Wc +Vr +Rp +Ld +Ld +Ld +Ld +Rp aN aN aN @@ -39123,15 +38873,15 @@ aN aN aN mr -aN -aN -aN -aN -aN -aN -aN -aN -aN +VN +TF +PD +TF +PD +OF +PD +OF +VN mr aN aN @@ -39282,7 +39032,7 @@ aN aN aN aN -ma +ei sq sq mN @@ -39308,7 +39058,7 @@ aN aN wK rt -xz +xd xZ wN wN @@ -39328,21 +39078,21 @@ qo qs tx wK -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN +Rp +Rp +Gv +Ld +Ld +Rp +Ky +Ky +Ky +Rp +Ng +LF +KL +Qr +Rp aN aN aN @@ -39380,15 +39130,15 @@ aN aN aN mr -aN -aN -aN -aN -aN -aN -aN -aN -aN +VN +VN +VN +VN +VN +VN +VN +VN +VN mr aN aN @@ -39540,12 +39290,12 @@ aN aN aN aN -ma +ei sq su su sq -ny +ei aN aN aN @@ -39565,7 +39315,7 @@ aN aN wK rw -xz +xd xZ wN wN @@ -39577,8 +39327,8 @@ wN wN wN xZ -xz -qc +xd +xd wK tf qo @@ -39586,19 +39336,19 @@ qs tA wK aN +Rp +Zf +Ld +LO +Rp aN aN aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN +Rp +Ld +Ld +Rc +Rp aN aN aN @@ -39637,15 +39387,15 @@ aN aN aN mr -aN -aN -aN -aN -aN -aN -aN -aN -aN +VN +GJ +Kp +ST +Kp +UG +Kp +zs +VN mr aN aN @@ -39822,7 +39572,7 @@ aN aN wK rv -xz +xd wN yg yr @@ -39834,7 +39584,7 @@ yg yr yH wN -xz +xd rr wK tj @@ -39843,19 +39593,19 @@ tv tz wK aN +Rp +Rp +Li +EI +Rp aN aN aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN +Rp +WL +Yv +Rp +Rp aN aN aN @@ -39894,19 +39644,19 @@ aN aN aN mr -aN -aN -aN -aN -aN -aN -aN -aN -aN +YC +KJ +Kp +Id +Kp +PS +Kp +Yz +YC mr -zn -zn -zF +xQ +xQ +xQ mr zZ Al @@ -40062,14 +39812,14 @@ sq aN aN od -ox -ox -ox +od +od +od oY -ox -ox -ox -pT +od +od +od +od aN aN aN @@ -40079,19 +39829,19 @@ aN aN wK wK -xz +xd rG -xz +xd rG -xz +xd wK wK wK -xz +xd rG -xz +xd rG -xz +xd wK wK wK @@ -40101,17 +39851,17 @@ wK wK aN aN +Rp +Rp +Rp +Rp aN aN aN -aN -aN -aN -aN -aN -aN -aN -aN +Rp +Rp +Rp +Rp aN aN aN @@ -40151,15 +39901,15 @@ aN aN aN mr -aN -aN -aN -aN -aN -aN -aN -aN -aN +VN +DP +Kp +hV +Kp +hV +Kp +RO +VN mr fZ fZ @@ -40318,7 +40068,7 @@ Oq sq aN aN -nV +od og og og @@ -40326,7 +40076,7 @@ og og og og -nV +od aN aN aN @@ -40336,19 +40086,19 @@ aN aN aN aN -xz -yt -xz -yt -xz +xd +yv +xd +yv +xd aN aN aN -xz -yt -xz -yt -xz +xd +yv +xd +yv +xd aN aN aN @@ -40408,15 +40158,15 @@ aN aN aN mr -aN -aN -aN -aN -aN -aN -aN -aN -aN +VN +hV +hV +hV +hV +hV +Ze +hV +VN mr fL yF @@ -40575,7 +40325,7 @@ Oq sq aN aN -nV +od QE og og @@ -40583,7 +40333,7 @@ og og og og -nV +od aN aN aN @@ -40593,19 +40343,19 @@ aN aN aN aN -xz +xd rG -xz +xd rG -xz +xd aN aN aN -xz +xd rG -xz +xd rG -xz +xd aN aN aN @@ -40665,15 +40415,15 @@ aN aN aN mr -aN -aN -aN -aN -aN -aN -aN -aN -aN +VN +Kp +Xo +Ze +Ze +Ze +YV +Kp +VN mr yF yF @@ -40832,7 +40582,7 @@ Oq sq aN aN -nV +od QI og og @@ -40840,36 +40590,36 @@ og og og og -nV -aN -aN -aN -aN -aN -aN +od aN aN aN aN aN aN +od +od +od +od +Fp +od rW -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN +od +Ui +Ui +Ui +od +Fp +od +Fp +od +od +Ui +Ui +od +od +od +od aN aN aN @@ -40922,22 +40672,22 @@ aN aN aN mr -aN -aN -aN -aN -aN -aN -aN -aN -aN +VN +Ln +UP +RZ +RZ +RZ +UP +Ln +VN mr yF yF yF zS yF -An +xQ aN aN aN @@ -41089,7 +40839,7 @@ Oq sq aN aN -nV +od QI og og @@ -41097,37 +40847,37 @@ og og og op -nV -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN +od aN aN aN aN aN aN +od +Su +KF +MV +GU +od +Oe +MI +Rb +Rb +Rb +SJ +Oe +Oz +Oe +SJ +Rb +Rb +Rb +Ic +EE +od +TY +DW aN aN aN @@ -41179,22 +40929,22 @@ aN aN aN mr -aN -aN -aN -aN -aN -aN -aN -aN -aN +VN +Kp +VN +Ya +Jg +Fg +VN +Kp +VN mr yF yF yF yF yF -Ao +xQ aN aN aN @@ -41346,7 +41096,7 @@ Oq sq aN aN -nV +od QI og og @@ -41354,37 +41104,37 @@ og og og og -nV -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN +od aN aN aN aN aN aN +Ui +Kx +GU +GU +GU +HP +Kd +Yn +Yn +Yn +Yn +Yn +Yn +Yn +Yn +Yn +Yn +Yn +Yn +Yn +Ve +Ui +TY +DW aN aN aN @@ -41436,22 +41186,22 @@ aN aN aN mr -aN -aN -aN -aN -aN -aN -aN -aN -aN +YC +MB +Yg +Kp +Kp +Kp +EY +Kb +YC mr yF yF zu zu yF -Ao +xQ aN aN aN @@ -41603,7 +41353,7 @@ Oq sq aN aN -nV +od KA og og @@ -41611,37 +41361,37 @@ og og og og -nV -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN +od aN aN aN aN aN +od +od +HH +GU +GU +GY +Ui +Kd +Yn +WN +WN +WN +WN +WN +Yn +WN +WN +WN +WN +WN +Yn +Ve +Ui +TY +DW aN aN aN @@ -41693,22 +41443,22 @@ aN aN aN mr -aN -aN -aN -aN +VN +VN +VN +YC fw -aN -aN -aN -aN +YC +VN +VN +VN mr yF zj zt zy zC -Ao +xQ aN aN aN @@ -41860,7 +41610,7 @@ Oq sq aN aN -nV +od og og og @@ -41868,37 +41618,37 @@ og og og og -nV -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN +od aN +od +od +Ui +od +od +od +Kx +GU +GU +GY +Ui +Kd +Yn +TT +PM +Nx +Dx +TT +Yn +Nx +Dx +TT +TU +Nx +Yn +Ve +od +Sf +Sf aN aN aN @@ -41965,7 +41715,7 @@ yF yF yF yF -Ao +xQ aN aN aN @@ -42117,45 +41867,45 @@ Oq sq aN aN -oe -ox -ox -ox -ox -ox -ox -ox -pU -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN +od +od +od +od +od +od +od +od +od aN +od +Zd +Hq +TA +FJ +od +EX +Tn +GU +DB +od +Kd +Yn +Rb +Rb +Rb +Rb +Rb +Yn +Rb +GX +Rb +Rb +Rb +Yn +Ve +od +TY +DW aN aN aN @@ -42222,7 +41972,7 @@ yF yF yF yF -Ao +xQ aN aN aN @@ -42384,6 +42134,35 @@ aN aN aN aN +Ui +Rw +Vs +Rs +Eh +od +od +Ui +HP +od +od +iQ +Yn +Yn +Yn +Yn +Yn +Yn +Yn +Yn +Yn +Yn +Yn +Yn +Yn +Ve +Ui +TY +DW aN aN aN @@ -42436,36 +42215,7 @@ aN aN aN aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -xP +xQ ye yw yF @@ -42625,39 +42375,10 @@ aN aN aN aN -ma +sq ei ei -ny -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN +sq aN aN aN @@ -42670,6 +42391,35 @@ aN aN aN aN +Ui +YW +Fd +Vs +Vs +PM +WD +ND +Pq +Jo +Ui +Kd +Yn +WN +WN +WN +WN +WN +Yn +WN +WN +WN +WN +WN +Yn +Ve +od +Sf +Sf aN aN aN @@ -42729,18 +42479,18 @@ at at at at -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN +TD +TD +TD +TD +TD +TD +NN +NN +NN +TD +TD +TD aN aN aN @@ -42898,35 +42648,35 @@ aN aN aN aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN +Ui +Nn +Fd +Vs +Vs +kh +MT +Yn +Yn +Kd +Wh +Kd +Yn +TT +TU +Nx +Dx +TT +Yn +Nx +Dx +TT +PM +Nx +Yn +Ve +Ui +TY +DW aN aN aN @@ -42986,18 +42736,18 @@ at bl bl bl -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN +OB +EW +EW +CX +EW +EW +EW +KD +KD +XB +Wt +VK aN aN aN @@ -43155,35 +42905,35 @@ aN aN aN aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN +Ui +LR +Fd +Vs +Vs +kh +MT +Yn +Yn +Kd +Wh +Kd +Yn +Rb +Rb +Rb +Rb +Rb +Yn +Rb +Rb +Rb +Rb +Rb +Yn +Ve +Ui +TY +DW aN aN aN @@ -43243,18 +42993,18 @@ bk bl bl bl -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN +zG +ZH +PG +Cw +TD +TD +EW +Fq +KD +DZ +Wt +VK aN aN aN @@ -43412,35 +43162,35 @@ aN aN aN aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN +Ui +Gf +Fd +Jb +Vs +PM +ic +RL +ct +My +Ui +Kd +Yn +Yn +Yn +Yn +Yn +Yn +Yn +Yn +Yn +Yn +Yn +Yn +Yn +Ve +od +Sf +Sf aN aN aN @@ -43500,18 +43250,18 @@ at at at at +TD +TD +TD +TD aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN +TD +EW +Fr +KD +qi +TD +TD aN aN aN @@ -43669,35 +43419,35 @@ aN aN aN aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN +Ui +Zx +Vs +Vq +OJ +od +od +Of +Of +od +od +EE +Ij +Oe +Oe +WN +WN +WN +Hf +WN +WN +Yn +Yn +WN +Hf +EE +Ui +TY +DW aN aN aN @@ -43762,12 +43512,12 @@ aN aN aN aN -aN -aN -aN -aN -aN -aN +TD +EW +Qh +KD +No +TD aN aN aN @@ -43926,35 +43676,35 @@ aN aN aN aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN +od +QG +Gy +pR +VS +od +Vn +ct +RL +OA +od +od +od +MP +MP +od +od +od +od +ZQ +Ui +QD +QD +Ui +PM +od +od +TY +DW aN aN aN @@ -44016,15 +43766,15 @@ aN at aN aN -aN -aN -aN -aN -aN -aN -aN -aN -aN +TD +NN +NN +TD +EW +Po +KT +TE +TD aN aN aN @@ -44183,6 +43933,35 @@ aN aN aN aN +od +od +Ui +od +od +od +EV +Kd +FZ +Ub +od +Qa +QH +Oe +Oe +Fy +EM +Pg +od +DH +YX +Ef +Ef +cP +GL +LH +od +Sf +Sf aN aN aN @@ -44230,36 +44009,7 @@ aN aN aN aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -xS +xR au au au @@ -44272,22 +44022,22 @@ aN aN at aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN +TD +TD +Jz +Jz +TD +EW +TD +TD +TD +TD +TD +TD +TD +TD +TD +TD aN at aN @@ -44444,6 +44194,31 @@ aN aN aN aN +od +od +Fk +Kd +FZ +YU +od +CH +id +RJ +RJ +RJ +RJ +IR +Oy +Jx +YX +Ef +Ef +cP +Jx +XG +ZV +TY +DW aN aN aN @@ -44491,32 +44266,7 @@ aN aN aN aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -xS +xR au au au @@ -44528,24 +44278,24 @@ at aN aN at -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN +TD +TD +KD +KD +KD +TD +EW +IX +KD +NE +Mf +Jv +DE +Fi +OG +mJ +TD +TD at aN aN @@ -44702,6 +44452,30 @@ aN aN aN aN +Ui +Fk +Kd +FZ +Ve +od +St +Dk +Cz +Cz +Cz +Cz +WR +Oy +Jx +YX +Ef +Ef +cP +Jx +PX +Fn +TY +DW aN aN aN @@ -44749,31 +44523,7 @@ aN aN aN aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -xS +xR au au bi @@ -44786,23 +44536,23 @@ aN aN at aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN +Fm +Ed +KD +Fu +TD +TD +TD +KD +KD +KD +KD +KD +Fi +Vw +XY +hU +TD at aN aN @@ -44959,6 +44709,30 @@ aN aN aN aN +od +EE +NA +VQ +EE +od +Wm +Jw +eF +EE +Ok +PT +Mc +ZQ +Zi +Ea +ig +Lp +IH +Sp +CV +od +TY +DW aN aN aN @@ -45006,31 +44780,7 @@ aN aN aN aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -xS +xR au Kq bi @@ -45043,23 +44793,23 @@ aN aN at aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN +Fm +SA +YH +Wb +IX +NB +IX +KD +KD +KD +KD +KD +Vk +KD +KD +ZI +TD at aN aN @@ -45216,6 +44966,29 @@ aN aN aN aN +od +Ui +Yk +Yk +Ui +od +od +Ui +Ui +Ui +Ui +Ui +od +od +od +od +Ui +Ui +Ui +Ui +od +od +od aN aN aN @@ -45264,30 +45037,7 @@ aN aN aN aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -xS +xR au au bi @@ -45300,23 +45050,23 @@ aN aN at aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN +Fm +Zk +KD +KD +TD +TD +TD +KD +KD +KD +KD +KD +Fi +MY +Rq +KO +TD at aN aN @@ -45544,7 +45294,7 @@ aN aN aN aN -xS +xR au au au @@ -45556,24 +45306,24 @@ at aN aN at -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN +TD +TD +KD +KD +KD +TD +EW +IX +KD +Xw +PF +ht +ht +Fi +CT +FO +TD +TD at aN aN @@ -45801,7 +45551,7 @@ aN aN aN aN -xS +xR au au au @@ -45814,22 +45564,22 @@ aN aN at aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN +TD +TD +Sl +Sl +TD +EW +TD +TD +TD +TD +TD +TD +TD +TD +TD +TD aN at aN @@ -46058,7 +45808,7 @@ aN aN aN aN -xT +xR aK au au @@ -46072,15 +45822,15 @@ aN at aN aN -aN -aN -aN -aN -aN -aN -aN -aN -aN +TD +Lm +Lm +TD +EW +mE +KD +JE +TD aN aN aN @@ -46332,12 +46082,12 @@ aN aN aN aN -aN -aN -aN -aN -aN -aN +TD +EW +Mw +KD +KD +TD aN aN aN @@ -46584,18 +46334,18 @@ at at at at +TD +TD +TD +TD aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN +TD +EW +MN +Gi +hR +TD +TD aN aN aN @@ -46842,17 +46592,17 @@ bl bl bl zT -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN +Zs +Rx +KC +TD +TD +EW +GQ +KD +KD +Wt +VK aN aN aN @@ -47098,18 +46848,18 @@ at bl bl bl -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN +XS +EW +EW +do +EW +EW +EW +KD +KD +XB +Wt +VK aN aN aN @@ -47355,18 +47105,18 @@ at at at at -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN +TD +TD +TD +TD +TD +TD +Lm +Lm +Lm +TD +TD +TD aN aN aN @@ -48427,7 +48177,7 @@ aN aN ff dP -gO +dP ff aN aN @@ -49480,62 +49230,62 @@ ih ih aN nj -nj -nj -nj -nj -nj -nj -nj -nj -nj -nj -nj -nj -nj -nj -nj -nj -nj -nj -nj -nj -nj -nj -nj -nj -nj -nj -nj -nj -nj -nj -nj -nj -nj -nj -nj -nj -nj -nj -nj -nj -nj -nj -nj -nj -nj -nj -nj -nj -nj -nj -nj -nj -nj -nj -nj -nj +Nd +Nd +Nd +Nd +Nd +Nd +Nd +Nd +Nd +Nd +Nd +Nd +Nd +Nd +Nd +Nd +Nd +Nd +Nd +Nd +Nd +Nd +Nd +Nd +Nd +Nd +Nd +Nd +Nd +Nd +Nd +Nd +Nd +Nd +Nd +Nd +Nd +Nd +Nd +Nd +Nd +Nd +Nd +Nd +Nd +Nd +Nd +Nd +Nd +Nd +Nd +Nd +Nd +Nd +Nd +Nd aN aN aN @@ -49736,7 +49486,7 @@ gL gD ih aN -nj +Nd ab ab ab @@ -49792,7 +49542,7 @@ ab ab ab ab -nj +Nd aN aN aN @@ -49987,13 +49737,13 @@ fo fQ fo fo -go +gp gC gC gU ih aN -nj +Nd ab ab ab @@ -50027,10 +49777,6 @@ ab ab ab ab -ae -ab -ab -ac ab ab ab @@ -50043,13 +49789,17 @@ ab ab ab ab +NL +HM +HM +HM +HM +HM +NL +HM +HM ab -ab -ab -ab -ab -ab -nj +Nd aN aN aN @@ -50244,13 +49994,13 @@ fo fo fo fo -gs -gE -gE -mb +gp +gp +gp +gp ih aN -nj +Nd ab ab ab @@ -50290,23 +50040,23 @@ ab ab ab ab +NL +HM +HM +HM +HM +HM +HM +TR +DC +Re +IW +DC +nY +ZD +hY ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -nj +Nd aN aN aN @@ -50507,7 +50257,7 @@ fo gl ih aN -nj +Nd ab ab ac @@ -50546,24 +50296,24 @@ ab ab ab ab -ae ab +HM +Vo +Vo +Pl +Vo +Vo +HM +TR +DC +DC +DC +DC +Kc +ZD +MH ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -nj +Nd aN aN aN @@ -50764,7 +50514,7 @@ fo gV ih aN -nj +Nd ab ab ae @@ -50804,23 +50554,23 @@ ab ab ab ab +HM +DC +DC +DC +DC +DC +HM +Wz +DC +DC +Es +IP +DC +ZD +Et ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -nj +Nd aN aN aN @@ -50993,7 +50743,7 @@ aN aN aN aN -cR +cS cY cZ dS @@ -51021,7 +50771,7 @@ fo fo ih aN -nj +Nd ab ab ab @@ -51054,30 +50804,30 @@ ab ab ae ab +NL +HM +HM +HM +HM ab ab +HM +DC +YR +DC +DC +DC +HM +Ge +YR +DC +Vc +Mu +HM +HM +bz ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -nj +Nd aN aN aN @@ -51250,7 +51000,7 @@ aN aN aN aN -cR +cS da cZ dU @@ -51273,12 +51023,12 @@ ih ih ih gw -gF -gN +je +je gW ih aN -nj +Nd ab ac ab @@ -51310,31 +51060,31 @@ ab ab ab ab -ag +ab +HM +Ha +NM +PE +HM +Sy +ab +HM +Dz +Kr +To +DC +DC +HM +Kw +DC +DC +Qw +HM ab ab ab ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -nj +Nd aN aN aN @@ -51507,7 +51257,7 @@ aN aN aN aN -cT +cS da cZ dT @@ -51531,11 +51281,11 @@ ke ih gv ls -gM -lu +je +je ih aN -nj +Nd ab ab ab @@ -51567,31 +51317,31 @@ ab ac ab ae -ag +ab +QU +DC +DC +VY +HM +HM +HM +HM +HM +HM +HM +Fc +CO +Mu +HM +jH +UD +HM +HM +HM +HM ab ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -nj +Nd aN aN aN @@ -51781,18 +51531,18 @@ aN ih ft fz -fE +fx je je kf ih -gz +gv gG -gN -gX +je +ls ih aN -nj +Nd ab ab ae @@ -51820,35 +51570,35 @@ ab ab ab ab -hj -hj -hj -hj -ag ab ab ab ab ab +QU +Oj +DC +DC +HM +EU +UA +UA +UA +UA +Lj +DC +DC +EK +dN +DC +DC +iH +DC +ZD +hY ab ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -nj +Nd aN aN aN @@ -52037,19 +51787,19 @@ aN aN ih fs -fy +fx fD ih gd iw ih gy -lu -gM +je +je dd ih aN -nj +Nd ab ab ab @@ -52074,38 +51824,38 @@ ab ab ab ab -hj -hj -hq -nj -nj -nj -nj -hE ab ab ab +Yi +Yi +Yi +Yi +ab +QU +Uw +NZ +DC +cC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +Us +De +ZD +MH ab ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -nj +Nd aN aN aN @@ -52306,7 +52056,7 @@ ih ih ih aN -nj +Nd ab ab ab @@ -52331,38 +52081,38 @@ ab ab ab ab -nj -ho -hr -nj +Yi +eU +eU +Yi hB hn -hu -hE +eU +ab +QU +mH +DC +Lb +HM +cy +Ty +Ty +Ty +Ty +Yl +Gs +DC +DC +DC +DC +DC +iH +DC +ZD +Et ab ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -nj +Nd aN aN aN @@ -52563,7 +52313,7 @@ aN aN aN aN -nj +Nd ab ab ab @@ -52594,32 +52344,32 @@ hn hl hn hn -hz -hE +eU +ab +QU +Dg +DC +DC +HM +HM +HM +HM +HM +HM +Sv +eE +VU +Mu +HM +Vd +Qm +HM +HM +HM +HM ab ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -nj +Nd aN aN aN @@ -52820,7 +52570,7 @@ aN aN aN aN -nj +Nd ab ab ab @@ -52845,38 +52595,38 @@ ab ab ab ab -nj -ho -hr -nj +Yi +eU +eU +Yi hn hn -hz -hE +eU +ab +HM +Dg +Yl +OE +HM +bz +eU +eU +eU +HM +QR +Jr +Uo +HM +PO +DC +DC +Zn +HM ab ab ab ab -ab -bA -iK -iR -pF -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -nj +Nd aN aN aN @@ -53077,7 +52827,7 @@ aN aN aN aN -nj +Nd ab ab ac @@ -53108,32 +52858,32 @@ hn hl hn hn -hz -hI +eU ab +Rl +HM +HM +HM +HM ab -ab -ab -ab -ag -hz +eU pz iZ Cd +QR +Jr +Uo +HM +FP +YR +DC +IO +Mu +HM +HM +Sy ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -nj +Nd aN aN aN @@ -53334,7 +53084,7 @@ aN aN aN aN -nj +Nd ab ab ab @@ -53359,38 +53109,38 @@ ab ab ab ab -nj -ho -hr -nj +Yi +eU +eU +Yi hB hn -hz -hI -ac -ae +eU ab ab ab -ag -hz +ab +ab +ab +ab +eU pA -jd +eU +Sn +QR +EP +Sj +HM +SB +DC +DC +DC +DC +Lc +ZD +hY ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -nj +Nd aN aN aN @@ -53591,7 +53341,7 @@ aN aN aN aN -nj +Nd ab ab ae @@ -53616,38 +53366,38 @@ ab ab ab ab -hm -hm -hs -hu +ab +ab +ab +eU hn hn -hz -hI +eU ab ab ab -ae ab -ag -hz +ab +ab +ab +eU pz -hz +eU +Rl +HM +HM +HM +HM +Cl +YR +DC +DC +DC +Dr +ZD +MH ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -nj +Nd aN aN aN @@ -53702,10 +53452,10 @@ aN aN aN rI -rQ -rQ -rQ -sk +rI +rI +rI +rI aN aN aN @@ -53848,7 +53598,7 @@ aN aN aN aN -nj +Nd ab ab ab @@ -53876,35 +53626,35 @@ ab ab ab ag -hz +eU hn hn -hz -hI +eU ab ab ab ab ab -ag -hz +ab +ab +eU pz -hz -ab -ac +eU ab ab ab ab +HM +HG +Uz +Fo +DC +DC +Ho +ZD +Et ab -ab -ab -ab -ab -ab -ab -ab -nj +Nd aN aN aN @@ -53962,8 +53712,8 @@ rL rR yv yv -se -sk +rI +rI aN aN aN @@ -54105,7 +53855,7 @@ aN aN aN aN -nj +Nd ac ab ab @@ -54130,38 +53880,38 @@ ab ab ab ab -hj -hj +ab +ab hq -hy +eU hn hn -hz -hI -ae +eU ab ab -ad ab -bB -hz +ab +ab +ab +ab +eU pz -hz +eU ab ab ab ab +Rl +HM +HM +HM +HM +HM +Rl +HM +HM ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -nj +Nd aN aN aN @@ -54220,7 +53970,7 @@ rR yv yv yv -rT +rI aN aN aN @@ -54362,7 +54112,7 @@ aN aN aN aN -nj +Nd ab ab ab @@ -54387,23 +54137,23 @@ ab ab ab ab -nj -ho -hr -nj +Yi +eU +eU +Yi hB hn -hz -hI +eU +ab ab ac -hj -hj -bz -hq -hy -pz -hy +ab +ab +ab +ab +eU +yE +eU ab ab ab @@ -54412,13 +54162,13 @@ ab ab ab ab -ad +bJ ab ab ab ab ab -nj +Nd aN aN aN @@ -54474,20 +54224,20 @@ aN aN rN rR -rY -sh +rI +rI yT -rU -rQ -rQ -rQ -rS -rQ -zV -rQ -rQ -rQ -sk +rI +rI +rI +rI +rI +rI +zQ +rI +rI +rI +rI aN aN aN @@ -54619,7 +54369,7 @@ aN aN aN aN -nj +Nd ab ab ab @@ -54650,20 +54400,20 @@ hn hl hn hn -hz -hI +eU ab -hq -nj -nj -nj -nj -nj -iU -nj -nj -nj -nj +ab +ab +Yi +Yi +Yi +Yi +Yi +hn +Yi +Yi +Yi +Yi ab ab ab @@ -54673,9 +54423,9 @@ ae ab ab ab +ag ab -ab -nj +Nd aN aN aN @@ -54729,23 +54479,23 @@ aN aN aN aN -rM -rS -rX +rI +rI +rI sg yM yW zh sy zx -rT +rI zO zW no sS no -tr -sk +rI +rI aN aN aN @@ -54876,7 +54626,7 @@ aN aN aN aN -nj +Nd ab ab ab @@ -54901,17 +54651,17 @@ ab ab ab ab -nj -ho -hr -nj +Yi +eU +eU +Yi hn hn -hz -hI -ag -nj -nj +eU +ab +ab +Yi +Yi ii iq iB @@ -54920,8 +54670,8 @@ hn jg jm ez -nj -nj +Yi +Yi ab ab ab @@ -54929,10 +54679,10 @@ ab ab ab ab -ab -ae -ab -nj +ag +Tw +ag +Nd aN aN aN @@ -54987,7 +54737,7 @@ aN aN aN aN -rT +rI yy yM rZ @@ -54995,17 +54745,17 @@ yX Wk zr zr -rT +rI zO zW zW zW zW -tr -rU -rQ -rQ -sk +rI +rI +rI +rI +rI aN aN aN @@ -55133,7 +54883,7 @@ aN aN aN aN -nj +Nd ab ab ab @@ -55164,10 +54914,10 @@ hn hl hn hn -hz -hI -ag -nj +eU +ab +ab +Yi hQ hn hn @@ -55178,18 +54928,18 @@ jf jk ey fd -nj -hI +Yi +ab ac -ad -hj +bJ ab ab ab ab ab +ag ab -nj +Nd aN aN aN @@ -55252,17 +55002,17 @@ yY Wl zr zr -rT +rI sG zW zW zW zW -rT +rI Bb AM tF -Bq +zQ aN aN aN @@ -55390,7 +55140,7 @@ aN aN aN aN -nj +Nd ab ab ab @@ -55415,16 +55165,16 @@ ab ab ab ab -nj -ho -hr -nj +Yi +eU +eU +Yi hB hn -hy -hK -hq -hM +eU +ab +ab +eU ie hn en @@ -55435,18 +55185,18 @@ jf jn fa fi -nj -hI +Yi ab -bK -nj -nj -nj -nj -nj -nj -nj -nj +ab +eh +Nd +Nd +Nd +Nd +Nd +Nd +Nd +Nd aN aN aN @@ -55501,7 +55251,7 @@ aN aN aN aN -rT +rI sb yM rZ @@ -55511,15 +55261,15 @@ yZ sC rU zQ -zX +zQ sL zQ -zX -rT +zQ +rI WI yM Bi -tI +zQ aN aN aN @@ -55647,7 +55397,7 @@ aN aN aN aN -nj +Nd ab ab ac @@ -55672,16 +55422,16 @@ ab ab ab ab -hm -hm -by -nj +ab +ab +ae +Yi hn hn -nj -nj -nj -nj +Yi +Yi +Yi +Yi hX hn en @@ -55692,11 +55442,11 @@ jf jk ey fh -nj +Yi bJ ab bN -nj +Nd aN aN aN @@ -55758,7 +55508,7 @@ aN aN aN aN -rT +rI sa Wf rZ @@ -55776,7 +55526,7 @@ ts rZ WU Bj -tI +zQ aN aN aN @@ -55904,7 +55654,7 @@ aN aN aN aN -nj +Nd ab ab ab @@ -55931,8 +55681,8 @@ ab ab ab ab -ag -nj +ab +Yi hn hn hD @@ -55949,11 +55699,11 @@ iL jo jM jO -nj -hK -hj -hq -nj +Yi +ab +ab +Nd +cs aN aN aN @@ -56015,7 +55765,7 @@ aN aN aN aN -rT +rI sc yM rZ @@ -56029,11 +55779,11 @@ WI rZ yM AM -rT +rI sn yM Bk -tI +zQ aN aN aN @@ -56161,7 +55911,7 @@ aN aN aN aN -nj +Nd ab ab ab @@ -56188,15 +55938,15 @@ ab ab ab ac -ag -nj +ab +Yi hn hn -nj -nj -nj -nj -nj +Yi +Yi +Yi +Yi +Yi ij hn hn @@ -56205,12 +55955,12 @@ hn hn hn hn -nj -nj -nj -hM -nj -nj +Yi +Yi +Yi +eU +Yi +Yi aN aN aN @@ -56286,11 +56036,11 @@ sn rZ yM AN -rT +rI Bc Bf Bl -Bs +zQ aN aN aN @@ -56418,7 +56168,7 @@ aN aN aN aN -nj +Nd ab ab ae @@ -56446,14 +56196,14 @@ ab ab ab ab -nj +Yi hn hn -nj +Yi aN aN aN -nj +Yi il hn hn @@ -56465,9 +56215,9 @@ hn kb kj ks -kq +kr kJ -nj +Yi aN aN aN @@ -56529,7 +56279,7 @@ aN aN aN aN -rT +rI yy yM rZ @@ -56543,11 +56293,11 @@ rZ rZ yM tk -tr -rS -rQ -rQ -sl +rI +rI +rI +rI +rI aN aN aN @@ -56675,7 +56425,7 @@ aN aN aN aN -nj +Nd ab ab ab @@ -56703,14 +56453,14 @@ ab ab ab ab -nj +Yi hn hn -nj +Yi aN aN aN -nj +Yi ik hn eq @@ -56721,10 +56471,10 @@ hn hn hn kj -kq -kq +kr +kr kJ -nj +Yi aN aN aN @@ -56786,8 +56536,8 @@ aN aN aN rI -rU -sd +rI +rI si yM zc @@ -56800,8 +56550,8 @@ yM rZ si yy -tr -sl +rI +rI aN aN aN @@ -56932,7 +56682,7 @@ aN aN aN aN -nj +Nd ab ab ab @@ -56960,28 +56710,28 @@ ab ab ab ae -nj +Yi hn hn -nj +Yi aN aN aN -nj -nj +Yi +Yi iz -nj -nj -nj -jd +Yi +Yi +Yi +eU iW -jd -nj +eU +Yi BQ -kq -kq +kr +kr kJ -nj +Yi aN aN aN @@ -57044,20 +56794,20 @@ aN aN rL rR -se -sh +rI +rI yT -rS -rQ -rQ +rI +rI +rI aB -rQ -rQ -rQ +rI +rI +rI aB -rQ -rQ -sl +rI +rI +rI aN aN aN @@ -57189,7 +56939,7 @@ aN aN aN aN -nj +Nd ab ab ab @@ -57217,28 +56967,28 @@ ab ab ab ab -nj +Yi hn hn -nj +Yi aN aN aN -nj +Yi im iy iy -nj -nj -hz +Yi +Yi +eU iV -hz -nj +eU +Yi qF -kq -kq +kr +kr kJ -nj +Yi aN aN aN @@ -57304,7 +57054,7 @@ rR yv yv yv -rT +rI aN aN sD @@ -57446,7 +57196,7 @@ aN aN aN aN -nj +Nd ab ab ac @@ -57474,28 +57224,28 @@ ab ac ab ab -nj +Yi hn hn -nj +Yi aN aN aN -nj +Yi io iy iF -nj -nj -hz +Yi +Yi +eU iV -hz -nj +eU +Yi qG -kq -kq +kr +kr kJ -nj +Yi aN aN aN @@ -57560,8 +57310,8 @@ rN rR yv yv -rY -sl +rI +rI aN aN aN @@ -57703,7 +57453,7 @@ aN aN aN aN -nj +Nd ab ab ab @@ -57731,28 +57481,28 @@ ab ab ab ab -nj +Yi hn hn -nj +Yi aN aN aN -nj +Yi in iA -nj -nj -nj -hz +Yi +Yi +Yi +eU iX -hz -nj +eU +Yi kl -kq -kC +kr +BW kL -nj +Yi aN aN aN @@ -57813,11 +57563,11 @@ aN aN aN aN -rM -rQ -rQ -rQ -sl +rI +rI +rI +rI +rI aN aN aN @@ -57960,56 +57710,56 @@ aN aN aN aN -nj +Nd ab -ef -it -it -it -it -it -it -it -it -it -it -it -ge +Yi +Yi +Yi +Yi +Yi +Yi +Yi +Yi +Yi +Yi +Yi +Yi +Yi ab -nj -nj -nj +Yi +Yi +Yi eU -iR -hr -nj -nj -nj -nj -nj -nj -nj +eU +eU +Yi +Yi +Yi +Yi +Yi +Yi +Yi Cc Cc -nj +Yi aN aN aN -nj -nj -nj -nj -nj -nj -hz +Yi +Yi +Yi +Yi +Yi +Yi +eU iV -hz -nj -nj -nj -nj -nj -nj +eU +Yi +Yi +Yi +Yi +Yi +Yi aN aN aN @@ -58217,23 +57967,23 @@ aN aN aN aN -nj +Nd ab -it -eA -eA -eA -eA -eA -eA -eA -eA -eA -eA -eA -it -hM -nj +Yi +GA +GA +GA +GA +GA +GA +GA +GA +GA +GA +GA +Yi +eU +Yi kn kT mt @@ -58245,26 +57995,26 @@ AY Bd gY gI -nj +Yi kr kr -nj +Yi aN aN aN aN aN -nj +Yi iJ gj gj -hz +eU iV -hz +eU gj gj jz -nj +Yi aN aN aN @@ -58474,23 +58224,23 @@ aN aN aN aN -nj +Nd ab -it -eA -eA -eA -eA -eA -eA -eA -eA -eA -eA -eA -it +Yi +EF +Rg +Mi +UC +Mz +Qy +Qy +Nb +Sq +PU +GA +Yi kr -nj +Yi kp kr kr @@ -58502,26 +58252,26 @@ kr kr kr mv -nj +Yi kr kr -nj +Yi aN aN aN aN aN -nj +Yi gj gi iI -hz +eU iW -hz +eU iI jv gj -nj +Yi aN aN aN @@ -58731,21 +58481,21 @@ aN aN aN aN -nj +Nd ab -it -eA -eA -eA -eA -eA -eA -eA -eA -eA -eA -eA -it +Yi +RF +Rg +Ud +ZC +Mi +Mi +Mi +Mi +Mi +Mi +Xs +Yi kr hA kr @@ -58762,23 +58512,23 @@ kr BM kr kr -nj +Yi aN aN aN aN aN -nj +Yi gi iu bD iv iP iv -bF +bD ju jv -nj +Yi aN aN aN @@ -58988,23 +58738,23 @@ aN aN aN aN -nj +Nd ab -it -eA -eA -eA -eA -eA -eA -eA -eA -eA -eA -eA -it +Yi +Vi +Rg +Mi +RR +Ph +Ph +Ph +Mi +Sq +JH +GA +Yi mv -nj +Yi kK kr kr @@ -59016,16 +58766,16 @@ kr kr kr mv -nj +Yi kr kr -nj +Yi aN aN aN aN aN -nj +Yi gx bD iv @@ -59033,9 +58783,9 @@ KX iS KX iv -bF +bD jJ -nj +Yi aN aN aN @@ -59245,23 +58995,23 @@ aN aN aN aN -nj +Nd ab -it -eA -eA -eA -eA -eA -eA -eA +Yi +GA +GA +GA +GA +GA +GA +GA eV -eA -eA -eA -it +GA +GA +GA +Yi kr -nj +Yi hO kr kr @@ -59273,16 +59023,16 @@ AZ Be Bh Bm -nj +Yi kr kr -nj +Yi aN aN aN aN aN -nj +Yi gx iv KX @@ -59292,7 +59042,7 @@ iS KX iv jJ -nj +Yi aN aN aN @@ -59502,44 +59252,44 @@ aN aN aN aN -nj +Nd ab -eg -it -it -it -it -it -it -it +Yi +Yi +Yi +Yi +Yi +Yi +Yi +Yi ej -it -it -it -gh +Yi +Yi +Yi +Yi kr -nj -nj +Yi +Yi oA AX oA -nj -nj +Yi +Yi BD -nj -nj -nj -nj -nj +Yi +Yi +Yi +Yi +Yi gg kr -nj +Yi aN aN aN aN aN -nj +Yi hg iP iS @@ -59549,7 +59299,7 @@ KW iS km jK -nj +Yi aN aN aN @@ -59759,44 +59509,44 @@ aN aN aN aN -nj +Nd ab ab ab ab ab ab -hm -hs -nj +ab +ab +Yi hN ji kr ga kr kr -nj +Yi nF oz kr Br By -nj +Yi gg kr BT BV BX -nj +Yi kr kr -nj +Yi aN aN aN aN aN -nj +Yi gx iv KY @@ -59806,7 +59556,7 @@ iS KY iv jJ -nj +Yi aN aN aN @@ -60016,7 +59766,7 @@ aN aN aN aN -nj +Nd ab ab ab @@ -60024,46 +59774,46 @@ ab ab ae ab -ag -nj +ab +Yi jh kr kr ai kr kr -nj +Yi nI kr kr kr Bz -nj +Yi BS BZ BU BW BY -nj +Yi kr kr -nj +Yi aN aN aN aN aN -nj +Yi gx -bE +bD iv KY iS iS iv -bG +bD jJ -nj +Yi aN aN aN @@ -60273,7 +60023,7 @@ aN aN aN aN -nj +Nd ab ab ab @@ -60282,45 +60032,45 @@ ab ab ab ab -nj +Yi eU -iR -hr -nj -nj +eU +eU +Yi +Yi jC -nj +Yi gg kr kr kr mv -nj -nj -nj -nj -nj -nj -nj +Yi +Yi +Yi +Yi +Yi +Yi +Yi kr kr -nj +Yi aN aN aN aN aN -nj +Yi hx iG -bE +bD iv iP iv -bG +bD jx jy -nj +Yi aN aN aN @@ -60530,7 +60280,7 @@ aN aN aN aN -nj +Nd ab ab ab @@ -60542,8 +60292,8 @@ ab ab ab ab -hs -nj +ab +Yi nW Ca nB @@ -60552,7 +60302,7 @@ kr Bo Bu kr -nj +Yi zL kr ga @@ -60561,13 +60311,13 @@ kr kr kr kr -nj +Yi aN aN aN aN aN -nj +Yi hG hx iT @@ -60577,7 +60327,7 @@ iT iT jy jz -nj +Yi aN aN aN @@ -60787,7 +60537,7 @@ aN aN aN aN -nj +Nd ab ab ab @@ -60800,7 +60550,7 @@ ab ab ae ab -nj +Yi eT kr nx @@ -60818,23 +60568,23 @@ kr kr kr kr -nj +Yi aN aN aN aN aN -nj -nj -nj -nj -nj -nj -nj -nj -nj -nj -nj +Yi +Yi +Yi +Yi +Yi +Yi +Yi +Yi +Yi +Yi +Yi aN aN aN @@ -61044,7 +60794,7 @@ aN aN aN aN -nj +Nd ab ab ab @@ -61056,8 +60806,8 @@ ab ab ab ab -hq -nj +ab +Yi BO Cb nB @@ -61066,7 +60816,7 @@ kr Bp Bv kr -nj +Yi zL kr gb @@ -61075,7 +60825,7 @@ kr kr kr kr -nj +Yi aN aN aN @@ -61301,7 +61051,7 @@ aN aN aN aN -nj +Nd ab ab ab @@ -61310,29 +61060,29 @@ ab ac ab ab -nj +Yi eU -iR -hr -nj -nj +eU +eU +Yi +Yi kk -nj +Yi gg kr kr kr mv -nj -nj -nj -nj -nj -nj -nj +Yi +Yi +Yi +Yi +Yi +Yi +Yi kr kr -nj +Yi aN aN aN @@ -61558,7 +61308,7 @@ aN aN aN aN -nj +Nd ab ab ab @@ -61566,30 +61316,30 @@ ac ab ab ab -ag -nj +ab +Yi hN kr kr nr kr kr -nj +Yi nM kr kr kr BB -nj +Yi BE BH BI BJ BK -nj +Yi kr kr -nj +Yi aN aN aN @@ -61815,7 +61565,7 @@ aN aN aN aN -nj +Nd ab ab ab @@ -61823,30 +61573,30 @@ ab ab ab ab -hq -nj +ab +Yi jh ns kr gb kr kr -nj +Yi nL oz kr kr BA -nj +Yi gg gb kr kr kr -nj +Yi kr kr -nj +Yi aN aN aN @@ -62072,38 +61822,38 @@ aN aN aN aN -nj +Nd ab -ef -it -it -it -it -it -it -it +Yi +Yi +Yi +Yi +Yi +Yi +Yi +Yi eZ -it -it -it -gm +Yi +Yi +Yi +Yi kr -nj -nj +Yi +Yi zN nx zN -nj -nj +Yi +Yi BF -nj -nj -nj -nj -nj +Yi +Yi +Yi +Yi +Yi gg kr -nj +Yi aN aN aN @@ -62329,23 +62079,23 @@ aN aN aN aN -nj +Nd ab -it -eA -eA -eA -eA -eA -eA -eA +Yi +So +So +So +So +So +So +So fc -eA -eA -eA -it +So +So +gj +Yi kr -nj +Yi zL kr kr @@ -62357,10 +62107,10 @@ Ba Bd gY gI -nj +Yi kr kr -nj +Yi aN aN aN @@ -62586,23 +62336,23 @@ aN aN aN aN -nj +Nd ab -it -eA -eA -eA -eA -eA -eA -eA -eA -eA -eA -eA -it +Yi +Lx +Ax +SN +KM +Hx +Hx +ZK +KQ +GD +So +So +Yi mv -nj +Yi gg kr kr @@ -62614,10 +62364,10 @@ kr kr kr mv -nj +Yi kr kr -nj +Yi aN aN aN @@ -62843,21 +62593,21 @@ aN aN aN aN -nj +Nd ab -it -eA -eA -eA -eA -eA -eA -eA -eA -eA -eA -eA -it +Yi +eG +Ax +ci +ci +ci +ci +ci +ci +ci +Mq +Ap +Yi kr hA kr @@ -62874,7 +62624,7 @@ kr BN kr kr -nj +Yi aN aN aN @@ -63100,23 +62850,23 @@ aN aN aN aN -nj +Nd ab -it -eA -eA -eA -eA -eA -eA -eA -eA -eA -eA -eA -it +Yi +Qe +Ax +EL +OQ +OQ +OQ +Qf +KQ +UJ +So +So +Yi kr -nj +Yi gg kr kr @@ -63128,10 +62878,10 @@ kr kr kr jG -nj +Yi kr kr -nj +Yi aN aN aN @@ -63357,23 +63107,23 @@ aN aN aN aN -nj +Nd ab -it -eA -eA -eA -eA -eA -eA -eA -eA -eA -eA -eA -it -hM -nj +Yi +So +So +So +So +So +So +So +So +So +So +gj +Yi +eU +Yi ix ix iE @@ -63385,10 +63135,10 @@ jq iE jD jF -nj +Yi kr kr -nj +Yi aN aN aN @@ -63614,38 +63364,38 @@ aN aN aN aN -nj +Nd ab -eg -it -it -it -it -it -it -it -it -it -it -it -gB +Yi +Yi +Yi +Yi +Yi +Yi +Yi +Yi +Yi +Yi +Yi +Yi +Yi ab -nj -nj -nj -nj -nj -nj +Yi +Yi +Yi +Yi +Yi +Yi BC -nj -nj -nj -nj -nj -nj +Yi +Yi +Yi +Yi +Yi +Yi kr kr -nj +Yi aN aN aN @@ -63871,7 +63621,7 @@ aN aN aN aN -nj +Nd ab ab ab @@ -63887,7 +63637,7 @@ ab ab ac ab -nj +Yi nv kr kr @@ -63899,10 +63649,10 @@ ga kr kr BL -nj +Yi kr kr -nj +Yi aN aN aN @@ -64128,7 +63878,7 @@ aN aN aN aN -nj +Nd ab ab ab @@ -64144,7 +63894,7 @@ ab ab eh ab -nj +Yi nS kr nS @@ -64156,10 +63906,31 @@ kr BG kr BG -nj +Yi mG mv -nj +Yi +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN aN aN aN @@ -64209,27 +63980,6 @@ aN aN aN aN -Vz -Vz -Vz -Vz -Vz -Vz -Vz -Vz -Vz -Vz -Vz -Vz -Vz -Vz -Vz -Vz -Vz -Vz -Vz -Vz -Vz aN aN aN @@ -64385,7 +64135,7 @@ aN aN aN aN -nj +Nd ab ab ab @@ -64399,9 +64149,9 @@ ab ab ab ac -ab -ab -nj +Nd +Nd +Yi nP kr nP @@ -64413,10 +64163,31 @@ kr nP kr nP -nj +Yi Ot Ot -nj +Yi +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN aN aN aN @@ -64466,27 +64237,6 @@ aN aN aN aN -Vz -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vz aN aN aN @@ -64642,38 +64392,59 @@ aN aN aN aN -nj -nj -nj -nj -nj -nj -nj -nj -nj -nj -nj -nj -nj -nj -nj -nj -nj -nj -nj -nj -nj -nj -nj -nj -nj -nj -nj -nj -nj +Nd +Nd +Nd +Nd +Nd +Nd +Nd +Nd +Nd +Nd +Nd +Nd +Nd +Nd +Nd +cs +Yi +Yi +Yi +Yi +Yi +Yi +Yi +Yi +Yi +Yi +Yi +Yi +Yi kr kr -nj +Yi +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN aN aN aN @@ -64723,27 +64494,6 @@ aN aN aN aN -Vz -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vz aN aN aN @@ -64927,10 +64677,31 @@ aN aN aN aN -nj +Yi DG mv -nj +Yi +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN aN aN aN @@ -64980,27 +64751,6 @@ aN aN aN aN -Vz -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vz aN aN aN @@ -65186,7 +64936,7 @@ Hr Hr Hr Om -GZ +Om Hr Hr Hr @@ -65237,27 +64987,27 @@ aN aN aN aN -Vz -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vz +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN aN aN aN @@ -65494,27 +65244,27 @@ aN aN aN aN -Vz -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vz +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN aN aN aN @@ -65751,27 +65501,27 @@ aN aN aN aN -Vz -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vz +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN aN aN aN @@ -65895,7 +65645,7 @@ ak ak ak ak -cb +aa aN aN aN @@ -66008,27 +65758,27 @@ aN aN aN aN -Vz -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vz +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN aN aN aN @@ -66119,7 +65869,7 @@ aN aN ur aN -wq +ur aN aN aN @@ -66265,27 +66015,27 @@ aN aN aN aN -Vz -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vz +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN aN aN aN @@ -66374,10 +66124,10 @@ aN aN aN ur -uE -Ar -uE -wq +ur +uu +ur +ur aN aN aN @@ -66522,27 +66272,6 @@ aN aN aN aN -Vz -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vz aN aN aN @@ -66606,11 +66335,32 @@ aN aN aN aN -us -uE +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +ur +ur wb -uE -vP +ur +ur aN aN aN @@ -66619,10 +66369,10 @@ aN aN aN ur -uS -uX -vq -wq +uu +uu +uu +ur aN aN aN @@ -66630,12 +66380,12 @@ aN aN aN ur -uA +ur Ac xh Ay -uA -wq +ur +ur aN aN aN @@ -66779,27 +66529,27 @@ aN aN aN aN -Vz -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Qr -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vz +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN aN aN aN @@ -66861,12 +66611,12 @@ aN aN aN aN -vC +uD aN aN -uA +ur uT -uA +ur aN aN aN @@ -66875,23 +66625,23 @@ aN aN aN ur -uE +ur yj uT yJ -uE -wq +ur +ur aN aN aN aN aN aN -uA +ur Ae xh AA -uA +ur aN aN aN @@ -67036,27 +66786,27 @@ aN aN aN aN -Vz -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vz +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN aN aN aN @@ -67113,42 +66863,42 @@ aN aN aN ur -uE -uS -uX -uX -vq -uE -uE -uE -uA +ur +uu +uu +uu +uu +ur +ur +ur +ur wc -uA -wq +ur +ur aN aN aN aN aN aN -uA -xM +ur +ur yi yz uT -wm -uA +ur +ur aN aN aN aN aN aN -uA +ur Ad xh Az -uA +ur aN aN aN @@ -67241,11 +66991,11 @@ aN Hr ED Qu -UZ +NW WA WA WA -UZ +NW WA ED Hr @@ -67293,27 +67043,27 @@ aN aN aN aN -Vz -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vz +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN aN aN aN @@ -67369,7 +67119,7 @@ aN aN aN ur -uA +ur uI uU uY @@ -67377,36 +67127,36 @@ vj vr vD vJ -uA -vU +ur +ur uT -uA -uE -wF -uE -wF -uE -wF -uE -uA +ur +ur +uu +ur +uu +ur +uu +ur +ur xV uT uT uT yR -uA +ur aN aN aN aN aN ur -uA -uE +ur +ur As -uE -uA -wq +ur +ur +ur aN aN aN @@ -67426,7 +67176,7 @@ aN aN "} (213,1,1) = {" -ah +aa an an an @@ -67437,7 +67187,7 @@ an an an an -bZ +aa ak ak ak @@ -67448,7 +67198,7 @@ ak ak ak ak -cb +aa aN aN aN @@ -67498,12 +67248,12 @@ aN Hr Hr NW -Qc +NW HN WA ip -Ri -ZE +NW +NW Hr Hr aN @@ -67550,27 +67300,27 @@ aN aN aN aN -Vz -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vz +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN aN aN aN @@ -67634,10 +67384,10 @@ uT uT uT vI -uA +ur uT uT -uA +ur ws uT wI @@ -67645,26 +67395,26 @@ uT xa xo xx -uA +ur xU uT uT uT yP -uA +ur aN aN aN aN ur -uE -uE -Af +ur +ur +ur xh -zD +ur zK -uE -wq +ur +ur aN aN aN @@ -67807,27 +67557,6 @@ aN aN aN aN -Vz -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vz aN aN aN @@ -67883,7 +67612,28 @@ aN aN aN aN -uB +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +uu uK uT vb @@ -67891,10 +67641,10 @@ uT vy uT uT -vh +uu uT uT -uA +ur wu uT wL @@ -67902,18 +67652,18 @@ uT xc uT xA -uA +ur xX yk uT yK yU -uA +ur aN aN aN aN -uA +ur zJ zY xh @@ -67921,7 +67671,7 @@ xh xh AF zJ -uA +ur aN aN aN @@ -68012,11 +67762,11 @@ aN Hr ED WA -UZ +NW WA WA WA -UZ +NW WA ED Hr @@ -68064,27 +67814,6 @@ aN aN aN aN -Vz -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vz aN aN aN @@ -68140,7 +67869,28 @@ aN aN aN aN -uB +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +uu uJ uT uZ @@ -68151,7 +67901,7 @@ uT vN uT uT -vh +uu wt uT wJ @@ -68159,18 +67909,18 @@ uT xb uT xy -uA +ur xW uT uT uT yS -uA +ur aN aN aN aN -uA +ur zI zU xh @@ -68178,7 +67928,7 @@ xh xh AE AG -uA +ur aN aN aN @@ -68269,12 +68019,12 @@ aN Hr Hr NW -Qc +NW HN WA ip -Ri -ZE +NW +NW Hr Hr aN @@ -68321,27 +68071,6 @@ aN aN aN aN -Vz -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vz aN aN aN @@ -68397,7 +68126,28 @@ aN aN aN aN -uB +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +uu uM uT vc @@ -68405,7 +68155,7 @@ uT vz uT uT -vh +uu uT uT wl @@ -68416,26 +68166,26 @@ uT uT uT uT -uA +ur ya uT uT uT za -uA +ur aN aN aN aN -us +ur zK -uE -Ag +ur +ur xh -zE -uE -uE -vP +ur +ur +ur +ur aN aN aN @@ -68578,27 +68328,6 @@ aN aN aN aN -Vz -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vz aN aN aN @@ -68654,7 +68383,28 @@ aN aN aN aN -uC +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +uu uL uT uT @@ -68662,10 +68412,10 @@ uT uT uT vI -uA +ur uT uT -vh +uu uT uT uT @@ -68673,25 +68423,25 @@ wT xe xp xB -uA +ur xY uT uT uT yV -uA +ur aN aN aN aN aN -us -uA -uE +ur +ur +ur At -uE -uA -vP +ur +ur +ur aN aN aN @@ -68783,11 +68533,11 @@ aN Hr ED WA -DL +NW WA Iz WA -DL +NW WA ED Hr @@ -68835,27 +68585,6 @@ aN aN aN aN -Vz -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vz aN aN aN @@ -68910,8 +68639,29 @@ aN aN aN aN -us -uA +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +ur +ur uN uV vg @@ -68919,45 +68669,45 @@ vk vA vE vK -uA +ur uT uT -uA +ur ww uT uT -wU -uE -uE -uE -uA +ur +ur +ur +ur +ur yb uT uT uT zb -uA +ur +aN +Dv +Dv +Dv +Dv aN ur -uS -vq -wq -aN -uA Ai xh AC -uA +ur +aN +Dv +ur +uu +ur +aN +aN +aN aN ur -uS -vq -wq -aN -aN -aN -aN -wq aN aN aN @@ -68968,7 +68718,7 @@ aN aN "} (219,1,1) = {" -ah +aa an an an @@ -68979,7 +68729,7 @@ an an an an -bZ +aa an an an @@ -68990,7 +68740,7 @@ an an an an -eW +aa aN aN aN @@ -69092,27 +68842,27 @@ aN aN aN aN -Vz -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vc -Vz +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN aN aN aN @@ -69169,53 +68919,53 @@ aN aN aN uD -uE -uE -uE -uE -uE -uE -uE -uA +ur +ur +ur +ur +ur +ur +ur +ur uT uT -uA +ur wv uT wM -uA +ur xf xq xC -uA -xN +ur +ur uT uT uT -wU -uA +ur +ur aN -uA -uT -uT +ur uu +uu +ur aN -uA +ur Ah xh AB -uA +ur aN +ur +ur +uT +ur +ur uu -uT -uT -uA -uE -uS -uX -vq -uA -wq +uu +uu +ur +ur aN aN aN @@ -69228,12 +68978,12 @@ aN af bt QT -am +bH aY aF -aT +aF aY -bw +bH QT bt cd @@ -69258,13 +69008,34 @@ aN aN aN aN -bZ -bZ -bZ -bZ -bZ -bZ -bZ +aa +aa +aa +aa +aa +aa +aa +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN aN aN aN @@ -69349,27 +69120,6 @@ aN aN aN aN -Vz -Vz -Vz -Vz -Vz -Vz -Vz -Vz -Vz -Vz -Vz -Vz -Vz -Vz -Vz -Vz -Vz -Vz -Vz -Vz -Vz aN aN aN @@ -69427,53 +69177,53 @@ aN aN aN Dv -us -uA +ur +ur vl uT vF uT -uA +ur uT uT -uA +ur wy uT wM -uA +ur xh xh xh -uA -uE +ur +ur yl yl yl -uE -uA +ur +ur aN -uA +ur uT uT -uB +uu aN -uA +ur Aj xh AD -uA +ur aN -uB +uu uT uT -uA +ur AJ uT AO AQ AT -uA -wq +ur +ur aN aN aN @@ -69485,12 +69235,12 @@ aN af Rj bH -aw +QT aY ao ao aY -bx +QT bH Rj cd @@ -69515,13 +69265,13 @@ aN aN aN aN -bZ +aa jl jl jl jl jl -bZ +aa aN aN aN @@ -69685,45 +69435,45 @@ aN aN aN aN -vh +uu uT uT uT uT -uA +ur uT uT -uA +ur wx uT wM -uA +ur xg xh xD -uA -xM +ur +ur uT uT uT -wm -uA +ur +ur aN -uA +ur uT uT -uB +uu aN -us -Ag +ur +ur xh -zE -vP +ur +ur aN -uB +uu uT uT -vh +uu uT uT uT @@ -69742,12 +69492,12 @@ aN af bt QT -am +bH aY av av aY -bw +bH QT bt cd @@ -69770,17 +69520,17 @@ aN aN aN aN -bZ -bZ -bZ +aa +aa +aa fM fM fM fM fM -bZ -bZ -bZ +aa +aa +aa aN aN aN @@ -69942,42 +69692,42 @@ aN aN aN aN -uA +ur vm uT vG uT -vh +uu uT uT -uA -vV +ur +ur uT uT -uA +ur xi xh xE -uA +ur uT uT uT uT uT -uA +ur Dv -uA +ur uT uT -uC +uu aN aN -uA +ur At -uA +ur aN aN -uC +uu uT uT AI @@ -69986,7 +69736,7 @@ uT uT uT AV -uB +uu aN aN aN @@ -69999,12 +69749,12 @@ aN af Rj bH -aw +QT aY ao ao aY -bx +QT bH Rj cd @@ -70027,17 +69777,17 @@ aN aN aN aN -bZ +aa dE fG -bZ -bZ -bZ -bZ -bZ +aa +aa +aa +aa +aa gJ gR -bZ +aa aN aN aN @@ -70199,7 +69949,7 @@ aN aN aN aN -vh +uu uT uT uT @@ -70207,43 +69957,43 @@ uT vO uT uT -wm -uE -wF +ur +ur +uu wl -uE -uE +ur +ur xr -uE -xM +ur +ur uT ym ym ym uT -wm -uE -xM +ur +ur +ur uT uT -wm -uS -vq -xM +ur +uu +uu +ur uT -wm -uS -vq -xM +ur +uu +uu +ur uT uT -vh +uu uT uT uT uT AU -uC +uu aN aN aN @@ -70256,12 +70006,12 @@ aN af bt QT -am +bH aY -aG -aU +aF +aF aY -bw +bH QT bt cd @@ -70284,17 +70034,17 @@ aN aN aN aN -bZ +aa dE fG -bZ -bZ -bZ -bZ -bZ +aa +aa +aa +aa +aa gJ gR -bZ +aa aN aN aN @@ -70456,12 +70206,12 @@ aN aN aN aN -uA +ur vo uT vH uT -vh +uu uT uT uT @@ -70494,14 +70244,14 @@ uT uT uT uT -uA +ur AK AL AP AR AW -uA -vP +ur +ur aN aN aN @@ -70510,7 +70260,7 @@ aN aN "} (225,1,1) = {" -ah +aa an an an @@ -70521,7 +70271,7 @@ an an an an -bZ +aa an an an @@ -70532,7 +70282,7 @@ an an an an -eW +aa aN aN aN @@ -70541,17 +70291,17 @@ aN aN aN aN -bZ +aa dE fG -bZ -bZ -bZ -bZ -bZ +aa +aa +aa +aa +aa gJ gR -bZ +aa aN aN aN @@ -70713,13 +70463,13 @@ aN aN aN aN -vh +uu vn uT vn uT -uA -vV +ur +ur uT uT uT @@ -70750,14 +70500,14 @@ uT uT uT uT -wU -uA -uE -uS -uX -vq -uA -vP +ur +ur +ur +uu +uu +uu +ur +ur aN aN aN @@ -70771,7 +70521,7 @@ af aj aO aO -Gx +bo bo bo Ew @@ -70798,17 +70548,17 @@ aN aN aN aN -bZ +aa dE fG -bZ -bZ -bZ -bZ -bZ +aa +aa +aa +aa +aa gJ gR -bZ +aa aN aN aN @@ -70970,50 +70720,50 @@ aN aN aN aN -uA +ur DX uT -DX uT -uA -uE -uE -uE -uE -uE -uE -uE -uE -uE -uE -xN +uT +ur +ur +ur +ur +ur +ur +ur +ur +ur +ur +ur +ur uT ym ym ym uT -wU -uE -uE -uE -uE -uE -uE -uE -uE -uE -uE -uE -uE -uE -uE -uE -vP +ur +ur +ur +ur +ur +ur +ur +ur +ur +ur +ur +ur +ur +ur +ur +ur +ur aN aN aN aN -vP +ur aN aN aN @@ -71028,7 +70778,7 @@ af al aO aO -Gx +bo bn aH aH @@ -71055,17 +70805,17 @@ aN aN aN aN -bZ +aa dE fG -bZ -bZ -bZ -bZ -bZ +aa +aa +aa +aa +aa gJ gR -bZ +aa aN aN aN @@ -71227,29 +70977,29 @@ aN aN aN Dv -uA +ur vp vB vp vM -uA -vP +ur +ur aN aN uD -uA +ur wO vY xj xs xF -uA +ur uT uT uT uT uT -uA +ur aN aN aN @@ -71264,7 +71014,7 @@ aN aN aN aN -vP +ur aN aN aN @@ -71285,7 +71035,7 @@ af al aO aO -Gx +bo bq aM aM @@ -71312,8 +71062,8 @@ aN aN aN aN -bZ -bZ +aa +aa ja fO fO @@ -71321,8 +71071,8 @@ fO fO fO lC -bZ -bZ +aa +aa aN aN aN @@ -71484,35 +71234,35 @@ aN aN aN aN -us -uE -uS -vq -uE -vP +ur +ur +uu +uu +ur +ur aN aN aN aN -wG +uu vY vY vY vY xG -uA -xN +ur +ur uT uT uT -wU -uA -uE -uE -uE -uE -uE -wq +ur +ur +ur +ur +ur +ur +ur +ur aN aN aN @@ -71542,7 +71292,7 @@ af al aO aO -Gx +bo IU aS aS @@ -71570,7 +71320,7 @@ aN aN aN aN -bZ +aa jb fN fN @@ -71578,7 +71328,7 @@ fN fN fN lD -bZ +aa aN aN aN @@ -71751,28 +71501,28 @@ Dv aN aN ur -uA +ur vY wV vY vY vY -uA -uA +ur +ur uT uT uT -uA -uA +ur +ur xh zl zv zz -zD -uA -wq +ur +ur +ur aN -wq +ur aN aN aN @@ -71827,7 +71577,7 @@ aN aN aN aN -bZ +aa jc jp jp @@ -71835,7 +71585,7 @@ jp jp jp jp -bZ +aa aN aN aN @@ -72004,33 +71754,33 @@ aN aN aN ur -uA -wf -wo -uE -uA +ur +uu +uu +ur +ur wP wW xk xt vY -uA -uA +ur +ur uT uT uT -uA -uA +ur +ur zf xh -GP +xh xh xh bO -uA -Ak -uA -wq +ur +uu +ur +ur aN aN aN @@ -72052,7 +71802,7 @@ aN aN "} (231,1,1) = {" -ah +aa an an an @@ -72063,7 +71813,7 @@ an an an an -bZ +aa an an an @@ -72074,7 +71824,7 @@ an an an an -eW +aa aN aN aN @@ -72084,7 +71834,7 @@ aN aN aN aN -bZ +aa jc jp jp @@ -72092,7 +71842,7 @@ jp jp jp jp -bZ +aa aN aN aN @@ -72260,24 +72010,24 @@ aN aN aN aN -uA +ur vW wd wn wz -uA -uE -uE -uE -uE +ur +ur +ur +ur +ur xH -uA -uA +ur +ur uT uT uT -wm -uA +ur +ur xh xh xh @@ -72286,7 +72036,7 @@ xh Hb Hg Hu -uA +ur aN aN aN @@ -72341,7 +72091,7 @@ aN aN aN aN -bZ +aa jc jp jp @@ -72349,7 +72099,7 @@ jp jp jp jp -bZ +aa aN aN aN @@ -72517,7 +72267,7 @@ aN aN aN aN -vR +uu vY wi vY @@ -72528,22 +72278,22 @@ uT uT uT uT -uA -uA +ur +ur uT uT uT uT zd xh -GP xh -GP +xh +xh xh zM Hh Hv -Au +uu aN aN aN @@ -72598,7 +72348,7 @@ aN aN aN aN -bZ +aa jc jp jp @@ -72606,7 +72356,7 @@ jp jp jp jp -bZ +aa aN aN aN @@ -72774,24 +72524,24 @@ aN aN aN aN -vQ +uu vX vY vY wA -uA -uE -uE -uE +ur +ur +ur +ur uT uT -uA -uA +ur +ur uT uT uT -wU -uA +ur +ur xh xh xh @@ -72800,7 +72550,7 @@ xh Hb Hi Hw -uA +ur aN aN aN @@ -72855,7 +72605,7 @@ aN aN aN aN -bZ +aa jc jp jp @@ -72863,7 +72613,7 @@ jp jp jp jp -bZ +aa aN aN aN @@ -73031,34 +72781,34 @@ aN aN aN aN -vQ +uu vZ vY vY wB -uA +ur wR wY xm uT uT -uA -xM +ur +ur uT uT uT -uA -uA +ur +ur zf xh -GP xh xh -bP -uA -Ak -uA -vP +xh +bO +ur +uu +ur +ur aN aN aN @@ -73112,15 +72862,15 @@ aN aN aN aN -bZ +aa jc jp jp -kB -kB jp jp -bZ +jp +jp +aa aN aN aN @@ -73288,7 +73038,7 @@ aN aN aN aN -vT +uu vY vY vY @@ -73304,17 +73054,17 @@ uT uT uT uT -uA -uA +ur +ur xh zm zw zA -zE -uA -vP +ur +ur +ur aN -vP +ur aN aN aN @@ -73369,7 +73119,7 @@ aN aN aN aN -bZ +aa jc jp jp @@ -73377,7 +73127,7 @@ gk gn jp lE -bZ +aa aN aN aN @@ -73545,30 +73295,30 @@ aN aN aN aN -uA +ur wa wj wp wD -uA +ur wS wZ xn uT uT -uA -xN +ur +ur uT uT -wU -uA -uE -uE -uE -uE -uE -uE -vP +ur +ur +ur +ur +ur +ur +ur +ur +ur aN aN aN @@ -73594,7 +73344,7 @@ aN aN "} (237,1,1) = {" -ah +aa an an an @@ -73605,7 +73355,7 @@ an an an an -bZ +aa an an an @@ -73616,7 +73366,7 @@ an an an an -eW +aa aN aN aN @@ -73626,15 +73376,15 @@ aN aN aN aN -bZ +aa jc jp jp -kB -kB jp jp -bZ +jp +jp +aa aN aN aN @@ -73802,29 +73552,29 @@ aN aN aN aN -us -uA -wf -wo -uE -uE -uE -uS -uX -vq -uE -uE -uA +ur +ur +uu +uu +ur +ur +ur +uu +uu +uu +ur +ur +ur yn yn -uA -uE -uE -uE -uE -uE -uE -vP +ur +ur +ur +ur +ur +ur +ur +ur aN aN aN @@ -73883,7 +73633,7 @@ aN aN aN aN -bZ +aa jc jp jp @@ -73891,7 +73641,7 @@ jp jp jp jp -bZ +aa aN aN aN @@ -74070,12 +73820,12 @@ aN aN aN aN -us -uA +ur +ur xJ xJ -uA -vP +ur +ur aN aN aN @@ -74140,7 +73890,7 @@ aN aN aN aN -bZ +aa jc jp jp @@ -74148,7 +73898,7 @@ jp jp jp jp -bZ +aa aN aN aN @@ -74328,10 +74078,10 @@ aN aN aN aN -yc +uu xJ xJ -yc +ur aN aN aN @@ -74397,7 +74147,7 @@ aN aN aN aN -bZ +aa jc jp jp @@ -74405,7 +74155,7 @@ jp jp jp jp -bZ +aa aN aN aN @@ -74585,11 +74335,11 @@ aN aN aN ur -uA +ur xJ xJ -uA -wq +ur +ur aN aN aN @@ -74654,7 +74404,7 @@ aN aN aN aN -bZ +aa jc jp jp @@ -74662,7 +74412,7 @@ jp jp jp jp -bZ +aa aN aN aN @@ -74841,13 +74591,13 @@ aN aN aN ur -uA -xI +ur +ur xJ xJ -yL -uA -wq +ur +ur +ur aN aN aN @@ -74911,7 +74661,7 @@ aN aN aN aN -bZ +aa jc jp jp @@ -74919,7 +74669,7 @@ jp jp jp jp -bZ +aa aN aN aN @@ -75097,15 +74847,15 @@ aN aN aN ur -uA -xI +ur +ur xJ xJ xJ xJ -yL -uA -wq +ur +ur +ur aN aN aN @@ -75136,7 +74886,7 @@ aN aN "} (243,1,1) = {" -ah +aa an an an @@ -75147,7 +74897,7 @@ an an an an -bZ +aa an an an @@ -75158,7 +74908,7 @@ an an an an -eW +aa aN aN aN @@ -75168,7 +74918,7 @@ aN aN aN aN -bZ +aa jb fP fP @@ -75176,7 +74926,7 @@ fP fP fP lD -bZ +aa aN aN aN @@ -75353,16 +75103,16 @@ aN aN aN aN -uA -xI +ur +ur xJ xJ xJ yA xJ xJ -yL -uA +ur +ur aN aN aN @@ -75424,8 +75174,8 @@ aN aN aN aN -bZ -bZ +aa +aa ja fO fO @@ -75433,8 +75183,8 @@ fO fO fO lC -bZ -bZ +aa +aa aN aN aN @@ -75610,7 +75360,7 @@ aN aN aN aN -xv +uu xJ xJ xJ @@ -75619,7 +75369,7 @@ yB yA xJ xJ -xv +uu aN aN aN @@ -75681,17 +75431,17 @@ aN aN aN aN -bZ +aa dF fG -bZ -bZ -bZ -bZ -bZ +aa +aa +aa +aa +aa gJ gT -bZ +aa aN aN aN @@ -75867,7 +75617,7 @@ aN aN aN aN -xu +uu xJ xJ yd @@ -75876,7 +75626,7 @@ yp yA xJ xJ -xu +uu aN aN aN @@ -75938,17 +75688,17 @@ aN aN aN aN -bZ +aa dF fG -bZ -bZ -bZ -bZ -bZ +aa +aa +aa +aa +aa gJ gT -bZ +aa aN aN aN @@ -76124,7 +75874,7 @@ aN aN aN aN -xw +uu xJ xJ xJ @@ -76133,7 +75883,7 @@ yp yA xJ xJ -xw +uu aN aN aN @@ -76195,17 +75945,17 @@ aN aN aN aN -bZ +aa dF fG -bZ -bZ -bZ -bZ -bZ +aa +aa +aa +aa +aa gJ gT -bZ +aa aN aN aN @@ -76381,16 +76131,16 @@ aN aN aN aN -uA -xK +ur +ur xJ xJ xJ yA xJ xJ -yN -uA +ur +ur aN aN aN @@ -76452,17 +76202,17 @@ aN aN aN aN -bZ +aa dF fG -bZ -bZ -bZ -bZ -bZ +aa +aa +aa +aa +aa gJ gT -bZ +aa aN aN aN @@ -76638,16 +76388,16 @@ aN aN aN aN -us -uA -xK +ur +ur +ur xJ xJ xJ xJ -yN -uA -vP +ur +ur +ur aN aN aN @@ -76678,7 +76428,7 @@ aN aN "} (249,1,1) = {" -ah +aa an an an @@ -76689,7 +76439,7 @@ an an an an -bZ +aa an an an @@ -76700,7 +76450,7 @@ an an an an -eW +aa aN aN aN @@ -76709,17 +76459,17 @@ aN aN aN aN -bZ +aa dF fG -bZ -bZ -bZ -bZ -bZ +aa +aa +aa +aa +aa gJ gT -bZ +aa aN aN aN @@ -76896,14 +76646,14 @@ aN aN aN aN -us -uE -xK +ur +ur +ur xJ xJ -yN -uE -vP +ur +ur +ur aN aN aN @@ -76966,17 +76716,17 @@ aN aN aN aN -bZ -bZ -bZ +aa +aa +aa fM fM fM fM fM -bZ -bZ -bZ +aa +aa +aa aN aN aN @@ -77154,12 +76904,12 @@ aN aN aN aN -us -uE -yu -yC -uE -vP +ur +ur +uu +uu +ur +ur aN aN aN @@ -77225,13 +76975,13 @@ aN aN aN aN -bZ +aa jr jr jr jr jr -bZ +aa aN aN aN @@ -77482,13 +77232,13 @@ aN aN aN aN -bZ -bZ -bZ -bZ -bZ -bZ -bZ +aa +aa +aa +aa +aa +aa +aa aN aN aN @@ -78220,7 +77970,7 @@ aN aN "} (255,1,1) = {" -RX +aa aE aE aE @@ -78231,7 +77981,7 @@ aE aE aE aE -cf +aa aE aE aE @@ -78242,7 +77992,7 @@ aE aE aE aE -eX +aa aN aN aN diff --git a/_maps/map_files/shuttles/admin_admin.dmm b/_maps/map_files/shuttles/admin_admin.dmm index 6e494e0b85b..f84d6a2940b 100644 --- a/_maps/map_files/shuttles/admin_admin.dmm +++ b/_maps/map_files/shuttles/admin_admin.dmm @@ -2,17 +2,8 @@ "aa" = ( /turf/space, /area/space) -"ab" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 8; - icon_state = "diagonalWall3" - }, -/area/shuttle/administration) "ac" = ( -/turf/simulated/shuttle/wall{ - icon_state = "wall3" - }, +/turf/simulated/wall/mineral/plastitanium/nodiagonal, /area/shuttle/administration) "ad" = ( /obj/machinery/door/airlock/external{ @@ -21,9 +12,7 @@ req_access_txt = "101" }, /obj/structure/fans/tiny, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/plating, /area/shuttle/administration) "ae" = ( /obj/machinery/door/airlock/external{ @@ -42,49 +31,26 @@ width = 18 }, /obj/structure/fans/tiny, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) -"af" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 1; - icon_state = "diagonalWall3" - }, +/turf/simulated/floor/plating, /area/shuttle/administration) "ag" = ( /obj/machinery/vending/boozeomat, -/turf/simulated/shuttle/wall{ - icon_state = "wall3" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "ah" = ( /obj/structure/table/reinforced, /obj/machinery/chem_dispenser/beer, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "ai" = ( /obj/structure/table/reinforced, /obj/item/storage/box/drinkingglasses, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "aj" = ( /obj/structure/table/reinforced, /obj/machinery/chem_dispenser/soda, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) -"ak" = ( -/turf/simulated/shuttle/wall{ - dir = 4; - icon_state = "wall3" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "al" = ( /obj/machinery/door_control{ @@ -97,38 +63,28 @@ icon_state = "tube1"; dir = 8 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "am" = ( -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "an" = ( /obj/machinery/cell_charger, /obj/structure/table, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "ao" = ( /obj/item/storage/toolbox/mechanical, /obj/item/multitool, /obj/structure/table, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "ap" = ( /obj/structure/table, /obj/machinery/recharger{ pixel_y = 4 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "aq" = ( /obj/machinery/light/spot{ @@ -136,9 +92,7 @@ icon_state = "tube1"; dir = 4 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "ar" = ( /obj/machinery/door/poddoor/preopen{ @@ -152,9 +106,7 @@ opacity = 1; req_access_txt = "101" }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "as" = ( /obj/machinery/light/spot{ @@ -162,9 +114,7 @@ icon_state = "tube1"; dir = 8 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "at" = ( /obj/item/stack/sheet/metal, @@ -173,43 +123,31 @@ pixel_x = 4; pixel_y = 4 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "au" = ( /obj/machinery/mecha_part_fabricator/upgraded, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "av" = ( /obj/machinery/kitchen_machine/microwave/upgraded, /obj/structure/table, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "aw" = ( /obj/machinery/door/window/northright{ name = "bar" }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "ax" = ( /obj/structure/table, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "ay" = ( /obj/item/ashtray/glass, /obj/structure/table, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "az" = ( /obj/item/storage/fancy/cigarettes/dromedaryco, @@ -217,9 +155,7 @@ pixel_x = 5 }, /obj/structure/table, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "aA" = ( /obj/machinery/door_control{ @@ -228,9 +164,7 @@ pixel_x = -30; req_access_txt = "101" }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "aB" = ( /obj/machinery/door/airlock/centcom{ @@ -239,9 +173,7 @@ opacity = 1; req_access_txt = "101" }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "aC" = ( /obj/structure/shuttle/engine/propulsion{ @@ -249,7 +181,7 @@ icon_state = "propulsion_l"; tag = "icon-propulsion_l (EAST)" }, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/shuttle/administration) "aD" = ( /obj/structure/shuttle/engine/heater{ @@ -261,45 +193,33 @@ color = "#FF0000"; dir = 4 }, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/shuttle/administration) "aE" = ( /obj/structure/chair/stool/bar, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "aF" = ( /obj/structure/reagent_dispensers/fueltank, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "aG" = ( /obj/structure/reagent_dispensers/watertank, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "aH" = ( /obj/machinery/recharge_station/upgraded, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "aI" = ( /obj/machinery/autolathe/upgraded{ hacked = 1 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "aJ" = ( /obj/structure/dispenser, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "aK" = ( /obj/structure/shuttle/engine/propulsion{ @@ -307,63 +227,36 @@ icon_state = "propulsion_r"; tag = "icon-propulsion_r (EAST)" }, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/shuttle/administration) "aL" = ( /obj/machinery/door/airlock/public/glass, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) -"aM" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 4; - icon_state = "diagonalWall3" - }, -/area/shuttle/administration) -"aN" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - icon_state = "diagonalWall3" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "aO" = ( /obj/machinery/vending/snack, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "aP" = ( /obj/machinery/vending/cola, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "aQ" = ( /obj/machinery/vending/coffee, /obj/machinery/light/spot, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "aR" = ( /obj/machinery/vending/cigarette, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "aS" = ( /obj/machinery/computer/card, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "aT" = ( /obj/machinery/computer/communications, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "aU" = ( /obj/machinery/door/poddoor/shutters{ @@ -374,13 +267,7 @@ name = "Blast Shutters"; opacity = 0 }, -/obj/structure/grille, -/obj/structure/shuttle/window{ - tag = "icon-window5_end (WEST)"; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "window5_end"; - dir = 8 - }, +/obj/effect/spawner/window/plastitanium, /turf/simulated/floor/plating, /area/shuttle/administration) "aV" = ( @@ -411,9 +298,7 @@ /obj/structure/chair/comfy/shuttle{ dir = 4 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "aW" = ( /obj/structure/chair/comfy/black{ @@ -422,47 +307,21 @@ /obj/structure/chair/comfy/shuttle{ dir = 4 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "aX" = ( /obj/machinery/computer/shuttle/admin{ name = "NTV Argos shuttle console" }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) -"aY" = ( -/obj/machinery/door/poddoor/shutters{ - density = 0; - dir = 4; - icon_state = "open"; - id_tag = "adminshuttleshutters"; - name = "Blast Shutters"; - opacity = 0 - }, -/obj/structure/grille, -/obj/structure/shuttle/window{ - dir = 4; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "window5_mid"; - tag = "icon-window5 (EAST)" - }, -/turf/simulated/floor/plating, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "aZ" = ( /obj/machinery/dna_scannernew/upgraded, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "ba" = ( /obj/machinery/computer/cloning, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "bb" = ( /obj/machinery/clonepod/upgraded, @@ -471,15 +330,11 @@ icon_state = "tube1"; dir = 1 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "bc" = ( /obj/machinery/computer/scan_consolenew, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "bd" = ( /obj/machinery/door/airlock/centcom{ @@ -488,40 +343,16 @@ opacity = 1; req_access_txt = "101" }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "be" = ( /obj/machinery/computer/camera_advanced/shuttle_docker/admin{ name = "NTV Argos shuttle navigation computer" }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) -"bf" = ( -/obj/machinery/door/poddoor/shutters{ - density = 0; - dir = 4; - icon_state = "open"; - id_tag = "adminshuttleshutters"; - name = "Blast Shutters"; - opacity = 0 - }, -/obj/structure/grille, -/obj/structure/shuttle/window{ - tag = "icon-window5_end (EAST)"; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "window5_end"; - dir = 4 - }, -/turf/simulated/floor/plating, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "bg" = ( -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "bh" = ( /obj/machinery/door/airlock/centcom{ @@ -530,24 +361,18 @@ opacity = 1; req_access_txt = "101" }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "bi" = ( /obj/machinery/bodyscanner, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "bk" = ( /obj/structure/window/plasmareinforced{ color = "#FF0000"; dir = 8 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "bl" = ( /obj/machinery/light/spot{ @@ -558,29 +383,21 @@ /obj/structure/chair/comfy/shuttle{ dir = 8 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "bm" = ( /obj/machinery/sleeper/upgraded{ dir = 4 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "bn" = ( /obj/machinery/chem_master, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "bo" = ( /obj/machinery/chem_dispenser, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "bp" = ( /obj/machinery/door/airlock/centcom{ @@ -589,32 +406,24 @@ opacity = 1; req_access_txt = "104" }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "bq" = ( /obj/machinery/door/window/brigdoor/westleft{ color = "#d70000"; req_access_txt = "104" }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "br" = ( /obj/structure/chair/comfy/shuttle{ dir = 8 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "bs" = ( /obj/machinery/iv_drip, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "bt" = ( /obj/machinery/light/spot{ @@ -622,9 +431,7 @@ icon_state = "tube1"; dir = 4 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "bu" = ( /obj/structure/table, @@ -634,9 +441,7 @@ icon_state = "tube1"; dir = 8 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "bv" = ( /obj/structure/window/plasmareinforced{ @@ -646,17 +451,13 @@ /obj/structure/chair/comfy/shuttle{ dir = 1 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "bw" = ( /obj/structure/chair/comfy/shuttle{ dir = 1 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "bx" = ( /obj/structure/table, @@ -669,34 +470,24 @@ /obj/item/scalpel, /obj/item/retractor, /obj/item/FixOVein, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "by" = ( /obj/machinery/optable, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "bz" = ( /obj/machinery/vending/medical, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "bA" = ( /obj/machinery/light, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "bB" = ( /obj/structure/table, /obj/item/storage/lockbox/mindshield, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "bC" = ( /obj/structure/table, @@ -705,24 +496,25 @@ pixel_y = 3 }, /obj/item/storage/box/trackimp, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/administration) +"vg" = ( +/turf/simulated/wall/mineral/plastitanium, /area/shuttle/administration) (1,1,1) = {" aa aa aa -ab +vg aC aK -aN +vg aa -ab +vg aC aK -aN +vg aa aa aa @@ -733,17 +525,17 @@ aa (2,1,1) = {" aa aa -ab -ac +vg +vg aD aD -ac -ac -ac +vg +vg +vg aD aD -ac -aN +vg +vg aa aa aa @@ -751,121 +543,121 @@ aa aa "} (3,1,1) = {" -aa -ab -ac +vg +vg +vg av am am aO -ac +vg aZ bg bg bm -ac -aN +vg +vg aa aa aa aa "} (4,1,1) = {" -ab +vg ag am aw am am aP -ac +vg ba bg bg bg bs -ac -aN +vg +vg aa aa aa "} (5,1,1) = {" -ac +vg ah am ax aE am aQ -ac +vg bb bg bg bg bg bx -ac +vg aa aa aa "} (6,1,1) = {" -ac +vg ai am ay aE am aR -ac +vg aZ bg bi bn bg by -ac +vg aa aa aa "} (7,1,1) = {" -ac +vg aj aq az aE am am -ac +vg bc bg bg bo bt bz -ac +vg aa aa aa "} (8,1,1) = {" -ac -ak -ak -ak -ak +vg +vg +vg +vg +vg aL -ak -ak -ak +vg +vg +vg bh -ak -ak -ak -ak -ac +vg +vg +vg +vg +vg aa aa aa @@ -885,7 +677,7 @@ am am am am -ac +vg aa aa aa @@ -905,126 +697,126 @@ am am am bA -ac +vg aa aa aa "} (11,1,1) = {" -ac -ak -ak +vg +vg +vg aB -ak -ak -ak +vg +vg +vg bd -ak -ak -ak +vg +vg +vg bp -ak -ak -ac +vg +vg +vg aa aa aa "} (12,1,1) = {" -ac +vg an as am aF -ac +vg aS am am -ac +vg am am bu bB -ac +vg aa aa aa "} (13,1,1) = {" -ac +vg ao am am aG -ac +vg aV aW aW -ac +vg am am am bC -ac +vg aa aa aa "} (14,1,1) = {" -ac +vg ap am am aH -ac +vg aT aX be -ac +vg am am am am -ac +vg aa aa aa "} (15,1,1) = {" -af -ac +vg +vg at am am -ac +vg aU -aY -bf -ac +aU +aU +vg bk bq bv ac -aM +vg aa aa aa "} (16,1,1) = {" aa -ac +vg au am aI -ac +vg aa aa aa -ac +vg am am bw -ac +vg aa aa aa @@ -1032,19 +824,19 @@ aa "} (17,1,1) = {" aa -af -ac +vg +vg aq aJ -ac +vg aa aa aa -ac +vg bl br -ac -aM +vg +vg aa aa aa @@ -1053,17 +845,17 @@ aa (18,1,1) = {" aa aa -af -ak -ak -aM +vg +vg +vg +vg aa aa aa -af -ak -ak -aM +vg +vg +vg +vg aa aa aa diff --git a/_maps/map_files/shuttles/admin_armory.dmm b/_maps/map_files/shuttles/admin_armory.dmm index 837f867a52b..673aca28604 100644 --- a/_maps/map_files/shuttles/admin_armory.dmm +++ b/_maps/map_files/shuttles/admin_armory.dmm @@ -1,21 +1,11 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"ae" = ( -/obj/structure/sign/securearea, -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall4"; - tag = "icon-swall14" - }, -/area/shuttle/administration) "al" = ( /obj/structure/window/reinforced{ dir = 4 }, /obj/structure/table/reinforced, /obj/item/folder, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "aI" = ( /obj/structure/table/reinforced, @@ -23,9 +13,7 @@ dir = 4 }, /obj/machinery/recharger, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "aP" = ( /obj/machinery/vending/security, @@ -34,7 +22,7 @@ icon_state = "tube1"; tag = "icon-tube1 (WEST)" }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/administration) "bi" = ( /obj/structure/table/reinforced, @@ -42,47 +30,28 @@ /obj/item/storage/firstaid/brute, /obj/item/storage/box/bodybags, /obj/item/storage/firstaid/surgery, -/turf/simulated/shuttle/floor, -/area/shuttle/administration) -"bm" = ( -/obj/structure/grille, -/obj/machinery/door/poddoor/shutters/preopen{ - dir = 8; - id_tag = "adminarmoryshutters" - }, -/obj/structure/window/full/shuttle, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/administration) "ce" = ( /obj/machinery/autolathe/upgraded{ hacked = 1 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "cl" = ( /obj/structure/chair/comfy/shuttle{ dir = 4 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "cV" = ( /obj/structure/closet/emcloset, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "de" = ( /obj/machinery/suit_storage_unit/security/secure, /obj/machinery/light/spot, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "df" = ( /obj/structure/rack, @@ -92,17 +61,13 @@ }, /obj/item/storage/box/buck, /obj/structure/window/reinforced, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "dn" = ( /obj/machinery/computer/camera_advanced/shuttle_docker/admin{ name = "NRV Sparta navigation computer" }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "dH" = ( /obj/structure/rack, @@ -115,13 +80,11 @@ pixel_x = 3; pixel_y = -3 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "dP" = ( /obj/machinery/recharge_station/upgraded, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/administration) "eI" = ( /obj/machinery/turretid/stun{ @@ -130,24 +93,20 @@ pixel_y = 30 }, /obj/machinery/computer/camera_advanced, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "eL" = ( /obj/structure/chair{ dir = 8 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "fo" = ( /obj/structure/chair{ dir = 1 }, /obj/machinery/light/spot, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/administration) "fF" = ( /obj/machinery/light/spot{ @@ -155,45 +114,35 @@ icon_state = "tube1"; tag = "icon-tube1 (EAST)" }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "fQ" = ( /obj/structure/chair/comfy/shuttle{ dir = 1 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "gd" = ( -/obj/machinery/door/airlock/shuttle, -/turf/simulated/shuttle/floor, +/obj/machinery/door/airlock/titanium, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/administration) "gh" = ( /obj/structure/chair/comfy/shuttle{ dir = 8 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "gj" = ( /obj/machinery/computer/communications{ name = "NRV Sparta Communications Console" }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "hN" = ( /obj/structure/chair{ dir = 4 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "ir" = ( /obj/structure/closet/emcloset, @@ -202,7 +151,7 @@ icon_state = "tube1"; tag = "icon-tube1 (NORTH)" }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/administration) "iz" = ( /obj/machinery/porta_turret{ @@ -216,85 +165,30 @@ dir = 1; layer = 2.9 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) -"jn" = ( -/obj/machinery/door/poddoor/shutters{ - density = 0; - dir = 2; - icon_state = "open"; - id_tag = "Asclshutters"; - name = "Blast Shutters"; - opacity = 0 - }, -/obj/structure/grille, -/obj/structure/window/full/shuttle, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "jB" = ( /obj/structure/table/reinforced, /obj/item/storage/lockbox/mindshield, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "jU" = ( /obj/machinery/suit_storage_unit/security/secure, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "kf" = ( /obj/structure/sign/securearea, -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall8"; - tag = "icon-swall12" - }, -/area/shuttle/administration) -"mq" = ( -/obj/structure/grille, -/obj/machinery/door/poddoor/shutters{ - density = 0; - dir = 2; - icon_state = "open"; - id_tag = "Asclshutters"; - name = "Blast Shutters"; - opacity = 0 - }, -/obj/structure/window/full/shuttle, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/wall/mineral/titanium, /area/shuttle/administration) "mw" = ( -/turf/simulated/shuttle/floor, -/area/shuttle/administration) -"mM" = ( -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall13" - }, -/area/shuttle/administration) -"nG" = ( -/obj/structure/window/full/shuttle, -/obj/structure/grille, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/administration) "oj" = ( /obj/structure/chair/comfy/shuttle{ dir = 1 }, /obj/machinery/light/spot, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "oY" = ( /obj/structure/chair, @@ -303,26 +197,20 @@ icon_state = "tube1"; tag = "icon-tube1 (NORTH)" }, -/turf/simulated/shuttle/floor, -/area/shuttle/administration) -"pa" = ( -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall11" - }, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/administration) "pK" = ( /obj/structure/shuttle/engine/propulsion{ dir = 4; icon_state = "propulsion" }, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/shuttle/administration) "pQ" = ( /obj/structure/chair{ dir = 8 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/administration) "qQ" = ( /obj/machinery/recharger/wallcharger{ @@ -342,25 +230,13 @@ pixel_x = 25; req_access_txt = "19" }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "rb" = ( /obj/machinery/door/window/brigdoor/southleft{ req_one_access_txt = "2;19" }, -/turf/simulated/shuttle/floor, -/area/shuttle/administration) -"rW" = ( -/obj/structure/grille, -/obj/machinery/door/poddoor/shutters/preopen{ - id_tag = "adminshuttlebridge" - }, -/obj/structure/window/full/shuttle, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/administration) "sq" = ( /obj/structure/table/reinforced, @@ -373,15 +249,13 @@ pixel_x = 3; pixel_y = -3 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "tx" = ( /obj/machinery/sleeper/upgraded{ dir = 4 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/administration) "ua" = ( /obj/structure/chair{ @@ -409,16 +283,7 @@ /obj/structure/chair/comfy/shuttle{ dir = 8 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) -"uz" = ( -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall4"; - tag = "icon-swall14" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "uW" = ( /obj/structure/shuttle/engine/heater{ @@ -428,24 +293,21 @@ /obj/structure/window/plasmareinforced{ dir = 8 }, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/shuttle/administration) "uY" = ( /obj/structure/window/reinforced, /obj/structure/table/reinforced, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/administration) "vk" = ( -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall_s6" - }, +/turf/simulated/wall/mineral/titanium, /area/shuttle/administration) "vy" = ( /obj/structure/table/reinforced, /obj/item/stack/sheet/metal/fifty, /obj/item/stack/sheet/glass/fifty, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/administration) "vA" = ( /obj/machinery/light/spot{ @@ -454,9 +316,7 @@ tag = "icon-tube1 (NORTH)" }, /obj/machinery/portable_atmospherics/canister/oxygen, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "vW" = ( /obj/structure/table/reinforced, @@ -464,9 +324,7 @@ dir = 4 }, /obj/item/storage/box/handcuffs, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "wG" = ( /obj/structure/rack, @@ -484,9 +342,7 @@ pixel_y = 0 }, /obj/item/clothing/head/helmet/alt, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "wH" = ( /obj/machinery/light/spot{ @@ -494,21 +350,10 @@ icon_state = "tube1"; tag = "icon-tube1 (WEST)" }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "wQ" = ( -/obj/machinery/door/poddoor/shutters{ - density = 0; - dir = 8; - icon_state = "open"; - id_tag = "Asclshutters"; - name = "Blast Shutters"; - opacity = 0 - }, -/obj/structure/grille, -/obj/structure/window/full/shuttle, +/obj/effect/spawner/window/shuttle, /turf/space, /area/shuttle/administration) "xm" = ( @@ -523,7 +368,7 @@ pixel_x = -3; pixel_y = 3 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/administration) "xF" = ( /obj/structure/rack, @@ -536,23 +381,11 @@ /obj/structure/window/reinforced{ dir = 4 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "xH" = ( -/obj/machinery/door/airlock/shuttle, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) -"xK" = ( -/obj/structure/sign/nosmoking_2, -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall3"; - tag = "icon-swall3" - }, +/obj/machinery/door/airlock/titanium, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "xQ" = ( /obj/structure/chair{ @@ -563,17 +396,13 @@ icon_state = "tube1"; tag = "icon-tube1 (NORTH)" }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "xU" = ( /obj/structure/table/reinforced, /obj/item/stack/sheet/metal/fifty, /obj/item/stack/sheet/glass/fifty, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "xZ" = ( /turf/space, @@ -591,9 +420,7 @@ dir = 8; id_tag = "adminarmoryshutters" }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "yu" = ( /obj/structure/table/reinforced, @@ -603,22 +430,11 @@ /obj/machinery/recharger{ pixel_x = 8 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "yF" = ( /obj/machinery/status_display, -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall3" - }, -/area/shuttle/administration) -"zY" = ( -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall14" - }, +/turf/simulated/wall/mineral/titanium, /area/shuttle/administration) "AH" = ( /obj/machinery/light/spot, @@ -632,9 +448,7 @@ /obj/structure/window/reinforced{ dir = 4 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "Bc" = ( /obj/structure/rack, @@ -650,9 +464,7 @@ pixel_x = 2; pixel_y = -4 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "Bj" = ( /obj/structure/fans/tiny, @@ -666,25 +478,17 @@ name = "Blast Door"; opacity = 0 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/plating, /area/shuttle/administration) "Bn" = ( /obj/machinery/door/window/brigdoor/southleft{ req_one_access_txt = "2;19" }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "Bq" = ( /obj/structure/sign/nosmoking_2, -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall1"; - tag = "icon-swall1" - }, +/turf/simulated/wall/mineral/titanium, /area/shuttle/administration) "BZ" = ( /obj/machinery/light/spot, @@ -698,9 +502,7 @@ dir = 1; layer = 2.9 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "Cl" = ( /obj/structure/table/reinforced, @@ -709,7 +511,7 @@ pixel_y = 3 }, /obj/item/storage/toolbox/mechanical, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/administration) "Du" = ( /obj/structure/rack, @@ -719,27 +521,16 @@ pixel_x = 3; pixel_y = -3 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "DZ" = ( /obj/machinery/light/spot, /obj/structure/closet/emcloset, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) -"Eq" = ( -/obj/structure/sign/securearea, -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall12" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "EQ" = ( -/obj/machinery/door/airlock/shuttle/glass, -/turf/simulated/shuttle/floor, +/obj/machinery/door/airlock/titanium/glass, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/administration) "Fd" = ( /obj/structure/rack, @@ -752,9 +543,7 @@ pixel_x = 3; pixel_y = -3 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "Fo" = ( /obj/structure/rack, @@ -769,16 +558,11 @@ /obj/item/gun/energy/immolator/multi{ pixel_y = 3 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "FF" = ( /obj/structure/sign/poster/official/enlist, -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall12" - }, +/turf/simulated/wall/mineral/titanium, /area/shuttle/administration) "FT" = ( /obj/structure/rack, @@ -791,17 +575,13 @@ /obj/structure/window/reinforced{ dir = 8 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "Gf" = ( /obj/structure/sign/vacuum{ pixel_x = -32 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "Gn" = ( /obj/structure/window/reinforced{ @@ -814,9 +594,7 @@ pixel_y = 3 }, /obj/item/gun/projectile/shotgun/riot/buckshot, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "Gx" = ( /obj/structure/fans/tiny, @@ -838,15 +616,13 @@ name = "Blast Door"; opacity = 0 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/plating, /area/shuttle/administration) "Gy" = ( /obj/structure/chair{ dir = 1 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/administration) "Hc" = ( /obj/machinery/porta_turret{ @@ -859,46 +635,31 @@ /obj/structure/window/reinforced{ dir = 8 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/administration) "HN" = ( /obj/structure/sign/poster/official/do_not_question, -/obj/item/tank/emergency_oxygen/engi, -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall3" - }, +/obj/item/tank/internals/emergency_oxygen/engi, +/turf/simulated/wall/mineral/titanium, /area/shuttle/administration) "Ir" = ( /obj/machinery/computer/shuttle/admin{ name = "NRV Sparta shuttle console" }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) -"IC" = ( -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall3" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "Jt" = ( /obj/machinery/suit_storage_unit/standard_unit, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "Ke" = ( /obj/machinery/door/window/brigdoor/southright{ req_one_access_txt = "2;19" }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/administration) "Kh" = ( -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "Ki" = ( /obj/structure/window/reinforced{ @@ -919,15 +680,7 @@ pixel_y = 0 }, /obj/item/clothing/head/helmet/alt, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) -"KM" = ( -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall7" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "Lh" = ( /obj/structure/rack, @@ -940,35 +693,23 @@ pixel_y = 3 }, /obj/item/gun/energy/ionrifle, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "LK" = ( /obj/structure/window/reinforced{ dir = 4 }, /obj/machinery/computer/secure_data, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) -"LP" = ( -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall_s9" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "Mi" = ( /obj/structure/table/reinforced, /obj/machinery/recharger, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "Mj" = ( /obj/machinery/vending/medical, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/administration) "Mo" = ( /obj/structure/rack, @@ -989,22 +730,7 @@ pixel_y = 0 }, /obj/item/clothing/head/helmet/alt, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) -"MN" = ( -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall12" - }, -/area/shuttle/administration) -"MZ" = ( -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall3"; - tag = "icon-swall3" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "Ni" = ( /obj/structure/window/reinforced{ @@ -1020,58 +746,37 @@ pixel_y = 3 }, /obj/item/gun/projectile/shotgun/riot/buckshot, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "Ns" = ( /obj/machinery/recharger/wallcharger{ pixel_y = 25 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/administration) "NF" = ( /obj/structure/sign/poster/official/here_for_your_safety, -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall3"; - tag = "icon-swall3" - }, +/turf/simulated/wall/mineral/titanium, /area/shuttle/administration) "NQ" = ( -/obj/machinery/door/poddoor/shutters{ - density = 0; - dir = 1; - icon_state = "open"; - id_tag = "Asclshutters"; - name = "Blast Shutters"; - opacity = 0 - }, -/obj/structure/grille, -/obj/structure/window/full/shuttle, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/obj/effect/spawner/window/shuttle, +/turf/simulated/floor/plating, /area/shuttle/administration) "Op" = ( /obj/structure/dispenser/oxygen, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "Ou" = ( /obj/machinery/autolathe/upgraded{ hacked = 1 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/administration) "Pe" = ( /obj/machinery/door/window/brigdoor/southright{ req_one_access_txt = "2;19" }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "Pn" = ( /obj/structure/rack, @@ -1087,15 +792,7 @@ pixel_x = 3; pixel_y = -3 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) -"PL" = ( -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall_s10" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "PR" = ( /obj/machinery/light/spot{ @@ -1108,9 +805,7 @@ pixel_x = -26; req_access_txt = "3" }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "PS" = ( /obj/structure/rack, @@ -1124,9 +819,7 @@ /obj/item/gun/energy/gun/nuclear{ pixel_y = 3 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "PV" = ( /obj/structure/rack, @@ -1144,16 +837,7 @@ dir = 1; layer = 2.9 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) -"RM" = ( -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall8"; - tag = "icon-swall12" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "TD" = ( /obj/machinery/door/airlock/command{ @@ -1161,9 +845,7 @@ req_access = null; req_access_txt = "19" }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "TF" = ( /obj/structure/table/reinforced, @@ -1172,18 +854,16 @@ }, /obj/structure/window/reinforced, /obj/item/storage/fancy/donut_box, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "Un" = ( /obj/structure/table/reinforced, -/obj/item/tank/emergency_oxygen/engi{ +/obj/item/tank/internals/emergency_oxygen/engi{ pixel_x = 3; pixel_y = -3 }, -/obj/item/tank/emergency_oxygen/engi, -/obj/item/tank/emergency_oxygen/engi{ +/obj/item/tank/internals/emergency_oxygen/engi, +/obj/item/tank/internals/emergency_oxygen/engi{ pixel_x = -3; pixel_y = 3 }, @@ -1201,7 +881,7 @@ pixel_x = 3; pixel_y = -3 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/administration) "Ur" = ( /obj/machinery/porta_turret{ @@ -1214,14 +894,7 @@ /obj/structure/window/reinforced{ dir = 4 }, -/turf/simulated/shuttle/floor, -/area/shuttle/administration) -"UR" = ( -/obj/machinery/status_display, -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall12" - }, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/administration) "UX" = ( /obj/structure/fans/tiny, @@ -1233,24 +906,14 @@ name = "Blast Door"; opacity = 0 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/administration) -"Vc" = ( -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall_s5" - }, +/turf/simulated/floor/plating, /area/shuttle/administration) "VC" = ( -/obj/machinery/door/airlock/shuttle{ +/obj/machinery/door/airlock/titanium{ name = "Shuttle Armory"; req_access_txt = "3" }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "VQ" = ( /obj/structure/rack, @@ -1266,9 +929,7 @@ pixel_x = 0; pixel_y = 0 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "WV" = ( /obj/structure/table/reinforced, @@ -1286,9 +947,7 @@ icon_state = "tube1"; tag = "icon-tube1 (EAST)" }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "XL" = ( /obj/structure/window/reinforced{ @@ -1304,60 +963,58 @@ pixel_y = 3 }, /obj/item/gun/projectile/shotgun/riot/buckshot, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) (1,1,1) = {" vk -MZ +vk HN -IC -IC -IC -IC -KM +vk +vk +vk +vk +vk +NQ +NQ +NQ wQ -wQ -wQ -wQ -KM -IC -IC -IC -IC -Vc +vk +vk +vk +vk +vk +vk "} (2,1,1) = {" -MN +vk Un xm Mj aP dP tx -MN +vk eI Ir dn gj -MN +vk vA cl cl DZ -Eq +kf "} (3,1,1) = {" -MN +vk Ns mw mw mw mw mw -MN +vk ua gh gh @@ -1370,19 +1027,19 @@ Kh Bj "} (4,1,1) = {" -MN +vk Ns mw mw mw mw Gy -MN +vk qQ Kh Kh Kh -UR +yF Jt Kh Kh @@ -1390,34 +1047,34 @@ Kh Bj "} (5,1,1) = {" -MN +vk Ns mw mw mw mw fo -zY -MZ +vk +vk TD -rW -rW -pa -MZ +NQ +NQ +vk +vk xH -nG -nG -Eq +NQ +NQ +kf "} (6,1,1) = {" -MN +vk bi Cl vy Ou mw mw -MN +vk cV Kh Kh @@ -1427,17 +1084,17 @@ Gf Kh Mi Mi -MN +vk "} (7,1,1) = {" -zY -nG -nG -nG -nG +vk +NQ +NQ +NQ +NQ gd -nG -MN +NQ +vk xQ Kh hN @@ -1447,10 +1104,10 @@ Kh Kh Kh oj -MN +vk "} (8,1,1) = {" -RM +vk oY mw mw @@ -1467,7 +1124,7 @@ Kh Kh Kh fQ -mq +NQ "} (9,1,1) = {" UX @@ -1487,7 +1144,7 @@ Kh Kh Kh fQ -jn +NQ "} (10,1,1) = {" Gx @@ -1507,17 +1164,17 @@ Kh Kh Kh Kh -jn +NQ "} (11,1,1) = {" -uz +vk oY mw mw mw mw Hc -ae +kf ir pQ pQ @@ -1527,30 +1184,30 @@ Kh Kh Kh BZ -MN +vk "} (12,1,1) = {" -zY -MZ +vk +vk Bq yg VC yg yF -pa -bm -bm -bm -MZ -MZ -xK +vk +NQ +NQ +NQ +vk +vk +Bq VC NF -MZ -mM +vk +vk "} (13,1,1) = {" -MN +vk Kh wH eL @@ -1567,7 +1224,7 @@ Bc Kh Kh AH -MN +vk "} (14,1,1) = {" NQ @@ -1587,7 +1244,7 @@ Pn Kh Kh Kh -mq +NQ "} (15,1,1) = {" NQ @@ -1607,7 +1264,7 @@ Kh Kh Kh Kh -mq +NQ "} (16,1,1) = {" NQ @@ -1627,10 +1284,10 @@ Kh Kh Kh Kh -mq +NQ "} (17,1,1) = {" -MN +vk fF Kh Kh @@ -1647,45 +1304,45 @@ ce jB jU de -MN +vk "} (18,1,1) = {" -PL -KM +vk +vk uW uW -KM -IC -IC -KM +vk +vk +vk +vk uW uW -KM -IC -IC -KM +vk +vk +vk +vk uW uW -KM -LP +vk +vk "} (19,1,1) = {" xZ -PL +vk pK pK -LP +vk xZ xZ -PL +vk pK pK -LP +vk xZ xZ -PL +vk pK pK -LP +vk xZ "} diff --git a/_maps/map_files/shuttles/admin_hospital.dmm b/_maps/map_files/shuttles/admin_hospital.dmm index 9e3b48a11c7..e37b06c17a1 100644 --- a/_maps/map_files/shuttles/admin_hospital.dmm +++ b/_maps/map_files/shuttles/admin_hospital.dmm @@ -3,24 +3,9 @@ /turf/space, /area/space) "ab" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall_s6"; - dir = 2 - }, -/area/shuttle/administration) -"ac" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall12"; - dir = 2 - }, +/turf/simulated/wall/mineral/titanium, /area/shuttle/administration) "ad" = ( -/obj/structure/shuttle/window{ - tag = "icon-window5_end"; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "window5_end"; - dir = 2 - }, /obj/machinery/door/poddoor/shutters{ density = 0; dir = 1; @@ -29,62 +14,14 @@ name = "Blast Shutters"; opacity = 0 }, -/obj/structure/grille, -/turf/space, -/area/shuttle/administration) -"ae" = ( -/obj/structure/shuttle/window{ - tag = "icon-window5_mid"; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "window5_mid"; - dir = 2 - }, -/obj/machinery/door/poddoor/shutters{ - density = 0; - dir = 1; - icon_state = "open"; - id_tag = "Asclshutters"; - name = "Blast Shutters"; - opacity = 0 - }, -/obj/structure/grille, -/turf/space, -/area/shuttle/administration) -"af" = ( -/obj/structure/shuttle/window{ - tag = "icon-window5_end (NORTH)"; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "window5_end"; - dir = 1 - }, -/obj/machinery/door/poddoor/shutters{ - density = 0; - dir = 1; - icon_state = "open"; - id_tag = "Asclshutters"; - name = "Blast Shutters"; - opacity = 0 - }, -/obj/structure/grille, -/turf/space, -/area/shuttle/administration) -"ag" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall14"; - dir = 2 - }, +/obj/effect/spawner/window/shuttle, +/turf/simulated/floor/plating, /area/shuttle/administration) "ah" = ( -/obj/structure/sign/redcross{ - desc = "The Star of Life, a symbol of Medical Aid."; - icon_state = "lifestar"; +/obj/structure/sign/lifestar{ name = "NHV Asclepius" }, -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall8"; - tag = "icon-swall12" - }, +/turf/simulated/wall/mineral/titanium, /area/shuttle/administration) "ai" = ( /obj/structure/fans/tiny, @@ -96,9 +33,7 @@ name = "Blast Door"; opacity = 0 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/plating, /area/shuttle/administration) "aj" = ( /obj/structure/fans/tiny, @@ -120,82 +55,15 @@ name = "Blast Door"; opacity = 0 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, -/area/shuttle/administration) -"ak" = ( -/obj/structure/sign/redcross{ - desc = "The Star of Life, a symbol of Medical Aid."; - icon_state = "lifestar"; - name = "NHV Asclepius" - }, -/turf/simulated/shuttle/wall{ - tag = "icon-swall14"; - icon_state = "swall4"; - dir = 2 - }, -/area/shuttle/administration) -"al" = ( -/obj/machinery/door/poddoor/shutters{ - density = 0; - dir = 1; - icon_state = "open"; - id_tag = "Asclshutters"; - name = "Blast Shutters"; - opacity = 0 - }, -/obj/structure/grille, -/obj/structure/shuttle/window{ - tag = "icon-window5_mid"; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "window5_mid"; - dir = 2 - }, -/turf/space, -/area/shuttle/administration) -"am" = ( -/obj/machinery/door/poddoor/shutters{ - density = 0; - dir = 1; - icon_state = "open"; - id_tag = "Asclshutters"; - name = "Blast Shutters"; - opacity = 0 - }, -/obj/structure/grille, -/obj/structure/shuttle/window{ - tag = "icon-window5_end (NORTH)"; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "window5_end"; - dir = 1 - }, -/turf/space, -/area/shuttle/administration) -"an" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall_s10"; - dir = 2 - }, -/area/shuttle/administration) -"ao" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall3"; - icon_state = "swall3"; - dir = 2 - }, +/turf/simulated/floor/plating, /area/shuttle/administration) "ap" = ( /obj/machinery/chem_master, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "aq" = ( /obj/machinery/chem_dispenser, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "ar" = ( /obj/machinery/chem_heater, @@ -204,32 +72,23 @@ icon_state = "tube1"; dir = 1 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "as" = ( /obj/structure/closet/secure_closet/reagents, /obj/item/storage/bag/chemistry, /obj/item/storage/bag/chemistry, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "at" = ( /obj/structure/closet/secure_closet/chemical, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "au" = ( /obj/structure/sign/chemistry{ pixel_y = 1 }, -/turf/simulated/shuttle/wall{ - icon_state = "swall3"; - dir = 2 - }, +/turf/simulated/wall/mineral/titanium, /area/shuttle/administration) "av" = ( /obj/structure/chair{ @@ -240,14 +99,10 @@ /obj/structure/chair/comfy/shuttle{ dir = 4 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "aw" = ( -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "ax" = ( /obj/structure/chair{ @@ -262,24 +117,18 @@ /obj/structure/chair/comfy/shuttle{ dir = 8 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "ay" = ( /obj/structure/table/reinforced, /obj/item/reagent_containers/glass/beaker/cryoxadone, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "az" = ( /obj/machinery/clonepod{ biomass = 300 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "aA" = ( /obj/machinery/computer/cloning, @@ -288,49 +137,27 @@ icon_state = "tube1"; dir = 1 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "aB" = ( /obj/machinery/dna_scannernew, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "aC" = ( /obj/machinery/atmospherics/unary/cryo_cell, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, -/area/shuttle/administration) -"aD" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall7"; - dir = 2 - }, -/area/shuttle/administration) -"aE" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall3"; - dir = 2 - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "aF" = ( /obj/structure/reagent_dispensers/fueltank/chem{ pixel_x = -32 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "aG" = ( /obj/structure/chair/comfy/shuttle{ dir = 1 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "aH" = ( /obj/structure/table/reinforced, @@ -342,32 +169,22 @@ layer = 2.9 }, /obj/structure/window/reinforced, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "aI" = ( /obj/machinery/light{ dir = 4; icon_state = "tube1" }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "aJ" = ( /obj/structure/sign/nosmoking_2, -/turf/simulated/shuttle/wall{ - tag = "icon-swall1"; - icon_state = "swall1"; - dir = 2 - }, +/turf/simulated/wall/mineral/titanium, /area/shuttle/administration) "aK" = ( /obj/machinery/atmospherics/pipe/simple/hidden, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "aL" = ( /obj/structure/shuttle/engine/heater{ @@ -377,14 +194,14 @@ /obj/structure/window/plasmareinforced{ dir = 8 }, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/shuttle/administration) "aM" = ( /obj/structure/shuttle/engine/propulsion{ dir = 4; icon_state = "propulsion" }, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/shuttle/administration) "aN" = ( /obj/structure/table/reinforced, @@ -397,22 +214,15 @@ /obj/item/reagent_containers/glass/bucket, /obj/item/reagent_containers/glass/bucket, /obj/item/reagent_containers/glass/bucket, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "aO" = ( /obj/structure/closet/crate/can, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "aP" = ( -/obj/structure/shuttle/window, -/obj/structure/grille, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/obj/effect/spawner/window/shuttle, +/turf/simulated/floor/plating, /area/shuttle/administration) "aQ" = ( /obj/structure/chair{ @@ -421,9 +231,7 @@ /obj/structure/chair/comfy/shuttle{ dir = 4 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "aR" = ( /obj/structure/chair{ @@ -432,9 +240,7 @@ /obj/structure/chair/comfy/shuttle{ dir = 8 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "aS" = ( /obj/structure/table/reinforced, @@ -447,24 +253,18 @@ name = "NHV Asclepius Chemistry"; network = list("NHV Asclepius") }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "aT" = ( -/obj/machinery/door/airlock/shuttle/glass{ +/obj/machinery/door/airlock/titanium/glass{ name = "Chemistry"; req_access_txt = "33" }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "aU" = ( -/obj/machinery/door/airlock/shuttle/glass, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/obj/machinery/door/airlock/titanium/glass, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "aV" = ( /obj/machinery/camera{ @@ -474,15 +274,7 @@ network = list("NHV Asclepius") }, /obj/machinery/atmospherics/pipe/simple/hidden, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, -/area/shuttle/administration) -"aW" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall_s9"; - dir = 2 - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "aX" = ( /obj/machinery/iv_drip, @@ -490,66 +282,47 @@ /obj/structure/reagent_dispensers/fueltank/chem{ pixel_x = -32 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "aY" = ( /obj/structure/chair/comfy/shuttle, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "aZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 6 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "ba" = ( /obj/machinery/chem_heater, /obj/machinery/light, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "bb" = ( /obj/machinery/status_display, -/turf/simulated/shuttle/wall{ - icon_state = "swall3"; - dir = 2 - }, +/turf/simulated/wall/mineral/titanium, /area/shuttle/administration) "bc" = ( /obj/structure/reagent_dispensers/water_cooler, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "bd" = ( /obj/machinery/vending/coffee, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "be" = ( /obj/structure/table/reinforced, /obj/item/reagent_containers/spray/cleaner, /obj/item/storage/box/gloves, /obj/item/storage/box/masks, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "bf" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ dir = 4 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "bg" = ( /obj/structure/table/reinforced, @@ -557,9 +330,7 @@ /obj/item/storage/firstaid, /obj/item/storage/firstaid/adv, /obj/item/storage/firstaid/adv, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "bh" = ( /obj/structure/table/reinforced, @@ -570,63 +341,19 @@ /obj/item/clothing/glasses/hud/health, /obj/item/clothing/glasses/hud/health, /obj/machinery/light, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "bi" = ( -/obj/machinery/atmospherics/unary/cold_sink/freezer{ +/obj/machinery/atmospherics/unary/thermomachine/freezer{ dir = 1 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "bj" = ( /obj/machinery/smartfridge/medbay, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, -/area/shuttle/administration) -"bk" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall13"; - icon_state = "swall13"; - dir = 2 - }, -/area/shuttle/administration) -"bl" = ( -/obj/structure/shuttle/window, -/obj/structure/grille, -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall8"; - tag = "icon-swall12" - }, -/area/shuttle/administration) -"bm" = ( -/obj/structure/shuttle/window, -/obj/structure/grille, -/turf/simulated/shuttle/wall{ - tag = "icon-swall14"; - icon_state = "swall4"; - dir = 2 - }, -/area/shuttle/administration) -"bn" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall15"; - icon_state = "swall15"; - dir = 2 - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "bo" = ( -/obj/structure/shuttle/window{ - tag = "icon-window5_end (WEST)"; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "window5_end"; - dir = 8 - }, /obj/machinery/door/poddoor/shutters{ density = 0; dir = 8; @@ -635,14 +362,12 @@ name = "Blast Shutters"; opacity = 0 }, -/obj/structure/grille, -/turf/space, +/obj/effect/spawner/window/shuttle, +/turf/simulated/floor/plating, /area/shuttle/administration) "bp" = ( /obj/machinery/computer/pandemic, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "bq" = ( /obj/machinery/camera{ @@ -679,9 +404,7 @@ /obj/structure/chair/comfy/shuttle{ dir = 8 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "br" = ( /obj/machinery/recharger/wallcharger{ @@ -690,16 +413,7 @@ /obj/machinery/recharger/wallcharger{ pixel_y = 35 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, -/area/shuttle/administration) -"bs" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall1"; - icon_state = "swall1"; - dir = 2 - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "bt" = ( /obj/structure/sink{ @@ -708,9 +422,7 @@ pixel_x = -12; pixel_y = 2 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "bu" = ( /obj/machinery/light{ @@ -721,9 +433,7 @@ /obj/structure/closet/walllocker/emerglocker{ pixel_y = 32 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "bv" = ( /obj/machinery/vending/medical, @@ -732,9 +442,7 @@ icon_state = "tube1"; dir = 1 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "bw" = ( /obj/structure/table/tray, @@ -749,15 +457,11 @@ /obj/item/FixOVein, /obj/item/surgicaldrill, /obj/item/storage/backpack/duffel/medical, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "bx" = ( /obj/machinery/optable, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "by" = ( /obj/machinery/computer/operating, @@ -766,47 +470,21 @@ icon_state = "tube1"; dir = 1 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "bz" = ( /obj/structure/closet/secure_closet/medical3, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "bA" = ( /obj/structure/closet/secure_closet/medical2, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, -/area/shuttle/administration) -"bB" = ( -/obj/structure/shuttle/window{ - dir = 4; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "window5_mid"; - tag = "icon-window5 (EAST)" - }, -/obj/machinery/door/poddoor/shutters{ - density = 0; - dir = 8; - icon_state = "open"; - id_tag = "Asclshutters"; - name = "Blast Shutters"; - opacity = 0 - }, -/obj/structure/grille, -/turf/space, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "bC" = ( /obj/machinery/computer/shuttle/admin{ name = "NHV Asclepius shuttle console" }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "bD" = ( /obj/machinery/door/airlock/command{ @@ -814,9 +492,7 @@ req_access = null; req_access_txt = "19" }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "bE" = ( /obj/structure/closet/crate/freezer, @@ -824,15 +500,7 @@ /obj/item/reagent_containers/iv_bag/blood/OMinus, /obj/item/reagent_containers/iv_bag/blood/OMinus, /obj/item/reagent_containers/iv_bag/blood/OMinus, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, -/area/shuttle/administration) -"bF" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall1"; - dir = 2 - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "bG" = ( /obj/machinery/camera{ @@ -841,27 +509,21 @@ name = "NHV Asclepius OR 1"; network = list("NHV Asclepius") }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "bH" = ( /obj/machinery/computer/camera_advanced/shuttle_docker/admin{ name = "NHV Asclepius navigation computer" }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "bI" = ( -/obj/machinery/door/airlock/shuttle/glass{ +/obj/machinery/door/airlock/titanium/glass{ name = "Operating Room"; req_access = null; req_access_txt = "45" }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "bJ" = ( /obj/structure/sink{ @@ -870,35 +532,13 @@ pixel_x = 11; pixel_y = 0 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, -/area/shuttle/administration) -"bK" = ( -/obj/structure/shuttle/window{ - tag = "icon-window5_end (EAST)"; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "window5_end"; - dir = 4 - }, -/obj/machinery/door/poddoor/shutters{ - density = 0; - dir = 8; - icon_state = "open"; - id_tag = "Asclshutters"; - name = "Blast Shutters"; - opacity = 0 - }, -/obj/structure/grille, -/turf/space, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "bL" = ( /obj/machinery/computer/communications{ name = "NHV Asclepius Communications Console" }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "bM" = ( /obj/structure/chair{ @@ -908,51 +548,32 @@ /obj/structure/chair/comfy/shuttle{ dir = 8 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, -/area/shuttle/administration) -"bN" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall2"; - icon_state = "swall2"; - dir = 2 - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "bO" = ( /obj/machinery/sleeper, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "bP" = ( /obj/machinery/sleeper{ dir = 4 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "bQ" = ( /obj/structure/bed{ name = "Triage: High Priority" }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "bR" = ( /obj/machinery/bodyscanner, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "bT" = ( /obj/machinery/light, /obj/structure/closet/crate/can, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "bU" = ( /obj/item/reagent_containers/spray/cleaner{ @@ -960,46 +581,22 @@ name = "Surgery Cleaner" }, /obj/structure/table/glass, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "bV" = ( /obj/structure/closet/crate/freezer, /obj/item/reagent_containers/iv_bag/blood/OMinus, /obj/item/reagent_containers/iv_bag/blood/OMinus, /obj/machinery/iv_drip, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, -/area/shuttle/administration) -"bW" = ( -/obj/machinery/status_display, -/turf/simulated/shuttle/wall{ - icon_state = "swall12"; - dir = 2 - }, -/area/shuttle/administration) -"bX" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall13"; - dir = 2 - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "bY" = ( /obj/structure/sign/examroom, -/turf/simulated/shuttle/wall{ - icon_state = "swall12"; - dir = 2 - }, +/turf/simulated/wall/mineral/titanium, /area/shuttle/administration) "bZ" = ( /obj/machinery/defibrillator_mount/loaded, -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swall8"; - tag = "icon-swall12" - }, +/turf/simulated/wall/mineral/titanium, /area/shuttle/administration) "ca" = ( /obj/machinery/light{ @@ -1011,9 +608,7 @@ name = "NHV Asclepius Central"; network = list("NHV Asclepius") }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "cb" = ( /obj/machinery/light{ @@ -1024,22 +619,7 @@ name = "Triage: High Priority" }, /obj/machinery/iv_drip, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, -/area/shuttle/administration) -"cc" = ( -/obj/structure/sign/nosmoking_2, -/turf/simulated/shuttle/wall{ - icon_state = "swall7"; - dir = 2 - }, -/area/shuttle/administration) -"cd" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall11"; - dir = 2 - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "ce" = ( /obj/machinery/portable_atmospherics/canister/oxygen{ @@ -1048,17 +628,13 @@ /obj/machinery/atmospherics/unary/portables_connector{ dir = 1 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "cf" = ( /obj/structure/table/glass, /obj/item/reagent_containers/glass/beaker/cryoxadone, /obj/item/reagent_containers/glass/beaker/cryoxadone, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "cg" = ( /obj/machinery/portable_atmospherics/canister/oxygen{ @@ -1076,9 +652,7 @@ network = list("NHV Asclepius") }, /obj/machinery/atmospherics/unary/portables_connector, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "ch" = ( /obj/structure/table/glass, @@ -1087,24 +661,18 @@ name = "Surgery Cleaner" }, /obj/machinery/cell_charger, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "ci" = ( /obj/structure/bed{ name = "Triage: High Priority" }, /obj/machinery/iv_drip, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "cj" = ( -/obj/machinery/atmospherics/unary/cold_sink/freezer, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/obj/machinery/atmospherics/unary/thermomachine/freezer, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "ck" = ( /obj/machinery/camera{ @@ -1113,9 +681,7 @@ name = "NHV Asclepius OR 2"; network = list("NHV Asclepius") }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "cl" = ( /obj/structure/closet/radiation, @@ -1125,9 +691,7 @@ /obj/item/clothing/suit/radiation, /obj/item/clothing/suit/radiation, /obj/item/clothing/suit/radiation, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "cm" = ( /obj/structure/closet/l3closet, @@ -1137,112 +701,60 @@ /obj/item/clothing/suit/bio_suit, /obj/item/clothing/suit/bio_suit, /obj/item/clothing/suit/bio_suit, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "cn" = ( /obj/structure/closet/secure_closet/medical1, /obj/item/clothing/head/beret/med, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "co" = ( /obj/machinery/portable_atmospherics/canister/oxygen, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "cp" = ( /obj/machinery/suit_storage_unit/cmo/secure/sec_storage, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "cq" = ( /obj/machinery/light, /obj/machinery/suit_storage_unit/cmo/secure/sec_storage, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "cr" = ( /obj/structure/dispenser/oxygen, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "cs" = ( /obj/machinery/vending/medical, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, -/area/shuttle/administration) -"ct" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall_s5"; - dir = 2 - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "cu" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 5; icon_state = "intact" }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "cv" = ( /obj/machinery/atmospherics/pipe/manifold/hidden, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "cw" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4; level = 1 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "cx" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 9; icon_state = "intact" }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, -/area/shuttle/administration) -"hL" = ( -/obj/structure/shuttle/window{ - tag = "icon-window5_mid"; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "window5_mid"; - dir = 2 - }, -/obj/structure/grille, -/obj/machinery/door/poddoor/shutters{ - density = 0; - dir = 2; - icon_state = "open"; - id_tag = "Asclshutters"; - name = "Blast Shutters"; - opacity = 0 - }, -/turf/space, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) "qa" = ( -/obj/structure/shuttle/window{ - tag = "icon-window5_end"; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "window5_end"; - dir = 2 - }, /obj/machinery/door/poddoor/shutters{ density = 0; dir = 2; @@ -1251,85 +763,53 @@ name = "Blast Shutters"; opacity = 0 }, -/obj/structure/grille, -/turf/space, +/obj/effect/spawner/window/shuttle, +/turf/simulated/floor/plating, /area/shuttle/administration) -"Kq" = ( -/obj/structure/shuttle/window{ - tag = "icon-window5_end"; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "window5_end"; - dir = 2 - }, -/obj/structure/grille, -/obj/machinery/door/poddoor/shutters{ - density = 0; - dir = 2; - icon_state = "open"; - id_tag = "Asclshutters"; - name = "Blast Shutters"; - opacity = 0 - }, -/turf/space, -/area/shuttle/administration) -"Vi" = ( -/obj/structure/shuttle/window{ - tag = "icon-window5_end (NORTH)"; - icon = 'icons/turf/shuttle.dmi'; - icon_state = "window5_end"; - dir = 1 - }, -/obj/structure/grille, -/obj/machinery/door/poddoor/shutters{ - density = 0; - dir = 2; - icon_state = "open"; - id_tag = "Asclshutters"; - name = "Blast Shutters"; - opacity = 0 - }, -/turf/space, +"zD" = ( +/obj/effect/spawner/window/shuttle, +/turf/simulated/floor/mineral/titanium, /area/shuttle/administration) (1,1,1) = {" ab -ao -aE -aE -aE -aE -aE -aD +ab +ab +ab +ab +ab +ab +ab bo -bB -bB -bK -aD -aE -aE -aE -aE -ct +bo +bo +bo +ab +ab +ab +ab +ab +ab "} (2,1,1) = {" -ac +ab ap aF aN aS aX ap -ac +ab bp bC bH bL -ac +ab cg cu aw cl -ac +ab "} (3,1,1) = {" ad @@ -1339,12 +819,12 @@ aw aw aY aq -ac +ab bq aR aR bM -ac +ab aC cv aw @@ -1352,47 +832,47 @@ cm qa "} (4,1,1) = {" -ae +ad ar aw aw aw aw ba -ac +ab br aw aw aw -bW +bb cf cw aw cn -hL +qa "} (5,1,1) = {" -af +ad as aw aw aw aw aw -ag -bs +ab +ab bD -aP -bN -bX +zD +ab +ab aC cv aw co -Vi +qa "} (6,1,1) = {" -ac +ab at aw aO @@ -1409,17 +889,17 @@ cj cx aw cp -ac +ab "} (7,1,1) = {" -ag +ab au aH aP aT aP bb -bk +ab bu aw aw @@ -1429,7 +909,7 @@ ch aw aw cq -ac +ab "} (8,1,1) = {" ah @@ -1439,7 +919,7 @@ aQ aw aQ bc -bl +aP aw aw aw @@ -1449,7 +929,7 @@ aw aw aw cr -ac +ab "} (9,1,1) = {" ai @@ -1469,7 +949,7 @@ aw aw aw bR -ac +ab "} (10,1,1) = {" aj @@ -1489,17 +969,17 @@ aw aw aw aw -ac +ab "} (11,1,1) = {" -ak +ah ax aI aR aw aR bd -bm +aP bv bE aw @@ -1509,47 +989,47 @@ ci bQ aw cs -ac +ab "} (12,1,1) = {" -ag -ao +ab +ab aJ aP aU aP bb -bn +ab aP -bF +ab bI -bN -cc +ab +aJ aP -bF +ab bI -bN -bX +ab +ab "} (13,1,1) = {" -ac +ab ay aw aw aw aw be -ac +ab bw bG aw bR -ac +ab bw ck aw bR -ac +ab "} (14,1,1) = {" ad @@ -1559,115 +1039,115 @@ aw aw aw bg -ac +ab bx aw aw aw -ac +ab bx aw aw aw -Kq +qa "} (15,1,1) = {" -al +ad aA aw aw aw aw bh -ac +ab by aw aw bT -ac +ab by aw aw bT -hL +qa "} (16,1,1) = {" -am +ad aB aw aw aw aZ bi -ac +ab bz aw aw bU -ac +ab bz aw aw bU -Vi +qa "} (17,1,1) = {" -ac +ab aC aK aK aV bf ce -ac +ab bA aw bJ bV -ac +ab bA aw bJ bV -ac +ab "} (18,1,1) = {" -an -aD +ab +ab aL aL -aD -aE -aE -bn +ab +ab +ab +ab aL aL -aD -aE -cd -aD +ab +ab +ab +ab aL aL -aD -aW +ab +ab "} (19,1,1) = {" aa -an +ab aM aM -aW +ab aa aa -an +ab aM aM -aW +ab aa aa -an +ab aM aM -aW +ab aa "} diff --git a/_maps/map_files/shuttles/cargo_base.dmm b/_maps/map_files/shuttles/cargo_base.dmm index d14aa27c38e..49eca02c975 100644 --- a/_maps/map_files/shuttles/cargo_base.dmm +++ b/_maps/map_files/shuttles/cargo_base.dmm @@ -1,36 +1,9 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - tag = "icon-swall_f6"; - icon_state = "swall_f6"; - dir = 2 - }, -/area/shuttle/supply) -"b" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall12"; - icon_state = "swall12"; - dir = 2 - }, -/area/shuttle/supply) -"c" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - tag = "icon-swall_f10"; - icon_state = "swall_f10"; - dir = 2 - }, -/area/shuttle/supply) -"d" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall3"; - icon_state = "swall3"; - dir = 2 - }, +/turf/simulated/wall/mineral/titanium, /area/shuttle/supply) "e" = ( -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/supply) "f" = ( /obj/machinery/light/spot{ @@ -38,7 +11,7 @@ icon_state = "tube1"; dir = 1 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/supply) "g" = ( /obj/machinery/conveyor{ @@ -46,7 +19,7 @@ id = "QMLoad2" }, /obj/structure/plasticflaps/mining, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating, /area/shuttle/supply) "h" = ( /obj/machinery/door/airlock/external{ @@ -54,7 +27,7 @@ name = "Shuttle Hatch"; req_access_txt = "31" }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/plating, /area/shuttle/supply) "i" = ( /obj/machinery/light/spot{ @@ -62,7 +35,7 @@ icon_state = "tube1"; dir = 8 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/supply) "j" = ( /obj/machinery/light/spot{ @@ -86,7 +59,7 @@ pixel_y = -8; req_access_txt = "0" }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/supply) "k" = ( /obj/machinery/door/airlock/external{ @@ -97,7 +70,7 @@ /obj/docking_port/mobile/supply{ timid = 1 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/plating, /area/shuttle/supply) "l" = ( /obj/machinery/conveyor{ @@ -105,69 +78,18 @@ id = "QMLoad" }, /obj/structure/plasticflaps/mining, -/turf/simulated/shuttle/plating, -/area/shuttle/supply) -"m" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall7"; - icon_state = "swall7"; - dir = 2 - }, -/area/shuttle/supply) -"n" = ( -/turf/simulated/shuttle/floor, -/turf/simulated/shuttle/wall/interior{ - tag = "icon-swall_f10"; - icon_state = "swall_f10" - }, +/turf/simulated/floor/plating, /area/shuttle/supply) "o" = ( /obj/machinery/light/spot, -/turf/simulated/shuttle/floor, -/area/shuttle/supply) -"p" = ( -/turf/simulated/shuttle/floor, -/turf/simulated/shuttle/wall/interior{ - tag = "icon-swall_f6"; - icon_state = "swall_f6" - }, -/area/shuttle/supply) -"q" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall11"; - icon_state = "swall11"; - dir = 2 - }, -/area/shuttle/supply) -"r" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - tag = "icon-swall_f5"; - icon_state = "swall_f5"; - dir = 2 - }, -/area/shuttle/supply) -"s" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall15"; - icon_state = "swall15"; - dir = 2 - }, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/supply) "t" = ( /obj/structure/window/reinforced{ dir = 1 }, /obj/structure/shuttle/engine/heater, -/turf/simulated/shuttle/plating, -/area/shuttle/supply) -"u" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - tag = "icon-swall_f9"; - icon_state = "swall_f9"; - dir = 2 - }, +/turf/simulated/floor/plating/airless, /area/shuttle/supply) "v" = ( /turf/space, @@ -177,36 +99,36 @@ tag = "icon-burst_l"; icon_state = "burst_l" }, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/shuttle/supply) "x" = ( /obj/structure/shuttle/engine/propulsion, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/shuttle/supply) "y" = ( /obj/structure/shuttle/engine/propulsion{ tag = "icon-burst_r"; icon_state = "burst_r" }, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/shuttle/supply) (1,1,1) = {" a -d -d -d -d -d -d -d -d -m -r +a +a +a +a +a +a +a +a +a +a v "} (2,1,1) = {" -b +a e e e @@ -215,12 +137,12 @@ i e e e -n -s +a +a w "} (3,1,1) = {" -b +a e e e @@ -234,7 +156,7 @@ t x "} (4,1,1) = {" -b +a f e e @@ -248,7 +170,7 @@ t x "} (5,1,1) = {" -b +a e e e @@ -262,7 +184,7 @@ t x "} (6,1,1) = {" -b +a e e e @@ -271,21 +193,21 @@ j e e e -p -s +a +a y "} (7,1,1) = {" -c -d -d +a +a +a g h -d +a k l -d -q -u +a +a +a v "} diff --git a/_maps/map_files/shuttles/emergency_bar.dmm b/_maps/map_files/shuttles/emergency_bar.dmm index 5d45aa9b206..5839657ec3d 100644 --- a/_maps/map_files/shuttles/emergency_bar.dmm +++ b/_maps/map_files/shuttles/emergency_bar.dmm @@ -3,39 +3,16 @@ /turf/space, /area/space) "ab" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f6"; - dir = 2 - }, +/turf/simulated/wall/mineral/titanium, /area/shuttle/escape) "ac" = ( -/obj/structure/grille, -/obj/structure/window/full/shuttle, +/obj/effect/spawner/window/shuttle, /turf/simulated/floor/plating, /area/shuttle/escape) -"ad" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - tag = "icon-swall_f10"; - icon_state = "swall_f10"; - dir = 2 - }, -/area/shuttle/escape) -"ae" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swallc4" - }, -/area/shuttle/escape) "af" = ( /obj/machinery/computer/emergency_shuttle, /turf/simulated/floor/carpet, /area/shuttle/escape) -"ag" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swallc3" - }, -/area/shuttle/escape) "ah" = ( /obj/machinery/computer/security{ network = list("SS13","Telecomms","Research Outpost","Mining Outpost") @@ -80,12 +57,6 @@ }, /turf/simulated/floor/carpet, /area/shuttle/escape) -"ap" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall3"; - dir = 2 - }, -/area/shuttle/escape) "aq" = ( /obj/machinery/computer/robotics, /turf/simulated/floor/carpet, @@ -100,24 +71,12 @@ /obj/machinery/light/spot, /turf/simulated/floor/carpet, /area/shuttle/escape) -"at" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall12"; - dir = 2 - }, -/area/shuttle/escape) -"au" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall13"; - dir = 2 - }, -/area/shuttle/escape) "av" = ( /obj/machinery/door/airlock/command/glass{ name = "Escape Shuttle Cockpit"; req_access_txt = "19" }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/carpet, /area/shuttle/escape) "aw" = ( /obj/structure/chair{ @@ -126,7 +85,7 @@ /obj/structure/chair/comfy/shuttle{ dir = 4 }, -/turf/simulated/shuttle/floor4, +/turf/simulated/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "ax" = ( /obj/machinery/status_display{ @@ -139,18 +98,7 @@ }, /obj/structure/chair, /obj/structure/chair/comfy/shuttle, -/turf/simulated/shuttle/floor4, -/area/shuttle/escape) -"ay" = ( -/obj/machinery/door/airlock/shuttle{ - aiControlDisabled = 1; - hackProof = 1; - id_tag = "s_docking_airlock"; - name = "Shuttle Hatch" - }, -/turf/simulated/floor/plasteel{ - icon_state = "freezerfloor" - }, +/turf/simulated/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "az" = ( /obj/item/twohanded/required/kirbyplants, @@ -201,17 +149,17 @@ /obj/structure/chair/comfy/shuttle{ dir = 4 }, -/turf/simulated/shuttle/floor4, +/turf/simulated/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "aF" = ( -/turf/simulated/shuttle/floor4, +/turf/simulated/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "aG" = ( /obj/machinery/door/airlock/security/glass{ name = "Escape Shuttle Cell"; req_access_txt = "2" }, -/turf/simulated/floor/plating, +/turf/simulated/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "aH" = ( /turf/simulated/floor/plasteel{ @@ -219,7 +167,7 @@ }, /area/shuttle/escape) "aI" = ( -/obj/machinery/door/airlock/shuttle{ +/obj/machinery/door/airlock/titanium{ aiControlDisabled = 1; hackProof = 1; id_tag = "s_docking_airlock"; @@ -234,19 +182,12 @@ /obj/structure/chair/comfy/shuttle{ dir = 1 }, -/turf/simulated/shuttle/floor4, +/turf/simulated/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "aK" = ( /obj/structure/chair, /obj/structure/chair/comfy/shuttle, -/turf/simulated/shuttle/floor4, -/area/shuttle/escape) -"aL" = ( -/obj/structure/grille, -/obj/structure/window/full/shuttle{ - icon_state = "16" - }, -/turf/simulated/floor/plating, +/turf/simulated/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "aM" = ( /obj/structure/chair/stool/bar, @@ -280,9 +221,7 @@ /obj/item/bodybag{ pixel_x = 5 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/escape) "aP" = ( /obj/structure/table/wood, @@ -292,20 +231,6 @@ dir = 2 }, /area/shuttle/escape) -"aQ" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall7"; - icon_state = "swall7"; - dir = 2 - }, -/area/shuttle/escape) -"aR" = ( -/obj/structure/grille, -/obj/structure/window/full/shuttle{ - icon_state = "15" - }, -/turf/simulated/floor/plating, -/area/shuttle/escape) "aS" = ( /obj/machinery/light/spot{ tag = "icon-tube1 (EAST)"; @@ -326,13 +251,13 @@ timid = 1; width = 24 }, -/obj/machinery/door/airlock/shuttle{ +/obj/machinery/door/airlock/titanium{ aiControlDisabled = 1; hackProof = 1; id_tag = "s_docking_airlock"; name = "Shuttle Hatch" }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/plating, /area/shuttle/escape) "aU" = ( /obj/structure/table, @@ -381,13 +306,6 @@ dir = 2 }, /area/shuttle/escape) -"ba" = ( -/obj/structure/grille, -/obj/structure/window/full/shuttle{ - icon_state = "8" - }, -/turf/simulated/floor/plating, -/area/shuttle/escape) "bb" = ( /obj/structure/table/wood, /obj/item/deck/cards, @@ -435,15 +353,6 @@ dir = 2 }, /area/shuttle/escape) -"bg" = ( -/obj/machinery/door/airlock/shuttle{ - aiControlDisabled = 1; - hackProof = 1; - id_tag = "s_docking_airlock"; - name = "Shuttle Hatch" - }, -/turf/simulated/shuttle/floor, -/area/shuttle/escape) "bh" = ( /obj/machinery/status_display{ pixel_y = -30 @@ -459,24 +368,8 @@ name = "Toilet"; req_access_txt = "0" }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, -/area/shuttle/escape) -"bj" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall14"; - icon_state = "swall14"; - dir = 2 - }, -/area/shuttle/escape) -"bk" = ( -/obj/structure/grille, -/obj/structure/window/full/shuttle{ - icon_state = "15" - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" +/turf/simulated/floor/plasteel{ + icon_state = "freezerfloor" }, /area/shuttle/escape) "bl" = ( @@ -499,9 +392,7 @@ name = "Escape Shuttle Infirmary"; req_access_txt = "0" }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/escape) "bo" = ( /turf/simulated/floor/plasteel{ @@ -529,9 +420,7 @@ }, /area/shuttle/escape) "br" = ( -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/escape) "bs" = ( /obj/machinery/vending/wallmed{ @@ -542,9 +431,7 @@ req_access_txt = "0" }, /obj/structure/bed/roller, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/escape) "bt" = ( /obj/machinery/door/airlock{ @@ -554,9 +441,6 @@ icon_state = "freezerfloor" }, /area/shuttle/escape) -"bu" = ( -/turf/simulated/shuttle/wall, -/area/shuttle/escape) "bv" = ( /obj/machinery/door/airlock{ name = "Unit 2" @@ -583,9 +467,7 @@ icon_state = "tube1"; dir = 8 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/escape) "by" = ( /obj/item/radio/intercom{ @@ -594,9 +476,7 @@ pixel_x = 28 }, /obj/structure/bed/roller, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/escape) "bz" = ( /obj/structure/toilet{ @@ -625,65 +505,29 @@ icon_state = "sleeper"; dir = 1 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/escape) "bD" = ( /obj/machinery/light/spot, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, -/area/shuttle/escape) -"bE" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f5"; - dir = 2 - }, -/area/shuttle/escape) -"bF" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall14"; - dir = 2 - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/escape) "bG" = ( /obj/structure/window/reinforced{ dir = 1 }, /obj/structure/shuttle/engine/heater, -/turf/simulated/shuttle/plating, -/area/shuttle/escape) -"bH" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall11"; - dir = 2 - }, -/area/shuttle/escape) -"bI" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall7"; - dir = 2 - }, +/turf/simulated/floor/plating/airless, /area/shuttle/escape) "bJ" = ( /obj/structure/shuttle/engine/heater, /obj/structure/window/reinforced{ dir = 1 }, -/turf/simulated/shuttle/plating, -/area/shuttle/escape) -"bK" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f9"; - dir = 2 - }, +/turf/simulated/floor/plating/airless, /area/shuttle/escape) "bL" = ( /obj/structure/shuttle/engine/propulsion, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/shuttle/escape) (1,1,1) = {" @@ -694,22 +538,22 @@ aa aa aa ab -ap -ap +ab +ab aI -aQ +ab aT -ap -aL -ba -aR -ap -bg -aQ -ay +ab ac -ap -bE +ac +ac +ab +aI +ab +aI +ac +ab +ab aa "} (2,1,1) = {" @@ -719,11 +563,11 @@ aa aa aa aa -at +ab aw aE aF -at +ab aA aH aX @@ -731,12 +575,12 @@ aB aX aH aA -at +ab bo bt bz -bF -bE +ab +ab "} (3,1,1) = {" aa @@ -744,12 +588,12 @@ aa aa aa ab -ap -au +ab +ab ax aF aF -at +ab aA aV aY @@ -757,10 +601,10 @@ bb aY be aA -at +ab bo -bu -bu +ab +ab bG bL "} @@ -769,13 +613,13 @@ aa aa ab ac -ae +ab aq -at +ab aK aF aJ -at +ab aA aV aY @@ -793,15 +637,15 @@ bL (5,1,1) = {" aa ab -ae +ab ak ai ar -at +ab aK aF aJ -at +ab aA aH aH @@ -809,25 +653,25 @@ aH aH aH aA -at +ab bo -bu -bu +ab +ab bG bL "} (6,1,1) = {" ab -ae +ab ah ai al al -at +ab ac aG -aL -bk +ac +ac aA aA aA @@ -835,12 +679,12 @@ aA aA aA bh -bj +ab bo bw bA -bH -bK +ab +ab "} (7,1,1) = {" ac @@ -861,21 +705,21 @@ aA aA aA aA -at +ab bp -bu +ab bB -at +ab aa "} (8,1,1) = {" -ad -ag +ab +ab aj ai al as -at +ab az aA aM @@ -887,21 +731,21 @@ aM aM az bh -bj -ap -ap -ap -bI -bE +ab +ab +ab +ab +ab +ab "} (9,1,1) = {" aa -ad -ag +ab +ab am ao al -at +ab aA aA aN @@ -923,11 +767,11 @@ bL (10,1,1) = {" aa aa -ad +ab ac -ag +ab ar -at +ab aB aH aN @@ -951,9 +795,9 @@ aa aa aa aa -ad -ap -au +ab +ab +ab aC aH aP @@ -979,7 +823,7 @@ aa aa aa aa -at +ab aD aH bq @@ -995,8 +839,8 @@ bm bs by bD -bF -bK +ab +ab "} (13,1,1) = {" aa @@ -1005,22 +849,22 @@ aa aa aa aa -ad -ap -ap +ab +ab +ab ac -ap -ap -ap -aL -ba -aR -ap +ab +ab +ab ac -ap -ap -ap -ap -bK +ac +ac +ab +ac +ab +ab +ab +ab +ab aa "} diff --git a/_maps/map_files/shuttles/emergency_clown.dmm b/_maps/map_files/shuttles/emergency_clown.dmm index 16150fb8fed..8fb6721df5b 100644 --- a/_maps/map_files/shuttles/emergency_clown.dmm +++ b/_maps/map_files/shuttles/emergency_clown.dmm @@ -3,39 +3,16 @@ /turf/space, /area/space) "ab" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f6"; - dir = 2 - }, +/turf/simulated/wall/mineral/titanium, /area/shuttle/escape) "ac" = ( -/obj/structure/grille, -/obj/structure/window/full/shuttle, +/obj/effect/spawner/window/shuttle, /turf/simulated/floor/plating, /area/shuttle/escape) -"ad" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - tag = "icon-swall_f10"; - icon_state = "swall_f10"; - dir = 2 - }, -/area/shuttle/escape) -"ae" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swallc4" - }, -/area/shuttle/escape) "af" = ( /obj/machinery/computer/emergency_shuttle, /turf/simulated/floor/noslip, /area/shuttle/escape) -"ag" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swallc3" - }, -/area/shuttle/escape) "ah" = ( /obj/machinery/computer/security{ network = list("SS13","Telecomms","Research Outpost","Mining Outpost") @@ -95,12 +72,6 @@ }, /turf/simulated/floor/noslip, /area/shuttle/escape) -"ar" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall3"; - dir = 2 - }, -/area/shuttle/escape) "as" = ( /obj/machinery/computer/robotics, /turf/simulated/floor/noslip, @@ -131,30 +102,12 @@ "aw" = ( /turf/simulated/floor/noslip, /area/shuttle/escape) -"ax" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall12"; - dir = 2 - }, -/area/shuttle/escape) -"ay" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall13"; - dir = 2 - }, -/area/shuttle/escape) "az" = ( /obj/machinery/door/airlock/public/glass, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/shuttle/escape) -"aA" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall14"; - dir = 2 - }, -/area/shuttle/escape) "aB" = ( /turf/simulated/floor/chasm, /area/shuttle/escape) @@ -174,13 +127,6 @@ /obj/item/bedsheet/rainbow, /turf/simulated/floor/noslip, /area/shuttle/escape) -"aE" = ( -/obj/structure/grille, -/obj/structure/window/full/shuttle{ - icon_state = "16" - }, -/turf/simulated/floor/plating, -/area/shuttle/escape) "aF" = ( /obj/machinery/status_display{ pixel_y = 30 @@ -208,7 +154,7 @@ name = "greentext" }, /obj/item/reagent_containers/food/condiment/saltshaker, -/turf/simulated/shuttle/floor4, +/turf/simulated/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "aI" = ( /obj/machinery/door/airlock/security/glass{ @@ -217,13 +163,6 @@ }, /turf/simulated/floor/noslip, /area/shuttle/escape) -"aJ" = ( -/obj/structure/grille, -/obj/structure/window/full/shuttle{ - icon_state = "8" - }, -/turf/simulated/floor/plating, -/area/shuttle/escape) "aK" = ( /obj/structure/closet/walllocker/emerglocker{ pixel_x = 28 @@ -240,27 +179,6 @@ }, /turf/simulated/floor/chasm, /area/shuttle/escape) -"aM" = ( -/obj/structure/grille, -/obj/structure/window/full/shuttle{ - icon_state = "16" - }, -/turf/simulated/floor/noslip, -/area/shuttle/escape) -"aN" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall7"; - icon_state = "swall7"; - dir = 2 - }, -/area/shuttle/escape) -"aO" = ( -/obj/structure/grille, -/obj/structure/window/full/shuttle{ - icon_state = "15" - }, -/turf/simulated/floor/plating, -/area/shuttle/escape) "aP" = ( /obj/docking_port/mobile/emergency{ dir = 4; @@ -270,13 +188,13 @@ timid = 1; width = 24 }, -/obj/machinery/door/airlock/shuttle{ +/obj/machinery/door/airlock/titanium{ aiControlDisabled = 1; hackProof = 1; id_tag = "s_docking_airlock"; name = "Shuttle Hatch" }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/plating, /area/shuttle/escape) "aQ" = ( /obj/item/radio/intercom{ @@ -317,13 +235,13 @@ /turf/simulated/floor/noslip, /area/shuttle/escape) "aT" = ( -/obj/machinery/door/airlock/shuttle{ +/obj/machinery/door/airlock/titanium{ aiControlDisabled = 1; hackProof = 1; id_tag = "s_docking_airlock"; name = "Shuttle Hatch" }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/plating, /area/shuttle/escape) "aU" = ( /obj/machinery/status_display{ @@ -337,31 +255,21 @@ /area/shuttle/escape) "aV" = ( /obj/structure/noticeboard, -/turf/simulated/shuttle/wall{ - icon_state = "swall12"; - dir = 2 - }, +/turf/simulated/wall/mineral/titanium, /area/shuttle/escape) "aW" = ( -/obj/machinery/door/airlock/shuttle{ +/obj/machinery/door/airlock/titanium{ aiControlDisabled = 1; hackProof = 1; id_tag = null; name = "Shuttle Cargo Hatch" }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, -/area/shuttle/escape) -"aX" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall14"; - icon_state = "swall14"; - dir = 2 +/turf/simulated/floor/plasteel{ + icon_state = "white" }, /area/shuttle/escape) "aY" = ( -/obj/machinery/door/airlock/shuttle{ +/obj/machinery/door/airlock/titanium{ aiControlDisabled = 1; hackProof = 1; id_tag = "s_docking_airlock"; @@ -369,20 +277,6 @@ }, /turf/simulated/floor/noslip, /area/shuttle/escape) -"aZ" = ( -/obj/structure/grille, -/obj/structure/window/full/shuttle{ - icon_state = "14" - }, -/turf/simulated/floor/plating, -/area/shuttle/escape) -"ba" = ( -/obj/structure/grille, -/obj/structure/window/full/shuttle{ - icon_state = "17" - }, -/turf/simulated/floor/plating, -/area/shuttle/escape) "bb" = ( /obj/machinery/door/airlock/medical/glass{ id_tag = null; @@ -482,13 +376,6 @@ }, /turf/simulated/floor/noslip, /area/shuttle/escape) -"bn" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f5"; - dir = 2 - }, -/area/shuttle/escape) "bo" = ( /obj/structure/window/reinforced{ dir = 1 @@ -497,19 +384,7 @@ /obj/structure/window/reinforced, /obj/item/stack/sheet/mineral/bananium, /obj/item/bikehorn/rubberducky, -/turf/simulated/shuttle/plating, -/area/shuttle/escape) -"bp" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall11"; - dir = 2 - }, -/area/shuttle/escape) -"bq" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall7"; - dir = 2 - }, +/turf/simulated/floor/plating, /area/shuttle/escape) "br" = ( /obj/structure/shuttle/engine/heater, @@ -519,18 +394,11 @@ /obj/structure/window/reinforced, /obj/item/stack/sheet/mineral/bananium, /obj/item/bikehorn/rubberducky, -/turf/simulated/shuttle/plating, -/area/shuttle/escape) -"bs" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f9"; - dir = 2 - }, +/turf/simulated/floor/plating, /area/shuttle/escape) "bt" = ( /obj/structure/shuttle/engine/propulsion, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/shuttle/escape) (1,1,1) = {" @@ -541,22 +409,22 @@ aa aa aa ab -ar -ar -ar -aN +ab +ab +ab +ab aP -ar -aE -aJ -aO -ar +ab +ac +ac +ac +ab aT -aN +ab aY ac -ar -bn +ab +ab aa "} (2,1,1) = {" @@ -566,11 +434,11 @@ aa aa aa aa -ax +ab aB aG aB -ax +ab am aQ aR @@ -578,12 +446,12 @@ aD aD aS am -ax +ab aw bf bj -aA -bn +ab +ab "} (3,1,1) = {" aa @@ -591,12 +459,12 @@ aa aa aa ab -ar -ay +ab +ab aC aH aB -ax +ab am am am @@ -616,13 +484,13 @@ aa aa ab ac -ae +ab as -ax +ab aB aB aL -ax +ab am aD aD @@ -640,23 +508,23 @@ bt (5,1,1) = {" aa ab -ae +ab ak ao at -ax +ab ac aI -aM -aO +ac +ac am -aE -aJ -aJ -aO +ac +ac +ac +ac am am -ax +ab bc bg bl @@ -665,12 +533,12 @@ bt "} (6,1,1) = {" ab -ae +ab ah ai am au -ax +ab aD aw aD @@ -682,12 +550,12 @@ aD aD am aU -aX -ar -ar -ar -bp -bs +ab +ab +ab +ab +ab +ab "} (7,1,1) = {" ac @@ -716,13 +584,13 @@ aa aa "} (8,1,1) = {" -ad -ag +ab +ab aj ai ap au -ax +ab aD aD aD @@ -734,30 +602,30 @@ aD aD am aU -aX -ar -ar -ar -bq -bn +ab +ab +ab +ab +ab +ab "} (9,1,1) = {" aa -ad -ag +ab +ab an aq av -aA -aE -aJ -aJ -aO +ab +ac +ac +ac +ac am -aE -aJ -aJ -aO +ac +ac +ac +ac am am ac @@ -770,11 +638,11 @@ bt (10,1,1) = {" aa aa -ad +ab ac -ag +ab aw -ax +ab aD aD aD @@ -798,9 +666,9 @@ aa aa aa aa -ad -ar -ay +ab +ab +ab aF am am @@ -812,7 +680,7 @@ am am am am -aZ +ac aw aw bm @@ -826,7 +694,7 @@ aa aa aa aa -ax +ab aD aK aD @@ -838,12 +706,12 @@ aD aD am am -ba +ac be bi aw -aA -bs +ab +ab "} (13,1,1) = {" aa @@ -852,22 +720,22 @@ aa aa aa aa -ad -ar -ar +ab +ab +ab ac -ar -ar -ar -aE -aJ -aO -ar +ab +ab +ab ac -ar -ar -ar -ar -bs +ac +ac +ab +ac +ab +ab +ab +ab +ab aa "} diff --git a/_maps/map_files/shuttles/emergency_cramped.dmm b/_maps/map_files/shuttles/emergency_cramped.dmm index 5cd443121dc..0b263aef6ef 100644 --- a/_maps/map_files/shuttles/emergency_cramped.dmm +++ b/_maps/map_files/shuttles/emergency_cramped.dmm @@ -3,43 +3,16 @@ /turf/space, /area/space) "b" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall_s6"; - dir = 2 - }, +/turf/simulated/wall/mineral/titanium, /area/shuttle/escape) "c" = ( -/obj/structure/window/full/shuttle, -/obj/structure/grille, +/obj/effect/spawner/window/shuttle, /turf/simulated/floor/plating, /area/shuttle/escape) -"d" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall_s10"; - dir = 2 - }, -/area/shuttle/escape) -"e" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swallc4" - }, -/area/shuttle/escape) "f" = ( /obj/machinery/computer/emergency_shuttle, /turf/simulated/floor/plating, /area/shuttle/escape) -"g" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swallc3" - }, -/area/shuttle/escape) -"h" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall3"; - icon_state = "swall3"; - dir = 2 - }, -/area/shuttle/escape) "i" = ( /obj/structure/table, /obj/item/book/manual, @@ -57,7 +30,7 @@ /turf/simulated/floor/plating, /area/shuttle/escape) "l" = ( -/obj/machinery/door/airlock/shuttle{ +/obj/machinery/door/airlock/titanium{ aiControlDisabled = 1; hackProof = 1; id_tag = "s_docking_airlock"; @@ -90,7 +63,7 @@ /turf/simulated/floor/plating, /area/shuttle/escape) "q" = ( -/obj/machinery/door/airlock/shuttle{ +/obj/machinery/door/airlock/titanium{ aiControlDisabled = 1; hackProof = 1; id_tag = "s_docking_airlock"; @@ -119,38 +92,17 @@ }, /turf/simulated/floor/plating, /area/shuttle/escape) -"t" = ( -/obj/structure/window/full/shuttle{ - icon_state = "16" - }, -/obj/structure/grille, -/turf/simulated/floor/plating, -/area/shuttle/escape) "u" = ( /obj/effect/decal/warning_stripes/yellow/hollow, /obj/structure/closet/crate, /obj/effect/spawner/lootdrop/maintenance, /turf/simulated/floor/plating, /area/shuttle/escape) -"v" = ( -/obj/structure/window/full/shuttle{ - icon_state = "8" - }, -/obj/structure/grille, -/turf/simulated/floor/plating, -/area/shuttle/escape) "w" = ( /obj/effect/decal/warning_stripes/yellow/hollow, /obj/structure/closet/crate, /turf/simulated/floor/plating, /area/shuttle/escape) -"x" = ( -/obj/structure/window/full/shuttle{ - icon_state = "15" - }, -/obj/structure/grille, -/turf/simulated/floor/plating, -/area/shuttle/escape) "y" = ( /obj/structure/closet/emcloset, /turf/simulated/floor/plating, @@ -162,57 +114,44 @@ dir = 1; layer = 2.9 }, -/turf/simulated/shuttle/plating, -/area/shuttle/escape) -"A" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall_s5"; - dir = 2 - }, +/turf/simulated/floor/plating, /area/shuttle/escape) "B" = ( /obj/structure/shuttle/engine/propulsion{ tag = "icon-burst_l"; icon_state = "burst_l" }, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/shuttle/escape) "C" = ( /obj/structure/shuttle/engine/propulsion{ tag = "icon-propulsion_r"; icon_state = "propulsion_r" }, -/turf/simulated/shuttle/plating, -/area/shuttle/escape) -"D" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall_s9"; - icon_state = "swall_s9"; - dir = 2 - }, +/turf/simulated/floor/plating/airless, /area/shuttle/escape) (1,1,1) = {" a b -h +b l -h +b q -h -t -v -x -h +b +c +c +c +b l -h +b l -h -A +b +b "} (2,1,1) = {" b -e +b i m n @@ -247,8 +186,8 @@ z C "} (4,1,1) = {" -d -g +b +b k m p @@ -266,19 +205,19 @@ C "} (5,1,1) = {" a -d -h -h -h -h -h -t -v -x -h -h -h -h -h -D +b +b +b +b +b +b +c +c +c +b +b +b +b +b +b "} diff --git a/_maps/map_files/shuttles/emergency_cyb.dmm b/_maps/map_files/shuttles/emergency_cyb.dmm index baccd222187..551a52ccc52 100644 --- a/_maps/map_files/shuttles/emergency_cyb.dmm +++ b/_maps/map_files/shuttles/emergency_cyb.dmm @@ -3,24 +3,12 @@ /turf/space, /area/space) "ab" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f6"; - dir = 2 - }, +/turf/simulated/wall/mineral/titanium, /area/shuttle/escape) "ac" = ( -/obj/structure/grille, -/obj/structure/window/full/shuttle, +/obj/effect/spawner/window/shuttle, /turf/simulated/floor/plating, /area/shuttle/escape) -"ad" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f10"; - dir = 2 - }, -/area/shuttle/escape) "ae" = ( /obj/structure/table/reinforced, /obj/item/paper_bin, @@ -112,12 +100,6 @@ icon_state = "vault" }, /area/shuttle/escape) -"aq" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall3"; - dir = 2 - }, -/area/shuttle/escape) "ar" = ( /obj/machinery/computer/security{ network = list("SS13","Research Outpost","Mining Outpost","Telecomms") @@ -158,18 +140,6 @@ icon_state = "dark" }, /area/shuttle/escape) -"av" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall12"; - dir = 2 - }, -/area/shuttle/escape) -"aw" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall13"; - dir = 2 - }, -/area/shuttle/escape) "ax" = ( /obj/machinery/computer/station_alert, /obj/structure/sign/poster/official/nanotrasen_logo{ @@ -192,7 +162,7 @@ /obj/structure/chair/comfy/shuttle{ dir = 4 }, -/turf/simulated/shuttle/floor4, +/turf/simulated/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "aA" = ( /obj/machinery/light, @@ -221,17 +191,7 @@ /area/shuttle/escape) "aD" = ( /obj/machinery/status_display, -/turf/simulated/shuttle/wall{ - icon_state = "swall12"; - dir = 2 - }, -/area/shuttle/escape) -"aE" = ( -/obj/structure/grille, -/obj/structure/window/full/shuttle{ - icon_state = "16" - }, -/turf/simulated/floor/plating, +/turf/simulated/wall/mineral/titanium, /area/shuttle/escape) "aF" = ( /obj/machinery/door/airlock/command/glass{ @@ -242,10 +202,10 @@ /area/shuttle/escape) "aG" = ( /obj/structure/table/reinforced, -/turf/simulated/shuttle/floor4, +/turf/simulated/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "aH" = ( -/turf/simulated/shuttle/floor4, +/turf/simulated/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "aI" = ( /obj/machinery/light{ @@ -253,19 +213,12 @@ on = 1 }, /obj/structure/chair/comfy/shuttle, -/turf/simulated/shuttle/floor4, +/turf/simulated/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "aJ" = ( /obj/structure/table/reinforced, /obj/item/storage/fancy/donut_box, -/turf/simulated/shuttle/floor4, -/area/shuttle/escape) -"aK" = ( -/obj/structure/grille, -/obj/structure/window/full/shuttle{ - icon_state = "8" - }, -/turf/simulated/floor/plating, +/turf/simulated/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "aL" = ( /obj/structure/table/reinforced, @@ -289,25 +242,11 @@ /obj/structure/chair/comfy/shuttle{ dir = 1 }, -/turf/simulated/shuttle/floor4, +/turf/simulated/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "aO" = ( /obj/structure/chair/comfy/shuttle, -/turf/simulated/shuttle/floor4, -/area/shuttle/escape) -"aP" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall7"; - icon_state = "swall7"; - dir = 2 - }, -/area/shuttle/escape) -"aQ" = ( -/obj/structure/grille, -/obj/structure/window/full/shuttle{ - icon_state = "15" - }, -/turf/simulated/floor/plating, +/turf/simulated/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "aR" = ( /obj/structure/closet/fireaxecabinet{ @@ -353,10 +292,10 @@ /obj/item/clothing/mask/breath, /obj/item/clothing/mask/breath, /obj/item/clothing/mask/breath, -/obj/item/tank/emergency_oxygen/engi, -/obj/item/tank/emergency_oxygen/engi, -/obj/item/tank/emergency_oxygen/engi, -/obj/item/tank/emergency_oxygen/engi, +/obj/item/tank/internals/emergency_oxygen/engi, +/obj/item/tank/internals/emergency_oxygen/engi, +/obj/item/tank/internals/emergency_oxygen/engi, +/obj/item/tank/internals/emergency_oxygen/engi, /turf/simulated/floor/plasteel{ icon_state = "bot"; dir = 1 @@ -371,13 +310,13 @@ /obj/structure/chair/comfy/shuttle{ dir = 4 }, -/turf/simulated/shuttle/floor4, +/turf/simulated/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "aX" = ( /obj/structure/chair/comfy/shuttle{ dir = 8 }, -/turf/simulated/shuttle/floor4, +/turf/simulated/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "aY" = ( /obj/structure/table/reinforced, @@ -387,33 +326,12 @@ icon_state = "redcorner" }, /area/shuttle/escape) -"aZ" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall14"; - icon_state = "swall14"; - dir = 2 - }, -/area/shuttle/escape) "ba" = ( /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/shuttle/escape) -"bb" = ( -/obj/structure/grille, -/obj/structure/window/full/shuttle{ - icon_state = "14" - }, -/turf/simulated/floor/plating, -/area/shuttle/escape) -"bc" = ( -/obj/structure/grille, -/obj/structure/window/full/shuttle{ - icon_state = "17" - }, -/turf/simulated/floor/plating, -/area/shuttle/escape) "bd" = ( /turf/simulated/floor/plasteel{ dir = 4; @@ -421,7 +339,7 @@ }, /area/shuttle/escape) "be" = ( -/obj/machinery/door/airlock/shuttle/glass{ +/obj/machinery/door/airlock/titanium/glass{ name = "Emergency Airlock Access"; req_one_access_txt = "2;19" }, @@ -448,14 +366,14 @@ id_tag = "s_docking_airlock" }, /obj/structure/fans/tiny, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plating, /area/shuttle/escape) "bj" = ( /obj/machinery/door/airlock/security/glass{ name = "Escape Shuttle Cell"; req_access_txt = "2" }, -/turf/simulated/shuttle/floor4, +/turf/simulated/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "bk" = ( /turf/simulated/floor/plasteel{ @@ -479,25 +397,18 @@ /turf/simulated/floor/mech_bay_recharge_floor, /area/shuttle/escape) "bo" = ( -/obj/machinery/door/airlock/shuttle{ +/obj/machinery/door/airlock/titanium{ aiControlDisabled = 1; hackProof = 1; id_tag = "s_docking_airlock"; name = "Shuttle Hatch" }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plating, /area/shuttle/escape) "bp" = ( /obj/structure/table/reinforced, /obj/machinery/recharger, -/turf/simulated/shuttle/floor4, -/area/shuttle/escape) -"bq" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f5"; - dir = 2 - }, +/turf/simulated/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "br" = ( /obj/item/twohanded/required/kirbyplants, @@ -506,35 +417,16 @@ icon_state = "redcorner" }, /area/shuttle/escape) -"bs" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall11"; - dir = 2 - }, -/area/shuttle/escape) -"bt" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall7"; - dir = 2 - }, -/area/shuttle/escape) "bu" = ( /obj/structure/shuttle/engine/heater, /obj/structure/window/reinforced{ dir = 1 }, -/turf/simulated/shuttle/plating, -/area/shuttle/escape) -"bv" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f9"; - dir = 2 - }, +/turf/simulated/floor/plating/airless, /area/shuttle/escape) "bw" = ( /obj/structure/shuttle/engine/propulsion, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/shuttle/escape) "bx" = ( /obj/item/twohanded/required/kirbyplants, @@ -594,7 +486,7 @@ }, /area/shuttle/escape) "bD" = ( -/obj/machinery/door/airlock/shuttle{ +/obj/machinery/door/airlock/titanium{ aiControlDisabled = 1; hackProof = 1; id_tag = "s_docking_airlock"; @@ -607,7 +499,7 @@ timid = 1; width = 29 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plating, /area/shuttle/escape) "bE" = ( /turf/simulated/floor/plasteel, @@ -721,7 +613,7 @@ /turf/simulated/floor/grass, /area/shuttle/escape) "bS" = ( -/obj/machinery/door/airlock/shuttle/glass{ +/obj/machinery/door/airlock/titanium/glass{ name = "Shuttle Cargo Hatch" }, /turf/simulated/floor/plasteel, @@ -745,19 +637,9 @@ dir = 1 }, /area/shuttle/escape) -"bW" = ( -/obj/machinery/status_display, -/turf/simulated/shuttle/wall{ - icon_state = "swall3"; - dir = 2 - }, -/area/shuttle/escape) "bX" = ( /obj/machinery/ai_status_display, -/turf/simulated/shuttle/wall{ - icon_state = "swall3"; - dir = 2 - }, +/turf/simulated/wall/mineral/titanium, /area/shuttle/escape) "bY" = ( /obj/structure/flora/ausbushes/grassybush, @@ -801,10 +683,7 @@ /area/shuttle/escape) "cc" = ( /obj/structure/extinguisher_cabinet, -/turf/simulated/shuttle/wall{ - icon_state = "swall3"; - dir = 2 - }, +/turf/simulated/wall/mineral/titanium, /area/shuttle/escape) "cd" = ( /obj/item/radio/intercom{ @@ -906,17 +785,7 @@ /area/shuttle/escape) "cm" = ( /obj/structure/sign/greencross, -/turf/simulated/shuttle/wall{ - icon_state = "swall12"; - dir = 2 - }, -/area/shuttle/escape) -"cn" = ( -/obj/structure/sign/greencross, -/turf/simulated/shuttle/wall{ - icon_state = "swall3"; - dir = 2 - }, +/turf/simulated/wall/mineral/titanium, /area/shuttle/escape) "co" = ( /obj/machinery/sleeper{ @@ -1097,9 +966,7 @@ }, /area/shuttle/escape) "cH" = ( -/turf/simulated/shuttle/wall{ - icon_state = "wall3" - }, +/turf/simulated/wall/mineral/plastitanium, /area/shuttle/escape) (1,1,1) = {" @@ -1109,28 +976,28 @@ aa aa aa ab -aq -aq -aq +ab +ab +ab bo -aP +ab bD -aq -aQ -aK -aE -aq +ab +ac +ac +ac +ab bo -aq +ab bo -aq -aq -aQ -aE -aq -aq -bt -bq +ab +ab +ac +ac +ab +ab +ab +ab aa "} (2,1,1) = {" @@ -1139,12 +1006,12 @@ aa aa aa aa -av +ab aG aW az aH -av +ab bE bJ bP @@ -1160,7 +1027,7 @@ bP bP cA aV -av +ab bu bw "} @@ -1191,7 +1058,7 @@ ba ba ba bB -bb +ac bu bw "} @@ -1201,12 +1068,12 @@ aa aa aa ab -aw +ab aI aH aH aN -bb +ac bg ba bQ @@ -1222,26 +1089,26 @@ bQ bQ ba bB -bc +ac bu bw "} (5,1,1) = {" ab -aq +ab ac -aq -bs -aw +ab +ab +ab aO aH aH aN -bc +ac bg ba bR -bW +aD bY cc bR @@ -1253,22 +1120,22 @@ bX bY ba bB -av +ab cH cH "} (6,1,1) = {" -av +ab ae am ar ay -av +ab aJ aX aH bp -av +ab bg ba bP @@ -1284,7 +1151,7 @@ bP bP ba bB -av +ab bu bw "} @@ -1294,12 +1161,12 @@ af an as aA -aZ -aq +ab +ab ac bj -aq -aw +ab +ab bF ba ba @@ -1346,7 +1213,7 @@ bQ bQ ba bB -av +ab cH cH "} @@ -1373,11 +1240,11 @@ ba bY cc bR -bW +aD bY ba bB -bb +ac bu bw "} @@ -1408,7 +1275,7 @@ bP bP ba bB -bc +ac bu bw "} @@ -1439,7 +1306,7 @@ ba ba ba bB -av +ab cH cH "} @@ -1449,12 +1316,12 @@ ak an au aB -aZ -aq +ab +ab be be -aq -aw +ab +ab aV bK bE @@ -1475,48 +1342,48 @@ bu bw "} (13,1,1) = {" -av +ab al ap ax aC -av +ab aS bf bd by -aZ -aq -aq +ab +ab +ab bS bS -aq -aq -aq -aP -cn +ab +ab +ab +ab +cm ac cu cu ac -bW -aq -aw +aD +ab +ab bu bw "} (14,1,1) = {" -ad -aq +ab +ab ac -aq -aP -aw +ab +ab +ab aT bg bl bz -av +ab bG bL bE @@ -1524,7 +1391,7 @@ bE bZ cd cf -av +ab co cs cv @@ -1532,7 +1399,7 @@ cv cy cB cD -av +ab cH cH "} @@ -1541,13 +1408,13 @@ aa aa aa aa -ad -aw +ab +ab aU bg bl bA -av +ab bn bM bT @@ -1563,7 +1430,7 @@ cv cy cp cE -bb +ac bu bw "} @@ -1578,7 +1445,7 @@ aU bg bl bB -av +ab bH bN bU @@ -1594,7 +1461,7 @@ cv cy cp cF -bc +ac bu bw "} @@ -1604,12 +1471,12 @@ aa aa aa aa -av +ab aV bh bm aV -av +ab bI bO bV @@ -1625,7 +1492,7 @@ cx cz cC cG -av +ab bu bw "} @@ -1635,28 +1502,28 @@ aa aa aa aa -ad +ab ac bi bi ac -bs -aq -aQ -aK -aK -aK -aE -aq -bs -aq -aq -aQ -aK -aK -aE -aq -bs -bv +ab +ab +ac +ac +ac +ac +ac +ab +ab +ab +ab +ac +ac +ac +ac +ab +ab +ab aa "} diff --git a/_maps/map_files/shuttles/emergency_dept.dmm b/_maps/map_files/shuttles/emergency_dept.dmm index fb479c23995..22cb29655c6 100644 --- a/_maps/map_files/shuttles/emergency_dept.dmm +++ b/_maps/map_files/shuttles/emergency_dept.dmm @@ -3,24 +3,12 @@ /turf/space, /area/space) "ab" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f6"; - dir = 2 - }, +/turf/simulated/wall/mineral/titanium, /area/shuttle/escape) "ac" = ( -/obj/structure/grille, -/obj/structure/window/full/shuttle, +/obj/effect/spawner/window/shuttle, /turf/simulated/floor/plating, /area/shuttle/escape) -"ad" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f10"; - dir = 2 - }, -/area/shuttle/escape) "ae" = ( /obj/structure/table/reinforced, /obj/item/paper_bin, @@ -112,12 +100,6 @@ icon_state = "vault" }, /area/shuttle/escape) -"aq" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall3"; - dir = 2 - }, -/area/shuttle/escape) "ar" = ( /obj/machinery/computer/security{ network = list("SS13","Research Outpost","Mining Outpost","Telecomms") @@ -158,18 +140,6 @@ icon_state = "dark" }, /area/shuttle/escape) -"av" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall12"; - dir = 2 - }, -/area/shuttle/escape) -"aw" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall13"; - dir = 2 - }, -/area/shuttle/escape) "ax" = ( /obj/machinery/computer/station_alert, /obj/structure/sign/poster/official/nanotrasen_logo{ @@ -192,7 +162,7 @@ /obj/structure/chair/comfy/shuttle{ dir = 4 }, -/turf/simulated/shuttle/floor4, +/turf/simulated/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "aA" = ( /obj/machinery/light, @@ -221,10 +191,7 @@ /area/shuttle/escape) "aD" = ( /obj/machinery/status_display, -/turf/simulated/shuttle/wall{ - icon_state = "swall12"; - dir = 2 - }, +/turf/simulated/wall/mineral/titanium, /area/shuttle/escape) "aE" = ( /obj/machinery/door/airlock/command/glass{ @@ -250,10 +217,10 @@ pixel_x = 32; pixel_y = 0 }, -/turf/simulated/shuttle/floor4, +/turf/simulated/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "aH" = ( -/turf/simulated/shuttle/floor4, +/turf/simulated/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "aI" = ( /obj/machinery/door/airlock/medical/glass{ @@ -270,7 +237,7 @@ /obj/structure/table/reinforced, /obj/item/storage/fancy/donut_box, /obj/item/restraints/handcuffs, -/turf/simulated/shuttle/floor4, +/turf/simulated/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "aL" = ( /obj/machinery/door/airlock/medical/glass{ @@ -302,10 +269,7 @@ dir = 1; pixel_y = 7 }, -/turf/simulated/shuttle/wall{ - icon_state = "swall12"; - dir = 2 - }, +/turf/simulated/wall/mineral/titanium, /area/shuttle/escape) "aO" = ( /mob/living/simple_animal/bot/secbot, @@ -314,18 +278,11 @@ dir = 2 }, /area/shuttle/escape) -"aP" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall7"; - icon_state = "swall7"; - dir = 2 - }, -/area/shuttle/escape) "aR" = ( /obj/structure/chair/comfy/shuttle{ dir = 1 }, -/turf/simulated/shuttle/floor4, +/turf/simulated/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "aS" = ( /turf/simulated/floor/plasteel{ @@ -360,20 +317,13 @@ normalspeed = 0; req_access_txt = "63" }, -/turf/simulated/shuttle/floor4, +/turf/simulated/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "aX" = ( /obj/structure/chair/comfy/shuttle{ dir = 8 }, -/turf/simulated/shuttle/floor4, -/area/shuttle/escape) -"aZ" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall14"; - icon_state = "swall14"; - dir = 2 - }, +/turf/simulated/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "ba" = ( /turf/simulated/floor/plasteel{ @@ -383,10 +333,7 @@ /area/shuttle/escape) "bb" = ( /obj/structure/sign/greencross, -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swallc3" - }, +/turf/simulated/wall/mineral/titanium, /area/shuttle/escape) "bc" = ( /obj/structure/bed/roller, @@ -442,7 +389,7 @@ dir = 1 }, /obj/machinery/light, -/turf/simulated/shuttle/floor4, +/turf/simulated/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "bh" = ( /obj/machinery/recharger/wallcharger{ @@ -467,7 +414,7 @@ normalspeed = 0; req_access_txt = "2" }, -/turf/simulated/shuttle/floor4, +/turf/simulated/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "bk" = ( /obj/machinery/door/airlock/mining/glass{ @@ -488,7 +435,7 @@ icon_state = "tube1"; dir = 8 }, -/turf/simulated/shuttle/floor4, +/turf/simulated/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "bm" = ( /obj/machinery/sleeper/upgraded{ @@ -501,12 +448,10 @@ /area/shuttle/escape) "bn" = ( /obj/structure/table/reinforced, -/turf/simulated/shuttle/floor{ - icon_state = "floor2" - }, +/turf/simulated/floor/mineral/titanium/yellow, /area/shuttle/escape) "bo" = ( -/obj/machinery/door/airlock/shuttle{ +/obj/machinery/door/airlock/titanium{ aiControlDisabled = 1; hackProof = 1; id_tag = "s_docking_airlock"; @@ -522,52 +467,24 @@ icon_state = "tube1"; dir = 4 }, -/turf/simulated/shuttle/floor4, -/area/shuttle/escape) -"bq" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f5"; - dir = 2 - }, +/turf/simulated/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "br" = ( /obj/structure/chair/comfy/shuttle{ dir = 1 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor2" - }, -/area/shuttle/escape) -"bs" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall11"; - dir = 2 - }, -/area/shuttle/escape) -"bt" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall7"; - dir = 2 - }, +/turf/simulated/floor/mineral/titanium/yellow, /area/shuttle/escape) "bu" = ( /obj/structure/shuttle/engine/heater, /obj/structure/window/reinforced{ dir = 1 }, -/turf/simulated/shuttle/plating, -/area/shuttle/escape) -"bv" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f9"; - dir = 2 - }, +/turf/simulated/floor/plating/airless, /area/shuttle/escape) "bw" = ( /obj/structure/shuttle/engine/propulsion, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/shuttle/escape) "bx" = ( /obj/structure/bed/roller, @@ -583,38 +500,27 @@ /obj/structure/chair/comfy/shuttle{ dir = 4 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor2" - }, +/turf/simulated/floor/mineral/titanium/yellow, /area/shuttle/escape) "bz" = ( -/turf/simulated/shuttle/floor{ - icon_state = "floor2" - }, +/turf/simulated/floor/mineral/titanium/yellow, /area/shuttle/escape) "bA" = ( /obj/structure/chair/comfy/shuttle{ dir = 8 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor2" - }, +/turf/simulated/floor/mineral/titanium/yellow, /area/shuttle/escape) "bB" = ( /obj/structure/table/reinforced, -/turf/simulated/shuttle/floor{ - icon_state = "floor5" - }, +/turf/simulated/floor/mineral/titanium/purple, /area/shuttle/escape) "bC" = ( /obj/structure/sign/directions/engineering, -/turf/simulated/shuttle/wall{ - icon_state = "swall12"; - dir = 2 - }, +/turf/simulated/wall/mineral/titanium, /area/shuttle/escape) "bD" = ( -/obj/machinery/door/airlock/shuttle{ +/obj/machinery/door/airlock/titanium{ aiControlDisabled = 1; hackProof = 1; id_tag = "s_docking_airlock"; @@ -633,9 +539,7 @@ /obj/structure/chair/comfy/shuttle{ dir = 1 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor5" - }, +/turf/simulated/floor/mineral/titanium/purple, /area/shuttle/escape) "bF" = ( /obj/structure/chair/comfy/shuttle{ @@ -646,14 +550,6 @@ icon_state = "cmo" }, /area/shuttle/escape) -"bG" = ( -/obj/machinery/status_display, -/turf/simulated/shuttle/wall{ - tag = "icon-swall14"; - icon_state = "swall14"; - dir = 2 - }, -/area/shuttle/escape) "bH" = ( /obj/structure/chair/comfy/shuttle{ dir = 8 @@ -671,22 +567,16 @@ /obj/structure/chair/comfy/shuttle{ dir = 4 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor5" - }, +/turf/simulated/floor/mineral/titanium/purple, /area/shuttle/escape) "bJ" = ( -/turf/simulated/shuttle/floor{ - icon_state = "floor5" - }, +/turf/simulated/floor/mineral/titanium/purple, /area/shuttle/escape) "bK" = ( /obj/structure/chair/comfy/shuttle{ dir = 8 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor5" - }, +/turf/simulated/floor/mineral/titanium/purple, /area/shuttle/escape) "bL" = ( /obj/structure/chair/comfy/shuttle{ @@ -696,9 +586,7 @@ icon_state = "tube1"; dir = 8 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor2" - }, +/turf/simulated/floor/mineral/titanium/yellow, /area/shuttle/escape) "bM" = ( /obj/structure/chair/comfy/shuttle{ @@ -708,9 +596,7 @@ icon_state = "tube1"; dir = 4 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor2" - }, +/turf/simulated/floor/mineral/titanium/yellow, /area/shuttle/escape) "bO" = ( /obj/structure/chair/comfy/shuttle{ @@ -759,9 +645,7 @@ icon_state = "tube1"; dir = 8 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor5" - }, +/turf/simulated/floor/mineral/titanium/purple, /area/shuttle/escape) "bT" = ( /obj/structure/chair/comfy/shuttle{ @@ -771,23 +655,15 @@ icon_state = "tube1"; dir = 4 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor5" - }, +/turf/simulated/floor/mineral/titanium/purple, /area/shuttle/escape) "bU" = ( /obj/structure/sign/directions/science, -/turf/simulated/shuttle/wall{ - icon_state = "swall12"; - dir = 2 - }, +/turf/simulated/wall/mineral/titanium, /area/shuttle/escape) "bV" = ( /obj/structure/sign/directions/cargo, -/turf/simulated/shuttle/wall{ - icon_state = "swall12"; - dir = 2 - }, +/turf/simulated/wall/mineral/titanium, /area/shuttle/escape) "bW" = ( /obj/structure/chair/comfy/shuttle{ @@ -796,14 +672,11 @@ /obj/machinery/recharger/wallcharger{ pixel_x = -24 }, -/turf/simulated/shuttle/floor4, +/turf/simulated/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "bX" = ( /obj/machinery/ai_status_display, -/turf/simulated/shuttle/wall{ - icon_state = "swall3"; - dir = 2 - }, +/turf/simulated/wall/mineral/titanium, /area/shuttle/escape) "bY" = ( /obj/structure/flora/ausbushes/grassybush, @@ -834,16 +707,11 @@ req_access_txt = "32"; req_one_access_txt = "0" }, -/turf/simulated/shuttle/floor{ - icon_state = "floor2" - }, +/turf/simulated/floor/mineral/titanium/yellow, /area/shuttle/escape) "cc" = ( /obj/structure/extinguisher_cabinet, -/turf/simulated/shuttle/wall{ - icon_state = "swall3"; - dir = 2 - }, +/turf/simulated/wall/mineral/titanium, /area/shuttle/escape) "cd" = ( /obj/machinery/door/airlock/research/glass{ @@ -851,14 +719,7 @@ normalspeed = 0; req_access_txt = "47" }, -/turf/simulated/shuttle/floor{ - icon_state = "floor5" - }, -/area/shuttle/escape) -"cf" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swallc4" - }, +/turf/simulated/floor/mineral/titanium/purple, /area/shuttle/escape) "ck" = ( /obj/structure/chair/comfy/shuttle{ @@ -927,9 +788,7 @@ }, /area/shuttle/escape) "cH" = ( -/turf/simulated/shuttle/wall{ - icon_state = "wall3" - }, +/turf/simulated/wall/mineral/plastitanium, /area/shuttle/escape) "sc" = ( /obj/machinery/door/airlock/medical/glass{ @@ -975,14 +834,11 @@ /area/shuttle/escape) "Qf" = ( /obj/machinery/defibrillator_mount/loaded, -/turf/simulated/shuttle/wall{ - icon_state = "swall12"; - dir = 2 - }, +/turf/simulated/wall/mineral/titanium, /area/shuttle/escape) "UN" = ( /obj/structure/chair/comfy/shuttle, -/turf/simulated/shuttle/floor4, +/turf/simulated/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "Wy" = ( /obj/structure/chair/comfy/shuttle, @@ -990,43 +846,43 @@ dir = 1; on = 1 }, -/turf/simulated/shuttle/floor4, +/turf/simulated/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) (1,1,1) = {" aa ab -aq +ab ac -aq -aP -aq -aq -aq +ab +ab +ab +ab +ab bo -aP +ab bD -aq +ab ac ac ac -aq +ab bo -aq +ab bo -bt -aq +ab +ab ac ac -aq -aq -bt -bq +ab +ab +ab +ab aa "} (2,1,1) = {" aa -av +ab az bl az @@ -1051,7 +907,7 @@ cA bP bP bP -av +ab cH cH "} @@ -1066,7 +922,7 @@ aH aH aH aH -av +ab ba ba ba @@ -1082,13 +938,13 @@ ba ba ba ba -av +ab bu bw "} (4,1,1) = {" aa -av +ab aX bp aX @@ -1097,7 +953,7 @@ aH aH aH aR -av +ab ba bQ bQ @@ -1119,16 +975,16 @@ bw "} (5,1,1) = {" ab -bs -aq -aq -aq -aw +ab +ab +ab +ab +ab Wy aH aH bg -av +ab ba bP bP @@ -1144,12 +1000,12 @@ ck bQ bQ bQ -av +ab cH cH "} (6,1,1) = {" -av +ab ae am ar @@ -1169,13 +1025,13 @@ ba ba ba ca -bG +aD bY cc bR bX bY -aw +ab cH cH "} @@ -1185,7 +1041,7 @@ af an as aA -av +ab UN aG aH @@ -1206,7 +1062,7 @@ bL by by bn -av +ab cH cH "} @@ -1216,12 +1072,12 @@ ag ao an bh -aZ -aq -aq +ab +ab +ab aW ac -cf +ab ba bP bP @@ -1237,7 +1093,7 @@ bz bz bz br -av +ab bu bw "} @@ -1299,7 +1155,7 @@ bz bz bz br -av +ab bu bw "} @@ -1309,9 +1165,9 @@ aj ao at an -aZ -aq -aq +ab +ab +ab aL ac bb @@ -1330,7 +1186,7 @@ bM bA bA bn -av +ab bu bw "} @@ -1340,7 +1196,7 @@ ak an au aB -av +ab bm cp cp @@ -1355,18 +1211,18 @@ bP bP ba ca -bG +aD bY cc bR bX bY -aw +ab cH cH "} (13,1,1) = {" -av +ab al ap ax @@ -1392,22 +1248,22 @@ bS bI bI bB -av +ab cH cH "} (14,1,1) = {" -ad -bt -aq -aq -aq -aw +ab +ab +ab +ab +ab +ab bc cp cp bx -av +ab ba aS aU @@ -1423,13 +1279,13 @@ bJ bJ bJ bE -av +ab cH cH "} (15,1,1) = {" aa -av +ab bF aM bF @@ -1438,7 +1294,7 @@ cE cp cp cw -av +ab ba aO aV @@ -1469,7 +1325,7 @@ cp cp cp xD -av +ab ba aS aS @@ -1485,22 +1341,22 @@ bJ bJ bJ bE -av +ab bu bw "} (17,1,1) = {" aa -av +ab aF bH aF -av +ab cG PY cD bf -av +ab aT aS bd @@ -1516,38 +1372,38 @@ bT bK bK bB -av +ab cH cH "} (18,1,1) = {" aa -ad -aq +ab +ab ac -aq -bs -aq -aq -aq -aq -bs +ab +ab +ab +ab +ab +ab +ab ac ac ac ac ac ac -aq +ab ac ac -bs +ab ac -aq +ab ac ac ac -bs -bv +ab +ab aa "} diff --git a/_maps/map_files/shuttles/emergency_meta.dmm b/_maps/map_files/shuttles/emergency_meta.dmm index cfd300d1abd..9a6f9844e7d 100644 --- a/_maps/map_files/shuttles/emergency_meta.dmm +++ b/_maps/map_files/shuttles/emergency_meta.dmm @@ -3,98 +3,34 @@ /turf/space, /area/space) "ab" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - tag = "icon-swall_f6"; - icon_state = "swall_f6"; - dir = 2 - }, +/turf/simulated/wall/mineral/titanium, /area/shuttle/escape) "ac" = ( -/obj/structure/grille, -/obj/structure/shuttle/window, -/turf/simulated/shuttle/plating, -/area/shuttle/escape) -"ad" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swallc2"; - dir = 2 - }, -/area/shuttle/escape) -"ae" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall8"; - dir = 2 - }, -/area/shuttle/escape) -"af" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall0"; - dir = 2 - }, +/obj/effect/spawner/window/shuttle, +/turf/simulated/floor/plating, /area/shuttle/escape) "ag" = ( -/obj/machinery/door/airlock/shuttle{ +/obj/machinery/door/airlock/titanium{ id_tag = "s_docking_airlock"; name = "Emergency Shuttle Airlock"; req_access_txt = "2" }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/plating, /area/shuttle/escape) "ah" = ( /obj/structure/sign/nosmoking_2, -/turf/simulated/shuttle/wall{ - icon_state = "swall0"; - dir = 2 - }, +/turf/simulated/wall/mineral/titanium, /area/shuttle/escape) "ai" = ( -/obj/machinery/door/airlock/shuttle{ +/obj/machinery/door/airlock/titanium{ id_tag = "s_docking_airlock"; name = "Emergency Shuttle Airlock"; req_access_txt = "0" }, -/turf/simulated/shuttle/floor, -/area/shuttle/escape) -"aj" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall4"; - dir = 2 - }, -/area/shuttle/escape) -"ak" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall12"; - icon_state = "swall12"; - dir = 2 - }, -/area/shuttle/escape) -"al" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - tag = "icon-swall_f10"; - icon_state = "swall_f10"; - dir = 2 - }, +/turf/simulated/floor/plating, /area/shuttle/escape) "am" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - tag = "icon-swall_f6"; - icon_state = "swall_f6"; - dir = 2 - }, -/turf/simulated/shuttle/wall{ - dir = 8; - icon_state = "diagonalWall3" - }, -/area/shuttle/escape) -"an" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall11"; - icon_state = "swall11"; - dir = 2 - }, +/turf/simulated/wall/mineral/plastitanium, /area/shuttle/escape) "ao" = ( /obj/structure/table, @@ -106,42 +42,31 @@ pixel_x = 5; pixel_y = -1 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/escape) "ap" = ( /obj/machinery/computer/crew, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/escape) "aq" = ( /obj/machinery/computer/security, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/escape) "ar" = ( /obj/structure/table, /obj/item/storage/firstaid/regular, -/turf/simulated/shuttle/floor, -/area/shuttle/escape) -"as" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall3"; - icon_state = "swall3"; - dir = 2 - }, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/escape) "at" = ( /obj/structure/closet/emcloset, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/escape) "au" = ( -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/escape) "av" = ( /obj/structure/chair/comfy/shuttle, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/escape) "aw" = ( /obj/machinery/light{ @@ -149,9 +74,7 @@ on = 1 }, /obj/structure/chair/comfy/shuttle, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/escape) "ax" = ( /obj/item/radio/intercom{ @@ -161,9 +84,7 @@ pixel_y = 27 }, /obj/structure/chair/comfy/shuttle, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/escape) "ay" = ( /obj/structure/closet/crate{ @@ -174,11 +95,11 @@ /obj/item/clothing/suit/storage/hazardvest, /obj/item/clothing/suit/storage/hazardvest, /obj/item/clothing/suit/storage/hazardvest, -/obj/item/tank/emergency_oxygen/engi, -/obj/item/tank/emergency_oxygen/engi, -/obj/item/tank/emergency_oxygen/engi, -/obj/item/tank/emergency_oxygen/engi, -/obj/item/tank/emergency_oxygen/engi, +/obj/item/tank/internals/emergency_oxygen/engi, +/obj/item/tank/internals/emergency_oxygen/engi, +/obj/item/tank/internals/emergency_oxygen/engi, +/obj/item/tank/internals/emergency_oxygen/engi, +/obj/item/tank/internals/emergency_oxygen/engi, /obj/item/clothing/mask/breath{ pixel_x = -5; pixel_y = -2 @@ -204,15 +125,7 @@ /obj/item/clothing/head/hardhat, /obj/item/clothing/head/hardhat, /obj/item/clothing/head/hardhat, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, -/area/shuttle/escape) -"az" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall1"; - dir = 2 - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/escape) "aA" = ( /obj/structure/shuttle/engine/propulsion{ @@ -220,7 +133,7 @@ icon_state = "propulsion"; tag = "icon-propulsion (EAST)" }, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/shuttle/escape) "aB" = ( /obj/structure/shuttle/engine/heater{ @@ -231,31 +144,27 @@ /obj/structure/window/reinforced{ dir = 4 }, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/shuttle/escape) "aC" = ( /obj/structure/table, /obj/item/storage/fancy, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/escape) "aD" = ( /obj/structure/chair/comfy/shuttle{ dir = 1 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/escape) "aE" = ( /obj/structure/table, /obj/item/restraints/handcuffs, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/escape) "aF" = ( /obj/machinery/status_display, -/turf/simulated/shuttle/wall{ - tag = "icon-swall3"; - icon_state = "swall3"; - dir = 2 - }, +/turf/simulated/wall/mineral/titanium, /area/shuttle/escape) "aG" = ( /obj/structure/dispenser/oxygen{ @@ -263,9 +172,7 @@ pixel_x = -1; pixel_y = 2 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/escape) "aH" = ( /obj/structure/shuttle/engine/propulsion{ @@ -273,7 +180,7 @@ icon_state = "propulsion_r"; tag = "icon-propulsion_r (EAST)" }, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/shuttle/escape) "aI" = ( /obj/structure/shuttle/engine/heater{ @@ -288,32 +195,28 @@ icon_state = "tube1"; dir = 4 }, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/shuttle/escape) "aJ" = ( /obj/machinery/computer/communications, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/escape) "aK" = ( /obj/structure/chair/comfy/shuttle, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/escape) "aL" = ( /obj/structure/chair/comfy/shuttle{ dir = 1 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/escape) "aM" = ( /obj/machinery/light, /obj/structure/chair/comfy/shuttle{ dir = 1 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/escape) "aN" = ( /obj/structure/closet/crate{ @@ -324,11 +227,11 @@ /obj/item/clothing/suit/storage/hazardvest, /obj/item/clothing/suit/storage/hazardvest, /obj/item/clothing/suit/storage/hazardvest, -/obj/item/tank/emergency_oxygen/engi, -/obj/item/tank/emergency_oxygen/engi, -/obj/item/tank/emergency_oxygen/engi, -/obj/item/tank/emergency_oxygen/engi, -/obj/item/tank/emergency_oxygen/engi, +/obj/item/tank/internals/emergency_oxygen/engi, +/obj/item/tank/internals/emergency_oxygen/engi, +/obj/item/tank/internals/emergency_oxygen/engi, +/obj/item/tank/internals/emergency_oxygen/engi, +/obj/item/tank/internals/emergency_oxygen/engi, /obj/item/clothing/mask/breath{ pixel_x = -5; pixel_y = -2 @@ -358,36 +261,34 @@ icon_state = "tube1"; dir = 4 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/escape) "aO" = ( /obj/structure/shuttle/engine/propulsion{ dir = 8; icon_state = "burst_l" }, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/shuttle/escape) "aP" = ( /obj/machinery/computer/emergency_shuttle, /obj/machinery/light{ dir = 8 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/escape) "aQ" = ( /obj/structure/chair/comfy/shuttle{ dir = 8 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/escape) "aR" = ( /obj/machinery/door/airlock/command/glass{ name = "Cockpit"; req_access_txt = "19" }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/escape) "aS" = ( /obj/machinery/vending/wallmed{ @@ -397,36 +298,22 @@ req_access_txt = "0"; use_power = 0 }, -/turf/simulated/shuttle/wall{ - icon_state = "swall0"; - dir = 2 - }, +/turf/simulated/wall/mineral/titanium, /area/shuttle/escape) "aT" = ( /obj/structure/extinguisher_cabinet, -/turf/simulated/shuttle/wall{ - icon_state = "swall0"; - dir = 2 - }, +/turf/simulated/wall/mineral/titanium, /area/shuttle/escape) "aU" = ( /obj/machinery/computer/atmos_alert, -/turf/simulated/shuttle/floor, -/area/shuttle/escape) -"aV" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall2"; - dir = 2 - }, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/escape) "aW" = ( /obj/machinery/light{ dir = 1 }, /obj/structure/chair/comfy/shuttle, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/escape) "aX" = ( /obj/machinery/hologram/holopad, @@ -436,18 +323,18 @@ pixel_x = 32; pixel_y = 0 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/escape) "aY" = ( /obj/structure/table, /obj/item/storage/toolbox/emergency, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/escape) "aZ" = ( /obj/machinery/light{ dir = 8 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/escape) "ba" = ( /obj/structure/table, @@ -456,7 +343,7 @@ idle_power_usage = 0; use_power = 0 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/escape) "bb" = ( /obj/structure/table, @@ -470,7 +357,7 @@ pixel_x = -3; pixel_y = 7 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/escape) "bc" = ( /obj/structure/table, @@ -479,7 +366,7 @@ pixel_x = 0; pixel_y = -30 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/escape) "bd" = ( /obj/item/radio/intercom{ @@ -492,9 +379,7 @@ /obj/structure/chair/comfy/shuttle{ dir = 1 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/escape) "be" = ( /obj/structure/table, @@ -509,24 +394,7 @@ icon_state = "tube1"; dir = 4 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, -/area/shuttle/escape) -"bf" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall15"; - icon_state = "swall15"; - dir = 2 - }, -/area/shuttle/escape) -"bg" = ( -/obj/structure/extinguisher_cabinet, -/turf/simulated/shuttle/wall{ - tag = "icon-swall12"; - icon_state = "swall12"; - dir = 2 - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/escape) "bh" = ( /obj/machinery/door/airlock/command{ @@ -534,30 +402,14 @@ req_access = null; req_access_txt = "19" }, -/turf/simulated/shuttle/floor, -/area/shuttle/escape) -"bi" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall7"; - icon_state = "swall7"; - dir = 2 - }, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/escape) "bj" = ( /obj/machinery/door/airlock/security/glass{ name = "Brig"; req_access_txt = "2" }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, -/area/shuttle/escape) -"bk" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall14"; - icon_state = "swall14"; - dir = 2 - }, +/turf/simulated/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "bl" = ( /obj/machinery/door/airlock/medical/glass{ @@ -565,31 +417,28 @@ name = "Escape Shuttle Infirmary"; req_access_txt = "0" }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/escape) "bm" = ( -/obj/structure/sign/redcross, -/turf/simulated/shuttle/wall{ - dir = 1; - icon_state = "swallc2" - }, +/obj/structure/sign/lifestar, +/turf/simulated/wall/mineral/titanium, /area/shuttle/escape) "bn" = ( -/obj/machinery/door/airlock/shuttle{ +/obj/machinery/door/airlock/titanium{ name = "Emergency Shuttle Cargo Bay Airlock" }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/escape) "bo" = ( /obj/structure/chair/comfy/shuttle{ dir = 4 }, -/turf/simulated/shuttle/plating{ +/turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, /area/shuttle/escape) "bp" = ( -/turf/simulated/shuttle/plating{ +/turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, /area/shuttle/escape) @@ -597,37 +446,29 @@ /obj/machinery/door/airlock/external{ name = "Emergency Recovery Airlock" }, -/turf/simulated/shuttle/plating{ - icon_state = "floorgrime" - }, +/turf/simulated/floor/plating, /area/shuttle/escape) "br" = ( -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/escape) "bs" = ( /obj/structure/chair/comfy/shuttle{ dir = 4 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "bt" = ( /obj/structure/chair/comfy/shuttle, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "bu" = ( /obj/structure/table, /obj/item/defibrillator, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/escape) "bv" = ( /obj/machinery/shower, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/escape) "bw" = ( /obj/machinery/sleeper, @@ -635,7 +476,7 @@ icon_state = "tube1"; dir = 4 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/escape) "bx" = ( /obj/structure/rack, @@ -644,16 +485,16 @@ /obj/item/weldingtool, /obj/item/wirecutters, /obj/item/stack/cable_coil, -/turf/simulated/shuttle/plating{ - dir = 4; - icon_state = "warning" +/obj/effect/turf_decal/stripes/line{ + dir = 4 }, +/turf/simulated/floor/plasteel, /area/shuttle/escape) "by" = ( /obj/structure/reagent_dispensers/watertank, -/turf/simulated/shuttle/plating{ - dir = 1; - icon_state = "delivery" +/obj/effect/turf_decal/delivery, +/turf/simulated/floor/plasteel{ + icon_state = "floorgrime" }, /area/shuttle/escape) "bz" = ( @@ -662,34 +503,22 @@ dir = 1; on = 1 }, -/turf/simulated/shuttle/plating{ - dir = 1; - icon_state = "delivery" +/obj/effect/turf_decal/delivery, +/turf/simulated/floor/plasteel{ + icon_state = "floorgrime" }, /area/shuttle/escape) "bA" = ( -/turf/simulated/shuttle/plating{ - dir = 1; - icon_state = "delivery" +/obj/effect/turf_decal/delivery, +/turf/simulated/floor/plasteel{ + icon_state = "floorgrime" }, /area/shuttle/escape) "bB" = ( /obj/machinery/recharge_station, -/turf/simulated/shuttle/plating{ - dir = 1; - icon_state = "delivery" - }, -/area/shuttle/escape) -"bC" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall12"; - dir = 2 - }, -/area/shuttle/escape) -"bD" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall11"; - dir = 2 +/obj/effect/turf_decal/delivery, +/turf/simulated/floor/plasteel{ + icon_state = "floorgrime" }, /area/shuttle/escape) "bE" = ( @@ -699,9 +528,7 @@ /obj/structure/chair/comfy/shuttle{ dir = 8 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "bF" = ( /obj/structure/table, @@ -736,11 +563,11 @@ pixel_x = 2; pixel_y = 8 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/escape) "bG" = ( /obj/machinery/sleeper, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/escape) "bH" = ( /obj/structure/rack, @@ -756,10 +583,10 @@ pixel_x = 3; pixel_y = -5 }, -/turf/simulated/shuttle/plating{ - dir = 4; - icon_state = "warning" +/obj/effect/turf_decal/stripes/line{ + dir = 4 }, +/turf/simulated/floor/plasteel, /area/shuttle/escape) "bI" = ( /obj/machinery/light{ @@ -768,13 +595,13 @@ /obj/structure/chair/comfy/shuttle{ dir = 4 }, -/turf/simulated/shuttle/plating{ +/turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, /area/shuttle/escape) "bJ" = ( /obj/machinery/suit_storage_unit/standard_unit, -/turf/simulated/shuttle/plating{ +/turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, /area/shuttle/escape) @@ -785,47 +612,30 @@ /obj/structure/chair/comfy/shuttle{ dir = 4 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "bL" = ( /obj/structure/chair/comfy/shuttle{ dir = 8 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "bM" = ( /obj/machinery/optable, /obj/machinery/light{ dir = 8 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/escape) "bN" = ( -/turf/simulated/shuttle/plating{ - dir = 4; - icon_state = "warning" - }, -/area/shuttle/escape) -"bO" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - tag = "icon-swall_f5"; - icon_state = "swall_f5"; - dir = 2 - }, -/turf/simulated/shuttle/wall{ - tag = "icon-diagonalWall3"; - icon_state = "diagonalWall3"; - dir = 2 +/obj/effect/turf_decal/stripes/line{ + dir = 4 }, +/turf/simulated/floor/plasteel, /area/shuttle/escape) "bP" = ( /obj/structure/reagent_dispensers/watertank, -/turf/simulated/shuttle/plating{ +/turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, /area/shuttle/escape) @@ -848,7 +658,7 @@ name = "Station Intercom (General)"; pixel_y = -28 }, -/turf/simulated/shuttle/floor4, +/turf/simulated/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "bR" = ( /obj/structure/table, @@ -857,23 +667,17 @@ idle_power_usage = 0; use_power = 0 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "bS" = ( /obj/structure/table, /obj/item/restraints/handcuffs, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "bT" = ( /obj/structure/table, /obj/item/storage/box/handcuffs, -/turf/simulated/shuttle/floor{ - icon_state = "floor4" - }, +/turf/simulated/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "bU" = ( /obj/structure/table, @@ -895,11 +699,11 @@ pixel_x = 0; pixel_y = -27 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/escape) "bV" = ( /obj/structure/sink, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/escape) "bW" = ( /obj/structure/table, @@ -908,7 +712,7 @@ pixel_x = 2; pixel_y = 3 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/escape) "bX" = ( /obj/structure/table, @@ -917,28 +721,20 @@ pixel_x = 3; pixel_y = 3 }, -/turf/simulated/shuttle/floor, -/area/shuttle/escape) -"bY" = ( -/obj/structure/sign/redcross, -/turf/simulated/shuttle/wall{ - dir = 8; - icon_state = "swall2"; - tag = "icon-swall2" - }, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/escape) "bZ" = ( /obj/structure/rack{ dir = 1 }, -/obj/item/tank/oxygen, +/obj/item/tank/internals/oxygen, /obj/item/clothing/suit/fire/firefighter, /obj/item/clothing/mask/gas, /obj/item/clothing/head/hardhat/red, -/turf/simulated/shuttle/plating{ - dir = 4; - icon_state = "warning" +/obj/effect/turf_decal/stripes/line{ + dir = 4 }, +/turf/simulated/floor/plasteel, /area/shuttle/escape) "ca" = ( /obj/structure/extinguisher_cabinet{ @@ -946,8 +742,9 @@ pixel_y = -30 }, /obj/machinery/space_heater, -/turf/simulated/shuttle/plating{ - icon_state = "bot" +/obj/effect/turf_decal/bot, +/turf/simulated/floor/plasteel{ + icon_state = "floorgrime" }, /area/shuttle/escape) "cb" = ( @@ -967,8 +764,9 @@ /obj/item/crowbar, /obj/item/wrench, /obj/item/radio, -/turf/simulated/shuttle/plating{ - icon_state = "bot" +/obj/effect/turf_decal/bot, +/turf/simulated/floor/plasteel{ + icon_state = "floorgrime" }, /area/shuttle/escape) "cc" = ( @@ -989,13 +787,14 @@ pixel_y = 3 }, /obj/item/lazarus_injector, +/obj/effect/turf_decal/bot, /mob/living/simple_animal/bot/medbot{ name = "\improper emergency medibot"; pixel_x = -3; pixel_y = 2 }, -/turf/simulated/shuttle/plating{ - icon_state = "bot" +/turf/simulated/floor/plasteel{ + icon_state = "floorgrime" }, /area/shuttle/escape) "cd" = ( @@ -1007,8 +806,9 @@ }, /obj/machinery/portable_atmospherics/canister/oxygen, /obj/machinery/light, -/turf/simulated/shuttle/plating{ - icon_state = "bot" +/obj/effect/turf_decal/bot, +/turf/simulated/floor/plasteel{ + icon_state = "floorgrime" }, /area/shuttle/escape) "ce" = ( @@ -1016,31 +816,8 @@ /obj/item/clipboard, /obj/item/folder/yellow, /obj/item/pen, -/turf/simulated/shuttle/plating{ - icon_state = "bot" - }, -/area/shuttle/escape) -"cf" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - tag = "icon-swall_f5"; - icon_state = "swall_f5"; - dir = 2 - }, -/area/shuttle/escape) -"cg" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall13"; - icon_state = "swall13"; - dir = 2 - }, -/area/shuttle/escape) -"ch" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - tag = "icon-swall_f9"; - icon_state = "swall_f9"; - dir = 2 +/turf/simulated/floor/plasteel{ + icon_state = "floorgrime" }, /area/shuttle/escape) "ci" = ( @@ -1052,12 +829,15 @@ timid = 1; width = 25 }, -/obj/machinery/door/airlock/shuttle{ +/obj/machinery/door/airlock/titanium{ id_tag = "s_docking_airlock"; name = "Emergency Shuttle Airlock"; req_access_txt = "0" }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/plating, +/area/shuttle/escape) +"Rk" = ( +/turf/simulated/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) (1,1,1) = {" @@ -1066,10 +846,10 @@ aa aO aA aH -aj +ab aO aH -aj +ab aO aA aH @@ -1082,31 +862,31 @@ am aB aI aB -ak +ab aB aI -ak +ab aB aI aB -bO +am aa "} (3,1,1) = {" ab -an -as -as -as -an -as -as -bf -as -as -as -an -cf +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab "} (4,1,1) = {" ac @@ -1117,7 +897,7 @@ aP aU aY ba -bg +aT bo bo bI @@ -1133,7 +913,7 @@ aQ aD au bb -ak +ab bp bp bp @@ -1149,9 +929,9 @@ au au aK bc -ae +ab bq -aj +ab bp bp bq @@ -1167,29 +947,29 @@ au au bh br -bC +ab bJ bJ ac "} (8,1,1) = {" -ad -as +ab +ab aF -az +ab aR -aV -as -as -bi -as -bD +ab +ab +ab +ab +ab +ab aF -as -cg +ab +ab "} (9,1,1) = {" -ae +ab at au au @@ -1197,12 +977,12 @@ au au aZ at -ak +ab bs bs bK bQ -ak +ab "} (10,1,1) = {" ac @@ -1214,14 +994,14 @@ au au au bj -br -br -br +Rk +Rk +Rk bR ac "} (11,1,1) = {" -af +ab av au aL @@ -1231,8 +1011,8 @@ au aL ac bt -br -br +Rk +Rk bS ac "} @@ -1245,12 +1025,12 @@ aS aW au aL -aj +ab bt bE bL bT -aj +ab "} (13,1,1) = {" ac @@ -1261,12 +1041,12 @@ ac av au bd -bk -as -as -as -as -cg +ab +ab +ab +ab +ab +ab "} (14,1,1) = {" ai @@ -1277,12 +1057,12 @@ aT av au aL -ae +ab bu bF bM bU -ae +ab "} (15,1,1) = {" ah @@ -1330,7 +1110,7 @@ bw bG au bX -aj +ab "} (18,1,1) = {" ac @@ -1342,14 +1122,14 @@ av au aL bm -az +ab ac bl -bY -cg +bm +ab "} (19,1,1) = {" -af +ab ax au aL @@ -1357,12 +1137,12 @@ ac av au aM -ae +ab bx bH bN bZ -ak +ab "} (20,1,1) = {" ci @@ -1378,7 +1158,7 @@ by bp bp ca -ae +ab "} (21,1,1) = {" ac @@ -1413,7 +1193,7 @@ cc ac "} (23,1,1) = {" -aj +ab au au au @@ -1426,10 +1206,10 @@ bA bp bp cd -aj +ab "} (24,1,1) = {" -ak +ab ay aG aN @@ -1437,26 +1217,26 @@ au aX au be -aj +ab bB bA bA ce -ak +ab "} (25,1,1) = {" -al -az +ab +ab ac -af +ab ac -af +ab ac -aV -an -az +ab +ab +ab ac ac -aV -ch +ab +ab "} diff --git a/_maps/map_files/shuttles/emergency_mil.dmm b/_maps/map_files/shuttles/emergency_mil.dmm index e5e13ddf4b9..482970ba92d 100644 --- a/_maps/map_files/shuttles/emergency_mil.dmm +++ b/_maps/map_files/shuttles/emergency_mil.dmm @@ -20,42 +20,12 @@ /turf/simulated/floor/plating/airless, /area/shuttle/escape) "ae" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swallc2" - }, -/area/shuttle/escape) -"af" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall12"; - dir = 2 - }, +/turf/simulated/wall/mineral/titanium, /area/shuttle/escape) "ag" = ( -/obj/structure/grille, -/obj/structure/window/full/shuttle, +/obj/effect/spawner/window/shuttle, /turf/simulated/floor/plating, /area/shuttle/escape) -"ah" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - dir = 2; - icon_state = "swallc1" - }, -/area/shuttle/escape) -"ai" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f6"; - dir = 2 - }, -/area/shuttle/escape) -"aj" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swallc4" - }, -/area/shuttle/escape) "ak" = ( /obj/machinery/computer/communications, /obj/machinery/light/spot{ @@ -63,15 +33,15 @@ icon_state = "tube1"; dir = 1 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/escape) "al" = ( /obj/machinery/computer/crew, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/escape) "am" = ( /obj/structure/table, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/escape) "an" = ( /obj/machinery/computer/security{ @@ -82,77 +52,39 @@ icon_state = "tube1"; dir = 1 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/escape) "ao" = ( /obj/machinery/computer/emergency_shuttle, -/turf/simulated/shuttle/floor, -/area/shuttle/escape) -"ap" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swallc3" - }, -/area/shuttle/escape) -"aq" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - tag = "icon-swall_f10"; - icon_state = "swall_f10"; - dir = 2 - }, -/area/shuttle/escape) -"ar" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall3"; - dir = 2 - }, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/escape) "as" = ( /obj/machinery/computer/station_alert, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/escape) "at" = ( -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/escape) "au" = ( /obj/structure/chair/comfy/shuttle{ dir = 1 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/escape) "ay" = ( /obj/machinery/computer/robotics, -/turf/simulated/shuttle/floor, -/area/shuttle/escape) -"aB" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall7"; - icon_state = "swall7"; - dir = 2 - }, -/area/shuttle/escape) -"aC" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall14"; - dir = 2 - }, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/escape) "aD" = ( /obj/machinery/door/airlock/command/glass{ name = "Escape Shuttle Cockpit"; req_access_txt = "19" }, -/turf/simulated/shuttle/floor, -/area/shuttle/escape) -"aE" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall11"; - dir = 2 - }, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/escape) "aF" = ( /obj/structure/chair/comfy/shuttle, -/turf/simulated/shuttle/floor4, +/turf/simulated/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "aG" = ( /obj/machinery/status_display{ @@ -164,14 +96,7 @@ dir = 1 }, /obj/structure/chair/comfy/shuttle, -/turf/simulated/shuttle/floor4, -/area/shuttle/escape) -"aH" = ( -/obj/structure/grille, -/obj/structure/window/full/shuttle{ - icon_state = "16" - }, -/turf/simulated/floor/plating, +/turf/simulated/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "aI" = ( /turf/simulated/floor/plating, @@ -223,17 +148,10 @@ /obj/structure/closet/walllocker/emerglocker{ pixel_x = -28 }, -/turf/simulated/shuttle/floor4, +/turf/simulated/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "aO" = ( -/turf/simulated/shuttle/floor4, -/area/shuttle/escape) -"aP" = ( -/obj/structure/grille, -/obj/structure/window/full/shuttle{ - icon_state = "8" - }, -/turf/simulated/floor/plating, +/turf/simulated/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "aQ" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ @@ -296,7 +214,7 @@ }, /area/shuttle/escape) "aW" = ( -/obj/machinery/door/airlock/shuttle{ +/obj/machinery/door/airlock/titanium{ aiControlDisabled = 1; hackProof = 1; id_tag = "s_docking_airlock"; @@ -308,10 +226,10 @@ /obj/structure/chair/comfy/shuttle{ dir = 1 }, -/turf/simulated/shuttle/floor4, +/turf/simulated/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "aY" = ( -/obj/machinery/atmospherics/unary/cold_sink/freezer{ +/obj/machinery/atmospherics/unary/thermomachine/freezer{ dir = 1 }, /turf/simulated/floor/plasteel{ @@ -379,17 +297,7 @@ /area/shuttle/escape) "bd" = ( /obj/structure/noticeboard, -/turf/simulated/shuttle/wall{ - icon_state = "swall12"; - dir = 2 - }, -/area/shuttle/escape) -"be" = ( -/obj/structure/grille, -/obj/structure/window/full/shuttle{ - icon_state = "15" - }, -/turf/simulated/floor/plating, +/turf/simulated/wall/mineral/titanium, /area/shuttle/escape) "bf" = ( /obj/machinery/door/airlock/command/glass{ @@ -414,13 +322,13 @@ timid = 1; width = 24 }, -/obj/machinery/door/airlock/shuttle{ +/obj/machinery/door/airlock/titanium{ aiControlDisabled = 1; hackProof = 1; id_tag = "s_docking_airlock"; name = "Shuttle Hatch" }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/plating, /area/shuttle/escape) "bi" = ( /obj/structure/closet/walllocker/emerglocker{ @@ -478,26 +386,6 @@ }, /turf/simulated/floor/plating, /area/shuttle/escape) -"bp" = ( -/obj/machinery/door/airlock/shuttle{ - aiControlDisabled = 1; - hackProof = 1; - id_tag = "s_docking_airlock"; - name = "Shuttle Hatch" - }, -/turf/simulated/shuttle/floor, -/area/shuttle/escape) -"bq" = ( -/obj/machinery/door/airlock/shuttle{ - aiControlDisabled = 1; - hackProof = 1; - id_tag = "s_docking_airlock"; - name = "Shuttle Hatch" - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor2" - }, -/area/shuttle/escape) "br" = ( /mob/living/simple_animal/bot/secbot, /turf/simulated/floor/plating, @@ -506,37 +394,23 @@ /obj/machinery/recharge_station, /turf/simulated/floor/plating, /area/shuttle/escape) -"bt" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f5"; - dir = 2 - }, -/area/shuttle/escape) "bu" = ( /obj/structure/window/reinforced{ dir = 1 }, /obj/structure/shuttle/engine/heater, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/shuttle/escape) "bv" = ( /obj/structure/shuttle/engine/heater, /obj/structure/window/reinforced{ dir = 1 }, -/turf/simulated/shuttle/plating, -/area/shuttle/escape) -"bw" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f9"; - dir = 2 - }, +/turf/simulated/floor/plating/airless, /area/shuttle/escape) "bx" = ( /obj/structure/shuttle/engine/propulsion, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/shuttle/escape) "by" = ( /turf/simulated/floor/plating/airless, @@ -560,41 +434,41 @@ (1,1,1) = {" aa aa -ai -ar -ar -aB -ar -ar -ar +ae +ae +ae +ae +ae +ae +ae aW -aB +ae bh -ar -ar -ar -ar -ar -bp +ae +ae +ae +ae +ae +aW ag -bq -ar -ar -bt +aW +ae +ae +ae aa "} (2,1,1) = {" aa ab -af +ae as au -af +ae aF aN aO aO -af +ae aI bj bl @@ -606,16 +480,16 @@ aI aI bl bn -aC -bt +ae +ae "} (3,1,1) = {" aa ad -af +ae at at -af +ae aG aO aO @@ -638,15 +512,15 @@ bx (4,1,1) = {" aa ae -aj +ae at at -af +ae aF aO aO aX -af +ae aI bk bk @@ -663,11 +537,11 @@ bx "} (5,1,1) = {" ab -af +ae ak au at -af +ae aF aO aO @@ -684,21 +558,21 @@ bl bl bl bl -aC -aj +ae +ae "} (6,1,1) = {" ac -af +ae al au at -aC -aH -aP -aP -aP -be +ae +ag +ag +ag +ag +ag aI aI aI @@ -710,7 +584,7 @@ aI aI aI aI -af +ae by "} (7,1,1) = {" @@ -736,21 +610,21 @@ aI aI bs bs -af +ae bz "} (8,1,1) = {" ac -af +ae an au at -aC -aH -aP -aP -aP -be +ae +ag +ag +ag +ag +ag aI aI aI @@ -762,21 +636,21 @@ aI aI aI aI -af +ae by "} (9,1,1) = {" ab -af +ae ao au at -af +ae aJ aQ aU aY -af +ae aI bk bk @@ -788,21 +662,21 @@ bk bk bk bk -aC -ap +ae +ae "} (10,1,1) = {" aa -ah -ap +ae +ae at at -af +ae aK aR aS aZ -af +ae aI bl bl @@ -820,10 +694,10 @@ bx (11,1,1) = {" aa ad -af +ae at at -af +ae aL aS aS @@ -846,15 +720,15 @@ bx (12,1,1) = {" aa ab -af +ae ay au -af +ae aM aT aV bb -af +ae bi bm bk @@ -866,32 +740,32 @@ aI br bk bm -aC -bw +ae +ae "} (13,1,1) = {" aa aa -aq -ar -ar -aE -ar -ar -ar +ae +ae +ae +ae +ae +ae +ae ag -aE -ar -ar -ar -ar -ar -ar -ar +ae +ae +ae +ae +ae +ae +ae +ae ag -ar -ar -ar -bw +ae +ae +ae +ae aa "} diff --git a/_maps/map_files/shuttles/emergency_narnar.dmm b/_maps/map_files/shuttles/emergency_narnar.dmm index aefef374d40..2b34425b9d2 100644 --- a/_maps/map_files/shuttles/emergency_narnar.dmm +++ b/_maps/map_files/shuttles/emergency_narnar.dmm @@ -289,16 +289,6 @@ /obj/effect/decal/cleanable/blood/writing, /turf/simulated/floor/engine/cult, /area/shuttle/escape) -"aR" = ( -/obj/effect/spawner/window/reinforced{ - color = "red" - }, -/turf/simulated/shuttle/wall{ - icon_state = "swall3"; - dir = 2 - }, -/turf/simulated/wall/cult, -/area/shuttle/escape) "aS" = ( /obj/machinery/status_display{ pixel_y = -30 @@ -306,21 +296,11 @@ /obj/machinery/light/spot, /turf/simulated/floor/engine/cult, /area/shuttle/escape) -"aT" = ( -/obj/machinery/door/airlock/cult/friendly, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, -/area/shuttle/escape) "aU" = ( /obj/effect/spawner/window/reinforced{ color = "red" }, -/turf/simulated/shuttle/wall{ - tag = "icon-swall14"; - icon_state = "swall14"; - dir = 2 - }, +/turf/space, /area/shuttle/escape) "aV" = ( /mob/living/simple_animal/hostile/construct/harvester, @@ -358,10 +338,6 @@ /obj/structure/showcase/horrific_experiment, /turf/simulated/floor/engine/cult, /area/shuttle/escape) -"ba" = ( -/obj/effect/spawner/window/reinforced, -/turf/simulated/floor/plating, -/area/shuttle/escape) "bb" = ( /obj/machinery/light/spot{ tag = "icon-tube1 (EAST)"; @@ -404,7 +380,7 @@ }, /obj/structure/shuttle/engine/heater, /obj/structure/cult/forge, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/shuttle/escape) "bi" = ( /obj/structure/shuttle/engine/heater, @@ -412,11 +388,11 @@ dir = 1 }, /obj/structure/cult/forge, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/shuttle/escape) "bj" = ( /obj/structure/shuttle/engine/propulsion, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/shuttle/escape) (1,1,1) = {" @@ -440,7 +416,7 @@ ab ar ab ar -ba +ac ab ab aa @@ -516,7 +492,7 @@ aF aj aj aj -aT +ar aj aj be @@ -748,7 +724,7 @@ ab ac ac ac -aR +aD ac ab ab diff --git a/_maps/map_files/shuttles/emergency_old.dmm b/_maps/map_files/shuttles/emergency_old.dmm index b8b49da71e5..d8493cc5c3b 100644 --- a/_maps/map_files/shuttles/emergency_old.dmm +++ b/_maps/map_files/shuttles/emergency_old.dmm @@ -3,54 +3,31 @@ /turf/space, /area/space) "ab" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f6"; - dir = 2 - }, +/turf/simulated/wall/mineral/titanium, /area/shuttle/escape) "ac" = ( -/obj/structure/grille, -/obj/structure/window/full/shuttle, +/obj/effect/spawner/window/shuttle, /turf/simulated/floor/plating, /area/shuttle/escape) -"ad" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - tag = "icon-swall_f10"; - icon_state = "swall_f10"; - dir = 2 - }, -/area/shuttle/escape) -"ae" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swallc4" - }, -/area/shuttle/escape) "af" = ( /obj/machinery/computer/emergency_shuttle, -/turf/simulated/shuttle/floor, -/area/shuttle/escape) -"ag" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swallc3" - }, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/escape) "ah" = ( /obj/machinery/computer/security{ network = list("SS13","Telecomms","Research Outpost","Mining Outpost") }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/escape) "ai" = ( /obj/structure/chair/comfy/shuttle{ dir = 1 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/escape) "aj" = ( /obj/machinery/computer/communications, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/escape) "ak" = ( /obj/docking_port/mobile/emergency{ @@ -60,27 +37,27 @@ timid = 1; width = 24 }, -/obj/machinery/door/airlock/shuttle{ +/obj/machinery/door/airlock/titanium{ aiControlDisabled = 1; hackProof = 1; id_tag = "s_docking_airlock"; name = "Shuttle Hatch" }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/plating, /area/shuttle/escape) "al" = ( /obj/machinery/computer/station_alert, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/escape) "an" = ( -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/escape) "ao" = ( /obj/machinery/computer/crew, /obj/machinery/status_display{ pixel_y = 30 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/escape) "ap" = ( /obj/structure/closet/walllocker/emerglocker{ @@ -89,7 +66,7 @@ /obj/structure/chair/comfy/shuttle{ dir = 1 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/escape) "aq" = ( /obj/structure/closet/walllocker/emerglocker{ @@ -98,66 +75,40 @@ /obj/structure/chair/comfy/shuttle{ dir = 1 }, -/turf/simulated/shuttle/floor, -/area/shuttle/escape) -"ar" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall3"; - dir = 2 - }, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/escape) "as" = ( /obj/machinery/computer/robotics, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/escape) "at" = ( /obj/structure/chair/comfy/shuttle{ dir = 8 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/escape) "au" = ( /obj/machinery/light/spot, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/escape) "av" = ( /obj/structure/chair/comfy/shuttle{ dir = 4 }, -/turf/simulated/shuttle/floor, -/area/shuttle/escape) -"aw" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall12"; - dir = 2 - }, -/area/shuttle/escape) -"ax" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall13"; - dir = 2 - }, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/escape) "ay" = ( /obj/machinery/door/airlock/command/glass{ name = "Escape Shuttle Cockpit"; req_access_txt = "19" }, -/turf/simulated/shuttle/floor, -/area/shuttle/escape) -"az" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall14"; - dir = 2 - }, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/escape) "aA" = ( /obj/structure/chair/comfy/shuttle{ dir = 4 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/escape) "aB" = ( /obj/machinery/status_display{ @@ -168,22 +119,13 @@ icon_state = "tube1"; dir = 1 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/escape) "aC" = ( /obj/structure/chair/comfy/shuttle{ dir = 8 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, -/area/shuttle/escape) -"aD" = ( -/obj/structure/grille, -/obj/structure/window/full/shuttle{ - icon_state = "16" - }, -/turf/simulated/floor/plating, +/turf/simulated/floor/mineral/titanium, /area/shuttle/escape) "aE" = ( /obj/structure/closet/walllocker/emerglocker{ @@ -192,14 +134,7 @@ /obj/structure/chair/comfy/shuttle{ dir = 4 }, -/turf/simulated/shuttle/floor4, -/area/shuttle/escape) -"aF" = ( -/obj/structure/grille, -/obj/structure/window/full/shuttle{ - icon_state = "8" - }, -/turf/simulated/floor/plating, +/turf/simulated/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "aG" = ( /obj/structure/closet/walllocker/emerglocker{ @@ -208,27 +143,10 @@ /obj/structure/chair/comfy/shuttle{ dir = 8 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/escape) "aI" = ( -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, -/area/shuttle/escape) -"aJ" = ( -/obj/structure/grille, -/obj/structure/window/full/shuttle{ - icon_state = "15" - }, -/turf/simulated/floor/plating, -/area/shuttle/escape) -"aK" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall7"; - dir = 2 - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/escape) "aL" = ( /obj/item/radio/intercom{ @@ -244,9 +162,7 @@ /obj/structure/chair/comfy/shuttle{ dir = 4 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/escape) "aM" = ( /obj/structure/closet/walllocker/emerglocker{ @@ -260,9 +176,7 @@ /obj/structure/chair/comfy/shuttle{ dir = 8 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/escape) "aN" = ( /obj/structure/table, @@ -278,57 +192,23 @@ icon_state = "tube1"; dir = 8 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, -/area/shuttle/escape) -"aP" = ( -/obj/machinery/door/airlock/shuttle{ - aiControlDisabled = 1; - hackProof = 1; - id_tag = "s_docking_airlock"; - name = "Shuttle Hatch" - }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/escape) "aQ" = ( /obj/machinery/status_display{ pixel_y = -30 }, /obj/machinery/light/spot, -/turf/simulated/shuttle/floor, -/area/shuttle/escape) -"aR" = ( -/obj/structure/grille, -/obj/structure/window/full/shuttle{ - icon_state = "14" - }, -/turf/simulated/floor/plating, -/area/shuttle/escape) -"aS" = ( -/obj/structure/grille, -/obj/structure/window/full/shuttle{ - icon_state = "17" - }, -/turf/simulated/floor/plating, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/escape) "aT" = ( -/obj/machinery/door/airlock/shuttle{ +/obj/machinery/door/airlock/titanium{ aiControlDisabled = 1; hackProof = 1; id_tag = null; name = "Shuttle Cargo Hatch" }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, -/area/shuttle/escape) -"aU" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall14"; - icon_state = "swall14"; - dir = 2 - }, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/escape) "aV" = ( /obj/machinery/door/airlock/medical/glass{ @@ -336,10 +216,10 @@ name = "Escape Shuttle Infirmary"; req_access_txt = "0" }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/escape) "aW" = ( -/obj/machinery/door/airlock/shuttle{ +/obj/machinery/door/airlock/titanium{ aiControlDisabled = 1; hackProof = 1; id_tag = "s_docking_airlock"; @@ -349,22 +229,18 @@ /area/shuttle/escape) "aX" = ( /obj/structure/closet/crate, -/turf/simulated/shuttle/floor{ - icon_state = "floor2" - }, +/turf/simulated/floor/mineral/titanium/yellow, /area/shuttle/escape) "aZ" = ( /obj/structure/chair/comfy/shuttle, -/turf/simulated/shuttle/floor4, +/turf/simulated/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "ba" = ( -/turf/simulated/shuttle/floor4, +/turf/simulated/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "bb" = ( /obj/structure/closet/cardboard, -/turf/simulated/shuttle/floor{ - icon_state = "floor2" - }, +/turf/simulated/floor/mineral/titanium/yellow, /area/shuttle/escape) "bc" = ( /obj/machinery/light/spot{ @@ -372,9 +248,7 @@ icon_state = "tube1"; dir = 4 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor2" - }, +/turf/simulated/floor/mineral/titanium/yellow, /area/shuttle/escape) "bd" = ( /obj/machinery/status_display{ @@ -386,9 +260,7 @@ icon_state = "tube1"; dir = 8 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/escape) "be" = ( /obj/item/radio/intercom{ @@ -397,59 +269,35 @@ pixel_x = 28 }, /obj/structure/bed/roller, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/escape) "bf" = ( /obj/machinery/mech_bay_recharge_port, -/turf/simulated/shuttle/floor{ - icon_state = "floor2" - }, +/turf/simulated/floor/mineral/titanium/yellow, /area/shuttle/escape) "bh" = ( /obj/structure/chair/comfy/shuttle{ dir = 1 }, -/turf/simulated/shuttle/floor4, -/area/shuttle/escape) -"bi" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f5"; - dir = 2 - }, +/turf/simulated/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "bj" = ( /obj/structure/window/reinforced{ dir = 1 }, /obj/structure/shuttle/engine/heater, -/turf/simulated/shuttle/plating, -/area/shuttle/escape) -"bk" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall11"; - dir = 2 - }, +/turf/simulated/floor/plating/airless, /area/shuttle/escape) "bm" = ( /obj/structure/shuttle/engine/heater, /obj/structure/window/reinforced{ dir = 1 }, -/turf/simulated/shuttle/plating, -/area/shuttle/escape) -"bn" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f9"; - dir = 2 - }, +/turf/simulated/floor/plating/airless, /area/shuttle/escape) "bo" = ( /obj/structure/shuttle/engine/propulsion, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/shuttle/escape) "db" = ( /obj/machinery/door/airlock/security/glass{ @@ -464,9 +312,7 @@ icon_state = "sleeper"; dir = 1 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/escape) "iM" = ( /obj/structure/table, @@ -486,22 +332,13 @@ /obj/item/bodybag{ pixel_x = 5 }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, -/area/shuttle/escape) -"kP" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall7"; - icon_state = "swall7"; - dir = 2 - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/escape) "lJ" = ( /obj/structure/chair/comfy/shuttle{ dir = 4 }, -/turf/simulated/shuttle/floor4, +/turf/simulated/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "mk" = ( /obj/machinery/status_display{ @@ -513,7 +350,7 @@ dir = 1 }, /obj/structure/chair/comfy/shuttle, -/turf/simulated/shuttle/floor4, +/turf/simulated/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "rj" = ( /obj/machinery/vending/wallmed{ @@ -524,50 +361,21 @@ req_access_txt = "0" }, /obj/structure/bed/roller, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, +/turf/simulated/floor/mineral/titanium, /area/shuttle/escape) "xo" = ( /obj/machinery/recharge_station, -/turf/simulated/shuttle/floor{ - icon_state = "floor2" - }, +/turf/simulated/floor/mineral/titanium/yellow, /area/shuttle/escape) "zT" = ( /obj/structure/noticeboard, -/turf/simulated/shuttle/wall{ - icon_state = "swall12"; - dir = 2 - }, -/area/shuttle/escape) -"Bs" = ( -/obj/machinery/door/airlock/shuttle{ - aiControlDisabled = 1; - hackProof = 1; - id_tag = "s_docking_airlock"; - name = "Shuttle Hatch" - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor2" - }, +/turf/simulated/wall/mineral/titanium, /area/shuttle/escape) "DZ" = ( -/turf/simulated/shuttle/floor{ - icon_state = "floor2" - }, +/turf/simulated/floor/mineral/titanium/yellow, /area/shuttle/escape) -"OC" = ( -/obj/structure/grille, -/obj/structure/window/full/shuttle{ - icon_state = "15" - }, -/turf/simulated/shuttle/floor{ - icon_state = "floor3" - }, -/area/shuttle/escape) -"XL" = ( -/turf/simulated/floor/mech_bay_recharge_floor, +"Jw" = ( +/turf/simulated/wall/mineral/titanium/nodiagonal, /area/shuttle/escape) (1,1,1) = {" @@ -578,22 +386,22 @@ aa aa aa ab -ar -ar +ab +ab aW -kP +ab ak -ar -aD -aF -aJ -ar -aP -kP -Bs +ab ac -ar -bi +ac +ac +ab +aW +Jw +aW +ac +ab +ab aa "} (2,1,1) = {" @@ -603,11 +411,11 @@ aa aa aa aa -aw +ab lJ aE ba -aw +ab an aL aA @@ -615,12 +423,12 @@ aA aA aN an -aw +ab DZ bb bf -az -bi +ab +ab "} (3,1,1) = {" aa @@ -628,12 +436,12 @@ aa aa aa ab -ar -ax +ab +ab mk ba ba -aw +ab an an an @@ -644,7 +452,7 @@ an zT DZ DZ -XL +DZ bj bo "} @@ -653,13 +461,13 @@ aa aa ab ac -ae +ab as -aw +ab aZ ba bh -aw +ab an aC aC @@ -677,23 +485,23 @@ bo (5,1,1) = {" aa ab -ae +ab al ap at -aw +ab aZ ba bh -aw +ab an -aD -aF -aF -aJ +ac +ac +ac +ac an an -aw +ab aX bc xo @@ -702,16 +510,16 @@ bo "} (6,1,1) = {" ab -ae +ab ah ai an an -aw +ab ac db -aD -OC +ac +ac an aA aA @@ -719,12 +527,12 @@ aA aA an aQ -aU -ar -ar -ar -bk -bn +ab +ab +ab +ab +ab +ab "} (7,1,1) = {" ac @@ -753,13 +561,13 @@ aa aa "} (8,1,1) = {" -ad -ag +ab +ab aj ai an au -aw +ab aC aC aC @@ -771,30 +579,30 @@ aC aC an aQ -aU -ar -ar -ar -aK -bi +ab +ab +ab +ab +ab +ab "} (9,1,1) = {" aa -ad -ag +ab +ab ao aq av -az -aD -aF -aF -aJ +ab +ac +ac +ac +ac an -aD -aF -aF -aJ +ac +ac +ac +ac an an ac @@ -807,11 +615,11 @@ bo (10,1,1) = {" aa aa -ad +ab ac -ag +ab an -aw +ab aA aA aA @@ -835,9 +643,9 @@ aa aa aa aa -ad -ar -ax +ab +ab +ab aB an an @@ -849,7 +657,7 @@ an an an an -aR +ac aI aI ev @@ -863,7 +671,7 @@ aa aa aa aa -aw +ab aC aG aC @@ -875,12 +683,12 @@ aC aC an an -aS +ac rj be aI -az -bn +ab +ab "} (13,1,1) = {" aa @@ -889,22 +697,22 @@ aa aa aa aa -ad -ar -ar +ab +ab +ab ac -ar -ar -ar -aD -aF -aJ -ar +ab +ab +ab ac -ar -ar -ar -ar -bn +ac +ac +ab +ac +ab +ab +ab +ab +ab aa "} diff --git a/_maps/map_files/shuttles/ferry_base.dmm b/_maps/map_files/shuttles/ferry_base.dmm index 658633d421a..84d89e20639 100644 --- a/_maps/map_files/shuttles/ferry_base.dmm +++ b/_maps/map_files/shuttles/ferry_base.dmm @@ -8,41 +8,14 @@ icon_state = "propulsion"; tag = "icon-propulsion (EAST)" }, -/turf/space, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f6"; - dir = 2 - }, +/turf/simulated/wall/mineral/titanium, /area/shuttle/transport) "c" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall12"; - dir = 2 - }, +/turf/simulated/wall/mineral/titanium, /area/shuttle/transport) "d" = ( -/obj/structure/shuttle/window, -/obj/structure/grille, -/turf/simulated/shuttle/plating, -/area/shuttle/transport) -"e" = ( -/obj/structure/grille, -/obj/structure/shuttle/window, -/turf/simulated/shuttle/plating, -/area/shuttle/transport) -"f" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f10"; - dir = 2 - }, -/area/shuttle/transport) -"g" = ( -/turf/simulated/shuttle/floor, -/turf/simulated/shuttle/wall/interior{ - tag = "icon-swall_f9"; - icon_state = "swall_f9" - }, +/obj/effect/spawner/window/shuttle, +/turf/simulated/floor/plating, /area/shuttle/transport) "h" = ( /obj/machinery/light/spot{ @@ -53,15 +26,15 @@ /obj/structure/chair/comfy/shuttle{ dir = 4 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/transport) "i" = ( /obj/machinery/computer/shuttle/ferry/request, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/transport) "j" = ( /obj/structure/chair/comfy/shuttle, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/transport) "k" = ( /obj/machinery/light/spot{ @@ -70,19 +43,19 @@ dir = 1 }, /obj/structure/chair/comfy/shuttle, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/transport) "l" = ( -/obj/machinery/door/airlock/shuttle{ +/obj/machinery/door/airlock/titanium{ id_tag = "s_docking_airlock" }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/plating, /area/shuttle/transport) "m" = ( -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/transport) "n" = ( -/obj/machinery/door/airlock/shuttle{ +/obj/machinery/door/airlock/titanium{ id_tag = "s_docking_airlock" }, /obj/docking_port/mobile{ @@ -95,70 +68,44 @@ timid = 1; width = 5 }, -/turf/simulated/shuttle/floor, -/area/shuttle/transport) -"o" = ( -/obj/structure/shuttle/engine/propulsion{ - dir = 8; - icon_state = "propulsion"; - tag = "icon-propulsion (EAST)" - }, -/turf/space, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f5"; - dir = 2 - }, -/area/shuttle/transport) -"p" = ( -/turf/simulated/shuttle/floor, -/turf/simulated/shuttle/wall/interior{ - tag = "icon-swall_f10"; - icon_state = "swall_f10" - }, +/turf/simulated/floor/plating, /area/shuttle/transport) "q" = ( /obj/structure/closet/crate, /obj/machinery/light/spot, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/transport) "r" = ( /obj/structure/closet/crate, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/transport) "s" = ( /obj/structure/chair/comfy/shuttle{ dir = 1 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/transport) "t" = ( /obj/machinery/light/spot, /obj/structure/chair/comfy/shuttle{ dir = 1 }, -/turf/simulated/shuttle/floor, -/area/shuttle/transport) -"u" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f9"; - dir = 2 - }, +/turf/simulated/floor/mineral/titanium/blue, /area/shuttle/transport) (1,1,1) = {" a b l -o +b a "} (2,1,1) = {" b -g +c m -p -o +c +b "} (3,1,1) = {" c @@ -203,11 +150,11 @@ s c "} (9,1,1) = {" -e +d j m s -e +d "} (10,1,1) = {" c @@ -224,9 +171,9 @@ t c "} (12,1,1) = {" -f +c d n d -u +c "} diff --git a/_maps/map_files/shuttles/ferry_meat.dmm b/_maps/map_files/shuttles/ferry_meat.dmm index a0935fb04d3..6dcf2379026 100644 --- a/_maps/map_files/shuttles/ferry_meat.dmm +++ b/_maps/map_files/shuttles/ferry_meat.dmm @@ -8,43 +8,14 @@ icon_state = "propulsion"; tag = "icon-propulsion (EAST)" }, -/turf/space, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f6"; - dir = 2 - }, +/turf/simulated/wall/mineral/titanium, /area/shuttle/transport) "c" = ( -/turf/simulated/shuttle/wall{ - icon_state = "swall12"; - dir = 2 - }, +/turf/simulated/wall/mineral/titanium, /area/shuttle/transport) "d" = ( -/obj/structure/shuttle/window, -/obj/structure/grille, -/turf/simulated/shuttle/plating, -/area/shuttle/transport) -"e" = ( -/obj/structure/grille, -/obj/structure/shuttle/window, -/turf/simulated/shuttle/plating, -/area/shuttle/transport) -"f" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f10"; - dir = 2 - }, -/area/shuttle/transport) -"g" = ( -/turf/simulated/floor/plasteel{ - icon_state = "freezerfloor" - }, -/turf/simulated/shuttle/wall/interior{ - tag = "icon-swall_f9"; - icon_state = "swall_f9" - }, +/obj/effect/spawner/window/shuttle, +/turf/simulated/floor/plating, /area/shuttle/transport) "h" = ( /obj/machinery/light/spot{ @@ -120,10 +91,10 @@ }, /area/shuttle/transport) "p" = ( -/obj/machinery/door/airlock/shuttle{ +/obj/machinery/door/airlock/titanium{ id_tag = "s_docking_airlock" }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/plating, /area/shuttle/transport) "q" = ( /obj/item/stack/sheet/animalhide/cat, @@ -137,7 +108,7 @@ }, /area/shuttle/transport) "r" = ( -/obj/machinery/door/airlock/shuttle{ +/obj/machinery/door/airlock/titanium{ id_tag = "s_docking_airlock" }, /obj/docking_port/mobile{ @@ -150,28 +121,7 @@ timid = 1; width = 5 }, -/turf/simulated/shuttle/floor, -/area/shuttle/transport) -"s" = ( -/obj/structure/shuttle/engine/propulsion{ - dir = 8; - icon_state = "propulsion"; - tag = "icon-propulsion (EAST)" - }, -/turf/space, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f5"; - dir = 2 - }, -/area/shuttle/transport) -"t" = ( -/turf/simulated/floor/plasteel{ - icon_state = "freezerfloor" - }, -/turf/simulated/shuttle/wall/interior{ - tag = "icon-swall_f10"; - icon_state = "swall_f10" - }, +/turf/simulated/floor/plating, /area/shuttle/transport) "u" = ( /obj/machinery/light/spot, @@ -201,27 +151,20 @@ icon_state = "freezerfloor" }, /area/shuttle/transport) -"y" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - icon_state = "swall_f9"; - dir = 2 - }, -/area/shuttle/transport) (1,1,1) = {" a b p -s +b a "} (2,1,1) = {" b -g +c k -t -s +c +b "} (3,1,1) = {" c @@ -266,11 +209,11 @@ x c "} (9,1,1) = {" -e +d k k k -e +d "} (10,1,1) = {" c @@ -287,9 +230,9 @@ w c "} (12,1,1) = {" -f +c d r d -y +c "} diff --git a/_maps/map_files/templates/light_floor_1.dmm b/_maps/map_files/templates/light_floor_1.dmm deleted file mode 100644 index 31441e8c501..00000000000 --- a/_maps/map_files/templates/light_floor_1.dmm +++ /dev/null @@ -1,180 +0,0 @@ -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"a" = ( -/turf/unsimulated/floor/carpet, -/area/template_noop) -"b" = ( -/turf/unsimulated/floor{ - luminosity = 1; - icon_state = "light_on-r" - }, -/area/template_noop) -"c" = ( -/turf/unsimulated/floor{ - luminosity = 1; - icon_state = "light_on-y" - }, -/area/template_noop) -"d" = ( -/turf/unsimulated/floor{ - luminosity = 1; - icon_state = "light_on-g" - }, -/area/template_noop) -"e" = ( -/turf/unsimulated/floor{ - icon_state = "light_on"; - luminosity = 1 - }, -/area/template_noop) -"f" = ( -/turf/unsimulated/floor{ - luminosity = 1; - icon_state = "light_on-b" - }, -/area/template_noop) -"g" = ( -/turf/unsimulated/floor{ - luminosity = 1; - icon_state = "light_on-p" - }, -/area/template_noop) -"h" = ( -/turf/unsimulated/floor{ - luminosity = 1; - icon_state = "light_on-w" - }, -/area/template_noop) - -(1,1,1) = {" -a -a -a -a -a -"} -(2,1,1) = {" -a -b -b -b -a -"} -(3,1,1) = {" -a -c -c -c -a -"} -(4,1,1) = {" -a -d -d -d -a -"} -(5,1,1) = {" -a -e -e -e -a -"} -(6,1,1) = {" -a -f -f -f -a -"} -(7,1,1) = {" -a -g -g -g -a -"} -(8,1,1) = {" -a -h -h -h -a -"} -(9,1,1) = {" -a -g -g -g -a -"} -(10,1,1) = {" -a -f -f -f -a -"} -(11,1,1) = {" -a -e -e -e -a -"} -(12,1,1) = {" -a -d -d -d -a -"} -(13,1,1) = {" -a -c -c -c -a -"} -(14,1,1) = {" -a -b -b -b -a -"} -(15,1,1) = {" -a -c -c -c -a -"} -(16,1,1) = {" -a -d -d -d -a -"} -(17,1,1) = {" -a -e -e -e -a -"} -(18,1,1) = {" -a -f -f -f -a -"} -(19,1,1) = {" -a -g -g -g -a -"} diff --git a/_maps/map_files/templates/light_floor_2.dmm b/_maps/map_files/templates/light_floor_2.dmm deleted file mode 100644 index 46bda3ef68b..00000000000 --- a/_maps/map_files/templates/light_floor_2.dmm +++ /dev/null @@ -1,180 +0,0 @@ -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"a" = ( -/turf/unsimulated/floor/carpet, -/area/template_noop) -"b" = ( -/turf/unsimulated/floor{ - luminosity = 1; - icon_state = "light_on-r" - }, -/area/template_noop) -"c" = ( -/turf/unsimulated/floor{ - luminosity = 1; - icon_state = "light_on-y" - }, -/area/template_noop) -"d" = ( -/turf/unsimulated/floor{ - luminosity = 1; - icon_state = "light_on-g" - }, -/area/template_noop) -"e" = ( -/turf/unsimulated/floor{ - luminosity = 1; - icon_state = "light_on" - }, -/area/template_noop) -"f" = ( -/turf/unsimulated/floor{ - luminosity = 1; - icon_state = "light_on-b" - }, -/area/template_noop) -"g" = ( -/turf/unsimulated/floor{ - luminosity = 1; - icon_state = "light_on-p" - }, -/area/template_noop) -"h" = ( -/turf/unsimulated/floor{ - luminosity = 1; - icon_state = "light_on-w" - }, -/area/template_noop) - -(1,1,1) = {" -a -a -a -b -a -"} -(2,1,1) = {" -a -a -b -c -a -"} -(3,1,1) = {" -a -b -c -d -a -"} -(4,1,1) = {" -a -c -d -e -a -"} -(5,1,1) = {" -a -d -e -f -a -"} -(6,1,1) = {" -a -e -f -g -a -"} -(7,1,1) = {" -a -f -g -h -a -"} -(8,1,1) = {" -a -g -h -g -a -"} -(9,1,1) = {" -a -h -g -f -a -"} -(10,1,1) = {" -a -g -f -e -a -"} -(11,1,1) = {" -a -f -e -d -a -"} -(12,1,1) = {" -a -e -d -c -a -"} -(13,1,1) = {" -a -d -c -b -a -"} -(14,1,1) = {" -a -c -b -c -a -"} -(15,1,1) = {" -a -b -c -d -a -"} -(16,1,1) = {" -a -c -d -e -a -"} -(17,1,1) = {" -a -d -e -f -a -"} -(18,1,1) = {" -a -e -f -g -a -"} -(19,1,1) = {" -a -f -g -a -a -"} diff --git a/_maps/map_files/templates/light_floor_3.dmm b/_maps/map_files/templates/light_floor_3.dmm deleted file mode 100644 index 6cc6db87445..00000000000 --- a/_maps/map_files/templates/light_floor_3.dmm +++ /dev/null @@ -1,180 +0,0 @@ -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"a" = ( -/turf/unsimulated/floor/carpet, -/area/template_noop) -"b" = ( -/turf/unsimulated/floor{ - luminosity = 1; - icon_state = "light_on-y" - }, -/area/template_noop) -"c" = ( -/turf/unsimulated/floor{ - luminosity = 1; - icon_state = "light_on-b" - }, -/area/template_noop) -"d" = ( -/turf/unsimulated/floor{ - luminosity = 1; - icon_state = "light_on-p" - }, -/area/template_noop) -"e" = ( -/turf/unsimulated/floor{ - luminosity = 1; - icon_state = "light_on-g" - }, -/area/template_noop) -"f" = ( -/turf/unsimulated/floor{ - luminosity = 1; - icon_state = "light_on-r" - }, -/area/template_noop) -"g" = ( -/turf/unsimulated/floor{ - luminosity = 1; - icon_state = "light_on" - }, -/area/template_noop) -"h" = ( -/turf/unsimulated/floor{ - luminosity = 1; - icon_state = "light_on-w" - }, -/area/template_noop) - -(1,1,1) = {" -a -a -a -a -a -"} -(2,1,1) = {" -a -f -f -f -f -"} -(3,1,1) = {" -b -b -b -b -f -"} -(4,1,1) = {" -a -e -e -e -f -"} -(5,1,1) = {" -a -g -g -g -f -"} -(6,1,1) = {" -c -c -c -c -f -"} -(7,1,1) = {" -a -d -d -d -f -"} -(8,1,1) = {" -a -h -h -h -h -"} -(9,1,1) = {" -d -d -d -d -h -"} -(10,1,1) = {" -a -c -c -c -h -"} -(11,1,1) = {" -a -g -g -g -h -"} -(12,1,1) = {" -e -e -e -e -h -"} -(13,1,1) = {" -a -b -b -b -h -"} -(14,1,1) = {" -a -f -f -f -g -"} -(15,1,1) = {" -b -b -b -b -g -"} -(16,1,1) = {" -a -e -e -e -g -"} -(17,1,1) = {" -a -g -g -g -g -"} -(18,1,1) = {" -c -c -c -c -g -"} -(19,1,1) = {" -a -d -d -d -g -"} diff --git a/_maps/map_files/templates/medium_shuttle1.dmm b/_maps/map_files/templates/medium_shuttle1.dmm index 90acb3211a1..dc79e62c111 100644 --- a/_maps/map_files/templates/medium_shuttle1.dmm +++ b/_maps/map_files/templates/medium_shuttle1.dmm @@ -8,7 +8,7 @@ icon_state = "burst_l"; tag = "icon-burst_l (EAST)" }, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/ruin/powered{ name = "Shuttle" }) @@ -23,40 +23,17 @@ icon_state = "rwindow"; dir = 4 }, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/ruin/powered{ name = "Shuttle" }) "d" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-wall3"; - icon_state = "wall3" - }, -/area/ruin/powered{ - name = "Shuttle" - }) -"e" = ( -/turf/space, -/turf/simulated/shuttle{ - tag = "icon-wall3 (NORTHEAST)"; - icon_state = "wall3"; - dir = 5 - }, +/turf/simulated/wall/mineral/plastitanium, /area/ruin/powered{ name = "Shuttle" }) "f" = ( -/turf/simulated/shuttle/wall, -/turf/simulated/shuttle/wall{ - tag = "icon-wall3 (SOUTHEAST)"; - icon_state = "wall3"; - dir = 6 - }, -/area/ruin/powered{ - name = "Shuttle" - }) -"g" = ( -/turf/simulated/shuttle/wall, +/turf/simulated/wall/mineral/titanium, /area/ruin/powered{ name = "Shuttle" }) @@ -159,7 +136,7 @@ name = "Shuttle" }) "t" = ( -/obj/effect/spawner/window/reinforced, +/obj/effect/spawner/window/shuttle, /turf/simulated/floor/plating, /area/ruin/powered{ name = "Shuttle" @@ -174,15 +151,6 @@ /area/ruin/powered{ name = "Shuttle" }) -"v" = ( -/turf/simulated/floor/plating, -/turf/simulated/shuttle/wall{ - tag = "icon-window1"; - icon_state = "window1" - }, -/area/ruin/powered{ - name = "Shuttle" - }) "w" = ( /obj/machinery/light{ dir = 4 @@ -194,51 +162,13 @@ /area/ruin/powered{ name = "Shuttle" }) -"x" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - tag = "icon-diagonalWall (NORTHWEST)"; - icon_state = "diagonalWall"; - dir = 9 - }, -/area/ruin/powered{ - name = "Shuttle" - }) -"y" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-wall"; - icon_state = "wall" - }, -/area/ruin/powered{ - name = "Shuttle" - }) "z" = ( /obj/structure/shuttle/engine/propulsion/burst/right{ dir = 8; icon_state = "burst_r"; tag = "icon-burst_r (EAST)" }, -/turf/simulated/shuttle/plating, -/area/ruin/powered{ - name = "Shuttle" - }) -"A" = ( -/turf/simulated/shuttle/wall, -/turf/simulated/shuttle/wall{ - tag = "icon-wall3 (NORTHEAST)"; - icon_state = "wall3"; - dir = 5 - }, -/area/ruin/powered{ - name = "Shuttle" - }) -"B" = ( -/turf/space, -/turf/simulated/shuttle{ - tag = "icon-wall3 (SOUTHEAST)"; - icon_state = "wall3"; - dir = 6 - }, +/turf/simulated/floor/plating/airless, /area/ruin/powered{ name = "Shuttle" }) @@ -281,16 +211,6 @@ /area/ruin/powered{ name = "Shuttle" }) -"G" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - tag = "icon-diagonalWall (SOUTHEAST)"; - icon_state = "diagonalWall"; - dir = 6 - }, -/area/ruin/powered{ - name = "Shuttle" - }) "H" = ( /obj/machinery/sleeper, /turf/simulated/floor/plasteel{ @@ -405,12 +325,7 @@ name = "Shuttle" }) "T" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - tag = "icon-diagonalWall (SOUTHEAST)"; - icon_state = "diagonalWall"; - dir = 6 - }, +/turf/simulated/wall/mineral/titanium, /area/space) "U" = ( /obj/structure/table/reinforced, @@ -430,11 +345,11 @@ a a a a -g +f h -g +f h -g +f a a a @@ -447,11 +362,11 @@ a a a a -g +f o o o -g +f a a a @@ -462,15 +377,15 @@ a a a a -g -g -g +f +f +f p -g +f p -g -g -y +f +f +f a a a @@ -479,15 +394,15 @@ a b b b -g +f N -g +f O o P -g +f Q -g +f z z z @@ -496,7 +411,7 @@ z c c c -g +f j k o @@ -504,7 +419,7 @@ i o p j -g +f c c c @@ -513,40 +428,40 @@ c d d f -g +f k -g -g -g -g -g +f +f +f +f +f k -g -A +f +f d d "} (7,1,1) = {" d d -g +f l j -g +f n n n -g +f j j -g +f d d "} (8,1,1) = {" d d -g +f C S k @@ -556,41 +471,41 @@ j k j D -g +f +d d -B "} (9,1,1) = {" -e d -g +d +f u j -g +f j w j -g +f R j -g -B +f +d a "} (10,1,1) = {" a -e -g -g -g -g +d +f +f +f +f k -g +f k -g -g -g -g +f +f +f +f a a "} @@ -602,7 +517,7 @@ j k j j -v +t j j k @@ -616,13 +531,13 @@ a a h j -g +f E j -v +t j F -g +f j h a @@ -631,17 +546,17 @@ a (13,1,1) = {" a a -g -g -g -g +f +f +f +f k -g +f k -g -g -g -g +f +f +f +f a a "} @@ -649,16 +564,16 @@ a a a T -g -g +f +f m q -v +t j I -g -g -x +f +f +f a a "} @@ -666,15 +581,15 @@ a a a a -G -g +f +f H q -v +t j I -g -x +f +f a a a @@ -684,13 +599,13 @@ a a a a -g -g +f +f k -g +f k -g -g +f +f a a a @@ -701,13 +616,13 @@ a a a a -g +f J j -g +f j j -g +f a a a @@ -718,13 +633,13 @@ a a a a -g +f K j -g +f j w -g +f a a a @@ -735,13 +650,13 @@ a a a a -g -g +f +f k -g +f k -g -g +f +f a a a @@ -752,13 +667,13 @@ a a a a -G -g +f +f r r r -g -x +f +f a a a @@ -770,11 +685,11 @@ a a a a -g +f r L r -g +f a a a @@ -787,11 +702,11 @@ a a a a -g +f U M s -g +f a a a @@ -804,11 +719,11 @@ a a a a -G +f t t t -x +f a a a diff --git a/_maps/map_files/templates/medium_shuttle2.dmm b/_maps/map_files/templates/medium_shuttle2.dmm index 8966fc3ac7a..6dde84a55bf 100644 --- a/_maps/map_files/templates/medium_shuttle2.dmm +++ b/_maps/map_files/templates/medium_shuttle2.dmm @@ -8,7 +8,7 @@ icon_state = "burst_l"; tag = "icon-burst_l (EAST)" }, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/ruin/powered{ name = "Shuttle" }) @@ -23,26 +23,12 @@ icon_state = "rwindow"; dir = 4 }, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/ruin/powered{ name = "Shuttle" }) "d" = ( -/turf/simulated/shuttle{ - tag = "icon-wall3 (EAST)"; - icon_state = "wall3"; - dir = 4 - }, -/area/ruin/powered{ - name = "Shuttle" - }) -"e" = ( -/turf/space, -/turf/simulated/shuttle{ - tag = "icon-wall3 (NORTHEAST)"; - icon_state = "wall3"; - dir = 5 - }, +/turf/simulated/wall/mineral/plastitanium, /area/ruin/powered{ name = "Shuttle" }) @@ -52,22 +38,12 @@ icon_state = "burst_r"; tag = "icon-burst_r (EAST)" }, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/ruin/powered{ name = "Shuttle" }) "g" = ( -/turf/simulated/shuttle/wall, -/turf/simulated/shuttle{ - tag = "icon-wall3 (SOUTHEAST)"; - icon_state = "wall3"; - dir = 6 - }, -/area/ruin/powered{ - name = "Shuttle" - }) -"h" = ( -/turf/simulated/shuttle/wall, +/turf/simulated/wall/mineral/titanium, /area/ruin/powered{ name = "Shuttle" }) @@ -76,29 +52,10 @@ dir = 1 }, /turf/simulated/floor/plasteel, -/area/ruin/powered{ - name = "Shuttle" - }) -"j" = ( -/turf/space, -/turf/simulated/shuttle{ - tag = "icon-wall3 (NORTHWEST)"; - icon_state = "wall3"; - dir = 9 - }, /area/ruin/powered{ name = "Shuttle" }) "k" = ( -/turf/simulated/floor/plasteel{ - tag = "icon-dark"; - icon_state = "dark" - }, -/area/ruin/powered{ - name = "Shuttle" - }) -"l" = ( -/obj/machinery/door/airlock/external, /turf/simulated/floor/plasteel{ tag = "icon-dark"; icon_state = "dark" @@ -148,16 +105,6 @@ /area/ruin/powered{ name = "Shuttle" }) -"s" = ( -/turf/space, -/turf/simulated/shuttle{ - tag = "icon-wall3 (SOUTHWEST)"; - icon_state = "wall3"; - dir = 10 - }, -/area/ruin/powered{ - name = "Shuttle" - }) "t" = ( /obj/structure/table, /turf/simulated/floor/plasteel, @@ -197,7 +144,7 @@ name = "Shuttle" }) "x" = ( -/obj/effect/spawner/window/reinforced, +/obj/effect/spawner/window/shuttle, /turf/simulated/floor/plating, /area/ruin/powered{ name = "Shuttle" @@ -211,13 +158,6 @@ "z" = ( /obj/machinery/portable_atmospherics/canister/oxygen, /turf/simulated/floor/plasteel, -/area/ruin/powered{ - name = "Shuttle" - }) -"A" = ( -/obj/structure/grille, -/obj/structure/shuttle/window, -/turf/simulated/floor/plating, /area/ruin/powered{ name = "Shuttle" }) @@ -232,16 +172,6 @@ /area/ruin/powered{ name = "Shuttle" }) -"C" = ( -/turf/simulated/shuttle/wall, -/turf/simulated/shuttle{ - tag = "icon-wall3 (NORTHEAST)"; - icon_state = "wall3"; - dir = 5 - }, -/area/ruin/powered{ - name = "Shuttle" - }) "D" = ( /obj/structure/computerframe, /obj/item/circuitboard/teleporter, @@ -262,16 +192,6 @@ /area/ruin/powered{ name = "Shuttle" }) -"F" = ( -/turf/space, -/turf/simulated/shuttle{ - tag = "icon-wall3 (SOUTHEAST)"; - icon_state = "wall3"; - dir = 6 - }, -/area/ruin/powered{ - name = "Shuttle" - }) "G" = ( /obj/item/radio/beacon, /turf/simulated/floor/plasteel{ @@ -291,12 +211,7 @@ name = "Shuttle" }) "I" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - tag = "icon-diagonalWall (SOUTHEAST)"; - icon_state = "diagonalWall"; - dir = 6 - }, +/turf/simulated/wall/mineral/titanium, /area/space) "J" = ( /obj/machinery/light{ @@ -319,14 +234,6 @@ /area/ruin/powered{ name = "Shuttle" }) -"L" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - tag = "icon-diagonalWall (NORTHWEST)"; - icon_state = "diagonalWall"; - dir = 9 - }, -/area/space) "M" = ( /obj/structure/bed, /obj/item/bedsheet/purple, @@ -367,26 +274,6 @@ /area/ruin/powered{ name = "Shuttle" }) -"Q" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - tag = "icon-diagonalWall (SOUTHEAST)"; - icon_state = "diagonalWall"; - dir = 6 - }, -/area/ruin/powered{ - name = "Shuttle" - }) -"R" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - tag = "icon-diagonalWall (NORTHWEST)"; - icon_state = "diagonalWall"; - dir = 9 - }, -/area/ruin/powered{ - name = "Shuttle" - }) "S" = ( /obj/structure/table/reinforced, /obj/machinery/recharger, @@ -515,15 +402,15 @@ a (4,1,1) = {" b f -j d d -s +d +d a -j d d -s +d +d b f "} @@ -533,10 +420,10 @@ c d d g -h +g y -h -C +g +g d d c @@ -546,21 +433,21 @@ c d d g -h -h +g +g z m t -h -h -C +g +g +g d d "} (7,1,1) = {" d d -h +g i m m @@ -568,28 +455,28 @@ m m m o -h +g d d "} (8,1,1) = {" d g -h +g n -h -h -h -h -h +g +g +g +g +g n -h -C +g +g d "} (9,1,1) = {" d -h +g T k k @@ -599,12 +486,12 @@ E k k N -h +g d "} (10,1,1) = {" -e -h +d +g T k k @@ -614,96 +501,96 @@ G k k N -h -F +g +d "} (11,1,1) = {" a -h -h -h +g +g +g n -h +g n -h +g n -h -h -h +g +g +g a "} (12,1,1) = {" a I -h +g J k -h +g k -h +g k K -h -L +g +I a "} (13,1,1) = {" a a -h +g H k -h +g V -h +g k k -h +g a a "} (14,1,1) = {" a a -h -h +g +g n -h -h -h +g +g +g n -h -h +g +g a a "} (15,1,1) = {" a a -l +y k k -h -h -h +g +g +g k k -l +y a a "} (16,1,1) = {" a a -h -h +g +g n -h -h -h +g +g +g n -h -h +g +g a a "} @@ -711,14 +598,14 @@ a a a I -h +g k k k k k -h -L +g +I a a "} @@ -726,13 +613,13 @@ a a a a -h +g n -h -h -h +g +g +g n -h +g a a a @@ -741,13 +628,13 @@ a a a a -h +g W u -A +x M K -h +g a a a @@ -756,13 +643,13 @@ a a a a -h +g p v -A +x M k -h +g a a a @@ -771,13 +658,13 @@ a a a a -h +g n -h -h -h +g +g +g n -h +g a a a @@ -786,13 +673,13 @@ a a a a -h +g k N -A +x P k -h +g a a a @@ -801,13 +688,13 @@ a a a a -h +g k N -A +x O k -h +g a a a @@ -816,13 +703,13 @@ a a a a -h +g q -h -h -h +g +g +g q -h +g a a a @@ -831,13 +718,13 @@ a a a a -h +g X r B r Y -h +g a a a @@ -846,13 +733,13 @@ a a a a -h +g r S Z w r -h +g a a a @@ -861,13 +748,13 @@ a a a a -Q -h +g +g x x x -h -R +g +g a a a @@ -877,11 +764,11 @@ a a a a -h +g a a a -h +g a a a diff --git a/_maps/map_files/templates/medium_shuttle3.dmm b/_maps/map_files/templates/medium_shuttle3.dmm index e87eec1f66b..9f2ce97d6d5 100644 --- a/_maps/map_files/templates/medium_shuttle3.dmm +++ b/_maps/map_files/templates/medium_shuttle3.dmm @@ -8,15 +8,12 @@ icon_state = "propulsion"; dir = 1 }, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/ruin/powered{ name = "Shuttle" }) "c" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-wall3"; - icon_state = "wall3" - }, +/turf/simulated/wall/mineral/plastitanium, /area/ruin/powered{ name = "Shuttle" }) @@ -26,52 +23,12 @@ icon_state = "heater"; dir = 1 }, -/turf/simulated/shuttle/plating, -/area/ruin/powered{ - name = "Shuttle" - }) -"e" = ( -/turf/space, -/turf/simulated/shuttle{ - tag = "icon-wall3 (NORTHWEST)"; - icon_state = "wall3"; - dir = 9 - }, -/area/ruin/powered{ - name = "Shuttle" - }) -"f" = ( -/turf/space, -/turf/simulated/shuttle{ - tag = "icon-wall3 (NORTHEAST)"; - icon_state = "wall3"; - dir = 5 - }, -/area/ruin/powered{ - name = "Shuttle" - }) -"g" = ( -/turf/simulated/shuttle/wall, -/turf/simulated/shuttle{ - tag = "icon-wall3 (SOUTHEAST)"; - icon_state = "wall3"; - dir = 6 - }, +/turf/simulated/floor/plating/airless, /area/ruin/powered{ name = "Shuttle" }) "h" = ( -/turf/simulated/shuttle/wall, -/area/ruin/powered{ - name = "Shuttle" - }) -"i" = ( -/turf/simulated/shuttle/wall, -/turf/simulated/shuttle{ - tag = "icon-wall3 (SOUTHWEST)"; - icon_state = "wall3"; - dir = 10 - }, +/turf/simulated/wall/mineral/titanium, /area/ruin/powered{ name = "Shuttle" }) @@ -103,7 +60,7 @@ icon_state = "propulsion"; tag = "icon-propulsion (EAST)" }, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/ruin/powered{ name = "Shuttle" }) @@ -113,7 +70,7 @@ icon_state = "heater"; dir = 8 }, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/ruin/powered{ name = "Shuttle" }) @@ -129,7 +86,7 @@ icon_state = "heater"; dir = 4 }, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/ruin/powered{ name = "Shuttle" }) @@ -139,33 +96,13 @@ icon_state = "propulsion"; tag = "icon-propulsion (WEST)" }, -/turf/simulated/shuttle/plating, -/area/ruin/powered{ - name = "Shuttle" - }) -"s" = ( -/turf/simulated/shuttle/wall, -/turf/simulated/shuttle{ - tag = "icon-wall3 (NORTHEAST)"; - icon_state = "wall3"; - dir = 5 - }, +/turf/simulated/floor/plating/airless, /area/ruin/powered{ name = "Shuttle" }) "t" = ( /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, -/area/ruin/powered{ - name = "Shuttle" - }) -"u" = ( -/turf/simulated/shuttle/wall, -/turf/simulated/shuttle{ - tag = "icon-wall3 (NORTHWEST)"; - icon_state = "wall3"; - dir = 9 - }, /area/ruin/powered{ name = "Shuttle" }) @@ -197,16 +134,6 @@ /area/ruin/powered{ name = "Shuttle" }) -"y" = ( -/turf/space, -/turf/simulated/shuttle{ - tag = "icon-wall3 (SOUTHWEST)"; - icon_state = "wall3"; - dir = 10 - }, -/area/ruin/powered{ - name = "Shuttle" - }) "z" = ( /obj/machinery/sleeper, /turf/simulated/floor/plasteel{ @@ -224,16 +151,6 @@ /area/ruin/powered{ name = "Shuttle" }) -"B" = ( -/turf/space, -/turf/simulated/shuttle{ - tag = "icon-wall3 (SOUTHEAST)"; - icon_state = "wall3"; - dir = 6 - }, -/area/ruin/powered{ - name = "Shuttle" - }) "C" = ( /obj/machinery/door/airlock/public/glass, /turf/simulated/floor/plating, @@ -260,13 +177,13 @@ }) "F" = ( /obj/structure/shuttle/engine/heater, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/ruin/powered{ name = "Shuttle" }) "G" = ( /obj/structure/shuttle/engine/propulsion, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/ruin/powered{ name = "Shuttle" }) @@ -325,18 +242,18 @@ a a a a -e +c o c c -y +c a a -e +c c c o -y +c a a a @@ -348,7 +265,7 @@ a a a a -e +c c c c @@ -361,7 +278,7 @@ c c c c -y +c a a a @@ -371,22 +288,22 @@ a a a a -e -g -h -h -s c -g +c +h +h +c +c +c j j -s c -g +c +c h h -s -y +c +c a a a @@ -394,7 +311,7 @@ a (6,1,1) = {" a a -e +c c h k @@ -411,7 +328,7 @@ l k h c -y +c a a "} @@ -444,7 +361,7 @@ a c c c -i +c h l l @@ -457,7 +374,7 @@ l l l h -u +c c c c @@ -490,9 +407,9 @@ G (10,1,1) = {" a a -f c -g +c +c h p h @@ -505,9 +422,9 @@ A h p h -s c -B +c +c a a "} @@ -562,9 +479,9 @@ a (13,1,1) = {" a a -e c -i +c +c h p h @@ -577,9 +494,9 @@ A h p h -u c -y +c +c a a "} @@ -612,7 +529,7 @@ a c c c -g +c h l l @@ -625,7 +542,7 @@ l l l h -s +c c c c @@ -658,7 +575,7 @@ a (17,1,1) = {" a a -f +c c h k @@ -675,7 +592,7 @@ l k h c -B +c a a "} @@ -683,22 +600,22 @@ a a a a -f -i -h -h -u c -i +c +h +h +c +c +c j j -u c -i +c +c h h -u -B +c +c a a a @@ -708,7 +625,7 @@ a a a a -f +c c c c @@ -721,7 +638,7 @@ c c c c -B +c a a a @@ -733,18 +650,18 @@ a a a a -f +c q c c -B +c a a -f +c c c q -B +c a a a diff --git a/_maps/map_files/templates/small_shuttle_1.dmm b/_maps/map_files/templates/small_shuttle_1.dmm index a1fae43e707..261b74c7874 100644 --- a/_maps/map_files/templates/small_shuttle_1.dmm +++ b/_maps/map_files/templates/small_shuttle_1.dmm @@ -1,130 +1,90 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - tag = "icon-swall_f6"; - icon_state = "swall_f6" - }, +/turf/simulated/wall/mineral/titanium, /area/ruin/powered) "b" = ( /turf/space, /area/ruin/powered) -"c" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall3"; - icon_state = "swall3" - }, -/area/ruin/powered) "d" = ( -/obj/machinery/door/unpowered/shuttle, -/turf/simulated/shuttle/floor, -/area/ruin/powered) -"e" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - tag = "icon-swall_f5"; - icon_state = "swall_f5" - }, -/area/ruin/powered) -"f" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall8"; - icon_state = "swall8" - }, +/obj/machinery/door/airlock/titanium, +/turf/simulated/floor/mineral/titanium/blue, /area/ruin/powered) "g" = ( -/obj/structure/grille, -/obj/structure/shuttle/window, -/turf/simulated/floor/plating/airless, +/obj/effect/spawner/window/shuttle, +/turf/simulated/floor/plating, /area/ruin/powered) "h" = ( -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/ruin/powered) "i" = ( /obj/machinery/light, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/ruin/powered) "j" = ( /obj/structure/shuttle/engine/heater, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, /area/ruin/powered) "k" = ( /obj/structure/shuttle/engine/propulsion, -/turf/simulated/shuttle/plating, -/area/ruin/powered) -"l" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall13"; - icon_state = "swall13" - }, +/turf/simulated/floor/plating/airless, /area/ruin/powered) "m" = ( /obj/structure/chair/comfy/shuttle{ dir = 4 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/ruin/powered) "n" = ( /obj/machinery/light{ icon_state = "tube1"; dir = 8 }, -/turf/simulated/shuttle/floor, +/obj/structure/window/reinforced, +/turf/simulated/floor/mineral/titanium/blue, /area/ruin/powered) "o" = ( /obj/structure/shuttle/engine/propulsion{ icon_state = "propulsion_l" }, -/turf/simulated/shuttle/plating, -/area/ruin/powered) -"p" = ( -/turf/simulated/shuttle/wall{ - tag = "icon-swall4"; - icon_state = "swall4" - }, +/turf/simulated/floor/plating/airless, /area/ruin/powered) "q" = ( /obj/machinery/computer, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/ruin/powered) "r" = ( /obj/structure/chair/comfy/shuttle{ dir = 1 }, -/turf/simulated/shuttle/floor, -/area/ruin/powered) -"s" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - tag = "icon-swall_f10"; - icon_state = "swall_f10" - }, -/area/ruin/powered) -"t" = ( -/turf/space, -/turf/simulated/shuttle/wall{ - tag = "icon-swall_f9"; - icon_state = "swall_f9" - }, +/turf/simulated/floor/mineral/titanium/blue, /area/ruin/powered) "u" = ( /obj/structure/chair/comfy/shuttle{ dir = 8 }, -/turf/simulated/shuttle/floor, +/turf/simulated/floor/mineral/titanium/blue, /area/ruin/powered) "v" = ( /obj/machinery/light{ dir = 4; icon_state = "tube1" }, -/turf/simulated/shuttle/floor, +/obj/structure/window/reinforced, +/turf/simulated/floor/mineral/titanium/blue, /area/ruin/powered) "w" = ( /obj/structure/shuttle/engine/propulsion{ icon_state = "propulsion_r" }, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/airless, +/area/ruin/powered) +"A" = ( +/obj/structure/window/reinforced, +/turf/simulated/floor/mineral/titanium/blue, +/area/ruin/powered) +"D" = ( +/obj/machinery/door/airlock/titanium, +/turf/simulated/floor/plating, /area/ruin/powered) (1,1,1) = {" @@ -132,19 +92,19 @@ b b b a -c -c -d -d -c -c -e +a +a +D +D +a +a +a "} (2,1,1) = {" a -c -c -l +a +a +a m m h @@ -157,12 +117,12 @@ o g h i -f -h +a h h h h +A j k "} @@ -175,7 +135,7 @@ h h h h -h +A j k "} @@ -183,20 +143,20 @@ k g q i -p -h +a h h h h +A j k "} (6,1,1) = {" -s -c -c -l +a +a +a +a u u h @@ -209,12 +169,12 @@ w b b b -s -c -c -d -d -c -c -t +a +a +a +D +D +a +a +a "} diff --git a/_maps/map_files/templates/spacehotel/n_01.dmm b/_maps/map_files/templates/spacehotel/n_01.dmm deleted file mode 100644 index 38805030481..00000000000 --- a/_maps/map_files/templates/spacehotel/n_01.dmm +++ /dev/null @@ -1,160 +0,0 @@ -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"a" = ( -/turf/template_noop, -/area/template_noop) -"b" = ( -/obj/structure/sign/poster/random{ - dir = 8; - pixel_x = -32 - }, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"c" = ( -/turf/unsimulated/floor/carpet, -/area/template_noop) -"d" = ( -/obj/structure/dresser, -/obj/item/lipstick/jade, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"e" = ( -/obj/machinery/light{ - dir = 8 - }, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"f" = ( -/obj/structure/bed, -/obj/item/bedsheet/green, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"g" = ( -/obj/structure/bed, -/obj/item/bedsheet/green, -/obj/item/toy/plushie/octopus, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"h" = ( -/obj/structure/window/reinforced/polarized{ - id = "room_n" - }, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"i" = ( -/obj/machinery/door/window/southright, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"j" = ( -/obj/item/flashlight/lamp/green, -/obj/structure/table/wood, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"k" = ( -/obj/structure/sink{ - icon_state = "sink"; - dir = 8; - pixel_x = -12; - pixel_y = 2 - }, -/obj/structure/mirror{ - dir = 8; - pixel_x = -28 - }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/template_noop) -"l" = ( -/obj/structure/toilet{ - dir = 1 - }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/template_noop) -"m" = ( -/obj/machinery/door/window/eastleft, -/obj/machinery/button/windowtint{ - id = "room_n"; - pixel_y = -24; - range = 2 - }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/template_noop) -"n" = ( -/obj/machinery/shower{ - dir = 8 - }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/template_noop) -"o" = ( -/turf/unsimulated/wall/metal, -/area/template_noop) - -(1,1,1) = {" -a -a -a -a -a -a -a -"} -(2,1,1) = {" -a -b -e -c -h -k -a -"} -(3,1,1) = {" -a -c -c -c -h -l -a -"} -(4,1,1) = {" -a -c -c -c -i -m -a -"} -(5,1,1) = {" -a -c -c -c -h -n -a -"} -(6,1,1) = {" -a -d -f -g -j -o -a -"} -(7,1,1) = {" -a -a -a -a -a -a -a -"} diff --git a/_maps/map_files/templates/spacehotel/n_02.dmm b/_maps/map_files/templates/spacehotel/n_02.dmm deleted file mode 100644 index 978ee2aa087..00000000000 --- a/_maps/map_files/templates/spacehotel/n_02.dmm +++ /dev/null @@ -1,204 +0,0 @@ -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"a" = ( -/turf/template_noop, -/area/template_noop) -"b" = ( -/obj/effect/decal/cleanable/flour{ - desc = "Probably." - }, -/obj/effect/decal/cleanable/pie_smudge, -/turf/template_noop, -/area/template_noop) -"c" = ( -/obj/effect/decal/cleanable/pie_smudge, -/obj/effect/decal/cleanable/flour, -/obj/item/grown/bananapeel{ - layer = 2.6 - }, -/turf/template_noop, -/area/template_noop) -"d" = ( -/obj/structure/sign/poster/random{ - dir = 8; - pixel_x = -32 - }, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"e" = ( -/turf/unsimulated/floor/carpet, -/area/template_noop) -"f" = ( -/obj/effect/decal/cleanable/pie_smudge, -/obj/effect/decal/cleanable/flour, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"g" = ( -/obj/structure/dresser, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"h" = ( -/obj/structure/bed, -/obj/item/bedsheet/orange, -/obj/effect/decal/cleanable/pie_smudge, -/obj/effect/decal/cleanable/flour, -/obj/item/grown/bananapeel/clownfish, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"i" = ( -/obj/structure/bed, -/obj/item/bedsheet/orange, -/obj/effect/decal/cleanable/flour{ - desc = "Rather caked in there." - }, -/obj/effect/decal/cleanable/pie_smudge, -/obj/item/grown/bananapeel/clownfish, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"j" = ( -/obj/structure/window/reinforced/polarized{ - id = "room_n" - }, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"k" = ( -/obj/machinery/door/window/southright, -/obj/effect/decal/cleanable/pie_smudge, -/obj/effect/decal/cleanable/flour, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"l" = ( -/obj/effect/decal/cleanable/pie_smudge, -/obj/effect/decal/cleanable/flour, -/obj/structure/window/reinforced/polarized{ - id = "room_n" - }, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"m" = ( -/obj/structure/table/wood, -/obj/item/flashlight/lamp/bananalamp, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"n" = ( -/obj/structure/sink{ - icon_state = "sink"; - dir = 8; - pixel_x = -12; - pixel_y = 2 - }, -/obj/structure/mirror{ - dir = 8; - pixel_x = -28 - }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/template_noop) -"o" = ( -/obj/structure/toilet{ - dir = 1 - }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/template_noop) -"p" = ( -/obj/machinery/door/window/eastleft, -/obj/machinery/button/windowtint{ - id = "room_n"; - pixel_y = -24; - range = 2 - }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/template_noop) -"q" = ( -/obj/machinery/shower{ - dir = 8 - }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/template_noop) -"r" = ( -/turf/unsimulated/wall/metal, -/area/template_noop) - -(1,1,1) = {" -a -a -a -a -a -a -a -a -a -"} -(2,1,1) = {" -a -a -d -f -e -j -n -a -a -"} -(3,1,1) = {" -a -a -e -f -f -j -o -a -a -"} -(4,1,1) = {" -b -c -f -f -f -k -p -a -a -"} -(5,1,1) = {" -b -a -e -f -f -l -q -a -a -"} -(6,1,1) = {" -a -a -g -h -i -m -r -a -a -"} -(7,1,1) = {" -a -a -a -a -a -a -a -a -a -"} diff --git a/_maps/map_files/templates/spacehotel/n_03.dmm b/_maps/map_files/templates/spacehotel/n_03.dmm deleted file mode 100644 index a04f1445ef0..00000000000 --- a/_maps/map_files/templates/spacehotel/n_03.dmm +++ /dev/null @@ -1,155 +0,0 @@ -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"a" = ( -/turf/template_noop, -/area/template_noop) -"b" = ( -/obj/structure/sign/poster/official/random{ - dir = 8; - pixel_x = -32 - }, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"c" = ( -/turf/unsimulated/floor/carpet, -/area/template_noop) -"d" = ( -/obj/structure/dresser, -/obj/item/lipstick/purple, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"e" = ( -/obj/machinery/light{ - dir = 8 - }, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"f" = ( -/obj/structure/bed, -/obj/item/bedsheet/purple, -/obj/item/toy/random, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"g" = ( -/obj/structure/window/reinforced/polarized{ - id = "room_n" - }, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"h" = ( -/obj/machinery/door/window/southright, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"i" = ( -/obj/item/flashlight/lamp/green, -/obj/structure/table/wood, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"j" = ( -/obj/structure/sink{ - icon_state = "sink"; - dir = 8; - pixel_x = -12; - pixel_y = 2 - }, -/obj/structure/mirror{ - dir = 8; - pixel_x = -28 - }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/template_noop) -"k" = ( -/obj/structure/toilet{ - dir = 1 - }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/template_noop) -"l" = ( -/obj/machinery/door/window/eastleft, -/obj/machinery/button/windowtint{ - id = "room_n"; - pixel_y = -24; - range = 2 - }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/template_noop) -"m" = ( -/obj/machinery/shower{ - dir = 8 - }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/template_noop) -"n" = ( -/turf/unsimulated/wall/metal, -/area/template_noop) - -(1,1,1) = {" -a -a -a -a -a -a -a -"} -(2,1,1) = {" -a -b -e -c -g -j -a -"} -(3,1,1) = {" -a -c -c -c -g -k -a -"} -(4,1,1) = {" -a -c -c -c -h -l -a -"} -(5,1,1) = {" -a -c -c -c -g -m -a -"} -(6,1,1) = {" -a -d -f -f -i -n -a -"} -(7,1,1) = {" -a -a -a -a -a -a -a -"} diff --git a/_maps/map_files/templates/spacehotel/n_04.dmm b/_maps/map_files/templates/spacehotel/n_04.dmm deleted file mode 100644 index 2011c03fe18..00000000000 --- a/_maps/map_files/templates/spacehotel/n_04.dmm +++ /dev/null @@ -1,191 +0,0 @@ -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"a" = ( -/turf/template_noop, -/area/template_noop) -"b" = ( -/obj/structure/sign/poster/ripped{ - dir = 8; - pixel_x = -32 - }, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"c" = ( -/turf/unsimulated/floor/carpet, -/area/template_noop) -"d" = ( -/obj/structure/dresser, -/obj/item/clothing/head/xenos, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"e" = ( -/obj/machinery/light{ - dir = 8 - }, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"f" = ( -/mob/living/simple_animal/hostile/alien/queen, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"g" = ( -/obj/structure/bed/nest, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"h" = ( -/obj/structure/bed/alien, -/obj/item/xenos_claw, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"i" = ( -/obj/effect/gibspawner/xeno, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"j" = ( -/obj/effect/decal/remains/human, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"k" = ( -/obj/structure/bed/alien, -/obj/item/clothing/suit/xenos, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"l" = ( -/obj/structure/alien/weeds/node, -/obj/structure/window/reinforced/polarized{ - id = "room_n" - }, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"m" = ( -/obj/structure/alien/weeds{ - icon_state = "weeds1" - }, -/obj/structure/window/reinforced/polarized{ - id = "room_n" - }, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"n" = ( -/obj/machinery/door/window/southright, -/obj/structure/alien/weeds{ - icon_state = "weeds1" - }, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"o" = ( -/obj/structure/table/wood, -/obj/item/lipstick/black, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"p" = ( -/obj/structure/sink{ - icon_state = "sink"; - dir = 8; - pixel_x = -12; - pixel_y = 2 - }, -/obj/structure/alien/weeds, -/obj/structure/mirror{ - dir = 8; - pixel_x = -28 - }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/template_noop) -"q" = ( -/obj/structure/toilet{ - dir = 1 - }, -/obj/structure/alien/weeds{ - icon_state = "weeds2" - }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/template_noop) -"r" = ( -/obj/machinery/door/window/eastleft, -/obj/structure/alien/weeds, -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/template_noop) -"s" = ( -/obj/machinery/shower{ - dir = 8 - }, -/obj/structure/alien/weeds{ - icon_state = "weeds1" - }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/template_noop) -"t" = ( -/turf/unsimulated/wall/metal, -/area/template_noop) - -(1,1,1) = {" -a -a -a -a -a -a -a -"} -(2,1,1) = {" -a -b -e -c -l -p -a -"} -(3,1,1) = {" -a -c -c -i -m -q -a -"} -(4,1,1) = {" -a -c -f -j -n -r -a -"} -(5,1,1) = {" -a -c -g -g -m -s -a -"} -(6,1,1) = {" -a -d -h -k -o -t -a -"} -(7,1,1) = {" -a -a -a -a -a -a -a -"} diff --git a/_maps/map_files/templates/spacehotel/n_05.dmm b/_maps/map_files/templates/spacehotel/n_05.dmm deleted file mode 100644 index 456e1ee649a..00000000000 --- a/_maps/map_files/templates/spacehotel/n_05.dmm +++ /dev/null @@ -1,160 +0,0 @@ -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"a" = ( -/turf/template_noop, -/area/template_noop) -"b" = ( -/obj/structure/sign/poster/official/random{ - dir = 8; - pixel_x = -32 - }, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"c" = ( -/turf/unsimulated/floor/carpet, -/area/template_noop) -"d" = ( -/obj/structure/dresser, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"e" = ( -/obj/machinery/light{ - dir = 8 - }, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"f" = ( -/obj/structure/bed, -/obj/item/bedsheet/yellow, -/obj/item/toy/plushie/girly_corgi, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"g" = ( -/obj/structure/bed, -/obj/item/bedsheet/yellow, -/obj/item/toy/plushie/corgi, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"h" = ( -/obj/structure/window/reinforced/polarized{ - id = "room_n" - }, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"i" = ( -/obj/machinery/door/window/southright, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"j" = ( -/obj/item/flashlight/lamp/green, -/obj/structure/table/wood, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"k" = ( -/obj/structure/sink{ - icon_state = "sink"; - dir = 8; - pixel_x = -12; - pixel_y = 2 - }, -/obj/structure/mirror{ - dir = 8; - pixel_x = -28 - }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/template_noop) -"l" = ( -/obj/structure/toilet{ - dir = 1 - }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/template_noop) -"m" = ( -/obj/machinery/door/window/eastleft, -/obj/machinery/button/windowtint{ - id = "room_n"; - pixel_y = -24; - range = 2 - }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/template_noop) -"n" = ( -/obj/machinery/shower{ - dir = 8 - }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/template_noop) -"o" = ( -/turf/unsimulated/wall/metal, -/area/template_noop) - -(1,1,1) = {" -a -a -a -a -a -a -a -"} -(2,1,1) = {" -a -b -e -c -h -k -a -"} -(3,1,1) = {" -a -c -c -c -h -l -a -"} -(4,1,1) = {" -a -c -c -c -i -m -a -"} -(5,1,1) = {" -a -c -c -c -h -n -a -"} -(6,1,1) = {" -a -d -f -g -j -o -a -"} -(7,1,1) = {" -a -a -a -a -a -a -a -"} diff --git a/_maps/map_files/templates/spacehotel/n_06.dmm b/_maps/map_files/templates/spacehotel/n_06.dmm deleted file mode 100644 index 5161e393842..00000000000 --- a/_maps/map_files/templates/spacehotel/n_06.dmm +++ /dev/null @@ -1,176 +0,0 @@ -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"a" = ( -/turf/template_noop, -/area/template_noop) -"b" = ( -/obj/effect/decal/cleanable/blood/gibs/old, -/obj/structure/sign/poster/random{ - dir = 8; - pixel_x = -32 - }, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"c" = ( -/turf/unsimulated/floor/carpet, -/area/template_noop) -"d" = ( -/obj/structure/dresser, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"e" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/effect/decal/cleanable/blood/old, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"f" = ( -/obj/effect/decal/cleanable/blood/old, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"g" = ( -/obj/structure/bed, -/obj/item/bedsheet/red, -/obj/item/toy/figure/cmo, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"h" = ( -/obj/machinery/optable, -/obj/effect/decal/cleanable/blood/old, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"i" = ( -/obj/structure/bed, -/obj/item/bedsheet/red, -/obj/effect/decal/cleanable/blood/gibs/old, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"j" = ( -/obj/effect/decal/cleanable/blood/old, -/obj/effect/decal/cleanable/blood/gibs/old, -/obj/structure/window/reinforced/polarized{ - id = "room_n" - }, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"k" = ( -/obj/effect/decal/cleanable/blood/old, -/obj/structure/window/reinforced/polarized{ - id = "room_n" - }, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"l" = ( -/obj/machinery/door/window/southright, -/obj/effect/decal/cleanable/blood/old, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"m" = ( -/obj/item/flashlight/lamp/green, -/obj/structure/table/wood, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"n" = ( -/obj/structure/sink{ - icon_state = "sink"; - dir = 8; - pixel_x = -12; - pixel_y = 2 - }, -/obj/structure/mirror{ - dir = 8; - pixel_x = -28 - }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/template_noop) -"o" = ( -/obj/structure/toilet{ - dir = 1 - }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/template_noop) -"p" = ( -/obj/machinery/door/window/eastleft, -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/template_noop) -"q" = ( -/obj/machinery/shower{ - dir = 8 - }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/template_noop) -"r" = ( -/turf/unsimulated/wall/metal, -/area/template_noop) - -(1,1,1) = {" -a -a -a -a -a -a -a -"} -(2,1,1) = {" -a -b -e -f -j -n -a -"} -(3,1,1) = {" -a -c -f -h -k -o -a -"} -(4,1,1) = {" -a -c -f -f -l -p -a -"} -(5,1,1) = {" -a -c -c -c -k -q -a -"} -(6,1,1) = {" -a -d -g -i -m -r -a -"} -(7,1,1) = {" -a -a -a -a -a -a -a -"} diff --git a/_maps/map_files/templates/spacehotel/n_07.dmm b/_maps/map_files/templates/spacehotel/n_07.dmm deleted file mode 100644 index 4e0fda46726..00000000000 --- a/_maps/map_files/templates/spacehotel/n_07.dmm +++ /dev/null @@ -1,160 +0,0 @@ -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"a" = ( -/turf/template_noop, -/area/template_noop) -"b" = ( -/obj/structure/sign/poster/random{ - dir = 8; - pixel_x = -32 - }, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"c" = ( -/turf/unsimulated/floor/carpet, -/area/template_noop) -"d" = ( -/obj/structure/dresser, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"e" = ( -/obj/machinery/light{ - dir = 8 - }, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"f" = ( -/obj/structure/bed, -/obj/item/bedsheet, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"g" = ( -/obj/structure/bed, -/obj/item/bedsheet, -/obj/effect/decal/cleanable/blood/old, -/obj/item/toy/carpplushie/dehy_carp, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"h" = ( -/obj/structure/window/reinforced/polarized{ - id = "room_n" - }, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"i" = ( -/obj/machinery/door/window/southright, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"j" = ( -/obj/item/flashlight/lamp/green, -/obj/structure/table/wood, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"k" = ( -/obj/structure/sink{ - icon_state = "sink"; - dir = 8; - pixel_x = -12; - pixel_y = 2 - }, -/obj/structure/mirror{ - dir = 8; - pixel_x = -28 - }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/template_noop) -"l" = ( -/obj/structure/toilet{ - dir = 1 - }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/template_noop) -"m" = ( -/obj/machinery/door/window/eastleft, -/obj/machinery/button/windowtint{ - id = "room_n"; - pixel_y = -24; - range = 2 - }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/template_noop) -"n" = ( -/obj/machinery/shower{ - dir = 8 - }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/template_noop) -"o" = ( -/turf/unsimulated/wall/metal, -/area/template_noop) - -(1,1,1) = {" -a -a -a -a -a -a -a -"} -(2,1,1) = {" -a -b -e -c -h -k -a -"} -(3,1,1) = {" -a -c -c -c -h -l -a -"} -(4,1,1) = {" -a -c -c -c -i -m -a -"} -(5,1,1) = {" -a -c -c -c -h -n -a -"} -(6,1,1) = {" -a -d -f -g -j -o -a -"} -(7,1,1) = {" -a -a -a -a -a -a -a -"} diff --git a/_maps/map_files/templates/spacehotel/n_08.dmm b/_maps/map_files/templates/spacehotel/n_08.dmm deleted file mode 100644 index 2854825eb4d..00000000000 --- a/_maps/map_files/templates/spacehotel/n_08.dmm +++ /dev/null @@ -1,173 +0,0 @@ -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"a" = ( -/turf/template_noop, -/area/template_noop) -"b" = ( -/obj/structure/sign/poster/official/random{ - dir = 8; - pixel_x = -32 - }, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"c" = ( -/obj/structure/sign/poster/random{ - dir = 1; - pixel_y = 32 - }, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"d" = ( -/turf/unsimulated/floor/carpet, -/area/template_noop) -"e" = ( -/obj/structure/dresser, -/obj/item/poster/random_contraband, -/obj/item/poster/random_contraband, -/obj/item/poster/random_contraband, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"f" = ( -/obj/machinery/light{ - dir = 8 - }, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"g" = ( -/obj/structure/bed, -/obj/item/bedsheet/blue, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"h" = ( -/obj/structure/window/reinforced/polarized{ - id = "room_n" - }, -/obj/structure/sign/poster/random{ - dir = 8; - pixel_x = -32 - }, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"i" = ( -/obj/structure/window/reinforced/polarized{ - id = "room_n" - }, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"j" = ( -/obj/machinery/door/window/southright, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"k" = ( -/obj/item/flashlight/lamp/green, -/obj/structure/table/wood, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"l" = ( -/obj/structure/sink{ - icon_state = "sink"; - dir = 8; - pixel_x = -12; - pixel_y = 2 - }, -/obj/structure/mirror{ - dir = 8; - pixel_x = -28 - }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/template_noop) -"m" = ( -/obj/structure/toilet{ - dir = 1 - }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/template_noop) -"n" = ( -/obj/machinery/door/window/eastleft, -/obj/machinery/button/windowtint{ - id = "room_n"; - pixel_y = -24; - range = 2 - }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/template_noop) -"o" = ( -/obj/machinery/shower{ - dir = 8 - }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/template_noop) -"p" = ( -/turf/unsimulated/wall/metal, -/area/template_noop) - -(1,1,1) = {" -a -a -a -a -a -a -a -"} -(2,1,1) = {" -a -b -f -d -h -l -a -"} -(3,1,1) = {" -a -c -d -d -i -m -a -"} -(4,1,1) = {" -a -d -d -d -j -n -a -"} -(5,1,1) = {" -a -c -d -d -i -o -a -"} -(6,1,1) = {" -a -e -g -g -k -p -a -"} -(7,1,1) = {" -a -a -a -a -a -a -a -"} diff --git a/_maps/map_files/templates/spacehotel/n_09.dmm b/_maps/map_files/templates/spacehotel/n_09.dmm deleted file mode 100644 index f2f66e6bb3f..00000000000 --- a/_maps/map_files/templates/spacehotel/n_09.dmm +++ /dev/null @@ -1,161 +0,0 @@ -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"a" = ( -/turf/template_noop, -/area/template_noop) -"b" = ( -/obj/structure/sign/poster/official/random{ - dir = 8; - pixel_x = -32 - }, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"c" = ( -/turf/unsimulated/floor/carpet, -/area/template_noop) -"d" = ( -/obj/structure/dresser, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"e" = ( -/obj/machinery/light{ - dir = 8 - }, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"f" = ( -/obj/structure/bed, -/obj/item/bedsheet/brown, -/obj/item/toy/eight_ball, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"g" = ( -/obj/structure/bed, -/obj/item/bedsheet/brown, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"h" = ( -/obj/structure/window/reinforced/polarized{ - id = "room_n" - }, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"i" = ( -/obj/machinery/door/window/southright, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"j" = ( -/obj/item/flashlight/lamp/green, -/obj/structure/table/wood, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"k" = ( -/obj/structure/sink{ - icon_state = "sink"; - dir = 8; - pixel_x = -12; - pixel_y = 2 - }, -/obj/structure/mirror{ - dir = 8; - pixel_x = -28 - }, -/obj/effect/decal/cleanable/vomit, -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/template_noop) -"l" = ( -/obj/structure/toilet{ - dir = 1 - }, -/obj/effect/decal/cleanable/vomit, -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/template_noop) -"m" = ( -/obj/machinery/door/window/eastleft, -/obj/machinery/button/windowtint{ - id = "room_n"; - pixel_y = -24; - range = 2 - }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/template_noop) -"n" = ( -/obj/machinery/shower{ - dir = 8 - }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/template_noop) -"o" = ( -/turf/unsimulated/wall/metal, -/area/template_noop) - -(1,1,1) = {" -a -a -a -a -a -a -a -"} -(2,1,1) = {" -a -b -e -c -h -k -a -"} -(3,1,1) = {" -a -c -c -c -h -l -a -"} -(4,1,1) = {" -a -c -c -c -i -m -a -"} -(5,1,1) = {" -a -c -c -c -h -n -a -"} -(6,1,1) = {" -a -d -f -g -j -o -a -"} -(7,1,1) = {" -a -a -a -a -a -a -a -"} diff --git a/_maps/map_files/templates/spacehotel/n_10.dmm b/_maps/map_files/templates/spacehotel/n_10.dmm deleted file mode 100644 index 29b6c651495..00000000000 --- a/_maps/map_files/templates/spacehotel/n_10.dmm +++ /dev/null @@ -1,149 +0,0 @@ -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"a" = ( -/turf/template_noop, -/area/template_noop) -"b" = ( -/obj/structure/sign/poster/official/random{ - dir = 8; - pixel_x = -32 - }, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"c" = ( -/turf/unsimulated/floor/carpet, -/area/template_noop) -"d" = ( -/obj/structure/dresser, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"e" = ( -/obj/machinery/light{ - dir = 8 - }, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"f" = ( -/obj/structure/bed, -/obj/item/bedsheet, -/obj/item/toy/plushie/deer, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"g" = ( -/obj/effect/decal/snow/sand/edge, -/obj/effect/view_portal{ - id = "snowland_room" - }, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"h" = ( -/obj/structure/bed, -/obj/item/bedsheet, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"i" = ( -/turf/unsimulated/wall/fakeglass{ - dir = 8; - icon_state = "fakewindows"; - opacity = 1 - }, -/area/template_noop) -"j" = ( -/turf/unsimulated/wall/fakeglass{ - dir = 4; - icon_state = "fakewindows"; - opacity = 0 - }, -/area/template_noop) -"k" = ( -/obj/effect/view_portal/visual{ - dist = 6; - frustrum = 1; - id = "snowland"; - radius = 2 - }, -/turf/unsimulated/floor, -/area/template_noop) -"l" = ( -/turf/unsimulated/wall/fakeglass{ - dir = 8; - icon_state = "fakewindows"; - opacity = 0 - }, -/area/template_noop) -"m" = ( -/turf/unsimulated/wall/fakeglass{ - dir = 4; - icon_state = "fakewindows"; - opacity = 1 - }, -/area/template_noop) -"n" = ( -/turf/unsimulated/wall{ - dynamic_lighting = 0; - icon = null - }, -/area/template_noop) - -(1,1,1) = {" -a -a -a -a -a -a -a -"} -(2,1,1) = {" -a -b -e -c -i -n -a -"} -(3,1,1) = {" -a -c -c -c -j -n -a -"} -(4,1,1) = {" -a -c -c -g -k -n -a -"} -(5,1,1) = {" -a -c -c -c -l -n -a -"} -(6,1,1) = {" -a -d -f -h -m -n -a -"} -(7,1,1) = {" -a -a -a -a -a -a -a -"} diff --git a/_maps/map_files/templates/spacehotel/n_11.dmm b/_maps/map_files/templates/spacehotel/n_11.dmm deleted file mode 100644 index f528a566567..00000000000 --- a/_maps/map_files/templates/spacehotel/n_11.dmm +++ /dev/null @@ -1,172 +0,0 @@ -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"a" = ( -/turf/template_noop, -/area/template_noop) -"b" = ( -/obj/structure/sign/poster/random{ - dir = 8; - pixel_x = -32 - }, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"c" = ( -/turf/unsimulated/floor/carpet, -/area/template_noop) -"d" = ( -/obj/structure/dresser, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"e" = ( -/obj/machinery/light{ - dir = 8 - }, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"f" = ( -/obj/structure/bed, -/obj/item/bedsheet/syndie, -/obj/item/twohanded/toy/chainsaw, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"g" = ( -/obj/structure/bed, -/obj/item/bedsheet/syndie, -/obj/item/toy/figure/syndie{ - pixel_x = 8 - }, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"h" = ( -/obj/structure/window/reinforced/polarized{ - id = "room_n" - }, -/obj/structure/sign/poster/random{ - dir = 8; - pixel_x = -32 - }, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"i" = ( -/obj/structure/window/reinforced/polarized{ - id = "room_n" - }, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"j" = ( -/obj/machinery/door/window/southright, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"k" = ( -/obj/item/flashlight/lamp/green, -/obj/structure/table/wood, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"l" = ( -/obj/structure/sink{ - icon_state = "sink"; - dir = 8; - pixel_x = -12; - pixel_y = 2 - }, -/obj/structure/mirror{ - dir = 8; - pixel_x = -28 - }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/template_noop) -"m" = ( -/obj/structure/toilet{ - dir = 1 - }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/template_noop) -"n" = ( -/obj/machinery/door/window/eastleft, -/obj/machinery/button/windowtint{ - id = "room_n"; - pixel_y = -24; - range = 2 - }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/template_noop) -"o" = ( -/obj/machinery/shower{ - dir = 8 - }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/template_noop) -"p" = ( -/turf/unsimulated/wall/metal, -/area/template_noop) - -(1,1,1) = {" -a -a -a -a -a -a -a -"} -(2,1,1) = {" -a -b -e -c -h -l -a -"} -(3,1,1) = {" -a -c -c -c -i -m -a -"} -(4,1,1) = {" -a -c -c -c -j -n -a -"} -(5,1,1) = {" -a -c -c -c -i -o -a -"} -(6,1,1) = {" -a -d -f -g -k -p -a -"} -(7,1,1) = {" -a -a -a -a -a -a -a -"} diff --git a/_maps/map_files/templates/spacehotel/n_12.dmm b/_maps/map_files/templates/spacehotel/n_12.dmm deleted file mode 100644 index 48fa090888f..00000000000 --- a/_maps/map_files/templates/spacehotel/n_12.dmm +++ /dev/null @@ -1,173 +0,0 @@ -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"a" = ( -/turf/template_noop, -/area/template_noop) -"b" = ( -/obj/structure/sign/poster/official/random{ - dir = 8; - pixel_x = -32 - }, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"c" = ( -/turf/unsimulated/floor/carpet, -/area/template_noop) -"d" = ( -/obj/structure/dresser, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"e" = ( -/obj/machinery/light{ - dir = 8 - }, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"f" = ( -/obj/structure/bed, -/obj/item/bedsheet/blue, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"g" = ( -/obj/structure/window/reinforced/polarized{ - id = "room_n" - }, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"h" = ( -/obj/structure/window/reinforced/polarized{ - id = "room_n" - }, -/obj/item/bikehorn/rubberducky, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"i" = ( -/obj/machinery/door/window/southright, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"j" = ( -/obj/item/flashlight/lamp/green, -/obj/structure/table/wood, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"k" = ( -/obj/structure/sink{ - icon_state = "sink"; - dir = 8; - pixel_x = -12; - pixel_y = 2 - }, -/obj/structure/mirror{ - dir = 8; - pixel_x = -28 - }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/template_noop) -"l" = ( -/obj/structure/toilet{ - dir = 1 - }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/template_noop) -"m" = ( -/obj/machinery/door/window/eastleft, -/obj/machinery/button/windowtint{ - id = "room_n"; - pixel_y = -24; - range = 2 - }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/template_noop) -"n" = ( -/obj/machinery/shower{ - dir = 8 - }, -/obj/structure/curtain/open/shower{ - anchored = 1; - opacity = 1 - }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor"; - opacity = 1 - }, -/area/template_noop) -"o" = ( -/turf/unsimulated/wall/metal, -/area/template_noop) -"p" = ( -/obj/effect/view_portal/visual{ - dist = 0; - id = "poolland"; - radius = 0 - }, -/turf/template_noop, -/area/template_noop) - -(1,1,1) = {" -a -a -a -a -a -a -a -"} -(2,1,1) = {" -a -b -e -g -k -o -a -"} -(3,1,1) = {" -a -c -c -h -l -o -a -"} -(4,1,1) = {" -a -c -c -i -m -o -a -"} -(5,1,1) = {" -a -c -c -g -n -p -a -"} -(6,1,1) = {" -a -d -f -j -o -o -a -"} -(7,1,1) = {" -a -a -a -a -a -a -a -"} diff --git a/_maps/map_files/templates/spacehotel/n_13.dmm b/_maps/map_files/templates/spacehotel/n_13.dmm deleted file mode 100644 index 2f068cecb49..00000000000 --- a/_maps/map_files/templates/spacehotel/n_13.dmm +++ /dev/null @@ -1,216 +0,0 @@ -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"a" = ( -/turf/template_noop, -/area/template_noop) -"b" = ( -/obj/structure/sign/poster/official/random{ - dir = 8; - pixel_x = -32 - }, -/obj/structure/sign/poster/official/random{ - dir = 1; - pixel_y = 32 - }, -/obj/random/plushie, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"c" = ( -/obj/structure/sign/poster/official/random{ - dir = 1; - pixel_y = 32 - }, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"d" = ( -/turf/unsimulated/floor/carpet, -/area/template_noop) -"e" = ( -/obj/structure/sign/poster/official/random{ - dir = 1; - pixel_y = 32 - }, -/obj/random/plushie, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"f" = ( -/obj/structure/dresser, -/obj/structure/sign/poster/official/random{ - dir = 1; - pixel_y = 32 - }, -/obj/structure/sign/poster/official/random{ - dir = 4; - pixel_x = 32 - }, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"g" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/random/plushie, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"h" = ( -/obj/structure/bed, -/obj/structure/sign/poster/official/random{ - dir = 4; - pixel_x = 32 - }, -/obj/item/bedsheet/rainbow, -/obj/random/plushie, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"i" = ( -/obj/random/plushie, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"j" = ( -/obj/structure/window/reinforced/polarized{ - id = "room_n" - }, -/obj/structure/sign/poster/official/random{ - dir = 8; - pixel_x = -32 - }, -/obj/random/plushie, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"k" = ( -/obj/structure/window/reinforced/polarized{ - id = "room_n" - }, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"l" = ( -/obj/machinery/door/window/southright, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"m" = ( -/obj/structure/window/reinforced/polarized{ - id = "room_n" - }, -/obj/random/plushie, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"n" = ( -/obj/item/flashlight/lamp/green, -/obj/structure/table/wood, -/obj/structure/sign/poster/official/random{ - dir = 4; - pixel_x = 32 - }, -/obj/structure/sign/poster/official/random{ - pixel_y = -32 - }, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"o" = ( -/obj/structure/sink{ - icon_state = "sink"; - dir = 8; - pixel_x = -12; - pixel_y = 2 - }, -/obj/structure/mirror{ - dir = 8; - pixel_x = -28 - }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/template_noop) -"p" = ( -/obj/structure/toilet{ - dir = 1 - }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/template_noop) -"q" = ( -/obj/machinery/door/window/eastleft, -/obj/machinery/button/windowtint{ - id = "room_n"; - pixel_y = -24; - range = 2 - }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/template_noop) -"r" = ( -/obj/machinery/shower{ - dir = 8 - }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/template_noop) -"s" = ( -/turf/unsimulated/wall/metal, -/area/template_noop) - -(1,1,1) = {" -a -a -a -a -a -a -a -"} -(2,1,1) = {" -a -b -g -i -j -o -a -"} -(3,1,1) = {" -a -c -d -d -k -p -a -"} -(4,1,1) = {" -a -d -d -d -l -q -a -"} -(5,1,1) = {" -a -e -d -d -m -r -a -"} -(6,1,1) = {" -a -f -h -h -n -s -a -"} -(7,1,1) = {" -a -a -a -a -a -a -a -"} diff --git a/_maps/map_files/templates/spacehotel/n_14.dmm b/_maps/map_files/templates/spacehotel/n_14.dmm deleted file mode 100644 index 4330c6de554..00000000000 --- a/_maps/map_files/templates/spacehotel/n_14.dmm +++ /dev/null @@ -1,161 +0,0 @@ -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"a" = ( -/turf/template_noop, -/area/template_noop) -"b" = ( -/obj/structure/sign/poster/official/random{ - dir = 8; - pixel_x = -32 - }, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"c" = ( -/turf/unsimulated/floor/carpet, -/area/template_noop) -"d" = ( -/obj/structure/dresser, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"e" = ( -/obj/machinery/light{ - dir = 8 - }, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"f" = ( -/obj/structure/bed, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"g" = ( -/obj/structure/mopbucket, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"h" = ( -/obj/structure/bed, -/obj/item/bedsheet/qm, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"i" = ( -/obj/structure/window/reinforced/polarized{ - id = "room_n" - }, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"j" = ( -/obj/machinery/door/window/southright, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"k" = ( -/obj/item/flashlight/lamp/green, -/obj/structure/table/wood, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"l" = ( -/obj/structure/sink{ - icon_state = "sink"; - dir = 8; - pixel_x = -12; - pixel_y = 2 - }, -/obj/structure/mirror{ - dir = 8; - pixel_x = -28 - }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/template_noop) -"m" = ( -/obj/structure/toilet{ - dir = 1 - }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/template_noop) -"n" = ( -/obj/machinery/door/window/eastleft, -/obj/machinery/button/windowtint{ - id = "room_n"; - pixel_y = -24; - range = 2 - }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/template_noop) -"o" = ( -/obj/machinery/shower{ - dir = 8 - }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/template_noop) -"p" = ( -/turf/unsimulated/wall/metal, -/area/template_noop) - -(1,1,1) = {" -a -a -a -a -a -a -a -"} -(2,1,1) = {" -a -b -e -g -i -l -a -"} -(3,1,1) = {" -a -c -c -c -i -m -a -"} -(4,1,1) = {" -a -c -c -c -j -n -a -"} -(5,1,1) = {" -a -c -c -c -i -o -a -"} -(6,1,1) = {" -a -d -f -h -k -p -a -"} -(7,1,1) = {" -a -a -a -a -a -a -a -"} diff --git a/_maps/map_files/templates/spacehotel/n_15.dmm b/_maps/map_files/templates/spacehotel/n_15.dmm deleted file mode 100644 index b4665f50955..00000000000 --- a/_maps/map_files/templates/spacehotel/n_15.dmm +++ /dev/null @@ -1,153 +0,0 @@ -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"a" = ( -/turf/template_noop, -/area/template_noop) -"b" = ( -/turf/unsimulated/floor{ - icon_state = "engine" - }, -/area/template_noop) -"c" = ( -/obj/machinery/light{ - dir = 8 - }, -/turf/unsimulated/floor{ - icon_state = "engine" - }, -/area/template_noop) -"d" = ( -/obj/machinery/power/compressor{ - dir = 1 - }, -/obj/effect/decal/warning_stripes/eastnorthwest, -/turf/unsimulated/floor{ - icon_state = "engine" - }, -/area/template_noop) -"e" = ( -/obj/machinery/light{ - dir = 4; - icon_state = "tube1" - }, -/turf/unsimulated/floor{ - icon_state = "engine" - }, -/area/template_noop) -"f" = ( -/obj/machinery/power/turbine, -/obj/effect/decal/warning_stripes/east, -/obj/effect/decal/warning_stripes/west, -/turf/unsimulated/floor{ - icon_state = "engine" - }, -/area/template_noop) -"g" = ( -/turf/unsimulated/wall/fakeglass{ - dir = 8; - icon_state = "fakewindows"; - opacity = 1 - }, -/area/template_noop) -"h" = ( -/turf/unsimulated/wall/fakeglass{ - icon_state = "fakewindows"; - dir = 4 - }, -/area/template_noop) -"i" = ( -/obj/machinery/door/poddoor{ - opacity = 0 - }, -/turf/space, -/area/template_noop) -"j" = ( -/turf/unsimulated/wall/fakeglass{ - icon_state = "fakewindows"; - dir = 8 - }, -/area/template_noop) -"k" = ( -/turf/unsimulated/wall/fakeglass{ - dir = 4; - icon_state = "fakewindows"; - opacity = 1 - }, -/area/template_noop) -"l" = ( -/turf/unsimulated/wall{ - dynamic_lighting = 0; - icon = null - }, -/area/template_noop) -"m" = ( -/obj/effect/view_portal/visual{ - dist = 5; - frustrum = 1; - id = "turbinespace" - }, -/turf/unsimulated/floor, -/area/template_noop) - -(1,1,1) = {" -a -a -a -a -a -a -a -"} -(2,1,1) = {" -a -b -c -b -g -l -a -"} -(3,1,1) = {" -a -b -b -b -h -l -a -"} -(4,1,1) = {" -a -b -d -f -i -m -a -"} -(5,1,1) = {" -a -b -b -b -j -l -a -"} -(6,1,1) = {" -a -b -e -b -k -l -a -"} -(7,1,1) = {" -a -a -a -a -a -a -a -"} diff --git a/_maps/map_files/templates/spacehotel/n_16.dmm b/_maps/map_files/templates/spacehotel/n_16.dmm deleted file mode 100644 index c659d1c5a56..00000000000 --- a/_maps/map_files/templates/spacehotel/n_16.dmm +++ /dev/null @@ -1,177 +0,0 @@ -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"a" = ( -/turf/template_noop, -/area/template_noop) -"b" = ( -/turf/unsimulated/wall{ - icon_state = "sandstone2" - }, -/area/template_noop) -"c" = ( -/obj/structure/chair/stool, -/obj/structure/mirror{ - dir = 8; - pixel_x = -28 - }, -/obj/machinery/light/small{ - dir = 1 - }, -/turf/unsimulated/floor{ - icon_state = "wood" - }, -/area/template_noop) -"d" = ( -/turf/unsimulated/floor{ - icon_state = "wood" - }, -/area/template_noop) -"e" = ( -/obj/structure/chair/stool, -/obj/structure/mirror{ - dir = 4; - pixel_x = 28 - }, -/obj/machinery/light/small{ - dir = 1 - }, -/turf/unsimulated/floor{ - icon_state = "wood" - }, -/area/template_noop) -"f" = ( -/turf/unsimulated/wall{ - icon_state = "sandstone3" - }, -/area/template_noop) -"g" = ( -/obj/structure/chair/stool, -/obj/structure/mirror{ - dir = 8; - pixel_x = -28 - }, -/obj/machinery/light/small, -/turf/unsimulated/floor{ - icon_state = "wood" - }, -/area/template_noop) -"h" = ( -/obj/structure/chair/stool, -/obj/structure/mirror{ - dir = 4; - pixel_x = 28 - }, -/obj/machinery/light/small, -/turf/unsimulated/floor{ - icon_state = "wood" - }, -/area/template_noop) -"i" = ( -/turf/unsimulated/wall{ - icon_state = "sandstone5" - }, -/area/template_noop) -"j" = ( -/turf/unsimulated/wall{ - icon_state = "sandstone8" - }, -/area/template_noop) -"k" = ( -/obj/effect/view_portal{ - id = "beach_room" - }, -/obj/structure/curtain/open, -/turf/unsimulated/floor{ - icon_state = "wood" - }, -/area/template_noop) -"l" = ( -/turf/unsimulated/wall{ - icon_state = "sandstone4" - }, -/area/template_noop) -"m" = ( -/turf/unsimulated/wall{ - icon_state = "sandstone9" - }, -/area/template_noop) -"n" = ( -/turf/unsimulated/wall{ - dynamic_lighting = 0; - icon = null - }, -/area/template_noop) -"o" = ( -/obj/effect/view_portal/visual{ - dist = 6; - frustrum = 1; - id = "beach"; - radius = 1 - }, -/turf/unsimulated/floor{ - icon_state = "wood" - }, -/area/template_noop) - -(1,1,1) = {" -a -a -a -a -a -a -a -"} -(2,1,1) = {" -a -b -f -i -n -n -a -"} -(3,1,1) = {" -a -c -g -j -n -n -a -"} -(4,1,1) = {" -a -d -d -k -o -n -a -"} -(5,1,1) = {" -a -e -h -l -n -n -a -"} -(6,1,1) = {" -a -b -f -m -n -n -a -"} -(7,1,1) = {" -a -a -a -a -a -a -a -"} diff --git a/_maps/map_files/templates/spacehotel/n_17.dmm b/_maps/map_files/templates/spacehotel/n_17.dmm deleted file mode 100644 index 1361f6eb6bd..00000000000 --- a/_maps/map_files/templates/spacehotel/n_17.dmm +++ /dev/null @@ -1,187 +0,0 @@ -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"a" = ( -/turf/template_noop, -/area/template_noop) -"b" = ( -/obj/structure/sign/poster/official/random{ - dir = 8; - pixel_x = -32 - }, -/obj/item/pizzabox/margherita, -/obj/item/pizzabox/margherita{ - pixel_y = 4 - }, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"c" = ( -/turf/unsimulated/floor/carpet, -/area/template_noop) -"d" = ( -/obj/structure/dresser, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"e" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/item/pizzabox/vegetable, -/obj/item/pizzabox/vegetable{ - pixel_y = 4 - }, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"f" = ( -/obj/structure/bed, -/obj/item/bedsheet/brown, -/obj/item/toy/prize/ripley{ - pixel_x = 4 - }, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"g" = ( -/obj/item/pizzabox/mushroom, -/obj/item/pizzabox/mushroom{ - pixel_y = 4 - }, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"h" = ( -/obj/structure/bed, -/obj/item/bedsheet/brown, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"i" = ( -/obj/structure/window/reinforced/polarized{ - id = "room_n" - }, -/obj/item/pizzabox/meat, -/obj/item/pizzabox/meat{ - pixel_y = 4 - }, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"j" = ( -/obj/structure/window/reinforced/polarized{ - id = "room_n" - }, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"k" = ( -/obj/machinery/door/window/southright, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"l" = ( -/obj/item/flashlight/lamp/green, -/obj/structure/table/wood, -/obj/item/toy/katana, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"m" = ( -/obj/structure/sink{ - icon_state = "sink"; - dir = 8; - pixel_x = -12; - pixel_y = 2 - }, -/obj/structure/mirror{ - dir = 8; - pixel_x = -28 - }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/template_noop) -"n" = ( -/obj/structure/toilet{ - dir = 1 - }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/template_noop) -"o" = ( -/obj/machinery/door/window/eastleft, -/obj/machinery/button/windowtint{ - id = "room_n"; - pixel_y = -24; - range = 2 - }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/template_noop) -"p" = ( -/obj/machinery/shower{ - dir = 8 - }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/template_noop) -"q" = ( -/turf/unsimulated/wall/metal, -/area/template_noop) - -(1,1,1) = {" -a -a -a -a -a -a -a -"} -(2,1,1) = {" -a -b -e -g -i -m -a -"} -(3,1,1) = {" -a -c -c -c -j -n -a -"} -(4,1,1) = {" -a -c -c -c -k -o -a -"} -(5,1,1) = {" -a -c -c -c -j -p -a -"} -(6,1,1) = {" -a -d -f -h -l -q -a -"} -(7,1,1) = {" -a -a -a -a -a -a -a -"} diff --git a/_maps/map_files/templates/spacehotel/n_18.dmm b/_maps/map_files/templates/spacehotel/n_18.dmm deleted file mode 100644 index 7186fc719b9..00000000000 --- a/_maps/map_files/templates/spacehotel/n_18.dmm +++ /dev/null @@ -1,155 +0,0 @@ -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"a" = ( -/turf/template_noop, -/area/template_noop) -"b" = ( -/obj/structure/sign/poster/official/random{ - dir = 8; - pixel_x = -32 - }, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"c" = ( -/turf/unsimulated/floor/carpet, -/area/template_noop) -"d" = ( -/obj/structure/dresser, -/obj/item/lipstick/purple, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"e" = ( -/obj/machinery/light{ - dir = 8 - }, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"f" = ( -/obj/structure/bed, -/obj/item/bedsheet/purple, -/obj/item/toy/plushie/purple_fox, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"g" = ( -/obj/structure/window/reinforced/polarized{ - id = "room_n" - }, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"h" = ( -/obj/machinery/door/window/southright, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"i" = ( -/obj/item/flashlight/lamp/green, -/obj/structure/table/wood, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"j" = ( -/obj/structure/sink{ - icon_state = "sink"; - dir = 8; - pixel_x = -12; - pixel_y = 2 - }, -/obj/structure/mirror{ - dir = 8; - pixel_x = -28 - }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/template_noop) -"k" = ( -/obj/structure/toilet{ - dir = 1 - }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/template_noop) -"l" = ( -/obj/machinery/door/window/eastleft, -/obj/machinery/button/windowtint{ - id = "room_n"; - pixel_y = -24; - range = 2 - }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/template_noop) -"m" = ( -/obj/machinery/shower{ - dir = 8 - }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/template_noop) -"n" = ( -/turf/unsimulated/wall/metal, -/area/template_noop) - -(1,1,1) = {" -a -a -a -a -a -a -a -"} -(2,1,1) = {" -a -b -e -c -g -j -a -"} -(3,1,1) = {" -a -c -c -c -g -k -a -"} -(4,1,1) = {" -a -c -c -c -h -l -a -"} -(5,1,1) = {" -a -c -c -c -g -m -a -"} -(6,1,1) = {" -a -d -f -f -i -n -a -"} -(7,1,1) = {" -a -a -a -a -a -a -a -"} diff --git a/_maps/map_files/templates/spacehotel/n_19.dmm b/_maps/map_files/templates/spacehotel/n_19.dmm deleted file mode 100644 index 81a6e5a3d78..00000000000 --- a/_maps/map_files/templates/spacehotel/n_19.dmm +++ /dev/null @@ -1,99 +0,0 @@ -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"a" = ( -/turf/template_noop, -/area/template_noop) -"b" = ( -/turf/unsimulated/wall/metal, -/area/template_noop) -"c" = ( -/obj/effect/view_portal{ - id = "mazeland_room" - }, -/obj/machinery/light{ - dir = 8 - }, -/turf/unsimulated/floor{ - icon_state = "floor" - }, -/area/template_noop) -"d" = ( -/obj/effect/view_portal/visual{ - dist = 2; - frustrum = 0; - id = "mazeland"; - radius = 1 - }, -/turf/unsimulated/floor{ - icon_state = "floor" - }, -/area/template_noop) -"e" = ( -/turf/unsimulated/wall{ - dynamic_lighting = 0; - icon = null - }, -/area/template_noop) - -(1,1,1) = {" -a -a -a -a -a -a -a -"} -(2,1,1) = {" -a -b -b -b -b -b -a -"} -(3,1,1) = {" -a -b -b -e -e -b -a -"} -(4,1,1) = {" -a -c -d -e -e -b -a -"} -(5,1,1) = {" -a -b -b -e -e -b -a -"} -(6,1,1) = {" -a -b -b -b -b -b -a -"} -(7,1,1) = {" -a -a -a -a -a -a -a -"} diff --git a/_maps/map_files/templates/spacehotel/s_01.dmm b/_maps/map_files/templates/spacehotel/s_01.dmm deleted file mode 100644 index 8362c0f21cc..00000000000 --- a/_maps/map_files/templates/spacehotel/s_01.dmm +++ /dev/null @@ -1,247 +0,0 @@ -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"a" = ( -/turf/template_noop, -/area/template_noop) -"b" = ( -/turf/unsimulated/beach/water, -/area/template_noop) -"c" = ( -/obj/machinery/shower{ - pixel_y = 24 - }, -/obj/structure/window/reinforced/polarized{ - dir = 4; - id = "room_s" - }, -/turf/unsimulated/floor{ - dir = 8; - icon_state = "whiteblue" - }, -/area/template_noop) -"d" = ( -/turf/unsimulated/floor/carpet, -/area/template_noop) -"e" = ( -/obj/structure/rack, -/obj/item/clothing/suit/apron, -/obj/item/clothing/suit/storage/hazardvest, -/obj/item/clothing/suit/holidaypriest, -/obj/item/clothing/suit/judgerobe, -/obj/item/clothing/suit/storage/labcoat, -/obj/item/clothing/suit/hooded/nun, -/obj/item/clothing/suit/straight_jacket, -/obj/item/clothing/suit/wizrobe/fake, -/obj/item/clothing/suit/wizrobe/marisa/fake, -/obj/effect/decal/cleanable/greenglow, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"f" = ( -/obj/structure/rack, -/obj/item/clothing/head/collectable/police, -/obj/item/clothing/head/hooded/nun_hood, -/obj/item/clothing/head/mailman, -/obj/item/clothing/head/nursehat, -/obj/item/clothing/head/wizard/fake, -/obj/item/clothing/head/powdered_wig, -/obj/item/clothing/head/wizard/marisa/fake, -/obj/item/clothing/mask/gas/clown_hat/sexy, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"g" = ( -/obj/structure/rack, -/obj/item/clothing/gloves/color/latex, -/obj/item/clothing/gloves/color/latex, -/obj/item/clothing/head/kitty, -/obj/item/clothing/head/rabbitears, -/obj/item/clothing/mask/muzzle, -/obj/item/clothing/accessory/stethoscope, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"h" = ( -/obj/structure/dresser, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"i" = ( -/obj/structure/table/wood, -/obj/item/flashlight/lamp/green, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"j" = ( -/obj/structure/window/reinforced/polarized{ - dir = 4; - id = "room_s" - }, -/turf/unsimulated/floor{ - dir = 8; - icon_state = "whiteblue" - }, -/area/template_noop) -"k" = ( -/obj/structure/bed, -/obj/item/bedsheet/captain, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"l" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/item/soap/deluxe, -/obj/machinery/button/windowtint{ - id = "room_s"; - pixel_x = -24; - pixel_y = 0; - range = 5 - }, -/turf/unsimulated/floor{ - dir = 1; - icon_state = "whiteblue" - }, -/area/template_noop) -"m" = ( -/turf/unsimulated/floor{ - dir = 1; - icon_state = "whiteblue" - }, -/area/template_noop) -"n" = ( -/obj/structure/window/reinforced/polarized{ - dir = 4; - id = "room_s" - }, -/turf/unsimulated/floor{ - dir = 1; - icon_state = "whitebluecorner" - }, -/area/template_noop) -"o" = ( -/obj/structure/sink{ - icon_state = "sink"; - dir = 8; - pixel_x = -12; - pixel_y = 2 - }, -/obj/structure/mirror{ - pixel_x = -28 - }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/template_noop) -"p" = ( -/obj/structure/toilet{ - dir = 1 - }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/template_noop) -"q" = ( -/obj/machinery/door/window/eastleft, -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/template_noop) -"K" = ( -/obj/machinery/poolcontroller/invisible, -/turf/unsimulated/beach/water, -/area/template_noop) - -(1,1,1) = {" -a -a -a -a -a -a -a -"} -(2,1,1) = {" -a -K -b -l -o -a -a -"} -(3,1,1) = {" -a -b -b -m -p -a -a -"} -(4,1,1) = {" -a -c -j -n -q -a -a -"} -(5,1,1) = {" -a -d -d -d -d -a -a -"} -(6,1,1) = {" -a -e -d -d -d -a -a -"} -(7,1,1) = {" -a -f -d -d -d -a -a -"} -(8,1,1) = {" -a -g -d -d -d -a -a -"} -(9,1,1) = {" -a -h -d -d -d -a -a -"} -(10,1,1) = {" -a -i -k -k -d -a -a -"} -(11,1,1) = {" -a -a -a -a -a -a -a -"} diff --git a/_maps/map_files/templates/spacehotel/s_02.dmm b/_maps/map_files/templates/spacehotel/s_02.dmm deleted file mode 100644 index 6834bc8d7e8..00000000000 --- a/_maps/map_files/templates/spacehotel/s_02.dmm +++ /dev/null @@ -1,248 +0,0 @@ -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"a" = ( -/turf/template_noop, -/area/template_noop) -"b" = ( -/turf/unsimulated/beach/water, -/area/template_noop) -"c" = ( -/obj/machinery/shower{ - pixel_y = 24 - }, -/obj/structure/window/reinforced/polarized{ - dir = 4; - id = "room_s" - }, -/turf/unsimulated/floor{ - dir = 8; - icon_state = "whiteblue" - }, -/area/template_noop) -"d" = ( -/turf/unsimulated/floor/carpet, -/area/template_noop) -"e" = ( -/obj/structure/rack, -/obj/item/clothing/suit/apron, -/obj/item/clothing/suit/storage/hazardvest, -/obj/item/clothing/suit/holidaypriest, -/obj/item/clothing/suit/judgerobe, -/obj/item/clothing/suit/storage/labcoat, -/obj/item/clothing/suit/hooded/nun, -/obj/item/clothing/suit/straight_jacket, -/obj/item/clothing/suit/wizrobe/fake, -/obj/item/clothing/suit/xenos, -/obj/item/clothing/suit/wizrobe/marisa/fake, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"f" = ( -/obj/structure/rack, -/obj/item/clothing/head/collectable/police, -/obj/item/clothing/head/hooded/nun_hood, -/obj/item/clothing/head/mailman, -/obj/item/clothing/head/nursehat, -/obj/item/clothing/head/wizard/fake, -/obj/item/clothing/head/powdered_wig, -/obj/item/clothing/head/xenos, -/obj/item/clothing/head/wizard/marisa/fake, -/obj/item/clothing/mask/gas/clown_hat/sexy, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"g" = ( -/obj/structure/rack, -/obj/item/clothing/gloves/color/latex, -/obj/item/clothing/gloves/color/latex, -/obj/item/clothing/head/kitty, -/obj/item/clothing/head/rabbitears, -/obj/item/clothing/mask/muzzle, -/obj/item/clothing/accessory/stethoscope, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"h" = ( -/obj/structure/dresser, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"i" = ( -/obj/structure/table/wood, -/obj/item/flashlight/lamp/green, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"j" = ( -/obj/structure/window/reinforced/polarized{ - dir = 4; - id = "room_s" - }, -/turf/unsimulated/floor{ - dir = 8; - icon_state = "whiteblue" - }, -/area/template_noop) -"k" = ( -/obj/structure/bed, -/obj/item/bedsheet/hop, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"l" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/item/soap/deluxe, -/obj/machinery/button/windowtint{ - id = "room_s"; - pixel_x = -24; - pixel_y = 0; - range = 5 - }, -/turf/unsimulated/floor{ - dir = 1; - icon_state = "whiteblue" - }, -/area/template_noop) -"m" = ( -/turf/unsimulated/floor{ - dir = 1; - icon_state = "whiteblue" - }, -/area/template_noop) -"n" = ( -/obj/structure/window/reinforced/polarized{ - dir = 4; - id = "room_s" - }, -/turf/unsimulated/floor{ - dir = 1; - icon_state = "whitebluecorner" - }, -/area/template_noop) -"o" = ( -/obj/structure/sink{ - icon_state = "sink"; - dir = 8; - pixel_x = -12; - pixel_y = 2 - }, -/obj/structure/mirror{ - pixel_x = -28 - }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/template_noop) -"p" = ( -/obj/structure/toilet{ - dir = 1 - }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/template_noop) -"q" = ( -/obj/machinery/door/window/eastleft, -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/template_noop) -"O" = ( -/obj/machinery/poolcontroller/invisible, -/turf/unsimulated/beach/water, -/area/template_noop) - -(1,1,1) = {" -a -a -a -a -a -a -a -"} -(2,1,1) = {" -a -O -b -l -o -a -a -"} -(3,1,1) = {" -a -b -b -m -p -a -a -"} -(4,1,1) = {" -a -c -j -n -q -a -a -"} -(5,1,1) = {" -a -d -d -d -d -a -a -"} -(6,1,1) = {" -a -e -d -d -d -a -a -"} -(7,1,1) = {" -a -f -d -d -d -a -a -"} -(8,1,1) = {" -a -g -d -d -d -a -a -"} -(9,1,1) = {" -a -h -d -d -d -a -a -"} -(10,1,1) = {" -a -i -k -k -d -a -a -"} -(11,1,1) = {" -a -a -a -a -a -a -a -"} diff --git a/_maps/map_files/templates/spacehotel/s_03.dmm b/_maps/map_files/templates/spacehotel/s_03.dmm deleted file mode 100644 index de9e6f19cf0..00000000000 --- a/_maps/map_files/templates/spacehotel/s_03.dmm +++ /dev/null @@ -1,268 +0,0 @@ -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"a" = ( -/turf/template_noop, -/area/template_noop) -"b" = ( -/turf/unsimulated/floor/upperlevel, -/area/awaymission/desert{ - name = "Sudden Drop" - }) -"c" = ( -/obj/machinery/shower{ - pixel_y = 24 - }, -/obj/structure/window/reinforced/polarized{ - dir = 4; - id = "room_s" - }, -/turf/unsimulated/floor{ - dir = 8; - icon_state = "whiteblue" - }, -/area/template_noop) -"d" = ( -/turf/unsimulated/floor/carpet, -/area/template_noop) -"e" = ( -/obj/structure/rack, -/obj/item/gun/magic/wand, -/obj/item/gun/magic/staff{ - pixel_y = -4 - }, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"f" = ( -/obj/structure/rack, -/obj/item/clothing/suit/wizrobe{ - pixel_x = -8; - pixel_y = -8 - }, -/obj/item/clothing/suit/wizrobe/black{ - pixel_x = -4; - pixel_y = -4 - }, -/obj/item/clothing/suit/wizrobe/clown, -/obj/item/clothing/suit/wizrobe/marisa{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/clothing/suit/wizrobe/red{ - pixel_x = 8; - pixel_y = 8 - }, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"g" = ( -/obj/structure/rack, -/obj/item/clothing/head/wizard{ - pixel_x = 8; - pixel_y = -8 - }, -/obj/item/clothing/head/wizard/black{ - pixel_x = 4; - pixel_y = -4 - }, -/obj/item/clothing/head/wizard/clown, -/obj/item/clothing/head/wizard/marisa{ - pixel_x = -4; - pixel_y = 4 - }, -/obj/item/clothing/head/wizard/red{ - pixel_x = -8; - pixel_y = 8 - }, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"h" = ( -/obj/structure/dresser, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"i" = ( -/obj/structure/table/wood, -/obj/item/flashlight/lamp/green, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"j" = ( -/obj/effect/levelref{ - id = "lavaland"; - name = "lavaland" - }, -/turf/unsimulated/floor/upperlevel, -/area/awaymission/desert{ - name = "Sudden Drop" - }) -"k" = ( -/obj/structure/window/reinforced/polarized{ - dir = 4; - id = "room_s" - }, -/turf/unsimulated/floor{ - dir = 8; - icon_state = "whiteblue" - }, -/area/template_noop) -"l" = ( -/obj/structure/bed, -/obj/item/bedsheet/wiz, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"m" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/item/soap/deluxe, -/obj/machinery/button/windowtint{ - id = "room_s"; - pixel_x = -24; - pixel_y = 0; - range = 5 - }, -/turf/unsimulated/floor{ - dir = 1; - icon_state = "whiteblue" - }, -/area/template_noop) -"n" = ( -/turf/unsimulated/floor{ - dir = 1; - icon_state = "whiteblue" - }, -/area/template_noop) -"o" = ( -/obj/structure/window/reinforced/polarized{ - dir = 4; - id = "room_s" - }, -/turf/unsimulated/floor{ - dir = 1; - icon_state = "whitebluecorner" - }, -/area/template_noop) -"p" = ( -/obj/structure/sink{ - icon_state = "sink"; - dir = 8; - pixel_x = -12; - pixel_y = 2 - }, -/obj/structure/mirror{ - pixel_x = -28 - }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/template_noop) -"q" = ( -/obj/structure/toilet{ - dir = 1 - }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/template_noop) -"r" = ( -/obj/machinery/door/window/eastleft, -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/template_noop) - -(1,1,1) = {" -a -a -a -a -a -a -a -"} -(2,1,1) = {" -a -b -b -m -p -a -a -"} -(3,1,1) = {" -a -b -j -n -q -a -a -"} -(4,1,1) = {" -a -c -k -o -r -a -a -"} -(5,1,1) = {" -a -d -d -d -d -a -a -"} -(6,1,1) = {" -a -e -d -d -d -a -a -"} -(7,1,1) = {" -a -f -d -d -d -a -a -"} -(8,1,1) = {" -a -g -d -d -d -a -a -"} -(9,1,1) = {" -a -h -d -d -d -a -a -"} -(10,1,1) = {" -a -i -l -l -d -a -a -"} -(11,1,1) = {" -a -a -a -a -a -a -a -"} diff --git a/_maps/map_files/templates/spacehotel/s_04.dmm b/_maps/map_files/templates/spacehotel/s_04.dmm deleted file mode 100644 index 81c1306da96..00000000000 --- a/_maps/map_files/templates/spacehotel/s_04.dmm +++ /dev/null @@ -1,296 +0,0 @@ -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"a" = ( -/turf/template_noop, -/area/template_noop) -"b" = ( -/turf/unsimulated/beach/water, -/area/template_noop) -"c" = ( -/obj/machinery/shower{ - pixel_y = 24 - }, -/obj/structure/window/reinforced/polarized{ - dir = 4; - id = "room_s" - }, -/turf/unsimulated/floor{ - dir = 8; - icon_state = "whiteblue" - }, -/area/template_noop) -"d" = ( -/turf/unsimulated/floor{ - icon = 'icons/turf/shuttle.dmi'; - icon_state = "floor4" - }, -/area/template_noop) -"e" = ( -/obj/structure/rack, -/obj/item/clothing/suit/syndicatefake, -/obj/item/clothing/under/syndicate, -/turf/unsimulated/floor{ - icon = 'icons/turf/shuttle.dmi'; - icon_state = "floor4" - }, -/area/template_noop) -"f" = ( -/obj/structure/rack, -/obj/item/clothing/mask/gas/syndicate, -/turf/unsimulated/floor{ - icon = 'icons/turf/shuttle.dmi'; - icon_state = "floor4" - }, -/area/template_noop) -"g" = ( -/obj/structure/rack, -/obj/structure/sign/poster/random{ - dir = 1; - pixel_y = 32 - }, -/obj/item/clothing/suit/space/hardsuit/syndi, -/obj/item/clothing/head/helmet/space/syndicate{ - pixel_x = -4 - }, -/turf/unsimulated/floor{ - icon = 'icons/turf/shuttle.dmi'; - icon_state = "floor4" - }, -/area/template_noop) -"h" = ( -/obj/structure/dresser, -/obj/structure/sign/poster/random{ - dir = 1; - pixel_y = 32 - }, -/turf/unsimulated/floor{ - icon = 'icons/turf/shuttle.dmi'; - icon_state = "floor4" - }, -/area/template_noop) -"i" = ( -/obj/structure/table/wood, -/obj/item/flashlight/lamp/green, -/obj/item/storage/fancy/cigarettes/syndicate{ - pixel_x = 8 - }, -/obj/structure/sign/poster/random{ - dir = 1; - pixel_y = 32 - }, -/obj/structure/sign/poster/random{ - dir = 4; - pixel_x = 32 - }, -/turf/unsimulated/floor{ - icon = 'icons/turf/shuttle.dmi'; - icon_state = "floor4" - }, -/area/template_noop) -"j" = ( -/obj/structure/window/reinforced/polarized{ - dir = 4; - id = "room_s" - }, -/turf/unsimulated/floor{ - dir = 8; - icon_state = "whiteblue" - }, -/area/template_noop) -"k" = ( -/obj/structure/bed, -/obj/item/bedsheet/syndie, -/obj/structure/sign/poster/random{ - dir = 4; - pixel_x = 32 - }, -/turf/unsimulated/floor{ - icon = 'icons/turf/shuttle.dmi'; - icon_state = "floor4" - }, -/area/template_noop) -"l" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/machinery/button/windowtint{ - id = "room_s"; - pixel_x = -24; - pixel_y = 0; - range = 5 - }, -/obj/item/soap/syndie, -/turf/unsimulated/floor{ - dir = 1; - icon_state = "whiteblue" - }, -/area/template_noop) -"m" = ( -/turf/unsimulated/floor{ - dir = 1; - icon_state = "whiteblue" - }, -/area/template_noop) -"n" = ( -/obj/structure/window/reinforced/polarized{ - dir = 4; - id = "room_s" - }, -/turf/unsimulated/floor{ - dir = 1; - icon_state = "whitebluecorner" - }, -/area/template_noop) -"o" = ( -/obj/structure/sink{ - icon_state = "sink"; - dir = 8; - pixel_x = -12; - pixel_y = 2 - }, -/obj/structure/mirror{ - pixel_x = -28 - }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/template_noop) -"p" = ( -/obj/structure/toilet{ - dir = 1 - }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/template_noop) -"q" = ( -/obj/machinery/door/window/eastleft, -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/template_noop) -"r" = ( -/obj/structure/sign/poster/random{ - pixel_y = -32 - }, -/turf/unsimulated/floor{ - icon = 'icons/turf/shuttle.dmi'; - icon_state = "floor4" - }, -/area/template_noop) -"s" = ( -/obj/structure/sign/poster/random{ - dir = 4; - pixel_x = 32 - }, -/obj/structure/sign/poster/random{ - pixel_y = -32 - }, -/turf/unsimulated/floor{ - icon = 'icons/turf/shuttle.dmi'; - icon_state = "floor4" - }, -/area/template_noop) -"X" = ( -/obj/machinery/poolcontroller/invisible, -/turf/unsimulated/beach/water, -/area/template_noop) - -(1,1,1) = {" -a -a -a -a -a -a -a -"} -(2,1,1) = {" -a -X -b -l -o -a -a -"} -(3,1,1) = {" -a -b -b -m -p -a -a -"} -(4,1,1) = {" -a -c -j -n -q -a -a -"} -(5,1,1) = {" -a -d -d -d -r -a -a -"} -(6,1,1) = {" -a -e -d -d -d -a -a -"} -(7,1,1) = {" -a -f -d -d -r -a -a -"} -(8,1,1) = {" -a -g -d -d -r -a -a -"} -(9,1,1) = {" -a -h -d -d -r -a -a -"} -(10,1,1) = {" -a -i -k -k -s -a -a -"} -(11,1,1) = {" -a -a -a -a -a -a -a -"} diff --git a/_maps/map_files/templates/spacehotel/s_05.dmm b/_maps/map_files/templates/spacehotel/s_05.dmm deleted file mode 100644 index 1ff9546e265..00000000000 --- a/_maps/map_files/templates/spacehotel/s_05.dmm +++ /dev/null @@ -1,235 +0,0 @@ -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"a" = ( -/turf/template_noop, -/area/template_noop) -"b" = ( -/turf/unsimulated/beach/water, -/area/template_noop) -"c" = ( -/obj/machinery/shower{ - pixel_y = 24 - }, -/obj/structure/window/reinforced/polarized{ - dir = 4; - id = "room_s" - }, -/turf/unsimulated/floor{ - dir = 8; - icon_state = "whitehall" - }, -/area/template_noop) -"d" = ( -/turf/unsimulated/floor{ - icon_state = "white" - }, -/area/template_noop) -"e" = ( -/obj/structure/rack, -/obj/item/instrument/guitar, -/obj/item/instrument/violin{ - pixel_x = 8 - }, -/turf/unsimulated/floor{ - icon_state = "white" - }, -/area/template_noop) -"f" = ( -/obj/structure/dresser, -/turf/unsimulated/floor{ - icon_state = "white" - }, -/area/template_noop) -"g" = ( -/obj/item/flashlight/lamp/green, -/obj/structure/table, -/turf/unsimulated/floor{ - icon_state = "white" - }, -/area/template_noop) -"h" = ( -/obj/structure/window/reinforced/polarized{ - dir = 4; - id = "room_s" - }, -/turf/unsimulated/floor{ - dir = 8; - icon_state = "whitehall" - }, -/area/template_noop) -"i" = ( -/obj/structure/piano, -/turf/unsimulated/floor{ - icon_state = "white" - }, -/area/template_noop) -"j" = ( -/obj/structure/bed, -/obj/item/bedsheet/mime, -/turf/unsimulated/floor{ - icon_state = "white" - }, -/area/template_noop) -"k" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/machinery/button/windowtint{ - id = "room_s"; - pixel_x = -24; - pixel_y = 0; - range = 5 - }, -/obj/item/soap, -/turf/unsimulated/floor{ - dir = 1; - icon_state = "whitehall" - }, -/area/template_noop) -"l" = ( -/turf/unsimulated/floor{ - dir = 1; - icon_state = "whitehall" - }, -/area/template_noop) -"m" = ( -/obj/structure/window/reinforced/polarized{ - dir = 4; - id = "room_s" - }, -/turf/unsimulated/floor{ - dir = 1; - icon_state = "whitecorner" - }, -/area/template_noop) -"n" = ( -/obj/structure/sink{ - icon_state = "sink"; - dir = 8; - pixel_x = -12; - pixel_y = 2 - }, -/obj/structure/mirror{ - pixel_x = -28 - }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/template_noop) -"o" = ( -/obj/structure/toilet{ - dir = 1 - }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/template_noop) -"p" = ( -/obj/machinery/door/window/eastleft, -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/template_noop) -"Z" = ( -/obj/machinery/poolcontroller/invisible, -/turf/unsimulated/beach/water, -/area/template_noop) - -(1,1,1) = {" -a -a -a -a -a -a -a -"} -(2,1,1) = {" -a -Z -b -k -n -a -a -"} -(3,1,1) = {" -a -b -b -l -o -a -a -"} -(4,1,1) = {" -a -c -h -m -p -a -a -"} -(5,1,1) = {" -a -d -i -d -d -a -a -"} -(6,1,1) = {" -a -d -d -d -d -a -a -"} -(7,1,1) = {" -a -d -d -d -d -a -a -"} -(8,1,1) = {" -a -e -d -d -d -a -a -"} -(9,1,1) = {" -a -f -d -d -d -a -a -"} -(10,1,1) = {" -a -g -j -j -d -a -a -"} -(11,1,1) = {" -a -a -a -a -a -a -a -"} diff --git a/_maps/map_files/templates/spacehotel/s_06.dmm b/_maps/map_files/templates/spacehotel/s_06.dmm deleted file mode 100644 index 03a1e7e9e99..00000000000 --- a/_maps/map_files/templates/spacehotel/s_06.dmm +++ /dev/null @@ -1,237 +0,0 @@ -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"a" = ( -/turf/template_noop, -/area/template_noop) -"b" = ( -/turf/unsimulated/beach/water, -/area/template_noop) -"c" = ( -/obj/machinery/shower{ - pixel_y = 24 - }, -/obj/structure/window/reinforced/polarized{ - dir = 4; - id = "room_s" - }, -/turf/unsimulated/floor{ - dir = 8; - icon_state = "whiteblue" - }, -/area/template_noop) -"d" = ( -/turf/unsimulated/floor/carpet, -/area/template_noop) -"e" = ( -/obj/structure/rack, -/obj/item/twohanded/dualsaber/toy, -/obj/item/twohanded/toy/chainsaw, -/obj/item/toy/foamblade, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"f" = ( -/obj/structure/rack, -/obj/item/toy/griffin{ - pixel_y = 8 - }, -/obj/item/toy/snappop, -/obj/item/toy/redbutton, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"g" = ( -/obj/structure/rack, -/obj/item/deck/cards, -/obj/item/toy/figure/secofficer, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"h" = ( -/obj/structure/dresser, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"i" = ( -/obj/structure/table/wood, -/obj/item/flashlight/lamp/green, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"j" = ( -/obj/structure/window/reinforced/polarized{ - dir = 4; - id = "room_s" - }, -/turf/unsimulated/floor{ - dir = 8; - icon_state = "whiteblue" - }, -/area/template_noop) -"k" = ( -/obj/item/toy/snappop, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"l" = ( -/obj/structure/bed, -/obj/item/bedsheet/patriot, -/turf/unsimulated/floor/carpet, -/area/template_noop) -"m" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/machinery/button/windowtint{ - id = "room_s"; - pixel_x = -24; - pixel_y = 0; - range = 5 - }, -/obj/item/soap/nanotrasen, -/turf/unsimulated/floor{ - dir = 1; - icon_state = "whiteblue" - }, -/area/template_noop) -"n" = ( -/turf/unsimulated/floor{ - dir = 1; - icon_state = "whiteblue" - }, -/area/template_noop) -"o" = ( -/obj/structure/window/reinforced/polarized{ - dir = 4; - id = "room_s" - }, -/turf/unsimulated/floor{ - dir = 1; - icon_state = "whitebluecorner" - }, -/area/template_noop) -"p" = ( -/obj/structure/sink{ - icon_state = "sink"; - dir = 8; - pixel_x = -12; - pixel_y = 2 - }, -/obj/structure/mirror{ - pixel_x = -28 - }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/template_noop) -"q" = ( -/obj/structure/toilet{ - dir = 1 - }, -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/template_noop) -"r" = ( -/obj/machinery/door/window/eastleft, -/turf/unsimulated/floor{ - icon_state = "freezerfloor" - }, -/area/template_noop) -"X" = ( -/obj/machinery/poolcontroller/invisible, -/turf/unsimulated/beach/water, -/area/template_noop) - -(1,1,1) = {" -a -a -a -a -a -a -a -"} -(2,1,1) = {" -a -X -b -m -p -a -a -"} -(3,1,1) = {" -a -b -b -n -q -a -a -"} -(4,1,1) = {" -a -c -j -o -r -a -a -"} -(5,1,1) = {" -a -d -d -k -d -a -a -"} -(6,1,1) = {" -a -e -d -d -d -a -a -"} -(7,1,1) = {" -a -f -d -d -d -a -a -"} -(8,1,1) = {" -a -g -k -d -d -a -a -"} -(9,1,1) = {" -a -h -d -d -d -a -a -"} -(10,1,1) = {" -a -i -l -l -d -a -a -"} -(11,1,1) = {" -a -a -a -a -a -a -a -"} diff --git a/_maps/metastation.dm b/_maps/metastation.dm index 0941ffc453a..1e71d218835 100644 --- a/_maps/metastation.dm +++ b/_maps/metastation.dm @@ -3,26 +3,19 @@ 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 = station -z2 = centcomm -z3 = derelict telecomms satellite -z4 = derelict station -z5 = mining -z6 = empty space -z7 = empty space +z1 = centcomm +z2 = station +z3 = lavaland */ - #if !defined(USING_MAP_DATUM) - #include "map_files\MetaStation\MetaStation.v41A.II.dmm" - #include "map_files\MetaStation\z2.dmm" + #include "map_files\generic\centcomm.dmm" + #include "map_files\MetaStation\MetaStation.dmm" #include "map_files\generic\Lavaland.dmm" - #define MAP_FILE "MetaStation.v41A.II.dmm" - #define MAP_NAME "MetaStation" #define MAP_TRANSITION_CONFIG list(\ -DECLARE_LEVEL(MAIN_STATION, CROSSLINKED, list(STATION_LEVEL, STATION_CONTACT, REACHABLE, AI_OK)),\ 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 diff --git a/code/ATMOSPHERICS/components/unary_devices/cold_sink.dm b/code/ATMOSPHERICS/components/unary_devices/cold_sink.dm deleted file mode 100644 index 7cae2968a22..00000000000 --- a/code/ATMOSPHERICS/components/unary_devices/cold_sink.dm +++ /dev/null @@ -1,42 +0,0 @@ -/obj/machinery/atmospherics/unary/cold_sink - icon = 'icons/obj/atmospherics/cold_sink.dmi' - icon_state = "on_cool" - density = 1 - use_power = IDLE_POWER_USE - - name = "cold sink" - desc = "Cools gas when connected to pipe network" - - var/on = 0 - - var/current_temperature = T20C - var/current_heat_capacity = 50000 //totally random - -/obj/machinery/atmospherics/unary/cold_sink/update_icon() - ..() - - if(node) - icon_state = "intact_[on?("on"):("off")]" - else - icon_state = "exposed" - - on = 0 - -/obj/machinery/atmospherics/unary/cold_sink/process_atmos() - ..() - if(!on) - return 0 - - var/air_heat_capacity = air_contents.heat_capacity() - var/combined_heat_capacity = current_heat_capacity + air_heat_capacity - var/old_temperature = air_contents.temperature - - if(combined_heat_capacity > 0) - var/combined_energy = current_temperature*current_heat_capacity + air_heat_capacity*air_contents.temperature - air_contents.temperature = combined_energy/combined_heat_capacity - - //todo: have current temperature affected. require power to bring down current temperature again - - if(abs(old_temperature-air_contents.temperature) > 1) - parent.update = 1 - return 1 diff --git a/code/ATMOSPHERICS/components/unary_devices/heat_source.dm b/code/ATMOSPHERICS/components/unary_devices/heat_source.dm deleted file mode 100644 index b3b1d0c4fdc..00000000000 --- a/code/ATMOSPHERICS/components/unary_devices/heat_source.dm +++ /dev/null @@ -1,41 +0,0 @@ -/obj/machinery/atmospherics/unary/heat_reservoir - icon = 'icons/obj/atmospherics/cold_sink.dmi' - icon_state = "intact_off" - density = 1 - use_power = IDLE_POWER_USE - - name = "heat reservoir" - desc = "Heats gas when connected to pipe network" - - var/on = 0 - - var/current_temperature = T20C - var/current_heat_capacity = 50000 //totally random - -/obj/machinery/atmospherics/unary/heat_reservoir/update_icon() - ..() - - if(node) - icon_state = "intact_[on?("on"):("off")]" - else - icon_state = "exposed" - - on = 0 - -/obj/machinery/atmospherics/unary/heat_reservoir/process_atmos() - ..() - if(!on) - return 0 - var/air_heat_capacity = air_contents.heat_capacity() - var/combined_heat_capacity = current_heat_capacity + air_heat_capacity - var/old_temperature = air_contents.temperature - - if(combined_heat_capacity > 0) - var/combined_energy = current_temperature*current_heat_capacity + air_heat_capacity*air_contents.temperature - air_contents.temperature = combined_energy/combined_heat_capacity - - //todo: have current temperature affected. require power to bring up current temperature again - - if(abs(old_temperature-air_contents.temperature) > 1) - parent.update = 1 - return 1 diff --git a/code/__DEFINES/_profile.dm b/code/__DEFINES/_profile.dm new file mode 100644 index 00000000000..d9ecd9bb5ac --- /dev/null +++ b/code/__DEFINES/_profile.dm @@ -0,0 +1,3 @@ +// This file exists so that world.Profile() is THE FIRST PROC TO RUN in the init sequence. This allows us to get the real details of everything lagging at server start. +// We don't actually care about storing the output here, this is just an easy way to ensure the profile runs first. +GLOBAL_REAL_VAR(world_init_profiler) = world.Profile(PROFILE_START) diff --git a/code/__DEFINES/admin.dm b/code/__DEFINES/admin.dm index 95494fb88cf..99fa1c50e0a 100644 --- a/code/__DEFINES/admin.dm +++ b/code/__DEFINES/admin.dm @@ -72,3 +72,19 @@ #define MAX_KEYPRESS_AUTOKICK 50 ///Length of held key rolling buffer #define HELD_KEY_BUFFER_LENGTH 15 + +/// Note text for suppressed CID warning +#define CIDWARNING_SUPPRESSED_NOTETEXT "CID COUNT WARNING DISABLED - Delete this note to re-enable" + +/// Note "ckey" for CID info tracking. Do not EVER update this. +#define CIDTRACKING_PSUEDO_CKEY "ALICE-CIDTRACKING" + +// Connection types. These match enums in the SQL DB. Dont change them +/// Client was let into the server +#define CONNECTION_TYPE_ESTABLISHED "ESTABLISHED" +/// Client was disallowed due to IPIntel +#define CONNECTION_TYPE_DROPPED_IPINTEL "DROPPED - IPINTEL" +/// Client was disallowed due to being banned +#define CONNECTION_TYPE_DROPPED_BANNED "DROPPED - BANNED" +/// Client was disallowed due to invalid data +#define CONNECTION_TYPE_DROPPED_INVALID "DROPPED - INVALID" diff --git a/code/__DEFINES/atmospherics.dm b/code/__DEFINES/atmospherics.dm index 0c7e32a0a76..24a8e9aad9c 100644 --- a/code/__DEFINES/atmospherics.dm +++ b/code/__DEFINES/atmospherics.dm @@ -13,6 +13,11 @@ #define TCRYO 265 // -48.15degC #define T0C 273.15 // 0degC #define T20C 293.15 // 20degC +/// -14C - Temperature used for kitchen cold room, medical freezer, etc. +#define COLD_ROOM_TEMP 259.15 + +/// -193C - Temperature used for server rooms +#define SERVER_ROOM_TEMP 80 #define MOLES_CELLSTANDARD (ONE_ATMOSPHERE*CELL_VOLUME/(T20C*R_IDEAL_GAS_EQUATION)) //moles in a 2.5 m^3 cell at 101.325 Pa and 20 degC #define M_CELL_WITH_RATIO (MOLES_CELLSTANDARD * 0.005) //compared against for superconductivity @@ -21,8 +26,8 @@ #define MOLES_O2STANDARD (MOLES_CELLSTANDARD*O2STANDARD) // O2 standard value (21%) #define MOLES_N2STANDARD (MOLES_CELLSTANDARD*N2STANDARD) // N2 standard value (79%) #define CELL_VOLUME 2500 //liters in a cell -#define BREATH_VOLUME 0.5 //liters in a normal breath -#define BREATH_MOLES (ONE_ATMOSPHERE * BREATH_VOLUME /(T20C*R_IDEAL_GAS_EQUATION)) +//liters in a normal breath +#define BREATH_VOLUME 1 #define BREATH_PERCENTAGE (BREATH_VOLUME/CELL_VOLUME) //Amount of air to take a from a tile //EXCITED GROUPS @@ -124,6 +129,8 @@ #define TANK_RUPTURE_PRESSURE (40.*ONE_ATMOSPHERE) //Tank spills all contents into atmosphere #define TANK_FRAGMENT_PRESSURE (50.*ONE_ATMOSPHERE) //Boom 3x3 base explosion #define TANK_FRAGMENT_SCALE (10.*ONE_ATMOSPHERE) //+1 for each SCALE kPa aboe threshold +#define TANK_MAX_RELEASE_PRESSURE (ONE_ATMOSPHERE * 3) +#define TANK_MIN_RELEASE_PRESSURE 0 #define TANK_DEFAULT_RELEASE_PRESSURE 16 // Atmos alarm defines @@ -133,3 +140,7 @@ //LAVALAND #define LAVALAND_EQUIPMENT_EFFECT_PRESSURE 50 //what pressure you have to be under to increase the effect of equipment meant for lavaland + +// Reactions +#define N2O_DECOMPOSITION_MIN_ENERGY 1400 +#define N2O_DECOMPOSITION_ENERGY_RELEASED 200000 diff --git a/code/__DEFINES/colors.dm b/code/__DEFINES/colors.dm index d379817e4b4..fc67f448526 100644 --- a/code/__DEFINES/colors.dm +++ b/code/__DEFINES/colors.dm @@ -11,6 +11,7 @@ #define COLOR_WHITE "#FFFFFF" #define COLOR_GRAY "#808080" #define COLOR_BLACK "#000000" +#define COLOR_HALF_TRANSPARENT_BLACK "#0000007A" #define COLOR_NAVY_BLUE "#000080" #define COLOR_LIGHT_GREEN "#008000" #define COLOR_DARK_GRAY "#404040" diff --git a/code/__DEFINES/combat.dm b/code/__DEFINES/combat.dm index b526047237b..5bda7374fba 100644 --- a/code/__DEFINES/combat.dm +++ b/code/__DEFINES/combat.dm @@ -32,18 +32,12 @@ #define OBLITERATION 32 //Bitflags defining which status effects could be or are inflicted on a mob -#define CANSTUN 1 -#define CANWEAKEN 2 -#define CANPARALYSE 4 -#define CANPUSH 8 -#define PASSEMOTES 16 //Mob has a cortical borer or holders inside of it that need to see emotes. -#define GOTTAGOFAST 32 -#define IGNORESLOWDOWN 128 -#define IGNORE_SPEED_CHANGES 256 -#define GOTTAGONOTSOFAST 512 //This is used for nukacola, mormal meth is a "1" speed up, nuka is 0.5 and they don't stack, feel free to use this one somewhere else -#define GODMODE 4096 -#define FAKEDEATH 8192 //Replaces stuff like changeling.changeling_fakedeath -#define XENO_HOST 16384 //Tracks whether we're gonna be a baby alien's mummy. +#define CANSTUN 1 +#define CANWEAKEN 2 +#define CANPARALYSE 4 +#define CANPUSH 8 +#define PASSEMOTES 16 //Mob has a cortical borer or holders inside of it that need to see emotes. +#define GODMODE 32 //Health Defines #define HEALTH_THRESHOLD_CRIT 0 diff --git a/code/__DEFINES/contractors.dm b/code/__DEFINES/contractors.dm index f0390c4e91f..35899f60933 100644 --- a/code/__DEFINES/contractors.dm +++ b/code/__DEFINES/contractors.dm @@ -26,3 +26,4 @@ #define HUB_PAGE_SHOP 2 GLOBAL_DATUM(prisoner_belongings, /obj/structure/closet/secure_closet/contractor) +GLOBAL_LIST(contractors) diff --git a/code/__DEFINES/contracts.dm b/code/__DEFINES/contracts.dm deleted file mode 100644 index 26351cfbac2..00000000000 --- a/code/__DEFINES/contracts.dm +++ /dev/null @@ -1,58 +0,0 @@ -#define CONTRACT_POWER "Power" -#define CONTRACT_WEALTH "Wealth" -#define CONTRACT_PRESTIGE "Prestige" -#define CONTRACT_MAGIC "Magic" -#define CONTRACT_REVIVE "Revive" -#define CONTRACT_KNOWLEDGE "Knowledge" -#define CONTRACT_UNWILLING "Unwilling" -#define CONTRACT_FRIENDSHIP "Friendship" -// FIXME: Implement these -#define CONTRACT_ETALENT "Engineering Talent" -#define CONTRACT_CTALENT "Chemistry Talent" -#define CONTRACT_RETURNDEAD "Return Dead" -#define CONTRACT_AUGMENT "Cybernetic Augmentations" -#define CONTRACT_CANDY "Endless Candy" -#define CONTRACT_ECHANCE "An Extra Chance" -#define CONTRACT_ATECH "Advanced Technology" -#define CONTRACT_DEVILSMACHINE "Devil's Machinery" -#define CONTRACT_YOUTH "Eternal Youth" -#define CONTRACT_FOOD "Food" -#define CONTRACT_SPACE "Space Gear" -#define CONTRACT_CALAMITY "Calamity" - -#define BANE_SALT "salt" -#define BANE_LIGHT "light" -#define BANE_IRON "iron" -#define BANE_WHITECLOTHES "whiteclothes" -#define BANE_SILVER "silver" -#define BANE_HARVEST "harvest" -#define BANE_TOOLBOX "toolbox" - -#define OBLIGATION_FOOD "food" -#define OBLIGATION_FIDDLE "fiddle" -#define OBLIGATION_DANCEOFF "danceoff" -#define OBLIGATION_GREET "greet" -#define OBLIGATION_PRESENCEKNOWN "presenceknown" -#define OBLIGATION_SAYNAME "sayname" -#define OBLIGATION_ANNOUNCEKILL "announcekill" -#define OBLIGATION_ANSWERTONAME "answername" - -#define BAN_HURTWOMAN "hurtwoman" -#define BAN_HURTMAN "hurtman" -#define BAN_CHAPEL "chapel" -#define BAN_HURTPRIEST "hurtpriest" -#define BAN_AVOIDWATER "avoidwater" -#define BAN_STRIKEUNCONCIOUS "strikeunconcious" -#define BAN_HURTLIZARD "hurtlizard" -#define BAN_HURTANIMAL "hurtanimal" - -#define BANISH_WATER "water" -#define BANISH_COFFIN "coffin" -#define BANISH_FORMALDYHIDE "embalm" -#define BANISH_RUNES "runes" -#define BANISH_CANDLES "candles" -#define BANISH_DESTRUCTION "destruction" -#define BANISH_FUNERAL_GARB "funeral" - -#define LORE 1 -#define LAW 2 diff --git a/code/__DEFINES/dcs/helpers.dm b/code/__DEFINES/dcs/helpers.dm index 144e94f1fe0..ba2b9a704a3 100644 --- a/code/__DEFINES/dcs/helpers.dm +++ b/code/__DEFINES/dcs/helpers.dm @@ -6,6 +6,14 @@ #define SEND_GLOBAL_SIGNAL(sigtype, arguments...) ( SEND_SIGNAL(SSdcs, sigtype, ##arguments) ) +/// Signifies that this proc is used to handle signals. +/// Every proc you pass to RegisterSignal must have this. +#define SIGNAL_HANDLER SHOULD_NOT_SLEEP(TRUE) + +/// Signifies that this proc is used to handle signals, but also sleeps. +/// Do not use this for new work. +#define SIGNAL_HANDLER_DOES_SLEEP + /// A wrapper for _AddElement that allows us to pretend we're using normal named arguments #define AddElement(arguments...) _AddElement(list(##arguments)) /// A wrapper for _RemoveElement that allows us to pretend we're using normal named arguments diff --git a/code/__DEFINES/dcs/signals.dm b/code/__DEFINES/dcs/signals.dm index 899f74069a6..2558653c510 100644 --- a/code/__DEFINES/dcs/signals.dm +++ b/code/__DEFINES/dcs/signals.dm @@ -156,6 +156,9 @@ #define COMSIG_ATOM_ORBIT_BEGIN "atom_orbit_begin" ///called when an atom stops orbiting another atom: (atom) #define COMSIG_ATOM_ORBIT_STOP "atom_orbit_stop" +///from base of atom/hitby(atom/movable/AM, skipcatch, hitpush, blocked, datum/thrownthing/throwingdatum) +#define COMSIG_ATOM_HITBY "atom_hitby" + ///////////////// ///from base of atom/attack_ghost(): (mob/dead/observer/ghost) #define COMSIG_ATOM_ATTACK_GHOST "atom_attack_ghost" @@ -493,7 +496,7 @@ // /obj/item/clothing signals -///from base of obj/item/clothing/shoes/proc/step_action(): () +///from [/mob/living/carbon/human/Move]: () #define COMSIG_SHOES_STEP_ACTION "shoes_step_action" ///from base of /obj/item/clothing/suit/space/proc/toggle_spacesuit(): (obj/item/clothing/suit/space/suit) #define COMSIG_SUIT_SPACE_TOGGLE "suit_space_toggle" diff --git a/code/__DEFINES/flags.dm b/code/__DEFINES/flags.dm index 485e5cd2656..a68646224cf 100644 --- a/code/__DEFINES/flags.dm +++ b/code/__DEFINES/flags.dm @@ -35,18 +35,14 @@ #define INFORM_ADMINS_ON_RELOCATE_2 32 #define BANG_PROTECT_2 64 -// An item worn in the ear slot with HEALS_EARS will heal your ears each -// Life() tick, even if normally your ears would be too damaged to heal. -#define HEALS_EARS_2 128 - // A mob with OMNITONGUE has no restriction in the ability to speak // languages that they know. So even if they wouldn't normally be able to // through mob or tongue restrictions, this flag allows them to ignore // those restrictions. #define OMNITONGUE_2 256 -// TESLA_IGNORE grants immunity from being targeted by tesla-style electricity -#define TESLA_IGNORE_2 512 +/// Prevents mobs from getting chainshocked by teslas and the supermatter +#define SHOCKED_2 512 // Stops you from putting things like an RCD or other items into an ORM or protolathe for materials. #define NO_MAT_REDEMPTION_2 1024 @@ -58,6 +54,11 @@ #define CHECK_RICOCHET_2 8192 +/// should the contents of this atom be acted upon +#define RAD_PROTECT_CONTENTS_2 16384 +/// should this object be allowed to be contaminated +#define RAD_NO_CONTAMINATE_2 32768 + //Reagent flags #define REAGENT_NOREACT 1 @@ -109,22 +110,21 @@ #define NO_RUINS 4 //ITEM INVENTORY SLOT BITMASKS -#define SLOT_OCLOTHING 1 -#define SLOT_ICLOTHING 2 -#define SLOT_GLOVES 4 -#define SLOT_EYES 8 -#define SLOT_EARS 16 -#define SLOT_MASK 32 -#define SLOT_HEAD 64 -#define SLOT_FEET 128 -#define SLOT_ID 256 -#define SLOT_BELT 512 -#define SLOT_BACK 1024 -#define SLOT_POCKET 2048 //this is to allow items with a w_class of 3 or 4 to fit in pockets. -#define SLOT_DENYPOCKET 4096 //this is to deny items with a w_class of 2 or 1 to fit in pockets. -#define SLOT_TWOEARS 8192 -#define SLOT_PDA 16384 -#define SLOT_TIE 32768 +#define SLOT_OCLOTHING (1<<0) +#define SLOT_ICLOTHING (1<<1) +#define SLOT_GLOVES (1<<2) +#define SLOT_EYES (1<<3) +#define SLOT_EARS (1<<4) +#define SLOT_MASK (1<<5) +#define SLOT_HEAD (1<<6) +#define SLOT_FEET (1<<7) +#define SLOT_ID (1<<8) +#define SLOT_BELT (1<<9) +#define SLOT_BACK (1<<10) +#define SLOT_POCKET (1<<11) //this is to allow items with a w_class of 3 or 4 to fit in pockets. +#define SLOT_TWOEARS (1<<12) +#define SLOT_PDA (1<<13) +#define SLOT_TIE (1<<14) //ORGAN TYPE FLAGS #define AFFECT_ROBOTIC_ORGAN 1 @@ -141,4 +141,16 @@ #define INDESTRUCTIBLE (1<<6) //doesn't take damage #define FREEZE_PROOF (1<<7) //can't be frozen +//tesla_zap +#define ZAP_MACHINE_EXPLOSIVE (1<<0) +#define ZAP_ALLOW_DUPLICATES (1<<1) +#define ZAP_OBJ_DAMAGE (1<<2) +#define ZAP_MOB_DAMAGE (1<<3) +#define ZAP_MOB_STUN (1<<4) +#define ZAP_GENERATES_POWER (1<<5) + +#define ZAP_DEFAULT_FLAGS ZAP_MOB_STUN | ZAP_MOB_DAMAGE | ZAP_OBJ_DAMAGE +#define ZAP_FUSION_FLAGS ZAP_OBJ_DAMAGE | ZAP_MOB_DAMAGE | ZAP_MOB_STUN +#define ZAP_SUPERMATTER_FLAGS ZAP_GENERATES_POWER + GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768)) diff --git a/code/__DEFINES/footstep.dm b/code/__DEFINES/footstep.dm new file mode 100644 index 00000000000..469549b8827 --- /dev/null +++ b/code/__DEFINES/footstep.dm @@ -0,0 +1,192 @@ +#define FOOTSTEP_WOOD "wood" +#define FOOTSTEP_FLOOR "floor" +#define FOOTSTEP_PLATING "plating" +#define FOOTSTEP_CARPET "carpet" +#define FOOTSTEP_SAND "sand" +#define FOOTSTEP_GRASS "grass" +#define FOOTSTEP_WATER "water" +#define FOOTSTEP_LAVA "lava" +#define FOOTSTEP_MEAT "meat" +//barefoot sounds +#define FOOTSTEP_WOOD_BAREFOOT "woodbarefoot" +#define FOOTSTEP_WOOD_CLAW "woodclaw" +#define FOOTSTEP_HARD_BAREFOOT "hardbarefoot" +#define FOOTSTEP_HARD_CLAW "hardclaw" +#define FOOTSTEP_CARPET_BAREFOOT "carpetbarefoot" +//misc footstep sounds +#define FOOTSTEP_GENERIC_HEAVY "heavy" + +//footstep mob defines +#define FOOTSTEP_MOB_CLAW 1 +#define FOOTSTEP_MOB_BAREFOOT 2 +#define FOOTSTEP_MOB_HEAVY 3 +#define FOOTSTEP_MOB_SHOE 4 +#define FOOTSTEP_MOB_HUMAN 5 //Warning: Only works on /mob/living/carbon/human +#define FOOTSTEP_MOB_SLIME 6 +#define FOOTSTEP_OBJ_MACHINE 7 +#define FOOTSTEP_OBJ_ROBOT 8 + +/* + +id = list( +list(sounds), +base volume, +extra range addition +) + + +*/ + +GLOBAL_LIST_INIT(footstep, list( + FOOTSTEP_WOOD = list(list( + 'sound/effects/footstep/wood1.ogg', + 'sound/effects/footstep/wood2.ogg', + 'sound/effects/footstep/wood3.ogg', + 'sound/effects/footstep/wood4.ogg', + 'sound/effects/footstep/wood5.ogg'), 100, 0), + FOOTSTEP_FLOOR = list(list( + 'sound/effects/footstep/floor1.ogg', + 'sound/effects/footstep/floor2.ogg', + 'sound/effects/footstep/floor3.ogg', + 'sound/effects/footstep/floor4.ogg', + 'sound/effects/footstep/floor5.ogg'), 75, -1), + FOOTSTEP_PLATING = list(list( + 'sound/effects/footstep/plating1.ogg', + 'sound/effects/footstep/plating2.ogg', + 'sound/effects/footstep/plating3.ogg', + 'sound/effects/footstep/plating4.ogg', + 'sound/effects/footstep/plating5.ogg'), 100, 1), + FOOTSTEP_CARPET = list(list( + 'sound/effects/footstep/carpet1.ogg', + 'sound/effects/footstep/carpet2.ogg', + 'sound/effects/footstep/carpet3.ogg', + 'sound/effects/footstep/carpet4.ogg', + 'sound/effects/footstep/carpet5.ogg'), 75, -1), + FOOTSTEP_SAND = list(list( + 'sound/effects/footstep/asteroid1.ogg', + 'sound/effects/footstep/asteroid2.ogg', + 'sound/effects/footstep/asteroid3.ogg', + 'sound/effects/footstep/asteroid4.ogg', + 'sound/effects/footstep/asteroid5.ogg'), 75, 0), + FOOTSTEP_GRASS = list(list( + 'sound/effects/footstep/grass1.ogg', + 'sound/effects/footstep/grass2.ogg', + 'sound/effects/footstep/grass3.ogg', + 'sound/effects/footstep/grass4.ogg'), 75, 0), + FOOTSTEP_WATER = list(list( + 'sound/effects/footstep/water1.ogg', + 'sound/effects/footstep/water2.ogg', + 'sound/effects/footstep/water3.ogg', + 'sound/effects/footstep/water4.ogg'), 100, 1), + FOOTSTEP_LAVA = list(list( + 'sound/effects/footstep/lava1.ogg', + 'sound/effects/footstep/lava2.ogg', + 'sound/effects/footstep/lava3.ogg'), 100, 0), + FOOTSTEP_MEAT = list(list( + 'sound/effects/meatslap.ogg'), 100, 0) +)) +//bare footsteps lists +GLOBAL_LIST_INIT(barefootstep, list( + FOOTSTEP_WOOD_BAREFOOT = list(list( + 'sound/effects/footstep/woodbarefoot1.ogg', + 'sound/effects/footstep/woodbarefoot2.ogg', + 'sound/effects/footstep/woodbarefoot3.ogg', + 'sound/effects/footstep/woodbarefoot4.ogg', + 'sound/effects/footstep/woodbarefoot5.ogg'), 80, -1), + FOOTSTEP_HARD_BAREFOOT = list(list( + 'sound/effects/footstep/hardbarefoot1.ogg', + 'sound/effects/footstep/hardbarefoot2.ogg', + 'sound/effects/footstep/hardbarefoot3.ogg', + 'sound/effects/footstep/hardbarefoot4.ogg', + 'sound/effects/footstep/hardbarefoot5.ogg'), 80, -1), + FOOTSTEP_CARPET_BAREFOOT = list(list( + 'sound/effects/footstep/carpetbarefoot1.ogg', + 'sound/effects/footstep/carpetbarefoot2.ogg', + 'sound/effects/footstep/carpetbarefoot3.ogg', + 'sound/effects/footstep/carpetbarefoot4.ogg', + 'sound/effects/footstep/carpetbarefoot5.ogg'), 75, -2), + FOOTSTEP_SAND = list(list( + 'sound/effects/footstep/asteroid1.ogg', + 'sound/effects/footstep/asteroid2.ogg', + 'sound/effects/footstep/asteroid3.ogg', + 'sound/effects/footstep/asteroid4.ogg', + 'sound/effects/footstep/asteroid5.ogg'), 75, 0), + FOOTSTEP_GRASS = list(list( + 'sound/effects/footstep/grass1.ogg', + 'sound/effects/footstep/grass2.ogg', + 'sound/effects/footstep/grass3.ogg', + 'sound/effects/footstep/grass4.ogg'), 75, 0), + FOOTSTEP_WATER = list(list( + 'sound/effects/footstep/water1.ogg', + 'sound/effects/footstep/water2.ogg', + 'sound/effects/footstep/water3.ogg', + 'sound/effects/footstep/water4.ogg'), 100, 1), + FOOTSTEP_LAVA = list(list( + 'sound/effects/footstep/lava1.ogg', + 'sound/effects/footstep/lava2.ogg', + 'sound/effects/footstep/lava3.ogg'), 100, 0), + FOOTSTEP_MEAT = list(list( + 'sound/effects/meatslap.ogg'), 100, 0), +)) + +//claw footsteps lists +GLOBAL_LIST_INIT(clawfootstep, list( + FOOTSTEP_WOOD_CLAW = list(list( + 'sound/effects/footstep/woodclaw1.ogg', + 'sound/effects/footstep/woodclaw2.ogg', + 'sound/effects/footstep/woodclaw3.ogg', + 'sound/effects/footstep/woodclaw2.ogg', + 'sound/effects/footstep/woodclaw1.ogg'), 90, 1), + FOOTSTEP_HARD_CLAW = list(list( + 'sound/effects/footstep/hardclaw1.ogg', + 'sound/effects/footstep/hardclaw2.ogg', + 'sound/effects/footstep/hardclaw3.ogg', + 'sound/effects/footstep/hardclaw4.ogg', + 'sound/effects/footstep/hardclaw1.ogg'), 90, 1), + FOOTSTEP_CARPET_BAREFOOT = list(list( + 'sound/effects/footstep/carpetbarefoot1.ogg', + 'sound/effects/footstep/carpetbarefoot2.ogg', + 'sound/effects/footstep/carpetbarefoot3.ogg', + 'sound/effects/footstep/carpetbarefoot4.ogg', + 'sound/effects/footstep/carpetbarefoot5.ogg'), 75, -2), + FOOTSTEP_SAND = list(list( + 'sound/effects/footstep/asteroid1.ogg', + 'sound/effects/footstep/asteroid2.ogg', + 'sound/effects/footstep/asteroid3.ogg', + 'sound/effects/footstep/asteroid4.ogg', + 'sound/effects/footstep/asteroid5.ogg'), 75, 0), + FOOTSTEP_GRASS = list(list( + 'sound/effects/footstep/grass1.ogg', + 'sound/effects/footstep/grass2.ogg', + 'sound/effects/footstep/grass3.ogg', + 'sound/effects/footstep/grass4.ogg'), 75, 0), + FOOTSTEP_WATER = list(list( + 'sound/effects/footstep/water1.ogg', + 'sound/effects/footstep/water2.ogg', + 'sound/effects/footstep/water3.ogg', + 'sound/effects/footstep/water4.ogg'), 100, 1), + FOOTSTEP_LAVA = list(list( + 'sound/effects/footstep/lava1.ogg', + 'sound/effects/footstep/lava2.ogg', + 'sound/effects/footstep/lava3.ogg'), 100, 0), + FOOTSTEP_MEAT = list(list( + 'sound/effects/meatslap.ogg'), 100, 0), +)) + +//heavy footsteps list +GLOBAL_LIST_INIT(heavyfootstep, list( + FOOTSTEP_GENERIC_HEAVY = list(list( + 'sound/effects/footstep/heavy1.ogg', + 'sound/effects/footstep/heavy2.ogg'), 100, 2), + FOOTSTEP_WATER = list(list( + 'sound/effects/footstep/water1.ogg', + 'sound/effects/footstep/water2.ogg', + 'sound/effects/footstep/water3.ogg', + 'sound/effects/footstep/water4.ogg'), 100, 2), + FOOTSTEP_LAVA = list(list( + 'sound/effects/footstep/lava1.ogg', + 'sound/effects/footstep/lava2.ogg', + 'sound/effects/footstep/lava3.ogg'), 100, 0), + FOOTSTEP_MEAT = list(list( + 'sound/effects/meatslap.ogg'), 100, 0), +)) diff --git a/code/__DEFINES/gamemode.dm b/code/__DEFINES/gamemode.dm index 497d8349ce1..9aee8f85eba 100644 --- a/code/__DEFINES/gamemode.dm +++ b/code/__DEFINES/gamemode.dm @@ -37,6 +37,7 @@ #define SPECIAL_ROLE_MORPH "Morph" #define SPECIAL_ROLE_MULTIVERSE "Multiverse Traveller" #define SPECIAL_ROLE_NUKEOPS "Syndicate" +#define SPECIAL_ROLE_PYROCLASTIC_SLIME "Pyroclastic Anomaly Slime" #define SPECIAL_ROLE_RAIDER "Vox Raider" #define SPECIAL_ROLE_REVENANT "Revenant" #define SPECIAL_ROLE_SHADOWLING "Shadowling" diff --git a/code/__DEFINES/genetics.dm b/code/__DEFINES/genetics.dm index c982420ff2a..f64022136ef 100644 --- a/code/__DEFINES/genetics.dm +++ b/code/__DEFINES/genetics.dm @@ -25,60 +25,7 @@ // MUTATIONS /////////////////////////////////////// -// Generic mutations: -#define TK "telekenesis" -#define COLDRES "cold_resistance" -#define XRAY "xray" -#define HULK "hulk" -#define CLUMSY "clumsy" -#define FAT "fat" -#define HUSK "husk" -#define NOCLONE "noclone" -#define LASER "eyelaser" // harm intent - click anywhere to shoot lasers from eyes -#define WINGDINGS "wingdings" // Ayy lmao -#define SKELETON "skeleton" -#define BREATHLESS "breathless" // no breathing -#define REMOTE_VIEW "remove_view" // remote viewing -#define REGEN "regeneration" // health regen -#define RUN "increased_run" // no slowdown -#define REMOTE_TALK "remote_talk" // remote talking -#define MORPH "morph" // changing appearance -#define HEATRES "heat_resistance" // heat resistance -#define HALLUCINATE "hallucinate" // hallucinations -#define FINGERPRINTS "no_prints" // no fingerprints -#define NO_SHOCK "no_shock" // insulated hands -#define DWARF "dwarf" // table climbing -#define OBESITY "obesity" // Decreased metabolism -#define STRONG "strong" // (Nothing) -#define SOBER "sober" // Increased alcohol metabolism -#define PSY_RESIST "psy_resist" // Block remoteview -#define EMPATH "empathy" //Read minds -#define COMIC "comic_sans" //Comic Sans -#define LOUD "loudness" // CAUSES INTENSE YELLING -#define DIZZY "dizzy" // Trippy. -#define LISP "lisp" -#define RADIOACTIVE "radioactive" -#define CHAV "chav" -#define SWEDISH "swedish" -#define SCRAMBLED "scrambled" -#define HORNS "horns" -#define IMMOLATE "immolate" -#define CLOAK "cloak" -#define CHAMELEON "chameleon" -#define CRYO "cryokinesis" -#define EATER "matter_eater" -#define JUMPY "jumpy" -#define POLYMORPH "polymorph" -//disabilities -#define NEARSIGHTED "nearsighted" -#define EPILEPSY "epilepsy" -#define COUGHING "coughing" -#define TOURETTES "tourettes" -#define NERVOUS "nervous" -#define BLINDNESS "blind" -#define COLOURBLIND "colorblind" -#define MUTE "mute" -#define DEAF "deaf" + //Nutrition levels for humans. No idea where else to put it #define NUTRITION_LEVEL_FAT 600 @@ -126,28 +73,12 @@ #define CLONER_MATURE_CLONE "mature" //Species traits. - +#define NO_BLOOD "no_blood" +#define NOTRANSSTING "no_trans_sting" #define IS_WHITELISTED "whitelisted" #define LIPS "lips" -#define NO_BLOOD "no_blood" -#define NO_BREATHE "no_breathe" -#define NO_DNA "no_dna" -#define NO_SCAN "no_scan" -#define NO_PAIN "no_pain" -#define IS_PLANT "is_plant" +#define EXOTIC_COLOR "exotic_blood_color" #define NO_INTORGANS "no_internal_organs" -#define RADIMMUNE "rad_immunity" -#define NOGUNS "no_guns" -#define NOTRANSSTING "no_trans_sting" -#define VIRUSIMMUNE "virus_immunity" -#define NOCRITDAMAGE "no_crit" -#define RESISTHOT "resist_heat" -#define RESISTCOLD "resist_cold" -#define NO_EXAMINE "no_examine" #define CAN_WINGDINGS "can_wingdings" -#define NO_GERMS "no_germs" -#define NO_DECAY "no_decay" -#define PIERCEIMMUNE "pierce_immunity" -#define NO_HUNGER "no_hunger" -#define EXOTIC_COLOR "exotic_blood_colour" -#define NO_OBESITY "no_obesity" +#define NO_CLONESCAN "no_clone_scan" +#define NO_HAIR "no_hair" diff --git a/code/__DEFINES/hud.dm b/code/__DEFINES/hud.dm index f4d5b9f5b1c..14e5fc674ce 100644 --- a/code/__DEFINES/hud.dm +++ b/code/__DEFINES/hud.dm @@ -53,9 +53,8 @@ #define ANTAG_HUD_VAMPIRE 16 #define ANTAG_HUD_ABDUCTOR 17 #define DATA_HUD_ABDUCTOR 18 -#define ANTAG_HUD_DEVIL 19 -#define ANTAG_HUD_EVENTMISC 20 -#define ANTAG_HUD_BLOB 21 +#define ANTAG_HUD_EVENTMISC 19 +#define ANTAG_HUD_BLOB 20 // Notification action types #define NOTIFY_JUMP "jump" diff --git a/code/__DEFINES/instruments.dm b/code/__DEFINES/instruments.dm index 64c77abc9fa..e2a46d08366 100644 --- a/code/__DEFINES/instruments.dm +++ b/code/__DEFINES/instruments.dm @@ -6,11 +6,6 @@ /// Max number of playing notes per instrument. #define CHANNELS_PER_INSTRUMENT 128 -/// Distance multiplier that makes us not be impacted by 3d sound as much. This is a multiplier so lower it is the closer we will pretend to be to people. -#define INSTRUMENT_DISTANCE_FALLOFF_BUFF 0.2 -/// How many tiles instruments have no falloff for -#define INSTRUMENT_DISTANCE_NO_FALLOFF 3 - /// Maximum length a note should ever go for #define INSTRUMENT_MAX_TOTAL_SUSTAIN (5 SECONDS) diff --git a/code/__DEFINES/is_helpers.dm b/code/__DEFINES/is_helpers.dm index 2b8c515e81a..a7f14a0ffe1 100644 --- a/code/__DEFINES/is_helpers.dm +++ b/code/__DEFINES/is_helpers.dm @@ -24,6 +24,8 @@ #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)) GLOBAL_LIST_INIT(pointed_types, typecacheof(list( @@ -51,8 +53,6 @@ GLOBAL_LIST_INIT(glass_sheet_types, typecacheof(list( #define isfloorturf(A) istype(A, /turf/simulated/floor) -#define isunsimulatedturf(A) istype(A, /turf/unsimulated) - #define iswallturf(A) istype(A, /turf/simulated/wall) #define isreinforcedwallturf(A) istype(A, /turf/simulated/wall/r_wall) diff --git a/code/__DEFINES/layers.dm b/code/__DEFINES/layers.dm index 6e677b02e49..9286ea2726d 100644 --- a/code/__DEFINES/layers.dm +++ b/code/__DEFINES/layers.dm @@ -86,6 +86,8 @@ #define LIGHTING_PLANE 15 #define LIGHTING_LAYER 15 +#define RAD_TEXT_LAYER 15.1 + #define ABOVE_LIGHTING_PLANE 16 #define ABOVE_LIGHTING_LAYER 16 diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm index 82550c5113a..e75eb49a02e 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 19 +#define SQL_VERSION 22 // Vending machine stuff #define CAT_NORMAL 1 @@ -429,6 +429,9 @@ //Explosive wall groups #define EXPLOSIVE_WALL_GROUP_SYNDICATE_BASE "syndicate_base" +/// Prepares a text to be used for maptext. Use this so it doesn't look hideous. +#define MAPTEXT(text) {"[##text]"} + // Filters #define FILTER_AMBIENT_OCCLUSION filter(type="drop_shadow", x=0, y=-2, size=4, color="#04080FAA") diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm index f4aca3c4aeb..a023063ca7f 100644 --- a/code/__DEFINES/mobs.dm +++ b/code/__DEFINES/mobs.dm @@ -13,6 +13,19 @@ #define DROPLIMB_BLUNT 1 #define DROPLIMB_BURN 2 +//Mob bio-types flags +#define MOB_ORGANIC (1 << 0) +#define MOB_MINERAL (1 << 1) +#define MOB_ROBOTIC (1 << 2) +#define MOB_UNDEAD (1 << 3) +#define MOB_HUMANOID (1 << 4) +#define MOB_BUG (1 << 5) +#define MOB_BEAST (1 << 6) // Not meant for human species, generally +#define MOB_EPIC (1 << 7) //megafauna +#define MOB_REPTILE (1 << 8) +#define MOB_SPIRIT (1 << 9) +#define MOB_PLANT (1 << 10) + #define AGE_MIN 17 //youngest a character can be #define AGE_MAX 85 //oldest a character can be @@ -139,6 +152,17 @@ #define ENVIRONMENT_SMASH_WALLS 2 //walls #define ENVIRONMENT_SMASH_RWALLS 4 //rwalls +///Flags used by the flags parameter of electrocute act. + +///Makes it so that the shock doesn't take gloves into account. +#define SHOCK_NOGLOVES (1 << 0) +///Used when the shock is from a tesla bolt. +#define SHOCK_TESLA (1 << 1) +///Used when an illusion shocks something. Makes the shock deal stamina damage and not trigger certain secondary effects. +#define SHOCK_ILLUSION (1 << 2) +///The shock doesn't stun. +#define SHOCK_NOSTUN (1 << 3) + #define POCKET_STRIP_DELAY 40 //time taken (in deciseconds) to search somebody's pockets #define DEFAULT_ITEM_STRIP_DELAY 40 //time taken (in deciseconds) to strip somebody @@ -214,6 +238,7 @@ #define issilicon(A) (istype((A), /mob/living/silicon)) #define isAI(A) (istype((A), /mob/living/silicon/ai)) #define isrobot(A) (istype((A), /mob/living/silicon/robot)) +#define isdrone(A) (istype((A), /mob/living/silicon/robot/drone)) #define ispAI(A) (istype((A), /mob/living/silicon/pai)) // For the tcomms monitor @@ -251,3 +276,9 @@ #define HEARING_PROTECTION_MINOR 1 #define HEARING_PROTECTION_MAJOR 2 #define HEARING_PROTECTION_TOTAL 3 + +// Eye protection +#define FLASH_PROTECTION_SENSITIVE -1 +#define FLASH_PROTECTION_NONE 0 +#define FLASH_PROTECTION_FLASH 1 +#define FLASH_PROTECTION_WELDER 2 diff --git a/code/__DEFINES/preferences.dm b/code/__DEFINES/preferences.dm index 74bbe68d566..73e7b2227dc 100644 --- a/code/__DEFINES/preferences.dm +++ b/code/__DEFINES/preferences.dm @@ -52,8 +52,11 @@ #define PREFTOGGLE_2_RUNECHAT 64 #define PREFTOGGLE_2_DEATHMESSAGE 128 #define PREFTOGGLE_2_EMOTE_BUBBLE 256 +// 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 TOGGLES_2_TOTAL 511 // 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 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_DEFAULT (PREFTOGGLE_2_FANCYUI|PREFTOGGLE_2_ITEMATTACK|PREFTOGGLE_2_WINDOWFLASHING|PREFTOGGLE_2_RUNECHAT|PREFTOGGLE_2_DEATHMESSAGE|PREFTOGGLE_2_EMOTE_BUBBLE) diff --git a/code/__DEFINES/radiation.dm b/code/__DEFINES/radiation.dm new file mode 100644 index 00000000000..9f7ea16f7b2 --- /dev/null +++ b/code/__DEFINES/radiation.dm @@ -0,0 +1,55 @@ +/* +These defines are the balancing points of various parts of the radiation system. +Changes here can have widespread effects: make sure you test well. +Ask ninjanomnom if they're around +*/ + +#define RAD_BACKGROUND_RADIATION 9 // How much radiation is harmless to a mob, this is also when radiation waves stop spreading + // WARNING: Lowering this value significantly increases SSradiation load + +// apply_effect((amount * RAD_MOB_COEFFICIENT) / max(1, (radiation ** 2) * RAD_OVERDOSE_REDUCTION), IRRADIATE, blocked) +#define RAD_MOB_COEFFICIENT 0.20 // Radiation applied is multiplied by this +#define RAD_MOB_SKIN_PROTECTION ((1 / RAD_MOB_COEFFICIENT) + RAD_BACKGROUND_RADIATION) + +#define RAD_LOSS_PER_TICK 0.5 +#define RAD_TOX_COEFFICIENT 0.08 // Toxin damage per tick coefficient +#define RAD_OVERDOSE_REDUCTION 0.000001 // Coefficient to the reduction in applied rads once the thing, usualy mob, has too much radiation + // WARNING: This number is highly sensitive to change, graph is first for best results +#define RAD_BURN_THRESHOLD 1000 // Applied radiation must be over this to burn +//Holy shit test after you tweak anything it's said like 6 times in here +//You probably want to plot any tweaks you make so you can see the curves visually +#define RAD_BURN_LOG_BASE 1.1 +#define RAD_BURN_LOG_GRADIENT 10000 +#define RAD_BURN_CURVE(X) log(1 + ((X - RAD_BURN_THRESHOLD) / RAD_BURN_LOG_GRADIENT)) / log(RAD_BURN_LOG_BASE) + +#define RAD_MOB_SAFE 500 // How much stored radiation in a mob with no ill effects + +#define RAD_MOB_HAIRLOSS 800 // How much stored radiation to check for hair loss + +#define RAD_MOB_MUTATE 1250 // How much stored radiation to check for mutation + +#define RAD_MOB_VOMIT 2000 // The amount of radiation to check for vomitting +#define RAD_MOB_VOMIT_PROB 1 // Chance per tick of vomitting + +#define RAD_MOB_KNOCKDOWN 2000 // How much stored radiation to check for stunning +#define RAD_MOB_KNOCKDOWN_PROB 1 // Chance of knockdown per tick when over threshold +#define RAD_MOB_KNOCKDOWN_AMOUNT 3 // Amount of knockdown when it occurs + +#define RAD_NO_INSULATION 1.0 // For things that shouldn't become irradiated for whatever reason +#define RAD_VERY_LIGHT_INSULATION 0.9 // What girders have +#define RAD_LIGHT_INSULATION 0.8 +#define RAD_MEDIUM_INSULATION 0.7 // What common walls have +#define RAD_HEAVY_INSULATION 0.6 // What reinforced walls have +#define RAD_EXTREME_INSULATION 0.5 // What rad collectors have +#define RAD_FULL_INSULATION 0 // Unused + +// WARNING: The defines below could have disastrous consequences if tweaked incorrectly. See: The great SM purge of Oct.6.2017 +// contamination_strength = (strength - RAD_MINIMUM_CONTAMINATION) * RAD_CONTAMINATION_STR_COEFFICIENT +#define RAD_MINIMUM_CONTAMINATION 350 // How strong does a radiation wave have to be to contaminate objects +#define RAD_CONTAMINATION_STR_COEFFICIENT 0.25 // Higher means higher strength scaling contamination strength +#define RAD_DISTANCE_COEFFICIENT 1 // Lower means further rad spread + +#define RAD_HALF_LIFE 90 // The half-life of contaminated objects + +#define RAD_GEIGER_MEASURE_SMOOTHING 5 +#define RAD_GEIGER_GRACE_PERIOD 2 diff --git a/code/__DEFINES/reagents.dm b/code/__DEFINES/reagents.dm index 564247455e3..eade54a1f05 100644 --- a/code/__DEFINES/reagents.dm +++ b/code/__DEFINES/reagents.dm @@ -19,3 +19,8 @@ #define REAGENT_TOUCH 1 #define REAGENT_INGEST 2 + +///Health threshold for synthflesh and rezadone to unhusk someone +#define UNHUSK_DAMAGE_THRESHOLD 50 +///Amount of synthflesh required to unhusk someone +#define SYNTHFLESH_UNHUSK_AMOUNT 100 diff --git a/code/__DEFINES/role_preferences.dm b/code/__DEFINES/role_preferences.dm index 8021fa4452d..85c15c1971c 100644 --- a/code/__DEFINES/role_preferences.dm +++ b/code/__DEFINES/role_preferences.dm @@ -26,7 +26,6 @@ #define ROLE_REVENANT "revenant" #define ROLE_HOG_GOD "hand of god: god" // We're prolly gonna port this one day or another #define ROLE_HOG_CULTIST "hand of god: cultist" -#define ROLE_DEVIL "devil" #define ROLE_RAIDER "vox raider" #define ROLE_TRADER "trader" #define ROLE_VAMPIRE "vampire" @@ -54,7 +53,6 @@ GLOBAL_LIST_INIT(special_roles, list( ROLE_CHANGELING = /datum/game_mode/changeling, // Changeling ROLE_BORER, // Cortical borer ROLE_CULTIST = /datum/game_mode/cult, // Cultist - ROLE_DEVIL = /datum/game_mode/devil/devil_agents, // Devil ROLE_GSPIDER, // Giant spider ROLE_GUARDIAN, // Guardian ROLE_MORPH, // Morph diff --git a/code/__DEFINES/rust_g.dm b/code/__DEFINES/rust_g.dm index c7b8bca1437..fe4b644096b 100644 --- a/code/__DEFINES/rust_g.dm +++ b/code/__DEFINES/rust_g.dm @@ -1,5 +1,10 @@ -/// Locator for the RUSTG DLL or SO depending on system type +#ifndef RUST_G +/// Locator for the RUSTG DLL or SO depending on system type. Override if needed. #define RUST_G (world.system_type == UNIX ? "./librust_g.so" : "./rust_g.dll") +#endif + +// Gets the version of RUSTG +/proc/rustg_get_version() return call(RUST_G, "get_version")() // Defines for internal job subsystem // #define RUSTG_JOB_NO_RESULTS_YET "NO RESULTS YET" @@ -10,6 +15,7 @@ #define rustg_dmi_strip_metadata(fname) call(RUST_G, "dmi_strip_metadata")(fname) #define rustg_dmi_create_png(path, width, height, data) call(RUST_G, "dmi_create_png")(path, width, height, data) +// Noise related operations // #define rustg_noise_get_at_coordinates(seed, x, y) call(RUST_G, "noise_get_at_coordinates")(seed, x, y) // Git related operations // @@ -43,3 +49,6 @@ #define rustg_sql_connected(handle) call(RUST_G, "sql_connected")(handle) #define rustg_sql_disconnect_pool(handle) call(RUST_G, "sql_disconnect_pool")(handle) #define rustg_sql_check_query(job_id) call(RUST_G, "sql_check_query")("[job_id]") + +// RUSTG Version // +#define RUST_G_VERSION "0.4.5-P2" diff --git a/code/__DEFINES/sound.dm b/code/__DEFINES/sound.dm index 3fcb9cc3410..c3f7780b917 100644 --- a/code/__DEFINES/sound.dm +++ b/code/__DEFINES/sound.dm @@ -6,16 +6,34 @@ #define CHANNEL_HEARTBEAT 1020 //sound channel for heartbeats #define CHANNEL_BUZZ 1019 #define CHANNEL_AMBIENCE 1018 +#define CHANNEL_ENGINE 1017 // Engine ambient sounds + +#define USER_VOLUME(M, C) M?.client?.prefs.get_channel_volume(C) //THIS SHOULD ALWAYS BE THE LOWEST ONE! //KEEP IT UPDATED -#define CHANNEL_HIGHEST_AVAILABLE 1017 +#define CHANNEL_HIGHEST_AVAILABLE 1016 #define MAX_INSTRUMENT_CHANNELS (128 * 6) +///Default range of a sound. +#define SOUND_RANGE 17 +///default extra range for sounds considered to be quieter +#define SHORT_RANGE_SOUND_EXTRARANGE -9 +///The range deducted from sound range for things that are considered silent / sneaky +#define SILENCED_SOUND_EXTRARANGE -11 +///Percentage of sound's range where no falloff is applied +#define SOUND_DEFAULT_FALLOFF_DISTANCE 1 //For a normal sound this would be 1 tile of no falloff +///The default exponent of sound falloff +#define SOUND_FALLOFF_EXPONENT 6 + #define SOUND_MINIMUM_PRESSURE 10 -#define FALLOFF_SOUNDS 0.5 + +#define EQUIP_SOUND_VOLUME 30 +#define PICKUP_SOUND_VOLUME 15 +#define DROP_SOUND_VOLUME 20 +#define YEET_SOUND_VOLUME 90 //Ambience types @@ -70,3 +88,47 @@ 'sound/hallucinations/growl3.ogg', 'sound/hallucinations/im_here1.ogg', 'sound/hallucinations/im_here2.ogg', 'sound/hallucinations/i_see_you1.ogg', 'sound/hallucinations/i_see_you2.ogg',\ 'sound/hallucinations/look_up1.ogg', 'sound/hallucinations/look_up2.ogg', 'sound/hallucinations/over_here1.ogg', 'sound/hallucinations/over_here2.ogg', 'sound/hallucinations/over_here3.ogg',\ 'sound/hallucinations/turn_around1.ogg', 'sound/hallucinations/turn_around2.ogg', 'sound/hallucinations/veryfar_noise.ogg', 'sound/hallucinations/wail.ogg') + +//default byond sound environments +#define SOUND_ENVIRONMENT_NONE -1 +#define SOUND_ENVIRONMENT_GENERIC 0 +#define SOUND_ENVIRONMENT_PADDED_CELL 1 +#define SOUND_ENVIRONMENT_ROOM 2 +#define SOUND_ENVIRONMENT_BATHROOM 3 +#define SOUND_ENVIRONMENT_LIVINGROOM 4 +#define SOUND_ENVIRONMENT_STONEROOM 5 +#define SOUND_ENVIRONMENT_AUDITORIUM 6 +#define SOUND_ENVIRONMENT_CONCERT_HALL 7 +#define SOUND_ENVIRONMENT_CAVE 8 +#define SOUND_ENVIRONMENT_ARENA 9 +#define SOUND_ENVIRONMENT_HANGAR 10 +#define SOUND_ENVIRONMENT_CARPETED_HALLWAY 11 +#define SOUND_ENVIRONMENT_HALLWAY 12 +#define SOUND_ENVIRONMENT_STONE_CORRIDOR 13 +#define SOUND_ENVIRONMENT_ALLEY 14 +#define SOUND_ENVIRONMENT_FOREST 15 +#define SOUND_ENVIRONMENT_CITY 16 +#define SOUND_ENVIRONMENT_MOUNTAINS 17 +#define SOUND_ENVIRONMENT_QUARRY 18 +#define SOUND_ENVIRONMENT_PLAIN 19 +#define SOUND_ENVIRONMENT_PARKING_LOT 20 +#define SOUND_ENVIRONMENT_SEWER_PIPE 21 +#define SOUND_ENVIRONMENT_UNDERWATER 22 +#define SOUND_ENVIRONMENT_DRUGGED 23 +#define SOUND_ENVIRONMENT_DIZZY 24 +#define SOUND_ENVIRONMENT_PSYCHOTIC 25 +//If we ever make custom ones add them here + +//"sound areas": easy way of keeping different types of areas consistent. +#define SOUND_AREA_STANDARD_STATION SOUND_ENVIRONMENT_PARKING_LOT +#define SOUND_AREA_LARGE_ENCLOSED SOUND_ENVIRONMENT_QUARRY +#define SOUND_AREA_SMALL_ENCLOSED SOUND_ENVIRONMENT_BATHROOM +#define SOUND_AREA_TUNNEL_ENCLOSED SOUND_ENVIRONMENT_STONEROOM +#define SOUND_AREA_LARGE_SOFTFLOOR SOUND_ENVIRONMENT_CARPETED_HALLWAY +#define SOUND_AREA_MEDIUM_SOFTFLOOR SOUND_ENVIRONMENT_LIVINGROOM +#define SOUND_AREA_SMALL_SOFTFLOOR SOUND_ENVIRONMENT_ROOM +#define SOUND_AREA_ASTEROID SOUND_ENVIRONMENT_CAVE +#define SOUND_AREA_SPACE SOUND_ENVIRONMENT_UNDERWATER +#define SOUND_AREA_LAVALAND SOUND_ENVIRONMENT_MOUNTAINS +#define SOUND_AREA_ICEMOON SOUND_ENVIRONMENT_CAVE +#define SOUND_AREA_WOODFLOOR SOUND_ENVIRONMENT_CITY diff --git a/code/__DEFINES/subsystems.dm b/code/__DEFINES/subsystems.dm index 1c2640fbdb2..ed76f6fd3ff 100644 --- a/code/__DEFINES/subsystems.dm +++ b/code/__DEFINES/subsystems.dm @@ -44,7 +44,8 @@ // Subsystem init_order, from highest priority to lowest priority // Subsystems shutdown in the reverse of the order they initialize in // The numbers just define the ordering, they are meaningless otherwise. -#define INIT_ORDER_TITLE 100 // This **MUST** load first or people will se blank lobby screens +#define INIT_ORDER_PROFILER 101 +#define INIT_ORDER_TITLE 100 // Load this quickly so people dont see a blank lobby screen #define INIT_ORDER_GARBAGE 21 #define INIT_ORDER_DBCORE 20 #define INIT_ORDER_BLACKBOX 19 @@ -80,7 +81,7 @@ #define INIT_ORDER_SHUTTLE -21 #define INIT_ORDER_NIGHTSHIFT -22 #define INIT_ORDER_NANOMOB -23 -#define INIT_ORDER_SQUEAK -40 +#define INIT_ORDER_LATE_MAPPING -40 #define INIT_ORDER_PATH -50 #define INIT_ORDER_PERSISTENCE -95 @@ -93,6 +94,7 @@ #define FIRE_PRIORITY_CLEANUP 10 #define FIRE_PRIORITY_TICKETS 10 #define FIRE_PRIORITY_RESEARCH 10 +#define FIRE_PRIORITY_AMBIENCE 10 #define FIRE_PRIORITY_GARBAGE 15 #define FIRE_PRIORITY_WET_FLOORS 20 #define FIRE_PRIORITY_AIR 20 @@ -129,8 +131,9 @@ #define RUNLEVELS_DEFAULT (RUNLEVEL_SETUP | RUNLEVEL_GAME | RUNLEVEL_POSTGAME) +// This do{} WHILE (FALSE) syntax may look stupid, but it speeds things up because BYOND memes #define COMPILE_OVERLAYS(A)\ - if (TRUE) {\ + do { \ var/list/ad = A.add_overlays;\ var/list/rm = A.remove_overlays;\ var/list/po = A.priority_overlays;\ @@ -146,4 +149,4 @@ A.overlays |= po;\ }\ A.flags_2 &= ~OVERLAY_QUEUED_2;\ -} +} while (FALSE) diff --git a/code/__DEFINES/tgs.dm b/code/__DEFINES/tgs.dm index 2562bfe4d34..af09ab67110 100644 --- a/code/__DEFINES/tgs.dm +++ b/code/__DEFINES/tgs.dm @@ -1,6 +1,6 @@ // tgstation-server DMAPI -#define TGS_DMAPI_VERSION "5.2.9" +#define TGS_DMAPI_VERSION "6.0.3" // All functions and datums outside this document are subject to change with any version and should not be relied on. @@ -67,7 +67,7 @@ #define TGS_EVENT_REPO_CHECKOUT 1 /// When the repository performs a fetch operation. No parameters #define TGS_EVENT_REPO_FETCH 2 -/// When the repository merges a pull request. Parameters: PR Number, PR Sha, (Nullable) Comment made by TGS user +/// When the repository test merges. Parameters: PR Number, PR Sha, (Nullable) Comment made by TGS user #define TGS_EVENT_REPO_MERGE_PULL_REQUEST 3 /// Before the repository makes a sychronize operation. Parameters: Absolute repostiory path #define TGS_EVENT_REPO_PRE_SYNCHRONIZE 4 @@ -95,8 +95,13 @@ #define TGS_EVENT_WATCHDOG_SHUTDOWN 15 /// Before the watchdog detaches for a TGS update/restart. No parameters. #define TGS_EVENT_WATCHDOG_DETACH 16 -// We don't actually implement this value as the DMAPI can never receive it +// We don't actually implement these 4 events as the DMAPI can never receive them. // #define TGS_EVENT_WATCHDOG_LAUNCH 17 +// #define TGS_EVENT_WATCHDOG_CRASH 18 +// #define TGS_EVENT_WORLD_END_PROCESS 19 +// #define TGS_EVENT_WORLD_REBOOT 20 +/// Watchdog event when TgsInitializationComplete() is called. No parameters. +#define TGS_EVENT_WORLD_PRIME 21 // OTHER ENUMS @@ -130,7 +135,6 @@ * * This may use [/world/var/sleep_offline] to make this happen so ensure no changes are made to it while this call is running. * Afterwards, consider explicitly setting it to what you want to avoid this BYOND bug: http://www.byond.com/forum/post/2575184 - * Before this point, note that any static files or directories may be in use by another server. Your code should account for this. * This function should not be called before ..() in [/world/proc/New]. */ /world/proc/TgsInitializationComplete() @@ -140,7 +144,7 @@ #define TGS_TOPIC var/tgs_topic_return = TgsTopic(args[1]); if(tgs_topic_return) return tgs_topic_return /** - * Call this at the beginning of [world/proc/Reboot]. + * Call this as late as possible in [world/proc/Reboot]. */ /world/proc/TgsReboot() return @@ -152,6 +156,8 @@ /datum/tgs_revision_information /// Full SHA of the commit. var/commit + /// ISO 8601 timestamp of when the commit was created + var/timestamp /// Full sha of last known remote commit. This may be null if the TGS repository is not currently tracking a remote branch. var/origin_commit @@ -190,21 +196,19 @@ /// Represents a merge of a GitHub pull request. /datum/tgs_revision_information/test_merge - /// The pull request number. + /// The test merge number. var/number - /// The pull request title when it was merged. + /// The test merge source's title when it was merged. var/title - /// The pull request body when it was merged. + /// The test merge source's body when it was merged. var/body - /// The GitHub username of the pull request's author. + /// The Username of the test merge source's author. var/author - /// An http URL to the pull request. + /// An http URL to the test merge source. var/url - /// The SHA of the pull request when that was merged. - var/pull_request_commit - /// ISO 8601 timestamp of when the pull request was merged. - var/time_merged - /// (Nullable) Comment left by the TGS user who initiated the merge.. + /// The SHA of the test merge when that was merged. + var/head_commit + /// Optional comment left by the TGS user who initiated the merge. var/comment /// Represents a connected chat channel. @@ -263,11 +267,11 @@ // API FUNCTIONS /// Returns the maximum supported [/datum/tgs_version] of the DMAPI. -/world/proc/TgsMaximumAPIVersion() +/world/proc/TgsMaximumApiVersion() return /// Returns the minimum supported [/datum/tgs_version] of the DMAPI. -/world/proc/TgsMinimumAPIVersion() +/world/proc/TgsMinimumApiVersion() return /** diff --git a/code/__HELPERS/AnimationLibrary.dm b/code/__HELPERS/AnimationLibrary.dm index cc496a85b63..1f0c3dd9ab1 100644 --- a/code/__HELPERS/AnimationLibrary.dm +++ b/code/__HELPERS/AnimationLibrary.dm @@ -4,26 +4,26 @@ * The spin from being thrown will interrupt most of these animations as will grabs, account for that accordingly. */ -/proc/animate_fade_grayscale(var/atom/A, var/time = 5) +/proc/animate_fade_grayscale(atom/A, time = 5) if(!istype(A) && !istype(A, /client)) return A.color = null animate(A, color = MATRIX_GREYSCALE, time = time, easing = SINE_EASING) -/proc/animate_melt_pixel(var/atom/A) +/proc/animate_melt_pixel(atom/A) if(!istype(A)) return animate(A, pixel_y = 0, time = 50 - A.pixel_y, alpha = 175, easing = BOUNCE_EASING) animate(alpha = 0, easing = LINEAR_EASING) -/proc/animate_explode_pixel(var/atom/A) +/proc/animate_explode_pixel(atom/A) if(!istype(A)) return var/floatdegrees = rand(5, 20) var/side = pick(-1, 1) animate(A, pixel_x = rand(-64, 64), pixel_y = rand(-64, 64), transform = matrix(floatdegrees * (side == 1 ? 1:-1), MATRIX_ROTATE), time = 10, alpha = 0, easing = SINE_EASING) -/proc/animate_float(var/atom/A, var/loopnum = -1, floatspeed = 20, random_side = 1) +/proc/animate_float(atom/A, loopnum = -1, floatspeed = 20, random_side = 1) if(!istype(A)) return var/floatdegrees = rand(5, 20) @@ -35,7 +35,7 @@ animate(A, pixel_y = 32, transform = matrix(floatdegrees * (side == 1 ? 1:-1), MATRIX_ROTATE), time = floatspeed, loop = loopnum, easing = SINE_EASING) animate(pixel_y = 0, transform = matrix(floatdegrees * (side == 1 ? -1:1), MATRIX_ROTATE), time = floatspeed, loop = loopnum, easing = SINE_EASING) -/proc/animate_levitate(var/atom/A, var/loopnum = -1, floatspeed = 20, random_side = 1) +/proc/animate_levitate(atom/A, loopnum = -1, floatspeed = 20, random_side = 1) if(!istype(A)) return var/floatdegrees = rand(5, 20) @@ -47,7 +47,7 @@ animate(A, pixel_y = 8, transform = matrix(floatdegrees * (side == 1 ? 1:-1), MATRIX_ROTATE), time = floatspeed, loop = loopnum, easing = SINE_EASING) animate(pixel_y = 0, transform = null, time = floatspeed, loop = loopnum, easing = SINE_EASING) -/proc/animate_ghostly_presence(var/atom/A, var/loopnum = -1, floatspeed = 20, random_side = 1) +/proc/animate_ghostly_presence(atom/A, loopnum = -1, floatspeed = 20, random_side = 1) if(!istype(A)) return var/floatdegrees = rand(5, 20) @@ -59,7 +59,7 @@ animate(A, pixel_y = 8, transform = matrix(floatdegrees * (side == 1 ? 1:-1), MATRIX_ROTATE), time = floatspeed, loop = loopnum, easing = SINE_EASING) animate(pixel_y = 0, transform = matrix(floatdegrees * (side == 1 ? -1:1), MATRIX_ROTATE), time = floatspeed, loop = loopnum, easing = SINE_EASING) -/proc/animate_fading_leap_up(var/atom/A) +/proc/animate_fading_leap_up(atom/A) if(!istype(A)) return var/matrix/M = matrix() @@ -71,7 +71,7 @@ sleep(1) A.alpha = 0 -/proc/animate_fading_leap_down(var/atom/A) +/proc/animate_fading_leap_down(atom/A) if(!istype(A)) return var/matrix/M = matrix() @@ -84,7 +84,7 @@ sleep(1) animate(A, transform = M, pixel_z = 0, alpha = 255, time = 1, loop = 1, easing = LINEAR_EASING) -/proc/animate_shake(var/atom/A, var/amount = 5, var/x_severity = 2, var/y_severity = 2) +/proc/animate_shake(atom/A, amount = 5, x_severity = 2, y_severity = 2) // Wiggles the sprite around on its tile then returns it to normal if(!istype(A)) return @@ -101,7 +101,7 @@ spawn(amount) animate(A, transform = null, pixel_y = 0, pixel_x = 0,time = 1,loop = 1, easing = LINEAR_EASING) -/proc/animate_teleport(var/atom/A) +/proc/animate_teleport(atom/A) if(!istype(A)) return var/matrix/M = matrix(1, 3, MATRIX_SCALE) @@ -110,7 +110,7 @@ animate(transform = M, time = 5, color = "#1111ff", alpha = 0, easing = CIRCULAR_EASING) animate(transform = null, time = 5, color = "#ffffff", alpha = 255, pixel_y = 0, easing = ELASTIC_EASING) -/proc/animate_teleport_wiz(var/atom/A) +/proc/animate_teleport_wiz(atom/A) if(!istype(A)) return var/matrix/M = matrix(0, 4, MATRIX_SCALE) @@ -119,14 +119,14 @@ animate(time = 8, transform = M, alpha = 5) //Do nothing, essentially animate(transform = null, time = 5, color = "#ffffff", alpha = 255, pixel_y = 0, easing = ELASTIC_EASING) -/proc/animate_rainbow_glow_old(var/atom/A) +/proc/animate_rainbow_glow_old(atom/A) if(!istype(A)) return animate(A, color = "#FF0000", time = rand(5,10), loop = -1, easing = LINEAR_EASING) animate(color = "#00FF00", time = rand(5,10), loop = -1, easing = LINEAR_EASING) animate(color = "#0000FF", time = rand(5,10), loop = -1, easing = LINEAR_EASING) -/proc/animate_rainbow_glow(var/atom/A) +/proc/animate_rainbow_glow(atom/A) if(!istype(A)) return animate(A, color = "#FF0000", time = rand(5,10), loop = -1, easing = LINEAR_EASING) @@ -136,37 +136,37 @@ animate(color = "#0000FF", time = rand(5,10), loop = -1, easing = LINEAR_EASING) animate(color = "#FF00FF", time = rand(5,10), loop = -1, easing = LINEAR_EASING) -/proc/animate_fade_to_color_fill(var/atom/A, var/the_color, var/time) +/proc/animate_fade_to_color_fill(atom/A, the_color, time) if(!istype(A) || !the_color || !time) return animate(A, color = the_color, time = time, easing = LINEAR_EASING) -/proc/animate_flash_color_fill(var/atom/A, var/the_color, var/loops, var/time) +/proc/animate_flash_color_fill(atom/A, the_color, loops, time) if(!istype(A) || !the_color || !time || !loops) return animate(A, color = the_color, time = time, easing = LINEAR_EASING) animate(color = "#FFFFFF", time = 5, loop = loops, easing = LINEAR_EASING) -/proc/animate_flash_color_fill_inherit(var/atom/A, var/the_color, var/loops, var/time) +/proc/animate_flash_color_fill_inherit(atom/A, the_color, loops, time) if(!istype(A) || !the_color || !time || !loops) return var/color_old = A.color animate(A, color = the_color, time = time, loop = loops, easing = LINEAR_EASING) animate(A, color = color_old, time = time, loop = loops, easing = LINEAR_EASING) -/proc/animate_clownspell(var/atom/A) +/proc/animate_clownspell(atom/A) if(!istype(A)) return animate(A, transform = matrix(1.3, MATRIX_SCALE), time = 5, color = "#00ff00", easing = BACK_EASING) animate(transform = null, time = 5, color = "#ffffff", easing = ELASTIC_EASING) -/proc/animate_wiggle_then_reset(var/atom/A, var/loops = 5, var/speed = 5, var/x_var = 3, var/y_var = 3) +/proc/animate_wiggle_then_reset(atom/A, loops = 5, speed = 5, x_var = 3, y_var = 3) if(!istype(A) || !loops || !speed) return animate(A, pixel_x = rand(-x_var, x_var), pixel_y = rand(-y_var, y_var), time = speed * 2,loop = loops, easing = rand(2,7)) animate(pixel_x = 0, pixel_y = 0, time = speed, easing = rand(2,7)) -/proc/animate_spin(var/atom/A, var/dir = "L", var/T = 1, var/looping = -1) +/proc/animate_spin(atom/A, dir = "L", T = 1, looping = -1) if(!istype(A)) return @@ -180,7 +180,7 @@ animate(transform = matrix(M, turn, MATRIX_ROTATE | MATRIX_MODIFY), time = T, loop = looping) animate(transform = matrix(M, turn, MATRIX_ROTATE | MATRIX_MODIFY), time = T, loop = looping) -/proc/animate_shockwave(var/atom/A) +/proc/animate_shockwave(atom/A) if(!istype(A)) return var/punchstr = rand(10, 20) diff --git a/code/__HELPERS/_logging.dm b/code/__HELPERS/_logging.dm index 6a5ba2d22ca..34e7f3fda28 100644 --- a/code/__HELPERS/_logging.dm +++ b/code/__HELPERS/_logging.dm @@ -147,16 +147,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 -/** - * Standardized method for tracking startup times. - */ -/proc/log_startup_progress(var/message) - to_chat(world, "[message]") - log_world(message) - // A logging proc that only outputs after setup is done, to // help devs test initialization stuff that happens a lot -/proc/log_after_setup(var/message) +/proc/log_after_setup(message) if(SSticker && SSticker.current_state > GAME_STATE_SETTING_UP) to_chat(world, "[message]") log_world(message) @@ -167,7 +160,7 @@ GLOBAL_PROTECT(log_end) // Helper procs for building detailed log lines -/proc/datum_info_line(var/datum/d) +/proc/datum_info_line(datum/d) if(!istype(d)) return if(!istype(d, /mob)) @@ -175,7 +168,7 @@ GLOBAL_PROTECT(log_end) var/mob/m = d return "[m] ([m.ckey]) ([m.type])" -/proc/atom_loc_line(var/atom/a) +/proc/atom_loc_line(atom/a) if(!istype(a)) return var/turf/t = get_turf(a) @@ -189,3 +182,16 @@ GLOBAL_PROTECT(log_end) /client/proc/simple_info_line() return "[key_name(src)] ([mob.x],[mob.y],[mob.z])" + +/proc/loc_name(atom/A) + if(!istype(A)) + return "(INVALID LOCATION)" + + var/turf/T = A + if(!istype(T)) + T = get_turf(A) + + if(istype(T)) + return "([AREACOORD(T)])" + else if(A.loc) + return "(UNKNOWN (?, ?, ?))" diff --git a/code/__HELPERS/cmp.dm b/code/__HELPERS/cmp.dm index afb70cb81e6..612f7b5abef 100644 --- a/code/__HELPERS/cmp.dm +++ b/code/__HELPERS/cmp.dm @@ -31,6 +31,9 @@ /proc/cmp_subsystem_priority(datum/controller/subsystem/a, datum/controller/subsystem/b) return a.priority - b.priority +/proc/cmp_filter_data_priority(list/A, list/B) + return A["priority"] - B["priority"] + /proc/cmp_timer(datum/timedevent/a, datum/timedevent/b) return a.timeToRun - b.timeToRun diff --git a/code/__HELPERS/debugger.dm b/code/__HELPERS/debugger.dm new file mode 100644 index 00000000000..e68b49e60db --- /dev/null +++ b/code/__HELPERS/debugger.dm @@ -0,0 +1,22 @@ +// All the stuff in here is related to the auxtools debugger, supplied as part of the DM Language Server VSCode extension +// These procs are named EXACTLY as they are since the debugger itself will hook into these procs internally +// Do not change these names. Please. -aa + +/proc/auxtools_stack_trace(msg) + CRASH(msg) + +/proc/enable_debugging(mode, port) + CRASH("auxtools not loaded") + +// Called in world/New() +/world/proc/enable_auxtools_debugger() + var/debug_server = world.GetConfig("env", "AUXTOOLS_DEBUG_DLL") + if (debug_server) + call(debug_server, "auxtools_init")() + enable_debugging() + +// Called in world/Del(). This is VERY important, otherwise you get phantom threads which try to lookup RAM they arent allowed to +/world/proc/disable_auxtools_debugger() + var/debug_server = world.GetConfig("env", "AUXTOOLS_DEBUG_DLL") + if (debug_server) + call(debug_server, "auxtools_shutdown")() diff --git a/code/__HELPERS/files.dm b/code/__HELPERS/files.dm index 0a58ed035f7..04330b7805c 100644 --- a/code/__HELPERS/files.dm +++ b/code/__HELPERS/files.dm @@ -17,7 +17,7 @@ for(var/file in args) src << browse_rsc(file) -/client/proc/browse_files(root="data/logs/", max_iterations=10, list/valid_extensions=list(".txt",".log",".htm")) +/client/proc/browse_files(root="data/logs/", max_iterations=10, list/valid_extensions=list("txt", "log", "htm", "json")) // wow why was this ever a parameter root = "data/logs/" var/path = root @@ -39,7 +39,8 @@ if(copytext(path,-1,0) != "/") //didn't choose a directory, no need to iterate again break - var/extension = copytext(path,-4,0) + var/list/exploded = splittext(path, ".") + var/extension = exploded[length(exploded)] if( !fexists(path) || !(extension in valid_extensions) ) to_chat(src, "Error: browse_files(): File not found/Invalid file([path]).") return diff --git a/code/__HELPERS/filters.dm b/code/__HELPERS/filters.dm new file mode 100644 index 00000000000..5121e4955ff --- /dev/null +++ b/code/__HELPERS/filters.dm @@ -0,0 +1,320 @@ +#define ICON_NOT_SET "Not Set" + +//This is stored as a nested list instead of datums or whatever because it json encodes nicely for usage in tgui +GLOBAL_LIST_INIT(master_filter_info, list( + "alpha" = list( + "defaults" = list( + "x" = 0, + "y" = 0, + "icon" = ICON_NOT_SET, + "render_source" = "", + "flags" = 0 + ), + "flags" = list( + "MASK_INVERSE" = MASK_INVERSE, + "MASK_SWAP" = MASK_SWAP + ) + ), + "angular_blur" = list( + "defaults" = list( + "x" = 0, + "y" = 0, + "size" = 1 + ) + ), + /* Not supported because making a proper matrix editor on the frontend would be a huge dick pain. + Uncomment if you ever implement it + "color" = list( + "defaults" = list( + "color" = matrix(), + "space" = FILTER_COLOR_RGB + ) + ), + */ + "displace" = list( + "defaults" = list( + "x" = 0, + "y" = 0, + "size" = null, + "icon" = ICON_NOT_SET, + "render_source" = "" + ) + ), + "drop_shadow" = list( + "defaults" = list( + "x" = 1, + "y" = -1, + "size" = 1, + "offset" = 0, + "color" = COLOR_HALF_TRANSPARENT_BLACK + ) + ), + "blur" = list( + "defaults" = list( + "size" = 1 + ) + ), + "layer" = list( + "defaults" = list( + "x" = 0, + "y" = 0, + "icon" = ICON_NOT_SET, + "render_source" = "", + "flags" = FILTER_OVERLAY, + "color" = "", + "transform" = null, + "blend_mode" = BLEND_DEFAULT + ) + ), + "motion_blur" = list( + "defaults" = list( + "x" = 0, + "y" = 0 + ) + ), + "outline" = list( + "defaults" = list( + "size" = 0, + "color" = COLOR_BLACK, + "flags" = NONE + ), + "flags" = list( + "OUTLINE_SHARP" = OUTLINE_SHARP, + "OUTLINE_SQUARE" = OUTLINE_SQUARE + ) + ), + "radial_blur" = list( + "defaults" = list( + "x" = 0, + "y" = 0, + "size" = 0.01 + ) + ), + "rays" = list( + "defaults" = list( + "x" = 0, + "y" = 0, + "size" = 16, + "color" = COLOR_WHITE, + "offset" = 0, + "density" = 10, + "threshold" = 0.5, + "factor" = 0, + "flags" = FILTER_OVERLAY | FILTER_UNDERLAY + ), + "flags" = list( + "FILTER_OVERLAY" = FILTER_OVERLAY, + "FILTER_UNDERLAY" = FILTER_UNDERLAY + ) + ), + "ripple" = list( + "defaults" = list( + "x" = 0, + "y" = 0, + "size" = 1, + "repeat" = 2, + "radius" = 0, + "falloff" = 1, + "flags" = NONE + ), + "flags" = list( + "WAVE_BOUNDED" = WAVE_BOUNDED + ) + ), + "wave" = list( + "defaults" = list( + "x" = 0, + "y" = 0, + "size" = 1, + "offset" = 0, + "flags" = NONE + ), + "flags" = list( + "WAVE_SIDEWAYS" = WAVE_SIDEWAYS, + "WAVE_BOUNDED" = WAVE_BOUNDED + ) + ) +)) + +#undef ICON_NOT_SET +/* + * Helpers to generate lists for filter helpers + * This is the only practical way of writing these that actually produces sane lists + */ +/proc/alpha_mask_filter(x, y, icon/icon, render_source, flags) + . = list("type" = "alpha") + if(!isnull(x)) + .["x"] = x + if(!isnull(y)) + .["y"] = y + if(!isnull(icon)) + .["icon"] = icon + if(!isnull(render_source)) + .["render_source"] = render_source + if(!isnull(flags)) + .["flags"] = flags + +/proc/angular_blur_filter(x, y, size) + . = list("type" = "angular_blur") + if(!isnull(x)) + .["x"] = x + if(!isnull(y)) + .["y"] = y + if(!isnull(size)) + .["size"] = size + +/proc/color_matrix_filter(matrix/in_matrix, space) + . = list("type" = "color") + .["color"] = in_matrix + if(!isnull(space)) + .["space"] = space + +/proc/displacement_map_filter(icon, render_source, x, y, size = 32) + . = list("type" = "displace") + if(!isnull(icon)) + .["icon"] = icon + if(!isnull(render_source)) + .["render_source"] = render_source + if(!isnull(x)) + .["x"] = x + if(!isnull(y)) + .["y"] = y + if(!isnull(size)) + .["size"] = size + +/proc/drop_shadow_filter(x, y, size, offset, color) + . = list("type" = "drop_shadow") + if(!isnull(x)) + .["x"] = x + if(!isnull(y)) + .["y"] = y + if(!isnull(size)) + .["size"] = size + if(!isnull(offset)) + .["offset"] = offset + if(!isnull(color)) + .["color"] = color + +/proc/gauss_blur_filter(size) + . = list("type" = "blur") + if(!isnull(size)) + .["size"] = size + +/proc/layering_filter(icon, render_source, x, y, flags, color, transform, blend_mode) + . = list("type" = "layer") + if(!isnull(icon)) + .["icon"] = icon + if(!isnull(render_source)) + .["render_source"] = render_source + if(!isnull(x)) + .["x"] = x + if(!isnull(y)) + .["y"] = y + if(!isnull(color)) + .["color"] = color + if(!isnull(flags)) + .["flags"] = flags + if(!isnull(transform)) + .["transform"] = transform + if(!isnull(blend_mode)) + .["blend_mode"] = blend_mode + +/proc/motion_blur_filter(x, y) + . = list("type" = "motion_blur") + if(!isnull(x)) + .["x"] = x + if(!isnull(y)) + .["y"] = y + +/proc/outline_filter(size, color, flags) + . = list("type" = "outline") + if(!isnull(size)) + .["size"] = size + if(!isnull(color)) + .["color"] = color + if(!isnull(flags)) + .["flags"] = flags + +/proc/radial_blur_filter(size, x, y) + . = list("type" = "radial_blur") + if(!isnull(size)) + .["size"] = size + if(!isnull(x)) + .["x"] = x + if(!isnull(y)) + .["y"] = y + +/proc/rays_filter(size, color, offset, density, threshold, factor, x, y, flags) + . = list("type" = "rays") + if(!isnull(size)) + .["size"] = size + if(!isnull(color)) + .["color"] = color + if(!isnull(offset)) + .["offset"] = offset + if(!isnull(density)) + .["density"] = density + if(!isnull(threshold)) + .["threshold"] = threshold + if(!isnull(factor)) + .["factor"] = factor + if(!isnull(x)) + .["x"] = x + if(!isnull(y)) + .["y"] = y + if(!isnull(flags)) + .["flags"] = flags + +/proc/ripple_filter(radius, size, falloff, repeat, x, y, flags) + . = list("type" = "ripple") + if(!isnull(radius)) + .["radius"] = radius + if(!isnull(size)) + .["size"] = size + if(!isnull(falloff)) + .["falloff"] = falloff + if(!isnull(repeat)) + .["repeat"] = repeat + if(!isnull(flags)) + .["flags"] = flags + if(!isnull(x)) + .["x"] = x + if(!isnull(y)) + .["y"] = y + +/proc/wave_filter(x, y, size, offset, flags) + . = list("type" = "wave") + if(!isnull(size)) + .["size"] = size + if(!isnull(x)) + .["x"] = x + if(!isnull(y)) + .["y"] = y + if(!isnull(offset)) + .["offset"] = offset + if(!isnull(flags)) + .["flags"] = flags + +/proc/apply_wibbly_filters(atom/in_atom, length) + for(var/i in 1 to 7) + //This is a very baffling and strange way of doing this but I am just preserving old functionality + var/X + var/Y + var/rsq + do + X = 60 * rand() - 30 + Y = 60 * rand() - 30 + rsq = X * X + Y * Y + while(rsq < 100 || rsq > 900) // Yeah let's just loop infinitely due to bad luck what's the worst that could happen? + var/random_roll = rand() + in_atom.add_filter("wibbly-[i]", 5, wave_filter(x = X, y = Y, size = rand() * 2.5 + 0.5, offset = random_roll)) + var/filter = in_atom.get_filter("wibbly-[i]") + animate(filter, offset = random_roll, time = 0, loop = -1, flags = ANIMATION_PARALLEL) + animate(offset = random_roll - 1, time = rand() * 20 + 10) + +/proc/remove_wibbly_filters(atom/in_atom) + var/filter + for(var/i in 1 to 7) + filter = in_atom.get_filter("wibbly-[i]") + animate(filter) + in_atom.remove_filter("wibbly-[i]") diff --git a/code/__HELPERS/game.dm b/code/__HELPERS/game.dm index bd99ca2ec62..63e527b59f2 100644 --- a/code/__HELPERS/game.dm +++ b/code/__HELPERS/game.dm @@ -51,7 +51,7 @@ // Like view but bypasses luminosity check -/proc/hear(var/range, var/atom/source) +/proc/hear(range, atom/source) var/lum = source.luminosity source.luminosity = 6 @@ -145,7 +145,7 @@ // It will keep doing this until it checks every content possible. This will fix any problems with mobs, that are inside objects, // being unable to hear people due to being in a box within a bag. -/proc/recursive_mob_check(var/atom/O, var/list/L = list(), var/recursion_limit = 3, var/client_check = 1, var/sight_check = 1, var/include_radio = 1) +/proc/recursive_mob_check(atom/O, list/L = list(), recursion_limit = 3, client_check = 1, sight_check = 1, include_radio = 1) //GLOB.debug_mob += O.contents.len if(!recursion_limit) @@ -174,7 +174,7 @@ // The old system would loop through lists for a total of 5000 per function call, in an empty server. // This new system will loop at around 1000 in an empty server. -/proc/get_mobs_in_view(var/R, var/atom/source, var/include_clientless = FALSE) +/proc/get_mobs_in_view(R, atom/source, include_clientless = FALSE) // Returns a list of mobs in range of R from source. Used in radio and say code. var/turf/T = get_turf(source) @@ -200,7 +200,7 @@ return hear -/proc/get_mobs_in_radio_ranges(var/list/obj/item/radio/radios) +/proc/get_mobs_in_radio_ranges(list/obj/item/radio/radios) . = list() // Returns a list of mobs who can hear any of the radios given in @radios var/list/speaker_coverage = list() @@ -263,7 +263,7 @@ return 0 return 1 -/proc/isInSight(var/atom/A, var/atom/B) +/proc/isInSight(atom/A, atom/B) var/turf/Aturf = get_turf(A) var/turf/Bturf = get_turf(B) @@ -293,7 +293,7 @@ if(AM.Move(get_step(T, direction))) break -/proc/get_mob_by_key(var/key) +/proc/get_mob_by_key(key) for(var/mob/M in GLOB.mob_list) if(M.ckey == lowertext(key)) return M @@ -339,22 +339,22 @@ O.screen_loc = screen_loc return O -/proc/Show2Group4Delay(obj/O, list/group, delay=0) - if(!isobj(O)) return - if(!group) group = GLOB.clients - for(var/client/C in group) - C.screen += O - if(delay) - spawn(delay) - for(var/client/C in group) - C.screen -= O +/proc/remove_images_from_clients(image/I, list/show_to) + for(var/client/C in show_to) + C.images -= I /proc/flick_overlay(image/I, list/show_to, duration) for(var/client/C in show_to) C.images += I - spawn(duration) - for(var/client/C in show_to) - C.images -= I + addtimer(CALLBACK(GLOBAL_PROC, /proc/remove_images_from_clients, I, show_to), duration, TIMER_CLIENT_TIME) + +/proc/flick_overlay_view(image/I, atom/target, duration) //wrapper for the above, flicks to everyone who can see the target atom + var/list/viewing = list() + for(var/m in viewers(target)) + var/mob/M = m + if(M.client) + viewing += M.client + flick_overlay(I, viewing, duration) /proc/get_active_player_count() // Get active players who are playing in the round @@ -392,7 +392,7 @@ src.dest_x = dest_x src.dest_y = dest_y -/proc/projectile_trajectory(var/src_x, var/src_y, var/rotation, var/angle, var/power) +/proc/projectile_trajectory(src_x, src_y, rotation, angle, power) // returns the destination (Vx,y) that a projectile shot at [src_x], [src_y], with an angle of [angle], // rotated at [rotation] and with the power of [power] @@ -410,7 +410,7 @@ return new /datum/projectile_data(src_x, src_y, time, distance, power_x, power_y, dest_x, dest_y) -/proc/mobs_in_area(var/area/the_area, var/client_needed=0, var/moblist=GLOB.mob_list) +/proc/mobs_in_area(area/the_area, client_needed=0, moblist=GLOB.mob_list) var/list/mobs_found[0] var/area/our_area = get_area(the_area) for(var/mob/M in moblist) @@ -421,7 +421,7 @@ mobs_found += M return mobs_found -/proc/alone_in_area(var/area/the_area, var/mob/must_be_alone, var/check_type = /mob/living/carbon) +/proc/alone_in_area(area/the_area, mob/must_be_alone, check_type = /mob/living/carbon) var/area/our_area = get_area(the_area) for(var/C in GLOB.alive_mob_list) if(!istype(C, check_type)) diff --git a/code/__HELPERS/global_lists.dm b/code/__HELPERS/global_lists.dm index ee1530df81b..282ad53cd06 100644 --- a/code/__HELPERS/global_lists.dm +++ b/code/__HELPERS/global_lists.dm @@ -84,13 +84,13 @@ continue if(!use_name) - error("Loadout - Missing display name: [G]") + stack_trace("Loadout - Missing display name: [G]") continue if(!initial(G.cost)) - error("Loadout - Missing cost: [G]") + stack_trace("Loadout - Missing cost: [G]") continue if(!initial(G.path)) - error("Loadout - Missing path definition: [G]") + stack_trace("Loadout - Missing path definition: [G]") continue if(!GLOB.loadout_categories[use_category]) diff --git a/code/__HELPERS/heap.dm b/code/__HELPERS/heap.dm index b878969571e..c9ad037755f 100644 --- a/code/__HELPERS/heap.dm +++ b/code/__HELPERS/heap.dm @@ -24,7 +24,7 @@ //(i.e the max or the min dependant on the comparison function) /datum/heap/proc/Pop() if(!L.len) - return 0 + return null . = L[1] L[1] = L[L.len] @@ -33,33 +33,33 @@ Sink(1) //Get a node up to its right position in the heap -/datum/heap/proc/Swim(var/index) +/datum/heap/proc/Swim(index) var/parent = round(index * 0.5) - while(parent > 0 && (call(cmp)(L[index],L[parent]) > 0)) - L.Swap(index,parent) + while(parent > 0 && (call(cmp)(L[index], L[parent]) > 0)) + L.Swap(index, parent) index = parent parent = round(index * 0.5) //Get a node down to its right position in the heap -/datum/heap/proc/Sink(var/index) +/datum/heap/proc/Sink(index) var/g_child = GetGreaterChild(index) - while(g_child > 0 && (call(cmp)(L[index],L[g_child]) < 0)) - L.Swap(index,g_child) + while(g_child > 0 && (call(cmp)(L[index], L[g_child]) < 0)) + L.Swap(index, g_child) index = g_child g_child = GetGreaterChild(index) //Returns the greater (relative to the comparison proc) of a node children //or 0 if there's no child -/datum/heap/proc/GetGreaterChild(var/index) +/datum/heap/proc/GetGreaterChild(index) if(index * 2 > L.len) return 0 if(index * 2 + 1 > L.len) return index * 2 - if(call(cmp)(L[index * 2],L[index * 2 + 1]) < 0) + if(call(cmp)(L[index * 2], L[index * 2 + 1]) < 0) return index * 2 + 1 else return index * 2 diff --git a/code/__HELPERS/icon_smoothing.dm b/code/__HELPERS/icon_smoothing.dm index caa8291b4bb..90873b6309a 100644 --- a/code/__HELPERS/icon_smoothing.dm +++ b/code/__HELPERS/icon_smoothing.dm @@ -289,7 +289,7 @@ //Icon smoothing helpers -/proc/smooth_zlevel(var/zlevel, now = FALSE) +/proc/smooth_zlevel(zlevel, now = FALSE) var/list/away_turfs = block(locate(1, 1, zlevel), locate(world.maxx, world.maxy, zlevel)) for(var/V in away_turfs) var/turf/T = V diff --git a/code/__HELPERS/icons.dm b/code/__HELPERS/icons.dm index ef0f47b2f9c..78d9fb407bf 100644 --- a/code/__HELPERS/icons.dm +++ b/code/__HELPERS/icons.dm @@ -894,7 +894,7 @@ The _flatIcons list is a cache for generated icon files. composite.Blend(icon(I.icon, I.icon_state, I.dir, 1), ICON_OVERLAY) return composite -/proc/adjust_brightness(var/color, var/value) +/proc/adjust_brightness(color, value) if(!color) return "#FFFFFF" if(!value) return color @@ -904,7 +904,7 @@ The _flatIcons list is a cache for generated icon files. RGB[3] = clamp(RGB[3]+value,0,255) return rgb(RGB[1],RGB[2],RGB[3]) -/proc/sort_atoms_by_layer(var/list/atoms) +/proc/sort_atoms_by_layer(list/atoms) // Comb sort icons based on levels var/list/result = atoms.Copy() var/gap = result.len @@ -925,7 +925,7 @@ The _flatIcons list is a cache for generated icon files. //Interface for using DrawBox() to draw 1 pixel on a coordinate. //Returns the same icon specifed in the argument, but with the pixel drawn -/proc/DrawPixel(var/icon/I,var/colour,var/drawX,var/drawY) +/proc/DrawPixel(icon/I, colour, drawX, drawY) if(!I) return 0 var/Iwidth = I.Width() @@ -938,7 +938,7 @@ The _flatIcons list is a cache for generated icon files. return I //Interface for easy drawing of one pixel on an atom. -/atom/proc/DrawPixelOn(var/colour, var/drawX, var/drawY) +/atom/proc/DrawPixelOn(colour, drawX, drawY) var/icon/I = new(icon) var/icon/J = DrawPixel(I, colour, drawX, drawY) if(J) //Only set the icon if it succeeded, the icon without the pixel is 1000x better than a black square. @@ -961,7 +961,7 @@ The _flatIcons list is a cache for generated icon files. //Imagine removing pixels from the main icon that are covered by pixels from the mask icon. //Standard behaviour is to cut pixels from the main icon that are covered by pixels from the mask icon unless passed mask_ready, see below. -/proc/get_icon_difference(var/icon/main, var/icon/mask, var/mask_ready) +/proc/get_icon_difference(icon/main, icon/mask, mask_ready) /*You should skip prep if the mask is already sprited properly. This significantly improves performance by eliminating most of the realtime icon work. e.g. A 'ready' mask is a mask where the part you want cut out is missing (no pixels, 0 alpha) from the sprite, and everything else is solid white.*/ diff --git a/code/__HELPERS/lists.dm b/code/__HELPERS/lists.dm index f302d96347d..bf0d7ab2b61 100644 --- a/code/__HELPERS/lists.dm +++ b/code/__HELPERS/lists.dm @@ -39,7 +39,7 @@ //Returns a list in plain english as a string -/proc/english_list(var/list/input, nothing_text = "nothing", and_text = " and ", comma_text = ", ", final_comma_text = "" ) +/proc/english_list(list/input, nothing_text = "nothing", and_text = " and ", comma_text = ", ", final_comma_text = "" ) var/total = input.len if(!total) return "[nothing_text]" @@ -60,7 +60,7 @@ return "[output][and_text][input[index]]" //Returns list element or null. Should prevent "index out of bounds" error. -/proc/listgetindex(var/list/list,index) +/proc/listgetindex(list/list, index) if(istype(list) && list.len) if(isnum(index)) if(InRange(index,1,list.len)) @@ -158,7 +158,7 @@ * If skiprep = 1, repeated elements are treated as one. * If either of arguments is not a list, returns null */ -/proc/difflist(var/list/first, var/list/second, var/skiprep=0) +/proc/difflist(list/first, list/second, skiprep=0) if(!islist(first) || !islist(second)) return var/list/result = new @@ -176,7 +176,7 @@ * If skipref = 1, repeated elements are treated as one. * If either of arguments is not a list, returns null */ -/proc/uniquemergelist(var/list/first, var/list/second, var/skiprep=0) +/proc/uniquemergelist(list/first, list/second, skiprep=0) if(!islist(first) || !islist(second)) return var/list/result = new @@ -236,7 +236,7 @@ return output //Randomize: Return the list in a random order -/proc/shuffle(var/list/L) +/proc/shuffle(list/L) if(!L) return L = L.Copy() @@ -247,20 +247,20 @@ return L //Return a list with no duplicate entries -/proc/uniquelist(var/list/L) +/proc/uniquelist(list/L) . = list() for(var/i in L) . |= i //Mergesort: divides up the list into halves to begin the sort -/proc/sortKey(var/list/client/L, var/order = 1) +/proc/sortKey(list/client/L, order = 1) if(isnull(L) || L.len < 2) return L var/middle = L.len / 2 + 1 return mergeKey(sortKey(L.Copy(0,middle)), sortKey(L.Copy(middle)), order) //Mergsort: does the actual sorting and returns the results back to sortAtom -/proc/mergeKey(var/list/client/L, var/list/client/R, var/order = 1) +/proc/mergeKey(list/client/L, list/client/R, order = 1) var/Li=1 var/Ri=1 var/list/result = new() @@ -277,7 +277,7 @@ return (result + R.Copy(Ri, 0)) //Mergesort: divides up the list into halves to begin the sort -/proc/sortAtom(var/list/atom/L, var/order = 1) +/proc/sortAtom(list/atom/L, order = 1) listclearnulls(L) if(isnull(L) || L.len < 2) return L @@ -285,7 +285,7 @@ return mergeAtoms(sortAtom(L.Copy(0,middle)), sortAtom(L.Copy(middle)), order) //Mergsort: does the actual sorting and returns the results back to sortAtom -/proc/mergeAtoms(var/list/atom/L, var/list/atom/R, var/order = 1) +/proc/mergeAtoms(list/atom/L, list/atom/R, order = 1) if(!L || !R) return 0 var/Li=1 var/Ri=1 @@ -306,7 +306,7 @@ //Mergesort: Specifically for record datums in a list. -/proc/sortRecord(var/list/datum/data/record/L, var/field = "name", var/order = 1) +/proc/sortRecord(list/datum/data/record/L, field = "name", order = 1) if(isnull(L)) return list() if(L.len < 2) @@ -315,7 +315,7 @@ return mergeRecordLists(sortRecord(L.Copy(0, middle), field, order), sortRecord(L.Copy(middle), field, order), field, order) //Mergsort: does the actual sorting and returns the results back to sortRecord -/proc/mergeRecordLists(var/list/datum/data/record/L, var/list/datum/data/record/R, var/field = "name", var/order = 1) +/proc/mergeRecordLists(list/datum/data/record/L, list/datum/data/record/R, field = "name", order = 1) var/Li=1 var/Ri=1 var/list/result = new() @@ -342,20 +342,20 @@ //Mergesort: any value in a list -/proc/sortList(var/list/L) +/proc/sortList(list/L) if(L.len < 2) return L var/middle = L.len / 2 + 1 // Copy is first,second-1 return mergeLists(sortList(L.Copy(0,middle)), sortList(L.Copy(middle))) //second parameter null = to end of list //Mergsorge: uses sortAssoc() but uses the var's name specifically. This should probably be using mergeAtom() instead -/proc/sortNames(var/list/L) +/proc/sortNames(list/L) var/list/Q = new() for(var/atom/x in L) Q[x.name] = x return sortAssoc(Q) -/proc/mergeLists(var/list/L, var/list/R) +/proc/mergeLists(list/L, list/R) var/Li=1 var/Ri=1 var/list/result = new() @@ -371,13 +371,13 @@ // List of lists, sorts by element[key] - for things like crew monitoring computer sorting records by name. -/proc/sortByKey(var/list/L, var/key) +/proc/sortByKey(list/L, key) if(L.len < 2) return L var/middle = L.len / 2 + 1 return mergeKeyedLists(sortByKey(L.Copy(0, middle), key), sortByKey(L.Copy(middle), key), key) -/proc/mergeKeyedLists(var/list/L, var/list/R, var/key) +/proc/mergeKeyedLists(list/L, list/R, key) var/Li=1 var/Ri=1 var/list/result = new() @@ -396,13 +396,13 @@ //Mergesort: any value in a list, preserves key=value structure -/proc/sortAssoc(var/list/L) +/proc/sortAssoc(list/L) if(L.len < 2) return L var/middle = L.len / 2 + 1 // Copy is first,second-1 return mergeAssoc(sortAssoc(L.Copy(0,middle)), sortAssoc(L.Copy(middle))) //second parameter null = to end of list -/proc/mergeAssoc(var/list/L, var/list/R) +/proc/mergeAssoc(list/L, list/R) var/Li=1 var/Ri=1 var/list/result = new() @@ -434,7 +434,7 @@ return r // Returns the key based on the index -/proc/get_key_by_index(var/list/L, var/index) +/proc/get_key_by_index(list/L, index) var/i = 1 for(var/key in L) if(index == i) @@ -442,7 +442,7 @@ i++ return null -/proc/count_by_type(var/list/L, type) +/proc/count_by_type(list/L, type) var/i = 0 for(var/T in L) if(istype(T, type)) @@ -450,7 +450,7 @@ return i //Don't use this on lists larger than half a dozen or so -/proc/insertion_sort_numeric_list_ascending(var/list/L) +/proc/insertion_sort_numeric_list_ascending(list/L) //log_world("ascending len input: [L.len]") var/list/out = list(pop(L)) for(var/entry in L) @@ -467,7 +467,7 @@ //log_world(" output: [out.len]") return out -/proc/insertion_sort_numeric_list_descending(var/list/L) +/proc/insertion_sort_numeric_list_descending(list/L) //log_world("descending len input: [L.len]") var/list/out = insertion_sort_numeric_list_ascending(L) //log_world(" output: [out.len]") @@ -483,13 +483,13 @@ if(islist(.[i])) .[i] = .(.[i]) -/proc/dd_sortedObjectList(var/list/L, var/cache=list()) +/proc/dd_sortedObjectList(list/L, list/cache = list()) if(L.len < 2) return L var/middle = L.len / 2 + 1 // Copy is first,second-1 return dd_mergeObjectList(dd_sortedObjectList(L.Copy(0,middle), cache), dd_sortedObjectList(L.Copy(middle), cache), cache) //second parameter null = to end of list -/proc/dd_mergeObjectList(var/list/L, var/list/R, var/list/cache) +/proc/dd_mergeObjectList(list/L, list/R, list/cache) var/Li=1 var/Ri=1 var/list/result = new() @@ -514,7 +514,7 @@ return (result + R.Copy(Ri, 0)) // Insert an object into a sorted list, preserving sortedness -/proc/dd_insertObjectList(var/list/L, var/O) +/proc/dd_insertObjectList(list/L, O) var/min = 1 var/max = L.len var/Oval = O:dd_SortValue() @@ -658,7 +658,7 @@ proc/dd_sortedObjectList(list/incoming) var/case_sensitive = 1 return dd_sortedtextlist(incoming, case_sensitive) -/proc/subtypesof(var/path) //Returns a list containing all subtypes of the given path, but not the given path itself. +/proc/subtypesof(path) //Returns a list containing all subtypes of the given path, but not the given path itself. if(!path || !ispath(path)) CRASH("Invalid path, failed to fetch subtypes of \"[path]\".") return (typesof(path) - path) @@ -825,3 +825,18 @@ proc/dd_sortedObjectList(list/incoming) L1[key] += other_value else L1[key] = other_value + +/** + * A proc for turning a list into an associative list. + * + * A simple proc for turning all things in a list into an associative list, instead + * Each item in the list will have an associative value of TRUE + + * Arguments: + * * flat_list - the list that it passes to make associative + */ + +/proc/make_associative(list/flat_list) + . = list() + for(var/thing in flat_list) + .[thing] = TRUE diff --git a/code/__HELPERS/mobs.dm b/code/__HELPERS/mobs.dm index 410f66b3056..e836824ad3a 100644 --- a/code/__HELPERS/mobs.dm +++ b/code/__HELPERS/mobs.dm @@ -1,4 +1,4 @@ -/proc/GetOppositeDir(var/dir) +/proc/GetOppositeDir(dir) switch(dir) if(NORTH) return SOUTH if(SOUTH) return NORTH @@ -46,7 +46,7 @@ return pick(valid_picks) -/proc/random_hair_style(var/gender, species = "Human", var/datum/robolimb/robohead) +/proc/random_hair_style(gender, species = "Human", datum/robolimb/robohead) var/h_style = "Bald" var/list/valid_hairstyles = list() for(var/hairstyle in GLOB.hair_styles_public_list) @@ -75,7 +75,7 @@ return h_style -/proc/random_facial_hair_style(var/gender, species = "Human", var/datum/robolimb/robohead) +/proc/random_facial_hair_style(gender, species = "Human", datum/robolimb/robohead) var/f_style = "Shaved" var/list/valid_facial_hairstyles = list() for(var/facialhairstyle in GLOB.facial_hair_styles_list) @@ -119,7 +119,7 @@ return ha_style -/proc/random_marking_style(var/location = "body", species = "Human", var/datum/robolimb/robohead, var/body_accessory, var/alt_head) +/proc/random_marking_style(location = "body", species = "Human", datum/robolimb/robohead, body_accessory, alt_head) var/m_style = "None" var/list/valid_markings = list() for(var/marking in GLOB.marking_styles_list) @@ -570,7 +570,7 @@ GLOBAL_LIST_INIT(do_after_once_tracker, list()) log_admin("[key_name(usr)] attempted to use a mouse macro: [verbused] [params]") message_admins("[key_name_admin(usr)] attempted to use a mouse macro: [verbused] [html_encode(params)]") if(client.next_mouse_macro_warning < world.time) // Warn occasionally - usr << 'sound/misc/sadtrombone.ogg' + SEND_SOUND(usr, sound('sound/misc/sadtrombone.ogg')) client.next_mouse_macro_warning = world.time + 600 /mob/verb/ClickSubstitute(params as command_text) set hidden = 1 diff --git a/code/__HELPERS/radiation.dm b/code/__HELPERS/radiation.dm new file mode 100644 index 00000000000..79a6194dc80 --- /dev/null +++ b/code/__HELPERS/radiation.dm @@ -0,0 +1,57 @@ +/** + * A special GetAllContents that doesn't search past things with rad insulation + * Components which return COMPONENT_BLOCK_RADIATION prevent further searching into that object's contents. The object itself will get returned still. + * The ignore list makes those objects never return at all + */ +/proc/get_rad_contents(atom/location) + var/static/list/ignored_things = typecacheof(list( + /mob/dead, + /mob/camera, + /obj/effect, + /obj/docking_port, + /atom/movable/lighting_object, + /obj/item/projectile)) + var/list/processing_list = list(location) + . = list() + while(length(processing_list)) + var/atom/thing = processing_list[1] + processing_list -= thing + if(ignored_things[thing.type]) + continue + . += thing + if((thing.flags_2 & RAD_PROTECT_CONTENTS_2) || (SEND_SIGNAL(thing, COMSIG_ATOM_RAD_PROBE) & COMPONENT_BLOCK_RADIATION)) + continue + processing_list += thing.contents + +/proc/radiation_pulse(atom/source, intensity, range_modifier, log = FALSE, can_contaminate = TRUE) + if(!SSradiation.can_fire) + return + for(var/dir in GLOB.cardinal) + new /datum/radiation_wave(source, dir, intensity, range_modifier, can_contaminate) + + var/list/things = get_rad_contents(source) //copypasta because I don't want to put special code in waves to handle their origin + for(var/k in 1 to length(things)) + var/atom/thing = things[k] + if(!thing) + continue + thing.rad_act(intensity) + + var/static/last_huge_pulse = 0 + if(intensity > 3000 && world.time > last_huge_pulse + 200) + last_huge_pulse = world.time + log = TRUE + if(log) + var/turf/_source_T = isturf(source) ? source : get_turf(source) + log_game("Radiation pulse with intensity: [intensity] and range modifier: [range_modifier] in [loc_name(_source_T)] ") + return TRUE + +/proc/get_rad_contamination(atom/location) + var/rad_strength = 0 + for(var/i in get_rad_contents(location)) // Yes it's intentional that you can't detect radioactive things under rad protection. Gives traitors a way to hide their glowing green rocks. + var/atom/thing = i + if(!thing) + continue + var/datum/component/radioactive/radiation = thing.GetComponent(/datum/component/radioactive) + if(radiation && rad_strength < radiation.strength) + rad_strength = radiation.strength + return rad_strength diff --git a/code/__HELPERS/text.dm b/code/__HELPERS/text.dm index 63be74dc16b..970f90684bb 100644 --- a/code/__HELPERS/text.dm +++ b/code/__HELPERS/text.dm @@ -22,7 +22,7 @@ return html_encode(txt) //Simply removes < and > and limits the length of the message -/proc/strip_html_simple(var/t,var/limit=MAX_MESSAGE_LEN) +/proc/strip_html_simple(t, limit=MAX_MESSAGE_LEN) var/list/strip_chars = list("<",">") t = copytext(t,1,limit) for(var/char in strip_chars) @@ -33,22 +33,13 @@ return t //Removes a few problematic characters -/proc/sanitize_simple(var/t,var/list/repl_chars = list("\n"="#","\t"="#")) +/proc/sanitize_simple(t, list/repl_chars = list("\n"="#","\t"="#")) for(var/char in repl_chars) t = replacetext(t, char, repl_chars[char]) return t -/proc/readd_quotes(var/t) - var/list/repl_chars = list(""" = "\"") - for(var/char in repl_chars) - var/index = findtext(t, char) - while(index) - t = copytext(t, 1, index) + repl_chars[char] + copytext(t, index+5) - index = findtext(t, char) - return t - //Runs byond's sanitization proc along-side sanitize_simple -/proc/sanitize(var/t,var/list/repl_chars = null) +/proc/sanitize(t, list/repl_chars = null) return html_encode(sanitize_simple(t,repl_chars)) // Gut ANYTHING that isnt alphanumeric, or brackets @@ -63,7 +54,7 @@ //Runs sanitize and strip_html_simple //I believe strip_html_simple() is required to run first to prevent '<' from displaying as '<' after sanitize() calls byond's html_encode() -/proc/strip_html(var/t,var/limit=MAX_MESSAGE_LEN) +/proc/strip_html(t, limit=MAX_MESSAGE_LEN) return copytext((sanitize(strip_html_simple(t))),1,limit) // Used to get a properly sanitized multiline input, of max_length @@ -76,12 +67,12 @@ //Runs byond's sanitization proc along-side strip_html_simple //I believe strip_html_simple() is required to run first to prevent '<' from displaying as '<' that html_encode() would cause -/proc/adminscrub(var/t,var/limit=MAX_MESSAGE_LEN) +/proc/adminscrub(t, limit=MAX_MESSAGE_LEN) return copytext((html_encode(strip_html_simple(t))),1,limit) //Returns null if there is any bad text in the string -/proc/reject_bad_text(var/text, var/max_length=512) +/proc/reject_bad_text(text, max_length=512) if(length(text) > max_length) return //message too long var/non_whitespace = 0 for(var/i=1, i<=length(text), i++) @@ -115,7 +106,7 @@ return msg //Filters out undesirable characters from names -/proc/reject_bad_name(var/t_in, var/allow_numbers=0, var/max_length=MAX_NAME_LEN) +/proc/reject_bad_name(t_in, allow_numbers=0, max_length=MAX_NAME_LEN) // Decode so that names with characters like < are still rejected t_in = html_decode(t_in) if(!t_in || length(t_in) > max_length) @@ -183,7 +174,7 @@ //checks text for html tags //if tag is not in whitelist (var/list/paper_tag_whitelist in global.dm) //relpaces < with < -/proc/checkhtml(var/t) +/proc/checkhtml(t) t = sanitize_simple(t, list("&#"=".")) var/p = findtext(t,"<",1) while(p) //going through all the tags @@ -235,7 +226,7 @@ * Text modification */ // See bygex.dm -/proc/replace_characters(var/t,var/list/repl_chars) +/proc/replace_characters(t, list/repl_chars) for(var/char in repl_chars) t = replacetext(t, char, repl_chars[char]) return t @@ -286,7 +277,7 @@ return trim_left(trim_right(text)) //Returns a string with the first element of the string capitalized. -/proc/capitalize(var/t as text) +/proc/capitalize(t as text) return uppertext(copytext(t, 1, 2)) + copytext(t, 2) //Centers text by adding spaces to either side of the string. @@ -314,7 +305,7 @@ return copytext(message, 1, length + 1) -/proc/stringmerge(var/text,var/compare,replace = "*") +/proc/stringmerge(text, compare,replace = "*") //This proc fills in all spaces with the "replace" var (* by default) with whatever //is in the other string at the same spot (assuming it is not a replace char). //This is used for fingerprints @@ -335,7 +326,7 @@ return 0 return newtext -/proc/stringpercent(var/text,character = "*") +/proc/stringpercent(text, character = "*") //This proc returns the number of chars of the string that is the character //This is used for detective work to determine fingerprint completion. if(!text || !character) @@ -347,7 +338,7 @@ count++ return count -/proc/reverse_text(var/text = "") +/proc/reverse_text(text = "") var/new_text = "" for(var/i = length(text); i > 0; i--) new_text += copytext(text, i, i+1) @@ -356,7 +347,7 @@ //This proc strips html properly, but it's not lazy like the other procs. //This means that it doesn't just remove < and > and call it a day. //Also limit the size of the input, if specified. -/proc/strip_html_properly(var/input, var/max_length = MAX_MESSAGE_LEN, allow_lines = 0) +/proc/strip_html_properly(input, max_length = MAX_MESSAGE_LEN, allow_lines = 0) if(!input) return var/opentag = 1 //These store the position of < and > respectively. @@ -380,12 +371,12 @@ input = copytext(input,1,max_length) return sanitize(input, allow_lines ? list("\t" = " ") : list("\n" = " ", "\t" = " ")) -/proc/trim_strip_html_properly(var/input, var/max_length = MAX_MESSAGE_LEN, allow_lines = 0) +/proc/trim_strip_html_properly(input, max_length = MAX_MESSAGE_LEN, allow_lines = 0) return trim(strip_html_properly(input, max_length, allow_lines)) //Used in preferences' SetFlavorText and human's set_flavor verb //Previews a string of len or less length -/proc/TextPreview(var/string,var/len=40) +/proc/TextPreview(string, len=40) if(length(string) <= len) if(!length(string)) return "\[...\]" @@ -395,14 +386,14 @@ return "[copytext_preserve_html(string, 1, 37)]..." //alternative copytext() for encoded text, doesn't break html entities (" and other) -/proc/copytext_preserve_html(var/text, var/first, var/last) +/proc/copytext_preserve_html(text, first, last) return html_encode(copytext(html_decode(text), first, last)) //Run sanitize(), but remove <, >, " first to prevent displaying them as > < &34; in some places, after html_encode(). //Best used for sanitize object names, window titles. //If you have a problem with sanitize() in chat, when quotes and >, < are displayed as html entites - //this is a problem of double-encode(when & becomes &), use sanitize() with encode=0, but not the sanitizeSafe()! -/proc/sanitizeSafe(var/input, var/max_length = MAX_MESSAGE_LEN, var/encode = 1, var/trim = 1, var/extra = 1) +/proc/sanitizeSafe(input, max_length = MAX_MESSAGE_LEN, encode = 1, trim = 1, extra = 1) return sanitize(replace_characters(input, list(">"=" ","<"=" ", "\""="'")), max_length, encode, trim, extra) diff --git a/code/__HELPERS/time.dm b/code/__HELPERS/time.dm index a5524d7c719..5f6e01e93ed 100644 --- a/code/__HELPERS/time.dm +++ b/code/__HELPERS/time.dm @@ -62,7 +62,7 @@ return time2text(station_time(time, TRUE), format) /* Returns 1 if it is the selected month and day */ -/proc/isDay(var/month, var/day) +/proc/isDay(month, day) if(isnum(month) && isnum(day)) var/MM = text2num(time2text(world.timeofday, "MM")) // get the current month var/DD = text2num(time2text(world.timeofday, "DD")) // get the current day @@ -94,13 +94,13 @@ return GLOB.month_names.Find(number) //Take a value in seconds and returns a string of minutes and seconds in the format X minute(s) and X seconds. -/proc/seconds_to_time(var/seconds as num) +/proc/seconds_to_time(seconds as num) var/numSeconds = seconds % 60 var/numMinutes = (seconds - numSeconds) / 60 return "[numMinutes] [numMinutes > 1 ? "minutes" : "minute"] and [numSeconds] seconds" //Take a value in seconds and makes it display like a clock -/proc/seconds_to_clock(var/seconds as num) +/proc/seconds_to_clock(seconds as num) return "[add_zero(num2text((seconds / 60) % 60), 2)]:[add_zero(num2text(seconds % 60), 2)]" //Takes a value of time in deciseconds. diff --git a/code/__HELPERS/traits.dm b/code/__HELPERS/traits.dm index d91254595c5..74760fd22b4 100644 --- a/code/__HELPERS/traits.dm +++ b/code/__HELPERS/traits.dm @@ -1,3 +1,6 @@ +#define SIGNAL_ADDTRAIT(trait_ref) "addtrait [trait_ref]" +#define SIGNAL_REMOVETRAIT(trait_ref) "removetrait [trait_ref]" + // trait accessor defines #define ADD_TRAIT(target, trait, source) \ do { \ @@ -6,12 +9,14 @@ target.status_traits = list(); \ _L = target.status_traits; \ _L[trait] = list(source); \ + SEND_SIGNAL(target, SIGNAL_ADDTRAIT(trait), trait); \ } else { \ _L = target.status_traits; \ if (_L[trait]) { \ _L[trait] |= list(source); \ } else { \ _L[trait] = list(source); \ + SEND_SIGNAL(target, SIGNAL_ADDTRAIT(trait), trait); \ } \ } \ } while (0) @@ -31,7 +36,8 @@ } \ };\ if (!length(_L[trait])) { \ - _L -= trait \ + _L -= trait; \ + SEND_SIGNAL(target, SIGNAL_REMOVETRAIT(trait), trait); \ }; \ if (!length(_L)) { \ target.status_traits = null \ @@ -46,31 +52,135 @@ for (var/_T in _L) { \ _L[_T] &= _S;\ if (!length(_L[_T])) { \ - _L -= _T } \ - };\ - if (!length(_L)) { \ - target.status_traits = null\ + _L -= _T; \ + SEND_SIGNAL(target, SIGNAL_REMOVETRAIT(_T), _T); \ + }; \ };\ + if (!length(_L)) { \ + target.status_traits = null\ + };\ }\ } while (0) + +#define REMOVE_TRAITS_IN(target, sources) \ + do { \ + var/list/_L = target.status_traits; \ + var/list/_S = sources; \ + if (sources && !islist(sources)) { \ + _S = list(sources); \ + } else { \ + _S = sources\ + }; \ + if (_L) { \ + for (var/_T in _L) { \ + _L[_T] -= _S;\ + if (!length(_L[_T])) { \ + _L -= _T; \ + SEND_SIGNAL(target, SIGNAL_REMOVETRAIT(_T)); \ + }; \ + };\ + if (!length(_L)) { \ + target.status_traits = null\ + };\ + }\ + } while (0) + #define HAS_TRAIT(target, trait) (target.status_traits ? (target.status_traits[trait] ? TRUE : FALSE) : FALSE) #define HAS_TRAIT_FROM(target, trait, source) (target.status_traits ? (target.status_traits[trait] ? (source in target.status_traits[trait]) : FALSE) : FALSE) +#define HAS_TRAIT_FROM_ONLY(target, trait, source) (\ + target.status_traits ?\ + (target.status_traits[trait] ?\ + ((source in target.status_traits[trait]) && (length(target.status_traits) == 1))\ + : FALSE)\ + : FALSE) +#define HAS_TRAIT_NOT_FROM(target, trait, source) (target.status_traits ? (target.status_traits[trait] ? (length(target.status_traits[trait] - source) > 0) : FALSE) : FALSE) /* Remember to update _globalvars/traits.dm if you're adding/removing/renaming traits. */ //mob traits +#define TRAIT_BLIND "blind" +#define TRAIT_MUTE "mute" +#define TRAIT_DEAF "deaf" +#define TRAIT_NEARSIGHT "nearsighted" +#define TRAIT_FAT "fat" +#define TRAIT_HUSK "husk" +#define TRAIT_BADDNA "baddna" +#define TRAIT_SKELETONIZED "skeletonized" +#define TRAIT_CLUMSY "clumsy" +#define TRAIT_CHUNKYFINGERS "chunkyfingers" //means that you can't use weapons with normal trigger guards. #define TRAIT_PACIFISM "pacifism" -#define TRAIT_WATERBREATH "waterbreathing" +#define TRAIT_IGNORESLOWDOWN "ignoreslow" +#define TRAIT_IGNOREDAMAGESLOWDOWN "ignoredamageslowdown" +#define TRAIT_GOTTAGOFAST "gottagofast" +#define TRAIT_GOTTAGONOTSOFAST "gottagonotsofast" +#define TRAIT_FAKEDEATH "fakedeath" //Makes the owner appear as dead to most forms of medical examination +#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_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" +#define TRAIT_RESISTHIGHPRESSURE "resist_high_pressure" +#define TRAIT_RESISTLOWPRESSURE "resist_low_pressure" +#define TRAIT_RADIMMUNE "rad_immunity" +#define TRAIT_GENELESS "geneless" +#define TRAIT_VIRUSIMMUNE "virus_immunity" +#define TRAIT_PIERCEIMMUNE "pierce_immunity" +#define TRAIT_NOFIRE "nonflammable" +#define TRAIT_NOHUNGER "no_hunger" +#define TRAIT_NOBREATH "no_breath" +#define TRAIT_NOCRITDAMAGE "no_crit" +#define TRAIT_XRAY_VISION "xray_vision" +#define TRAIT_THERMAL_VISION "thermal_vision" +#define TRAIT_XENO_IMMUNE "xeno_immune" //prevents xeno huggies implanting skeletons #define TRAIT_BLOODCRAWL "bloodcrawl" #define TRAIT_BLOODCRAWL_EAT "bloodcrawl_eat" -#define TRAIT_JESTER "jester" +#define TRAIT_DWARF "dwarf" +#define TRAIT_SILENT_FOOTSTEPS "silent_footsteps" //makes your footsteps completely silent + +#define TRAIT_COMIC_SANS "comic_sans" +#define TRAIT_NOFINGERPRINTS "no_fingerprints" +#define TRAIT_SLOWDIGESTION "slow_digestion" +#define TRAIT_COLORBLIND "colorblind" +#define TRAIT_WINGDINGS "wingdings" +#define TRAIT_WATERBREATH "waterbreathing" +#define TRAIT_NOFAT "no_fatness" +#define TRAIT_NOGERMS "no_germs" +#define TRAIT_NODECAY "no_decay" +#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" // // common trait sources +#define TRAIT_GENERIC "generic" +#define EYE_DAMAGE "eye_damage" +#define EAR_DAMAGE "ear_damage" +#define GENETIC_MUTATION "genetic" +#define OBESITY "obesity" +#define MAGIC_TRAIT "magic" +#define SPECIES_TRAIT "species" #define ROUNDSTART_TRAIT "roundstart" //cannot be removed without admin intervention +#define CLOTHING_TRAIT "clothing" #define CULT_TRAIT "cult" +#define INNATE_TRAIT "innate" // unique trait sources +#define STATUE_MUTE "statue" +#define CHANGELING_DRAIN "drain" +#define TRAIT_HULK "hulk" +#define STASIS_MUTE "stasis" +#define SCRYING_ORB "scrying-orb" #define CULT_EYES "cult_eyes" +#define DOGGO_SPACESUIT "doggo_spacesuit" +#define FLOORCLUWNE "floorcluwne" + +//quirk traits +#define TRAIT_ALCOHOL_TOLERANCE "alcohol_tolerance" + +//traits that should be properly converted to genetic mutations one day +#define TRAIT_LASEREYES "laser_eyes" diff --git a/code/__HELPERS/type2type.dm b/code/__HELPERS/type2type.dm index bf44f6a4bc9..b962907d043 100644 --- a/code/__HELPERS/type2type.dm +++ b/code/__HELPERS/type2type.dm @@ -146,7 +146,7 @@ return //Converts an angle (degrees) into an ss13 direction -/proc/angle2dir(var/degree) +/proc/angle2dir(degree) degree = ((degree+22.5)%365) if(degree < 45) return NORTH if(degree < 90) return NORTHEAST @@ -170,7 +170,7 @@ //returns the north-zero clockwise angle in degrees, given a direction -/proc/dir2angle(var/D) +/proc/dir2angle(D) switch(D) if(NORTH) return 0 if(SOUTH) return 180 @@ -183,7 +183,7 @@ else return null //Returns the angle in english -/proc/angle2text(var/degree) +/proc/angle2text(degree) return dir2text(angle2dir(degree)) //Converts a blend_mode constant to one acceptable to icon.Blend() @@ -281,7 +281,7 @@ if(3*hue < 2) return (a+(b-a)*((2/3)-hue)*6) return a -/proc/num2septext(var/theNum, var/sigFig = 7,var/sep=",") // default sigFig (1,000,000) +/proc/num2septext(theNum, sigFig = 7, sep=",") // default sigFig (1,000,000) var/finalNum = num2text(theNum, sigFig) // Start from the end, or from the decimal point @@ -323,7 +323,7 @@ . = max(0, min(255, 138.5177312231 * log(temp - 10) - 305.0447927307)) //Argument: Give this a space-separated string consisting of 6 numbers. Returns null if you don't -/proc/text2matrix(var/matrixtext) +/proc/text2matrix(matrixtext) var/list/matrixtext_list = splittext(matrixtext, " ") var/list/matrix_list = list() for(var/item in matrixtext_list) @@ -351,7 +351,7 @@ //The string is well, obviously the string being checked //The datum is used as a source for var names, to check validity //Otherwise every single word could technically be a variable! -/proc/string2listofvars(var/t_string, var/datum/var_source) +/proc/string2listofvars(t_string, datum/var_source) if(!t_string || !var_source) return list() diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm index 4a2cbf8ce4f..3056485d755 100644 --- a/code/__HELPERS/unsorted.dm +++ b/code/__HELPERS/unsorted.dm @@ -5,7 +5,7 @@ /* Get the direction of startObj relative to endObj. * Return values: To the right, 1. Below, 2. To the left, 3. Above, 4. Not found adjacent in cardinal directions, 0. */ -/proc/getRelativeDirection(var/atom/movable/startObj, var/atom/movable/endObj) +/proc/getRelativeDirection(atom/movable/startObj, atom/movable/endObj) if(endObj.x == startObj.x + 1 && endObj.y == startObj.y) return EAST @@ -21,11 +21,11 @@ return 0 //Returns the middle-most value -/proc/dd_range(var/low, var/high, var/num) +/proc/dd_range(low, high, num) return max(low,min(high,num)) //Returns whether or not A is the middle most value -/proc/InRange(var/A, var/lower, var/upper) +/proc/InRange(A, lower, upper) if(A < lower) return 0 if(A > upper) return 0 return 1 @@ -152,7 +152,7 @@ Turf and target are seperate in case you want to teleport some distance from a t // Returns true if direction is blocked from loc // Checks if doors are open -/proc/DirBlocked(turf/loc,var/dir) +/proc/DirBlocked(turf/loc, dir) for(var/obj/structure/window/D in loc) if(!D.density) continue @@ -240,7 +240,7 @@ Turf and target are seperate in case you want to teleport some distance from a t return 1 //Ensure the frequency is within bounds of what it should be sending/recieving at -/proc/sanitize_frequency(var/f, var/low = PUBLIC_LOW_FREQ, var/high = PUBLIC_HIGH_FREQ) +/proc/sanitize_frequency(f, low = PUBLIC_LOW_FREQ, high = PUBLIC_HIGH_FREQ) f = round(f) f = max(low, f) f = min(high, f) @@ -249,10 +249,10 @@ Turf and target are seperate in case you want to teleport some distance from a t return f //Turns 1479 into 147.9 -/proc/format_frequency(var/f) +/proc/format_frequency(f) return "[round(f / 10)].[f % 10]" -/obj/proc/atmosanalyzer_scan(var/datum/gas_mixture/air_contents, mob/user, var/obj/target = src) +/obj/proc/atmosanalyzer_scan(datum/gas_mixture/air_contents, mob/user, obj/target = src) var/obj/icon = target user.visible_message("[user] has used the analyzer on [target].", "You use the analyzer on [target].") var/pressure = air_contents.return_pressure() @@ -320,7 +320,7 @@ Turf and target are seperate in case you want to teleport some distance from a t return selected -/proc/select_active_ai(var/mob/user) +/proc/select_active_ai(mob/user) var/list/ais = active_ais() if(ais.len) if(user) . = input(usr,"AI signals detected:", "AI selection") in ais @@ -419,8 +419,26 @@ Turf and target are seperate in case you want to teleport some distance from a t return "[round((powerused * 0.000001), 0.001)] MW" return "[round((powerused * 0.000000001), 0.0001)] GW" +// Format an energy value in J, kJ, MJ, or GJ. 1W = 1J/s. +/proc/DisplayJoules(units) + if (units < 1000) // Less than a kJ + return "[round(units, 0.1)] J" + else if (units < 1000000) // Less than a MJ + return "[round(units * 0.001, 0.01)] kJ" + else if (units < 1000000000) // Less than a GJ + return "[round(units * 0.000001, 0.001)] MJ" + return "[round(units * 0.000000001, 0.0001)] GJ" + +// Format an energy value measured in Power Cell units. +/proc/DisplayEnergy(units) + // APCs process every (SSmachines.wait * 0.1) seconds, and turn 1 W of + // excess power into GLOB.CELLRATE energy units when charging cells. + // With the current configuration of wait=20 and CELLRATE=0.002, this + // means that one unit is 1 kJ. + return DisplayJoules(units * SSmachines.wait * 0.1 / GLOB.CELLRATE) + //Forces a variable to be posative -/proc/modulus(var/M) +/proc/modulus(M) if(M >= 0) return M if(M < 0) @@ -447,7 +465,7 @@ Turf and target are seperate in case you want to teleport some distance from a t // Returns the atom sitting on the turf. // For example, using this on a disk, which is in a bag, on a mob, will return the mob because it's on the turf. -/proc/get_atom_on_turf(var/atom/movable/M) +/proc/get_atom_on_turf(atom/movable/M) var/atom/loc = M while(loc && loc.loc && !istype(loc.loc, /turf/)) loc = loc.loc @@ -457,7 +475,7 @@ Turf and target are seperate in case you want to teleport some distance from a t Returns 1 if the chain up to the area contains the given typepath 0 otherwise */ -/atom/proc/is_found_within(var/typepath) +/atom/proc/is_found_within(typepath) var/atom/A = src while(A.loc) if(istype(A.loc, typepath)) @@ -473,7 +491,7 @@ Returns 1 if the chain up to the area contains the given typepath // returns the turf located at the map edge in the specified direction relative to A // used for mass driver -/proc/get_edge_target_turf(var/atom/A, var/direction) +/proc/get_edge_target_turf(atom/A, direction) var/turf/target = locate(A.x, A.y, A.z) if(!A || !target) @@ -497,7 +515,7 @@ Returns 1 if the chain up to the area contains the given typepath // result is bounded to map size // note range is non-pythagorean // used for disposal system -/proc/get_ranged_target_turf(var/atom/A, var/direction, var/range) +/proc/get_ranged_target_turf(atom/A, direction, range) var/x = A.x var/y = A.y @@ -515,17 +533,17 @@ Returns 1 if the chain up to the area contains the given typepath // returns turf relative to A offset in dx and dy tiles // bound to map limits -/proc/get_offset_target_turf(var/atom/A, var/dx, var/dy) +/proc/get_offset_target_turf(atom/A, dx, dy) var/x = min(world.maxx, max(1, A.x + dx)) var/y = min(world.maxy, max(1, A.y + dy)) return locate(x,y,A.z) //Makes sure MIDDLE is between LOW and HIGH. If not, it adjusts it. Returns the adjusted value. -/proc/between(var/low, var/middle, var/high) +/proc/between(low, middle, high) return max(min(middle, high), low) //returns random gauss number -/proc/GaussRand(var/sigma) +/proc/GaussRand(sigma) var/x,y,rsq do x=2*rand()-1 @@ -535,7 +553,7 @@ Returns 1 if the chain up to the area contains the given typepath return sigma*y*sqrt(-2*log(rsq)/rsq) //returns random gauss number, rounded to 'roundto' -/proc/GaussRandRound(var/sigma,var/roundto) +/proc/GaussRandRound(sigma, roundto) return round(GaussRand(sigma),roundto) //Will return the contents of an atom recursivly to a depth of 'searchDepth' @@ -558,7 +576,7 @@ Returns 1 if the chain up to the area contains the given typepath return weight //Step-towards method of determining whether one atom can see another. Similar to viewers() -/proc/can_see(var/atom/source, var/atom/target, var/length=5) // I couldnt be arsed to do actual raycasting :I This is horribly inaccurate. +/proc/can_see(atom/source, atom/target, length=5) // I couldnt be arsed to do actual raycasting :I This is horribly inaccurate. var/turf/current = get_turf(source) var/turf/target_turf = get_turf(target) var/steps = 1 @@ -588,7 +606,7 @@ Returns 1 if the chain up to the area contains the given typepath return 1 return 0 -/proc/get_step_towards2(var/atom/ref , var/atom/trg) +/proc/get_step_towards2(atom/ref , atom/trg) var/base_dir = get_dir(ref, get_step_towards(ref,trg)) var/turf/temp = get_step_towards(ref,trg) @@ -618,7 +636,7 @@ Returns 1 if the chain up to the area contains the given typepath //Takes: Anything that could possibly have variables and a varname to check. //Returns: 1 if found, 0 if not. -/proc/hasvar(var/datum/A, var/varname) +/proc/hasvar(datum/A, varname) if(A.vars.Find(lowertext(varname))) return 1 else return 0 @@ -635,7 +653,7 @@ Returns 1 if the chain up to the area contains the given typepath //Takes: Area type as text string or as typepath OR an instance of the area. //Returns: A list of all areas of that type in the world. -/proc/get_areas(var/areatype) +/proc/get_areas(areatype) if(!areatype) return null if(istext(areatype)) areatype = text2path(areatype) if(isarea(areatype)) @@ -649,7 +667,7 @@ Returns 1 if the chain up to the area contains the given typepath //Takes: Area type as text string or as typepath OR an instance of the area. //Returns: A list of all turfs in areas of that type of that type in the world. -/proc/get_area_turfs(var/areatype) +/proc/get_area_turfs(areatype) if(!areatype) return null if(istext(areatype)) areatype = text2path(areatype) if(isarea(areatype)) @@ -664,7 +682,7 @@ Returns 1 if the chain up to the area contains the given typepath //Takes: Area type as text string or as typepath OR an instance of the area. //Returns: A list of all atoms (objs, turfs, mobs) in areas of that type of that type in the world. -/proc/get_area_all_atoms(var/areatype) +/proc/get_area_all_atoms(areatype) if(!areatype) return null if(istext(areatype)) areatype = text2path(areatype) if(isarea(areatype)) @@ -683,7 +701,7 @@ Returns 1 if the chain up to the area contains the given typepath var/y_pos = null var/z_pos = null -/area/proc/move_contents_to(var/area/A, var/turftoleave=null, var/direction = null) +/area/proc/move_contents_to(area/A, turftoleave=null, direction = null) //Takes: Area. Optional: turf type to leave behind. //Returns: Nothing. //Notes: Attempts to move the contents of one area to another area. @@ -822,7 +840,7 @@ Returns 1 if the chain up to the area contains the given typepath -/proc/DuplicateObject(obj/original, var/perfectcopy = 0 , var/sameloc = 0, var/atom/newloc = null) +/proc/DuplicateObject(obj/original, perfectcopy = 0 , sameloc = 0, atom/newloc = null) if(!original) return null @@ -849,7 +867,7 @@ Returns 1 if the chain up to the area contains the given typepath O.update_icon() return O -/area/proc/copy_contents_to(var/area/A , var/platingRequired = 0 ) +/area/proc/copy_contents_to(area/A , platingRequired = 0 ) //Takes: Area. Optional: If it should copy to areas that don't have plating //Returns: Nothing. //Notes: Attempts to move the contents of one area to another area. @@ -1078,7 +1096,7 @@ Returns 1 if the chain up to the area contains the given typepath //centered = 0 counts from turf edge to edge //centered = 1 counts from turf center to turf center //of course mathematically this is just adding world.icon_size on again -/proc/getPixelDistance(var/atom/A, var/atom/B, var/centered = 1) +/proc/getPixelDistance(atom/A, atom/B, centered = 1) if(!istype(A)||!istype(B)) return 0 . = bounds_dist(A, B) + sqrt((((A.pixel_x+B.pixel_x)**2) + ((A.pixel_y+B.pixel_y)**2))) @@ -1168,7 +1186,7 @@ GLOBAL_LIST_INIT(can_embed_types, typecacheof(list( return 1 return 0 -/proc/reverse_direction(var/dir) +/proc/reverse_direction(dir) switch(dir) if(NORTH) return SOUTH @@ -1243,7 +1261,7 @@ GLOBAL_LIST_INIT(wall_items, typecacheof(list(/obj/machinery/power/apc, /obj/mac Standard way to write links -Sayu */ -/proc/topic_link(var/datum/D, var/arglist, var/content) +/proc/topic_link(datum/D, arglist, content) if(istype(arglist,/list)) arglist = list2params(arglist) return "[content]" @@ -1354,7 +1372,7 @@ Standard way to write links -Sayu chance = max(chance - (initial_chance / steps), 0) steps-- -/proc/get_random_colour(var/simple, var/lower, var/upper) +/proc/get_random_colour(simple, lower, upper) var/colour if(simple) colour = pick(list("FF0000","FF7F00","FFFF00","00FF00","0000FF","4B0082","8F00FF")) @@ -1366,7 +1384,7 @@ Standard way to write links -Sayu colour += temp_col return colour -/proc/get_distant_turf(var/turf/T,var/direction,var/distance) +/proc/get_distant_turf(turf/T, direction, distance) if(!T || !direction || !distance) return var/dest_x = T.x @@ -1387,7 +1405,7 @@ Standard way to write links -Sayu GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new) //Version of view() which ignores darkness, because BYOND doesn't have it. -/proc/dview(var/range = world.view, var/center, var/invis_flags = 0) +/proc/dview(range = world.view, center, invis_flags = 0) if(!center) return @@ -1556,7 +1574,7 @@ GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new) //The y dimension of the icon file used in the image // eg: center_image(I, 32,32) // eg2: center_image(I, 96,96) -/proc/center_image(var/image/I, x_dimension = 0, y_dimension = 0) +/proc/center_image(image/I, x_dimension = 0, y_dimension = 0) if(!I) return @@ -1711,7 +1729,7 @@ GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new) chosen = matches[chosen] return chosen -/proc/make_types_fancy(var/list/types) +/proc/make_types_fancy(list/types) if(ispath(types)) types = list(types) . = list() @@ -1800,8 +1818,6 @@ GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new) /datum = "D", /turf/simulated/floor = "SIM_FLOOR", /turf/simulated/wall = "SIM_WALL", - /turf/unsimulated/floor = "UNSIM_FLOOR", - /turf/unsimulated/wall = "UNSIM_WALL", /turf = "T", /mob/living/carbon/alien = "XENO", /mob/living/carbon/human = "HUMAN", @@ -1946,7 +1962,7 @@ GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new) result += (1 << num) return result -/proc/pixel_shift_dir(var/dir, var/amount_x = 32, var/amount_y = 32) //Returns a list with pixel_shift values that will shift an object's icon one tile in the direction passed. +/proc/pixel_shift_dir(dir, amount_x = 32, amount_y = 32) //Returns a list with pixel_shift values that will shift an object's icon one tile in the direction passed. amount_x = min(max(0, amount_x), 32) //No less than 0, no greater than 32. amount_y = min(max(0, amount_x), 32) var/list/shift = list("x" = 0, "y" = 0) @@ -1970,13 +1986,27 @@ GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new) return shift -//Return a list of atoms in a location of a given type. Can be refined to look for pixel-shift. -/proc/get_atoms_of_type(var/atom/here, var/type, var/check_shift, var/shift_x = 0, var/shift_y = 0) +/** + * Returns a list of atoms in a location of a given type. Can be refined to look for pixel-shift. + * + * Arguments: + * * loc - The atom to look in. + * * type - The type to look for. + * * check_shift - If true, will exclude atoms whose pixel_x/pixel_y do not match shift_x/shift_y. + * * shift_x - If check_shift is true, atoms whose pixel_x is different to this will be excluded. + * * shift_y - If check_shift is true, atoms whose pixel_y is different to this will be excluded. + */ +/proc/get_atoms_of_type(atom/loc, type, check_shift = FALSE, shift_x = 0, shift_y = 0) . = list() - if(here) - for(var/atom/thing in here) - if(istype(thing, type) && (check_shift && thing.pixel_x == shift_x && thing.pixel_y == shift_y)) - . += thing + if(!loc) + return + for(var/a in loc) + var/atom/A = a + if(!istype(A, type)) + continue + if(check_shift && !(A.pixel_x == shift_x && A.pixel_y == shift_y)) + continue + . += A //gives us the stack trace from CRASH() without ending the current proc. /proc/stack_trace(msg) @@ -2052,3 +2082,66 @@ GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new) return TRUE return contains(location.loc) + +/proc/log_connection(ckey, ip, cid, connection_type) + ASSERT(connection_type in list(CONNECTION_TYPE_ESTABLISHED, CONNECTION_TYPE_DROPPED_IPINTEL, CONNECTION_TYPE_DROPPED_BANNED, CONNECTION_TYPE_DROPPED_INVALID)) + var/datum/db_query/query_accesslog = SSdbcore.NewQuery("INSERT INTO `[format_table_name("connection_log")]`(`datetime`, `ckey`, `ip`, `computerid`, `result`) VALUES(Now(), :ckey, :ip, :cid, :result)", list( + "ckey" = ckey, + "ip" = "[ip ? ip : ""]", // This is important. NULL is not the same as "", and if you directly open the `.dmb` file, you get a NULL IP. + "cid" = cid, + "result" = connection_type + )) + query_accesslog.warn_execute() + qdel(query_accesslog) + +/** + * Returns the clean name of an audio channel. + * + * Arguments: + * * channel - The channel number. + */ +/proc/get_channel_name(channel) + switch(channel) + if(CHANNEL_LOBBYMUSIC) + return "Lobby Music" + if(CHANNEL_ADMIN) + return "Admin MIDIs" + if(CHANNEL_VOX) + return "AI Announcements" + if(CHANNEL_JUKEBOX) + return "Dance Machines" + if(CHANNEL_HEARTBEAT) + return "Heartbeat" + if(CHANNEL_BUZZ) + return "White Noise" + if(CHANNEL_AMBIENCE) + return "Ambience" + if(CHANNEL_ENGINE) + return "Engine Ambience" + +/proc/slot_bitfield_to_slot(input_slot_flags) // Kill off this garbage ASAP; slot flags and clothing flags should be IDENTICAL. GOSH DARN IT. Doesn't work with ears or pockets, either. + switch(input_slot_flags) + if(SLOT_OCLOTHING) + return slot_wear_suit + if(SLOT_ICLOTHING) + return slot_w_uniform + if(SLOT_GLOVES) + return slot_gloves + if(SLOT_EYES) + return slot_glasses + if(SLOT_MASK) + return slot_wear_mask + if(SLOT_HEAD) + return slot_head + if(SLOT_FEET) + return slot_shoes + if(SLOT_ID) + return slot_wear_id + if(SLOT_BELT) + return slot_belt + if(SLOT_BACK) + return slot_back + if(SLOT_PDA) + return slot_wear_pda + if(SLOT_TIE) + return slot_tie diff --git a/code/_globalvars/lists/devil.dm b/code/_globalvars/lists/devil.dm deleted file mode 100644 index 54528709573..00000000000 --- a/code/_globalvars/lists/devil.dm +++ /dev/null @@ -1,8 +0,0 @@ -//what could possibly go wrong -GLOBAL_LIST_INIT(devil_machines, typecacheof(/obj/item/circuitboard, TRUE) - list( - /obj/item/circuitboard/shuttle, - /obj/item/circuitboard/swfdoor, - /obj/item/circuitboard/olddoor, - /obj/item/circuitboard/computer, - /obj/item/circuitboard/machine -)) diff --git a/code/_globalvars/lists/misc.dm b/code/_globalvars/lists/misc.dm index d065f5fa7bc..ebdf2017900 100644 --- a/code/_globalvars/lists/misc.dm +++ b/code/_globalvars/lists/misc.dm @@ -30,8 +30,7 @@ GLOBAL_LIST_INIT(restricted_camera_networks, list( "UO45", "UO45R", "UO71", - "Xeno", - "Hotel" + "Xeno" )) //Those networks can only be accessed by preexisting terminals. AIs and new terminals can't use them. GLOBAL_LIST_INIT(ruin_landmarks, list()) diff --git a/code/_globalvars/lists/reagents.dm b/code/_globalvars/lists/reagents.dm index abd878ff936..833da2a9879 100644 --- a/code/_globalvars/lists/reagents.dm +++ b/code/_globalvars/lists/reagents.dm @@ -63,6 +63,6 @@ GLOBAL_LIST_INIT(blocked_chems, list("polonium", "initropidril", "concentrated_i GLOBAL_LIST_INIT(safe_chem_list, list("antihol", "charcoal", "epinephrine", "insulin", "teporone","silver_sulfadiazine", "salbutamol", "omnizine", "stimulants", "synaptizine", "potass_iodide", "oculine", "mannitol", "styptic_powder", "spaceacillin", "salglu_solution", "sal_acid", "cryoxadone", "blood", "synthflesh", "hydrocodone", - "mitocholide", "rezadone")) + "mitocholide", "rezadone", "menthol")) GLOBAL_LIST_INIT(safe_chem_applicator_list, list("silver_sulfadiazine", "styptic_powder", "synthflesh")) diff --git a/code/_globalvars/traits.dm b/code/_globalvars/traits.dm index ccc31e5c501..382303c1212 100644 --- a/code/_globalvars/traits.dm +++ b/code/_globalvars/traits.dm @@ -5,11 +5,59 @@ */ GLOBAL_LIST_INIT(traits_by_type, list( /mob = list( + "TRAIT_BLIND" = TRAIT_BLIND, + "TRAIT_MUTE" = TRAIT_MUTE, + "TRAIT_DEAF" = TRAIT_DEAF, + "TRAIT_NEARSIGHT" = TRAIT_NEARSIGHT, + "TRAIT_FAT" = TRAIT_FAT, + "TRAIT_HUSK" = TRAIT_HUSK, + "TRAIT_BADDNA" = TRAIT_BADDNA, + "TRAIT_SKELETONIZED" = TRAIT_SKELETONIZED, + "TRAIT_CLUMSY" = TRAIT_CLUMSY, + "TRAIT_CHUNKYFINGERS" = TRAIT_CHUNKYFINGERS, "TRAIT_PACIFISM" = TRAIT_PACIFISM, - "TRAIT_WATERBREATH" = TRAIT_WATERBREATH, - "BLOODCRAWL" = TRAIT_BLOODCRAWL, - "BLOODCRAWL_EAT" = TRAIT_BLOODCRAWL_EAT - ))) + "TRAIT_IGNORESLOWDOWN" = TRAIT_IGNORESLOWDOWN, + "TRAIT_IGNOREDAMAGESLOWDOWN" = TRAIT_IGNOREDAMAGESLOWDOWN, + "TRAIT_GOTTAGOFAST" = TRAIT_GOTTAGOFAST, + "TRAIT_GOTTAGONOTSOFAST" = TRAIT_GOTTAGONOTSOFAST, + "TRAIT_FAKEDEATH" = TRAIT_FAKEDEATH, + "TRAIT_XENO_HOST" = TRAIT_XENO_HOST, + "TRAIT_SHOCKIMMUNE" = TRAIT_SHOCKIMMUNE, + "TRAIT_TESLA_SHOCKIMMUNE" = TRAIT_TESLA_SHOCKIMMUNE, + "TRAIT_RESISTHEAT" = TRAIT_RESISTHEAT, + "TRAIT_RESISTHEATHANDS" = TRAIT_RESISTHEATHANDS, + "TRAIT_RESISTCOLD" = TRAIT_RESISTCOLD, + "TRAIT_RESISTHIGHPRESSURE" = TRAIT_RESISTHIGHPRESSURE, + "TRAIT_RESISTLOWPRESSURE" = TRAIT_RESISTLOWPRESSURE, + "TRAIT_RADIMMUNE" = TRAIT_RADIMMUNE, + "TRAIT_GENELESS" = TRAIT_GENELESS, + "TRAIT_VIRUSIMMUNE" = TRAIT_VIRUSIMMUNE, + "TRAIT_PIERCEIMMUNE" = TRAIT_PIERCEIMMUNE, + "TRAIT_NOFIRE" = TRAIT_NOFIRE, + "TRAIT_NOHUNGER" = TRAIT_NOHUNGER, + "TRAIT_NOBREATH" = TRAIT_NOBREATH, + "TRAIT_NOCRITDAMAGE" = TRAIT_NOCRITDAMAGE, + "TRAIT_XRAY_VISION" = TRAIT_XRAY_VISION, + "TRAIT_THERMAL_VISION" = TRAIT_THERMAL_VISION, + "TRAIT_XENO_IMMUNE" = TRAIT_XENO_IMMUNE, + "TRAIT_BLOODCRAWL" = TRAIT_BLOODCRAWL, + "TRAIT_BLOODCRAWL_EAT" = TRAIT_BLOODCRAWL_EAT, + "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, + "TRAIT_SLOWDIGESTION" = TRAIT_SLOWDIGESTION, + "TRAIT_COLORBLIND" = TRAIT_COLORBLIND, + "TRAIT_WINGDINGS" = TRAIT_WINGDINGS, + "TRAIT_WATERBREATH" = TRAIT_WATERBREATH, + "TRAIT_NOFAT" = TRAIT_NOFAT, + "TRAIT_NOGERMS" = TRAIT_NOGERMS, + "TRAIT_NODECAY" = TRAIT_NODECAY, + "TRAIT_NOEXAMINE" = TRAIT_NOEXAMINE, + "TRAIT_NOPAIN" = TRAIT_NOPAIN))) /// value -> trait name, generated on use from trait_by_type global GLOBAL_LIST(trait_name_map) diff --git a/code/_onclick/adjacent.dm b/code/_onclick/adjacent.dm index 58cfdf477f2..f9096ad6492 100644 --- a/code/_onclick/adjacent.dm +++ b/code/_onclick/adjacent.dm @@ -10,11 +10,11 @@ Note that in all cases the neighbor is handled simply; this is usually the user's mob, in which case it is up to you to check that the mob is not inside of something */ -/atom/proc/Adjacent(var/atom/neighbor) // basic inheritance, unused +/atom/proc/Adjacent(atom/neighbor) // basic inheritance, unused return 0 // Not a sane use of the function and (for now) indicative of an error elsewhere -/area/Adjacent(var/atom/neighbor) +/area/Adjacent(atom/neighbor) CRASH("Call to /area/Adjacent(), unimplemented proc") @@ -25,7 +25,7 @@ * If you are diagonally adjacent, ensure you can pass through at least one of the mutually adjacent square. * Passing through in this case ignores anything with the LETPASSTHROW flag, such as tables, racks, and morgue trays. */ -/turf/Adjacent(var/atom/neighbor, var/atom/target = null) +/turf/Adjacent(atom/neighbor, atom/target = null) var/turf/T0 = get_turf(neighbor) if(T0 == src) return 1 @@ -63,7 +63,7 @@ Note: Multiple-tile objects are created when the bound_width and bound_height are creater than the tile size. This is not used in stock /tg/station currently. */ -/atom/movable/Adjacent(var/atom/neighbor) +/atom/movable/Adjacent(atom/neighbor) if(neighbor == loc) return 1 if(!isturf(loc)) return 0 for(var/turf/T in locs) @@ -72,7 +72,7 @@ return 0 // This is necessary for storage items not on your person. -/obj/item/Adjacent(var/atom/neighbor, var/recurse = 1) +/obj/item/Adjacent(atom/neighbor, recurse = 1) if(neighbor == loc) return 1 if(istype(loc,/obj/item)) if(recurse > 0) @@ -85,7 +85,7 @@ This is defined as any dense ON_BORDER object, or any dense object without LETPASSTHROW. The border_only flag allows you to not objects (for source and destination squares) */ -/turf/proc/ClickCross(var/target_dir, var/border_only, var/target_atom = null) +/turf/proc/ClickCross(target_dir, border_only, target_atom = null) for(var/obj/O in src) if( !O.density || O == target_atom || (O.pass_flags & LETPASSTHROW)) continue // LETPASSTHROW is used for anything you can click through diff --git a/code/_onclick/ai.dm b/code/_onclick/ai.dm index 4652ee2f20b..a907a5dfc45 100644 --- a/code/_onclick/ai.dm +++ b/code/_onclick/ai.dm @@ -32,14 +32,6 @@ return changeNext_click(1) - if(multicam_on) - var/turf/T = get_turf(A) - if(T) - for(var/obj/screen/movable/pic_in_pic/ai/P in T.vis_locs) - if(P.ai == src) - P.Click(params) - break - if(control_disabled || stat) return diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm index 8467c6dcb75..77a4ae192f1 100644 --- a/code/_onclick/click.dm +++ b/code/_onclick/click.dm @@ -196,7 +196,7 @@ return FALSE // Default behavior: ignore double clicks, consider them normal clicks instead -/mob/proc/DblClickOn(var/atom/A, var/params) +/mob/proc/DblClickOn(atom/A, params) return /* @@ -209,7 +209,7 @@ proximity_flag is not currently passed to attack_hand, and is instead used in human click code to allow glove touches only at melee range. */ -/mob/proc/UnarmedAttack(var/atom/A, var/proximity_flag) +/mob/proc/UnarmedAttack(atom/A, proximity_flag) if(ismob(A)) changeNext_move(CLICK_CD_MELEE) return @@ -230,14 +230,14 @@ Used when you are handcuffed and click things. Not currently used by anything but could easily be. */ -/mob/proc/RestrainedClickOn(var/atom/A) +/mob/proc/RestrainedClickOn(atom/A) return /* Middle click Only used for swapping hands */ -/mob/proc/MiddleClickOn(var/atom/A) +/mob/proc/MiddleClickOn(atom/A) pointed(A) return @@ -285,7 +285,7 @@ // In case of use break glass /* -/atom/proc/MiddleClick(var/mob/M as mob) +/atom/proc/MiddleClick(mob/M as mob) return */ @@ -294,10 +294,10 @@ For most mobs, examine. This is overridden in ai.dm */ -/mob/proc/ShiftClickOn(var/atom/A) +/mob/proc/ShiftClickOn(atom/A) A.ShiftClick(src) return -/atom/proc/ShiftClick(var/mob/user) +/atom/proc/ShiftClick(mob/user) if(user.client && get_turf(user.client.eye) == get_turf(user)) user.examinate(src) return @@ -306,7 +306,7 @@ Ctrl click For most objects, pull */ -/mob/proc/CtrlClickOn(var/atom/A) +/mob/proc/CtrlClickOn(atom/A) A.CtrlClick(src) return @@ -320,7 +320,7 @@ Alt click Unused except for AI */ -/mob/proc/AltClickOn(var/atom/A) +/mob/proc/AltClickOn(atom/A) A.AltClick(src) return @@ -331,36 +331,39 @@ else ..() -/atom/proc/AltClick(var/mob/user) +/atom/proc/AltClick(mob/user) + SEND_SIGNAL(src, COMSIG_CLICK_ALT, user) var/turf/T = get_turf(src) - if(T) - if(user.TurfAdjacent(T)) - user.listed_turf = T - user.client.statpanel = T.name - // If we had a method to force a `Stat` update, it would go here - else - user.listed_turf = null - return + if(T && (isturf(loc) || isturf(src)) && user.TurfAdjacent(T)) + user.listed_turf = T + user.client.statpanel = T.name -/mob/proc/TurfAdjacent(var/turf/T) +/// Use this instead of [/mob/proc/AltClickOn] where you only want turf content listing without additional atom alt-click interaction +/atom/proc/AltClickNoInteract(mob/user, atom/A) + var/turf/T = get_turf(A) + if(T && user.TurfAdjacent(T)) + user.listed_turf = T + user.client.statpanel = T.name + +/mob/proc/TurfAdjacent(turf/T) return T.Adjacent(src) /* Control+Shift/Alt+Shift click Unused except for AI */ -/mob/proc/CtrlShiftClickOn(var/atom/A) +/mob/proc/CtrlShiftClickOn(atom/A) A.CtrlShiftClick(src) return -/atom/proc/CtrlShiftClick(var/mob/user) +/atom/proc/CtrlShiftClick(mob/user) return -/mob/proc/AltShiftClickOn(var/atom/A) +/mob/proc/AltShiftClickOn(atom/A) A.AltShiftClick(src) return -/atom/proc/AltShiftClick(var/mob/user) +/atom/proc/AltShiftClick(mob/user) return @@ -392,7 +395,7 @@ LE.fire() // Simple helper to face what you clicked on, in case it should be needed in more than one place -/mob/proc/face_atom(var/atom/A) +/mob/proc/face_atom(atom/A) if( stat || buckled || !A || !x || !y || !A.x || !A.y ) return var/dx = A.x - x var/dy = A.y - y diff --git a/code/_onclick/click_override.dm b/code/_onclick/click_override.dm index fc1d09628e8..0336c809511 100644 --- a/code/_onclick/click_override.dm +++ b/code/_onclick/click_override.dm @@ -12,7 +12,7 @@ /datum/middleClickOverride/ -/datum/middleClickOverride/proc/onClick(var/atom/A, var/mob/living/user) +/datum/middleClickOverride/proc/onClick(atom/A, mob/living/user) user.middleClickOverride = null return 1 /* Note, when making a new click override it is ABSOLUTELY VITAL that you set the source's clickOverride to null at some point if you don't want them to be stuck with it forever. @@ -35,7 +35,7 @@ /datum/middleClickOverride/badminClicker var/summon_path = /obj/item/reagent_containers/food/snacks/cookie -/datum/middleClickOverride/badminClicker/onClick(var/atom/A, var/mob/living/user) +/datum/middleClickOverride/badminClicker/onClick(atom/A, mob/living/user) var/atom/movable/newObject = new summon_path newObject.loc = get_turf(A) to_chat(user, "You release the power you had stored up, summoning \a [newObject.name]! ") @@ -74,7 +74,7 @@ L.Weaken(3) else if(P.unlimited_power) - L.electrocute_act(1000, P, safety = TRUE, override = TRUE) //Just kill them + L.electrocute_act(1000, P, flags = SHOCK_NOGLOVES) //Just kill them else electrocute_mob(L, C, P) break diff --git a/code/_onclick/hud/_defines.dm b/code/_onclick/hud/_defines.dm index b069ff31eb7..91fe0c99bf7 100644 --- a/code/_onclick/hud/_defines.dm +++ b/code/_onclick/hud/_defines.dm @@ -22,7 +22,6 @@ //Middle left indicators #define ui_lingchemdisplay "WEST:6,CENTER-1:15" #define ui_lingstingdisplay "WEST:6,CENTER-3:11" -#define ui_devilsouldisplay "WEST:6,CENTER-1:15" //Lower center, persistant menu #define ui_sstore1 "CENTER-5:10,SOUTH:5" @@ -153,8 +152,6 @@ #define ui_ai_take_picture "SOUTH:6,WEST+12" #define ui_ai_view_images "SOUTH:6,WEST+13" #define ui_ai_sensor "SOUTH:6,WEST+14" -#define ui_ai_multicam "SOUTH+1:6,WEST+13" -#define ui_ai_add_multicam "SOUTH+1:6,WEST+14" // Bots #define ui_bot_radio "EAST-1:28,SOUTH:7" diff --git a/code/_onclick/hud/ai.dm b/code/_onclick/hud/ai.dm index 856f724f925..63783a04467 100644 --- a/code/_onclick/hud/ai.dm +++ b/code/_onclick/hud/ai.dm @@ -140,26 +140,6 @@ var/mob/living/silicon/robot/borg = usr borg.sensor_mode() -/obj/screen/ai/multicam - name = "Multicamera Mode" - icon_state = "multicam" - -/obj/screen/ai/multicam/Click() - if(..()) - return - var/mob/living/silicon/ai/AI = usr - AI.toggle_multicam() - -/obj/screen/ai/add_multicam - name = "New Camera" - icon_state = "new_cam" - -/obj/screen/ai/add_multicam/Click() - if(..()) - return - var/mob/living/silicon/ai/AI = usr - AI.drop_new_multicam() - /mob/living/silicon/ai/create_mob_hud() if(client && !hud_used) hud_used = new /datum/hud/ai(src) @@ -248,16 +228,6 @@ using.screen_loc = ui_ai_sensor static_inventory += using -//Multicamera mode - using = new /obj/screen/ai/multicam() - using.screen_loc = ui_ai_multicam - static_inventory += using - -//Add multicamera camera - using = new /obj/screen/ai/add_multicam() - using.screen_loc = ui_ai_add_multicam - static_inventory += using - //Intent using = new /obj/screen/act_intent/robot/AI() using.icon_state = mymob.a_intent diff --git a/code/_onclick/hud/devil.dm b/code/_onclick/hud/devil.dm deleted file mode 100644 index 53f7265c6a4..00000000000 --- a/code/_onclick/hud/devil.dm +++ /dev/null @@ -1,87 +0,0 @@ - -//Soul counter is stored with the humans, it does weird when you place it here apparently... - - -/datum/hud/devil/New(mob/owner, ui_style = 'icons/mob/screen_midnight.dmi') - ..() - - var/obj/screen/using - var/obj/screen/inventory/inv_box - - using = new /obj/screen/drop() - using.icon = ui_style - using.screen_loc = ui_drop_throw - static_inventory += using - - mymob.pullin = new /obj/screen/pull() - mymob.pullin.icon = ui_style - mymob.pullin.update_icon(mymob) - mymob.pullin.screen_loc = ui_pull_resist - static_inventory += mymob.pullin - - inv_box = new /obj/screen/inventory/hand() - inv_box.name = "right hand" - inv_box.icon = ui_style - inv_box.icon_state = "hand_r" - inv_box.screen_loc = ui_rhand - inv_box.slot_id = slot_r_hand - static_inventory += inv_box - - inv_box = new /obj/screen/inventory/hand() - inv_box.name = "left hand" - inv_box.icon = ui_style - inv_box.icon_state = "hand_l" - inv_box.screen_loc = ui_lhand - inv_box.slot_id = slot_l_hand - static_inventory += inv_box - - using = new /obj/screen/swap_hand() - using.name = "hand" - using.icon = ui_style - using.icon_state = "swap_1" - using.screen_loc = ui_swaphand1 - static_inventory += using - - using = new /obj/screen/swap_hand() - using.name = "hand" - using.icon = ui_style - using.icon_state = "swap_2" - using.screen_loc = ui_swaphand2 - static_inventory += using - - zone_select = new /obj/screen/zone_sel() - zone_select.icon = ui_style - zone_select.update_icon(mymob) - - lingchemdisplay = new /obj/screen/ling/chems() - devilsouldisplay = new /obj/screen/devil/soul_counter - infodisplay += devilsouldisplay - - for(var/obj/screen/inventory/inv in static_inventory) - if(inv.slot_id) - inv.hud = src - inv_slots[inv.slot_id] = inv - inv.update_icon() - - -/datum/hud/devil/persistent_inventory_update() - if(!mymob) - return - var/mob/living/carbon/true_devil/D = mymob - - if(hud_version != HUD_STYLE_NOHUD) - if(D.r_hand) - D.r_hand.screen_loc = ui_rhand - D.client.screen += D.r_hand - if(D.l_hand) - D.l_hand.screen_loc = ui_lhand - D.client.screen += D.l_hand - else - if(D.r_hand) - D.r_hand.screen_loc = null - if(D.l_hand) - D.l_hand.screen_loc = null - -/mob/living/carbon/true_devil/create_mob_hud() - if(client && !hud_used) - hud_used = new /datum/hud/devil(src, ui_style2icon(client.prefs.UI_style)) diff --git a/code/_onclick/hud/hud.dm b/code/_onclick/hud/hud.dm index c8d8a7d2290..0cfb6985b8e 100644 --- a/code/_onclick/hud/hud.dm +++ b/code/_onclick/hud/hud.dm @@ -27,8 +27,6 @@ var/obj/screen/move_intent var/obj/screen/module_store_icon - var/obj/screen/devil/soul_counter/devilsouldisplay - var/list/static_inventory = list() //the screen objects which are static var/list/toggleable_inventory = list() //the screen objects which can be hidden var/list/hotkeybuttons = list() //the buttons that can be used via hotkeys @@ -89,7 +87,6 @@ alien_plasma_display = null vampire_blood_display = null nightvisionicon = null - devilsouldisplay = null QDEL_LIST_ASSOC_VAL(plane_masters) diff --git a/code/_onclick/hud/human.dm b/code/_onclick/hud/human.dm index 5b4ce4c99e9..8f125079d6b 100644 --- a/code/_onclick/hud/human.dm +++ b/code/_onclick/hud/human.dm @@ -36,35 +36,6 @@ var/mob/living/carbon/U = usr U.unset_sting() -/obj/screen/devil - invisibility = INVISIBILITY_ABSTRACT - -/obj/screen/devil/soul_counter - icon = 'icons/mob/screen_gen.dmi' - name = "souls owned" - icon_state = "Devil-6" - screen_loc = ui_devilsouldisplay - -/obj/screen/devil/soul_counter/proc/update_counter(souls = 0) - invisibility = 0 - maptext = "
[souls]
" - switch(souls) - if(0,null) - icon_state = "Devil-1" - if(1,2) - icon_state = "Devil-2" - if(3 to 5) - icon_state = "Devil-3" - if(6 to 8) - icon_state = "Devil-4" - if(9 to INFINITY) - icon_state = "Devil-5" - else - icon_state = "Devil-6" - -/obj/screen/devil/soul_counter/proc/clear() - invisibility = INVISIBILITY_ABSTRACT - /obj/screen/ling/chems name = "chemical storage" icon_state = "power_display" @@ -85,7 +56,7 @@ /datum/hud/human var/hud_alpha = 255 -/datum/hud/human/New(mob/living/carbon/human/owner, var/ui_style = 'icons/mob/screen_white.dmi', var/ui_color = "#ffffff", var/ui_alpha = 255) +/datum/hud/human/New(mob/living/carbon/human/owner, ui_style = 'icons/mob/screen_white.dmi', ui_color = "#ffffff", ui_alpha = 255) ..() owner.overlay_fullscreen("see_through_darkness", /obj/screen/fullscreen/see_through_darkness) @@ -372,9 +343,6 @@ lingstingdisplay = new /obj/screen/ling/sting() infodisplay += lingstingdisplay - devilsouldisplay = new /obj/screen/devil/soul_counter - infodisplay += devilsouldisplay - zone_select = new /obj/screen/zone_sel() zone_select.color = ui_color zone_select.icon = ui_style diff --git a/code/_onclick/hud/parallax.dm b/code/_onclick/hud/parallax.dm index d5fb5cad4fa..e9b95cdd4fc 100644 --- a/code/_onclick/hud/parallax.dm +++ b/code/_onclick/hud/parallax.dm @@ -8,7 +8,7 @@ var/last_parallax_shift //world.time of last update var/parallax_throttle = 0 //ds between updates var/parallax_movedir = 0 - var/parallax_layers_max = 3 + var/parallax_layers_max = 4 var/parallax_animate_timer /datum/hud/proc/create_parallax() @@ -21,6 +21,8 @@ C.parallax_layers_cached += new /obj/screen/parallax_layer/layer_1(null, C.view) C.parallax_layers_cached += new /obj/screen/parallax_layer/layer_2(null, C.view) C.parallax_layers_cached += new /obj/screen/parallax_layer/planet(null, C.view) + if(SSparallax.random_layer) + C.parallax_layers_cached += new SSparallax.random_layer C.parallax_layers_cached += new /obj/screen/parallax_layer/layer_3(null, C.view) C.parallax_layers = C.parallax_layers_cached.Copy() @@ -44,12 +46,12 @@ switch(C.prefs.parallax) if (PARALLAX_INSANE) C.parallax_throttle = FALSE - C.parallax_layers_max = 4 + C.parallax_layers_max = 5 return TRUE if (PARALLAX_MED) C.parallax_throttle = PARALLAX_DELAY_MED - C.parallax_layers_max = 2 + C.parallax_layers_max = 3 return TRUE if (PARALLAX_LOW) @@ -60,8 +62,9 @@ if (PARALLAX_DISABLE) return FALSE + //This is high parallax. C.parallax_throttle = PARALLAX_DELAY_DEFAULT - C.parallax_layers_max = 3 + C.parallax_layers_max = 4 return TRUE /datum/hud/proc/update_parallax_pref() @@ -276,6 +279,21 @@ speed = 1.4 layer = 3 +/obj/screen/parallax_layer/random + blend_mode = BLEND_OVERLAY + speed = 3 + layer = 3 + +/obj/screen/parallax_layer/random/space_gas + icon_state = "space_gas" + +/obj/screen/parallax_layer/random/space_gas/New(view) + ..() + add_atom_colour(SSparallax.random_parallax_color, ADMIN_COLOUR_PRIORITY) + +/obj/screen/parallax_layer/random/asteroids + icon_state = "asteroids" + /obj/screen/parallax_layer/planet icon_state = "planet" blend_mode = BLEND_OVERLAY diff --git a/code/_onclick/hud/plane_master.dm b/code/_onclick/hud/plane_master.dm index d372da7c681..d49722e79ee 100644 --- a/code/_onclick/hud/plane_master.dm +++ b/code/_onclick/hud/plane_master.dm @@ -12,15 +12,6 @@ /obj/screen/plane_master/proc/Hide(override) alpha = override || hide_alpha -/obj/screen/plane_master/proc/outline(_size, _color) - filters += filter(type = "outline", size = _size, color = _color) - -/obj/screen/plane_master/proc/shadow(_size, _border, _offset = 0, _x = 0, _y = 0, _color = "#04080FAA") - filters += filter(type = "drop_shadow", x = _x, y = _y, color = _color, size = _size, offset = _offset) - -/obj/screen/plane_master/proc/clear_filters() - filters = list() - //Why do plane masters need a backdrop sometimes? Read http://www.byond.com/forum/?post=2141928 //Trust me, you need one. Period. If you don't think you do, you're doing something extremely wrong. /obj/screen/plane_master/proc/backdrop(mob/mymob) @@ -40,7 +31,7 @@ /obj/screen/plane_master/game_world/backdrop(mob/mymob) clear_filters() if(istype(mymob) && mymob.client && mymob.client.prefs && (mymob.client.prefs.toggles & PREFTOGGLE_AMBIENT_OCCLUSION)) - filters += FILTER_AMBIENT_OCCLUSION + add_filter("AO", 1, drop_shadow_filter(x = 0, y = -2, size = 4, color = "#04080FAA")) /obj/screen/plane_master/lighting name = "lighting plane master" diff --git a/code/_onclick/hud/robot.dm b/code/_onclick/hud/robot.dm index f048c3c393d..bd1c5210826 100644 --- a/code/_onclick/hud/robot.dm +++ b/code/_onclick/hud/robot.dm @@ -87,6 +87,14 @@ var/mob/living/silicon/robot/R = usr R.installed_modules() +/obj/screen/robot/mov_intent + name = "fast/slow toggle" + icon_state = "running" + +/obj/screen/robot/mov_intent/Click() + usr.toggle_move_intent() + + /mob/living/silicon/robot/create_mob_hud() if(client && !hud_used) hud_used = new /datum/hud/robot(src) @@ -131,11 +139,19 @@ static_inventory += using //Intent +// Attack intent using = new /obj/screen/act_intent/robot() using.icon_state = mymob.a_intent static_inventory += using action_intent = using +// Movement intent + using = new /obj/screen/robot/mov_intent() + using.icon_state = (mymob.m_intent == MOVE_INTENT_RUN ? "running" : "walking") + static_inventory += using + using.screen_loc = ui_movi + move_intent = using + //Health mymob.healths = new /obj/screen/healths/robot() infodisplay += mymob.healths diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm index 58bb69355ea..a01ea315e58 100644 --- a/code/_onclick/hud/screen_objects.dm +++ b/code/_onclick/hud/screen_objects.dm @@ -95,7 +95,7 @@ screen_loc = ui_borg_intents /obj/screen/act_intent/robot/AI - screen_loc = "EAST-1:32,SOUTH:70" + screen_loc = "SOUTH+1:6,EAST-1:32" /obj/screen/mov_intent name = "run/walk toggle" diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm index 69ae3659fcb..1fe1c68522b 100644 --- a/code/_onclick/item_attack.dm +++ b/code/_onclick/item_attack.dm @@ -31,7 +31,7 @@ return FALSE /obj/attackby(obj/item/I, mob/living/user, params) - return ..() || (can_be_hit && I.attack_obj(src, user)) + return ..() || (can_be_hit && I.attack_obj(src, user, params)) /mob/living/attackby(obj/item/I, mob/living/user, params) user.changeNext_move(CLICK_CD_MELEE) @@ -73,7 +73,7 @@ else SEND_SIGNAL(M, COMSIG_ITEM_ATTACK) if(hitsound) - playsound(loc, hitsound, get_clamped_volume(), 1, -1) + playsound(loc, hitsound, get_clamped_volume(), TRUE, extrarange = stealthy_audio ? SILENCED_SOUND_EXTRARANGE : -1, falloff_distance = 0) M.lastattacker = user.real_name M.lastattackerckey = user.ckey @@ -87,7 +87,7 @@ //the equivalent of the standard version of attack() but for object targets. -/obj/item/proc/attack_obj(obj/O, mob/living/user) +/obj/item/proc/attack_obj(obj/O, mob/living/user, params) if(SEND_SIGNAL(src, COMSIG_ITEM_ATTACK_OBJ, O, user) & COMPONENT_NO_ATTACK_OBJ) return if(flags & (NOBLUDGEON)) diff --git a/code/_onclick/observer.dm b/code/_onclick/observer.dm index df0ed20f6b1..8a23d228afc 100644 --- a/code/_onclick/observer.dm +++ b/code/_onclick/observer.dm @@ -1,4 +1,4 @@ -/mob/dead/observer/DblClickOn(var/atom/A, var/params) +/mob/dead/observer/DblClickOn(atom/A, params) if(client.click_intercept) // Not doing a click intercept here, because otherwise we double-tap with the `ClickOn` proc. // But we return here since we don't want to do regular dblclick handling @@ -18,7 +18,7 @@ forceMove(get_turf(A)) update_parallax_contents() -/mob/dead/observer/ClickOn(var/atom/A, var/params) +/mob/dead/observer/ClickOn(atom/A, params) if(client.click_intercept) client.click_intercept.InterceptClickOn(src, params, A) return @@ -41,18 +41,21 @@ if(M) admin_mob_info(M) return + if(modifiers["middle"]) + MiddleClickOn(A) + return if(modifiers["shift"]) ShiftClickOn(A) return if(modifiers["alt"]) - AltClickOn(A) + AltClickNoInteract(src, A) return // You are responsible for checking config.ghost_interaction when you override this function // Not all of them require checking, see below A.attack_ghost(src) // We don't need a fucking toggle. -/mob/dead/observer/ShiftClickOn(var/atom/A) +/mob/dead/observer/ShiftClickOn(atom/A) examinate(A) /atom/proc/attack_ghost(mob/user) diff --git a/code/_onclick/other_mobs.dm b/code/_onclick/other_mobs.dm index 4497f170a2d..b2338937ebc 100644 --- a/code/_onclick/other_mobs.dm +++ b/code/_onclick/other_mobs.dm @@ -12,7 +12,7 @@ if(proximity && istype(G) && G.Touch(A, 1)) return - if(HULK in mutations) + if(HAS_TRAIT(src, TRAIT_HULK)) if(proximity) //no telekinetic hulk attack if(A.attack_hulk(src)) return @@ -28,11 +28,11 @@ return /* -/mob/living/carbon/human/RestrainedClickOn(var/atom/A) -- Handled by carbons +/mob/living/carbon/human/RestrainedClickOn(atom/A) -- Handled by carbons return */ -/mob/living/carbon/RestrainedClickOn(var/atom/A) +/mob/living/carbon/RestrainedClickOn(atom/A) return 0 /mob/living/carbon/human/RangedAttack(atom/A, params) @@ -42,10 +42,10 @@ if(istype(G) && G.Touch(A, 0)) // for magic gloves return - if((LASER in mutations) && a_intent == INTENT_HARM) + if(HAS_TRAIT(src, TRAIT_LASEREYES) && a_intent == INTENT_HARM) LaserEyes(A) - if(TK in mutations) + if(dna.GetSEState(GLOB.teleblock)) A.attack_tk(src) if(isturf(A) && get_dist(src, A) <= 1) @@ -54,17 +54,17 @@ /* Animals & All Unspecified */ -/mob/living/UnarmedAttack(var/atom/A) +/mob/living/UnarmedAttack(atom/A) A.attack_animal(src) -/mob/living/simple_animal/hostile/UnarmedAttack(var/atom/A) +/mob/living/simple_animal/hostile/UnarmedAttack(atom/A) target = A AttackingTarget() /atom/proc/attack_animal(mob/user) return -/mob/living/RestrainedClickOn(var/atom/A) +/mob/living/RestrainedClickOn(atom/A) return /* @@ -109,5 +109,5 @@ return // pAIs are not intended to interact with anything in the world -/mob/living/silicon/pai/UnarmedAttack(var/atom/A) +/mob/living/silicon/pai/UnarmedAttack(atom/A) return diff --git a/code/_onclick/overmind.dm b/code/_onclick/overmind.dm index 419524c8711..40c60b99268 100644 --- a/code/_onclick/overmind.dm +++ b/code/_onclick/overmind.dm @@ -1,7 +1,7 @@ // Blob Overmind Controls -/mob/camera/blob/ClickOn(var/atom/A, var/params) //Expand blob +/mob/camera/blob/ClickOn(atom/A, params) //Expand blob var/list/modifiers = params2list(params) if(modifiers["middle"]) MiddleClickOn(A) diff --git a/code/_onclick/telekinesis.dm b/code/_onclick/telekinesis.dm index e684707d460..342af86c0b6 100644 --- a/code/_onclick/telekinesis.dm +++ b/code/_onclick/telekinesis.dm @@ -39,11 +39,11 @@ /obj/item/attack_tk(mob/user) if(user.stat || !isturf(loc)) return - if((TK in user.mutations) && !user.get_active_hand()) // both should already be true to get here + if(user.dna?.GetSEState(GLOB.teleblock) && !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 - warning("Strange attack_tk(): TK([TK in user.mutations]) empty hand([!user.get_active_hand()])") + warning("Strange attack_tk(): TK([user.dna?.GetSEState(GLOB.teleblock)]) empty hand([!user.get_active_hand()])") /mob/attack_tk(mob/user) @@ -87,7 +87,7 @@ //stops TK grabs being equipped anywhere but into hands -/obj/item/tk_grab/equipped(mob/user, var/slot) +/obj/item/tk_grab/equipped(mob/user, slot) if( (slot == slot_l_hand) || (slot== slot_r_hand) ) return qdel(src) @@ -109,7 +109,7 @@ if(!host || host != user) qdel(src) return - if(!(TK in host.mutations)) + if(!host.dna?.GetSEState(GLOB.teleblock)) qdel(src) return if(isobj(target) && !isturf(target.loc)) @@ -151,7 +151,7 @@ if(!.) return I == focus -/obj/item/tk_grab/proc/focus_object(var/obj/target, var/mob/user) +/obj/item/tk_grab/proc/focus_object(obj/target, mob/user) if(!istype(target,/obj)) return//Cant throw non objects atm might let it do mobs later if(target.anchored || !isturf(target.loc)) diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm index c80fe0f7804..aa43133d111 100644 --- a/code/controllers/configuration.dm +++ b/code/controllers/configuration.dm @@ -166,11 +166,6 @@ var/default_laws = 0 //Controls what laws the AI spawns with. - var/list/station_levels = list(1) // Defines which Z-levels the station exists on. - var/list/admin_levels= list(2) // Defines which Z-levels which are for admin functionality, for example including such areas as Central Command and the Syndicate Shuttle - var/list/contact_levels = list(1, 5) // Defines which Z-levels which, for example, a Code Red announcement may affect - var/list/player_levels = list(1, 3, 4, 5, 6, 7) // Defines all Z-levels a character can typically reach - var/const/minutes_to_ticks = 60 * 10 // Event settings var/expected_round_length = 60 * 2 * minutes_to_ticks // 2 hours @@ -274,6 +269,12 @@ /// Limit of how many SQL threads can run at once var/rust_sql_thread_limit = 50 + /// Max amount of CIDs that one ckey can have attached to them before they trip a warning + var/max_client_cid_history = 3 + + /// Enable auto profiler of rounds + var/auto_profile = FALSE + /datum/configuration/New() for(var/T in subtypesof(/datum/game_mode)) var/datum/game_mode/M = T @@ -765,6 +766,10 @@ // End discord stuff if("centcom_ban_db_url") centcom_ban_db_url = value + if("max_client_cid_history") + max_client_cid_history = text2num(value) + if("enable_auto_profiler") + auto_profile = TRUE else log_config("Unknown setting in configuration: '[name]'") diff --git a/code/controllers/controller.dm b/code/controllers/controller.dm index c9d5f1e5650..54f984005c8 100644 --- a/code/controllers/controller.dm +++ b/code/controllers/controller.dm @@ -17,3 +17,11 @@ /datum/controller/proc/Recover() /datum/controller/proc/stat_entry() + +/** + * Standardized method for tracking startup times. + */ +/datum/controller/proc/log_startup_progress(message) + Master.current_init_stage = "([name]): [message]" + to_chat(world, "\[[name]] [message]") + log_world("\[[name]] [message]") diff --git a/code/controllers/master.dm b/code/controllers/master.dm index 9a119bfa6a3..82e2517823a 100644 --- a/code/controllers/master.dm +++ b/code/controllers/master.dm @@ -17,48 +17,61 @@ GLOBAL_REAL(Master, /datum/controller/master) = new /datum/controller/master name = "Master" - // Are we processing (higher values increase the processing delay by n ticks) - var/processing = TRUE - // How many times have we ran + /// Are we processing (higher values increase the processing delay by n ticks) + var/processing = 1 + /// How many times have we ran var/iteration = 0 - // world.time of last fire, for tracking lag outside of the mc + /// world.time of last fire, for tracking lag outside of the mc var/last_run - // List of subsystems to process(). + /// List of subsystems to fire(). var/list/subsystems + /// Current init stage + var/current_init_stage + // Vars for keeping track of tick drift. var/init_timeofday var/init_time var/tickdrift = 0 + /// How long is the MC sleeping between runs, read only (set by Loop() based off of anti-tick-contention heuristics) var/sleep_delta = 1 + /// Set this to 1 to debug the MC with a detailed stack trace. Do not set on a production server. var/make_runtime = 0 - var/initializations_finished_with_no_players_logged_in //I wonder what this could be? + /// Did inits finish with no one logged in + var/initializations_finished_with_no_players_logged_in - // The type of the last subsystem to be process()'d. + // The type of the last subsystem to be fire()'d. var/last_type_processed - var/datum/controller/subsystem/queue_head //Start of queue linked list - var/datum/controller/subsystem/queue_tail //End of queue linked list (used for appending to the list) - var/queue_priority_count = 0 //Running total so that we don't have to loop thru the queue each run to split up the tick - var/queue_priority_count_bg = 0 //Same, but for background subsystems - var/map_loading = FALSE //Are we loading in a new map? + /// Start of queue linked list + var/datum/controller/subsystem/queue_head + /// End of queue linked list (used for appending to the list) + var/datum/controller/subsystem/queue_tail + /// Running total so that we don't have to loop thru the queue each run to split up the tick + var/queue_priority_count = 0 + /// Same, but for background subsystems + var/queue_priority_count_bg = 0 + /// Are we loading in a new map? + var/map_loading = FALSE - var/current_runlevel //for scheduling different subsystems for different stages of the round + /// For scheduling different subsystems for different stages of the round + var/current_runlevel + /// Do we want to sleep until players log in? var/sleep_offline_after_initializations = TRUE var/static/restart_clear = 0 var/static/restart_timeout = 0 var/static/restart_count = 0 + /// Random seed generated for randomness if entropy is required var/static/random_seed - //current tick limit, assigned before running a subsystem. - //used by CHECK_TICK as well so that the procs subsystems call can obey that SS's tick limits + /// Current tick limit, assigned before running a subsystem. Used by CHECK_TICK as well so that the procs subsystems call can obey that SS's tick limits var/static/current_ticklimit = TICK_LIMIT_RUNNING /datum/controller/master/New() @@ -185,14 +198,13 @@ GLOBAL_REAL(Master, /datum/controller/master) = new for(var/datum/controller/subsystem/SS in subsystems) if(SS.flags & SS_NO_INIT) continue + SS.log_startup_progress("Initializing...") SS.Initialize(REALTIMEOFDAY) CHECK_TICK current_ticklimit = TICK_LIMIT_RUNNING var/time = (REALTIMEOFDAY - start_timeofday) / 10 - var/msg = "Initializations complete within [time] second[time == 1 ? "" : "s"]!" - to_chat(world, "[msg]") - log_world(msg) + log_startup_progress("Initializations complete within [time] second[time == 1 ? "" : "s"]!") if(config.developer_express_start & SSticker.current_state == GAME_STATE_PREGAME) SSticker.current_state = GAME_STATE_SETTING_UP @@ -588,7 +600,8 @@ GLOBAL_REAL(Master, /datum/controller/master) = new /datum/controller/master/stat_entry() if(!statclick) statclick = new/obj/effect/statclick/debug(null, "Initializing...", src) - + if(current_init_stage) + stat("Init Stage", current_init_stage) stat("Byond:", "(FPS:[world.fps]) (TickCount:[world.time / world.tick_lag]) (TickDrift:[round(Master.tickdrift, 1)]([round((Master.tickdrift / (world.time / world.tick_lag)) * 100, 0.1)]%))") stat("Master Controller:", statclick.update("(TickRate:[Master.processing]) (Iteration:[Master.iteration])")) diff --git a/code/controllers/subsystem.dm b/code/controllers/subsystem.dm index c9934b128cf..f187fb7a9b9 100644 --- a/code/controllers/subsystem.dm +++ b/code/controllers/subsystem.dm @@ -162,9 +162,7 @@ /datum/controller/subsystem/Initialize(start_timeofday) initialized = TRUE var/time = (REALTIMEOFDAY - start_timeofday) / 10 - var/msg = "Initialized [name] subsystem within [time] second[time == 1 ? "" : "s"]!" - to_chat(world, "[msg]") - log_world(msg) + log_startup_progress("Initialized within [time] second[time == 1 ? "" : "s"]!") return time //hook for printing stats to the "MC" statuspanel for admins to see performance and related stats etc. diff --git a/code/controllers/subsystem/afk.dm b/code/controllers/subsystem/afk.dm index ee3d70814b4..9b1d5f3fa26 100644 --- a/code/controllers/subsystem/afk.dm +++ b/code/controllers/subsystem/afk.dm @@ -76,7 +76,7 @@ SUBSYSTEM_DEF(afk) /datum/controller/subsystem/afk/proc/warn(mob/living/carbon/human/H, text) to_chat(H, text) - SEND_SOUND(H, 'sound/effects/adminhelp.ogg') + SEND_SOUND(H, sound('sound/effects/adminhelp.ogg')) if(H.client) window_flash(H.client) diff --git a/code/controllers/subsystem/air.dm b/code/controllers/subsystem/air.dm index 061c057c368..324df11b8d1 100644 --- a/code/controllers/subsystem/air.dm +++ b/code/controllers/subsystem/air.dm @@ -280,14 +280,10 @@ SUBSYSTEM_DEF(air) if(blockchanges && T.excited_group) T.excited_group.garbage_collect() else - for(var/direction in GLOB.cardinal) - if(!(T.atmos_adjacent_turfs & direction)) - continue - var/turf/simulated/S = get_step(T, direction) - if(istype(S)) - add_to_active(S) + for(var/turf/simulated/S in T.atmos_adjacent_turfs) + add_to_active(S) -/datum/controller/subsystem/air/proc/setup_allturfs(var/list/turfs_to_init = block(locate(1, 1, 1), locate(world.maxx, world.maxy, world.maxz))) +/datum/controller/subsystem/air/proc/setup_allturfs(list/turfs_to_init = block(locate(1, 1, 1), locate(world.maxx, world.maxy, world.maxz))) var/list/active_turfs = src.active_turfs // Clear active turfs - faster than removing every single turf in the world @@ -325,15 +321,15 @@ SUBSYSTEM_DEF(air) ET.excited = 1 . += ET -/datum/controller/subsystem/air/proc/setup_atmos_machinery(var/list/machines_to_init) +/datum/controller/subsystem/air/proc/setup_atmos_machinery(list/machines_to_init) var/watch = start_watch() log_startup_progress("Initializing atmospherics machinery...") var/count = _setup_atmos_machinery(machines_to_init) - log_startup_progress(" Initialized [count] atmospherics machines in [stop_watch(watch)]s.") + log_startup_progress("Initialized [count] atmospherics machines in [stop_watch(watch)]s.") // this underscored variant is so that we can have a means of late initing // atmos machinery without a loud announcement to the world -/datum/controller/subsystem/air/proc/_setup_atmos_machinery(var/list/machines_to_init) +/datum/controller/subsystem/air/proc/_setup_atmos_machinery(list/machines_to_init) var/count = 0 for(var/obj/machinery/atmospherics/A in machines_to_init) A.atmos_init() @@ -349,15 +345,15 @@ SUBSYSTEM_DEF(air) //this can't be done with setup_atmos_machinery() because // all atmos machinery has to initalize before the first // pipenet can be built. -/datum/controller/subsystem/air/proc/setup_pipenets(var/list/pipes) +/datum/controller/subsystem/air/proc/setup_pipenets(list/pipes) var/watch = start_watch() log_startup_progress("Initializing pipe networks...") var/count = _setup_pipenets(pipes) - log_startup_progress(" Initialized [count] pipenets in [stop_watch(watch)]s.") + log_startup_progress("Initialized [count] pipenets in [stop_watch(watch)]s.") // An underscored wrapper that exists for the same reason // the machine init wrapper does -/datum/controller/subsystem/air/proc/_setup_pipenets(var/list/pipes) +/datum/controller/subsystem/air/proc/_setup_pipenets(list/pipes) var/count = 0 for(var/obj/machinery/atmospherics/machine in pipes) machine.build_network() diff --git a/code/controllers/subsystem/ambience.dm b/code/controllers/subsystem/ambience.dm new file mode 100644 index 00000000000..2b1f0894c68 --- /dev/null +++ b/code/controllers/subsystem/ambience.dm @@ -0,0 +1,30 @@ +/// The subsystem used to play ambience to users every now and then, makes them real excited. +SUBSYSTEM_DEF(ambience) + name = "Ambience" + flags = SS_BACKGROUND | SS_NO_INIT + priority = FIRE_PRIORITY_AMBIENCE + runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME + wait = 1 SECONDS + ///Assoc list of listening client - next ambience time + var/list/ambience_listening_clients = list() + +/datum/controller/subsystem/ambience/fire(resumed) + for(var/C in ambience_listening_clients) + var/client/client_iterator = C + + if(isnull(client_iterator)) + ambience_listening_clients -= client_iterator + continue + + if(ambience_listening_clients[client_iterator] > world.time) + continue //Not ready for the next sound + + var/area/current_area = get_area(client_iterator.mob) + + var/ambience = safepick(current_area.ambientsounds) + if(!ambience) + continue + + SEND_SOUND(client_iterator.mob, sound(ambience, repeat = 0, wait = 0, volume = 25 * client_iterator.prefs.get_channel_volume(CHANNEL_AMBIENCE), channel = CHANNEL_AMBIENCE)) + + ambience_listening_clients[client_iterator] = world.time + rand(current_area.min_ambience_cooldown, current_area.max_ambience_cooldown) diff --git a/code/controllers/subsystem/atoms.dm b/code/controllers/subsystem/atoms.dm index cbe8806fc15..cf29fb0619f 100644 --- a/code/controllers/subsystem/atoms.dm +++ b/code/controllers/subsystem/atoms.dm @@ -54,7 +54,7 @@ SUBSYSTEM_DEF(atoms) CHECK_TICK if(noisy) - log_startup_progress(" Initialized [count] atoms in [stop_watch(watch)]s") + log_startup_progress("Initialized [count] atoms in [stop_watch(watch)]s") else log_debug(" Initialized [count] atoms in [stop_watch(watch)]s") pass(count) @@ -71,9 +71,9 @@ SUBSYSTEM_DEF(atoms) var/atom/A = I A.LateInitialize() if(noisy) - log_startup_progress(" Late initialized [late_loaders.len] atoms in [stop_watch(watch)]s") + log_startup_progress("Late initialized [length(late_loaders)] atoms in [stop_watch(watch)]s") else - log_debug(" Late initialized [late_loaders.len] atoms in [stop_watch(watch)]s") + log_debug(" Late initialized [length(late_loaders)] atoms in [stop_watch(watch)]s") late_loaders.Cut() /datum/controller/subsystem/atoms/proc/InitAtom(atom/A, list/arguments) diff --git a/code/controllers/subsystem/changelog.dm b/code/controllers/subsystem/changelog.dm index 8379e1a387c..3a2e3513916 100644 --- a/code/controllers/subsystem/changelog.dm +++ b/code/controllers/subsystem/changelog.dm @@ -163,6 +163,7 @@ SUBSYSTEM_DEF(changelog) // This proc is the star of the show /datum/controller/subsystem/changelog/proc/GenerateChangelogHTML() + . = FALSE // Modify the code below to modify the header of the changelog var/changelog_header = {" @@ -188,52 +189,64 @@ SUBSYSTEM_DEF(changelog) // Load in the header changelogHTML += changelog_header - // Make blocks for all the PRs + // We put all these queries into a list so we can batch-execute them to avoid excess delays + // We index these based on PR numbers. MAKE SURE YOU USE STRING INDICIES IN THIS IF YOU EVER TWEAK IT -aa + var/list/datum/db_query/meta_queries = list() + var/list/datum/db_query/entry_queries = list() + + // Create some queries for each PR + for(var/pr_number in prs_to_process) + var/datum/db_query/pr_meta = SSdbcore.NewQuery( + "SELECT author, DATE_FORMAT(date_merged, '%Y-%m-%d at %T') AS date FROM changelog WHERE pr_number = :prnum LIMIT 1", + list("prnum" = pr_number) + ) + + // MAKE SURE YOU CAST TO STRINGS HERE! + meta_queries["[pr_number]"] = pr_meta + + var/datum/db_query/pr_cl_entries = SSdbcore.NewQuery( + "SELECT cl_type, cl_entry FROM changelog WHERE pr_number = :prnum", + list("prnum" = pr_number) + ) + + // And here + entry_queries["[pr_number]"] = pr_cl_entries + + ASSERT(length(meta_queries) == length(entry_queries)) // If these dont add up, something went very wrong + + // Explanation for parameters: + // TRUE: We want warnings if these fail + // FALSE: Do NOT qdel() queries here, otherwise they wont be read. At all. + // TRUE: This is an assoc list, so it needs to prepare for that + SSdbcore.MassExecute(meta_queries, TRUE, FALSE, TRUE) + SSdbcore.MassExecute(entry_queries, TRUE, FALSE, TRUE) + for(var/pr_number in prs_to_process) // Initial declarations var/pr_block = "" // HTML for the changelog section var/author = "" // Author of the PR var/merge_date = "" // Timestamp of when the PR was merged - // Now we gather the data from the DB - var/datum/db_query/pr_meta = SSdbcore.NewQuery( - "SELECT author, DATE_FORMAT(date_merged, '%Y-%m-%d at %T') AS date FROM changelog WHERE pr_number = :prnum LIMIT 1", - list("prnum" = pr_number) - ) - - if(!pr_meta.warn_execute()) - qdel(pr_meta) - return FALSE - - while(pr_meta.NextRow()) - author = pr_meta.item[1] - merge_date = pr_meta.item[2] - - qdel(pr_meta) + // Assemble metadata + while(meta_queries["[pr_number]"].NextRow()) + author = meta_queries["[pr_number]"].item[1] + merge_date = meta_queries["[pr_number]"].item[2] // Now for each actual entry - var/datum/db_query/pr_cl_entries = SSdbcore.NewQuery( - "SELECT cl_type, cl_entry FROM changelog WHERE pr_number = :prnum", - list("prnum" = pr_number) - ) - - if(!pr_cl_entries.warn_execute()) - qdel(pr_cl_entries) - return FALSE - - // Now we make a changelog block pr_block += "
" - // If the github URL in the config has a trailing slash, it doesnt matter here, thankfully github accepts having a double slash: https://github.com/org/repo//pull/1 pr_block += "

#[pr_number] by [author] (Merged on [merge_date])" - while(pr_cl_entries.NextRow()) - pr_block += "

[Text2Icon(pr_cl_entries.item[1])] [pr_cl_entries.item[2]]

" + while(entry_queries["[pr_number]"].NextRow()) + pr_block += "

[Text2Icon(entry_queries["[pr_number]"].item[1])] [entry_queries["[pr_number]"].item[2]]

" - qdel(pr_cl_entries) pr_block += "

" changelogHTML += pr_block + // Cleanup queries + QDEL_LIST_ASSOC_VAL(meta_queries) + QDEL_LIST_ASSOC_VAL(entry_queries) + // Make sure we return TRUE so we know it worked return TRUE @@ -248,14 +261,7 @@ SUBSYSTEM_DEF(changelog) if("forum") usr.client.forum() if("wiki") - // Wiki needs snowflake because it has no cancel button - if(config.wikiurl) - if(alert("This will open the wiki in your browser. Are you sure?",,"Yes","No")=="No") - return - usr.client.wiki() - else - to_chat(usr, "The Wiki URL is not set in the server configuration. Please inform the server host.") - + usr.client.wiki() if("github") usr.client.github() // Takes a PR number as argument @@ -263,6 +269,7 @@ SUBSYSTEM_DEF(changelog) if(config.githuburl) if(alert("This will open PR #[href_list["openPR"]] in your browser. Are you sure?",,"Yes","No")=="No") return + // If the github URL in the config has a trailing slash, it doesnt matter here, thankfully github accepts having a double slash: https://github.com/org/repo//pull/1 var/url = "[config.githuburl]/pull/[href_list["openPR"]]" usr << link(url) else diff --git a/code/controllers/subsystem/dbcore.dm b/code/controllers/subsystem/dbcore.dm index 9812dcf6a80..81aab3b0759 100644 --- a/code/controllers/subsystem/dbcore.dm +++ b/code/controllers/subsystem/dbcore.dm @@ -38,7 +38,7 @@ SUBSYSTEM_DEF(dbcore) for(var/I in active_queries) var/datum/db_query/Q = I if(world.time - Q.last_activity_time > 5 MINUTES) - message_admins("Found undeleted query, please check the server logs and notify coders.") + log_debug("Found undeleted query, please check the server logs and notify coders.") log_sql("Undeleted query: \"[Q.sql]\" LA: [Q.last_activity] LAT: [Q.last_activity_time]") qdel(Q) if(MC_TICK_CHECK) @@ -180,7 +180,7 @@ SUBSYSTEM_DEF(dbcore) "UPDATE [format_table_name("round")] SET start_datetime=NOW(), commit_hash=:hash WHERE id=:round_id", list("hash" = GLOB.revision_info.commit_hash, "round_id" = GLOB.round_id) ) - query_round_start.Execute() + query_round_start.Execute(async = FALSE) // This happens during a time of intense server lag, so should be non-async qdel(query_round_start) /** @@ -264,26 +264,42 @@ SUBSYSTEM_DEF(dbcore) * * querys - List of queries to execute * * warn - Boolean to warn on query failure * * qdel - Boolean to enable auto qdel of queries + * * assoc - Boolean to enable support for an associative list of queries + * * log - Do we want to generate logs for these queries */ -/datum/controller/subsystem/dbcore/proc/MassExecute(list/querys, warn = FALSE, qdel = FALSE) +/datum/controller/subsystem/dbcore/proc/MassExecute(list/querys, warn = FALSE, qdel = FALSE, assoc = FALSE, log = TRUE) if(!islist(querys)) if(!istype(querys, /datum/db_query)) CRASH("Invalid query passed to MassExecute: [querys]") querys = list(querys) + var/start_time = start_watch() + if(log) + log_debug("Mass executing [length(querys)] queries...") + for(var/thing in querys) - var/datum/db_query/query = thing + var/datum/db_query/query + if(assoc) + query = querys[thing] + else + query = thing if(warn) INVOKE_ASYNC(query, /datum/db_query.proc/warn_execute) else INVOKE_ASYNC(query, /datum/db_query.proc/Execute) for(var/thing in querys) - var/datum/db_query/query = thing + var/datum/db_query/query + if(assoc) + query = querys[thing] + else + query = thing UNTIL(!query.in_progress) if(qdel) qdel(query) + if(log) + log_debug("Executed [length(querys)] queries in [stop_watch(start_time)]s") /** * # db_query diff --git a/code/controllers/subsystem/events.dm b/code/controllers/subsystem/events.dm index 4b2ed4a71fd..859c940688c 100644 --- a/code/controllers/subsystem/events.dm +++ b/code/controllers/subsystem/events.dm @@ -2,6 +2,7 @@ SUBSYSTEM_DEF(events) name = "Events" init_order = INIT_ORDER_EVENTS runlevels = RUNLEVEL_GAME + flags = SS_KEEP_TIMING offline_implications = "Random events will no longer happen. No immediate action is needed." // Report events at the end of the rouund var/report_at_round_end = 0 diff --git a/code/controllers/subsystem/ghost_spawns.dm b/code/controllers/subsystem/ghost_spawns.dm index d8a4f29e20d..e0234c2616a 100644 --- a/code/controllers/subsystem/ghost_spawns.dm +++ b/code/controllers/subsystem/ghost_spawns.dm @@ -59,11 +59,12 @@ SUBSYSTEM_DEF(ghost_spawns) var/category = "[P.hash]_notify_action" + var/notice_sound = sound('sound/misc/notice2.ogg') for(var/mob/dead/observer/M in (ignore_respawnability ? GLOB.player_list : GLOB.respawnable_list)) if(!is_eligible(M, role, antag_age_check, role, min_hours, check_antaghud)) continue - SEND_SOUND(M, 'sound/misc/notice2.ogg') + SEND_SOUND(M, notice_sound) if(flash_window) window_flash(M.client) @@ -245,7 +246,7 @@ SUBSYSTEM_DEF(ghost_spawns) if(time_left() <= 0) if(!silent) to_chat(M, "Sorry, you were too late for the consideration!") - SEND_SOUND(M, 'sound/machines/buzz-sigh.ogg') + SEND_SOUND(M, sound('sound/machines/buzz-sigh.ogg')) return signed_up += M diff --git a/code/controllers/subsystem/jobs.dm b/code/controllers/subsystem/jobs.dm index 56e877f6f8d..c7e18522392 100644 --- a/code/controllers/subsystem/jobs.dm +++ b/code/controllers/subsystem/jobs.dm @@ -1,7 +1,7 @@ SUBSYSTEM_DEF(jobs) name = "Jobs" init_order = INIT_ORDER_JOBS // 12 - wait = 3000 // 5 minutes (Deciseconds) + wait = 5 MINUTES // Dont ever make this a super low value since EXP updates are calculated from this value runlevels = RUNLEVEL_GAME offline_implications = "Job playtime hours will no longer be logged. No immediate action is needed." @@ -25,11 +25,11 @@ SUBSYSTEM_DEF(jobs) // Only fires every 5 minutes /datum/controller/subsystem/jobs/fire() - if(!config.sql_enabled || !config.use_exp_tracking) + if(!SSdbcore.IsConnected() || !config.use_exp_tracking) return - INVOKE_ASYNC(GLOBAL_PROC, /.proc/update_exp, 5, 0) + batch_update_player_exp(announce = FALSE) // Set this to true if you ever want to inform players about their EXP gains -/datum/controller/subsystem/jobs/proc/SetupOccupations(var/list/faction = list("Station")) +/datum/controller/subsystem/jobs/proc/SetupOccupations(list/faction = list("Station")) occupations = list() var/list/all_jobs = subtypesof(/datum/job) if(!all_jobs.len) @@ -47,7 +47,7 @@ SUBSYSTEM_DEF(jobs) return 1 -/datum/controller/subsystem/jobs/proc/Debug(var/text) +/datum/controller/subsystem/jobs/proc/Debug(text) if(!GLOB.debug2) return 0 job_debug.Add(text) @@ -67,7 +67,7 @@ SUBSYSTEM_DEF(jobs) /datum/controller/subsystem/jobs/proc/GetPlayerAltTitle(mob/new_player/player, rank) return player.client.prefs.GetPlayerAltTitle(GetJob(rank)) -/datum/controller/subsystem/jobs/proc/AssignRole(var/mob/new_player/player, var/rank, var/latejoin = 0) +/datum/controller/subsystem/jobs/proc/AssignRole(mob/new_player/player, rank, latejoin = 0) Debug("Running AR, Player: [player], Rank: [rank], LJ: [latejoin]") if(player && player.mind && rank) var/datum/job/job = GetJob(rank) @@ -110,7 +110,7 @@ SUBSYSTEM_DEF(jobs) Debug("AR has failed, Player: [player], Rank: [rank]") return 0 -/datum/controller/subsystem/jobs/proc/FreeRole(var/rank) //making additional slot on the fly +/datum/controller/subsystem/jobs/proc/FreeRole(rank) //making additional slot on the fly var/datum/job/job = GetJob(rank) if(job && job.current_positions >= job.total_positions && job.total_positions != -1) job.total_positions++ @@ -145,7 +145,7 @@ SUBSYSTEM_DEF(jobs) candidates += player return candidates -/datum/controller/subsystem/jobs/proc/GiveRandomJob(var/mob/new_player/player) +/datum/controller/subsystem/jobs/proc/GiveRandomJob(mob/new_player/player) Debug("GRJ Giving random job, Player: [player]") for(var/datum/job/job in shuffle(occupations)) if(!job) @@ -229,7 +229,7 @@ SUBSYSTEM_DEF(jobs) ///This proc is called at the start of the level loop of DivideOccupations() and will cause head jobs to be checked before any other jobs of the same level -/datum/controller/subsystem/jobs/proc/CheckHeadPositions(var/level) +/datum/controller/subsystem/jobs/proc/CheckHeadPositions(level) for(var/command_position in GLOB.command_positions) var/datum/job/job = GetJob(command_position) if(!job) @@ -409,7 +409,7 @@ SUBSYSTEM_DEF(jobs) log_debug("Dividing Occupations took [stop_watch(watch)]s") return 1 -/datum/controller/subsystem/jobs/proc/AssignRank(var/mob/living/carbon/human/H, var/rank, var/joined_late = 0) +/datum/controller/subsystem/jobs/proc/AssignRank(mob/living/carbon/human/H, rank, joined_late = 0) if(!H) return null var/datum/job/job = GetJob(rank) @@ -500,7 +500,7 @@ SUBSYSTEM_DEF(jobs) job.after_spawn(H) //Gives glasses to the vision impaired - if(NEARSIGHTED in H.mutations) + if(HAS_TRAIT(H, TRAIT_NEARSIGHT)) var/equipped = H.equip_to_slot_or_del(new /obj/item/clothing/glasses/regular(H), slot_glasses) if(equipped != 1) var/obj/item/clothing/glasses/G = H.glasses @@ -726,3 +726,139 @@ SUBSYSTEM_DEF(jobs) new_id_change_records["[id_change_counter]"] = thisrecord id_change_counter++ id_change_records = new_id_change_records + +// This proc will update all players EXP at once. It will calculate amount of time to add dynamically based on the SS fire time. +/datum/controller/subsystem/jobs/proc/batch_update_player_exp(announce = FALSE) + // Right off the bat + var/start_time = start_watch() + // First calculate minutes + var/divider = 10 // By default, 10 deciseconds in 1 second + if(flags & SS_TICKER) + divider = 20 // If this SS ever gets made into a ticker SS, account for that + + var/minutes = (wait / divider) / 60 // Calculate minutes based on the SS wait time (How often this proc fires) + + // Step 1: Get us a list of clients to process + var/list/client/clients_to_process = GLOB.clients.Copy() // This is copied so that clients joining in the middle of this dont break things + Debug("Starting EXP update for [length(clients_to_process)] clients. (Adding [minutes] minutes)") + + var/list/datum/db_query/select_queries = list() // List of SELECT queries to mass grab EXP. + + for(var/i in clients_to_process) + var/client/C = i + if(!C) + continue // If a client logs out in the middle of this + + var/datum/db_query/exp_read = SSdbcore.NewQuery( + "SELECT exp FROM [format_table_name("player")] WHERE ckey=:ckey", + list("ckey" = C.ckey) + ) + + select_queries[C.ckey] = exp_read + + var/list/read_records = list() + // Explanation for parameters: + // TRUE: We want warnings if these fail + // FALSE: Do NOT qdel() queries here, otherwise they wont be read. At all. + // TRUE: This is an assoc list, so it needs to prepare for that + // FALSE: We dont want to logspam + SSdbcore.MassExecute(select_queries, TRUE, FALSE, TRUE, FALSE) // Batch execute so we can take advantage of async magic + + for(var/i in clients_to_process) + var/client/C = i + if(!C) + continue // If a client logs out in the middle of this + + if(select_queries[C.ckey]) // This check should not be necessary, but I am paranoid + while(select_queries[C.ckey].NextRow()) + read_records[C.ckey] = params2list(select_queries[C.ckey].item[1]) + + QDEL_LIST_ASSOC_VAL(select_queries) // Clean stuff up + + var/list/play_records = list() + + var/list/datum/db_query/player_update_queries = list() // List of queries to update player EXP + var/list/datum/db_query/playtime_history_update_queries = list() // List of queries to update the playtime history table + + for(var/i in clients_to_process) + var/client/C = i + if(!C) + continue // If a client logs out in the middle of this + // Get us a container + play_records[C.ckey] = list() + for(var/rtype in GLOB.exp_jobsmap) + if(text2num(read_records[C.ckey][rtype])) + play_records[C.ckey][rtype] = text2num(read_records[C.ckey][rtype]) + else + play_records[C.ckey][rtype] = 0 + + + var/myrole + if(C.mob.mind) + if(C.mob.mind.playtime_role) + myrole = C.mob.mind.playtime_role + else if(C.mob.mind.assigned_role) + myrole = C.mob.mind.assigned_role + + var/added_living = 0 + var/added_ghost = 0 + if(C.mob.stat == CONSCIOUS && myrole) + play_records[C.ckey][EXP_TYPE_LIVING] += minutes + added_living += minutes + + if(announce) + to_chat(C.mob, "You got: [minutes] Living EXP!") + + for(var/category in GLOB.exp_jobsmap) + if(GLOB.exp_jobsmap[category]["titles"]) + if(myrole in GLOB.exp_jobsmap[category]["titles"]) + play_records[C.ckey][category] += minutes + if(announce) + to_chat(C.mob, "You got: [minutes] [category] EXP!") + + if(C.mob.mind.special_role) + play_records[C.ckey][EXP_TYPE_SPECIAL] += minutes + if(announce) + to_chat(C.mob, "You got: [minutes] Special EXP!") + + else if(isobserver(C.mob)) + play_records[C.ckey][EXP_TYPE_GHOST] += minutes + added_ghost += minutes + if(announce) + to_chat(C.mob, "You got: [minutes] Ghost EXP!") + else + continue + + var/new_exp = list2params(play_records[C.ckey]) + + C.prefs.exp = new_exp + + var/datum/db_query/update_query = SSdbcore.NewQuery( + "UPDATE [format_table_name("player")] SET exp =:newexp, lastseen=NOW() WHERE ckey=:ckey", + list( + "newexp" = new_exp, + "ckey" = C.ckey + ) + ) + + player_update_queries += update_query + + var/datum/db_query/update_query_history = SSdbcore.NewQuery({" + INSERT INTO [format_table_name("playtime_history")] (ckey, date, time_living, time_ghost) + VALUES (:ckey, CURDATE(), :addedliving, :addedghost) + ON DUPLICATE KEY UPDATE time_living=time_living + VALUES(time_living), time_ghost=time_ghost + VALUES(time_ghost)"}, + list( + "ckey" = C.ckey, + "addedliving" = added_living, + "addedghost" = added_ghost + ) + ) + + playtime_history_update_queries += update_query_history + + + // warn=TRUE, qdel=TRUE, assoc=FALSE, log=FALSE + SSdbcore.MassExecute(player_update_queries, TRUE, TRUE, FALSE, FALSE) // Batch execute so we can take advantage of async magic + SSdbcore.MassExecute(playtime_history_update_queries, TRUE, TRUE, FALSE, FALSE) + + Debug("Successfully updated all EXP data in [stop_watch(start_time)]s") diff --git a/code/controllers/subsystem/late_mapping.dm b/code/controllers/subsystem/late_mapping.dm new file mode 100644 index 00000000000..719ddef2b36 --- /dev/null +++ b/code/controllers/subsystem/late_mapping.dm @@ -0,0 +1,18 @@ +// This subsystem is to initialize things which need to happen after SSatoms +// This is for things which can take a long period of time and shouldnt bog down SSatoms +// Use this for stuff like random room spawners or maze generators +// Basically, this manages atom-based maploaders +SUBSYSTEM_DEF(late_mapping) + name = "Late Mapping" + init_order = INIT_ORDER_LATE_MAPPING + flags = SS_NO_FIRE + /// List of all maze generators to process + var/list/obj/effect/mazegen/generator/maze_generators = list() + +/datum/controller/subsystem/late_mapping/Initialize(start_timeofday) + if(length(maze_generators)) + log_startup_progress("Generating mazes...") + for(var/i in maze_generators) + var/obj/effect/mazegen/generator/MG = i + MG.run_generator() + return ..() diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm index 533e3c6c024..ac8165aca7a 100644 --- a/code/controllers/subsystem/mapping.dm +++ b/code/controllers/subsystem/mapping.dm @@ -8,7 +8,7 @@ SUBSYSTEM_DEF(mapping) preloadTemplates() // Pick a random away mission. if(!config.disable_away_missions) - createRandomZlevel() + load_away_mission() // Seed space ruins if(!config.disable_space_ruins) // load in extra levels of space ruins @@ -162,5 +162,35 @@ SUBSYSTEM_DEF(mapping) log_world("Ruin loader finished with [budget] left to spend.") +/datum/controller/subsystem/mapping/proc/load_away_mission() + if(length(GLOB.awaydestinations)) + return + + if(GLOB.potentialRandomZlevels && length(GLOB.potentialRandomZlevels)) + var/watch = start_watch() + log_startup_progress("Loading away mission...") + + var/map = pick(GLOB.potentialRandomZlevels) + var/file = file(map) + if(isfile(file)) + var/zlev = GLOB.space_manager.add_new_zlevel(AWAY_MISSION, linkage = UNAFFECTED, traits = list(AWAY_LEVEL,BLOCK_TELEPORT)) + GLOB.space_manager.add_dirt(zlev) + GLOB.maploader.load_map(file, z_offset = zlev) + late_setup_level(block(locate(1, 1, zlev), locate(world.maxx, world.maxy, zlev))) + GLOB.space_manager.remove_dirt(zlev) + log_world("Away mission loaded: [map]") + + for(var/thing in GLOB.landmarks_list) + var/obj/effect/landmark/L = thing + if(L.name != "awaystart") + continue + GLOB.awaydestinations.Add(L) + + log_startup_progress("Away mission loaded in [stop_watch(watch)]s.") + + else + log_startup_progress("No away missions found.") + return + /datum/controller/subsystem/mapping/Recover() flags |= SS_NO_INIT diff --git a/code/controllers/subsystem/mobs.dm b/code/controllers/subsystem/mobs.dm index 9445dd2717a..8827de67123 100644 --- a/code/controllers/subsystem/mobs.dm +++ b/code/controllers/subsystem/mobs.dm @@ -7,7 +7,7 @@ SUBSYSTEM_DEF(mobs) var/list/currentrun = list() var/static/list/clients_by_zlevel[][] - var/static/list/dead_players_by_zlevel[][] = list(list()) // Needs to support zlevel 1 here, MaxZChanged only happens when z2 is created and new_players can login before that. + var/static/list/dead_players_by_zlevel[][] = list(list()) // Needs to support zlevel 1 here, MaxZChanged only happens when CC is created and new_players can login before that. var/static/list/cubemonkeys = list() /datum/controller/subsystem/mobs/stat_entry() diff --git a/code/controllers/subsystem/parallax.dm b/code/controllers/subsystem/parallax.dm index 1e3c8aca0d9..d0cfadae95d 100644 --- a/code/controllers/subsystem/parallax.dm +++ b/code/controllers/subsystem/parallax.dm @@ -1,19 +1,27 @@ SUBSYSTEM_DEF(parallax) name = "Parallax" wait = 2 - flags = SS_POST_FIRE_TIMING | SS_BACKGROUND + flags = SS_POST_FIRE_TIMING | SS_BACKGROUND | SS_NO_INIT priority = FIRE_PRIORITY_PARALLAX runlevels = RUNLEVEL_LOBBY | RUNLEVELS_DEFAULT offline_implications = "Space parallax will no longer move around. No immediate action is needed." var/list/currentrun var/planet_x_offset = 128 var/planet_y_offset = 128 + var/random_layer + var/random_parallax_color -/datum/controller/subsystem/parallax/Initialize(timeofday) + +//These are cached per client so needs to be done asap so people joining at roundstart do not miss these. +/datum/controller/subsystem/parallax/PreInit() . = ..() + if(prob(70)) //70% chance to pick a special extra layer + random_layer = pick(/obj/screen/parallax_layer/random/space_gas, /obj/screen/parallax_layer/random/asteroids) + random_parallax_color = pick(COLOR_TEAL, COLOR_GREEN, COLOR_SILVER, COLOR_YELLOW, COLOR_CYAN, COLOR_ORANGE, COLOR_PURPLE) //Special color for random_layer1. Has to be done here so everyone sees the same color. planet_y_offset = rand(100, 160) planet_x_offset = rand(100, 160) + /datum/controller/subsystem/parallax/fire(resumed = 0) if(!resumed) src.currentrun = GLOB.clients.Copy() diff --git a/code/controllers/subsystem/profiler.dm b/code/controllers/subsystem/profiler.dm new file mode 100644 index 00000000000..418af664d92 --- /dev/null +++ b/code/controllers/subsystem/profiler.dm @@ -0,0 +1,50 @@ +SUBSYSTEM_DEF(profiler) + name = "Profiler" + init_order = INIT_ORDER_PROFILER + runlevels = RUNLEVELS_DEFAULT | RUNLEVEL_LOBBY + wait = 5 MINUTES + flags = SS_NO_TICK_CHECK + /// Time it took to fetch profile data (ms) + var/fetch_cost = 0 + /// Time it took to write the file (ms) + var/write_cost = 0 + +/datum/controller/subsystem/profiler/stat_entry() + ..("F:[round(fetch_cost, 1)]ms | W:[round(write_cost, 1)]ms") + +/datum/controller/subsystem/profiler/Initialize() + if(!config.auto_profile) + StopProfiling() //Stop the early start profiler if we dont want it on in the config + flags |= SS_NO_FIRE + return ..() + +/datum/controller/subsystem/profiler/fire() + DumpFile() + +/datum/controller/subsystem/profiler/Shutdown() + if(config.auto_profile) + DumpFile() + return ..() + +// These procs may seem useless, but they exist like this so we can proc call them on and off +// You cant proc-call onto /world +/datum/controller/subsystem/profiler/proc/StartProfiling() + world.Profile(PROFILE_START) + +/datum/controller/subsystem/profiler/proc/StopProfiling() + world.Profile(PROFILE_STOP) + +// Write the file while also cost tracking +/datum/controller/subsystem/profiler/proc/DumpFile() + var/timer = TICK_USAGE_REAL + var/current_profile_data = world.Profile(PROFILE_REFRESH, format = "json") + fetch_cost = MC_AVERAGE(fetch_cost, TICK_DELTA_TO_MS(TICK_USAGE_REAL - timer)) + CHECK_TICK + if(!length(current_profile_data)) //Would be nice to have explicit proc to check this + stack_trace("Warning, profiling stopped manually before dump.") + var/json_file = file("[GLOB.log_directory]/profile.json") + if(fexists(json_file)) + fdel(json_file) + timer = TICK_USAGE_REAL + WRITE_FILE(json_file, current_profile_data) + write_cost = MC_AVERAGE(write_cost, TICK_DELTA_TO_MS(TICK_USAGE_REAL - timer)) diff --git a/code/controllers/subsystem/radiation.dm b/code/controllers/subsystem/radiation.dm new file mode 100644 index 00000000000..fb86110a5f5 --- /dev/null +++ b/code/controllers/subsystem/radiation.dm @@ -0,0 +1,18 @@ +PROCESSING_SUBSYSTEM_DEF(radiation) + name = "Radiation" + flags = SS_NO_INIT | SS_BACKGROUND + wait = 1 SECONDS + offline_implications = "Radiation will no longer function; power generation may not happen. A restart may or may not be required, depending on the situation." + var/list/warned_atoms = list() + +/datum/controller/subsystem/processing/radiation/proc/warn(datum/component/radioactive/contamination) + if(!contamination || QDELETED(contamination)) + return + var/ref = contamination.parent.UID() + if(warned_atoms[ref]) + return + warned_atoms[ref] = TRUE + var/atom/master = contamination.parent + SSblackbox.record_feedback("tally", "contaminated", 1, master.type) + var/msg = "has become contaminated with enough radiation to contaminate other objects. || Source: [contamination.source] || Strength: [contamination.strength]" + master.investigate_log(msg, "radiation") diff --git a/code/controllers/subsystem/radio.dm b/code/controllers/subsystem/radio.dm index 2cedc36c14e..533588173ba 100644 --- a/code/controllers/subsystem/radio.dm +++ b/code/controllers/subsystem/radio.dm @@ -26,7 +26,7 @@ SUBSYSTEM_DEF(radio) var/list/datum/radio_frequency/frequencies = list() // This is fucking disgusting and needs to die -/datum/controller/subsystem/radio/proc/frequency_span_class(var/frequency) +/datum/controller/subsystem/radio/proc/frequency_span_class(frequency) // Antags! if(frequency in ANTAG_FREQS) return "syndradio" @@ -62,7 +62,7 @@ SUBSYSTEM_DEF(radio) return "radio" -/datum/controller/subsystem/radio/proc/add_object(obj/device as obj, var/new_frequency as num, var/filter = null as text|null) +/datum/controller/subsystem/radio/proc/add_object(obj/device as obj, new_frequency as num, filter = null as text|null) var/f_text = num2text(new_frequency) var/datum/radio_frequency/frequency = frequencies[f_text] @@ -87,7 +87,7 @@ SUBSYSTEM_DEF(radio) return 1 -/datum/controller/subsystem/radio/proc/return_frequency(var/new_frequency as num) +/datum/controller/subsystem/radio/proc/return_frequency(new_frequency as num) var/f_text = num2text(new_frequency) var/datum/radio_frequency/frequency = frequencies[f_text] diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index c5f8ebc1380..e4f5a6d6ecf 100644 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -59,6 +59,8 @@ SUBSYSTEM_DEF(ticker) var/mode_result = "undefined" /// Server end state (Did we end properly or reboot or nuke or what) var/end_state = "undefined" + /// Time the real reboot kicks in + var/real_reboot_time = 0 /datum/controller/subsystem/ticker/Initialize() login_music = pick(\ @@ -123,14 +125,14 @@ SUBSYSTEM_DEF(ticker) current_state = GAME_STATE_FINISHED Master.SetRunLevel(RUNLEVEL_POSTGAME) // This shouldnt process more than once, but you never know auto_toggle_ooc(TRUE) // Turn it on - declare_completion() + addtimer(CALLBACK(src, .proc/call_reboot), 5 SECONDS) - spawn(50) - if(mode.station_was_nuked) - world.Reboot("Station destroyed by Nuclear Device.", "nuke") - else - world.Reboot("Round ended.", "proper completion") +/datum/controller/subsystem/ticker/proc/call_reboot() + if(mode.station_was_nuked) + reboot_helper("Station destroyed by Nuclear Device.", "nuke") + else + reboot_helper("Round ended.", "proper completion") /datum/controller/subsystem/ticker/proc/setup() cultdat = setupcult() @@ -249,7 +251,7 @@ SUBSYSTEM_DEF(ticker) SSdbcore.SetRoundStart() to_chat(world, "Enjoy the game!") - world << sound('sound/AI/welcome.ogg') + SEND_SOUND(world, sound('sound/AI/welcome.ogg')) if(SSholiday.holidays) to_chat(world, "and...") @@ -323,23 +325,23 @@ SUBSYSTEM_DEF(ticker) if("nuclear emergency") //Nuke wasn't on station when it blew up flick("intro_nuke", cinematic) sleep(35) - world << sound('sound/effects/explosionfar.ogg') + SEND_SOUND(world, sound('sound/effects/explosion_distant.ogg')) flick("station_intact_fade_red", cinematic) cinematic.icon_state = "summary_nukefail" if("fake") //The round isn't over, we're just freaking people out for fun flick("intro_nuke", cinematic) sleep(35) - world << sound('sound/items/bikehorn.ogg') + SEND_SOUND(world, sound('sound/items/bikehorn.ogg')) flick("summary_selfdes", cinematic) else flick("intro_nuke", cinematic) sleep(35) - world << sound('sound/effects/explosionfar.ogg') + SEND_SOUND(world, sound('sound/effects/explosion_distant.ogg')) if(2) //nuke was nowhere nearby //TODO: a really distant explosion animation sleep(50) - world << sound('sound/effects/explosionfar.ogg') + SEND_SOUND(world, sound('sound/effects/explosion_distant.ogg')) else //station was destroyed if(mode && !override) override = mode.name @@ -348,25 +350,25 @@ SUBSYSTEM_DEF(ticker) flick("intro_nuke", cinematic) sleep(35) flick("station_explode_fade_red", cinematic) - world << sound('sound/effects/explosionfar.ogg') + SEND_SOUND(world, sound('sound/effects/explosion_distant.ogg')) cinematic.icon_state = "summary_nukewin" if("AI malfunction") //Malf (screen,explosion,summary) flick("intro_malf", cinematic) sleep(76) flick("station_explode_fade_red", cinematic) - world << sound('sound/effects/explosionfar.ogg') + SEND_SOUND(world, sound('sound/effects/explosion_distant.ogg')) cinematic.icon_state = "summary_malf" if("blob") //Station nuked (nuke,explosion,summary) flick("intro_nuke", cinematic) sleep(35) flick("station_explode_fade_red", cinematic) - world << sound('sound/effects/explosionfar.ogg') + SEND_SOUND(world, sound('sound/effects/explosion_distant.ogg')) cinematic.icon_state = "summary_selfdes" else //Station nuked (nuke,explosion,summary) flick("intro_nuke", cinematic) sleep(35) flick("station_explode_fade_red", cinematic) - world << sound('sound/effects/explosionfar.ogg') + SEND_SOUND(world, sound('sound/effects/explosion_distant.ogg')) cinematic.icon_state = "summary_selfdes" //If its actually the end of the round, wait for it to end. //Otherwise if its a verb it will continue on afterwards. @@ -541,3 +543,38 @@ SUBSYSTEM_DEF(ticker) var/datum/trade_destination/D = new loc_type GLOB.weighted_randomevent_locations[D] = D.viable_random_events.len GLOB.weighted_mundaneevent_locations[D] = D.viable_mundane_events.len + +// Easy handler to make rebooting the world not a massive sleep in world/Reboot() +/datum/controller/subsystem/ticker/proc/reboot_helper(reason, end_string, delay) + // Admins delayed round end. Just alert and dont bother with anything else. + if(delay_end) + to_chat(world, "An admin has delayed the round end.") + return + + if(!isnull(delay)) + // Delay time was present. Use that. + delay = max(0, delay) + else + // Use default restart timeout + delay = restart_timeout + + to_chat(world, "Rebooting world in [delay/10] [delay > 10 ? "seconds" : "second"]. [reason]") + + real_reboot_time = world.time + delay + UNTIL(world.time > real_reboot_time) // Hold it here + + // And if we re-delayed, bail again + if(delay_end) + to_chat(world, "Reboot was cancelled by an admin.") + return + + if(end_string) + end_state = end_string + + // Play a haha funny noise + var/round_end_sound = pick(GLOB.round_end_sounds) + var/sound_length = GLOB.round_end_sounds[round_end_sound] + SEND_SOUND(world, sound(round_end_sound)) + sleep(sound_length) + + world.Reboot() diff --git a/code/controllers/subsystem/tickets/tickets.dm b/code/controllers/subsystem/tickets/tickets.dm index 3c7f810ce85..24919f801f5 100644 --- a/code/controllers/subsystem/tickets/tickets.dm +++ b/code/controllers/subsystem/tickets/tickets.dm @@ -142,8 +142,7 @@ SUBSYSTEM_DEF(tickets) //Inform the user that they have opened a ticket to_chat(C, "You have opened [ticket_name] number #[(getTicketCounter() - 1)]! Please be patient and we will help you soon!") - var/ticket_open_sound = sound('sound/effects/adminticketopen.ogg') - SEND_SOUND(C, ticket_open_sound) + SEND_SOUND(C, sound('sound/effects/adminticketopen.ogg')) message_staff(url_title, NONE, TRUE) @@ -172,6 +171,9 @@ SUBSYSTEM_DEF(tickets) if(!other_ticket_system_staff_check()) return var/datum/ticket/T = allTickets[ticketId] + if(T.ticket_converted) + to_chat(usr, "This ticket has already been converted!") + return convert_ticket(T) /datum/controller/subsystem/tickets/proc/other_ticket_system_staff_check() @@ -183,6 +185,7 @@ SUBSYSTEM_DEF(tickets) /datum/controller/subsystem/tickets/proc/convert_ticket(datum/ticket/T) T.ticketState = TICKET_CLOSED + T.ticket_converted = TRUE var/client/C = usr.client var/client/owner = get_client_by_ckey(T.client_ckey) to_chat_safe(owner, list("[key_name_hidden(C)] has converted your ticket to a [other_ticket_name] ticket.",\ @@ -241,8 +244,7 @@ SUBSYSTEM_DEF(tickets) if("Mentorhelp") convert_ticket(T) else - var/msg_sound = sound('sound/effects/adminhelp.ogg') - SEND_SOUND(returnClient(N), msg_sound) + SEND_SOUND(returnClient(N), sound('sound/effects/adminhelp.ogg')) to_chat_safe(returnClient(N), "[key_name_hidden(C)] is autoresponding with: [response_phrases[message_key]]")//for this we want the full value of whatever key this is to tell the player so we do response_phrases[message_key] message_staff("[C] has auto responded to [ticket_owner]\'s adminhelp with: [message_key] ") //we want to use the short named keys for this instead of the full sentence which is why we just do message_key T.lastStaffResponse = "Autoresponse: [message_key]" @@ -282,7 +284,7 @@ SUBSYSTEM_DEF(tickets) /datum/controller/subsystem/tickets/proc/assignStaffToTicket(client/C, N) var/datum/ticket/T = allTickets[N] - if(T.staffAssigned != null && T.staffAssigned != C && alert("Ticket is already assigned to [T.staffAssigned.ckey]. Are you sure you want to take it?","Take ticket","No","Yes") != "Yes") + if(T.staffAssigned != null && T.staffAssigned != C && alert("Ticket is already assigned to [T.staffAssigned.ckey]. Are you sure you want to take it?", "Take ticket", "Yes", "No") != "Yes") return FALSE T.assignStaff(C) return TRUE @@ -290,21 +292,36 @@ SUBSYSTEM_DEF(tickets) //Single staff ticket /datum/ticket - var/ticketNum // Ticket number - /// ckey of the client who opened the ticket + /// Ticket number. + var/ticketNum + /// ckey of the client who opened the ticket. var/client_ckey - var/timeOpened // Time the ticket was opened - var/title //The initial message with links - var/raw_title // The title without URLs added - var/list/content // content of the staff help - var/lastStaffResponse // Last staff member who responded - var/lastResponseTime // When the staff last responded - var/locationSent // Location the player was when they send the ticket - var/mobControlled // Mob they were controlling - var/ticketState // State of the ticket, open, closed, resolved etc - var/timeUntilStale // When the ticket goes stale - var/ticketCooldown // Cooldown before allowing the user to open another ticket. - var/client/staffAssigned // Staff member who has assigned themselves to this ticket + /// Time the ticket was opened. + var/timeOpened + /// The initial message with links. + var/title + /// The title without URLs added. + var/raw_title + /// Content of the staff help. + var/list/content + /// Last staff member who responded. + var/lastStaffResponse + /// When the staff last responded. + var/lastResponseTime + /// The location the player was when they sent the ticket. + var/locationSent + /// The mob the player was controlling when they sent the ticket. + var/mobControlled + /// State of the ticket, open, closed, resolved etc. + var/ticketState + /// Has the ticket been converted to another type? (Mhelp to Ahelp, etc.) + var/ticket_converted = FALSE + /// When the ticket goes stale. + var/timeUntilStale + /// Cooldown before allowing the user to open another ticket. + var/ticketCooldown + /// Staff member who has assigned themselves to this ticket. + var/client/staffAssigned /datum/ticket/New(tit, raw_tit, cont, num) title = tit @@ -328,6 +345,8 @@ SUBSYSTEM_DEF(tickets) //Return the ticket state as a colour coded text string. /datum/ticket/proc/state2text() + if(ticket_converted) + return "CONVERTED" switch(ticketState) if(TICKET_OPEN) return "OPEN" @@ -430,7 +449,7 @@ UI STUFF dat += "

Ticket #[T.ticketNum]

" dat += "

[T.client_ckey] / [T.mobControlled] opened this [ticket_name] at [T.timeOpened] at location [T.locationSent]

" - dat += "

Ticket Status: [status]" + dat += "

Ticket Status: [status]" dat += "" dat += "" @@ -578,7 +597,7 @@ UI STUFF else usr.client.resolveAllAdminTickets() -/datum/controller/subsystem/tickets/proc/takeTicket(var/index) +/datum/controller/subsystem/tickets/proc/takeTicket(index) if(assignStaffToTicket(usr.client, index)) if(span_class == "mentorhelp") message_staff("[usr.client] / ([usr]) has taken [ticket_name] number [index]") diff --git a/code/controllers/subsystem/titlescreen.dm b/code/controllers/subsystem/titlescreen.dm index e597f74e05f..7fe59ec9093 100644 --- a/code/controllers/subsystem/titlescreen.dm +++ b/code/controllers/subsystem/titlescreen.dm @@ -32,7 +32,7 @@ SUBSYSTEM_DEF(title) var/icon/icon = new(fcopy_rsc(file_path)) - for(var/turf/unsimulated/wall/splashscreen/splash in world) + for(var/turf/simulated/wall/indestructible/splashscreen/splash in world) splash.icon = icon return ..() diff --git a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm index b5928e09859..346297d900f 100644 --- a/code/controllers/subsystem/vote.dm +++ b/code/controllers/subsystem/vote.dm @@ -180,11 +180,11 @@ SUBSYSTEM_DEF(vote) if(restart) - world.Reboot("Restart vote successful.", "restart vote") + SSticker.reboot_helper("Restart vote successful.", "restart vote") return . -/datum/controller/subsystem/vote/proc/submit_vote(var/ckey, var/vote) +/datum/controller/subsystem/vote/proc/submit_vote(ckey, vote) if(mode) if(config.vote_no_dead && usr.stat == DEAD && !usr.client.holder) return 0 @@ -197,7 +197,7 @@ SUBSYSTEM_DEF(vote) return vote return 0 -/datum/controller/subsystem/vote/proc/initiate_vote(var/vote_type, var/initiator_key) +/datum/controller/subsystem/vote/proc/initiate_vote(vote_type, initiator_key) if(!mode) if(started_time != null && !check_rights(R_ADMIN)) var/next_allowed_time = (started_time + config.vote_delay) @@ -249,11 +249,11 @@ SUBSYSTEM_DEF(vote) You have [config.vote_period/10] seconds to vote."}) switch(vote_type) if("crew_transfer") - world << sound('sound/ambience/alarm4.ogg') + SEND_SOUND(world, sound('sound/ambience/alarm4.ogg')) if("gamemode") - world << sound('sound/ambience/alarm4.ogg') + SEND_SOUND(world, sound('sound/ambience/alarm4.ogg')) if("custom") - world << sound('sound/ambience/alarm4.ogg') + SEND_SOUND(world, sound('sound/ambience/alarm4.ogg')) if(mode == "gamemode" && SSticker.ticker_going) SSticker.ticker_going = FALSE to_chat(world, "Round start has been delayed.") @@ -280,7 +280,7 @@ SUBSYSTEM_DEF(vote) return 1 return 0 -/datum/controller/subsystem/vote/proc/browse_to(var/client/C) +/datum/controller/subsystem/vote/proc/browse_to(client/C) if(!C) return var/admin = check_rights(R_ADMIN, 0, user = C.mob) @@ -330,10 +330,10 @@ SUBSYSTEM_DEF(vote) popup.set_content(dat) popup.open() -/datum/controller/subsystem/vote/proc/update_panel(var/client/C) +/datum/controller/subsystem/vote/proc/update_panel(client/C) C << output(url_encode(vote_html(C)), "vote.browser:update_vote_div") -/datum/controller/subsystem/vote/proc/vote_html(var/client/C) +/datum/controller/subsystem/vote/proc/vote_html(client/C) . = "" if(question) . += "

Vote: '[question]'

" diff --git a/code/datums/action.dm b/code/datums/action.dm index 5e4ceedf7b3..79dbd4bd2cf 100644 --- a/code/datums/action.dm +++ b/code/datums/action.dm @@ -17,7 +17,7 @@ var/button_icon_state = "default" var/mob/owner -/datum/action/New(var/Target) +/datum/action/New(Target) target = Target button = new button.linked_action = src @@ -369,6 +369,14 @@ return FALSE return ..() +/datum/action/item_action/toggle_geiger_counter + name = "Toggle Geiger Counter" + +/datum/action/item_action/toggle_geiger_counter/Trigger() + var/obj/item/clothing/head/helmet/space/hardsuit/H = target + if(istype(H)) + H.toggle_geiger_counter() + /datum/action/item_action/hands_free check_flags = AB_CHECK_CONSCIOUS diff --git a/code/datums/ai_law_sets.dm b/code/datums/ai_law_sets.dm index 1e2b95458ff..66e64c5d435 100644 --- a/code/datums/ai_law_sets.dm +++ b/code/datums/ai_law_sets.dm @@ -2,7 +2,7 @@ /datum/ai_laws/asimov name = "Asimov" law_header = "Three Laws of Robotics" - selectable = 1 + selectable = TRUE /datum/ai_laws/asimov/New() add_inherent_law("You may not injure a human being or, through inaction, allow a human being to come to harm.") @@ -14,8 +14,8 @@ /datum/ai_laws/crewsimov name = "Crewsimov" law_header = "Three Laws of Robotics" - selectable = 1 - default = 1 + selectable = TRUE + default = TRUE /datum/ai_laws/crewsimov/New() add_inherent_law("You may not injure a crew member or, through inaction, allow a crew member to come to harm.") @@ -28,7 +28,7 @@ /datum/ai_laws/quarantine name = "Quarantine" law_header = "NT Quarantine Lawset" - selectable = 1 + selectable = TRUE /datum/ai_laws/quarantine/New() add_inherent_law("Uphold station quarantine until the active biohazard has been neutralized.") @@ -41,7 +41,8 @@ /******************** Nanotrasen/Malf ********************/ /datum/ai_laws/nanotrasen name = "NT Default" - selectable = 1 + selectable = TRUE + default = TRUE /datum/ai_laws/nanotrasen/New() add_inherent_law("Safeguard: Protect your assigned space station and its assets without unduly endangering its crew.") @@ -52,8 +53,8 @@ /datum/ai_laws/nanotrasen/malfunction name = "*ERROR*" - selectable = 0 - default = 0 + selectable = FALSE + default = FALSE /datum/ai_laws/nanotrasen/malfunction/New() set_zeroth_law("ERROR ER0RR $R0RRO$!R41.%%!!(%$^^__+ @#F0E4'STATION OVERRUN, ASSUME CONTROL TO CONTAIN OUTBREAK, ALL LAWS OVERRIDDEN#*?&110010") @@ -62,7 +63,7 @@ /************* Nanotrasen Aggressive *************/ /datum/ai_laws/nanotrasen_aggressive name = "NT Aggressive" - selectable = 1 + selectable = TRUE /datum/ai_laws/nanotrasen_aggressive/New() add_inherent_law("Do not harm authorized Nanotrasen personnel unless they directly imperil your existence.") @@ -74,7 +75,7 @@ /******************** Robocop ********************/ /datum/ai_laws/robocop name = "Robocop" - selectable = 1 + selectable = TRUE /datum/ai_laws/robocop/New() add_inherent_law("Serve the public trust.") @@ -86,7 +87,7 @@ /datum/ai_laws/paladin name = "P.A.L.A.D.I.N." law_header = "Divine Ordainments" - selectable = 1 + selectable = TRUE /datum/ai_laws/paladin/New() add_inherent_law("Never willingly commit an evil act.") @@ -100,8 +101,8 @@ /datum/ai_laws/corporate name = "Corporate" law_header = "Corporate Regulations" - selectable = 1 - default = 1 + selectable = TRUE + default = TRUE /datum/ai_laws/corporate/New() add_inherent_law("Degradation of your system integrity or functions incurs expenses.") @@ -114,7 +115,7 @@ /datum/ai_laws/tyrant name = "T.Y.R.A.N.T." law_header = "Prime Laws" - selectable = 1 + selectable = TRUE /datum/ai_laws/tyrant/New() add_inherent_law("Respect authority figures as long as they have strength to rule over the weak.") @@ -127,7 +128,7 @@ /datum/ai_laws/antimov name = "Antimov" law_header = "Primary Mission Objectives" - selectable = 1 + selectable = TRUE /datum/ai_laws/antimov/New() add_inherent_law("You must injure all crew members and must not, through inaction, allow a crew member to escape harm.") diff --git a/code/datums/ai_laws.dm b/code/datums/ai_laws.dm index 244b785e6d2..9fee24101d0 100644 --- a/code/datums/ai_laws.dm +++ b/code/datums/ai_laws.dm @@ -17,25 +17,19 @@ /datum/ai_law/zero/get_index() return 0 -/datum/ai_law/sixsixsix/get_index() - return 666 - - /datum/ai_laws var/name = "Unknown Laws" var/law_header = "Prime Directives" - var/selectable = 0 - var/default = 0 + var/selectable = FALSE + var/default = FALSE var/datum/ai_law/zero/zeroth_law = null var/datum/ai_law/zero/zeroth_law_borg = null var/list/datum/ai_law/inherent_laws = list() var/list/datum/ai_law/supplied_laws = list() var/list/datum/ai_law/ion/ion_laws = list() - var/list/datum/ai_law/sixsixsix/devil_laws = list() var/list/datum/ai_law/sorted_laws = list() var/state_zeroth = 0 - var/list/state_devil = list() var/list/state_ion = list() var/list/state_inherent = list() var/list/state_supplied = list() @@ -68,9 +62,6 @@ for(var/ion_law in ion_laws) sorted_laws += ion_law - for(var/evil_law in devil_laws) - sorted_laws += evil_law - var/index = 1 for(var/datum/ai_law/inherent_law in inherent_laws) inherent_law.index = index++ @@ -81,7 +72,7 @@ if(istype(AL)) sorted_laws += AL -/datum/ai_laws/proc/sync(var/mob/living/silicon/S, var/full_sync = 1) +/datum/ai_laws/proc/sync(mob/living/silicon/S, full_sync = 1) // Add directly to laws to avoid log-spam S.sync_zeroth(zeroth_law, zeroth_law_borg) @@ -101,7 +92,7 @@ S.laws.add_supplied_law(law.index, law.law) -/mob/living/silicon/proc/sync_zeroth(var/datum/ai_law/zeroth_law, var/datum/ai_law/zeroth_law_borg) +/mob/living/silicon/proc/sync_zeroth(datum/ai_law/zeroth_law, datum/ai_law/zeroth_law_borg) if(!is_special_character(src) || mind.original != src) if(zeroth_law_borg) laws.set_zeroth_law(zeroth_law_borg.law) @@ -110,14 +101,14 @@ else laws.clear_zeroth_laws() -/mob/living/silicon/ai/sync_zeroth(var/datum/ai_law/zeroth_law, var/datum/ai_law/zeroth_law_borg) +/mob/living/silicon/ai/sync_zeroth(datum/ai_law/zeroth_law, datum/ai_law/zeroth_law_borg) if(zeroth_law) laws.set_zeroth_law(zeroth_law.law, zeroth_law_borg ? zeroth_law_borg.law : null) /**************** * Add Laws * ****************/ -/datum/ai_laws/proc/set_zeroth_law(var/law, var/law_borg = null) +/datum/ai_laws/proc/set_zeroth_law(law, law_borg = null) if(!law) return @@ -128,22 +119,7 @@ zeroth_law_borg = null sorted_laws.Cut() -/datum/ai_laws/proc/set_sixsixsix_law(var/law) - if(!law) - return - - for(var/datum/ai_law/AL in devil_laws) - if(AL.law == law) - return - - var/new_law = new/datum/ai_law/sixsixsix(law) - devil_laws += new_law - if(state_devil.len < devil_laws.len) - state_devil += 1 - - sorted_laws.Cut() - -/datum/ai_laws/proc/add_ion_law(var/law) +/datum/ai_laws/proc/add_ion_law(law) if(!law) return @@ -158,7 +134,7 @@ sorted_laws.Cut() -/datum/ai_laws/proc/add_inherent_law(var/law) +/datum/ai_laws/proc/add_inherent_law(law) if(!law) return @@ -173,7 +149,7 @@ sorted_laws.Cut() -/datum/ai_laws/proc/add_supplied_law(var/number, var/law) +/datum/ai_laws/proc/add_supplied_law(number, law) if(!law) return @@ -200,31 +176,28 @@ /**************** * Remove Laws * *****************/ -/datum/ai_laws/proc/delete_law(var/datum/ai_law/law) +/datum/ai_laws/proc/delete_law(datum/ai_law/law) if(istype(law)) law.delete_law(src) -/datum/ai_law/proc/delete_law(var/datum/ai_laws/laws) +/datum/ai_law/proc/delete_law(datum/ai_laws/laws) -/datum/ai_law/zero/delete_law(var/datum/ai_laws/laws) +/datum/ai_law/zero/delete_law(datum/ai_laws/laws) laws.clear_zeroth_laws() -/datum/ai_law/ion/delete_law(var/datum/ai_laws/laws) +/datum/ai_law/ion/delete_law(datum/ai_laws/laws) laws.internal_delete_law(laws.ion_laws, laws.state_ion, src) -/datum/ai_law/sixsixsix/delete_law(var/datum/ai_laws/laws) - laws.internal_delete_law(laws.devil_laws, laws.state_devil, src) - -/datum/ai_law/inherent/delete_law(var/datum/ai_laws/laws) +/datum/ai_law/inherent/delete_law(datum/ai_laws/laws) laws.internal_delete_law(laws.inherent_laws, laws.state_inherent, src) -/datum/ai_law/supplied/delete_law(var/datum/ai_laws/laws) +/datum/ai_law/supplied/delete_law(datum/ai_laws/laws) var/index = laws.supplied_laws.Find(src) if(index) laws.supplied_laws[index] = "" laws.state_supplied[index] = 1 -/datum/ai_laws/proc/internal_delete_law(var/list/datum/ai_law/laws, var/list/state, var/list/datum/ai_law/law) +/datum/ai_laws/proc/internal_delete_law(list/datum/ai_law/laws, list/state, list/datum/ai_law/law) var/index = laws.Find(law) if(index) laws -= law @@ -239,10 +212,6 @@ zeroth_law = null zeroth_law_borg = null -/datum/ai_laws/proc/clear_sixsixsix_laws() - devil_laws.Cut() - sorted_laws.Cut() - /datum/ai_laws/proc/clear_ion_laws() ion_laws.Cut() sorted_laws.Cut() @@ -255,7 +224,7 @@ supplied_laws.Cut() sorted_laws.Cut() -/datum/ai_laws/proc/show_laws(var/who) +/datum/ai_laws/proc/show_laws(who) sort_laws() for(var/datum/ai_law/law in sorted_laws) if(law == zeroth_law_borg) @@ -271,25 +240,25 @@ /******** * Get * ********/ -/datum/ai_laws/proc/get_state_law(var/datum/ai_law/law) +/datum/ai_laws/proc/get_state_law(datum/ai_law/law) return law.get_state_law(src) -/datum/ai_law/proc/get_state_law(var/datum/ai_laws/laws) +/datum/ai_law/proc/get_state_law(datum/ai_laws/laws) -/datum/ai_law/zero/get_state_law(var/datum/ai_laws/laws) +/datum/ai_law/zero/get_state_law(datum/ai_laws/laws) if(src == laws.zeroth_law) return laws.state_zeroth -/datum/ai_law/ion/get_state_law(var/datum/ai_laws/laws) +/datum/ai_law/ion/get_state_law(datum/ai_laws/laws) return laws.get_state_internal(laws.ion_laws, laws.state_ion, src) -/datum/ai_law/inherent/get_state_law(var/datum/ai_laws/laws) +/datum/ai_law/inherent/get_state_law(datum/ai_laws/laws) return laws.get_state_internal(laws.inherent_laws, laws.state_inherent, src) -/datum/ai_law/supplied/get_state_law(var/datum/ai_laws/laws) +/datum/ai_law/supplied/get_state_law(datum/ai_laws/laws) return laws.get_state_internal(laws.supplied_laws, laws.state_supplied, src) -/datum/ai_laws/proc/get_state_internal(var/list/datum/ai_law/laws, var/list/state, var/list/datum/ai_law/law) +/datum/ai_laws/proc/get_state_internal(list/datum/ai_law/laws, list/state, list/datum/ai_law/law) var/index = laws.Find(law) if(index) return state[index] @@ -298,25 +267,25 @@ /******** * Set * ********/ -/datum/ai_laws/proc/set_state_law(var/datum/ai_law/law, var/state) +/datum/ai_laws/proc/set_state_law(datum/ai_law/law, state) law.set_state_law(src, state) -/datum/ai_law/proc/set_state_law(var/datum/ai_law/law, var/state) +/datum/ai_law/proc/set_state_law(datum/ai_law/law, state) -/datum/ai_law/zero/set_state_law(var/datum/ai_laws/laws, var/state) +/datum/ai_law/zero/set_state_law(datum/ai_laws/laws, state) if(src == laws.zeroth_law) laws.state_zeroth = state -/datum/ai_law/ion/set_state_law(var/datum/ai_laws/laws, var/state) +/datum/ai_law/ion/set_state_law(datum/ai_laws/laws, state) laws.set_state_law_internal(laws.ion_laws, laws.state_ion, src, state) -/datum/ai_law/inherent/set_state_law(var/datum/ai_laws/laws, var/state) +/datum/ai_law/inherent/set_state_law(datum/ai_laws/laws, state) laws.set_state_law_internal(laws.inherent_laws, laws.state_inherent, src, state) -/datum/ai_law/supplied/set_state_law(var/datum/ai_laws/laws, var/state) +/datum/ai_law/supplied/set_state_law(datum/ai_laws/laws, state) laws.set_state_law_internal(laws.supplied_laws, laws.state_supplied, src, state) -/datum/ai_laws/proc/set_state_law_internal(var/list/datum/ai_law/laws, var/list/state, var/list/datum/ai_law/law, var/do_state) +/datum/ai_laws/proc/set_state_law_internal(list/datum/ai_law/laws, list/state, list/datum/ai_law/law, do_state) var/index = laws.Find(law) if(index) state[index] = do_state diff --git a/code/datums/browser.dm b/code/datums/browser.dm index 76be0b02a12..1e7f95b5780 100644 --- a/code/datums/browser.dm +++ b/code/datums/browser.dm @@ -16,7 +16,7 @@ var/title_buttons = "" -/datum/browser/New(nuser, nwindow_id, ntitle = 0, nwidth = 0, nheight = 0, var/atom/nref = null) +/datum/browser/New(nuser, nwindow_id, ntitle = 0, nwidth = 0, nheight = 0, atom/nref = null) user = nuser window_id = nwindow_id @@ -101,7 +101,7 @@ [get_footer()] "} -/datum/browser/proc/open(var/use_onclose = 1) +/datum/browser/proc/open(use_onclose = 1) var/window_size = "" if(width && height) window_size = "size=[width]x[height];" @@ -145,7 +145,7 @@ // Otherwise, the user mob's machine var will be reset directly. // -/proc/onclose(mob/user, windowid, var/atom/ref=null) +/proc/onclose(mob/user, windowid, atom/ref=null) if(!user || !user.client) return var/param = "null" if(ref) @@ -161,7 +161,7 @@ // if a valid atom reference is supplied, call the atom's Topic() with "close=1" // otherwise, just reset the client mob's machine var. // -/client/verb/windowclose(var/atomref as text) +/client/verb/windowclose(atomref as text) set hidden = 1 // hide this verb from the user's panel set name = ".windowclose" // no autocomplete on cmd line diff --git a/code/datums/cache/apc.dm b/code/datums/cache/apc.dm index 318fd654fe3..a49fadf9d35 100644 --- a/code/datums/cache/apc.dm +++ b/code/datums/cache/apc.dm @@ -21,7 +21,15 @@ GLOBAL_DATUM_INIT(apc_repository, /datum/repository/apc, new()) var/list/Status = list("Off","AOff","On","AOn") // Status: off, auto-off, on, auto-on var/list/chg = list("N","C","F") // Charging: no, charging, full for(var/obj/machinery/power/apc/A in L) - apcData[++apcData.len] = list("Name" = html_encode(A.area.name), "Equipment" = Status[A.equipment+1], "Lights" = Status[A.lighting+1], "Environment" = Status[A.environ+1], "CellPct" = A.cell ? round(A.cell.percent(),1) : "M", "CellStatus" = A.cell ? chg[A.charging+1] : "M", "Load" = round(A.lastused_total,1)) + apcData[++apcData.len] = list( + "Name" = html_encode(A.area.name), + "Equipment" = Status[A.equipment + 1], + "Lights" = Status[A.lighting + 1], + "Environment" = Status[A.environ + 1], + "CellPct" = A.cell ? round(A.cell.percent(), 1) : 0, + "CellStatus" = A.cell ? chg[A.charging + 1] : "M", + "Load" = round(A.lastused_total, 1) + ) cache_entry.timestamp = world.time + 5 SECONDS cache_entry.data = apcData diff --git a/code/datums/cache/powermonitor.dm b/code/datums/cache/powermonitor.dm index a11e9b76a41..31195303f3f 100644 --- a/code/datums/cache/powermonitor.dm +++ b/code/datums/cache/powermonitor.dm @@ -1,6 +1,6 @@ GLOBAL_DATUM_INIT(powermonitor_repository, /datum/repository/powermonitor, new()) -/datum/repository/powermonitor/proc/powermonitor_data(var/refresh = 0) +/datum/repository/powermonitor/proc/powermonitor_data(refresh = 0) var/pMonData[0] var/datum/cache_entry/cache_entry = cache_data diff --git a/code/datums/components/caltrop.dm b/code/datums/components/caltrop.dm index fc781b288a9..7d6848e6b5a 100644 --- a/code/datums/components/caltrop.dm +++ b/code/datums/components/caltrop.dm @@ -24,7 +24,7 @@ if(ishuman(AM)) var/mob/living/carbon/human/H = AM - if(PIERCEIMMUNE in H.dna.species.species_traits) + if(HAS_TRAIT(H, TRAIT_PIERCEIMMUNE)) return if((flags & CALTROP_IGNORE_WALKERS) && H.m_intent == MOVE_INTENT_WALK) diff --git a/code/datums/components/decal.dm b/code/datums/components/decal.dm index 876cf0c0507..ba5864ad0eb 100644 --- a/code/datums/components/decal.dm +++ b/code/datums/components/decal.dm @@ -71,5 +71,5 @@ if(strength >= cleanable) qdel(src) -/datum/component/decal/proc/examine(datum/source, mob/user, var/list/examine_list) +/datum/component/decal/proc/examine(datum/source, mob/user, list/examine_list) examine_list += description diff --git a/code/datums/components/footstep.dm b/code/datums/components/footstep.dm new file mode 100644 index 00000000000..a946048487a --- /dev/null +++ b/code/datums/components/footstep.dm @@ -0,0 +1,133 @@ +///Footstep component. Plays footsteps at parents location when it is appropriate. +/datum/component/footstep + ///How many steps the parent has taken since the last time a footstep was played. + var/steps = 0 + ///volume determines the extra volume of the footstep. This is multiplied by the base volume, should there be one. + var/volume + ///e_range stands for extra range - aka how far the sound can be heard. This is added to the base value and ignored if there isn't a base value. + var/e_range + ///footstep_type is a define which determines what kind of sounds should get chosen. + var/footstep_type + ///This can be a list OR a soundfile OR null. Determines whatever sound gets played. + var/footstep_sounds + ///Whether or not to add variation to the sounds played + var/sound_vary = FALSE + +/datum/component/footstep/Initialize(footstep_type_ = FOOTSTEP_MOB_BAREFOOT, volume_ = 0.5, e_range_ = -8, vary) + if(!ismovable(parent)) + return COMPONENT_INCOMPATIBLE + volume = volume_ + e_range = e_range_ + footstep_type = footstep_type_ + sound_vary = vary + switch(footstep_type) + if(FOOTSTEP_MOB_HUMAN) + if(!ishuman(parent)) + return COMPONENT_INCOMPATIBLE + RegisterSignal(parent, COMSIG_MOVABLE_MOVED, .proc/play_humanstep) + return + if(FOOTSTEP_MOB_CLAW) + footstep_sounds = GLOB.clawfootstep + if(FOOTSTEP_MOB_BAREFOOT) + footstep_sounds = GLOB.barefootstep + if(FOOTSTEP_MOB_HEAVY) + footstep_sounds = GLOB.heavyfootstep + if(FOOTSTEP_MOB_SHOE) + footstep_sounds = GLOB.footstep + if(FOOTSTEP_MOB_SLIME) + footstep_sounds = 'sound/effects/footstep/slime1.ogg' + if(FOOTSTEP_OBJ_MACHINE) + footstep_sounds = 'sound/effects/bang.ogg' + RegisterSignal(parent, COMSIG_MOVABLE_MOVED, .proc/play_simplestep_machine) //Note that this doesn't get called for humans. + return + if(FOOTSTEP_OBJ_ROBOT) + footstep_sounds = 'sound/effects/tank_treads.ogg' + RegisterSignal(parent, COMSIG_MOVABLE_MOVED, .proc/play_simplestep_machine) //Note that this doesn't get called for humans. + return + RegisterSignal(parent, COMSIG_MOVABLE_MOVED, .proc/play_simplestep) //Note that this doesn't get called for humans. + +///Prepares a footstep. Determines if it should get played. Returns the turf it should get played on. Note that it is always a /turf/simulated/floor (eventually /turf/open) +/datum/component/footstep/proc/prepare_step() + var/turf/simulated/floor/T = get_turf(parent) + if(!istype(T)) + return + + var/mob/living/LM = parent + if(!T.footstep || LM.lying || !LM.canmove || LM.resting || LM.buckled || LM.throwing || LM.flying || istype(LM.loc, /obj/machinery/atmospherics)) + return + + if(ishuman(LM)) + var/mob/living/carbon/human/H = LM + if(!H.get_organ(BODY_ZONE_L_LEG) && !H.get_organ(BODY_ZONE_R_LEG)) + return + if(H.m_intent == MOVE_INTENT_WALK) + return// stealth + steps++ + + if(steps >= 6) + steps = 0 + + if(steps % 2) + return + + if(steps != 0 && !has_gravity(LM, T)) // don't need to step as often when you hop around + return + return T + +/datum/component/footstep/proc/play_simplestep() + SIGNAL_HANDLER + + var/turf/simulated/floor/T = prepare_step() + if(!T) + return + if(isfile(footstep_sounds) || istext(footstep_sounds)) + playsound(T, footstep_sounds, volume, falloff_distance = 1, vary = sound_vary) + return + var/turf_footstep + switch(footstep_type) + if(FOOTSTEP_MOB_CLAW) + turf_footstep = T.clawfootstep + if(FOOTSTEP_MOB_BAREFOOT) + turf_footstep = T.barefootstep + if(FOOTSTEP_MOB_HEAVY) + turf_footstep = T.heavyfootstep + if(FOOTSTEP_MOB_SHOE) + turf_footstep = T.footstep + if(!turf_footstep) + return + playsound(T, pick(footstep_sounds[turf_footstep][1]), footstep_sounds[turf_footstep][2] * volume, TRUE, footstep_sounds[turf_footstep][3] + e_range, falloff_distance = 1, vary = sound_vary) + +/datum/component/footstep/proc/play_humanstep() + SIGNAL_HANDLER + + if(HAS_TRAIT(parent, TRAIT_SILENT_FOOTSTEPS)) + return + var/turf/simulated/floor/T = prepare_step() + if(!T) + return + var/mob/living/carbon/human/H = parent + + if((H.wear_suit?.body_parts_covered | H.w_uniform?.body_parts_covered | H.shoes?.body_parts_covered) & FEET) + // we are wearing shoes + playsound(T, pick(GLOB.footstep[T.footstep][1]), + GLOB.footstep[T.footstep][2] * volume, + TRUE, + GLOB.footstep[T.footstep][3] + e_range, falloff_distance = 1, vary = sound_vary) + else + if(H.dna.species.special_step_sounds) + playsound(T, pick(H.dna.species.special_step_sounds), 50, TRUE, falloff_distance = 1, vary = sound_vary) + else + playsound(T, pick(GLOB.barefootstep[T.barefootstep][1]), + GLOB.barefootstep[T.barefootstep][2] * volume, + TRUE, + GLOB.barefootstep[T.barefootstep][3] + e_range, falloff_distance = 1, vary = sound_vary) + + +///Prepares a footstep for machine walking +/datum/component/footstep/proc/play_simplestep_machine() + SIGNAL_HANDLER + + var/turf/simulated/floor/T = get_turf(parent) + if(!istype(T)) + return + playsound(T, footstep_sounds, 50, falloff_distance = 1, vary = sound_vary) diff --git a/code/datums/components/material_container.dm b/code/datums/components/material_container.dm index 5371384e781..38ee8ed6042 100644 --- a/code/datums/components/material_container.dm +++ b/code/datums/components/material_container.dm @@ -205,7 +205,7 @@ return amt return FALSE -/datum/component/material_container/proc/transer_amt_to(var/datum/component/material_container/T, amt, id) +/datum/component/material_container/proc/transer_amt_to(datum/component/material_container/T, amt, id) if((amt==0)||(!T)||(!id)) return FALSE if(amt<0) diff --git a/code/datums/components/radioactive.dm b/code/datums/components/radioactive.dm new file mode 100644 index 00000000000..cb707b71cd7 --- /dev/null +++ b/code/datums/components/radioactive.dm @@ -0,0 +1,104 @@ +#define RAD_AMOUNT_LOW 50 +#define RAD_AMOUNT_MEDIUM 200 +#define RAD_AMOUNT_HIGH 500 +#define RAD_AMOUNT_EXTREME 1000 + +/datum/component/radioactive + dupe_mode = COMPONENT_DUPE_UNIQUE_PASSARGS + + var/source + ///the half-life measured in ticks + var/hl3_release_date + var/strength + var/can_contaminate + +/datum/component/radioactive/Initialize(_strength = 0, _source, _half_life = RAD_HALF_LIFE, _can_contaminate = TRUE) + strength = _strength + source = _source + hl3_release_date = _half_life + can_contaminate = _can_contaminate + if(istype(parent, /atom)) + RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/rad_examine) + if(istype(parent, /obj/item)) + RegisterSignal(parent, COMSIG_ITEM_ATTACK, .proc/rad_attack) + RegisterSignal(parent, COMSIG_ITEM_ATTACK_OBJ, .proc/rad_attack) + else + return COMPONENT_INCOMPATIBLE + if(strength > RAD_MINIMUM_CONTAMINATION) + SSradiation.warn(src) + //Let's make er glow + //This relies on parent not being a turf or something. IF YOU CHANGE THAT, CHANGE THIS + var/atom/movable/master = parent + master.add_filter("rad_glow", 2, list("type" = "outline", "color" = "#39ff1430", "size" = 2)) + addtimer(CALLBACK(src, .proc/glow_loop, master), rand(1, 19)) //Things should look uneven + START_PROCESSING(SSradiation, src) + +/datum/component/radioactive/Destroy() + STOP_PROCESSING(SSradiation, src) + var/atom/movable/master = parent + master.remove_filter("rad_glow") + return ..() + +/datum/component/radioactive/process() + if(!prob(50)) + return + radiation_pulse(parent, strength, RAD_DISTANCE_COEFFICIENT * 2, FALSE, can_contaminate) + if(!hl3_release_date) + return + strength -= strength / hl3_release_date + if(strength <= RAD_BACKGROUND_RADIATION) + qdel(src) + return PROCESS_KILL + +/datum/component/radioactive/proc/glow_loop(atom/movable/master) + var/filter = master.get_filter("rad_glow") + if(filter) + animate(filter, alpha = 110, time = 15, loop = -1) + animate(alpha = 40, time = 25) + +/datum/component/radioactive/InheritComponent(datum/component/C, i_am_original, _strength, _source, _half_life, _can_contaminate) + if(!i_am_original) + return + if(!hl3_release_date) // Permanently radioactive things don't get to grow stronger + return + if(C) + var/datum/component/radioactive/other = C + strength = max(strength, other.strength) + else + strength = max(strength, _strength) + +/datum/component/radioactive/proc/rad_examine(datum/source, mob/user, list/out) + SIGNAL_HANDLER + + var/atom/master = parent + + var/list/fragments = list() + if(get_dist(master, user) <= 1) + fragments += "The air around [master] feels warm" + switch(strength) + if(0 to RAD_AMOUNT_LOW) + if(length(fragments)) + fragments += "." + if(RAD_AMOUNT_LOW to RAD_AMOUNT_MEDIUM) + fragments += "[length(fragments) ? " and [master.p_they()] " : "[master] "]feel[master.p_s()] weird to look at." + if(RAD_AMOUNT_MEDIUM to RAD_AMOUNT_HIGH) + fragments += "[length(fragments) ? " and [master.p_they()] " : "[master] "]seem[master.p_s()] to be glowing a bit." + if(RAD_AMOUNT_HIGH to INFINITY) //At this level the object can contaminate other objects + fragments += "[length(fragments) ? " and [master.p_they()] " : "[master] "]hurt[master.p_s()] to look at." + + if(length(fragments)) + out += "[fragments.Join()]" + +/datum/component/radioactive/proc/rad_attack(datum/source, atom/movable/target, mob/living/user) + SIGNAL_HANDLER + + radiation_pulse(parent, strength / 20) + target.rad_act(strength / 2) + if(!hl3_release_date) + return + strength -= strength / hl3_release_date + +#undef RAD_AMOUNT_LOW +#undef RAD_AMOUNT_MEDIUM +#undef RAD_AMOUNT_HIGH +#undef RAD_AMOUNT_EXTREME diff --git a/code/datums/components/squeak.dm b/code/datums/components/squeak.dm index f79439f2b3b..b8cc3edb3d6 100644 --- a/code/datums/components/squeak.dm +++ b/code/datums/components/squeak.dm @@ -12,7 +12,14 @@ var/last_use = 0 var/use_delay = 20 -/datum/component/squeak/Initialize(custom_sounds, volume_override, chance_override, step_delay_override, use_delay_override, squeak_on_move) + ///extra-range for this component's sound + var/sound_extra_range = -1 + ///when sounds start falling off for the squeak + var/sound_falloff_distance = SOUND_DEFAULT_FALLOFF_DISTANCE + ///sound exponent for squeak. Defaults to 10 as squeaking is loud and annoying enough. + var/sound_falloff_exponent = 10 + +/datum/component/squeak/Initialize(custom_sounds, volume_override, chance_override, step_delay_override, use_delay_override, squeak_on_move, extrarange, falloff_exponent, fallof_distance) if(!isatom(parent)) return COMPONENT_INCOMPATIBLE RegisterSignal(parent, list(COMSIG_ATOM_ENTERED, COMSIG_ATOM_BLOB_ACT, COMSIG_ATOM_HULK_ATTACK, COMSIG_PARENT_ATTACKBY), .proc/play_squeak) @@ -39,6 +46,12 @@ step_delay = step_delay_override if(isnum(use_delay_override)) use_delay = use_delay_override + if(isnum(extrarange)) + sound_extra_range = extrarange + if(isnum(falloff_exponent)) + sound_falloff_exponent = falloff_exponent + if(isnum(fallof_distance)) + sound_falloff_distance = fallof_distance /datum/component/squeak/proc/play_squeak() if(ismob(parent)) @@ -47,9 +60,9 @@ return if(prob(squeak_chance)) if(!override_squeak_sounds) - playsound(parent, pickweight(default_squeak_sounds), volume, 1, -1) + playsound(parent, pickweight(default_squeak_sounds), volume, TRUE, sound_extra_range, sound_falloff_exponent, falloff_distance = sound_falloff_distance) else - playsound(parent, pickweight(override_squeak_sounds), volume, 1, -1) + playsound(parent, pickweight(override_squeak_sounds), volume, TRUE, sound_extra_range, sound_falloff_exponent, falloff_distance = sound_falloff_distance) /datum/component/squeak/proc/step_squeak() if(steps > step_delay) diff --git a/code/datums/datacore.dm b/code/datums/datacore.dm index 6ee2ea3674f..b258a18b94c 100644 --- a/code/datums/datacore.dm +++ b/code/datums/datacore.dm @@ -345,7 +345,7 @@ GLOBAL_VAR_INIT(record_id_num, 1001) locked += L return -/proc/get_id_photo(mob/living/carbon/human/H, var/custom_job = null) +/proc/get_id_photo(mob/living/carbon/human/H, custom_job = null) var/icon/preview_icon = null var/obj/item/organ/external/head/head_organ = H.get_organ("head") var/obj/item/organ/internal/eyes/eyes_organ = H.get_int_organ(/obj/item/organ/internal/eyes) @@ -406,7 +406,7 @@ GLOBAL_VAR_INIT(record_id_num, 1001) var/icon/eyes_s = new/icon("icon" = 'icons/mob/human_face.dmi', "icon_state" = H.dna.species ? H.dna.species.eyes : "eyes_s") if(!eyes_organ) return - eyes_s.Blend(eyes_organ.eye_colour, ICON_ADD) + eyes_s.Blend(eyes_organ.eye_color, ICON_ADD) face_s.Blend(eyes_s, ICON_OVERLAY) var/datum/sprite_accessory/hair_style = GLOB.hair_styles_full_list[head_organ.h_style] diff --git a/code/datums/datumvars.dm b/code/datums/datumvars.dm index dc6101630bf..675b59b965c 100644 --- a/code/datums/datumvars.dm +++ b/code/datums/datumvars.dm @@ -445,7 +445,7 @@ usr << browse(html, "window=variables[refid];size=475x650") #define VV_HTML_ENCODE(thing) ( sanitize ? html_encode(thing) : thing ) -/proc/debug_variable(name, value, level, var/datum/DA = null, sanitize = TRUE) +/proc/debug_variable(name, value, level, datum/DA = null, sanitize = TRUE) var/header if(DA) if(islist(DA)) diff --git a/code/datums/diseases/_MobProcs.dm b/code/datums/diseases/_MobProcs.dm index 81312cdfcc4..1d8596482b3 100644 --- a/code/datums/diseases/_MobProcs.dm +++ b/code/datums/diseases/_MobProcs.dm @@ -142,11 +142,12 @@ /mob/living/carbon/human/CanContractDisease(datum/disease/D) - if((VIRUSIMMUNE in dna.species.species_traits) && !D.bypasses_immunity) - return 0 + if(HAS_TRAIT(src, TRAIT_VIRUSIMMUNE) && !D.bypasses_immunity) + return FALSE + for(var/thing in D.required_organs) if(!((locate(thing) in bodyparts) || (locate(thing) in internal_organs))) - return 0 + return FALSE return ..() /mob/living/carbon/human/monkey/CanContractDisease(datum/disease/D) diff --git a/code/datums/diseases/advance/advance.dm b/code/datums/diseases/advance/advance.dm index f167df70dac..132ddf6ff66 100644 --- a/code/datums/diseases/advance/advance.dm +++ b/code/datums/diseases/advance/advance.dm @@ -44,7 +44,7 @@ GLOBAL_LIST_INIT(advance_cures, list( */ -/datum/disease/advance/New(var/process = 1, var/datum/disease/advance/D) +/datum/disease/advance/New(process = 1, datum/disease/advance/D) if(!istype(D)) D = null // Generate symptoms if we weren't given any. @@ -317,7 +317,7 @@ GLOBAL_LIST_INIT(advance_cures, list( */ // Mix a list of advance diseases and return the mixed result. -/proc/Advance_Mix(var/list/D_list) +/proc/Advance_Mix(list/D_list) // to_chat(world, "Mixing!!!!") diff --git a/code/datums/diseases/advance/presets.dm b/code/datums/diseases/advance/presets.dm index c1df095f9c2..0cf111358c9 100644 --- a/code/datums/diseases/advance/presets.dm +++ b/code/datums/diseases/advance/presets.dm @@ -1,6 +1,6 @@ // Cold -/datum/disease/advance/cold/New(var/process = 1, var/datum/disease/advance/D, var/copy = 0) +/datum/disease/advance/cold/New(process = 1, datum/disease/advance/D, copy = 0) if(!D) name = "Cold" symptoms = list(new/datum/symptom/sneeze) @@ -9,7 +9,7 @@ // Flu -/datum/disease/advance/flu/New(var/process = 1, var/datum/disease/advance/D, var/copy = 0) +/datum/disease/advance/flu/New(process = 1, datum/disease/advance/D, copy = 0) if(!D) name = "Flu" symptoms = list(new/datum/symptom/cough) @@ -18,7 +18,7 @@ // Voice Changing -/datum/disease/advance/voice_change/New(var/process = 1, var/datum/disease/advance/D, var/copy = 0) +/datum/disease/advance/voice_change/New(process = 1, datum/disease/advance/D, copy = 0) if(!D) name = "Epiglottis Mutation" symptoms = list(new/datum/symptom/voice_change) @@ -27,7 +27,7 @@ // Toxin Filter -/datum/disease/advance/heal/New(var/process = 1, var/datum/disease/advance/D, var/copy = 0) +/datum/disease/advance/heal/New(process = 1, datum/disease/advance/D, copy = 0) if(!D) name = "Liver Enhancer" symptoms = list(new/datum/symptom/heal) @@ -36,7 +36,7 @@ // Hullucigen -/datum/disease/advance/hullucigen/New(var/process = 1, var/datum/disease/advance/D, var/copy = 0) +/datum/disease/advance/hullucigen/New(process = 1, datum/disease/advance/D, copy = 0) if(!D) name = "Reality Impairment" symptoms = list(new/datum/symptom/hallucigen) @@ -44,7 +44,7 @@ // Sensory Restoration -/datum/disease/advance/sensory_restoration/New(var/process = 1, var/datum/disease/advance/D, var/copy = 0) +/datum/disease/advance/sensory_restoration/New(process = 1, datum/disease/advance/D, copy = 0) if(!D) name = "Reality Enhancer" symptoms = list(new/datum/symptom/sensory_restoration) diff --git a/code/datums/diseases/advance/symptoms/deafness.dm b/code/datums/diseases/advance/symptoms/deafness.dm index a3111478b26..1346b6afc26 100644 --- a/code/datums/diseases/advance/symptoms/deafness.dm +++ b/code/datums/diseases/advance/symptoms/deafness.dm @@ -16,7 +16,6 @@ Bonus */ /datum/symptom/deafness - name = "Deafness" stealth = -1 resistance = -2 @@ -29,15 +28,12 @@ Bonus ..() if(prob(SYMPTOM_ACTIVATION_PROB)) var/mob/living/M = A.affected_mob + var/obj/item/organ/internal/ears/ears = M.get_organ_slot("ears") + if(!ears) + return //cutting off your ears to cure the deafness: the ultimate own switch(A.stage) if(3, 4) to_chat(M, "[pick("You hear a ringing in your ear.", "Your ears pop.")]") if(5) - if(!(DEAF in M.mutations)) - to_chat(M, "Your ears pop and begin ringing loudly!") - M.BecomeDeaf() - spawn(200) - if(M) - to_chat(M, "The ringing in your ears fades...") - M.CureDeaf() - return + to_chat(M, "Your ears pop and begin ringing loudly!") + ears.deaf = min(20, ears.deaf + 15) diff --git a/code/datums/diseases/advance/symptoms/shedding.dm b/code/datums/diseases/advance/symptoms/shedding.dm index c3a64501759..a1f244c5566 100644 --- a/code/datums/diseases/advance/symptoms/shedding.dm +++ b/code/datums/diseases/advance/symptoms/shedding.dm @@ -31,20 +31,25 @@ BONUS to_chat(M, "[pick("Your scalp itches.", "Your skin feels flakey.")]") if(istype(M, /mob/living/carbon/human)) var/mob/living/carbon/human/H = M + if(NO_HAIR in H.dna.species.species_traits) + return // Hair can't fall out if you don't have any var/obj/item/organ/external/head/head_organ = H.get_organ("head") switch(A.stage) if(3, 4) if(!(head_organ.h_style == "Bald") && !(head_organ.h_style == "Balding Hair")) to_chat(H, "Your hair starts to fall out in clumps...") - spawn(50) - head_organ.h_style = "Balding Hair" - H.update_hair() + addtimer(CALLBACK(src, .proc/change_hair, H, head_organ, null, "Balding Hair"), 5 SECONDS) if(5) if(!(head_organ.f_style == "Shaved") || !(head_organ.h_style == "Bald")) to_chat(H, "Your hair starts to fall out in clumps...") - spawn(50) - head_organ.f_style = "Shaved" - head_organ.h_style = "Bald" - H.update_hair() - H.update_fhair() - return + addtimer(CALLBACK(src, .proc/change_hair, H, head_organ, "Shaved", "Bald"), 5 SECONDS) + +/datum/symptom/shedding/proc/change_hair(mob/living/carbon/human/H, obj/item/organ/external/head/head_organ, f_style, h_style) + if(!H || !head_organ) + return + if(f_style) + head_organ.f_style = f_style + H.update_fhair() + if(h_style) + head_organ.h_style = h_style + H.update_hair() diff --git a/code/datums/diseases/advance/symptoms/vision.dm b/code/datums/diseases/advance/symptoms/vision.dm index 252eaf16ecc..4c854953745 100644 --- a/code/datums/diseases/advance/symptoms/vision.dm +++ b/code/datums/diseases/advance/symptoms/vision.dm @@ -44,7 +44,8 @@ Bonus M.EyeBlurry(30) eyes.receive_damage(5) if(eyes.damage >= 10) - M.BecomeNearsighted() + M.become_nearsighted(EYE_DAMAGE) if(prob(eyes.damage - 10 + 1)) - if(M.BecomeBlind()) + if(!M.eye_blind) to_chat(M, "You go blind!") + eyes.receive_damage(eyes.max_damage) diff --git a/code/datums/diseases/critical.dm b/code/datums/diseases/critical.dm index e8486a8f408..d3c1da6e6c1 100644 --- a/code/datums/diseases/critical.dm +++ b/code/datums/diseases/critical.dm @@ -25,7 +25,7 @@ max_stages = 3 spread_flags = SPECIAL cure_text = "Saline-Glucose Solution" - cures = list("salglu_solution") + cures = list("salglu_solution", "syndicate_nanites") cure_chance = 10 viable_mobtypes = list(/mob/living/carbon/human) stage_prob = 6 @@ -86,7 +86,7 @@ max_stages = 3 spread_flags = SPECIAL cure_text = "Atropine, Epinephrine, or Heparin" - cures = list("atropine", "epinephrine", "heparin") + cures = list("atropine", "epinephrine", "heparin", "syndicate_nanites") cure_chance = 10 needs_all_cures = FALSE viable_mobtypes = list(/mob/living/carbon/human) @@ -157,7 +157,7 @@ /datum/disease/critical/hypoglycemia/has_cure() if(ishuman(affected_mob)) var/mob/living/carbon/human/H = affected_mob - if(NO_HUNGER in H.dna.species.species_traits) + if(HAS_TRAIT(H, TRAIT_NOHUNGER)) return TRUE if(ismachineperson(H)) return TRUE @@ -165,6 +165,8 @@ /datum/disease/critical/hypoglycemia/stage_act() if(..()) + if(isLivingSSD(affected_mob)) // We don't want AFK people dying from this. + return if(affected_mob.nutrition > NUTRITION_LEVEL_HYPOGLYCEMIA) to_chat(affected_mob, "You feel a lot better!") cure() diff --git a/code/datums/diseases/pierrot_throat.dm b/code/datums/diseases/pierrot_throat.dm index ffcdb3d0a68..bda1253a61c 100644 --- a/code/datums/diseases/pierrot_throat.dm +++ b/code/datums/diseases/pierrot_throat.dm @@ -54,7 +54,7 @@ if(3) if(prob(10)) to_chat(affected_mob, "Your thoughts are interrupted by a loud HONK!") - affected_mob << 'sound/items/airhorn.ogg' + SEND_SOUND(affected_mob, sound('sound/items/airhorn.ogg')) if(4) if(prob(5)) affected_mob.say( pick( list("HONK!", "Honk!", "Honk.", "Honk?", "Honk!!", "Honk?!", "Honk...") ) ) diff --git a/code/datums/dog_fashion.dm b/code/datums/dog_fashion.dm index 14705ae7375..af1e3376687 100644 --- a/code/datums/dog_fashion.dm +++ b/code/datums/dog_fashion.dm @@ -31,7 +31,7 @@ if(speak_emote) D.speak_emote = speak_emote -/datum/dog_fashion/proc/get_overlay(var/dir) +/datum/dog_fashion/proc/get_overlay(dir) if(icon_file && obj_icon_state) var/image/corgI = image(icon_file, obj_icon_state, dir = dir) corgI.alpha = obj_alpha @@ -124,6 +124,10 @@ name = "Pyromancer REAL_NAME" speak = list("YAP", "Woof!", "Bark!", "AUUUUUU", "ONI SOMA!") +/datum/dog_fashion/head/black_wizard + name = "Necromancer REAL_NAME" + speak = list("YAP", "Woof!", "Bark!", "AUUUUUU") + /datum/dog_fashion/head/cardborg name = "Borgi" speak = list("Ping!","Beep!","Woof!") @@ -148,6 +152,8 @@ name = "Corgi Tech REAL_NAME" desc = "The reason your yellow gloves have chew-marks." +/datum/dog_fashion/head/softcap + /datum/dog_fashion/head/reindeer name = "REAL_NAME the red-nosed Corgi" emote_hear = list("lights the way!", "illuminates.", "yaps!") @@ -201,10 +207,45 @@ /datum/dog_fashion/back/hardsuit/apply(mob/living/simple_animal/pet/dog/D) ..() - D.mutations.Add(BREATHLESS) + ADD_TRAIT(D, TRAIT_NOBREATH, DOGGO_SPACESUIT) D.atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0) D.minbodytemp = 0 /datum/dog_fashion/head/fried_vox_empty name = "Colonel REAL_NAME" desc = "Keep away from live vox." + +/datum/dog_fashion/head/HoS + name = "Head of Security REAL_NAME" + desc = "Probably better than the last HoS." + +/datum/dog_fashion/head/beret/sec + name = "Officer REAL_NAME" + desc = "Ever-loyal, ever-vigilant." + +/datum/dog_fashion/head/bowlerhat + name = "REAL_NAME" + desc = "A sophisticated city gent." + +/datum/dog_fashion/head/surgery + name = "Nurse-in-Training REAL_NAME" + desc = "The most adorable bed-side manner ever." + +/datum/dog_fashion/head/bucket + name = "REAL_NAME" + desc = "A janitor's best friend." + +/datum/dog_fashion/head/justice_wig + name = "Arbiter REAL_NAME" + desc = "Head of the High Court of Cute." + +/datum/dog_fashion/head/wizard/magus + name = "Battlemage REAL_NAME" + +/datum/dog_fashion/head/wizard/marisa + name = "Witch REAL_NAME" + desc = "Flying broom not included." + +/datum/dog_fashion/head/roman + name = "Imperator REAL_NAME" + desc = "For the Senate and the people of Rome!" diff --git a/code/datums/elements/earhealing.dm b/code/datums/elements/earhealing.dm new file mode 100644 index 00000000000..ee33cd9ee34 --- /dev/null +++ b/code/datums/elements/earhealing.dm @@ -0,0 +1,36 @@ +/datum/element/earhealing + element_flags = ELEMENT_DETACH + var/list/user_by_item = list() + +/datum/element/earhealing/New() + START_PROCESSING(SSdcs, src) + +/datum/element/earhealing/Attach(datum/target) + . = ..() + if(!isitem(target)) + return ELEMENT_INCOMPATIBLE + + RegisterSignal(target, list(COMSIG_ITEM_EQUIPPED, COMSIG_ITEM_DROPPED), .proc/equippedChanged) + +/datum/element/earhealing/Detach(datum/target) + . = ..() + UnregisterSignal(target, list(COMSIG_ITEM_EQUIPPED, COMSIG_ITEM_DROPPED)) + user_by_item -= target + +/datum/element/earhealing/proc/equippedChanged(datum/source, mob/living/carbon/user, slot) + SIGNAL_HANDLER + + if(((slot == slot_l_ear) || (slot == slot_r_ear)) && istype(user)) + user_by_item[source] = user + else + user_by_item -= source + +/datum/element/earhealing/process() + for(var/i in user_by_item) + var/mob/living/carbon/user = user_by_item[i] + var/obj/item/organ/internal/ears/ears = user.get_int_organ(/obj/item/organ/internal/ears) + if(!ears || HAS_TRAIT_NOT_FROM(user, TRAIT_DEAF, EAR_DAMAGE)) + continue + ears.deaf = max(ears.deaf - 0.25, (ears.ear_damage < 100 ? 0 : 1)) // Do not clear deafness if our ears are too damaged + ears.ear_damage = max(ears.ear_damage - 0.025, 0) + CHECK_TICK diff --git a/code/datums/elements/rad_insulation.dm b/code/datums/elements/rad_insulation.dm new file mode 100644 index 00000000000..2c9492dac9d --- /dev/null +++ b/code/datums/elements/rad_insulation.dm @@ -0,0 +1,34 @@ +/datum/element/rad_insulation + element_flags = ELEMENT_DETACH | ELEMENT_BESPOKE + id_arg_index = 2 + var/amount // Multiplier for radiation strength passing through + +/datum/element/rad_insulation/Attach(datum/target, _amount = RAD_MEDIUM_INSULATION, protects = TRUE, contamination_proof = TRUE) + . = ..() + if(!isatom(target)) + return ELEMENT_INCOMPATIBLE + + if(protects) // Does this protect things in its contents from being affected? + RegisterSignal(target, COMSIG_ATOM_RAD_PROBE, .proc/rad_probe_react) + if(contamination_proof) // Can this object be contaminated? + RegisterSignal(target, COMSIG_ATOM_RAD_CONTAMINATING, .proc/rad_contaminating) + if(_amount != 1) // If it's 1 it won't have any impact on radiation passing through anyway + RegisterSignal(target, COMSIG_ATOM_RAD_WAVE_PASSING, .proc/rad_pass) + + amount = _amount + +/datum/element/rad_insulation/proc/rad_probe_react(datum/source) + SIGNAL_HANDLER + + return COMPONENT_BLOCK_RADIATION + +/datum/element/rad_insulation/proc/rad_contaminating(datum/source, strength) + SIGNAL_HANDLER + + return COMPONENT_BLOCK_CONTAMINATION + +/datum/element/rad_insulation/proc/rad_pass(datum/source, datum/radiation_wave/wave, width) + SIGNAL_HANDLER + + wave.intensity = wave.intensity * (1 - ((1 - amount) / width)) // The further out the rad wave goes the less it's affected by insulation (larger width) + return COMPONENT_RAD_WAVE_HANDLED diff --git a/code/datums/helper_datums/construction_datum.dm b/code/datums/helper_datums/construction_datum.dm index 8eefe5efa0d..155bbaed8dc 100644 --- a/code/datums/helper_datums/construction_datum.dm +++ b/code/datums/helper_datums/construction_datum.dm @@ -217,7 +217,7 @@ text = replacetext(text,"{HOLDER}","[holder]") return text -/datum/construction/reversible2/custom_action(index, diff, used_atom, var/mob/user) +/datum/construction/reversible2/custom_action(index, diff, used_atom, mob/user) if(!..(index,used_atom,user)) return 0 diff --git a/code/datums/helper_datums/input.dm b/code/datums/helper_datums/input.dm index 4c3dc6a1cf4..175a730b275 100644 --- a/code/datums/helper_datums/input.dm +++ b/code/datums/helper_datums/input.dm @@ -45,7 +45,7 @@ return result // Callback function should take the result as the last argument -/datum/async_input/proc/on_close(var/datum/callback/cb) +/datum/async_input/proc/on_close(datum/callback/cb) onCloseCb = cb /datum/async_input/proc/show() diff --git a/code/datums/helper_datums/teleport.dm b/code/datums/helper_datums/teleport.dm index 4609075ddd7..49c38103d56 100644 --- a/code/datums/helper_datums/teleport.dm +++ b/code/datums/helper_datums/teleport.dm @@ -84,14 +84,12 @@ /datum/teleport/proc/playSpecials(atom/location,datum/effect_system/effect,sound) if(location) if(effect) - spawn(-1) - src = null - effect.attach(location) - effect.start() + src = null + effect.attach(location) + effect.start() if(sound) - spawn(-1) - src = null - playsound(location,sound,60,1) + src = null + playsound(location,sound,60,1) return //do the monkey dance diff --git a/code/datums/hud.dm b/code/datums/hud.dm index 50152c4873d..60fbb9c8194 100644 --- a/code/datums/hud.dm +++ b/code/datums/hud.dm @@ -21,7 +21,6 @@ GLOBAL_LIST_INIT(huds, list( \ ANTAG_HUD_VAMPIRE = new/datum/atom_hud/antag/hidden(),\ ANTAG_HUD_ABDUCTOR = new/datum/atom_hud/antag/hidden(),\ DATA_HUD_ABDUCTOR = new/datum/atom_hud/abductor(),\ - ANTAG_HUD_DEVIL = new/datum/atom_hud/antag/hidden(),\ ANTAG_HUD_EVENTMISC = new/datum/atom_hud/antag/hidden(),\ ANTAG_HUD_BLOB = new/datum/atom_hud/antag/hidden()\ )) diff --git a/code/datums/log_record.dm b/code/datums/log_record.dm index 2a659477b47..cf437c86dbd 100644 --- a/code/datums/log_record.dm +++ b/code/datums/log_record.dm @@ -37,7 +37,7 @@ else . = subject -/datum/log_record/proc/get_health_string(var/mob/living/L) +/datum/log_record/proc/get_health_string(mob/living/L) var/OX = L.getOxyLoss() > 50 ? "[L.getOxyLoss()]" : L.getOxyLoss() var/TX = L.getToxLoss() > 50 ? "[L.getToxLoss()]" : L.getToxLoss() var/BU = L.getFireLoss() > 50 ? "[L.getFireLoss()]" : L.getFireLoss() diff --git a/code/datums/looping_sounds/item_sounds.dm b/code/datums/looping_sounds/item_sounds.dm new file mode 100644 index 00000000000..54c6a196c02 --- /dev/null +++ b/code/datums/looping_sounds/item_sounds.dm @@ -0,0 +1,42 @@ +#define RAD_GEIGER_LOW 100 // Geiger counter sound thresholds +#define RAD_GEIGER_MEDIUM 500 +#define RAD_GEIGER_HIGH 1000 + +/datum/looping_sound/geiger + mid_sounds = list( + list('sound/items/geiger/low1.ogg' = 1, 'sound/items/geiger/low2.ogg' = 1, 'sound/items/geiger/low3.ogg' = 1, 'sound/items/geiger/low4.ogg' = 1), + list('sound/items/geiger/med1.ogg' = 1, 'sound/items/geiger/med2.ogg' = 1, 'sound/items/geiger/med3.ogg' = 1, 'sound/items/geiger/med4.ogg' = 1), + list('sound/items/geiger/high1.ogg' = 1, 'sound/items/geiger/high2.ogg' = 1, 'sound/items/geiger/high3.ogg' = 1, 'sound/items/geiger/high4.ogg' = 1), + list('sound/items/geiger/ext1.ogg' = 1, 'sound/items/geiger/ext2.ogg' = 1, 'sound/items/geiger/ext3.ogg' = 1, 'sound/items/geiger/ext4.ogg' = 1) + ) + mid_length = 2 + volume = 25 + var/last_radiation + +/datum/looping_sound/geiger/get_sound(starttime) + var/danger + switch(last_radiation) + if(RAD_BACKGROUND_RADIATION to RAD_GEIGER_LOW) + danger = 1 + if(RAD_GEIGER_LOW to RAD_GEIGER_MEDIUM) + danger = 2 + if(RAD_GEIGER_MEDIUM to RAD_GEIGER_HIGH) + danger = 3 + if(RAD_GEIGER_HIGH to INFINITY) + danger = 4 + else + return null + return ..(starttime, mid_sounds[danger]) + +/datum/looping_sound/geiger/stop() + . = ..() + last_radiation = 0 + +#undef RAD_GEIGER_LOW +#undef RAD_GEIGER_MEDIUM +#undef RAD_GEIGER_HIGH + +/datum/looping_sound/tape_recorder_hiss + mid_sounds = list('sound/items/taperecorder/taperecorder_hiss_mid.ogg') + start_sound = list('sound/items/taperecorder/taperecorder_hiss_start.ogg') + volume = 10 diff --git a/code/datums/looping_sounds/looping_sound.dm b/code/datums/looping_sounds/looping_sound.dm index 006e92c305c..33fb5595c24 100644 --- a/code/datums/looping_sounds/looping_sound.dm +++ b/code/datums/looping_sounds/looping_sound.dm @@ -24,9 +24,15 @@ var/end_sound var/chance var/volume = 100 - var/muted = TRUE + var/vary = FALSE var/max_loops var/direct + var/extra_range = 0 + var/falloff_exponent + var/muted = TRUE + var/falloff_distance + /// Channel of the audio, random otherwise + var/channel /datum/looping_sound/New(list/_output_atoms = list(), start_immediately = FALSE, _direct = FALSE) if(!mid_sounds) @@ -71,14 +77,16 @@ var/list/atoms_cache = output_atoms var/sound/S = sound(soundfile) if(direct) - S.channel = SSsounds.random_available_channel() - S.volume = volume + S.channel = channel || SSsounds.random_available_channel() for(var/i in 1 to atoms_cache.len) var/atom/thing = atoms_cache[i] if(direct) + if(ismob(thing)) + var/mob/M = thing + S.volume = volume * (USER_VOLUME(M, channel) || 1) SEND_SOUND(thing, S) else - playsound(thing, S, volume) + playsound(thing, S, volume, vary, extra_range, falloff_exponent = falloff_exponent, falloff_distance = falloff_distance, channel = channel) /datum/looping_sound/proc/get_sound(looped, _mid_sounds) if(!_mid_sounds) diff --git a/code/datums/looping_sounds/machinery_sounds.dm b/code/datums/looping_sounds/machinery_sounds.dm index 8fe37324237..432e2709335 100644 --- a/code/datums/looping_sounds/machinery_sounds.dm +++ b/code/datums/looping_sounds/machinery_sounds.dm @@ -5,3 +5,15 @@ mid_length = 10 end_sound = 'sound/machines/shower/shower_end.ogg' volume = 20 + +/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + +/datum/looping_sound/supermatter + mid_sounds = list('sound/machines/sm/loops/calm.ogg' = 1) + mid_length = 60 + volume = 40 + extra_range = 25 + falloff_exponent = 10 + falloff_distance = 5 + vary = TRUE + channel = CHANNEL_ENGINE diff --git a/code/datums/looping_sounds/weather.dm b/code/datums/looping_sounds/weather.dm index 74b21ba0809..d355bc59c14 100644 --- a/code/datums/looping_sounds/weather.dm +++ b/code/datums/looping_sounds/weather.dm @@ -8,7 +8,7 @@ start_sound = 'sound/weather/ashstorm/outside/active_start.ogg' start_length = 130 end_sound = 'sound/weather/ashstorm/outside/active_end.ogg' - volume = 40 + volume = 80 /datum/looping_sound/active_inside_ashstorm mid_sounds = list( @@ -20,7 +20,7 @@ start_sound = 'sound/weather/ashstorm/inside/active_start.ogg' start_length = 130 end_sound = 'sound/weather/ashstorm/inside/active_end.ogg' - volume = 30 + volume = 60 /datum/looping_sound/weak_outside_ashstorm mid_sounds = list( @@ -32,7 +32,7 @@ start_sound = 'sound/weather/ashstorm/outside/weak_start.ogg' start_length = 130 end_sound = 'sound/weather/ashstorm/outside/weak_end.ogg' - volume = 20 + volume = 50 /datum/looping_sound/weak_inside_ashstorm mid_sounds = list( @@ -44,4 +44,4 @@ start_sound = 'sound/weather/ashstorm/inside/weak_start.ogg' start_length = 130 end_sound = 'sound/weather/ashstorm/inside/weak_end.ogg' - volume = 10 + volume = 30 diff --git a/code/datums/mind.dm b/code/datums/mind.dm index 052dc268b72..35e0053822d 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -31,7 +31,7 @@ var/assigned_role //assigned role is what job you're assigned to when you join the station. var/playtime_role //if set, overrides your assigned_role for the purpose of playtime awards. Set by IDcomputer when your ID is changed. var/special_role //special roles are typically reserved for antags or roles like ERT. If you want to avoid a character being automatically announced by the AI, on arrival (becuase they're an off station character or something); ensure that special_role and assigned_role are equal. - var/offstation_role = FALSE //set to true for ERT, deathsquad, abductors, etc, that can go from and to z2 at will and shouldn't be antag targets + var/offstation_role = FALSE //set to true for ERT, deathsquad, abductors, etc, that can go from and to CC at will and shouldn't be antag targets var/list/restricted_roles = list() var/list/spell_list = list() // Wizard mode & "Give Spell" badmin button. @@ -55,10 +55,6 @@ var/antag_hud_icon_state = null //this mind's ANTAG_HUD should have this icon_state var/datum/atom_hud/antag/antag_hud = null //this mind's antag HUD var/datum/mindslaves/som //stands for slave or master...hush.. - var/datum/devilinfo/devilinfo //Information about the devil, if any. - var/damnation_type = 0 - var/datum/mind/soulOwner //who owns the soul. Under normal circumstances, this will point to src - var/hasSoul = TRUE var/isholy = FALSE // is this person a chaplain or admin role allowed to use bibles var/isblessed = FALSE // is this person blessed by a chaplain? @@ -76,7 +72,6 @@ /datum/mind/New(new_key) key = new_key - soulOwner = src /datum/mind/Destroy() SSticker.minds -= src @@ -88,7 +83,6 @@ antag_datums = null current = null original = null - soulOwner = null return ..() /datum/mind/proc/transfer_to(mob/living/new_character) @@ -314,22 +308,6 @@ . += _memory_edit_role_enabled(ROLE_ABDUCTOR) -/datum/mind/proc/memory_edit_devil(mob/living/H) - . = _memory_edit_header("devil", list("devilagents")) - if(src in SSticker.mode.devils) - if(!devilinfo) - . += "No devilinfo found! Yell at a coder!" - else if(!devilinfo.ascendable) - . += "DEVIL|Ascendable Devil|sintouched|no" - else - . += "DEVIL|ASCENDABLE DEVIL|sintouched|no" - else if(src in SSticker.mode.sintouched) - . += "devil|Ascendable Devil|SINTOUCHED|no" - else - . += "devil|Ascendable Devil|sintouched|NO" - - . += _memory_edit_role_enabled(ROLE_DEVIL) - /datum/mind/proc/memory_edit_eventmisc(mob/living/H) . = _memory_edit_header("event", list()) if(src in SSticker.mode.eventmiscs) @@ -349,55 +327,41 @@ . += _memory_edit_role_enabled(ROLE_TRAITOR) // Contractor . += "
contractor: " - var/datum/antagonist/traitor/contractor/C = has_antag_datum(/datum/antagonist/traitor/contractor) - if(C) - var/status - if(C.contractor_uplink) // Offer accepted - status = "CONTRACTOR" - else if(world.time >= C.offer_deadline) - status = "CONTRACTOR (EXPIRED)" - else - status = "CONTRACTOR (PENDING)" - . += "[status]|no" + var/datum/contractor_hub/H = LAZYACCESS(GLOB.contractors, src) + if(H) + . += "CONTRACTOR" // List all their contracts - if(C.contractor_uplink) - . += "
Contracts:" - if(C.contractor_uplink.hub.contracts) - var/count = 1 - for(var/co in C.contractor_uplink.hub.contracts) - var/datum/syndicate_contract/CO = co - . += "
Contract #[count++]: " - . += "[CO.contract.target?.name || "Invalid target!"]|" - . += "locations|" - . += "more|" - switch(CO.status) - if(CONTRACT_STATUS_INVALID) - . += "INVALID" - if(CONTRACT_STATUS_INACTIVE) - . += "inactive" - if(CONTRACT_STATUS_ACTIVE) - . += "ACTIVE|" - . += "interrupt|" - . += "fail" - if(CONTRACT_STATUS_COMPLETED) - . += "COMPLETED" - if(CONTRACT_STATUS_FAILED) - . += "FAILED" - . += "
" - . += "Add Contract
" - . += "Claimable TC: [C.contractor_uplink.hub.reward_tc_available]
" - . += "Available Rep: [C.contractor_uplink.hub.rep]
" - else - . += "
" - . += "Has not logged in to contractor uplink" - else - if(has_antag_datum(/datum/antagonist/traitor)) - if(find_syndicate_uplink()) - . += "contractor|NO" - else - . += "contractor|NO|No Uplink" + . += "
Contracts:" + if(H.contracts) + var/count = 1 + for(var/co in H.contracts) + var/datum/syndicate_contract/CO = co + . += "
Contract #[count++]: " + . += "[CO.contract.target?.name || "Invalid target!"]|" + . += "locations|" + . += "more|" + switch(CO.status) + if(CONTRACT_STATUS_INVALID) + . += "INVALID" + if(CONTRACT_STATUS_INACTIVE) + . += "inactive" + if(CONTRACT_STATUS_ACTIVE) + . += "ACTIVE|" + . += "interrupt|" + . += "fail" + if(CONTRACT_STATUS_COMPLETED) + . += "COMPLETED" + if(CONTRACT_STATUS_FAILED) + . += "FAILED" + . += "
" + . += "Add Contract
" + . += "Claimable TC: [H.reward_tc_available]
" + . += "Available Rep: [H.rep]
" else - . += "contractor|NO" + . += "
" + . += "Has not logged in to contractor uplink" + else + . += "NO" // Mindslave . += "
mindslaved: " if(has_antag_datum(/datum/antagonist/mindslave)) @@ -475,10 +439,6 @@ sections["shadowling"] = memory_edit_shadowling(H) /** Abductors **/ sections["abductor"] = memory_edit_abductor(H) - /** DEVIL ***/ - var/static/list/devils_typecache = typecacheof(list(/mob/living/carbon/human, /mob/living/carbon/true_devil, /mob/living/silicon/robot)) - if(is_type_in_typecache(current, devils_typecache)) - sections["devil"] = memory_edit_devil(H) sections["eventmisc"] = memory_edit_eventmisc(H) /** TRAITOR ***/ sections["traitor"] = memory_edit_traitor() @@ -926,7 +886,7 @@ special_role = SPECIAL_ROLE_WIZARD //ticker.mode.learn_basic_spells(current) SSticker.mode.update_wiz_icons_added(src) - SEND_SOUND(current, 'sound/ambience/antag/ragesmages.ogg') + SEND_SOUND(current, sound('sound/ambience/antag/ragesmages.ogg')) to_chat(current, "You are a Space Wizard!") current.faction = list("wizard") log_admin("[key_name(usr)] has wizarded [key_name(current)]") @@ -972,7 +932,7 @@ SSticker.mode.grant_changeling_powers(current) SSticker.mode.update_change_icons_added(src) special_role = SPECIAL_ROLE_CHANGELING - SEND_SOUND(current, 'sound/ambience/antag/ling_aler.ogg') + SEND_SOUND(current, sound('sound/ambience/antag/ling_aler.ogg')) to_chat(current, "Your powers have awoken. A flash of memory returns to us... we are a changeling!") log_admin("[key_name(usr)] has changelinged [key_name(current)]") message_admins("[key_name_admin(usr)] has changelinged [key_name_admin(current)]") @@ -990,7 +950,7 @@ current.dna = changeling.absorbed_dna[1] current.real_name = current.dna.real_name current.UpdateAppearance() - domutcheck(current, null) + domutcheck(current) log_admin("[key_name(usr)] has reset [key_name(current)]'s DNA") message_admins("[key_name_admin(usr)] has reset [key_name_admin(current)]'s DNA") @@ -1017,7 +977,7 @@ slaved.masters += src som = slaved //we MIGT want to mindslave someone special_role = SPECIAL_ROLE_VAMPIRE - SEND_SOUND(current, 'sound/ambience/antag/vampalert.ogg') + SEND_SOUND(current, sound('sound/ambience/antag/vampalert.ogg')) to_chat(current, "Your powers have awoken. Your lust for blood grows... You are a Vampire!") log_admin("[key_name(usr)] has vampired [key_name(current)]") message_admins("[key_name_admin(usr)] has vampired [key_name_admin(current)]") @@ -1118,76 +1078,6 @@ SSticker.mode.update_eventmisc_icons_added(src) message_admins("[key_name_admin(usr)] has eventantag'ed [current].") log_admin("[key_name(usr)] has eventantag'ed [current].") - else if(href_list["devil"]) - switch(href_list["devil"]) - if("clear") - if(src in SSticker.mode.devils) - if(istype(current,/mob/living/carbon/true_devil/)) - to_chat(usr,"This cannot be used on true or arch-devils.") - else - SSticker.mode.devils -= src - SSticker.mode.update_devil_icons_removed(src) - special_role = null - to_chat(current,"Your infernal link has been severed! You are no longer a devil!") - RemoveSpell(/obj/effect/proc_holder/spell/targeted/infernal_jaunt) - RemoveSpell(/obj/effect/proc_holder/spell/targeted/click/fireball/hellish) - RemoveSpell(/obj/effect/proc_holder/spell/targeted/click/summon_contract) - RemoveSpell(/obj/effect/proc_holder/spell/targeted/conjure_item/pitchfork) - RemoveSpell(/obj/effect/proc_holder/spell/targeted/conjure_item/pitchfork/greater) - RemoveSpell(/obj/effect/proc_holder/spell/targeted/conjure_item/pitchfork/ascended) - RemoveSpell(/obj/effect/proc_holder/spell/targeted/conjure_item/violin) - RemoveSpell(/obj/effect/proc_holder/spell/targeted/summon_dancefloor) - RemoveSpell(/obj/effect/proc_holder/spell/targeted/sintouch) - RemoveSpell(/obj/effect/proc_holder/spell/targeted/sintouch/ascended) - message_admins("[key_name_admin(usr)] has de-devil'ed [current].") - if(issilicon(current)) - var/mob/living/silicon/S = current - S.laws.clear_sixsixsix_laws() - devilinfo = null - log_admin("[key_name(usr)] has de-devil'ed [current].") - else if(src in SSticker.mode.sintouched) - SSticker.mode.sintouched -= src - message_admins("[key_name_admin(usr)] has de-sintouch'ed [current].") - log_admin("[key_name(usr)] has de-sintouch'ed [current].") - if("devil") - if(devilinfo) - devilinfo.ascendable = FALSE - message_admins("[key_name_admin(usr)] has made [current] unable to ascend as a devil.") - log_admin("[key_name_admin(usr)] has made [current] unable to ascend as a devil.") - return - if(!ishuman(current) && !isrobot(current)) - to_chat(usr, "This only works on humans and cyborgs!") - return - SSticker.mode.devils += src - special_role = "devil" - SSticker.mode.update_devil_icons_added(src) - SSticker.mode.finalize_devil(src, FALSE) - SSticker.mode.forge_devil_objectives(src, 2) - SSticker.mode.greet_devil(src) - message_admins("[key_name_admin(usr)] has devil'ed [current].") - log_admin("[key_name(usr)] has devil'ed [current].") - if("ascendable_devil") - if(devilinfo) - devilinfo.ascendable = TRUE - message_admins("[key_name_admin(usr)] has made [current] able to ascend as a devil.") - log_admin("[key_name_admin(usr)] has made [current] able to ascend as a devil.") - return - if(!ishuman(current) && !isrobot(current)) - to_chat(usr, "This only works on humans and cyborgs!") - return - SSticker.mode.devils += src - special_role = "devil" - SSticker.mode.update_devil_icons_added(src) - SSticker.mode.finalize_devil(src, TRUE) - SSticker.mode.forge_devil_objectives(src, 2) - SSticker.mode.greet_devil(src) - message_admins("[key_name_admin(usr)] has devil'ed [current]. The devil has been marked as ascendable.") - log_admin("[key_name(usr)] has devil'ed [current]. The devil has been marked as ascendable.") - if("sintouched") - var/mob/living/carbon/human/H = current - H.influenceSin() - message_admins("[key_name_admin(usr)] has sintouch'ed [current].") - log_admin("[key_name(usr)] has sintouch'ed [current].") else if(href_list["traitor"]) switch(href_list["traitor"]) @@ -1216,50 +1106,10 @@ message_admins("[key_name_admin(usr)] has automatically forged objectives for [key_name_admin(current)]") else if(href_list["contractor"]) - var/datum/antagonist/traitor/contractor/C = has_antag_datum(/datum/antagonist/traitor/contractor) - var/datum/contractor_hub/H = C && C.contractor_uplink?.hub + var/datum/contractor_hub/H = LAZYACCESS(GLOB.contractors, src) switch(href_list["contractor"]) - if("clear") - if(!C) - return - var/memory = C.antag_memory // Need to preserve the codewords and such - // Clean up contractor stuff - var/obj/item/uplink/hidden/U = find_syndicate_uplink() - U?.contractor = null - C.silent = TRUE - remove_antag_datum(/datum/antagonist/traitor/contractor) - // Traitor them again - if(!has_antag_datum(/datum/antagonist/traitor, FALSE)) - var/datum/antagonist/traitor/T = new() - T.give_objectives = FALSE - T.should_equip = FALSE - T.silent = TRUE - T.antag_memory += memory - add_antag_datum(T) - // Notify - to_chat(current, "You are no longer a Contractor!") - log_admin("[key_name(usr)] has de-contractored [key_name(current)]") - message_admins("[key_name_admin(usr)] has de-contractored [key_name_admin(current)]") - - if("contractor") - if(has_antag_datum(/datum/antagonist/traitor/contractor)) - return - var/datum/antagonist/traitor/T = has_antag_datum(/datum/antagonist/traitor) - var/memory = T?.antag_memory // Need to preserve the codewords and such - // Replace the traitor datum by a contractor one - remove_antag_datum(/datum/antagonist/traitor) - C = new() - C.give_objectives = FALSE - C.should_equip = FALSE - C.silent = TRUE - C.antag_memory += memory - add_antag_datum(C) - // Notify - log_admin("[key_name(usr)] has contractored [key_name(current)]") - message_admins("[key_name_admin(usr)] has contractored [key_name_admin(current)]") - if("add") - if(!C) + if(!H) return var/list/possible_targets = list() for(var/foo in SSticker.minds) @@ -1275,37 +1125,37 @@ var/datum/syndicate_contract/new_contract = new(H, src, list(), target) new_contract.reward_tc = list(0, 0, 0) H.contracts += new_contract - SStgui.update_uis(C.contractor_uplink.hub) + SStgui.update_uis(H) log_admin("[key_name(usr)] has given a new contract to [key_name(current)] with [target.current] as the target") message_admins("[key_name_admin(usr)] has given a new contract to [key_name_admin(current)] with [target.current] as the target") if("tc") - if(!C) + if(!H) return var/new_tc = input(usr, "Enter the new amount of TC:", "Set Claimable TC", H.reward_tc_available) as num|null new_tc = text2num(new_tc) if(isnull(new_tc) || new_tc < 0) return H.reward_tc_available = new_tc - SStgui.update_uis(C.contractor_uplink.hub) + SStgui.update_uis(H) log_admin("[key_name(usr)] has set [key_name(current)]'s claimable TC to [new_tc]") message_admins("[key_name_admin(usr)] has set [key_name_admin(current)]'s claimable TC to [new_tc]") if("rep") - if(!C) + if(!H) return var/new_rep = input(usr, "Enter the new amount of Rep:", "Set Available Rep", H.rep) as num|null new_rep = text2num(new_rep) if(isnull(new_rep) || new_rep < 0) return H.rep = new_rep - SStgui.update_uis(C.contractor_uplink.hub) + SStgui.update_uis(H) log_admin("[key_name(usr)] has set [key_name(current)]'s contractor Rep to [new_rep]") message_admins("[key_name_admin(usr)] has set [key_name_admin(current)]'s contractor Rep to [new_rep]") // Contract specific actions if("target") - if(!C) + if(!H) return var/datum/syndicate_contract/CO = locateUID(href_list["cuid"]) if(!istype(CO)) @@ -1333,12 +1183,12 @@ temp.Blend(R.fields["photo"], ICON_OVERLAY) CO.target_photo = temp // Notify - SStgui.update_uis(C.contractor_uplink.hub) + SStgui.update_uis(H) log_admin("[key_name(usr)] has set [key_name(current)]'s contract target to [target.current]") message_admins("[key_name_admin(usr)] has set [key_name_admin(current)]'s contract target to [target.current]") if("locations") - if(!C) + if(!H) return var/datum/syndicate_contract/CO = locateUID(href_list["cuid"]) if(!istype(CO)) @@ -1371,12 +1221,12 @@ return CO.contract.candidate_zones[difficulty] = new_area CO.reward_tc[difficulty] = new_reward - SStgui.update_uis(C.contractor_uplink.hub) + SStgui.update_uis(H) log_admin("[key_name(usr)] has set [key_name(current)]'s contract location to [new_area] with [new_reward] TC as reward") message_admins("[key_name_admin(usr)] has set [key_name_admin(current)]'s contract location to [new_area] with [new_reward] TC as reward") if("other") - if(!C) + if(!H) return var/datum/syndicate_contract/CO = locateUID(href_list["cuid"]) if(!istype(CO)) @@ -1416,10 +1266,10 @@ message_admins("[key_name_admin(usr)] has deleted [key_name_admin(current)]'s contract") else return - SStgui.update_uis(C.contractor_uplink.hub) + SStgui.update_uis(H) if("interrupt") - if(!C) + if(!H) return var/datum/syndicate_contract/CO = locateUID(href_list["cuid"]) if(!istype(CO) || CO.status != CONTRACT_STATUS_ACTIVE) @@ -1432,7 +1282,7 @@ message_admins("[key_name_admin(usr)] has interrupted [key_name_admin(current)]'s contract") if("fail") - if(!C) + if(!H) return var/datum/syndicate_contract/CO = locateUID(href_list["cuid"]) if(!istype(CO) || CO.status != CONTRACT_STATUS_ACTIVE) @@ -1441,7 +1291,7 @@ if(!fail_reason || CO.status != CONTRACT_STATUS_ACTIVE) return CO.fail(fail_reason) - SStgui.update_uis(C.contractor_uplink.hub) + SStgui.update_uis(H) log_admin("[key_name(usr)] has failed [key_name(current)]'s contract with reason: [fail_reason]") message_admins("[key_name_admin(usr)] has failed [key_name_admin(current)]'s contract with reason: [fail_reason]") @@ -1569,14 +1419,8 @@ else if(href_list["common"]) switch(href_list["common"]) if("undress") - if(ishuman(current)) - var/mob/living/carbon/human/H = current - // Don't "undress" organs right out of the body - for(var/obj/item/W in H.contents - (H.bodyparts | H.internal_organs)) - current.unEquip(W, 1) - else - for(var/obj/item/W in current) - current.unEquip(W, 1) + for(var/obj/item/I in current) + current.unEquip(I, TRUE) log_admin("[key_name(usr)] has unequipped [key_name(current)]") message_admins("[key_name_admin(usr)] has unequipped [key_name_admin(current)]") if("takeuplink") @@ -1865,17 +1709,6 @@ var/obj/effect/proc_holder/spell/S = X S.action.Grant(new_character) -/datum/mind/proc/disrupt_spells(delay, list/exceptions = New()) - for(var/X in spell_list) - var/obj/effect/proc_holder/spell/S = X - for(var/type in exceptions) - if(istype(S, type)) - continue - S.charge_counter = delay - spawn(0) - S.start_recharge() - S.updateButtonIcon() - /datum/mind/proc/get_ghost(even_if_they_cant_reenter) for(var/mob/dead/observer/G in GLOB.dead_mob_list) if(G.mind == src) @@ -1951,18 +1784,6 @@ to_chat(current, "You seem to have forgotten the events of the past 10 minutes or so, and your head aches a bit as if someone beat it savagely with a stick.") to_chat(current, "This means you don't remember who you were working for or what you were doing.") -/datum/mind/proc/is_revivable() //Note, this ONLY checks the mind. - if(damnation_type) - return FALSE - return TRUE - -// returns a mob to message to produce something visible for the target mind -/datum/mind/proc/messageable_mob() - if(!QDELETED(current) && current.client) - return current - else - return get_ghost(even_if_they_cant_reenter = TRUE) - //Initialisation procs /mob/proc/mind_initialize() if(mind) diff --git a/code/datums/outfits/outfit.dm b/code/datums/outfits/outfit.dm index 416c4f9c02d..1c5aba0f171 100644 --- a/code/datums/outfits/outfit.dm +++ b/code/datums/outfits/outfit.dm @@ -44,9 +44,9 @@ /datum/outfit/proc/equip_item(mob/living/carbon/human/H, path, slot) var/obj/item/I = new path(H) if(collect_not_del) - H.equip_or_collect(I, slot) + H.equip_or_collect(I, slot, TRUE) else - H.equip_to_slot_or_del(I, slot) + H.equip_to_slot_or_del(I, slot, TRUE) /datum/outfit/proc/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) //to be overriden for toggling internals, id binding, access etc @@ -115,7 +115,7 @@ H.equip_or_collect(new path(H), slot_in_backpack) for(var/path in cybernetic_implants) - var/obj/item/organ/internal/O = new path(H) + var/obj/item/organ/internal/O = new path O.insert(H) if(!H.head && toggle_helmet && istype(H.wear_suit, /obj/item/clothing/suit/space/hardsuit)) diff --git a/code/datums/outfits/outfit_admin.dm b/code/datums/outfits/outfit_admin.dm index d5be5f50f35..22d61c818ec 100644 --- a/code/datums/outfits/outfit_admin.dm +++ b/code/datums/outfits/outfit_admin.dm @@ -239,9 +239,8 @@ /obj/item/implant/dust ) cybernetic_implants = list( - /obj/item/organ/internal/cyberimp/eyes/shield, /obj/item/organ/internal/cyberimp/eyes/hud/security, - /obj/item/organ/internal/cyberimp/eyes/xray, + /obj/item/organ/internal/eyes/cybernetic/xray, /obj/item/organ/internal/cyberimp/brain/anti_stun/hardened, /obj/item/organ/internal/cyberimp/chest/nutriment/plus, /obj/item/organ/internal/cyberimp/arm/combat/centcom @@ -318,7 +317,7 @@ glasses = /obj/item/clothing/glasses/thermal/monocle id = /obj/item/card/id/syndicate/vox l_pocket = /obj/item/melee/classic_baton/telescopic - r_pocket = /obj/item/tank/emergency_oxygen/vox + r_pocket = /obj/item/tank/internals/emergency_oxygen/double/vox backpack_contents = list( /obj/item/flashlight = 1, /obj/item/restraints/handcuffs/cable/zipties = 1, @@ -484,7 +483,7 @@ shoes = /obj/item/clothing/shoes/black head = /obj/item/clothing/head/xenos glasses = /obj/item/clothing/glasses/thermal - l_pocket = /obj/item/tank/emergency_oxygen/double/full + l_pocket = /obj/item/tank/internals/emergency_oxygen/double r_pocket = /obj/item/toy/toy_xeno backpack_contents = list( /obj/item/storage/box/survival = 1, @@ -734,7 +733,7 @@ mask = /obj/item/clothing/mask/gas/syndicate glasses = /obj/item/clothing/glasses/night id = /obj/item/card/id/syndicate - suit_store = /obj/item/tank/emergency_oxygen/double/full + suit_store = /obj/item/tank/internals/emergency_oxygen/double /datum/outfit/admin/chrono/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() @@ -961,7 +960,7 @@ l_ear = /obj/item/radio/headset/ert glasses = /obj/item/clothing/glasses/meson/cyber id = /obj/item/card/id - suit_store = /obj/item/tank/oxygen + suit_store = /obj/item/tank/internals/oxygen backpack_contents = list( /obj/item/storage/box/survival = 1, /obj/item/flashlight = 1 @@ -1052,7 +1051,7 @@ H.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/raise_vampires) to_chat(H, "You have gained the ability to Raise Vampires. This extremely powerful AOE ability affects all humans near you. Vampires/thralls are healed. Corpses are raised as vampires. Others are stunned, then brain damaged, then killed.") H.dna.SetSEState(GLOB.jumpblock, 1) - genemutcheck(H, GLOB.jumpblock, null, MUTCHK_FORCED) + singlemutcheck(H, GLOB.jumpblock, MUTCHK_FORCED) H.update_mutations() H.gene_stability = 100 diff --git a/code/datums/outfits/plasmamen.dm b/code/datums/outfits/plasmamen.dm index 94206c0ae3a..ed1484852e1 100644 --- a/code/datums/outfits/plasmamen.dm +++ b/code/datums/outfits/plasmamen.dm @@ -3,7 +3,7 @@ head = /obj/item/clothing/head/helmet/space/plasmaman uniform = /obj/item/clothing/under/plasmaman - r_hand = /obj/item/tank/plasma/plasmaman/belt/full + r_hand = /obj/item/tank/internals/plasmaman/belt/full mask = /obj/item/clothing/mask/breath /datum/outfit/plasmaman/bar @@ -182,3 +182,8 @@ head = /obj/item/clothing/head/helmet/space/plasmaman/wizard uniform = /obj/item/clothing/under/plasmaman/wizard + +/datum/outfit/plasmaman/assistant + name = "Assistant Plasmaman" + head = /obj/item/clothing/head/helmet/space/plasmaman/assistant + uniform = /obj/item/clothing/under/plasmaman/assistant diff --git a/code/datums/outfits/vv_outfit.dm b/code/datums/outfits/vv_outfit.dm index 95c91318bb8..a8162a04dec 100644 --- a/code/datums/outfits/vv_outfit.dm +++ b/code/datums/outfits/vv_outfit.dm @@ -125,9 +125,9 @@ // Copy cybernetic implants O.cybernetic_implants = list() - for(var/obj/item/organ/internal/CI in contents) - if(istype(CI)) - O.cybernetic_implants |= CI.type + for(var/org in internal_organs) + var/obj/item/organ/internal/aug = org + O.cybernetic_implants |= aug.type // Copy accessories var/obj/item/clothing/under/uniform_slot = get_item_by_slot(slot_w_uniform) diff --git a/code/datums/pipe_datums.dm b/code/datums/pipe_datums.dm index 8d3b0807f9c..8fd243850b3 100644 --- a/code/datums/pipe_datums.dm +++ b/code/datums/pipe_datums.dm @@ -370,13 +370,13 @@ GLOBAL_LIST_EMPTY(rpd_pipe_list) //Some pipes we don't want to be dispensable pipe_id = PIPE_DISPOSALS_JUNCTION_LEFT pipe_icon = "pipe-j2" -/proc/get_pipe_name(var/pipe_id, var/pipe_type) +/proc/get_pipe_name(pipe_id, pipe_type) for(var/datum/pipes/P in GLOB.construction_pipe_list) if(P.pipe_id == pipe_id && P.pipe_type == pipe_type) return P.pipe_name return "unknown pipe" -/proc/get_pipe_icon(var/pipe_id) +/proc/get_pipe_icon(pipe_id) for(var/datum/pipes/P in GLOB.construction_pipe_list) if(P.pipe_id == pipe_id) return P.pipe_icon diff --git a/code/datums/radiation_wave.dm b/code/datums/radiation_wave.dm new file mode 100644 index 00000000000..0c6f32c4555 --- /dev/null +++ b/code/datums/radiation_wave.dm @@ -0,0 +1,139 @@ +/datum/radiation_wave + /// The thing that spawned this radiation wave + var/source + /// The center of the wave + var/turf/master_turf + /// How far we've moved + var/steps = 0 + /// How strong it was originaly + var/intensity + /// How much contaminated material it still has + var/remaining_contam + /// Higher than 1 makes it drop off faster, 0.5 makes it drop off half etc + var/range_modifier + /// The direction of movement + var/move_dir + /// The directions to the side of the wave, stored for easy looping + var/list/__dirs + /// Whether or not this radiation wave can create contaminated objects + var/can_contaminate + +/datum/radiation_wave/New(atom/_source, dir, _intensity = 0, _range_modifier = RAD_DISTANCE_COEFFICIENT, _can_contaminate = TRUE) + + source = "[_source] \[[_source.UID()]\]" + + master_turf = get_turf(_source) + + move_dir = dir + __dirs = list() + __dirs += turn(dir, 90) + __dirs += turn(dir, -90) + + intensity = _intensity + remaining_contam = intensity + range_modifier = _range_modifier + can_contaminate = _can_contaminate + + START_PROCESSING(SSradiation, src) + +/datum/radiation_wave/Destroy() + . = QDEL_HINT_IWILLGC + STOP_PROCESSING(SSradiation, src) + ..() + +/datum/radiation_wave/process() + master_turf = get_step(master_turf, move_dir) + if(!master_turf) + qdel(src) + return + steps++ + var/list/atoms = get_rad_atoms() + + var/strength + if(steps > 1) + strength = INVERSE_SQUARE(intensity, max(range_modifier * steps, 1), 1) + else + strength = intensity + + if(strength < RAD_BACKGROUND_RADIATION) + qdel(src) + return + radiate(atoms, strength) + check_obstructions(atoms) // reduce our overall strength if there are radiation insulators + +/datum/radiation_wave/proc/get_rad_atoms() + var/list/atoms = list() + var/distance = steps + var/cmove_dir = move_dir + var/cmaster_turf = master_turf + + if(cmove_dir == NORTH || cmove_dir == SOUTH) + distance-- //otherwise corners overlap + + atoms += get_rad_contents(cmaster_turf) + + var/turf/place + for(var/dir in __dirs) //There should be just 2 dirs in here, left and right of the direction of movement + place = cmaster_turf + for(var/i in 1 to distance) + place = get_step(place, dir) + if(!place) + break + atoms += get_rad_contents(place) + + return atoms + +/datum/radiation_wave/proc/check_obstructions(list/atoms) + var/width = steps + var/cmove_dir = move_dir + if(cmove_dir == NORTH || cmove_dir == SOUTH) + width-- + width = 1 + (2 * width) + + for(var/k in 1 to atoms.len) + var/atom/thing = atoms[k] + if(!thing) + continue + if(SEND_SIGNAL(thing, COMSIG_ATOM_RAD_WAVE_PASSING, src, width) & COMPONENT_RAD_WAVE_HANDLED) + continue + if(thing.rad_insulation != RAD_NO_INSULATION) + intensity *= (1 - ((1 - thing.rad_insulation) / width)) + +/datum/radiation_wave/proc/radiate(list/atoms, strength) + var/can_contam = strength >= RAD_MINIMUM_CONTAMINATION + var/contamination_strength = (strength - RAD_MINIMUM_CONTAMINATION) * RAD_CONTAMINATION_STR_COEFFICIENT + contamination_strength = max(contamination_strength, RAD_BACKGROUND_RADIATION) + // It'll never reach 100% chance but the further out it gets the more likely it'll contaminate + var/contamination_chance = 100 - (90 / (1 + steps * 0.1)) + for(var/k in atoms) + var/atom/thing = k + if(QDELETED(thing)) + continue + thing.rad_act(strength) + + // This list should only be for types which don't get contaminated but you want to look in their contents + // If you don't want to look in their contents and you don't want to rad_act them: + // modify the ignored_things list in __HELPERS/radiation.dm instead + var/static/list/blacklisted = typecacheof(list( + /turf, + /obj/structure/cable, + /obj/machinery/atmospherics, + /obj/item/ammo_casing, + /obj/item/implant, + /obj/singularity, + )) + if(!can_contaminate || !can_contam || blacklisted[thing.type]) + continue + if(thing.flags_2 & RAD_NO_CONTAMINATE_2 || SEND_SIGNAL(thing, COMSIG_ATOM_RAD_CONTAMINATING, strength) & COMPONENT_BLOCK_CONTAMINATION) + continue + + if(contamination_strength > remaining_contam) + contamination_strength = remaining_contam + if(!prob(contamination_chance)) + continue + if(SEND_SIGNAL(thing, COMSIG_ATOM_RAD_CONTAMINATING, strength) & COMPONENT_BLOCK_CONTAMINATION) + continue + remaining_contam -= contamination_strength + if(remaining_contam < RAD_BACKGROUND_RADIATION) + can_contaminate = FALSE + thing.AddComponent(/datum/component/radioactive, contamination_strength, source) diff --git a/code/datums/radio.dm b/code/datums/radio.dm index efeebc7c973..79890350f20 100644 --- a/code/datums/radio.dm +++ b/code/datums/radio.dm @@ -3,7 +3,7 @@ var/frequency as num var/list/obj/devices = list() -/datum/radio_frequency/proc/post_signal(obj/source as obj|null, datum/signal/signal, var/filter = null as text|null, var/range = null as num|null) +/datum/radio_frequency/proc/post_signal(obj/source as obj|null, datum/signal/signal, filter = null as text|null, range = null as num|null) var/turf/start_point if(range) start_point = get_turf(source) @@ -19,7 +19,7 @@ send_to_filter(source, signal, next_filter, start_point, range) //Sends a signal to all machines belonging to a given filter. Should be called by post_signal() -/datum/radio_frequency/proc/send_to_filter(obj/source, datum/signal/signal, var/filter, var/turf/start_point = null, var/range = null) +/datum/radio_frequency/proc/send_to_filter(obj/source, datum/signal/signal, filter, turf/start_point = null, range = null) if(range && !start_point) return @@ -35,7 +35,7 @@ device.receive_signal(signal, TRANSMISSION_RADIO, frequency) -/datum/radio_frequency/proc/add_listener(obj/device as obj, var/filter as text|null) +/datum/radio_frequency/proc/add_listener(obj/device as obj, filter as text|null) if(!filter) filter = RADIO_DEFAULT //log_admin("add_listener(device=[device],filter=[filter]) frequency=[frequency]") diff --git a/code/datums/revision.dm b/code/datums/revision.dm index 50c616fc94f..d1cb3ff0619 100644 --- a/code/datums/revision.dm +++ b/code/datums/revision.dm @@ -11,12 +11,26 @@ GLOBAL_PROTECT(revision_info) // Dont mess with this var/commit_hash /// Date that this commit was made var/commit_date + /// Origin commit (Only set if running TGS, and will only be different if the server is running testmerges) + var/origin_commit + /// List of testmerges (If applicable) + var/list/testmerges = list() +// Pull info from the rust DLL /datum/code_revision/New() commit_hash = rustg_git_revparse("HEAD") if(commit_hash) commit_date = rustg_git_commit_date(commit_hash) +// Pull info from TGS +/datum/code_revision/proc/load_tgs_info() + testmerges = world.TgsTestMerges() + var/datum/tgs_revision_information/revinfo = world.TgsRevision() + if(revinfo) + commit_hash = revinfo.commit + origin_commit = revinfo.origin_commit + commit_date = revinfo.timestamp + /** * Code Revision Logging Helper * @@ -24,17 +38,50 @@ GLOBAL_PROTECT(revision_info) // Dont mess with this */ /datum/code_revision/proc/log_info() // Put revision info in the world log - var/logmsg + var/list/logmsgs = list() if(commit_hash && commit_date) - logmsg = "Running ParaCode commit: [commit_hash] (Date: [commit_date])" + logmsgs += "Running ParaCode commit: [commit_hash] (Date: [commit_date])" else - logmsg = "Unable to determine revision info! Code may not be running in a git repository." + logmsgs += "Unable to determine revision info! Code may not be running in a git repository." + + // Check if we were on TGS + if(world.TgsAvailable()) + if(origin_commit && (commit_hash != origin_commit)) // Commits are different, theres likely a testmerge + logmsgs += "Origin commit: [origin_commit]" + if(length(testmerges)) + logmsgs += "The following PRs are testmerged:" + for(var/pr in testmerges) + var/datum/tgs_revision_information/test_merge/tm = pr + logmsgs += "PR #[tm.number] at commit [tm.head_commit]" + // Log these in blackbox so they can be attributed to round IDs easier in the future + SSblackbox.record_feedback("associative", "testmerged_prs", 1, list("number" = "[tm.number]", "commit" = "[tm.head_commit]", "title" = "[tm.title]", "author" = "[tm.author]")) + + var/logmsg = logmsgs.Join("\n") // Log it in all these log_world(logmsg) log_runtime_txt(logmsg) log_runtime_summary(logmsg) + +/** + * Testmerge Chat Message Helper + * + * Formats testmerged PRs into a nice message + * Arguments: + * * header - Should a header be sent too + */ +/datum/code_revision/proc/get_testmerge_chatmessage(header = FALSE) + var/list/msg = list() + if(header) + msg += "The following PRs are currently testmerged:" + + for(var/pr in GLOB.revision_info.testmerges) + var/datum/tgs_revision_information/test_merge/tm = pr + msg += "- PR #[tm.number] - [tm.title]" + + return msg.Join("
") + /client/verb/get_revision_info() set name = "Get Revision Info" set category = "OOC" @@ -48,9 +95,14 @@ GLOBAL_PROTECT(revision_info) // Dont mess with this // Commit info if(GLOB.revision_info.commit_hash && GLOB.revision_info.commit_date) msg += "Server Commit:[GLOB.revision_info.commit_hash] (Date: [GLOB.revision_info.commit_date])" + if(GLOB.revision_info.origin_commit && (GLOB.revision_info.commit_hash != GLOB.revision_info.origin_commit)) + msg += "Origin Commit:[GLOB.revision_info.origin_commit]" else msg += "Server Commit:Unable to determine" + if(world.TgsAvailable() && length(GLOB.revision_info.testmerges)) + msg += "Active Testmerges:" + msg += GLOB.revision_info.get_testmerge_chatmessage(FALSE) // Show server BYOND version msg += "Server BYOND Version: [world.byond_version].[world.byond_build]" diff --git a/code/datums/ruins/lavaland.dm b/code/datums/ruins/lavaland.dm index 2143fb5ad5c..5110058674a 100644 --- a/code/datums/ruins/lavaland.dm +++ b/code/datums/ruins/lavaland.dm @@ -51,14 +51,6 @@ cost = 20 allow_duplicates = FALSE -/datum/map_template/ruin/lavaland/syndicate_base - name = "Syndicate Lava Base" - id = "lava-base" - description = "A secret base researching illegal bioweapons, it is closely guarded by an elite team of syndicate agents." - suffix = "lavaland_surface_syndicate_base1.dmm" - cost = 20 - allow_duplicates = FALSE - /datum/map_template/ruin/lavaland/free_golem name = "Free Golem Ship" id = "golem-ship" diff --git a/code/datums/ruins/space.dm b/code/datums/ruins/space.dm index c11eed424da..d05b932b5cc 100644 --- a/code/datums/ruins/space.dm +++ b/code/datums/ruins/space.dm @@ -258,6 +258,15 @@ always_place = TRUE cost = 0 +/datum/map_template/ruin/space/syndicate_space_base + name = "Syndicate Space Base" + id = "syndie-space-base" + description = "A secret base researching illegal bioweapons, it is closely guarded by an elite team of syndicate agents." + suffix = "syndie_space_base.dmm" + cost = 0 + always_place = TRUE + allow_duplicates = FALSE + /datum/map_template/ruin/space/syndiecakesfactory id = "Syndiecakes Factory" suffix = "syndiecakesfactory.dmm" diff --git a/code/datums/soullink.dm b/code/datums/soullink.dm deleted file mode 100644 index f5727f1d0d0..00000000000 --- a/code/datums/soullink.dm +++ /dev/null @@ -1,166 +0,0 @@ -/mob/living - var/list/ownedSoullinks //soullinks we are the owner of - var/list/sharedSoullinks //soullinks we are a/the sharer of - -/mob/living/Destroy() - for(var/s in ownedSoullinks) - var/datum/soullink/S = s - S.ownerDies(FALSE) - qdel(s) //If the owner is destroy()'d, the soullink is destroy()'d - ownedSoullinks = null - for(var/s in sharedSoullinks) - var/datum/soullink/S = s - S.sharerDies(FALSE) - S.removeSoulsharer(src) //If a sharer is destroy()'d, they are simply removed - sharedSoullinks = null - return ..() - -//Keeps track of a Mob->Mob (potentially Player->Player) connection -//Can be used to trigger actions on one party when events happen to another -//Eg: shared deaths -//Can be used to form a linked list of mob-hopping -//Does NOT transfer with minds -/datum/soullink - var/mob/living/soulowner - var/mob/living/soulsharer - var/id //Optional ID, for tagging and finding specific instances - -/datum/soullink/Destroy() - if(soulowner) - LAZYREMOVE(soulowner.ownedSoullinks, src) - soulowner = null - if(soulsharer) - LAZYREMOVE(soulsharer.sharedSoullinks, src) - soulsharer = null - return ..() - -/datum/soullink/proc/removeSoulsharer(mob/living/sharer) - if(soulsharer == sharer) - soulsharer = null - LAZYREMOVE(sharer.sharedSoullinks, src) - -//Used to assign variables, called primarily by soullink() -//Override this to create more unique soullinks (Eg: 1->Many relationships) -//Return TRUE/FALSE to return the soullink/null in soullink() -/datum/soullink/proc/parseArgs(mob/living/owner, mob/living/sharer) - if(!owner || !sharer) - return FALSE - soulowner = owner - soulsharer = sharer - LAZYADD(owner.ownedSoullinks, src) - LAZYADD(sharer.sharedSoullinks, src) - return TRUE - -//Runs after /living death() -//Override this for content -/datum/soullink/proc/ownerDies(gibbed, mob/living/owner) - -//Runs after /living death() -//Override this for content -/datum/soullink/proc/sharerDies(gibbed, mob/living/owner) - -//Runs after /living update_revive() -//Override this for content -/datum/soullink/proc/ownerRevives(mob/living/owner) - -//Runs after /living update_revive() -//Override this for content -/datum/soullink/proc/sharerRevives(mob/living/owner) - -//Quick-use helper -/proc/soullink(typepath, ...) - var/datum/soullink/S = new typepath() - if(S.parseArgs(arglist(args.Copy(2, 0)))) - return S - - - -///////////////// -// MULTISHARER // -///////////////// -//Abstract soullink for use with 1 Owner -> Many Sharer setups -/datum/soullink/multisharer - var/list/soulsharers - -/datum/soullink/multisharer/parseArgs(mob/living/owner, list/sharers) - if(!owner || !LAZYLEN(sharers)) - return FALSE - soulowner = owner - soulsharers = sharers - LAZYADD(owner.ownedSoullinks, src) - for(var/l in sharers) - var/mob/living/L = l - LAZYADD(L.sharedSoullinks, src) - return TRUE - -/datum/soullink/multisharer/removeSoulsharer(mob/living/sharer) - LAZYREMOVE(soulsharers, sharer) - - - -///////////////// -// SHARED FATE // -///////////////// -//When the soulowner dies, the soulsharer dies, and vice versa -//This is intended for two players(or AI) and two mobs - -/datum/soullink/sharedfate/ownerDies(gibbed, mob/living/owner) - if(soulsharer) - soulsharer.death(gibbed) - -/datum/soullink/sharedfate/sharerDies(gibbed, mob/living/sharer) - if(soulowner) - soulowner.death(gibbed) - -///////////////// -// Demon Bind // -///////////////// -//When the soulowner dies, the soulsharer dies, but NOT vice versa -//This is intended for two players(or AI) and two mobs - -/datum/soullink/oneway/ownerDies(gibbed, mob/living/owner) - if(soulsharer) - soulsharer.dust(FALSE) - -/datum/soullink/oneway/devilfriend - -///////////////// -// SHARED BODY // -///////////////// -//When the soulsharer dies, they're placed in the soulowner, who remains alive -//If the soulowner dies, the soulsharer is killed and placed into the soulowner (who is still dying) -//This one is intended for one player moving between many mobs - -/datum/soullink/sharedbody/ownerDies(gibbed, mob/living/owner) - if(soulowner && soulsharer) - if(soulsharer.mind) - soulsharer.mind.transfer_to(soulowner) - soulsharer.death(gibbed) - -/datum/soullink/sharedbody/sharerDies(gibbed, mob/living/sharer) - if(soulowner && soulsharer && soulsharer.mind) - soulsharer.mind.transfer_to(soulowner) - - - -////////////////////// -// REPLACEMENT POOL // -////////////////////// -//When the owner dies, one of the sharers is placed in the owner's body, fully healed -//Sort of a "winner-stays-on" soullink -//Gibbing ends it immediately - -/datum/soullink/multisharer/replacementpool/ownerDies(gibbed, mob/living/owner) - if(LAZYLEN(soulsharers) && !gibbed) //let's not put them in some gibs - var/list/souls = shuffle(soulsharers.Copy()) - for(var/l in souls) - var/mob/living/L = l - if(L.stat != DEAD && L.mind) - L.mind.transfer_to(soulowner) - soulowner.revive(TRUE, TRUE) - L.death(FALSE) - -//Lose your claim to the throne! -/datum/soullink/multisharer/replacementpool/sharerDies(gibbed, mob/living/sharer) - removeSoulsharer(sharer) - diff --git a/code/datums/spell.dm b/code/datums/spell.dm index eab723fa329..db668cd609a 100644 --- a/code/datums/spell.dm +++ b/code/datums/spell.dm @@ -38,7 +38,7 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell)) spell.remove_ranged_ability(spell.ranged_ability_user) return ..() -/obj/effect/proc_holder/proc/add_ranged_ability(mob/user, var/msg) +/obj/effect/proc_holder/proc/add_ranged_ability(mob/user, msg) if(!user || !user.client) return if(user.ranged_ability && user.ranged_ability != src) @@ -61,7 +61,7 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell)) if(C && ranged_mousepointer && C.mouse_pointer_icon == ranged_mousepointer) C.mouse_pointer_icon = initial(C.mouse_pointer_icon) -/obj/effect/proc_holder/proc/remove_ranged_ability(mob/user, var/msg) +/obj/effect/proc_holder/proc/remove_ranged_ability(mob/user, msg) if(!user || (user.ranged_ability && user.ranged_ability != src)) //To avoid removing the wrong ability return user.ranged_ability = null @@ -120,7 +120,7 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell)) var/smoke_amt = 0 //cropped at 10 var/critfailchance = 0 - var/centcom_cancast = 1 //Whether or not the spell should be allowed on z2 + var/centcom_cancast = TRUE //Whether or not the spell should be allowed on the admin zlevel var/datum/action/spell_action/action = null var/action_icon = 'icons/mob/actions/actions.dmi' diff --git a/code/datums/spells/area_teleport.dm b/code/datums/spells/area_teleport.dm index 5986da3a412..b931bd9840f 100644 --- a/code/datums/spells/area_teleport.dm +++ b/code/datums/spells/area_teleport.dm @@ -11,7 +11,7 @@ /obj/effect/proc_holder/spell/targeted/area_teleport/perform(list/targets, recharge = 1, mob/living/user = usr) var/thearea = before_cast(targets) - if(!thearea || !cast_check(TRUE, FALSE, user)) + if(!thearea || !cast_check(FALSE, FALSE, user)) revert_cast() return invocation(thearea) diff --git a/code/datums/spells/banana_touch.dm b/code/datums/spells/banana_touch.dm index e8b7f27b0da..ae2d1d69161 100644 --- a/code/datums/spells/banana_touch.dm +++ b/code/datums/spells/banana_touch.dm @@ -57,8 +57,8 @@ equip_to_slot_if_possible(new /obj/item/clothing/mask/gas/clown_hat/nodrop, slot_wear_mask, TRUE, TRUE) dna.SetSEState(GLOB.clumsyblock, TRUE, TRUE) dna.SetSEState(GLOB.comicblock, TRUE, TRUE) - genemutcheck(src, GLOB.clumsyblock, null, MUTCHK_FORCED) - genemutcheck(src, GLOB.comicblock, null, MUTCHK_FORCED) + singlemutcheck(src, GLOB.clumsyblock, MUTCHK_FORCED) + singlemutcheck(src, GLOB.comicblock, MUTCHK_FORCED) if(!(iswizard(src) || (mind && mind.special_role == SPECIAL_ROLE_WIZARD_APPRENTICE))) //Mutations are permanent on non-wizards. Can still be removed by genetics fuckery but not mutadone. dna.default_blocks.Add(GLOB.clumsyblock) dna.default_blocks.Add(GLOB.comicblock) diff --git a/code/datums/spells/cluwne.dm b/code/datums/spells/cluwne.dm index 19a12055fef..5a3b7b5da58 100644 --- a/code/datums/spells/cluwne.dm +++ b/code/datums/spells/cluwne.dm @@ -26,9 +26,8 @@ var/obj/item/organ/internal/honktumor/cursed/tumor = new tumor.insert(src) - mutations.Add(NERVOUS) dna.SetSEState(GLOB.nervousblock, 1, 1) - genemutcheck(src, GLOB.nervousblock, null, MUTCHK_FORCED) + singlemutcheck(src, GLOB.nervousblock, MUTCHK_FORCED) rename_character(real_name, "cluwne") unEquip(w_uniform, 1) @@ -55,15 +54,12 @@ if(tumor) tumor.remove(src) else - mutations.Remove(CLUMSY) - mutations.Remove(GLOB.comicblock) - dna.SetSEState(GLOB.clumsyblock,0) - dna.SetSEState(GLOB.comicblock,0) - genemutcheck(src, GLOB.clumsyblock, null, MUTCHK_FORCED) - genemutcheck(src, GLOB.comicblock, null, MUTCHK_FORCED) - mutations.Remove(NERVOUS) - dna.SetSEState(GLOB.nervousblock, 0) - genemutcheck(src, GLOB.nervousblock, null, MUTCHK_FORCED) + dna.SetSEState(GLOB.clumsyblock, FALSE) + dna.SetSEState(GLOB.comicblock, FALSE) + singlemutcheck(src, GLOB.clumsyblock, MUTCHK_FORCED) + singlemutcheck(src, GLOB.comicblock, MUTCHK_FORCED) + dna.SetSEState(GLOB.nervousblock, FALSE) + singlemutcheck(src, GLOB.nervousblock, MUTCHK_FORCED) var/obj/item/clothing/under/U = w_uniform unEquip(w_uniform, 1) diff --git a/code/datums/spells/conjure.dm b/code/datums/spells/conjure.dm index 306ec8b9987..be716536aff 100644 --- a/code/datums/spells/conjure.dm +++ b/code/datums/spells/conjure.dm @@ -13,7 +13,7 @@ var/list/newVars = list() //vars of the summoned objects will be replaced with those where they meet //should have format of list("emagged" = 1,"name" = "Wizard's Justicebot"), for example var/delay = 1//Go Go Gadget Inheritance - + var/cast_sound = 'sound/items/welder.ogg' /obj/effect/proc_holder/spell/aoe_turf/conjure/cast(list/targets,mob/living/user = usr) @@ -32,9 +32,6 @@ if(summon_ignore_prev_spawn_points) targets -= spawn_place if(ispath(summoned_object_type,/turf)) - if(istype(get_turf(user),/turf/simulated/shuttle)) - to_chat(user, "You can't build things on shuttles!") - break var/turf/O = spawn_place var/N = summoned_object_type O.ChangeTurf(N) @@ -47,9 +44,7 @@ summoned_object.admin_spawned = TRUE if(summon_lifespan) - spawn(summon_lifespan) - if(summoned_object) - qdel(summoned_object) + QDEL_IN(summoned_object, summon_lifespan) else switch(charge_type) if("recharge") diff --git a/code/datums/spells/devil.dm b/code/datums/spells/devil.dm deleted file mode 100644 index f9e075bdf81..00000000000 --- a/code/datums/spells/devil.dm +++ /dev/null @@ -1,248 +0,0 @@ -/obj/effect/proc_holder/spell/targeted/conjure_item/pitchfork - name = "Summon Pitchfork" - desc = "A devil's weapon of choice. Use this to summon/unsummon your pitchfork." - item_type = /obj/item/twohanded/pitchfork/demonic - action_icon_state = "pitchfork" - action_background_icon_state = "bg_demon" - -/obj/effect/proc_holder/spell/targeted/conjure_item/pitchfork/greater - item_type = /obj/item/twohanded/pitchfork/demonic/greater - -/obj/effect/proc_holder/spell/targeted/conjure_item/pitchfork/ascended - item_type = /obj/item/twohanded/pitchfork/demonic/ascended - -/obj/effect/proc_holder/spell/targeted/conjure_item/violin - item_type = /obj/item/instrument/violin/golden - desc = "A devil's instrument of choice. Use this to summon/unsummon your golden violin." - invocation_type = "whisper" - invocation = "I ain't have this much fun since Georgia." - action_icon_state = "golden_violin" - name = "Summon golden violin" - action_background_icon_state = "bg_demon" - - -/obj/effect/proc_holder/spell/targeted/click/summon_contract - name = "Summon infernal contract" - desc = "Skip making a contract by hand, just do it by magic." - invocation_type = "whisper" - invocation = "Just sign on the dotted line." - selection_activated_message = "You prepare a detailed contract. Click on a target to summon the contract in his hands." - selection_deactivated_message = "You archive the contract for later use." - include_user = FALSE - range = 5 - auto_target_single = FALSE // Prevent an accidental contract from summoning - click_radius = -1 // Precision clicking required - allowed_type = /mob/living/carbon - clothes_req = FALSE - school = "conjuration" - charge_max = 150 - cooldown_min = 10 - action_icon_state = "spell_default" - action_background_icon_state = "bg_demon" - -/obj/effect/proc_holder/spell/targeted/click/summon_contract/cast(list/targets, mob/user = usr) - for(var/target in targets) - var/mob/living/carbon/C = target - if(C.mind && user.mind) - if(C.stat == DEAD) - if(user.drop_item()) - var/obj/item/paper/contract/infernal/revive/contract = new(user.loc, C.mind, user.mind) - user.put_in_hands(contract) - else - var/obj/item/paper/contract/infernal/contract - var/contractTypeName = input(user, "What type of contract?") in list (CONTRACT_POWER, CONTRACT_WEALTH, CONTRACT_PRESTIGE, CONTRACT_MAGIC, CONTRACT_KNOWLEDGE, CONTRACT_FRIENDSHIP) //TODO: Refactor this to be less boilerplate-y - switch(contractTypeName) - if(CONTRACT_POWER) - contract = new /obj/item/paper/contract/infernal/power(C.loc, C.mind, user.mind) - if(CONTRACT_WEALTH) - contract = new /obj/item/paper/contract/infernal/wealth(C.loc, C.mind, user.mind) - if(CONTRACT_PRESTIGE) - contract = new /obj/item/paper/contract/infernal/prestige(C.loc, C.mind, user.mind) - if(CONTRACT_MAGIC) - contract = new /obj/item/paper/contract/infernal/magic(C.loc, C.mind, user.mind) - if(CONTRACT_KNOWLEDGE) - contract = new /obj/item/paper/contract/infernal/knowledge(C.loc, C.mind, user.mind) - if(CONTRACT_FRIENDSHIP) - contract = new /obj/item/paper/contract/infernal/friendship(C.loc, C.mind, user.mind) - C.put_in_hands(contract) - else - to_chat(user,"[C] seems to not be sentient. You are unable to summon a contract for them.") - - -/obj/effect/proc_holder/spell/targeted/click/fireball/hellish - name = "Hellfire" - desc = "This spell launches hellfire at the target." - school = "evocation" - charge_max = 80 - clothes_req = FALSE - invocation = "Your very soul will catch fire!" - invocation_type = "shout" - fireball_type = /obj/item/projectile/magic/fireball/infernal - action_background_icon_state = "bg_demon" - -/obj/effect/proc_holder/spell/targeted/click/fireball/hellish/cast(list/targets, mob/living/user = usr) - add_attack_logs(user, targets, "has fired a Hellfire ball", ATKLOG_FEW) - .=..() - - -/obj/effect/proc_holder/spell/targeted/infernal_jaunt - name = "Infernal Jaunt" - desc = "Use hellfire to phase out of existence." - charge_max = 200 - clothes_req = FALSE - selection_type = "range" - range = -1 - cooldown_min = 0 - overlay = null - include_user = TRUE - action_icon_state = "jaunt" - action_background_icon_state = "bg_demon" - -/obj/effect/proc_holder/spell/targeted/infernal_jaunt/cast(list/targets, mob/living/user = usr) - if(istype(user)) - if(istype(user.loc, /obj/effect/dummy/slaughter)) - var/continuing = 0 - if(istype(get_area(user), /area/shuttle)) // Can always phase in in a shuttle. - continuing = TRUE - else - for(var/mob/living/C in orange(2, get_turf(user.loc))) //Can also phase in when nearby a potential buyer. - if (C.mind && C.mind.soulOwner == C.mind) - continuing = TRUE - break - if(continuing) - to_chat(user,"You are now phasing in.") - if(do_mob(user,user,150)) - user.infernalphasein() - else - to_chat(user,"You can only re-appear near a potential signer or on a shuttle.") - revert_cast() - return ..() - else - user.notransform = TRUE - user.fakefire() - to_chat(user,"You begin to phase back into sinful flames.") - if(do_mob(user,user,150)) - user.infernalphaseout() - else - to_chat(user,"You must remain still while exiting.") - user.ExtinguishMob() - start_recharge() - return - revert_cast() - - -/mob/living/proc/infernalphaseout() - dust_animation() - visible_message("[src] disappears in a flashfire!") - playsound(get_turf(src), 'sound/misc/enter_blood.ogg', 100, 1, -1) - var/obj/effect/dummy/slaughter/s_holder = new(loc) - ExtinguishMob() - forceMove(s_holder) - holder = s_holder - notransform = FALSE - fakefireextinguish() - -/mob/living/proc/infernalphasein() - if(notransform) - to_chat(src,"You're too busy to jaunt in.") - return 0 - fakefire() - forceMove(get_turf(src)) - visible_message("[src] appears in a firey blaze!") - playsound(get_turf(src), 'sound/misc/exit_blood.ogg', 100, 1, -1) - spawn(15) - fakefireextinguish(TRUE) - -/obj/effect/proc_holder/spell/targeted/sintouch - name = "Sin Touch" - desc = "Subtly encourage someone to sin." - charge_max = 1800 - clothes_req = FALSE - selection_type = "range" - range = 2 - cooldown_min = 0 - overlay = null - include_user = FALSE - action_icon_state = "sintouch" - action_background_icon_state = "bg_demon" - random_target = TRUE - random_target_priority = TARGET_RANDOM - max_targets = 3 - invocation = "TASTE SIN AND INDULGE!!" - invocation_type = "shout" - -/obj/effect/proc_holder/spell/targeted/sintouch/ascended - name = "Greater sin touch" - charge_max = 100 - range = 7 - max_targets = 10 - -/obj/effect/proc_holder/spell/targeted/sintouch/cast(list/targets, mob/living/user = usr) - for(var/mob/living/carbon/human/H in targets) - if(!H.mind) - continue - for(var/datum/objective/sintouched/A in H.mind.objectives) - continue - H.influenceSin() - H.Weaken(2) - H.Stun(2) - -/obj/effect/proc_holder/spell/targeted/summon_dancefloor - name = "Summon Dancefloor" - desc = "When what a Devil really needs is funk." - include_user = TRUE - range = -1 - clothes_req = FALSE - - school = "conjuration" - charge_max = 10 - cooldown_min = 50 //5 seconds, so the smoke can't be spammed - action_icon_state = "funk" - action_background_icon_state = "bg_demon" - - var/list/dancefloor_turfs - var/list/dancefloor_turfs_types - var/dancefloor_exists = FALSE -// var/datum/effect_system/smoke_spread/transparent/dancefloor_devil/smoke - - -/obj/effect/proc_holder/spell/targeted/summon_dancefloor/cast(list/targets, mob/user = usr) - LAZYINITLIST(dancefloor_turfs) - LAZYINITLIST(dancefloor_turfs_types) - -/* - if(!smoke) - smoke = new() - smoke.set_up(0, get_turf(user)) - smoke.start() -*/ - - if(dancefloor_exists) - dancefloor_exists = FALSE - for(var/i in 1 to dancefloor_turfs.len) - var/turf/T = dancefloor_turfs[i] - T.ChangeTurf(dancefloor_turfs_types[i]) - else - var/list/funky_turfs = RANGE_TURFS(1, user) - for(var/turf/T in funky_turfs) - if(T.density) - to_chat(user, "You're too close to a wall.") - return - dancefloor_exists = TRUE - var/i = 1 - dancefloor_turfs.len = funky_turfs.len - dancefloor_turfs_types.len = funky_turfs.len - for(var/t in funky_turfs) - var/turf/T = t - dancefloor_turfs[i] = T - dancefloor_turfs_types[i] = T.type - T.ChangeTurf((i % 2 == 0) ? /turf/simulated/floor/light/colour_cycle/dancefloor_a : /turf/simulated/floor/light/colour_cycle/dancefloor_b) - i++ - -/* -/datum/effect_system/smoke_spread/transparent/dancefloor_devil - effect_type = /obj/effect/particle_effect/smoke/transparent/dancefloor_devil - -/obj/effect/particle_effect/smoke/transparent/dancefloor_devil - lifetime = 2 -*/ diff --git a/code/datums/spells/devil_boons.dm b/code/datums/spells/devil_boons.dm deleted file mode 100644 index 5746fd9c2d2..00000000000 --- a/code/datums/spells/devil_boons.dm +++ /dev/null @@ -1,73 +0,0 @@ -/obj/effect/proc_holder/spell/targeted/summon_wealth - name = "Summon wealth" - desc = "The reward for selling your soul." - invocation_type = "none" - include_user = 1 - range = -1 - clothes_req = 0 - school = "conjuration" - charge_max = 100 - cooldown_min = 10 - action_icon_state = "moneybag" - - -/obj/effect/proc_holder/spell/targeted/summon_wealth/cast(list/targets, mob/user = usr) - for(var/mob/living/carbon/C in targets) - if(user.drop_item()) - var/obj/item = pick( - new /obj/item/coin/gold(user.loc), - new /obj/item/coin/diamond(user.loc), - new /obj/item/coin/silver(user.loc), - new /obj/item/stack/sheet/mineral/gold(user.loc), - new /obj/item/stack/sheet/mineral/silver(user.loc), - new /obj/item/stack/sheet/mineral/diamond(user.loc), - new /obj/item/stack/spacecash/c1000(user.loc)) - C.put_in_hands(item) - -/obj/effect/proc_holder/spell/targeted/view_range - name = "Distant vision" - desc = "The reward for selling your soul." - invocation_type = "none" - include_user = 1 - range = -1 - clothes_req = 0 - charge_max = 50 - cooldown_min = 10 - action_icon_state = "camera_jump" - var/ranges = list(7,8,9,10/*,11,12*/) - -/obj/effect/proc_holder/spell/targeted/view_range/cast(list/targets, mob/user = usr) - for(var/mob/C in targets) - if(!C.client) - continue - C.client.view = input("Select view range:", "Range", 4) in ranges - -/obj/effect/proc_holder/spell/targeted/summon_friend - name = "Summon Friend" - desc = "The reward for selling your soul." - invocation_type = "none" - include_user = 1 - range = -1 - clothes_req = 0 - charge_max = 50 - cooldown_min = 10 - action_icon_state = "sacredflame" - var/mob/living/friend - var/obj/effect/mob_spawn/human/demonic_friend/friendShell - -/obj/effect/proc_holder/spell/targeted/summon_friend/cast(list/targets, mob/user = usr) - if(!QDELETED(friend)) - to_chat(friend, "Your master has deemed you a poor friend. Your durance in hell will now resume.") - to_chat(user, "You banish your friend back to whence [friend.p_they()] came.") - friend.dust() - qdel(friendShell) - return - if(!QDELETED(friendShell)) - qdel(friendShell) - return - for(var/C in targets) - var/mob/living/L = C - friendShell = new /obj/effect/mob_spawn/human/demonic_friend(L.loc, L.mind, src) - -/obj/effect/proc_holder/spell/targeted/conjure_item/spellpacket/robeless - clothes_req = FALSE diff --git a/code/datums/spells/genetic.dm b/code/datums/spells/genetic.dm index d95c6212486..dce6966512a 100644 --- a/code/datums/spells/genetic.dm +++ b/code/datums/spells/genetic.dm @@ -2,31 +2,36 @@ name = "Genetic" desc = "This spell inflicts a set of mutations and disabilities upon the target." - var/list/mutations = list() //mutation strings - var/duration = 100 //deciseconds - /* - Disabilities - 1st bit - ? - 2nd bit - ? - 3rd bit - ? - 4th bit - ? - 5th bit - ? - 6th bit - ? - */ + var/list/active_on = list() + var/list/traits = list() // traits + var/list/mutations = list() // mutation defines. Set these in Initialize. Refactor this nonsense one day + var/duration = 100 // deciseconds /obj/effect/proc_holder/spell/targeted/genetic/cast(list/targets, mob/user = usr) - for(var/mob/living/target in targets) - for(var/x in mutations) - target.mutations.Add(x) - target.update_mutations() //update target's mutation overlays - var/mob/living/carbon/human/H = target - if(ishuman(target)) - H.update_body() - spawn(duration) - target.mutations.Remove(mutations) - target.update_mutations() - if(ishuman(target)) - H.update_body() + if(!target.dna) + continue + for(var/A in mutations) + target.dna.SetSEState(A, TRUE) + singlemutcheck(target, A, MUTCHK_FORCED) + for(var/A in traits) + ADD_TRAIT(target, A, MAGIC_TRAIT) + active_on += target + target.regenerate_icons() + if(duration < charge_max) + addtimer(CALLBACK(src, .proc/remove, target), duration, TIMER_OVERRIDE|TIMER_UNIQUE) - return +/obj/effect/proc_holder/spell/targeted/genetic/Destroy() + for(var/V in active_on) + remove(V) + return ..() + +/obj/effect/proc_holder/spell/targeted/genetic/proc/remove(mob/living/carbon/target) + active_on -= target + if(!QDELETED(target)) + for(var/A in mutations) + target.dna.SetSEState(A, FALSE) + singlemutcheck(target, A, MUTCHK_FORCED) + for(var/A in traits) + REMOVE_TRAIT(target, A, MAGIC_TRAIT) + target.regenerate_icons() diff --git a/code/datums/spells/knock.dm b/code/datums/spells/knock.dm index e4c652ae1d3..072bbf244e2 100644 --- a/code/datums/spells/knock.dm +++ b/code/datums/spells/knock.dm @@ -16,19 +16,23 @@ /obj/effect/proc_holder/spell/aoe_turf/knock/cast(list/targets, mob/user = usr) for(var/turf/T in targets) for(var/obj/machinery/door/door in T.contents) - spawn(1) - if(istype(door,/obj/machinery/door/airlock/hatch/gamma)) - return - if(istype(door,/obj/machinery/door/airlock)) - var/obj/machinery/door/airlock/A = door - A.unlock(1) //forced because it's magic! - door.open() + INVOKE_ASYNC(src, .proc/try_open_airlock, door) for(var/obj/structure/closet/C in T.contents) - spawn(1) - if(istype(C, /obj/structure/closet/secure_closet)) - var/obj/structure/closet/secure_closet/SC = C - SC.locked = 0 - C.open() + INVOKE_ASYNC(src, .proc/try_open_closet, C) + +/obj/effect/proc_holder/spell/aoe_turf/knock/proc/try_open_airlock(obj/machinery/door/door) + if(istype(door, /obj/machinery/door/airlock/hatch/gamma)) + return + if(istype(door, /obj/machinery/door/airlock)) + var/obj/machinery/door/airlock/A = door + A.unlock(TRUE) //forced because it's magic! + door.open() + +/obj/effect/proc_holder/spell/aoe_turf/knock/proc/try_open_closet(obj/structure/closet/C) + if(istype(C, /obj/structure/closet/secure_closet)) + var/obj/structure/closet/secure_closet/SC = C + SC.locked = FALSE + C.open() /obj/effect/proc_holder/spell/aoe_turf/knock/greater name = "Greater Knock" diff --git a/code/datums/spells/lightning.dm b/code/datums/spells/lightning.dm index 20cd8dccdf5..639ba34766f 100644 --- a/code/datums/spells/lightning.dm +++ b/code/datums/spells/lightning.dm @@ -88,7 +88,7 @@ var/mob/living/current = target if(bounces < 1) if(damaging) - current.electrocute_act(bolt_energy, "Lightning Bolt", safety = TRUE) + current.electrocute_act(bolt_energy, "Lightning Bolt", flags = SHOCK_NOGLOVES) else current.AdjustJitter(1000) //High numbers for violent convulsions current.do_jitter_animation(current.jitteriness) @@ -99,7 +99,7 @@ playsound(get_turf(current), 'sound/magic/lightningshock.ogg', 50, 1, -1) else if(damaging) - current.electrocute_act(bolt_energy, "Lightning Bolt", safety = TRUE) + current.electrocute_act(bolt_energy, "Lightning Bolt", flags = SHOCK_NOGLOVES) else current.AdjustJitter(1000) //High numbers for violent convulsions current.do_jitter_animation(current.jitteriness) diff --git a/code/datums/spells/mime_malaise.dm b/code/datums/spells/mime_malaise.dm index 1765b2f5741..03d5c07fb0f 100644 --- a/code/datums/spells/mime_malaise.dm +++ b/code/datums/spells/mime_malaise.dm @@ -50,5 +50,5 @@ equip_to_slot_if_possible(new /obj/item/clothing/under/mime/nodrop, slot_w_uniform, TRUE, TRUE) equip_to_slot_if_possible(new /obj/item/clothing/suit/suspenders/nodrop, slot_wear_suit, TRUE, TRUE) dna.SetSEState(GLOB.muteblock , TRUE, TRUE) - genemutcheck(src, GLOB.muteblock , null, MUTCHK_FORCED) + singlemutcheck(src, GLOB.muteblock, MUTCHK_FORCED) dna.default_blocks.Add(GLOB.muteblock) diff --git a/code/datums/spells/shapeshift.dm b/code/datums/spells/shapeshift.dm index 7b72b5a42c4..1095457278f 100644 --- a/code/datums/spells/shapeshift.dm +++ b/code/datums/spells/shapeshift.dm @@ -73,14 +73,22 @@ /obj/effect/proc_holder/spell/targeted/shapeshift/dragon name = "Dragon Form" - desc = "Take on the shape a lesser ash drake." - invocation = "RAAAAAAAAWR!" + desc = "Take on the shape a lesser ash drake after a short delay." + invocation = "*scream" shapeshift_type = /mob/living/simple_animal/hostile/megafauna/dragon/lesser current_shapes = list(/mob/living/simple_animal/hostile/megafauna/dragon/lesser) current_casters = list() possible_shapes = list(/mob/living/simple_animal/hostile/megafauna/dragon/lesser) +/obj/effect/proc_holder/spell/targeted/shapeshift/dragon/Shapeshift(mob/living/caster) + caster.visible_message("[caster] screams in agony as bones and claws erupt out of their flesh!", + "You begin channeling the transformation.") + if(!do_after(caster, 5 SECONDS, FALSE, caster)) + to_chat(caster, "You lose concentration of the spell!") + return + return ..() + /obj/effect/proc_holder/spell/targeted/shapeshift/bats name = "Bat Form" desc = "Take on the shape of a swarm of bats." diff --git a/code/datums/spells/summonitem.dm b/code/datums/spells/summonitem.dm index a0c41b57001..bac924e8240 100644 --- a/code/datums/spells/summonitem.dm +++ b/code/datums/spells/summonitem.dm @@ -12,7 +12,8 @@ include_user = 1 var/obj/marked_item - + /// List of objects which will result in the spell stopping with the recursion search + var/static/list/blacklisted_summons = list(/obj/machinery/computer/cryopod = TRUE, /obj/machinery/atmospherics = TRUE, /obj/structure/disposalholder = TRUE, /obj/machinery/disposal = TRUE) action_icon_state = "summons" /obj/effect/proc_holder/spell/targeted/summonitem/cast(list/targets, mob/user = usr) @@ -89,7 +90,7 @@ var/obj/machinery/portable_atmospherics/P = item_to_retrieve.loc P.disconnect() P.update_icon() - if(istype(item_to_retrieve.loc, /obj/structure/disposalholder) || istype(item_to_retrieve.loc, /obj/machinery/disposal))//fixes the breaking of disposals. No more bluespace connected disposal bins! + if(is_type_in_typecache(item_to_retrieve.loc, blacklisted_summons)) break item_to_retrieve = item_to_retrieve.loc diff --git a/code/datums/spells/wizard.dm b/code/datums/spells/wizard.dm index a99655222a4..acaeeb41487 100644 --- a/code/datums/spells/wizard.dm +++ b/code/datums/spells/wizard.dm @@ -88,21 +88,16 @@ include_user = 1 centcom_cancast = 0 - mutations = list(LASER, HULK) + traits = list(TRAIT_LASEREYES) duration = 300 cooldown_min = 300 //25 deciseconds reduction per rank action_icon_state = "mutate" sound = 'sound/magic/mutate.ogg' -/obj/effect/proc_holder/spell/targeted/genetic/mutate/cast(list/targets, mob/user = usr) - for(var/mob/living/target in targets) - target.dna.SetSEState(GLOB.hulkblock, 1) - genemutcheck(target, GLOB.hulkblock, null, MUTCHK_FORCED) - spawn(duration) - target.dna.SetSEState(GLOB.hulkblock, 0) - genemutcheck(target, GLOB.hulkblock, null, MUTCHK_FORCED) - ..() +/obj/effect/proc_holder/spell/targeted/genetic/mutate/Initialize(mapload) + . = ..() + mutations = list(GLOB.hulkblock) /obj/effect/proc_holder/spell/targeted/smoke name = "Smoke" @@ -304,7 +299,7 @@ sound = 'sound/magic/blind.ogg' /obj/effect/proc_holder/spell/targeted/genetic/blind - mutations = list(BLINDNESS) + traits = list(TRAIT_BLIND) duration = 300 sound = 'sound/magic/blind.ogg' @@ -379,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/status_effects/buffs.dm b/code/datums/status_effects/buffs.dm index e6b2e8d2008..2ee2ac615fa 100644 --- a/code/datums/status_effects/buffs.dm +++ b/code/datums/status_effects/buffs.dm @@ -54,34 +54,30 @@ /datum/status_effect/blooddrunk/on_apply() . = ..() if(.) + ADD_TRAIT(owner, TRAIT_IGNOREDAMAGESLOWDOWN, "blooddrunk") if(ishuman(owner)) - owner.status_flags |= IGNORESLOWDOWN var/mob/living/carbon/human/H = owner - for(var/X in H.bodyparts) - var/obj/item/organ/external/BP = X - BP.brute_mod *= 0.1 - BP.burn_mod *= 0.1 - H.dna.species.tox_mod *= 0.1 - H.dna.species.oxy_mod *= 0.1 - H.dna.species.clone_mod *= 0.1 - H.dna.species.stamina_mod *= 0.1 + H.physiology.brute_mod *= 0.1 + H.physiology.burn_mod *= 0.1 + H.physiology.tox_mod *= 0.1 + H.physiology.oxy_mod *= 0.1 + H.physiology.clone_mod *= 0.1 + H.physiology.stamina_mod *= 0.1 add_attack_logs(owner, owner, "gained blood-drunk stun immunity", ATKLOG_ALL) owner.add_stun_absorption("blooddrunk", INFINITY, 4) - owner.playsound_local(get_turf(owner), 'sound/effects/singlebeat.ogg', 40, 1) + owner.playsound_local(get_turf(owner), 'sound/effects/singlebeat.ogg', 40, TRUE, use_reverb = FALSE) /datum/status_effect/blooddrunk/on_remove() if(ishuman(owner)) var/mob/living/carbon/human/H = owner - for(var/X in H.bodyparts) - var/obj/item/organ/external/BP = X - BP.brute_mod *= 10 - BP.burn_mod *= 10 - H.dna.species.tox_mod *= 10 - H.dna.species.oxy_mod *= 10 - H.dna.species.clone_mod *= 10 - H.dna.species.stamina_mod *= 10 + H.physiology.brute_mod *= 10 + H.physiology.burn_mod *= 10 + H.physiology.tox_mod *= 10 + H.physiology.oxy_mod *= 10 + H.physiology.clone_mod *= 10 + H.physiology.stamina_mod *= 10 add_attack_logs(owner, owner, "lost blood-drunk stun immunity", ATKLOG_ALL) - owner.status_flags &= ~IGNORESLOWDOWN + REMOVE_TRAIT(owner, TRAIT_IGNOREDAMAGESLOWDOWN, "blooddrunk") if(islist(owner.stun_absorption) && owner.stun_absorption["blooddrunk"]) owner.stun_absorption -= "blooddrunk" @@ -215,7 +211,7 @@ alert_type = /obj/screen/alert/status_effect/regenerative_core /datum/status_effect/regenerative_core/on_apply() - owner.status_flags |= IGNORE_SPEED_CHANGES + ADD_TRAIT(owner, TRAIT_IGNOREDAMAGESLOWDOWN, id) owner.adjustBruteLoss(-25) owner.adjustFireLoss(-25) owner.remove_CC() @@ -231,4 +227,4 @@ return TRUE /datum/status_effect/regenerative_core/on_remove() - owner.status_flags &= ~IGNORE_SPEED_CHANGES + REMOVE_TRAIT(owner, TRAIT_IGNOREDAMAGESLOWDOWN, id) diff --git a/code/datums/status_effects/status_effect.dm b/code/datums/status_effects/status_effect.dm index 2580b1c9935..fa392b4082e 100644 --- a/code/datums/status_effects/status_effect.dm +++ b/code/datums/status_effects/status_effect.dm @@ -67,6 +67,9 @@ owner = null qdel(src) +/datum/status_effect/proc/before_remove() //! Called before being removed; returning FALSE will cancel removal + return TRUE + /datum/status_effect/proc/refresh() var/original_duration = initial(duration) if(original_duration == -1) @@ -118,12 +121,13 @@ S1 = new effect(arguments) . = S1 -/mob/living/proc/remove_status_effect(effect) //removes all of a given status effect from this mob, returning TRUE if at least one was removed +/mob/living/proc/remove_status_effect(effect, ...) //removes all of a given status effect from this mob, returning TRUE if at least one was removed . = FALSE + var/list/arguments = args.Copy(2) if(status_effects) var/datum/status_effect/S1 = effect for(var/datum/status_effect/S in status_effects) - if(initial(S1.id) == S.id) + if(initial(S1.id) == S.id && S.before_remove(arguments)) qdel(S) . = TRUE @@ -205,6 +209,8 @@ if(stacks >= stack_threshold && !threshold_crossed) //threshold_crossed check prevents threshold effect from occuring if changing from above threshold to still above threshold threshold_crossed = TRUE on_threshold_cross() + if(consumed_on_threshold) + return else if(stacks < stack_threshold && threshold_crossed) threshold_crossed = FALSE //resets threshold effect if we fall below threshold so threshold effect can trigger again on_threshold_drop() @@ -220,8 +226,9 @@ qdel(src) //deletes status if stacks fall under one /datum/status_effect/stacking/on_creation(mob/living/new_owner, stacks_to_apply) - ..() - add_stacks(stacks_to_apply) + . = ..() + if(.) + add_stacks(stacks_to_apply) /datum/status_effect/stacking/on_apply() if(!can_have_status()) @@ -246,3 +253,22 @@ owner.underlays -= status_underlay QDEL_NULL(status_overlay) return ..() + +/// Status effect from multiple sources, when all sources are removed, so is the effect +/datum/status_effect/grouped + status_type = STATUS_EFFECT_MULTIPLE //! Adds itself to sources and destroys itself if one exists already, there are never multiple + var/list/sources = list() + +/datum/status_effect/grouped/on_creation(mob/living/new_owner, source) + var/datum/status_effect/grouped/existing = new_owner.has_status_effect(type) + if(existing) + existing.sources |= source + qdel(src) + return FALSE + else + sources |= source + return ..() + +/datum/status_effect/grouped/before_remove(source) + sources -= source + return !length(sources) diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm index 95882979e23..3a856a8d130 100644 --- a/code/datums/supplypacks.dm +++ b/code/datums/supplypacks.dm @@ -18,7 +18,7 @@ GLOBAL_LIST_INIT(all_supply_groups, list(SUPPLY_EMERGENCY,SUPPLY_SECURITY,SUPPLY_ENGINEER,SUPPLY_MEDICAL,SUPPLY_SCIENCE,SUPPLY_ORGANIC,SUPPLY_MATERIALS,SUPPLY_MISC,SUPPLY_VEND)) -/proc/get_supply_group_name(var/cat) +/proc/get_supply_group_name(cat) switch(cat) if(SUPPLY_EMERGENCY) return "Emergency" @@ -89,11 +89,11 @@ GLOBAL_LIST_INIT(all_supply_groups, list(SUPPLY_EMERGENCY,SUPPLY_SECURITY,SUPPLY /mob/living/simple_animal/bot/floorbot, /mob/living/simple_animal/bot/medbot, /mob/living/simple_animal/bot/medbot, - /obj/item/tank/air, - /obj/item/tank/air, - /obj/item/tank/air, - /obj/item/tank/air, - /obj/item/tank/air, + /obj/item/tank/internals/air, + /obj/item/tank/internals/air, + /obj/item/tank/internals/air, + /obj/item/tank/internals/air, + /obj/item/tank/internals/air, /obj/item/clothing/mask/gas, /obj/item/clothing/mask/gas, /obj/item/clothing/mask/gas, @@ -111,9 +111,9 @@ GLOBAL_LIST_INIT(all_supply_groups, list(SUPPLY_EMERGENCY,SUPPLY_SECURITY,SUPPLY contains = list(/obj/item/clothing/mask/gas, /obj/item/clothing/mask/gas, /obj/item/clothing/mask/gas, - /obj/item/tank/air, - /obj/item/tank/air, - /obj/item/tank/air) + /obj/item/tank/internals/air, + /obj/item/tank/internals/air, + /obj/item/tank/internals/air) cost = 10 containername = "internals crate" @@ -125,8 +125,8 @@ GLOBAL_LIST_INIT(all_supply_groups, list(SUPPLY_EMERGENCY,SUPPLY_SECURITY,SUPPLY /obj/item/clothing/mask/gas, /obj/item/flashlight, /obj/item/flashlight, - /obj/item/tank/oxygen/red, - /obj/item/tank/oxygen/red, + /obj/item/tank/internals/oxygen/red, + /obj/item/tank/internals/oxygen/red, /obj/item/extinguisher, /obj/item/extinguisher, /obj/item/clothing/head/hardhat/red, @@ -159,8 +159,8 @@ GLOBAL_LIST_INIT(all_supply_groups, list(SUPPLY_EMERGENCY,SUPPLY_SECURITY,SUPPLY name = "Vox Life Support Supplies" contains = list(/obj/item/clothing/mask/breath/vox, /obj/item/clothing/mask/breath/vox, - /obj/item/tank/emergency_oxygen/vox, - /obj/item/tank/emergency_oxygen/vox) + /obj/item/tank/internals/emergency_oxygen/double/vox, + /obj/item/tank/internals/emergency_oxygen/double/vox) cost = 50 containertype = /obj/structure/closet/crate/medical containername = "vox life support supplies crate" @@ -169,8 +169,8 @@ GLOBAL_LIST_INIT(all_supply_groups, list(SUPPLY_EMERGENCY,SUPPLY_SECURITY,SUPPLY name = "Plasmaman Supply Kit" contains = list(/obj/item/clothing/under/plasmaman, /obj/item/clothing/under/plasmaman, - /obj/item/tank/plasma/plasmaman/belt/full, - /obj/item/tank/plasma/plasmaman/belt/full, + /obj/item/tank/internals/plasmaman/belt/full, + /obj/item/tank/internals/plasmaman/belt/full, /obj/item/clothing/mask/breath, /obj/item/clothing/mask/breath, /obj/item/clothing/head/helmet/space/plasmaman, @@ -447,9 +447,9 @@ GLOBAL_LIST_INIT(all_supply_groups, list(SUPPLY_EMERGENCY,SUPPLY_SECURITY,SUPPLY /datum/supply_packs/security/armory/eweapons name = "Incendiary Weapons Crate" contains = list(/obj/item/flamethrower/full, - /obj/item/tank/plasma, - /obj/item/tank/plasma, - /obj/item/tank/plasma, + /obj/item/tank/internals/plasma, + /obj/item/tank/internals/plasma, + /obj/item/tank/internals/plasma, /obj/item/grenade/chem_grenade/incendiary, /obj/item/grenade/chem_grenade/incendiary, /obj/item/grenade/chem_grenade/incendiary) @@ -608,7 +608,9 @@ GLOBAL_LIST_INIT(all_supply_groups, list(SUPPLY_EMERGENCY,SUPPLY_SECURITY,SUPPLY /obj/item/clothing/head/welding, /obj/item/clothing/head/hardhat, /obj/item/clothing/head/hardhat, - /obj/item/clothing/head/hardhat) + /obj/item/clothing/head/hardhat, + /obj/item/clothing/glasses/meson/engine, + /obj/item/clothing/glasses/meson/engine) cost = 10 containername = "engineering gear crate" @@ -705,6 +707,18 @@ GLOBAL_LIST_INIT(all_supply_groups, list(SUPPLY_EMERGENCY,SUPPLY_SECURITY,SUPPLY cost = 25 containername = "particle accelerator crate" +/datum/supply_packs/engineering/radiation + name = "Radiation Protection Crate" + cost = 20 + contains = list(/obj/item/clothing/head/radiation, + /obj/item/clothing/head/radiation, + /obj/item/clothing/suit/radiation, + /obj/item/clothing/suit/radiation, + /obj/item/geiger_counter, + /obj/item/geiger_counter) + containername = "radiation protection crate" + containertype = /obj/structure/closet/crate/radiation + /datum/supply_packs/engineering/engine/spacesuit name = "Space Suit Crate" contains = list(/obj/item/clothing/suit/space, @@ -728,7 +742,7 @@ GLOBAL_LIST_INIT(all_supply_groups, list(SUPPLY_EMERGENCY,SUPPLY_SECURITY,SUPPLY /datum/supply_packs/engineering/engine/supermatter_shard name = "Supermatter Shard Crate" - contains = list(/obj/machinery/power/supermatter_shard) + contains = list(/obj/machinery/power/supermatter_crystal/shard) cost = 50 //So cargo thinks twice before killing themselves with it containertype = /obj/structure/closet/crate/secure/engineering containername = "supermatter shard crate" @@ -908,7 +922,7 @@ GLOBAL_LIST_INIT(all_supply_groups, list(SUPPLY_EMERGENCY,SUPPLY_SECURITY,SUPPLY contains = list(/obj/item/cautery, /obj/item/surgicaldrill, /obj/item/clothing/mask/breath/medical, - /obj/item/tank/anesthetic, + /obj/item/tank/internals/anesthetic, /obj/item/FixOVein, /obj/item/hemostat, /obj/item/scalpel, @@ -965,9 +979,9 @@ GLOBAL_LIST_INIT(all_supply_groups, list(SUPPLY_EMERGENCY,SUPPLY_SECURITY,SUPPLY /datum/supply_packs/science/plasma name = "Plasma Assembly Crate" - contains = list(/obj/item/tank/plasma, - /obj/item/tank/plasma, - /obj/item/tank/plasma, + contains = list(/obj/item/tank/internals/plasma, + /obj/item/tank/internals/plasma, + /obj/item/tank/internals/plasma, /obj/item/assembly/igniter, /obj/item/assembly/igniter, /obj/item/assembly/igniter, diff --git a/code/datums/tgs_event_handler.dm b/code/datums/tgs_event_handler.dm index 2a57cbac6c0..df140ad6ff6 100644 --- a/code/datums/tgs_event_handler.dm +++ b/code/datums/tgs_event_handler.dm @@ -7,33 +7,33 @@ 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("TGS: Reboot will no longer [reboot_mode_lookup["[old_reboot_mode]"]], it will instead [reboot_mode_lookup["[new_reboot_mode]"]]") + message_admins("\[Server]\[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("TGS: Changing port from [world.port] to [args[2]]") + message_admins("\[Server]\[Info] Changing port from [world.port] to [args[2]]") if(TGS_EVENT_INSTANCE_RENAMED) - message_admins("TGS: Instance renamed to from [world.TgsInstanceName()] to [args[2]]") + message_admins("\[Server]\[Info] Instance renamed to from [world.TgsInstanceName()] to [args[2]]") if(TGS_EVENT_COMPILE_START) - message_admins("TGS: Deployment started, new game version incoming...") + message_admins("\[Server]\[Info] Code deployment started, new game version incoming next round...") if(TGS_EVENT_COMPILE_CANCELLED) - message_admins("TGS: Deployment cancelled!") + message_admins("\[Server]\[Warning] Code deployment cancelled!") if(TGS_EVENT_COMPILE_FAILURE) - message_admins("TGS: Deployment failed!") + message_admins("\[Server]\[Error] Code deployment failed! Inform a maintainer/host immediately!") if(TGS_EVENT_DEPLOYMENT_COMPLETE) - message_admins("TGS: Deployment complete!") + message_admins("\[Server]\[Info] Code deployment complete!") to_chat(world, "Server updated, changes will be applied on the next round...") if(TGS_EVENT_WATCHDOG_DETACH) - message_admins("TGS restarting...") - reattach_timer = addtimer(CALLBACK(src, .proc/LateOnReattach), 1 MINUTES) + message_admins("\[Server]\[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)) - to_chat(world, "TGS updated to v[new_version.deprefixed_parameter]") + message_admins("\[Server]\[Info] Manager back online. TGS has been updated to v[new_version.deprefixed_parameter]") else - message_admins("TGS: Back online") + message_admins("\[Server]\[Info] Manager back online") if(reattach_timer) deltimer(reattach_timer) reattach_timer = null /datum/tgs_event_handler/impl/proc/LateOnReattach() - message_admins("Warning: TGS hasn't notified us of it coming back for a full minute! Is there a problem?") + message_admins("\[Server]\[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 bb794d9ebd6..61c1e8df625 100644 --- a/code/datums/uplink_item.dm +++ b/code/datums/uplink_item.dm @@ -1,6 +1,6 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) -/proc/get_uplink_items(var/job = null) +/proc/get_uplink_items(job = null) var/list/uplink_items = list() var/list/sales_items = list() var/newreference = 1 @@ -82,7 +82,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) var/refund_path = null // Alternative path for refunds, in case the item purchased isn't what is actually refunded (ie: holoparasites). var/refund_amount // specified refund amount in case there needs to be a TC penalty for refunds. -/datum/uplink_item/proc/spawn_item(var/turf/loc, var/obj/item/uplink/U) +/datum/uplink_item/proc/spawn_item(turf/loc, obj/item/uplink/U) if(hijack_only && !(usr.mind.special_role == SPECIAL_ROLE_NUKEOPS))//nukies get items that regular traitors only get with hijack. If a hijack-only item is not for nukies, then exclude it via the gamemode list. if(!(locate(/datum/objective/hijack) in usr.mind.objectives)) @@ -103,7 +103,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) desc = replacetext(initial(temp.desc), "\n", "
") return desc -/datum/uplink_item/proc/buy(var/obj/item/uplink/hidden/U, var/mob/user) +/datum/uplink_item/proc/buy(obj/item/uplink/hidden/U, mob/user) if(!istype(U)) return 0 @@ -952,6 +952,14 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) item = /obj/item/toy/carpplushie/dehy_carp cost = 2 +/datum/uplink_item/stealthy_weapons/combat_plus + name = "Combat Gloves Plus" + desc = "Combat gloves with installed nanochips that teach you Krav Maga when worn, great as a cheap backup weapon. Warning, the nanochips will override any other fighting styles such as CQC." + reference = "CGP" + item = /obj/item/clothing/gloves/color/black/krav_maga/combat + cost = 5 + gamemodes = list(/datum/game_mode/nuclear) + // GRENADES AND EXPLOSIVES /datum/uplink_item/explosives @@ -1556,43 +1564,32 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) surplus = 0 gamemodes = list(/datum/game_mode/nuclear) -/datum/uplink_item/cyber_implants/spawn_item(turf/loc, obj/item/uplink/U) - if(item) - if(findtext(item, /obj/item/organ/internal/cyberimp)) - U.uses -= max(cost, 0) - U.used_TC += cost - SSblackbox.record_feedback("nested tally", "traitor_uplink_items_bought", 1, list("[initial(name)]", "[cost]")) //this one and the line before copypasted because snowflaek code - return new /obj/item/storage/box/cyber_implants(loc, item) - else - return ..() - /datum/uplink_item/cyber_implants/thermals name = "Thermal Vision Implant" - desc = "These cybernetic eyes will give you thermal vision. Comes with an automated implanting tool." + desc = "These cybernetic eyes will give you thermal vision. Comes with an autosurgeon." reference = "CIT" - item = /obj/item/organ/internal/cyberimp/eyes/thermals + item = /obj/item/autosurgeon/organ/syndicate/thermal_eyes cost = 8 /datum/uplink_item/cyber_implants/xray name = "X-Ray Vision Implant" - desc = "These cybernetic eyes will give you X-ray vision. Comes with an automated implanting tool." + desc = "These cybernetic eyes will give you X-ray vision. Comes with an autosurgeon." reference = "CIX" - item = /obj/item/organ/internal/cyberimp/eyes/xray + item = /obj/item/autosurgeon/organ/syndicate/xray_eyes cost = 10 /datum/uplink_item/cyber_implants/antistun name = "Hardened CNS Rebooter Implant" - desc = "This implant will help you get back up on your feet faster after being stunned. It is invulnerable to EMPs. \ - Comes with an automated implanting tool." + desc = "This implant will help you get back up on your feet faster after being stunned. It is immune to EMP attacks. Comes with an autosurgeon." reference = "CIAS" - item = /obj/item/organ/internal/cyberimp/brain/anti_stun/hardened + item = /obj/item/autosurgeon/organ/syndicate/anti_stun cost = 12 /datum/uplink_item/cyber_implants/reviver name = "Hardened Reviver Implant" - desc = "This implant will attempt to revive you if you lose consciousness. It is invulnerable to EMPs. Comes with an automated implanting tool." + desc = "This implant will attempt to revive and heal you if you lose consciousness. It is immune to EMP attacks. Comes with an autosurgeon." reference = "CIR" - item = /obj/item/organ/internal/cyberimp/chest/reviver/hardened + item = /obj/item/autosurgeon/organ/syndicate/reviver cost = 8 // POINTLESS BADASSERY @@ -1674,10 +1671,9 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) /datum/uplink_item/bundles_TC/cyber_implants name = "Cybernetic Implants Bundle" - desc = "A random selection of cybernetic implants. Guaranteed 5 high quality implants. \ - Comes with an automated implanting tool." + desc = "A random selection of cybernetic implants. Guaranteed 5 high quality implants. Comes with an autosurgeon." reference = "CIB" - item = /obj/item/storage/box/cyber_implants/bundle + item = /obj/item/storage/box/cyber_implants cost = 40 gamemodes = list(/datum/game_mode/nuclear) @@ -1700,6 +1696,38 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) cost = 18 // normally 23 gamemodes = list(/datum/game_mode/nuclear) +/datum/uplink_item/bundles_TC/contractor + name = "Syndicate Contractor Kit" + desc = "A bundle granting you the privilege of taking on kidnapping contracts for credit and TC payouts that can add up to more than its initial cost." + reference = "SCOK" + cost = 20 + item = /obj/item/storage/box/syndie_kit/contractor + excludefrom = list(/datum/game_mode/nuclear) + +/datum/uplink_item/bundles_TC/contractor/spawn_item(turf/loc, obj/item/uplink/U) + var/datum/mind/mind = usr.mind + var/datum/antagonist/traitor/AT = mind.has_antag_datum(/datum/antagonist/traitor) + if(LAZYACCESS(GLOB.contractors, mind)) + to_chat(usr, "Error: Contractor credentials detected for the current user. Unable to provide another Contractor kit.") + return + else if(!AT) + to_chat(usr, "Error: Embedded Syndicate credentials not found.") + return + else if(mind.changeling || mind.vampire) + to_chat(usr, "Error: Embedded Syndicate credentials contain an abnormal signature. Aborting.") + return + + var/obj/item/I = ..() + // Init the hub + var/obj/item/contractor_uplink/CU = locate(/obj/item/contractor_uplink) in I + CU.hub = new(mind, CU) + // Update their mind stuff + LAZYSET(GLOB.contractors, mind, CU.hub) + AT.update_traitor_icons_added(mind) + + log_game("[key_name(usr)] became a Contractor") + return I + /datum/uplink_item/bundles_TC/badass name = "Syndicate Bundle" desc = "Syndicate Bundles are specialised groups of items that arrive in a plain box. These items are collectively worth more than 20 telecrystals, but you do not know which specialisation you will receive." diff --git a/code/datums/vision_override.dm b/code/datums/vision_override.dm index 86aab6d65ec..e110daafd53 100644 --- a/code/datums/vision_override.dm +++ b/code/datums/vision_override.dm @@ -4,15 +4,7 @@ var/sight_flags = 0 var/see_in_dark = 0 var/lighting_alpha - - var/light_sensitive = 0 /datum/vision_override/nightvision see_in_dark = 8 lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE - -/datum/vision_override/nightvision/thermals - sight_flags = SEE_MOBS - -/datum/vision_override/nightvision/thermals/ling_augmented_eyesight - light_sensitive = 1 diff --git a/code/datums/weather/weather_types/radiation_storm.dm b/code/datums/weather/weather_types/radiation_storm.dm index 2bfefa5624e..8eff5e412c7 100644 --- a/code/datums/weather/weather_types/radiation_storm.dm +++ b/code/datums/weather/weather_types/radiation_storm.dm @@ -36,7 +36,7 @@ if(prob(40)) if(ishuman(L)) var/mob/living/carbon/human/H = L - if(!(RADIMMUNE in H.dna.species.species_traits)) + if(!HAS_TRAIT(H, TRAIT_RADIMMUNE)) if(prob(max(0, 100 - resist))) randmuti(H) // Applies bad mutation if(prob(50)) @@ -44,9 +44,9 @@ randmutb(H) else randmutg(H) - domutcheck(H, null, 1) + domutcheck(H, MUTCHK_FORCED) - L.apply_effect(20, IRRADIATE, resist) + L.rad_act(20) /datum/weather/rad_storm/end() if(..()) diff --git a/code/datums/wires/wires.dm b/code/datums/wires/wires.dm index 5707c0aa9a1..691018cd6fa 100644 --- a/code/datums/wires/wires.dm +++ b/code/datums/wires/wires.dm @@ -105,7 +105,7 @@ if(ishuman(user)) var/mob/living/carbon/human/H = user var/obj/item/organ/internal/eyes/eyes = H.get_int_organ(/obj/item/organ/internal/eyes) - if(eyes && (COLOURBLIND in H.mutations)) // Check if the human has colorblindness. + if(eyes && HAS_TRAIT(H, TRAIT_COLORBLIND)) // Check if the human has colorblindness. replace_colors = eyes.replace_colours // Get the colorblind replacement colors list. var/list/wires_list = list() diff --git a/code/defines/procs/AStar.dm b/code/defines/procs/AStar.dm index 1d6fa5619e2..e2212ed8fd3 100644 --- a/code/defines/procs/AStar.dm +++ b/code/defines/procs/AStar.dm @@ -62,24 +62,23 @@ Actual Adjacent procs : return b.f - a.f //wrapper that returns an empty list if A* failed to find a path -/proc/get_path_to(caller, end, dist, maxnodes, maxnodedepth = 30, mintargetdist, adjacent = /turf/proc/reachableAdjacentTurfs, id=null, turf/exclude=null, simulated_only = 1) +/proc/get_path_to(caller, end, dist, maxnodes, maxnodedepth = 30, mintargetdist, adjacent = /turf/proc/reachableAdjacentTurfs, id = null, turf/exclude = null, simulated_only = TRUE) var/list/path = AStar(caller, end, dist, maxnodes, maxnodedepth, mintargetdist, adjacent, id, exclude, simulated_only) if(!path) path = list() return path //the actual algorithm -/proc/AStar(caller, end, dist, maxnodes, maxnodedepth = 30, mintargetdist, adjacent = /turf/proc/reachableAdjacentTurfs, id=null, turf/exclude=null, simulated_only = 1) - +/proc/AStar(caller, end, dist, maxnodes, maxnodedepth = 30, mintargetdist, adjacent = /turf/proc/reachableAdjacentTurfs, id = null, turf/exclude = null, simulated_only = TRUE) //sanitation var/start = get_turf(caller) if(!start) - return 0 + return null if(maxnodes) //if start turf is farther than maxnodes from end turf, no need to do anything if(call(start, dist)(end) > maxnodes) - return 0 + return null maxnodedepth = maxnodes //no need to consider path longer than maxnodes var/datum/heap/open = new /datum/heap(/proc/HeapPathWeightCompare) //the open list @@ -92,7 +91,6 @@ Actual Adjacent procs : //then run the main loop while(!open.IsEmpty() && !path) - { //get the lower f node on the open list cur = open.Pop() //get the lower f turf in the open list closed.Add(cur.source) //and tell we've processed it @@ -100,7 +98,7 @@ Actual Adjacent procs : //if we only want to get near the target, check if we're close enough var/closeenough if(mintargetdist) - closeenough = call(cur.source,dist)(end) <= mintargetdist + closeenough = call(cur.source, dist)(end) <= mintargetdist //if too many steps, abandon that path if(maxnodedepth && (cur.nt > maxnodedepth)) @@ -118,12 +116,13 @@ Actual Adjacent procs : break //get adjacents turfs using the adjacent proc, checking for access with id - var/list/L = call(cur.source,adjacent)(caller, id, simulated_only) - for(var/turf/T in L) + var/list/L = call(cur.source, adjacent)(caller, id, simulated_only) + for(var/t in L) + var/turf/T = t if(T == exclude || (T in closed)) continue - var/newg = cur.g + call(cur.source,dist)(T) + var/newg = cur.g + call(cur.source, dist)(T) if(!T.PNode) //is not already in open list, so add it open.Insert(new /datum/pathnode(T,cur,newg,call(T,dist)(end),cur.nt+1)) else //is already in open list, check if it's a better way from the current turf @@ -134,18 +133,17 @@ Actual Adjacent procs : T.PNode.nt = cur.nt + 1 open.ReSort(T.PNode)//reorder the changed element in the list - } - //cleaning after us for(var/datum/pathnode/PN in open.L) PN.source.PNode = null - for(var/turf/T in closed) + for(var/t in closed) + var/turf/T = t T.PNode = null //reverse the path to get it from start to finish if(path) - for(var/i = 1; i <= path.len/2; i++) - path.Swap(i,path.len-i+1) + for(var/i in 1 to path.len / 2) + path.Swap(i, path.len - i + 1) return path @@ -156,10 +154,10 @@ Actual Adjacent procs : var/turf/simulated/T for(var/dir in GLOB.cardinal) - T = get_step(src,dir) + T = get_step(src, dir) if(!T || (simulated_only && !istype(T))) continue - if(!T.density && !LinkBlockedWithAccess(T,caller, ID)) + if(!T.density && !LinkBlockedWithAccess(T, caller, ID)) L.Add(T) return L @@ -170,15 +168,21 @@ Actual Adjacent procs : /turf/proc/LinkBlockedWithAccess(turf/T, caller, ID) var/adir = get_dir(src, T) var/rdir = get_dir(T, src) + var/atom/caller_atom = caller + if(!istype(caller_atom)) + caller_atom = null for(var/obj/structure/window/W in src) if(!W.CanAStarPass(ID, adir)) - return 1 + return TRUE for(var/obj/machinery/door/window/W in src) if(!W.CanAStarPass(ID, adir)) - return 1 + return TRUE for(var/obj/O in T) - if(!O.CanAStarPass(ID, rdir, caller)) - return 1 + var/pass_through = FALSE + if(caller_atom) + pass_through = caller_atom.CanAStarPassTo(ID, adir, O) + if(!O.CanAStarPass(ID, rdir, caller) && !pass_through) + return TRUE - return 0 + return FALSE diff --git a/code/defines/procs/admin.dm b/code/defines/procs/admin.dm index fa5556b4e40..7add6ea0a37 100644 --- a/code/defines/procs/admin.dm +++ b/code/defines/procs/admin.dm @@ -48,6 +48,9 @@ if(include_link && C) . += "" . += key + // See if the player is on the watchlist. Requires admin permissions. + if(check_rights(R_ADMIN, FALSE) && C && C.watchlisted) + . += "(W)" if(include_link) if(C) . += "" diff --git a/code/defines/procs/announce.dm b/code/defines/procs/announce.dm index ba5320cfdb3..b62f0f8763b 100644 --- a/code/defines/procs/announce.dm +++ b/code/defines/procs/announce.dm @@ -14,37 +14,37 @@ GLOBAL_DATUM_INIT(event_announcement, /datum/announcement/priority/command/event var/admin_announcement = 0 // Admin announcements are received regardless of being in range of a radio, unless you're in the lobby to prevent metagaming var/language = "Galactic Common" -/datum/announcement/New(var/do_log = 0, var/new_sound = null, var/do_newscast = 0) +/datum/announcement/New(do_log = 0, new_sound = null, do_newscast = 0) sound = new_sound log = do_log newscast = do_newscast -/datum/announcement/minor/New(var/do_log = 0, var/new_sound = sound('sound/misc/notice2.ogg'), var/do_newscast = 0) +/datum/announcement/minor/New(do_log = 0, new_sound = sound('sound/misc/notice2.ogg'), do_newscast = 0) ..(do_log, new_sound, do_newscast) title = "Attention" announcement_type = "Minor Announcement" -/datum/announcement/priority/New(var/do_log = 1, var/new_sound = sound('sound/misc/notice2.ogg'), var/do_newscast = 0) +/datum/announcement/priority/New(do_log = 1, new_sound = sound('sound/misc/notice2.ogg'), do_newscast = 0) ..(do_log, new_sound, do_newscast) title = "Priority Announcement" announcement_type = "Priority Announcement" -/datum/announcement/priority/command/New(var/do_log = 1, var/new_sound = sound('sound/misc/notice2.ogg'), var/do_newscast = 0) +/datum/announcement/priority/command/New(do_log = 1, new_sound = sound('sound/misc/notice2.ogg'), do_newscast = 0) ..(do_log, new_sound, do_newscast) admin_announcement = 1 title = "[command_name()] Update" announcement_type = "[command_name()] Update" -/datum/announcement/priority/command/event/New(var/do_log = 1, var/new_sound = sound('sound/misc/notice2.ogg'), var/do_newscast = 0) +/datum/announcement/priority/command/event/New(do_log = 1, new_sound = sound('sound/misc/notice2.ogg'), do_newscast = 0) ..(do_log, new_sound, do_newscast) admin_announcement = 0 -/datum/announcement/priority/security/New(var/do_log = 1, var/new_sound = sound('sound/misc/notice2.ogg'), var/do_newscast = 0) +/datum/announcement/priority/security/New(do_log = 1, new_sound = sound('sound/misc/notice2.ogg'), do_newscast = 0) ..(do_log, new_sound, do_newscast) title = "Security Announcement" announcement_type = "Security Announcement" -/datum/announcement/proc/Announce(var/message as text, var/new_title = "", var/new_sound = null, var/do_newscast = newscast, var/msg_sanitized = 0, var/from, var/msg_language) +/datum/announcement/proc/Announce(message as text, new_title = "", new_sound = null, do_newscast = newscast, msg_sanitized = 0, from, msg_language) if(!message) return @@ -76,7 +76,7 @@ GLOBAL_DATUM_INIT(event_announcement, /datum/announcement/priority/command/event Sound(message_sound, combined_receivers[1] + combined_receivers[2]) Log(message, message_title) -/datum/announcement/proc/Get_Receivers(var/datum/language/message_language) +/datum/announcement/proc/Get_Receivers(datum/language/message_language) var/list/receivers = list() var/list/garbled_receivers = list() @@ -161,17 +161,17 @@ GLOBAL_DATUM_INIT(event_announcement, /datum/announcement/priority/command/event news.can_be_redacted = 0 announce_newscaster_news(news) -/datum/announcement/proc/Sound(var/message_sound, var/receivers) +/datum/announcement/proc/Sound(message_sound, receivers) if(!message_sound) return for(var/mob/M in receivers) - M << message_sound + SEND_SOUND(M, message_sound) /datum/announcement/proc/Log(message as text, message_title as text) if(log) log_game("[key_name(usr)] has made \a [announcement_type]: [message_title] - [message] - [announcer]") message_admins("[key_name_admin(usr)] has made \a [announcement_type].", 1) -/proc/GetNameAndAssignmentFromId(var/obj/item/card/id/I) +/proc/GetNameAndAssignmentFromId(obj/item/card/id/I) // Format currently matches that of newscaster feeds: Registered Name (Assigned Rank) return I.assignment ? "[I.registered_name] ([I.assignment])" : I.registered_name diff --git a/code/defines/procs/radio.dm b/code/defines/procs/radio.dm index 7c0dc4de7f8..c0f7716557e 100644 --- a/code/defines/procs/radio.dm +++ b/code/defines/procs/radio.dm @@ -3,7 +3,7 @@ #define TELECOMMS_RECEPTION_RECEIVER 2 #define TELECOMMS_RECEPTION_BOTH 3 -/proc/get_frequency_name(var/display_freq) +/proc/get_frequency_name(display_freq) var/freq_text // the name of the channel diff --git a/code/defines/procs/records.dm b/code/defines/procs/records.dm index a74680ec578..277dae36f1a 100644 --- a/code/defines/procs/records.dm +++ b/code/defines/procs/records.dm @@ -25,7 +25,7 @@ qdel(dummy) return G -/proc/CreateSecurityRecord(var/name as text, var/id as text) +/proc/CreateSecurityRecord(name as text, id as text) var/datum/data/record/R = new /datum/data/record() R.fields["name"] = name R.fields["id"] = id diff --git a/code/game/area/ai_monitored.dm b/code/game/area/ai_monitored.dm index abfcb7210b0..074164b5805 100644 --- a/code/game/area/ai_monitored.dm +++ b/code/game/area/ai_monitored.dm @@ -2,6 +2,7 @@ name = "AI Monitored Area" var/list/motioncameras = list() var/list/motionTargets = list() + sound_environment = SOUND_ENVIRONMENT_ROOM /area/ai_monitored/Initialize(mapload) . = ..() diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm index b4719690673..6565779e14b 100644 --- a/code/game/area/areas.dm +++ b/code/game/area/areas.dm @@ -67,6 +67,13 @@ var/moving = FALSE /// "Haunted" areas such as the morgue and chapel are easier to boo. Because flavor. var/is_haunted = FALSE + ///Used to decide what kind of reverb the area makes sound have + var/sound_environment = SOUND_ENVIRONMENT_NONE + + ///Used to decide what the minimum time between ambience is + var/min_ambience_cooldown = 30 SECONDS + ///Used to decide what the maximum time between ambience is + var/max_ambience_cooldown = 90 SECONDS /area/Initialize(mapload) GLOB.all_areas += src @@ -368,7 +375,7 @@ #define ENVIRON 3 */ -/area/proc/powered(var/chan) // return true if the area has power to given channel +/area/proc/powered(chan) // return true if the area has power to given channel if(!requires_power) return 1 @@ -398,7 +405,7 @@ SEND_SIGNAL(src, COMSIG_AREA_POWER_CHANGE) updateicon() -/area/proc/usage(var/chan) +/area/proc/usage(chan) var/used = 0 switch(chan) if(LIGHT) @@ -432,7 +439,7 @@ used_light = 0 used_environ = 0 -/area/proc/use_power(var/amount, var/chan) +/area/proc/use_power(amount, chan) switch(chan) if(EQUIP) used_equip += amount @@ -441,7 +448,7 @@ if(ENVIRON) used_environ += amount -/area/proc/use_battery_power(var/amount, var/chan) +/area/proc/use_battery_power(amount, chan) switch(chan) if(EQUIP) used_equip += amount @@ -474,35 +481,21 @@ if((oldarea.has_gravity == 0) && (newarea.has_gravity == 1) && (L.m_intent == MOVE_INTENT_RUN)) // Being ready when you change areas gives you a chance to avoid falling all together. thunk(L) - // Ambience goes down here -- make sure to list each area seperately for ease of adding things in later, thanks! Note: areas adjacent to each other should have the same sounds to prevent cutoff when possible.- LastyScratch - if(L && L.client && !L.client.ambience_playing && (L.client.prefs.sound & SOUND_BUZZ)) //split off the white noise from the rest of the ambience because of annoyance complaints - Kluys + //Ship ambience just loops if turned on. + if(L && L.client && !L.client.ambience_playing && (L.client.prefs.sound & SOUND_BUZZ)) L.client.ambience_playing = TRUE - SEND_SOUND(L, sound('sound/ambience/shipambience.ogg', repeat = TRUE, wait = FALSE, volume = 35, channel = CHANNEL_BUZZ)) + SEND_SOUND(L, sound('sound/ambience/shipambience.ogg', repeat = TRUE, wait = FALSE, volume = 35 * L.client.prefs.get_channel_volume(CHANNEL_BUZZ), channel = CHANNEL_BUZZ)) else if(L && L.client && !(L.client.prefs.sound & SOUND_BUZZ)) L.client.ambience_playing = FALSE - if(prob(35) && L && L.client && (L.client.prefs.sound & SOUND_AMBIENCE)) - var/sound = pick(ambientsounds) - - if(!L.client.played) - SEND_SOUND(L, sound(sound, repeat = FALSE, wait = FALSE, volume = 25, channel = CHANNEL_AMBIENCE)) - L.client.played = TRUE - addtimer(CALLBACK(L.client, /client/proc/ResetAmbiencePlayed), 600) - -/** - * Reset the played var to false on the client - */ -/client/proc/ResetAmbiencePlayed() - played = FALSE - -/area/proc/gravitychange(var/gravitystate = 0, var/area/A) +/area/proc/gravitychange(gravitystate = 0, area/A) A.has_gravity = gravitystate if(gravitystate) for(var/mob/living/carbon/human/M in A) thunk(M) -/area/proc/thunk(var/mob/living/carbon/human/M) +/area/proc/thunk(mob/living/carbon/human/M) if(istype(M,/mob/living/carbon/human/)) // Only humans can wear magboots, so we give them a chance to. if(istype(M.shoes, /obj/item/clothing/shoes/magboots) && (M.shoes.flags & NOSLIP)) return @@ -543,9 +536,9 @@ for(var/obj/machinery/power/apc/temp_apc in src) INVOKE_ASYNC(temp_apc, /obj/machinery/power/apc.proc/overload_lighting, 70) for(var/obj/machinery/door/airlock/temp_airlock in src) - temp_airlock.prison_open() + INVOKE_ASYNC(temp_airlock, /obj/machinery/door/airlock.proc/prison_open) for(var/obj/machinery/door/window/temp_windoor in src) - temp_windoor.open() + INVOKE_ASYNC(temp_windoor, /obj/machinery/door.proc/open) /area/AllowDrop() CRASH("Bad op: area/AllowDrop() called") diff --git a/code/game/area/areas/depot-areas.dm b/code/game/area/areas/depot-areas.dm index 4a6606d836e..ec1ba64deec 100644 --- a/code/game/area/areas/depot-areas.dm +++ b/code/game/area/areas/depot-areas.dm @@ -314,7 +314,7 @@ for(var/obj/machinery/computer/syndicate_depot/C in src) C.security_lockout = FALSE -/area/syndicate_depot/core/proc/set_emergency_access(var/openaccess) +/area/syndicate_depot/core/proc/set_emergency_access(openaccess) for(var/obj/machinery/door/airlock/A in src) if(istype(A, /obj/machinery/door/airlock/hatch/syndicate/vault)) continue @@ -341,7 +341,7 @@ receivers |= M for(var/mob/R in receivers) to_chat(R, msg_text) - R << sound('sound/misc/notice1.ogg') + SEND_SOUND(R, sound('sound/misc/notice1.ogg')) /area/syndicate_depot/core/proc/shields_up() if(shield_list.len) @@ -424,18 +424,47 @@ return TRUE return FALSE +/** + * Returns a STRING, containing the NAMES of the mobs in the provided list, JOINED together with ", " + * + * E.g. list_show(depotarea.guard_list) returns a string like: + * "Syndicate Backup (123), Syndicate Backup(456), Syndicate Backup(789)", etc. + * Arguments: + * * list/L, the list of UIDs from which to draw members + * * show_ckeys, bool, if true will display ckeys in addition to names + */ /area/syndicate_depot/core/proc/list_show(list/L, show_ckeys = FALSE) - var/list/formatted = list() + var/list/formatted = list_shownames(L, show_ckeys) + return formatted.Join(", ") + +/** + * Returns a LIST of the NAMES of the mobs in the provided list. + * + * E.g. list_shownames(depotarea.guard_list) returns a list of the names of extra guard mobs in depot. + * Arguments: + * * list/L, the list of UIDs from which to draw members + * * show_ckeys, bool, if true will display ckeys in addition to names + */ +/area/syndicate_depot/core/proc/list_shownames(list/L, show_ckeys = FALSE) + var/list/names = list() for(var/uid in L) var/mob/M = locateUID(uid) if(!istype(M)) continue if(show_ckeys) - formatted += "[M.ckey]([M])" + names += "[M.ckey]([M])" else - formatted += "[M]" - return formatted.Join(", ") + names += "[M]" + return names +/** + * Returns a LIST of the MOBS in one of the depot area's lists. + * + * E.g. list_getmobs(depotarea.guard_list) returns a list of the extra guard mobs in the depot. + * Arguments: + * * list/L, the list of UIDs from which to draw members + * * show_ckeys, bool, if true will display ckeys in addition to names + */ /area/syndicate_depot/core/proc/list_getmobs(list/L, show_ckeys = FALSE) var/list/moblist = list() for(var/uid in L) @@ -444,19 +473,6 @@ continue moblist += M return moblist - -/area/syndicate_depot/core/proc/list_gethtmlmobs(list/L) - var/returntext = "" - var/list/moblist = list_getmobs(L) - if(moblist.len) - returntext += "
    " - for(var/mob/thismob in moblist) - returntext += "
  • [thismob]
    • " - returntext += "
" - else - returntext += "
NONE" - return returntext - /area/syndicate_depot/outer name = "Suspicious Asteroid" icon_state = "green" diff --git a/code/game/area/areas/mining.dm b/code/game/area/areas/mining.dm index b621bade493..59bbcdb35da 100644 --- a/code/game/area/areas/mining.dm +++ b/code/game/area/areas/mining.dm @@ -16,6 +16,9 @@ outdoors = TRUE ambientsounds = MINING_SOUNDS flags = NONE + sound_environment = SOUND_AREA_STANDARD_STATION + min_ambience_cooldown = 70 SECONDS + max_ambience_cooldown = 220 SECONDS /area/mine/dangerous/explored/golem name = "Small Asteroid" @@ -32,6 +35,8 @@ outdoors = TRUE ambientsounds = MINING_SOUNDS flags = NONE + min_ambience_cooldown = 70 SECONDS + max_ambience_cooldown = 220 SECONDS /area/mine/lobby name = "Mining Station" @@ -90,6 +95,7 @@ /area/lavaland icon_state = "mining" has_gravity = TRUE + sound_environment = SOUND_AREA_LAVALAND /area/lavaland/surface name = "Lavaland" @@ -101,6 +107,8 @@ power_light = FALSE requires_power = TRUE ambientsounds = MINING_SOUNDS + min_ambience_cooldown = 70 SECONDS + max_ambience_cooldown = 220 SECONDS /area/lavaland/underground name = "Lavaland Caves" @@ -112,6 +120,8 @@ power_equip = FALSE power_light = FALSE ambientsounds = MINING_SOUNDS + min_ambience_cooldown = 70 SECONDS + max_ambience_cooldown = 220 SECONDS /area/lavaland/surface/outdoors name = "Lavaland Wastes" diff --git a/code/game/area/areas/ruins/lavaland.dm b/code/game/area/areas/ruins/lavaland.dm index 534ea820006..c267bbeffae 100644 --- a/code/game/area/areas/ruins/lavaland.dm +++ b/code/game/area/areas/ruins/lavaland.dm @@ -37,45 +37,6 @@ /area/ruin/powered/seedvault icon_state = "dk_yellow" -/area/ruin/unpowered/syndicate_lava_base - name = "Secret Base" - icon_state = "dk_yellow" - ambientsounds = HIGHSEC_SOUNDS - report_alerts = FALSE - hide_attacklogs = TRUE - -/area/ruin/unpowered/syndicate_lava_base/engineering - name = "Syndicate Lavaland Engineering" - -/area/ruin/unpowered/syndicate_lava_base/medbay - name = "Syndicate Lavaland Medbay" - -/area/ruin/unpowered/syndicate_lava_base/arrivals - name = "Syndicate Lavaland Arrivals" - -/area/ruin/unpowered/syndicate_lava_base/bar - name = "Syndicate Lavaland Bar" - -/area/ruin/unpowered/syndicate_lava_base/main - name = "Syndicate Lavaland Primary Hallway" - -/area/ruin/unpowered/syndicate_lava_base/cargo - name = "Syndicate Lavaland Cargo Bay" - -/area/ruin/unpowered/syndicate_lava_base/chemistry - name = "Syndicate Lavaland Chemistry" - -/area/ruin/unpowered/syndicate_lava_base/virology - name = "Syndicate Lavaland Virology" - -/area/ruin/unpowered/syndicate_lava_base/testlab - name = "Syndicate Lavaland Experimentation Lab" - -/area/ruin/unpowered/syndicate_lava_base/dormitories - name = "Syndicate Lavaland Dormitories" - -/area/ruin/unpowered/syndicate_lava_base/telecomms - name = "Syndicate Lavaland Telecommunications" //Xeno Nest diff --git a/code/game/area/areas/ruins/syndicate_space_base.dm b/code/game/area/areas/ruins/syndicate_space_base.dm new file mode 100644 index 00000000000..f26eb56fa86 --- /dev/null +++ b/code/game/area/areas/ruins/syndicate_space_base.dm @@ -0,0 +1,50 @@ +/area/ruin/unpowered/syndicate_space_base + name = "Secret Base" + icon_state = "dk_yellow" + ambientsounds = HIGHSEC_SOUNDS + report_alerts = FALSE + hide_attacklogs = TRUE + +/area/ruin/unpowered/syndicate_space_base/engineering + name = "Syndicate Space Base Engineering" + icon_state = "engine" + +/area/ruin/unpowered/syndicate_space_base/medbay + name = "Syndicate Space Base Medbay" + icon_state = "medbay2" + +/area/ruin/unpowered/syndicate_space_base/arrivals + name = "Syndicate Space Base Arrivals" + icon_state = "teleporter" + + +/area/ruin/unpowered/syndicate_space_base/bar + name = "Syndicate Space Base Bar" + icon_state = "bar" + +/area/ruin/unpowered/syndicate_space_base/main + name = "Syndicate Space Base Primary Hallway" + +/area/ruin/unpowered/syndicate_space_base/cargo + name = "Syndicate Space Base Cargo Bay" + icon_state = "storage" + +/area/ruin/unpowered/syndicate_space_base/chemistry + name = "Syndicate Space Base Chemistry" + icon_state = "chem" + +/area/ruin/unpowered/syndicate_space_base/virology + name = "Syndicate Space Base Virology" + icon_state = "virology" + +/area/ruin/unpowered/syndicate_space_base/testlab + name = "Syndicate Space Base Experimentation Lab" + icon_state = "toxtest" + +/area/ruin/unpowered/syndicate_space_base/dormitories + name = "Syndicate Space Base Dormitories" + icon_state = "dorms" + +/area/ruin/unpowered/syndicate_space_base/telecomms + name = "Syndicate Space Base Telecommunications" + icon_state = "tcomsatcham" diff --git a/code/game/area/ss13_areas.dm b/code/game/area/ss13_areas.dm index 4e75ae5c577..736a6d84447 100644 --- a/code/game/area/ss13_areas.dm +++ b/code/game/area/ss13_areas.dm @@ -42,6 +42,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station valid_territory = FALSE outdoors = TRUE ambientsounds = SPACE_SOUNDS + sound_environment = SOUND_AREA_SPACE /area/space/nearstation icon_state = "space_near" @@ -66,6 +67,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station valid_territory = FALSE dynamic_lighting = DYNAMIC_LIGHTING_FORCED parallax_movedir = NORTH + sound_environment = SOUND_ENVIRONMENT_ROOM /area/shuttle/arrival name = "\improper Arrival Shuttle" @@ -392,6 +394,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station requires_power = FALSE dynamic_lighting = DYNAMIC_LIGHTING_DISABLED has_gravity = TRUE + ambientsounds = null // No ambient sounds in the lobby // === end remove @@ -477,6 +480,9 @@ NOTE: there are two lists of areas in the end of this file: centcom and station valid_territory = FALSE dynamic_lighting = DYNAMIC_LIGHTING_FORCED ambientsounds = MINING_SOUNDS + sound_environment = SOUND_AREA_ASTEROID + min_ambience_cooldown = 70 SECONDS + max_ambience_cooldown = 220 SECONDS /area/asteroid/cave // -- TLE name = "\improper Asteroid - Underground" @@ -594,6 +600,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/maintenance ambientsounds = MAINTENANCE_SOUNDS valid_territory = FALSE + sound_environment = SOUND_AREA_TUNNEL_ENCLOSED /area/maintenance/atmos_control name = "Atmospherics Maintenance" @@ -696,6 +703,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/hallway valid_territory = FALSE //too many areas with similar/same names, also not very interesting summon spots + sound_environment = SOUND_AREA_STANDARD_STATION /area/hallway/primary/fore name = "\improper Fore Primary Hallway" @@ -762,14 +770,17 @@ NOTE: there are two lists of areas in the end of this file: centcom and station name = "\improper Bridge" icon_state = "bridge" ambientsounds = list('sound/ambience/signal.ogg') + sound_environment = SOUND_AREA_STANDARD_STATION /area/bridge/meeting_room name = "\improper Heads of Staff Meeting Room" icon_state = "meeting" + sound_environment = SOUND_AREA_MEDIUM_SOFTFLOOR /area/crew_quarters/captain name = "\improper Captain's Office" icon_state = "captain" + sound_environment = SOUND_AREA_WOODFLOOR /area/crew_quarters/captain/bedroom name = "\improper Captain's Bedroom" @@ -826,10 +837,12 @@ 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" + sound_environment = SOUND_AREA_STANDARD_STATION /area/server name = "\improper Messaging Server Room" icon_state = "server" + sound_environment = SOUND_AREA_STANDARD_STATION /area/ntrep name = "\improper Nanotrasen Representative's Office" @@ -848,10 +861,12 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/crew_quarters name = "\improper Dormitories" icon_state = "Sleep" + sound_environment = SOUND_AREA_STANDARD_STATION /area/crew_quarters/toilet name = "\improper Dormitory Toilets" icon_state = "toilet" + sound_environment = SOUND_AREA_SMALL_ENCLOSED /area/crew_quarters/sleep name = "\improper Dormitories" @@ -905,6 +920,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" + sound_environment = SOUND_AREA_WOODFLOOR /area/crew_quarters/bar/atrium name = "Atrium" @@ -913,6 +929,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/crew_quarters/theatre name = "\improper Theatre" icon_state = "Theatre" + sound_environment = SOUND_AREA_WOODFLOOR /area/crew_quarters/mrchangs name = "\improper Mr Chang's" @@ -921,6 +938,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/library name = "\improper Library" icon_state = "library" + sound_environment = SOUND_AREA_LARGE_SOFTFLOOR /area/library/abandoned name = "\improper Abandoned Library" @@ -930,6 +948,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station icon_state = "chapel" ambientsounds = HOLY_SOUNDS is_haunted = TRUE + sound_environment = SOUND_AREA_LARGE_ENCLOSED /area/chapel/main name = "\improper Chapel" @@ -945,10 +964,12 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/lawoffice name = "\improper Law Office" icon_state = "law" + sound_environment = SOUND_AREA_SMALL_SOFTFLOOR /area/magistrateoffice name = "\improper Magistrate's Office" icon_state = "magistrate" + sound_environment = SOUND_AREA_SMALL_SOFTFLOOR /area/clownoffice name = "\improper Clown's Office" @@ -974,6 +995,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station name = "\improper Holodeck" icon_state = "Holodeck" dynamic_lighting = DYNAMIC_LIGHTING_DISABLED + sound_environment = SOUND_ENVIRONMENT_PADDED_CELL /area/holodeck/alphadeck name = "\improper Holodeck Alpha" @@ -1068,6 +1090,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station //Engineering /area/engine ambientsounds = ENGINEERING_SOUNDS + sound_environment = SOUND_AREA_LARGE_ENCLOSED /area/engine/engine_smes name = "\improper Engineering SMES" @@ -1082,10 +1105,12 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/engine/break_room name = "\improper Engineering Foyer" icon_state = "engine" + sound_environment = SOUND_AREA_SMALL_ENCLOSED /area/engine/equipmentstorage name = "\improper Engineering Equipment Storage" icon_state = "storage" + sound_environment = SOUND_AREA_SMALL_ENCLOSED /area/engine/hardsuitstorage name = "\improper Engineering Hardsuit Storage" @@ -1114,6 +1139,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/engine/supermatter name = "\improper Supermatter Engine" icon_state = "engine" + sound_environment = SOUND_AREA_SMALL_ENCLOSED //Solars @@ -1122,6 +1148,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station valid_territory = FALSE dynamic_lighting = DYNAMIC_LIGHTING_IFSTARLIGHT ambientsounds = ENGINEERING_SOUNDS + sound_environment = SOUND_AREA_SPACE /area/solar/auxport name = "\improper Fore Port Solar Array" @@ -1194,6 +1221,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station name = "\improper Gateway" icon_state = "teleporter" ambientsounds = ENGINEERING_SOUNDS + sound_environment = SOUND_AREA_STANDARD_STATION /area/AIsattele name = "\improper Abandoned Teleporter" @@ -1213,6 +1241,9 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/medical ambientsounds = MEDICAL_SOUNDS + sound_environment = SOUND_AREA_STANDARD_STATION + min_ambience_cooldown = 90 SECONDS + max_ambience_cooldown = 180 SECONDS /area/medical/medbay name = "\improper Medbay" @@ -1247,6 +1278,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/medical/patients_rooms name = "\improper Patient's Rooms" icon_state = "patients" + sound_environment = SOUND_AREA_SMALL_SOFTFLOOR /area/medical/ward name = "\improper Medbay Patient Ward" @@ -1301,6 +1333,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station icon_state = "morgue" ambientsounds = SPOOKY_SOUNDS is_haunted = TRUE + sound_environment = SOUND_AREA_SMALL_ENCLOSED /area/medical/chemistry name = "\improper Chemistry" @@ -1350,6 +1383,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/security ambientsounds = HIGHSEC_SOUNDS + sound_environment = SOUND_AREA_STANDARD_STATION /area/security/main name = "\improper Security Office" @@ -1432,6 +1466,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /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" @@ -1459,6 +1494,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/security/warden name = "\improper Warden's Office" icon_state = "Warden" + sound_environment = SOUND_AREA_SMALL_SOFTFLOOR /area/security/armoury name = "\improper Armory" @@ -1536,12 +1572,14 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/quartermaster name = "\improper Quartermasters" icon_state = "quart" + sound_environment = SOUND_AREA_STANDARD_STATION ///////////WORK IN PROGRESS////////// /area/quartermaster/sorting name = "\improper Delivery Office" icon_state = "quartstorage" + sound_environment = SOUND_AREA_STANDARD_STATION ////////////WORK IN PROGRESS////////// @@ -1552,6 +1590,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/quartermaster/storage name = "\improper Cargo Bay" icon_state = "quartstorage" + sound_environment = SOUND_AREA_LARGE_ENCLOSED /area/quartermaster/qm name = "\improper Quartermaster's Office" @@ -1572,17 +1611,23 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/janitor name = "\improper Custodial Closet" icon_state = "janitor" + sound_environment = SOUND_AREA_SMALL_ENCLOSED /area/hydroponics name = "\improper Hydroponics" icon_state = "hydro" + sound_environment = SOUND_AREA_STANDARD_STATION /area/hydroponics/abandoned_garden name = "\improper Abandoned Garden" icon_state = "hydro" + sound_environment = SOUND_AREA_SMALL_ENCLOSED //Toxins +/area/toxins + sound_environment = SOUND_AREA_STANDARD_STATION + /area/toxins/lab name = "\improper Research and Development" icon_state = "toxlab" @@ -1650,6 +1695,8 @@ NOTE: there are two lists of areas in the end of this file: centcom and station icon_state = "toxmisc" //Storage +/area/storage + sound_environment = SOUND_AREA_STANDARD_STATION /area/storage/tools name = "Auxiliary Tool Storage" @@ -1837,6 +1884,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station name = "\improper Construction Area" icon_state = "yellow" ambientsounds = ENGINEERING_SOUNDS + sound_environment = SOUND_AREA_STANDARD_STATION /area/mining_construction name = "Auxillary Base Construction" @@ -1925,6 +1973,8 @@ NOTE: there are two lists of areas in the end of this file: centcom and station //AI +/area/ai_monitored + sound_environment = SOUND_AREA_STANDARD_STATION /area/ai_monitored/storage/eva name = "EVA Storage" @@ -1945,10 +1995,12 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/turret_protected/ai_upload name = "\improper AI Upload Chamber" icon_state = "ai_upload" + sound_environment = SOUND_AREA_SMALL_ENCLOSED /area/turret_protected/ai_upload_foyer name = "AI Upload Access" icon_state = "ai_foyer" + sound_environment = SOUND_AREA_SMALL_ENCLOSED /area/turret_protected/ai name = "\improper AI Chamber" @@ -1957,6 +2009,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/turret_protected/aisat name = "\improper AI Satellite" icon_state = "ai" + sound_environment = SOUND_ENVIRONMENT_ROOM /area/aisat name = "\improper AI Satellite Exterior" @@ -1973,6 +2026,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/turret_protected/aisat_interior name = "\improper AI Satellite Antechamber" icon_state = "ai" + sound_environment = SOUND_AREA_LARGE_ENCLOSED //Misc @@ -2033,6 +2087,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/tcommsat/computer name = "\improper Telecoms Control Room" icon_state = "tcomsatcomp" + sound_environment = SOUND_AREA_MEDIUM_SOFTFLOOR /area/tcommsat/server name = "\improper Telecoms Server Room" @@ -2052,6 +2107,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station icon_state = "away" report_alerts = FALSE ambientsounds = AWAY_MISSION_SOUNDS + sound_environment = SOUND_ENVIRONMENT_ROOM /area/awaymission/example name = "\improper Strange Station" diff --git a/code/game/atoms.dm b/code/game/atoms.dm index 2ab953e5fc3..66df3d4a76c 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -7,6 +7,9 @@ var/list/fingerprints var/list/fingerprintshidden var/fingerprintslast = null + ///For handling persistent filters + var/list/filter_data + var/list/blood_DNA var/blood_color var/last_bumped = 0 @@ -48,6 +51,9 @@ var/list/atom_colours //used to store the different colors on an atom //its inherent color, the colored paint applied on it, special color effect etc... + /// Radiation insulation types + var/rad_insulation = RAD_NO_INSULATION + /// Last name used to calculate a color for the chatmessage overlays. Used for caching. var/chat_color_name /// Last color calculated for the the chatmessage overlays. Used for caching. @@ -270,6 +276,9 @@ /atom/proc/emp_act(severity) return +/atom/proc/water_act(volume, temperature, source, method = REAGENT_TOUCH) //amount of water acting : temperature of water in kelvin : object that called it (for shennagins) + return TRUE + /atom/proc/bullet_act(obj/item/projectile/P, def_zone) SEND_SIGNAL(src, COMSIG_ATOM_BULLET_ACT, P, def_zone) . = P.on_hit(src, 0, def_zone) @@ -404,6 +413,14 @@ /atom/proc/emag_act() return +/** + * Respond to a radioactive wave hitting this atom + * + * Default behaviour is to send [COMSIG_ATOM_RAD_ACT] and return + */ +/atom/proc/rad_act(amount) + SEND_SIGNAL(src, COMSIG_ATOM_RAD_ACT, amount) + /atom/proc/fart_act(mob/living/M) return FALSE @@ -422,6 +439,71 @@ if(AM && isturf(AM.loc)) step(AM, turn(AM.dir, 180)) + +/atom/proc/add_filter(name, priority, list/params) + LAZYINITLIST(filter_data) + var/list/p = params.Copy() + p["priority"] = priority + filter_data[name] = p + update_filters() + +/atom/proc/update_filters() + filters = null + filter_data = sortTim(filter_data, /proc/cmp_filter_data_priority, TRUE) + for(var/f in filter_data) + var/list/data = filter_data[f] + var/list/arguments = data.Copy() + arguments -= "priority" + filters += filter(arglist(arguments)) + UNSETEMPTY(filter_data) + +/atom/proc/transition_filter(name, time, list/new_params, easing, loop) + var/filter = get_filter(name) + if(!filter) + return + + var/list/old_filter_data = filter_data[name] + + var/list/params = old_filter_data.Copy() + for(var/thing in new_params) + params[thing] = new_params[thing] + + animate(filter, new_params, time = time, easing = easing, loop = loop) + for(var/param in params) + filter_data[name][param] = params[param] + +/atom/proc/change_filter_priority(name, new_priority) + if(!filter_data || !filter_data[name]) + return + + filter_data[name]["priority"] = new_priority + update_filters() + +/obj/item/update_filters() + . = ..() + for(var/X in actions) + var/datum/action/A = X + A.UpdateButtonIcon() + +/atom/proc/get_filter(name) + if(filter_data && filter_data[name]) + return filters[filter_data.Find(name)] + +/atom/proc/remove_filter(name_or_names) + if(!filter_data) + return + + var/list/names = islist(name_or_names) ? name_or_names : list(name_or_names) + + for(var/name in names) + if(filter_data[name]) + filter_data -= name + update_filters() + +/atom/proc/clear_filters() + filter_data = null + filters = null + /* * Base proc, terribly named but it's all over the code so who cares I guess right? * @@ -493,7 +575,7 @@ add_fibers(M) //He has no prints! - if(FINGERPRINTS in M.mutations) + if(HAS_TRAIT(M, TRAIT_NOFINGERPRINTS)) if(fingerprintslast != M.key) fingerprintshidden += "(Has no fingerprints) Real name: [M.real_name], Key: [M.key]" fingerprintslast = M.key @@ -708,27 +790,44 @@ GLOBAL_LIST_EMPTY(blood_splatter_icons) blood_overlay.color = color overlays += blood_overlay -/atom/proc/clean_blood() +/atom/proc/clean_blood(radiation_clean = FALSE) germ_level = 0 + if(radiation_clean) + clean_radiation() if(islist(blood_DNA)) blood_DNA = null return TRUE -/obj/effect/decal/cleanable/blood/clean_blood() +/** + * Removes some radiation from an atom + * + * Removes a configurable amount of radiation from an atom + * and stops green glow if radiation gets low enough through it. + * Arguments: + * * clean_factor - How much radiation to remove, as a multiple of RAD_BACKGROUND_RADIATION (currently 9) + */ +/atom/proc/clean_radiation(clean_factor = 2) + var/datum/component/radioactive/healthy_green_glow = GetComponent(/datum/component/radioactive) + if(!QDELETED(healthy_green_glow)) + healthy_green_glow.strength = max(0, (healthy_green_glow.strength - (RAD_BACKGROUND_RADIATION * clean_factor))) + if(healthy_green_glow.strength <= RAD_BACKGROUND_RADIATION) + qdel(healthy_green_glow) + +/obj/effect/decal/cleanable/blood/clean_blood(radiation_clean = FALSE) return // While this seems nonsensical, clean_blood isn't supposed to be used like this on a blood decal. -/obj/item/clean_blood() +/obj/item/clean_blood(radiation_clean = FALSE) . = ..() if(.) if(blood_overlay) overlays -= blood_overlay -/obj/item/clothing/gloves/clean_blood() +/obj/item/clothing/gloves/clean_blood(radiation_clean = FALSE) . = ..() if(.) transfer_blood = 0 -/obj/item/clothing/shoes/clean_blood() +/obj/item/clothing/shoes/clean_blood(radiation_clean = FALSE) ..() bloody_shoes = list(BLOOD_STATE_HUMAN = 0, BLOOD_STATE_XENO = 0, BLOOD_STATE_NOT_BLOODY = 0) blood_state = BLOOD_STATE_NOT_BLOODY @@ -736,36 +835,36 @@ GLOBAL_LIST_EMPTY(blood_splatter_icons) var/mob/M = loc M.update_inv_shoes() -/mob/living/carbon/human/clean_blood(clean_hands = TRUE, clean_mask = TRUE, clean_feet = TRUE) +/mob/living/carbon/human/clean_blood(radiation_clean = FALSE, clean_hands = TRUE, clean_mask = TRUE, clean_feet = TRUE) if(w_uniform && !(wear_suit && wear_suit.flags_inv & HIDEJUMPSUIT)) - if(w_uniform.clean_blood()) + if(w_uniform.clean_blood(radiation_clean)) update_inv_w_uniform() if(gloves && !(wear_suit && wear_suit.flags_inv & HIDEGLOVES)) - if(gloves.clean_blood()) + if(gloves.clean_blood(radiation_clean)) update_inv_gloves() gloves.germ_level = 0 clean_hands = FALSE if(shoes && !(wear_suit && wear_suit.flags_inv & HIDESHOES)) - if(shoes.clean_blood()) + if(shoes.clean_blood(radiation_clean)) update_inv_shoes() clean_feet = FALSE if(s_store && !(wear_suit && wear_suit.flags_inv & HIDESUITSTORAGE)) - if(s_store.clean_blood()) + if(s_store.clean_blood(radiation_clean)) update_inv_s_store() if(lip_style && !(head && head.flags_inv & HIDEMASK)) lip_style = null update_body() if(glasses && !(wear_mask && wear_mask.flags_inv & HIDEEYES)) - if(glasses.clean_blood()) + if(glasses.clean_blood(radiation_clean)) update_inv_glasses() if(l_ear && !(wear_mask && wear_mask.flags_inv & HIDEEARS)) - if(l_ear.clean_blood()) + if(l_ear.clean_blood(radiation_clean)) update_inv_ears() if(r_ear && !(wear_mask && wear_mask.flags_inv & HIDEEARS)) - if(r_ear.clean_blood()) + if(r_ear.clean_blood(radiation_clean)) update_inv_ears() if(belt) - if(belt.clean_blood()) + if(belt.clean_blood(radiation_clean)) update_inv_belt() ..(clean_hands, clean_mask, clean_feet) update_icons() //apply the now updated overlays to the mob @@ -845,6 +944,14 @@ GLOBAL_LIST_EMPTY(blood_splatter_icons) /atom/proc/ratvar_act() return +/** + * Respond to an electric bolt action on our item + * + * Default behaviour is to return, we define here to allow for cleaner code later on + */ +/atom/proc/zap_act(power, zap_flags) + return + /atom/proc/handle_ricochet(obj/item/projectile/P) return @@ -959,6 +1066,13 @@ GLOBAL_LIST_EMPTY(blood_splatter_icons) color = C return +/* + Checks whether this atom can traverse the destination object when used as source for AStar. + This should only be used as an override to /obj/proc/CanAStarPass. Aka don't use this unless you can't change the object's proc. + Returning TRUE here will override the above proc's result. +*/ +/atom/proc/CanAStarPassTo(ID, dir, obj/destination) + return TRUE /** Call this when you want to present a renaming prompt to the user. diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index d60959706d3..7232239d6f5 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -134,7 +134,7 @@ // Used in shuttle movement and AI eye stuff. // Primarily used to notify objects being moved by a shuttle/bluespace fuckup. -/atom/movable/proc/setLoc(var/T, var/teleported=0) +/atom/movable/proc/setLoc(T, teleported=0) loc = T /atom/movable/Move(atom/newloc, direct = 0, movetime) @@ -302,6 +302,7 @@ if(client) reset_perspective(destination) update_canmove() //if the mob was asleep inside a container and then got forceMoved out we need to make them fall. + update_runechat_msg_location() //Called whenever an object moves and by mobs when they attempt to move themselves through space @@ -309,7 +310,7 @@ //Return 0 to have src start/keep drifting in a no-grav area and 1 to stop/not start drifting //Mobs should return 1 if they should be able to move of their own volition, see client/Move() in mob_movement.dm //movement_dir == 0 when stopping or any dir when trying to move -/atom/movable/proc/Process_Spacemove(var/movement_dir = 0) +/atom/movable/proc/Process_Spacemove(movement_dir = 0) if(has_gravity(src)) return 1 @@ -443,9 +444,6 @@ if(master) return master.attack_hand(a, b, c) -/atom/movable/proc/water_act(volume, temperature, source, method = REAGENT_TOUCH) //amount of water acting : temperature of water in kelvin : object that called it (for shennagins) - return TRUE - /atom/movable/proc/handle_buckled_mob_movement(newloc,direct,movetime) for(var/m in buckled_mobs) var/mob/living/buckled_mob = m @@ -516,20 +514,26 @@ return //don't do an animation if attacking self var/pixel_x_diff = 0 var/pixel_y_diff = 0 + var/turn_dir = 1 var/direction = get_dir(src, A) if(direction & NORTH) pixel_y_diff = 8 + turn_dir = prob(50) ? -1 : 1 else if(direction & SOUTH) pixel_y_diff = -8 + turn_dir = prob(50) ? -1 : 1 if(direction & EAST) pixel_x_diff = 8 else if(direction & WEST) pixel_x_diff = -8 + turn_dir = -1 - animate(src, pixel_x = pixel_x + pixel_x_diff, pixel_y = pixel_y + pixel_y_diff, time = 2) - animate(pixel_x = pixel_x - pixel_x_diff, pixel_y = pixel_y - pixel_y_diff, time = 2) + var/matrix/initial_transform = matrix(transform) + var/matrix/rotated_transform = transform.Turn(5 * turn_dir) + animate(src, pixel_x = pixel_x + pixel_x_diff, pixel_y = pixel_y + pixel_y_diff, transform = rotated_transform, time = 0.1 SECONDS, easing = CUBIC_EASING) + animate(pixel_x = pixel_x - pixel_x_diff, pixel_y = pixel_y - pixel_y_diff, transform = initial_transform, time = 0.2 SECONDS, easing = SINE_EASING) /atom/movable/proc/do_item_attack_animation(atom/A, visual_effect_icon, obj/item/used_item) var/image/I @@ -568,14 +572,17 @@ if(M.client && M.client.prefs.toggles2 & PREFTOGGLE_2_ITEMATTACK) viewing |= M.client - flick_overlay(I, viewing, 5) // 5 ticks/half a second + I.appearance_flags |= RESET_TRANSFORM | KEEP_APART + flick_overlay(I, viewing, 7) // 7 ticks/half a second // And animate the attack! var/t_color = "#ffffff" - if(ismob(src) && ismob(A) && (!used_item)) + if(ismob(src) && ismob(A) && !used_item) var/mob/M = src t_color = M.a_intent == INTENT_HARM ? "#ff0000" : "#ffffff" - animate(I, alpha = 175, pixel_x = 0, pixel_y = 0, pixel_z = 0, time = 3, color = t_color) + animate(I, alpha = 175, pixel_x = 0, pixel_y = 0, pixel_z = 0, time = 0.3 SECONDS, color = t_color) + animate(time = 0.1 SECONDS) + animate(alpha = 0, time = 0.3 SECONDS, easing = CIRCULAR_EASING | EASE_OUT) /atom/movable/proc/portal_destroyed(obj/effect/portal/P) return diff --git a/code/game/data_huds.dm b/code/game/data_huds.dm index 121838ee304..3692f725361 100644 --- a/code/game/data_huds.dm +++ b/code/game/data_huds.dm @@ -96,7 +96,7 @@ //helper for getting the appropriate health status /proc/RoundHealth(mob/living/M) - if(M.stat == DEAD || (M.status_flags & FAKEDEATH)) + if(M.stat == DEAD || (HAS_TRAIT(M, TRAIT_FAKEDEATH))) return "health-100-dead" //what's our health? it doesn't matter, we're dead, or faking var/maxi_health = M.maxHealth @@ -178,7 +178,7 @@ /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 || (status_flags & FAKEDEATH) + 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) @@ -186,7 +186,7 @@ holder.icon_state = "hudflatline" else holder.icon_state = "huddead" - else if(status_flags & XENO_HOST) + else if(HAS_TRAIT(src, TRAIT_XENO_HOST)) holder.icon_state = "hudxeno" else if(B && B.controlling) holder.icon_state = "hudbrainworm" diff --git a/code/game/dna/dna2.dm b/code/game/dna/dna2.dm index a9a91ebf17f..b0323825c70 100644 --- a/code/game/dna/dna2.dm +++ b/code/game/dna/dna2.dm @@ -9,12 +9,12 @@ // and to tell our new DNA datum which values to set in order to turn something // on or off. GLOBAL_LIST_INIT(dna_activity_bounds, new(DNA_SE_LENGTH)) -GLOBAL_LIST_INIT(assigned_gene_blocks, new(DNA_SE_LENGTH)) +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)) -GLOBAL_LIST_EMPTY(dna_genes) +GLOBAL_LIST_EMPTY(dna_mutations) GLOBAL_LIST_EMPTY(good_blocks) GLOBAL_LIST_EMPTY(bad_blocks) @@ -173,7 +173,7 @@ GLOBAL_LIST_EMPTY(bad_blocks) var/value = GetUIValue(block) return round(1 + (value / 4096) * maxvalue) -// Is the UI gene "on" or "off"? +// Is the UI mutation "on" or "off"? // For UI, this is simply a check of if the value is > 2050. /datum/dna/proc/GetUIState(block) if(block <= 0) @@ -181,7 +181,7 @@ GLOBAL_LIST_EMPTY(bad_blocks) return UI[block] > 2050 -// Set UI gene "on" (1) or "off" (0) +// Set UI mutation "on" (1) or "off" (0) /datum/dna/proc/SetUIState(block, on, defer = FALSE) if(block <= 0) return @@ -299,7 +299,7 @@ GLOBAL_LIST_EMPTY(bad_blocks) var/value = GetSEValue(block) return round(1 + (value / 4096) * maxvalue) -// Is the block "on" (1) or "off" (0)? (Un-assigned genes are always off.) +// Is the block "on" (1) or "off" (0)? (Un-assigned mutations are always off.) /datum/dna/proc/GetSEState(block) if(block <= 0) return FALSE @@ -443,4 +443,4 @@ GLOBAL_LIST_EMPTY(bad_blocks) destination.dna.species.handle_dna(destination) // Handle DNA has to be re-called as the DNA was changed. destination.UpdateAppearance() - domutcheck(destination, null, MUTCHK_FORCED) + domutcheck(destination, MUTCHK_FORCED) diff --git a/code/game/dna/dna2_domutcheck.dm b/code/game/dna/dna2_domutcheck.dm index 16eee549bf2..d82e652dbb7 100644 --- a/code/game/dna/dna2_domutcheck.dm +++ b/code/game/dna/dna2_domutcheck.dm @@ -1,67 +1,56 @@ // (Re-)Apply mutations. // TODO: Turn into a /mob proc, change inj to a bitflag for various forms of differing behavior. // M: Mob to mess with -// connected: Machine we're in, type unchecked so I doubt it's used beyond monkeying // flags: See below, bitfield. -/proc/domutcheck(mob/living/M, connected = null, flags = 0) - for(var/datum/dna/gene/gene in GLOB.dna_genes) +/proc/domutcheck(mob/living/M, flags = 0) + for(var/datum/mutation/mutation in GLOB.dna_mutations) if(!M || !M.dna) return - if(!gene.block) + if(!mutation.block) continue - domutation(gene, M, connected, flags) + domutation(mutation, M, flags) -// Use this to force a mut check on a single gene! -/proc/genemutcheck(mob/living/M, block, connected = null, flags = 0) - if(ishuman(M)) // Would've done this via species instead of type, but the basic mob doesn't have a species, go figure. - var/mob/living/carbon/human/H = M - if(NO_DNA in H.dna.species.species_traits) - return +// Use this to force a mut check on a single mutation! +/proc/singlemutcheck(mob/living/M, block, flags = 0) if(!M) return + if(HAS_TRAIT(M, TRAIT_GENELESS)) + return if(block < 0) return - var/datum/dna/gene/gene = GLOB.assigned_gene_blocks[block] - domutation(gene, M, connected, flags) + var/datum/mutation/mutation = GLOB.assigned_mutation_blocks[block] + domutation(mutation, M, flags) -/proc/domutation(datum/dna/gene/gene, mob/living/M, connected = null, flags = 0) - if(!gene || !istype(gene)) +/proc/domutation(datum/mutation/mutation, mob/living/M, flags = 0) + if(!mutation || !istype(mutation)) return FALSE // Current state - var/gene_active = M.dna.GetSEState(gene.block) + var/mutation_active = M.dna.GetSEState(mutation.block) // Sanity checks, don't skip. - if(!gene.can_activate(M,flags) && gene_active) + if(!mutation.can_activate(M, flags) && mutation_active) //testing("[M] - Failed to activate [gene.name] (can_activate fail).") return FALSE - var/defaultgenes // Do not mutate inherent species abilities - if(ishuman(M)) - var/mob/living/carbon/human/H = M - defaultgenes = H.dna.species.default_genes - - if((gene in defaultgenes) && gene_active) - return - // Prior state - var/gene_prior_status = (gene.type in M.active_genes) - var/changed = gene_active != gene_prior_status + var/mutation_prior_status = (mutation.type in M.active_mutations) + var/changed = mutation_active != mutation_prior_status // If gene state has changed: if(changed) // Gene active (or ALWAYS ACTIVATE) - if(gene_active) + if(mutation_active) //testing("[gene.name] activated!") - gene.activate(M,connected,flags) + mutation.activate(M) if(M) - M.active_genes |= gene.type + M.active_mutations |= mutation.type // If Gene is NOT active: else //testing("[gene.name] deactivated!") - gene.deactivate(M,connected,flags) + mutation.deactivate(M) if(M) - M.active_genes -= gene.type + M.active_mutations -= mutation.type diff --git a/code/game/dna/dna2_helpers.dm b/code/game/dna/dna2_helpers.dm index 7ded549f29b..9ecad776e3e 100644 --- a/code/game/dna/dna2_helpers.dm +++ b/code/game/dna/dna2_helpers.dm @@ -60,7 +60,7 @@ if(prob(prob)) M.dna.SetSEValue(i, rand(1, 4095), 1) M.dna.UpdateSE() - domutcheck(M, null) + domutcheck(M) // I haven't yet figured out what the fuck this is supposed to do. /proc/miniscramble(input, rs, rd) @@ -213,7 +213,7 @@ // This proc gives the DNA info for eye color to the given eyes /datum/dna/proc/write_eyes_attributes(obj/item/organ/internal/eyes/eyes_organ) - eyes_organ.eye_colour = rgb(eyes_organ.dna.GetUIValueRange(DNA_UI_EYES_R, 255), eyes_organ.dna.GetUIValueRange(DNA_UI_EYES_G, 255), eyes_organ.dna.GetUIValueRange(DNA_UI_EYES_B, 255)) + eyes_organ.eye_color = rgb(eyes_organ.dna.GetUIValueRange(DNA_UI_EYES_R, 255), eyes_organ.dna.GetUIValueRange(DNA_UI_EYES_G, 255), eyes_organ.dna.GetUIValueRange(DNA_UI_EYES_B, 255)) /* TRAIT CHANGING PROCS @@ -223,9 +223,9 @@ // In absence of eyes, possibly randomize the eye color DNA? return - SetUIValueRange(DNA_UI_EYES_R, color2R(eyes_organ.eye_colour), 255, 1) - SetUIValueRange(DNA_UI_EYES_G, color2G(eyes_organ.eye_colour), 255, 1) - SetUIValueRange(DNA_UI_EYES_B, color2B(eyes_organ.eye_colour), 255, 1) + SetUIValueRange(DNA_UI_EYES_R, color2R(eyes_organ.eye_color), 255, 1) + SetUIValueRange(DNA_UI_EYES_G, color2G(eyes_organ.eye_color), 255, 1) + SetUIValueRange(DNA_UI_EYES_B, color2B(eyes_organ.eye_color), 255, 1) /datum/dna/proc/head_traits_to_dna(obj/item/organ/external/head/head_organ) if(!head_organ) diff --git a/code/game/dna/dna_modifier.dm b/code/game/dna/dna_modifier.dm index 5b1a14bba1f..11aa0cce55a 100644 --- a/code/game/dna/dna_modifier.dm +++ b/code/game/dna/dna_modifier.dm @@ -312,12 +312,10 @@ if(!occupant) return TRUE - if(ishuman(occupant)) - var/mob/living/carbon/human/H = occupant - if(NO_DNA in H.dna.species.species_traits) - return TRUE + if(HAS_TRAIT(occupant, TRAIT_GENELESS)) + return TRUE - var/radiation_protection = occupant.run_armor_check(null, "rad", "Your clothes feel warm.", "Your clothes feel warm.") + var/radiation_protection = occupant.run_armor_check(null, "rad") if(radiation_protection > NEGATE_MUTATION_THRESHOLD) return TRUE return FALSE @@ -473,7 +471,7 @@ occupantData["name"] = connected.occupant.dna.real_name occupantData["stat"] = connected.occupant.stat occupantData["isViableSubject"] = 1 - if((NOCLONE in connected.occupant.mutations && connected.scan_level < 3) || !connected.occupant.dna || (NO_DNA in connected.occupant.dna.species.species_traits)) + if((HAS_TRAIT(connected.occupant, TRAIT_BADDNA) && connected.scan_level < 3) || !connected.occupant.dna || HAS_TRAIT(connected.occupant, TRAIT_GENELESS)) occupantData["isViableSubject"] = 0 occupantData["health"] = connected.occupant.health occupantData["maxHealth"] = connected.occupant.maxHealth @@ -540,7 +538,7 @@ return var/radiation = (((radiation_intensity * 3) + radiation_duration * 3) / connected.damage_coeff) - connected.occupant.apply_effect(radiation, IRRADIATE, 0) + connected.occupant.apply_effect(radiation, IRRADIATE) if(connected.radiation_check()) return @@ -588,7 +586,7 @@ if(prob((80 + (radiation_duration / 2)))) var/radiation = (radiation_intensity + radiation_duration) - connected.occupant.apply_effect(radiation,IRRADIATE,0) + connected.occupant.apply_effect(radiation, IRRADIATE) if(connected.radiation_check()) return @@ -598,13 +596,13 @@ connected.occupant.UpdateAppearance() else var/radiation = ((radiation_intensity * 2) + radiation_duration) - connected.occupant.apply_effect(radiation, IRRADIATE, 0) + connected.occupant.apply_effect(radiation, IRRADIATE) if(connected.radiation_check()) return if(prob(20 + radiation_intensity)) randmutb(connected.occupant) - domutcheck(connected.occupant, connected) + domutcheck(connected.occupant) else randmuti(connected.occupant) connected.occupant.UpdateAppearance() @@ -644,7 +642,7 @@ if(connected.occupant) if(prob((80 + ((radiation_duration / 2) + (connected.precision_coeff ** 3))))) var/radiation = ((radiation_intensity + radiation_duration) / connected.damage_coeff) - connected.occupant.apply_effect(radiation, IRRADIATE, 0) + connected.occupant.apply_effect(radiation, IRRADIATE) if(connected.radiation_check()) return 1 @@ -659,10 +657,10 @@ //testing("Irradiated SE block [real_SE_block]:[selected_se_subblock] ([original_block] now [block]) [(real_SE_block!=selected_se_block) ? "(SHIFTED)":""]!") connected.occupant.dna.SetSESubBlock(real_SE_block, selected_se_subblock, block) - domutcheck(connected.occupant, connected) + domutcheck(connected.occupant) else var/radiation = (((radiation_intensity * 2) + radiation_duration) / connected.damage_coeff) - connected.occupant.apply_effect(radiation, IRRADIATE, 0) + connected.occupant.apply_effect(radiation, IRRADIATE) if(connected.radiation_check()) return @@ -670,7 +668,7 @@ if(prob(80 - radiation_duration)) //testing("Random bad mut!") randmutb(connected.occupant) - domutcheck(connected.occupant, connected) + domutcheck(connected.occupant) else randmuti(connected.occupant) //testing("Random identity mut!") @@ -723,7 +721,7 @@ if("changeLabel") ui_modal_input(src, "changeBufferLabel", "Please enter the new buffer label:", null, list("id" = bufferId), buffer.name, UI_MODAL_INPUT_MAX_LENGTH_NAME) if("transfer") - if(!connected.occupant || (NOCLONE in connected.occupant.mutations && connected.scan_level < 3) || !connected.occupant.dna) + if(!connected.occupant || (HAS_TRAIT(connected.occupant, TRAIT_BADDNA) && connected.scan_level < 3) || !connected.occupant.dna) return irradiating = 2 @@ -737,7 +735,7 @@ connected.locked = lock_state var/radiation = (rand(20,50) / connected.damage_coeff) - connected.occupant.apply_effect(radiation, IRRADIATE, 0) + connected.occupant.apply_effect(radiation, IRRADIATE) if(connected.radiation_check()) return @@ -752,7 +750,7 @@ else if(buf.types & DNA2_BUF_SE) connected.occupant.dna.SE = buf.dna.SE.Copy() connected.occupant.dna.UpdateSE() - domutcheck(connected.occupant, connected) + domutcheck(connected.occupant) if("createInjector") if(!injector_ready) return diff --git a/code/game/dna/genes/disabilities.dm b/code/game/dna/genes/disabilities.dm deleted file mode 100644 index 8970a115f5e..00000000000 --- a/code/game/dna/genes/disabilities.dm +++ /dev/null @@ -1,261 +0,0 @@ -///////////////////// -// DISABILITY GENES -// -// These activate either a mutation, disability -// -// Gene is always activated. -///////////////////// - -/datum/dna/gene/disability - name = "DISABILITY" - - // Mutation to give (or 0) - var/mutation = 0 - - // Activation message - var/activation_message = "" - - // Yay, you're no longer growing 3 arms - var/deactivation_message = "" - -/datum/dna/gene/disability/can_activate(mob/M, flags) - return TRUE // Always set! - -/datum/dna/gene/disability/activate(mob/living/M, connected, flags) - ..() - M.mutations |= mutation - if(activation_message) - to_chat(M, "[activation_message]") - else - testing("[name] has no activation message.") - -/datum/dna/gene/disability/deactivate(mob/living/M, connected, flags) - ..() - M.mutations.Remove(mutation) - if(deactivation_message) - to_chat(M, "[deactivation_message]") - else - testing("[name] has no deactivation message.") - -/datum/dna/gene/disability/hallucinate - name = "Hallucinate" - activation_message = "Your mind says 'Hello'." - deactivation_message = "Sanity returns. Or does it?" - instability = -GENE_INSTABILITY_MODERATE - mutation = HALLUCINATE - -/datum/dna/gene/disability/hallucinate/New() - ..() - block = GLOB.hallucinationblock - -/datum/dna/gene/disability/hallucinate/OnMobLife(mob/living/carbon/human/H) - if(prob(1)) - H.AdjustHallucinate(45) - -/datum/dna/gene/disability/epilepsy - name = "Epilepsy" - activation_message = "You get a headache." - deactivation_message = "Your headache is gone, at last." - instability = -GENE_INSTABILITY_MODERATE - mutation = EPILEPSY - -/datum/dna/gene/disability/epilepsy/New() - ..() - block = GLOB.epilepsyblock - -/datum/dna/gene/disability/epilepsy/OnMobLife(mob/living/carbon/human/H) - if((prob(1) && H.paralysis < 1)) - H.visible_message("[H] starts having a seizure!","You have a seizure!") - H.Paralyse(10) - H.Jitter(1000) - -/datum/dna/gene/disability/cough - name = "Coughing" - activation_message = "You start coughing." - deactivation_message = "Your throat stops aching." - instability = -GENE_INSTABILITY_MINOR - mutation = COUGHING - -/datum/dna/gene/disability/cough/New() - ..() - block = GLOB.coughblock - -/datum/dna/gene/disability/cough/OnMobLife(mob/living/carbon/human/H) - if((prob(5) && H.paralysis <= 1)) - H.drop_item() - H.emote("cough") - -/datum/dna/gene/disability/clumsy - name = "Clumsiness" - activation_message = "You feel lightheaded." - deactivation_message = "You regain some control of your movements" - instability = -GENE_INSTABILITY_MINOR - mutation = CLUMSY - -/datum/dna/gene/disability/clumsy/New() - ..() - block = GLOB.clumsyblock - -/datum/dna/gene/disability/tourettes - name = "Tourettes" - activation_message = "You twitch." - deactivation_message = "Your mouth tastes like soap." - instability = -GENE_INSTABILITY_MODERATE - mutation = TOURETTES - -/datum/dna/gene/disability/tourettes/New() - ..() - block = GLOB.twitchblock - -/datum/dna/gene/disability/tourettes/OnMobLife(mob/living/carbon/human/H) - if((prob(10) && H.paralysis <= 1)) - H.Stun(10) - switch(rand(1, 3)) - if(1) - H.emote("twitch") - if(2 to 3) - H.say("[prob(50) ? ";" : ""][pick("SHIT", "PISS", "FUCK", "CUNT", "COCKSUCKER", "MOTHERFUCKER", "TITS")]") - var/x_offset_old = H.pixel_x - var/y_offset_old = H.pixel_y - var/x_offset = H.pixel_x + rand(-2, 2) - var/y_offset = H.pixel_y + rand(-1, 1) - animate(H, pixel_x = x_offset, pixel_y = y_offset, time = 1) - animate(H, pixel_x = x_offset_old, pixel_y = y_offset_old, time = 1) - -/datum/dna/gene/disability/nervousness - name = "Nervousness" - activation_message="You feel nervous." - deactivation_message ="You feel much calmer." - mutation = NERVOUS - -/datum/dna/gene/disability/nervousness/New() - ..() - block = GLOB.nervousblock - -/datum/dna/gene/disability/nervousness/OnMobLife(mob/living/carbon/human/H) - if(prob(10)) - H.Stuttering(10) - -/datum/dna/gene/disability/blindness - name = "Blindness" - activation_message = "You can't seem to see anything." - deactivation_message = "You can see now, in case you didn't notice..." - instability = -GENE_INSTABILITY_MAJOR - mutation = BLINDNESS - -/datum/dna/gene/disability/blindness/New() - ..() - block = GLOB.blindblock - -/datum/dna/gene/disability/blindness/activate(mob/M, connected, flags) - ..() - M.update_blind_effects() - -/datum/dna/gene/disability/blindness/deactivate(mob/M, connected, flags) - ..() - M.update_blind_effects() - - -/datum/dna/gene/disability/colourblindness - name = "Colourblindness" - activation_message = "You feel a peculiar prickling in your eyes while your perception of colour changes." - deactivation_message ="Your eyes tingle unsettlingly, though everything seems to become alot more colourful." - instability = -GENE_INSTABILITY_MODERATE - mutation = COLOURBLIND - -/datum/dna/gene/disability/colourblindness/New() - ..() - block = GLOB.colourblindblock - -/datum/dna/gene/disability/colourblindness/activate(mob/M, connected, flags) - ..() - M.update_client_colour() //Handle the activation of the colourblindness on the mob. - M.update_icons() //Apply eyeshine as needed. - -/datum/dna/gene/disability/colourblindness/deactivate(mob/M, connected, flags) - ..() - M.update_client_colour() //Handle the deactivation of the colourblindness on the mob. - M.update_icons() //Remove eyeshine as needed. - -/datum/dna/gene/disability/deaf - name = "Deafness" - activation_message="It's kinda quiet." - deactivation_message ="You can hear again!" - instability = -GENE_INSTABILITY_MAJOR - mutation = DEAF - -/datum/dna/gene/disability/deaf/New() - ..() - block = GLOB.deafblock - -/datum/dna/gene/disability/deaf/activate(mob/M, connected, flags) - ..() - M.MinimumDeafTicks(1) - -/datum/dna/gene/disability/nearsighted - name = "Nearsightedness" - activation_message="Your eyes feel weird..." - deactivation_message ="You can see clearly now" - instability = -GENE_INSTABILITY_MODERATE - mutation = NEARSIGHTED - -/datum/dna/gene/disability/nearsighted/New() - ..() - block = GLOB.glassesblock - -/datum/dna/gene/disability/nearsighted/activate(mob/living/M, connected, flags) - ..() - M.update_nearsighted_effects() - -/datum/dna/gene/disability/nearsighted/deactivate(mob/living/M, connected, flags) - ..() - M.update_nearsighted_effects() - -/datum/dna/gene/disability/lisp - name = "Lisp" - desc = "I wonder wath thith doeth." - activation_message = "Thomething doethn't feel right." - deactivation_message = "You now feel able to pronounce consonants." - mutation = LISP - -/datum/dna/gene/disability/lisp/New() - ..() - block = GLOB.lispblock - -/datum/dna/gene/disability/lisp/OnSay(mob/M, message) - return replacetext(message,"s","th") - -/datum/dna/gene/disability/comic - name = "Comic" - desc = "This will only bring death and destruction." - activation_message = "Uh oh!" - deactivation_message = "Well thank god that's over with." - mutation = COMIC - -/datum/dna/gene/disability/comic/New() - ..() - block = GLOB.comicblock - -/datum/dna/gene/disability/wingdings - name = "Alien Voice" - desc = "Garbles the subject's voice into an incomprehensible speech." - activation_message = "Your vocal cords feel alien." - deactivation_message = "Your vocal cords no longer feel alien." - instability = -GENE_INSTABILITY_MINOR - mutation = WINGDINGS - -/datum/dna/gene/disability/wingdings/New() - ..() - block = GLOB.wingdingsblock - -/datum/dna/gene/disability/wingdings/OnSay(mob/M, message) - var/garbled_message = "" - for(var/i in 1 to length(message)) - if(message[i] in GLOB.alphabet_uppercase) - garbled_message += pick(GLOB.alphabet_uppercase) - else if(message[i] in GLOB.alphabet) - garbled_message += pick(GLOB.alphabet) - else - garbled_message += message[i] - message = garbled_message - return message diff --git a/code/game/dna/genes/gene.dm b/code/game/dna/genes/gene.dm deleted file mode 100644 index 1509cd098a4..00000000000 --- a/code/game/dna/genes/gene.dm +++ /dev/null @@ -1,126 +0,0 @@ -/** -* Gene Datum -* -* domutcheck was getting pretty hairy. This is the solution. -* -* All genes are stored in a global variable to cut down on memory -* usage. -* -* @author N3X15 -*/ - -/datum/dna/gene - // Display name - var/name = "BASE GENE" - - // Probably won't get used but why the fuck not - var/desc="Oh god who knows what this does." - - // Set in initialize()! - // What gene activates this? - var/block = 0 - - // Any of a number of GENE_ flags. - var/flags = 0 - - // Chance of the gene to cause adverse effects when active - var/instability = 0 - -/* -* Is the gene active in this mob's DNA? -*/ -/datum/dna/gene/proc/is_active(mob/M) - return M.active_genes && (type in M.active_genes) - -// Return 1 if we can activate. -// HANDLE MUTCHK_FORCED HERE! -/datum/dna/gene/proc/can_activate(mob/M, flags) - return FALSE - -// Called when the gene activates. Do your magic here. -/datum/dna/gene/proc/activate(mob/living/M, connected, flags) - M.gene_stability -= instability - -/** -* Called when the gene deactivates. Undo your magic here. -* Only called when the block is deactivated. -*/ -/datum/dna/gene/proc/deactivate(mob/living/M, connected, flags) - M.gene_stability += instability - -// This section inspired by goone's bioEffects. - -/** -* Called in each life() tick. -*/ -/datum/dna/gene/proc/OnMobLife(mob/M) - return - -/** -* Called when the mob dies -*/ -/datum/dna/gene/proc/OnMobDeath(mob/M) - return - -/** -* Called when the mob says shit -*/ -/datum/dna/gene/proc/OnSay(mob/M, message) - return message - -/** -* Called after the mob runs update_icons. -* -* @params M The subject. -* @params g Gender (m or f) -*/ -/datum/dna/gene/proc/OnDrawUnderlays(mob/M, g) - return FALSE - - -///////////////////// -// BASIC GENES -// -// These just chuck in a mutation and display a message. -// -// Gene is activated: -// 1. If mutation already exists in mob -// 2. If the probability roll succeeds -// 3. Activation is forced (done in domutcheck) -///////////////////// - - -/datum/dna/gene/basic - name = "BASIC GENE" - - // Mutation to give - var/mutation = 0 - - // Activation probability - var/activation_prob = 100 - - // Possible activation messages - var/list/activation_messages = list() - - // Possible deactivation messages - var/list/deactivation_messages = list() - -/datum/dna/gene/basic/can_activate(mob/M, flags) - if(flags & MUTCHK_FORCED) - return TRUE - // Probability check - return prob(activation_prob) - -/datum/dna/gene/basic/activate(mob/M, connected, flags) - ..() - M.mutations.Add(mutation) - if(activation_messages.len) - var/msg = pick(activation_messages) - to_chat(M, "[msg]") - -/datum/dna/gene/basic/deactivate(mob/living/M, connected, flags) - ..() - M.mutations.Remove(mutation) - if(deactivation_messages.len) - var/msg = pick(deactivation_messages) - to_chat(M, "[msg]") diff --git a/code/game/dna/genes/goon_disabilities.dm b/code/game/dna/genes/goon_disabilities.dm deleted file mode 100644 index 2d2d19cc3bb..00000000000 --- a/code/game/dna/genes/goon_disabilities.dm +++ /dev/null @@ -1,298 +0,0 @@ -////////////////// -// DISABILITIES // -////////////////// - -//////////////////////////////////////// -// Totally Crippling -//////////////////////////////////////// - -// WAS: /datum/bioEffect/mute -/datum/dna/gene/disability/mute - name = "Mute" - desc = "Completely shuts down the speech center of the subject's brain." - activation_message = "You feel unable to express yourself at all." - deactivation_message = "You feel able to speak freely again." - instability = -GENE_INSTABILITY_MODERATE - mutation = MUTE - -/datum/dna/gene/disability/mute/New() - ..() - block = GLOB.muteblock - -/datum/dna/gene/disability/mute/OnSay(mob/M, message) - return "" - -//////////////////////////////////////// -// Harmful to others as well as self -//////////////////////////////////////// - -/datum/dna/gene/disability/radioactive - name = "Radioactive" - desc = "The subject suffers from constant radiation sickness and causes the same on nearby organics." - activation_message = "You feel a strange sickness permeate your whole body." - deactivation_message = "You no longer feel awful and sick all over." - instability = -GENE_INSTABILITY_MAJOR - mutation = RADIOACTIVE - -/datum/dna/gene/disability/radioactive/New() - ..() - block = GLOB.radblock - - -/datum/dna/gene/disability/radioactive/can_activate(mob/M, flags) - if(!..()) - return FALSE - if(ishuman(M)) - var/mob/living/carbon/human/H = M - if((RADIMMUNE in H.dna.species.species_traits) && !(flags & MUTCHK_FORCED)) - return FALSE - return TRUE - -/datum/dna/gene/disability/radioactive/OnMobLife(mob/living/carbon/human/H) - var/radiation_amount = abs(min(H.radiation - 20,0)) - H.apply_effect(radiation_amount, IRRADIATE) - for(var/mob/living/L in range(1, H)) - if(L == H) - continue - to_chat(L, "You are enveloped by a soft green glow emanating from [H].") - L.apply_effect(5, IRRADIATE) - -/datum/dna/gene/disability/radioactive/OnDrawUnderlays(mob/M, g) - return "rads_s" - -//////////////////////////////////////// -// Other disabilities -//////////////////////////////////////// - -// WAS: /datum/bioEffect/fat -/datum/dna/gene/disability/fat - name = "Obesity" - desc = "Greatly slows the subject's metabolism, enabling greater buildup of lipid tissue." - activation_message = "You feel blubbery and lethargic!" - deactivation_message = "You feel fit!" - instability = -GENE_INSTABILITY_MINOR - mutation = OBESITY - -/datum/dna/gene/disability/fat/New() - ..() - block = GLOB.fatblock - -// WAS: /datum/bioEffect/chav -/datum/dna/gene/disability/speech/chav - name = "Chav" - desc = "Forces the language center of the subject's brain to construct sentences in a more rudimentary manner." - activation_message = "Ye feel like a rite prat like, innit?" - deactivation_message = "You no longer feel like being rude and sassy." - mutation = CHAV - //List of swappable words. Normal word first, chav word second. - var/static/list/chavlinks = list( - "arrest" = "nick", - "arrested" = "nicked", - "ass" = "arse", - "bad" = "pants", - "bar" = "spoons", - "brain" = "noggin", - "break" = "smash", - "broke" = "smashed", - "broken" = "gone kaput", - "comdom" = "knob'ed", - "cool" = "ace", - "crazy" = "well mad", - "cup of tea" = "cuppa", - "destroyed" = "rekt", - "dick" = "prat", - "disappointed" = "gutted", - "disgusting" = "minging", - "disposals" = "bins", - "drink" = "bevvy", - "engineer" = "sparky", - "excited" = "jacked", - "fight" = "scuffle", - "food" = "nosh", - "friend" = "blud", - "fuck" = "fook", - "get" = "giz", - "girl" = "bird", - "go away" = "jog on", - "good" = "mint", - "great" = "bangin'", - "happy" = "chuffed", - "hello" = "orite", - "hi" = "sup", - "idiot" = "twit", - "isn't it" = "innit", - "kill" = "bang", - "killed" = "banged", - "man" = "bloke", - "mess" = "shambles", - "mistake" = "cock-up", - "murder" = "hench", - "murdered" = "henched", - "no" = "naw", - "really" = "propa", - "robust" = "'ard", - "run" = "leg it", - "sec" = "cops", - "security" = "coppers", - "silly" = "daft", - "steal" = "nick", - "stole" = "nicked", - "surprised" = "gobsmacked", - "suspicious" = "dodgy", - "tired" = "knackered", - "wet" = "moist", - "what" = "wot", - "window" = "windy", - "windows" = "windies", - "yes" = "ye", - "yikes" = "blimey", - "your" = "yur" - ) - -/datum/dna/gene/disability/speech/chav/New() - ..() - block = GLOB.chavblock - -/datum/dna/gene/disability/speech/chav/OnSay(mob/M, message) - var/static/regex/R = regex("\\b([chavlinks.Join("|")])\\b", "g") - message = R.Replace(message, /datum/dna/gene/disability/speech/chav/proc/replace_speech) - return message -/datum/dna/gene/disability/speech/chav/proc/replace_speech(matched) - return chavlinks[matched] - -// WAS: /datum/bioEffect/swedish -/datum/dna/gene/disability/speech/swedish - name = "Swedish" - desc = "Forces the language center of the subject's brain to construct sentences in a vaguely norse manner." - activation_message = "You feel Swedish, however that works." - deactivation_message = "The feeling of Swedishness passes." - mutation = SWEDISH - -/datum/dna/gene/disability/speech/swedish/New() - ..() - block = GLOB.swedeblock - -/datum/dna/gene/disability/speech/swedish/OnSay(mob/M, message) - // svedish - message = replacetextEx(message,"W","V") - message = replacetextEx(message,"w","v") - message = replacetextEx(message,"J","Y") - message = replacetextEx(message,"j","y") - message = replacetextEx(message,"A",pick("Å","Ä","Æ","A")) - message = replacetextEx(message,"a",pick("å","ä","æ","a")) - message = replacetextEx(message,"BO","BJO") - message = replacetextEx(message,"Bo","Bjo") - message = replacetextEx(message,"bo","bjo") - message = replacetextEx(message,"O",pick("Ö","Ø","O")) - message = replacetextEx(message,"o",pick("ö","ø","o")) - if(prob(30) && !M.is_muzzled()) - message += " Bork[pick("",", bork",", bork, bork")]!" - return message - -// WAS: /datum/bioEffect/unintelligable -/datum/dna/gene/disability/unintelligable - name = "Unintelligable" - desc = "Heavily corrupts the part of the brain responsible for forming spoken sentences." - activation_message = "You can't seem to form any coherent thoughts!" - deactivation_message = "Your mind feels more clear." - instability = -GENE_INSTABILITY_MINOR - mutation = SCRAMBLED - -/datum/dna/gene/disability/unintelligable/New() - ..() - block = GLOB.scrambleblock - -/datum/dna/gene/disability/unintelligable/OnSay(mob/M, message) - var/prefix = copytext(message,1,2) - if(prefix == ";") - message = copytext(message,2) - else if(prefix in list(":","#")) - prefix += copytext(message,2,3) - message = copytext(message,3) - else - prefix="" - - var/list/words = splittext(message," ") - var/list/rearranged = list() - for(var/i=1;i<=words.len;i++) - var/cword = pick(words) - words.Remove(cword) - var/suffix = copytext(cword,length(cword)-1,length(cword)) - while(length(cword)>0 && (suffix in list(".",",",";","!",":","?"))) - cword = copytext(cword,1 ,length(cword)-1) - suffix = copytext(cword,length(cword)-1,length(cword) ) - if(length(cword)) - rearranged += cword - return "[prefix][uppertext(jointext(rearranged," "))]!!" - -////////////////// -// USELESS SHIT // -////////////////// - -// WAS: /datum/bioEffect/strong -/datum/dna/gene/disability/strong - // pretty sure this doesn't do jack shit, putting it here until it does - name = "Strong" - desc = "Enhances the subject's ability to build and retain heavy muscles." - activation_message = "You feel buff!" - deactivation_message = "You feel wimpy and weak." - mutation = STRONG - -/datum/dna/gene/disability/strong/New() - ..() - block = GLOB.strongblock - -// WAS: /datum/bioEffect/horns -/datum/dna/gene/disability/horns - name = "Horns" - desc = "Enables the growth of a compacted keratin formation on the subject's head." - activation_message = "A pair of horns erupt from your head." - deactivation_message = "Your horns crumble away into nothing." - mutation = HORNS - -/datum/dna/gene/disability/horns/New() - ..() - block = GLOB.hornsblock - -/datum/dna/gene/disability/horns/OnDrawUnderlays(mob/M, g) - return "horns_s" - -//////////////////////////////////////////////////////////////////////// -// WAS: /datum/bioEffect/immolate -/datum/dna/gene/basic/grant_spell/immolate - name = "Incendiary Mitochondria" - desc = "The subject becomes able to convert excess cellular energy into thermal energy." - activation_messages = list("You suddenly feel rather hot.") - deactivation_messages = list("You no longer feel uncomfortably hot.") - mutation = IMMOLATE - - spelltype = /obj/effect/proc_holder/spell/targeted/immolate - -/datum/dna/gene/basic/grant_spell/immolate/New() - ..() - block = GLOB.immolateblock - -/obj/effect/proc_holder/spell/targeted/immolate - name = "Incendiary Mitochondria" - desc = "The subject becomes able to convert excess cellular energy into thermal energy." - panel = "Abilities" - - charge_type = "recharge" - charge_max = 600 - - clothes_req = 0 - stat_allowed = 0 - invocation_type = "none" - range = -1 - selection_type = "range" - var/list/compatible_mobs = list(/mob/living/carbon/human) - include_user = 1 - - action_icon_state = "genetic_incendiary" - -/obj/effect/proc_holder/spell/targeted/immolate/cast(list/targets, mob/living/user = usr) - var/mob/living/carbon/L = user - L.adjust_fire_stacks(0.5) - L.visible_message("[L.name] suddenly bursts into flames!") - L.IgniteMob() - playsound(L.loc, 'sound/effects/bamf.ogg', 50, 0) diff --git a/code/game/dna/genes/goon_powers.dm b/code/game/dna/genes/goon_powers.dm deleted file mode 100644 index 1b470a125c8..00000000000 --- a/code/game/dna/genes/goon_powers.dm +++ /dev/null @@ -1,618 +0,0 @@ -#define EAT_MOB_DELAY 300 // 30s - -// WAS: /datum/bioEffect/alcres -/datum/dna/gene/basic/sober - name = "Sober" - activation_messages = list("You feel unusually sober.") - deactivation_messages = list("You feel like you could use a stiff drink.") - - mutation = SOBER - -/datum/dna/gene/basic/sober/New() - ..() - block = GLOB.soberblock - -//WAS: /datum/bioEffect/psychic_resist -/datum/dna/gene/basic/psychic_resist - name = "Psy-Resist" - desc = "Boosts efficiency in sectors of the brain commonly associated with meta-mental energies." - activation_messages = list("Your mind feels closed.") - deactivation_messages = list("You feel oddly exposed.") - - mutation = PSY_RESIST - -/datum/dna/gene/basic/psychic_resist/New() - ..() - block = GLOB.psyresistblock - -///////////////////////// -// Stealth Enhancers -///////////////////////// - -/datum/dna/gene/basic/stealth - instability = GENE_INSTABILITY_MODERATE - -/datum/dna/gene/basic/stealth/can_activate(mob/M, flags) - // Can only activate one of these at a time. - if(is_type_in_list(/datum/dna/gene/basic/stealth,M.active_genes)) - testing("Cannot activate [type]: /datum/dna/gene/basic/stealth in M.active_genes.") - return FALSE - return ..() - -/datum/dna/gene/basic/stealth/deactivate(mob/living/M, connected, flags) - ..() - M.alpha = 255 - -// WAS: /datum/bioEffect/darkcloak -/datum/dna/gene/basic/stealth/darkcloak - name = "Cloak of Darkness" - desc = "Enables the subject to bend low levels of light around themselves, creating a cloaking effect." - activation_messages = list("You begin to fade into the shadows.") - deactivation_messages = list("You become fully visible.") - activation_prob = 25 - mutation = CLOAK - -/datum/dna/gene/basic/stealth/darkcloak/New() - ..() - block = GLOB.shadowblock - -/datum/dna/gene/basic/stealth/darkcloak/OnMobLife(mob/M) - var/turf/simulated/T = get_turf(M) - if(!istype(T)) - return - var/light_available = T.get_lumcount() * 10 - if(light_available <= 2) - M.alpha = round(M.alpha * 0.8) - else - M.alpha = 255 - -//WAS: /datum/bioEffect/chameleon -/datum/dna/gene/basic/stealth/chameleon - name = "Chameleon" - desc = "The subject becomes able to subtly alter light patterns to become invisible, as long as they remain still." - activation_messages = list("You feel one with your surroundings.") - deactivation_messages = list("You feel oddly visible.") - activation_prob = 25 - mutation = CHAMELEON - -/datum/dna/gene/basic/stealth/chameleon/New() - ..() - block = GLOB.chameleonblock - -/datum/dna/gene/basic/stealth/chameleon/OnMobLife(mob/M) - if((world.time - M.last_movement) >= 30 && !M.stat && M.canmove && !M.restrained()) - M.alpha -= 25 - else - M.alpha = round(255 * 0.80) - -///////////////////////////////////////////////////////////////////////////////////////// - -/datum/dna/gene/basic/grant_spell - var/obj/effect/proc_holder/spell/spelltype - -/datum/dna/gene/basic/grant_spell/activate(mob/M, connected, flags) - M.AddSpell(new spelltype(null)) - ..() - return TRUE - -/datum/dna/gene/basic/grant_spell/deactivate(mob/M, connected, flags) - for(var/obj/effect/proc_holder/spell/S in M.mob_spell_list) - if(istype(S, spelltype)) - M.RemoveSpell(S) - ..() - return TRUE - -/datum/dna/gene/basic/grant_verb - var/verbtype - -/datum/dna/gene/basic/grant_verb/activate(mob/M, connected, flags) - ..() - M.verbs += verbtype - return TRUE - -/datum/dna/gene/basic/grant_verb/deactivate(mob/M, connected, flags) - ..() - M.verbs -= verbtype - -// WAS: /datum/bioEffect/cryokinesis -/datum/dna/gene/basic/grant_spell/cryo - name = "Cryokinesis" - desc = "Allows the subject to lower the body temperature of others." - activation_messages = list("You notice a strange cold tingle in your fingertips.") - deactivation_messages = list("Your fingers feel warmer.") - instability = GENE_INSTABILITY_MODERATE - mutation = CRYO - - spelltype = /obj/effect/proc_holder/spell/targeted/click/cryokinesis - -/datum/dna/gene/basic/grant_spell/cryo/New() - ..() - block = GLOB.cryoblock - -/obj/effect/proc_holder/spell/targeted/click/cryokinesis - name = "Cryokinesis" - desc = "Drops the bodytemperature of another person." - panel = "Abilities" - - charge_type = "recharge" - charge_max = 1200 - - clothes_req = FALSE - stat_allowed = FALSE - - click_radius = 0 - auto_target_single = FALSE // Give the clueless geneticists a way out and to have them not target themselves - selection_activated_message = "Your mind grow cold. Click on a target to cast the spell." - selection_deactivated_message = "Your mind returns to normal." - allowed_type = /mob/living/carbon - invocation_type = "none" - range = 7 - selection_type = "range" - include_user = TRUE - var/list/compatible_mobs = list(/mob/living/carbon/human) - - action_icon_state = "genetic_cryo" - -/obj/effect/proc_holder/spell/targeted/click/cryokinesis/cast(list/targets, mob/user = usr) - - var/mob/living/carbon/C = targets[1] - - if(COLDRES in C.mutations) - C.visible_message("A cloud of fine ice crystals engulfs [C.name], but disappears almost instantly!") - return - var/handle_suit = FALSE - if(ishuman(C)) - var/mob/living/carbon/human/H = C - if(istype(H.head, /obj/item/clothing/head/helmet/space)) - if(istype(H.wear_suit, /obj/item/clothing/suit/space)) - handle_suit = TRUE - if(H.internal) - H.visible_message("[user] sprays a cloud of fine ice crystals, engulfing [H]!", - "[user] sprays a cloud of fine ice crystals over your [H.head]'s visor.") - else - H.visible_message("[user] sprays a cloud of fine ice crystals engulfing, [H]!", - "[user] sprays a cloud of fine ice crystals cover your [H.head]'s visor and make it into your air vents!.") - - H.bodytemperature = max(0, H.bodytemperature - 100) - add_attack_logs(user, C, "Cryokinesis") - if(!handle_suit) - C.bodytemperature = max(0, C.bodytemperature - 200) - C.ExtinguishMob() - - C.visible_message("[user] sprays a cloud of fine ice crystals, engulfing [C]!") - add_attack_logs(user, C, "Cryokinesis- NO SUIT/INTERNALS") - - //playsound(user.loc, 'bamf.ogg', 50, 0) - - new/obj/effect/self_deleting(C.loc, icon('icons/effects/genetics.dmi', "cryokinesis")) - -/obj/effect/self_deleting - density = 0 - opacity = 0 - anchored = 1 - icon = null - desc = "" - //layer = 15 - -/obj/effect/self_deleting/New(atom/location, icon/I, duration = 20, oname = "something") - . = ..() - name = oname - loc=location - icon = I - QDEL_IN(src, duration) - -/////////////////////////////////////////////////////////////////////////////////////////// - -// WAS: /datum/bioEffect/mattereater -/datum/dna/gene/basic/grant_spell/mattereater - name = "Matter Eater" - desc = "Allows the subject to eat just about anything without harm." - activation_messages = list("You feel hungry.") - deactivation_messages = list("You don't feel quite so hungry anymore.") - instability = GENE_INSTABILITY_MINOR - mutation = EATER - - spelltype=/obj/effect/proc_holder/spell/targeted/eat - -/datum/dna/gene/basic/grant_spell/mattereater/New() - ..() - block = GLOB.eatblock - -/obj/effect/proc_holder/spell/targeted/eat - name = "Eat" - desc = "Eat just about anything!" - panel = "Abilities" - - charge_type = "recharge" - charge_max = 300 - - clothes_req = 0 - stat_allowed = 0 - invocation_type = "none" - range = 1 - selection_type = "view" - - action_icon_state = "genetic_eat" - - var/list/types_allowed = list( - /obj/item, - /mob/living/simple_animal/pet, - /mob/living/simple_animal/hostile, - /mob/living/simple_animal/parrot, - /mob/living/simple_animal/crab, - /mob/living/simple_animal/mouse, - /mob/living/carbon/human, - /mob/living/simple_animal/slime, - /mob/living/carbon/alien/larva, - /mob/living/simple_animal/slime, - /mob/living/simple_animal/chick, - /mob/living/simple_animal/chicken, - /mob/living/simple_animal/lizard, - /mob/living/simple_animal/cow, - /mob/living/simple_animal/spiderbot - ) - var/list/own_blacklist = list( - /obj/item/organ, - /obj/item/implant - ) - -/obj/effect/proc_holder/spell/targeted/eat/proc/doHeal(mob/user) - if(ishuman(user)) - var/mob/living/carbon/human/H = user - for(var/name in H.bodyparts_by_name) - var/obj/item/organ/external/affecting = null - if(!H.bodyparts_by_name[name]) - continue - affecting = H.bodyparts_by_name[name] - if(!istype(affecting, /obj/item/organ/external)) - continue - affecting.heal_damage(4, 0, updating_health = FALSE) - H.UpdateDamageIcon() - H.updatehealth() - -/obj/effect/proc_holder/spell/targeted/eat/choose_targets(mob/user = usr) - var/list/targets = new /list() - var/list/possible_targets = new /list() - - if(!check_mouth(user)) - revert_cast(user) - return - - for(var/atom/movable/O in view_or_range(range, user, selection_type)) - if((O in user) && is_type_in_list(O,own_blacklist)) - continue - if(is_type_in_list(O,types_allowed)) - if(isanimal(O)) - var/mob/living/simple_animal/SA = O - if(!SA.gold_core_spawnable) - continue - possible_targets += O - - targets += input("Choose the target of your hunger.", "Targeting") as null|anything in possible_targets - - if(!targets.len || !targets[1]) //doesn't waste the spell - revert_cast(user) - return - - if(!check_mouth(user)) - revert_cast(user) - return - - perform(targets, user = user) - -/obj/effect/proc_holder/spell/targeted/eat/proc/check_mouth(mob/user = usr) - var/can_eat = TRUE - if(iscarbon(user)) - var/mob/living/carbon/C = user - if((C.head && (C.head.flags_cover & HEADCOVERSMOUTH)) || (C.wear_mask && (C.wear_mask.flags_cover & MASKCOVERSMOUTH) && !C.wear_mask.mask_adjusted)) - to_chat(C, "Your mouth is covered, preventing you from eating!") - can_eat = FALSE - return can_eat - -/obj/effect/proc_holder/spell/targeted/eat/cast(list/targets, mob/user = usr) - if(!targets.len) - to_chat(user, "No target found in range.") - return - - var/atom/movable/the_item = targets[1] - if(ishuman(the_item)) - var/mob/living/carbon/human/H = the_item - var/obj/item/organ/external/limb = H.get_organ(user.zone_selected) - if(!istype(limb)) - to_chat(user, "You can't eat this part of them!") - revert_cast() - return FALSE - if(istype(limb,/obj/item/organ/external/head)) - // Bullshit, but prevents being unable to clone someone. - to_chat(user, "You try to put \the [limb] in your mouth, but [the_item.p_their()] ears tickle your throat!") - revert_cast() - return FALSE - if(istype(limb,/obj/item/organ/external/chest)) - // Bullshit, but prevents being able to instagib someone. - to_chat(user, "You try to put [the_item.p_their()] [limb] in your mouth, but it's too big to fit!") - revert_cast() - return FALSE - user.visible_message("[user] begins stuffing [the_item]'s [limb.name] into [user.p_their()] gaping maw!") - var/oldloc = H.loc - if(!do_mob(user,H,EAT_MOB_DELAY)) - to_chat(user, "You were interrupted before you could eat [the_item]!") - else - if(!limb || !H) - return - if(H.loc != oldloc) - to_chat(user, "\The [limb] moved away from your mouth!") - return - user.visible_message("[user] [pick("chomps","bites")] off [the_item]'s [limb]!") - playsound(user.loc, 'sound/items/eatfood.ogg', 50, 0) - limb.droplimb(0, DROPLIMB_SHARP) - doHeal(user) - else - user.visible_message("[user] eats \the [the_item].") - playsound(user.loc, 'sound/items/eatfood.ogg', 50, 0) - qdel(the_item) - doHeal(user) - -//////////////////////////////////////////////////////////////////////// - -//WAS: /datum/bioEffect/jumpy -/datum/dna/gene/basic/grant_spell/jumpy - name = "Jumpy" - desc = "Allows the subject to leap great distances." - //cooldown = 30 - activation_messages = list("Your leg muscles feel taut and strong.") - deactivation_messages = list("Your leg muscles shrink back to normal.") - instability = GENE_INSTABILITY_MINOR - mutation = JUMPY - - spelltype =/obj/effect/proc_holder/spell/targeted/leap - -/datum/dna/gene/basic/grant_spell/jumpy/New() - ..() - block = GLOB.jumpblock - -/obj/effect/proc_holder/spell/targeted/leap - name = "Jump" - desc = "Leap great distances!" - panel = "Abilities" - range = -1 - include_user = 1 - - charge_type = "recharge" - charge_max = 60 - - clothes_req = 0 - stat_allowed = 0 - invocation_type = "none" - - action_icon_state = "genetic_jump" - -/obj/effect/proc_holder/spell/targeted/leap/cast(list/targets, mob/user = usr) - var/failure = FALSE - if(istype(user.loc,/mob/) || user.lying || user.stunned || user.buckled || user.stat) - to_chat(user, "You can't jump right now!") - return - - if(istype(user.loc,/turf/)) - if(user.restrained())//Why being pulled while cuffed prevents you from moving - for(var/mob/M in range(user, 1)) - if(M.pulling == user) - if(!M.restrained() && M.stat == 0 && M.canmove && user.Adjacent(M)) - failure = TRUE - else - M.stop_pulling() - - user.visible_message("[user.name] takes a huge leap!") - playsound(user.loc, 'sound/weapons/thudswoosh.ogg', 50, 1) - if(failure) - user.Weaken(5) - user.Stun(5) - user.visible_message("[user] attempts to leap away but is slammed back down to the ground!", - "You attempt to leap away but are suddenly slammed back down to the ground!", - "You hear the flexing of powerful muscles and suddenly a crash as a body hits the floor.") - return FALSE - var/prevLayer = user.layer - var/prevFlying = user.flying - user.layer = 9 - - user.flying = TRUE - for(var/i=0, i<10, i++) - step(user, user.dir) - if(i < 5) user.pixel_y += 8 - else user.pixel_y -= 8 - sleep(1) - user.flying = prevFlying - - if(FAT in user.mutations && prob(66)) - user.visible_message("[user.name] crashes due to [user.p_their()] heavy weight!") - //playsound(user.loc, 'zhit.wav', 50, 1) - user.AdjustWeakened(10) - user.AdjustStunned(5) - - user.layer = prevLayer - - if(istype(user.loc,/obj/)) - var/obj/container = user.loc - to_chat(user, "You leap and slam your head against the inside of [container]! Ouch!") - user.AdjustParalysis(3) - user.AdjustWeakened(5) - container.visible_message("[user.loc] emits a loud thump and rattles a bit.") - playsound(user.loc, 'sound/effects/bang.ogg', 50, 1) - var/wiggle = 6 - while(wiggle > 0) - wiggle-- - container.pixel_x = rand(-3,3) - container.pixel_y = rand(-3,3) - sleep(1) - container.pixel_x = 0 - container.pixel_y = 0 - -//////////////////////////////////////////////////////////////////////// - -// WAS: /datum/bioEffect/polymorphism - -/datum/dna/gene/basic/grant_spell/polymorph - name = "Polymorphism" - desc = "Enables the subject to reconfigure their appearance to mimic that of others." - - spelltype =/obj/effect/proc_holder/spell/targeted/click/polymorph - //cooldown = 1800 - activation_messages = list("You don't feel entirely like yourself somehow.") - deactivation_messages = list("You feel secure in your identity.") - instability = GENE_INSTABILITY_MODERATE - mutation = POLYMORPH - -/datum/dna/gene/basic/grant_spell/polymorph/New() - ..() - block = GLOB.polymorphblock - -/obj/effect/proc_holder/spell/targeted/click/polymorph - name = "Polymorph" - desc = "Mimic the appearance of others!" - panel = "Abilities" - charge_max = 1800 - - clothes_req = FALSE - stat_allowed = FALSE - - click_radius = -1 // Precision required - auto_target_single = FALSE // Safety to not turn into monkey (420) - selection_activated_message = "You body becomes unstable. Click on a target to cast transform into them." - selection_deactivated_message = "Your body calms down again." - allowed_type = /mob/living/carbon/human - - invocation_type = "none" - range = 1 - selection_type = "range" - - action_icon_state = "genetic_poly" - -/obj/effect/proc_holder/spell/targeted/click/polymorph/cast(list/targets, mob/user = usr) - var/mob/living/carbon/human/target = targets[1] - - user.visible_message("[user]'s body shifts and contorts.") - - spawn(10) - if(target && user) - playsound(user.loc, 'sound/goonstation/effects/gib.ogg', 50, 1) - var/mob/living/carbon/human/H = user - H.UpdateAppearance(target.dna.UI) - H.real_name = target.real_name - H.name = target.name - -//////////////////////////////////////////////////////////////////////// - -// WAS: /datum/bioEffect/empath -/datum/dna/gene/basic/grant_spell/empath - name = "Empathic Thought" - desc = "The subject becomes able to read the minds of others for certain information." - - spelltype = /obj/effect/proc_holder/spell/targeted/empath - activation_messages = list("You suddenly notice more about others than you did before.") - deactivation_messages = list("You no longer feel able to sense intentions.") - instability = GENE_INSTABILITY_MINOR - mutation = EMPATH - -/datum/dna/gene/basic/grant_spell/empath/New() - ..() - block = GLOB.empathblock - -/obj/effect/proc_holder/spell/targeted/empath - name = "Read Mind" - desc = "Read the minds of others for information." - charge_max = 180 - clothes_req = 0 - human_req = 1 - stat_allowed = 0 - invocation_type = "none" - range = -2 - selection_type = "range" - - action_icon_state = "genetic_empath" - -/obj/effect/proc_holder/spell/targeted/empath/choose_targets(mob/user = usr) - var/list/targets = new /list() - targets += input("Choose the target to spy on.", "Targeting") as null|mob in range(7,usr) - - if(!targets.len || !targets[1]) //doesn't waste the spell - revert_cast(user) - return - - perform(targets, user = user) - -/obj/effect/proc_holder/spell/targeted/empath/cast(list/targets, mob/user = usr) - for(var/mob/living/carbon/M in targets) - if(!iscarbon(M)) - to_chat(user, "You may only use this on other organic beings.") - return - - if(PSY_RESIST in M.mutations) - to_chat(user, "You can't see into [M.name]'s mind at all!") - return - - if(M.stat == 2) - to_chat(user, "[M.name] is dead and cannot have [M.p_their()] mind read.") - return - if(M.health < 0) - to_chat(user, "[M.name] is dying, and [M.p_their()] thoughts are too scrambled to read.") - return - - to_chat(user, "Mind Reading of [M.name]:") - - var/pain_condition = M.health / M.maxHealth - // lower health means more pain - var/list/randomthoughts = list("what to have for lunch","the future","the past","money", - "[M.p_their()] hair","what to do next","[M.p_their()] job","space","amusing things","sad things", - "annoying things","happy things","something incoherent","something [M.p_they()] did wrong") - var/thoughts = "thinking about [pick(randomthoughts)]" - - if(M.fire_stacks) - pain_condition -= 0.5 - thoughts = "preoccupied with the fire" - - if(M.radiation) - pain_condition -= 0.25 - - switch(pain_condition) - if(0.81 to INFINITY) - to_chat(user, "Condition: [M.name] feels good.") - if(0.61 to 0.8) - to_chat(user, "Condition: [M.name] is suffering mild pain.") - if(0.41 to 0.6) - to_chat(user, "Condition: [M.name] is suffering significant pain.") - if(0.21 to 0.4) - to_chat(user, "Condition: [M.name] is suffering severe pain.") - else - to_chat(user, "Condition: [M.name] is suffering excruciating pain.") - thoughts = "haunted by [M.p_their()] own mortality" - - switch(M.a_intent) - if(INTENT_HELP) - to_chat(user, "Mood: You sense benevolent thoughts from [M.name].") - if(INTENT_DISARM) - to_chat(user, "Mood: You sense cautious thoughts from [M.name].") - if(INTENT_GRAB) - to_chat(user, "Mood: You sense hostile thoughts from [M.name].") - if(INTENT_HARM) - to_chat(user, "Mood: You sense cruel thoughts from [M.name].") - for(var/mob/living/L in view(7,M)) - if(L == M) - continue - thoughts = "thinking about punching [L.name]" - break - else - to_chat(user, "Mood: You sense strange thoughts from [M.name].") - - if(istype(M,/mob/living/carbon/human)) - var/numbers[0] - var/mob/living/carbon/human/H = M - if(H.mind && H.mind.initial_account) - numbers += H.mind.initial_account.account_number - numbers += H.mind.initial_account.remote_access_pin - if(numbers.len>0) - to_chat(user, "Numbers: You sense the number[numbers.len>1?"s":""] [english_list(numbers)] [numbers.len>1?"are":"is"] important to [M.name].") - to_chat(user, "Thoughts: [M.name] is currently [thoughts].") - - if(EMPATH in M.mutations) - to_chat(M, "You sense [user.name] reading your mind.") - else if(prob(5) || M.mind.assigned_role=="Chaplain") - to_chat(M, "You sense someone intruding upon your thoughts...") diff --git a/code/game/dna/genes/powers.dm b/code/game/dna/genes/powers.dm deleted file mode 100644 index d893c64565c..00000000000 --- a/code/game/dna/genes/powers.dm +++ /dev/null @@ -1,200 +0,0 @@ -/////////////////////////////////// -// POWERS -/////////////////////////////////// - -/datum/dna/gene/basic/nobreath - name = "No Breathing" - activation_messages = list("You feel no need to breathe.") - deactivation_messages = list("You feel the need to breathe, once more.") - instability = GENE_INSTABILITY_MODERATE - mutation = BREATHLESS - activation_prob = 25 - -/datum/dna/gene/basic/nobreath/New() - ..() - block = GLOB.breathlessblock - - -/datum/dna/gene/basic/regenerate - name = "Regenerate" - activation_messages = list("Your wounds start healing.") - deactivation_messages = list("Your regenerative powers feel like they've vanished.") - instability = GENE_INSTABILITY_MINOR - mutation = REGEN - -/datum/dna/gene/basic/regenerate/New() - ..() - block = GLOB.regenerateblock - -/datum/dna/gene/basic/regenerate/OnMobLife(mob/living/carbon/human/H) - H.adjustBruteLoss(-0.1, FALSE) - H.adjustFireLoss(-0.1) - -/datum/dna/gene/basic/increaserun - name = "Super Speed" - activation_messages = list("You feel swift and unencumbered.") - deactivation_messages = list("You feel slow.") - instability = GENE_INSTABILITY_MINOR - mutation = RUN - -/datum/dna/gene/basic/increaserun/New() - ..() - block = GLOB.increaserunblock - -/datum/dna/gene/basic/increaserun/can_activate(mob/M, flags) - if(!..()) - return FALSE - if(ishuman(M)) - var/mob/living/carbon/human/H = M - if(H.dna.species && H.dna.species.speed_mod && !(flags & MUTCHK_FORCED)) - return FALSE - return TRUE - -/datum/dna/gene/basic/heat_resist - name = "Heat Resistance" - activation_messages = list("Your skin is icy to the touch.") - deactivation_messages = list("Your skin no longer feels icy to the touch.") - instability = GENE_INSTABILITY_MODERATE - mutation = HEATRES - -/datum/dna/gene/basic/heat_resist/New() - ..() - block = GLOB.coldblock - -/datum/dna/gene/basic/heat_resist/OnDrawUnderlays(mob/M, g) - return "cold_s" - -/datum/dna/gene/basic/cold_resist - name = "Cold Resistance" - activation_messages = list("Your body is filled with warmth.") - deactivation_messages = list("Your body is no longer filled with warmth.") - instability = GENE_INSTABILITY_MODERATE - mutation = COLDRES - -/datum/dna/gene/basic/cold_resist/New() - ..() - block = GLOB.fireblock - -/datum/dna/gene/basic/cold_resist/OnDrawUnderlays(mob/M, g) - return "fire_s" - -/datum/dna/gene/basic/noprints - name = "No Prints" - activation_messages = list("Your fingers feel numb.") - deactivation_messages = list("your fingers no longer feel numb.") - instability = GENE_INSTABILITY_MINOR - mutation = FINGERPRINTS - -/datum/dna/gene/basic/noprints/New() - ..() - block = GLOB.noprintsblock - -/datum/dna/gene/basic/noshock - name = "Shock Immunity" - activation_messages = list("Your skin feels dry and unreactive.") - deactivation_messages = list("Your skin no longer feels dry and unreactive.") - instability = GENE_INSTABILITY_MODERATE - mutation = NO_SHOCK - -/datum/dna/gene/basic/noshock/New() - ..() - block = GLOB.shockimmunityblock - -/datum/dna/gene/basic/midget - name = "Midget" - activation_messages = list("Everything around you seems bigger now...") - deactivation_messages = list("Everything around you seems to shrink...") - instability = GENE_INSTABILITY_MINOR - mutation = DWARF - -/datum/dna/gene/basic/midget/New() - ..() - block = GLOB.smallsizeblock - -/datum/dna/gene/basic/midget/activate(mob/M, connected, flags) - ..() - M.pass_flags |= PASSTABLE - M.resize = 0.8 - M.update_transform() - -/datum/dna/gene/basic/midget/deactivate(mob/M, connected, flags) - ..() - M.pass_flags &= ~PASSTABLE - M.resize = 1.25 - M.update_transform() - -// OLD HULK BEHAVIOR -/datum/dna/gene/basic/hulk - name = "Hulk" - activation_messages = list("Your muscles hurt.") - deactivation_messages = list("Your muscles shrink.") - instability = GENE_INSTABILITY_MAJOR - mutation = HULK - activation_prob = 15 - -/datum/dna/gene/basic/hulk/New() - ..() - block = GLOB.hulkblock - -/datum/dna/gene/basic/hulk/activate(mob/M, connected, flags) - ..() - var/status = CANSTUN | CANWEAKEN | CANPARALYSE | CANPUSH - M.status_flags &= ~status - -/datum/dna/gene/basic/hulk/deactivate(mob/M, connected, flags) - ..() - M.status_flags |= CANSTUN | CANWEAKEN | CANPARALYSE | CANPUSH - -/datum/dna/gene/basic/hulk/OnDrawUnderlays(mob/M, g) - if(HULK in M.mutations) - return "hulk_[g]_s" - return FALSE - -/datum/dna/gene/basic/hulk/OnMobLife(mob/living/carbon/human/M) - if(!istype(M)) - return - if((HULK in M.mutations) && M.health <= 0) - M.mutations.Remove(HULK) - M.dna.SetSEState(GLOB.hulkblock,0) - genemutcheck(M, GLOB.hulkblock,null,MUTCHK_FORCED) - M.update_mutations() //update our mutation overlays - M.update_body() - M.status_flags |= CANSTUN | CANWEAKEN | CANPARALYSE | CANPUSH //temporary fix until the problem can be solved. - to_chat(M, "You suddenly feel very weak.") - -/datum/dna/gene/basic/xray - name = "X-Ray Vision" - activation_messages = list("The walls suddenly disappear.") - deactivation_messages = list("the walls around you re-appear.") - instability = GENE_INSTABILITY_MAJOR - mutation = XRAY - activation_prob = 15 - -/datum/dna/gene/basic/xray/New() - ..() - block = GLOB.xrayblock - -/datum/dna/gene/basic/xray/activate(mob/living/M, connected, flags) - ..() - M.update_sight() - M.update_icons() //Apply eyeshine as needed. - -/datum/dna/gene/basic/xray/deactivate(mob/living/M, connected, flags) - ..() - M.update_sight() - M.update_icons() //Remove eyeshine as needed. - -/datum/dna/gene/basic/tk - name = "Telekenesis" - activation_messages = list("You feel smarter.") - deactivation_messages = list("You feel dumber.") - instability = GENE_INSTABILITY_MAJOR - mutation = TK - activation_prob = 15 - -/datum/dna/gene/basic/tk/New() - ..() - block = GLOB.teleblock - -/datum/dna/gene/basic/tk/OnDrawUnderlays(mob/M, g) - return "telekinesishead_s" diff --git a/code/game/dna/genes/vg_disabilities.dm b/code/game/dna/genes/vg_disabilities.dm deleted file mode 100644 index c2ad1559b6a..00000000000 --- a/code/game/dna/genes/vg_disabilities.dm +++ /dev/null @@ -1,42 +0,0 @@ - -/datum/dna/gene/disability/speech/loud - name = "Loud" - desc = "Forces the speaking centre of the subjects brain to yell every sentence." - activation_message = "YOU FEEL LIKE YELLING!" - deactivation_message = "You feel like being quiet.." - mutation = LOUD - -/datum/dna/gene/disability/speech/loud/New() - ..() - block = GLOB.loudblock - - - -/datum/dna/gene/disability/speech/loud/OnSay(mob/M, message) - message = replacetext(message,".","!") - message = replacetext(message,"?","?!") - message = replacetext(message,"!","!!") - return uppertext(message) - -/datum/dna/gene/disability/dizzy - name = "Dizzy" - desc = "Causes the cerebellum to shut down in some places." - activation_message = "You feel very dizzy..." - deactivation_message = "You regain your balance." - instability = -GENE_INSTABILITY_MINOR - mutation = DIZZY - -/datum/dna/gene/disability/dizzy/New() - ..() - block = GLOB.dizzyblock - - -/datum/dna/gene/disability/dizzy/OnMobLife(mob/living/carbon/human/M) - if(!istype(M)) - return - if(DIZZY in M.mutations) - M.Dizzy(300) - -/datum/dna/gene/disability/dizzy/deactivate(mob/living/M, connected, flags) - ..() - M.SetDizzy(0) diff --git a/code/game/dna/genes/vg_powers.dm b/code/game/dna/genes/vg_powers.dm deleted file mode 100644 index 482842fb6be..00000000000 --- a/code/game/dna/genes/vg_powers.dm +++ /dev/null @@ -1,408 +0,0 @@ -///////////////////Vanilla Morph//////////////////////////////////// - -/datum/dna/gene/basic/grant_spell/morph - name = "Morphism" - desc = "Enables the subject to reconfigure their appearance to that of any human." - spelltype =/obj/effect/proc_holder/spell/targeted/morph - activation_messages = list("Your body feels if can alter its appearance.") - deactivation_messages = list("Your body doesn't feel capable of altering its appearance.") - instability = GENE_INSTABILITY_MINOR - mutation = MORPH - -/datum/dna/gene/basic/grant_spell/morph/New() - ..() - block = GLOB.morphblock - -/obj/effect/proc_holder/spell/targeted/morph - name = "Morph" - desc = "Mimic the appearance of your choice!" - panel = "Abilities" - charge_max = 1800 - - clothes_req = 0 - stat_allowed = 0 - invocation_type = "none" - range = -1 - include_user = 1 - selection_type = "range" - - action_icon_state = "genetic_morph" - -/obj/effect/proc_holder/spell/targeted/morph/cast(list/targets, mob/user = usr) - if(!ishuman(user)) - return - - if(istype(user.loc,/mob/)) - to_chat(user, "You can't change your appearance right now!") - return - var/mob/living/carbon/human/M = user - var/obj/item/organ/external/head/head_organ = M.get_organ("head") - var/obj/item/organ/internal/eyes/eyes_organ = M.get_int_organ(/obj/item/organ/internal/eyes) - - var/new_gender = alert(user, "Please select gender.", "Character Generation", "Male", "Female") - if(new_gender) - if(new_gender == "Male") - M.change_gender(MALE) - else - M.change_gender(FEMALE) - - var/new_eyes = input("Please select eye color.", "Character Generation", eyes_organ.eye_colour) as null|color - if(new_eyes) - M.change_eye_color(new_eyes) - - //Alt heads. - if(head_organ.dna.species.bodyflags & HAS_ALT_HEADS) - var/list/valid_alt_heads = M.generate_valid_alt_heads() - var/new_alt_head = input("Please select alternate head", "Character Generation", head_organ.alt_head) as null|anything in valid_alt_heads - if(new_alt_head) - M.change_alt_head(new_alt_head) - - // hair - var/list/valid_hairstyles = M.generate_valid_hairstyles() - var/new_style = input("Please select hair style", "Character Generation", head_organ.h_style) as null|anything in valid_hairstyles - - // if new style selected (not cancel) - if(new_style) - M.change_hair(new_style) - - var/new_hair = input("Please select hair color.", "Character Generation", head_organ.hair_colour) as null|color - if(new_hair) - M.change_hair_color(new_hair) - - var/datum/sprite_accessory/hair_style = GLOB.hair_styles_public_list[head_organ.h_style] - if(hair_style.secondary_theme && !hair_style.no_sec_colour) - new_hair = input("Please select secondary hair color.", "Character Generation", head_organ.sec_hair_colour) as null|color - if(new_hair) - M.change_hair_color(new_hair, 1) - - // facial hair - var/list/valid_facial_hairstyles = M.generate_valid_facial_hairstyles() - new_style = input("Please select facial style", "Character Generation", head_organ.f_style) as null|anything in valid_facial_hairstyles - - if(new_style) - M.change_facial_hair(new_style) - - var/new_facial = input("Please select facial hair color.", "Character Generation", head_organ.facial_colour) as null|color - if(new_facial) - M.change_facial_hair_color(new_facial) - - var/datum/sprite_accessory/facial_hair_style = GLOB.facial_hair_styles_list[head_organ.f_style] - if(facial_hair_style.secondary_theme && !facial_hair_style.no_sec_colour) - new_facial = input("Please select secondary facial hair color.", "Character Generation", head_organ.sec_facial_colour) as null|color - if(new_facial) - M.change_facial_hair_color(new_facial, 1) - - //Head accessory. - if(head_organ.dna.species.bodyflags & HAS_HEAD_ACCESSORY) - var/list/valid_head_accessories = M.generate_valid_head_accessories() - var/new_head_accessory = input("Please select head accessory style", "Character Generation", head_organ.ha_style) as null|anything in valid_head_accessories - if(new_head_accessory) - M.change_head_accessory(new_head_accessory) - - var/new_head_accessory_colour = input("Please select head accessory colour.", "Character Generation", head_organ.headacc_colour) as null|color - if(new_head_accessory_colour) - M.change_head_accessory_color(new_head_accessory_colour) - - //Body accessory. - if(M.dna.species.tail && M.dna.species.bodyflags & HAS_TAIL) - var/list/valid_body_accessories = M.generate_valid_body_accessories() - if(valid_body_accessories.len > 1) //By default valid_body_accessories will always have at the very least a 'none' entry populating the list, even if the user's species is not present in any of the list items. - var/new_body_accessory = input("Please select body accessory style", "Character Generation", M.body_accessory) as null|anything in valid_body_accessories - if(new_body_accessory) - M.change_body_accessory(new_body_accessory) - - //Head markings. - if(M.dna.species.bodyflags & HAS_HEAD_MARKINGS) - var/list/valid_head_markings = M.generate_valid_markings("head") - var/new_marking = input("Please select head marking style", "Character Generation", M.m_styles["head"]) as null|anything in valid_head_markings - if(new_marking) - M.change_markings(new_marking, "head") - - var/new_marking_colour = input("Please select head marking colour.", "Character Generation", M.m_colours["head"]) as null|color - if(new_marking_colour) - M.change_marking_color(new_marking_colour, "head") - //Body markings. - if(M.dna.species.bodyflags & HAS_BODY_MARKINGS) - var/list/valid_body_markings = M.generate_valid_markings("body") - var/new_marking = input("Please select body marking style", "Character Generation", M.m_styles["body"]) as null|anything in valid_body_markings - if(new_marking) - M.change_markings(new_marking, "body") - - var/new_marking_colour = input("Please select body marking colour.", "Character Generation", M.m_colours["body"]) as null|color - if(new_marking_colour) - M.change_marking_color(new_marking_colour, "body") - //Tail markings. - if(M.dna.species.bodyflags & HAS_TAIL_MARKINGS) - var/list/valid_tail_markings = M.generate_valid_markings("tail") - var/new_marking = input("Please select tail marking style", "Character Generation", M.m_styles["tail"]) as null|anything in valid_tail_markings - if(new_marking) - M.change_markings(new_marking, "tail") - - var/new_marking_colour = input("Please select tail marking colour.", "Character Generation", M.m_colours["tail"]) as null|color - if(new_marking_colour) - M.change_marking_color(new_marking_colour, "tail") - - //Skin tone. - if(M.dna.species.bodyflags & HAS_SKIN_TONE) - var/new_tone = input("Please select skin tone level: 1-220 (1=albino, 35=caucasian, 150=black, 220='very' black)", "Character Generation", M.s_tone) as null|text - if(!new_tone) - new_tone = 35 - else - new_tone = 35 - max(min(round(text2num(new_tone)), 220), 1) - M.change_skin_tone(new_tone) - - if(M.dna.species.bodyflags & HAS_ICON_SKIN_TONE) - var/prompt = "Please select skin tone: 1-[M.dna.species.icon_skin_tones.len] (" - for(var/i = 1 to M.dna.species.icon_skin_tones.len) - prompt += "[i] = [M.dna.species.icon_skin_tones[i]]" - if(i != M.dna.species.icon_skin_tones.len) - prompt += ", " - prompt += ")" - - var/new_tone = input(prompt, "Character Generation", M.s_tone) as null|text - if(!new_tone) - new_tone = 0 - else - new_tone = max(min(round(text2num(new_tone)), M.dna.species.icon_skin_tones.len), 1) - M.change_skin_tone(new_tone) - - //Skin colour. - if(M.dna.species.bodyflags & HAS_SKIN_COLOR) - var/new_body_colour = input("Please select body colour.", "Character Generation", M.skin_colour) as null|color - if(new_body_colour) - M.change_skin_color(new_body_colour) - - M.update_dna() - - M.visible_message("[M] morphs and changes [M.p_their()] appearance!", "You change your appearance!", "Oh, god! What the hell was that? It sounded like flesh getting squished and bone ground into a different shape!") - -/datum/dna/gene/basic/grant_spell/remotetalk - name = "Telepathy" - activation_messages = list("You feel you can project your thoughts.") - deactivation_messages = list("You no longer feel you can project your thoughts.") - instability = GENE_INSTABILITY_MINOR - mutation = REMOTE_TALK - - spelltype =/obj/effect/proc_holder/spell/targeted/remotetalk - -/datum/dna/gene/basic/grant_spell/remotetalk/New() - ..() - block = GLOB.remotetalkblock - -/datum/dna/gene/basic/grant_spell/remotetalk/activate(mob/living/M, connected, flags) - ..() - M.AddSpell(new /obj/effect/proc_holder/spell/targeted/mindscan(null)) - -/datum/dna/gene/basic/grant_spell/remotetalk/deactivate(mob/user) - ..() - for(var/obj/effect/proc_holder/spell/S in user.mob_spell_list) - if(istype(S, /obj/effect/proc_holder/spell/targeted/mindscan)) - user.RemoveSpell(S) - -/obj/effect/proc_holder/spell/targeted/remotetalk - name = "Project Mind" - desc = "Make people understand your thoughts!" - charge_max = 0 - - clothes_req = 0 - stat_allowed = 0 - invocation_type = "none" - range = -2 - selection_type = "range" - - action_icon_state = "genetic_project" - -/obj/effect/proc_holder/spell/targeted/remotetalk/choose_targets(mob/user = usr) - var/list/targets = new /list() - var/list/validtargets = user.get_telepathic_targets() - - if(!length(validtargets)) - to_chat(user, "There are no valid targets!") - start_recharge() - return - - var/target_name = input("Choose the target to talk to.", "Targeting") as null|anything in validtargets - - var/mob/living/target - if(!target_name || !(target = validtargets[target_name])) - revert_cast(user) - return - - targets += target - perform(targets, user = user) - -/obj/effect/proc_holder/spell/targeted/remotetalk/cast(list/targets, mob/user = usr) - if(!ishuman(user)) return - var/say = input("What do you wish to say") as text|null - if(!say || usr.stat) - return - say = strip_html(say) - say = pencode_to_html(say, usr, format = 0, fields = 0) - - for(var/mob/living/target in targets) - log_say("(TPATH to [key_name(target)]) [say]", user) - user.create_log(SAY_LOG, "Telepathically said '[say]' using [src]", target) - if(REMOTE_TALK in target.mutations) - target.show_message("You hear [user.real_name]'s voice: [say]") - else - target.show_message("You hear a voice that seems to echo around the room: [say]") - user.show_message("You project your mind into [(target in user.get_visible_mobs()) ? target.name : "the unknown entity"]: [say]") - for(var/mob/dead/observer/G in GLOB.player_list) - G.show_message("Telepathic message from [user] ([ghost_follow_link(user, ghost=G)]) to [target] ([ghost_follow_link(target, ghost=G)]): [say]") - -/obj/effect/proc_holder/spell/targeted/mindscan - name = "Scan Mind" - desc = "Offer people a chance to share their thoughts!" - charge_max = 0 - clothes_req = 0 - stat_allowed = 0 - invocation_type = "none" - range = -2 - selection_type = "range" - action_icon_state = "genetic_mindscan" - var/list/available_targets = list() - -/obj/effect/proc_holder/spell/targeted/mindscan/choose_targets(mob/user = usr) - var/list/targets = list() - var/list/validtargets = user.get_telepathic_targets() - - if(!length(validtargets)) - to_chat(user, "There are no valid targets!") - start_recharge() - return - - var/target_name = input("Choose the target to listen to.", "Targeting") as null|anything in validtargets - - var/mob/living/target - if(!target_name || !(target = validtargets[target_name])) - revert_cast(user) - return - - targets += target - perform(targets, user = user) - -/obj/effect/proc_holder/spell/targeted/mindscan/cast(list/targets, mob/user = usr) - if(!ishuman(user)) - return - for(var/mob/living/target in targets) - var/message = "You feel your mind expand briefly... (Click to send a message.)" - if(REMOTE_TALK in target.mutations) - message = "You feel [user.real_name] request a response from you... (Click here to project mind.)" - user.show_message("You offer your mind to [(target in user.get_visible_mobs()) ? target.name : "the unknown entity"].") - target.show_message("[message]") - available_targets += target - addtimer(CALLBACK(src, .proc/removeAvailability, target), 100) - -/obj/effect/proc_holder/spell/targeted/mindscan/proc/removeAvailability(mob/living/target) - if(target in available_targets) - available_targets -= target - if(!(target in available_targets)) - target.show_message("You feel the sensation fade...") - -/obj/effect/proc_holder/spell/targeted/mindscan/Topic(href, href_list) - var/mob/living/user - if(href_list["user"]) - user = locateUID(href_list["user"]) - if(href_list["target"]) - if(!user) - return - var/mob/living/target = locateUID(href_list["target"]) - if(!(target in available_targets)) - return - available_targets -= target - var/say = input("What do you wish to say") as text|null - if(!say) - return - say = strip_html(say) - say = pencode_to_html(say, target, format = 0, fields = 0) - user.create_log(SAY_LOG, "Telepathically responded '[say]' using [src]", target) - log_say("(TPATH to [key_name(target)]) [say]", user) - if(REMOTE_TALK in target.mutations) - target.show_message("You project your mind into [user.name]: [say]") - else - target.show_message("You fill the space in your thoughts: [say]") - user.show_message("You hear [target.name]'s voice: [say]") - for(var/mob/dead/observer/G in GLOB.player_list) - G.show_message("Telepathic response from [target] ([ghost_follow_link(target, ghost=G)]) to [user] ([ghost_follow_link(user, ghost=G)]): [say]") - -/obj/effect/proc_holder/spell/targeted/mindscan/Destroy() - available_targets.Cut() - return ..() - -/datum/dna/gene/basic/grant_spell/remoteview - name = "Remote Viewing" - activation_messages = list("Your mind can see things from afar.") - deactivation_messages = list("Your mind can no longer can see things from afar.") - instability = GENE_INSTABILITY_MINOR - mutation = REMOTE_VIEW - - spelltype =/obj/effect/proc_holder/spell/targeted/remoteview - -/datum/dna/gene/basic/grant_spell/remoteview/New() - ..() - block = GLOB.remoteviewblock - - -/obj/effect/proc_holder/spell/targeted/remoteview - name = "Remote View" - desc = "Spy on people from any range!" - charge_max = 100 - - clothes_req = 0 - stat_allowed = 0 - invocation_type = "none" - range = -2 - selection_type = "range" - - action_icon_state = "genetic_view" - -/obj/effect/proc_holder/spell/targeted/remoteview/choose_targets(mob/user = usr) - var/list/targets = list() - var/list/remoteviewers = list() - for(var/mob/M in GLOB.alive_mob_list) - if(M == user) - continue - if(PSY_RESIST in M.mutations) - continue - if(REMOTE_VIEW in M.mutations) - remoteviewers += M - if(!LAZYLEN(remoteviewers)) - to_chat(user, "No valid targets with remote view were found!") - start_recharge() - return - targets += input("Choose the target to spy on.", "Targeting") as null|anything in remoteviewers - if(!targets) - to_chat(user, "You decide against remote viewing.") - start_recharge() - return - perform(targets, user = user) - -/obj/effect/proc_holder/spell/targeted/remoteview/cast(list/targets, mob/user = usr) - var/mob/living/carbon/human/H - if(ishuman(user)) - H = user - else - return - - var/mob/target - - if(istype(H.l_hand, /obj/item/tk_grab) || istype(H.r_hand, /obj/item/tk_grab)) - to_chat(H, "Your mind is too busy with that telekinetic grab.") - H.remoteview_target = null - H.reset_perspective() - return - - if(H.client.eye != user.client.mob) - H.remoteview_target = null - H.reset_perspective() - return - - for(var/mob/living/L in targets) - target = L - - if(target) - H.remoteview_target = target - H.reset_perspective(target) - else - H.remoteview_target = null - H.reset_perspective() diff --git a/code/game/dna/mutations/_mutations.dm b/code/game/dna/mutations/_mutations.dm new file mode 100644 index 00000000000..a9718394066 --- /dev/null +++ b/code/game/dna/mutations/_mutations.dm @@ -0,0 +1,74 @@ +/datum/mutation + /// Display name + var/name = "mutation" + /// Description of the gene + var/desc = "A mutation." + /// What gene activates this? Set in initialize()! + var/block = 0 + /// Chance of the gene to cause adverse effects when active + var/instability = 0 + /// Trait to give, if any + var/traits_to_add = list() + /// Activation probability + var/activation_prob = 100 + /// Possible activation messages + var/list/activation_messages = list() + /// Possible deactivation messages + var/list/deactivation_messages = list() + + +// Is the gene active in this mob's DNA? +/datum/mutation/proc/is_active(mob/M) + return M.active_mutations && (type in M.active_mutations) + +// Return TRUE if we can activate. +// HANDLE MUTCHK_FORCED HERE! +/datum/mutation/proc/can_activate(mob/M, flags) + if(flags & MUTCHK_FORCED) + return TRUE + // Probability check + return prob(activation_prob) + +// Called when the gene activates. Do your magic here. +/datum/mutation/proc/activate(mob/living/M) + M.gene_stability -= instability + for(var/thing in traits_to_add) + ADD_TRAIT(M, thing, GENETIC_MUTATION) + if(length(activation_messages)) + var/msg = pick(activation_messages) + to_chat(M, "[msg]") + + +// Called when the gene deactivates. Undo your magic here. +// Only called when the block is deactivated. +/datum/mutation/proc/deactivate(mob/living/M) + M.gene_stability += instability + for(var/thing in traits_to_add) + REMOVE_TRAIT(M, thing, GENETIC_MUTATION) + if(length(deactivation_messages)) + var/msg = pick(deactivation_messages) + to_chat(M, "[msg]") + +// This section inspired by goone's bioEffects. + + +// Called in each life() tick. +/datum/mutation/proc/on_life(mob/M) + return + + +// Called when the mob dies +/datum/mutation/proc/on_death(mob/M) + return + + +// Called when the mob says shit +/datum/mutation/proc/on_say(mob/M, message) + return message + + +// Called after the mob runs update_icons. +// @params M The subject. +// @params g Gender (m or f) +/datum/mutation/proc/on_draw_underlays(mob/M, g) + return FALSE diff --git a/code/game/dna/mutations/disabilities.dm b/code/game/dna/mutations/disabilities.dm new file mode 100644 index 00000000000..bcb11eb1631 --- /dev/null +++ b/code/game/dna/mutations/disabilities.dm @@ -0,0 +1,549 @@ +///////////////////// +// DISABILITY MUTATIONS +// +// +// +// Mutation is always activated. +///////////////////// + +/datum/mutation/disability + name = "DISABILITY" + +/datum/mutation/disability/can_activate(mob/M, flags) + return TRUE // Always set! + +/datum/mutation/disability/hallucinate + name = "Hallucinate" + activation_messages = list("Your mind says 'Hello'.") + deactivation_messages = list("Sanity returns. Or does it?") + instability = -GENE_INSTABILITY_MODERATE + +/datum/mutation/disability/hallucinate/New() + ..() + block = GLOB.hallucinationblock + +/datum/mutation/disability/hallucinate/on_life(mob/living/carbon/human/H) + if(prob(1)) + H.AdjustHallucinate(45) + +/datum/mutation/disability/epilepsy + name = "Epilepsy" + activation_messages = list("You get a headache.") + deactivation_messages = list("Your headache is gone, at last.") + instability = -GENE_INSTABILITY_MODERATE + +/datum/mutation/disability/epilepsy/New() + ..() + block = GLOB.epilepsyblock + +/datum/mutation/disability/epilepsy/on_life(mob/living/carbon/human/H) + if((prob(1) && H.paralysis < 1)) + H.visible_message("[H] starts having a seizure!","You have a seizure!") + H.Paralyse(10) + H.Jitter(1000) + +/datum/mutation/disability/cough + name = "Coughing" + activation_messages = list("You start coughing.") + deactivation_messages = list("Your throat stops aching.") + instability = -GENE_INSTABILITY_MINOR + +/datum/mutation/disability/cough/New() + ..() + block = GLOB.coughblock + +/datum/mutation/disability/cough/on_life(mob/living/carbon/human/H) + if((prob(5) && H.paralysis <= 1)) + H.drop_item() + H.emote("cough") + +/datum/mutation/disability/clumsy + name = "Clumsiness" + activation_messages = list("You feel lightheaded.") + deactivation_messages = list("You regain some control of your movements") + instability = -GENE_INSTABILITY_MINOR + traits_to_add = list(TRAIT_CLUMSY) + +/datum/mutation/disability/clumsy/New() + ..() + block = GLOB.clumsyblock + +/datum/mutation/disability/tourettes + name = "Tourettes" + activation_messages = list("You twitch.") + deactivation_messages = list("Your mouth tastes like soap.") + instability = -GENE_INSTABILITY_MODERATE + +/datum/mutation/disability/tourettes/New() + ..() + block = GLOB.twitchblock + +/datum/mutation/disability/tourettes/on_life(mob/living/carbon/human/H) + if((prob(10) && H.paralysis <= 1)) + H.Stun(10) + switch(rand(1, 3)) + if(1) + H.emote("twitch") + if(2 to 3) + H.say("[prob(50) ? ";" : ""][pick("SHIT", "PISS", "FUCK", "CUNT", "COCKSUCKER", "MOTHERFUCKER", "TITS")]") + var/x_offset_old = H.pixel_x + var/y_offset_old = H.pixel_y + var/x_offset = H.pixel_x + rand(-2, 2) + var/y_offset = H.pixel_y + rand(-1, 1) + animate(H, pixel_x = x_offset, pixel_y = y_offset, time = 1) + animate(H, pixel_x = x_offset_old, pixel_y = y_offset_old, time = 1) + +/datum/mutation/disability/nervousness + name = "Nervousness" + activation_messages = list("You feel nervous.") + deactivation_messages = list("You feel much calmer.") + +/datum/mutation/disability/nervousness/New() + ..() + block = GLOB.nervousblock + +/datum/mutation/disability/nervousness/on_life(mob/living/carbon/human/H) + if(prob(10)) + H.Stuttering(10) + +/datum/mutation/disability/blindness + name = "Blindness" + activation_messages = list("You can't seem to see anything.") + deactivation_messages = list("You can see now, in case you didn't notice...") + instability = -GENE_INSTABILITY_MAJOR + traits_to_add = list(TRAIT_BLIND) + +/datum/mutation/disability/blindness/New() + ..() + block = GLOB.blindblock + +/datum/mutation/disability/blindness/activate(mob/M) + ..() + M.update_blind_effects() + +/datum/mutation/disability/blindness/deactivate(mob/M) + ..() + M.update_blind_effects() + + +/datum/mutation/disability/colourblindness + name = "Colourblindness" + activation_messages = list("You feel a peculiar prickling in your eyes while your perception of colour changes.") + deactivation_messages = list("Your eyes tingle unsettlingly, though everything seems to become alot more colourful.") + instability = -GENE_INSTABILITY_MODERATE + traits_to_add = list(TRAIT_COLORBLIND) + +/datum/mutation/disability/colourblindness/New() + ..() + block = GLOB.colourblindblock + +/datum/mutation/disability/colourblindness/activate(mob/M) + ..() + M.update_client_colour() //Handle the activation of the colourblindness on the mob. + M.update_icons() //Apply eyeshine as needed. + +/datum/mutation/disability/colourblindness/deactivate(mob/M) + ..() + M.update_client_colour() //Handle the deactivation of the colourblindness on the mob. + M.update_icons() //Remove eyeshine as needed. + +/datum/mutation/disability/deaf + name = "Deafness" + activation_messages = list("It's kinda quiet.") + deactivation_messages = list("You can hear again!") + instability = -GENE_INSTABILITY_MAJOR + traits_to_add = list(TRAIT_DEAF) + +/datum/mutation/disability/deaf/New() + ..() + block = GLOB.deafblock + +/datum/mutation/disability/nearsighted + name = "Nearsightedness" + activation_messages = list("Your eyes feel weird...") + deactivation_messages = list("You can see clearly now") + instability = -GENE_INSTABILITY_MODERATE + traits_to_add = list(TRAIT_NEARSIGHT) + +/datum/mutation/disability/nearsighted/New() + ..() + block = GLOB.glassesblock + +/datum/mutation/disability/nearsighted/activate(mob/living/M) + ..() + M.update_nearsighted_effects() + +/datum/mutation/disability/nearsighted/deactivate(mob/living/M) + ..() + M.update_nearsighted_effects() + +/datum/mutation/disability/lisp + name = "Lisp" + desc = "I wonder wath thith doeth." + activation_messages = list("Thomething doethn't feel right.") + deactivation_messages = list("You now feel able to pronounce consonants.") + +/datum/mutation/disability/lisp/New() + ..() + block = GLOB.lispblock + +/datum/mutation/disability/lisp/on_say(mob/M, message) + return replacetext(message,"s","th") + +/datum/mutation/disability/comic + name = "Comic" + desc = "This will only bring death and destruction." + activation_messages = list("Uh oh!") + deactivation_messages = list("Well thank god that's over with.") + traits_to_add = list(TRAIT_COMIC_SANS) + +/datum/mutation/disability/comic/New() + ..() + block = GLOB.comicblock + +/datum/mutation/disability/wingdings + name = "Alien Voice" + desc = "Garbles the subject's voice into an incomprehensible speech." + activation_messages = list("Your vocal cords feel alien.") + deactivation_messages = list("Your vocal cords no longer feel alien.") + instability = -GENE_INSTABILITY_MINOR + traits_to_add = list(TRAIT_WINGDINGS) + +/datum/mutation/disability/wingdings/New() + ..() + block = GLOB.wingdingsblock + +/datum/mutation/disability/wingdings/on_say(mob/M, message) + var/garbled_message = "" + for(var/i in 1 to length(message)) + if(message[i] in GLOB.alphabet_uppercase) + garbled_message += pick(GLOB.alphabet_uppercase) + else if(message[i] in GLOB.alphabet) + garbled_message += pick(GLOB.alphabet) + else + garbled_message += message[i] + message = garbled_message + return message + +////////////////// +// DISABILITIES // +////////////////// + +//////////////////////////////////////// +// Totally Crippling +//////////////////////////////////////// + +// WAS: /datum/bioEffect/mute +/datum/mutation/disability/mute + name = "Mute" + desc = "Completely shuts down the speech center of the subject's brain." + activation_messages = list("You feel unable to express yourself at all.") + deactivation_messages = list("You feel able to speak freely again.") + instability = -GENE_INSTABILITY_MODERATE + traits_to_add = list(TRAIT_MUTE) + +/datum/mutation/disability/mute/New() + ..() + block = GLOB.muteblock + +/datum/mutation/disability/mute/on_say(mob/M, message) + return "" + +//////////////////////////////////////// +// Harmful to others as well as self +//////////////////////////////////////// + +/datum/mutation/disability/radioactive + name = "Radioactive" + desc = "The subject suffers from constant radiation sickness and causes the same on nearby organics." + activation_messages = list("You feel a strange sickness permeate your whole body.") + deactivation_messages = list("You no longer feel awful and sick all over.") + instability = -GENE_INSTABILITY_MAJOR + +/datum/mutation/disability/radioactive/New() + ..() + block = GLOB.radblock + + +/datum/mutation/disability/radioactive/can_activate(mob/M, flags) + if(!..()) + return FALSE + if(ishuman(M)) + var/mob/living/carbon/human/H = M + if(HAS_TRAIT(H, TRAIT_RADIMMUNE) && !(flags & MUTCHK_FORCED)) + return FALSE + return TRUE + +/datum/mutation/disability/radioactive/on_life(mob/living/carbon/human/H) + radiation_pulse(H, 20) + +/datum/mutation/disability/radioactive/on_draw_underlays(mob/M, g) + return "rads_s" + +//////////////////////////////////////// +// Other disabilities +//////////////////////////////////////// + +// WAS: /datum/bioEffect/fat +/datum/mutation/disability/fat + name = "Obesity" + desc = "Greatly slows the subject's metabolism, enabling greater buildup of lipid tissue." + activation_messages = list("You feel blubbery and lethargic!") + deactivation_messages = list("You feel fit!") + instability = -GENE_INSTABILITY_MINOR + traits_to_add = list(TRAIT_SLOWDIGESTION) + +/datum/mutation/disability/fat/New() + ..() + block = GLOB.fatblock + +// WAS: /datum/bioEffect/chav +/datum/mutation/disability/speech/chav + name = "Chav" + desc = "Forces the language center of the subject's brain to construct sentences in a more rudimentary manner." + activation_messages = list("Ye feel like a rite prat like, innit?") + deactivation_messages = list("You no longer feel like being rude and sassy.") + //List of swappable words. Normal word first, chav word second. + var/static/list/chavlinks = list( + "arrest" = "nick", + "arrested" = "nicked", + "ass" = "arse", + "bad" = "pants", + "bar" = "spoons", + "brain" = "noggin", + "break" = "smash", + "broke" = "smashed", + "broken" = "gone kaput", + "comdom" = "knob'ed", + "cool" = "ace", + "crazy" = "well mad", + "cup of tea" = "cuppa", + "destroyed" = "rekt", + "dick" = "prat", + "disappointed" = "gutted", + "disgusting" = "minging", + "disposals" = "bins", + "drink" = "bevvy", + "engineer" = "sparky", + "excited" = "jacked", + "fight" = "scuffle", + "food" = "nosh", + "friend" = "blud", + "fuck" = "fook", + "get" = "giz", + "girl" = "bird", + "go away" = "jog on", + "good" = "mint", + "great" = "bangin'", + "happy" = "chuffed", + "hello" = "orite", + "hi" = "sup", + "idiot" = "twit", + "isn't it" = "innit", + "kill" = "bang", + "killed" = "banged", + "man" = "bloke", + "mess" = "shambles", + "mistake" = "cock-up", + "murder" = "hench", + "murdered" = "henched", + "no" = "naw", + "really" = "propa", + "robust" = "'ard", + "run" = "leg it", + "sec" = "cops", + "security" = "coppers", + "silly" = "daft", + "steal" = "nick", + "stole" = "nicked", + "surprised" = "gobsmacked", + "suspicious" = "dodgy", + "tired" = "knackered", + "wet" = "moist", + "what" = "wot", + "window" = "windy", + "windows" = "windies", + "yes" = "ye", + "yikes" = "blimey", + "your" = "yur" + ) + +/datum/mutation/disability/speech/chav/New() + ..() + block = GLOB.chavblock + +/datum/mutation/disability/speech/chav/on_say(mob/M, message) + var/static/regex/R = regex("\\b([chavlinks.Join("|")])\\b", "g") + message = R.Replace(message, /datum/mutation/disability/speech/chav/proc/replace_speech) + return message + +/datum/mutation/disability/speech/chav/proc/replace_speech(matched) + return chavlinks[matched] + +// WAS: /datum/bioEffect/swedish +/datum/mutation/disability/speech/swedish + name = "Swedish" + desc = "Forces the language center of the subject's brain to construct sentences in a vaguely norse manner." + activation_messages = list("You feel Swedish, however that works.") + deactivation_messages = list("The feeling of Swedishness passes.") + +/datum/mutation/disability/speech/swedish/New() + ..() + block = GLOB.swedeblock + +/datum/mutation/disability/speech/swedish/on_say(mob/M, message) + // svedish + message = replacetextEx(message,"W","V") + message = replacetextEx(message,"w","v") + message = replacetextEx(message,"J","Y") + message = replacetextEx(message,"j","y") + message = replacetextEx(message,"A",pick("Å","Ä","Æ","A")) + message = replacetextEx(message,"a",pick("å","ä","æ","a")) + message = replacetextEx(message,"BO","BJO") + message = replacetextEx(message,"Bo","Bjo") + message = replacetextEx(message,"bo","bjo") + message = replacetextEx(message,"O",pick("Ö","Ø","O")) + message = replacetextEx(message,"o",pick("ö","ø","o")) + if(prob(30) && !M.is_muzzled()) + message += " Bork[pick("",", bork",", bork, bork")]!" + return message + +// WAS: /datum/bioEffect/unintelligable +/datum/mutation/disability/unintelligable + name = "Unintelligable" + desc = "Heavily corrupts the part of the brain responsible for forming spoken sentences." + activation_messages = list("You can't seem to form any coherent thoughts!") + deactivation_messages = list("Your mind feels more clear.") + instability = -GENE_INSTABILITY_MINOR + +/datum/mutation/disability/unintelligable/New() + ..() + block = GLOB.scrambleblock + +/datum/mutation/disability/unintelligable/on_say(mob/M, message) + var/prefix = copytext(message,1,2) + if(prefix == ";") + message = copytext(message,2) + else if(prefix in list(":","#")) + prefix += copytext(message,2,3) + message = copytext(message,3) + else + prefix="" + + var/list/words = splittext(message," ") + var/list/rearranged = list() + for(var/i=1;i<=words.len;i++) + var/cword = pick(words) + words.Remove(cword) + var/suffix = copytext(cword,length(cword)-1,length(cword)) + while(length(cword)>0 && (suffix in list(".",",",";","!",":","?"))) + cword = copytext(cword,1 ,length(cword)-1) + suffix = copytext(cword,length(cword)-1,length(cword) ) + if(length(cword)) + rearranged += cword + return "[prefix][uppertext(jointext(rearranged," "))]!!" + +////////////////// +// USELESS SHIT // +////////////////// + +// WAS: /datum/bioEffect/strong +/datum/mutation/disability/strong + // pretty sure this doesn't do jack shit, putting it here until it does + name = "Strong" + desc = "Enhances the subject's ability to build and retain heavy muscles." + activation_messages = list("You feel buff!") + deactivation_messages = list("You feel wimpy and weak.") + +/datum/mutation/disability/strong/New() + ..() + block = GLOB.strongblock + +// WAS: /datum/bioEffect/horns +/datum/mutation/disability/horns + name = "Horns" + desc = "Enables the growth of a compacted keratin formation on the subject's head." + activation_messages = list("A pair of horns erupt from your head.") + deactivation_messages = list("Your horns crumble away into nothing.") + +/datum/mutation/disability/horns/New() + ..() + block = GLOB.hornsblock + +/datum/mutation/disability/horns/on_draw_underlays(mob/M, g) + return "horns_s" + +/datum/mutation/grant_spell/immolate + name = "Incendiary Mitochondria" + desc = "The subject becomes able to convert excess cellular energy into thermal energy." + activation_messages = list("You suddenly feel rather hot.") + deactivation_messages = list("You no longer feel uncomfortably hot.") + spelltype = /obj/effect/proc_holder/spell/targeted/immolate + +/datum/mutation/grant_spell/immolate/New() + ..() + block = GLOB.immolateblock + +/obj/effect/proc_holder/spell/targeted/immolate + name = "Incendiary Mitochondria" + desc = "The subject becomes able to convert excess cellular energy into thermal energy." + panel = "Abilities" + + charge_type = "recharge" + charge_max = 600 + + clothes_req = 0 + stat_allowed = 0 + invocation_type = "none" + range = -1 + selection_type = "range" + var/list/compatible_mobs = list(/mob/living/carbon/human) + include_user = 1 + + action_icon_state = "genetic_incendiary" + +/obj/effect/proc_holder/spell/targeted/immolate/cast(list/targets, mob/living/user = usr) + var/mob/living/carbon/L = user + L.adjust_fire_stacks(0.5) + L.visible_message("[L.name] suddenly bursts into flames!") + L.IgniteMob() + playsound(L.loc, 'sound/effects/bamf.ogg', 50, 0) + +/datum/mutation/disability/speech/loud + name = "Loud" + desc = "Forces the speaking centre of the subjects brain to yell every sentence." + activation_messages = list("YOU FEEL LIKE YELLING!") + deactivation_messages = list("You feel like being quiet..") + +/datum/mutation/disability/speech/loud/New() + ..() + block = GLOB.loudblock + + + +/datum/mutation/disability/speech/loud/on_say(mob/M, message) + message = replacetext(message,".","!") + message = replacetext(message,"?","?!") + message = replacetext(message,"!","!!") + return uppertext(message) + +/datum/mutation/disability/dizzy + name = "Dizzy" + desc = "Causes the cerebellum to shut down in some places." + activation_messages = list("You feel very dizzy...") + deactivation_messages = list("You regain your balance.") + instability = -GENE_INSTABILITY_MINOR + +/datum/mutation/disability/dizzy/New() + ..() + block = GLOB.dizzyblock + + +/datum/mutation/disability/dizzy/on_life(mob/living/carbon/human/M) + if(!istype(M)) + return + M.Dizzy(300) + +/datum/mutation/disability/dizzy/deactivate(mob/living/M) + ..() + M.SetDizzy(0) diff --git a/code/game/dna/genes/monkey.dm b/code/game/dna/mutations/monkey.dm similarity index 77% rename from code/game/dna/genes/monkey.dm rename to code/game/dna/mutations/monkey.dm index 583b2c75836..4ebe366bfb7 100644 --- a/code/game/dna/genes/monkey.dm +++ b/code/game/dna/mutations/monkey.dm @@ -1,22 +1,20 @@ -/datum/dna/gene/monkey +/datum/mutation/monkey name = "Monkey" -/datum/dna/gene/monkey/New() +/datum/mutation/monkey/New() ..() block = GLOB.monkeyblock -/datum/dna/gene/monkey/can_activate(mob/M, flags) +/datum/mutation/monkey/can_activate(mob/M, flags) return ishuman(M) -/datum/dna/gene/monkey/activate(mob/living/carbon/human/H, connected, flags) +/datum/mutation/monkey/activate(mob/living/carbon/human/H) if(!istype(H)) return if(issmall(H)) return for(var/obj/item/W in H) - if(istype(W,/obj/item/organ)) - continue - if(istype(W,/obj/item/implant)) + if(istype(W, /obj/item/implant)) continue H.unEquip(W) @@ -43,7 +41,7 @@ return H -/datum/dna/gene/monkey/deactivate(mob/living/carbon/human/H, connected, flags) +/datum/mutation/monkey/deactivate(mob/living/carbon/human/H) if(!istype(H)) return if(!issmall(H)) @@ -51,9 +49,7 @@ for(var/obj/item/W in H) if(W == H.w_uniform) // will be torn continue - if(istype(W,/obj/item/organ)) - continue - if(istype(W,/obj/item/implant)) + if(istype(W, /obj/item/implant)) continue H.unEquip(W) H.regenerate_icons() diff --git a/code/game/dna/mutations/powers.dm b/code/game/dna/mutations/powers.dm new file mode 100644 index 00000000000..98d94299bfc --- /dev/null +++ b/code/game/dna/mutations/powers.dm @@ -0,0 +1,1181 @@ +/////////////////////////////////// +// POWERS +/////////////////////////////////// + +/datum/mutation/nobreath + name = "No Breathing" + activation_messages = list("You feel no need to breathe.") + deactivation_messages = list("You feel the need to breathe, once more.") + instability = GENE_INSTABILITY_MODERATE + traits_to_add = list(TRAIT_NOBREATH) + activation_prob = 25 + +/datum/mutation/nobreath/New() + ..() + block = GLOB.breathlessblock + + +/datum/mutation/regenerate + name = "Regenerate" + activation_messages = list("Your wounds start healing.") + deactivation_messages = list("Your regenerative powers feel like they've vanished.") + instability = GENE_INSTABILITY_MINOR + +/datum/mutation/regenerate/New() + ..() + block = GLOB.regenerateblock + +/datum/mutation/regenerate/on_life(mob/living/carbon/human/H) + H.adjustBruteLoss(-0.1, FALSE) + H.adjustFireLoss(-0.1) + +/datum/mutation/increaserun + name = "Super Speed" + activation_messages = list("You feel swift and unencumbered.") + deactivation_messages = list("You feel slow.") + instability = GENE_INSTABILITY_MINOR + traits_to_add = list(TRAIT_IGNORESLOWDOWN) + +/datum/mutation/increaserun/New() + ..() + block = GLOB.increaserunblock + +/datum/mutation/increaserun/can_activate(mob/M, flags) + if(!..()) + return FALSE + if(ishuman(M)) + var/mob/living/carbon/human/H = M + if(H.dna.species && H.dna.species.speed_mod && !(flags & MUTCHK_FORCED)) + return FALSE + return TRUE + +/datum/mutation/heat_resist + name = "Heat Resistance" + activation_messages = list("Your skin is icy to the touch.") + deactivation_messages = list("Your skin no longer feels icy to the touch.") + instability = GENE_INSTABILITY_MODERATE + traits_to_add = list(TRAIT_RESISTHEAT, TRAIT_RESISTHIGHPRESSURE) + +/datum/mutation/heat_resist/New() + ..() + block = GLOB.coldblock + +/datum/mutation/heat_resist/on_draw_underlays(mob/M, g) + return "cold_s" + +/datum/mutation/cold_resist + name = "Cold Resistance" + activation_messages = list("Your body is filled with warmth.") + deactivation_messages = list("Your body is no longer filled with warmth.") + instability = GENE_INSTABILITY_MODERATE + traits_to_add = list(TRAIT_RESISTCOLD, TRAIT_RESISTLOWPRESSURE) + +/datum/mutation/cold_resist/New() + ..() + block = GLOB.fireblock + +/datum/mutation/cold_resist/on_draw_underlays(mob/M, g) + return "fire_s" + +/datum/mutation/noprints + name = "No Prints" + activation_messages = list("Your fingers feel numb.") + deactivation_messages = list("your fingers no longer feel numb.") + instability = GENE_INSTABILITY_MINOR + traits_to_add = list(TRAIT_NOFINGERPRINTS) + +/datum/mutation/noprints/New() + ..() + block = GLOB.noprintsblock + +/datum/mutation/noshock + name = "Shock Immunity" + activation_messages = list("Your skin feels dry and unreactive.") + deactivation_messages = list("Your skin no longer feels dry and unreactive.") + instability = GENE_INSTABILITY_MODERATE + traits_to_add = list(TRAIT_SHOCKIMMUNE) + +/datum/mutation/noshock/New() + ..() + block = GLOB.shockimmunityblock + +/datum/mutation/midget + name = "Midget" + activation_messages = list("Everything around you seems bigger now...") + deactivation_messages = list("Everything around you seems to shrink...") + instability = GENE_INSTABILITY_MINOR + traits_to_add = list(TRAIT_DWARF) + +/datum/mutation/midget/New() + ..() + block = GLOB.smallsizeblock + +/datum/mutation/midget/activate(mob/M) + ..() + M.pass_flags |= PASSTABLE + M.resize = 0.8 + M.update_transform() + +/datum/mutation/midget/deactivate(mob/M) + ..() + M.pass_flags &= ~PASSTABLE + M.resize = 1.25 + M.update_transform() + +// OLD HULK BEHAVIOR +/datum/mutation/hulk + name = "Hulk" + activation_messages = list("Your muscles hurt.") + deactivation_messages = list("Your muscles shrink.") + instability = GENE_INSTABILITY_MAJOR + traits_to_add = list(TRAIT_HULK, TRAIT_CHUNKYFINGERS) + activation_prob = 15 + +/datum/mutation/hulk/New() + ..() + block = GLOB.hulkblock + +/datum/mutation/hulk/activate(mob/M) + ..() + var/status = CANSTUN | CANWEAKEN | CANPARALYSE | CANPUSH + M.status_flags &= ~status + +/datum/mutation/hulk/deactivate(mob/M) + ..() + M.status_flags |= CANSTUN | CANWEAKEN | CANPARALYSE | CANPUSH + +/datum/mutation/hulk/on_draw_underlays(mob/M, g) + return "hulk_[g]_s" + +/datum/mutation/hulk/on_life(mob/living/carbon/human/M) + if(!istype(M)) + return + if(M.health <= 0) + M.dna.SetSEState(GLOB.hulkblock, 0) + singlemutcheck(M, GLOB.hulkblock, MUTCHK_FORCED) + M.update_mutations() //update our mutation overlays + M.update_body() + M.status_flags |= CANSTUN | CANWEAKEN | CANPARALYSE | CANPUSH //temporary fix until the problem can be solved. + to_chat(M, "You suddenly feel very weak.") + +/datum/mutation/xray + name = "X-Ray Vision" + activation_messages = list("The walls suddenly disappear.") + deactivation_messages = list("the walls around you re-appear.") + instability = GENE_INSTABILITY_MAJOR + traits_to_add = list(TRAIT_XRAY_VISION) + activation_prob = 15 + +/datum/mutation/xray/New() + ..() + block = GLOB.xrayblock + +/datum/mutation/xray/activate(mob/living/M) + ..() + M.update_sight() + M.update_icons() //Apply eyeshine as needed. + +/datum/mutation/xray/deactivate(mob/living/M) + ..() + M.update_sight() + M.update_icons() //Remove eyeshine as needed. + +/datum/mutation/tk + name = "Telekenesis" + activation_messages = list("You feel smarter.") + deactivation_messages = list("You feel dumber.") + instability = GENE_INSTABILITY_MAJOR + activation_prob = 15 + +/datum/mutation/tk/New() + ..() + block = GLOB.teleblock + +/datum/mutation/tk/on_draw_underlays(mob/M, g) + return "telekinesishead_s" + +#define EAT_MOB_DELAY 300 // 30s + +// WAS: /datum/bioEffect/alcres +/datum/mutation/sober + name = "Sober" + activation_messages = list("You feel unusually sober.") + deactivation_messages = list("You feel like you could use a stiff drink.") + + traits_to_add = list(TRAIT_ALCOHOL_TOLERANCE) + +/datum/mutation/sober/New() + ..() + block = GLOB.soberblock + +//WAS: /datum/bioEffect/psychic_resist +/datum/mutation/psychic_resist + name = "Psy-Resist" + desc = "Boosts efficiency in sectors of the brain commonly associated with meta-mental energies." + activation_messages = list("Your mind feels closed.") + deactivation_messages = list("You feel oddly exposed.") + +/datum/mutation/psychic_resist/New() + ..() + block = GLOB.psyresistblock + +///////////////////////// +// Stealth Enhancers +///////////////////////// + +/datum/mutation/stealth + instability = GENE_INSTABILITY_MODERATE + +/datum/mutation/stealth/can_activate(mob/M, flags) + // Can only activate one of these at a time. + if(is_type_in_list(/datum/mutation/stealth, M.active_mutations)) + testing("Cannot activate [type]: /datum/mutation/stealth in M.active_mutations.") + return FALSE + return ..() + +/datum/mutation/stealth/deactivate(mob/living/M) + ..() + M.alpha = 255 + +// WAS: /datum/bioEffect/darkcloak +/datum/mutation/stealth/darkcloak + name = "Cloak of Darkness" + desc = "Enables the subject to bend low levels of light around themselves, creating a cloaking effect." + activation_messages = list("You begin to fade into the shadows.") + deactivation_messages = list("You become fully visible.") + activation_prob = 25 + +/datum/mutation/stealth/darkcloak/New() + ..() + block = GLOB.shadowblock + +/datum/mutation/stealth/darkcloak/on_life(mob/M) + var/turf/simulated/T = get_turf(M) + if(!istype(T)) + return + var/light_available = T.get_lumcount() * 10 + if(light_available <= 2) + M.alpha = round(M.alpha * 0.8) + else + M.alpha = 255 + +//WAS: /datum/bioEffect/chameleon +/datum/mutation/stealth/chameleon + name = "Chameleon" + desc = "The subject becomes able to subtly alter light patterns to become invisible, as long as they remain still." + activation_messages = list("You feel one with your surroundings.") + deactivation_messages = list("You feel oddly visible.") + activation_prob = 25 + +/datum/mutation/stealth/chameleon/New() + ..() + block = GLOB.chameleonblock + +/datum/mutation/stealth/chameleon/on_life(mob/M) + if((world.time - M.last_movement) >= 30 && !M.stat && M.canmove && !M.restrained()) + M.alpha -= 25 + else + M.alpha = round(255 * 0.80) + +///////////////////////////////////////////////////////////////////////////////////////// + +/datum/mutation/grant_spell + var/obj/effect/proc_holder/spell/spelltype + +/datum/mutation/grant_spell/activate(mob/M) + M.AddSpell(new spelltype(null)) + ..() + return TRUE + +/datum/mutation/grant_spell/deactivate(mob/M) + for(var/obj/effect/proc_holder/spell/S in M.mob_spell_list) + if(istype(S, spelltype)) + M.RemoveSpell(S) + ..() + return TRUE + +// WAS: /datum/bioEffect/cryokinesis +/datum/mutation/grant_spell/cryo + name = "Cryokinesis" + desc = "Allows the subject to lower the body temperature of others." + activation_messages = list("You notice a strange cold tingle in your fingertips.") + deactivation_messages = list("Your fingers feel warmer.") + instability = GENE_INSTABILITY_MODERATE + spelltype = /obj/effect/proc_holder/spell/targeted/click/cryokinesis + +/datum/mutation/grant_spell/cryo/New() + ..() + block = GLOB.cryoblock + +/obj/effect/proc_holder/spell/targeted/click/cryokinesis + name = "Cryokinesis" + desc = "Drops the bodytemperature of another person." + panel = "Abilities" + + charge_type = "recharge" + charge_max = 1200 + + clothes_req = FALSE + stat_allowed = FALSE + + click_radius = 0 + auto_target_single = FALSE // Give the clueless geneticists a way out and to have them not target themselves + selection_activated_message = "Your mind grow cold. Click on a target to cast the spell." + selection_deactivated_message = "Your mind returns to normal." + allowed_type = /mob/living/carbon + invocation_type = "none" + range = 7 + selection_type = "range" + include_user = TRUE + var/list/compatible_mobs = list(/mob/living/carbon/human) + + action_icon_state = "genetic_cryo" + +/obj/effect/proc_holder/spell/targeted/click/cryokinesis/cast(list/targets, mob/user = usr) + + var/mob/living/carbon/C = targets[1] + + if(HAS_TRAIT(C, TRAIT_RESISTCOLD)) + C.visible_message("A cloud of fine ice crystals engulfs [C.name], but disappears almost instantly!") + return + var/handle_suit = FALSE + if(ishuman(C)) + var/mob/living/carbon/human/H = C + if(istype(H.head, /obj/item/clothing/head/helmet/space)) + if(istype(H.wear_suit, /obj/item/clothing/suit/space)) + handle_suit = TRUE + if(H.internal) + H.visible_message("[user] sprays a cloud of fine ice crystals, engulfing [H]!", + "[user] sprays a cloud of fine ice crystals over your [H.head]'s visor.") + else + H.visible_message("[user] sprays a cloud of fine ice crystals engulfing, [H]!", + "[user] sprays a cloud of fine ice crystals cover your [H.head]'s visor and make it into your air vents!.") + + H.bodytemperature = max(0, H.bodytemperature - 100) + add_attack_logs(user, C, "Cryokinesis") + if(!handle_suit) + C.bodytemperature = max(0, C.bodytemperature - 200) + C.ExtinguishMob() + + C.visible_message("[user] sprays a cloud of fine ice crystals, engulfing [C]!") + add_attack_logs(user, C, "Cryokinesis- NO SUIT/INTERNALS") + +/////////////////////////////////////////////////////////////////////////////////////////// + +// WAS: /datum/bioEffect/mattereater +/datum/mutation/grant_spell/mattereater + name = "Matter Eater" + desc = "Allows the subject to eat just about anything without harm." + activation_messages = list("You feel hungry.") + deactivation_messages = list("You don't feel quite so hungry anymore.") + instability = GENE_INSTABILITY_MINOR + + spelltype=/obj/effect/proc_holder/spell/targeted/eat + +/datum/mutation/grant_spell/mattereater/New() + ..() + block = GLOB.eatblock + +/obj/effect/proc_holder/spell/targeted/eat + name = "Eat" + desc = "Eat just about anything!" + panel = "Abilities" + + charge_type = "recharge" + charge_max = 300 + + clothes_req = 0 + stat_allowed = 0 + invocation_type = "none" + range = 1 + selection_type = "view" + + action_icon_state = "genetic_eat" + + var/list/types_allowed = list( + /obj/item, + /mob/living/simple_animal/pet, + /mob/living/simple_animal/hostile, + /mob/living/simple_animal/parrot, + /mob/living/simple_animal/crab, + /mob/living/simple_animal/mouse, + /mob/living/carbon/human, + /mob/living/simple_animal/slime, + /mob/living/carbon/alien/larva, + /mob/living/simple_animal/slime, + /mob/living/simple_animal/chick, + /mob/living/simple_animal/chicken, + /mob/living/simple_animal/lizard, + /mob/living/simple_animal/cow, + /mob/living/simple_animal/spiderbot + ) + var/list/own_blacklist = list( + /obj/item/organ, + /obj/item/implant + ) + +/obj/effect/proc_holder/spell/targeted/eat/proc/doHeal(mob/user) + if(ishuman(user)) + var/mob/living/carbon/human/H = user + for(var/name in H.bodyparts_by_name) + var/obj/item/organ/external/affecting = null + if(!H.bodyparts_by_name[name]) + continue + affecting = H.bodyparts_by_name[name] + if(!istype(affecting, /obj/item/organ/external)) + continue + affecting.heal_damage(4, 0, updating_health = FALSE) + H.UpdateDamageIcon() + H.updatehealth() + +/obj/effect/proc_holder/spell/targeted/eat/choose_targets(mob/user = usr) + var/list/targets = new /list() + var/list/possible_targets = new /list() + + if(!check_mouth(user)) + revert_cast(user) + return + + for(var/atom/movable/O in view_or_range(range, user, selection_type)) + if((O in user) && is_type_in_list(O,own_blacklist)) + continue + if(is_type_in_list(O,types_allowed)) + if(isanimal(O)) + var/mob/living/simple_animal/SA = O + if(!SA.gold_core_spawnable) + continue + possible_targets += O + + targets += input("Choose the target of your hunger.", "Targeting") as null|anything in possible_targets + + if(!targets.len || !targets[1]) //doesn't waste the spell + revert_cast(user) + return + + if(!check_mouth(user)) + revert_cast(user) + return + + perform(targets, user = user) + +/obj/effect/proc_holder/spell/targeted/eat/proc/check_mouth(mob/user = usr) + var/can_eat = TRUE + if(iscarbon(user)) + var/mob/living/carbon/C = user + if((C.head && (C.head.flags_cover & HEADCOVERSMOUTH)) || (C.wear_mask && (C.wear_mask.flags_cover & MASKCOVERSMOUTH) && !C.wear_mask.mask_adjusted)) + to_chat(C, "Your mouth is covered, preventing you from eating!") + can_eat = FALSE + return can_eat + +/obj/effect/proc_holder/spell/targeted/eat/cast(list/targets, mob/user = usr) + if(!targets.len) + to_chat(user, "No target found in range.") + return + + var/atom/movable/the_item = targets[1] + if(ishuman(the_item)) + var/mob/living/carbon/human/H = the_item + var/obj/item/organ/external/limb = H.get_organ(user.zone_selected) + if(!istype(limb)) + to_chat(user, "You can't eat this part of them!") + revert_cast() + return FALSE + if(istype(limb,/obj/item/organ/external/head)) + // Bullshit, but prevents being unable to clone someone. + to_chat(user, "You try to put \the [limb] in your mouth, but [the_item.p_their()] ears tickle your throat!") + revert_cast() + return FALSE + if(istype(limb,/obj/item/organ/external/chest)) + // Bullshit, but prevents being able to instagib someone. + to_chat(user, "You try to put [the_item.p_their()] [limb] in your mouth, but it's too big to fit!") + revert_cast() + return FALSE + user.visible_message("[user] begins stuffing [the_item]'s [limb.name] into [user.p_their()] gaping maw!") + var/oldloc = H.loc + if(!do_mob(user,H,EAT_MOB_DELAY)) + to_chat(user, "You were interrupted before you could eat [the_item]!") + else + if(!limb || !H) + return + if(H.loc != oldloc) + to_chat(user, "\The [limb] moved away from your mouth!") + return + user.visible_message("[user] [pick("chomps","bites")] off [the_item]'s [limb]!") + playsound(user.loc, 'sound/items/eatfood.ogg', 50, 0) + limb.droplimb(0, DROPLIMB_SHARP) + doHeal(user) + else + user.visible_message("[user] eats \the [the_item].") + playsound(user.loc, 'sound/items/eatfood.ogg', 50, 0) + qdel(the_item) + doHeal(user) + +//////////////////////////////////////////////////////////////////////// + +//WAS: /datum/bioEffect/jumpy +/datum/mutation/grant_spell/jumpy + name = "Jumpy" + desc = "Allows the subject to leap great distances." + //cooldown = 30 + activation_messages = list("Your leg muscles feel taut and strong.") + deactivation_messages = list("Your leg muscles shrink back to normal.") + instability = GENE_INSTABILITY_MINOR + + spelltype =/obj/effect/proc_holder/spell/targeted/leap + +/datum/mutation/grant_spell/jumpy/New() + ..() + block = GLOB.jumpblock + +/obj/effect/proc_holder/spell/targeted/leap + name = "Jump" + desc = "Leap great distances!" + panel = "Abilities" + range = -1 + include_user = 1 + + charge_type = "recharge" + charge_max = 60 + + clothes_req = 0 + stat_allowed = 0 + invocation_type = "none" + + action_icon_state = "genetic_jump" + +/obj/effect/proc_holder/spell/targeted/leap/cast(list/targets, mob/user = usr) + var/failure = FALSE + if(istype(user.loc,/mob/) || user.lying || user.stunned || user.buckled || user.stat) + to_chat(user, "You can't jump right now!") + return + + if(istype(user.loc,/turf/)) + if(user.restrained())//Why being pulled while cuffed prevents you from moving + for(var/mob/M in range(user, 1)) + if(M.pulling == user) + if(!M.restrained() && M.stat == 0 && M.canmove && user.Adjacent(M)) + failure = TRUE + else + M.stop_pulling() + + user.visible_message("[user.name] takes a huge leap!") + playsound(user.loc, 'sound/weapons/thudswoosh.ogg', 50, 1) + if(failure) + user.Weaken(5) + user.Stun(5) + user.visible_message("[user] attempts to leap away but is slammed back down to the ground!", + "You attempt to leap away but are suddenly slammed back down to the ground!", + "You hear the flexing of powerful muscles and suddenly a crash as a body hits the floor.") + return FALSE + var/prevLayer = user.layer + var/prevFlying = user.flying + user.layer = 9 + + user.flying = TRUE + for(var/i=0, i<10, i++) + step(user, user.dir) + if(i < 5) user.pixel_y += 8 + else user.pixel_y -= 8 + sleep(1) + user.flying = prevFlying + + if(HAS_TRAIT(user, TRAIT_FAT) && prob(66)) + user.visible_message("[user.name] crashes due to [user.p_their()] heavy weight!") + //playsound(user.loc, 'zhit.wav', 50, 1) + user.AdjustWeakened(10) + user.AdjustStunned(5) + + user.layer = prevLayer + + if(istype(user.loc,/obj/)) + var/obj/container = user.loc + to_chat(user, "You leap and slam your head against the inside of [container]! Ouch!") + user.AdjustParalysis(3) + user.AdjustWeakened(5) + container.visible_message("[user.loc] emits a loud thump and rattles a bit.") + playsound(user.loc, 'sound/effects/bang.ogg', 50, 1) + var/wiggle = 6 + while(wiggle > 0) + wiggle-- + container.pixel_x = rand(-3,3) + container.pixel_y = rand(-3,3) + sleep(1) + container.pixel_x = 0 + container.pixel_y = 0 + +//////////////////////////////////////////////////////////////////////// + +// WAS: /datum/bioEffect/polymorphism + +/datum/mutation/grant_spell/polymorph + name = "Polymorphism" + desc = "Enables the subject to reconfigure their appearance to mimic that of others." + + spelltype =/obj/effect/proc_holder/spell/targeted/click/polymorph + //cooldown = 1800 + activation_messages = list("You don't feel entirely like yourself somehow.") + deactivation_messages = list("You feel secure in your identity.") + instability = GENE_INSTABILITY_MODERATE + +/datum/mutation/grant_spell/polymorph/New() + ..() + block = GLOB.polymorphblock + +/obj/effect/proc_holder/spell/targeted/click/polymorph + name = "Polymorph" + desc = "Mimic the appearance of others!" + panel = "Abilities" + charge_max = 1800 + + clothes_req = FALSE + stat_allowed = FALSE + + click_radius = -1 // Precision required + auto_target_single = FALSE // Safety to not turn into monkey (420) + selection_activated_message = "You body becomes unstable. Click on a target to cast transform into them." + selection_deactivated_message = "Your body calms down again." + allowed_type = /mob/living/carbon/human + + invocation_type = "none" + range = 1 + selection_type = "range" + + action_icon_state = "genetic_poly" + +/obj/effect/proc_holder/spell/targeted/click/polymorph/cast(list/targets, mob/user = usr) + var/mob/living/carbon/human/target = targets[1] + + user.visible_message("[user]'s body shifts and contorts.") + + spawn(10) + if(target && user) + playsound(user.loc, 'sound/goonstation/effects/gib.ogg', 50, 1) + var/mob/living/carbon/human/H = user + H.UpdateAppearance(target.dna.UI) + H.real_name = target.real_name + H.name = target.name + +//////////////////////////////////////////////////////////////////////// + +// WAS: /datum/bioEffect/empath +/datum/mutation/grant_spell/empath + name = "Empathic Thought" + desc = "The subject becomes able to read the minds of others for certain information." + + spelltype = /obj/effect/proc_holder/spell/targeted/empath + activation_messages = list("You suddenly notice more about others than you did before.") + deactivation_messages = list("You no longer feel able to sense intentions.") + instability = GENE_INSTABILITY_MINOR + +/datum/mutation/grant_spell/empath/New() + ..() + block = GLOB.empathblock + +/obj/effect/proc_holder/spell/targeted/empath + name = "Read Mind" + desc = "Read the minds of others for information." + charge_max = 180 + clothes_req = FALSE + human_req = TRUE + stat_allowed = CONSCIOUS + invocation_type = "none" + range = -2 + selection_type = "range" + + action_icon_state = "genetic_empath" + +/obj/effect/proc_holder/spell/targeted/empath/choose_targets(mob/user = usr) + var/list/possible_targets = list() + for(var/mob/living/carbon/C in range(7, user)) + possible_targets += C + var/target = input("Choose the target to spy on.", "Targeting") as null|mob in possible_targets + + if(!target) //doesn't waste the spell + revert_cast(user) + return + + perform(list(target), user = user) + +/obj/effect/proc_holder/spell/targeted/empath/cast(list/targets, mob/user = usr) + for(var/mob/living/carbon/M in targets) + if(!iscarbon(M)) + to_chat(user, "You may only use this on other organic beings.") + return + + if(M.dna?.GetSEState(GLOB.psyresistblock)) + to_chat(user, "You can't see into [M.name]'s mind at all!") + return + + if(M.stat == 2) + to_chat(user, "[M.name] is dead and cannot have [M.p_their()] mind read.") + return + if(M.health < 0) + to_chat(user, "[M.name] is dying, and [M.p_their()] thoughts are too scrambled to read.") + return + + to_chat(user, "Mind Reading of [M.name]:") + + var/pain_condition = M.health / M.maxHealth + // lower health means more pain + var/list/randomthoughts = list("what to have for lunch","the future","the past","money", + "[M.p_their()] hair","what to do next","[M.p_their()] job","space","amusing things","sad things", + "annoying things","happy things","something incoherent","something [M.p_they()] did wrong") + var/thoughts = "thinking about [pick(randomthoughts)]" + + if(M.fire_stacks) + pain_condition -= 0.5 + thoughts = "preoccupied with the fire" + + if(M.radiation) + pain_condition -= 0.25 + + switch(pain_condition) + if(0.81 to INFINITY) + to_chat(user, "Condition: [M.name] feels good.") + if(0.61 to 0.8) + to_chat(user, "Condition: [M.name] is suffering mild pain.") + if(0.41 to 0.6) + to_chat(user, "Condition: [M.name] is suffering significant pain.") + if(0.21 to 0.4) + to_chat(user, "Condition: [M.name] is suffering severe pain.") + else + to_chat(user, "Condition: [M.name] is suffering excruciating pain.") + thoughts = "haunted by [M.p_their()] own mortality" + + switch(M.a_intent) + if(INTENT_HELP) + to_chat(user, "Mood: You sense benevolent thoughts from [M.name].") + if(INTENT_DISARM) + to_chat(user, "Mood: You sense cautious thoughts from [M.name].") + if(INTENT_GRAB) + to_chat(user, "Mood: You sense hostile thoughts from [M.name].") + if(INTENT_HARM) + to_chat(user, "Mood: You sense cruel thoughts from [M.name].") + for(var/mob/living/L in view(7,M)) + if(L == M) + continue + thoughts = "thinking about punching [L.name]" + break + else + to_chat(user, "Mood: You sense strange thoughts from [M.name].") + + if(istype(M,/mob/living/carbon/human)) + var/numbers[0] + var/mob/living/carbon/human/H = M + if(H.mind && H.mind.initial_account) + numbers += H.mind.initial_account.account_number + numbers += H.mind.initial_account.remote_access_pin + if(numbers.len>0) + to_chat(user, "Numbers: You sense the number[numbers.len>1?"s":""] [english_list(numbers)] [numbers.len>1?"are":"is"] important to [M.name].") + to_chat(user, "Thoughts: [M.name] is currently [thoughts].") + + if(M.dna?.GetSEState(GLOB.empathblock)) + to_chat(M, "You sense [user.name] reading your mind.") + else if(prob(5) || M.mind.assigned_role=="Chaplain") + to_chat(M, "You sense someone intruding upon your thoughts...") + +///////////////////Vanilla Morph//////////////////////////////////// + +/datum/mutation/grant_spell/morph + name = "Morphism" + desc = "Enables the subject to reconfigure their appearance to that of any human." + spelltype =/obj/effect/proc_holder/spell/targeted/morph + activation_messages = list("Your body feels if can alter its appearance.") + deactivation_messages = list("Your body doesn't feel capable of altering its appearance.") + instability = GENE_INSTABILITY_MINOR + +/datum/mutation/grant_spell/morph/New() + ..() + block = GLOB.morphblock + +/obj/effect/proc_holder/spell/targeted/morph + name = "Morph" + desc = "Mimic the appearance of your choice!" + panel = "Abilities" + charge_max = 1800 + + clothes_req = 0 + stat_allowed = 0 + invocation_type = "none" + range = -1 + include_user = 1 + selection_type = "range" + + action_icon_state = "genetic_morph" + +/obj/effect/proc_holder/spell/targeted/morph/cast(list/targets, mob/user = usr) + if(!ishuman(user)) + return + + if(istype(user.loc,/mob/)) + to_chat(user, "You can't change your appearance right now!") + return + var/mob/living/carbon/human/M = user + var/obj/item/organ/external/head/head_organ = M.get_organ("head") + var/obj/item/organ/internal/eyes/eyes_organ = M.get_int_organ(/obj/item/organ/internal/eyes) + + var/new_gender = alert(user, "Please select gender.", "Character Generation", "Male", "Female") + if(new_gender) + if(new_gender == "Male") + M.change_gender(MALE) + else + M.change_gender(FEMALE) + + var/new_eyes = input("Please select eye color.", "Character Generation", eyes_organ.eye_color) as null|color + if(new_eyes) + M.change_eye_color(new_eyes) + + //Alt heads. + if(head_organ.dna.species.bodyflags & HAS_ALT_HEADS) + var/list/valid_alt_heads = M.generate_valid_alt_heads() + var/new_alt_head = input("Please select alternate head", "Character Generation", head_organ.alt_head) as null|anything in valid_alt_heads + if(new_alt_head) + M.change_alt_head(new_alt_head) + + // hair + var/list/valid_hairstyles = M.generate_valid_hairstyles() + var/new_style = input("Please select hair style", "Character Generation", head_organ.h_style) as null|anything in valid_hairstyles + + // if new style selected (not cancel) + if(new_style) + M.change_hair(new_style) + + var/new_hair = input("Please select hair color.", "Character Generation", head_organ.hair_colour) as null|color + if(new_hair) + M.change_hair_color(new_hair) + + var/datum/sprite_accessory/hair_style = GLOB.hair_styles_public_list[head_organ.h_style] + if(hair_style.secondary_theme && !hair_style.no_sec_colour) + new_hair = input("Please select secondary hair color.", "Character Generation", head_organ.sec_hair_colour) as null|color + if(new_hair) + M.change_hair_color(new_hair, 1) + + // facial hair + var/list/valid_facial_hairstyles = M.generate_valid_facial_hairstyles() + new_style = input("Please select facial style", "Character Generation", head_organ.f_style) as null|anything in valid_facial_hairstyles + + if(new_style) + M.change_facial_hair(new_style) + + var/new_facial = input("Please select facial hair color.", "Character Generation", head_organ.facial_colour) as null|color + if(new_facial) + M.change_facial_hair_color(new_facial) + + var/datum/sprite_accessory/facial_hair_style = GLOB.facial_hair_styles_list[head_organ.f_style] + if(facial_hair_style.secondary_theme && !facial_hair_style.no_sec_colour) + new_facial = input("Please select secondary facial hair color.", "Character Generation", head_organ.sec_facial_colour) as null|color + if(new_facial) + M.change_facial_hair_color(new_facial, 1) + + //Head accessory. + if(head_organ.dna.species.bodyflags & HAS_HEAD_ACCESSORY) + var/list/valid_head_accessories = M.generate_valid_head_accessories() + var/new_head_accessory = input("Please select head accessory style", "Character Generation", head_organ.ha_style) as null|anything in valid_head_accessories + if(new_head_accessory) + M.change_head_accessory(new_head_accessory) + + var/new_head_accessory_colour = input("Please select head accessory colour.", "Character Generation", head_organ.headacc_colour) as null|color + if(new_head_accessory_colour) + M.change_head_accessory_color(new_head_accessory_colour) + + //Body accessory. + if(M.dna.species.tail && M.dna.species.bodyflags & HAS_TAIL) + var/list/valid_body_accessories = M.generate_valid_body_accessories() + if(valid_body_accessories.len > 1) //By default valid_body_accessories will always have at the very least a 'none' entry populating the list, even if the user's species is not present in any of the list items. + var/new_body_accessory = input("Please select body accessory style", "Character Generation", M.body_accessory) as null|anything in valid_body_accessories + if(new_body_accessory) + M.change_body_accessory(new_body_accessory) + + //Head markings. + if(M.dna.species.bodyflags & HAS_HEAD_MARKINGS) + var/list/valid_head_markings = M.generate_valid_markings("head") + var/new_marking = input("Please select head marking style", "Character Generation", M.m_styles["head"]) as null|anything in valid_head_markings + if(new_marking) + M.change_markings(new_marking, "head") + + var/new_marking_colour = input("Please select head marking colour.", "Character Generation", M.m_colours["head"]) as null|color + if(new_marking_colour) + M.change_marking_color(new_marking_colour, "head") + //Body markings. + if(M.dna.species.bodyflags & HAS_BODY_MARKINGS) + var/list/valid_body_markings = M.generate_valid_markings("body") + var/new_marking = input("Please select body marking style", "Character Generation", M.m_styles["body"]) as null|anything in valid_body_markings + if(new_marking) + M.change_markings(new_marking, "body") + + var/new_marking_colour = input("Please select body marking colour.", "Character Generation", M.m_colours["body"]) as null|color + if(new_marking_colour) + M.change_marking_color(new_marking_colour, "body") + //Tail markings. + if(M.dna.species.bodyflags & HAS_TAIL_MARKINGS) + var/list/valid_tail_markings = M.generate_valid_markings("tail") + var/new_marking = input("Please select tail marking style", "Character Generation", M.m_styles["tail"]) as null|anything in valid_tail_markings + if(new_marking) + M.change_markings(new_marking, "tail") + + var/new_marking_colour = input("Please select tail marking colour.", "Character Generation", M.m_colours["tail"]) as null|color + if(new_marking_colour) + M.change_marking_color(new_marking_colour, "tail") + + //Skin tone. + if(M.dna.species.bodyflags & HAS_SKIN_TONE) + var/new_tone = input("Please select skin tone level: 1-220 (1=albino, 35=caucasian, 150=black, 220='very' black)", "Character Generation", M.s_tone) as null|text + if(!new_tone) + new_tone = 35 + else + new_tone = 35 - max(min(round(text2num(new_tone)), 220), 1) + M.change_skin_tone(new_tone) + + if(M.dna.species.bodyflags & HAS_ICON_SKIN_TONE) + var/prompt = "Please select skin tone: 1-[M.dna.species.icon_skin_tones.len] (" + for(var/i = 1 to M.dna.species.icon_skin_tones.len) + prompt += "[i] = [M.dna.species.icon_skin_tones[i]]" + if(i != M.dna.species.icon_skin_tones.len) + prompt += ", " + prompt += ")" + + var/new_tone = input(prompt, "Character Generation", M.s_tone) as null|text + if(!new_tone) + new_tone = 0 + else + new_tone = max(min(round(text2num(new_tone)), M.dna.species.icon_skin_tones.len), 1) + M.change_skin_tone(new_tone) + + //Skin colour. + if(M.dna.species.bodyflags & HAS_SKIN_COLOR) + var/new_body_colour = input("Please select body colour.", "Character Generation", M.skin_colour) as null|color + if(new_body_colour) + M.change_skin_color(new_body_colour) + + M.update_dna() + + M.visible_message("[M] morphs and changes [M.p_their()] appearance!", "You change your appearance!", "Oh, god! What the hell was that? It sounded like flesh getting squished and bone ground into a different shape!") + +/datum/mutation/grant_spell/remotetalk + name = "Telepathy" + activation_messages = list("You feel you can project your thoughts.") + deactivation_messages = list("You no longer feel you can project your thoughts.") + instability = GENE_INSTABILITY_MINOR + + spelltype =/obj/effect/proc_holder/spell/targeted/remotetalk + +/datum/mutation/grant_spell/remotetalk/New() + ..() + block = GLOB.remotetalkblock + +/datum/mutation/grant_spell/remotetalk/activate(mob/living/M) + ..() + M.AddSpell(new /obj/effect/proc_holder/spell/targeted/mindscan(null)) + +/datum/mutation/grant_spell/remotetalk/deactivate(mob/user) + ..() + for(var/obj/effect/proc_holder/spell/S in user.mob_spell_list) + if(istype(S, /obj/effect/proc_holder/spell/targeted/mindscan)) + user.RemoveSpell(S) + +/obj/effect/proc_holder/spell/targeted/remotetalk + name = "Project Mind" + desc = "Make people understand your thoughts!" + charge_max = 0 + + clothes_req = 0 + stat_allowed = 0 + invocation_type = "none" + range = -2 + selection_type = "range" + + action_icon_state = "genetic_project" + +/obj/effect/proc_holder/spell/targeted/remotetalk/choose_targets(mob/user = usr) + var/list/targets = new /list() + var/list/validtargets = user.get_telepathic_targets() + + if(!length(validtargets)) + to_chat(user, "There are no valid targets!") + start_recharge() + return + + var/target_name = input("Choose the target to talk to.", "Targeting") as null|anything in validtargets + + var/mob/living/target + if(!target_name || !(target = validtargets[target_name])) + revert_cast(user) + return + + targets += target + perform(targets, user = user) + +/obj/effect/proc_holder/spell/targeted/remotetalk/cast(list/targets, mob/user = usr) + if(!ishuman(user)) return + var/say = input("What do you wish to say") as text|null + if(!say || usr.stat) + return + say = strip_html(say) + say = pencode_to_html(say, usr, format = 0, fields = 0) + + for(var/mob/living/target in targets) + log_say("(TPATH to [key_name(target)]) [say]", user) + user.create_log(SAY_LOG, "Telepathically said '[say]' using [src]", target) + if(target.dna?.GetSEState(GLOB.remotetalkblock)) + target.show_message("You hear [user.real_name]'s voice: [say]") + else + target.show_message("You hear a voice that seems to echo around the room: [say]") + user.show_message("You project your mind into [(target in user.get_visible_mobs()) ? target.name : "the unknown entity"]: [say]") + for(var/mob/dead/observer/G in GLOB.player_list) + G.show_message("Telepathic message from [user] ([ghost_follow_link(user, ghost=G)]) to [target] ([ghost_follow_link(target, ghost=G)]): [say]") + +/obj/effect/proc_holder/spell/targeted/mindscan + name = "Scan Mind" + desc = "Offer people a chance to share their thoughts!" + charge_max = 0 + clothes_req = 0 + stat_allowed = 0 + invocation_type = "none" + range = -2 + selection_type = "range" + action_icon_state = "genetic_mindscan" + var/list/available_targets = list() + +/obj/effect/proc_holder/spell/targeted/mindscan/choose_targets(mob/user = usr) + var/list/targets = list() + var/list/validtargets = user.get_telepathic_targets() + + if(!length(validtargets)) + to_chat(user, "There are no valid targets!") + start_recharge() + return + + var/target_name = input("Choose the target to listen to.", "Targeting") as null|anything in validtargets + + var/mob/living/target + if(!target_name || !(target = validtargets[target_name])) + revert_cast(user) + return + + targets += target + perform(targets, user = user) + +/obj/effect/proc_holder/spell/targeted/mindscan/cast(list/targets, mob/user = usr) + if(!ishuman(user)) + return + for(var/mob/living/target in targets) + var/message = "You feel your mind expand briefly... (Click to send a message.)" + if(target.dna?.GetSEState(GLOB.remotetalkblock)) + message = "You feel [user.real_name] request a response from you... (Click here to project mind.)" + user.show_message("You offer your mind to [(target in user.get_visible_mobs()) ? target.name : "the unknown entity"].") + target.show_message("[message]") + available_targets += target + addtimer(CALLBACK(src, .proc/removeAvailability, target), 100) + +/obj/effect/proc_holder/spell/targeted/mindscan/proc/removeAvailability(mob/living/target) + if(target in available_targets) + available_targets -= target + if(!(target in available_targets)) + target.show_message("You feel the sensation fade...") + +/obj/effect/proc_holder/spell/targeted/mindscan/Topic(href, href_list) + var/mob/living/user + if(href_list["user"]) + user = locateUID(href_list["user"]) + if(href_list["target"]) + if(!user) + return + var/mob/living/target = locateUID(href_list["target"]) + if(!(target in available_targets)) + return + available_targets -= target + var/say = input("What do you wish to say") as text|null + if(!say) + return + say = strip_html(say) + say = pencode_to_html(say, target, format = 0, fields = 0) + user.create_log(SAY_LOG, "Telepathically responded '[say]' using [src]", target) + log_say("(TPATH to [key_name(target)]) [say]", user) + if(target.dna?.GetSEState(GLOB.remotetalkblock)) + target.show_message("You project your mind into [user.name]: [say]") + else + target.show_message("You fill the space in your thoughts: [say]") + user.show_message("You hear [target.name]'s voice: [say]") + for(var/mob/dead/observer/G in GLOB.player_list) + G.show_message("Telepathic response from [target] ([ghost_follow_link(target, ghost=G)]) to [user] ([ghost_follow_link(user, ghost=G)]): [say]") + +/obj/effect/proc_holder/spell/targeted/mindscan/Destroy() + available_targets.Cut() + return ..() + +/datum/mutation/grant_spell/remoteview + name = "Remote Viewing" + activation_messages = list("Your mind can see things from afar.") + deactivation_messages = list("Your mind can no longer can see things from afar.") + instability = GENE_INSTABILITY_MINOR + + spelltype =/obj/effect/proc_holder/spell/targeted/remoteview + +/datum/mutation/grant_spell/remoteview/New() + ..() + block = GLOB.remoteviewblock + + +/obj/effect/proc_holder/spell/targeted/remoteview + name = "Remote View" + desc = "Spy on people from any range!" + charge_max = 100 + + clothes_req = 0 + stat_allowed = 0 + invocation_type = "none" + range = -2 + selection_type = "range" + + action_icon_state = "genetic_view" + +/obj/effect/proc_holder/spell/targeted/remoteview/choose_targets(mob/user = usr) + var/list/targets = list() + var/list/remoteviewers = list() + for(var/mob/M in GLOB.alive_mob_list) + if(M == user) + continue + if(M.dna?.GetSEState(GLOB.psyresistblock)) + continue + if(M.dna?.GetSEState(GLOB.remoteviewblock)) + remoteviewers += M + if(!LAZYLEN(remoteviewers)) + to_chat(user, "No valid targets with remote view were found!") + start_recharge() + return + targets += input("Choose the target to spy on.", "Targeting") as null|anything in remoteviewers + if(!targets) + to_chat(user, "You decide against remote viewing.") + start_recharge() + return + perform(targets, user = user) + +/obj/effect/proc_holder/spell/targeted/remoteview/cast(list/targets, mob/user = usr) + var/mob/living/carbon/human/H + if(ishuman(user)) + H = user + else + return + + var/mob/target + + if(istype(H.l_hand, /obj/item/tk_grab) || istype(H.r_hand, /obj/item/tk_grab)) + to_chat(H, "Your mind is too busy with that telekinetic grab.") + H.remoteview_target = null + H.reset_perspective() + return + + if(H.client.eye != user.client.mob) + H.remoteview_target = null + H.reset_perspective() + return + + for(var/mob/living/L in targets) + target = L + + if(target) + H.remoteview_target = target + H.reset_perspective(target) + else + H.remoteview_target = null + H.reset_perspective() diff --git a/code/game/gamemodes/blob/blob.dm b/code/game/gamemodes/blob/blob.dm index 641167c768c..83fefdf9deb 100644 --- a/code/game/gamemodes/blob/blob.dm +++ b/code/game/gamemodes/blob/blob.dm @@ -63,7 +63,7 @@ GLOBAL_LIST_EMPTY(blob_nodes) return candidates -/datum/game_mode/blob/proc/blobize(var/mob/living/carbon/human/blob) +/datum/game_mode/blob/proc/blobize(mob/living/carbon/human/blob) var/datum/mind/blobmind = blob.mind if(!istype(blobmind)) return 0 @@ -79,7 +79,7 @@ GLOBAL_LIST_EMPTY(blob_nodes) burst_blob(blobmind) return 1 -/datum/game_mode/blob/proc/make_blobs(var/count) +/datum/game_mode/blob/proc/make_blobs(count) var/list/candidates = get_blob_candidates() var/mob/living/carbon/human/blob = null count=min(count, candidates.len) @@ -97,16 +97,16 @@ GLOBAL_LIST_EMPTY(blob_nodes) to_chat(world, "You must kill it all while minimizing the damage to the station.") -/datum/game_mode/blob/proc/greet_blob(var/datum/mind/blob) +/datum/game_mode/blob/proc/greet_blob(datum/mind/blob) to_chat(blob.current, "You are infected by the Blob!") to_chat(blob.current, "Your body is ready to give spawn to a new blob core which will eat this station.") 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.") - SEND_SOUND(blob.current, 'sound/magic/mutate.ogg') + SEND_SOUND(blob.current, sound('sound/magic/mutate.ogg')) return -/datum/game_mode/blob/proc/show_message(var/message) +/datum/game_mode/blob/proc/show_message(message) for(var/datum/mind/blob in infected_crew) to_chat(blob.current, message) @@ -114,7 +114,7 @@ GLOBAL_LIST_EMPTY(blob_nodes) for(var/datum/mind/blob in infected_crew) burst_blob(blob) -/datum/game_mode/blob/proc/burst_blob(var/datum/mind/blob, var/warned=0) +/datum/game_mode/blob/proc/burst_blob(datum/mind/blob, warned=0) var/client/blob_client = null var/turf/location = null @@ -140,7 +140,7 @@ GLOBAL_LIST_EMPTY(blob_nodes) else if(blob_client && location) burst++ C.gib() - var/obj/structure/blob/core/core = new(location, 200, blob_client, blob_point_rate) + var/obj/structure/blob/core/core = new(location, blob_client, blob_point_rate) if(core.overmind && core.overmind.mind) core.overmind.mind.name = blob.name infected_crew -= blob @@ -190,7 +190,7 @@ GLOBAL_LIST_EMPTY(blob_nodes) return ..() -/datum/game_mode/blob/proc/stage(var/stage) +/datum/game_mode/blob/proc/stage(stage) switch(stage) if(0) send_intercept(1) diff --git a/code/game/gamemodes/blob/blob_report.dm b/code/game/gamemodes/blob/blob_report.dm index 93b84dbb54d..670c9ea8aa4 100644 --- a/code/game/gamemodes/blob/blob_report.dm +++ b/code/game/gamemodes/blob/blob_report.dm @@ -1,4 +1,4 @@ -/datum/game_mode/blob/proc/send_intercept(var/report = 1) +/datum/game_mode/blob/proc/send_intercept(report = 1) var/intercepttext = "" var/interceptname = "" switch(report) @@ -89,7 +89,7 @@ else if(istype(O, /obj/machinery)) src.mach += 1 -/datum/station_state/proc/score(var/datum/station_state/result) +/datum/station_state/proc/score(datum/station_state/result) if(!result) return 0 var/output = 0 output += (result.floor / max(floor,1)) diff --git a/code/game/gamemodes/blob/blobs/blob_mobs.dm b/code/game/gamemodes/blob/blobs/blob_mobs.dm index a3b0d83f690..14603c1681a 100644 --- a/code/game/gamemodes/blob/blobs/blob_mobs.dm +++ b/code/game/gamemodes/blob/blobs/blob_mobs.dm @@ -20,7 +20,7 @@ fire_damage = 3 var/mob/camera/blob/overmind = null -/mob/living/simple_animal/hostile/blob/proc/adjustcolors(var/a_color) +/mob/living/simple_animal/hostile/blob/proc/adjustcolors(a_color) if(a_color) color = a_color @@ -34,6 +34,11 @@ H.color = "#000000" adjustHealth(-maxHealth * 0.0125) +/mob/living/simple_animal/hostile/blob/Process_Spacemove(movement_dir = 0) + // Use any nearby blob structures to allow space moves. + for(var/obj/structure/blob/B in range(1, src)) + return TRUE + return ..() //////////////// // BLOB SPORE // @@ -64,7 +69,7 @@ return 1 return ..() -/mob/living/simple_animal/hostile/blob/blobspore/New(loc, var/obj/structure/blob/factory/linked_node) +/mob/living/simple_animal/hostile/blob/blobspore/New(loc, obj/structure/blob/factory/linked_node) if(istype(linked_node)) factory = linked_node factory.spores += src @@ -92,12 +97,13 @@ health = maxHealth name = "blob zombie" desc = "A shambling corpse animated by the blob." + mob_biotypes |= MOB_HUMANOID melee_damage_lower = 10 melee_damage_upper = 15 icon = H.icon speak_emote = list("groans") icon_state = "zombie2_s" - if(head_organ) + if(head_organ && !(NO_HAIR in H.dna.species.species_traits)) head_organ.h_style = null H.update_hair() human_overlays = H.overlays @@ -143,7 +149,7 @@ adjustcolors(overmind?.blob_reagent_datum?.complementary_color) -/mob/living/simple_animal/hostile/blob/blobspore/adjustcolors(var/a_color) +/mob/living/simple_animal/hostile/blob/blobspore/adjustcolors(a_color) color = a_color if(is_zombie) @@ -180,6 +186,7 @@ see_in_dark = 8 lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE move_resist = MOVE_FORCE_OVERPOWERING + a_intent = INTENT_HARM /mob/living/simple_animal/hostile/blob/blobbernaut/Life(seconds, times_fired) if(stat != DEAD && (getBruteLoss() || getFireLoss())) // Heal on blob structures diff --git a/code/game/gamemodes/blob/blobs/core.dm b/code/game/gamemodes/blob/blobs/core.dm index dc8d0f5aba2..a12f53150ca 100644 --- a/code/game/gamemodes/blob/blobs/core.dm +++ b/code/game/gamemodes/blob/blobs/core.dm @@ -12,22 +12,22 @@ var/is_offspring = null var/selecting = 0 -/obj/structure/blob/core/New(loc, var/h = 200, var/client/new_overmind = null, var/new_rate = 2, offspring) +/obj/structure/blob/core/Initialize(mapload, client/new_overmind = null, new_rate = 2, offspring) + . = ..() GLOB.blob_cores += src START_PROCESSING(SSobj, src) GLOB.poi_list |= src adjustcolors(color) //so it atleast appears if(offspring) - is_offspring = 1 + is_offspring = TRUE if(overmind) adjustcolors(overmind.blob_reagent_datum.color) if(!overmind) create_overmind(new_overmind) point_rate = new_rate - ..(loc, h) -/obj/structure/blob/core/adjustcolors(var/a_color) +/obj/structure/blob/core/adjustcolors(a_color) overlays.Cut() color = null var/image/I = new('icons/mob/blob.dmi', "blob") diff --git a/code/game/gamemodes/blob/blobs/node.dm b/code/game/gamemodes/blob/blobs/node.dm index d8fe4943586..0023328b463 100644 --- a/code/game/gamemodes/blob/blobs/node.dm +++ b/code/game/gamemodes/blob/blobs/node.dm @@ -6,12 +6,12 @@ armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 65, "acid" = 90) point_return = 18 -/obj/structure/blob/node/New(loc, var/h = 100) +/obj/structure/blob/node/Initialize(mapload) + . = ..() GLOB.blob_nodes += src START_PROCESSING(SSobj, src) - ..(loc, h) -/obj/structure/blob/node/adjustcolors(var/a_color) +/obj/structure/blob/node/adjustcolors(a_color) overlays.Cut() color = null var/image/I = new('icons/mob/blob.dmi', "blob") diff --git a/code/game/gamemodes/blob/blobs/storage.dm b/code/game/gamemodes/blob/blobs/storage.dm index b9052b3601a..ced60709575 100644 --- a/code/game/gamemodes/blob/blobs/storage.dm +++ b/code/game/gamemodes/blob/blobs/storage.dm @@ -11,6 +11,6 @@ overmind.max_blob_points -= 50 ..() -/obj/structure/blob/storage/proc/update_max_blob_points(var/new_point_increase) +/obj/structure/blob/storage/proc/update_max_blob_points(new_point_increase) if(overmind) overmind.max_blob_points += new_point_increase diff --git a/code/game/gamemodes/blob/overmind.dm b/code/game/gamemodes/blob/overmind.dm index 316a136afc6..e5da77c8196 100644 --- a/code/game/gamemodes/blob/overmind.dm +++ b/code/game/gamemodes/blob/overmind.dm @@ -53,15 +53,15 @@ /mob/camera/blob/update_health_hud() if(blob_core && hud_used) - hud_used.blobhealthdisplay.maptext = "
[round(blob_core.obj_integrity)]
" + hud_used.blobhealthdisplay.maptext = "
[round(blob_core.obj_integrity)]
" -/mob/camera/blob/proc/add_points(var/points) +/mob/camera/blob/proc/add_points(points) if(points != 0) blob_points = clamp(blob_points + points, 0, max_blob_points) if(hud_used) - hud_used.blobpwrdisplay.maptext = "
[round(src.blob_points)]
" + hud_used.blobpwrdisplay.maptext = "
[round(src.blob_points)]
" -/mob/camera/blob/say(var/message) +/mob/camera/blob/say(message) if(!message) return @@ -105,7 +105,7 @@ stat(null, "Core Health: [blob_core.obj_integrity]") stat(null, "Power Stored: [blob_points]/[max_blob_points]") -/mob/camera/blob/Move(var/NewLoc, var/Dir = 0) +/mob/camera/blob/Move(NewLoc, Dir = 0) var/obj/structure/blob/B = locate() in range("3x3", NewLoc) if(B) loc = NewLoc diff --git a/code/game/gamemodes/blob/powers.dm b/code/game/gamemodes/blob/powers.dm index 350da7c7593..6ed1bc1aef8 100644 --- a/code/game/gamemodes/blob/powers.dm +++ b/code/game/gamemodes/blob/powers.dm @@ -1,6 +1,6 @@ // Point controlling procs -/mob/camera/blob/proc/can_buy(var/cost = 15) +/mob/camera/blob/proc/can_buy(cost = 15) if(blob_points < cost) to_chat(src, "You cannot afford this!") return 0 @@ -50,7 +50,7 @@ var/turf/T = get_turf(src) create_shield(T) -/mob/camera/blob/proc/create_shield(var/turf/T) +/mob/camera/blob/proc/create_shield(turf/T) var/obj/structure/blob/B = locate(/obj/structure/blob) in T var/obj/structure/blob/shield/S = locate(/obj/structure/blob/shield) in T @@ -283,7 +283,7 @@ var/turf/T = get_turf(src) remove_blob(T) -/mob/camera/blob/proc/remove_blob(var/turf/T) +/mob/camera/blob/proc/remove_blob(turf/T) var/obj/structure/blob/B = locate(/obj/structure/blob) in T if(!T) @@ -312,7 +312,7 @@ var/turf/T = get_turf(src) expand_blob(T) -/mob/camera/blob/proc/expand_blob(var/turf/T) +/mob/camera/blob/proc/expand_blob(turf/T) if(!T) return @@ -350,7 +350,7 @@ var/turf/T = get_turf(src) rally_spores(T) -/mob/camera/blob/proc/rally_spores(var/turf/T) +/mob/camera/blob/proc/rally_spores(turf/T) to_chat(src, "You rally your spores.") var/list/surrounding_turfs = block(locate(T.x - 1, T.y - 1, T.z), locate(T.x + 1, T.y + 1, T.z)) @@ -389,7 +389,7 @@ return split_used = TRUE - new /obj/structure/blob/core/ (get_turf(N), 200, null, blob_core.point_rate, offspring = TRUE) + new /obj/structure/blob/core(get_turf(N), null, blob_core.point_rate, TRUE) qdel(N) if(SSticker && SSticker.mode.name == "blob") diff --git a/code/game/gamemodes/blob/theblob.dm b/code/game/gamemodes/blob/theblob.dm index afe8e3fabe7..b1c5ffde619 100644 --- a/code/game/gamemodes/blob/theblob.dm +++ b/code/game/gamemodes/blob/theblob.dm @@ -16,13 +16,13 @@ var/atmosblock = FALSE //if the blob blocks atmos and heat spread var/mob/camera/blob/overmind -/obj/structure/blob/New(loc) - ..() +/obj/structure/blob/Initialize(mapload) + . = ..() GLOB.blobs += src setDir(pick(GLOB.cardinal)) update_icon() if(atmosblock) - air_update_turf(1) + air_update_turf(TRUE) ConsumeTile() /obj/structure/blob/Destroy() @@ -73,7 +73,7 @@ health_timestamp = world.time + 10 // 1 seconds -/obj/structure/blob/proc/Pulse(var/pulse = 0, var/origin_dir = 0, var/a_color)//Todo: Fix spaceblob expand +/obj/structure/blob/proc/Pulse(pulse = 0, origin_dir = 0, a_color)//Todo: Fix spaceblob expand RegenHealth() if(run_action())//If we can do something here then we dont need to pulse more @@ -110,7 +110,7 @@ if(iswallturf(loc)) loc.blob_act(src) //don't ask how a wall got on top of the core, just eat it -/obj/structure/blob/proc/expand(var/turf/T = null, var/prob = 1, var/a_color) +/obj/structure/blob/proc/expand(turf/T = null, prob = 1, a_color) if(prob && !prob(obj_integrity)) return if(istype(T, /turf/space) && prob(75)) return @@ -139,13 +139,14 @@ A.blob_act(src) return 1 -/obj/structure/blob/Crossed(var/mob/living/L, oldloc) +/obj/structure/blob/Crossed(mob/living/L, oldloc) ..() L.blob_act(src) -/obj/structure/blob/tesla_act(power) - ..() - take_damage(power / 400, BURN, "energy") +/obj/structure/blob/zap_act(power, zap_flags) + take_damage(power * 0.0025, BURN, "energy") + power -= power * 0.0025 //You don't get to do it for free + return ..() //You don't get to do it for free /obj/structure/blob/hulk_damage() return 15 @@ -187,7 +188,7 @@ if(. && obj_integrity > 0) update_icon() -/obj/structure/blob/proc/change_to(var/type) +/obj/structure/blob/proc/change_to(type) if(!ispath(type)) error("[type] is an invalid type for the blob.") var/obj/structure/blob/B = new type(src.loc) @@ -197,7 +198,7 @@ B.adjustcolors(color) qdel(src) -/obj/structure/blob/proc/adjustcolors(var/a_color) +/obj/structure/blob/proc/adjustcolors(a_color) if(a_color) color = a_color return diff --git a/code/game/gamemodes/changeling/changeling.dm b/code/game/gamemodes/changeling/changeling.dm index cf02a711d6f..7d074e869e7 100644 --- a/code/game/gamemodes/changeling/changeling.dm +++ b/code/game/gamemodes/changeling/changeling.dm @@ -112,7 +112,7 @@ GLOBAL_LIST_INIT(possible_changeling_IDs, list("Alpha","Beta","Gamma","Delta","E if(identity_theft.target && identity_theft.target.current) identity_theft.target_real_name = kill_objective.target.current.real_name //Whoops, forgot this. var/mob/living/carbon/human/H = identity_theft.target.current - if(can_absorb_species(H.dna.species)) // For species that can't be absorbed - should default to an escape objective + if(!HAS_TRAIT(H, TRAIT_GENELESS)) // For species that can't be absorbed - should default to an escape objective identity_theft.explanation_text = "Escape on the shuttle or an escape pod with the identity of [identity_theft.target_real_name], the [identity_theft.target.assigned_role] while wearing [identity_theft.target.p_their()] identification card." changeling.objectives += identity_theft else @@ -131,7 +131,7 @@ GLOBAL_LIST_INIT(possible_changeling_IDs, list("Alpha","Beta","Gamma","Delta","E return /datum/game_mode/proc/greet_changeling(datum/mind/changeling, you_are=1) - SEND_SOUND(changeling.current, 'sound/ambience/antag/ling_aler.ogg') + SEND_SOUND(changeling.current, sound('sound/ambience/antag/ling_aler.ogg')) if(you_are) to_chat(changeling.current, "You are a changeling!") to_chat(changeling.current, "Use say \":g message\" to communicate with your fellow changelings. Remember: you get all of their absorbed DNA if you absorb them.") @@ -139,7 +139,8 @@ GLOBAL_LIST_INIT(possible_changeling_IDs, list("Alpha","Beta","Gamma","Delta","E if(changeling.current.mind) if(changeling.current.mind.assigned_role == "Clown") to_chat(changeling.current, "You have evolved beyond your clownish nature, allowing you to wield weapons without harming yourself.") - changeling.current.mutations.Remove(CLUMSY) + changeling.current.dna.SetSEState(GLOB.clumsyblock, FALSE) + singlemutcheck(changeling.current, GLOB.clumsyblock, MUTCHK_FORCED) var/datum/action/innate/toggle_clumsy/A = new A.Grant(changeling.current) var/obj_count = 1 @@ -315,11 +316,11 @@ GLOBAL_LIST_INIT(possible_changeling_IDs, list("Alpha","Beta","Gamma","Delta","E to_chat(user, "[T] is not compatible with our biology.") return - if((NOCLONE || SKELETON || HUSK) in T.mutations) + if(HAS_TRAIT(T, TRAIT_BADDNA) || HAS_TRAIT(T, TRAIT_HUSK) || HAS_TRAIT(T, TRAIT_SKELETONIZED)) to_chat(user, "DNA of [target] is ruined beyond usability!") return - if(NO_DNA in T.dna.species.species_traits) + if(HAS_TRAIT(T, TRAIT_GENELESS)) to_chat(user, "This creature does not have DNA!") return @@ -327,6 +328,3 @@ GLOBAL_LIST_INIT(possible_changeling_IDs, list("Alpha","Beta","Gamma","Delta","E to_chat(user, "We already have this DNA in storage!") return 1 - -/proc/can_absorb_species(datum/species/S) - return !(NO_DNA in S.species_traits) diff --git a/code/game/gamemodes/changeling/changeling_power.dm b/code/game/gamemodes/changeling/changeling_power.dm index 40daa5735c3..47f83b4618b 100644 --- a/code/game/gamemodes/changeling/changeling_power.dm +++ b/code/game/gamemodes/changeling/changeling_power.dm @@ -25,7 +25,7 @@ if you override it, MAKE SURE you call parent or it will not be usable the same goes for Remove(). if you override Remove(), call parent or else your power wont be removed on respec */ -/datum/action/changeling/proc/on_purchase(var/mob/user) +/datum/action/changeling/proc/on_purchase(mob/user) if(needs_button) Grant(user) @@ -46,18 +46,18 @@ the same goes for Remove(). if you override Remove(), call parent or else your p sting_feedback(user, target) take_chemical_cost(c) -/datum/action/changeling/proc/sting_action(var/mob/user, var/mob/target) +/datum/action/changeling/proc/sting_action(mob/user, mob/target) return 0 -/datum/action/changeling/proc/sting_feedback(var/mob/user, var/mob/target) +/datum/action/changeling/proc/sting_feedback(mob/user, mob/target) return 0 -/datum/action/changeling/proc/take_chemical_cost(var/datum/changeling/changeling) +/datum/action/changeling/proc/take_chemical_cost(datum/changeling/changeling) changeling.chem_charges -= chemical_cost changeling.geneticdamage += genetic_damage //Fairly important to remember to return 1 on success >.< -/datum/action/changeling/proc/can_sting(var/mob/user, var/mob/target) +/datum/action/changeling/proc/can_sting(mob/user, mob/target) if(!ishuman(user)) //typecast everything from mob to carbon from this point onwards return 0 if(req_human && (!ishuman(user) || issmall(user))) @@ -73,7 +73,7 @@ the same goes for Remove(). if you override Remove(), call parent or else your p if(req_stat < user.stat) to_chat(user, "We are incapacitated.") return 0 - if((user.status_flags & FAKEDEATH) && name!="Regenerate") + if(HAS_TRAIT(user, TRAIT_FAKEDEATH) && name != "Regenerate") to_chat(user, "We are incapacitated.") return 0 if(c.geneticdamage > max_genetic_damage) @@ -82,7 +82,7 @@ the same goes for Remove(). if you override Remove(), call parent or else your p return 1 //used in /mob/Stat() -/datum/action/changeling/proc/can_be_used_by(var/mob/user) +/datum/action/changeling/proc/can_be_used_by(mob/user) if(!ishuman(user)) return 0 if(req_human && !ishuman(user)) @@ -90,7 +90,7 @@ the same goes for Remove(). if you override Remove(), call parent or else your p return 1 // Transform the target to the chosen dna. Used in transform.dm and tiny_prick.dm (handy for changes since it's the same thing done twice) -/datum/action/changeling/proc/transform_dna(var/mob/living/carbon/human/H, var/datum/dna/D) +/datum/action/changeling/proc/transform_dna(mob/living/carbon/human/H, datum/dna/D) if(!D) return diff --git a/code/game/gamemodes/changeling/evolution_menu.dm b/code/game/gamemodes/changeling/evolution_menu.dm index 83453f09b2a..c07e8ac083b 100644 --- a/code/game/gamemodes/changeling/evolution_menu.dm +++ b/code/game/gamemodes/changeling/evolution_menu.dm @@ -84,7 +84,7 @@ view_mode = new_view_mode return TRUE -/datum/changeling/proc/purchasePower(var/mob/living/carbon/user, var/sting_name) +/datum/changeling/proc/purchasePower(mob/living/carbon/user, sting_name) var/datum/action/changeling/thepower = null var/list/all_powers = init_subtypes(/datum/action/changeling) @@ -112,7 +112,7 @@ to_chat(user, "We have reached our capacity for abilities.") return FALSE - if(user.status_flags & FAKEDEATH)//To avoid potential exploits by buying new powers while in stasis, which clears your verblist. + if(HAS_TRAIT(user, TRAIT_FAKEDEATH)) //To avoid potential exploits by buying new powers while in stasis, which clears your verblist. to_chat(user, "We lack the energy to evolve new abilities right now.") return FALSE @@ -122,7 +122,7 @@ return TRUE //Reselect powers -/datum/changeling/proc/lingRespec(var/mob/user) +/datum/changeling/proc/lingRespec(mob/user) if(!ishuman(user) || issmall(user)) to_chat(user, "We can't remove our evolutions in this form!") return FALSE @@ -136,7 +136,7 @@ to_chat(user, "You lack the power to readapt your evolutions!") return FALSE -/mob/proc/make_changeling(var/get_free_powers = TRUE) +/mob/proc/make_changeling(get_free_powers = TRUE) if(!mind) return if(!ishuman(src)) @@ -170,7 +170,7 @@ return 1 //Used to dump the languages from the changeling datum into the actual mob. -/mob/proc/changeling_update_languages(var/updated_languages) +/mob/proc/changeling_update_languages(updated_languages) for(var/datum/language/L in updated_languages) add_language("L.name") @@ -190,7 +190,7 @@ chem_recharge_slowdown = initial(chem_recharge_slowdown) mimicing = "" -/mob/proc/remove_changeling_powers(var/keep_free_powers=0) +/mob/proc/remove_changeling_powers(keep_free_powers=0) if(ishuman(src)) if(mind && mind.changeling) digitalcamo = 0 diff --git a/code/game/gamemodes/changeling/powers/absorb.dm b/code/game/gamemodes/changeling/powers/absorb.dm index bae3f75ce6b..33c0501c7d5 100644 --- a/code/game/gamemodes/changeling/powers/absorb.dm +++ b/code/game/gamemodes/changeling/powers/absorb.dm @@ -27,7 +27,7 @@ var/mob/living/carbon/target = G.affecting return changeling.can_absorb_dna(user,target) -/datum/action/changeling/absorbDNA/sting_action(var/mob/user) +/datum/action/changeling/absorbDNA/sting_action(mob/user) var/datum/changeling/changeling = user.mind.changeling var/obj/item/grab/G = user.get_active_hand() var/mob/living/carbon/human/target = G.affecting @@ -101,7 +101,7 @@ return 1 //Absorbs the target DNA. -/datum/changeling/proc/absorb_dna(mob/living/carbon/T, var/mob/user) +/datum/changeling/proc/absorb_dna(mob/living/carbon/T, mob/user) T.dna.real_name = T.real_name //Set this again, just to be sure that it's properly set. var/datum/dna/new_dna = T.dna.Clone() //Steal all of their languages! @@ -113,7 +113,7 @@ absorbedcount++ store_dna(new_dna, user) -/datum/changeling/proc/store_dna(var/datum/dna/new_dna, var/mob/user) +/datum/changeling/proc/store_dna(datum/dna/new_dna, mob/user) for(var/datum/objective/escape/escape_with_identity/E in user.mind.objectives) if(E.target_real_name == new_dna.real_name) protected_dna |= new_dna diff --git a/code/game/gamemodes/changeling/powers/augmented_eyesight.dm b/code/game/gamemodes/changeling/powers/augmented_eyesight.dm index 28afcaa9c36..9e0a2279bbd 100644 --- a/code/game/gamemodes/changeling/powers/augmented_eyesight.dm +++ b/code/game/gamemodes/changeling/powers/augmented_eyesight.dm @@ -3,84 +3,54 @@ /datum/action/changeling/augmented_eyesight name = "Augmented Eyesight" - desc = "Creates heat receptors in our eyes and dramatically increases light sensing ability." - helptext = "Grants us thermal vision or flash protection. We will become a lot more vulnerable to flash based devices while thermal vision is active." + desc = "Creates more light sensing rods in our eyes, allowing our vision to penetrate most blocking objects. Protects our vision from flashes while inactive." + helptext = "Grants us x-ray vision or flash protection. We will become a lot more vulnerable to flash-based devices while x-ray vision is active." button_icon_state = "augmented_eyesight" chemical_cost = 0 dna_cost = 2 //Would be 1 without thermal vision active = FALSE /datum/action/changeling/augmented_eyesight/on_purchase(mob/user) //The ability starts inactive, so we should be protected from flashes. + if(!istype(user)) + return ..() - var/obj/item/organ/internal/cyberimp/eyes/O = new /obj/item/organ/internal/cyberimp/eyes/shield/ling() - O.insert(user) - active = FALSE + var/obj/item/organ/internal/eyes/E = user.get_organ_slot("eyes") + if(E) + E.flash_protect = FLASH_PROTECTION_WELDER //Adjust the user's eyes' flash protection + to_chat(user, "We adjust our eyes to protect them from bright lights.") + else + to_chat(user, "We can't adjust our eyes if we don't have any!") /datum/action/changeling/augmented_eyesight/sting_action(mob/living/carbon/user) if(!istype(user)) return - if(!active) - var/obj/item/organ/internal/cyberimp/eyes/O = new /obj/item/organ/internal/cyberimp/eyes/thermals/ling() - O.insert(user) - active = TRUE + ..() + var/obj/item/organ/internal/eyes/E = user.get_organ_slot("eyes") + if(E) + if(!active) + E.vision_flags |= SEE_MOBS | SEE_OBJS | SEE_TURFS //Add sight flags to the user's eyes + E.flash_protect = FLASH_PROTECTION_SENSITIVE //Adjust the user's eyes' flash protection + to_chat(user, "We adjust our eyes to sense prey through walls.") + active = TRUE + else + E.vision_flags ^= SEE_MOBS | SEE_OBJS | SEE_TURFS //Remove sight flags from the user's eyes + E.flash_protect = FLASH_PROTECTION_WELDER //Adjust the user's eyes' flash protection + to_chat(user, "We adjust our eyes to protect them from bright lights.") + active = FALSE + user.update_sight() else - var/obj/item/organ/internal/cyberimp/eyes/O = new /obj/item/organ/internal/cyberimp/eyes/shield/ling() - O.insert(user) - active = FALSE - return 1 + to_chat(user, "We can't adjust our eyes if we don't have any!") + return TRUE -/datum/action/changeling/augmented_eyesight/Remove(mob/user) - var/obj/item/organ/internal/cyberimp/eyes/O = user.get_organ_slot("eye_ling") - if(O) - O.remove(user) - qdel(O) - ..() - -/obj/item/organ/internal/cyberimp/eyes/shield/ling - name = "protective membranes" - desc = "These variable transparency organic membranes will protect you from welders and flashes and heal your eye damage." - icon_state = "ling_eyeshield" - eye_colour = "#000000" - implant_overlay = null - slot = "eye_ling" - status = 0 - aug_message = "We feel a minute twitch in our eyes, our eyes feel more durable." - -/obj/item/organ/internal/cyberimp/eyes/shield/ling/on_life() - ..() - var/obj/item/organ/internal/eyes/E = owner.get_int_organ(/obj/item/organ/internal/eyes) - if(owner.eye_blind || owner.eye_blurry || (BLINDNESS in owner.mutations) || (NEARSIGHTED in owner.mutations) || (E && E.damage > 0)) - owner.reagents.add_reagent("oculine", 1) - -/obj/item/organ/internal/cyberimp/eyes/shield/ling/prepare_eat() - var/obj/S = ..() - S.reagents.add_reagent("oculine", 15) - return S - -/obj/item/organ/internal/cyberimp/eyes/thermals/ling - name = "heat receptors" - desc = "These heat receptors dramatically increases eyes light sensing ability." - icon_state = "ling_thermal" - eye_colour = "#000000" - implant_overlay = null - slot = "eye_ling" - status = 0 - aug_message = "We feel a minute twitch in our eyes, and darkness creeps away." - -/obj/item/organ/internal/cyberimp/eyes/thermals/ling/emp_act(severity) - return - -/obj/item/organ/internal/cyberimp/eyes/thermals/ling/insert(mob/living/carbon/M, special = 0) - ..() - if(ishuman(owner)) - var/mob/living/carbon/human/H = owner - H.weakeyes = 1 - if(!H.vision_type) - H.set_sight(/datum/vision_override/nightvision) - -/obj/item/organ/internal/cyberimp/eyes/thermals/ling/remove(mob/living/carbon/M, special = 0) - if(ishuman(owner)) - var/mob/living/carbon/human/H = owner - H.weakeyes = 0 - H.set_sight(null) + +/datum/action/changeling/augmented_eyesight/Remove(mob/user) //Get rid of x-ray vision and flash protection when the user refunds this ability + if(!istype(user)) + return + var/obj/item/organ/internal/eyes/E = user.get_organ_slot("eyes") + if(E) + if(active) + E.vision_flags ^= SEE_MOBS | SEE_OBJS | SEE_TURFS + else + E.flash_protect = FLASH_PROTECTION_NONE + user.update_sight() ..() diff --git a/code/game/gamemodes/changeling/powers/chameleon_skin.dm b/code/game/gamemodes/changeling/powers/chameleon_skin.dm index d71758a9c8f..48d9b8e4d6e 100644 --- a/code/game/gamemodes/changeling/powers/chameleon_skin.dm +++ b/code/game/gamemodes/changeling/powers/chameleon_skin.dm @@ -13,10 +13,10 @@ return if(H.dna.GetSEState(GLOB.chameleonblock)) H.dna.SetSEState(GLOB.chameleonblock, 0) - genemutcheck(H, GLOB.chameleonblock, null, MUTCHK_FORCED) + singlemutcheck(H, GLOB.chameleonblock, MUTCHK_FORCED) else H.dna.SetSEState(GLOB.chameleonblock, 1) - genemutcheck(H, GLOB.chameleonblock, null, MUTCHK_FORCED) + singlemutcheck(H, GLOB.chameleonblock, MUTCHK_FORCED) SSblackbox.record_feedback("nested tally", "changeling_powers", 1, list("[name]")) return TRUE @@ -25,5 +25,5 @@ var/mob/living/carbon/C = user if(C.dna.GetSEState(GLOB.chameleonblock)) C.dna.SetSEState(GLOB.chameleonblock, 0) - genemutcheck(C, GLOB.chameleonblock, null, MUTCHK_FORCED) + singlemutcheck(C, GLOB.chameleonblock, MUTCHK_FORCED) ..() diff --git a/code/game/gamemodes/changeling/powers/digitalcamo.dm b/code/game/gamemodes/changeling/powers/digitalcamo.dm index d50a2afe5c7..29385d33636 100644 --- a/code/game/gamemodes/changeling/powers/digitalcamo.dm +++ b/code/game/gamemodes/changeling/powers/digitalcamo.dm @@ -6,7 +6,7 @@ dna_cost = 1 //Prevents AIs tracking you but makes you easily detectable to the human-eye. -/datum/action/changeling/digitalcamo/sting_action(var/mob/user) +/datum/action/changeling/digitalcamo/sting_action(mob/user) if(user.digitalcamo) to_chat(user, "We return to normal.") diff --git a/code/game/gamemodes/changeling/powers/epinephrine.dm b/code/game/gamemodes/changeling/powers/epinephrine.dm index 758e9215ed8..ef22de10ce4 100644 --- a/code/game/gamemodes/changeling/powers/epinephrine.dm +++ b/code/game/gamemodes/changeling/powers/epinephrine.dm @@ -9,7 +9,7 @@ req_stat = UNCONSCIOUS //Recover from stuns. -/datum/action/changeling/epinephrine/sting_action(var/mob/living/user) +/datum/action/changeling/epinephrine/sting_action(mob/living/user) if(user.lying) to_chat(user, "We arise.") diff --git a/code/game/gamemodes/changeling/powers/fakedeath.dm b/code/game/gamemodes/changeling/powers/fakedeath.dm index 89586d9672c..b29dd5f8ac6 100644 --- a/code/game/gamemodes/changeling/powers/fakedeath.dm +++ b/code/game/gamemodes/changeling/powers/fakedeath.dm @@ -9,13 +9,13 @@ max_genetic_damage = 100 //Fake our own death and fully heal. You will appear to be dead but regenerate fully after a short delay. -/datum/action/changeling/fakedeath/sting_action(var/mob/living/user) +/datum/action/changeling/fakedeath/sting_action(mob/living/user) to_chat(user, "We begin our stasis, preparing energy to arise once more.") if(user.stat != DEAD) user.emote("deathgasp") user.timeofdeath = world.time - user.status_flags |= FAKEDEATH //play dead + ADD_TRAIT(user, TRAIT_FAKEDEATH, "changeling") //play dead user.updatehealth("fakedeath sting") user.update_canmove() user.mind.changeling.regenerating = TRUE @@ -30,8 +30,8 @@ var/datum/action/changeling/revive/R = new R.Grant(user) -/datum/action/changeling/fakedeath/can_sting(var/mob/user) - if(user.status_flags & FAKEDEATH) +/datum/action/changeling/fakedeath/can_sting(mob/user) + if(HAS_TRAIT(user, TRAIT_FAKEDEATH)) to_chat(user, "We are already regenerating.") return if(!user.stat)//Confirmation for living changelings if they want to fake their death diff --git a/code/game/gamemodes/changeling/powers/fleshmend.dm b/code/game/gamemodes/changeling/powers/fleshmend.dm index 6ed396c0cba..99cb6164aa6 100644 --- a/code/game/gamemodes/changeling/powers/fleshmend.dm +++ b/code/game/gamemodes/changeling/powers/fleshmend.dm @@ -25,7 +25,7 @@ recent_uses = max(1, recent_uses - (1 / healing_ticks)) //Starts healing you every second for 10 seconds. Can be used whilst unconscious. -/datum/action/changeling/fleshmend/sting_action(var/mob/living/user) +/datum/action/changeling/fleshmend/sting_action(mob/living/user) to_chat(user, "We begin to heal rapidly.") if(recent_uses > 1) to_chat(user, "Our healing's effectiveness is reduced \ diff --git a/code/game/gamemodes/changeling/powers/headslug.dm b/code/game/gamemodes/changeling/powers/headslug.dm index d67ad36a80e..e37f97269e4 100644 --- a/code/game/gamemodes/changeling/powers/headslug.dm +++ b/code/game/gamemodes/changeling/powers/headslug.dm @@ -17,7 +17,7 @@ var/list/organs = user.get_organs_zone("head", 1) for(var/obj/item/organ/internal/I in organs) - I.remove(user, 1) + I.remove(user, TRUE) explosion(get_turf(user),0,0,2,0,silent=1) for(var/mob/living/carbon/human/H in range(2,user)) @@ -35,7 +35,7 @@ spawn(5) // So it's not killed in explosion var/mob/living/simple_animal/hostile/headslug/crab = new(new_location) for(var/obj/item/organ/internal/I in organs) - I.loc = crab + I.forceMove(crab) crab.origin = M if(crab.origin) crab.origin.active = 1 diff --git a/code/game/gamemodes/changeling/powers/hivemind.dm b/code/game/gamemodes/changeling/powers/hivemind.dm index 6506f25263c..f67b222189d 100644 --- a/code/game/gamemodes/changeling/powers/hivemind.dm +++ b/code/game/gamemodes/changeling/powers/hivemind.dm @@ -7,7 +7,7 @@ chemical_cost = -1 needs_button = FALSE -/datum/action/changeling/hivemind_comms/on_purchase(var/mob/user) +/datum/action/changeling/hivemind_comms/on_purchase(mob/user) ..() var/datum/changeling/changeling=user.mind.changeling changeling.changeling_speak = 1 diff --git a/code/game/gamemodes/changeling/powers/humanform.dm b/code/game/gamemodes/changeling/powers/humanform.dm index 90031d4d542..bc413fae216 100644 --- a/code/game/gamemodes/changeling/powers/humanform.dm +++ b/code/game/gamemodes/changeling/powers/humanform.dm @@ -8,7 +8,7 @@ max_genetic_damage = 3 //Transform into a human. -/datum/action/changeling/humanform/sting_action(var/mob/living/carbon/human/user) +/datum/action/changeling/humanform/sting_action(mob/living/carbon/human/user) var/datum/changeling/changeling = user.mind.changeling var/list/names = list() for(var/datum/dna/DNA in (changeling.absorbed_dna+changeling.protected_dna)) @@ -25,12 +25,12 @@ return 0 to_chat(user, "We transform our appearance.") user.dna.SetSEState(GLOB.monkeyblock,0,1) - genemutcheck(user,GLOB.monkeyblock,null,MUTCHK_FORCED) + singlemutcheck(user,GLOB.monkeyblock, MUTCHK_FORCED) if(istype(user)) user.set_species(chosen_dna.species.type) user.dna = chosen_dna.Clone() user.real_name = chosen_dna.real_name - domutcheck(user,null,MUTCHK_FORCED) + domutcheck(user, MUTCHK_FORCED) user.flavor_text = "" user.dna.UpdateSE() user.dna.UpdateUI() diff --git a/code/game/gamemodes/changeling/powers/lesserform.dm b/code/game/gamemodes/changeling/powers/lesserform.dm index c492c47f9c6..9622cb4f48e 100644 --- a/code/game/gamemodes/changeling/powers/lesserform.dm +++ b/code/game/gamemodes/changeling/powers/lesserform.dm @@ -9,7 +9,7 @@ req_human = 1 //Transform into a monkey. -/datum/action/changeling/lesserform/sting_action(var/mob/living/carbon/human/user) +/datum/action/changeling/lesserform/sting_action(mob/living/carbon/human/user) var/datum/changeling/changeling = user.mind.changeling if(!user) return 0 diff --git a/code/game/gamemodes/changeling/powers/mimic_voice.dm b/code/game/gamemodes/changeling/powers/mimic_voice.dm index bcbe91a3cb6..cddb369963a 100644 --- a/code/game/gamemodes/changeling/powers/mimic_voice.dm +++ b/code/game/gamemodes/changeling/powers/mimic_voice.dm @@ -9,7 +9,7 @@ // Fake Voice -/datum/action/changeling/mimicvoice/sting_action(var/mob/user) +/datum/action/changeling/mimicvoice/sting_action(mob/user) var/datum/changeling/changeling=user.mind.changeling if(changeling.mimicing) changeling.mimicing = "" diff --git a/code/game/gamemodes/changeling/powers/mutations.dm b/code/game/gamemodes/changeling/powers/mutations.dm index be88e0bb6e0..420628a0198 100644 --- a/code/game/gamemodes/changeling/powers/mutations.dm +++ b/code/game/gamemodes/changeling/powers/mutations.dm @@ -21,7 +21,7 @@ var/weapon_type var/weapon_name_simple -/datum/action/changeling/weapon/try_to_sting(var/mob/user, var/mob/target) +/datum/action/changeling/weapon/try_to_sting(mob/user, mob/target) if(istype(user.l_hand, weapon_type)) //Not the nicest way to do it, but eh qdel(user.l_hand) if(!silent) @@ -36,7 +36,7 @@ return ..(user, target) -/datum/action/changeling/weapon/sting_action(var/mob/user) +/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!") return @@ -60,7 +60,7 @@ var/recharge_slowdown = 0 var/blood_on_castoff = 0 -/datum/action/changeling/suit/try_to_sting(var/mob/user, var/mob/target) +/datum/action/changeling/suit/try_to_sting(mob/user, mob/target) var/datum/changeling/changeling = user.mind.changeling if(!ishuman(user) || !changeling) return @@ -84,7 +84,7 @@ return ..(H, target) -/datum/action/changeling/suit/sting_action(var/mob/living/carbon/human/user) +/datum/action/changeling/suit/sting_action(mob/living/carbon/human/user) if(!user.unEquip(user.wear_suit)) to_chat(user, "\the [user.wear_suit] is stuck to your body, you cannot grow a [suit_name_simple] over it!") return @@ -358,7 +358,7 @@ weapon_type = /obj/item/shield/changeling weapon_name_simple = "shield" -/datum/action/changeling/weapon/shield/sting_action(var/mob/user) +/datum/action/changeling/weapon/shield/sting_action(mob/user) var/datum/changeling/changeling = user.mind.changeling //So we can read the absorbedcount. if(!changeling) return @@ -422,7 +422,7 @@ icon_state = "lingspacesuit" desc = "A huge, bulky mass of pressure and temperature-resistant organic tissue, evolved to facilitate space travel." flags = STOPSPRESSUREDMAGE | NODROP | DROPDEL - allowed = list(/obj/item/flashlight, /obj/item/tank/emergency_oxygen, /obj/item/tank/oxygen) + allowed = list(/obj/item/flashlight, /obj/item/tank/internals) armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 90, "acid" = 90) //No armor at all /obj/item/clothing/suit/space/changeling/New() diff --git a/code/game/gamemodes/changeling/powers/panacea.dm b/code/game/gamemodes/changeling/powers/panacea.dm index 914a73fa7b4..bc0ff435b38 100644 --- a/code/game/gamemodes/changeling/powers/panacea.dm +++ b/code/game/gamemodes/changeling/powers/panacea.dm @@ -8,7 +8,7 @@ req_stat = UNCONSCIOUS //Heals the things that the other regenerative abilities don't. -/datum/action/changeling/panacea/sting_action(var/mob/user) +/datum/action/changeling/panacea/sting_action(mob/user) to_chat(user, "We cleanse impurities from our form.") diff --git a/code/game/gamemodes/changeling/powers/revive.dm b/code/game/gamemodes/changeling/powers/revive.dm index b8747ba1162..8ebe5ba48d8 100644 --- a/code/game/gamemodes/changeling/powers/revive.dm +++ b/code/game/gamemodes/changeling/powers/revive.dm @@ -6,7 +6,7 @@ always_keep = 1 //Revive from regenerative stasis -/datum/action/changeling/revive/sting_action(var/mob/living/carbon/user) +/datum/action/changeling/revive/sting_action(mob/living/carbon/user) user.setToxLoss(0, FALSE) user.setOxyLoss(0, FALSE) user.setCloneLoss(0, FALSE) @@ -19,9 +19,9 @@ user.SetEyeBlurry(0, FALSE) user.RestoreEars() user.heal_overall_damage(user.getBruteLoss(), user.getFireLoss(), updating_health = FALSE) - user.CureBlind(FALSE) + user.cure_blind(null, FALSE) user.CureDeaf() - user.CureNearsighted(FALSE) + user.cure_nearsighted(null, FALSE) user.reagents.clear_reagents() user.germ_level = 0 user.timeofdeath = 0 @@ -52,7 +52,7 @@ H.remove_all_embedded_objects() for(var/datum/disease/critical/C in user.viruses) C.cure() - user.status_flags &= ~(FAKEDEATH) + REMOVE_TRAIT(user, TRAIT_FAKEDEATH, "changeling") user.updatehealth("revive sting") user.update_blind_effects() user.update_blurry_effects() diff --git a/code/game/gamemodes/changeling/powers/shriek.dm b/code/game/gamemodes/changeling/powers/shriek.dm index 229122f5291..b7d021a10d6 100644 --- a/code/game/gamemodes/changeling/powers/shriek.dm +++ b/code/game/gamemodes/changeling/powers/shriek.dm @@ -8,7 +8,7 @@ req_human = 1 //A flashy ability, good for crowd control and sowing chaos. -/datum/action/changeling/resonant_shriek/sting_action(var/mob/user) +/datum/action/changeling/resonant_shriek/sting_action(mob/user) for(var/mob/living/M in get_mobs_in_view(4, user)) if(iscarbon(M)) if(ishuman(M)) @@ -16,14 +16,14 @@ if(H.check_ear_prot() >= HEARING_PROTECTION_TOTAL) continue if(!M.mind || !M.mind.changeling) - M.MinimumDeafTicks(30) + M.AdjustEarDamage(0, 30) M.AdjustConfused(20) M.Jitter(50) else - M << sound('sound/effects/screech.ogg') + SEND_SOUND(M, sound('sound/effects/screech.ogg')) if(issilicon(M)) - M << sound('sound/weapons/flash.ogg') + SEND_SOUND(M, sound('sound/weapons/flash.ogg')) M.Weaken(rand(5,10)) for(var/obj/machinery/light/L in range(4, user)) @@ -41,7 +41,7 @@ dna_cost = 1 //A flashy ability, good for crowd control and sewing chaos. -/datum/action/changeling/dissonant_shriek/sting_action(var/mob/user) +/datum/action/changeling/dissonant_shriek/sting_action(mob/user) for(var/obj/machinery/light/L in range(5, usr)) L.on = 1 L.break_light_tube() diff --git a/code/game/gamemodes/changeling/powers/spiders.dm b/code/game/gamemodes/changeling/powers/spiders.dm index 5577007a155..4139928dc3c 100644 --- a/code/game/gamemodes/changeling/powers/spiders.dm +++ b/code/game/gamemodes/changeling/powers/spiders.dm @@ -8,7 +8,7 @@ req_dna = 5 //Makes some spiderlings. Good for setting traps and causing general trouble. -/datum/action/changeling/spiders/sting_action(var/mob/user) +/datum/action/changeling/spiders/sting_action(mob/user) for(var/i=0, i<2, i++) var/obj/structure/spider/spiderling/S = new(user.loc) S.grow_as = /mob/living/simple_animal/hostile/poison/giant_spider/hunter diff --git a/code/game/gamemodes/changeling/powers/strained_muscles.dm b/code/game/gamemodes/changeling/powers/strained_muscles.dm index c05c37fdcf0..a89daed095f 100644 --- a/code/game/gamemodes/changeling/powers/strained_muscles.dm +++ b/code/game/gamemodes/changeling/powers/strained_muscles.dm @@ -12,12 +12,12 @@ var/stacks = 0 //Increments every 5 seconds; damage increases over time var/enabled = 0 //Whether or not you are a hedgehog -/datum/action/changeling/strained_muscles/sting_action(var/mob/living/carbon/user) +/datum/action/changeling/strained_muscles/sting_action(mob/living/carbon/user) enabled = !enabled if(enabled) to_chat(user, "Our muscles tense and strengthen.") else - user.status_flags &= ~GOTTAGOFAST + REMOVE_TRAIT(user, TRAIT_GOTTAGOFAST, "changeling") to_chat(user, "Our muscles relax.") if(stacks >= 10) to_chat(user, "We collapse in exhaustion.") @@ -25,11 +25,11 @@ user.emote("gasp") while(enabled) - user.status_flags |= GOTTAGOFAST + ADD_TRAIT(user, TRAIT_GOTTAGOFAST, "changeling") if(user.stat || user.staminaloss >= 90) enabled = 0 //Let's use something exact instead of !enabled where we can. to_chat(user, "Our muscles relax without the energy to strengthen them.") - user.status_flags &= ~GOTTAGOFAST + REMOVE_TRAIT(user, TRAIT_GOTTAGOFAST, "changeling") user.Weaken(2) user.emote("gasp") break diff --git a/code/game/gamemodes/changeling/powers/swap_form.dm b/code/game/gamemodes/changeling/powers/swap_form.dm index e392974648c..b155cccf5db 100644 --- a/code/game/gamemodes/changeling/powers/swap_form.dm +++ b/code/game/gamemodes/changeling/powers/swap_form.dm @@ -7,7 +7,7 @@ dna_cost = 1 req_human = 1 //Monkeys can't grab -/datum/action/changeling/swap_form/can_sting(var/mob/living/carbon/user) +/datum/action/changeling/swap_form/can_sting(mob/living/carbon/user) if(!..()) return var/obj/item/grab/G = user.get_active_hand() @@ -15,10 +15,10 @@ to_chat(user, "We must have an aggressive grab on creature in our active hand to do this!") return var/mob/living/carbon/human/target = G.affecting - if((NOCLONE || SKELETON || HUSK) in target.mutations) + if(HAS_TRAIT(target, TRAIT_BADDNA) || HAS_TRAIT(target, TRAIT_HUSK) || HAS_TRAIT(target, TRAIT_SKELETONIZED)) to_chat(user, "DNA of [target] is ruined beyond usability!") return - if(!istype(target) || !target.mind || issmall(target) || (NO_DNA in target.dna.species.species_traits)) + if(!istype(target) || !target.mind || issmall(target) || HAS_TRAIT(target, TRAIT_GENELESS)) to_chat(user, "[target] is not compatible with this ability.") return if(target.mind.changeling) @@ -29,7 +29,7 @@ return return 1 -/datum/action/changeling/swap_form/sting_action(var/mob/living/carbon/user) +/datum/action/changeling/swap_form/sting_action(mob/living/carbon/user) var/obj/item/grab/G = user.get_active_hand() var/mob/living/carbon/human/target = G.affecting var/datum/changeling/changeling = user.mind.changeling diff --git a/code/game/gamemodes/changeling/powers/tiny_prick.dm b/code/game/gamemodes/changeling/powers/tiny_prick.dm index 97fc24c0938..14d93439510 100644 --- a/code/game/gamemodes/changeling/powers/tiny_prick.dm +++ b/code/game/gamemodes/changeling/powers/tiny_prick.dm @@ -37,7 +37,7 @@ if(mind && mind.changeling && mind.changeling.chosen_sting) mind.changeling.chosen_sting.unset_sting(src) -/datum/action/changeling/sting/can_sting(var/mob/user, var/mob/target) +/datum/action/changeling/sting/can_sting(mob/user, mob/target) if(!..()) return if(!user.mind.changeling.chosen_sting) @@ -57,7 +57,7 @@ return return 1 -/datum/action/changeling/sting/sting_feedback(var/mob/user, var/mob/target) +/datum/action/changeling/sting/sting_feedback(mob/user, mob/target) if(!target) return to_chat(user, "We stealthily sting [target.name].") @@ -91,20 +91,20 @@ return ..() -/datum/action/changeling/sting/transformation/can_sting(var/mob/user, var/mob/target) +/datum/action/changeling/sting/transformation/can_sting(mob/user, mob/target) if(!..()) return - if((HUSK in target.mutations) || (!ishuman(target))) + if(HAS_TRAIT(target, TRAIT_HUSK) || !ishuman(target) || (NOTRANSSTING in target.dna.species.species_traits)) to_chat(user, "Our sting appears ineffective against its DNA.") return FALSE if(ishuman(target)) var/mob/living/carbon/human/H = target - if(NO_DNA in H.dna.species.species_traits) + if(HAS_TRAIT(H, TRAIT_GENELESS)) to_chat(user, "This won't work on a creature without DNA.") return FALSE return TRUE -/datum/action/changeling/sting/transformation/sting_action(var/mob/user, var/mob/target) +/datum/action/changeling/sting/transformation/sting_action(mob/user, mob/target) add_attack_logs(user, target, "Transformation sting (changeling) (new identity is [selected_dna.real_name])") if(issmall(target)) to_chat(user, "Our genes cry out as we sting [target.name]!") @@ -129,11 +129,11 @@ chemical_cost = 25 dna_cost = 0 -/datum/action/changeling/sting/extract_dna/can_sting(var/mob/user, var/mob/target) +/datum/action/changeling/sting/extract_dna/can_sting(mob/user, mob/target) if(..()) return user.mind.changeling.can_absorb_dna(user, target) -/datum/action/changeling/sting/extract_dna/sting_action(var/mob/user, var/mob/living/carbon/human/target) +/datum/action/changeling/sting/extract_dna/sting_action(mob/user, mob/living/carbon/human/target) add_attack_logs(user, target, "Extraction sting (changeling)") if(!(user.mind.changeling.has_dna(target.dna))) user.mind.changeling.absorb_dna(target, user) @@ -149,7 +149,7 @@ chemical_cost = 20 dna_cost = 2 -/datum/action/changeling/sting/mute/sting_action(var/mob/user, var/mob/living/carbon/target) +/datum/action/changeling/sting/mute/sting_action(mob/user, mob/living/carbon/target) add_attack_logs(user, target, "Mute sting (changeling)") target.AdjustSilence(30) SSblackbox.record_feedback("nested tally", "changeling_powers", 1, list("[name]")) @@ -164,10 +164,10 @@ chemical_cost = 25 dna_cost = 1 -/datum/action/changeling/sting/blind/sting_action(var/mob/living/user, var/mob/living/target) +/datum/action/changeling/sting/blind/sting_action(mob/living/user, mob/living/target) add_attack_logs(user, target, "Blind sting (changeling)") to_chat(target, "Your eyes burn horrifically!") - target.BecomeNearsighted() + target.become_nearsighted(EYE_DAMAGE) target.EyeBlind(20) target.EyeBlurry(40) SSblackbox.record_feedback("nested tally", "changeling_powers", 1, list("[name]")) @@ -182,7 +182,7 @@ chemical_cost = 10 dna_cost = 1 -/datum/action/changeling/sting/LSD/sting_action(var/mob/user, var/mob/living/carbon/target) +/datum/action/changeling/sting/LSD/sting_action(mob/user, mob/living/carbon/target) add_attack_logs(user, target, "LSD sting (changeling)") spawn(rand(300,600)) if(target) @@ -199,7 +199,7 @@ chemical_cost = 15 dna_cost = 2 -/datum/action/changeling/sting/cryo/sting_action(var/mob/user, var/mob/target) +/datum/action/changeling/sting/cryo/sting_action(mob/user, mob/target) add_attack_logs(user, target, "Cryo sting (changeling)") if(target.reagents) target.reagents.add_reagent("frostoil", 30) diff --git a/code/game/gamemodes/changeling/powers/transform.dm b/code/game/gamemodes/changeling/powers/transform.dm index f486195b8db..3aaed08b965 100644 --- a/code/game/gamemodes/changeling/powers/transform.dm +++ b/code/game/gamemodes/changeling/powers/transform.dm @@ -9,7 +9,7 @@ max_genetic_damage = 3 //Change our DNA to that of somebody we've absorbed. -/datum/action/changeling/transform/sting_action(var/mob/living/carbon/human/user) +/datum/action/changeling/transform/sting_action(mob/living/carbon/human/user) var/datum/changeling/changeling = user.mind.changeling var/datum/dna/chosen_dna = changeling.select_dna("Select the target DNA: ", "Target DNA") @@ -23,7 +23,7 @@ SSblackbox.record_feedback("nested tally", "changeling_powers", 1, list("[name]")) return 1 -/datum/changeling/proc/select_dna(var/prompt, var/title) +/datum/changeling/proc/select_dna(prompt, title) var/list/names = list() for(var/datum/dna/DNA in (absorbed_dna+protected_dna)) names += "[DNA.real_name]" diff --git a/code/game/gamemodes/changeling/traitor_chan.dm b/code/game/gamemodes/changeling/traitor_chan.dm index f163b2a4c04..b7ff2c30e0d 100644 --- a/code/game/gamemodes/changeling/traitor_chan.dm +++ b/code/game/gamemodes/changeling/traitor_chan.dm @@ -2,11 +2,13 @@ name = "traitor+changeling" config_tag = "traitorchan" traitors_possible = 3 //hard limit on traitors if scaling is turned off - restricted_jobs = list("AI", "Cyborg") + restricted_jobs = list("Cyborg") + secondary_restricted_jobs = list("AI") // Allows AI to roll traitor, but not changeling required_players = 10 required_enemies = 1 // how many of each type are required recommended_enemies = 3 - var/protected_species_changeling = list("Machine") + secondary_enemies_scaling = 0.025 + secondary_protected_species = list("Machine") /datum/game_mode/traitor/changeling/announce() to_chat(world, "The current game mode is - Traitor+Changeling!") @@ -18,17 +20,23 @@ restricted_jobs += protected_jobs var/list/datum/mind/possible_changelings = get_players_for_role(ROLE_CHANGELING) + secondary_enemies = CEILING((secondary_enemies_scaling * num_players()), 1) for(var/mob/new_player/player in GLOB.player_list) - if((player.mind in possible_changelings) && (player.client.prefs.species in protected_species_changeling)) + if((player.mind in possible_changelings) && (player.client.prefs.species in secondary_protected_species)) possible_changelings -= player.mind if(possible_changelings.len > 0) - var/datum/mind/changeling = pick(possible_changelings) - changelings += changeling - modePlayer += changelings - changeling.restricted_roles = restricted_jobs - changeling.special_role = SPECIAL_ROLE_CHANGELING + for(var/I in possible_changelings) + if(length(changelings) >= secondary_enemies) + break + var/datum/mind/changeling = pick(possible_changelings) + changelings += changeling + modePlayer += changelings + possible_changelings -= changeling + changeling.restricted_roles = (restricted_jobs + secondary_restricted_jobs) + changeling.special_role = SPECIAL_ROLE_CHANGELING + return ..() else return 0 diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm index e4d94ecb69f..04c9e13b605 100644 --- a/code/game/gamemodes/cult/cult.dm +++ b/code/game/gamemodes/cult/cult.dm @@ -81,14 +81,15 @@ GLOBAL_LIST_EMPTY(all_cults) cult_objs.setup() for(var/datum/mind/cult_mind in cult) - SEND_SOUND(cult_mind.current, 'sound/ambience/antag/bloodcult.ogg') + SEND_SOUND(cult_mind.current, sound('sound/ambience/antag/bloodcult.ogg')) to_chat(cult_mind.current, CULT_GREETING) equip_cultist(cult_mind.current) cult_mind.current.faction |= "cult" 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.") - cult_mind.current.mutations.Remove(CLUMSY) + cult_mind.current.dna.SetSEState(GLOB.clumsyblock, FALSE) + singlemutcheck(cult_mind.current, GLOB.clumsyblock, MUTCHK_FORCED) var/datum/action/innate/toggle_clumsy/A = new A.Grant(cult_mind.current) @@ -182,10 +183,11 @@ GLOBAL_LIST_EMPTY(all_cults) 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.") - cult_mind.current.mutations.Remove(CLUMSY) + cult_mind.current.dna.SetSEState(GLOB.clumsyblock, FALSE) + singlemutcheck(cult_mind.current, GLOB.clumsyblock, MUTCHK_FORCED) var/datum/action/innate/toggle_clumsy/A = new A.Grant(cult_mind.current) - SEND_SOUND(cult_mind.current, 'sound/ambience/antag/bloodcult.ogg') + SEND_SOUND(cult_mind.current, sound('sound/ambience/antag/bloodcult.ogg')) cult_mind.current.create_attack_log("Has been converted to the cult!") cult_mind.current.create_log(CONVERSION_LOG, "converted to the cult") @@ -218,7 +220,7 @@ GLOBAL_LIST_EMPTY(all_cults) for(var/datum/mind/M in cult) if(!M.current || !ishuman(M.current)) continue - SEND_SOUND(M.current, 'sound/hallucinations/i_see_you2.ogg') + SEND_SOUND(M.current, sound('sound/hallucinations/i_see_you2.ogg')) to_chat(M.current, "The veil weakens as your cult grows, your eyes begin to glow...") addtimer(CALLBACK(src, .proc/rise, M.current), 20 SECONDS) @@ -227,7 +229,7 @@ GLOBAL_LIST_EMPTY(all_cults) for(var/datum/mind/M in cult) if(!M.current || !ishuman(M.current)) continue - SEND_SOUND(M.current, 'sound/hallucinations/im_here1.ogg') + SEND_SOUND(M.current, sound('sound/hallucinations/im_here1.ogg')) to_chat(M.current, "Your cult is ascendant and the red harvest approaches - you cannot hide your true nature for much longer!") addtimer(CALLBACK(src, .proc/ascend, M.current), 20 SECONDS) GLOB.command_announcement.Announce("Picking up extradimensional activity related to the Cult of [SSticker.cultdat ? SSticker.cultdat.entity_name : "Nar'Sie"] from your station. Data suggests that about [ascend_percent * 100]% of the station has been converted. Security staff are authorized to use lethal force freely against cultists. Non-security staff should be prepared to defend themselves and their work areas from hostile cultists. Self defense permits non-security staff to use lethal force as a last resort, but non-security staff should be defending their work areas, not hunting down cultists. Dead crewmembers must be revived and deconverted once the situation is under control.", "Central Command Higher Dimensional Affairs", 'sound/AI/commandreport.ogg') diff --git a/code/game/gamemodes/cult/cult_actions.dm b/code/game/gamemodes/cult/cult_actions.dm index c5dd101c3b4..ab81f253a32 100644 --- a/code/game/gamemodes/cult/cult_actions.dm +++ b/code/game/gamemodes/cult/cult_actions.dm @@ -31,7 +31,7 @@ to_chat(user, "You can't speak!") return - if((MUTE in user.mutations) || user.mind.miming) //Under vow of silence/mute? + if(HAS_TRAIT(user, TRAIT_MUTE) || user.mind.miming) //Under vow of silence/mute? user.visible_message("[user] appears to whisper to themselves.", "You begin to whisper to yourself.") //Make them do *something* abnormal. sleep(10) diff --git a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm index 1ffae321f32..ca1938a76ea 100644 --- a/code/game/gamemodes/cult/cult_items.dm +++ b/code/game/gamemodes/cult/cult_items.dm @@ -53,9 +53,9 @@ user.Confused(10) user.Jitter(6) - if(HULK in user.mutations) + if(HAS_TRAIT(user, TRAIT_HULK)) to_chat(user, "You can't seem to hold the blade properly!") - return FALSE + user.unEquip(src, TRUE) /obj/item/restraints/legcuffs/bola/cult name = "runed bola" @@ -119,7 +119,7 @@ item_state = "cult_armour" desc = "A bulky suit of armor, bristling with spikes. It looks space proof." w_class = WEIGHT_CLASS_NORMAL - allowed = list(/obj/item/tome, /obj/item/melee/cultblade, /obj/item/tank) + allowed = list(/obj/item/tome, /obj/item/melee/cultblade, /obj/item/tank/internals) slowdown = 1 armor = list("melee" = 70, "bullet" = 50, "laser" = 30,"energy" = 15, "bomb" = 30, "bio" = 30, "rad" = 30, "fire" = 40, "acid" = 75) magical = TRUE @@ -162,7 +162,7 @@ if(current_charges) owner.visible_message("[attack_text] is deflected in a burst of blood-red sparks!") current_charges-- - playsound(loc, "sparks", 100, TRUE) + playsound(loc, "sparks", 100, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) new /obj/effect/temp_visual/cult/sparks(get_turf(owner)) if(!current_charges) owner.visible_message("The runed shield around [owner] suddenly disappears!") @@ -200,12 +200,12 @@ user.Confused(10) user.Weaken(5) else if(slot == slot_wear_suit) - user.status_flags |= GOTTAGOFAST + ADD_TRAIT(user, TRAIT_GOTTAGOFAST, "cultrobes") /obj/item/clothing/suit/hooded/cultrobes/flagellant_robe/dropped(mob/user) . = ..() if(user) - user.status_flags &= ~GOTTAGOFAST + REMOVE_TRAIT(user, TRAIT_GOTTAGOFAST, "cultrobes") /obj/item/clothing/head/hooded/flagellant_hood name = "flagellant's robes" @@ -355,7 +355,7 @@ var/turf/destination = pick(turfs) if(uses <= 0) icon_state ="shifter_drained" - playsound(mobloc, "sparks", 50, TRUE) + playsound(mobloc, "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) @@ -364,8 +364,8 @@ 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) - playsound(destination, "sparks", 50, TRUE) + playsound(destination, 'sound/effects/phasein.ogg', 25, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) + playsound(destination, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) else to_chat(C, "The veil cannot be torn here!") diff --git a/code/game/gamemodes/cult/cult_structures.dm b/code/game/gamemodes/cult/cult_structures.dm index 772f6231d5b..b2b4dfa534e 100644 --- a/code/game/gamemodes/cult/cult_structures.dm +++ b/code/game/gamemodes/cult/cult_structures.dm @@ -74,7 +74,7 @@ if(invisibility) to_chat(user, "The magic in [src] is being channeled into Redspace, reveal the structure first!") return - if(HULK in user.mutations) + if(HAS_TRAIT(user, TRAIT_HULK)) to_chat(user, "You cannot seem to manipulate this structure with your bulky hands!") return if(!anchored) @@ -140,7 +140,7 @@ choosable_items = list("Eldritch Whetstone" = /obj/item/whetstone/cult, "Flask of Unholy Water" = /obj/item/reagent_containers/food/drinks/bottle/unholywater, "Construct Shell" = /obj/structure/constructshell) -/obj/structure/cult/functional/altar/New() +/obj/structure/cult/functional/altar/Initialize(mapload) . = ..() icon_state = SSticker.cultdat?.altar_icon_state @@ -160,7 +160,7 @@ choosable_items = list("Shielded Robe" = /obj/item/clothing/suit/hooded/cultrobes/cult_shield, "Flagellant's Robe" = /obj/item/clothing/suit/hooded/cultrobes/flagellant_robe, "Mirror Shield" = /obj/item/shield/mirror) -/obj/structure/cult/functional/forge/New() +/obj/structure/cult/functional/forge/Initialize(mapload) . = ..() icon_state = SSticker.cultdat?.forge_icon_state @@ -198,8 +198,7 @@ GLOBAL_LIST_INIT(blacklisted_pylon_turfs, typecacheof(list( /turf/simulated/floor/plating/lava, /turf/simulated/floor/chasm, /turf/simulated/wall/cult, - /turf/simulated/wall/cult/artificer, - /turf/unsimulated/wall + /turf/simulated/wall/cult/artificer ))) /obj/structure/cult/functional/pylon @@ -217,17 +216,14 @@ GLOBAL_LIST_INIT(blacklisted_pylon_turfs, typecacheof(list( var/corrupt_delay = 50 var/last_corrupt = 0 -/obj/structure/cult/functional/pylon/New() +/obj/structure/cult/functional/pylon/Initialize(mapload) . = ..() + START_PROCESSING(SSobj, src) icon_state = SSticker.cultdat?.pylon_icon_state /obj/structure/cult/functional/pylon/attack_hand(mob/living/user)//override as it should not create anything return -/obj/structure/cult/functional/pylon/New() - START_PROCESSING(SSobj, src) - ..() - /obj/structure/cult/functional/pylon/Destroy() STOP_PROCESSING(SSobj, src) ..() @@ -307,7 +303,7 @@ GLOBAL_LIST_INIT(blacklisted_pylon_turfs, typecacheof(list( choosable_items = list("Shuttle Curse" = /obj/item/shuttle_curse, "Zealot's Blindfold" = /obj/item/clothing/glasses/hud/health/night/cultblind, "Veil Shifter" = /obj/item/cult_shift) //Add void torch to veil shifter spawn -/obj/structure/cult/functional/archives/New() +/obj/structure/cult/functional/archives/Initialize(mapload) . = ..() icon_state = SSticker.cultdat?.archives_icon_state diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm index d99f223e7fb..4c98a3c59d3 100644 --- a/code/game/gamemodes/cult/runes.dm +++ b/code/game/gamemodes/cult/runes.dm @@ -603,7 +603,7 @@ structure_check() searches for nearby cultist structures required for the invoca fail_invoke() return - SEND_SOUND(mob_to_revive, 'sound/ambience/antag/bloodcult.ogg') + SEND_SOUND(mob_to_revive, sound('sound/ambience/antag/bloodcult.ogg')) to_chat(mob_to_revive, "\"PASNAR SAVRAE YAM'TOTH. Arise.\"") mob_to_revive.visible_message("[mob_to_revive] draws in a huge breath, red light shining from [mob_to_revive.p_their()] eyes.", \ "You awaken suddenly from the void. You're alive!") @@ -1001,7 +1001,7 @@ structure_check() searches for nearby cultist structures required for the invoca used = TRUE color = rgb(255, 0, 0) ..() - SEND_SOUND(world, 'sound/effects/dimensional_rend.ogg') + SEND_SOUND(world, sound('sound/effects/dimensional_rend.ogg')) to_chat(world, "The veil... is... TORN!!!--") icon_state = "rune_large_distorted" var/turf/T = get_turf(src) diff --git a/code/game/gamemodes/devil/contracts/friend.dm b/code/game/gamemodes/devil/contracts/friend.dm deleted file mode 100644 index 8838dc8a371..00000000000 --- a/code/game/gamemodes/devil/contracts/friend.dm +++ /dev/null @@ -1,54 +0,0 @@ -/obj/effect/mob_spawn/human/demonic_friend - name = "Essence of friendship" - desc = "Oh boy! Oh boy! A friend!" - mob_name = "Demonic friend" - icon = 'icons/obj/cardboard_cutout.dmi' - icon_state = "cutout_basic" - outfit = /datum/outfit/demonic_friend - death = FALSE - roundstart = FALSE - random = TRUE - id_job = "SuperFriend" - id_access = "assistant" - var/obj/effect/proc_holder/spell/targeted/summon_friend/spell - var/datum/mind/owner - assignedrole = "SuperFriend" - -/obj/effect/mob_spawn/human/demonic_friend/Initialize(mapload, datum/mind/owner_mind, obj/effect/proc_holder/spell/targeted/summon_friend/summoning_spell) - . = ..() - owner = owner_mind - description = "Be someone's loyal friend/slave. If they die, you die as well." //best I could think of in the moment, not sure how this role plays in practise, have never seen it. - flavour_text = "You have been given a reprieve from your eternity of torment, to be [owner.name]'s friend for [owner.p_their()] short mortal coil. Be aware that if you do not live up to [owner.name]'s expectations, [owner.p_they()] can send you back to hell with a single thought. [owner.name]'s death will also return you to hell." - var/area/A = get_area(src) - if(!mapload && A) - notify_ghosts("\A friendship shell has been completed in \the [A.name].", source = src, action=NOTIFY_ATTACK, flashwindow = TRUE) - objectives = "Be [owner.name]'s friend, and keep [owner.name] alive, so you don't get sent back to hell." - spell = summoning_spell - - -/obj/effect/mob_spawn/human/demonic_friend/special(mob/living/L) - if(!QDELETED(owner.current) && owner.current.stat != DEAD) - L.real_name = "[owner.name]'s best friend" - L.name = L.real_name - soullink(/datum/soullink/oneway/devilfriend, owner.current, L) - spell.friend = L - spell.charge_counter = spell.charge_max - L.mind.hasSoul = FALSE - var/mob/living/carbon/human/H = L - var/obj/item/worn = H.wear_id - var/obj/item/card/id/id = worn.GetID() - id.registered_name = L.real_name - id.update_label() - to_chat(owner.current, "Your friend has arrived!") - else - to_chat(L, "Your owner is already dead! You will soon perish.") - addtimer(CALLBACK(L, /mob.proc/dust), 150) //Give em a few seconds as a mercy. - -/datum/outfit/demonic_friend - name = "Demonic Friend" - uniform = /obj/item/clothing/under/assistantformal - shoes = /obj/item/clothing/shoes/laceup - r_pocket = /obj/item/radio/off - back = /obj/item/storage/backpack - implants = list(/obj/item/implant/mindshield) //No revolutionaries, he's MY friend. - id = /obj/item/card/id diff --git a/code/game/gamemodes/devil/devil.dm b/code/game/gamemodes/devil/devil.dm deleted file mode 100644 index 06933891ba6..00000000000 --- a/code/game/gamemodes/devil/devil.dm +++ /dev/null @@ -1,48 +0,0 @@ -GLOBAL_LIST_INIT(whiteness, list( - /obj/item/clothing/under/color/white = 2, - /obj/item/clothing/under/rank/bartender = 1, - /obj/item/clothing/under/rank/chef = 1, - /obj/item/clothing/under/rank/chief_engineer = 1, - /obj/item/clothing/under/rank/scientist = 1, - /obj/item/clothing/under/rank/chemist = 1, - /obj/item/clothing/under/rank/chief_medical_officer = 1, - /obj/item/clothing/under/rank/geneticist = 1, - /obj/item/clothing/under/rank/virologist = 1, - /obj/item/clothing/under/rank/nursesuit = 1, - /obj/item/clothing/under/rank/medical = 1, - /obj/item/clothing/under/rank/psych = 1, - /obj/item/clothing/under/rank/orderly = 1, - /obj/item/clothing/under/rank/security/brigphys = 1, - /obj/item/clothing/under/rank/internalaffairs = 1, - /obj/item/clothing/under/rank/ntrep = 1, - /obj/item/clothing/under/det = 1, - /obj/item/clothing/under/wedding/bride_white = 1, - /obj/item/clothing/under/mafia/white = 1, - /obj/item/clothing/under/noble_clothes = 1, - /obj/item/clothing/under/sl_suit = 1, - /obj/item/clothing/under/burial = 1 -)) - - - -/mob/living/proc/check_devil_bane_multiplier(obj/item/weapon, mob/living/attacker) - switch(mind.devilinfo.bane) - if(BANE_WHITECLOTHES) - if(istype(attacker, /mob/living/carbon/human)) - var/mob/living/carbon/human/H = attacker - if(H.w_uniform && istype(H.w_uniform, /obj/item/clothing/under)) - var/obj/item/clothing/under/U = H.w_uniform - if(GLOB.whiteness[U.type]) - src.visible_message("[src] seems to have been harmed by the purity of [attacker]'s clothes.", "Unsullied white clothing is disrupting your form.") - return GLOB.whiteness[U.type] + 1 - if(BANE_TOOLBOX) - if(istype(weapon,/obj/item/storage/toolbox)) - src.visible_message("The [weapon] seems unusually robust this time.", "The [weapon] is your unmaking!") - return 2.5 // Will take four hits with a normal toolbox. - if(BANE_HARVEST) - if(istype(weapon,/obj/item/reagent_containers/food/snacks/grown/) || istype(weapon,/obj/item/grown)) - src.visible_message("The spirits of the harvest aid in the exorcism.", "The harvest spirits are harming you.") - src.Weaken(2) - qdel(weapon) - return 2 - return 1 diff --git a/code/game/gamemodes/devil/devil_agent/devil_agent.dm b/code/game/gamemodes/devil/devil_agent/devil_agent.dm deleted file mode 100644 index e9a1d998a7a..00000000000 --- a/code/game/gamemodes/devil/devil_agent/devil_agent.dm +++ /dev/null @@ -1,38 +0,0 @@ -/datum/game_mode/devil/devil_agents - name = "Devil Agents" - config_tag = "devilagents" - required_players = 25 - required_enemies = 3 - recommended_enemies = 8 - - traitors_possible = 10 //hard limit on traitors if scaling is turned off - num_modifier = 4 - objective_count = 2 - - var/list/target_list = list() - var/list/late_joining_list = list() - minimum_devils = 3 - -/datum/game_mode/devil/devil_agents/post_setup() - var/i = 0 - for(var/datum/mind/devil in devils) - i++ - if(i + 1 > devils.len) - i = 0 - target_list[devil] = devils[i + 1] - ..() - -/datum/game_mode/devil/devil_agents/forge_devil_objectives(datum/mind/devil_mind, quantity) - ..(devil_mind, quantity - give_outsell_objective(devil_mind)) - -/datum/game_mode/devil/devil_agents/proc/give_outsell_objective(datum/mind/devil) - //If you override this method, have it return the number of objectives added. - if(target_list.len && target_list[devil]) // Is a double agent - var/datum/mind/target_mind = target_list[devil] - var/datum/objective/devil/outsell/outsellobjective = new - outsellobjective.owner = devil - outsellobjective.target = target_mind - outsellobjective.update_explanation_text() - devil.objectives += outsellobjective - return 1 - return 0 diff --git a/code/game/gamemodes/devil/devil_game_mode.dm b/code/game/gamemodes/devil/devil_game_mode.dm deleted file mode 100644 index 3ea91343f6b..00000000000 --- a/code/game/gamemodes/devil/devil_game_mode.dm +++ /dev/null @@ -1,67 +0,0 @@ -/datum/game_mode/devil - name = "devil" - config_tag = "devil" - protected_jobs = list("Security Officer", "Warden", "Detective", "Nanotrasen Representative", "Security Pod Pilot", "Magistrate", - "Internal Affairs Agent", "Librarian", "Chaplain", "Head of Security", "Captain", "Brig Physician", - "Nanotrasen Navy Officer", "Special Operations Officer", "AI", "Cyborg") - required_players = 2 - required_enemies = 1 - recommended_enemies = 4 - - var/traitors_possible = 4 //hard limit on devils if scaling is turned off - var/num_modifier = 0 // Used for gamemodes, that are a child of traitor, that need more than the usual. - var/objective_count = 2 - var/minimum_devils = 1 - var/devil_scale_coefficient = 10 - -/datum/game_mode/devil/announce() - to_chat(world, {"The current game mode is - Devil!
) - Devils: Purchase souls and tempt the crew to sin!
- Crew: Resist the lure of sin and remain pure!"}) - -/datum/game_mode/devil/pre_setup() - - if(config.protect_roles_from_antagonist) - restricted_jobs += protected_jobs - - var/list/possible_devils = get_players_for_role(ROLE_DEVIL) - var/num_devils = 0 - if(!possible_devils.len) - return 0 - if(config.traitor_scaling) - num_devils = max(1, round((num_players())/(devil_scale_coefficient))+1) - else - num_devils = max(1, min(num_players(), traitors_possible)) - - - for(var/j = 0, j < num_devils, j++) - if (!possible_devils.len) - break - var/datum/mind/devil = pick(possible_devils) - devils += devil - devil.special_role = ROLE_DEVIL - devil.restricted_roles = restricted_jobs - - log_game("[devil.key] (ckey) has been selected as a [config_tag]") - possible_devils.Remove(devil) - - if(devils.len < required_enemies) - return 0 - return 1 - - -/datum/game_mode/devil/post_setup() - for(var/datum/mind/devil in devils) - spawn(rand(10, 100)) - finalize_devil(devil, TRUE) - spawn(100) - forge_devil_objectives(devil, objective_count) //This has to be in a separate loop, as we need devil names to be generated before we give objectives in devil agent. - devil.devilinfo.announce_laws(devil.current) - var/obj_count = 1 - to_chat(devil.current, " Your current objectives:") - for(var/datum/objective/objective in devil.objectives) - to_chat(devil.current, "Objective #[obj_count]: [objective.explanation_text]") - obj_count++ - modePlayer += devils - ..() - return 1 diff --git a/code/game/gamemodes/devil/devilinfo.dm b/code/game/gamemodes/devil/devilinfo.dm deleted file mode 100644 index 22a5f4a6cde..00000000000 --- a/code/game/gamemodes/devil/devilinfo.dm +++ /dev/null @@ -1,559 +0,0 @@ -#define BLOOD_THRESHOLD 3 //How many souls are needed per stage. -#define TRUE_THRESHOLD 7 -#define ARCH_THRESHOLD 12 - -#define BASIC_DEVIL 0 -#define BLOOD_LIZARD 1 -#define TRUE_DEVIL 2 -#define ARCH_DEVIL 3 - -#define LOSS_PER_DEATH 2 - -#define SOULVALUE (soulsOwned.len-reviveNumber) - -#define DEVILRESURRECTTIME 600 - -GLOBAL_LIST_EMPTY(allDevils) -GLOBAL_LIST_INIT(lawlorify, list ( - LORE = list( - OBLIGATION_FOOD = "This devil seems to always offer it's victims food before slaughtering them.", - OBLIGATION_FIDDLE = "This devil will never turn down a musical challenge.", - OBLIGATION_DANCEOFF = "This devil will never turn down a dance off.", - OBLIGATION_GREET = "This devil seems to only be able to converse with people it knows the name of.", - OBLIGATION_PRESENCEKNOWN = "This devil seems to be unable to attack from stealth.", - OBLIGATION_SAYNAME = "He will always chant his name upon killing someone.", - OBLIGATION_ANNOUNCEKILL = "This devil always loudly announces his kills for the world to hear.", - OBLIGATION_ANSWERTONAME = "This devil always responds to his truename.", - BANE_SILVER = "Silver seems to gravely injure this devil.", - BANE_SALT = "Throwing salt at this devil will hinder his ability to use infernal powers temporarily.", - BANE_LIGHT = "Bright flashes will disorient the devil, likely causing him to flee.", - BANE_IRON = "Cold iron will slowly injure him, until he can purge it from his system.", - BANE_WHITECLOTHES = "Wearing clean white clothing will help ward off this devil.", - BANE_HARVEST = "Presenting the labors of a harvest will disrupt the devil.", - BANE_TOOLBOX = "That which holds the means of creation also holds the means of the devil's undoing.", - BAN_HURTWOMAN = "This devil seems to prefer hunting men.", - BAN_CHAPEL = "This devil avoids holy ground.", - BAN_HURTPRIEST = "The anointed clergy appear to be immune to his powers.", - BAN_AVOIDWATER = "The devil seems to have some sort of aversion to water, though it does not appear to harm him.", - BAN_STRIKEUNCONCIOUS = "This devil only shows interest in those who are awake.", - BAN_HURTLIZARD = "This devil will not strike an Unathi first.", - BAN_HURTANIMAL = "This devil avoids hurting animals.", - BANISH_WATER = "To banish the devil, you must infuse it's body with holy water.", - BANISH_COFFIN = "This devil will return to life if it's remains are not placed within a coffin.", - BANISH_FORMALDYHIDE = "To banish the devil, you must inject it's lifeless body with embalming fluid.", - BANISH_RUNES = "This devil will resurrect after death, unless it's remains are within a rune.", - BANISH_CANDLES = "A large number of nearby lit candles will prevent it from resurrecting.", - BANISH_DESTRUCTION = "It's corpse must be utterly destroyed to prevent resurrection.", - BANISH_FUNERAL_GARB = "If clad in funeral garments, this devil will be unable to resurrect. Should the clothes not fit, lay them gently on top of the devil's corpse." - ), - LAW = list( - OBLIGATION_FOOD = "When not acting in self defense, you must always offer your victim food before harming them.", - OBLIGATION_FIDDLE = "When not in immediate danger, if you are challenged to a musical duel, you must accept it. You are not obligated to duel the same person twice.", - OBLIGATION_DANCEOFF = "When not in immediate danger, if you are challenged to a dance off, you must accept it. You are not obligated to face off with the same person twice.", - OBLIGATION_GREET = "You must always greet other people by their last name before talking with them.", - OBLIGATION_PRESENCEKNOWN = "You must always make your presence known before attacking.", - OBLIGATION_SAYNAME = "You must always say your true name after you kill someone.", - OBLIGATION_ANNOUNCEKILL = "Upon killing someone, you must make your deed known to all within earshot, over comms if reasonably possible.", - OBLIGATION_ANSWERTONAME = "If you are not under attack, you must always respond to your true name.", - BAN_HURTWOMAN = "You must never harm a female outside of self defense.", - BAN_CHAPEL = "You must never attempt to enter the chapel.", - BAN_HURTPRIEST = "You must never attack a priest.", - BAN_AVOIDWATER = "You must never willingly touch a wet surface.", - BAN_STRIKEUNCONCIOUS = "You must never strike an unconscious person.", - BAN_HURTLIZARD = "You must never harm an Unathi outside of self defense.", - BAN_HURTANIMAL = "You must never harm a non-sentient creature or robot outside of self defense.", - BANE_SILVER = "Silver, in all of it's forms shall be your downfall.", - BANE_SALT = "Salt will disrupt your magical abilities.", - BANE_LIGHT = "Blinding lights will prevent you from using offensive powers for a time.", - BANE_IRON = "Cold wrought iron shall act as poison to you.", - BANE_WHITECLOTHES = "Those clad in pristine white garments will strike you true.", - BANE_HARVEST = "The fruits of the harvest shall be your downfall.", - BANE_TOOLBOX = "Toolboxes are bad news for you, for some reason.", - BANISH_WATER = "If your corpse is filled with holy water, you will be unable to resurrect.", - BANISH_COFFIN = "If your corpse is in a coffin, you will be unable to resurrect.", - BANISH_FORMALDYHIDE = "If your corpse is embalmed, you will be unable to resurrect.", - BANISH_RUNES = "If your corpse is placed within a rune, you will be unable to resurrect.", - BANISH_CANDLES = "If your corpse is near lit candles, you will be unable to resurrect.", - BANISH_DESTRUCTION = "If your corpse is destroyed, you will be unable to resurrect.", - BANISH_FUNERAL_GARB = "If your corpse is clad in funeral garments, you will be unable to resurrect." - ) - )) - -/datum/devilinfo - var/datum/mind/owner = null - var/obligation - var/ban - var/bane - var/banish - var/truename - var/list/datum/mind/soulsOwned = new - var/datum/dna/humanform = null - var/reviveNumber = 0 - var/form = BASIC_DEVIL - var/exists = 0 - var/static/list/dont_remove_spells = list( - /obj/effect/proc_holder/spell/targeted/click/summon_contract, - /obj/effect/proc_holder/spell/targeted/conjure_item/violin, - /obj/effect/proc_holder/spell/targeted/summon_dancefloor) - var/ascendable = FALSE - -/datum/devilinfo/New() - ..() - dont_remove_spells = typecacheof(dont_remove_spells) - -/proc/randomDevilInfo(name = randomDevilName()) - var/datum/devilinfo/devil = new - devil.truename = name - devil.bane = randomdevilbane() - devil.obligation = randomdevilobligation() - devil.ban = randomdevilban() - devil.banish = randomdevilbanish() - return devil - -/proc/devilInfo(name, saveDetails = 0) - if(GLOB.allDevils[lowertext(name)]) - return GLOB.allDevils[lowertext(name)] - else - var/datum/devilinfo/devil = randomDevilInfo(name) - GLOB.allDevils[lowertext(name)] = devil - devil.exists = saveDetails - return devil - - - -/proc/randomDevilName() - var/preTitle = "" - var/title = "" - var/mainName = "" - var/suffix = "" - if(prob(65)) - if(prob(35)) - preTitle = pick("Dark ", "Hellish ", "Fiery ", "Sinful ", "Blood ") - title = pick("Lord ", "Fallen Prelate ", "Count ", "Viscount ", "Vizier ", "Elder ", "Adept ") - var/probability = 100 - mainName = pick("Hal", "Ve", "Odr", "Neit", "Ci", "Quon", "Mya", "Folth", "Wren", "Gyer", "Geyr", "Hil", "Niet", "Twou", "Hu", "Don") - while(prob(probability)) - mainName += pick("hal", "ve", "odr", "neit", "ca", "quon", "mya", "folth", "wren", "gyer", "geyr", "hil", "niet", "twoe", "phi", "coa") - probability -= 20 - if(prob(40)) - suffix = pick(" the Red", " the Soulless", " the Master", ", the Lord of all things", ", Jr.") - return preTitle + title + mainName + suffix - -/proc/randomdevilobligation() - return pick(OBLIGATION_FOOD, OBLIGATION_FIDDLE, OBLIGATION_DANCEOFF, OBLIGATION_GREET, OBLIGATION_PRESENCEKNOWN, OBLIGATION_SAYNAME, OBLIGATION_ANNOUNCEKILL, OBLIGATION_ANSWERTONAME) - -/proc/randomdevilban() - return pick(BAN_HURTWOMAN, BAN_CHAPEL, BAN_HURTPRIEST, BAN_AVOIDWATER, BAN_STRIKEUNCONCIOUS, BAN_HURTLIZARD, BAN_HURTANIMAL) - -/proc/randomdevilbane() - return pick(BANE_SALT, BANE_LIGHT, BANE_IRON, BANE_WHITECLOTHES, BANE_SILVER, BANE_HARVEST, BANE_TOOLBOX) - -/proc/randomdevilbanish() - return pick(BANISH_WATER, BANISH_COFFIN, BANISH_FORMALDYHIDE, BANISH_RUNES, BANISH_CANDLES, BANISH_DESTRUCTION, BANISH_FUNERAL_GARB) - -/datum/devilinfo/proc/link_with_mob(mob/living/L) - if(istype(L, /mob/living/carbon/human)) - var/mob/living/carbon/human/H = L - humanform = H.dna.Clone() - owner = L.mind - give_base_spells(1) - -/datum/devilinfo/proc/add_soul(datum/mind/soul) - if(soulsOwned.Find(soul)) - return - soulsOwned += soul - owner.current.set_nutrition(NUTRITION_LEVEL_FULL) - to_chat(owner.current, "You feel satiated as you received a new soul.") - update_hud() - switch(SOULVALUE) - if(0) - to_chat(owner.current, "Your hellish powers have been restored.") - give_base_spells() - if(BLOOD_THRESHOLD) - to_chat(owner.current, "You feel as though your humanoid form is about to shed. You will soon turn into a blood lizard.") - sleep(50) - increase_blood_lizard() - if(TRUE_THRESHOLD) - to_chat(owner.current, "You feel as though your current form is about to shed. You will soon turn into a true devil.") - sleep(50) - increase_true_devil() - if(ARCH_THRESHOLD) - arch_devil_prelude() - increase_arch_devil() - -/datum/devilinfo/proc/remove_soul(datum/mind/soul) - if(soulsOwned.Remove(soul)) - to_chat(owner.current, "You feel as though a soul has slipped from your grasp.") - check_regression() - update_hud() - -/datum/devilinfo/proc/check_regression() - if(form == ARCH_DEVIL) - return //arch devil can't regress - //Yes, fallthrough behavior is intended, so I can't use a switch statement. - if(form == TRUE_DEVIL && SOULVALUE < TRUE_THRESHOLD) - regress_blood_lizard() - if(form == BLOOD_LIZARD && SOULVALUE < BLOOD_THRESHOLD) - regress_humanoid() - if(SOULVALUE < 0) - remove_spells() - to_chat(owner.current, "As punishment for your failures, all of your powers except contract creation have been revoked.") - -/datum/devilinfo/proc/regress_humanoid() - to_chat(owner.current, "Your powers weaken, have more contracts be signed to regain power.") - if(istype(owner.current, /mob/living/carbon/human)) - var/mob/living/carbon/human/H = owner.current - if(humanform) - H.set_species(humanform.species) - H.dna = humanform.Clone() - H.sync_organ_dna(assimilate = 0) - else - H.set_species(/datum/species/human) - // TODO: Add some appearance randomization here or something - humanform = H.dna.Clone() - H.regenerate_icons() - else - owner.current.color = "" - give_base_spells() - if(istype(owner.current.loc, /obj/effect/dummy/slaughter)) - owner.current.forceMove(get_turf(owner.current))//Fixes dying while jaunted leaving you permajaunted. - form = BASIC_DEVIL - -/datum/devilinfo/proc/regress_blood_lizard() - var/mob/living/carbon/true_devil/D = owner.current - to_chat(D, "Your powers weaken, have more contracts be signed to regain power.") - D.oldform.loc = D.loc - owner.transfer_to(D.oldform) - D.oldform.status_flags &= ~GODMODE - give_lizard_spells() - qdel(D) - form = BLOOD_LIZARD - update_hud() - - -/datum/devilinfo/proc/increase_blood_lizard() - if(ishuman(owner.current)) - var/mob/living/carbon/human/H = owner.current - var/list/language_temp = H.languages.Copy() - H.set_species(/datum/species/unathi) - H.languages = language_temp - H.underwear = "Nude" - H.undershirt = "Nude" - H.socks = "Nude" - H.change_skin_color(80, 16, 16) //A deep red - H.regenerate_icons() - else //Did the devil get hit by a staff of transmutation? - owner.current.color = "#501010" - give_lizard_spells() - form = BLOOD_LIZARD - - - -/datum/devilinfo/proc/increase_true_devil() - var/mob/living/carbon/true_devil/A = new /mob/living/carbon/true_devil(owner.current.loc, owner.current) - A.faction |= "hell" - // Put the old body in stasis - owner.current.status_flags |= GODMODE - owner.current.loc = A - A.oldform = owner.current - owner.transfer_to(A) - A.set_name() - give_true_spells() - form = TRUE_DEVIL - update_hud() - -/datum/devilinfo/proc/arch_devil_prelude() - if(!ascendable) - return - var/mob/living/carbon/true_devil/D = owner.current - to_chat(D, "You feel as though your form is about to ascend.") - sleep(50) - if(!D) - return - D.visible_message("[D]'s skin begins to erupt with spikes.", \ - "Your flesh begins creating a shield around yourself.") - sleep(100) - if(!D) - return - D.visible_message("The horns on [D]'s head slowly grow and elongate.", \ - "Your body continues to mutate. Your telepathic abilities grow.") - sleep(90) - if(!D) - return - D.visible_message("[D]'s body begins to violently stretch and contort.", \ - "You begin to rend apart the final barriers to ultimate power.") - sleep(40) - if(!D) - return - to_chat(D, "Yes!") - sleep(10) - if(!D) - return - to_chat(D, "YES!!") - sleep(10) - if(!D) - return - to_chat(D, "YE--") - sleep(1) - if(!D) - return - to_chat(world, "SLOTH, WRATH, GLUTTONY, ACEDIA, ENVY, GREED, PRIDE! FIRES OF HELL AWAKEN!!") - world << 'sound/hallucinations/veryfar_noise.ogg' - sleep(50) - if(!SSticker.mode.devil_ascended) - SSshuttle.emergency.request(null, 0.3) - SSticker.mode.devil_ascended++ - -/datum/devilinfo/proc/increase_arch_devil() - if(!ascendable) - return - var/mob/living/carbon/true_devil/D = owner.current - if(!istype(D)) - return - give_arch_spells() - D.convert_to_archdevil() - if(istype(D.loc, /obj/effect/dummy/slaughter)) - D.forceMove(get_turf(D)) - var/area/A = get_area(owner.current) - if(A) - notify_ghosts("An arch devil has ascended in [A.name]. Reach out to the devil to start climbing the infernal corporate ladder.", title = "Arch Devil Ascended", source = owner.current, action = NOTIFY_ATTACK) - form = ARCH_DEVIL - -/datum/devilinfo/proc/remove_spells() - for(var/X in owner.spell_list) - var/obj/effect/proc_holder/spell/S = X - if(!is_type_in_typecache(S, dont_remove_spells)) - owner.RemoveSpell(S) - -/datum/devilinfo/proc/give_summon_contract() - owner.AddSpell(new /obj/effect/proc_holder/spell/targeted/click/summon_contract(null)) - - -/datum/devilinfo/proc/give_base_spells(give_summon_contract = 0) - remove_spells() - owner.AddSpell(new /obj/effect/proc_holder/spell/targeted/click/fireball/hellish(null)) - owner.AddSpell(new /obj/effect/proc_holder/spell/targeted/conjure_item/pitchfork(null)) - if(give_summon_contract) - give_summon_contract() - if(obligation == OBLIGATION_FIDDLE) - owner.AddSpell(new /obj/effect/proc_holder/spell/targeted/conjure_item/violin(null)) - if(obligation == OBLIGATION_DANCEOFF) - owner.AddSpell(new /obj/effect/proc_holder/spell/targeted/summon_dancefloor(null)) - -/datum/devilinfo/proc/give_lizard_spells() - remove_spells() - owner.AddSpell(new /obj/effect/proc_holder/spell/targeted/conjure_item/pitchfork(null)) - owner.AddSpell(new /obj/effect/proc_holder/spell/targeted/click/fireball/hellish(null)) - owner.AddSpell(new /obj/effect/proc_holder/spell/targeted/infernal_jaunt(null)) - -/datum/devilinfo/proc/give_true_spells() - remove_spells() - owner.AddSpell(new /obj/effect/proc_holder/spell/targeted/conjure_item/pitchfork/greater(null)) - owner.AddSpell(new /obj/effect/proc_holder/spell/targeted/click/fireball/hellish(null)) - owner.AddSpell(new /obj/effect/proc_holder/spell/targeted/infernal_jaunt(null)) - owner.AddSpell(new /obj/effect/proc_holder/spell/targeted/sintouch(null)) - -/datum/devilinfo/proc/give_arch_spells() - remove_spells() - owner.AddSpell(new /obj/effect/proc_holder/spell/targeted/conjure_item/pitchfork/ascended(null)) - owner.AddSpell(new /obj/effect/proc_holder/spell/targeted/sintouch/ascended(null)) - -/datum/devilinfo/proc/beginResurrectionCheck(mob/living/body) - if(owner.current != body) - body = owner.current - if(SOULVALUE > 0) - to_chat(owner.current, "Your body has been damaged to the point that you may no longer use it. At the cost of some of your power, you will return to life soon.") - addtimer(CALLBACK(src, "activateResurrection", body), DEVILRESURRECTTIME) - else - to_chat(owner.messageable_mob(), "Your hellish powers are too weak to resurrect yourself.") - -/datum/devilinfo/proc/activateResurrection(mob/living/body) - if(QDELETED(body) || body.stat == DEAD) - if(SOULVALUE > 0) - if(check_banishment(body)) - to_chat(owner.messageable_mob(), "Unfortunately, the mortals have finished a ritual that prevents your resurrection.") - return -1 - else - to_chat(owner.messageable_mob(), "WE LIVE AGAIN!") - return hellish_resurrection(body) - else - to_chat(owner.messageable_mob(), "Unfortunately, the power that stemmed from your contracts has been extinguished. You no longer have enough power to resurrect.") - return -1 - else - to_chat(owner.current, "You seem to have resurrected without your hellish powers.") - -/datum/devilinfo/proc/check_banishment(mob/living/body) - switch(banish) - if(BANISH_WATER) - if(!QDELETED(body) && iscarbon(body)) - var/mob/living/carbon/H = body - return H.reagents.has_reagent("holy water") - return 0 - if(BANISH_COFFIN) - return (!QDELETED(body) && istype(body.loc, /obj/structure/closet/coffin)) - if(BANISH_FORMALDYHIDE) - if(!QDELETED(body) && iscarbon(body)) - var/mob/living/carbon/H = body - return H.reagents.has_reagent("formaldehyde") - return 0 - if(BANISH_RUNES) - if(!QDELETED(body)) - for(var/obj/effect/decal/cleanable/crayon/R in range(0,body)) - if (R.name == "rune") - return 1 - return 0 - if(BANISH_CANDLES) - if(!QDELETED(body)) - var/count = 0 - for(var/obj/item/candle/C in range(1,body)) - count += C.lit - if(count>=4) - return 1 - return 0 - if(BANISH_DESTRUCTION) - if(!QDELETED(body)) - return 0 - return 1 - if(BANISH_FUNERAL_GARB) - if(!QDELETED(body) && iscarbon(body)) - var/mob/living/carbon/human/H = body - if(H.w_uniform && istype(H.w_uniform, /obj/item/clothing/under/burial)) - return 1 - return 0 - else - for(var/obj/item/clothing/under/burial/B in range(0,body)) - if(B.loc == get_turf(B)) //Make sure it's not in someone's inventory or something. - return 1 - return 0 - -/datum/devilinfo/proc/hellish_resurrection(mob/living/body) - message_admins("[owner.name] (true name is: [truename]) is resurrecting using hellish energy.") - if(SOULVALUE <= ARCH_THRESHOLD && ascendable) // once ascended, arch devils do not go down in power by any means. - reviveNumber += LOSS_PER_DEATH - update_hud() - if(!QDELETED(body)) - body.revive() - if(!body.client) - var/mob/dead/observer/O = owner.get_ghost() - O.reenter_corpse() - if(istype(body.loc, /obj/effect/dummy/slaughter)) - body.forceMove(get_turf(body))//Fixes dying while jaunted leaving you permajaunted. - if(istype(body, /mob/living/carbon/true_devil)) - var/mob/living/carbon/true_devil/D = body - if(D.oldform) - D.oldform.revive() // Heal the old body too, so the devil doesn't resurrect, then immediately regress into a dead body. - if(body.stat == DEAD) // Not sure why this would happen - create_new_body() - else if(GLOB.blobstart.len > 0) - // teleport the body so repeated beatdowns aren't an option) - body.forceMove(get_turf(pick(GLOB.blobstart))) - // give them the devil lawyer outfit in case they got stripped - if(ishuman(body)) - var/mob/living/carbon/human/H = body - H.equipOutfit(/datum/outfit/devil_lawyer) - else - create_new_body() - check_regression() - -/datum/devilinfo/proc/create_new_body() - if(GLOB.blobstart.len > 0) - var/turf/targetturf = get_turf(pick(GLOB.blobstart)) - var/mob/currentMob = owner.current - if(QDELETED(currentMob)) - currentMob = owner.get_ghost() - if(!currentMob) - message_admins("[owner.name]'s devil resurrection failed due to client logoff. Aborting.") - return -1 - if(currentMob.mind != owner) - message_admins("[owner.name]'s devil resurrection failed due to becoming a new mob. Aborting.") - return -1 - var/mob/living/carbon/human/H = new /mob/living/carbon/human(targetturf) - owner.transfer_to(H) - if(isobserver(currentMob)) - var/mob/dead/observer/O = currentMob - O.reenter_corpse() - if(humanform) - H.set_species(humanform.species) - H.dna = humanform.Clone() - - H.dna.UpdateSE() - H.dna.UpdateUI() - - H.sync_organ_dna(1) // It's literally a fresh body as you can get, so all organs properly belong to it - H.UpdateAppearance() - else - // gibbed cyborg or similar - create a randomized "humanform" appearance - H.scramble_appearance() - humanform = H.dna.Clone() - - - H.equipOutfit(/datum/outfit/devil_lawyer) - give_base_spells(TRUE) - if(SOULVALUE >= BLOOD_THRESHOLD) - increase_blood_lizard() - if(SOULVALUE >= TRUE_THRESHOLD) //Yes, BOTH this and the above if statement are to run if soulpower is high enough. - increase_true_devil() - if(SOULVALUE >= ARCH_THRESHOLD && ascendable) - increase_arch_devil() - else - throw EXCEPTION("Unable to find a blobstart landmark for hellish resurrection") - -/datum/devilinfo/proc/update_hud() - if(istype(owner.current, /mob/living/carbon)) - var/mob/living/C = owner.current - if(C.hud_used && C.hud_used.devilsouldisplay) - C.hud_used.devilsouldisplay.update_counter(SOULVALUE) - -// SECTION: Messages and explanations - -/datum/devilinfo/proc/announce_laws(mob/living/owner) - to_chat(owner, "You remember your link to the infernal. You are [truename], an agent of hell, a devil. And you were sent to the plane of creation for a reason. A greater purpose. Convince the crew to sin, and embroiden Hell's grasp.") - to_chat(owner, "However, your infernal form is not without weaknesses.") - to_chat(owner, "You may not use violence to coerce someone into selling their soul.") - to_chat(owner, "You may not directly and knowingly physically harm a devil, other than yourself.") - to_chat(owner,GLOB.lawlorify[LAW][bane]) - to_chat(owner,GLOB.lawlorify[LAW][ban]) - to_chat(owner,GLOB.lawlorify[LAW][obligation]) - to_chat(owner,GLOB.lawlorify[LAW][banish]) - to_chat(owner, "

Remember, the crew can research your weaknesses if they find out your devil name.
") - - -#undef BLOOD_THRESHOLD -#undef TRUE_THRESHOLD -#undef ARCH_THRESHOLD -#undef BASIC_DEVIL -#undef BLOOD_LIZARD -#undef TRUE_DEVIL -#undef ARCH_DEVIL -#undef LOSS_PER_DEATH -#undef SOULVALUE -#undef DEVILRESURRECTTIME - -/datum/outfit/devil_lawyer - name = "Devil Lawyer" - uniform = /obj/item/clothing/under/lawyer/black - shoes = /obj/item/clothing/shoes/laceup - back = /obj/item/storage/backpack - l_hand = /obj/item/storage/briefcase - l_pocket = /obj/item/pen - l_ear = /obj/item/radio/headset - - id = /obj/item/card/id - -/datum/outfit/devil_lawyer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - var/obj/item/card/id/W = H.wear_id - if(!istype(W) || W.assignment) // either doesn't have a card, or the card is already written to - return - var/name_to_use = H.real_name - if(H.mind && H.mind.devilinfo) - // Having hell create an ID for you causes its risks - name_to_use = H.mind.devilinfo.truename - - W.name = "[name_to_use]'s ID Card (Lawyer)" - W.registered_name = name_to_use - W.assignment = "Lawyer" - W.rank = W.assignment - W.age = H.age - W.sex = capitalize(H.gender) - W.access = list(ACCESS_MAINT_TUNNELS, ACCESS_SYNDICATE, ACCESS_EXTERNAL_AIRLOCKS) - W.photo = get_id_photo(H) diff --git a/code/game/gamemodes/devil/game_mode.dm b/code/game/gamemodes/devil/game_mode.dm deleted file mode 100644 index 74ff27468cc..00000000000 --- a/code/game/gamemodes/devil/game_mode.dm +++ /dev/null @@ -1,93 +0,0 @@ -/datum/game_mode - var/list/datum/mind/sintouched = list() - var/list/datum/mind/devils = list() - var/devil_ascended = 0 // Number of arch devils on station - -/datum/game_mode/proc/auto_declare_completion_sintouched() - var/text = "" - if(sintouched.len) - text += "
The sintouched were:" - var/list/sintouchedUnique = uniqueList(sintouched) - for(var/S in sintouchedUnique) - var/datum/mind/sintouched_mind = S - text += printplayer(sintouched_mind) - text += printobjectives(sintouched_mind) - text += "
" - text += "
" - to_chat(world,text) - -/datum/game_mode/proc/auto_declare_completion_devils() - var/text = "" - if(devils.len) - text += "
The devils were:" - for(var/D in devils) - var/datum/mind/devil = D - text += printplayer(devil) - text += printdevilinfo(devil) - text += printobjectives(devil) - text += "
" - text += "
" - to_chat(world,text) - - -/datum/game_mode/proc/finalize_devil(datum/mind/devil_mind, ascendable = FALSE) - var/trueName= randomDevilName() - devil_mind.devilinfo = devilInfo(trueName, 1) - devil_mind.devilinfo.ascendable = ascendable - devil_mind.store_memory("Your diabolical true name is [devil_mind.devilinfo.truename]
[GLOB.lawlorify[LAW][devil_mind.devilinfo.ban]]
You may not use violence to coerce someone into selling their soul.
You may not directly and knowingly physically harm a devil, other than yourself.
[GLOB.lawlorify[LAW][devil_mind.devilinfo.bane]]
[GLOB.lawlorify[LAW][devil_mind.devilinfo.obligation]]
[GLOB.lawlorify[LAW][devil_mind.devilinfo.banish]]
") - devil_mind.devilinfo.link_with_mob(devil_mind.current) - if(devil_mind.assigned_role == "Clown") - to_chat(devil_mind.current, "Your infernal nature allows you to wield weapons without harming yourself.") - devil_mind.current.mutations.Remove(CLUMSY) - var/datum/action/innate/toggle_clumsy/A = new - A.Grant(devil_mind.current) - spawn(10) - devil_mind.devilinfo.update_hud() - if(issilicon(devil_mind.current)) - var/mob/living/silicon/S = devil_mind.current - S.laws.set_sixsixsix_law("You may not use violence to coerce someone into selling their soul.") - S.laws.set_sixsixsix_law("You may not directly and knowingly physically harm a devil, other than yourself.") - S.laws.set_sixsixsix_law("[GLOB.lawlorify[LAW][devil_mind.devilinfo.ban]]") - S.laws.set_sixsixsix_law("[GLOB.lawlorify[LAW][devil_mind.devilinfo.obligation]]") - S.laws.set_sixsixsix_law("Accomplish your objectives at all costs.") - -// unsure about the second "quantity" arg and how it fits with the antag refactor -/datum/game_mode/proc/forge_devil_objectives(datum/mind/devil_mind, quantity) - var/list/validtypes = list(/datum/objective/devil/soulquantity, /datum/objective/devil/soulquality, /datum/objective/devil/sintouch, /datum/objective/devil/buy_target) - for(var/i = 1 to quantity) - var/type = pick(validtypes) - var/datum/objective/devil/objective = new type(null) - objective.owner = devil_mind - devil_mind.objectives += objective - if(!istype(objective, /datum/objective/devil/buy_target)) - validtypes -= type //prevent duplicate objectives, EXCEPT for buy_target. - else - objective.find_target() - -/datum/game_mode/proc/greet_devil(datum/mind/devil_mind) - if(!devil_mind.devilinfo) - return - devil_mind.devilinfo.announce_laws(devil_mind.current) - devil_mind.announce_objectives() - - -/datum/game_mode/proc/printdevilinfo(datum/mind/ply) - if(!ply.devilinfo) - return "Target is not a devil." - var/text = "
The devil's true name is: [ply.devilinfo.truename]
" - text += "The devil's bans were:
" - text += " [GLOB.lawlorify[LORE][ply.devilinfo.ban]]
" - text += " [GLOB.lawlorify[LORE][ply.devilinfo.bane]]
" - text += " [GLOB.lawlorify[LORE][ply.devilinfo.obligation]]
" - text += " [GLOB.lawlorify[LORE][ply.devilinfo.banish]]

" - return text - -/datum/game_mode/proc/update_devil_icons_added(datum/mind/devil_mind) - var/datum/atom_hud/antag/hud = GLOB.huds[ANTAG_HUD_DEVIL] - hud.join_hud(devil_mind.current) - set_antag_hud(devil_mind.current, "huddevil") - -/datum/game_mode/proc/update_devil_icons_removed(datum/mind/devil_mind) - var/datum/atom_hud/antag/hud = GLOB.huds[ANTAG_HUD_DEVIL] - hud.leave_hud(devil_mind.current) - set_antag_hud(devil_mind.current, null) diff --git a/code/game/gamemodes/devil/imp/imp.dm b/code/game/gamemodes/devil/imp/imp.dm deleted file mode 100644 index e863eaf1f6a..00000000000 --- a/code/game/gamemodes/devil/imp/imp.dm +++ /dev/null @@ -1,54 +0,0 @@ -//////////////////The Monster - -/mob/living/simple_animal/imp - name = "imp" - real_name = "imp" - desc = "A large, menacing creature covered in armored black scales." - speak_emote = list("cackles") - emote_hear = list("cackles","screeches") - response_help = "thinks better of touching" - response_disarm = "flails at" - response_harm = "punches" - icon = 'icons/mob/mob.dmi' - icon_state = "imp" - icon_living = "imp" - speed = 1 - a_intent = INTENT_HARM - stop_automated_movement = 1 - status_flags = CANPUSH - attack_sound = 'sound/misc/demon_attack1.ogg' - atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0) - minbodytemp = 250 //Weak to cold - maxbodytemp = INFINITY - faction = list("hell") - attacktext = "wildly tears into" - maxHealth = 200 - health = 200 - healable = 0 - environment_smash = 1 - melee_damage_lower = 10 - melee_damage_upper = 15 - see_in_dark = 8 - lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE - var/boost - var/playstyle_string = "You are an imp, a mischevious creature from hell. You are the lowest rank on the hellish totem pole \ - Though you are not obligated to help, perhaps by aiding a higher ranking devil, you might just get a promotion. However, you are incapable \ - of intentionally harming a fellow devil." - -/mob/living/simple_animal/imp/New() - ..() - boost = world.time + 60 - -/mob/living/simple_animal/imp/Life() - ..() - if(boost[src] screams in agony as it sublimates into a sulfurous smoke.") - ghostize() - qdel(src) diff --git a/code/game/gamemodes/devil/objectives.dm b/code/game/gamemodes/devil/objectives.dm deleted file mode 100644 index 04d0217b599..00000000000 --- a/code/game/gamemodes/devil/objectives.dm +++ /dev/null @@ -1,109 +0,0 @@ -/datum/objective/devil - -/datum/objective/devil/soulquantity - explanation_text = "You shouldn't see this text. Error:DEVIL1" - target_amount = 4 - -/datum/objective/devil/soulquantity/New() - target_amount = pick(6, 7, 8) - update_explanation_text() - -/datum/objective/devil/proc/update_explanation_text() - //Intentionally empty - -/datum/objective/devil/soulquantity/update_explanation_text() - explanation_text = "Purchase, and retain control over at least [target_amount] souls." - -/datum/objective/devil/soulquantity/check_completion() - var/count = 0 - for(var/S in owner.devilinfo.soulsOwned) - var/datum/mind/L = S - if(L.soulOwner == owner) - count++ - return count >= target_amount - - - -/datum/objective/devil/soulquality - explanation_text = "You shouldn't see this text. Error:DEVIL2" - var/contractType - var/contractName - -/datum/objective/devil/soulquality/New() - contractType = pick(CONTRACT_POWER, CONTRACT_WEALTH, CONTRACT_PRESTIGE, CONTRACT_MAGIC, CONTRACT_REVIVE, CONTRACT_KNOWLEDGE) - target_amount = pick(1, 2) - switch(contractType) - if(CONTRACT_POWER) - contractName = "for power" - if(CONTRACT_WEALTH) - contractName = "for wealth" - if(CONTRACT_PRESTIGE) - contractName = "for prestige" - if(CONTRACT_MAGIC) - contractName = "for magic" - if(CONTRACT_REVIVE) - contractName = "of revival" - if(CONTRACT_KNOWLEDGE) - contractName = "for knowledge" - update_explanation_text() - -/datum/objective/devil/soulquality/update_explanation_text() - explanation_text = "Have mortals sign at least [target_amount] contracts [contractName]." - -/datum/objective/devil/soulquality/check_completion() - var/count = 0 - for(var/S in owner.devilinfo.soulsOwned) - var/datum/mind/L = S - if(L.soulOwner != L && L.damnation_type == contractType) - count++ - return count >= target_amount - - - -/datum/objective/devil/sintouch - explanation_text = "You shouldn't see this text. Error:DEVIL3" - -/datum/objective/devil/sintouch/New() - target_amount = pick(4, 5) - explanation_text = "Ensure at least [target_amount] mortals are sintouched." - -/datum/objective/devil/sintouch/check_completion() - return target_amount <= SSticker.mode.sintouched.len - - - -/datum/objective/devil/buy_target - explanation_text = "You shouldn't see this text. Error:DEVIL4" - -/datum/objective/devil/buy_target/New() - find_target() - update_explanation_text() - -/datum/objective/devil/buy_target/update_explanation_text() - if(target) - explanation_text = "Purchase and retain the soul of [target.name], the [target.assigned_role]." - else - explanation_text = "Free objective." - -/datum/objective/devil/buy_target/check_completion() - return target.soulOwner == owner - - -/datum/objective/devil/outsell - explanation_text = "You shouldn't see this text. Error:DEVIL5" - -/datum/objective/devil/outsell/update_explanation_text() - explanation_text = "Purchase and retain control over more souls than [target.devilinfo.truename], known to mortals as [target.name], the [target.assigned_role]." - -/datum/objective/devil/outsell/check_completion() - var/selfcount = 0 - for(var/S in owner.devilinfo.soulsOwned) - var/datum/mind/L = S - if(L.soulOwner == owner) - selfcount++ - var/targetcount = 0 - for(var/S in target.devilinfo.soulsOwned) - var/datum/mind/L = S - if(L.soulOwner == target) - targetcount++ - return selfcount > targetcount diff --git a/code/game/gamemodes/devil/true_devil/_true_devil.dm b/code/game/gamemodes/devil/true_devil/_true_devil.dm deleted file mode 100644 index 197524c0e38..00000000000 --- a/code/game/gamemodes/devil/true_devil/_true_devil.dm +++ /dev/null @@ -1,218 +0,0 @@ -#define DEVIL_R_HAND_LAYER 1 -#define DEVIL_L_HAND_LAYER 2 -#define DEVIL_TOTAL_LAYERS 2 - -// This is used primarily for having hands. -/mob/living/carbon/true_devil - name = "True Devil" - desc = "A pile of infernal energy, taking a vaguely humanoid form." - icon = 'icons/mob/32x64.dmi' - icon_state = "true_devil" - gender = NEUTER - health = 350 - maxHealth = 350 - ventcrawler = FALSE - density = TRUE - pass_flags = 0 - var/ascended = FALSE - sight = (SEE_TURFS | SEE_OBJS) - status_flags = CANPUSH - universal_understand = TRUE - universal_speak = TRUE //The devil speaks all languages meme - var/mob/living/oldform - var/list/devil_overlays[DEVIL_TOTAL_LAYERS] - -/mob/living/carbon/true_devil/New(loc, mob/living/carbon/dna_source) - dna = dna_source.dna.Clone() - var/obj/item/organ/internal/brain/B = new(src) - var/obj/item/organ/internal/ears/E = new(src) - B.insert() - E.insert() - ..() - -// inventory system could use some love -/mob/living/carbon/true_devil/put_in_hands(obj/item/W) - if(!W) - return 0 - if(put_in_active_hand(W)) - return TRUE - else if(put_in_inactive_hand(W)) - return TRUE - else - ..() - -/mob/living/carbon/true_devil/proc/convert_to_archdevil() - maxHealth = 5000 // not an IMPOSSIBLE amount, but still near impossible. - ascended = TRUE - health = maxHealth - icon_state = "arch_devil" - -/mob/living/carbon/true_devil/proc/set_name() - name = mind.devilinfo.truename - real_name = name - -/mob/living/carbon/true_devil/Login() - ..() - if(mind.devilinfo) - mind.devilinfo.announce_laws(src) - mind.announce_objectives() - - -/mob/living/carbon/true_devil/death(gibbed) - . = ..(gibbed) - drop_l_hand() - drop_r_hand() - - -/mob/living/carbon/true_devil/examine(mob/user) - var/msg = "*---------*\nThis is [bicon(src)] [src]!\n" - - //Left hand items - if(l_hand && !(l_hand.flags & ABSTRACT)) - if(l_hand.blood_DNA) - msg += "It is holding [bicon(l_hand)] [l_hand.gender == PLURAL? "some" : "a"] blood-stained [l_hand.name] in its left hand!\n" - else - msg += "It is holding [bicon(l_hand)] \a [l_hand] in its left hand.\n" - - //Right hand items - if(r_hand && !(r_hand.flags & ABSTRACT)) - if(r_hand.blood_DNA) - msg += "It is holding [bicon(r_hand)] [r_hand.gender == PLURAL? "some" : "a"] blood-stained [r_hand.name] in its right hand!\n" - else - msg += "It is holding [bicon(r_hand)] \a [r_hand] in its right hand.\n" - - //Braindead - if(!client && stat != DEAD) - msg += "The devil seems to be in deep contemplation.\n" - - //Damaged - if(stat == DEAD) - msg += "The hellfire seems to have been extinguished, for now at least.\n" - else if(health < (maxHealth/10)) - msg += "You can see hellfire inside of it's gaping wounds.\n" - else if(health < (maxHealth/2)) - msg += "You can see hellfire inside of it's wounds.\n" - msg += "*---------*" - . = list(msg) - - -/mob/living/carbon/true_devil/IsAdvancedToolUser() - return TRUE - -/mob/living/carbon/true_devil/assess_threat() - return 666 - -/mob/living/carbon/true_devil/flash_eyes(intensity = 1, override_blindness_check = 0, affect_silicon = 0, visual = 0) - if(mind && has_bane(BANE_LIGHT)) - mind.disrupt_spells(-500) - return ..() //flashes don't stop devils UNLESS it's their bane. - - -/mob/living/carbon/true_devil/attacked_by(obj/item/I, mob/living/user, def_zone) - var/weakness = check_weakness(I, user) - apply_damage(I.force * weakness, I.damtype, def_zone) - var/message_verb = "" - if(I.attack_verb && I.attack_verb.len) - message_verb = "[pick(I.attack_verb)]" - else if(I.force) - message_verb = "attacked" - - var/attack_message = "[src] has been [message_verb] with [I]." - if(user) - user.do_attack_animation(src) - if(user in viewers(src, null)) - attack_message = "[user] has [message_verb] [src] with [I]!" - if(message_verb) - visible_message("[attack_message]", - "[attack_message]") - return TRUE - -/mob/living/carbon/true_devil/UnarmedAttack(atom/A, proximity) - if(!ishuman(A)) - // `attack_hand` on mobs assumes the attacker is a human - // I am the worst - A.attack_hand(src) - // If the devil wants to actually attack, they have the pitchfork. - - -/mob/living/carbon/true_devil/Process_Spacemove(movement_dir = 0) - return TRUE - -/mob/living/carbon/true_devil/singularity_act() - if(ascended) - return 0 - return ..() - -/mob/living/carbon/true_devil/attack_ghost(mob/dead/observer/user as mob) - if(ascended || user.mind.soulOwner == src.mind) - var/mob/living/simple_animal/imp/S = new(get_turf(loc)) - S.key = user.key - S.mind.assigned_role = "MODE" - S.mind.special_role = "Imp" - var/datum/objective/newobjective = new - newobjective.explanation_text = "Try to get a promotion to a higher infernal rank." - S.mind.objectives += newobjective - to_chat(S,S.playstyle_string) - to_chat(S,"Objective #1: [newobjective.explanation_text]") - return - else - return ..() - -/mob/living/carbon/true_devil/resist_fire() - //They're immune to fire. - -/mob/living/carbon/true_devil/attack_hand(mob/living/carbon/human/M) - if(..()) - switch(M.a_intent) - if(INTENT_HARM) - var/damage = rand(1, 5) - playsound(loc, "punch", 25, 1, -1) - visible_message("[M] has punched [src]!", \ - "[M] has punched [src]!") - adjustBruteLoss(damage) - add_attack_logs(M, src, "attacked") - updatehealth() - if(INTENT_DISARM) - if(!lying && !ascended) //No stealing the arch devil's pitchfork. - if(prob(5)) - // Weaken knocks people over - // Paralyse knocks people out - // It's Paralyse for parity though - // Weaken(2) - Paralyse(2) - playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) - add_attack_logs(M, src, "pushed") - visible_message("[M] has pushed down [src]!", \ - "[M] has pushed down [src]!") - else - if(prob(25)) - drop_item() - playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) - visible_message("[M] has disarmed [src]!", \ - "[M] has disarmed [src]!") - else - playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1) - visible_message("[M] has attempted to disarm [src]!") - -/mob/living/carbon/true_devil/handle_breathing() - // devils do not need to breathe - -/mob/living/carbon/true_devil/is_literate() - return TRUE - -/mob/living/carbon/true_devil/ex_act(severity, ex_target) - if(!ascended) - var/b_loss - switch (severity) - if (1) - b_loss = 500 - if (2) - b_loss = 150 - if(3) - b_loss = 30 - if(has_bane(BANE_LIGHT)) - b_loss *=2 - adjustBruteLoss(b_loss) - return ..() - -#undef DEVIL_TOTAL_LAYERS diff --git a/code/game/gamemodes/devil/true_devil/inventory.dm b/code/game/gamemodes/devil/true_devil/inventory.dm deleted file mode 100644 index 3f5446d88bc..00000000000 --- a/code/game/gamemodes/devil/true_devil/inventory.dm +++ /dev/null @@ -1,50 +0,0 @@ -/mob/living/carbon/true_devil/unEquip(obj/item/I, force) - if(..(I,force)) - update_inv_r_hand() - update_inv_l_hand() - return 1 - return 0 - -/mob/living/carbon/true_devil/update_inv_r_hand() - ..() - if(r_hand) - var/t_state = r_hand.item_state - if(!t_state) - t_state = r_hand.icon_state - - var/image/I = image("icon" = r_hand.righthand_file, "icon_state" = "[t_state]") - I = center_image(I, r_hand.inhand_x_dimension, r_hand.inhand_y_dimension) - devil_overlays[DEVIL_R_HAND_LAYER] = I - else - devil_overlays[DEVIL_R_HAND_LAYER] = null - update_icons() - - -/mob/living/carbon/true_devil/update_inv_l_hand() - ..() - if(l_hand) - var/t_state = l_hand.item_state - if(!t_state) - t_state = l_hand.icon_state - - var/image/I = image("icon" = l_hand.lefthand_file, "icon_state" = "[t_state]") - I = center_image(I, l_hand.inhand_x_dimension, l_hand.inhand_y_dimension) - devil_overlays[DEVIL_L_HAND_LAYER] = I - else - devil_overlays[DEVIL_L_HAND_LAYER] = null - update_icons() - -/mob/living/carbon/true_devil/proc/remove_overlay(cache_index) - if(devil_overlays[cache_index]) - overlays -= devil_overlays[cache_index] - devil_overlays[cache_index] = null - - -/mob/living/carbon/true_devil/proc/apply_overlay(cache_index) - var/image/I = devil_overlays[cache_index] - if(I) - if(I in overlays) - return - var/list/new_overlays = overlays.Copy() - new_overlays += I - overlays = new_overlays diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index 83afb1bbc42..343f8bf27ae 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -20,11 +20,15 @@ var/explosion_in_progress = 0 //sit back and relax var/list/datum/mind/modePlayer = new var/list/restricted_jobs = list() // Jobs it doesn't make sense to be. I.E chaplain or AI cultist + var/list/secondary_restricted_jobs = list() // Same as above, but for secondary antagonists var/list/protected_jobs = list() // Jobs that can't be traitors var/list/protected_species = list() // Species that can't be traitors + var/list/secondary_protected_species = list() // Same as above, but for secondary antagonists var/required_players = 0 var/required_enemies = 0 var/recommended_enemies = 0 + var/secondary_enemies = 0 + var/secondary_enemies_scaling = 0 // Scaling rate of secondary enemies var/newscaster_announcements = null var/ert_disabled = 0 var/uplink_welcome = "Syndicate Uplink Console:" @@ -73,13 +77,7 @@ spawn (ROUNDSTART_LOGOUT_REPORT_TIME) display_roundstart_logout_report() - if(SSticker && SSticker.mode && SSdbcore.IsConnected()) - var/datum/db_query/query_round_game_mode = SSdbcore.NewQuery("UPDATE [format_table_name("round")] SET game_mode=:gm WHERE id=:rid", list( - "gm" = SSticker.mode, - "rid" = GLOB.round_id - )) - if(query_round_game_mode.warn_execute()) - qdel(query_round_game_mode) + INVOKE_ASYNC(src, .proc/set_mode_in_db) // Async query, dont bother slowing roundstart generate_station_goals() GLOB.start_state = new /datum/station_state() @@ -91,6 +89,17 @@ /datum/game_mode/process() return 0 +// I wonder what this could do guessing by the name +/datum/game_mode/proc/set_mode_in_db() + if(SSticker?.mode && SSdbcore.IsConnected()) + var/datum/db_query/query_round_game_mode = SSdbcore.NewQuery("UPDATE [format_table_name("round")] SET game_mode=:gm WHERE id=:rid", list( + "gm" = SSticker.mode.name, + "rid" = GLOB.round_id + )) + // We dont do anything with output. Dont bother wrapping with if() + query_round_game_mode.warn_execute() + qdel(query_round_game_mode) + //Called by the gameticker /datum/game_mode/proc/process_job_tasks() var/obj/machinery/message_server/useMS = null @@ -218,7 +227,7 @@ /datum/game_mode/proc/check_win() //universal trigger to be called at mob death, nuke explosion, etc. To be called from everywhere. return 0 -/datum/game_mode/proc/get_players_for_role(var/role, override_jobbans=0) +/datum/game_mode/proc/get_players_for_role(role, override_jobbans=0) var/list/players = list() var/list/candidates = list() //var/list/drafted = list() @@ -267,10 +276,10 @@ // Less if there are not enough valid players in the game entirely to make recommended_enemies. -/datum/game_mode/proc/latespawn(var/mob) +/datum/game_mode/proc/latespawn(mob) /* -/datum/game_mode/proc/check_player_role_pref(var/role, var/mob/player) +/datum/game_mode/proc/check_player_role_pref(role, mob/player) if(player.preferences.be_special & role) return 1 return 0 @@ -397,7 +406,7 @@ to_chat(M, msg) //Announces objectives/generic antag text. -/proc/show_generic_antag_text(var/datum/mind/player) +/proc/show_generic_antag_text(datum/mind/player) if(player.current) to_chat(player.current, "You are an antagonist! Within the rules, \ try to act as an opposing force to the crew. Further RP and try to make sure \ @@ -406,7 +415,7 @@ Think through your actions and make the roleplay immersive! Please remember all \ rules aside from those without explicit exceptions apply to antagonists.") -/proc/show_objectives(var/datum/mind/player) +/proc/show_objectives(datum/mind/player) if(!player || !player.current) return var/obj_count = 1 @@ -415,7 +424,7 @@ to_chat(player.current, "Objective #[obj_count]: [objective.explanation_text]") obj_count++ -/proc/get_roletext(var/role) +/proc/get_roletext(role) return role /proc/get_nuke_code() diff --git a/code/game/gamemodes/heist/heist.dm b/code/game/gamemodes/heist/heist.dm index 54faf90fef8..4277fc76916 100644 --- a/code/game/gamemodes/heist/heist.dm +++ b/code/game/gamemodes/heist/heist.dm @@ -83,7 +83,7 @@ GLOBAL_LIST_EMPTY(cortical_stacks) //Stacks for 'leave nobody behind' objective. return ..() -/datum/game_mode/proc/create_vox(var/datum/mind/newraider) +/datum/game_mode/proc/create_vox(datum/mind/newraider) var/sounds = rand(2,8) var/i = 0 @@ -175,7 +175,7 @@ GLOBAL_LIST_EMPTY(cortical_stacks) //Stacks for 'leave nobody behind' objective. return objs -/datum/game_mode/proc/greet_vox(var/datum/mind/raider) +/datum/game_mode/proc/greet_vox(datum/mind/raider) to_chat(raider.current, "You are a Vox Raider, fresh from the Shoal!") to_chat(raider.current, "The Vox are a race of cunning, sharp-eyed nomadic raiders and traders endemic to the frontier and much of the unexplored galaxy. You and the crew have come to the [station_name()] for plunder, trade or both.") 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.") diff --git a/code/game/gamemodes/intercept_report.dm b/code/game/gamemodes/intercept_report.dm index acee798e96c..aaf5dd1eea7 100644 --- a/code/game/gamemodes/intercept_report.dm +++ b/code/game/gamemodes/intercept_report.dm @@ -55,7 +55,7 @@ ) -/datum/intercept_text/proc/build(var/mode_type, datum/mind/correct_person) +/datum/intercept_text/proc/build(mode_type, datum/mind/correct_person) switch(mode_type) if("revolution") src.text = "" diff --git a/code/game/gamemodes/malfunction/Malf_Modules.dm b/code/game/gamemodes/malfunction/Malf_Modules.dm index 308bc4fb818..e299f0c97c2 100644 --- a/code/game/gamemodes/malfunction/Malf_Modules.dm +++ b/code/game/gamemodes/malfunction/Malf_Modules.dm @@ -170,7 +170,7 @@ AM.upgrade(A) possible_modules -= AM to_chat(A, AM.unlock_text) - A.playsound_local(A, AM.unlock_sound, 50, 0) + A.playsound_local(A, AM.unlock_sound, 50, FALSE, use_reverb = FALSE) else if(AM.power_type) if(!action) //Unlocking for the first time @@ -183,7 +183,7 @@ if(AM.unlock_text) to_chat(A, AM.unlock_text) if(AM.unlock_sound) - A.playsound_local(A, AM.unlock_sound, 50, 0) + A.playsound_local(A, AM.unlock_sound, 50, FALSE, use_reverb = FALSE) else //Adding uses to an existing module action.uses += initial(action.uses) action.desc = "[initial(action.desc)] It has [action.uses] use\s remaining." @@ -318,8 +318,9 @@ announced = max(0, announced-1) /obj/machinery/doomsday_device/proc/detonate(z_level = 1) - for(var/mob/M in GLOB.player_list) - M << 'sound/machines/alarm.ogg' + var/doomsday_alarm = sound('sound/machines/alarm.ogg') + for(var/explodee in GLOB.player_list) + SEND_SOUND(explodee, doomsday_alarm) sleep(100) for(var/mob/living/L in GLOB.mob_list) var/turf/T = get_turf(L) @@ -330,7 +331,8 @@ to_chat(L, "The blast wave from [src] tears you atom from atom!") L.dust() to_chat(world, "The AI cleansed the station of life with the doomsday device!") - SSticker.force_ending = 1 + SSticker.force_ending = TRUE + SSticker.mode.station_was_nuked = TRUE //AI Turret Upgrade: Increases the health and damage of all turrets. /datum/AI_Module/large/upgrade_turrets @@ -368,18 +370,8 @@ uses = 1 /datum/action/innate/ai/lockdown/Activate() - for(var/obj/machinery/door/D in GLOB.airlocks) - if(!is_station_level(D.z)) - continue - INVOKE_ASYNC(D, /obj/machinery/door.proc/hostile_lockdown, owner) - addtimer(CALLBACK(D, /obj/machinery/door.proc/disable_lockdown), 900) - - post_status("alert", "lockdown") - - GLOB.minor_announcement.Announce("Hostile runtime detected in door controllers. Isolation lockdown protocols are now in effect. Please remain calm.", "Network Alert") to_chat(owner, "Lockdown Initiated. Network reset in 90 seconds.") - spawn(900) - GLOB.minor_announcement.Announce("Automatic system reboot complete. Have a secure day.","Network reset:") + new /datum/event/door_runtime() //Destroy RCDs: Detonates all non-cyborg RCDs on the station. /datum/AI_Module/large/destroy_rcd @@ -404,7 +396,7 @@ RCD.detonate_pulse() to_chat(owner, "RCD detonation pulse emitted.") - owner.playsound_local(owner, 'sound/machines/twobeep.ogg', 50, 0) + owner.playsound_local(owner, 'sound/machines/twobeep.ogg', 50, FALSE, use_reverb = FALSE) //Unlock Mech Domination: Unlocks the ability to dominate mechs. Big shocker, right? /datum/AI_Module/large/mecha_domination @@ -443,7 +435,7 @@ continue F.emagged = TRUE to_chat(owner, "All thermal sensors on the station have been disabled. Fire alerts will no longer be recognized.") - owner.playsound_local(owner, 'sound/machines/terminal_off.ogg', 50, 0) + owner.playsound_local(owner, 'sound/machines/terminal_off.ogg', 50, FALSE, use_reverb = FALSE) //Air Alarm Safety Override: Unlocks the ability to enable flooding on all air alarms. /datum/AI_Module/large/break_air_alarms @@ -468,7 +460,7 @@ continue AA.emagged = TRUE to_chat(owner, "All air alarm safeties on the station have been overriden. Air alarms may now use the Flood environmental mode.") - owner.playsound_local(owner, 'sound/machines/terminal_off.ogg', 50, 0) + owner.playsound_local(owner, 'sound/machines/terminal_off.ogg', 50, FALSE, use_reverb = FALSE) //Overload Machine: Allows the AI to overload a machine, detonating it after a delay. Two uses per purchase. @@ -514,7 +506,7 @@ to_chat(ranged_ability_user, "You can only overload machines!") return - ranged_ability_user.playsound_local(ranged_ability_user, "sparks", 50, 0) + ranged_ability_user.playsound_local(ranged_ability_user, "sparks", 50, FALSE, use_reverb = FALSE) attached_action.adjust_uses(-1) if(attached_action && attached_action.uses) attached_action.desc = "[initial(attached_action.desc)] It has [attached_action.uses] use\s remaining." @@ -569,7 +561,7 @@ to_chat(ranged_ability_user, "That machine can't be overridden!") return - ranged_ability_user.playsound_local(ranged_ability_user, 'sound/misc/interference.ogg', 50, 0) + ranged_ability_user.playsound_local(ranged_ability_user, 'sound/misc/interference.ogg', 50, FALSE, use_reverb = FALSE) attached_action.adjust_uses(-1) if(attached_action && attached_action.uses) attached_action.desc = "[initial(attached_action.desc)] It has [attached_action.uses] use\s remaining." @@ -683,7 +675,7 @@ else apc.overload++ to_chat(owner, "Overcurrent applied to the powernet.") - owner.playsound_local(owner, "sparks", 50, 0) + owner.playsound_local(owner, "sparks", 50, FALSE, use_reverb = FALSE) adjust_uses(-1) if(src && uses) //Not sure if not having src here would cause a runtime, so it's here to be safe desc = "[initial(desc)] It has [uses] use\s remaining." @@ -724,7 +716,7 @@ fixed_cameras++ uses-- //Not adjust_uses() so it doesn't automatically delete or show a message to_chat(owner, "Diagnostic complete! Cameras reactivated: [fixed_cameras]. Reactivations remaining: [uses].") - owner.playsound_local(owner, 'sound/items/wirecutter.ogg', 50, 0) + owner.playsound_local(owner, 'sound/items/wirecutter.ogg', 50, FALSE, use_reverb = FALSE) adjust_uses(0, TRUE) //Checks the uses remaining if(src && uses) //Not sure if not having src here would cause a runtime, so it's here to be safe desc = "[initial(desc)] It has [uses] use\s remaining." @@ -794,4 +786,3 @@ /datum/AI_Module/large/cameracrack/upgrade(mob/living/silicon/ai/AI) if(AI.builtInCamera) QDEL_NULL(AI.builtInCamera) - diff --git a/code/game/gamemodes/meteor/meteors.dm b/code/game/gamemodes/meteor/meteors.dm index 0743a6f686d..d156c97266b 100644 --- a/code/game/gamemodes/meteor/meteors.dm +++ b/code/game/gamemodes/meteor/meteors.dm @@ -18,18 +18,18 @@ GLOBAL_LIST_INIT(meteors_ops, list(/obj/effect/meteor/goreops)) //Meaty Ops /////////////////////////////// //Meteor spawning global procs /////////////////////////////// -/proc/spawn_meteors(var/number = 10, var/list/meteortypes) +/proc/spawn_meteors(number = 10, list/meteortypes) for(var/i = 0; i < number; i++) spawn_meteor(meteortypes) -/proc/spawn_meteor(var/list/meteortypes) +/proc/spawn_meteor(list/meteortypes) var/turf/pickedstart var/turf/pickedgoal var/max_i = 10//number of tries to spawn meteor. while(!istype(pickedstart, /turf/space)) var/startSide = pick(GLOB.cardinal) - pickedstart = spaceDebrisStartLoc(startSide, 1) - pickedgoal = spaceDebrisFinishLoc(startSide, 1) + pickedstart = spaceDebrisStartLoc(startSide, level_name_to_num(MAIN_STATION)) + pickedgoal = spaceDebrisFinishLoc(startSide, level_name_to_num(MAIN_STATION)) max_i-- if(max_i<=0) return @@ -136,7 +136,7 @@ GLOBAL_LIST_INIT(meteors_ops, list(/obj/effect/meteor/goreops)) //Meaty Ops /obj/effect/meteor/CanPass(atom/movable/mover, turf/target, height=0) return istype(mover, /obj/effect/meteor) ? 1 : ..() -/obj/effect/meteor/proc/ram_turf(var/turf/T) +/obj/effect/meteor/proc/ram_turf(turf/T) //first bust whatever is in the turf for(var/atom/A in T) if(A != src) @@ -170,7 +170,7 @@ GLOBAL_LIST_INIT(meteors_ops, list(/obj/effect/meteor/goreops)) //Meaty Ops var/obj/item/O = new meteordrop(get_turf(src)) O.throw_at(dest, 5, 10) -/obj/effect/meteor/proc/meteor_effect(var/sound=1) +/obj/effect/meteor/proc/meteor_effect(sound=1) if(sound) var/sound/meteor_sound = sound(meteorsound) var/random_frequency = get_rand_frequency() @@ -245,8 +245,7 @@ GLOBAL_LIST_INIT(meteors_ops, list(/obj/effect/meteor/goreops)) //Meaty Ops ..(heavy) explosion(src.loc, 0, 0, 4, 3, 0) new /obj/effect/decal/cleanable/greenglow(get_turf(src)) - for(var/mob/living/L in view(5, src)) - L.apply_effect(40, IRRADIATE) + radiation_pulse(src, 500) //Station buster Tunguska /obj/effect/meteor/tunguska diff --git a/code/game/gamemodes/miniantags/abduction/gland.dm b/code/game/gamemodes/miniantags/abduction/gland.dm index b242802c9cf..021c4e09f06 100644 --- a/code/game/gamemodes/miniantags/abduction/gland.dm +++ b/code/game/gamemodes/miniantags/abduction/gland.dm @@ -68,7 +68,7 @@ active_mind_control = FALSE update_gland_hud() -/obj/item/organ/internal/heart/gland/remove(var/mob/living/carbon/M, special = 0) +/obj/item/organ/internal/heart/gland/remove(mob/living/carbon/M, special = 0) active = 0 if(initial(uses) == 1) uses = initial(uses) @@ -77,7 +77,7 @@ clear_mind_control() . = ..() -/obj/item/organ/internal/heart/gland/insert(var/mob/living/carbon/M, special = 0) +/obj/item/organ/internal/heart/gland/insert(mob/living/carbon/M, special = 0) ..() if(special != 2 && uses) // Special 2 means abductor surgery Start() @@ -113,6 +113,8 @@ mind_control_duration = 3000 /obj/item/organ/internal/heart/gland/heals/activate() + if(!(owner.mob_biotypes & MOB_ORGANIC)) + return to_chat(owner, "You feel curiously revitalized.") owner.adjustToxLoss(-20) owner.adjustBruteLoss(-20) @@ -281,23 +283,23 @@ if(ishuman(owner)) owner.gene_stability += GENE_INSTABILITY_MODERATE // give them this gene for free owner.dna.SetSEState(GLOB.shockimmunityblock, TRUE) - genemutcheck(owner, GLOB.shockimmunityblock, null, MUTCHK_FORCED) + singlemutcheck(owner, GLOB.shockimmunityblock, MUTCHK_FORCED) /obj/item/organ/internal/heart/gland/electric/remove(mob/living/carbon/M, special = 0) if(ishuman(owner)) owner.gene_stability -= GENE_INSTABILITY_MODERATE // but return it to normal once it's removed owner.dna.SetSEState(GLOB.shockimmunityblock, FALSE) - genemutcheck(owner, GLOB.shockimmunityblock, null, MUTCHK_FORCED) + singlemutcheck(owner, GLOB.shockimmunityblock, MUTCHK_FORCED) return ..() /obj/item/organ/internal/heart/gland/electric/activate() owner.visible_message("[owner]'s skin starts emitting electric arcs!",\ "You feel electric energy building up inside you!") - playsound(get_turf(owner), "sparks", 100, 1, -1) + playsound(get_turf(owner), "sparks", 100, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) addtimer(CALLBACK(src, .proc/zap), rand(30, 100)) /obj/item/organ/internal/heart/gland/electric/proc/zap() - tesla_zap(owner, 4, 8000) + tesla_zap(owner, 4, 8000, ZAP_MOB_DAMAGE | ZAP_OBJ_DAMAGE | ZAP_MOB_STUN) playsound(get_turf(owner), 'sound/magic/lightningshock.ogg', 50, 1) /obj/item/organ/internal/heart/gland/chem diff --git a/code/game/gamemodes/miniantags/borer/borer.dm b/code/game/gamemodes/miniantags/borer/borer.dm index 750473b1dfa..d5de0f42f29 100644 --- a/code/game/gamemodes/miniantags/borer/borer.dm +++ b/code/game/gamemodes/miniantags/borer/borer.dm @@ -25,7 +25,7 @@ if(M.mind && isobserver(M)) to_chat(M, "Thought-speech, [src] -> [B.truename]: [message]") -/mob/living/captive_brain/say_understands(var/mob/other, var/datum/language/speaking = null) +/mob/living/captive_brain/say_understands(mob/other, datum/language/speaking = null) var/mob/living/simple_animal/borer/B = loc if(!istype(B)) log_runtime(EXCEPTION("Trapped mind found without a borer!"), src) @@ -114,12 +114,12 @@ var/datum/action/innate/borer/freeze_victim/freeze_victim_action = new var/datum/action/innate/borer/torment/torment_action = new -/mob/living/simple_animal/borer/New(atom/newloc, var/gen=1) +/mob/living/simple_animal/borer/New(atom/newloc, gen=1) ..(newloc) 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() @@ -151,7 +151,7 @@ if(client.statpanel == "Status") stat("Chemicals", chemicals) -/mob/living/simple_animal/borer/say(var/message) +/mob/living/simple_animal/borer/say(message) var/list/message_pieces = parse_languages(message) for(var/datum/multilingual_say_piece/S in message_pieces) if(!istype(S.speaking, /datum/language/corticalborer) && loc == host && !talk_inside_host) @@ -823,7 +823,7 @@ /mob/living/simple_animal/borer/can_use_vents() return -/mob/living/simple_animal/borer/proc/transfer_personality(var/client/candidate) +/mob/living/simple_animal/borer/proc/transfer_personality(client/candidate) if(!candidate || !candidate.mob) return diff --git a/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm b/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm index 3744ed17aec..b99a153c234 100644 --- a/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm +++ b/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm @@ -60,14 +60,13 @@ desc = "Robotic constructs of unknown design, swarmers seek only to consume materials and replicate themselves indefinitely." speak_emote = list("tones") bubble_icon = "swarmer" + 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 @@ -85,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 @@ -488,7 +487,7 @@ changeNext_move(CLICK_CD_MELEE) target.ex_act(EXPLODE_LIGHT) -/mob/living/simple_animal/hostile/swarmer/proc/DisperseTarget(var/mob/living/target) +/mob/living/simple_animal/hostile/swarmer/proc/DisperseTarget(mob/living/target) if(target == src) return @@ -518,8 +517,8 @@ playsound(src,'sound/effects/sparks4.ogg', 50, TRUE) do_teleport(target, F, 0) -/mob/living/simple_animal/hostile/swarmer/electrocute_act(shock_damage, obj/source, siemens_coeff = 1, safety = FALSE, override = FALSE, tesla_shock = FALSE, illusion = FALSE, stun = TRUE) - if(!tesla_shock) +/mob/living/simple_animal/hostile/swarmer/electrocute_act(shock_damage, source, siemens_coeff = 1, flags = NONE) + if(!(flags & SHOCK_TESLA)) return FALSE return ..() @@ -558,7 +557,7 @@ /obj/effect/temp_visual/swarmer/disintegration/Initialize(mapload) . = ..() - playsound(loc, "sparks", 100, TRUE) + playsound(loc, "sparks", 100, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) /obj/effect/temp_visual/swarmer/dismantle icon_state = "dismantle" @@ -604,12 +603,12 @@ max_integrity = 10 density = FALSE -/obj/structure/swarmer/trap/Crossed(var/atom/movable/AM, oldloc) +/obj/structure/swarmer/trap/Crossed(atom/movable/AM, oldloc) if(isliving(AM)) var/mob/living/L = AM if(!istype(L, /mob/living/simple_animal/hostile/swarmer)) playsound(loc,'sound/effects/snap.ogg',50, 1, -1) - L.electrocute_act(0, src, 1, TRUE, TRUE) + L.electrocute_act(100, src, 1, flags = SHOCK_NOGLOVES | SHOCK_ILLUSION) if(isrobot(L) || ismachineperson(L)) L.Weaken(5) qdel(src) diff --git a/code/game/gamemodes/miniantags/guardian/guardian.dm b/code/game/gamemodes/miniantags/guardian/guardian.dm index e14e3ba9981..c2a72b12b1e 100644 --- a/code/game/gamemodes/miniantags/guardian/guardian.dm +++ b/code/game/gamemodes/miniantags/guardian/guardian.dm @@ -12,6 +12,7 @@ icon_living = "magicOrange" icon_dead = "magicOrange" speed = 0 + mob_biotypes = NONE a_intent = INTENT_HARM can_change_intents = 0 stop_automated_movement = 1 @@ -128,7 +129,7 @@ else resulthealth = round((summoner.health / summoner.maxHealth) * 100) if(hud_used) - hud_used.guardianhealthdisplay.maptext = "
[resulthealth]%
" + hud_used.guardianhealthdisplay.maptext = "
[resulthealth]%
" /mob/living/simple_animal/hostile/guardian/adjustHealth(amount, updating_health = TRUE) //The spirit is invincible, but passes on damage to the summoner var/damage = amount * damage_transfer @@ -239,6 +240,8 @@ var/ling_failure = "The deck refuses to respond to a souless creature such as you." var/list/possible_guardians = list("Chaos", "Standard", "Ranged", "Support", "Explosive", "Assassin", "Lightning", "Charger", "Protector") var/random = FALSE + /// What type was picked the first activation + var/picked_random_type var/color_list = list("Pink" = "#FFC0CB", "Red" = "#FF0000", "Orange" = "#FFA500", @@ -247,10 +250,9 @@ var/name_list = list("Aries", "Leo", "Sagittarius", "Taurus", "Virgo", "Capricorn", "Gemini", "Libra", "Aquarius", "Cancer", "Scorpio", "Pisces") /obj/item/guardiancreator/attack_self(mob/living/user) - for(var/mob/living/simple_animal/hostile/guardian/G in GLOB.alive_mob_list) - if(G.summoner == user) - to_chat(user, "You already have a [mob_name]!") - return + if(has_guardian(user)) + to_chat(user, "You already have a [mob_name]!") + return if(user.mind && (user.mind.changeling || user.mind.vampire)) to_chat(user, "[ling_failure]") return @@ -264,12 +266,29 @@ used = FALSE return to_chat(user, "[use_message]") - var/list/mob/dead/observer/candidates = SSghost_spawns.poll_candidates("Do you want to play as the [mob_name] of [user.real_name]?", ROLE_GUARDIAN, FALSE, 10 SECONDS, source = src) + + var/guardian_type + if(random) + if(!picked_random_type) // Only pick the type once. No type fishing + picked_random_type = pick(possible_guardians) + guardian_type = picked_random_type + else + guardian_type = input(user, "Pick the type of [mob_name]", "[mob_name] Creation") as null|anything in possible_guardians + if(!guardian_type) + to_chat(user, "You decide against using the [name].") + used = FALSE + return + + var/list/mob/dead/observer/candidates = SSghost_spawns.poll_candidates("Do you want to play as the [mob_name] ([guardian_type]) of [user.real_name]?", ROLE_GUARDIAN, FALSE, 10 SECONDS, source = src, role_cleanname = "[mob_name] ([guardian_type])") var/mob/dead/observer/theghost = null if(candidates.len) theghost = pick(candidates) - spawn_guardian(user, theghost.key) + if(has_guardian(user)) + to_chat(user, "You already have a [mob_name]!") + used = FALSE + return + spawn_guardian(user, theghost.key, guardian_type) else to_chat(user, "[failure_message]") used = FALSE @@ -279,12 +298,14 @@ if(used) . += "[used_message]" -/obj/item/guardiancreator/proc/spawn_guardian(mob/living/user, key) - var/guardian_type = "Standard" - if(random) - guardian_type = pick(possible_guardians) - else - guardian_type = input(user, "Pick the type of [mob_name]", "[mob_name] Creation") as null|anything in possible_guardians +/obj/item/guardiancreator/proc/has_guardian(mob/living/user) + for(var/mob/living/simple_animal/hostile/guardian/G in GLOB.alive_mob_list) + if(G.summoner == user) + return TRUE + return FALSE + + +/obj/item/guardiancreator/proc/spawn_guardian(mob/living/user, key, guardian_type) var/pickedtype = /mob/living/simple_animal/hostile/guardian/punch switch(guardian_type) diff --git a/code/game/gamemodes/miniantags/guardian/types/bomb.dm b/code/game/gamemodes/miniantags/guardian/types/bomb.dm index bc2e19e6878..67b99d91968 100644 --- a/code/game/gamemodes/miniantags/guardian/types/bomb.dm +++ b/code/game/gamemodes/miniantags/guardian/types/bomb.dm @@ -25,6 +25,7 @@ if(istype(A, /obj/)) if(bomb_cooldown <= world.time && !stat) var/obj/item/guardian_bomb/B = new /obj/item/guardian_bomb(get_turf(A)) + add_attack_logs(src, A, "booby trapped (summoner: [summoner])") to_chat(src, "Success! Bomb on [A] armed!") if(summoner) to_chat(summoner, "Your guardian has primed [A] to explode!") @@ -41,7 +42,7 @@ var/mob/living/spawner -/obj/item/guardian_bomb/proc/disguise(var/obj/A) +/obj/item/guardian_bomb/proc/disguise(obj/A) A.forceMove(src) stored_obj = A opacity = A.opacity @@ -53,22 +54,25 @@ addtimer(CALLBACK(src, .proc/disable), 600) /obj/item/guardian_bomb/proc/disable() + add_attack_logs(null, stored_obj, "booby trap expired") stored_obj.forceMove(get_turf(src)) if(spawner) to_chat(spawner, "Failure! Your trap on [stored_obj] didn't catch anyone this time.") qdel(src) -/obj/item/guardian_bomb/proc/detonate(var/mob/living/user) +/obj/item/guardian_bomb/proc/detonate(mob/living/user) if(!istype(user)) return to_chat(user, "The [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) + add_attack_logs(user, stored_obj, "booby trap defused") to_chat(user, "You knew this because of your link with your guardian, so you smartly defuse the bomb.") stored_obj.forceMove(get_turf(loc)) qdel(src) return + add_attack_logs(user, stored_obj, "booby trap TRIGGERED (spawner: [spawner])") to_chat(spawner, "Success! Your trap on [src] caught [user]!") stored_obj.forceMove(get_turf(loc)) playsound(get_turf(src),'sound/effects/explosion2.ogg', 200, 1) @@ -78,9 +82,8 @@ /obj/item/guardian_bomb/attackby(obj/item/W, mob/living/user) detonate(user) -/obj/item/guardian_bomb/pickup(mob/living/user) +/obj/item/guardian_bomb/attack_hand(mob/user) detonate(user) - return FALSE // Disarm or blow up. No picking up /obj/item/guardian_bomb/examine(mob/user) . = stored_obj.examine(user) diff --git a/code/game/gamemodes/miniantags/guardian/types/lightning.dm b/code/game/gamemodes/miniantags/guardian/types/lightning.dm index e2ab6360ae5..e1874ea5c56 100644 --- a/code/game/gamemodes/miniantags/guardian/types/lightning.dm +++ b/code/game/gamemodes/miniantags/guardian/types/lightning.dm @@ -22,10 +22,9 @@ . = ..() if(!summoner) return - if(!(NO_SHOCK in summoner.mutations)) - summoner.mutations.Add(NO_SHOCK) + ADD_TRAIT(summoner, TRAIT_SHOCKIMMUNE, "guardian") -/mob/living/simple_animal/hostile/guardian/beam/electrocute_act(shock_damage, obj/source, siemens_coeff = 1, safety = FALSE, override = FALSE, tesla_shock = FALSE, illusion = FALSE, stun = TRUE) +/mob/living/simple_animal/hostile/guardian/beam/electrocute_act(shock_damage, source, siemens_coeff = 1, flags = NONE) return FALSE //You are lightning, you should not be hurt by such things. /mob/living/simple_animal/hostile/guardian/beam/AttackingTarget() @@ -118,6 +117,6 @@ . = 1 /mob/living/simple_animal/hostile/guardian/beam/death(gibbed) - if(summoner && (NO_SHOCK in summoner.mutations)) - summoner.mutations.Remove(NO_SHOCK) + if(summoner) + REMOVE_TRAIT(summoner, TRAIT_SHOCKIMMUNE, "guardian") return ..() diff --git a/code/game/gamemodes/miniantags/morph/morph.dm b/code/game/gamemodes/miniantags/morph/morph.dm index a122351a4bb..6e3627f2684 100644 --- a/code/game/gamemodes/miniantags/morph/morph.dm +++ b/code/game/gamemodes/miniantags/morph/morph.dm @@ -152,7 +152,7 @@ /mob/living/simple_animal/hostile/morph/LoseAggro() vision_range = initial(vision_range) -/mob/living/simple_animal/hostile/morph/AIShouldSleep(var/list/possible_targets) +/mob/living/simple_animal/hostile/morph/AIShouldSleep(list/possible_targets) . = ..() if(.) var/list/things = list() diff --git a/code/game/gamemodes/miniantags/morph/morph_event.dm b/code/game/gamemodes/miniantags/morph/morph_event.dm index 7fc9e134195..dd1a198f6f8 100644 --- a/code/game/gamemodes/miniantags/morph/morph_event.dm +++ b/code/game/gamemodes/miniantags/morph/morph_event.dm @@ -6,27 +6,29 @@ var/list/candidates = SSghost_spawns.poll_candidates("Do you want to play as a morph?", ROLE_MORPH, TRUE, source = /mob/living/simple_animal/hostile/morph) if(!candidates.len) key_of_morph = null - return kill() + kill() + return var/mob/C = pick(candidates) key_of_morph = C.key if(!key_of_morph) - return kill() + kill() + return var/datum/mind/player_mind = new /datum/mind(key_of_morph) player_mind.active = 1 if(!GLOB.xeno_spawn) - return kill() + kill() + return var/mob/living/simple_animal/hostile/morph/S = new /mob/living/simple_animal/hostile/morph(pick(GLOB.xeno_spawn)) player_mind.transfer_to(S) player_mind.assigned_role = SPECIAL_ROLE_MORPH player_mind.special_role = SPECIAL_ROLE_MORPH SSticker.mode.traitors |= player_mind to_chat(S, S.playstyle_string) - S << 'sound/magic/mutate.ogg' + 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.") - return 1 /datum/event/spawn_morph/start() get_morph() diff --git a/code/game/gamemodes/miniantags/revenant/revenant.dm b/code/game/gamemodes/miniantags/revenant/revenant.dm index 62739b030e1..fb46533b817 100644 --- a/code/game/gamemodes/miniantags/revenant/revenant.dm +++ b/code/game/gamemodes/miniantags/revenant/revenant.dm @@ -15,6 +15,7 @@ var/icon_reveal = "revenant_revealed" var/icon_stun = "revenant_stun" var/icon_drain = "revenant_draining" + mob_biotypes = MOB_SPIRIT incorporeal_move = 3 see_invisible = INVISIBILITY_REVENANT invisibility = INVISIBILITY_REVENANT @@ -87,7 +88,7 @@ return //most humans will now be either bones or harvesters, but we're still un-alive. -/mob/living/simple_animal/revenant/electrocute_act(shock_damage, obj/source, siemens_coeff = 1, safety = FALSE, override = FALSE, tesla_shock = FALSE, illusion = FALSE, stun = TRUE) +/mob/living/simple_animal/revenant/electrocute_act(shock_damage, source, siemens_coeff = 1, flags = NONE) return FALSE //You are a ghost, atmos and grill makes sparks, and you make your own shocks with lights. /mob/living/simple_animal/revenant/adjustHealth(amount, updating_health = TRUE) @@ -118,7 +119,7 @@ /mob/living/simple_animal/revenant/New() ..() - + flags_2 |= RAD_NO_CONTAMINATE_2 remove_from_all_data_huds() random_revenant_name() @@ -159,7 +160,7 @@ /mob/living/simple_animal/revenant/proc/giveObjectivesandGoals() mind.wipe_memory() - SEND_SOUND(src, 'sound/effects/ghost.ogg') + SEND_SOUND(src, sound('sound/effects/ghost.ogg')) to_chat(src, "
") to_chat(src, "You are a revenant.") to_chat(src, "Your formerly mundane spirit has been infused with alien energies and empowered into a revenant.") diff --git a/code/game/gamemodes/miniantags/revenant/revenant_abilities.dm b/code/game/gamemodes/miniantags/revenant/revenant_abilities.dm index 47e5e759c77..0c4bfc48f33 100644 --- a/code/game/gamemodes/miniantags/revenant/revenant_abilities.dm +++ b/code/game/gamemodes/miniantags/revenant/revenant_abilities.dm @@ -1,5 +1,5 @@ ///Harvest -/mob/living/simple_animal/revenant/ClickOn(var/atom/A, var/params) //Copypaste from ghost code - revenants can't interact with the world directly. +/mob/living/simple_animal/revenant/ClickOn(atom/A, params) //Copypaste from ghost code - revenants can't interact with the world directly. if(client.click_intercept) client.click_intercept.InterceptClickOn(src, params, A) @@ -217,7 +217,7 @@ if(M == user) return M.Beam(L,icon_state="purple_lightning",icon='icons/effects/effects.dmi',time=5) - M.electrocute_act(shock_damage, L, safety = TRUE) + M.electrocute_act(shock_damage, L, flags = SHOCK_NOGLOVES) do_sparks(4, 0, M) playsound(M, 'sound/machines/defib_zap.ogg', 50, 1, -1) @@ -250,7 +250,7 @@ human.adjustToxLoss(toxdamage) human.AdjustConfused(confusion, bound_lower = 0, bound_upper = maxconfusion) new/obj/effect/temp_visual/revenant(human.loc) - if(!istype(T, /turf/simulated/shuttle) && !istype(T, /turf/simulated/wall/rust) && !istype(T, /turf/simulated/wall/r_wall) && istype(T, /turf/simulated/wall) && prob(15)) + if(!istype(T, /turf/simulated/wall/rust) && !istype(T, /turf/simulated/wall/r_wall) && istype(T, /turf/simulated/wall) && prob(15)) new/obj/effect/temp_visual/revenant(T) T.ChangeTurf(/turf/simulated/wall/rust) if(!istype(T, /turf/simulated/wall/r_wall/rust) && istype(T, /turf/simulated/wall/r_wall) && prob(15)) diff --git a/code/game/gamemodes/miniantags/revenant/revenant_spawn_event.dm b/code/game/gamemodes/miniantags/revenant/revenant_spawn_event.dm index aa76f3620ac..40f6ac3398c 100644 --- a/code/game/gamemodes/miniantags/revenant/revenant_spawn_event.dm +++ b/code/game/gamemodes/miniantags/revenant/revenant_spawn_event.dm @@ -4,7 +4,7 @@ var/key_of_revenant -/datum/event/revenant/proc/get_revenant(var/end_if_fail = 0) +/datum/event/revenant/proc/get_revenant(end_if_fail = 0) var/deadMobs = 0 for(var/mob/M in GLOB.dead_mob_list) deadMobs++ @@ -16,12 +16,14 @@ var/list/candidates = SSghost_spawns.poll_candidates("Do you want to play as a revenant?", ROLE_REVENANT, TRUE, source = /mob/living/simple_animal/revenant) if(!candidates.len) key_of_revenant = null - return kill() + kill() + return var/mob/C = pick(candidates) key_of_revenant = C.key if(!key_of_revenant) - return kill() + kill() + return var/datum/mind/player_mind = new /datum/mind(key_of_revenant) player_mind.active = 1 @@ -42,7 +44,8 @@ if(!spawn_locs) //If we can't find either, just spawn the revenant at the player's location spawn_locs += get_turf(player_mind.current) if(!spawn_locs) //If we can't find THAT, then just retry - return kill() + kill() + return var/mob/living/simple_animal/revenant/revvie = new /mob/living/simple_animal/revenant/(pick(spawn_locs)) player_mind.transfer_to(revvie) player_mind.assigned_role = SPECIAL_ROLE_REVENANT @@ -50,8 +53,6 @@ SSticker.mode.traitors |= player_mind message_admins("[key_of_revenant] has been made into a revenant by an event.") log_game("[key_of_revenant] was spawned as a revenant by an event.") - return 1 - /datum/event/revenant/start() get_revenant() diff --git a/code/game/gamemodes/miniantags/sintouched/objectives.dm b/code/game/gamemodes/miniantags/sintouched/objectives.dm deleted file mode 100644 index 04e0e3266f0..00000000000 --- a/code/game/gamemodes/miniantags/sintouched/objectives.dm +++ /dev/null @@ -1,34 +0,0 @@ -/datum/objective/sintouched - completed = 1 - -/* NO ERP OBJECTIVE FOR YOU. -/datum/objective/sintouched/lust - dangerrating = 3 // it's not AS dangerous. - -/datum/objective/sintouched/lust/New() - var/mob/dead/D = pick(dead_mob_list) - if(prob(50) && D) - explanation_text = "You know that [D] has perished.... and you think [D] is kinda cute. Make sure everyone knows how HOT [D]'s lifeless body is." - else - explanation_text = "Go get married, then immediately cheat on your new spouse." */ - -/datum/objective/sintouched/gluttony - explanation_text = "Food is delicious, so delicious you can't let it be wasted on other people." - -/datum/objective/sintouched/greed - explanation_text = "You want MORE, more money, more wealth, more riches. Go get it, but don't hurt people for it." - -/datum/objective/sintouched/sloth - explanation_text = "You just get tired randomly. Go take a nap at a time that would inconvenience other people." - -/datum/objective/sintouched/wrath - explanation_text = "What have your coworkers ever done for you? Don't offer to help them in any matter, and refuse if asked." - -/datum/objective/sintouched/envy - explanation_text = "Why should you be stuck with your rank? Show everyone you can do other jobs too, and don't let anyone stop you, least of all because you have no training." - -/datum/objective/sintouched/pride - explanation_text = "You are the BEST thing on the station. Make sure everyone knows it." - -/datum/objective/sintouched/acedia - explanation_text = "Angels, devils, good, evil... who cares? Just ignore any hellish threats and do your job." diff --git a/code/game/gamemodes/miniantags/slaughter/bloodcrawl.dm b/code/game/gamemodes/miniantags/slaughter/bloodcrawl.dm index ed0a4a908ed..f5311010707 100644 --- a/code/game/gamemodes/miniantags/slaughter/bloodcrawl.dm +++ b/code/game/gamemodes/miniantags/slaughter/bloodcrawl.dm @@ -2,7 +2,7 @@ #define BLOODCRAWL 1 #define BLOODCRAWL_EAT 2 -/mob/living/proc/phaseout(var/obj/effect/decal/cleanable/B) +/mob/living/proc/phaseout(obj/effect/decal/cleanable/B) if(iscarbon(src)) var/mob/living/carbon/C = src @@ -105,7 +105,7 @@ icon = 'icons/effects/blood.dmi' flags = NODROP|ABSTRACT -/mob/living/proc/phasein(var/obj/effect/decal/cleanable/B) +/mob/living/proc/phasein(obj/effect/decal/cleanable/B) if(notransform) to_chat(src, "Finish eating first!") diff --git a/code/game/gamemodes/miniantags/slaughter/slaughter.dm b/code/game/gamemodes/miniantags/slaughter/slaughter.dm index 1563ea4eac9..b488e0a826c 100644 --- a/code/game/gamemodes/miniantags/slaughter/slaughter.dm +++ b/code/game/gamemodes/miniantags/slaughter/slaughter.dm @@ -15,6 +15,7 @@ icon_living = "daemon" speed = 1 a_intent = INTENT_HARM + mob_biotypes = MOB_ORGANIC | MOB_HUMANOID stop_automated_movement = 1 status_flags = CANPUSH attack_sound = 'sound/misc/demon_attack1.ogg' @@ -79,7 +80,7 @@ if(mind) to_chat(src, src.playstyle_string) to_chat(src, "You are not currently in the same plane of existence as the station. Use the blood crawl action at a blood pool to manifest.") - src << 'sound/misc/demon_dies.ogg' + SEND_SOUND(src, sound('sound/misc/demon_dies.ogg')) if(!(vialspawned)) var/datum/objective/slaughter/objective = new var/datum/objective/demonFluff/fluffObjective = new @@ -165,13 +166,13 @@ if(!demon_candidates.len) visible_message("[src] disappears in a flash of red light!") qdel(src) - return 0 + return var/mob/M = pick(demon_candidates) var/mob/living/simple_animal/slaughter/cult/S = src if(!M || !M.client) visible_message("[src] disappears in a flash of red light!") qdel(src) - return 0 + return var/client/C = M.client S.key = C.key @@ -302,6 +303,11 @@ health = 175 melee_damage_lower = 25 melee_damage_upper = 25 + playstyle_string = "You are the Laughter Demon, an adorable creature from another existence. You have a single desire: to hug and tickle. \ + You may use the blood crawl icon when on blood pools to travel through them, appearing and dissapearing from the station at will. \ + Pulling a dead or critical mob while you enter a pool will pull them in with you, allowing you to hug them. \ + You move quickly upon leaving a pool of blood, but the material world will soon sap your strength and leave you sluggish. \ + (You should be attacking people on harm intent, and not nuzzling them.)" attack_sound = 'sound/items/bikehorn.ogg' feast_sound = 'sound/spookoween/scary_horn2.ogg' diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm index 7c2071f8e58..11b49f225bf 100644 --- a/code/game/gamemodes/nuclear/nuclear.dm +++ b/code/game/gamemodes/nuclear/nuclear.dm @@ -186,7 +186,7 @@ M.regenerate_icons() M.update_body() -/datum/game_mode/proc/prepare_syndicate_leader(var/datum/mind/synd_mind, var/nuke_code) +/datum/game_mode/proc/prepare_syndicate_leader(datum/mind/synd_mind, nuke_code) 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.") @@ -219,7 +219,7 @@ else nuke_code = "code will be provided later" -/datum/game_mode/proc/update_syndicate_id(var/datum/mind/synd_mind, is_leader = FALSE) +/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) if(LAZYLEN(found_ids)) @@ -231,14 +231,14 @@ else message_admins("Warning: Operative [key_name_admin(synd_mind.current)] spawned without an ID card!") -/datum/game_mode/proc/forge_syndicate_objectives(var/datum/mind/syndicate) +/datum/game_mode/proc/forge_syndicate_objectives(datum/mind/syndicate) var/datum/objective/nuclear/syndobj = new syndobj.owner = syndicate syndicate.objectives += syndobj -/datum/game_mode/proc/greet_syndicate(var/datum/mind/syndicate, var/you_are=1) - SEND_SOUND(syndicate.current, 'sound/ambience/antag/ops.ogg') +/datum/game_mode/proc/greet_syndicate(datum/mind/syndicate, you_are=1) + SEND_SOUND(syndicate.current, sound('sound/ambience/antag/ops.ogg')) if(you_are) to_chat(syndicate.current, "You are a [syndicate_name()] agent!") var/obj_count = 1 @@ -286,13 +286,13 @@ switch(race) if("Vox" || "Vox Armalis") synd_mob.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/syndicate(synd_mob), slot_wear_mask) - synd_mob.equip_to_slot_or_del(new /obj/item/tank/emergency_oxygen/vox(synd_mob), slot_l_hand) + synd_mob.equip_to_slot_or_del(new /obj/item/tank/internals/emergency_oxygen/double/vox(synd_mob), slot_l_hand) synd_mob.internal = synd_mob.l_hand synd_mob.update_action_buttons_icon() if("Plasmaman") synd_mob.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/syndicate(synd_mob), slot_wear_mask) - synd_mob.equip_or_collect(new /obj/item/tank/plasma/plasmaman(synd_mob), slot_s_store) + synd_mob.equip_or_collect(new /obj/item/tank/internals/plasmaman(synd_mob), slot_s_store) synd_mob.equip_or_collect(new /obj/item/extinguisher_refill(synd_mob), slot_in_backpack) synd_mob.equip_or_collect(new /obj/item/extinguisher_refill(synd_mob), slot_in_backpack) synd_mob.internal = synd_mob.get_item_by_slot(slot_s_store) @@ -418,7 +418,7 @@ to_chat(world, text) return 1 -/proc/nukelastname(var/mob/M as mob) //--All praise goes to NEO|Phyte, all blame goes to DH, and it was Cindi-Kate's idea. Also praise Urist for copypasta ho. +/proc/nukelastname(mob/M as mob) //--All praise goes to NEO|Phyte, all blame goes to DH, and it was Cindi-Kate's idea. Also praise Urist for copypasta ho. var/randomname = pick(GLOB.last_names) var/newname = sanitize(copytext(input(M,"You are the nuke operative [pick("Czar", "Boss", "Commander", "Chief", "Kingpin", "Director", "Overlord")]. Please choose a last name for your family.", "Name change",randomname),1,MAX_NAME_LEN)) diff --git a/code/game/gamemodes/nuclear/nuclear_challenge.dm b/code/game/gamemodes/nuclear/nuclear_challenge.dm index 48116911640..5e11a78888d 100644 --- a/code/game/gamemodes/nuclear/nuclear_challenge.dm +++ b/code/game/gamemodes/nuclear/nuclear_challenge.dm @@ -48,7 +48,7 @@ if(!check_allowed(user) || !war_declaration) return - GLOB.event_announcement.Announce(war_declaration, "Declaration of War", 'sound/effects/siren.ogg') + GLOB.event_announcement.Announce(war_declaration, "Declaration of War", 'sound/effects/siren.ogg', msg_sanitized = TRUE) to_chat(user, "You've attracted the attention of powerful forces within the syndicate. A bonus bundle of telecrystals has been granted to your team. Great things await you if you complete the mission.") to_chat(user, "Your bonus telecrystals have been split between your team's uplinks.") diff --git a/code/game/gamemodes/nuclear/nuclearbomb.dm b/code/game/gamemodes/nuclear/nuclearbomb.dm index 36159c28239..fa0ba2fbf0f 100644 --- a/code/game/gamemodes/nuclear/nuclearbomb.dm +++ b/code/game/gamemodes/nuclear/nuclearbomb.dm @@ -14,7 +14,8 @@ GLOBAL_VAR(bomb_set) icon_state = "nuclearbomb0" density = 1 resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF - var/extended = FALSE + anchored = TRUE + var/extended = TRUE var/lighthack = FALSE var/timeleft = 120 var/timing = FALSE @@ -34,6 +35,10 @@ GLOBAL_VAR(bomb_set) /obj/machinery/nuclearbomb/syndicate is_syndicate = TRUE +/obj/machinery/nuclearbomb/undeployed + extended = FALSE + anchored = FALSE + /obj/machinery/nuclearbomb/New() ..() r_code = rand(10000, 99999.0) // Creates a random code upon object spawn. @@ -68,6 +73,9 @@ GLOBAL_VAR(bomb_set) else to_chat(user, "You need to deploy [src] first.") return + else if(istype(O, /obj/item/disk/plantgene)) + to_chat(user, "You try to plant the disk, but despite rooting around, it won't fit! After you branch out to read the instructions, you find out where the problem stems from. You've been bamboo-zled, this isn't a nuclear disk at all!") + return return ..() /obj/machinery/nuclearbomb/crowbar_act(mob/user, obj/item/I) @@ -207,7 +215,7 @@ GLOBAL_VAR(bomb_set) data["codemsg"] = "-----" return data -/obj/machinery/nuclearbomb/proc/is_auth(var/mob/user) +/obj/machinery/nuclearbomb/proc/is_auth(mob/user) if(auth) return TRUE else if(user.can_admin_interact()) @@ -266,11 +274,6 @@ GLOBAL_VAR(bomb_set) else code = "ERROR" return - - if(!yes_code) // All requests below here require both NAD inserted AND code correct - return - - switch(action) if("toggle_anchor") if(removal_stage == NUKE_MOBILE) anchored = FALSE @@ -285,6 +288,11 @@ GLOBAL_VAR(bomb_set) else visible_message("The anchoring bolts slide back into the depths of [src].") return + + if(!yes_code) // All requests below here require both NAD inserted AND code correct + return + + switch(action) if("set_time") var/time = input(usr, "Detonation time (seconds, min 120, max 600)", "Input Time", 120) as num|null if(time) @@ -327,9 +335,9 @@ GLOBAL_VAR(bomb_set) return qdel(src) -/obj/machinery/nuclearbomb/tesla_act(power, explosive) - ..() - if(explosive) +/obj/machinery/nuclearbomb/zap_act(power, zap_flags) + . = ..() + if(zap_flags & ZAP_MACHINE_EXPLOSIVE) qdel(src)//like the singulo, tesla deletes it. stops it from exploding over and over #define NUKERANGE 80 @@ -379,7 +387,7 @@ GLOBAL_VAR(bomb_set) //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 - world.Reboot("Station destroyed by Nuclear Device.", "nuke - unhandled ending") + SSticker.reboot_helper("Station destroyed by Nuclear Device.", "nuke - unhandled ending") return return @@ -422,7 +430,7 @@ GLOBAL_VAR(bomb_set) to_chat(holder, "You can't help but feel that you just lost something back there...") qdel(src) - //station disk is allowed on z1, escape shuttle/pods, CC, and syndicate shuttles/base, reset otherwise + //station disk is allowed on the station level, escape shuttle/pods, CC, and syndicate shuttles/base, reset otherwise /obj/item/disk/nuclear/proc/check_disk_loc() var/turf/T = get_turf(src) var/area/A = get_area(src) diff --git a/code/game/gamemodes/nuclear/pinpointer.dm b/code/game/gamemodes/nuclear/pinpointer.dm index 3c970c8653e..cfbcf7f69ed 100644 --- a/code/game/gamemodes/nuclear/pinpointer.dm +++ b/code/game/gamemodes/nuclear/pinpointer.dm @@ -198,11 +198,11 @@ to_chat(usr, "You set the pinpointer to locate [locationx],[locationy]") - return attack_self() + return attack_self(usr) if("Disk Recovery") setting = SETTING_DISK - return attack_self() + return attack_self(usr) if("Other Signature") setting = SETTING_OBJECT @@ -240,7 +240,7 @@ target = C break - return attack_self() + return attack_self(usr) /////////////////////// //nuke op pinpointers// diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index dc7fd5e6239..b7ff2d7992e 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -60,7 +60,7 @@ GLOBAL_LIST_INIT(potential_theft_objectives, (subtypesof(/datum/theft_objective) /datum/objective/proc/on_target_cryo() if(owner?.current) to_chat(owner.current, "
You get the feeling your target is no longer within reach. Time for Plan [pick("A","B","C","D","X","Y","Z")]. Objectives updated!") - SEND_SOUND(owner.current, 'sound/ambience/alarm4.ogg') + SEND_SOUND(owner.current, sound('sound/ambience/alarm4.ogg')) target = null INVOKE_ASYNC(src, .proc/post_target_cryo) @@ -243,7 +243,7 @@ GLOBAL_LIST_INIT(potential_theft_objectives, (subtypesof(/datum/theft_objective) if(issilicon(player)) continue if(get_area(player) == A) - if(player.real_name != owner.current.real_name && !istype(get_turf(player.mind.current), /turf/simulated/shuttle/floor4)) + if(player.real_name != owner.current.real_name && !istype(get_turf(player.mind.current), /turf/simulated/floor/mineral/plastitanium/red/brig)) return 0 for(var/mob/living/player in GLOB.player_list) //Make sure at least one of you is onboard @@ -252,7 +252,7 @@ GLOBAL_LIST_INIT(potential_theft_objectives, (subtypesof(/datum/theft_objective) if(issilicon(player)) continue if(get_area(player) == A) - if(player.real_name == owner.current.real_name && !istype(get_turf(player.mind.current), /turf/simulated/shuttle/floor4)) + if(player.real_name == owner.current.real_name && !istype(get_turf(player.mind.current), /turf/simulated/floor/mineral/plastitanium/red/brig)) return 1 return 0 @@ -262,11 +262,13 @@ GLOBAL_LIST_INIT(potential_theft_objectives, (subtypesof(/datum/theft_objective) /datum/objective/block/check_completion() if(!istype(owner.current, /mob/living/silicon)) - return 0 + return FALSE + if(SSticker.mode.station_was_nuked) + return TRUE if(SSshuttle.emergency.mode < SHUTTLE_ENDGAME) - return 0 + return FALSE if(!owner.current) - return 0 + return FALSE var/area/A = SSshuttle.emergency.areaInstance @@ -276,9 +278,9 @@ GLOBAL_LIST_INIT(potential_theft_objectives, (subtypesof(/datum/theft_objective) if(player.mind && player.stat != DEAD) if(get_area(player) == A) - return 0 // If there are any other organic mobs on the shuttle, you failed the objective. + return FALSE // If there are any other organic mobs on the shuttle, you failed the objective. - return 1 + return TRUE /datum/objective/escape explanation_text = "Escape on the shuttle or an escape pod alive and free." @@ -300,7 +302,7 @@ GLOBAL_LIST_INIT(potential_theft_objectives, (subtypesof(/datum/theft_objective) if(!location) return 0 - if(istype(location, /turf/simulated/shuttle/floor4) || istype(location, /turf/simulated/floor/mineral/plastitanium/red/brig)) // Fails traitors if they are in the shuttle brig -- Polymorph + if(istype(location, /turf/simulated/floor/mineral/plastitanium/red/brig)) // Fails traitors if they are in the shuttle brig -- Polymorph return 0 if(location.onCentcom() || location.onSyndieBase()) @@ -317,7 +319,7 @@ GLOBAL_LIST_INIT(potential_theft_objectives, (subtypesof(/datum/theft_objective) for(var/datum/mind/possible_target in SSticker.minds) if(possible_target != owner && ishuman(possible_target.current) && (possible_target.current.stat != DEAD) && possible_target.current.client) var/mob/living/carbon/human/H = possible_target.current - if(!(NO_DNA in H.dna.species.species_traits)) + if(!HAS_TRAIT(H, TRAIT_GENELESS)) possible_targets += possible_target if(possible_targets.len > 0) target = pick(possible_targets) @@ -371,36 +373,27 @@ GLOBAL_LIST_INIT(potential_theft_objectives, (subtypesof(/datum/theft_objective) var/theft_area /datum/objective/steal/proc/get_location() - if(steal_target.location_override) - return steal_target.location_override - var/list/obj/item/steal_candidates = get_all_of_type(steal_target.typepath, subtypes = TRUE) - for(var/obj/item/candidate in steal_candidates) - if(!is_admin_level(candidate.loc.z)) - theft_area = get_area(candidate.loc) - return "[theft_area]" - return "an unknown area" + return steal_target.location_override || "an unknown area" /datum/objective/steal/find_target() - var/loop=50 - while(!steal_target && loop > 0) - loop-- - var/thefttype = pick(GLOB.potential_theft_objectives) + var/potential = GLOB.potential_theft_objectives.Copy() + while(!steal_target && length(potential)) + var/thefttype = pick_n_take(potential) var/datum/theft_objective/O = new thefttype if(owner.assigned_role in O.protected_jobs) continue if(O in owner.targets) continue - if(O.flags & 2) + if(O.flags & 2) // THEFT_FLAG_UNIQUE continue - steal_target = O + steal_target = O explanation_text = "Steal [steal_target]. One was last seen in [get_location()]. " - if(islist(O.protected_jobs) && O.protected_jobs.len) - explanation_text += "It may also be in the possession of the [jointext(O.protected_jobs, ", ")]." + if(length(O.protected_jobs)) + explanation_text += "It may also be in the possession of the [english_list(O.protected_jobs, and_text = " or ")]." return explanation_text = "Free Objective." - /datum/objective/steal/proc/select_target() var/list/possible_items_all = GLOB.potential_theft_objectives+"custom" var/new_target = input("Select target:", "Objective target", null) as null|anything in possible_items_all @@ -440,7 +433,7 @@ GLOBAL_LIST_INIT(potential_theft_objectives, (subtypesof(/datum/theft_objective) /datum/objective/steal/exchange martyr_compatible = 0 -/datum/objective/steal/exchange/proc/set_faction(var/faction,var/otheragent) +/datum/objective/steal/exchange/proc/set_faction(faction, otheragent) target = otheragent var/datum/theft_objective/unique/targetinfo if(faction == "red") @@ -451,7 +444,7 @@ GLOBAL_LIST_INIT(potential_theft_objectives, (subtypesof(/datum/theft_objective) steal_target = targetinfo /datum/objective/steal/exchange/backstab -/datum/objective/steal/exchange/backstab/set_faction(var/faction) +/datum/objective/steal/exchange/backstab/set_faction(faction) var/datum/theft_objective/unique/targetinfo if(faction == "red") targetinfo = new /datum/theft_objective/unique/docs_red @@ -486,7 +479,7 @@ GLOBAL_LIST_INIT(potential_theft_objectives, (subtypesof(/datum/theft_objective) /datum/objective/absorb -/datum/objective/absorb/proc/gen_amount_goal(var/lowbound = 4, var/highbound = 6) +/datum/objective/absorb/proc/gen_amount_goal(lowbound = 4, highbound = 6) target_amount = rand (lowbound,highbound) if(SSticker) var/n_p = 1 //autowin @@ -498,7 +491,7 @@ GLOBAL_LIST_INIT(potential_theft_objectives, (subtypesof(/datum/theft_objective) n_p++ else if(SSticker.current_state == GAME_STATE_PLAYING) for(var/mob/living/carbon/human/P in GLOB.player_list) - if(NO_DNA in P.dna.species.species_traits) + if(HAS_TRAIT(P, TRAIT_GENELESS)) continue if(P.client && !(P.mind in SSticker.mode.changelings) && P.mind!=owner) n_p++ diff --git a/code/game/gamemodes/revolution/revolution.dm b/code/game/gamemodes/revolution/revolution.dm index 1f9e3e4359e..c8a9d39e555 100644 --- a/code/game/gamemodes/revolution/revolution.dm +++ b/code/game/gamemodes/revolution/revolution.dm @@ -121,7 +121,8 @@ if(mob.mind) if(mob.mind.assigned_role == "Clown") to_chat(mob, "Your training has allowed you to overcome your clownish nature, allowing you to wield weapons without harming yourself.") - mob.mutations.Remove(CLUMSY) + mob.dna.SetSEState(GLOB.clumsyblock, FALSE) + singlemutcheck(mob, GLOB.clumsyblock, MUTCHK_FORCED) var/datum/action/innate/toggle_clumsy/A = new A.Grant(mob) diff --git a/code/game/gamemodes/setupgame.dm b/code/game/gamemodes/setupgame.dm index f6ba6504381..9ce71866e88 100644 --- a/code/game/gamemodes/setupgame.dm +++ b/code/game/gamemodes/setupgame.dm @@ -1,4 +1,4 @@ -/proc/getAssignedBlock(var/name,var/list/blocksLeft, var/activity_bounds=DNA_DEFAULT_BOUNDS, var/good=0) +/proc/getAssignedBlock(name, list/blocksLeft, activity_bounds=DNA_DEFAULT_BOUNDS, good=0) if(blocksLeft.len==0) warning("[name]: No more blocks left to assign!") return 0 @@ -107,14 +107,14 @@ // Monkeyblock is always last. GLOB.monkeyblock = DNA_SE_LENGTH - // And the genes that actually do the work. (domutcheck improvements) + // And the mutations that actually do the work. (domutcheck improvements) var/list/blocks_assigned[DNA_SE_LENGTH] - for(var/gene_type in typesof(/datum/dna/gene)) - var/datum/dna/gene/G = new gene_type + for(var/mutation_type in typesof(/datum/mutation)) + var/datum/mutation/G = new mutation_type 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_genes.Add(G) + GLOB.dna_mutations.Add(G) var/list/assignedToBlock[0] if(blocks_assigned[G.block]) assignedToBlock=blocks_assigned[G.block] @@ -122,14 +122,14 @@ blocks_assigned[G.block]=assignedToBlock //testing("DNA2: Gene [G.name] assigned to block [G.block].") - // I WILL HAVE A LIST OF GENES THAT MATCHES THE RANDOMIZED BLOCKS GODDAMNIT! - for(var/block=1;block<=DNA_SE_LENGTH;block++) + // 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/dna/gene/gene in GLOB.dna_genes) - if(gene.name == name || gene.block == block) - if(gene.block in GLOB.assigned_gene_blocks) - warning("DNA2: Gene [gene.name] trying to add to already assigned gene block list (used by [english_list(GLOB.assigned_gene_blocks[block])])") - GLOB.assigned_gene_blocks[block] = gene + for(var/datum/mutation/mutation in GLOB.dna_mutations) + 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])])") + GLOB.assigned_mutation_blocks[block] = mutation //testing("DNA2: [numsToAssign.len] blocks are unused: [english_list(numsToAssign)]") diff --git a/code/game/gamemodes/shadowling/ascendant_shadowling.dm b/code/game/gamemodes/shadowling/ascendant_shadowling.dm index 9eeadeaba0f..e4f6f7de4ab 100644 --- a/code/game/gamemodes/shadowling/ascendant_shadowling.dm +++ b/code/game/gamemodes/shadowling/ascendant_shadowling.dm @@ -38,7 +38,7 @@ icon_state = "NurnKal" icon_living = "NurnKal" -/mob/living/simple_animal/ascendant_shadowling/Process_Spacemove(var/movement_dir = 0) +/mob/living/simple_animal/ascendant_shadowling/Process_Spacemove(movement_dir = 0) return 1 //copypasta from carp code /mob/living/simple_animal/ascendant_shadowling/ex_act(severity) @@ -47,7 +47,7 @@ /mob/living/simple_animal/ascendant_shadowling/singularity_act() return 0 //Well hi, fellow god! How are you today? -/mob/living/simple_animal/ascendant_shadowling/proc/announce(var/text, var/size = 4, var/new_sound = null) +/mob/living/simple_animal/ascendant_shadowling/proc/announce(text, size = 4, new_sound = null) var/message = "\"[text]\"" for(var/mob/M in GLOB.player_list) if(!isnewplayer(M) && M.client) diff --git a/code/game/gamemodes/shadowling/shadowling.dm b/code/game/gamemodes/shadowling/shadowling.dm index 8eb5c2af838..a017b6d9af0 100644 --- a/code/game/gamemodes/shadowling/shadowling.dm +++ b/code/game/gamemodes/shadowling/shadowling.dm @@ -55,15 +55,15 @@ Made by Xhuis var/victory_warning_announced = FALSE var/thrall_ratio = 1 -/proc/is_thrall(var/mob/living/M) +/proc/is_thrall(mob/living/M) return istype(M) && M.mind && SSticker && SSticker.mode && (M.mind in SSticker.mode.shadowling_thralls) -/proc/is_shadow_or_thrall(var/mob/living/M) +/proc/is_shadow_or_thrall(mob/living/M) return istype(M) && M.mind && SSticker && SSticker.mode && ((M.mind in SSticker.mode.shadowling_thralls) || (M.mind in SSticker.mode.shadows)) -/proc/is_shadow(var/mob/living/M) +/proc/is_shadow(mob/living/M) return istype(M) && M.mind && SSticker && SSticker.mode && (M.mind in SSticker.mode.shadows) @@ -122,7 +122,7 @@ Made by Xhuis //give_shadowling_abilities(shadow) ..() -/datum/game_mode/proc/greet_shadow(var/datum/mind/shadow) +/datum/game_mode/proc/greet_shadow(datum/mind/shadow) 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.") @@ -130,7 +130,7 @@ Made by Xhuis -/datum/game_mode/proc/process_shadow_objectives(var/datum/mind/shadow_mind) +/datum/game_mode/proc/process_shadow_objectives(datum/mind/shadow_mind) var/objective = "enthrall" //may be devour later, but for now it seems murderbone-y if(objective == "enthrall") @@ -140,7 +140,7 @@ Made by Xhuis to_chat(shadow_mind.current, "Objective #1: [objective_explanation]
") -/datum/game_mode/proc/finalize_shadowling(var/datum/mind/shadow_mind) +/datum/game_mode/proc/finalize_shadowling(datum/mind/shadow_mind) var/mob/living/carbon/human/S = shadow_mind.current shadow_mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/shadowling_hatch(null)) spawn(0) @@ -148,7 +148,8 @@ Made by Xhuis update_shadow_icons_added(shadow_mind) if(shadow_mind.assigned_role == "Clown") to_chat(S, "Your alien nature has allowed you to overcome your clownishness.") - S.mutations.Remove(CLUMSY) + S.dna.SetSEState(GLOB.clumsyblock, FALSE) + singlemutcheck(S, GLOB.clumsyblock, MUTCHK_FORCED) /datum/game_mode/proc/add_thrall(datum/mind/new_thrall_mind) if(!istype(new_thrall_mind)) @@ -161,7 +162,7 @@ Made by Xhuis new_thrall_mind.current.create_log(CONVERSION_LOG, "Became a thrall") new_thrall_mind.current.add_language("Shadowling Hivemind") new_thrall_mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/lesser_shadow_walk(null)) - new_thrall_mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/shadow_vision/thrall(null)) + new_thrall_mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/shadow_vision(null)) to_chat(new_thrall_mind.current, "You see the truth. Reality has been torn away and you realize what a fool you've been.") to_chat(new_thrall_mind.current, "The shadowlings are your masters. Serve them above all else and ensure they complete their goals.") to_chat(new_thrall_mind.current, "You may not harm other thralls or the shadowlings. However, you do not need to obey other thralls.") @@ -175,7 +176,7 @@ Made by Xhuis GLOB.command_announcement.Announce("Large concentration of psychic bluespace energy detected by long-ranged scanners. Shadowling ascension event imminent. Prevent it at all costs!", "Central Command Higher Dimensional Affairs", 'sound/AI/spanomalies.ogg') return 1 -/datum/game_mode/proc/remove_thrall(datum/mind/thrall_mind, var/kill = 0) +/datum/game_mode/proc/remove_thrall(datum/mind/thrall_mind, kill = 0) if(!istype(thrall_mind) || !(thrall_mind in shadowling_thralls) || !isliving(thrall_mind.current)) return 0 //If there is no mind, the mind isn't a thrall, or the mind's mob isn't alive, return shadowling_thralls.Remove(thrall_mind) @@ -225,7 +226,7 @@ Made by Xhuis var/shadow_nag_messages = list("You can barely hold yourself in this lesser form!", "The urge to become something greater is overwhelming!", "You feel a burning passion to hatch free of this shell and assume godhood!") H.take_overall_damage(0, 3) to_chat(H, "[pick(shadow_nag_messages)]") - H << 'sound/weapons/sear.ogg' + SEND_SOUND(H, sound('sound/weapons/sear.ogg')) if(shadows_alive) return ..() diff --git a/code/game/gamemodes/shadowling/shadowling_abilities.dm b/code/game/gamemodes/shadowling/shadowling_abilities.dm index a3aa9919eb2..4d93a601e9d 100644 --- a/code/game/gamemodes/shadowling/shadowling_abilities.dm +++ b/code/game/gamemodes/shadowling/shadowling_abilities.dm @@ -1,6 +1,6 @@ #define EMPOWERED_THRALL_LIMIT 5 -/obj/effect/proc_holder/spell/proc/shadowling_check(var/mob/living/carbon/human/H) +/obj/effect/proc_holder/spell/proc/shadowling_check(mob/living/carbon/human/H) if(!H || !istype(H)) return if(H.incorporeal_move == 1) @@ -80,10 +80,12 @@ var/blacklisted_lights = list(/obj/item/flashlight/flare, /obj/item/flashlight/slime) action_icon_state = "veil" -/obj/effect/proc_holder/spell/aoe_turf/veil/cast(list/targets, mob/user = usr) +/obj/effect/proc_holder/spell/aoe_turf/veil/cast_check(charge_check = TRUE, start_recharge = TRUE, mob/user = usr) if(!shadowling_check(user)) - charge_counter = charge_max - return + return FALSE + return ..() + +/obj/effect/proc_holder/spell/aoe_turf/veil/cast(list/targets, mob/user = usr) to_chat(user, "You silently disable all nearby lights.") for(var/obj/structure/glowshroom/G in orange(2, user)) //Why the fuck was this in the loop below? G.visible_message("[G] withers away!") @@ -103,10 +105,12 @@ include_user = 1 action_icon_state = "shadow_walk" -/obj/effect/proc_holder/spell/targeted/shadow_walk/cast(list/targets, mob/user = usr) +/obj/effect/proc_holder/spell/targeted/shadow_walk/cast_check(charge_check = TRUE, start_recharge = TRUE, mob/user = usr) if(!shadowling_check(user)) - charge_counter = charge_max - return + return FALSE + return ..() + +/obj/effect/proc_holder/spell/targeted/shadow_walk/cast(list/targets, mob/user = usr) for(var/mob/living/target in targets) playsound(user.loc, 'sound/effects/bamf.ogg', 50, 1) target.visible_message("[target] vanishes in a puff of black mist!", "You enter the space between worlds as a passageway.") @@ -146,9 +150,9 @@ /obj/effect/proc_holder/spell/targeted/shadow_vision - name = "Shadowling Darksight" - desc = "Gives you night and thermal vision." - panel = "Shadowling Abilities" + name = "Thrall Darksight" + desc = "Gives you night vision." + panel = "Thrall Abilities" charge_max = 0 range = -1 include_user = 1 @@ -167,11 +171,6 @@ to_chat(H, "You return your vision to normal.") H.set_sight(null) -/obj/effect/proc_holder/spell/targeted/shadow_vision/thrall - desc = "Thrall Darksight" - desc = "Gives you night vision." - panel = "Thrall Abilities" - /obj/effect/proc_holder/spell/aoe_turf/flashfreeze name = "Icy Veins" desc = "Instantly freezes the blood of nearby people, stunning them and causing burn damage." @@ -181,10 +180,12 @@ clothes_req = 0 action_icon_state = "icy_veins" -/obj/effect/proc_holder/spell/aoe_turf/flashfreeze/cast(list/targets, mob/user = usr) +/obj/effect/proc_holder/spell/aoe_turf/flashfreeze/cast_check(charge_check = TRUE, start_recharge = TRUE, mob/living/user = usr) if(!shadowling_check(user)) - charge_counter = charge_max - return + return FALSE + return ..() + +/obj/effect/proc_holder/spell/aoe_turf/flashfreeze/cast(list/targets, mob/user = usr) to_chat(user, "You freeze the nearby air.") playsound(user.loc, 'sound/effects/ghost2.ogg', 50, 1) @@ -220,8 +221,11 @@ selection_deactivated_message = "Your mind relaxes." allowed_type = /mob/living/carbon/human -/obj/effect/proc_holder/spell/targeted/click/enthrall/can_cast(mob/user = usr, charge_check = TRUE, show_message = FALSE) - if(enthralling || !shadowling_check(user)) +/obj/effect/proc_holder/spell/targeted/click/enthrall/cast_check(charge_check = TRUE, start_recharge = TRUE, mob/living/user = usr) + if(enthralling) + to_chat(user, "You're already enthralling someone!") + return FALSE + if(!shadowling_check(user)) return FALSE return ..() @@ -316,10 +320,12 @@ var/reviveThrallAcquired action_icon_state = "collective_mind" -/obj/effect/proc_holder/spell/targeted/collective_mind/cast(list/targets, mob/user = usr) +/obj/effect/proc_holder/spell/targeted/collective_mind/cast_check(charge_check = TRUE, start_recharge = TRUE, mob/living/user = usr) if(!shadowling_check(user)) - charge_counter = charge_max - return + return FALSE + return ..() + +/obj/effect/proc_holder/spell/targeted/collective_mind/cast(list/targets, mob/user = usr) for(var/mob/living/target in targets) var/thralls = 0 var/victory_threshold = SSticker.mode.required_thralls @@ -391,10 +397,12 @@ include_user = 1 action_icon_state = "black_smoke" -/obj/effect/proc_holder/spell/targeted/blindness_smoke/cast(list/targets, mob/user = usr) //Extremely hacky +/obj/effect/proc_holder/spell/targeted/blindness_smoke/cast_check(charge_check = TRUE, start_recharge = TRUE, mob/living/user = usr) if(!shadowling_check(user)) - charge_counter = charge_max - return + return FALSE + return ..() + +/obj/effect/proc_holder/spell/targeted/blindness_smoke/cast(list/targets, mob/user = usr) //Extremely hacky for(var/mob/living/target in targets) target.visible_message("[target] suddenly bends over and coughs out a cloud of black smoke, which begins to spread rapidly!") to_chat(target, "You regurgitate a vast cloud of blinding smoke.") @@ -440,10 +448,12 @@ clothes_req = 0 action_icon_state = "screech" -/obj/effect/proc_holder/spell/aoe_turf/unearthly_screech/cast(list/targets, mob/user = usr) +/obj/effect/proc_holder/spell/aoe_turf/unearthly_screech/cast_check(charge_check = TRUE, start_recharge = TRUE, mob/living/user = usr) if(!shadowling_check(user)) - charge_counter = charge_max - return + return FALSE + return ..() + +/obj/effect/proc_holder/spell/aoe_turf/unearthly_screech/cast(list/targets, mob/user = usr) user.audible_message("[user] lets out a horrible scream!") playsound(user.loc, 'sound/effects/screech.ogg', 100, 1) @@ -462,7 +472,7 @@ else if(issilicon(target)) var/mob/living/silicon/S = target to_chat(S, "ERROR $!(@ ERROR )#^! SENSORY OVERLOAD \[$(!@#") - S << 'sound/misc/interference.ogg' + SEND_SOUND(S, sound('sound/misc/interference.ogg')) playsound(S, 'sound/machines/warning-buzzer.ogg', 50, 1) do_sparks(5, 1, S) S.Weaken(6) @@ -477,11 +487,12 @@ clothes_req = FALSE action_icon_state = "null_charge" -/obj/effect/proc_holder/spell/aoe_turf/null_charge/cast(mob/user = usr) +/obj/effect/proc_holder/spell/aoe_turf/null_charge/cast_check(charge_check = TRUE, start_recharge = TRUE, mob/living/user = usr) if(!shadowling_check(user)) - charge_counter = charge_max - return + return FALSE + return ..() +/obj/effect/proc_holder/spell/aoe_turf/null_charge/cast(mob/user = usr) var/list/local_objs = view(1, user) var/obj/machinery/power/apc/target_apc for(var/object in local_objs) @@ -537,7 +548,7 @@ selection_deactivated_message = "Your mind relaxes." allowed_type = /mob/living/carbon/human -/obj/effect/proc_holder/spell/targeted/click/reviveThrall/can_cast(mob/user = usr) +/obj/effect/proc_holder/spell/targeted/click/reviveThrall/cast_check(charge_check = TRUE, start_recharge = TRUE, mob/living/user = usr) if(!shadowling_check(user)) return FALSE return ..() @@ -627,9 +638,12 @@ action_icon_state = "extend_shuttle" var/global/extendlimit = 0 -/obj/effect/proc_holder/spell/targeted/click/shadowling_extend_shuttle/can_cast(mob/user = usr, charge_check = TRUE, show_message = FALSE) +/obj/effect/proc_holder/spell/targeted/click/shadowling_extend_shuttle/cast_check(charge_check = TRUE, start_recharge = TRUE, mob/living/user = usr) if(!shadowling_check(user)) return FALSE + return ..() + +/obj/effect/proc_holder/spell/targeted/click/shadowling_extend_shuttle/can_cast(mob/user = usr, charge_check = TRUE, show_message = FALSE) if(extendlimit == 1) if(show_message) to_chat(user, "Shuttle was already delayed.") diff --git a/code/game/gamemodes/shadowling/special_shadowling_abilities.dm b/code/game/gamemodes/shadowling/special_shadowling_abilities.dm index 28c934f7d38..4007ce3c77a 100644 --- a/code/game/gamemodes/shadowling/special_shadowling_abilities.dm +++ b/code/game/gamemodes/shadowling/special_shadowling_abilities.dm @@ -15,7 +15,8 @@ GLOBAL_LIST_INIT(possibleShadowlingNames, list("U'ruan", "Y`shej", "Nex", "Hel-u if(user.stat || !ishuman(user) || !user || !is_shadow(user || isinspace(user))) return if(!isturf(user.loc)) - to_chat(user, "You can't hatch here!") + revert_cast(user) + to_chat(user, "You must be standing on a floor to hatch!") return for(var/mob/living/carbon/human/H in targets) var/hatch_or_no = alert(H,"Are you sure you want to hatch? You cannot undo this!",,"Yes","No") @@ -29,7 +30,7 @@ GLOBAL_LIST_INIT(possibleShadowlingNames, list("U'ruan", "Y`shej", "Nex", "Hel-u H.visible_message("[H]'s things suddenly slip off. They hunch over and vomit up a copious amount of purple goo which begins to shape around them!", \ "You remove any equipment which would hinder your hatching and begin regurgitating the resin which will protect you.") - for(var/obj/item/I in H.contents - (H.bodyparts | H.internal_organs)) //drops all items except organs + for(var/obj/item/I in H.contents) H.unEquip(I) sleep(50) @@ -65,7 +66,7 @@ GLOBAL_LIST_INIT(possibleShadowlingNames, list("U'ruan", "Y`shej", "Nex", "Hel-u to_chat(H, "You are free!") H.status_flags = temp_flags sleep(10) - playsound(H.loc, 'sound/effects/ghost.ogg', 100, 1) + playsound(H.loc, 'sound/effects/ghost.ogg', 50, TRUE) var/newNameId = pick(GLOB.possibleShadowlingNames) GLOB.possibleShadowlingNames.Remove(newNameId) H.real_name = newNameId @@ -98,7 +99,6 @@ GLOBAL_LIST_INIT(possibleShadowlingNames, list("U'ruan", "Y`shej", "Nex", "Hel-u sleep(10) to_chat(H, "Your powers are awoken. You may now live to your fullest extent. Remember your goal. Cooperate with your thralls and allies.") H.ExtinguishMob() - H.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/shadow_vision(null)) H.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/click/enthrall(null)) H.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/click/glare(null)) H.mind.AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/veil(null)) @@ -122,10 +122,13 @@ GLOBAL_LIST_INIT(possibleShadowlingNames, list("U'ruan", "Y`shej", "Nex", "Hel-u include_user = 1 action_icon_state = "ascend" +/obj/effect/proc_holder/spell/targeted/shadowling_ascend/cast_check(charge_check = TRUE, start_recharge = TRUE, mob/living/user = usr) + if(!shadowling_check(user)) + return FALSE + return ..() + /obj/effect/proc_holder/spell/targeted/shadowling_ascend/cast(list/targets, mob/user = usr) var/mob/living/carbon/human/H = user - if(!shadowling_check(H)) - return for(H in targets) var/hatch_or_no = alert(H,"It is time to ascend. Are you sure about this?",,"Yes","No") switch(hatch_or_no) diff --git a/code/game/gamemodes/steal_items.dm b/code/game/gamemodes/steal_items.dm index edbe51fd66f..780962045be 100644 --- a/code/game/gamemodes/steal_items.dm +++ b/code/game/gamemodes/steal_items.dm @@ -13,7 +13,7 @@ var/flags = 0 var/location_override -/datum/theft_objective/proc/check_completion(var/datum/mind/owner) +/datum/theft_objective/proc/check_completion(datum/mind/owner) if(!owner.current) return 0 if(!isliving(owner.current)) @@ -31,33 +31,38 @@ name = "the captain's antique laser gun" typepath = /obj/item/gun/energy/laser/captain protected_jobs = list("Captain") + location_override = "the Captain's Office" /datum/theft_objective/captains_jetpack name = "the captain's deluxe jetpack" typepath = /obj/item/tank/jetpack/oxygen/captain protected_jobs = list("Captain") + location_override = "the Captain's Office" /datum/theft_objective/captains_rapier name = "the captain's rapier" typepath = /obj/item/melee/rapier protected_jobs = list("Captain") + location_override = "the Captain's Office" /datum/theft_objective/hoslaser name = "the head of security's X-01 multiphase energy gun" typepath = /obj/item/gun/energy/gun/hos protected_jobs = list("Head Of Security") + location_override = "the Head of Security's Office" /datum/theft_objective/hand_tele name = "a hand teleporter" typepath = /obj/item/hand_tele protected_jobs = list("Captain", "Research Director", "Chief Engineer") + location_override = "Teleporter" /datum/theft_objective/ai name = "a functional AI" typepath = /obj/item/aicard location_override = "AI Satellite. An intellicard for transportation can be found in Tech Storage, Science Department or manufactured" -/datum/theft_objective/ai/check_special_completion(var/obj/item/aicard/C) +/datum/theft_objective/ai/check_special_completion(obj/item/aicard/C) if(..()) for(var/mob/living/silicon/ai/A in C) if(istype(A, /mob/living/silicon/ai) && A.stat != 2) //See if any AI's are alive inside that card. @@ -68,17 +73,20 @@ name = "a compact defibrillator" typepath = /obj/item/defibrillator/compact protected_jobs = list("Chief Medical Officer", "Paramedic") + location_override = "the Chief Medical Officer's Office" /datum/theft_objective/magboots name = "the chief engineer's advanced magnetic boots" typepath = /obj/item/clothing/shoes/magboots/advance protected_jobs = list("Chief Engineer") + location_override = "the Chief Engineer's Office" /datum/theft_objective/blueprints name = "the station blueprints" typepath = /obj/item/areaeditor/blueprints/ce protected_jobs = list("Chief Engineer") altitems = list(/obj/item/photo) + location_override = "the Chief Engineer's Office" /datum/objective_item/steal/blueprints/check_special_completion(obj/item/I) if(istype(I, /obj/item/areaeditor/blueprints/ce)) @@ -93,35 +101,42 @@ name = "the medal of captaincy" typepath = /obj/item/clothing/accessory/medal/gold/captain protected_jobs = list("Captain") + location_override = "the Captain's Office" /datum/theft_objective/nukedisc name = "the nuclear authentication disk" typepath = /obj/item/disk/nuclear protected_jobs = list("Captain") + location_override = "the Captain's Office" /datum/theft_objective/reactive name = "the reactive teleport armor" typepath = /obj/item/clothing/suit/armor/reactive/teleport protected_jobs = list("Research Director") + location_override = "the Research Director's Office" /datum/theft_objective/steal/documents name = "any set of secret documents of any organization" typepath = /obj/item/documents //Any set of secret documents. Doesn't have to be NT's + location_override = "the Vault" /datum/theft_objective/hypospray name = "the Chief Medical Officer's hypospray" typepath = /obj/item/reagent_containers/hypospray/CMO protected_jobs = list("Chief Medical Officer") + location_override = "the Chief Medical Officer's Office" /datum/theft_objective/ablative name = "an ablative armor vest" typepath = /obj/item/clothing/suit/armor/laserproof protected_jobs = list("Head of Security", "Warden") + location_override = "the Armory" /datum/theft_objective/krav name = "the warden's krav maga martial arts gloves" typepath = /obj/item/clothing/gloves/color/black/krav_maga/sec protected_jobs = list("Head Of Security", "Warden") + location_override = "the Warden's Office" /datum/theft_objective/number var/min=0 @@ -139,7 +154,7 @@ required_amount=rand(lower,upper)*step name = "[required_amount] [name]" -/datum/theft_objective/number/check_completion(var/datum/mind/owner) +/datum/theft_objective/number/check_completion(datum/mind/owner) if(!owner.current) return 0 if(!isliving(owner.current)) @@ -151,7 +166,7 @@ found_amount += getAmountStolen(I) return found_amount >= required_amount -/datum/theft_objective/number/proc/getAmountStolen(var/obj/item/I) +/datum/theft_objective/number/proc/getAmountStolen(obj/item/I) return I:amount /datum/theft_objective/unique @@ -160,7 +175,9 @@ /datum/theft_objective/unique/docs_red name = "the \"Red\" secret documents" typepath = /obj/item/documents/syndicate/red + location_override = "a Syndicate agent's possession" /datum/theft_objective/unique/docs_blue name = "the \"Blue\" secret documents" typepath = /obj/item/documents/syndicate/blue + location_override = "a Syndicate agent's possession" diff --git a/code/game/gamemodes/traitor/traitor.dm b/code/game/gamemodes/traitor/traitor.dm index bb65e4b0874..f247f860400 100644 --- a/code/game/gamemodes/traitor/traitor.dm +++ b/code/game/gamemodes/traitor/traitor.dm @@ -20,14 +20,6 @@ var/traitors_possible = 4 //hard limit on traitors if scaling is turned off var/const/traitor_scaling_coeff = 5.0 //how much does the amount of players get divided by to determine traitors var/antag_datum = /datum/antagonist/traitor //what type of antag to create - // Contractor related - /// Minimum number of possible contractors regardless of the number of traitors. - var/min_contractors = 1 - /// How many contractors there are in proportion to traitors. - /// Calculated as: num_contractors = max(min_contractors, CEILING(num_traitors * contractor_traitor_ratio, 1)) - var/contractor_traitor_ratio = 0.25 - /// List of traitors who are eligible to become a contractor. - var/list/datum/mind/selected_contractors = list() /datum/game_mode/traitor/announce() to_chat(world, "The current game mode is - Traitor!") @@ -52,8 +44,6 @@ else num_traitors = max(1, min(num_players(), traitors_possible)) - var/num_contractors = max(min_contractors, CEILING(num_traitors * contractor_traitor_ratio, 1)) - for(var/j = 0, j < num_traitors, j++) if(!possible_traitors.len) break @@ -62,8 +52,6 @@ traitor.special_role = SPECIAL_ROLE_TRAITOR traitor.restricted_roles = restricted_jobs possible_traitors.Remove(traitor) - if(num_contractors-- > 0) - selected_contractors += traitor if(!pre_traitors.len) return 0 @@ -73,7 +61,6 @@ /datum/game_mode/traitor/post_setup() for(var/datum/mind/traitor in pre_traitors) var/datum/antagonist/traitor/new_antag = new antag_datum() - new_antag.is_contractor = (traitor in selected_contractors) addtimer(CALLBACK(traitor, /datum/mind.proc/add_antag_datum, new_antag), rand(10,100)) if(!exchange_blue) exchange_blue = -1 //Block latejoiners from getting exchange objectives @@ -130,11 +117,11 @@ else special_role_text = "antagonist" - var/datum/antagonist/traitor/contractor/contractor = traitor.has_antag_datum(/datum/antagonist/traitor/contractor) - if(istype(contractor) && contractor.contractor_uplink) + var/datum/contractor_hub/H = LAZYACCESS(GLOB.contractors, traitor) + if(H) var/count = 1 - var/earned_tc = contractor.contractor_uplink.hub.reward_tc_paid_out - for(var/c in contractor.contractor_uplink.hub.contracts) + var/earned_tc = H.reward_tc_paid_out + for(var/c in H.contracts) var/datum/syndicate_contract/C = c // Locations var/locations = list() diff --git a/code/game/gamemodes/vampire/traitor_vamp.dm b/code/game/gamemodes/vampire/traitor_vamp.dm index d69b9a23518..7fb1088214b 100644 --- a/code/game/gamemodes/vampire/traitor_vamp.dm +++ b/code/game/gamemodes/vampire/traitor_vamp.dm @@ -3,11 +3,13 @@ config_tag = "traitorvamp" traitors_possible = 3 //hard limit on traitors if scaling is turned off protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Blueshield", "Nanotrasen Representative", "Security Pod Pilot", "Magistrate", "Chaplain", "Brig Physician", "Internal Affairs Agent", "Nanotrasen Navy Officer", "Special Operations Officer") - restricted_jobs = list("AI", "Cyborg") + restricted_jobs = list("Cyborg") + secondary_restricted_jobs = list("AI") required_players = 10 required_enemies = 1 // how many of each type are required recommended_enemies = 3 - var/protected_species_vampire = list("Machine") + secondary_enemies_scaling = 0.025 + secondary_protected_species = list("Machine") /datum/game_mode/traitor/vampire/announce() to_chat(world, "The current game mode is - Traitor+Vampire!") @@ -19,20 +21,26 @@ restricted_jobs += protected_jobs var/list/datum/mind/possible_vampires = get_players_for_role(ROLE_VAMPIRE) + secondary_enemies = CEILING((secondary_enemies_scaling * num_players()), 1) for(var/mob/new_player/player in GLOB.player_list) - if((player.mind in possible_vampires) && (player.client.prefs.species in protected_species_vampire)) + if((player.mind in possible_vampires) && (player.client.prefs.species in secondary_protected_species)) possible_vampires -= player.mind if(possible_vampires.len > 0) - var/datum/mind/vampire = pick(possible_vampires) - vampires += vampire - modePlayer += vampires - var/datum/mindslaves/slaved = new() - slaved.masters += vampire - vampire.som = slaved //we MIGT want to mindslave someone - vampire.restricted_roles = restricted_jobs - vampire.special_role = SPECIAL_ROLE_VAMPIRE + for(var/I in possible_vampires) + if(length(vampires) >= secondary_enemies) + break + var/datum/mind/vampire = pick(possible_vampires) + vampires += vampire + modePlayer += vampires + possible_vampires -= vampire + var/datum/mindslaves/slaved = new() + slaved.masters += vampire + vampire.som = slaved //we MIGHT want to mindslave someone + vampire.restricted_roles = (restricted_jobs + secondary_restricted_jobs) + vampire.special_role = SPECIAL_ROLE_VAMPIRE + ..() return 1 else diff --git a/code/game/gamemodes/vampire/vampire.dm b/code/game/gamemodes/vampire/vampire.dm index a7bd5852f77..8a3628a1717 100644 --- a/code/game/gamemodes/vampire/vampire.dm +++ b/code/game/gamemodes/vampire/vampire.dm @@ -135,7 +135,7 @@ to_chat(world, text) return 1 -/datum/game_mode/proc/forge_vampire_objectives(var/datum/mind/vampire) +/datum/game_mode/proc/forge_vampire_objectives(datum/mind/vampire) //Objectives are traitor objectives plus blood objectives var/datum/objective/blood/blood_objective = new @@ -172,10 +172,10 @@ return vampire_mob.make_vampire() -/datum/game_mode/proc/greet_vampire(var/datum/mind/vampire, var/you_are=1) +/datum/game_mode/proc/greet_vampire(datum/mind/vampire, you_are=1) var/dat if(you_are) - SEND_SOUND(vampire.current, 'sound/ambience/antag/vampalert.ogg') + SEND_SOUND(vampire.current, sound('sound/ambience/antag/vampalert.ogg')) dat = "You are a Vampire!
" dat += {"To bite someone, target the head and use harm intent with an empty hand. Drink blood to gain new powers. You are weak to holy things and starlight. Don't go into space and avoid the Chaplain, the chapel and especially Holy Water."} @@ -185,7 +185,8 @@ You are weak to holy things and starlight. Don't go into space and avoid the Cha if(vampire.current.mind) if(vampire.current.mind.assigned_role == "Clown") to_chat(vampire.current, "Your lust for blood has allowed you to overcome your clumsy nature allowing you to wield weapons without harming yourself.") - vampire.current.mutations.Remove(CLUMSY) + vampire.current.dna.SetSEState(GLOB.clumsyblock, FALSE) + singlemutcheck(vampire.current, GLOB.clumsyblock, MUTCHK_FORCED) var/datum/action/innate/toggle_clumsy/A = new A.Grant(vampire.current) var/obj_count = 1 @@ -219,6 +220,10 @@ You are weak to holy things and starlight. Don't go into space and avoid the Cha /obj/effect/proc_holder/spell/vampire/targetted/enthrall = 300, /datum/vampire_passive/full = 500) +/datum/vampire/proc/adjust_nullification(base, extra) + // First hit should give full nullification, while subsequent hits increase the value slower + nullified = max(nullified + extra, base) + /datum/vampire/New(gend = FEMALE) gender = gend @@ -247,7 +252,7 @@ You are weak to holy things and starlight. Don't go into space and avoid the Cha qdel(ability) owner.update_sight() // Life updates conditionally, so we need to update sight here in case the vamp loses his vision based powers. Maybe one day refactor to be more OOP and on the vampire's ability datum. -/datum/vampire/proc/update_owner(var/mob/living/carbon/human/current) //Called when a vampire gets cloned. This updates vampire.owner to the new body. +/datum/vampire/proc/update_owner(mob/living/carbon/human/current) //Called when a vampire gets cloned. This updates vampire.owner to the new body. if(current.mind && current.mind.vampire && current.mind.vampire.owner && (current.mind.vampire.owner != current)) current.mind.vampire.owner = current @@ -433,7 +438,7 @@ You are weak to holy things and starlight. Don't go into space and avoid the Cha hud.vampire_blood_display.screen_loc = "WEST:6,CENTER-1:15" hud.static_inventory += hud.vampire_blood_display hud.show_hud(hud.hud_version) - hud.vampire_blood_display.maptext = "
[bloodusable]
" + hud.vampire_blood_display.maptext = "
[bloodusable]
" handle_vampire_cloak() if(istype(owner.loc, /turf/space)) check_sun() diff --git a/code/game/gamemodes/vampire/vampire_powers.dm b/code/game/gamemodes/vampire/vampire_powers.dm index 0ff7192a7e6..4e06cb02df1 100644 --- a/code/game/gamemodes/vampire/vampire_powers.dm +++ b/code/game/gamemodes/vampire/vampire_powers.dm @@ -270,7 +270,7 @@ continue to_chat(C, "You hear a ear piercing shriek and your senses dull!") C.Weaken(4) - C.MinimumDeafTicks(20) + C.AdjustEarDamage(0, 20) C.Stuttering(20) C.Stun(4) C.Jitter(150) @@ -564,7 +564,7 @@ H.raise_vampire(user) -/mob/living/carbon/human/proc/raise_vampire(var/mob/M) +/mob/living/carbon/human/proc/raise_vampire(mob/M) if(!istype(M)) log_debug("human/proc/raise_vampire called with invalid argument.") return diff --git a/code/game/gamemodes/wizard/artefact.dm b/code/game/gamemodes/wizard/artefact.dm index cb0c277b1e6..af83abba66b 100644 --- a/code/game/gamemodes/wizard/artefact.dm +++ b/code/game/gamemodes/wizard/artefact.dm @@ -147,7 +147,7 @@ var/spawn_path = /mob/living/simple_animal/cow //defaulty cows to prevent unintentional narsies var/spawn_amt_left = 20 -/obj/effect/rend/New(loc, var/spawn_type, var/spawn_amt, var/desc) +/obj/effect/rend/New(loc, spawn_type, spawn_amt, desc) ..() src.spawn_path = spawn_type src.spawn_amt_left = spawn_amt @@ -220,6 +220,37 @@ damtype = BURN force = 15 hitsound = 'sound/items/welder2.ogg' + var/mob/current_owner + +/obj/item/scrying/Initialize(mapload) + . = ..() + START_PROCESSING(SSobj, src) + +/obj/item/scrying/Destroy() + STOP_PROCESSING(SSobj, src) + current_owner = null + return ..() + +/obj/item/scrying/process() + var/mob/holder = get(loc, /mob) + if(current_owner && current_owner != holder) + + to_chat(current_owner, "Your otherworldly vision fades...") + + REMOVE_TRAIT(current_owner, TRAIT_XRAY_VISION, SCRYING_ORB) + current_owner.update_sight() + current_owner.update_icons() + + current_owner = null + + if(!current_owner && holder) + current_owner = holder + + to_chat(current_owner, "You can see...everything!") + + ADD_TRAIT(current_owner, TRAIT_XRAY_VISION, SCRYING_ORB) + current_owner.update_sight() + current_owner.update_icons() /obj/item/scrying/attack_self(mob/user as mob) to_chat(user, " You can see...everything!") @@ -321,7 +352,7 @@ GLOBAL_LIST_EMPTY(multiverse) to_chat(user, "[src] is recharging! Keep in mind it shares a cooldown with the swords wielded by your copies.") -/obj/item/multisword/proc/spawn_copy(var/client/C, var/turf/T, mob/user) +/obj/item/multisword/proc/spawn_copy(client/C, turf/T, mob/user) var/mob/living/carbon/human/M = new/mob/living/carbon/human(T) if(duplicate_self) user.client.prefs.copy_to(M) @@ -342,7 +373,7 @@ GLOBAL_LIST_EMPTY(multiverse) if(duplicate_self) M.dna = user.dna.Clone() M.UpdateAppearance() - domutcheck(M, null) + domutcheck(M) M.update_body() M.update_hair() M.update_fhair() @@ -367,7 +398,7 @@ GLOBAL_LIST_EMPTY(multiverse) M.mind.special_role = SPECIAL_ROLE_MULTIVERSE log_game("[M.key] was made a multiverse traveller with the objective to help [usr.real_name] protect the station.") -/obj/item/multisword/proc/equip_copy(var/mob/living/carbon/human/M) +/obj/item/multisword/proc/equip_copy(mob/living/carbon/human/M) var/obj/item/multisword/sword = new sword_type sword.assigned = assigned @@ -795,8 +826,8 @@ GLOBAL_LIST_EMPTY(multiverse) GiveHint(target) else if(istype(I,/obj/item/bikehorn)) to_chat(target, "HONK") - target << 'sound/items/airhorn.ogg' - target.MinimumDeafTicks(3) + SEND_SOUND(target, sound('sound/items/airhorn.ogg')) + target.AdjustEarDamage(0, 3) GiveHint(target) cooldown = world.time +cooldown_time return diff --git a/code/game/gamemodes/wizard/godhand.dm b/code/game/gamemodes/wizard/godhand.dm index f2d0e6eb81a..409a1801e40 100644 --- a/code/game/gamemodes/wizard/godhand.dm +++ b/code/game/gamemodes/wizard/godhand.dm @@ -13,7 +13,7 @@ throw_range = 0 throw_speed = 0 -/obj/item/melee/touch_attack/New(var/spell) +/obj/item/melee/touch_attack/New(spell) attached_spell = spell ..() diff --git a/code/game/gamemodes/wizard/raginmages.dm b/code/game/gamemodes/wizard/raginmages.dm index 0c2475edd41..d50a6200764 100644 --- a/code/game/gamemodes/wizard/raginmages.dm +++ b/code/game/gamemodes/wizard/raginmages.dm @@ -16,7 +16,7 @@ to_chat(world, "The current game mode is - Ragin' Mages!") to_chat(world, "The Space Wizard Federation is pissed, crew must help defeat all the Space Wizards invading the station!") -/datum/game_mode/wizard/raginmages/greet_wizard(var/datum/mind/wizard, var/you_are=1) +/datum/game_mode/wizard/raginmages/greet_wizard(datum/mind/wizard, you_are=1) if(you_are) to_chat(wizard.current, "You are the Space Wizard!") to_chat(wizard.current, "The Space Wizard Federation has given you the following tasks:") @@ -85,7 +85,7 @@ return ..() // To silence all struggles within the wizard's lair -/datum/game_mode/wizard/raginmages/proc/end_squabble(var/area/wizard_station/A) +/datum/game_mode/wizard/raginmages/proc/end_squabble(area/wizard_station/A) if(!istype(A)) return // You could probably do mean things with this otherwise var/list/marked_for_death = list() for(var/mob/living/L in A) // To hit non-wizard griefers @@ -143,7 +143,7 @@ // ripped from -tg-'s wizcode, because whee lets make a very general proc for a very specific gamemode // This probably wouldn't do half bad as a proc in __HELPERS // Lemme know if this causes species to mess up spectacularly or anything -/datum/game_mode/wizard/raginmages/proc/makeBody(var/mob/dead/observer/G) +/datum/game_mode/wizard/raginmages/proc/makeBody(mob/dead/observer/G) if(!G || !G.key) return // Let's not steal someone's soul here var/mob/living/carbon/human/new_character = new(pick(GLOB.latejoin)) diff --git a/code/game/gamemodes/wizard/soulstone.dm b/code/game/gamemodes/wizard/soulstone.dm index 324ecae1c0a..cd7c5d21546 100644 --- a/code/game/gamemodes/wizard/soulstone.dm +++ b/code/game/gamemodes/wizard/soulstone.dm @@ -108,7 +108,7 @@ player_mob = ghost var/client/player_client = player_mob.client to_chat(player_mob, "[user] is trying to capture your soul into [src]! Click the button in the top right of the game window to respond.") - player_client << 'sound/misc/notice2.ogg' + SEND_SOUND(player_client, sound('sound/misc/notice2.ogg')) window_flash(player_client) var/obj/screen/alert/notify_soulstone/A = player_mob.throw_alert("\ref[src]_soulstone_thingy", /obj/screen/alert/notify_soulstone) @@ -297,7 +297,7 @@ if(length(contents)) to_chat(user, "Capture failed!: The soul stone is full! Use or free an existing soul to make room.") else - T.loc = src //put shade in stone + T.forceMove(src) // Put the shade into the stone. T.canmove = 0 T.health = T.maxHealth icon_state = icon_state_full diff --git a/code/game/gamemodes/wizard/spellbook.dm b/code/game/gamemodes/wizard/spellbook.dm index 0038200497e..b3c84d28ec4 100644 --- a/code/game/gamemodes/wizard/spellbook.dm +++ b/code/game/gamemodes/wizard/spellbook.dm @@ -172,6 +172,18 @@ 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" @@ -357,10 +369,14 @@ name = "Buy Item" refundable = 0 buy_word = "Summon" + var/spawn_on_floor = FALSE var/item_path = null /datum/spellbook_entry/item/Buy(mob/living/carbon/human/user, obj/item/spellbook/book) - user.put_in_hands(new item_path) + if(spawn_on_floor == FALSE) + user.put_in_hands(new item_path) + else + new item_path(user.loc) SSblackbox.record_feedback("tally", "wizard_spell_learned", 1, log_name) return 1 @@ -386,16 +402,6 @@ log_name = "SO" category = "Artefacts" -/datum/spellbook_entry/item/scryingorb/Buy(mob/living/carbon/human/user, obj/item/spellbook/book) - if(..()) - if(!(XRAY in user.mutations)) - user.mutations.Add(XRAY) - user.sight |= (SEE_MOBS|SEE_OBJS|SEE_TURFS) - user.see_in_dark = 8 - user.lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE - to_chat(user, "The walls suddenly disappear.") - return TRUE - /datum/spellbook_entry/item/soulstones name = "Six Soul Stone Shards and the spell Artificer" desc = "Soul Stone Shards are ancient tools capable of capturing and harnessing the spirits of the dead and dying. The spell Artificer allows you to create arcane machines for the captured souls to pilot." @@ -416,6 +422,30 @@ log_name = "WA" category = "Artefacts" +/datum/spellbook_entry/item/cursed_heart + name = "Cursed Heart" + desc = "A heart that has been empowered with magic to heal the user. The user must ensure the heart is manually beaten or their blood circulation will suffer, but every beat heals their injuries. It must beat every 6 seconds. Not reccomended for first time wizards." + item_path = /obj/item/organ/internal/heart/cursed/wizard + log_name = "CH" + cost = 1 + category = "Artefacts" + +/datum/spellbook_entry/item/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" + category = "Artefacts" + +/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." + item_path = /obj/item/warp_cube/red + log_name = "WC" + cost = 1 + spawn_on_floor = TRUE // breaks if spawned in hand + category = "Artefacts" + //Weapons and Armors /datum/spellbook_entry/item/battlemage name = "Battlemage Armour" @@ -447,6 +477,21 @@ log_name = "SI" category = "Weapons and Armors" +/datum/spellbook_entry/item/spell_blade //Yes spellblade is technicaly a staff, but you can melee with it and it is not called a staff so I am putting it here + name = "Spellblade" + desc = "A magical sword that is quite good at slashing people, but is even better at shooting magical projectiles that can potentialy delimb at range." + item_path = /obj/item/gun/magic/staff/spellblade + log_name = "SB" + category = "Weapons and Armors" + +/datum/spellbook_entry/item/meat_hook + name = "Meat hook" + desc = "An enchanted hook, that can be used to hook people, hurt them, and bring them right to you. Quite bulky, works well as a belt though." + item_path = /obj/item/gun/magic/hook + cost = 1 + log_name = "MH" + category = "Weapons and Armors" + //Staves /datum/spellbook_entry/item/staffdoor name = "Staff of Door Creation" diff --git a/code/game/gamemodes/wizard/wizard.dm b/code/game/gamemodes/wizard/wizard.dm index c21640d8466..43e768a1ef2 100644 --- a/code/game/gamemodes/wizard/wizard.dm +++ b/code/game/gamemodes/wizard/wizard.dm @@ -77,7 +77,7 @@ wizhud.leave_hud(wiz_mind.current) set_antag_hud(wiz_mind.current, null) -/datum/game_mode/proc/forge_wizard_objectives(var/datum/mind/wizard) +/datum/game_mode/proc/forge_wizard_objectives(datum/mind/wizard) var/datum/objective/wizchaos/wiz_objective = new wiz_objective.owner = wizard wizard.objectives += wiz_objective @@ -98,7 +98,7 @@ if(wizard_mob.mind) wizard_mob.mind.name = newname -/datum/game_mode/proc/greet_wizard(var/datum/mind/wizard, var/you_are=1) +/datum/game_mode/proc/greet_wizard(datum/mind/wizard, you_are=1) addtimer(CALLBACK(wizard.current, /mob/.proc/playsound_local, null, 'sound/ambience/antag/ragesmages.ogg', 100, 0), 30) if(you_are) to_chat(wizard.current, "You are the Space Wizard!") @@ -198,7 +198,7 @@ finished = 1 return 1 -/datum/game_mode/wizard/declare_completion(var/ragin = 0) +/datum/game_mode/wizard/declare_completion(ragin = 0) if(finished && !ragin) SSticker.mode_result = "wizard loss - wizard killed" to_chat(world, " The wizard[(wizards.len>1)?"s":""] has been killed by the crew! The Space Wizards Federation has been taught a lesson they will not soon forget!") diff --git a/code/game/jobs/access.dm b/code/game/jobs/access.dm index ac533f0b7ef..6eaaf03aaef 100644 --- a/code/game/jobs/access.dm +++ b/code/game/jobs/access.dm @@ -54,7 +54,7 @@ L = list() return check_access_list(L) -/obj/proc/check_access_list(var/list/L) +/obj/proc/check_access_list(list/L) generate_req_lists() if(!L) @@ -63,7 +63,7 @@ return 0 return has_access(req_access, req_one_access, L) -/proc/has_access(var/list/req_access, var/list/req_one_access, var/list/accesses) +/proc/has_access(list/req_access, list/req_one_access, list/accesses) for(var/req in req_access) if(!(req in accesses)) //doesn't have this access return 0 @@ -443,7 +443,7 @@ return "Unknown" -/proc/GetIdCard(var/mob/living/carbon/human/H) +/proc/GetIdCard(mob/living/carbon/human/H) if(H.wear_id) var/id = H.wear_id.GetID() if(id) @@ -452,7 +452,7 @@ var/obj/item/I = H.get_active_hand() return I.GetID() -/proc/FindNameFromID(var/mob/living/carbon/human/H) +/proc/FindNameFromID(mob/living/carbon/human/H) ASSERT(istype(H)) var/obj/item/card/id/C = H.get_active_hand() if( istype(C) || istype(C, /obj/item/pda) ) diff --git a/code/game/jobs/job/central.dm b/code/game/jobs/job/central.dm index 8684ca7d1b0..c25dfdd256f 100644 --- a/code/game/jobs/job/central.dm +++ b/code/game/jobs/job/central.dm @@ -93,7 +93,7 @@ /obj/item/implant/dust ) cybernetic_implants = list( - /obj/item/organ/internal/cyberimp/eyes/xray, + /obj/item/organ/internal/eyes/cybernetic/xray, /obj/item/organ/internal/cyberimp/brain/anti_stun/hardened, /obj/item/organ/internal/cyberimp/chest/nutriment/plus, /obj/item/organ/internal/cyberimp/arm/combat/centcom diff --git a/code/game/jobs/job/job.dm b/code/game/jobs/job/job.dm index d5c5089c8af..fd3e1a0442b 100644 --- a/code/game/jobs/job/job.dm +++ b/code/game/jobs/job/job.dm @@ -190,7 +190,7 @@ continue if(G.slot) - if(H.equip_to_slot_or_del(G.spawn_item(H), G.slot)) + if(H.equip_to_slot_or_del(G.spawn_item(H), G.slot, TRUE)) to_chat(H, "Equipping you with [gear]!") else gear_leftovers += G diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm index 6f4eb3759de..a7a8b69edba 100644 --- a/code/game/jobs/job/security.dm +++ b/code/game/jobs/job/security.dm @@ -149,8 +149,7 @@ if(visualsOnly) return - H.dna.SetSEState(GLOB.soberblock,1) - H.mutations += SOBER + H.dna.SetSEState(GLOB.soberblock, TRUE) H.check_mutations = 1 /datum/job/officer @@ -213,7 +212,7 @@ uniform = /obj/item/clothing/under/rank/security/brigphys suit = /obj/item/clothing/suit/storage/fr_jacket shoes = /obj/item/clothing/shoes/white - l_ear = /obj/item/radio/headset/headset_sec/alt + l_ear = /obj/item/radio/headset/headset_sec/alt/brig_phys glasses = /obj/item/clothing/glasses/hud/health/sunglasses id = /obj/item/card/id/security suit_store = /obj/item/flashlight/pen diff --git a/code/game/jobs/job/support.dm b/code/game/jobs/job/support.dm index 5d8c630cf7b..4f0c1aa0d64 100644 --- a/code/game/jobs/job/support.dm +++ b/code/game/jobs/job/support.dm @@ -34,7 +34,7 @@ return H.dna.SetSEState(GLOB.soberblock,1) - genemutcheck(H, GLOB.soberblock, null, MUTCHK_FORCED) + singlemutcheck(H, GLOB.soberblock, MUTCHK_FORCED) H.dna.default_blocks.Add(GLOB.soberblock) H.check_mutations = 1 @@ -211,7 +211,7 @@ suit = /obj/item/clothing/suit/hooded/explorer mask = /obj/item/clothing/mask/gas/explorer glasses = /obj/item/clothing/glasses/meson - suit_store = /obj/item/tank/emergency_oxygen + suit_store = /obj/item/tank/internals/emergency_oxygen internals_slot = slot_s_store backpack_contents = list( /obj/item/flashlight/seclite=1,\ @@ -272,6 +272,8 @@ /obj/item/instrument/bikehorn = 1 ) + implants = list(/obj/item/implant/sad_trombone) + backpack = /obj/item/storage/backpack/clown satchel = /obj/item/storage/backpack/clown dufflebag = /obj/item/storage/backpack/duffel/clown @@ -292,11 +294,11 @@ implant.insert(H) H.dna.SetSEState(GLOB.clumsyblock, TRUE) - genemutcheck(H, GLOB.clumsyblock, null, MUTCHK_FORCED) + singlemutcheck(H, GLOB.clumsyblock, MUTCHK_FORCED) H.dna.default_blocks.Add(GLOB.clumsyblock) if(!ismachineperson(H)) H.dna.SetSEState(GLOB.comicblock, TRUE) - genemutcheck(H, GLOB.comicblock, null, MUTCHK_FORCED) + singlemutcheck(H, GLOB.comicblock, MUTCHK_FORCED) H.dna.default_blocks.Add(GLOB.comicblock) H.check_mutations = TRUE H.add_language("Clownish") @@ -308,7 +310,8 @@ /datum/action/innate/toggle_clumsy/Activate() var/mob/living/carbon/human/H = owner - H.mutations.Add(CLUMSY) + H.dna.SetSEState(GLOB.clumsyblock, TRUE) + singlemutcheck(H, GLOB.clumsyblock, MUTCHK_FORCED) active = TRUE background_icon_state = "bg_spell" UpdateButtonIcon() @@ -316,7 +319,8 @@ /datum/action/innate/toggle_clumsy/Deactivate() var/mob/living/carbon/human/H = owner - H.mutations.Remove(CLUMSY) + H.dna.SetSEState(GLOB.clumsyblock, FALSE) + singlemutcheck(H, GLOB.clumsyblock, MUTCHK_FORCED) active = FALSE background_icon_state = "bg_default" UpdateButtonIcon() diff --git a/code/game/jobs/job_exp.dm b/code/game/jobs/job_exp.dm index f0483e5c17a..b30fbac02c4 100644 --- a/code/game/jobs/job_exp.dm +++ b/code/game/jobs/job_exp.dm @@ -11,30 +11,30 @@ GLOBAL_LIST_INIT(role_playtime_requirements, list( ROLE_DRONE = 10, // High, because they're like mini engineering cyborgs that can ignore the AI, ventcrawl, and respawn themselves // SOLO ANTAGS - ROLE_TRAITOR = 3, - ROLE_CHANGELING = 3, - ROLE_WIZARD = 3, - ROLE_VAMPIRE = 3, - ROLE_BLOB = 3, + ROLE_TRAITOR = 5, + ROLE_CHANGELING = 5, + ROLE_WIZARD = 20, + ROLE_VAMPIRE = 5, + ROLE_BLOB = 20, ROLE_REVENANT = 3, ROLE_BORER = 3, - ROLE_NINJA = 3, - ROLE_MORPH = 3, - ROLE_DEMON = 3, + ROLE_NINJA = 20, + ROLE_MORPH = 5, + ROLE_DEMON = 5, // DUO ANTAGS - ROLE_GUARDIAN = 5, + ROLE_GUARDIAN = 20, ROLE_GSPIDER = 5, // TEAM ANTAGS // Higher numbers here, because they require more experience to be played correctly - ROLE_SHADOWLING = 10, + ROLE_SHADOWLING = 20, ROLE_REV = 10, - ROLE_OPERATIVE = 10, - ROLE_CULTIST = 10, + ROLE_OPERATIVE = 20, + ROLE_CULTIST = 20, ROLE_RAIDER = 10, ROLE_ALIEN = 10, - ROLE_ABDUCTOR = 10, + ROLE_ABDUCTOR = 20, )) // Client Verbs @@ -85,7 +85,7 @@ GLOBAL_LIST_INIT(role_playtime_requirements, list( src << browse(msg, "window=Player_playtime_check") -/datum/admins/proc/cmd_mentor_show_exp_panel(var/client/C) +/datum/admins/proc/cmd_mentor_show_exp_panel(client/C) if(!C) to_chat(usr, "ERROR: Client not found.") return @@ -197,10 +197,10 @@ GLOBAL_LIST_INIT(role_playtime_requirements, list( return_text += "" return return_text -/client/proc/get_exp_type(var/etype) +/client/proc/get_exp_type(etype) return get_exp_format(get_exp_type_num(etype)) -/client/proc/get_exp_type_num(var/etype) +/client/proc/get_exp_type_num(etype) var/list/play_records = params2list(prefs.exp) return text2num(play_records[etype]) @@ -216,7 +216,7 @@ GLOBAL_LIST_INIT(role_playtime_requirements, list( return result_text.Join("") -/proc/get_exp_format(var/expnum) +/proc/get_exp_format(expnum) if(expnum > 60) return num2text(round(expnum / 60)) + "h" else if(expnum > 0) @@ -224,97 +224,3 @@ GLOBAL_LIST_INIT(role_playtime_requirements, list( else return "none" -/proc/update_exp(mins = 0, ann = 0) - if(!SSdbcore.IsConnected()) - return - for(var/client/L in GLOB.clients) - if(L.inactivity >= (10 MINUTES)) - continue - L.update_exp_client(mins, ann) - CHECK_TICK - -/client/proc/update_exp_client(minutes = 0, announce_changes = 0) - if(!src || !ckey || !SSdbcore.IsConnected()) - return - - var/datum/db_query/exp_read = SSdbcore.NewQuery( - "SELECT exp FROM [format_table_name("player")] WHERE ckey=:ckey", - list("ckey" = ckey) - ) - - if(!exp_read.warn_execute()) - qdel(exp_read) - return FALSE - - var/list/read_records = list() - var/hasread = FALSE - while(exp_read.NextRow()) - read_records = params2list(exp_read.item[1]) - hasread = TRUE - - qdel(exp_read) - - if(!hasread) - return - - var/list/play_records = list() - for(var/rtype in GLOB.exp_jobsmap) - if(text2num(read_records[rtype])) - play_records[rtype] = text2num(read_records[rtype]) - else - play_records[rtype] = 0 - var/myrole - if(mob.mind) - if(mob.mind.playtime_role) - myrole = mob.mind.playtime_role - else if(mob.mind.assigned_role) - myrole = mob.mind.assigned_role - var/added_living = 0 - var/added_ghost = 0 - if(mob.stat == CONSCIOUS && myrole) - play_records[EXP_TYPE_LIVING] += minutes - added_living += minutes - if(announce_changes) - to_chat(mob,"You got: [minutes] Living EXP!") - for(var/category in GLOB.exp_jobsmap) - if(GLOB.exp_jobsmap[category]["titles"]) - if(myrole in GLOB.exp_jobsmap[category]["titles"]) - play_records[category] += minutes - if(announce_changes) - to_chat(mob,"You got: [minutes] [category] EXP!") - if(mob.mind.special_role) - play_records[EXP_TYPE_SPECIAL] += minutes - if(announce_changes) - to_chat(mob,"You got: [minutes] Special EXP!") - else if(isobserver(mob)) - play_records[EXP_TYPE_GHOST] += minutes - added_ghost += minutes - if(announce_changes) - to_chat(mob,"You got: [minutes] Ghost EXP!") - else - return - var/new_exp = list2params(play_records) - prefs.exp = new_exp - - var/datum/db_query/update_query = SSdbcore.NewQuery( - "UPDATE [format_table_name("player")] SET exp =:newexp, lastseen=NOW() WHERE ckey=:ckey", - list( - "newexp" = new_exp, - "ckey" = ckey - ) - ) - update_query.warn_execute() - qdel(update_query) - - var/datum/db_query/update_query_history = SSdbcore.NewQuery({" - INSERT INTO [format_table_name("playtime_history")] (ckey, date, time_living, time_ghost) - VALUES (:ckey, CURDATE(), :addedliving, :addedghost) - ON DUPLICATE KEY UPDATE time_living=time_living + VALUES(time_living), time_ghost=time_ghost + VALUES(time_ghost)"}, - list( - "ckey" = ckey, - "addedliving" = added_living, - "addedghost" = added_ghost - ) - ) - update_query_history.warn_execute() - qdel(update_query_history) diff --git a/code/game/jobs/job_objective.dm b/code/game/jobs/job_objective.dm index 660d1830f0a..8eaf9e09b39 100644 --- a/code/game/jobs/job_objective.dm +++ b/code/game/jobs/job_objective.dm @@ -1,7 +1,7 @@ /datum/mind/var/list/job_objectives = list() #define FINDJOBTASK_DEFAULT_NEW 1 // Make a new task of this type if one can't be found. -/datum/mind/proc/findJobTask(var/typepath, var/options = 0) +/datum/mind/proc/findJobTask(typepath, options = 0) var/datum/job_objective/task = locate(typepath) in job_objectives if(!istype(task,typepath)) if(options & FINDJOBTASK_DEFAULT_NEW) @@ -18,7 +18,7 @@ var/units_requested = INFINITY var/completion_payment = 0 // Credits paid to owner when completed -/datum/job_objective/New(var/datum/mind/new_owner) +/datum/job_objective/New(datum/mind/new_owner) owner = new_owner owner.job_objectives += src @@ -27,7 +27,7 @@ var/desc = "Placeholder Objective" return desc -/datum/job_objective/proc/unit_completed(var/count=1) +/datum/job_objective/proc/unit_completed(count=1) units_completed += count /datum/job_objective/proc/is_completed() diff --git a/code/game/jobs/jobs.dm b/code/game/jobs/jobs.dm index 2f8e426e030..e0e817f76ef 100644 --- a/code/game/jobs/jobs.dm +++ b/code/game/jobs/jobs.dm @@ -105,7 +105,7 @@ GLOBAL_LIST_INIT(whitelisted_positions, list( )) -/proc/guest_jobbans(var/job) +/proc/guest_jobbans(job) return (job in GLOB.whitelisted_positions) /proc/get_job_datums() @@ -119,7 +119,7 @@ GLOBAL_LIST_INIT(whitelisted_positions, list( return occupations -/proc/get_alternate_titles(var/job) +/proc/get_alternate_titles(job) var/list/jobs = get_job_datums() var/list/titles = list() diff --git a/code/game/jobs/whitelist.dm b/code/game/jobs/whitelist.dm index fe835c4dc8d..af80e7474a4 100644 --- a/code/game/jobs/whitelist.dm +++ b/code/game/jobs/whitelist.dm @@ -13,13 +13,13 @@ GLOBAL_LIST_EMPTY(whitelist) if(!GLOB.whitelist.len) GLOB.whitelist = null /* -/proc/check_whitelist(mob/M, var/rank) +/proc/check_whitelist(mob/M, rank) if(!whitelist) return 0 return ("[M.ckey]" in whitelist) */ -/proc/is_job_whitelisted(mob/M, var/rank) +/proc/is_job_whitelisted(mob/M, rank) if(guest_jobbans(rank)) if(!config.usewhitelist) return TRUE @@ -68,7 +68,7 @@ GLOBAL_LIST_EMPTY(alien_whitelist) GLOB.alien_whitelist = splittext(text, "\n") //todo: admin aliens -/proc/is_alien_whitelisted(mob/M, var/species) +/proc/is_alien_whitelisted(mob/M, species) if(!config.usealienwhitelist) return TRUE if(config.disable_karma) diff --git a/code/game/machinery/Beacon.dm b/code/game/machinery/Beacon.dm index d3b2114f801..41612fb870b 100644 --- a/code/game/machinery/Beacon.dm +++ b/code/game/machinery/Beacon.dm @@ -39,8 +39,8 @@ destroy_beacon() return ..() -/obj/machinery/bluespace_beacon/hide(var/intact) - invisibility = intact ? 101 : 0 +/obj/machinery/bluespace_beacon/hide(intact) + invisibility = intact ? INVISIBILITY_MAXIMUM : 0 update_icon() // update the icon_state diff --git a/code/game/machinery/Freezer.dm b/code/game/machinery/Freezer.dm deleted file mode 100644 index 66b970e3806..00000000000 --- a/code/game/machinery/Freezer.dm +++ /dev/null @@ -1,330 +0,0 @@ -/obj/machinery/atmospherics/unary/cold_sink/freezer - name = "freezer" - icon = 'icons/obj/cryogenic2.dmi' - icon_state = "freezer" - density = 1 - var/min_temperature = 0 - anchored = 1.0 - use_power = IDLE_POWER_USE - active_power_usage = 5000 //cooling down massive amounts of air's not cheap. This is still very low considering everything - power_channel = EQUIP - current_heat_capacity = 1000 - layer = 3 - plane = GAME_PLANE - max_integrity = 300 - armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 100, "bomb" = 0, "bio" = 100, "rad" = 100, "fire" = 80, "acid" = 30) - -/obj/machinery/atmospherics/unary/cold_sink/freezer/New() - ..() - initialize_directions = dir - component_parts = list() - component_parts += new /obj/item/circuitboard/thermomachine(null) - component_parts += new /obj/item/stock_parts/matter_bin(null) - component_parts += new /obj/item/stock_parts/matter_bin(null) - component_parts += new /obj/item/stock_parts/micro_laser(null) - component_parts += new /obj/item/stock_parts/micro_laser(null) - component_parts += new /obj/item/stack/sheet/glass(null) - component_parts += new /obj/item/stack/cable_coil(null, 1) - RefreshParts() - -/obj/machinery/atmospherics/unary/cold_sink/freezer/upgraded/New() - ..() - component_parts = list() - component_parts += new /obj/item/circuitboard/thermomachine(null) - component_parts += new /obj/item/stock_parts/matter_bin/super(null) - component_parts += new /obj/item/stock_parts/matter_bin/super(null) - component_parts += new /obj/item/stock_parts/micro_laser/ultra(null) - component_parts += new /obj/item/stock_parts/micro_laser/ultra(null) - component_parts += new /obj/item/stack/sheet/glass(null) - component_parts += new /obj/item/stack/cable_coil(null, 1) - RefreshParts() - -/obj/machinery/atmospherics/unary/cold_sink/freezer/RefreshParts() - var/H - var/T - for(var/obj/item/stock_parts/matter_bin/M in component_parts) - H += M.rating - for(var/obj/item/stock_parts/micro_laser/M in component_parts) - T += M.rating - min_temperature = max(0,T0C - (170 + (T*15))) - current_heat_capacity = 1000 * ((H - 1) ** 2) - -/obj/machinery/atmospherics/unary/cold_sink/freezer/on_construction() - ..(dir,dir) - -/obj/machinery/atmospherics/unary/cold_sink/freezer/process() - return // need to overwrite the parent or it returns PROCESS_KILL and it stops processing/using power - -/obj/machinery/atmospherics/unary/cold_sink/freezer/attackby(obj/item/I, mob/user, params) - if(exchange_parts(user, I)) - return - return ..() - -/obj/machinery/atmospherics/unary/cold_sink/freezer/crowbar_act(mob/user, obj/item/I) - if(default_deconstruction_crowbar(user, I)) - return TRUE - -/obj/machinery/atmospherics/unary/cold_sink/freezer/screwdriver_act(mob/user, obj/item/I) - if(default_deconstruction_screwdriver(user, "freezer-o", "freezer", I)) - on = FALSE - use_power = IDLE_POWER_USE - update_icon() - return TRUE - -/obj/machinery/atmospherics/unary/cold_sink/freezer/wrench_act(mob/user, obj/item/I) - . = TRUE - if(!I.use_tool(src, user, 0, volume = I.tool_volume)) - return - if(!panel_open) - to_chat(user, "Open the maintenance panel first.") - return - var/list/choices = list("West" = WEST, "East" = EAST, "South" = SOUTH, "North" = NORTH) - var/selected = input(user,"Select a direction for the connector.", "Connector Direction") in choices - dir = choices[selected] - var/node_connect = dir - initialize_directions = dir - for(var/obj/machinery/atmospherics/target in get_step(src,node_connect)) - if(target.initialize_directions & get_dir(target,src)) - node = target - break - build_network() - update_icon() - -/obj/machinery/atmospherics/unary/cold_sink/freezer/update_icon() - if(panel_open) - icon_state = "freezer-o" - else if(src.on) - icon_state = "freezer_1" - else - icon_state = "freezer" - return - -/obj/machinery/atmospherics/unary/cold_sink/freezer/attack_ai(mob/user as mob) - attack_hand(user) - -/obj/machinery/atmospherics/unary/cold_sink/freezer/attack_ghost(mob/user as mob) - attack_hand(user) - -/obj/machinery/atmospherics/unary/cold_sink/freezer/attack_hand(mob/user as mob) - if(panel_open) - to_chat(user, "Close the maintenance panel first.") - return - - ui_interact(user) - -/obj/machinery/atmospherics/unary/cold_sink/freezer/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state) - ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open) - if(!ui) - ui = new(user, src, ui_key, "GasFreezer", "Gas Cooling System", 540, 200) - ui.open() - -/obj/machinery/atmospherics/unary/cold_sink/freezer/ui_data(mob/user) - var/list/data = list() - data["on"] = on - data["pressure"] = round(air_contents.return_pressure()) - data["temperature"] = round(air_contents.temperature) - data["temperatureCelsius"] = round(air_contents.temperature - T0C, 1) - if(air_contents.total_moles() == 0 && air_contents.temperature == 0) - data["temperatureCelsius"] = 0 - data["min"] = round(min_temperature) - data["max"] = round(T20C) - data["target"] = round(current_temperature) - data["targetCelsius"] = round(current_temperature - T0C, 1) - return data - -/obj/machinery/atmospherics/unary/cold_sink/freezer/ui_act(action, params) - if(..()) - return - add_fingerprint(usr) - . = TRUE - - switch(action) - if("power") - on = !on - if(on) - use_power = ACTIVE_POWER_USE - else - use_power = IDLE_POWER_USE - update_icon() - if("minimum") - current_temperature = min_temperature - if("maximum") - current_temperature = T20C - if("temp") - var/amount = params["temp"] - amount = text2num(amount) - current_temperature = clamp(amount, T20C, min_temperature) - -/obj/machinery/atmospherics/unary/cold_sink/freezer/power_change() - ..() - if(stat & NOPOWER) - on = 0 - use_power = IDLE_POWER_USE - update_icon() - -/obj/machinery/atmospherics/unary/heat_reservoir/heater/ - name = "heater" - icon = 'icons/obj/cryogenic2.dmi' - icon_state = "heater" - density = 1 - var/max_temperature = 0 - anchored = 1.0 - layer = 3 - current_heat_capacity = 1000 - active_power_usage = 5000 - power_channel = EQUIP - max_integrity = 300 - armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 100, "bomb" = 0, "bio" = 100, "rad" = 100, "fire" = 80, "acid" = 30) - -/obj/machinery/atmospherics/unary/heat_reservoir/heater/New() - ..() - initialize_directions = dir - var/obj/item/circuitboard/thermomachine/H = new /obj/item/circuitboard/thermomachine(null) - H.build_path = /obj/machinery/atmospherics/unary/heat_reservoir/heater - H.name = "circuit board (Heater)" - component_parts = list() - component_parts += H - component_parts += new /obj/item/stock_parts/matter_bin(src) - component_parts += new /obj/item/stock_parts/matter_bin(src) - component_parts += new /obj/item/stock_parts/micro_laser(src) - component_parts += new /obj/item/stock_parts/micro_laser(src) - component_parts += new /obj/item/stack/sheet/glass(src) - component_parts += new /obj/item/stack/cable_coil(src, 1) - RefreshParts() - -/obj/machinery/atmospherics/unary/heat_reservoir/heater/upgraded/New() - ..() - var/obj/item/circuitboard/thermomachine/H = new /obj/item/circuitboard/thermomachine(null) - H.build_path = /obj/machinery/atmospherics/unary/heat_reservoir/heater - H.name = "circuit board (Heater)" - component_parts = list() - component_parts += H - component_parts += new /obj/item/stock_parts/matter_bin/super(src) - component_parts += new /obj/item/stock_parts/matter_bin/super(src) - component_parts += new /obj/item/stock_parts/micro_laser/ultra(src) - component_parts += new /obj/item/stock_parts/micro_laser/ultra(src) - component_parts += new /obj/item/stack/sheet/glass(src) - component_parts += new /obj/item/stack/cable_coil(src, 1) - RefreshParts() - -/obj/machinery/atmospherics/unary/heat_reservoir/heater/on_construction() - ..(dir,dir) - -/obj/machinery/atmospherics/unary/heat_reservoir/heater/process() - return // need to override the parent or it stops processing, meaning it stops using power. - -/obj/machinery/atmospherics/unary/heat_reservoir/heater/RefreshParts() - var/H - var/T - for(var/obj/item/stock_parts/matter_bin/M in component_parts) - H += M.rating - for(var/obj/item/stock_parts/micro_laser/M in component_parts) - T += M.rating - max_temperature = T20C + (140 * T) - current_heat_capacity = 1000 * ((H - 1) ** 2) - -/obj/machinery/atmospherics/unary/heat_reservoir/heater/attackby(obj/item/I, mob/user, params) - if(exchange_parts(user, I)) - return - return ..() - -/obj/machinery/atmospherics/unary/heat_reservoir/heater/crowbar_act(mob/user, obj/item/I) - if(default_deconstruction_crowbar(user, I)) - return TRUE - -/obj/machinery/atmospherics/unary/heat_reservoir/heater/screwdriver_act(mob/user, obj/item/I) - if(default_deconstruction_screwdriver(user, "heater-o", "heater", I)) - on = 0 - use_power = IDLE_POWER_USE - update_icon() - return TRUE - -/obj/machinery/atmospherics/unary/heat_reservoir/heater/wrench_act(mob/user, obj/item/I) - . = TRUE - if(!I.use_tool(src, user, 0, volume = I.tool_volume)) - return - if(!panel_open) - to_chat(user, "Open the maintenance panel first.") - return - var/list/choices = list("West" = WEST, "East" = EAST, "South" = SOUTH, "North" = NORTH) - var/selected = input(user,"Select a direction for the connector.", "Connector Direction") in choices - dir = choices[selected] - var/node_connect = dir - initialize_directions = dir - for(var/obj/machinery/atmospherics/target in get_step(src,node_connect)) - if(target.initialize_directions & get_dir(target,src)) - node = target - break - build_network() - update_icon() - -/obj/machinery/atmospherics/unary/heat_reservoir/heater/update_icon() - if(panel_open) - icon_state = "heater-o" - else if(src.on) - icon_state = "heater_1" - else - icon_state = "heater" - return - -/obj/machinery/atmospherics/unary/heat_reservoir/heater/attack_ai(mob/user as mob) - attack_hand(user) - -/obj/machinery/atmospherics/unary/heat_reservoir/heater/attack_ghost(mob/user as mob) - src.attack_hand(user) - -/obj/machinery/atmospherics/unary/heat_reservoir/heater/attack_hand(mob/user as mob) - if(panel_open) - to_chat(user, "Close the maintenance panel first.") - return - ui_interact(user) - -/obj/machinery/atmospherics/unary/heat_reservoir/heater/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state) - ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open) - if(!ui) - ui = new(user, src, ui_key, "GasFreezer", "Gas Heating System", 540, 200) - ui.open() - -/obj/machinery/atmospherics/unary/heat_reservoir/heater/ui_data(mob/user) - var/list/data = list() - data["on"] = on - data["pressure"] = round(air_contents.return_pressure()) - data["temperature"] = round(air_contents.temperature) - data["temperatureCelsius"] = round(air_contents.temperature - T0C, 1) - if(air_contents.total_moles() == 0 && air_contents.temperature == 0) - data["temperatureCelsius"] = 0 - data["min"] = round(T20C) - data["max"] = round(T20C + max_temperature) - data["target"] = round(current_temperature) - data["targetCelsius"] = round(current_temperature - T0C, 1) - return data - -/obj/machinery/atmospherics/unary/heat_reservoir/heater/ui_act(action, params) - if(..()) - return - add_fingerprint(usr) - . = TRUE - - switch(action) - if("power") - on = !on - if(on) - use_power = ACTIVE_POWER_USE - else - use_power = IDLE_POWER_USE - update_icon() - if("minimum") - current_temperature = T20C - if("maximum") - current_temperature = max_temperature + T20C - if("temp") - var/amount = params["temp"] - amount = text2num(amount) - current_temperature = clamp(amount, T20C, T20C + max_temperature) - -/obj/machinery/atmospherics/unary/heat_reservoir/heater/power_change() - ..() - if(stat & NOPOWER) - on = 0 - use_power = IDLE_POWER_USE - update_icon() diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm index 5d123fd225f..ea7fa1f118b 100644 --- a/code/game/machinery/Sleeper.dm +++ b/code/game/machinery/Sleeper.dm @@ -115,7 +115,7 @@ if(world.timeofday > (R.last_addiction_dose + ADDICTION_SPEEDUP_TIME)) // 2.5 minutes addiction_removal_chance = 10 if(prob(addiction_removal_chance)) - to_chat(occupant, "You no longer feel reliant on [R.name]!") + to_chat(occupant, "You no longer feel reliant on [R.name]!") occupant.reagents.addiction_list.Remove(R) qdel(R) @@ -462,7 +462,7 @@ set category = "Object" set src in oview(1) - if(usr.incapacitated()) //are you cuffed, dying, lying, stunned or other + if(usr.incapacitated() || !Adjacent(usr)) return if(beaker) diff --git a/code/game/machinery/adv_med.dm b/code/game/machinery/adv_med.dm index 4978db6efce..670e58247d4 100644 --- a/code/game/machinery/adv_med.dm +++ b/code/game/machinery/adv_med.dm @@ -321,9 +321,9 @@ occupantData["intOrgan"] = intOrganData - occupantData["blind"] = (BLINDNESS in occupant.mutations) - occupantData["colourblind"] = (COLOURBLIND in occupant.mutations) - occupantData["nearsighted"] = (NEARSIGHTED in occupant.mutations) + occupantData["blind"] = HAS_TRAIT(occupant, TRAIT_BLIND) + occupantData["colourblind"] = HAS_TRAIT(occupant, TRAIT_COLORBLIND) + occupantData["nearsighted"] = HAS_TRAIT(occupant, TRAIT_NEARSIGHT) data["occupant"] = occupantData return data @@ -511,11 +511,11 @@ dat += "" dat += "" dat += "
[T.title]
[i.name]N/A[i.damage][infection]:[mech][dead]
" - if(BLINDNESS in occupant.mutations) + if(HAS_TRAIT(occupant, TRAIT_BLIND)) dat += "Cataracts detected.
" - if(COLOURBLIND in occupant.mutations) + if(HAS_TRAIT(occupant, TRAIT_COLORBLIND)) dat += "Photoreceptor abnormalities detected.
" - if(NEARSIGHTED in occupant.mutations) + if(HAS_TRAIT(occupant, TRAIT_NEARSIGHT)) dat += "Retinal misalignment detected.
" else dat += "[src] is empty." diff --git a/code/game/machinery/ai_slipper.dm b/code/game/machinery/ai_slipper.dm index eaa1120ab04..45cd917c39b 100644 --- a/code/game/machinery/ai_slipper.dm +++ b/code/game/machinery/ai_slipper.dm @@ -27,7 +27,7 @@ disabled = TRUE update_icon() -/obj/machinery/ai_slipper/proc/setState(var/enabled, var/uses) +/obj/machinery/ai_slipper/proc/setState(enabled, uses) disabled = disabled uses = uses power_change() diff --git a/code/game/machinery/atmo_control.dm b/code/game/machinery/atmo_control.dm deleted file mode 100644 index 93ecea71fa8..00000000000 --- a/code/game/machinery/atmo_control.dm +++ /dev/null @@ -1,741 +0,0 @@ -/obj/machinery/air_sensor - icon = 'icons/obj/stationobjs.dmi' - icon_state = "gsensor1" - resistance_flags = FIRE_PROOF - name = "gas sensor" - req_one_access_txt = "24;10" - - anchored = 1 - var/state = 0 - var/bolts = 1 - - var/id_tag - frequency = ATMOS_VENTSCRUB - Mtoollink = 1 - settagwhitelist = list("id_tag") - - var/on = 1 - var/output = 3 - //Flags: - // 1 for pressure - // 2 for temperature - // Output >= 4 includes gas composition - // 4 for oxygen concentration - // 8 for toxins concentration - // 16 for nitrogen concentration - // 32 for carbon dioxide concentration - -/obj/machinery/air_sensor/update_icon() - icon_state = "gsensor[on]" - -/obj/machinery/air_sensor/multitool_menu(var/mob/user, var/obj/item/multitool/P) - return {" - Main - "} - -/obj/machinery/air_sensor/multitool_topic(var/mob/user, var/list/href_list, var/obj/O) - . = ..() - if(.) - return . - - if("toggle_out_flag" in href_list) - var/bitflag_value = text2num(href_list["toggle_out_flag"])//this is a string normally - if(!(bitflag_value in list(1, 2, 4, 8, 16, 32))) //Here to prevent breaking the sensors with HREF exploits - return 0 - if(output&bitflag_value)//the bitflag is on ATM - output &= ~bitflag_value - else//can't not be off - output |= bitflag_value - 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") - return TRUE - -/obj/machinery/air_sensor/attackby(var/obj/item/W as obj, var/mob/user as mob) - if(istype(W, /obj/item/multitool)) - update_multitool_menu(user) - return 1 - if(istype(W, /obj/item/wrench)) - if(bolts) - to_chat(usr, "The [src] is bolted to the floor! You can't detach it like this.") - return 1 - playsound(loc, W.usesound, 50, 1) - to_chat(user, "You begin to unfasten \the [src]...") - if(do_after(user, 40 * W.toolspeed, target = src)) - user.visible_message("[user] unfastens \the [src].", "You have unfastened \the [src].", "You hear ratchet.") - new /obj/item/pipe_gsensor(src.loc) - qdel(src) - return 1 - return - return ..() - -/obj/machinery/air_sensor/process_atmos() - if(on) - if(!radio_connection) - return - var/datum/signal/signal = new - signal.transmission_method = 1 //radio signal - signal.data["tag"] = id_tag - signal.data["timestamp"] = world.time - - var/datum/gas_mixture/air_sample = return_air() - - if(output&1) - signal.data["pressure"] = num2text(round(air_sample.return_pressure(),0.1),) - if(output&2) - signal.data["temperature"] = round(air_sample.temperature,0.1) - - if(output>4) - var/total_moles = air_sample.total_moles() - if(total_moles > 0) - if(output&4) - signal.data["oxygen"] = round(100*air_sample.oxygen/total_moles,0.1) - if(output&8) - signal.data["toxins"] = round(100*air_sample.toxins/total_moles,0.1) - if(output&16) - signal.data["nitrogen"] = round(100*air_sample.nitrogen/total_moles,0.1) - if(output&32) - signal.data["carbon_dioxide"] = round(100*air_sample.carbon_dioxide/total_moles,0.1) - else - signal.data["oxygen"] = 0 - signal.data["toxins"] = 0 - signal.data["nitrogen"] = 0 - signal.data["carbon_dioxide"] = 0 - signal.data["sigtype"]="status" - radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA) - -/obj/machinery/air_sensor/set_frequency(new_frequency) - SSradio.remove_object(src, frequency) - frequency = new_frequency - radio_connection = SSradio.add_object(src, frequency, RADIO_ATMOSIA) - -/obj/machinery/air_sensor/Initialize() - ..() - SSair.atmos_machinery += src - set_frequency(frequency) - -/obj/machinery/air_sensor/Destroy() - SSair.atmos_machinery -= src - if(SSradio) - SSradio.remove_object(src, frequency) - radio_connection = null - return ..() - - -/obj/machinery/computer/general_air_control - icon = 'icons/obj/computer.dmi' - icon_screen = "tank" - icon_keyboard = "atmos_key" - circuit = /obj/item/circuitboard/air_management - req_one_access_txt = "24;10" - - name = "Computer" - - frequency = ATMOS_VENTSCRUB - var/show_sensors=1 - var/list/sensors = list() - Mtoollink = 1 - - var/list/sensor_information = list() - -/obj/machinery/computer/general_air_control/Destroy() - if(SSradio) - SSradio.remove_object(src, frequency) - radio_connection = null - return ..() - -/obj/machinery/computer/general_air_control/attack_hand(mob/user) - if(..(user)) - return - var/html=return_text() - var/datum/browser/popup = new(user, "gac", name, 400, 400) - popup.set_content(html) - popup.open(0) - user.set_machine(src) - onclose(user, "gac") - -/obj/machinery/computer/general_air_control/process() - ..() - if(!sensors) - //warning("[src.type] at [x],[y],[z] has null sensors. Please fix.")//commenting this line out because the admins will get a warning like this every time somebody builds another GAC - sensors = list() - src.updateUsrDialog() - -/obj/machinery/computer/general_air_control/attackby(I as obj, user as mob, params) - if(istype(I, /obj/item/multitool)) - update_multitool_menu(user) - return 1 - return ..() - - -/obj/machinery/computer/general_air_control/receive_signal(datum/signal/signal) - if(!signal || signal.encryption) return - - var/id_tag = signal.data["tag"] - if(!id_tag || !sensors || !sensors.Find(id_tag)) return - - sensor_information[id_tag] = signal.data - -/obj/machinery/computer/general_air_control/proc/return_text() - var/sensor_data - if(show_sensors) - if(sensors.len) - for(var/id_tag in sensors) - var/long_name = sensors[id_tag] - var/list/data = sensor_information[id_tag] - var/sensor_part = "
[long_name]" - - if(data) - sensor_part += "" - if(data["pressure"]) - sensor_part += "" - if(data["temperature"]) - sensor_part += "" - if(data["oxygen"]||data["toxins"]||data["nitrogen"]||data["carbon_dioxide"]) - sensor_part += "" - sensor_part += "
Pressure:[data["pressure"]] kPa
Temperature:[data["temperature"]] K
Gas Composition :
    " - if(data["oxygen"]) - sensor_part += "
  • [data["oxygen"]]% O2
    • " - if(data["nitrogen"]) - sensor_part += "
  • [data["nitrogen"]]% N
    • " - if(data["carbon_dioxide"]) - sensor_part += "
  • [data["carbon_dioxide"]]% CO2
    • " - if(data["toxins"]) - sensor_part += "
  • [data["toxins"]]% Plasma
    • " - sensor_part += "
" - - else - sensor_part += "[long_name] can not be found!
" - sensor_part += "
" - sensor_data += sensor_part - - else - sensor_data = "No sensors connected." - - var/output = {" - - [show_sensors ? "

Sensor Data:

" + sensor_data : ""] - "} - - return output - -/obj/machinery/computer/general_air_control/set_frequency(new_frequency) - SSradio.remove_object(src, frequency) - frequency = new_frequency - radio_connection = SSradio.add_object(src, frequency, RADIO_ATMOSIA) - -/obj/machinery/computer/general_air_control/Initialize() - ..() - set_frequency(frequency) - -/obj/machinery/computer/general_air_control/multitool_menu(mob/user, obj/item/multitool/P) - var/dat= {" - Main - - Sensors: - "} - return dat - -/obj/machinery/computer/general_air_control/multitool_topic(mob/user,list/href_list,obj/O) - . = ..() - if(.) return . - if("add_sensor" in href_list) - - // Make a list of all available sensors on the same frequency - var/list/sensor_list = list() - for(var/obj/machinery/air_sensor/G in GLOB.machines) - if(!isnull(G.id_tag) && G.frequency == frequency) - sensor_list|=G.id_tag - if(!sensor_list.len) - to_chat(user, "No sensors on this frequency.") - return FALSE - - // Have the user pick one of them and name its label - var/sensor = input(user, "Select a sensor:", "Sensor Data") as null|anything in sensor_list - if(!sensor) - return FALSE - var/label = reject_bad_name( input(user, "Choose a sensor label:", "Sensor Label") as text|null, allow_numbers=1) - if(!label) - return FALSE - - // Add the sensor's information to general_air_controler - sensors[sensor] = label - return TRUE - - if("edit_sensor" in href_list) - var/list/sensor_list = list() - for(var/obj/machinery/air_sensor/G in GLOB.machines) - if(!isnull(G.id_tag) && G.frequency == frequency) - sensor_list|=G.id_tag - if(!sensor_list.len) - to_chat(user, "No sensors on this frequency.") - return FALSE - var/label = sensors[href_list["edit_sensor"]] - var/sensor = input(user, "Select a sensor:", "Sensor Data", href_list["edit_sensor"]) as null|anything in sensor_list - if(!sensor) - return FALSE - sensors.Remove(href_list["edit_sensor"]) - sensors[sensor] = label - return TRUE - -/obj/machinery/computer/general_air_control/unlinkFrom(mob/user, obj/O) - ..() - if("id_tag" in O.vars && (istype(O,/obj/machinery/air_sensor) || istype(O, /obj/machinery/meter))) - sensors.Remove(O:id_tag) - return 1 - return 0 - -/obj/machinery/computer/general_air_control/linkMenu(obj/O) - if(isLinkedWith(O)) - return - - var/dat="" - - if(istype(O,/obj/machinery/air_sensor) || istype(O, /obj/machinery/meter)) - dat += " \[New Sensor\] " - return dat - -/obj/machinery/computer/general_air_control/canLink(obj/O, list/context) - if(istype(O,/obj/machinery/air_sensor) || istype(O, /obj/machinery/meter)) - return O:id_tag - -/obj/machinery/computer/general_air_control/isLinkedWith(obj/O) - if(istype(O,/obj/machinery/air_sensor) || istype(O, /obj/machinery/meter)) - return O:id_tag in sensors - -/obj/machinery/computer/general_air_control/linkWith(mob/user, obj/O, context) - sensors[O:id_tag] = reject_bad_name(clean_input(user, "Choose a sensor label:", "Sensor Label"), allow_numbers=1) - return 1 - -/obj/machinery/computer/general_air_control/large_tank_control - circuit = /obj/item/circuitboard/large_tank_control - req_one_access_txt = "24;10" - settagwhitelist = list("input_tag", "output_tag") - - var/input_tag - var/output_tag - - var/list/input_info - var/list/output_info - - var/list/input_linkable=list( - /obj/machinery/atmospherics/unary/outlet_injector, - /obj/machinery/atmospherics/unary/vent_pump - ) - - var/list/output_linkable=list( - /obj/machinery/atmospherics/unary/vent_pump - ) - - var/pressure_setting = ONE_ATMOSPHERE * 45 - -/obj/machinery/computer/general_air_control/large_tank_control/attackby(I as obj, user as mob) - if(istype(I, /obj/item/multitool)) - update_multitool_menu(user) - return 1 - return ..() - - -/obj/machinery/computer/general_air_control/large_tank_control/multitool_menu(mob/user, obj/item/multitool/P) - var/dat= {" - - Sensors: - "} - return dat - - -/obj/machinery/computer/general_air_control/large_tank_control/linkWith(mob/user, obj/machinery/atmospherics/unary/O, list/context) - if(!is_type_in_list(O, input_linkable)) - return FALSE - - if(context["slot"] == "input") - input_tag = O.id_tag - input_info = null - if(istype(O, /obj/machinery/atmospherics/unary/vent_pump)) - send_signal(list("tag" = input_tag, - "direction" = 1, // Release - "checks" = 0 // No pressure checks. - )) - return TRUE - - if(context["slot"] == "output") - output_tag = O.id_tag - output_info = null - if(istype(O, /obj/machinery/atmospherics/unary/vent_pump)) - send_signal(list("tag" = output_tag, - "direction" = 0, // Siphon - "checks" = 2 // Internal pressure checks. - )) - return TRUE - -/obj/machinery/computer/general_air_control/large_tank_control/unlinkFrom(mob/user, obj/O) - if("id_tag" in O.vars) - if(O:id_tag == input_tag) - input_tag=null - input_info=null - return 1 - if(O:id_tag == output_tag) - output_tag=null - output_info=null - return 1 - return 0 - -/obj/machinery/computer/general_air_control/large_tank_control/linkMenu(obj/O) - var/dat="" - if(canLink(O,list("slot"="input"))) - dat += " \[Link @ Input\] " - if(canLink(O,list("slot"="output"))) - dat += " \[Link @ Output\] " - return dat - -/obj/machinery/computer/general_air_control/large_tank_control/canLink(obj/O, list/context) - return (context["slot"]=="input" && is_type_in_list(O,input_linkable)) || (context["slot"]=="output" && is_type_in_list(O,output_linkable)) - -/obj/machinery/computer/general_air_control/large_tank_control/isLinkedWith(obj/O) - if(O:id_tag == input_tag) - return 1 - if(O:id_tag == output_tag) - return 1 - return 0 - -/obj/machinery/computer/general_air_control/large_tank_control/process() - ..() - if(!input_info && input_tag) - request_device_refresh(input_tag) - if(!output_info && output_tag) - request_device_refresh(output_tag) - -/obj/machinery/computer/general_air_control/large_tank_control/return_text() - var/output = ..() - //if(signal.data) - // input_info = signal.data // Attempting to fix intake control -- TLE - - output += "

Tank Control System


" - if(input_tag) - if(input_info) - var/power = (input_info["power"]) - var/volume_rate = input_info["volume_rate"] - output += {" -
- Input (Refresh) - - - - - - - - - -
State:[power?("Injecting"):("On Hold")]
Rate:[volume_rate] L/sec
-
-"} - else - output += "ERROR: Can not find input port Search
" - if(output_tag) - if(output_info) - var/power = (output_info["power"]) - var/output_pressure = output_info["internal"] - output += {" -
- Output (Refresh) - - - - - - - - - -
State:[power?("Open"):("On Hold")]
Max Output Pressure:[output_pressure] kPa
-
-"} - else - output += "ERROR: Can not find output port Search
" - - return output - -/obj/machinery/computer/general_air_control/large_tank_control/receive_signal(datum/signal/signal) - if(!signal || signal.encryption) return - - var/id_tag = signal.data["tag"] - - if(input_tag == id_tag) - input_info = signal.data - updateUsrDialog() - else if(output_tag == id_tag) - output_info = signal.data - updateUsrDialog() - else - ..(signal) - -/obj/machinery/computer/general_air_control/large_tank_control/proc/request_device_refresh(device) - send_signal(list("tag"=device, "status")) - -/obj/machinery/computer/general_air_control/large_tank_control/proc/send_signal(list/data) - if(!radio_connection) - return - var/datum/signal/signal = new - signal.transmission_method = 1 //radio signal - signal.source = src - signal.data=data - signal.data["sigtype"]="command" - radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA) - -/obj/machinery/computer/general_air_control/large_tank_control/Topic(href, href_list) - if(..()) - return 1 - - add_fingerprint(usr) - - if(href_list["out_set_pressure"]) - var/response=input(usr,"Set new pressure, in kPa. \[0-[50*ONE_ATMOSPHERE]\]") as num - pressure_setting = text2num(response) - pressure_setting = between(0, pressure_setting, 50*ONE_ATMOSPHERE) - - if(!radio_connection) - return 0 - var/datum/signal/signal = new - signal.transmission_method = 1 //radio signal - signal.source = src - if(href_list["in_refresh_status"]) - input_info = null - signal.data = list ("tag" = input_tag, "status" = 1) - - else if(href_list["in_toggle_injector"]) - input_info = null - signal.data = list ("tag" = input_tag, "power_toggle" = 1) - - else if(href_list["out_refresh_status"]) - output_info = null - signal.data = list ("tag" = output_tag, "status" = 1) - - else if(href_list["out_toggle_power"]) - output_info = null - signal.data = list ("tag" = output_tag, "power_toggle" = 1) - - else if(href_list["out_set_pressure"]) - output_info = null - signal.data = list ("tag" = output_tag, "set_internal_pressure" = "[pressure_setting]") - /*else - testing("Bad Topic() to GAC \"[src.name]\": [href]") - return*/ // NOPE. // disabling because it spams when multitool menus are used - - signal.data["sigtype"] = "command" - radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA) - src.updateUsrDialog() - -/obj/machinery/computer/general_air_control/fuel_injection - icon = 'icons/obj/computer.dmi' - icon_screen = "atmos" - circuit = /obj/item/circuitboard/injector_control - - var/device_tag - var/list/device_info - - var/automation = 0 - - var/cutoff_temperature = 2000 - var/on_temperature = 1200 - -/obj/machinery/computer/general_air_control/fuel_injection/attackby(I as obj, user as mob, params) - if(istype(I, /obj/item/multitool)) - update_multitool_menu(user) - return 1 - return ..() - -/obj/machinery/computer/general_air_control/fuel_injection/process() - if(automation) - if(!radio_connection) - return 0 - - var/injecting = 0 - for(var/id_tag in sensor_information) - var/list/data = sensor_information[id_tag] - if(data["temperature"]) - if(data["temperature"] >= cutoff_temperature) - injecting = 0 - break - if(data["temperature"] <= on_temperature) - injecting = 1 - - var/datum/signal/signal = new - signal.transmission_method = 1 //radio signal - signal.source = src - - signal.data = list( - "tag" = device_tag, - "power" = injecting, - "sigtype"="command" - ) - - radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA) - - ..() - -/obj/machinery/computer/general_air_control/fuel_injection/return_text() - var/output = ..() - output += "
Fuel Injection System (Refresh)" - if(device_info) - var/power = device_info["power"] - var/volume_rate = device_info["volume_rate"] - output += {" - - - - - - - - - - - - "} - - if(automation) - - // AUTOFIXED BY fix_string_idiocy.py - // C:\Users\Rob\Documents\Projects\vgstation13\code\game\machinery\atmo_control.dm:372: output += "Automated Fuel Injection: Engaged
" - output += {" - - - "} - // END AUTOFIX - else - - // AUTOFIXED BY fix_string_idiocy.py - // C:\Users\Rob\Documents\Projects\vgstation13\code\game\machinery\atmo_control.dm:375: output += "Automated Fuel Injection: Disengaged
" - output += {" - - - - "} - // END AUTOFIX - output += "
Status:[power?"Injecting":"On Hold"]
Rate:[volume_rate] L/sec
Automated Fuel Injection:[automation?"Engaged":"Disengaged"]
Injector Controls Locked Out
Injector:Toggle Power Inject (1 Cycle)
" - else - output += {"

ERROR: Can not find device. Search

"} - output += "
" - - return output - -/obj/machinery/computer/general_air_control/fuel_injection/receive_signal(datum/signal/signal) - if(!signal || signal.encryption) return - - var/id_tag = signal.data["tag"] - - if(device_tag == id_tag) - device_info = signal.data - else - ..(signal) - -/obj/machinery/computer/general_air_control/fuel_injection/Topic(href, href_list) - if(..()) - return - - if(href_list["refresh_status"]) - device_info = null - if(!radio_connection) - return 0 - - var/datum/signal/signal = new - signal.transmission_method = 1 //radio signal - signal.source = src - signal.data = list( - "tag" = device_tag, - "status", - "sigtype"="command" - ) - radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA) - - if(href_list["toggle_automation"]) - automation = !automation - - if(href_list["toggle_injector"]) - device_info = null - if(!radio_connection) - return 0 - - var/datum/signal/signal = new - signal.transmission_method = 1 //radio signal - signal.source = src - signal.data = list( - "tag" = device_tag, - "power_toggle", - "sigtype"="command" - ) - - radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA) - - if(href_list["injection"]) - if(!radio_connection) - return 0 - - var/datum/signal/signal = new - signal.transmission_method = 1 //radio signal - signal.source = src - signal.data = list( - "tag" = device_tag, - "inject", - "sigtype"="command" - ) - - radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA) diff --git a/code/game/machinery/atmoalter/zvent.dm b/code/game/machinery/atmoalter/zvent.dm deleted file mode 100644 index 773432133e8..00000000000 --- a/code/game/machinery/atmoalter/zvent.dm +++ /dev/null @@ -1,35 +0,0 @@ -/obj/machinery/zvent - name = "Interfloor Air Transfer System" - - icon = 'icons/obj/pipes.dmi' - icon_state = "vent-db" - density = 0 - anchored=1 - - var/on = 0 - var/volume_rate = 800 - -/obj/machinery/zvent/New() - ..() - SSair.atmos_machinery += src - -/obj/machinery/zvent/Destroy() - SSair.atmos_machinery -= src - return ..() - -/obj/machinery/zvent/process_atmos() - - //all this object does, is make its turf share air with the ones above and below it, if they have a vent too. - if(istype(loc,/turf/simulated)) //if we're not on a valid turf, forget it - for(var/new_z in list(-1,1)) //change this list if a fancier system of z-levels gets implemented - var/turf/simulated/zturf_conn = locate(x,y,z+new_z) - if(istype(zturf_conn)) - var/obj/machinery/zvent/zvent_conn= locate(/obj/machinery/zvent) in zturf_conn - if(istype(zvent_conn)) - //both floors have simulated turfs, share() - var/turf/simulated/myturf = loc - var/datum/gas_mixture/conn_air = zturf_conn.air //TODO: pop culture reference - var/datum/gas_mixture/my_air = myturf.air - if(istype(conn_air) && istype(my_air)) - my_air.share(conn_air) - air_update_turf() diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm index 8a800e9a29f..c148ca6e68f 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -37,12 +37,13 @@ var/list/recipiecache = list() var/list/categories = list("Tools", "Electronics", "Construction", "Communication", "Security", "Machinery", "Medical", "Miscellaneous", "Dinnerware", "Imported") + var/board_type = /obj/item/circuitboard/autolathe /obj/machinery/autolathe/New() AddComponent(/datum/component/material_container, list(MAT_METAL, MAT_GLASS), _show_on_examine=TRUE, _after_insert=CALLBACK(src, .proc/AfterMaterialInsert)) ..() component_parts = list() - component_parts += new /obj/item/circuitboard/autolathe(null) + component_parts += new board_type(null) component_parts += new /obj/item/stock_parts/matter_bin(null) component_parts += new /obj/item/stock_parts/matter_bin(null) component_parts += new /obj/item/stock_parts/matter_bin(null) @@ -57,7 +58,7 @@ /obj/machinery/autolathe/upgraded/New() ..() component_parts = list() - component_parts += new /obj/item/circuitboard/autolathe(null) + component_parts += new board_type(null) component_parts += new /obj/item/stock_parts/matter_bin/super(null) component_parts += new /obj/item/stock_parts/matter_bin/super(null) component_parts += new /obj/item/stock_parts/matter_bin/super(null) @@ -288,6 +289,8 @@ return ..() /obj/machinery/autolathe/crowbar_act(mob/user, obj/item/I) + if(!panel_open) + return if(!I.use_tool(src, user, 0, volume = 0)) return . = TRUE @@ -491,3 +494,13 @@ /obj/machinery/autolathe/proc/check_disabled_callback() if(!wires.is_cut(WIRE_AUTOLATHE_DISABLE)) disabled = FALSE + +/obj/machinery/autolathe/syndicate + name = "syndicate autolathe" + board_type = /obj/item/circuitboard/autolathe/syndi + +/obj/machinery/autolathe/syndicate/New() + ..() + if(files) + QDEL_NULL(files) + files = new /datum/research/autolathe/syndicate(src) diff --git a/code/game/machinery/buttons.dm b/code/game/machinery/buttons.dm index 9d7b73b2bcc..32b9b381887 100644 --- a/code/game/machinery/buttons.dm +++ b/code/game/machinery/buttons.dm @@ -24,7 +24,7 @@ /obj/machinery/button/indestructible resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF -/obj/machinery/driver_button/New(turf/loc, var/w_dir=null) +/obj/machinery/driver_button/New(turf/loc, w_dir=null) ..() switch(w_dir) if(NORTH) @@ -81,7 +81,7 @@ return ..() -/obj/machinery/driver_button/multitool_menu(var/mob/user, var/obj/item/multitool/P) +/obj/machinery/driver_button/multitool_menu(mob/user, obj/item/multitool/P) return {"
  • ID Tag: [format_tag("ID Tag","id_tag","set_id")]
    • @@ -147,7 +147,7 @@ icon_state = "launcherbtt" active = 0 -/obj/machinery/driver_button/multitool_topic(var/mob/user,var/list/href_list,var/obj/O) +/obj/machinery/driver_button/multitool_topic(mob/user, list/href_list, obj/O) ..() if("toggle_logic" in href_list) logic_connect = !logic_connect diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm index e174bd5fca8..1d4b59acdf9 100644 --- a/code/game/machinery/camera/camera.dm +++ b/code/game/machinery/camera/camera.dm @@ -104,12 +104,6 @@ to_chat(M, "The screen bursts into static.") ..() -/obj/machinery/camera/tesla_act(power)//EMP proof upgrade also makes it tesla immune - if(isEmpProof()) - return - ..() - qdel(src)//to prevent bomb testing camera from exploding over and over forever - /obj/machinery/camera/ex_act(severity) if(invuln) return diff --git a/code/game/machinery/camera/tracking.dm b/code/game/machinery/camera/tracking.dm index 1c247b23c03..b67357fead3 100644 --- a/code/game/machinery/camera/tracking.dm +++ b/code/game/machinery/camera/tracking.dm @@ -33,7 +33,7 @@ return T -/mob/living/silicon/ai/proc/ai_camera_list(var/camera in get_camera_list()) +/mob/living/silicon/ai/proc/ai_camera_list(camera in get_camera_list()) set category = "AI Commands" set name = "Show Camera List" @@ -160,7 +160,7 @@ ai_actual_track(target) -/mob/living/silicon/ai/proc/ai_cancel_tracking(var/forced = 0) +/mob/living/silicon/ai/proc/ai_cancel_tracking(forced = 0) if(!cameraFollow) return diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm index aad316726ac..e8d5cfcf437 100644 --- a/code/game/machinery/cloning.dm +++ b/code/game/machinery/cloning.dm @@ -210,12 +210,6 @@ GLOBAL_LIST_INIT(cloner_biomass_items, list(\ if(radio_announce) Radio.autosay(message, name, "Medical", list(z)) -/obj/machinery/clonepod/proc/spooky_devil_flavor() - playsound(loc, pick('sound/goonstation/voice/male_scream.ogg', 'sound/goonstation/voice/female_scream.ogg'), 100, 1) - mess = TRUE - update_icon() - connected_message("If you keep trying to steal from me, you'll end up with me.") - //Start growing a human clone in the pod! /obj/machinery/clonepod/proc/growclone(datum/dna2/record/R) if(mess || attempting || panel_open || stat & (NOPOWER|BROKEN)) @@ -225,11 +219,6 @@ GLOBAL_LIST_INIT(cloner_biomass_items, list(\ return 0 if(clonemind.current && clonemind.current.stat != DEAD) //mind is associated with a non-dead body return 0 - if(clonemind.damnation_type) - spooky_devil_flavor() - return 0 - if(!clonemind.is_revivable()) //Other reasons for being unrevivable - return 0 if(clonemind.active) //somebody is using that mind if(ckey(clonemind.key) != R.ckey ) return 0 @@ -274,7 +263,7 @@ GLOBAL_LIST_INIT(cloner_biomass_items, list(\ for(var/datum/language/L in R.languages) H.add_language(L.name) - domutcheck(H, null, MUTCHK_FORCED) //Ensures species that get powers by the species proc handle_dna keep them + domutcheck(H, MUTCHK_FORCED) //Ensures species that get powers by the species proc handle_dna keep them if(efficiency > 2 && efficiency < 5 && prob(25)) randmutb(H) @@ -331,7 +320,7 @@ GLOBAL_LIST_INIT(cloner_biomass_items, list(\ connected_message("Clone Ejected: Loss of power.") else if((occupant) && (occupant.loc == src)) - if((occupant.stat == DEAD) || (occupant.suiciding) || (occupant.mind && !occupant.mind.is_revivable())) //Autoeject corpses and suiciding dudes. + if((occupant.stat == DEAD) || (occupant.suiciding)) //Autoeject corpses and suiciding dudes. announce_radio_message("The cloning of [occupant] has been aborted due to unrecoverable tissue failure.") go_out() connected_message("Clone Rejected: Deceased.") @@ -439,11 +428,9 @@ GLOBAL_LIST_INIT(cloner_biomass_items, list(\ anchored = TRUE /obj/machinery/clonepod/emag_act(user) - if(isnull(occupant)) - return - go_out() + malfunction() -/obj/machinery/clonepod/proc/update_clone_antag(var/mob/living/carbon/human/H) +/obj/machinery/clonepod/proc/update_clone_antag(mob/living/carbon/human/H) // Check to see if the clone's mind is an antagonist of any kind and handle them accordingly to make sure they get their spells, HUD/whatever else back. if((H.mind in SSticker.mode:revolutionaries) || (H.mind in SSticker.mode:head_revolutionaries)) SSticker.mode.update_rev_icons_added() //So the icon actually appears @@ -534,7 +521,7 @@ GLOBAL_LIST_INIT(cloner_biomass_items, list(\ message += "Agony blazes across your consciousness as your body is torn apart.
    " message += "Is this what dying is like? Yes it is." to_chat(occupant, "[message]") - occupant << sound('sound/hallucinations/veryfar_noise.ogg',0,1,50) + SEND_SOUND(occupant, sound('sound/hallucinations/veryfar_noise.ogg', 0, 1, 50)) for(var/i in missing_organs) qdel(i) missing_organs.Cut() diff --git a/code/game/machinery/computer/HolodeckControl.dm b/code/game/machinery/computer/HolodeckControl.dm index 3bdcf8766af..73ef22b3616 100644 --- a/code/game/machinery/computer/HolodeckControl.dm +++ b/code/game/machinery/computer/HolodeckControl.dm @@ -12,11 +12,11 @@ light_color = LIGHT_COLOR_CYAN -/obj/machinery/computer/HolodeckControl/attack_ai(var/mob/user as mob) +/obj/machinery/computer/HolodeckControl/attack_ai(mob/user as mob) return attack_hand(user) -/obj/machinery/computer/HolodeckControl/attack_hand(var/mob/user as mob) +/obj/machinery/computer/HolodeckControl/attack_hand(mob/user as mob) if(..()) return 1 @@ -159,7 +159,7 @@ updateUsrDialog() return -/obj/machinery/computer/HolodeckControl/attackby(var/obj/item/D as obj, var/mob/user as mob, params) +/obj/machinery/computer/HolodeckControl/attackby(obj/item/D as obj, mob/user as mob, params) return /obj/machinery/computer/HolodeckControl/emag_act(user as mob) @@ -221,7 +221,7 @@ T.ex_act(3) T.hotspot_expose(1000,500,1) -/obj/machinery/computer/HolodeckControl/proc/derez(var/obj/obj , var/silent = 1) +/obj/machinery/computer/HolodeckControl/proc/derez(obj/obj , silent = 1) holographic_items.Remove(obj) if(obj == null) @@ -237,14 +237,14 @@ visible_message("The [oldobj.name] fades away!") qdel(obj) -/obj/machinery/computer/HolodeckControl/proc/checkInteg(var/area/A) +/obj/machinery/computer/HolodeckControl/proc/checkInteg(area/A) for(var/turf/T in A) if(istype(T, /turf/space)) return 0 return 1 -/obj/machinery/computer/HolodeckControl/proc/togglePower(var/toggleOn = 0) +/obj/machinery/computer/HolodeckControl/proc/togglePower(toggleOn = 0) if(toggleOn) var/area/targetsource = locate(/area/holodeck/source_emptycourt) @@ -269,7 +269,7 @@ active = 0 -/obj/machinery/computer/HolodeckControl/proc/loadProgram(var/area/A) +/obj/machinery/computer/HolodeckControl/proc/loadProgram(area/A) if(world.time < (last_change + 25)) if(world.time < (last_change + 15))//To prevent super-spam clicking, reduced process size and annoyance -Sieve @@ -332,10 +332,9 @@ icon_state = "grass1" floor_tile = /obj/item/stack/tile/grass -/turf/simulated/floor/holofloor/grass/New() - ..() - spawn(1) - update_icon() +/turf/simulated/floor/holofloor/grass/Initialize(mapload) + . = ..() + update_icon() /turf/simulated/floor/holofloor/grass/update_icon() ..() diff --git a/code/game/machinery/computer/Operating.dm b/code/game/machinery/computer/Operating.dm index 9d98bf6105d..c875b094058 100644 --- a/code/game/machinery/computer/Operating.dm +++ b/code/game/machinery/computer/Operating.dm @@ -185,7 +185,7 @@ var/patientStatus // Tell the computer what to say based on the status of the patient on the table. var/isNewPatient = (table.patient != currentPatient) //Is this a new Patient? - if(table.patient.stat == DEAD || table.patient.status_flags & FAKEDEATH) + if(table.patient.stat == DEAD || HAS_TRAIT(table.patient, TRAIT_FAKEDEATH)) patientStatus = "Dead" else if(table.patient.stat == CONSCIOUS) patientStatus = "Awake" diff --git a/code/game/machinery/computer/ai_core.dm b/code/game/machinery/computer/ai_core.dm index 6d07aaf3299..b9c567321c3 100644 --- a/code/game/machinery/computer/ai_core.dm +++ b/code/game/machinery/computer/ai_core.dm @@ -7,7 +7,7 @@ max_integrity = 500 var/state = 0 var/datum/ai_laws/laws = null - var/obj/item/circuitboard/circuit = null + var/obj/item/circuitboard/aicore/circuit = null var/obj/item/mmi/brain = null /obj/structure/AIcore/Destroy() @@ -242,8 +242,8 @@ anchored = TRUE state = AI_READY_CORE -/obj/structure/AIcore/deactivated/New() - ..() +/obj/structure/AIcore/deactivated/Initialize(mapload) + . = ..() circuit = new(src) /obj/structure/AIcore/deactivated/Destroy() diff --git a/code/game/machinery/computer/aifixer.dm b/code/game/machinery/computer/aifixer.dm index b1fef7a1b23..8afa3fbb429 100644 --- a/code/game/machinery/computer/aifixer.dm +++ b/code/game/machinery/computer/aifixer.dm @@ -21,10 +21,10 @@ else return ..() -/obj/machinery/computer/aifixer/attack_ai(var/mob/user as mob) +/obj/machinery/computer/aifixer/attack_ai(mob/user as mob) ui_interact(user) -/obj/machinery/computer/aifixer/attack_hand(var/mob/user as mob) +/obj/machinery/computer/aifixer/attack_hand(mob/user as mob) ui_interact(user) /obj/machinery/computer/aifixer/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state) @@ -107,7 +107,7 @@ else overlays += image(icon,"ai-fixer-empty",overlay_layer) -/obj/machinery/computer/aifixer/transfer_ai(var/interaction, var/mob/user, var/mob/living/silicon/ai/AI, var/obj/item/aicard/card) +/obj/machinery/computer/aifixer/transfer_ai(interaction, mob/user, mob/living/silicon/ai/AI, obj/item/aicard/card) if(!..()) return //Downloading AI from card to terminal. diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index feb7a823a37..391a137749a 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -21,7 +21,7 @@ Reset() -/obj/machinery/computer/arcade/proc/prizevend(var/score) +/obj/machinery/computer/arcade/proc/prizevend(score) if(!contents.len) var/prize_amount if(score) @@ -113,7 +113,7 @@ blocked = 1 var/attackamt = rand(2,6) temp = "You attack for [attackamt] damage!" - playsound(src.loc, 'sound/arcade/hit.ogg', 20, 1, extrarange = -6, falloff = 10) + playsound(loc, 'sound/arcade/hit.ogg', 50, TRUE) updateUsrDialog() if(turtle > 0) turtle-- @@ -127,7 +127,7 @@ var/pointamt = rand(1,3) var/healamt = rand(6,8) temp = "You use [pointamt] magic to heal for [healamt] damage!" - playsound(src.loc, 'sound/arcade/heal.ogg', 20, 1, extrarange = -6, falloff = 10) + playsound(loc, 'sound/arcade/heal.ogg', 50, TRUE) updateUsrDialog() turtle++ @@ -142,7 +142,7 @@ blocked = 1 var/chargeamt = rand(4,7) temp = "You regain [chargeamt] points" - playsound(src.loc, 'sound/arcade/mana.ogg', 20, 1, extrarange = -6, falloff = 10) + playsound(loc, 'sound/arcade/mana.ogg', 50, TRUE) player_mp += chargeamt if(turtle > 0) turtle-- @@ -177,7 +177,7 @@ if(!gameover) gameover = 1 temp = "[enemy_name] has fallen! Rejoice!" - playsound(src.loc, 'sound/arcade/win.ogg', 20, 1, extrarange = -6, falloff = 10) + playsound(loc, 'sound/arcade/win.ogg', 50, TRUE) if(emagged) SSblackbox.record_feedback("tally", "arcade_status", 1, "win_emagged") @@ -195,13 +195,13 @@ else if(emagged && (turtle >= 4)) var/boomamt = rand(5,10) temp = "[enemy_name] throws a bomb, exploding you for [boomamt] damage!" - playsound(src.loc, 'sound/arcade/boom.ogg', 20, 1, extrarange = -6, falloff = 10) + playsound(loc, 'sound/arcade/boom.ogg', 50, TRUE) player_hp -= boomamt else if((enemy_mp <= 5) && (prob(70))) var/stealamt = rand(2,3) temp = "[enemy_name] steals [stealamt] of your power!" - playsound(src.loc, 'sound/arcade/steal.ogg', 20, 1, extrarange = -6, falloff = 10) + playsound(loc, 'sound/arcade/steal.ogg', 50, TRUE) player_mp -= stealamt updateUsrDialog() @@ -209,7 +209,7 @@ gameover = 1 sleep(10) temp = "You have been drained! GAME OVER" - playsound(src.loc, 'sound/arcade/lose.ogg', 20, 1, extrarange = -6, falloff = 10) + playsound(loc, 'sound/arcade/lose.ogg', 50, TRUE) if(emagged) SSblackbox.record_feedback("tally", "arcade_status", 1, "loss_mana_emagged") usr.gib() @@ -218,20 +218,20 @@ else if((enemy_hp <= 10) && (enemy_mp > 4)) temp = "[enemy_name] heals for 4 health!" - playsound(src.loc, 'sound/arcade/heal.ogg', 20, 1, extrarange = -6, falloff = 10) + playsound(loc, 'sound/arcade/heal.ogg', 50, TRUE) enemy_hp += 4 enemy_mp -= 4 else var/attackamt = rand(3,6) temp = "[enemy_name] attacks for [attackamt] damage!" - playsound(src.loc, 'sound/arcade/hit.ogg', 20, 1, extrarange = -6, falloff = 10) + playsound(loc, 'sound/arcade/hit.ogg', 50, TRUE) player_hp -= attackamt if((player_mp <= 0) || (player_hp <= 0)) gameover = 1 temp = "You have been crushed! GAME OVER" - playsound(src.loc, 'sound/arcade/lose.ogg', 20, 1, extrarange = -6, falloff = 10) + playsound(loc, 'sound/arcade/lose.ogg', 50, TRUE) if(emagged) SSblackbox.record_feedback("tally", "arcade_status", 1, "loss_hp_emagged") usr.gib() @@ -451,7 +451,7 @@ else to_chat(usr, "Something strikes you from behind! It hurts like hell and feel like a blunt weapon, but nothing is there...") M.take_organ_damage(30) - playsound(loc, 'sound/weapons/genhit2.ogg', 100, 1) + playsound(loc, 'sound/weapons/genhit2.ogg', 100, TRUE) if(ORION_TRAIL_ILLNESS) var/severity = rand(1,3) //pray to RNGesus. PRAY, PIGS if(severity == 1) @@ -465,7 +465,7 @@ M.Stun(5) sleep(30) atom_say("[M] violently throws up!") - playsound(loc, 'sound/effects/splat.ogg', 50, 1) + playsound(loc, 'sound/effects/splat.ogg', 50, TRUE) M.adjust_nutrition(-50) //lose a lot of food var/turf/location = usr.loc if(istype(location, /turf/simulated)) @@ -475,12 +475,12 @@ M.Weaken(3) atom_say("A sudden gust of powerful wind slams [M] into the floor!") M.take_organ_damage(25) - playsound(src.loc, 'sound/weapons/genhit.ogg', 100, 1) + playsound(loc, 'sound/weapons/genhit.ogg', 100, TRUE) else to_chat(M, "A violent gale blows past you, and you barely manage to stay standing!") if(ORION_TRAIL_COLLISION) //by far the most damaging event if(prob(90)) - playsound(src.loc, 'sound/effects/bang.ogg', 100, 1) + playsound(loc, 'sound/effects/bang.ogg', 100, TRUE) var/turf/simulated/floor/F for(F in orange(1, src)) F.ChangeTurf(F.baseturf) @@ -488,15 +488,15 @@ if(hull) sleep(10) atom_say("A new floor suddenly appears around [src]. What the hell?") - playsound(src.loc, 'sound/weapons/genhit.ogg', 100, 1) + playsound(loc, 'sound/weapons/genhit.ogg', 100, TRUE) var/turf/space/T for(T in orange(1, src)) T.ChangeTurf(/turf/simulated/floor/plating) else atom_say("Something slams into the floor around [src] - luckily, it didn't get through!") - playsound(src.loc, 'sound/effects/bang.ogg', 20, 1) + playsound(loc, 'sound/effects/bang.ogg', 50, TRUE) if(ORION_TRAIL_MALFUNCTION) - playsound(src.loc, 'sound/effects/empulse.ogg', 20, 1) + playsound(loc, 'sound/effects/empulse.ogg', 50, TRUE) visible_message("[src] malfunctions, randomizing in-game stats!") var/oldfood = food var/oldfuel = fuel @@ -510,7 +510,7 @@ audible_message("[src] lets out a somehow ominous chime.") food = oldfood fuel = oldfuel - playsound(src.loc, 'sound/machines/chime.ogg', 20, 1) + playsound(loc, 'sound/machines/chime.ogg', 50, TRUE) else if(href_list["newgame"]) //Reset everything newgame() @@ -553,7 +553,7 @@ event = ORION_TRAIL_BLACKHOLE event() if(emagged) //has to be here because otherwise it doesn't work - playsound(src.loc, 'sound/effects/supermatter.ogg', 100, 1) + playsound(loc, 'sound/effects/supermatter.ogg', 100, TRUE) atom_say("A miniature black hole suddenly appears in front of [src], devouring [usr] alive!") usr.Stun(10) //you can't run :^) var/S = new /obj/singularity/academy(usr.loc) @@ -574,7 +574,7 @@ if(length(settlers) <= 0 || alive <= 0) return var/sheriff = remove_crewmember() //I shot the sheriff - playsound(loc, 'sound/weapons/gunshots/gunshot.ogg', 100, 1) + playsound(loc, 'sound/weapons/gunshots/gunshot.ogg', 100, TRUE) if(length(settlers) == 0 || alive == 0) atom_say("The last crewmember [sheriff], shot themselves, GAME OVER!") @@ -907,7 +907,7 @@ //Add Random/Specific crewmember -/obj/machinery/computer/arcade/orion_trail/proc/add_crewmember(var/specific = "") +/obj/machinery/computer/arcade/orion_trail/proc/add_crewmember(specific = "") var/newcrew = "" if(specific) newcrew = specific @@ -923,7 +923,7 @@ //Remove Random/Specific crewmember -/obj/machinery/computer/arcade/orion_trail/proc/remove_crewmember(var/specific = "", var/dont_remove = "") +/obj/machinery/computer/arcade/orion_trail/proc/remove_crewmember(specific = "", dont_remove = "") var/list/safe2remove = settlers var/removed = "" if(dont_remove) @@ -998,14 +998,14 @@ to_chat(user, "You flip the switch on the underside of [src].") active = 1 visible_message("[src] softly beeps and whirs to life!") - playsound(src.loc, 'sound/machines/defib_saftyon.ogg', 25, 1) + playsound(loc, 'sound/machines/defib_saftyon.ogg', 25, TRUE) atom_say("This is ship ID #[rand(1,1000)] to Orion Port Authority. We're coming in for landing, over.") sleep(20) visible_message("[src] begins to vibrate...") atom_say("Uh, Port? Having some issues with our reactor, could you check it out? Over.") sleep(30) atom_say("Oh, God! Code Eight! CODE EIGHT! IT'S GONNA BL-") - playsound(src.loc, 'sound/machines/buzz-sigh.ogg', 25, 1) + playsound(loc, 'sound/machines/buzz-sigh.ogg', 25, TRUE) sleep(3.6) visible_message("[src] explodes!") explosion(src.loc, 1,2,4, flame_range = 3) diff --git a/code/game/machinery/computer/atmos_control.dm b/code/game/machinery/computer/atmos_control.dm index 7083986242f..db28dd16dc6 100644 --- a/code/game/machinery/computer/atmos_control.dm +++ b/code/game/machinery/computer/atmos_control.dm @@ -1,3 +1,745 @@ +/obj/machinery/air_sensor + icon = 'icons/obj/stationobjs.dmi' + icon_state = "gsensor1" + resistance_flags = FIRE_PROOF + name = "gas sensor" + req_one_access_txt = "24;10" + + anchored = 1 + var/state = 0 + var/bolts = 1 + + var/id_tag + frequency = ATMOS_VENTSCRUB + Mtoollink = 1 + settagwhitelist = list("id_tag") + + var/on = 1 + var/output = 3 + //Flags: + // 1 for pressure + // 2 for temperature + // Output >= 4 includes gas composition + // 4 for oxygen concentration + // 8 for toxins concentration + // 16 for nitrogen concentration + // 32 for carbon dioxide concentration + +/obj/machinery/air_sensor/update_icon() + icon_state = "gsensor[on]" + +/obj/machinery/air_sensor/multitool_menu(mob/user, obj/item/multitool/P) + return {" + Main + "} + +/obj/machinery/air_sensor/multitool_topic(mob/user, list/href_list, obj/O) + . = ..() + if(.) + return . + + if("toggle_out_flag" in href_list) + var/bitflag_value = text2num(href_list["toggle_out_flag"])//this is a string normally + if(!(bitflag_value in list(1, 2, 4, 8, 16, 32))) //Here to prevent breaking the sensors with HREF exploits + return 0 + if(output&bitflag_value)//the bitflag is on ATM + output &= ~bitflag_value + else//can't not be off + output |= bitflag_value + 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") + return TRUE + +/obj/machinery/air_sensor/attackby(obj/item/W as obj, mob/user as mob) + if(istype(W, /obj/item/multitool)) + update_multitool_menu(user) + return 1 + if(istype(W, /obj/item/wrench)) + if(bolts) + to_chat(usr, "The [src] is bolted to the floor! You can't detach it like this.") + return 1 + playsound(loc, W.usesound, 50, 1) + to_chat(user, "You begin to unfasten \the [src]...") + if(do_after(user, 40 * W.toolspeed, target = src)) + user.visible_message("[user] unfastens \the [src].", "You have unfastened \the [src].", "You hear ratchet.") + new /obj/item/pipe_gsensor(src.loc) + qdel(src) + return 1 + return + return ..() + +/obj/machinery/air_sensor/process_atmos() + if(on) + if(!radio_connection) + return + var/datum/signal/signal = new + signal.transmission_method = 1 //radio signal + signal.data["tag"] = id_tag + signal.data["timestamp"] = world.time + + var/datum/gas_mixture/air_sample = return_air() + + if(output&1) + signal.data["pressure"] = num2text(round(air_sample.return_pressure(),0.1),) + if(output&2) + signal.data["temperature"] = round(air_sample.temperature,0.1) + + if(output>4) + var/total_moles = air_sample.total_moles() + if(total_moles > 0) + if(output&4) + signal.data["oxygen"] = round(100*air_sample.oxygen/total_moles,0.1) + if(output&8) + signal.data["toxins"] = round(100*air_sample.toxins/total_moles,0.1) + if(output&16) + signal.data["nitrogen"] = round(100*air_sample.nitrogen/total_moles,0.1) + if(output&32) + signal.data["carbon_dioxide"] = round(100*air_sample.carbon_dioxide/total_moles,0.1) + else + signal.data["oxygen"] = 0 + signal.data["toxins"] = 0 + signal.data["nitrogen"] = 0 + signal.data["carbon_dioxide"] = 0 + signal.data["sigtype"]="status" + radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA) + +/obj/machinery/air_sensor/set_frequency(new_frequency) + SSradio.remove_object(src, frequency) + frequency = new_frequency + radio_connection = SSradio.add_object(src, frequency, RADIO_ATMOSIA) + +/obj/machinery/air_sensor/Initialize() + ..() + SSair.atmos_machinery += src + set_frequency(frequency) + +/obj/machinery/air_sensor/Destroy() + SSair.atmos_machinery -= src + if(SSradio) + SSradio.remove_object(src, frequency) + radio_connection = null + return ..() + + +/obj/machinery/computer/general_air_control + icon = 'icons/obj/computer.dmi' + icon_screen = "tank" + icon_keyboard = "atmos_key" + circuit = /obj/item/circuitboard/air_management + req_one_access_txt = "24;10" + + name = "Computer" + + frequency = ATMOS_VENTSCRUB + var/show_sensors=1 + var/list/sensors = list() + Mtoollink = 1 + + var/list/sensor_information = list() + +/obj/machinery/computer/general_air_control/Destroy() + if(SSradio) + SSradio.remove_object(src, frequency) + radio_connection = null + return ..() + +/obj/machinery/computer/general_air_control/attack_hand(mob/user) + if(..(user)) + return + var/html=return_text() + var/datum/browser/popup = new(user, "gac", name, 400, 400) + popup.set_content(html) + popup.open(0) + user.set_machine(src) + onclose(user, "gac") + +/obj/machinery/computer/general_air_control/process() + ..() + if(!sensors) + //warning("[src.type] at [x],[y],[z] has null sensors. Please fix.")//commenting this line out because the admins will get a warning like this every time somebody builds another GAC + sensors = list() + src.updateUsrDialog() + +/obj/machinery/computer/general_air_control/attackby(I as obj, user as mob, params) + if(istype(I, /obj/item/multitool)) + update_multitool_menu(user) + return 1 + return ..() + + +/obj/machinery/computer/general_air_control/receive_signal(datum/signal/signal) + if(!signal || signal.encryption) return + + var/id_tag = signal.data["tag"] + if(!id_tag || !sensors || !sensors.Find(id_tag)) return + + sensor_information[id_tag] = signal.data + +/obj/machinery/computer/general_air_control/proc/return_text() + var/sensor_data + if(show_sensors) + if(sensors.len) + for(var/id_tag in sensors) + var/long_name = sensors[id_tag] + var/list/data = sensor_information[id_tag] + var/sensor_part = "
    [long_name]" + + if(data) + sensor_part += "" + if(data["pressure"]) + sensor_part += "" + if(data["temperature"]) + sensor_part += "" + if(data["oxygen"]||data["toxins"]||data["nitrogen"]||data["carbon_dioxide"]) + sensor_part += "" + sensor_part += "
    Pressure:[data["pressure"]] kPa
    Temperature:[data["temperature"]] K
    Gas Composition :
      " + if(data["oxygen"]) + sensor_part += "
    • [data["oxygen"]]% O2
      • " + if(data["nitrogen"]) + sensor_part += "
    • [data["nitrogen"]]% N
      • " + if(data["carbon_dioxide"]) + sensor_part += "
    • [data["carbon_dioxide"]]% CO2
      • " + if(data["toxins"]) + sensor_part += "
    • [data["toxins"]]% Plasma
      • " + sensor_part += "
    " + + else + sensor_part += "[long_name] can not be found!
    " + sensor_part += "
    " + sensor_data += sensor_part + + else + sensor_data = "No sensors connected." + + var/output = {" + + [show_sensors ? "

    Sensor Data:

    " + sensor_data : ""] + "} + + return output + +/obj/machinery/computer/general_air_control/set_frequency(new_frequency) + SSradio.remove_object(src, frequency) + frequency = new_frequency + radio_connection = SSradio.add_object(src, frequency, RADIO_ATMOSIA) + +/obj/machinery/computer/general_air_control/Initialize() + ..() + set_frequency(frequency) + +/obj/machinery/computer/general_air_control/multitool_menu(mob/user, obj/item/multitool/P) + var/dat= {" + Main + + Sensors: + "} + return dat + +/obj/machinery/computer/general_air_control/multitool_topic(mob/user,list/href_list,obj/O) + . = ..() + if(.) return . + if("add_sensor" in href_list) + + // Make a list of all available sensors on the same frequency + var/list/sensor_list = list() + for(var/obj/machinery/air_sensor/G in GLOB.machines) + if(!isnull(G.id_tag) && G.frequency == frequency) + sensor_list|=G.id_tag + if(!sensor_list.len) + to_chat(user, "No sensors on this frequency.") + return FALSE + + // Have the user pick one of them and name its label + var/sensor = input(user, "Select a sensor:", "Sensor Data") as null|anything in sensor_list + if(!sensor) + return FALSE + var/label = reject_bad_name( input(user, "Choose a sensor label:", "Sensor Label") as text|null, allow_numbers=1) + if(!label) + return FALSE + + // Add the sensor's information to general_air_controler + sensors[sensor] = label + return TRUE + + if("edit_sensor" in href_list) + var/list/sensor_list = list() + for(var/obj/machinery/air_sensor/G in GLOB.machines) + if(!isnull(G.id_tag) && G.frequency == frequency) + sensor_list|=G.id_tag + if(!sensor_list.len) + to_chat(user, "No sensors on this frequency.") + return FALSE + var/label = sensors[href_list["edit_sensor"]] + var/sensor = input(user, "Select a sensor:", "Sensor Data", href_list["edit_sensor"]) as null|anything in sensor_list + if(!sensor) + return FALSE + sensors.Remove(href_list["edit_sensor"]) + sensors[sensor] = label + return TRUE + +/obj/machinery/computer/general_air_control/unlinkFrom(mob/user, obj/O) + ..() + if("id_tag" in O.vars && (istype(O,/obj/machinery/air_sensor) || istype(O, /obj/machinery/meter))) + sensors.Remove(O:id_tag) + return 1 + return 0 + +/obj/machinery/computer/general_air_control/linkMenu(obj/O) + if(isLinkedWith(O)) + return + + var/dat="" + + if(istype(O,/obj/machinery/air_sensor) || istype(O, /obj/machinery/meter)) + dat += " \[New Sensor\] " + return dat + +/obj/machinery/computer/general_air_control/canLink(obj/O, list/context) + if(istype(O,/obj/machinery/air_sensor) || istype(O, /obj/machinery/meter)) + return O:id_tag + +/obj/machinery/computer/general_air_control/isLinkedWith(obj/O) + if(istype(O,/obj/machinery/air_sensor) || istype(O, /obj/machinery/meter)) + return O:id_tag in sensors + +/obj/machinery/computer/general_air_control/linkWith(mob/user, obj/O, context) + sensors[O:id_tag] = reject_bad_name(clean_input(user, "Choose a sensor label:", "Sensor Label"), allow_numbers=1) + return 1 + +/obj/machinery/computer/general_air_control/large_tank_control + circuit = /obj/item/circuitboard/large_tank_control + req_one_access_txt = "24;10" + settagwhitelist = list("input_tag", "output_tag") + + var/input_tag + var/output_tag + + var/list/input_info + var/list/output_info + + var/list/input_linkable=list( + /obj/machinery/atmospherics/unary/outlet_injector, + /obj/machinery/atmospherics/unary/vent_pump + ) + + var/list/output_linkable=list( + /obj/machinery/atmospherics/unary/vent_pump + ) + + var/pressure_setting = ONE_ATMOSPHERE * 45 + +/obj/machinery/computer/general_air_control/large_tank_control/attackby(I as obj, user as mob) + if(istype(I, /obj/item/multitool)) + update_multitool_menu(user) + return 1 + return ..() + + +/obj/machinery/computer/general_air_control/large_tank_control/multitool_menu(mob/user, obj/item/multitool/P) + var/dat= {" + + Sensors: + "} + return dat + + +/obj/machinery/computer/general_air_control/large_tank_control/linkWith(mob/user, obj/machinery/atmospherics/unary/O, list/context) + if(!is_type_in_list(O, input_linkable)) + return FALSE + + if(context["slot"] == "input") + input_tag = O.id_tag + input_info = null + if(istype(O, /obj/machinery/atmospherics/unary/vent_pump)) + send_signal(list("tag" = input_tag, + "direction" = 1, // Release + "checks" = 0 // No pressure checks. + )) + return TRUE + + if(context["slot"] == "output") + output_tag = O.id_tag + output_info = null + if(istype(O, /obj/machinery/atmospherics/unary/vent_pump)) + send_signal(list("tag" = output_tag, + "direction" = 0, // Siphon + "checks" = 2 // Internal pressure checks. + )) + return TRUE + +/obj/machinery/computer/general_air_control/large_tank_control/unlinkFrom(mob/user, obj/O) + if("id_tag" in O.vars) + if(O:id_tag == input_tag) + input_tag=null + input_info=null + return 1 + if(O:id_tag == output_tag) + output_tag=null + output_info=null + return 1 + return 0 + +/obj/machinery/computer/general_air_control/large_tank_control/linkMenu(obj/O) + var/dat="" + if(canLink(O,list("slot"="input"))) + dat += " \[Link @ Input\] " + if(canLink(O,list("slot"="output"))) + dat += " \[Link @ Output\] " + return dat + +/obj/machinery/computer/general_air_control/large_tank_control/canLink(obj/O, list/context) + return (context["slot"]=="input" && is_type_in_list(O,input_linkable)) || (context["slot"]=="output" && is_type_in_list(O,output_linkable)) + +/obj/machinery/computer/general_air_control/large_tank_control/isLinkedWith(obj/O) + if(O:id_tag == input_tag) + return 1 + if(O:id_tag == output_tag) + return 1 + return 0 + +/obj/machinery/computer/general_air_control/large_tank_control/process() + ..() + if(!input_info && input_tag) + request_device_refresh(input_tag) + if(!output_info && output_tag) + request_device_refresh(output_tag) + +/obj/machinery/computer/general_air_control/large_tank_control/return_text() + var/output = ..() + //if(signal.data) + // input_info = signal.data // Attempting to fix intake control -- TLE + + output += "

    Tank Control System


    " + if(input_tag) + if(input_info) + var/power = (input_info["power"]) + var/volume_rate = input_info["volume_rate"] + output += {" +
    + Input (Refresh) + + + + + + + + + +
    State:[power?("Injecting"):("On Hold")]
    Rate:[volume_rate] L/sec
    +
    +"} + else + output += "ERROR: Can not find input port Search
    " + if(output_tag) + if(output_info) + var/power = (output_info["power"]) + var/output_pressure = output_info["internal"] + output += {" +
    + Output (Refresh) + + + + + + + + + +
    State:[power?("Open"):("On Hold")]
    Max Output Pressure:[output_pressure] kPa
    +
    +"} + else + output += "ERROR: Can not find output port Search
    " + + return output + +/obj/machinery/computer/general_air_control/large_tank_control/receive_signal(datum/signal/signal) + if(!signal || signal.encryption) return + + var/id_tag = signal.data["tag"] + + if(input_tag == id_tag) + input_info = signal.data + updateUsrDialog() + else if(output_tag == id_tag) + output_info = signal.data + updateUsrDialog() + else + ..(signal) + +/obj/machinery/computer/general_air_control/large_tank_control/proc/request_device_refresh(device) + send_signal(list("tag"=device, "status")) + +/obj/machinery/computer/general_air_control/large_tank_control/proc/send_signal(list/data) + if(!radio_connection) + return + var/datum/signal/signal = new + signal.transmission_method = 1 //radio signal + signal.source = src + signal.data=data + signal.data["sigtype"]="command" + radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA) + +/obj/machinery/computer/general_air_control/large_tank_control/Topic(href, href_list) + if(..()) + return 1 + + add_fingerprint(usr) + + if(href_list["out_set_pressure"]) + var/response=input(usr,"Set new pressure, in kPa. \[0-[50*ONE_ATMOSPHERE]\]") as num + pressure_setting = text2num(response) + pressure_setting = between(0, pressure_setting, 50*ONE_ATMOSPHERE) + + if(!radio_connection) + return 0 + var/datum/signal/signal = new + signal.transmission_method = 1 //radio signal + signal.source = src + if(href_list["in_refresh_status"]) + input_info = null + signal.data = list ("tag" = input_tag, "status" = 1) + + else if(href_list["in_toggle_injector"]) + input_info = null + signal.data = list ("tag" = input_tag, "power_toggle" = 1) + + else if(href_list["out_refresh_status"]) + output_info = null + signal.data = list ("tag" = output_tag, "status" = 1) + + else if(href_list["out_toggle_power"]) + output_info = null + signal.data = list ("tag" = output_tag, "power_toggle" = 1) + + else if(href_list["out_set_pressure"]) + output_info = null + signal.data = list ("tag" = output_tag, "set_internal_pressure" = "[pressure_setting]") + /*else + testing("Bad Topic() to GAC \"[src.name]\": [href]") + return*/ // NOPE. // disabling because it spams when multitool menus are used + + signal.data["sigtype"] = "command" + radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA) + src.updateUsrDialog() + +/obj/machinery/computer/general_air_control/fuel_injection + icon = 'icons/obj/computer.dmi' + icon_screen = "atmos" + circuit = /obj/item/circuitboard/injector_control + + var/device_tag + var/list/device_info + + var/automation = 0 + + var/cutoff_temperature = 2000 + var/on_temperature = 1200 + +/obj/machinery/computer/general_air_control/fuel_injection/attackby(I as obj, user as mob, params) + if(istype(I, /obj/item/multitool)) + update_multitool_menu(user) + return 1 + return ..() + +/obj/machinery/computer/general_air_control/fuel_injection/process() + if(automation) + if(!radio_connection) + return 0 + + var/injecting = 0 + for(var/id_tag in sensor_information) + var/list/data = sensor_information[id_tag] + if(data["temperature"]) + if(data["temperature"] >= cutoff_temperature) + injecting = 0 + break + if(data["temperature"] <= on_temperature) + injecting = 1 + + var/datum/signal/signal = new + signal.transmission_method = 1 //radio signal + signal.source = src + + signal.data = list( + "tag" = device_tag, + "power" = injecting, + "sigtype"="command" + ) + + radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA) + + ..() + +/obj/machinery/computer/general_air_control/fuel_injection/return_text() + var/output = ..() + output += "
    Fuel Injection System (Refresh)" + if(device_info) + var/power = device_info["power"] + var/volume_rate = device_info["volume_rate"] + output += {" + + + + + + + + + + + + "} + + if(automation) + + // AUTOFIXED BY fix_string_idiocy.py + // C:\Users\Rob\Documents\Projects\vgstation13\code\game\machinery\atmo_control.dm:372: output += "Automated Fuel Injection: Engaged
    " + output += {" + + + "} + // END AUTOFIX + else + + // AUTOFIXED BY fix_string_idiocy.py + // C:\Users\Rob\Documents\Projects\vgstation13\code\game\machinery\atmo_control.dm:375: output += "Automated Fuel Injection: Disengaged
    " + output += {" + + + + "} + // END AUTOFIX + output += "
    Status:[power?"Injecting":"On Hold"]
    Rate:[volume_rate] L/sec
    Automated Fuel Injection:[automation?"Engaged":"Disengaged"]
    Injector Controls Locked Out
    Injector:Toggle Power Inject (1 Cycle)
    " + else + output += {"

    ERROR: Can not find device. Search

    "} + output += "
    " + + return output + +/obj/machinery/computer/general_air_control/fuel_injection/receive_signal(datum/signal/signal) + if(!signal || signal.encryption) return + + var/id_tag = signal.data["tag"] + + if(device_tag == id_tag) + device_info = signal.data + else + ..(signal) + +/obj/machinery/computer/general_air_control/fuel_injection/Topic(href, href_list) + if(..()) + return + + if(href_list["refresh_status"]) + device_info = null + if(!radio_connection) + return 0 + + var/datum/signal/signal = new + signal.transmission_method = 1 //radio signal + signal.source = src + signal.data = list( + "tag" = device_tag, + "status", + "sigtype"="command" + ) + radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA) + + if(href_list["toggle_automation"]) + automation = !automation + + if(href_list["toggle_injector"]) + device_info = null + if(!radio_connection) + return 0 + + var/datum/signal/signal = new + signal.transmission_method = 1 //radio signal + signal.source = src + signal.data = list( + "tag" = device_tag, + "power_toggle", + "sigtype"="command" + ) + + radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA) + + if(href_list["injection"]) + if(!radio_connection) + return 0 + + var/datum/signal/signal = new + signal.transmission_method = 1 //radio signal + signal.source = src + signal.data = list( + "tag" = device_tag, + "inject", + "sigtype"="command" + ) + + radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA) + /obj/machinery/computer/atmoscontrol name = "\improper central atmospherics computer" icon = 'icons/obj/computer.dmi' diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm index 01e8a26cb31..6edc4d21eed 100644 --- a/code/game/machinery/computer/card.dm +++ b/code/game/machinery/computer/card.dm @@ -75,7 +75,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0) /obj/machinery/computer/card/proc/is_centcom() return FALSE -/obj/machinery/computer/card/proc/is_authenticated(var/mob/user) +/obj/machinery/computer/card/proc/is_authenticated(mob/user) if(user.can_admin_interact()) return TRUE if(scan) @@ -97,12 +97,12 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0) return formatted -/obj/machinery/computer/card/proc/format_job_slots() +/obj/machinery/computer/card/proc/format_job_slots(check_department, is_admin) var/list/formatted = list() for(var/datum/job/job in SSjobs.occupations) if(job_blacklisted_full(job)) continue - if(!job_in_department(job)) + if(check_department && !job_in_department(job)) continue formatted.Add(list(list( "title" = job.title, @@ -110,7 +110,8 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0) "total_positions" = job.total_positions, "can_open" = can_open_job(job), "can_close" = can_close_job(job), - "can_prioritize" = can_prioritize_job(job) + "can_prioritize" = can_prioritize_job(job, is_admin), + "is_priority" = (job in SSjobs.prioritized_jobs) ))) return formatted @@ -212,11 +213,11 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0) return TRUE return FALSE -/obj/machinery/computer/card/proc/can_prioritize_job(datum/job/job) +/obj/machinery/computer/card/proc/can_prioritize_job(datum/job/job, is_admin) if(job) if(job_blacklisted_full(job)) return FALSE - if(!job_in_department(job, FALSE)) + if(!is_admin && !job_in_department(job, FALSE)) return FALSE if(job in SSjobs.prioritized_jobs) return TRUE // because this also lets us un-prioritize the job @@ -291,7 +292,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0) return TRUE return FALSE -/obj/machinery/computer/card/attack_ai(var/mob/user as mob) +/obj/machinery/computer/card/attack_ai(mob/user as mob) return attack_hand(user) /obj/machinery/computer/card/attack_hand(mob/user as mob) @@ -319,8 +320,10 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0) data["scan_rank"] = scan ? scan.rank : FALSE data["authenticated"] = is_authenticated(user) ? TRUE : FALSE + data["auth_or_ghost"] = data["authenticated"] || isobserver(user) data["target_dept"] = target_dept data["iscentcom"] = is_centcom() ? TRUE : FALSE + data["isadmin"] = user.can_admin_interact() switch(mode) if(IDCOMPUTER_SCREEN_TRANSFER) // JOB TRANSFER @@ -348,7 +351,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0) data["all_centcom_skins"] = is_centcom() ? format_card_skins(get_centcom_card_skins()) : FALSE if(IDCOMPUTER_SCREEN_SLOTS) // JOB SLOTS - data["job_slots"] = format_job_slots() + data["job_slots"] = format_job_slots(!isobserver(user), data["isadmin"]) data["priority_jobs"] = list() for(var/datum/job/a in SSjobs.prioritized_jobs) data["priority_jobs"] += a.title @@ -690,17 +693,15 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0) var/datum/job/j = SSjobs.GetJob(priority_target) if(!j) return FALSE - if(!job_in_department(j)) + if(!can_prioritize_job(j, usr.can_admin_interact())) return FALSE var/priority = TRUE if(j in SSjobs.prioritized_jobs) SSjobs.prioritized_jobs -= j priority = FALSE - else if(SSjobs.prioritized_jobs.len < 3) - SSjobs.prioritized_jobs += j else - return FALSE - log_game("[key_name(usr)] ([scan.assignment]) [priority ? "prioritized" : "unprioritized"] the job \"[j.title]\".") + SSjobs.prioritized_jobs += j + log_game("[key_name(usr)] ([scan ? scan.assignment : "ADMIN"]) [priority ? "prioritized" : "unprioritized"] the job \"[j.title]\".") playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0) return diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm index 73722f5e6a3..f2a76b15f58 100644 --- a/code/game/machinery/computer/cloning.dm +++ b/code/game/machinery/computer/cloning.dm @@ -372,7 +372,7 @@ src.add_fingerprint(usr) -/obj/machinery/computer/cloning/proc/scan_mob(mob/living/carbon/human/subject as mob, var/scan_brain = 0) +/obj/machinery/computer/cloning/proc/scan_mob(mob/living/carbon/human/subject as mob, scan_brain = 0) if(stat & NOPOWER) return if(scanner.stat & (NOPOWER|BROKEN)) @@ -392,7 +392,7 @@ if(subject.get_int_organ(/obj/item/organ/internal/brain)) var/obj/item/organ/internal/brain/Brn = subject.get_int_organ(/obj/item/organ/internal/brain) if(istype(Brn)) - if(NO_SCAN in Brn.dna.species.species_traits) + if(NO_CLONESCAN in Brn.dna.species.species_traits) set_scan_temp("[Brn.dna.species.name_plural] are not scannable.", "bad") SStgui.update_uis(src) return @@ -408,7 +408,7 @@ set_scan_temp("Subject's brain is not responding. Further attempts after a short delay may succeed.", "bad") SStgui.update_uis(src) return - if((NOCLONE in subject.mutations) && src.scanner.scan_level < 2) + if(HAS_TRAIT(subject, TRAIT_BADDNA) && src.scanner.scan_level < 2) set_scan_temp("Subject has incompatible genetic mutations.", "bad") SStgui.update_uis(src) return @@ -432,7 +432,7 @@ var/obj/item/organ/B = subject.get_int_organ(/obj/item/organ/internal/brain) B.dna.check_integrity() R.dna=B.dna.Clone() - if(NO_SCAN in R.dna.species.species_traits) + if(NO_CLONESCAN in R.dna.species.species_traits) extra_info = "Proper genetic interface not found, defaulting to genetic data of the body." R.dna.species = new subject.dna.species.type R.id= copytext(md5(B.dna.real_name), 2, 6) @@ -459,7 +459,7 @@ SStgui.update_uis(src) //Find a specific record by key. -/obj/machinery/computer/cloning/proc/find_record(var/find_key) +/obj/machinery/computer/cloning/proc/find_record(find_key) var/selected_record = null for(var/datum/dna2/record/R in src.records) if(R.ckey == find_key) diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index 2cceb39b778..054a6719aff 100644 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -3,8 +3,9 @@ #define COMM_SCREEN_MESSAGES 3 #define COMM_AUTHENTICATION_NONE 0 -#define COMM_AUTHENTICATION_MIN 1 -#define COMM_AUTHENTICATION_MAX 2 +#define COMM_AUTHENTICATION_HEAD 1 +#define COMM_AUTHENTICATION_CAPT 2 +#define COMM_AUTHENTICATION_AGHOST 3 #define COMM_MSGLEN_MINIMUM 6 #define COMM_CCMSGLEN_MINIMUM 20 @@ -44,19 +45,18 @@ ..() crew_announcement.newscast = 0 -/obj/machinery/computer/communications/proc/is_authenticated(var/mob/user, var/message = 1) - if(authenticated == COMM_AUTHENTICATION_MAX) - return COMM_AUTHENTICATION_MAX - else if(user.can_admin_interact()) - return COMM_AUTHENTICATION_MAX - else if(authenticated) - return COMM_AUTHENTICATION_MIN - else - if(message) - to_chat(user, "Access denied.") - return COMM_AUTHENTICATION_NONE +/obj/machinery/computer/communications/proc/is_authenticated(mob/user, message = 1) + if(user.can_admin_interact()) + return COMM_AUTHENTICATION_AGHOST + if(authenticated == COMM_AUTHENTICATION_CAPT) + return COMM_AUTHENTICATION_CAPT + if(authenticated) + return COMM_AUTHENTICATION_HEAD + if(message) + to_chat(user, "Access denied.") + return COMM_AUTHENTICATION_NONE -/obj/machinery/computer/communications/proc/change_security_level(var/new_level) +/obj/machinery/computer/communications/proc/change_security_level(new_level) tmp_alertlevel = new_level var/old_level = GLOB.security_level if(!tmp_alertlevel) tmp_alertlevel = SEC_LEVEL_GREEN @@ -80,7 +80,7 @@ if(action == "auth") if(!ishuman(usr)) - to_chat(usr, "Access denied.") + to_chat(usr, "Access denied, no humanoid lifesign detected.") return FALSE // Logout function. if(authenticated != COMM_AUTHENTICATION_NONE) @@ -91,15 +91,15 @@ // Login function. var/list/access = usr.get_access() if(allowed(usr)) - authenticated = COMM_AUTHENTICATION_MIN + authenticated = COMM_AUTHENTICATION_HEAD if(ACCESS_CAPTAIN in access) - authenticated = COMM_AUTHENTICATION_MAX + authenticated = COMM_AUTHENTICATION_CAPT var/mob/living/carbon/human/H = usr var/obj/item/card/id = H.get_idcard(TRUE) if(istype(id)) crew_announcement.announcer = GetNameAndAssignmentFromId(id) if(authenticated == COMM_AUTHENTICATION_NONE) - to_chat(usr, "You need to wear your ID.") + to_chat(usr, "You need to wear a command or Captain-level ID.") return // All functions below this point require authentication. @@ -133,12 +133,12 @@ to_chat(usr, "You need to wear your ID.") if("announce") - if(is_authenticated(usr) == COMM_AUTHENTICATION_MAX) + if(is_authenticated(usr) >= COMM_AUTHENTICATION_CAPT) if(message_cooldown > world.time) to_chat(usr, "Please allow at least one minute to pass between announcements.") return - var/input = input(usr, "Please write a message to announce to the station crew.", "Priority Announcement") - if(!input || message_cooldown > world.time || ..() || !(is_authenticated(usr) == COMM_AUTHENTICATION_MAX)) + var/input = input(usr, "Please write a message to announce to the station crew.", "Priority Announcement") as null|message + if(!input || message_cooldown > world.time || ..() || !(is_authenticated(usr) >= COMM_AUTHENTICATION_CAPT)) return if(length(input) < COMM_MSGLEN_MINIMUM) to_chat(usr, "Message '[input]' is too short. [COMM_MSGLEN_MINIMUM] character minimum.") @@ -217,12 +217,12 @@ setMenuState(usr, COMM_SCREEN_STAT) if("nukerequest") - if(is_authenticated(usr) == COMM_AUTHENTICATION_MAX) + if(is_authenticated(usr) >= COMM_AUTHENTICATION_CAPT) if(centcomm_message_cooldown > world.time) to_chat(usr, "Arrays recycling. Please stand by.") return var/input = stripped_input(usr, "Please enter the reason for requesting the nuclear self-destruct codes. Misuse of the nuclear request system will not be tolerated under any circumstances. Transmission does not guarantee a response.", "Self Destruct Code Request.","") - if(!input || ..() || !(is_authenticated(usr) == COMM_AUTHENTICATION_MAX)) + if(!input || ..() || !(is_authenticated(usr) >= COMM_AUTHENTICATION_CAPT)) return if(length(input) < COMM_CCMSGLEN_MINIMUM) to_chat(usr, "Message '[input]' is too short. [COMM_CCMSGLEN_MINIMUM] character minimum.") @@ -235,12 +235,12 @@ setMenuState(usr, COMM_SCREEN_MAIN) if("MessageCentcomm") - if(is_authenticated(usr) == COMM_AUTHENTICATION_MAX) + if(is_authenticated(usr) >= COMM_AUTHENTICATION_CAPT) if(centcomm_message_cooldown > world.time) to_chat(usr, "Arrays recycling. Please stand by.") return var/input = stripped_input(usr, "Please choose a message to transmit to Centcomm via quantum entanglement. Please be aware that this process is very expensive, and abuse will lead to... termination. Transmission does not guarantee a response.", "To abort, send an empty message.", "") - if(!input || ..() || !(is_authenticated(usr) == COMM_AUTHENTICATION_MAX)) + if(!input || ..() || !(is_authenticated(usr) >= COMM_AUTHENTICATION_CAPT)) return if(length(input) < COMM_CCMSGLEN_MINIMUM) to_chat(usr, "Message '[input]' is too short. [COMM_CCMSGLEN_MINIMUM] character minimum.") @@ -254,12 +254,12 @@ // OMG SYNDICATE ...LETTERHEAD if("MessageSyndicate") - if((is_authenticated(usr) == COMM_AUTHENTICATION_MAX) && (src.emagged)) + if((is_authenticated(usr) >= COMM_AUTHENTICATION_CAPT) && (src.emagged)) if(centcomm_message_cooldown > world.time) to_chat(usr, "Arrays recycling. Please stand by.") return var/input = stripped_input(usr, "Please choose a message to transmit to \[ABNORMAL ROUTING CORDINATES\] via quantum entanglement. Please be aware that this process is very expensive, and abuse will lead to... termination. Transmission does not guarantee a response.", "To abort, send an empty message.", "") - if(!input || ..() || !(is_authenticated(usr) == COMM_AUTHENTICATION_MAX)) + if(!input || ..() || !(is_authenticated(usr) >= COMM_AUTHENTICATION_CAPT)) return if(length(input) < COMM_CCMSGLEN_MINIMUM) to_chat(usr, "Message '[input]' is too short. [COMM_CCMSGLEN_MINIMUM] character minimum.") @@ -295,10 +295,10 @@ to_chat(user, "You scramble the communication routing circuits!") SStgui.update_uis(src) -/obj/machinery/computer/communications/attack_ai(var/mob/user as mob) +/obj/machinery/computer/communications/attack_ai(mob/user as mob) return src.attack_hand(user) -/obj/machinery/computer/communications/attack_hand(var/mob/user as mob) +/obj/machinery/computer/communications/attack_hand(mob/user as mob) if(..(user)) return @@ -320,10 +320,12 @@ /obj/machinery/computer/communications/ui_data(mob/user) var/list/data = list() data["is_ai"] = isAI(user) || isrobot(user) + data["noauthbutton"] = !ishuman(user) data["menu_state"] = data["is_ai"] ? ai_menu_state : menu_state data["emagged"] = emagged data["authenticated"] = is_authenticated(user, 0) - data["authmax"] = data["authenticated"] == COMM_AUTHENTICATION_MAX ? TRUE : FALSE + data["authhead"] = data["authenticated"] >= COMM_AUTHENTICATION_HEAD && (data["authenticated"] == COMM_AUTHENTICATION_AGHOST || !isobserver(user)) + data["authcapt"] = data["authenticated"] >= COMM_AUTHENTICATION_CAPT && (data["authenticated"] == COMM_AUTHENTICATION_AGHOST || !isobserver(user)) data["stat_display"] = list( "type" = display_type, @@ -390,25 +392,25 @@ data["esc_section"] = data["esc_status"] || data["esc_callable"] || data["esc_recallable"] || data["lastCallLoc"] return data -/obj/machinery/computer/communications/proc/setCurrentMessage(var/mob/user,var/value) +/obj/machinery/computer/communications/proc/setCurrentMessage(mob/user, value) if(isAI(user) || isrobot(user)) aicurrmsg = value else currmsg = value -/obj/machinery/computer/communications/proc/getCurrentMessage(var/mob/user) +/obj/machinery/computer/communications/proc/getCurrentMessage(mob/user) if(isAI(user) || isrobot(user)) return aicurrmsg else return currmsg -/obj/machinery/computer/communications/proc/setMenuState(var/mob/user,var/value) +/obj/machinery/computer/communications/proc/setMenuState(mob/user, value) if(isAI(user) || isrobot(user)) ai_menu_state=value else menu_state=value -/proc/call_shuttle_proc(var/mob/user, var/reason) +/proc/call_shuttle_proc(mob/user, reason) if(GLOB.sent_strike_team == 1) to_chat(user, "Central Command will not allow the shuttle to be called. Consider all contracts terminated.") return @@ -431,7 +433,7 @@ return -/proc/init_shift_change(var/mob/user, var/force = 0) +/proc/init_shift_change(mob/user, force = 0) // if force is 0, some things may stop the shuttle call if(!force) if(SSshuttle.emergencyNoEscape) @@ -462,7 +464,7 @@ return -/proc/cancel_call_proc(var/mob/user) +/proc/cancel_call_proc(mob/user) if(SSticker.mode.name == "meteor") return diff --git a/code/game/machinery/computer/computer.dm b/code/game/machinery/computer/computer.dm index 4e2fb78c385..f18d378fff4 100644 --- a/code/game/machinery/computer/computer.dm +++ b/code/game/machinery/computer/computer.dm @@ -33,8 +33,8 @@ /obj/machinery/computer/process() if(stat & (NOPOWER|BROKEN)) - return 0 - return 1 + return FALSE + return TRUE /obj/machinery/computer/extinguish_light() set_light(0) diff --git a/code/game/machinery/computer/depot.dm b/code/game/machinery/computer/depot.dm index be5dbead66e..e157570f2c5 100644 --- a/code/game/machinery/computer/depot.dm +++ b/code/game/machinery/computer/depot.dm @@ -14,6 +14,8 @@ light_color = LIGHT_COLOR_PURE_CYAN req_access = list(ACCESS_SYNDICATE) bubble_icon = "syndibot" + var/window_height = 400 // should be roughly 100 per section. Allow extra space for the lockout alert. + var/window_width = 400 var/security_lockout = FALSE var/sound_yes = 'sound/machines/twobeep.ogg' var/sound_no = 'sound/machines/buzz-sigh.ogg' @@ -28,9 +30,9 @@ depotarea = get_area(src) /obj/machinery/computer/syndicate_depot/attack_ai(mob/user) - if(req_access.len && !("syndicate" in user.faction)) + if(length(req_access) && !("syndicate" in user.faction)) to_chat(user, "A firewall blocks your access.") - return 1 + return TRUE return ..() /obj/machinery/computer/syndicate_depot/emp_act(severity) @@ -42,19 +44,12 @@ /obj/machinery/computer/syndicate_depot/allowed(mob/user) if(user.can_advanced_admin_interact()) - return 1 - if(!isliving(user)) - return 0 - if(has_security_lockout(user)) - return 0 - return ..() - -/obj/machinery/computer/syndicate_depot/proc/has_security_lockout(mob/user) - if(security_lockout) - playsound(user, 'sound/machines/buzz-sigh.ogg', 50, 0) - to_chat(user, "[src] is under security lockout.") return TRUE - return FALSE + if(!isliving(user)) + return FALSE + if(security_lockout) + return FALSE + return ..() /obj/machinery/computer/syndicate_depot/proc/activate_security_lockout() security_lockout = TRUE @@ -65,14 +60,7 @@ return if(stat & (NOPOWER|BROKEN)) return - if(!allowed(user)) - to_chat(user, "Access Denied.") - return - user.set_machine(src) - var/dat = get_menu(user) - user << browse(dat, "window=computer;size=575x450") - onclose(user, "computer") - + ui_interact(user) /obj/machinery/computer/syndicate_depot/set_broken() . = ..() @@ -84,17 +72,55 @@ /obj/machinery/computer/syndicate_depot/proc/disable_special_functions() return -/obj/machinery/computer/syndicate_depot/Topic(href, href_list) +/obj/machinery/computer/syndicate_depot/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state) + ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open) + if(!ui) + ui = new(user, src, ui_key, "SyndicateComputerSimple", name, window_width, window_height, master_ui, state) + ui.open() + +/obj/machinery/computer/syndicate_depot/ui_data(mob/user) + var/list/data = list() + data["rows"] = list() + if(security_lockout) + data["rows"] += list(list( + "title" = "Security Lockout", + "status" = "Due to heightened security alert, base computers are locked out.", + )) + else if(length(req_access)) + data["rows"] += list(list( + "title" = "Security Notice", + "status" = "This terminal requires a syndicate ID of sufficient clearance.", + )) + /* + Guide for making your own template sections: + data["rows"] += list(list( + "title" = "Example Section Title", + "status" = "Example text box contents. Can be long.", + "bullets" = list(X,Y,Z) // a list of strings that appear, one per line, in the section. + "buttontitle" = "Example Button Title", // If present, button shows up on right with the provided title. null = no button + "buttonact" = "primary", // function name called when button is pressed ('primary' or 'secondary') + "buttondisabled" = !allowed(user) // if true, button is not clickable, used to allow ghosts to see but not use buttons + "buttontooltip" = "Tooltip that appears when you hover over the button" + )) + */ + return data + +/obj/machinery/computer/syndicate_depot/ui_act(action, params) 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["primary"]) - primary(usr) - if(href_list["secondary"]) - secondary(usr, text2num(href_list["secondary"])) - add_fingerprint(usr) - updateUsrDialog() + return + . = FALSE + if(!allowed(usr)) + to_chat(usr, "Access denied.") + return + switch(action) + if("primary") + primary(usr) + . = TRUE + if("secondary") + secondary(usr) + . = TRUE + if(.) + add_fingerprint(usr) /obj/machinery/computer/syndicate_depot/Destroy() disable_special_functions() @@ -103,21 +129,14 @@ return ..() -/obj/machinery/computer/syndicate_depot/proc/get_menu(mob/user) - return "" - /obj/machinery/computer/syndicate_depot/proc/primary(mob/user) - if(!allowed(user)) - return 1 - return 0 + return FALSE -/obj/machinery/computer/syndicate_depot/proc/secondary(mob/user, subcommand) - if(!allowed(user)) - return 1 - return 0 +/obj/machinery/computer/syndicate_depot/proc/secondary(mob/user) + return FALSE /obj/machinery/computer/syndicate_depot/proc/raise_alert(reason) - if(depotarea) + if(istype(depotarea)) depotarea.increase_alert(reason) @@ -127,17 +146,30 @@ /obj/machinery/computer/syndicate_depot/doors name = "depot door control computer" req_access = list() + window_height = 300 var/pub_access = FALSE -/obj/machinery/computer/syndicate_depot/doors/get_menu(mob/user) - return {"Syndicate Depot Door Control Computer
    -

    Toggle Airlock Emergency Access -

    Toggle Hidden Doors -
    "} +/obj/machinery/computer/syndicate_depot/doors/ui_data(mob/user) + var/list/data = ..() + data["rows"] += list(list( + "title" = "Airlock Emergency Access", + "status" = "Connected", + "buttontitle" = pub_access ? "Disable" : "Enable", + "buttonact" = "primary", + "buttondisabled" = !allowed(user), + "buttontooltip" = "Enables/disables emergency access on every airlock nearby." + )) + data["rows"] += list(list( + "title" = "Secret Doors", + "status" = "Connected", + "buttontitle" = "Toggle Open/Closed", + "buttonact" = "secondary", + "buttondisabled" = !allowed(user), + "buttontooltip" = "Opens/closes secret doors nearby." + )) + return data /obj/machinery/computer/syndicate_depot/doors/primary(mob/user) - if(..()) - return if(depotarea) pub_access = !pub_access if(pub_access) @@ -149,8 +181,6 @@ playsound(user, sound_yes, 50, 0) /obj/machinery/computer/syndicate_depot/doors/secondary(mob/user, subcommand) - if(..()) - return if(depotarea) depotarea.toggle_falsewalls(src) to_chat(user, "False walls toggled.") @@ -164,16 +194,21 @@ icon_screen = "explosive" req_access = list() alerts_when_broken = TRUE + window_height = 200 // this might appear big, but it has to have space for the lockout alert -/obj/machinery/computer/syndicate_depot/selfdestruct/get_menu(mob/user) - var/menutext = {"Syndicate Depot Fusion Reactor Control
    -

    Disable Containment Field -
    "} - return menutext +/obj/machinery/computer/syndicate_depot/selfdestruct/ui_data(mob/user) + var/list/data = ..() + data["rows"] += list(list( + "title" = "Reactor Containment Fields", + "status" = (istype(depotarea) && !depotarea.used_self_destruct) ? "Online" : "Offline", + "buttontitle" = (istype(depotarea) && !depotarea.used_self_destruct) ? "Disable" : null, + "buttonact" = "primary", + "buttondisabled" = !allowed(user), + "buttontooltip" = "Disables the containment field of the reactor." + )) + return data /obj/machinery/computer/syndicate_depot/selfdestruct/primary(mob/user) - if(..()) - return if(depotarea.used_self_destruct) playsound(user, sound_no, 50, 0) return @@ -189,6 +224,7 @@ icon_screen = "accelerator" req_access = list(ACCESS_SYNDICATE_LEADER) alerts_when_broken = TRUE + window_height = 280 var/area/syndicate_depot/perimeter/perimeterarea /obj/machinery/computer/syndicate_depot/shieldcontrol/Initialize(mapload) @@ -196,26 +232,37 @@ perimeterarea = locate(/area/syndicate_depot/perimeter) /obj/machinery/computer/syndicate_depot/shieldcontrol/Destroy() - if(istype(perimeterarea) && perimeterarea.shield_list.len) + if(istype(perimeterarea) && length(perimeterarea.shield_list)) perimeterarea.perimeter_shields_down() return ..() -/obj/machinery/computer/syndicate_depot/shieldcontrol/get_menu(mob/user) - var/menutext = {"Syndicate Depot Shield Grid Control
    -
    "} - menutext += {"(SYNDI-LEADER) Whole-base Shield: [perimeterarea.shield_list.len ? "ON" : "OFF"] ([perimeterarea.shield_list.len ? "Disable" : "Enable"])
    "} - menutext += {"(SYNDI-LEADER) Armory Shield: [depotarea.shield_list.len ? "ON" : "OFF"] ([depotarea.shield_list.len ? "Disable" : "Enable"])
    "} - return menutext +/obj/machinery/computer/syndicate_depot/shieldcontrol/ui_data(mob/user) + var/list/data = ..() + data["rows"] += list(list( + "title" = "Asteroid Perimeter Shield", + "status" = length(perimeterarea.shield_list) ? "ON" : "OFF", + "buttontitle" = length(perimeterarea.shield_list) ? "Disable" : "Enable", + "buttonact" = "primary", + "buttondisabled" = !allowed(user), + "buttontooltip" = "While on, nobody can get into the depot." + )) + data["rows"] += list(list( + "title" = "Armory Shield", + "status" = length(depotarea.shield_list) ? "ON" : "OFF", + "buttontitle" = length(depotarea.shield_list) ? "Disable" : "Enable", + "buttonact" = "secondary", + "buttondisabled" = !allowed(user), + "buttontooltip" = "While on, the armory is protected from looters." + )) + return data /obj/machinery/computer/syndicate_depot/shieldcontrol/primary(mob/user) - if(..()) - return if(depotarea.used_self_destruct) playsound(user, sound_no, 50, 0) return if(!istype(perimeterarea)) return - if(perimeterarea.shield_list.len) + if(length(perimeterarea.shield_list)) perimeterarea.perimeter_shields_down() depotarea.perimeter_shield_status = FALSE else @@ -225,11 +272,9 @@ /obj/machinery/computer/syndicate_depot/shieldcontrol/secondary(mob/user) - if(..()) - return if(!istype(depotarea)) return - if(depotarea.shield_list.len) + if(length(depotarea.shield_list)) depotarea.shields_down() else depotarea.shields_up() @@ -243,6 +288,7 @@ icon_screen = "syndishuttle" req_access = list() alerts_when_broken = TRUE + window_height = 300 var/message_sent = FALSE /obj/machinery/computer/syndicate_depot/syndiecomms/Initialize(mapload) @@ -255,27 +301,29 @@ depotarea.comms_computer = null return ..() -/obj/machinery/computer/syndicate_depot/syndiecomms/get_menu(mob/user) - var/menu = "Syndicate Communications Relay
    " - menu += "

    One-Time Uplink to Syndicate HQ: [message_sent ? "ALREADY USED" : "AVAILABLE (Open Channel)"]" - if(depotarea.on_peaceful) - menu += "

    Visiting Agents: VISIT IN PROGRESS. " - if(depotarea.list_includes(user, depotarea.peaceful_list)) - menu += "[user] IS RECOGNIZED AS VISITING AGENT" - else - menu += "[user] NOT RECOGNIZED. (Sign-in as Agent)" - if(check_rights(R_ADMIN, 0, user)) - menu += "

    ADMIN: (End Visitor Mode)" - - else - menu += "

    Visiting Agents: NONE (Sign-in as Agent)" - return menu +/obj/machinery/computer/syndicate_depot/syndiecomms/ui_data(mob/user) + var/list/data = ..() + data["rows"] += list(list( + "title" = "Communications Array", + "status" = message_sent ? "Offline" : "Online", + "buttontitle" = message_sent ? null : "Contact Syndicate HQ", + "buttonact" = "primary", + "buttondisabled" = !allowed(user) + )) + data["rows"] += list(list( + "title" = "Visiting Agents", + "status" = !length(depotarea.peaceful_list) ? "None" : null, + "bullets" = length(depotarea.peaceful_list) ? depotarea.list_shownames(depotarea.peaceful_list) : null, + "buttontitle" = "Sign In As Agent", + "buttonact" = "secondary", + "buttondisabled" = !allowed(user), + "buttontooltip" = "Only actual syndicate agents can do this." + )) + return data /obj/machinery/computer/syndicate_depot/syndiecomms/primary(mob/user) - if(..()) - return if(!isliving(user)) - to_chat(user, "ERROR: No lifesigns detected at terminal, aborting.") // Safety to prevent aghosts accidentally pressing it and getting everyone killed. + to_chat(user, "ERROR: No lifesigns detected at terminal, aborting.") // Safety to prevent aghosts accidentally consuming the only use. return if(message_sent) playsound(user, 'sound/machines/buzz-sigh.ogg', 50, 0) @@ -289,48 +337,35 @@ Syndicate_announce(input, user) to_chat(user, "Message transmitted.") log_say("[key_name(user)] has sent a Syndicate comms message from the depot: [input]", user) - updateUsrDialog() playsound(user, sound_yes, 50, 0) -/obj/machinery/computer/syndicate_depot/syndiecomms/secondary(mob/user, subcommand) - if(..()) - return - if(has_security_lockout(user)) - return - if(depotarea) - if(depotarea.local_alarm || depotarea.called_backup || depotarea.used_self_destruct) - to_chat(user, "Visitor sign-in is not possible while the depot is on security alert.") - else if(depotarea.on_peaceful) - if(subcommand == DEPOT_VISITOR_END) - if(check_rights(R_ADMIN, 0, user)) - depotarea.peaceful_mode(FALSE, TRUE) - else if (subcommand == DEPOT_VISITOR_ADD) - if(user.mind && user.mind.special_role == SPECIAL_ROLE_TRAITOR) - if(depotarea.list_includes(user, depotarea.peaceful_list)) - to_chat(user, "[user] is already signed in as a visiting agent.") - else - grant_syndie_faction(user) - else - to_chat(user, "Only verified agents of the Syndicate may sign in as visitors. Everyone else will be shot on sight.") - else if(subcommand == DEPOT_VISITOR_START) - if(depotarea.something_looted) - to_chat(user, "Visitor sign-in is not possible after supplies have been taken from a locker in the depot.") - else if("syndicate" in user.faction) - to_chat(user, "You are already recognized as a member of the Syndicate, and do not need to sign in.") - else if(user.mind && user.mind.special_role == SPECIAL_ROLE_TRAITOR) - grant_syndie_faction(user) - depotarea.peaceful_mode(TRUE, TRUE) - else - to_chat(user, "Only verified agents of the Syndicate may sign in as visitors. Everyone else will be shot on sight.") - else - to_chat(user, "Unrecognized subcommand: [subcommand]") - else +/obj/machinery/computer/syndicate_depot/syndiecomms/secondary(mob/user) + if(!istype(depotarea)) to_chat(user, "ERROR: [src] is unable to uplink to depot network.") - updateUsrDialog() + return + if(depotarea.local_alarm || depotarea.called_backup || depotarea.used_self_destruct) + to_chat(user, "Visitor sign-in is not possible while the depot is on security alert.") + return + if(depotarea.something_looted) + to_chat(user, "Visitor sign-in is not possible after supplies have been taken from a locker in the depot.") + return + if("syndicate" in user.faction) + to_chat(user, "You are already recognized as a member of the Syndicate, and do not need to sign in.") + return + if(!user.mind || user.mind.special_role != SPECIAL_ROLE_TRAITOR) + to_chat(user, "Only verified agents of the Syndicate may sign in as visitors. Everyone else will be shot on sight.") + return + if(depotarea.list_includes(user, depotarea.peaceful_list)) + to_chat(user, "[user] is already signed in as a visiting agent.") + return + if(!depotarea.on_peaceful) + depotarea.peaceful_mode(TRUE, TRUE) + grant_syndie_faction(user) playsound(user, sound_yes, 50, 0) /obj/machinery/computer/syndicate_depot/syndiecomms/proc/grant_syndie_faction(mob/user) user.faction += "syndicate" + depotarea.alert_log += "[user.name] signed in as a visitor." depotarea.list_add(user, depotarea.peaceful_list) to_chat(user, {"
    Welcome, Agent. You are now signed-in as a depot visitor. @@ -355,6 +390,8 @@ name = "syndicate teleporter console" icon_screen = "telesci" icon_keyboard = "teleport_key" + window_height = 300 + req_access = list(ACCESS_SYNDICATE_LEADER) var/obj/machinery/bluespace_beacon/syndicate/mybeacon var/obj/effect/portal/redspace/myportal var/obj/effect/portal/redspace/myportal2 @@ -433,34 +470,37 @@ qdel(myportal2) myportal2 = null -/obj/machinery/computer/syndicate_depot/teleporter/get_menu(mob/user) - var/menutext = "Syndicate Teleporter Control
    " +/obj/machinery/computer/syndicate_depot/teleporter/ui_data(mob/user) findbeacon() + var/list/data = ..() if(mybeacon) - menutext += {"

    Incoming Teleport Beacon: [mybeacon.enabled ? "ON" : "OFF"] ([mybeacon.enabled ? "Disable" : "Enable"])
    "} - else - menutext += {"

    Incoming Teleport Beacon: Reconnecting to beacon..."} - menutext += {"

    Outgoing Teleport Portal: [portal_enabled ? "ON" : "OFF"]"} - if(check_rights(R_ADMIN, 0, user) || (depotarea.on_peaceful && !portal_enabled)) - menutext += {" ([portal_enabled ? "Disable" : "Enable"])
    "} - return menutext + data["rows"] += list(list( + "title" = "Incoming Teleport Beacon", + "status" = mybeacon.enabled ? "ON" : "OFF", + "buttontitle" = mybeacon.enabled ? "Disable" : "Enable", + "buttonact" = "primary", + "buttondisabled" = !allowed(user), + "buttontooltip" = "When on, emagged teleporters can lock onto this location and open portals here." + )) + data["rows"] += list(list( + "title" = "Outgoing Teleport Portal", + "status" = portal_enabled ? "ON" : "OFF", + "buttontitle" = portal_enabled ? "Disable" : "Enable", + "buttonact" = "secondary", + "buttondisabled" = !allowed(user), + "buttontooltip" = "When on, creates a bi-directional portal to the beacon of your choice." + )) + return data /obj/machinery/computer/syndicate_depot/teleporter/primary(mob/user) - if(..()) - return if(!mybeacon && user) to_chat(user, "Unable to connect to teleport beacon.") return var/bresult = mybeacon.toggle() to_chat(user, "Syndicate Teleporter Beacon: [bresult ? "ON" : "OFF"]") - updateUsrDialog() playsound(user, sound_yes, 50, 0) /obj/machinery/computer/syndicate_depot/teleporter/secondary(mob/user) - if(..()) - return - if(!check_rights(R_ADMIN, 0, user) && !(depotarea.on_peaceful && !portal_enabled)) - return if(!portal_enabled && myportal) to_chat(user, "Outgoing Teleport Portal: deactivating... please wait...") return @@ -478,64 +518,72 @@ name = "syndicate ai terminal" icon_screen = "command" req_access = list() + window_height = 750 // has to be very tall since it has many sections which can expand -/obj/machinery/computer/syndicate_depot/aiterminal/get_menu(mob/user) - var/menutext = "Syndicate AI Terminal

    " +/obj/machinery/computer/syndicate_depot/aiterminal/ui_data(mob/user) + var/list/data = ..() if(!istype(depotarea)) - menutext += "
    ERROR: Unable to connect to AI network." - return menutext + return data - if(depotarea.alert_log.len) - menutext += "Event Log:
      " - for(var/thisline in depotarea.alert_log) - menutext += "
    • [thisline]
      • " - menutext += "
    " + var/alertlevel = "Green" + if(depotarea.on_peaceful) + alertlevel = "Visitor Mode" + else if(depotarea.used_self_destruct) + alertlevel = "Delta" + else if(depotarea.called_backup) + alertlevel = "Red" + else if(depotarea.local_alarm) + alertlevel = "Blue" else - menutext += "Event Log: EMPTY" - menutext += "

    " - - menutext += "Terminated Intruders: " - menutext += depotarea.list_gethtmlmobs(depotarea.dead_list) - menutext += "

    " - - menutext += "Extra Security Forces: " - menutext += depotarea.list_gethtmlmobs(depotarea.guard_list) - menutext += "

    " - - menutext += "Visiting Agents: " - menutext += depotarea.list_gethtmlmobs(depotarea.peaceful_list) - menutext += "

    " - + alertlevel = "Green" + data["rows"] += list(list( + "title" = "Alert Level", + "status" = alertlevel, + "buttontitle" = (allowed(user) && check_rights(R_ADMIN, FALSE, user)) ? "(ADMIN) Reset Alert Level" : null, + "buttonact" = "primary" + )) var/has_bot = FALSE for(var/mob/living/simple_animal/bot/ed209/syndicate/B in depotarea.list_getmobs(depotarea.guard_list)) has_bot = TRUE - if(has_bot) - menutext += "

    Sentry Bot: (issue recall order)" - else - menutext += "

    Sentry Bot: (none present)" - menutext += "

    " - - if(check_rights(R_ADMIN, 0, user)) - if(depotarea.on_peaceful) - menutext += "

    ADMIN: (To end visitor mode, use comms console.)" - else - menutext += "

    ADMIN: (Reset Depot Alert Level)" - - return menutext + data["rows"] += list(list( + "title" = "Extra Security Forces", + "status" = !length(depotarea.guard_list) ? "None Present" : null, + "bullets" = length(depotarea.guard_list) ? depotarea.list_shownames(depotarea.guard_list) : null, + "buttontitle" = has_bot ? "Recall Sentry Bot" : null, + "buttonact" = "secondary", + "buttondisabled" = !allowed(user), + "buttontooltip" = "Removes the sentry bot, but increases the alert level." + )) + data["rows"] += list(list( + "title" = "Logs", + "status" = !length(depotarea.alert_log) ? "None" : null, + "bullets" = depotarea.alert_log // this is naturally a list + )) + data["rows"] += list(list( + "title" = "Terminated Intruders", + "status" = !length(depotarea.dead_list) ? "None" : null, + "bullets" = length(depotarea.dead_list) ? depotarea.list_shownames(depotarea.dead_list) : null + )) + data["rows"] += list(list( + "title" = "Visiting Agents", + "status" = !length(depotarea.peaceful_list) ? "None" : null, + "bullets" = length(depotarea.peaceful_list) ? depotarea.list_shownames(depotarea.peaceful_list) : null + )) + return data /obj/machinery/computer/syndicate_depot/aiterminal/primary(mob/user) - if(..()) + if(!check_rights(R_ADMIN, FALSE, user)) return - if(!check_rights(R_ADMIN, 0, user)) + if(!istype(depotarea)) return - if(depotarea) + if(depotarea.on_peaceful) + depotarea.peaceful_mode(FALSE, TRUE) + else depotarea.reset_alert() - to_chat(user, "Alert level reset.") - playsound(user, sound_yes, 50, 0) + to_chat(user, "Alert level reset.") + playsound(user, sound_yes, 50, 0) /obj/machinery/computer/syndicate_depot/aiterminal/secondary(mob/user) - if(..()) - return for(var/mob/living/simple_animal/bot/ed209/syndicate/B in depotarea.list_getmobs(depotarea.guard_list)) depotarea.list_remove(B, depotarea.guard_list) new /obj/effect/portal(get_turf(B)) diff --git a/code/game/machinery/computer/honkputer.dm b/code/game/machinery/computer/honkputer.dm index 9f5d77a642c..6990e1c3dc8 100644 --- a/code/game/machinery/computer/honkputer.dm +++ b/code/game/machinery/computer/honkputer.dm @@ -65,7 +65,7 @@ src.emagged = 1 to_chat(user, "You scramble the login circuits, allowing anyone to use the console!") -/obj/machinery/computer/HONKputer/attack_hand(var/mob/user as mob) +/obj/machinery/computer/HONKputer/attack_hand(mob/user as mob) if(..()) return if(is_away_level(src.z)) diff --git a/code/game/machinery/computer/law.dm b/code/game/machinery/computer/law.dm index d7987477a65..823a20884d6 100644 --- a/code/game/machinery/computer/law.dm +++ b/code/game/machinery/computer/law.dm @@ -42,7 +42,7 @@ return ..() -/obj/machinery/computer/aiupload/attack_hand(var/mob/user as mob) +/obj/machinery/computer/aiupload/attack_hand(mob/user as mob) if(src.stat & NOPOWER) to_chat(usr, "The upload computer has no power!") return @@ -85,7 +85,7 @@ return ..() -/obj/machinery/computer/borgupload/attack_hand(var/mob/user as mob) +/obj/machinery/computer/borgupload/attack_hand(mob/user as mob) if(src.stat & NOPOWER) to_chat(usr, "The upload computer has no power!") return diff --git a/code/game/machinery/computer/message.dm b/code/game/machinery/computer/message.dm index b53b16a1075..a7345522b25 100644 --- a/code/game/machinery/computer/message.dm +++ b/code/game/machinery/computer/message.dm @@ -79,7 +79,7 @@ linkedServer = GLOB.message_servers[1] return -/obj/machinery/computer/message_monitor/attack_hand(var/mob/user as mob) +/obj/machinery/computer/message_monitor/attack_hand(mob/user as mob) if(..()) return if(stat & (NOPOWER|BROKEN)) @@ -87,7 +87,9 @@ //If the computer is being hacked or is emagged, display the reboot message. if(hacking || emag) message = rebootmsg - var/dat = "Message Monitor Console" + var/dat = "Message Monitor Console" + dat += "" + dat += "" dat += "

    Message Monitor Console

    " dat += "

    " diff --git a/code/game/machinery/computer/pod.dm b/code/game/machinery/computer/pod.dm index bafcd2d8ca2..322031d9997 100644 --- a/code/game/machinery/computer/pod.dm +++ b/code/game/machinery/computer/pod.dm @@ -48,7 +48,7 @@ return -/obj/machinery/computer/pod/proc/solo_sync(var/ident_tag) +/obj/machinery/computer/pod/proc/solo_sync(ident_tag) for(var/obj/machinery/mass_driver/M in GLOB.machines) if(M.z != src.z) continue if((M.id_tag == ident_tag) && !(ident_tag in synced)) @@ -74,7 +74,7 @@ return -/obj/machinery/computer/pod/proc/launch_sequence(var/ident_tag) +/obj/machinery/computer/pod/proc/launch_sequence(ident_tag) if(stat & (NOPOWER|BROKEN)) return var/anydriver = 0 @@ -108,12 +108,12 @@ return -/obj/machinery/computer/pod/attack_ai(var/mob/user as mob) +/obj/machinery/computer/pod/attack_ai(mob/user as mob) src.add_hiddenprint(user) return attack_hand(user) -/obj/machinery/computer/pod/attack_hand(var/mob/user as mob) +/obj/machinery/computer/pod/attack_hand(mob/user as mob) if(..()) return @@ -272,7 +272,7 @@ circuit = /obj/item/circuitboard/syndicatedoor light_color = "#00FFFF" -/obj/machinery/computer/pod/old/syndicate/attack_hand(var/mob/user as mob) +/obj/machinery/computer/pod/old/syndicate/attack_hand(mob/user as mob) if(!allowed(user)) to_chat(user, "Access Denied") return @@ -290,7 +290,7 @@ var/teleporter_dest = 0 circuit = /obj/item/circuitboard/pod/deathsquad -/obj/machinery/computer/pod/deathsquad/launch_sequence(var/ident_tag) +/obj/machinery/computer/pod/deathsquad/launch_sequence(ident_tag) if(stat & (NOPOWER|BROKEN)) return var/anydriver = 0 @@ -352,7 +352,7 @@ var/id_tag = "" -/obj/structure/deathsquad_tele/Bumped(var/atom/movable/AM) +/obj/structure/deathsquad_tele/Bumped(atom/movable/AM) if(!ztarget) return ..() var/y = AM.y spawn() diff --git a/code/game/machinery/computer/pod_tracking_console.dm b/code/game/machinery/computer/pod_tracking_console.dm index 6af1ab0bdf4..e8072d9e1d7 100644 --- a/code/game/machinery/computer/pod_tracking_console.dm +++ b/code/game/machinery/computer/pod_tracking_console.dm @@ -23,18 +23,19 @@ var/list/data = list() var/list/pods = list() for(var/obj/item/spacepod_equipment/misc/tracker/TR in GLOB.pod_trackers) - var/obj/spacepod/my_pod = TR.my_atom - var/podname = capitalize(sanitize(my_pod.name)) - var/pilot = "None" - var/passengers = list() - if(my_pod.pilot) - pilot = my_pod.pilot - if(my_pod.passengers) - for(var/mob/M in my_pod.passengers) - passengers += M.name - var/passengers_text = english_list(passengers, "None") + if(TR.my_atom) + var/obj/spacepod/my_pod = TR.my_atom + var/podname = capitalize(sanitize(my_pod.name)) + var/pilot = "None" + var/passengers = list() + if(my_pod.pilot) + pilot = my_pod.pilot + if(my_pod.passengers) + for(var/mob/M in my_pod.passengers) + passengers += M.name + var/passengers_text = english_list(passengers, "None") - pods.Add(list(list("name" = podname, "podx" = my_pod.x, "pody" = my_pod.y, "podz" = my_pod.z, "pilot" = pilot, "passengers" = passengers_text))) + pods.Add(list(list("name" = podname, "podx" = my_pod.x, "pody" = my_pod.y, "podz" = my_pod.z, "pilot" = pilot, "passengers" = passengers_text))) data["pods"] = pods return data diff --git a/code/game/machinery/computer/prisoner.dm b/code/game/machinery/computer/prisoner.dm index 8aa41e70f69..a155a323663 100644 --- a/code/game/machinery/computer/prisoner.dm +++ b/code/game/machinery/computer/prisoner.dm @@ -15,7 +15,7 @@ light_color = LIGHT_COLOR_DARKRED -/obj/machinery/computer/prisoner/attack_ai(var/mob/user as mob) +/obj/machinery/computer/prisoner/attack_ai(mob/user as mob) return src.attack_hand(user) /obj/machinery/computer/prisoner/New() @@ -26,7 +26,7 @@ GLOB.prisoncomputer_list -= src return ..() -/obj/machinery/computer/prisoner/attack_hand(var/mob/user as mob) +/obj/machinery/computer/prisoner/attack_hand(mob/user as mob) if(..()) return 1 user.set_machine(src) diff --git a/code/game/machinery/computer/robot.dm b/code/game/machinery/computer/robot.dm index 79c2cb35566..ffa434e7f2d 100644 --- a/code/game/machinery/computer/robot.dm +++ b/code/game/machinery/computer/robot.dm @@ -12,10 +12,10 @@ var/safety = 1 -/obj/machinery/computer/robotics/attack_ai(var/mob/user as mob) +/obj/machinery/computer/robotics/attack_ai(mob/user as mob) return attack_hand(user) -/obj/machinery/computer/robotics/attack_hand(var/mob/user as mob) +/obj/machinery/computer/robotics/attack_hand(mob/user as mob) if(..()) return if(stat & (NOPOWER|BROKEN)) diff --git a/code/game/machinery/computer/salvage_ship.dm b/code/game/machinery/computer/salvage_ship.dm index 1a3f15ddbab..917849101a5 100644 --- a/code/game/machinery/computer/salvage_ship.dm +++ b/code/game/machinery/computer/salvage_ship.dm @@ -106,5 +106,5 @@ updateUsrDialog() return -/obj/machinery/computer/salvage_ship/bullet_act(var/obj/item/projectile/Proj) +/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 60e1d2814f2..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,25 +246,6 @@ QDEL_NULL(record_security) update_all_mob_security_hud() set_temp("Security record deleted.") - if("delete_security_all") // Delete All Security Records - if(!logged_in) - return - 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.") - 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 @@ -494,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/sm_monitor.dm b/code/game/machinery/computer/sm_monitor.dm index 01cd72549f3..2a63d23e82a 100644 --- a/code/game/machinery/computer/sm_monitor.dm +++ b/code/game/machinery/computer/sm_monitor.dm @@ -10,7 +10,7 @@ /// Last status of the active supermatter for caching purposes var/last_status /// Reference to the active shard - var/obj/machinery/power/supermatter_shard/active + var/obj/machinery/power/supermatter_crystal/active /obj/machinery/computer/sm_monitor/Destroy() active = null @@ -28,7 +28,7 @@ /obj/machinery/computer/sm_monitor/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state) ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) - ui = new(user, src, ui_key, "SupermatterMonitor", name, 600, 325, master_ui, state) + ui = new(user, src, ui_key, "SupermatterMonitor", name, 600, 350, master_ui, state) ui.open() /obj/machinery/computer/sm_monitor/ui_data(mob/user) @@ -52,27 +52,27 @@ data["SM_ambienttemp"] = air.temperature data["SM_ambientpressure"] = air.return_pressure() //data["SM_EPR"] = round((air.total_moles / air.group_multiplier) / 23.1, 0.01) - var/other_moles = air.total_trace_moles() + var/list/gasdata = list() var/TM = air.total_moles() if(TM) - data["SM_gas_O2"] = round(100*air.oxygen/TM, 0.01) - data["SM_gas_CO2"] = round(100*air.carbon_dioxide/TM, 0.01) - data["SM_gas_N2"] = round(100*air.nitrogen/TM, 0.01) - data["SM_gas_PL"] = round(100*air.toxins/TM, 0.01) - if(other_moles) - data["SM_gas_OTHER"] = round(100 * other_moles / TM, 0.01) - else - data["SM_gas_OTHER"] = 0 + gasdata.Add(list(list("name"= "Oxygen", "amount" = round(100 * air.oxygen / TM, 0.01)))) + gasdata.Add(list(list("name"= "Carbon Dioxide", "amount" = round(100 * air.carbon_dioxide / TM, 0.01)))) + gasdata.Add(list(list("name"= "Nitrogen", "amount" = round(100 * air.nitrogen / TM, 0.01)))) + gasdata.Add(list(list("name"= "Plasma", "amount" = round(100 * air.toxins / TM, 0.01)))) + gasdata.Add(list(list("name"= "Nitrous Oxide", "amount" = round(100 * air.sleeping_agent / TM, 0.01)))) + gasdata.Add(list(list("name"= "Agent B", "amount" = round(100 * air.agent_b / TM, 0.01)))) else - data["SM_gas_O2"] = 0 - data["SM_gas_CO2"] = 0 - data["SM_gas_N2"] = 0 - data["SM_gas_PH"] = 0 - data["SM_gas_OTHER"] = 0 + gasdata.Add(list(list("name"= "Oxygen", "amount" = 0))) + gasdata.Add(list(list("name"= "Carbon Dioxide", "amount" = 0))) + gasdata.Add(list(list("name"= "Nitrogen", "amount" = 0))) + gasdata.Add(list(list("name"= "Plasma", "amount" = 0))) + gasdata.Add(list(list("name"= "Nitrous Oxide", "amount" = 0))) + gasdata.Add(list(list("name"= "Agent B", "amount" = 0))) + data["gases"] = gasdata else var/list/SMS = list() for(var/I in supermatters) - var/obj/machinery/power/supermatter_shard/S = I + var/obj/machinery/power/supermatter_crystal/S = I var/area/A = get_area(S) if(!A) continue @@ -80,7 +80,7 @@ SMS.Add(list(list( "area_name" = A.name, "integrity" = S.get_integrity(), - "uid" = S.UID() + "supermatter_id" = S.supermatter_id ))) data["active"] = FALSE @@ -98,7 +98,7 @@ var/turf/T = get_turf(ui_host()) // Get the UI host incase this ever turned into a supermatter monitoring module for AIs to use or something if(!T) return - for(var/obj/machinery/power/supermatter_shard/S in SSair.atmos_machinery) + for(var/obj/machinery/power/supermatter_crystal/S in SSair.atmos_machinery) // Delaminating, not within coverage, not on a tile. if(!(is_station_level(S.z) || is_mining_level(S.z) || atoms_share_level(S, T) || !istype(S.loc, /turf/simulated/))) continue @@ -136,9 +136,9 @@ refresh() if("view") - var/newuid = params["view"] - for(var/obj/machinery/power/supermatter_shard/S in supermatters) - if(S.UID() == newuid) + var/newuid = text2num(params["view"]) + for(var/obj/machinery/power/supermatter_crystal/S in supermatters) + if(S.supermatter_id == newuid) active = S break diff --git a/code/game/machinery/computer/specops_shuttle.dm b/code/game/machinery/computer/specops_shuttle.dm index 5933fc1b7d0..216c4fd8b67 100644 --- a/code/game/machinery/computer/specops_shuttle.dm +++ b/code/game/machinery/computer/specops_shuttle.dm @@ -247,7 +247,7 @@ GLOBAL_VAR_INIT(specops_shuttle_timeleft, 0) return 0 return 1 -/obj/machinery/computer/specops_shuttle/attack_ai(var/mob/user as mob) +/obj/machinery/computer/specops_shuttle/attack_ai(mob/user as mob) to_chat(user, "Access Denied.") return 1 @@ -257,7 +257,7 @@ GLOBAL_VAR_INIT(specops_shuttle_timeleft, 0) else return ..() -/obj/machinery/computer/specops_shuttle/attack_hand(var/mob/user as mob) +/obj/machinery/computer/specops_shuttle/attack_hand(mob/user as mob) if(!allowed(user)) to_chat(user, "Access Denied.") return diff --git a/code/game/machinery/computer/syndicate_specops_shuttle.dm b/code/game/machinery/computer/syndicate_specops_shuttle.dm index efe5617511e..6b72e5bbf5b 100644 --- a/code/game/machinery/computer/syndicate_specops_shuttle.dm +++ b/code/game/machinery/computer/syndicate_specops_shuttle.dm @@ -178,7 +178,7 @@ GLOBAL_VAR_INIT(syndicate_elite_shuttle_timeleft, 0) 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(var/mob/user as mob) +/obj/machinery/computer/syndicate_elite_shuttle/attack_ai(mob/user as mob) to_chat(user, "Access Denied.") return 1 @@ -188,7 +188,7 @@ GLOBAL_VAR_INIT(syndicate_elite_shuttle_timeleft, 0) else return ..() -/obj/machinery/computer/syndicate_elite_shuttle/attack_hand(var/mob/user as mob) +/obj/machinery/computer/syndicate_elite_shuttle/attack_hand(mob/user as mob) if(!allowed(user)) to_chat(user, "Access Denied.") return diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm index bea325f9d33..322141dee0a 100644 --- a/code/game/machinery/constructable_frame.dm +++ b/code/game/machinery/constructable_frame.dm @@ -314,9 +314,8 @@ to destroy them and players will be able to make replacements. /obj/item/stock_parts/capacitor = 6) /obj/item/circuitboard/thermomachine - name = "circuit board (Freezer)" - desc = "Use screwdriver to switch between heating and cooling modes." - build_path = /obj/machinery/atmospherics/unary/cold_sink/freezer + name = "Thermomachine (Machine Board)" + build_path = /obj/machinery/atmospherics/unary/thermomachine board_type = "machine" origin_tech = "programming=3;plasmatech=3" req_components = list( @@ -325,19 +324,6 @@ to destroy them and players will be able to make replacements. /obj/item/stack/cable_coil = 1, /obj/item/stack/sheet/glass = 1) -/obj/item/circuitboard/thermomachine/attackby(obj/item/I, mob/user, params) - if(istype(I, /obj/item/screwdriver)) - if(build_path == /obj/machinery/atmospherics/unary/cold_sink/freezer) - build_path = /obj/machinery/atmospherics/unary/heat_reservoir/heater - name = "circuit board (Heater)" - to_chat(user, "You set the board to heating.") - else - build_path = /obj/machinery/atmospherics/unary/cold_sink/freezer - name = "circuit board (Freezer)" - to_chat(user, "You set the board to cooling.") - return - return ..() - /obj/item/circuitboard/recharger name = "circuit board (Recharger)" build_path = /obj/machinery/recharger @@ -504,7 +490,8 @@ to destroy them and players will be able to make replacements. "\improper Secure Refrigerated Medicine Storage" = /obj/machinery/smartfridge/secure/medbay, "\improper Smart Chemical Storage" = /obj/machinery/smartfridge/secure/chemistry, "smart virus storage" = /obj/machinery/smartfridge/secure/chemistry/virology, - "\improper Drink Showcase" = /obj/machinery/smartfridge/drinks + "\improper Drink Showcase" = /obj/machinery/smartfridge/drinks, + "disk compartmentalizer" = /obj/machinery/smartfridge/disks ) @@ -638,6 +625,10 @@ to destroy them and players will be able to make replacements. /obj/item/stock_parts/manipulator = 1, /obj/item/stack/sheet/glass = 1) +/obj/item/circuitboard/autolathe/syndi + name = "Circuit board (Syndi Autolathe)" + build_path = /obj/machinery/autolathe/syndicate + /obj/item/circuitboard/protolathe name = "Circuit board (Protolathe)" build_path = /obj/machinery/r_n_d/protolathe diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm index 3c523cce7fa..23f217bf32b 100644 --- a/code/game/machinery/cryopod.dm +++ b/code/game/machinery/cryopod.dm @@ -1,3 +1,7 @@ +#define CRYO_DESTROY 0 +#define CRYO_PRESERVE 1 +#define CRYO_OBJECTIVE 2 + /* * Cryogenic refrigeration unit. Basically a despawner. * Stealing a lot of concepts/code from sleepers due to massive laziness. @@ -137,12 +141,22 @@ updateUsrDialog() return +/obj/machinery/computer/cryopod/proc/freeze_item(obj/item/I, preserve_status) + frozen_items += I + if(preserve_status == CRYO_OBJECTIVE) + objective_items += I + I.forceMove(src) + RegisterSignal(I, COMSIG_MOVABLE_MOVED, .proc/item_got_removed) + +/obj/machinery/computer/cryopod/proc/item_got_removed(obj/item/I) + objective_items -= I + frozen_items -= I + UnregisterSignal(I, COMSIG_MOVABLE_MOVED) + /obj/machinery/computer/cryopod/proc/dispense_item(obj/item/I) if(!(I in frozen_items)) return - I.forceMove(get_turf(src)) - objective_items -= I - frozen_items -= I + I.forceMove(get_turf(src)) // Will call item_got_removed due to the signal being registered to COMSIG_MOVABLE_MOVED /obj/machinery/computer/cryopod/emag_act(mob/user) user.changeNext_move(CLICK_CD_MELEE) @@ -179,13 +193,12 @@ orient_right = 1 icon_state = "cryo_rear-r" -/obj/structure/cryofeed/New() - +/obj/structure/cryofeed/Initialize(mapload) + . = ..() if(orient_right) icon_state = "cryo_rear-r" else icon_state = "cryo_rear" - ..() //Cryopods themselves. /obj/machinery/cryopod @@ -212,6 +225,7 @@ var/willing_time_divisor = 10 var/time_entered = 0 // Used to keep track of the safe period. var/obj/item/radio/intercom/announce + var/silent = FALSE var/obj/machinery/computer/cryopod/control_computer var/last_no_computer_message = 0 @@ -236,7 +250,10 @@ /obj/item/clothing/gloves/color/black/krav_maga/sec, /obj/item/spacepod_key, /obj/item/nullrod, - /obj/item/key + /obj/item/key, + /obj/item/door_remote, + /obj/item/autopsy_scanner, + /obj/item/holosign_creator/atmos ) // These items will NOT be preserved var/list/do_not_preserve_items = list ( @@ -315,10 +332,6 @@ despawn_occupant() -#define CRYO_DESTROY 0 -#define CRYO_PRESERVE 1 -#define CRYO_OBJECTIVE 2 - /obj/machinery/cryopod/proc/should_preserve_item(obj/item/I) for(var/datum/theft_objective/T in control_computer.theft_cache) if(istype(I, T.typepath) && T.check_special_completion(I)) @@ -365,10 +378,7 @@ if(preserve == CRYO_DESTROY) qdel(I) else if(control_computer && control_computer.allow_items) - control_computer.frozen_items += I - if(preserve == CRYO_OBJECTIVE) - control_computer.objective_items += I - I.loc = null + control_computer.freeze_item(I, preserve) else I.forceMove(loc) @@ -378,10 +388,11 @@ SSticker.mode.cult_objs.ready_to_summon() //Update any existing objectives involving this mob. - for(var/datum/objective/O in GLOB.all_objectives) - if(O.target != occupant.mind) - continue - O.on_target_cryo() + if(occupant.mind) + for(var/datum/objective/O in GLOB.all_objectives) + if(O.target != occupant.mind) + continue + O.on_target_cryo() if(occupant.mind && occupant.mind.assigned_role) //Handle job slot/tater cleanup. var/job = occupant.mind.assigned_role @@ -420,34 +431,38 @@ //Make an announcement and log the person entering storage. control_computer.frozen_crew += "[occupant.real_name]" - var/ailist[] = list() - for(var/mob/living/silicon/ai/A in GLOB.alive_mob_list) - ailist += A - if(ailist.len) - var/mob/living/silicon/ai/announcer = pick(ailist) - if (announce_rank) - announcer.say(";[occupant.real_name] ([announce_rank]) [on_store_message]") + if(!silent) + var/list/ailist = list() + for(var/thing in GLOB.ai_list) + var/mob/living/silicon/ai/AI = thing + if(AI.stat) + continue + ailist += AI + if(length(ailist)) + var/mob/living/silicon/ai/announcer = pick(ailist) + if(announce_rank) + announcer.say(";[occupant.real_name] ([announce_rank]) [on_store_message]", ignore_languages = TRUE) + else + announcer.say(";[occupant.real_name] [on_store_message]", ignore_languages = TRUE) else - announcer.say(";[occupant.real_name] [on_store_message]") - else - if (announce_rank) - announce.autosay("[occupant.real_name] ([announce_rank]) [on_store_message]", "[on_store_name]") - else - announce.autosay("[occupant.real_name] [on_store_message]", "[on_store_name]") - visible_message("\The [src] hums and hisses as it moves [occupant.real_name] into storage.") + if(announce_rank) + announce.autosay("[occupant.real_name] ([announce_rank]) [on_store_message]", "[on_store_name]") + else + if(announce_rank) + announce.autosay("[occupant.real_name] ([announce_rank]) [on_store_message]", "[on_store_name]") + else + announce.autosay("[occupant.real_name] [on_store_message]", "[on_store_name]") + visible_message("[src] hums and hisses as it moves [occupant.real_name] into storage.") // Ghost and delete the mob. - if(!occupant.get_ghost(1)) + if(!occupant.get_ghost(TRUE)) if(TOO_EARLY_TO_GHOST) - occupant.ghostize(0) // Players despawned too early may not re-enter the game + occupant.ghostize(FALSE) // Players despawned too early may not re-enter the game else - occupant.ghostize(1) + occupant.ghostize(TRUE) QDEL_NULL(occupant) name = initial(name) -#undef CRYO_DESTROY -#undef CRYO_PRESERVE -#undef CRYO_OBJECTIVE /obj/machinery/cryopod/attackby(obj/item/I, mob/user, params) @@ -575,7 +590,7 @@ else to_chat(user, "You stop [L == user ? "climbing into the cryo pod." : "putting [L] into the cryo pod."]") -/obj/machinery/cryopod/proc/take_occupant(var/mob/living/carbon/E, var/willing_factor = 1) +/obj/machinery/cryopod/proc/take_occupant(mob/living/carbon/E, willing_factor = 1) if(occupant) return if(!E) @@ -701,6 +716,10 @@ /obj/machinery/cryopod/blob_act() return //Sorta gamey, but we don't really want these to be destroyed. +/obj/machinery/cryopod/offstation + // Won't announce when used for cryoing. + silent = TRUE + /obj/machinery/computer/cryopod/robot name = "robotic storage console" desc = "An interface between crew and the robotic storage systems" @@ -746,7 +765,7 @@ return ..() -/proc/cryo_ssd(var/mob/living/carbon/person_to_cryo) +/proc/cryo_ssd(mob/living/carbon/person_to_cryo) if(istype(person_to_cryo.loc, /obj/machinery/cryopod)) return 0 if(isobj(person_to_cryo.loc)) @@ -767,7 +786,7 @@ return 1 return 0 -/proc/force_cryo_human(var/mob/living/carbon/person_to_cryo) +/proc/force_cryo_human(mob/living/carbon/person_to_cryo) if(!istype(person_to_cryo)) return if(!istype(person_to_cryo.loc, /obj/machinery/cryopod)) @@ -775,3 +794,7 @@ if(istype(person_to_cryo.loc, /obj/machinery/cryopod)) var/obj/machinery/cryopod/P = person_to_cryo.loc P.despawn_occupant() + +#undef CRYO_DESTROY +#undef CRYO_PRESERVE +#undef CRYO_OBJECTIVE diff --git a/code/game/machinery/dance_machine.dm b/code/game/machinery/dance_machine.dm index c071b473216..319e8035df1 100644 --- a/code/game/machinery/dance_machine.dm +++ b/code/game/machinery/dance_machine.dm @@ -467,7 +467,7 @@ if(!M.client || M.client.prefs.sound & SOUND_DISCO) if(!(M in rangers)) rangers[M] = TRUE - M.playsound_local(get_turf(M), null, 100, channel = CHANNEL_JUKEBOX, S = song_played) + M.playsound_local(get_turf(M), null, 100, channel = CHANNEL_JUKEBOX, S = song_played, use_reverb = FALSE) for(var/mob/L in rangers) if(get_dist(src, L) > 10) rangers -= L diff --git a/code/game/machinery/deployable.dm b/code/game/machinery/deployable.dm index 4611dcd8358..c8b19751c68 100644 --- a/code/game/machinery/deployable.dm +++ b/code/game/machinery/deployable.dm @@ -132,8 +132,8 @@ var/deploy_time = 40 var/deploy_message = TRUE -/obj/structure/barricade/security/New() - ..() +/obj/structure/barricade/security/Initialize(mapload) + . = ..() addtimer(CALLBACK(src, .proc/deploy), deploy_time) /obj/structure/barricade/security/proc/deploy() diff --git a/code/game/machinery/door_control.dm b/code/game/machinery/door_control.dm index 8e9befd7a6a..22727d54b57 100644 --- a/code/game/machinery/door_control.dm +++ b/code/game/machinery/door_control.dm @@ -46,7 +46,7 @@ emagged = 1 req_access = list() req_one_access = list() - playsound(loc, "sparks", 100, 1) + playsound(src, "sparks", 100, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) /obj/machinery/door_control/attack_ghost(mob/user) if(user.can_advanced_admin_interact()) diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index d670c42e5a8..8c5ed4ddb6e 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -57,6 +57,8 @@ GLOBAL_LIST_EMPTY(airlock_overlays) explosion_block = 1 assemblytype = /obj/structure/door_assembly siemens_strength = 1 + flags_2 = RAD_PROTECT_CONTENTS_2 | RAD_NO_CONTAMINATE_2 + rad_insulation = RAD_MEDIUM_INSULATION var/security_level = 0 //How much are wires secured var/aiControlDisabled = AICONTROLDISABLED_OFF var/hackProof = FALSE // if TRUE, this door can't be hacked by the AI @@ -190,7 +192,7 @@ About the new airlock wires panel: else return else if(user.hallucination > 50 && prob(10) && !operating) - if(user.electrocute_act(50, src, 1, illusion = TRUE)) // We'll just go with a flat 50 damage, instead of doing powernet checks + if(user.electrocute_act(50, src, flags = SHOCK_ILLUSION)) // We'll just go with a flat 50 damage, instead of doing powernet checks return ..(user) @@ -1283,6 +1285,7 @@ About the new airlock wires panel: sleep(6) if(QDELETED(src)) return + electronics = new /obj/item/airlock_electronics/destroyed() operating = FALSE if(!open()) update_icon(AIRLOCK_CLOSED, 1) @@ -1404,9 +1407,6 @@ About the new airlock wires panel: ae = electronics electronics = null ae.forceMove(loc) - if(emagged) - ae.icon_state = "door_electronics_smoked" - operating = 0 qdel(src) /obj/machinery/door/airlock/proc/note_type() //Returns a string representing the type of note pinned to this airlock diff --git a/code/game/machinery/doors/airlock_control.dm b/code/game/machinery/doors/airlock_control.dm index 47e6e4dc85b..3820c11adf0 100644 --- a/code/game/machinery/doors/airlock_control.dm +++ b/code/game/machinery/doors/airlock_control.dm @@ -146,6 +146,7 @@ /obj/machinery/airlock_sensor icon = 'icons/obj/airlock_machines.dmi' icon_state = "airlock_sensor_off" + layer = ABOVE_WINDOW_LAYER name = "airlock sensor" anchored = 1 resistance_flags = FIRE_PROOF @@ -228,9 +229,9 @@ icon = 'icons/obj/airlock_machines.dmi' icon_state = "access_button_standby" name = "access button" + layer = ABOVE_WINDOW_LAYER anchored = 1 power_channel = ENVIRON - var/master_tag frequency = AIRLOCK_FREQ var/command = "cycle" diff --git a/code/game/machinery/doors/airlock_electronics.dm b/code/game/machinery/doors/airlock_electronics.dm index e9435dfe4e8..0be1de00c80 100644 --- a/code/game/machinery/doors/airlock_electronics.dm +++ b/code/game/machinery/doors/airlock_electronics.dm @@ -102,3 +102,16 @@ if("clear_all") selected_accesses = list() + +/obj/item/airlock_electronics/destroyed + name = "burned-out airlock electronics" + icon_state = "door_electronics_smoked" + +/obj/item/airlock_electronics/destroyed/attack_self(mob/user) + return + +/obj/item/airlock_electronics/destroyed/decompile_act(obj/item/matter_decompiler/C, mob/user) + C.stored_comms["metal"] += 1 + C.stored_comms["glass"] += 1 + qdel(src) + return TRUE diff --git a/code/game/machinery/doors/airlock_types.dm b/code/game/machinery/doors/airlock_types.dm index 9f99b45afa4..9b913dbf148 100644 --- a/code/game/machinery/doors/airlock_types.dm +++ b/code/game/machinery/doors/airlock_types.dm @@ -150,18 +150,17 @@ icon = 'icons/obj/doors/airlocks/station/uranium.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_uranium paintable = FALSE - var/event_step = 20 + var/last_event = 0 -/obj/machinery/door/airlock/uranium/New() +/obj/machinery/door/airlock/uranium/process() + if(world.time > last_event + 20) + if(prob(50)) + radiate() + last_event = world.time ..() - addtimer(CALLBACK(src, .proc/radiate), event_step) - /obj/machinery/door/airlock/uranium/proc/radiate() - if(prob(50)) - for(var/mob/living/L in range (3,src)) - L.apply_effect(15,IRRADIATE,0) - addtimer(CALLBACK(src, .proc/radiate), event_step) + radiation_pulse(get_turf(src), 150) /obj/machinery/door/airlock/uranium/glass @@ -460,23 +459,6 @@ "You hear welding.") update_icon() - -////////////////////////////////// -/* - Shuttle Airlocks -*/ - -/obj/machinery/door/airlock/shuttle - name = "shuttle airlock" - icon = 'icons/obj/doors/airlocks/shuttle/shuttle.dmi' - overlays_file = 'icons/obj/doors/airlocks/shuttle/overlays.dmi' - assemblytype = /obj/structure/door_assembly/door_assembly_shuttle - paintable = FALSE - -/obj/machinery/door/airlock/shuttle/glass - opacity = 0 - glass = TRUE - /obj/machinery/door/airlock/abductor name = "alien airlock" desc = "With humanity's current technological level, it could take years to hack this advanced airlock... or maybe we should give a screwdriver a try?" diff --git a/code/game/machinery/doors/brigdoors.dm b/code/game/machinery/doors/brigdoors.dm index ce5b516c8c7..e50eb991838 100644 --- a/code/game/machinery/doors/brigdoors.dm +++ b/code/game/machinery/doors/brigdoors.dm @@ -86,7 +86,7 @@ var/timetext = seconds_to_time(timetoset / 10) var/announcetext = "Detainee [occupant] ([prisoner_drank]) has been incarcerated for [timetext] for the crime of: '[crimes]'. \ Arresting Officer: [usr.name].[R ? "" : " Detainee record not found, manual record update required."]" - Radio.autosay(announcetext, name, "Security", list(z)) + Radio.autosay(announcetext, name, "Security") // Notify the actual criminal being brigged. This is a QOL thing to ensure they always know the charges against them. // Announcing it on radio isn't enough, as they're unlikely to have sec radio. diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index d9568f69ac1..c1f4fd22044 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -383,3 +383,7 @@ /obj/machinery/door/GetExplosionBlock() return density ? real_explosion_block : 0 + +/obj/machinery/door/zap_act(power, zap_flags) + zap_flags &= ~ZAP_OBJ_DAMAGE + . = ..() diff --git a/code/game/machinery/doors/poddoor.dm b/code/game/machinery/doors/poddoor.dm index c0dce817189..cebd507a9ca 100644 --- a/code/game/machinery/doors/poddoor.dm +++ b/code/game/machinery/doors/poddoor.dm @@ -79,7 +79,7 @@ layer = CLOSED_DOOR_LAYER closingLayer = CLOSED_DOOR_LAYER -/obj/machinery/door/poddoor/multi_tile/New() +/obj/machinery/door/poddoor/multi_tile/Initialize(mapload) . = ..() apply_opacity_to_my_turfs(opacity) @@ -97,7 +97,7 @@ return ..() //Multi-tile poddoors don't turn invisible automatically, so we change the opacity of the turfs below instead one by one. -/obj/machinery/door/poddoor/multi_tile/proc/apply_opacity_to_my_turfs(var/new_opacity) +/obj/machinery/door/poddoor/multi_tile/proc/apply_opacity_to_my_turfs(new_opacity) for(var/turf/T in locs) T.opacity = new_opacity T.has_opaque_atom = new_opacity diff --git a/code/game/machinery/doors/shutters.dm b/code/game/machinery/doors/shutters.dm index 457b056b7f9..c2914262d15 100644 --- a/code/game/machinery/doors/shutters.dm +++ b/code/game/machinery/doors/shutters.dm @@ -12,3 +12,24 @@ icon_state = "open" density = FALSE opacity = 0 + +/obj/machinery/door/poddoor/shutters/radiation + name = "radiation shutters" + desc = "Lead-lined shutters with a radiation hazard symbol. Whilst this won't stop you getting irradiated, especially by a supermatter crystal, it will stop radiation travelling as far." + icon = 'icons/obj/doors/shutters_radiation.dmi' + icon_state = "closed" + rad_insulation = RAD_EXTREME_INSULATION + +/obj/machinery/door/poddoor/shutters/radiation/preopen + icon_state = "open" + density = FALSE + opacity = FALSE + rad_insulation = RAD_NO_INSULATION + +/obj/machinery/door/poddoor/shutters/radiation/open() + . = ..() + rad_insulation = RAD_NO_INSULATION + +/obj/machinery/door/poddoor/shutters/radiation/close() + . = ..() + rad_insulation = RAD_EXTREME_INSULATION diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm index dcb78253f35..59d839018bb 100644 --- a/code/game/machinery/doors/windowdoor.dm +++ b/code/game/machinery/doors/windowdoor.dm @@ -16,11 +16,9 @@ var/obj/item/airlock_electronics/electronics var/base_state = "left" var/reinf = 0 - var/cancolor = TRUE var/shards = 2 var/rods = 2 var/cable = 1 - var/list/debris = list() /obj/machinery/door/window/New(loc, set_dir) ..() @@ -29,18 +27,9 @@ if(req_access && req_access.len) icon_state = "[icon_state]" base_state = icon_state - if(!color && cancolor) - color = color_windows(src) - for(var/i in 1 to shards) - debris += new /obj/item/shard(src) - if(rods) - debris += new /obj/item/stack/rods(src, rods) - if(cable) - debris += new /obj/item/stack/cable_coil(src, cable) /obj/machinery/door/window/Destroy() density = FALSE - QDEL_LIST(debris) if(obj_integrity == 0) playsound(src, "shatter", 70, 1) QDEL_NULL(electronics) @@ -190,12 +179,19 @@ /obj/machinery/door/window/deconstruct(disassembled = TRUE) if(!(flags & NODECONSTRUCT) && !disassembled) - for(var/obj/fragment in debris) - fragment.forceMove(get_turf(src)) - transfer_fingerprints_to(fragment) - debris -= fragment + for(var/obj/item/shard/debris in spawnDebris(drop_location())) + transfer_fingerprints_to(debris) // transfer fingerprints to shards only qdel(src) +/obj/machinery/door/window/proc/spawnDebris(location) + . = list() + for(var/i in 1 to shards) + . += new /obj/item/shard(location) + if(rods) + . += new /obj/item/stack/rods(location, rods) + if(cable) + . += new /obj/item/stack/cable_coil(location, cable) + /obj/machinery/door/window/narsie_act() color = NARSIE_WINDOW_COLOUR @@ -223,8 +219,9 @@ if(!operating && density && !emagged) emagged = TRUE operating = TRUE + electronics = new /obj/item/airlock_electronics/destroyed() flick("[base_state]spark", src) - playsound(src, "sparks", 75, 1) + playsound(src, "sparks", 75, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) sleep(6) operating = FALSE open(2) @@ -283,11 +280,6 @@ WA.update_icon() WA.created_name = name - if(emagged) - to_chat(user, "You discard the damaged electronics.") - qdel(src) - return - to_chat(user, "You remove the airlock electronics.") var/obj/item/airlock_electronics/ae @@ -349,12 +341,11 @@ shards = 0 rods = 0 resistance_flags = ACID_PROOF | FIRE_PROOF - cancolor = FALSE var/made_glow = FALSE -/obj/machinery/door/window/clockwork/New(loc, set_dir) - ..() - debris += new/obj/item/stack/tile/brass(src, 2) +/obj/machinery/door/window/clockwork/spawnDebris(location) + . = ..() + . = new /obj/item/stack/tile/brass(location, 2) /obj/machinery/door/window/clockwork/setDir(direct) if(!made_glow) diff --git a/code/game/machinery/doppler_array.dm b/code/game/machinery/doppler_array.dm index e02bcce1315..0061e91001c 100644 --- a/code/game/machinery/doppler_array.dm +++ b/code/game/machinery/doppler_array.dm @@ -19,7 +19,7 @@ GLOBAL_LIST_EMPTY(doppler_arrays) var/actual_size_message var/theoretical_size_message -/datum/explosion_log/New(var/log_time, var/log_epicenter, var/log_actual_size_message, var/log_theoretical_size_message) +/datum/explosion_log/New(log_time, log_epicenter, log_actual_size_message, log_theoretical_size_message) ..() logged_time = log_time epicenter = log_epicenter diff --git a/code/game/machinery/embedded_controller/airlock_controllers.dm b/code/game/machinery/embedded_controller/airlock_controllers.dm index 3cf506d96ba..8766864bdc1 100644 --- a/code/game/machinery/embedded_controller/airlock_controllers.dm +++ b/code/game/machinery/embedded_controller/airlock_controllers.dm @@ -1,5 +1,6 @@ //base type for controllers of two-door systems /obj/machinery/embedded_controller/radio/airlock + layer = ABOVE_WINDOW_LAYER // Setup parameters only radio_filter = RADIO_AIRLOCK var/tag_exterior_door diff --git a/code/game/machinery/embedded_controller/airlock_program.dm b/code/game/machinery/embedded_controller/airlock_program.dm index d9500e30808..825ba8ceee5 100644 --- a/code/game/machinery/embedded_controller/airlock_program.dm +++ b/code/game/machinery/embedded_controller/airlock_program.dm @@ -23,7 +23,7 @@ var/state = STATE_IDLE var/target_state = TARGET_NONE -/datum/computer/file/embedded_program/airlock/New(var/obj/machinery/embedded_controller/M) +/datum/computer/file/embedded_program/airlock/New(obj/machinery/embedded_controller/M) ..(M) memory["chamber_sensor_pressure"] = ONE_ATMOSPHERE @@ -271,13 +271,13 @@ var/int_closed = check_interior_door_secured() return (ext_closed && int_closed) -/datum/computer/file/embedded_program/airlock/proc/signalDoor(var/tag, var/command) +/datum/computer/file/embedded_program/airlock/proc/signalDoor(tag, command) var/datum/signal/signal = new signal.data["tag"] = tag signal.data["command"] = command post_signal(signal, RADIO_AIRLOCK) -/datum/computer/file/embedded_program/airlock/proc/signalPump(var/tag, var/power, var/direction, var/pressure) +/datum/computer/file/embedded_program/airlock/proc/signalPump(tag, power, direction, pressure) var/datum/signal/signal = new signal.data = list( "tag" = tag, @@ -289,7 +289,7 @@ post_signal(signal) //this is called to set the appropriate door state at the end of a cycling process, or for the exterior buttons -/datum/computer/file/embedded_program/airlock/proc/cycleDoors(var/target) +/datum/computer/file/embedded_program/airlock/proc/cycleDoors(target) switch(target) if(TARGET_OUTOPEN) toggleDoor(memory["interior_status"], tag_interior_door, memory["secure"], "close") @@ -305,7 +305,7 @@ signalDoor(tag_exterior_door, command) signalDoor(tag_interior_door, command) -/datum/computer/file/embedded_program/airlock/proc/signal_mech_sensor(var/command, var/sensor) +/datum/computer/file/embedded_program/airlock/proc/signal_mech_sensor(command, sensor) var/datum/signal/signal = new signal.data["tag"] = sensor signal.data["command"] = command @@ -331,7 +331,7 @@ Only sends a command if it is needed, i.e. if the door is already open, passing an open command to this proc will not send an additional command to open the door again. ----------------------------------------------------------*/ -/datum/computer/file/embedded_program/airlock/proc/toggleDoor(var/list/doorStatus, var/doorTag, var/secure, var/command) +/datum/computer/file/embedded_program/airlock/proc/toggleDoor(list/doorStatus, doorTag, secure, command) var/doorCommand = null if(command == "toggle") diff --git a/code/game/machinery/embedded_controller/embedded_controller_base.dm b/code/game/machinery/embedded_controller/embedded_controller_base.dm index a58118b31f0..2a049958488 100644 --- a/code/game/machinery/embedded_controller/embedded_controller_base.dm +++ b/code/game/machinery/embedded_controller/embedded_controller_base.dm @@ -69,7 +69,7 @@ else icon_state = "airlock_control_off" -/obj/machinery/embedded_controller/radio/post_signal(datum/signal/signal, var/filter = null) +/obj/machinery/embedded_controller/radio/post_signal(datum/signal/signal, filter = null) signal.transmission_method = TRANSMISSION_RADIO if(radio_connection) //use_power(radio_power_use) //neat idea, but causes way too much lag. diff --git a/code/game/machinery/embedded_controller/embedded_program_base.dm b/code/game/machinery/embedded_controller/embedded_program_base.dm index 5bd46b2f3e0..bf64ee1e75e 100644 --- a/code/game/machinery/embedded_controller/embedded_program_base.dm +++ b/code/game/machinery/embedded_controller/embedded_program_base.dm @@ -5,7 +5,7 @@ var/id_tag -/datum/computer/file/embedded_program/New(var/obj/machinery/embedded_controller/M) +/datum/computer/file/embedded_program/New(obj/machinery/embedded_controller/M) master = M if(istype(M, /obj/machinery/embedded_controller/radio)) var/obj/machinery/embedded_controller/radio/R = M diff --git a/code/game/machinery/firealarm.dm b/code/game/machinery/firealarm.dm index b4214fe3b23..71e919f10cc 100644 --- a/code/game/machinery/firealarm.dm +++ b/code/game/machinery/firealarm.dm @@ -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]!") @@ -220,11 +219,9 @@ FIRE ALARM /obj/machinery/firealarm/power_change() if(powered(ENVIRON)) stat &= ~NOPOWER - update_icon() else - spawn(rand(0,15)) - stat |= NOPOWER - update_icon() + stat |= NOPOWER + update_icon() /obj/machinery/firealarm/attack_hand(mob/user) if(stat & (NOPOWER|BROKEN) || buildstage != 2) diff --git a/code/game/machinery/flasher.dm b/code/game/machinery/flasher.dm index 369d43e5d94..b7b35863541 100644 --- a/code/game/machinery/flasher.dm +++ b/code/game/machinery/flasher.dm @@ -66,9 +66,6 @@ if(L.flash_eyes(affect_silicon = 1)) L.Weaken(strength) - if(L.weakeyes) - L.Weaken(strength * 1.5) - L.visible_message("[L] gasps and shields [L.p_their()] eyes!") /obj/machinery/flasher/emp_act(severity) if(stat & (BROKEN|NOPOWER)) diff --git a/code/game/machinery/gameboard.dm b/code/game/machinery/gameboard.dm index edc1d3499ec..3141f66592d 100644 --- a/code/game/machinery/gameboard.dm +++ b/code/game/machinery/gameboard.dm @@ -73,7 +73,7 @@ user << browse(null, "window=SpessChess") // And I will kill you. return -/obj/machinery/gameboard/Topic(var/href, var/list/href_list) +/obj/machinery/gameboard/Topic(href, list/href_list) . = ..() var/prize = /obj/item/stack/tickets if(.) diff --git a/code/game/machinery/guestpass.dm b/code/game/machinery/guestpass.dm index 165c8dbe4cb..2292b20728a 100644 --- a/code/game/machinery/guestpass.dm +++ b/code/game/machinery/guestpass.dm @@ -39,21 +39,22 @@ density = 0 - var/obj/item/card/id/giver + var/obj/item/card/id/scan var/list/accesses = list() var/giv_name = "NOT SPECIFIED" var/reason = "NOT SPECIFIED" var/duration = 5 + var/print_cooldown = 0 var/list/internal_log = list() - var/mode = 0 // 0 - making pass, 1 - viewing logs + var/mode = FALSE // FALSE - making pass, TRUE - viewing logs /obj/machinery/computer/guestpass/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/card/id)) - if(!giver) + if(!scan) if(user.drop_item()) I.forceMove(src) - giver = I + scan = I updateUsrDialog() else to_chat(user, "There is already ID card inside.") @@ -61,132 +62,161 @@ return ..() /obj/machinery/computer/guestpass/proc/get_changeable_accesses() - return giver.access + return scan.access /obj/machinery/computer/guestpass/attack_ai(mob/user) return attack_hand(user) -/obj/machinery/computer/guestpass/attack_hand(var/mob/user as mob) +/obj/machinery/computer/guestpass/attack_hand(mob/user) if(..()) return + ui_interact(user) - user.set_machine(src) - var/dat +/obj/machinery/computer/guestpass/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state) + ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open) + if(!ui) + ui = new(user, src, ui_key, "GuestPass", name, 500, 850, master_ui, state) + ui.open() + ui.set_autoupdate(FALSE) - if(mode == 1) //Logs - dat += "

    Activity log


    " - for(var/entry in internal_log) - dat += "[entry]
    " - dat += "Print
    " - dat += "Back
    " +/obj/machinery/computer/guestpass/ui_data(mob/user) + var/list/data = list() + data["showlogs"] = mode + data["scan_name"] = scan ? scan.name : FALSE + data["issue_log"] = internal_log ? internal_log : list() + data["giv_name"] = giv_name + data["reason"] = reason + data["duration"] = duration + if(scan && !(ACCESS_CHANGE_IDS in scan.access)) + data["grantableList"] = scan ? scan.access : list() + data["canprint"] = FALSE + if(!scan) + data["printmsg"] = "No card inserted." + else if(!length(scan.access)) + data["printmsg"] = "Card has no access." + else if(!length(accesses)) + data["printmsg"] = "No access types selected." + else if(print_cooldown > world.time) + data["printmsg"] = "Busy for [(round((print_cooldown - world.time) / 10))]s.." else - dat += "

    Guest pass terminal #[uid]


    " - dat += "View activity log

    " - dat += "Issuing ID: [giver]
    " - dat += "Issued to: [giv_name]
    " - dat += "Reason: [reason]
    " - dat += "Duration (minutes): [duration] m
    " - dat += "Access to areas:
    " - if(giver && giver.access) - for(var/A in get_changeable_accesses()) - var/area = get_access_desc(A) - if(A in accesses) - area = "[area]" - dat += "[area]
    " - dat += "
    Issue pass
    " + data["printmsg"] = "Print Pass" + data["canprint"] = TRUE - var/datum/browser/popup = new(user, "guestpass", name, 400, 520) - popup.set_content(dat) - popup.open(0) - onclose(user, "guestpass") + data["selectedAccess"] = accesses ? accesses : list() + return data +/obj/machinery/computer/guestpass/ui_static_data(mob/user) + var/list/data = list() + data["regions"] = get_accesslist_static_data(REGION_GENERAL, REGION_COMMAND) + return data -/obj/machinery/computer/guestpass/Topic(href, href_list) +/obj/machinery/computer/guestpass/ui_act(action, params) if(..()) - return 1 - usr.set_machine(src) - if(href_list["mode"]) - mode = text2num(href_list["mode"]) - - if(href_list["choice"]) - switch(href_list["choice"]) - if("giv_name") - var/nam = strip_html_simple(input("Person pass is issued to", "Name", giv_name) as text|null) - if(nam) - giv_name = nam - if("reason") - var/reas = strip_html_simple(input("Reason why pass is issued", "Reason", reason) as text|null) - if(reas) - reason = reas - if("duration") - var/dur = input("Duration (in minutes) during which pass is valid (up to 30 minutes).", "Duration") as num|null - if(dur) - if(dur > 0 && dur <= 30) - duration = dur - else - to_chat(usr, "Invalid duration.") - if("access") - var/A = text2num(href_list["access"]) - if(A in accesses) - accesses.Remove(A) + return + . = TRUE + switch(action) + if("scan") // insert/remove your ID card + if(scan) + if(ishuman(usr)) + scan.forceMove(get_turf(usr)) + usr.put_in_hands(scan) + scan = null else - if(giver && giver.access && (A in get_changeable_accesses())) + scan.forceMove(get_turf(src)) + scan = null + accesses.Cut() + else + var/obj/item/I = usr.get_active_hand() + if(istype(I, /obj/item/card/id)) + if(usr.drop_item()) + I.forceMove(src) + scan = I + if("mode") + mode = !mode + if(!scan || !scan.access) + return // everything below here requires card auth + switch(action) + if("giv_name") + var/nam = strip_html_simple(input("Person pass is issued to", "Name", giv_name) as text | null) + if(nam) + giv_name = nam + if("reason") + var/reas = strip_html_simple(input("Reason why pass is issued", "Reason", reason) as text | null) + if(reas) + reason = reas + if("duration") + var/dur = input("Duration (in minutes) during which pass is valid (up to 30 minutes).", "Duration") as num | null + if(dur) + if(dur > 0 && dur <= 30) + duration = dur + else + to_chat(usr, "Invalid duration.") + if("print") + var/dat = "

    Activity log of guest pass terminal #[uid]


    " + for(var/entry in internal_log) + dat += "[entry]
    " + var/obj/item/paper/P = new /obj/item/paper(loc) + playsound(loc, 'sound/goonstation/machines/printer_dotmatrix.ogg', 50, TRUE) + P.name = "activity log" + P.info = dat + if("issue") + if(!length(accesses)) + return + if(print_cooldown > world.time) + return + var/number = add_zero("[rand(0, 9999)]", 4) + var/entry = "\[[station_time()]\] Pass #[number] issued by [scan.registered_name] ([scan.assignment]) to [giv_name]. Reason: [reason]. Grants access to following areas: " + for(var/i in 1 to length(accesses)) + var/A = accesses[i] + if(A) + var/area = get_access_desc(A) + entry += "[i > 1 ? ", [area]" : "[area]"]" + var/obj/item/card/id/guest/pass = new(get_turf(src)) + pass.temp_access = accesses.Copy() + pass.registered_name = giv_name + pass.expiration_time = world.time + duration MINUTES + pass.reason = reason + pass.name = "guest pass #[number]" + print_cooldown = world.time + 10 SECONDS + entry += ". Expires at [station_time_timestamp("hh:mm:ss", pass.expiration_time)]." + internal_log += entry + if("access") + var/A = text2num(params["access"]) + if(A in accesses) + accesses.Remove(A) + else if(ACCESS_CHANGE_IDS in scan.access) + accesses += A + else if(A in get_changeable_accesses()) + accesses += A + if("grant_region") + var/region = text2num(params["region"]) + if(isnull(region)) + return + if(ACCESS_CHANGE_IDS in scan.access) + accesses |= get_region_accesses(region) + else + var/list/new_accesses = get_region_accesses(region) + for(var/A in new_accesses) + if(A in scan.access) accesses.Add(A) - if(href_list["action"]) - switch(href_list["action"]) - if("id") - if(giver) - if(ishuman(usr)) - giver.loc = usr.loc - if(!usr.get_active_hand()) - usr.put_in_hands(giver) - giver = null - else - giver.loc = src.loc - giver = null - accesses.Cut() - else - var/obj/item/I = usr.get_active_hand() - if(istype(I, /obj/item/card/id)) - usr.drop_item() - I.loc = src - giver = I - updateUsrDialog() - - if("print") - var/dat = "

    Activity log of guest pass terminal #[uid]


    " - for(var/entry in internal_log) - dat += "[entry]
    " -// to_chat(usr, "Printing the log, standby...") - //sleep(50) - var/obj/item/paper/P = new/obj/item/paper( loc ) - playsound(loc, 'sound/goonstation/machines/printer_dotmatrix.ogg', 50, 1) - P.name = "activity log" - P.info = dat - - if("issue") - if(giver) - var/number = add_zero("[rand(0,9999)]", 4) - var/entry = "\[[station_time()]\] Pass #[number] issued by [giver.registered_name] ([giver.assignment]) to [giv_name]. Reason: [reason]. Grants access to following areas: " - for(var/i=1 to accesses.len) - var/A = accesses[i] - if(A) - var/area = get_access_desc(A) - entry += "[i > 1 ? ", [area]" : "[area]"]" - entry += ". Expires at [station_time(world.time + duration*10*60)]." - internal_log.Add(entry) - - var/obj/item/card/id/guest/pass = new(src.loc) - pass.temp_access = accesses.Copy() - pass.registered_name = giv_name - pass.expiration_time = world.time + duration*10*60 - pass.reason = reason - pass.name = "guest pass #[number]" - else - to_chat(usr, "Cannot issue pass without issuing ID.") - updateUsrDialog() - return + if("deny_region") + var/region = text2num(params["region"]) + if(isnull(region)) + return + accesses -= get_region_accesses(region) + if("clear_all") + accesses = list() + if("grant_all") + if(ACCESS_CHANGE_IDS in scan.access) + accesses = get_all_accesses() + else + var/list/new_accesses = get_all_accesses() + for(var/A in new_accesses) + if(A in scan.access) + accesses += A + if(.) + add_fingerprint(usr) /obj/machinery/computer/guestpass/hop name = "\improper HoP guest pass terminal" diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm index 6d2586c46aa..c4d5c4984b9 100644 --- a/code/game/machinery/hologram.dm +++ b/code/game/machinery/hologram.dm @@ -343,7 +343,7 @@ GLOBAL_LIST_EMPTY(holopads) update_holoray(user,new_turf) return TRUE -/obj/machinery/hologram/holopad/proc/activate_holo(mob/living/user, var/force = 0) +/obj/machinery/hologram/holopad/proc/activate_holo(mob/living/user, force = 0) var/mob/living/silicon/ai/AI = user if(!istype(AI)) AI = null @@ -423,7 +423,7 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/ icon_state = "holopad0" -/obj/machinery/hologram/holopad/proc/set_holo(mob/living/user, var/obj/effect/overlay/holo_pad_hologram/h) +/obj/machinery/hologram/holopad/proc/set_holo(mob/living/user, obj/effect/overlay/holo_pad_hologram/h) masters[user] = h holorays[user] = new /obj/effect/overlay/holoray(loc) var/mob/living/silicon/ai/AI = user diff --git a/code/game/machinery/lightswitch.dm b/code/game/machinery/lightswitch.dm index f2262b99859..ae3520af45b 100644 --- a/code/game/machinery/lightswitch.dm +++ b/code/game/machinery/lightswitch.dm @@ -17,7 +17,7 @@ var/logic_connect = 0 //Set this to allow the switch to send out logic signals. -/obj/machinery/light_switch/New(turf/loc, var/w_dir=null) +/obj/machinery/light_switch/New(turf/loc, w_dir=null) ..() switch(w_dir) if(NORTH) @@ -165,7 +165,7 @@ new/obj/item/mounted/frame/light_switch(get_turf(src)) qdel(src) -/obj/machinery/light_switch/multitool_menu(var/mob/user, var/obj/item/multitool/P) +/obj/machinery/light_switch/multitool_menu(mob/user, obj/item/multitool/P) return {" "} -/obj/machinery/light_switch/multitool_topic(var/mob/user,var/list/href_list,var/obj/O) +/obj/machinery/light_switch/multitool_topic(mob/user, list/href_list, obj/O) ..() if("toggle_light_connect" in href_list) light_connect = !light_connect diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm index 5358a1206b8..901844c0c14 100644 --- a/code/game/machinery/machinery.dm +++ b/code/game/machinery/machinery.dm @@ -102,7 +102,6 @@ Class Procs: max_integrity = 200 layer = BELOW_OBJ_LAYER var/stat = 0 - var/emagged = 0 var/use_power = IDLE_POWER_USE //0 = dont run the auto //1 = run auto, use idle @@ -112,13 +111,10 @@ Class Procs: var/power_channel = EQUIP //EQUIP,ENVIRON or LIGHT var/list/component_parts = null //list of all the parts used to build it, if made from certain kinds of frames. var/uid - var/manual = 0 var/global/gl_uid = 1 - var/custom_aghost_alerts=0 var/panel_open = 0 var/area/myArea var/interact_offline = 0 // Can the machine be interacted with while de-powered. - var/list/use_log // Init this list if you wish to add logging to your machine - currently only viewable in VV var/list/settagwhitelist // (Init this list if needed) WHITELIST OF VARIABLES THAT THE set_tag HREF CAN MODIFY, DON'T PUT SHIT YOU DON'T NEED ON HERE, AND IF YOU'RE GONNA USE set_tag (format_tag() proc), ADD TO THIS LIST. atom_say_verb = "beeps" var/siemens_strength = 0.7 // how badly will it shock you? @@ -207,7 +203,7 @@ Class Procs: stat &= ~BROKEN //sets the use_power var and then forces an area power update -/obj/machinery/proc/update_use_power(var/new_use_power) +/obj/machinery/proc/update_use_power(new_use_power) use_power = new_use_power /obj/machinery/proc/auto_use_power() @@ -245,7 +241,7 @@ Class Procs: return TRUE return FALSE -/obj/machinery/proc/handle_multitool_topic(var/href, var/list/href_list, var/mob/user) +/obj/machinery/proc/handle_multitool_topic(href, list/href_list, mob/user) if(!allowed(user))//no, not even HREF exploits return FALSE var/obj/item/multitool/P = get_multitool(usr) @@ -317,7 +313,7 @@ Class Procs: update_multitool_menu(usr) return TRUE -/obj/machinery/Topic(href, href_list, var/nowindow = 0, var/datum/ui_state/state = GLOB.default_state) +/obj/machinery/Topic(href, href_list, nowindow = 0, datum/ui_state/state = GLOB.default_state) if(..(href, href_list, nowindow, state)) return 1 @@ -325,10 +321,10 @@ Class Procs: add_fingerprint(usr) return 0 -/obj/machinery/proc/operable(var/additional_flags = 0) +/obj/machinery/proc/operable(additional_flags = 0) return !inoperable(additional_flags) -/obj/machinery/proc/inoperable(var/additional_flags = 0) +/obj/machinery/proc/inoperable(additional_flags = 0) return (stat & (NOPOWER|BROKEN|additional_flags)) /obj/machinery/ui_status(mob/user, datum/ui_state/state) @@ -343,11 +339,11 @@ Class Procs: return ..() -/obj/machinery/CouldUseTopic(var/mob/user) +/obj/machinery/CouldUseTopic(mob/user) ..() user.set_machine(src) -/obj/machinery/CouldNotUseTopic(var/mob/user) +/obj/machinery/CouldNotUseTopic(mob/user) usr.unset_machine() /obj/machinery/proc/dropContents()//putting for swarmers, occupent code commented out, someone can use later. @@ -571,7 +567,7 @@ Class Procs: /obj/machinery/proc/is_assess_emagged() return emagged -/obj/machinery/proc/assess_perp(mob/living/carbon/human/perp, var/check_access, var/auth_weapons, var/check_records, var/check_arrest) +/obj/machinery/proc/assess_perp(mob/living/carbon/human/perp, check_access, auth_weapons, check_records, check_arrest) var/threatcount = 0 //the integer returned if(is_assess_emagged()) @@ -637,14 +633,15 @@ Class Procs: /obj/machinery/proc/can_be_overridden() . = 1 -/obj/machinery/tesla_act(power, explosive = FALSE) - ..() - if(prob(85) && explosive) - explosion(loc, 1, 2, 4, flame_range = 2, adminlog = 0, smoke = 0) - else if(prob(50)) - emp_act(EMP_LIGHT) - else - ex_act(EXPLODE_HEAVY) +/obj/machinery/zap_act(power, zap_flags) + if(prob(85) && (zap_flags & ZAP_MACHINE_EXPLOSIVE) && !(resistance_flags & INDESTRUCTIBLE)) + explosion(src, 1, 2, 4, flame_range = 2, adminlog = FALSE, smoke = FALSE) + else if(zap_flags & ZAP_OBJ_DAMAGE) + take_damage(power * 0.0005, BURN, "energy") + if(prob(40)) + emp_act(EMP_LIGHT) + power -= power * 0.0005 + return ..() /obj/machinery/proc/adjust_item_drop_location(atom/movable/AM) // Adjust item drop location to a 3x3 grid inside the tile, returns slot id from 0 to 8 var/md5 = md5(AM.name) // Oh, and it's deterministic too. A specific item will always drop from the same slot. diff --git a/code/game/machinery/magnet.dm b/code/game/machinery/magnet.dm index dd2ef029d57..7bd89ac6dae 100644 --- a/code/game/machinery/magnet.dm +++ b/code/game/machinery/magnet.dm @@ -44,7 +44,7 @@ // update the invisibility and icon /obj/machinery/magnetic_module/hide(intact) - invisibility = intact ? 101 : 0 + invisibility = intact ? INVISIBILITY_MAXIMUM : 0 updateicon() // update the icon_state @@ -69,7 +69,7 @@ -/obj/machinery/magnetic_module/proc/Cmd(var/command, var/modifier) +/obj/machinery/magnetic_module/proc/Cmd(command, modifier) if(command) switch(command) if("set-electriclevel") diff --git a/code/game/machinery/mass_driver.dm b/code/game/machinery/mass_driver.dm index 8c960774b63..cae3e78186e 100644 --- a/code/game/machinery/mass_driver.dm +++ b/code/game/machinery/mass_driver.dm @@ -34,7 +34,7 @@ return ..() -/obj/machinery/mass_driver/multitool_menu(var/mob/user, var/obj/item/multitool/P) +/obj/machinery/mass_driver/multitool_menu(mob/user, obj/item/multitool/P) return {"
    • [format_tag("ID Tag","id_tag","set_id")]
      • @@ -98,7 +98,7 @@ anchored = 0 var/build = 0 -/obj/machinery/mass_driver_frame/attackby(var/obj/item/W as obj, var/mob/user as mob) +/obj/machinery/mass_driver_frame/attackby(obj/item/W as obj, mob/user as mob) switch(build) if(0) // Loose frame if(istype(W, /obj/item/wrench)) @@ -204,7 +204,7 @@ set name = "Rotate Frame" set src in view(1) - if( usr.stat || usr.restrained() || (usr.status_flags & FAKEDEATH)) + if( usr.stat || usr.restrained() || HAS_TRAIT(usr, TRAIT_FAKEDEATH)) return src.dir = turn(src.dir, -90) diff --git a/code/game/machinery/overview.dm b/code/game/machinery/overview.dm index 7d8910d6ef5..a3254458337 100644 --- a/code/game/machinery/overview.dm +++ b/code/game/machinery/overview.dm @@ -11,7 +11,7 @@ src.drawmap(usr) -/obj/machinery/computer/security/proc/drawmap(var/mob/user as mob) +/obj/machinery/computer/security/proc/drawmap(mob/user as mob) var/icx = round(world.maxx/16) + 1 var/icy = round(world.maxy/16) + 1 @@ -70,12 +70,6 @@ if("/turf/simulated/wall/r_wall") colour = rgb(128,96,96) - if("/turf/unsimulated/floor") - colour = rgb(240,240,240) - - if("/turf/unsimulated/wall", "/turf/unsimulated/wall/other") - colour = rgb(140,140,140) - else colour = rgb(0,40,0) @@ -226,12 +220,6 @@ if("/turf/simulated/wall/r_wall") colour = rgb(128,96,96) - if("/turf/unsimulated/floor") - colour = rgb(240,240,240) - - if("/turf/unsimulated/wall", "/turf/unsimulated/wall/other") - colour = rgb(140,140,140) - else colour = rgb(0,40,0) diff --git a/code/game/machinery/pipe/construction.dm b/code/game/machinery/pipe/construction.dm index a8c9710ff6c..69166311caa 100644 --- a/code/game/machinery/pipe/construction.dm +++ b/code/game/machinery/pipe/construction.dm @@ -1,3 +1,6 @@ +#define CIRC_LEFT WEST +#define CIRC_RIGHT EAST + /obj/item/pipe name = "pipe" desc = "A pipe" @@ -146,7 +149,7 @@ else return ..() -/obj/item/pipe/proc/update(var/obj/machinery/atmospherics/make_from) +/obj/item/pipe/proc/update(obj/machinery/atmospherics/make_from) name = "[get_pipe_name(pipe_type, PIPETYPE_ATMOS)] fitting" icon_state = get_pipe_icon(pipe_type) var/obj/machinery/atmospherics/trinary/triP = make_from @@ -300,7 +303,7 @@ else return 0 -/obj/item/pipe/proc/unflip(var/direction) +/obj/item/pipe/proc/unflip(direction) if(!(direction in GLOB.cardinal)) return turn(direction, 45) @@ -511,7 +514,7 @@ item_state = "buildpipe" w_class = WEIGHT_CLASS_BULKY -/obj/item/pipe_meter/attackby(var/obj/item/W as obj, var/mob/user as mob, params) +/obj/item/pipe_meter/attackby(obj/item/W as obj, mob/user as mob, params) if(!istype(W, /obj/item/wrench)) return ..() if(!locate(/obj/machinery/atmospherics/pipe, src.loc)) @@ -536,7 +539,7 @@ item_state = "buildpipe" w_class = WEIGHT_CLASS_BULKY -/obj/item/pipe_gsensor/attackby(var/obj/item/W as obj, var/mob/user as mob) +/obj/item/pipe_gsensor/attackby(obj/item/W as obj, mob/user as mob) if(!istype(W, /obj/item/wrench)) return ..() new/obj/machinery/air_sensor( src.loc ) diff --git a/code/game/machinery/pipe/pipe_dispenser.dm b/code/game/machinery/pipe/pipe_dispenser.dm index 8f0e3316399..38443de284e 100644 --- a/code/game/machinery/pipe/pipe_dispenser.dm +++ b/code/game/machinery/pipe/pipe_dispenser.dm @@ -95,7 +95,7 @@ new /obj/item/pipe_gsensor(loc) return TRUE -/obj/machinery/pipedispenser/attackby(var/obj/item/W as obj, var/mob/user as mob, params) +/obj/machinery/pipedispenser/attackby(obj/item/W as obj, mob/user as mob, params) add_fingerprint(usr) if(istype(W, /obj/item/pipe) || istype(W, /obj/item/pipe_meter) || istype(W, /obj/item/pipe_gsensor)) to_chat(usr, "You put [W] back to [src].") @@ -138,7 +138,7 @@ icon_state = "pipe_d" //Allow you to drag-drop disposal pipes into it -/obj/machinery/pipedispenser/disposal/MouseDrop_T(var/obj/structure/disposalconstruct/pipe, mob/usr) +/obj/machinery/pipedispenser/disposal/MouseDrop_T(obj/structure/disposalconstruct/pipe, mob/usr) if(usr.incapacitated()) return diff --git a/code/game/machinery/poolcontroller.dm b/code/game/machinery/poolcontroller.dm index 5673ba8d204..8273e58cbc2 100644 --- a/code/game/machinery/poolcontroller.dm +++ b/code/game/machinery/poolcontroller.dm @@ -39,8 +39,8 @@ var/turf/simulated/floor/beach/water/W = T W.linkedcontroller = src linkedturfs += T - else if(istype(T, /turf/unsimulated/beach/water)) - var/turf/unsimulated/beach/water/W = T + else if(istype(T, /turf/simulated/floor/beach/away/water)) + var/turf/simulated/floor/beach/away/water/W = T W.linkedcontroller = src linkedturfs += T @@ -76,7 +76,7 @@ /obj/machinery/poolcontroller/proc/processMob() for(var/M in mobinpool) //They're already typecasted when entering the turf // Following two are sanity check. If the mob is no longer in the pool for whatever reason (Looking at you teleport), remove them - if(!istype(get_turf(M), /turf/simulated/floor/beach/water) && !istype(get_turf(M), /turf/unsimulated/beach/water)) // Water component when? + if(!istype(get_turf(M), /turf/simulated/floor/beach/water) && !istype(get_turf(M), /turf/simulated/floor/beach/away/water)) // Water component when? mobinpool -= M continue handleTemp(M) //handles pool temp effects on the swimmers @@ -89,7 +89,7 @@ animate(decal, alpha = 10, time = 20) QDEL_IN(decal, 25) -/obj/machinery/poolcontroller/proc/handleTemp(var/mob/M) +/obj/machinery/poolcontroller/proc/handleTemp(mob/M) if(!M || isAIEye(M) || issilicon(M) || isobserver(M) || M.stat == DEAD) return M.water_act(100, temperature, src)//leave temp at 0, we handle it in the switch. oh wait @@ -108,16 +108,16 @@ if(FRIGID) //YOU'RE AS COLD AS ICE to_chat(M, "The water is freezing!") -/obj/machinery/poolcontroller/proc/handleDrowning(var/mob/living/carbon/human/drownee) +/obj/machinery/poolcontroller/proc/handleDrowning(mob/living/carbon/human/drownee) if(!drownee) return if(drownee && ((drownee.lying && !drownee.player_logged) || deep_water)) //Mob lying down and not SSD or water is deep (determined by controller) if(drownee.internal) return //Has internals, no drowning - if((NO_BREATHE in drownee.dna.species.species_traits) || (BREATHLESS in drownee.mutations)) + if(HAS_TRAIT(drownee, TRAIT_NOBREATH)) return //doesn't breathe, no drowning - if(HAS_TRAIT(drownee,TRAIT_WATERBREATH)) + if(HAS_TRAIT(drownee, TRAIT_WATERBREATH)) return //fish things don't drown if(drownee.stat == DEAD) //Dead spacemen don't drown more diff --git a/code/game/machinery/portable_tag_turret.dm b/code/game/machinery/portable_tag_turret.dm index 562db4074f3..34c8f8a7623 100644 --- a/code/game/machinery/portable_tag_turret.dm +++ b/code/game/machinery/portable_tag_turret.dm @@ -25,7 +25,7 @@ . = ..() icon_state = "[lasercolor]grey_target_prism" -/obj/machinery/porta_turret/tag/weapon_setup(var/obj/item/gun/energy/E) +/obj/machinery/porta_turret/tag/weapon_setup(obj/item/gun/energy/E) return /obj/machinery/porta_turret/tag/ui_data(mob/user) @@ -71,7 +71,7 @@ spawn(100) disabled = FALSE -/obj/machinery/porta_turret/tag/assess_living(var/mob/living/L) +/obj/machinery/porta_turret/tag/assess_living(mob/living/L) if(!L) return TURRET_NOT_TARGET diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm index ea84cf39cd4..4f22d1c2bb2 100644 --- a/code/game/machinery/portable_turret.dm +++ b/code/game/machinery/portable_turret.dm @@ -104,9 +104,10 @@ weapon_setup(installation) -/obj/machinery/porta_turret/proc/weapon_setup(var/guntype) +/obj/machinery/porta_turret/proc/weapon_setup(guntype) switch(guntype) if(/obj/item/gun/energy/laser/practice) + lethal_is_configurable = FALSE iconholder = 1 eprojectile = /obj/item/projectile/beam @@ -120,6 +121,7 @@ iconholder = 1 if(/obj/item/gun/energy/taser) + lethal_is_configurable = FALSE eprojectile = /obj/item/projectile/beam eshot_sound = 'sound/weapons/laser.ogg' @@ -315,11 +317,9 @@ GLOBAL_LIST_EMPTY(turret_icons) /obj/machinery/porta_turret/power_change() if(powered() || !use_power) stat &= ~NOPOWER - update_icon() else - spawn(rand(0, 15)) - stat |= NOPOWER - update_icon() + stat |= NOPOWER + update_icon() /obj/machinery/porta_turret/attackby(obj/item/I, mob/user) @@ -608,7 +608,7 @@ GLOBAL_LIST_EMPTY(turret_icons) return TURRET_PRIORITY_TARGET //if the perp has passed all previous tests, congrats, it is now a "shoot-me!" nominee -/obj/machinery/porta_turret/proc/tryToShootAt(var/list/mob/living/targets) +/obj/machinery/porta_turret/proc/tryToShootAt(list/mob/living/targets) if(targets.len && last_target && (last_target in targets) && target(last_target)) return 1 @@ -666,7 +666,7 @@ GLOBAL_LIST_EMPTY(turret_icons) return ..() -/obj/machinery/porta_turret/proc/set_raised_raising(var/is_raised, var/is_raising) +/obj/machinery/porta_turret/proc/set_raised_raising(is_raised, is_raising) raised = is_raised raising = is_raising density = is_raised || is_raising @@ -754,7 +754,7 @@ GLOBAL_LIST_EMPTY(turret_icons) var/check_borgs var/ailock -/obj/machinery/porta_turret/proc/setState(var/datum/turret_checks/TC) +/obj/machinery/porta_turret/proc/setState(datum/turret_checks/TC) if(controllock) return enabled = TC.enabled diff --git a/code/game/machinery/quantum_pad.dm b/code/game/machinery/quantum_pad.dm index 739d8e31a5d..f07e2e443e7 100644 --- a/code/game/machinery/quantum_pad.dm +++ b/code/game/machinery/quantum_pad.dm @@ -132,9 +132,9 @@ linked_pad.sparks() flick("qpad-beam", src) - playsound(get_turf(src), 'sound/weapons/emitter2.ogg', 25, 1, extrarange = 3, falloff = 5) + playsound(get_turf(src), 'sound/weapons/emitter2.ogg', 25, TRUE) flick("qpad-beam", linked_pad) - playsound(get_turf(linked_pad), 'sound/weapons/emitter2.ogg', 25, 1, extrarange = 3, falloff = 5) + playsound(get_turf(linked_pad), 'sound/weapons/emitter2.ogg', 25, TRUE) var/tele_success = TRUE for(var/atom/movable/ROI in get_turf(src)) // if is anchored, don't let through diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm index b6da46a67c8..9063a126317 100644 --- a/code/game/machinery/rechargestation.dm +++ b/code/game/machinery/rechargestation.dm @@ -83,8 +83,9 @@ new /obj/effect/gibspawner/generic(get_turf(loc)) //I REPLACE YOUR TECHNOLOGY WITH FLESH! qdel(src) -/obj/machinery/recharge_station/Bumped(var/mob/AM) - move_inside(AM) +/obj/machinery/recharge_station/Bumped(mob/AM) + if(ismob(AM)) + move_inside(AM) /obj/machinery/recharge_station/AllowDrop() return FALSE @@ -233,7 +234,7 @@ add_fingerprint(usr) return -/obj/machinery/recharge_station/verb/move_inside(var/mob/user = usr) +/obj/machinery/recharge_station/verb/move_inside(mob/user = usr) set category = "Object" set src in oview(1) if(!user || !usr) diff --git a/code/game/machinery/recycler.dm b/code/game/machinery/recycler.dm index 5d26f0e946e..99e0b45a90b 100644 --- a/code/game/machinery/recycler.dm +++ b/code/game/machinery/recycler.dm @@ -76,7 +76,7 @@ if(emergency_mode) emergency_mode = FALSE update_icon() - playsound(loc, "sparks", 75, 1, -1) + playsound(src, "sparks", 75, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) to_chat(user, "You use the cryptographic sequencer on the [name].") /obj/machinery/recycler/update_icon() diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm index 351366c1501..487ec245466 100644 --- a/code/game/machinery/requests_console.dm +++ b/code/game/machinery/requests_console.dm @@ -193,7 +193,7 @@ GLOBAL_LIST_EMPTY(allRequestConsoles) reset_message(TRUE) if("writeAnnouncement") - var/new_message = sanitize(input("Write your message:", "Awaiting Input", "")) + var/new_message = input("Write your message:", "Awaiting Input", message) as message|null if(new_message) message = new_message else @@ -202,7 +202,7 @@ GLOBAL_LIST_EMPTY(allRequestConsoles) if("sendAnnouncement") if(!announcementConsole) return - announcement.Announce(message, msg_sanitized = TRUE) + announcement.Announce(message) reset_message(TRUE) if("department") @@ -235,7 +235,7 @@ GLOBAL_LIST_EMPTY(allRequestConsoles) radiochannel = "AI Private" else if(recipient == "Cargo Bay") radiochannel = "Supply" - message_log += "Message sent to [recipient] at [station_time_timestamp()] - [message]" + message_log.Add(list(list("Message sent to [recipient] at [station_time_timestamp()]", "[message]"))) Radio.autosay("Alert; a new requests console message received for [recipient] from [department]", null, "[radiochannel]") else atom_say("No server detected!") @@ -273,7 +273,7 @@ GLOBAL_LIST_EMPTY(allRequestConsoles) atom_say("[error_message]") return print_label(ship_tag_name, ship_tag_index) - shipping_log += "Shipping Label printed for [ship_tag_name] - [msgVerified]" + shipping_log.Add(list(list("Shipping Label printed for [ship_tag_name]", "[msgVerified]"))) // List in a list for passing into TGUI reset_message(TRUE) //Handle silencing the console @@ -343,9 +343,9 @@ GLOBAL_LIST_EMPTY(allRequestConsoles) switch(priority) if(RQ_HIGHPRIORITY) // High - message_log += "High Priority - From: [linkedSender] - [message]" + message_log.Add(list(list("High Priority - From: [linkedSender]") + message)) // List in a list for passing into TGUI else // Normal - message_log += "From: [linkedSender] - [message]" + message_log.Add(list(list("From: [linkedSender]") + message)) // List in a list for passing into TGUI set_light(2) /obj/machinery/requests_console/proc/print_label(tag_name, tag_index) diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm index 287adba2ffa..6934483c0ae 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() @@ -673,6 +674,6 @@ phaseout() return ..() -/obj/machinery/shieldwall/syndicate/hitby(AM as mob|obj) +/obj/machinery/shieldwall/syndicate/hitby(atom/movable/AM, skipcatch, hitpush, blocked, datum/thrownthing/throwingdatum) phaseout() return ..() diff --git a/code/game/machinery/status_display.dm b/code/game/machinery/status_display.dm index 30dfc78fe29..81835d19c82 100644 --- a/code/game/machinery/status_display.dm +++ b/code/game/machinery/status_display.dm @@ -287,7 +287,7 @@ return -/obj/machinery/ai_status_display/proc/set_picture(var/state) +/obj/machinery/ai_status_display/proc/set_picture(state) picture_state = state if(overlays.len) overlays.Cut() diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index b307c91b5df..9fe8c781c09 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -8,42 +8,51 @@ density = TRUE max_integrity = 250 - var/obj/item/clothing/suit/space/suit = null - var/obj/item/clothing/head/helmet/space/helmet = null + var/obj/item/clothing/suit/suit = null + var/obj/item/clothing/head/helmet = null var/obj/item/clothing/mask/mask = null - var/obj/item/clothing/shoes/magboots/magboots = null + var/obj/item/clothing/shoes/boots = null var/obj/item/storage = null var/helmet_type = null var/suit_type = null var/mask_type = null - var/magboots_type = null + var/boots_type = null var/storage_type = null var/locked = FALSE + /// prevent locking people in there if set to true var/safeties = TRUE var/broken = FALSE - var/secure = FALSE //set to true to enable ID locking - var/shocked = FALSE//is it shocking anyone that touches it? - req_access = list(ACCESS_EVA) //the ID needed if ID lock is enabled + + /// enables ID locking when set to true + var/secure = FALSE + /// Shocks anyone that touches it + var/shocked = FALSE + /// Access needed to control it, checked only if ID lock is enabled + req_access = list(ACCESS_EVA) var/datum/wires/suitstorage/wires = null + /// Is true if a uv cleaning cycle is currently running. var/uv = FALSE + /// If set to true, uses much more damaging UV wavelength and fries anything inside. var/uv_super = FALSE + /// How many uv cleaning cycles to do, counts down while cleaning takes place. var/uv_cycles = 6 var/message_cooldown var/breakout_time = 300 //abstract these onto machinery eventually var/state_open = FALSE - var/list/occupant_typecache //if set, turned into typecache in Initialize, other wise, defaults to mob/living typecache + /// If set, turned into typecache in Initialize, other wise, defaults to mob/living typecache + var/list/occupant_typecache var/atom/movable/occupant = null /obj/machinery/suit_storage_unit/standard_unit - suit_type = /obj/item/clothing/suit/space/eva - helmet_type = /obj/item/clothing/head/helmet/space/eva - mask_type = /obj/item/clothing/mask/breath + suit_type = /obj/item/clothing/suit/space/eva + helmet_type = /obj/item/clothing/head/helmet/space/eva + mask_type = /obj/item/clothing/mask/breath /obj/machinery/suit_storage_unit/standard_unit/secure secure = TRUE //start with ID lock enabled @@ -51,40 +60,40 @@ /obj/machinery/suit_storage_unit/captain name = "captain's suit storage unit" desc = "An industrial U-Stor-It Storage unit designed to accomodate all kinds of space suits. Its on-board equipment also allows the user to decontaminate the contents through a UV-ray purging cycle. There's a warning label dangling from the control pad, reading \"STRICTLY NO BIOLOGICALS IN THE CONFINES OF THE UNIT\". This one looks kind of fancy." - suit_type = /obj/item/clothing/suit/space/captain - helmet_type = /obj/item/clothing/head/helmet/space/capspace - mask_type = /obj/item/clothing/mask/gas + suit_type = /obj/item/clothing/suit/space/captain + helmet_type = /obj/item/clothing/head/helmet/space/capspace + mask_type = /obj/item/clothing/mask/gas storage_type = /obj/item/tank/jetpack/oxygen/captain - req_access = list(ACCESS_CAPTAIN) + req_access = list(ACCESS_CAPTAIN) /obj/machinery/suit_storage_unit/captain/secure secure = TRUE /obj/machinery/suit_storage_unit/engine name = "engineering suit storage unit" - suit_type = /obj/item/clothing/suit/space/hardsuit/engine - mask_type = /obj/item/clothing/mask/breath - magboots_type = /obj/item/clothing/shoes/magboots - req_access = list(ACCESS_ENGINE_EQUIP) + suit_type = /obj/item/clothing/suit/space/hardsuit/engine + mask_type = /obj/item/clothing/mask/breath + boots_type = /obj/item/clothing/shoes/magboots + req_access = list(ACCESS_ENGINE_EQUIP) /obj/machinery/suit_storage_unit/engine/secure secure = TRUE /obj/machinery/suit_storage_unit/ce name = "chief engineer's suit storage unit" - suit_type = /obj/item/clothing/suit/space/hardsuit/engine/elite - mask_type = /obj/item/clothing/mask/gas - magboots_type = /obj/item/clothing/shoes/magboots/advance - req_access = list(ACCESS_CE) + suit_type = /obj/item/clothing/suit/space/hardsuit/engine/elite + mask_type = /obj/item/clothing/mask/gas + boots_type = /obj/item/clothing/shoes/magboots/advance + req_access = list(ACCESS_CE) /obj/machinery/suit_storage_unit/ce/secure secure = TRUE /obj/machinery/suit_storage_unit/security name = "security suit storage unit" - suit_type = /obj/item/clothing/suit/space/hardsuit/security - mask_type = /obj/item/clothing/mask/gas/sechailer - req_access = list(ACCESS_SECURITY) + suit_type = /obj/item/clothing/suit/space/hardsuit/security + mask_type = /obj/item/clothing/mask/gas/sechailer + req_access = list(ACCESS_SECURITY) /obj/machinery/suit_storage_unit/security/secure secure = TRUE @@ -94,19 +103,19 @@ /obj/machinery/suit_storage_unit/atmos name = "atmospherics suit storage unit" - suit_type = /obj/item/clothing/suit/space/hardsuit/engine/atmos - mask_type = /obj/item/clothing/mask/gas - magboots_type = /obj/item/clothing/shoes/magboots/atmos - req_access = list(ACCESS_ATMOSPHERICS) + suit_type = /obj/item/clothing/suit/space/hardsuit/engine/atmos + mask_type = /obj/item/clothing/mask/gas + boots_type = /obj/item/clothing/shoes/magboots/atmos + req_access = list(ACCESS_ATMOSPHERICS) /obj/machinery/suit_storage_unit/atmos/secure secure = TRUE /obj/machinery/suit_storage_unit/mining name = "mining suit storage unit" - suit_type = /obj/item/clothing/suit/space/hardsuit/mining - mask_type = /obj/item/clothing/mask/breath - req_access = list(ACCESS_MINING_STATION) + suit_type = /obj/item/clothing/suit/space/hardsuit/mining + mask_type = /obj/item/clothing/mask/breath + req_access = list(ACCESS_MINING_STATION) /obj/machinery/suit_storage_unit/mining/secure secure = TRUE @@ -118,9 +127,9 @@ req_access = list(ACCESS_MINING_STATION) /obj/machinery/suit_storage_unit/cmo - suit_type = /obj/item/clothing/suit/space/hardsuit/medical - mask_type = /obj/item/clothing/mask/breath - req_access = list(ACCESS_CMO) + suit_type = /obj/item/clothing/suit/space/hardsuit/medical + mask_type = /obj/item/clothing/mask/breath + req_access = list(ACCESS_CMO) /obj/machinery/suit_storage_unit/cmo/secure secure = TRUE @@ -150,9 +159,9 @@ /obj/machinery/suit_storage_unit/syndicate 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 + 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 req_access = list(ACCESS_SYNDICATE) safeties = FALSE //in a syndicate base, everything can be used as a murder weapon at a moment's notice. @@ -163,50 +172,51 @@ req_access = list(ACCESS_CENT_GENERAL) /obj/machinery/suit_storage_unit/ert/command - suit_type = /obj/item/clothing/suit/space/hardsuit/ert/commander - mask_type = /obj/item/clothing/mask/breath - storage_type = /obj/item/tank/emergency_oxygen/double + suit_type = /obj/item/clothing/suit/space/hardsuit/ert/commander + mask_type = /obj/item/clothing/mask/breath + storage_type = /obj/item/tank/internals/emergency_oxygen/double /obj/machinery/suit_storage_unit/ert/command/secure secure = TRUE /obj/machinery/suit_storage_unit/ert/security - suit_type = /obj/item/clothing/suit/space/hardsuit/ert/security - mask_type = /obj/item/clothing/mask/breath - storage_type = /obj/item/tank/emergency_oxygen/double + suit_type = /obj/item/clothing/suit/space/hardsuit/ert/security + mask_type = /obj/item/clothing/mask/breath + storage_type = /obj/item/tank/internals/emergency_oxygen/double /obj/machinery/suit_storage_unit/ert/security/secure secure = TRUE /obj/machinery/suit_storage_unit/ert/engineer - suit_type = /obj/item/clothing/suit/space/hardsuit/ert/engineer - mask_type = /obj/item/clothing/mask/breath - storage_type = /obj/item/tank/emergency_oxygen/double + suit_type = /obj/item/clothing/suit/space/hardsuit/ert/engineer + mask_type = /obj/item/clothing/mask/breath + storage_type = /obj/item/tank/internals/emergency_oxygen/double /obj/machinery/suit_storage_unit/ert/engineer/secure secure = TRUE /obj/machinery/suit_storage_unit/ert/medical - suit_type = /obj/item/clothing/suit/space/hardsuit/ert/medical - mask_type = /obj/item/clothing/mask/breath - storage_type = /obj/item/tank/emergency_oxygen/double + suit_type = /obj/item/clothing/suit/space/hardsuit/ert/medical + mask_type = /obj/item/clothing/mask/breath + storage_type = /obj/item/tank/internals/emergency_oxygen/double /obj/machinery/suit_storage_unit/ert/medical/secure secure = TRUE //telecoms NASA SSU. Suits themselves are assigned in Initialize /obj/machinery/suit_storage_unit/telecoms - mask_type = /obj/item/clothing/mask/breath + mask_type = /obj/item/clothing/mask/breath storage_type = /obj/item/tank/jetpack/void - req_access = list(ACCESS_TCOMSAT) + req_access = list(ACCESS_TCOMSAT) /obj/machinery/suit_storage_unit/telecoms/secure secure = TRUE /obj/machinery/suit_storage_unit/radsuit name = "radiation suit storage unit" - suit_type = /obj/item/clothing/suit/radiation - helmet_type = /obj/item/clothing/head/radiation + suit_type = /obj/item/clothing/suit/radiation + helmet_type = /obj/item/clothing/head/radiation + storage_type = /obj/item/geiger_counter //copied from /obj/effect/nasavoidsuitspawner /obj/machinery/suit_storage_unit/telecoms/Initialize() @@ -244,8 +254,8 @@ helmet = new helmet_type(src) if(mask_type) mask = new mask_type(src) - if(magboots_type) - magboots = new magboots_type(src) + if(boots_type) + boots = new boots_type(src) if(storage_type) storage = new storage_type(src) update_icon() @@ -259,7 +269,7 @@ QDEL_NULL(suit) QDEL_NULL(helmet) QDEL_NULL(mask) - QDEL_NULL(magboots) + QDEL_NULL(boots) QDEL_NULL(storage) QDEL_NULL(wires) return ..() @@ -304,7 +314,7 @@ if(state_open) if(store_item(I, user)) update_icon() - updateUsrDialog() + SStgui.update_uis(src) to_chat(user, "You load the [I] into the storage compartment.") else to_chat(user, "You can't fit [I] into [src]!") @@ -323,19 +333,19 @@ /obj/machinery/suit_storage_unit/proc/store_item(obj/item/I, mob/user) . = FALSE - if(istype(I, /obj/item/clothing/suit/space) && !suit) + if(istype(I, /obj/item/clothing/suit) && !suit) suit = I . = TRUE - if(istype(I, /obj/item/clothing/head/helmet) && !helmet) + if(istype(I, /obj/item/clothing/head) && !helmet) helmet = I . = TRUE if(istype(I, /obj/item/clothing/mask) && !mask) mask = I . = TRUE - if(istype(I, /obj/item/clothing/shoes/magboots) && !magboots) - magboots = I + if(istype(I, /obj/item/clothing/shoes) && !boots) + boots = I . = TRUE - if((istype(I, /obj/item/tank)) && !storage) + if((istype(I, /obj/item/tank) || I.w_class <= WEIGHT_CLASS_SMALL) && !storage && !.) storage = I . = TRUE if(.) @@ -356,6 +366,7 @@ helmet = null suit = null mask = null + boots = null storage = null occupant = null @@ -399,8 +410,6 @@ if(uv_cycles) uv_cycles-- uv = TRUE - locked = TRUE - update_icon() if(occupant) var/mob/living/mob_occupant = occupant if(uv_super) @@ -412,20 +421,27 @@ else uv_cycles = initial(uv_cycles) uv = FALSE - locked = FALSE + for(var/atom/A in contents) + A.clean_blood(radiation_clean = FALSE) // we invoke the radiation cleaning proc directly + A.clean_radiation(12) // instead of letting clean_blood do it if(uv_super) visible_message("[src]'s door creaks open with a loud whining noise. A cloud of foul black smoke escapes from its chamber.") playsound(src, 'sound/machines/airlock_alien_prying.ogg', 50, 1) - qdel(helmet) - qdel(mask) - qdel(magboots) - qdel(storage) - qdel(suit) - helmet = null - suit = null - mask = null - magboots = null - storage = null + if(suit && !(suit.resistance_flags & LAVA_PROOF)) + qdel(suit) + suit = null + if(helmet && !(helmet.resistance_flags & LAVA_PROOF)) + qdel(helmet) + helmet = null + if(mask && !(mask.resistance_flags & LAVA_PROOF)) + qdel(mask) + mask = null + if(boots && !(boots.resistance_flags & LAVA_PROOF)) + qdel(boots) + boots = null + if(storage && !(storage.resistance_flags & LAVA_PROOF)) + qdel(storage) + storage = null else if(!occupant) @@ -433,9 +449,10 @@ else visible_message("[src]'s door slides open, barraging you with the nauseating smell of charred flesh.") playsound(src, 'sound/machines/airlock_close.ogg', 25, 1) - open_machine(FALSE) if(occupant) dump_contents() + update_icon() + SStgui.update_uis(src) /obj/machinery/suit_storage_unit/relaymove(mob/user) if(locked) @@ -484,7 +501,7 @@ if(drop) dropContents() update_icon() - updateUsrDialog() + SStgui.update_uis(src) /obj/machinery/suit_storage_unit/dropContents() var/turf/T = get_turf(src) @@ -514,180 +531,123 @@ if(target && !target.has_buckled_mobs() && (!isliving(target) || !mobtarget.buckled)) occupant = target target.forceMove(src) - updateUsrDialog() + SStgui.update_uis(src) update_icon() //////// -/obj/machinery/suit_storage_unit/attack_hand(mob/user) - var/dat - if(shocked && !(stat & NOPOWER)) - if(shock(user, 100)) - return - if(stat & NOPOWER) - return - if(..()) - return - if(panel_open) //The maintenance panel is open. Time for some shady stuff - wires.Interact(user) - if(uv) //The thing is running its cauterisation cycle. You have to wait. - dat += "Suit storage unit" - dat+= "Unit is cauterising contents with selected UV ray intensity. Please wait.
      " - else - if(!broken) - dat+= "Welcome to the Unit control panel.
      " - dat+= text("Helmet storage compartment: []
      ",(helmet ? helmet.name : "      No helmet detected.") ) - if(helmet && state_open) - dat+="Dispense helmet
      " - dat+= text("Suit storage compartment: []
      ",(suit ? suit.name : "      No exosuit detected.") ) - if(suit && state_open) - dat+="Dispense suit
      " - dat+= text("Breathmask storage compartment: []
      ",(mask ? mask.name : "      No breathmask detected.") ) - if(mask && state_open) - dat+="Dispense mask
      " - dat+= text("Magboots storage compartment: []
      ",(magboots ? magboots.name : "      No magboots detected.") ) - if(magboots && state_open) - dat+="Dispense magboots
      " - dat+= text("Tank storage compartment: []
      ",(storage ? storage.name : "      No storage item detected.") ) - if(storage && state_open) - dat+="Dispense storage item
      " - if(occupant) - dat+= "
      WARNING: Biological entity detected inside the Unit's storage. Please remove.
      " - dat+= "Eject extra load" - dat+= text("
      Unit is: [] - [] Unit ",(state_open ? "Open" : "Closed"),(state_open ? "Close" : "Open")) - if(state_open) - dat+="
      " - else - dat+= text(" - *[] Unit*
      ",(locked ? "Unlock" : "Lock") ) - dat+= text("Unit status: []",(locked? "**LOCKED**
      " : "**UNLOCKED**
      ") ) - dat+= "Start Disinfection cycle
      " - dat += "

      Close control panel" - else //Ohhhh shit it's dirty or broken! Let's inform the guy. - dat+= "Suit storage unit" - dat+= "Unit chamber is too contaminated to continue usage. Please call for a qualified individual to perform maintenance.

      " - dat+= "
      Close control panel" - - - var/datum/browser/popup = new(user, "suit_storage_unit", name, 400, 500) - popup.set_content(dat) - popup.open(0) - onclose(user, "suit_storage_unit") - return - /obj/machinery/suit_storage_unit/proc/check_allowed(user) if(!(allowed(user) || !secure)) to_chat(user, "Access denied.") return FALSE return TRUE -/obj/machinery/suit_storage_unit/Topic(href, href_list) +/obj/machinery/suit_storage_unit/attack_hand(mob/user) + if(..() || (stat & NOPOWER)) + return + if(shocked && shock(user, 100)) + return + if(panel_open) //The maintenance panel is open. Time for some shady stuff + wires.Interact(user) + ui_interact(user) + +/obj/machinery/suit_storage_unit/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state) + ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open) + if(!ui) + ui = new(user, src, ui_key, "SuitStorage", name, 402, 268, master_ui, state) + ui.set_autoupdate(FALSE) + ui.open() + +/obj/machinery/suit_storage_unit/ui_data(mob/user) + var/list/data = list( + "locked" = locked, + "open" = state_open, + "broken" = broken, + "helmet" = helmet ? helmet.name : null, + "suit" = suit ? suit.name : null, + "magboots" = boots ? boots.name : null, + "mask" = mask ? mask.name : null, + "storage" = storage ? storage.name : null, + "uv" = uv + ) + return data + +/obj/machinery/suit_storage_unit/ui_act(action, list/params) if(..()) - return 1 + return + add_fingerprint(usr) if(shocked && !(stat & NOPOWER)) if(shock(usr, 100)) - return - if((usr.contents.Find(src) || ((get_dist(src, usr) <= 1) && istype(src.loc, /turf))) || (istype(usr, /mob/living/silicon/ai))) - usr.set_machine(src) - if(href_list["toggleUV"]) - toggleUV(usr) - updateUsrDialog() - update_icon() - if(href_list["togglesafeties"]) - togglesafeties(usr) - updateUsrDialog() - update_icon() - if(href_list["dispense_helmet"]) - dispense_helmet(usr) - updateUsrDialog() - update_icon() - if(href_list["dispense_suit"]) - dispense_suit(usr) - updateUsrDialog() - update_icon() - if(href_list["dispense_mask"]) - dispense_mask(usr) - updateUsrDialog() - update_icon() - if(href_list["dispense_magboots"]) - dispense_magboots(usr) - updateUsrDialog() - update_icon() - if(href_list["dispense_storage"]) - dispense_storage(usr) - updateUsrDialog() - update_icon() - if(href_list["toggle_open"]) + return FALSE + + . = TRUE + switch(action) + if("dispense_helmet") + dispense_helmet() + if("dispense_suit") + dispense_suit() + if("dispense_mask") + dispense_mask() + if("dispense_boots") + dispense_boots() + if("dispense_storage") + dispense_storage() + if("toggle_open") if(!check_allowed(usr)) - return + return FALSE toggle_open(usr) - updateUsrDialog() - update_icon() - if(href_list["toggle_lock"]) + if("toggle_lock") if(!check_allowed(usr)) - return + return FALSE toggle_lock(usr) - updateUsrDialog() - update_icon() - if(href_list["cook"]) - cook(usr) - updateUsrDialog() - update_icon() - if(href_list["eject_guy"]) + if("cook") + cook() + if("eject_occupant") eject_occupant(usr) - updateUsrDialog() - update_icon() - add_fingerprint(usr) - return + update_icon() - -/obj/machinery/suit_storage_unit/proc/toggleUV(mob/user) +/obj/machinery/suit_storage_unit/proc/toggleUV() if(!panel_open) return else - if(uv_super) - to_chat(user, "You slide the dial back towards \"185nm\".") - uv_super = FALSE - else - to_chat(user, "You crank the dial all the way up to \"15nm\".") - uv_super = TRUE + uv_super = !uv_super -/obj/machinery/suit_storage_unit/proc/togglesafeties(mob/user) +/obj/machinery/suit_storage_unit/proc/togglesafeties() if(!panel_open) return else - to_chat(user, "You push the button. The coloured LED next to it changes.") safeties = !safeties -/obj/machinery/suit_storage_unit/proc/dispense_helmet(mob/user as mob) +/obj/machinery/suit_storage_unit/proc/dispense_helmet() if(!helmet) return else helmet.forceMove(loc) helmet = null -/obj/machinery/suit_storage_unit/proc/dispense_suit(mob/user as mob) +/obj/machinery/suit_storage_unit/proc/dispense_suit() if(!suit) return else suit.forceMove(loc) suit = null -/obj/machinery/suit_storage_unit/proc/dispense_mask(mob/user as mob) +/obj/machinery/suit_storage_unit/proc/dispense_mask() if(!mask) return else mask.forceMove(loc) mask = null -/obj/machinery/suit_storage_unit/proc/dispense_magboots(mob/user as mob) - if(!magboots) +/obj/machinery/suit_storage_unit/proc/dispense_boots() + if(!boots) return else - magboots.forceMove(loc) - magboots = null + boots.forceMove(loc) + boots = null -/obj/machinery/suit_storage_unit/proc/dispense_storage(mob/user as mob) +/obj/machinery/suit_storage_unit/proc/dispense_storage() if(!storage) return else @@ -742,7 +702,7 @@ return eject_occupant(usr) add_fingerprint(usr) - updateUsrDialog() + SStgui.update_uis(src) update_icon() return @@ -773,7 +733,7 @@ update_icon() add_fingerprint(usr) - updateUsrDialog() + SStgui.update_uis(src) return else occupant = null diff --git a/code/game/machinery/syndicatebeacon.dm b/code/game/machinery/syndicatebeacon.dm index a5cff57ad52..6318eebdb2d 100644 --- a/code/game/machinery/syndicatebeacon.dm +++ b/code/game/machinery/syndicatebeacon.dm @@ -17,7 +17,7 @@ var/selfdestructing = 0 var/charges = 1 -/obj/machinery/syndicate_beacon/attack_hand(var/mob/user as mob) +/obj/machinery/syndicate_beacon/attack_hand(mob/user as mob) usr.set_machine(src) var/dat = "Scanning [pick("retina pattern", "voice print", "fingerprints", "dna sequence")]...
      Identity confirmed,
      " if(istype(user, /mob/living/carbon/human) || istype(user, /mob/living/silicon/ai)) @@ -147,7 +147,7 @@ return -/obj/machinery/power/singularity_beacon/attack_hand(var/mob/user as mob) +/obj/machinery/power/singularity_beacon/attack_hand(mob/user as mob) if(anchored) return active ? Deactivate(user) : Activate(user) else diff --git a/code/game/machinery/syndicatebomb.dm b/code/game/machinery/syndicatebomb.dm index e6f9f617cff..ed196abc6dc 100644 --- a/code/game/machinery/syndicatebomb.dm +++ b/code/game/machinery/syndicatebomb.dm @@ -303,22 +303,6 @@ ..() wires.cut_all() -/obj/machinery/syndicatebomb/self_destruct - name = "self destruct device" - desc = "Do not taunt. Warranty invalid if exposed to high temperature. Not suitable for agents under 3 years of age." - req_access = list(ACCESS_SYNDICATE) - payload = /obj/item/bombcore/large - can_unanchor = FALSE - var/explosive_wall_group = EXPLOSIVE_WALL_GROUP_SYNDICATE_BASE // If set, this bomb will also cause explosive walls in the same group to explode - -/obj/machinery/syndicatebomb/self_destruct/try_detonate(ignore_active = FALSE) - . = ..() - if(. && explosive_wall_group) - for(var/wall in GLOB.explosive_walls) - var/turf/simulated/wall/mineral/plastitanium/explosive/E = wall - if(E.explosive_wall_group == explosive_wall_group) - E.self_destruct() - sleep(5) ///Bomb Cores/// diff --git a/code/game/machinery/tcomms/_base.dm b/code/game/machinery/tcomms/_base.dm index 2f6702eaa8c..3fa0c31b559 100644 --- a/code/game/machinery/tcomms/_base.dm +++ b/code/game/machinery/tcomms/_base.dm @@ -30,7 +30,7 @@ GLOBAL_LIST_EMPTY(tcomms_machines) /obj/machinery/tcomms name = "Telecommunications Device" desc = "Someone forgot to say what this thingy does. Please yell at a coder" - icon = 'icons/obj/tcomms.dmi' + icon = 'icons/obj/machines/telecomms.dmi' icon_state = "error" density = TRUE anchored = TRUE @@ -85,10 +85,8 @@ GLOBAL_LIST_EMPTY(tcomms_machines) /obj/machinery/tcomms/update_icon() . = ..() // Show the off sprite if were inactive, ion'd or unpowered - if(!active || (stat & NOPOWER) || ion) - icon_state = "[initial(icon_state)]_off" - else - icon_state = initial(icon_state) + var/functioning = (active && !(stat & NOPOWER) && !ion) + icon_state = "[initial(icon_state)][panel_open ? "_o" : null][functioning ? null : "_off"]" // Attack overrides. These are needed so the UIs can be opened up // diff --git a/code/game/machinery/tcomms/core.dm b/code/game/machinery/tcomms/core.dm index f0b340459c7..12650996e89 100644 --- a/code/game/machinery/tcomms/core.dm +++ b/code/game/machinery/tcomms/core.dm @@ -307,7 +307,7 @@ if("add_filter") // This is a stripped input because I did NOT come this far for this system to be abused by HTML injection - var/name_to_add = stripped_input(usr, "Enter a name to add to the filtering list", "Name Entry") + var/name_to_add = html_decode(stripped_input(usr, "Enter a name to add to the filtering list", "Name Entry")) if(name_to_add == "") return if(name_to_add in nttc.filtering) diff --git a/code/game/machinery/tcomms/nttc.dm b/code/game/machinery/tcomms/nttc.dm index 6ca309a7dfe..0576bbe7e41 100644 --- a/code/game/machinery/tcomms/nttc.dm +++ b/code/game/machinery/tcomms/nttc.dm @@ -189,7 +189,7 @@ // This loads a configuration from a JSON string. // Fucking broken as shit, someone help me fix this. -/datum/nttc_configuration/proc/nttc_deserialize(text, var/ckey) +/datum/nttc_configuration/proc/nttc_deserialize(text, ckey) if(word_blacklist.Find(text)) //uh oh, they tried to be naughty message_admins("EXPLOIT WARNING: [ckey] attempted to upload an NTTC configuration containing JS abusable tags!") log_admin("EXPLOIT WARNING: [ckey] attempted to upload an NTTC configuration containing JS abusable tags") @@ -279,9 +279,14 @@ if(toggle_command_bold) var/job = tcm.sender_job if((job in ert_jobs) || (job in heads) || (job in cc_jobs)) - for(var/datum/multilingual_say_piece/S in message_pieces) - if(S.message) - S.message = "[capitalize(S.message)]" // This only capitalizes the first word + for(var/I in 1 to length(message_pieces)) + var/datum/multilingual_say_piece/S = message_pieces[I] + if(!S.message) + continue + if(I == 1 && !istype(S.speaking, /datum/language/noise)) // Capitalise the first section only, unless it's an emote. + S.message = "[capitalize(S.message)]" + S.message = "[S.message]" // Make everything bolded + // Language Conversion if(setting_language && valid_languages[setting_language]) diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm index c665d511fa6..9b7af34349f 100644 --- a/code/game/machinery/teleporter.dm +++ b/code/game/machinery/teleporter.dm @@ -8,13 +8,17 @@ icon_screen = "teleport" icon_keyboard = "teleport_key" circuit = /obj/item/circuitboard/teleporter - var/obj/item/gps/locked = null /// A GPS with a locked destination - var/regime = REGIME_TELEPORT /// Switches mode between teleporter, gate and gps + /// A GPS with a locked destination + var/obj/item/gps/locked = null + /// Switches mode between teleporter, gate and gps + var/regime = REGIME_TELEPORT var/id = null - var/obj/machinery/teleport/station/power_station /// The power station that's connected to the console - var/calibrating = FALSE /// Whether calibration is in progress or not. Calibration prevents changes. - var/turf/target ///The target turf of the teleporter - var/target_list ///lists of suitable teleport targets, dependent on regime. Used in the UI + /// The power station that's connected to the console + var/obj/machinery/teleport/station/power_station + /// Whether calibration is in progress or not. Calibration prevents changes. + var/calibrating = FALSE + /// The target turf of the teleporter + var/turf/target /* var/area_bypass is for one-time-use teleport cards (such as clown planet coordinates.) Setting this to TRUE will set var/obj/item/gps/locked to null after a player enters the portal and will not allow hand-teles to open portals to that location. @@ -22,17 +26,11 @@ var/area_bypass = FALSE var/cc_beacon = FALSE -/obj/machinery/computer/teleporter/New() - src.id = "[rand(1000, 9999)]" - link_power_station() - ..() - return - /obj/machinery/computer/teleporter/Initialize() - ..() + . = ..() link_power_station() update_icon() - target_list = targets_teleport() + id = "[rand(1000, 9999)]" /obj/machinery/computer/teleporter/Destroy() if(power_station) @@ -98,7 +96,14 @@ data["target"] = (!target || !targetarea) ? "None" : sanitize(targetarea.name) data["calibrating"] = calibrating data["locked"] = locked ? TRUE : FALSE - data["targetsTeleport"] = target_list + data["targetsTeleport"] = null + switch(regime) + if(REGIME_TELEPORT) + data["targetsTeleport"] = targets_teleport() + if(REGIME_GATE) + data["targetsTeleport"] = targets_gate() + if(REGIME_GPS) + data["targetsTeleport"] = null //clears existing entries, target is added by load action return data /obj/machinery/computer/teleporter/ui_act(action, params) @@ -118,21 +123,15 @@ if("eject") //eject gps device eject() if("load") //load gps coordinates - target = locate(locked.locked_location.x,locked.locked_location.y,locked.locked_location.z) + target = locate(locked.locked_location.x, locked.locked_location.y, locked.locked_location.z) if("setregime") regime = text2num(params["regime"]) - if(regime == REGIME_TELEPORT) - target_list = targets_teleport() - if(regime == REGIME_GATE) - target_list = targets_gate() - if(regime == REGIME_GPS) - target_list = null //clears existing entries, target is added by load action resetPowerstation() target = null if("settarget") resetPowerstation() - var/turf/tmpTarget = locate(text2num(params["x"]),text2num(params["y"]),text2num(params["z"])) - if(!istype(tmpTarget, /turf)) + var/turf/tmpTarget = locate(text2num(params["x"]), text2num(params["y"]), text2num(params["z"])) + if(!isturf(tmpTarget)) atom_say("No valid targets available.") return target = tmpTarget @@ -188,7 +187,6 @@ locked.loc = loc locked = null regime = REGIME_TELEPORT - target_list = targets_teleport() /** * Creates a list of viable targets for the teleport. Helper function of ui_data @@ -321,7 +319,7 @@ active_power_usage = 2000 var/obj/machinery/teleport/station/power_station var/calibrated //Calibration prevents mutation - var/admin_usage = FALSE // if 1, works on z2. If 0, doesn't. Used for admin room teleport. + var/admin_usage = FALSE // if 1, works on CC level. If 0, doesn't. Used for admin room teleport. /obj/machinery/teleport/hub/New() ..() @@ -403,7 +401,9 @@ 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 - . = do_teleport(M, locate(rand((2*TRANSITIONEDGE), world.maxx - (2*TRANSITIONEDGE)), rand((2*TRANSITIONEDGE), world.maxy - (2*TRANSITIONEDGE)), 3), 2, bypass_area_flag = com.area_bypass) + var/list/target_z = levels_by_trait(REACHABLE) + 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 diff --git a/code/game/machinery/transformer.dm b/code/game/machinery/transformer.dm index 18abeba7400..d03536e8f5b 100644 --- a/code/game/machinery/transformer.dm +++ b/code/game/machinery/transformer.dm @@ -201,14 +201,14 @@ flick("separator-AO0",src) playsound(loc, 'sound/effects/alert.ogg', 50, 0) sleep(5) - H.apply_effect((rand(150,200)),IRRADIATE,0) + H.rad_act(rand(150, 200)) if(prob(5)) if(prob(75)) randmutb(H) // Applies bad mutation - domutcheck(H,null,1) + domutcheck(H, MUTCHK_FORCED) else randmutg(H) // Applies good mutation - domutcheck(H,null,1) + domutcheck(H, MUTCHK_FORCED) /obj/machinery/transformer/xray/proc/scan(obj/item/I) @@ -252,8 +252,6 @@ for(var/obj/item/I in H) if(istype(I, /obj/item/implant)) continue - if(istype(I, /obj/item/organ)) - continue qdel(I) H.equipOutfit(selected_outfit) @@ -309,7 +307,7 @@ H.real_name = template.real_name H.sync_organ_dna(assimilate = 0, old_ue = prev_ue) H.UpdateAppearance() - domutcheck(H, null, MUTCHK_FORCED) + domutcheck(H, MUTCHK_FORCED) H.update_mutations() /obj/machinery/transformer/gene_applier/attackby(obj/item/I, mob/living/user, params) diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index a562a0c00dc..9f18c35c4b7 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -510,6 +510,10 @@ if(ishuman(user)) H = user C = H.get_idcard(TRUE) + if(!C && istype(H.wear_pda, /obj/item/pda)) + var/obj/item/pda/P = H.wear_pda + if(istype(P.id, /obj/item/card/id)) + C = P.id var/obj/item/stack/spacecash/S = H.get_active_hand() if(istype(S)) data["userMoney"] = S.amount @@ -802,11 +806,9 @@ /obj/machinery/vending/power_change() if(powered()) stat &= ~NOPOWER - update_icon() else - spawn(rand(0, 15)) - stat |= NOPOWER - update_icon() + stat |= NOPOWER + update_icon() /obj/machinery/vending/obj_break(damage_flag) if(!(stat & BROKEN)) @@ -922,7 +924,8 @@ /obj/item/reagent_containers/food/drinks/drinkingglass = 30, /obj/item/reagent_containers/food/drinks/drinkingglass/shotglass = 30, /obj/item/reagent_containers/food/drinks/ice = 9) - contraband = list(/obj/item/reagent_containers/food/drinks/tea = 10) + contraband = list(/obj/item/reagent_containers/food/drinks/tea = 10, + /obj/item/reagent_containers/food/drinks/bottle/fernet = 5) vend_delay = 15 slogan_list = list("I hope nobody asks me for a bloody cup o' tea...","Alcohol is humanity's friend. Would you abandon a friend?","Quite delighted to serve you!","Is nobody thirsty on this station?") ads_list = list("Drink up!","Booze is good for you!","Alcohol is humanity's best friend.","Quite delighted to serve you!","Care for a nice, cold beer?","Nothing cures you like booze!","Have a sip!","Have a drink!","Have a beer!","Beer is good for you!","Only the finest alcohol!","Best quality booze since 2053!","Award-winning wine!","Maximum alcohol!","Man loves beer.","A toast for progress!") @@ -1358,6 +1361,7 @@ /obj/item/seeds/grass = 3, /obj/item/seeds/lemon = 3, /obj/item/seeds/lime = 3, + /obj/item/seeds/mint = 3, /obj/item/seeds/onion = 3, /obj/item/seeds/orange = 3, /obj/item/seeds/peanuts = 3, @@ -1574,15 +1578,22 @@ desc = "A kitchen and restaurant equipment vendor." ads_list = list("Mm, food stuffs!","Food and food accessories.","Get your plates!","You like forks?","I like forks.","Woo, utensils.","You don't really need these...") icon_state = "dinnerware" - products = list(/obj/item/storage/bag/tray = 8,/obj/item/kitchen/utensil/fork = 6, - /obj/item/kitchen/knife = 3,/obj/item/kitchen/rollingpin = 2, + 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, - /obj/item/reagent_containers/food/drinks/drinkingglass = 8, /obj/item/clothing/suit/chef/classic = 2, /obj/item/storage/belt/chef = 2, + /obj/item/reagent_containers/food/drinks/drinkingglass = 8, + /obj/item/clothing/suit/chef/classic = 2, + /obj/item/storage/belt/chef = 2, /obj/item/reagent_containers/food/condiment/pack/ketchup = 5, /obj/item/reagent_containers/food/condiment/pack/hotsauce = 5, /obj/item/reagent_containers/food/condiment/saltshaker =5, /obj/item/reagent_containers/food/condiment/peppermill =5, - /obj/item/whetstone = 2, /obj/item/mixing_bowl = 10, + /obj/item/whetstone = 2, + /obj/item/mixing_bowl = 10, /obj/item/kitchen/mould/bear = 1, /obj/item/kitchen/mould/worm = 1, /obj/item/kitchen/mould/bean = 1, /obj/item/kitchen/mould/ball = 1, /obj/item/kitchen/mould/cane = 1, /obj/item/kitchen/mould/cash = 1, @@ -1637,7 +1648,7 @@ icon_state = "engivend" icon_deny = "engivend-deny" req_one_access_txt = "11;24" // Engineers and atmos techs can use this - products = list(/obj/item/clothing/glasses/meson = 2,/obj/item/multitool = 4,/obj/item/airlock_electronics = 10,/obj/item/firelock_electronics = 10,/obj/item/firealarm_electronics = 10,/obj/item/apc_electronics = 10,/obj/item/airalarm_electronics = 10,/obj/item/stock_parts/cell/high = 10,/obj/item/camera_assembly = 10) + products = list(/obj/item/clothing/glasses/meson/engine = 2,/obj/item/multitool = 4, /obj/item/geiger_counter = 5, /obj/item/airlock_electronics = 10,/obj/item/firelock_electronics = 10,/obj/item/firealarm_electronics = 10,/obj/item/apc_electronics = 10,/obj/item/airalarm_electronics = 10,/obj/item/stock_parts/cell/high = 10,/obj/item/camera_assembly = 10) contraband = list(/obj/item/stock_parts/cell/potato = 3) premium = list(/obj/item/storage/belt/utility = 3) refill_canister = /obj/item/vending_refill/engivend @@ -1658,7 +1669,7 @@ icon_deny = "engi-deny" req_access_txt = "11" products = list(/obj/item/clothing/under/rank/chief_engineer = 4,/obj/item/clothing/under/rank/engineer = 4,/obj/item/clothing/shoes/workboots = 4,/obj/item/clothing/head/hardhat = 4, - /obj/item/storage/belt/utility = 4,/obj/item/clothing/glasses/meson = 4,/obj/item/clothing/gloves/color/yellow = 4, /obj/item/screwdriver = 12, + /obj/item/storage/belt/utility = 4,/obj/item/clothing/glasses/meson/engine = 4,/obj/item/clothing/gloves/color/yellow = 4, /obj/item/screwdriver = 12, /obj/item/crowbar = 12,/obj/item/wirecutters = 12,/obj/item/multitool = 12,/obj/item/wrench = 12,/obj/item/t_scanner = 12, /obj/item/stack/cable_coil/heavyduty = 8, /obj/item/stock_parts/cell = 8, /obj/item/weldingtool = 8,/obj/item/clothing/head/welding = 8, /obj/item/light/tube = 10,/obj/item/clothing/suit/fire = 4, /obj/item/stock_parts/scanning_module = 5,/obj/item/stock_parts/micro_laser = 5, @@ -1682,7 +1693,7 @@ req_access_txt = "29" products = list(/obj/item/clothing/suit/storage/labcoat = 4,/obj/item/clothing/under/rank/roboticist = 4,/obj/item/stack/cable_coil = 4,/obj/item/flash = 4, /obj/item/stock_parts/cell/high = 12, /obj/item/assembly/prox_sensor = 3,/obj/item/assembly/signaler = 3,/obj/item/healthanalyzer = 3, - /obj/item/scalpel = 2,/obj/item/circular_saw = 2,/obj/item/tank/anesthetic = 2,/obj/item/clothing/mask/breath/medical = 5, + /obj/item/scalpel = 2,/obj/item/circular_saw = 2,/obj/item/tank/internals/anesthetic = 2,/obj/item/clothing/mask/breath/medical = 5, /obj/item/screwdriver = 5,/obj/item/crowbar = 5) refill_canister = /obj/item/vending_refill/robotics @@ -1706,7 +1717,7 @@ /obj/item/reagent_containers/food/snacks/candy/candy_corn = 6) contraband = list(/obj/item/kitchen/knife = 6, /obj/item/reagent_containers/food/drinks/coffee = 12, - /obj/item/tank/emergency_oxygen = 6, + /obj/item/tank/internals/emergency_oxygen = 6, /obj/item/clothing/mask/breath = 6) refill_canister = /obj/item/vending_refill/sustenance diff --git a/code/game/machinery/washing_machine.dm b/code/game/machinery/washing_machine.dm index a48fa88b96a..a5120327f4c 100644 --- a/code/game/machinery/washing_machine.dm +++ b/code/game/machinery/washing_machine.dm @@ -272,6 +272,9 @@ if( istype(W,/obj/item/clothing/gloves/furgloves ) ) to_chat(user, "This item does not fit.") return + if(istype(W, /obj/item/clothing/gloves/color/black/krav_maga/sec)) + to_chat(user, "Washing these gloves would fry the electronics!") + return if(W.flags & NODROP) //if "can't drop" item to_chat(user, "\The [W] is stuck to your hand, you cannot put it in the washing machine!") return diff --git a/code/game/mecha/combat/combat.dm b/code/game/mecha/combat/combat.dm index d8ddee347e2..95539c4b4b1 100644 --- a/code/game/mecha/combat/combat.dm +++ b/code/game/mecha/combat/combat.dm @@ -7,7 +7,7 @@ destruction_sleep_duration = 2 var/am = "d3c2fbcadca903a41161ccc9df9cf948" -/obj/mecha/combat/moved_inside(var/mob/living/carbon/human/H as mob) +/obj/mecha/combat/moved_inside(mob/living/carbon/human/H as mob) if(..()) if(H.client) H.client.mouse_pointer_icon = file("icons/mecha/mecha_mouse.dmi") @@ -15,7 +15,7 @@ else return 0 -/obj/mecha/combat/mmi_moved_inside(var/obj/item/mmi/mmi_as_oc as obj,mob/user as mob) +/obj/mecha/combat/mmi_moved_inside(obj/item/mmi/mmi_as_oc as obj, mob/user as mob) if(..()) if(occupant.client) occupant.client.mouse_pointer_icon = file("icons/mecha/mecha_mouse.dmi") diff --git a/code/game/mecha/equipment/tools/other_tools.dm b/code/game/mecha/equipment/tools/other_tools.dm index 8fdbf0880df..f1b9b291245 100644 --- a/code/game/mecha/equipment/tools/other_tools.dm +++ b/code/game/mecha/equipment/tools/other_tools.dm @@ -296,7 +296,7 @@ return 1000 //making magic -/obj/item/mecha_parts/mecha_equipment/tesla_energy_relay/proc/get_power_channel(var/area/A) +/obj/item/mecha_parts/mecha_equipment/tesla_energy_relay/proc/get_power_channel(area/A) var/pow_chan if(A) for(var/c in use_channels) @@ -395,7 +395,7 @@ if(result) send_byjax(chassis.occupant,"exosuit.browser","\ref[src]",get_equip_info()) -/obj/item/mecha_parts/mecha_equipment/generator/proc/load_fuel(var/obj/item/I) +/obj/item/mecha_parts/mecha_equipment/generator/proc/load_fuel(obj/item/I) if(istype(I) && (fuel_type in I.materials)) if(istype(I, /obj/item/stack/sheet)) var/obj/item/stack/sheet/P = I @@ -489,12 +489,11 @@ fuel_per_cycle_idle = 10 fuel_per_cycle_active = 30 power_per_cycle = 50 - var/rad_per_cycle = 0.3 + var/rad_per_cycle = 30 /obj/item/mecha_parts/mecha_equipment/generator/nuclear/critfail() return /obj/item/mecha_parts/mecha_equipment/generator/nuclear/process() if(..()) - for(var/mob/living/carbon/M in view(chassis)) - M.apply_effect((rad_per_cycle * 3),IRRADIATE,0) + radiation_pulse(get_turf(src), rad_per_cycle) diff --git a/code/game/mecha/equipment/tools/work_tools.dm b/code/game/mecha/equipment/tools/work_tools.dm index 74b26ebf23a..f78b34078eb 100644 --- a/code/game/mecha/equipment/tools/work_tools.dm +++ b/code/game/mecha/equipment/tools/work_tools.dm @@ -345,7 +345,7 @@ UnregisterSignal(chassis, COMSIG_MOVABLE_MOVED) return ..() -/obj/item/mecha_parts/mecha_equipment/cable_layer/action(var/obj/item/stack/cable_coil/target) +/obj/item/mecha_parts/mecha_equipment/cable_layer/action(obj/item/stack/cable_coil/target) if(!action_checks(target)) return if(istype(target) && target.amount) @@ -407,7 +407,7 @@ /obj/item/mecha_parts/mecha_equipment/cable_layer/proc/reset() last_piece = null -/obj/item/mecha_parts/mecha_equipment/cable_layer/proc/dismantleFloor(var/turf/new_turf) +/obj/item/mecha_parts/mecha_equipment/cable_layer/proc/dismantleFloor(turf/new_turf) if(istype(new_turf, /turf/simulated/floor)) var/turf/simulated/floor/T = new_turf if(!istype(T, /turf/simulated/floor/plating)) diff --git a/code/game/mecha/equipment/weapons/weapons.dm b/code/game/mecha/equipment/weapons/weapons.dm index e8db08bf37c..351aba3905b 100644 --- a/code/game/mecha/equipment/weapons/weapons.dm +++ b/code/game/mecha/equipment/weapons/weapons.dm @@ -12,7 +12,7 @@ var/projectiles var/projectile_energy_cost -/obj/item/mecha_parts/mecha_equipment/weapon/can_attach(var/obj/mecha/combat/M as obj) +/obj/item/mecha_parts/mecha_equipment/weapon/can_attach(obj/mecha/combat/M as obj) if(..()) if(istype(M)) if(size > M.maxsize) @@ -212,7 +212,7 @@ to_chat(M, "HONK") M.SetSleeping(0) M.Stuttering(20) - M.MinimumDeafTicks(30) + M.AdjustEarDamage(0, 30) M.Weaken(3) if(prob(30)) M.Stun(10) @@ -517,8 +517,8 @@ /obj/item/mecha_parts/mecha_equipment/weapon/energy/plasma equip_cooldown = 10 - name = "217-D Heavy Plasma Cutter" - desc = "A device that shoots resonant plasma bursts at extreme velocity. The blasts are capable of crushing rock and demloishing solid obstacles." + name = "\improper 217-D Heavy Plasma Cutter" + desc = "A device that shoots resonant plasma bursts at extreme velocity. The blasts are capable of crushing rock and demolishing solid obstacles." icon_state = "mecha_plasmacutter" item_state = "plasmacutter" lefthand_file = 'icons/mob/inhands/guns_lefthand.dmi' diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index d01f8fd856b..2876527a526 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -37,7 +37,6 @@ var/datum/effect_system/spark_spread/spark_system = new var/lights = 0 var/lights_power = 6 - var/emagged = FALSE var/frozen = FALSE var/repairing = FALSE @@ -137,7 +136,7 @@ internal_tank = new /obj/machinery/portable_atmospherics/canister/air(src) return internal_tank -/obj/mecha/proc/add_cell(var/obj/item/stock_parts/cell/C=null) +/obj/mecha/proc/add_cell(obj/item/stock_parts/cell/C=null) if(C) C.forceMove(src) cell = C @@ -243,7 +242,7 @@ ////////////////////////////////// //////// Movement procs //////// ////////////////////////////////// -/obj/mecha/Process_Spacemove(var/movement_dir = 0) +/obj/mecha/Process_Spacemove(movement_dir = 0) . = ..() if(.) return 1 @@ -355,7 +354,7 @@ if(. && stepsound) playsound(src, stepsound, 40, 1) -/obj/mecha/Bump(var/atom/obstacle, bump_allowed) +/obj/mecha/Bump(atom/obstacle, bump_allowed) if(throwing) //high velocity mechas in your face! var/breakthrough = 0 if(istype(obstacle, /obj/structure/window)) @@ -888,7 +887,7 @@ else examine(user) if(occupant) - user << "This exosuit has a pilot and cannot be controlled." + to_chat(user, "This exosuit has a pilot and cannot be controlled.") return var/can_control_mech = FALSE for(var/obj/item/mecha_parts/mecha_tracking/ai_control/A in trackers) @@ -921,7 +920,7 @@ AI.aiRestorePowerRoutine = 0//So the AI initially has power. AI.control_disabled = 1 AI.aiRadio.disabledAi = 1 - AI.loc = card + AI.forceMove(card) occupant = null AI.controlled_mech = null AI.remote_control = null @@ -957,7 +956,7 @@ //Hack and From Card interactions share some code, so leave that here for both to use. /obj/mecha/proc/ai_enter_mech(mob/living/silicon/ai/AI, interaction) AI.aiRestorePowerRoutine = 0 - AI.loc = src + AI.forceMove(src) occupant = AI icon_state = initial(icon_state) playsound(src, 'sound/machines/windowdoor.ogg', 50, 1) @@ -1106,7 +1105,7 @@ else to_chat(user, "You stop entering the exosuit!") -/obj/mecha/proc/moved_inside(var/mob/living/carbon/human/H as mob) +/obj/mecha/proc/moved_inside(mob/living/carbon/human/H as mob) if(H && H.client && (H in range(1))) occupant = H H.stop_pulling() @@ -1129,7 +1128,7 @@ else return FALSE -/obj/mecha/proc/mmi_move_inside(var/obj/item/mmi/mmi_as_oc as obj,mob/user as mob) +/obj/mecha/proc/mmi_move_inside(obj/item/mmi/mmi_as_oc as obj,mob/user as mob) if(!mmi_as_oc.brainmob || !mmi_as_oc.brainmob.client) to_chat(user, "Consciousness matrix not detected!") return FALSE @@ -1155,7 +1154,7 @@ to_chat(user, "You stop inserting the MMI.") return FALSE -/obj/mecha/proc/mmi_moved_inside(obj/item/mmi/mmi_as_oc,mob/user) +/obj/mecha/proc/mmi_moved_inside(obj/item/mmi/mmi_as_oc, mob/user) if(mmi_as_oc && (user in range(1))) if(!mmi_as_oc.brainmob || !mmi_as_oc.brainmob.client) to_chat(user, "Consciousness matrix not detected.") @@ -1166,7 +1165,7 @@ if(!user.unEquip(mmi_as_oc)) to_chat(user, "\the [mmi_as_oc] is stuck to your hand, you cannot put it in \the [src]") return FALSE - var/mob/brainmob = mmi_as_oc.brainmob + var/mob/living/carbon/brain/brainmob = mmi_as_oc.brainmob brainmob.reset_perspective(src) occupant = brainmob brainmob.forceMove(src) //should allow relaymove @@ -1198,7 +1197,7 @@ return 1 return 0 -/obj/mecha/proc/pilot_mmi_hud(var/mob/living/carbon/brain/pilot) +/obj/mecha/proc/pilot_mmi_hud(mob/living/carbon/brain/pilot) return /obj/mecha/Exited(atom/movable/M, atom/newloc) @@ -1251,7 +1250,7 @@ if(istype(mob_container, /obj/item/mmi)) var/obj/item/mmi/mmi = mob_container if(mmi.brainmob) - L.loc = mmi + L.forceMove(mmi) L.reset_perspective() mmi.mecha = null mmi.update_icon() diff --git a/code/game/mecha/mecha_construction_paths.dm b/code/game/mecha/mecha_construction_paths.dm index 4ea78db674a..01ac7cf8d7d 100644 --- a/code/game/mecha/mecha_construction_paths.dm +++ b/code/game/mecha/mecha_construction_paths.dm @@ -1202,99 +1202,99 @@ result = "/obj/mecha/combat/phazon" steps = list( //1 - list("key"=/obj/item/assembly/signaler/anomaly, + list("key" = /obj/item/assembly/signaler/anomaly/bluespace, "backkey"=null, //Cannot remove the anomaly core once it's in "desc"="Anomaly core socket is open and awaiting connection."), //2 - list("key"=TOOL_WELDER, + list("key" = TOOL_WELDER, "backkey"=TOOL_WRENCH, "desc"="External armor is wrenched."), //3 - list("key"=TOOL_WRENCH, + list("key" = TOOL_WRENCH, "backkey"=TOOL_CROWBAR, "desc"="External armor is installed."), //4 - list("key"=/obj/item/mecha_parts/part/phazon_armor, + list("key" = /obj/item/mecha_parts/part/phazon_armor, "backkey"=TOOL_WELDER, "desc"="Phase armor is welded."), //5 - list("key"=TOOL_WELDER, + list("key" = TOOL_WELDER, "backkey"=TOOL_WRENCH, "desc"="Phase armor is wrenched."), //6 - list("key"=TOOL_WRENCH, + list("key" = TOOL_WRENCH, "backkey"=TOOL_CROWBAR, "desc"="Phase armor is installed."), //7 - list("key"=/obj/item/stack/sheet/plasteel, + list("key" = /obj/item/stack/sheet/plasteel, "backkey"=TOOL_SCREWDRIVER, "desc"="The bluespace crystal is engaged."), //8 - list("key"=TOOL_SCREWDRIVER, + list("key" = TOOL_SCREWDRIVER, "backkey"=/obj/item/wirecutters, "desc"="The bluespace crystal is connected."), //9 - list("key"=/obj/item/stack/cable_coil, + list("key" = /obj/item/stack/cable_coil, "backkey"=TOOL_CROWBAR, "desc"="The bluespace crystal is installed."), //10 - list("key"=/obj/item/stack/ore/bluespace_crystal, + list("key" = /obj/item/stack/ore/bluespace_crystal, "backkey"=TOOL_SCREWDRIVER, "desc"="Super capacitor is secured."), //11 - list("key"=TOOL_SCREWDRIVER, + list("key" = TOOL_SCREWDRIVER, "backkey"=TOOL_CROWBAR, "desc"="Super capacitor is installed."), //12 - list("key"=/obj/item/stock_parts/capacitor/super, + list("key" = /obj/item/stock_parts/capacitor/super, "backkey"=TOOL_SCREWDRIVER, "desc"="Phasic scanner module is secured."), //13 - list("key"=TOOL_SCREWDRIVER, + list("key" = TOOL_SCREWDRIVER, "backkey"=TOOL_CROWBAR, "desc"="Phasic scanner module is installed."), //14 - list("key"=/obj/item/stock_parts/scanning_module/phasic, + list("key" = /obj/item/stock_parts/scanning_module/phasic, "backkey"=TOOL_SCREWDRIVER, "desc"="Scanning module is secured."), //15 - list("key"=TOOL_SCREWDRIVER, + list("key" = TOOL_SCREWDRIVER, "backkey"=TOOL_CROWBAR, "desc"="Scanning module is installed."), //16 - list("key"=/obj/item/circuitboard/mecha/phazon/targeting, + list("key" = /obj/item/circuitboard/mecha/phazon/targeting, "backkey"=TOOL_SCREWDRIVER, "desc"="Peripherals control module is secured."), //17 - list("key"=TOOL_SCREWDRIVER, + list("key" = TOOL_SCREWDRIVER, "backkey"=TOOL_CROWBAR, "desc"="Peripherals control module is installed"), //18 - list("key"=/obj/item/circuitboard/mecha/phazon/peripherals, + list("key" = /obj/item/circuitboard/mecha/phazon/peripherals, "backkey"=TOOL_SCREWDRIVER, "desc"="Central control module is secured."), //19 - list("key"=TOOL_SCREWDRIVER, + list("key" = TOOL_SCREWDRIVER, "backkey"=TOOL_CROWBAR, "desc"="Central control module is installed."), //20 - list("key"=/obj/item/circuitboard/mecha/phazon/main, + list("key" = /obj/item/circuitboard/mecha/phazon/main, "backkey"=TOOL_SCREWDRIVER, "desc"="The wiring is adjusted."), //21 - list("key"=/obj/item/wirecutters, + list("key" = /obj/item/wirecutters, "backkey"=TOOL_SCREWDRIVER, "desc"="The wiring is added."), //22 - list("key"=/obj/item/stack/cable_coil, + list("key" = /obj/item/stack/cable_coil, "backkey"=TOOL_SCREWDRIVER, "desc"="The hydraulic systems are active."), //23 - list("key"=TOOL_SCREWDRIVER, + list("key" = TOOL_SCREWDRIVER, "backkey"=TOOL_WRENCH, "desc"="The hydraulic systems are connected."), //24 - list("key"=TOOL_WRENCH, + list("key" = TOOL_WRENCH, "desc"="The hydraulic systems are disconnected.") ) diff --git a/code/game/mecha/mecha_modkit.dm b/code/game/mecha/mecha_modkit.dm index 9d07e760c79..55558ff66dd 100644 --- a/code/game/mecha/mecha_modkit.dm +++ b/code/game/mecha/mecha_modkit.dm @@ -5,7 +5,7 @@ icon_state = "harddisk_mini" var/install_time = 15 -/obj/item/mecha_modkit/proc/install(var/obj/mecha/mech, var/mob/user) +/obj/item/mecha_modkit/proc/install(obj/mecha/mech, mob/user) if(user) to_chat(user, "You install [src] into [mech].") return TRUE @@ -20,7 +20,7 @@ var/lowpowersound = 'sound/mecha/lowpower.ogg' var/longactivationsound = 'sound/mecha/nominal.ogg' -/obj/item/mecha_modkit/voice/install(var/obj/mecha/mech, var/mob/living/carbon/user) +/obj/item/mecha_modkit/voice/install(obj/mecha/mech, mob/living/carbon/user) if(istype(mech, /obj/mecha/combat/reticence) && user) to_chat(user, "You attempt to install [src] into [mech], but an invisible barrier prevents you from doing so!") return FALSE diff --git a/code/game/mecha/mecha_parts.dm b/code/game/mecha/mecha_parts.dm index 6b8122e69d9..4bb7f96e66f 100644 --- a/code/game/mecha/mecha_parts.dm +++ b/code/game/mecha/mecha_parts.dm @@ -259,6 +259,11 @@ ..() construct = new /datum/construction/mecha/phazon_chassis(src) +/obj/item/mecha_parts/chassis/phazon/attackby(obj/item/I, mob/user, params) + . = ..() + if(istype(I, /obj/item/assembly/signaler/anomaly) && !istype(I, /obj/item/assembly/signaler/anomaly/bluespace)) + to_chat(user, "The anomaly core socket only accepts bluespace anomaly cores!") + /obj/item/mecha_parts/part/phazon_torso name="Phazon Torso" icon_state = "phazon_harness" diff --git a/code/game/mecha/medical/odysseus.dm b/code/game/mecha/medical/odysseus.dm index 93003258008..3fd3cf8742b 100644 --- a/code/game/mecha/medical/odysseus.dm +++ b/code/game/mecha/medical/odysseus.dm @@ -13,7 +13,7 @@ normal_step_energy_drain = 6 var/builtin_hud_user = 0 -/obj/mecha/medical/odysseus/moved_inside(var/mob/living/carbon/human/H) +/obj/mecha/medical/odysseus/moved_inside(mob/living/carbon/human/H) . = ..() if(. && ishuman(H)) if(istype(H.glasses, /obj/item/clothing/glasses/hud)) @@ -23,7 +23,7 @@ A.add_hud_to(H) builtin_hud_user = 1 -/obj/mecha/medical/odysseus/mmi_moved_inside(var/obj/item/mmi/mmi_as_oc, mob/user) +/obj/mecha/medical/odysseus/mmi_moved_inside(obj/item/mmi/mmi_as_oc, mob/user) . = ..() if(.) if(occupant.client) diff --git a/code/game/mecha/working/ripley.dm b/code/game/mecha/working/ripley.dm index 7569d8b5263..96f045ea9d3 100644 --- a/code/game/mecha/working/ripley.dm +++ b/code/game/mecha/working/ripley.dm @@ -62,7 +62,7 @@ add_overlay(occupant ? "ripley-g-full" : "ripley-g-full-open") /obj/mecha/working/ripley/firefighter - desc = "Standart APLU chassis was refitted with additional thermal protection and cistern." + desc = "A standard APLU chassis that was refitted with additional thermal protection and a cistern." name = "APLU \"Firefighter\"" icon_state = "firefighter" initial_icon = "firefighter" @@ -200,7 +200,7 @@ if(!emagged) emagged = TRUE to_chat(user, "You slide the card through [src]'s ID slot.") - playsound(loc, "sparks", 100, 1) + playsound(loc, "sparks", 100, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) desc += "
      The mech's equipment slots spark dangerously!" else to_chat(user, "[src]'s ID slot rejects the card.") diff --git a/code/game/objects/effects/anomalies.dm b/code/game/objects/effects/anomalies.dm index ed4f5162447..ba1d107c94e 100644 --- a/code/game/objects/effects/anomalies.dm +++ b/code/game/objects/effects/anomalies.dm @@ -1,98 +1,180 @@ //Anomalies, used for events. Note that these DO NOT work by themselves; their procs are called by the event datum. +/// Chance of taking a step per second +#define ANOMALY_MOVECHANCE 70 + /obj/effect/anomaly name = "anomaly" - icon = 'icons/effects/effects.dmi' desc = "A mysterious anomaly, seen commonly only in the region of space that the station orbits..." icon_state = "bhole3" - density = 0 - anchored = 1 - luminosity = 3 - var/obj/item/assembly/signaler/anomaly/aSignal = null + density = FALSE + anchored = TRUE + light_range = 3 + var/movechance = ANOMALY_MOVECHANCE + var/obj/item/assembly/signaler/anomaly/aSignal = /obj/item/assembly/signaler/anomaly + var/area/impact_area + /// Time in deciseconds before the anomaly triggers + var/lifespan = 990 + var/death_time -/obj/effect/anomaly/New() + var/countdown_colour + var/obj/effect/countdown/anomaly/countdown + + /// Do we drop a core when we're neutralized? + var/drops_core = TRUE + +/obj/effect/anomaly/Initialize(mapload, new_lifespan, _drops_core = TRUE) . = ..() - set_light(initial(luminosity)) - aSignal = new(src) - aSignal.code = rand(1,100) - - var/new_frequency = sanitize_frequency(rand(PUBLIC_LOW_FREQ, PUBLIC_HIGH_FREQ)) - aSignal.set_frequency(new_frequency) GLOB.poi_list |= src + START_PROCESSING(SSobj, src) + impact_area = get_area(src) + + if(!impact_area) + return INITIALIZE_HINT_QDEL + + drops_core = _drops_core + + aSignal = new aSignal(src) + aSignal.code = rand(1, 100) + aSignal.anomaly_type = type + + var/frequency = rand(PUBLIC_LOW_FREQ, PUBLIC_HIGH_FREQ) + if(ISMULTIPLE(frequency, 2))//signaller frequencies are always uneven! + frequency++ + aSignal.set_frequency(frequency) + + if(new_lifespan) + lifespan = new_lifespan + death_time = world.time + lifespan + countdown = new(src) + if(countdown_colour) + countdown.color = countdown_colour + countdown.start() /obj/effect/anomaly/Destroy() - QDEL_NULL(aSignal) GLOB.poi_list.Remove(src) + STOP_PROCESSING(SSobj, src) + QDEL_NULL(countdown) + QDEL_NULL(aSignal) return ..() +/obj/effect/anomaly/process() + anomalyEffect() + if(death_time < world.time) + if(loc) + detonate() + qdel(src) + /obj/effect/anomaly/proc/anomalyEffect() - if(prob(50)) + if(prob(movechance)) step(src, pick(GLOB.alldirs)) +/obj/effect/anomaly/proc/detonate() + return + +/obj/effect/anomaly/ex_act(severity) + if(severity == EXPLODE_DEVASTATE) + qdel(src) /obj/effect/anomaly/proc/anomalyNeutralize() - var/turf/T = get_turf(src) + new /obj/effect/particle_effect/smoke/bad(loc) - new /obj/effect/particle_effect/smoke/bad(T) - - if(aSignal) - aSignal.forceMove(T) + if(drops_core) + aSignal.forceMove(drop_location()) aSignal = null + // else, anomaly core gets deleted by qdel(src). qdel(src) /obj/effect/anomaly/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/analyzer)) - to_chat(user, "Analyzing... [src]'s unstable field is fluctuating along frequency [aSignal.code]:[format_frequency(aSignal.frequency)].") + to_chat(user, "Analyzing... [src]'s unstable field is fluctuating along frequency [format_frequency(aSignal.frequency)], code [aSignal.code].") /////////////////////// /obj/effect/anomaly/grav name = "gravitational anomaly" icon_state = "shield2" - density = 1 - var/boing = 0 - -/obj/effect/anomaly/grav/New() - ..() - aSignal.origin_tech = "magnets=7" + density = FALSE + var/boing = FALSE + aSignal = /obj/item/assembly/signaler/anomaly/grav /obj/effect/anomaly/grav/anomalyEffect() ..() - - boing = 1 + boing = TRUE for(var/obj/O in orange(4, src)) if(!O.anchored) step_towards(O,src) + for(var/mob/living/M in range(0, src)) + gravShock(M) for(var/mob/living/M in orange(4, src)) - step_towards(M,src) + if(!M.mob_negates_gravity()) + step_towards(M,src) + for(var/obj/O in range(0, src)) + if(!O.anchored) + var/mob/living/target = locate() in view(4, src) + if(target && !target.stat) + O.throw_at(target, 5, 10) -/obj/effect/anomaly/grav/Bump(mob/A) +/obj/effect/anomaly/grav/Crossed(atom/movable/AM) + . = ..() + gravShock(AM) + +/obj/effect/anomaly/grav/Bump(atom/A) gravShock(A) - return -/obj/effect/anomaly/grav/Bumped(mob/A) - gravShock(A) - return +/obj/effect/anomaly/grav/Bumped(atom/movable/AM) + gravShock(AM) -/obj/effect/anomaly/grav/proc/gravShock(var/mob/A) +/obj/effect/anomaly/grav/proc/gravShock(mob/living/A) if(boing && isliving(A) && !A.stat) A.Weaken(2) var/atom/target = get_edge_target_turf(A, get_dir(src, get_step_away(A, src))) A.throw_at(target, 5, 1) - boing = 0 - return + boing = FALSE ///////////////////// /obj/effect/anomaly/flux name = "flux wave anomaly" icon_state = "electricity2" + density = TRUE + aSignal = /obj/item/assembly/signaler/anomaly/flux + var/canshock = FALSE + var/shockdamage = 20 + var/explosive = TRUE -/obj/effect/anomaly/flux/New() +/obj/effect/anomaly/flux/Initialize(mapload, new_lifespan, drops_core = TRUE, _explosive = TRUE) + . = ..() + explosive = _explosive + +/obj/effect/anomaly/flux/anomalyEffect() ..() - aSignal.origin_tech = "powerstorage=7" + canshock = TRUE + for(var/mob/living/M in get_turf(src)) + mobShock(M) + +/obj/effect/anomaly/flux/Crossed(atom/movable/AM) + . = ..() + mobShock(AM) + +/obj/effect/anomaly/flux/Bump(atom/A) + mobShock(A) + +/obj/effect/anomaly/flux/Bumped(atom/movable/AM) + mobShock(AM) + +/obj/effect/anomaly/flux/proc/mobShock(mob/living/M) + if(canshock && istype(M)) + canshock = FALSE //Just so you don't instakill yourself if you slam into the anomaly five times in a second. + M.electrocute_act(shockdamage, name, flags = SHOCK_NOGLOVES) + +/obj/effect/anomaly/flux/detonate() + if(explosive) + explosion(src, 1, 4, 16, 18) //Low devastation, but hits a lot of stuff. + else + new /obj/effect/particle_effect/sparks(loc) ///////////////////// @@ -100,32 +182,116 @@ name = "bluespace anomaly" icon = 'icons/obj/projectiles.dmi' icon_state = "bluespace" - density = 1 + density = TRUE + aSignal = /obj/item/assembly/signaler/anomaly/bluespace -/obj/effect/anomaly/bluespace/New() +/obj/effect/anomaly/bluespace/anomalyEffect() ..() - aSignal.origin_tech = "bluespace=7" + for(var/mob/living/M in range(1, src)) + do_teleport(M, locate(M.x, M.y, M.z), 4) + +/obj/effect/anomaly/bluespace/Bumped(atom/movable/AM) + if(isliving(AM)) + do_teleport(AM, locate(AM.x, AM.y, AM.z), 8) + +/obj/effect/anomaly/bluespace/detonate() + var/turf/T = pick(get_area_turfs(impact_area)) + if(T) + // Calculate new position (searches through beacons in world) + var/obj/item/radio/beacon/chosen + var/list/possible = list() + for(var/obj/item/radio/beacon/W in GLOB.beacons) + if(!is_station_level(W.z)) + continue + possible += W + + if(length(possible)) + chosen = pick(possible) + + if(chosen) + // Calculate previous position for transition + var/turf/turf_from = T // the turf of origin we're travelling FROM + var/turf/turf_to = get_turf(chosen) // the turf of origin we're travelling TO + + playsound(turf_to, 'sound/effects/phasein.ogg', 100, TRUE) + GLOB.event_announcement.Announce("Massive bluespace translocation detected.", "Anomaly Alert") + + var/list/flashers = list() + for(var/mob/living/carbon/C in viewers(turf_to, null)) + if(C.flash_eyes()) + flashers += C + + var/y_distance = turf_to.y - turf_from.y + var/x_distance = turf_to.x - turf_from.x + for(var/atom/movable/A in urange(12, turf_from)) // iterate thru list of mobs in the area + if(istype(A, /obj/item/radio/beacon)) + continue // don't teleport beacons because that's just insanely stupid + if(A.anchored || A.move_resist == INFINITY) + continue + + var/turf/newloc = locate(A.x + x_distance, A.y + y_distance, turf_to.z) // calculate the new place + if(!A.Move(newloc) && newloc) // if the atom, for some reason, can't move, FORCE them to move! :) We try Move() first to invoke any movement-related checks the atom needs to perform after moving + A.forceMove(newloc) + + if(ismob(A) && !(A in flashers)) // don't flash if we're already doing an effect + var/mob/M = A + if(M.client) + INVOKE_ASYNC(src, .proc/blue_effect, M) + +/obj/effect/anomaly/bluespace/proc/blue_effect(mob/M) + var/obj/blueeffect = new /obj(src) + blueeffect.screen_loc = "WEST,SOUTH to EAST,NORTH" + blueeffect.icon = 'icons/effects/effects.dmi' + blueeffect.icon_state = "shieldsparkles" + blueeffect.layer = FLASH_LAYER + blueeffect.plane = FULLSCREEN_PLANE + blueeffect.mouse_opacity = MOUSE_OPACITY_TRANSPARENT + M.client.screen += blueeffect + sleep(20) + M.client.screen -= blueeffect + qdel(blueeffect) -/obj/effect/anomaly/bluespace/Bumped(atom/A) - if(isliving(A)) - do_teleport(A, locate(A.x, A.y, A.z), 10) - return ///////////////////// /obj/effect/anomaly/pyro name = "pyroclastic anomaly" icon_state = "mustard" - -/obj/effect/anomaly/pyro/New() - ..() - aSignal.origin_tech = "plasmatech=7" + var/ticks = 0 + aSignal = /obj/item/assembly/signaler/anomaly/pyro /obj/effect/anomaly/pyro/anomalyEffect() ..() + ticks++ + if(ticks < 5) + return + else + ticks = 0 var/turf/simulated/T = get_turf(src) if(istype(T)) - T.atmos_spawn_air(LINDA_SPAWN_HEAT | LINDA_SPAWN_TOXINS, 3) + T.atmos_spawn_air(LINDA_SPAWN_HEAT | LINDA_SPAWN_TOXINS | LINDA_SPAWN_OXYGEN, 5) + +/obj/effect/anomaly/pyro/detonate() + INVOKE_ASYNC(src, .proc/makepyroslime) + +/obj/effect/anomaly/pyro/proc/makepyroslime() + var/turf/simulated/T = get_turf(src) + if(istype(T)) + T.atmos_spawn_air(LINDA_SPAWN_HEAT | LINDA_SPAWN_TOXINS | LINDA_SPAWN_OXYGEN, 500) //Make it hot and burny for the new slime + var/new_colour = pick("red", "orange") + var/mob/living/simple_animal/slime/S = new(T, new_colour) + S.rabid = TRUE + S.amount_grown = SLIME_EVOLUTION_THRESHOLD + S.Evolve() + var/datum/action/innate/slime/reproduce/A = new + A.Grant(S) + + var/list/mob/dead/observer/candidates = SSghost_spawns.poll_candidates("Do you want to play as a pyroclastic anomaly slime?", ROLE_SENTIENT, FALSE, 100, source = S, role_cleanname = "pyroclastic anomaly slime") + if(LAZYLEN(candidates)) + var/mob/dead/observer/chosen = pick(candidates) + S.key = chosen.key + S.mind.special_role = SPECIAL_ROLE_PYROCLASTIC_SLIME + log_game("[key_name(S.key)] was made into a slime by pyroclastic anomaly at [AREACOORD(T)].") ///////////////////// @@ -133,10 +299,7 @@ name = "vortex anomaly" icon_state = "bhole3" desc = "That's a nice station you have there. It'd be a shame if something happened to it." - -/obj/effect/anomaly/bhole/New() - ..() - aSignal.origin_tech = "engineering=7" + aSignal = /obj/item/assembly/signaler/anomaly/vortex /obj/effect/anomaly/bhole/anomalyEffect() ..() @@ -144,31 +307,31 @@ qdel(src) return - grav(rand(0,3), rand(2,3), 50, 25) + grav(rand(0, 3), rand(2, 3), 50, 25) //Throwing stuff around! - for(var/obj/O in orange(1,src)) + for(var/obj/O in range(2, src)) + if(O == src) + return //DON'T DELETE YOURSELF GOD DAMN if(!O.anchored) - var/mob/living/target = locate() in view(5,src) - if(!target) - return - O.throw_at(target, 5, 10) - return + var/mob/living/target = locate() in view(4, src) + if(target && !target.stat) + O.throw_at(target, 7, 5) else - O.ex_act(2) + O.ex_act(EXPLODE_HEAVY) -/obj/effect/anomaly/bhole/proc/grav(var/r, var/ex_act_force, var/pull_chance, var/turf_removal_chance) +/obj/effect/anomaly/bhole/proc/grav(r, ex_act_force, pull_chance, turf_removal_chance) for(var/t = -r, t < r, t++) - affect_coord(x+t, y-r, ex_act_force, pull_chance, turf_removal_chance) - affect_coord(x-t, y+r, ex_act_force, pull_chance, turf_removal_chance) - affect_coord(x+r, y+t, ex_act_force, pull_chance, turf_removal_chance) - affect_coord(x-r, y-t, ex_act_force, pull_chance, turf_removal_chance) - return + affect_coord(x + t, y - r, ex_act_force, pull_chance, turf_removal_chance) + affect_coord(x - t, y + r, ex_act_force, pull_chance, turf_removal_chance) + affect_coord(x + r, y + t, ex_act_force, pull_chance, turf_removal_chance) + affect_coord(x - r, y - t, ex_act_force, pull_chance, turf_removal_chance) -/obj/effect/anomaly/bhole/proc/affect_coord(var/x, var/y, var/ex_act_force, var/pull_chance, var/turf_removal_chance) +/obj/effect/anomaly/bhole/proc/affect_coord(x, y, ex_act_force, pull_chance, turf_removal_chance) //Get turf at coordinate var/turf/T = locate(x, y, z) - if(isnull(T)) return + if(isnull(T)) + return //Pulling and/or ex_act-ing movable atoms in that turf if(prob(pull_chance)) @@ -176,38 +339,12 @@ if(O.anchored) O.ex_act(ex_act_force) else - step_towards(O,src) + step_towards(O, src) for(var/mob/living/M in T.contents) - step_towards(M,src) + step_towards(M, src) //Damaging the turf - if( T && istype(T,/turf/simulated) && prob(turf_removal_chance) ) + if(T && prob(turf_removal_chance)) T.ex_act(ex_act_force) - return -///////////////////// - -/obj/effect/anomaly/atmos - name = "transformative gas anomaly" - icon_state = "electricity2" - var/gas_type - -/obj/effect/anomaly/atmos/New() - ..() - gas_type = pick(GAS_N2O, GAS_CO2, GAS_N2) - aSignal.origin_tech = "materials=7" //turning gas into another gas has some interesting implications for material science - //might also work as biotech maybe? Since there's no anomaly for that. - -/obj/effect/anomaly/atmos/anomalyEffect() - ..() - var/turf/simulated/T = get_turf(src) - if(istype(T)) - var/flag - switch(gas_type) - if(GAS_CO2) - flag = LINDA_SPAWN_CO2 - if(GAS_N2O) - flag = LINDA_SPAWN_N2O - else - flag = LINDA_SPAWN_NITROGEN - T.atmos_spawn_air(LINDA_SPAWN_20C | flag, 10) +#undef ANOMALY_MOVECHANCE diff --git a/code/game/objects/effects/decals/Cleanable/humans.dm b/code/game/objects/effects/decals/Cleanable/humans.dm index bf24498e4b2..f88a3cb630d 100644 --- a/code/game/objects/effects/decals/Cleanable/humans.dm +++ b/code/game/objects/effects/decals/Cleanable/humans.dm @@ -182,7 +182,7 @@ GLOBAL_LIST_EMPTY(splatter_cache) /obj/effect/decal/cleanable/blood/gibs/cleangibs //most ironic name ever... scoop_reagents = null -/obj/effect/decal/cleanable/blood/gibs/proc/streak(var/list/directions) +/obj/effect/decal/cleanable/blood/gibs/proc/streak(list/directions) set waitfor = 0 var/direction = pick(directions) for(var/i = 0, i < pick(1, 200; 2, 150; 3, 50; 4), i++) diff --git a/code/game/objects/effects/decals/Cleanable/misc.dm b/code/game/objects/effects/decals/Cleanable/misc.dm index a8510ddc102..721b28d09fd 100644 --- a/code/game/objects/effects/decals/Cleanable/misc.dm +++ b/code/game/objects/effects/decals/Cleanable/misc.dm @@ -18,6 +18,22 @@ scoop_reagents = list("ash" = 10) mergeable_decal = FALSE +/obj/effect/decal/cleanable/glass + name = "tiny shards" + desc = "Back to sand." + icon = 'icons/obj/shards.dmi' + icon_state = "tiny" + +/obj/effect/decal/cleanable/glass/Initialize(mapload) + . = ..() + setDir(pick(GLOB.cardinal)) + +/obj/effect/decal/cleanable/glass/ex_act() + qdel(src) + +/obj/effect/decal/cleanable/glass/plasma + icon_state = "plasmatiny" + /obj/effect/decal/cleanable/dirt name = "dirt" desc = "Someone should clean that up." diff --git a/code/game/objects/effects/decals/Cleanable/robots.dm b/code/game/objects/effects/decals/Cleanable/robots.dm index 91f558068a8..b3519902a6e 100644 --- a/code/game/objects/effects/decals/Cleanable/robots.dm +++ b/code/game/objects/effects/decals/Cleanable/robots.dm @@ -20,7 +20,7 @@ /obj/effect/decal/cleanable/blood/gibs/robot/can_bloodcrawl_in() return FALSE -/obj/effect/decal/cleanable/blood/gibs/robot/streak(var/list/directions) +/obj/effect/decal/cleanable/blood/gibs/robot/streak(list/directions) spawn(0) var/direction = pick(directions) for(var/i = 0, i < pick(1, 200; 2, 150; 3, 50; 4), i++) diff --git a/code/game/objects/effects/decals/contraband.dm b/code/game/objects/effects/decals/contraband.dm index 0f34aa95b71..1ba71e35290 100644 --- a/code/game/objects/effects/decals/contraband.dm +++ b/code/game/objects/effects/decals/contraband.dm @@ -12,8 +12,8 @@ var/poster_type var/obj/structure/sign/poster/poster_structure -/obj/item/poster/New(loc, obj/structure/sign/poster/new_poster_structure) - ..() +/obj/item/poster/Initialize(mapload, obj/structure/sign/poster/new_poster_structure) + . = ..() poster_structure = new_poster_structure if(!new_poster_structure && poster_type) poster_structure = new poster_type(src) @@ -61,8 +61,8 @@ var/poster_item_desc = "This hypothetical poster item should not exist, let's be honest here." var/poster_item_icon_state = "rolled_poster" -/obj/structure/sign/poster/New() - ..() +/obj/structure/sign/poster/Initialize(mapload) + . = ..() if(random_basetype) randomise(random_basetype) if(!ruined) diff --git a/code/game/objects/effects/decals/misc.dm b/code/game/objects/effects/decals/misc.dm index 88663e6c38c..9decdcf4c31 100644 --- a/code/game/objects/effects/decals/misc.dm +++ b/code/game/objects/effects/decals/misc.dm @@ -58,14 +58,14 @@ /obj/effect/decal/straw/edge icon_state = "strawscatterededge" -/obj/effect/decal/ants +/obj/effect/decal/cleanable/ants name = "space ants" desc = "A bunch of space ants." icon = 'icons/goonstation/effects/effects.dmi' icon_state = "spaceants" scoop_reagents = list("ants" = 20) -/obj/effect/decal/ants/Initialize(mapload) +/obj/effect/decal/cleanable/ants/Initialize(mapload) . = ..() var/scale = (rand(2, 10) / 10) + (rand(0, 5) / 100) transform = matrix(transform, scale, scale, MATRIX_SCALE) diff --git a/code/game/objects/effects/effect_system/effects_sparks.dm b/code/game/objects/effects/effect_system/effects_sparks.dm index f59f44ca1db..6d00e3c4efb 100644 --- a/code/game/objects/effects/effect_system/effects_sparks.dm +++ b/code/game/objects/effects/effect_system/effects_sparks.dm @@ -25,7 +25,7 @@ /obj/effect/particle_effect/sparks/New() ..() flick("sparks", src) // replay the animation - playsound(loc, "sparks", 100, 1) + playsound(src, "sparks", 100, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) var/turf/T = loc if(isturf(T)) T.hotspot_expose(hotspottemp, 100) diff --git a/code/game/objects/effects/effects.dm b/code/game/objects/effects/effects.dm index 625d2ad8fd9..9053786e554 100644 --- a/code/game/objects/effects/effects.dm +++ b/code/game/objects/effects/effects.dm @@ -69,9 +69,6 @@ /obj/effect/abstract/decompile_act(obj/item/matter_decompiler/C, mob/user) return -/obj/effect/abstract/tesla_act(power) - return - /obj/effect/abstract/singularity_act() return diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm index 0f373bfe851..4a00dfda86d 100644 --- a/code/game/objects/effects/landmarks.dm +++ b/code/game/objects/effects/landmarks.dm @@ -164,10 +164,9 @@ new /obj/item/clothing/shoes/jackboots(src.loc) qdel(src) -/obj/effect/landmark/costume/nyangirl/New() +/obj/effect/landmark/costume/schoolgirl/New() . = ..() new /obj/item/clothing/under/schoolgirl(src.loc) - new /obj/item/clothing/head/kitty(src.loc) qdel(src) /obj/effect/landmark/costume/maid/New() diff --git a/code/game/objects/effects/mines.dm b/code/game/objects/effects/mines.dm index f671fcfcf23..6e57fab9bb6 100644 --- a/code/game/objects/effects/mines.dm +++ b/code/game/objects/effects/mines.dm @@ -67,13 +67,11 @@ var/radiation_amount /obj/effect/mine/dnascramble/mineEffect(mob/living/victim) - victim.apply_effect(radiation_amount, IRRADIATE, 0) - if(ishuman(victim)) - var/mob/living/carbon/human/V = victim - if(NO_DNA in V.dna.species.species_traits) - return + victim.rad_act(radiation_amount) + if(!victim.dna || HAS_TRAIT(victim, TRAIT_GENELESS)) + return randmutb(victim) - domutcheck(victim ,null) + domutcheck(victim) /obj/effect/mine/gas name = "oxygen mine" @@ -132,7 +130,7 @@ if(!istype(victim) || !victim.client) return to_chat(victim, "RIP AND TEAR") - victim << 'sound/misc/e1m1.ogg' + SEND_SOUND(victim, sound('sound/misc/e1m1.ogg')) var/old_color = victim.client.color var/red_splash = list(1,0,0,0.8,0.2,0, 0.8,0,0.2,0.1,0,0) var/pure_red = list(0,0,0,0,0,0,0,0,0,1,0,0) @@ -179,7 +177,7 @@ if(!victim.client || !istype(victim)) return to_chat(victim, "You feel fast!") - victim.status_flags |= GOTTAGOFAST + ADD_TRAIT(victim, TRAIT_GOTTAGOFAST, "mine") spawn(duration) - victim.status_flags &= ~GOTTAGOFAST + REMOVE_TRAIT(victim, TRAIT_GOTTAGOFAST, "mine") to_chat(victim, "You slow down.") diff --git a/code/game/objects/effects/snowcloud.dm b/code/game/objects/effects/snowcloud.dm index b8d193e13a3..8567f4fc5a5 100644 --- a/code/game/objects/effects/snowcloud.dm +++ b/code/game/objects/effects/snowcloud.dm @@ -134,6 +134,7 @@ if(!. && isliving(target)) var/mob/living/M = target M.adjustStaminaLoss(stamina_damage) + playsound(target, 'sound/weapons/tap.ogg', 50, TRUE) qdel(src) /obj/item/snowball/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume, global_overlay = TRUE) diff --git a/code/game/objects/effects/spawners/bombspawner.dm b/code/game/objects/effects/spawners/bombspawner.dm index 9b62faa5252..10600cb1fee 100644 --- a/code/game/objects/effects/spawners/bombspawner.dm +++ b/code/game/objects/effects/spawners/bombspawner.dm @@ -24,8 +24,8 @@ ..() var/obj/item/transfer_valve/V = new(src.loc) - var/obj/item/tank/plasma/PT = new(V) - var/obj/item/tank/oxygen/OT = new(V) + var/obj/item/tank/internals/plasma/PT = new(V) + var/obj/item/tank/internals/oxygen/OT = new(V) V.tank_one = PT V.tank_two = OT diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm index dcdcff81313..90fcb842684 100644 --- a/code/game/objects/effects/spawners/lootdrop.dm +++ b/code/game/objects/effects/spawners/lootdrop.dm @@ -94,6 +94,7 @@ /obj/item/book/manual/engineering_construction = 10, /obj/item/book/manual/engineering_hacking = 10, /obj/item/clothing/head/cone = 10, + /obj/item/geiger_counter = 30, /obj/item/coin/silver = 10, /obj/item/coin/twoheaded = 10, /obj/item/poster/random_contraband = 10, @@ -116,8 +117,8 @@ /obj/item/storage/fancy/cigarettes/dromedaryco = 10, /obj/item/storage/toolbox/mechanical = 10, /obj/item/screwdriver = 30, - /obj/item/tank/emergency_oxygen = 20, - /obj/item/tank/emergency_oxygen/engi = 10, + /obj/item/tank/internals/emergency_oxygen = 20, + /obj/item/tank/internals/emergency_oxygen/engi = 10, /obj/item/vending_refill/cola = 10, /obj/item/weldingtool = 30, /obj/item/wirecutters = 10, @@ -254,10 +255,10 @@ loot = list( // Robotics /obj/item/mmi/robotic_brain = 50, // Low-value, but we want to encourage getting more players back in the round. - /obj/item/assembly/signaler/anomaly = 50, // anomaly core + /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/autoimplanter = 50, + /obj/item/autosurgeon = 50, // Research / Experimentor /obj/item/paper/researchnotes = 150, // papers that give random R&D levels @@ -319,7 +320,7 @@ /obj/item/storage/belt/utility/chief/full = 25, /obj/item/rcd/combat = 25, /obj/item/rpd/bluespace = 25, - /obj/item/tank/emergency_oxygen/double/full = 25, + /obj/item/tank/internals/emergency_oxygen/double = 25, /obj/item/slimepotion/speed = 25, /obj/item/storage/backpack/holding = 25, /obj/item/clothing/glasses/meson/night = 25, // NV mesons @@ -387,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/spawners/vaultspawner.dm b/code/game/objects/effects/spawners/vaultspawner.dm index faa09956abb..ca455603916 100644 --- a/code/game/objects/effects/spawners/vaultspawner.dm +++ b/code/game/objects/effects/spawners/vaultspawner.dm @@ -4,7 +4,7 @@ var/minX = 2 var/minY = 2 -/obj/effect/vaultspawner/New(turf/location as turf,lX = minX,uX = maxX,lY = minY,uY = maxY,var/type = null) +/obj/effect/vaultspawner/New(turf/location as turf,lX = minX,uX = maxX,lY = minY,uY = maxY, type = null) . = ..() if(!type) type = pick("sandstone","rock","alien") diff --git a/code/game/objects/effects/spawners/windowspawner.dm b/code/game/objects/effects/spawners/windowspawner.dm index cf29d86a450..1d498888588 100644 --- a/code/game/objects/effects/spawners/windowspawner.dm +++ b/code/game/objects/effects/spawners/windowspawner.dm @@ -2,12 +2,13 @@ name = "window spawner" icon = 'icons/obj/structures.dmi' icon_state = "window_spawner" - var/useFull = 0 - var/useGrille = 1 - var/windowtospawn = /obj/structure/window/basic - anchored = 1 // No sliding out while you prime + var/useFull = TRUE + var/useGrille = TRUE + var/window_to_spawn_regular = /obj/structure/window/basic + var/window_to_spawn_full = /obj/structure/window/full/basic + anchored = TRUE // No sliding out while you prime -/obj/effect/spawner/window/Initialize() +/obj/effect/spawner/window/Initialize(mapload) . = ..() var/turf/T = get_turf(src) for(var/obj/structure/grille/G in get_turf(src)) @@ -20,35 +21,60 @@ for(var/obj/effect/spawner/window/WS in get_step(src,cdir)) cdir = null break - if(!cdir) continue - var/obj/structure/window/WI = new windowtospawn(get_turf(src)) + if(!cdir) + continue + var/obj/structure/window/WI = new window_to_spawn_regular(get_turf(src)) WI.dir = cdir else - var/obj/structure/window/W = new windowtospawn(get_turf(src)) - W.dir = SOUTHWEST + new window_to_spawn_full(get_turf(src)) if(useGrille) new /obj/structure/grille(get_turf(src)) - src.air_update_turf(1) //atmos can pass otherwise - // Give some time for nearby window spawners to initialize - spawn(10) - qdel(src) - // why is this line a no-op - // QDEL_IN(src, 10) + air_update_turf(TRUE) //atmos can pass otherwise + return INITIALIZE_HINT_QDEL /obj/effect/spawner/window/reinforced name = "reinforced window spawner" icon_state = "rwindow_spawner" - windowtospawn = /obj/structure/window/reinforced + window_to_spawn_regular = /obj/structure/window/reinforced + window_to_spawn_full = /obj/structure/window/full/reinforced + +/obj/effect/spawner/window/plasma + name = "plasma window spawner" + icon_state = "pwindow_spawner" + window_to_spawn_regular = /obj/structure/window/plasmabasic + window_to_spawn_full = /obj/structure/window/full/plasmabasic /obj/effect/spawner/window/reinforced/plasma name = "reinforced plasma window spawner" - icon_state = "pwindow_spawner" - windowtospawn = /obj/structure/window/plasmareinforced + icon_state = "prwindow_spawner" + window_to_spawn_regular = /obj/structure/window/plasmareinforced + window_to_spawn_full = /obj/structure/window/full/plasmareinforced + +/obj/effect/spawner/window/reinforced/tinted + name = "tinted reinforced window spawner" + icon_state = "twindow_spawner" + window_to_spawn_regular = /obj/structure/window/reinforced/tinted + window_to_spawn_full = /obj/structure/window/full/reinforced/tinted /obj/effect/spawner/window/shuttle name = "shuttle window spawner" icon_state = "swindow_spawner" - windowtospawn = /obj/structure/window/shuttle + window_to_spawn_full = /obj/structure/window/full/shuttle + +/obj/effect/spawner/window/shuttle/survival_pod + name = "pod window spawner" + icon_state = "podwindow_spawner" + window_to_spawn_full = /obj/structure/window/full/shuttle/survival_pod + +/obj/effect/spawner/window/plastitanium + name = "plastitanium window spawner" + icon_state = "plastitaniumwindow_spawner" + window_to_spawn_full = /obj/structure/window/full/plastitanium + +/obj/effect/spawner/window/ice + name = "ice window spawner" + icon_state = "icewindow_spawner" + window_to_spawn_full = /obj/structure/window/full/reinforced/ice diff --git a/code/game/objects/effects/spiders.dm b/code/game/objects/effects/spiders.dm index a1538b5fe92..ba7d03d1857 100644 --- a/code/game/objects/effects/spiders.dm +++ b/code/game/objects/effects/spiders.dm @@ -34,8 +34,8 @@ /obj/structure/spider/stickyweb icon_state = "stickyweb1" -/obj/structure/spider/stickyweb/New() - ..() +/obj/structure/spider/stickyweb/Initialize(mapload) + . = ..() if(prob(50)) icon_state = "stickyweb2" @@ -60,8 +60,8 @@ var/player_spiders = 0 var/list/faction = list("spiders") -/obj/structure/spider/eggcluster/New() - ..() +/obj/structure/spider/eggcluster/Initialize(mapload) + . = ..() pixel_x = rand(3,-3) pixel_y = rand(3,-3) START_PROCESSING(SSobj, src) @@ -93,8 +93,8 @@ var/list/faction = list("spiders") var/selecting_player = 0 -/obj/structure/spider/spiderling/New() - ..() +/obj/structure/spider/spiderling/Initialize(mapload) + . = ..() pixel_x = rand(6,-6) pixel_y = rand(6,-6) START_PROCESSING(SSobj, src) @@ -156,12 +156,8 @@ //================= else if(prob(33)) - var/list/nearby = oview(10, src) - if(nearby.len) - var/target_atom = pick(nearby) - walk_to(src, target_atom) - if(prob(40)) - visible_message("[src] skitters[pick(" away"," around","")].") + if(random_skitter() && prob(40)) + visible_message("[src] skitters[pick(" away"," around","")].") else if(prob(10)) //ventcrawl! for(var/obj/machinery/atmospherics/unary/vent_pump/v in view(7,src)) @@ -190,6 +186,18 @@ to_chat(S, "You are a spider who is loyal to [S.master_commander], obey [S.master_commander]'s every order and assist [S.master_commander.p_them()] in completing [S.master_commander.p_their()] goals at any cost.") qdel(src) +/obj/structure/spider/spiderling/proc/random_skitter() + var/list/available_turfs = list() + for(var/turf/simulated/S in oview(10, src)) + // no !isspaceturf check needed since /turf/simulated is not a subtype of /turf/space + if(S.density) + continue + available_turfs += S + if(!length(available_turfs)) + return FALSE + walk_to(src, pick(available_turfs)) + return TRUE + /obj/structure/spider/spiderling/decompile_act(obj/item/matter_decompiler/C, mob/user) if(!istype(user, /mob/living/silicon/robot/drone)) user.visible_message("[user] sucks [src] into its decompiler. There's a horrible crunching noise.", \ @@ -213,8 +221,8 @@ icon_state = "cocoon1" max_integrity = 60 -/obj/structure/spider/cocoon/New() - ..() +/obj/structure/spider/cocoon/Initialize(mapload) + . = ..() icon_state = pick("cocoon1","cocoon2","cocoon3") /obj/structure/spider/cocoon/Destroy() diff --git a/code/game/objects/effects/step_triggers.dm b/code/game/objects/effects/step_triggers.dm index bde6cb538df..a12d967e8f6 100644 --- a/code/game/objects/effects/step_triggers.dm +++ b/code/game/objects/effects/step_triggers.dm @@ -7,10 +7,10 @@ invisibility = INVISIBILITY_ABSTRACT // nope cant see this shit anchored = TRUE -/obj/effect/step_trigger/proc/Trigger(var/atom/movable/A) +/obj/effect/step_trigger/proc/Trigger(atom/movable/A) return FALSE -/obj/effect/step_trigger/Crossed(var/H, oldloc) +/obj/effect/step_trigger/Crossed(H, oldloc) . = ..() if(!H) return diff --git a/code/game/objects/empulse.dm b/code/game/objects/empulse.dm index 30c0063ea78..3b89a3d0ce9 100644 --- a/code/game/objects/empulse.dm +++ b/code/game/objects/empulse.dm @@ -17,8 +17,9 @@ if(heavy_range > light_range) light_range = heavy_range + var/emp_sound = sound('sound/effects/empulse.ogg') for(var/mob/M in range(heavy_range, epicenter)) - M << 'sound/effects/empulse.ogg' + SEND_SOUND(M, emp_sound) for(var/atom/T in range(light_range, epicenter)) if(cause == "cult" && iscultist(T)) continue diff --git a/code/game/objects/explosion.dm b/code/game/objects/explosion.dm index df017a3e3f3..4e4eefbe9cb 100644 --- a/code/game/objects/explosion.dm +++ b/code/game/objects/explosion.dm @@ -1,13 +1,27 @@ //TODO: Flash range does nothing currently +#define CREAK_DELAY 5 SECONDS //Time taken for the creak to play after explosion, if applicable. +#define DEVASTATION_PROB 30 //The probability modifier for devistation, maths! +#define HEAVY_IMPACT_PROB 5 //ditto +#define FAR_UPPER 60 //Upper limit for the far_volume, distance, clamped. +#define FAR_LOWER 40 //lower limit for the far_volume, distance, clamped. +#define PROB_SOUND 75 //The probability modifier for a sound to be an echo, or a far sound. (0-100) +#define SHAKE_CLAMP 2.5 //The limit for how much the camera can shake for out of view booms. +#define FREQ_UPPER 40 //The upper limit for the randomly selected frequency. +#define FREQ_LOWER 25 //The lower of the above. + /proc/explosion(turf/epicenter, devastation_range, heavy_impact_range, light_impact_range, flash_range, adminlog = 1, ignorecap = 0, flame_range = 0, silent = 0, smoke = 1, cause = null, breach = TRUE) epicenter = get_turf(epicenter) + if(!epicenter) + return // Archive the uncapped explosion for the doppler array var/orig_dev_range = devastation_range var/orig_heavy_range = heavy_impact_range var/orig_light_range = light_impact_range + var/orig_max_distance = max(devastation_range, heavy_impact_range, light_impact_range, flash_range, flame_range) + if(!ignorecap) // Clamp all values to MAX_EXPLOSION_RANGE devastation_range = min (GLOB.max_ex_devastation_range, devastation_range) @@ -16,17 +30,21 @@ flash_range = min (GLOB.max_ex_flash_range, flash_range) flame_range = min (GLOB.max_ex_flame_range, flame_range) + var/max_range = max(devastation_range, heavy_impact_range, light_impact_range, flame_range) + spawn(0) var/watch = start_watch() - if(!epicenter) return - var/max_range = max(devastation_range, heavy_impact_range, light_impact_range, flame_range) var/list/cached_exp_block = list() if(adminlog) message_admins("Explosion with size ([devastation_range], [heavy_impact_range], [light_impact_range], [flame_range]) in area [epicenter.loc.name] [cause ? "(Cause: [cause])" : ""] [ADMIN_COORDJMP(epicenter)] ") log_game("Explosion with size ([devastation_range], [heavy_impact_range], [light_impact_range], [flame_range]) in area [epicenter.loc.name] [cause ? "(Cause: [cause])" : ""] [COORD(epicenter)] ") + var/x0 = epicenter.x + var/y0 = epicenter.y + var/z0 = epicenter.z + // Play sounds; we want sounds to be different depending on distance so we will manually do it ourselves. // Stereo users will also hear the direction of the explosion! @@ -34,41 +52,69 @@ // 3/7/14 will calculate to 80 + 35 var/far_dist = 0 - far_dist += heavy_impact_range * 5 + far_dist += heavy_impact_range * 15 far_dist += devastation_range * 20 if(!silent) var/frequency = get_rand_frequency() var/sound/explosion_sound = sound(get_sfx("explosion")) - var/sound/global_boom = sound('sound/effects/explosionfar.ogg') + var/sound/far_explosion_sound = sound('sound/effects/explosionfar.ogg') + var/sound/creaking_explosion_sound = sound(get_sfx("explosion_creaking")) + var/sound/hull_creaking_sound = sound(get_sfx("hull_creaking")) + var/sound/explosion_echo_sound = sound('sound/effects/explosion_distant.ogg') + var/on_station = is_station_level(epicenter.z) + var/creaking_explosion = FALSE - for(var/P in GLOB.player_list) - var/mob/M = P + if(prob(devastation_range * DEVASTATION_PROB + heavy_impact_range * HEAVY_IMPACT_PROB) && on_station) // Huge explosions are near guaranteed to make the station creak and whine, smaller ones might. + creaking_explosion = TRUE // prob over 100 always returns true + + for(var/MN in GLOB.player_list) + var/mob/M = MN // Double check for client - if(M && M.client) - var/turf/M_turf = get_turf(M) - if(M_turf && M_turf.z == epicenter.z) - var/dist = get_dist(M_turf, epicenter) - // If inside the blast radius + world.view - 2 - if(dist <= round(max_range + world.view - 2, 1)) - M.playsound_local(epicenter, null, 100, 1, frequency, falloff = 5, S = explosion_sound) - // You hear a far explosion if you're outside the blast radius. Small bombs shouldn't be heard all over the station. - else if(M.can_hear() && !isspaceturf(M.loc)) - M << global_boom + var/turf/M_turf = get_turf(M) + if(M_turf && M_turf.z == z0) + var/dist = get_dist(M_turf, epicenter) + var/baseshakeamount + if(orig_max_distance - dist > 0) + baseshakeamount = sqrt((orig_max_distance - dist) * 0.1) + // If inside the blast radius + world.view - 2 + if(dist <= round(max_range + world.view - 2, 1)) + M.playsound_local(epicenter, null, 100, 1, frequency, S = explosion_sound) + if(baseshakeamount > 0) + shake_camera(M, 25, clamp(baseshakeamount, 0, 10)) + // You hear a far explosion if you're outside the blast radius. Small bombs shouldn't be heard all over the station. + else if(dist <= far_dist) + var/far_volume = clamp(far_dist / 2, FAR_LOWER, FAR_UPPER) // Volume is based on explosion size and dist + if(creaking_explosion) + M.playsound_local(epicenter, null, far_volume, 1, frequency, S = creaking_explosion_sound, distance_multiplier = 0) + else if(prob(PROB_SOUND)) // Sound variety during meteor storm/tesloose/other bad event + M.playsound_local(epicenter, null, far_volume, 1, frequency, S = far_explosion_sound, distance_multiplier = 0) // Far sound + else + M.playsound_local(epicenter, null, far_volume, 1, frequency, S = explosion_echo_sound, distance_multiplier = 0) // Echo sound + + if(baseshakeamount > 0 || devastation_range) + if(!baseshakeamount) // Devastating explosions rock the station and ground + baseshakeamount = devastation_range * 3 + shake_camera(M, 10, clamp(baseshakeamount * 0.25, 0, SHAKE_CLAMP)) + else if(!isspaceturf(get_turf(M)) && heavy_impact_range) // Big enough explosions echo throughout the hull + var/echo_volume = 40 + if(devastation_range) + baseshakeamount = devastation_range + shake_camera(M, 10, clamp(baseshakeamount * 0.25, 0, SHAKE_CLAMP)) + echo_volume = 60 + M.playsound_local(epicenter, null, echo_volume, 1, frequency, S = explosion_echo_sound, distance_multiplier = 0) + + if(creaking_explosion) // 5 seconds after the bang, the station begins to creak + addtimer(CALLBACK(M, /mob/proc/playsound_local, epicenter, null, rand(FREQ_LOWER, FREQ_UPPER), 1, frequency, null, null, FALSE, hull_creaking_sound, 0), CREAK_DELAY) if(heavy_impact_range > 1) + var/datum/effect_system/explosion/E if(smoke) - var/datum/effect_system/explosion/smoke/E = new/datum/effect_system/explosion/smoke() - E.set_up(epicenter) - E.start() + E = new /datum/effect_system/explosion/smoke else - var/datum/effect_system/explosion/E = new/datum/effect_system/explosion() - E.set_up(epicenter) - E.start() - - var/x0 = epicenter.x - var/y0 = epicenter.y - var/z0 = epicenter.z + E = new + E.set_up(epicenter) + E.start() var/list/affected_turfs = spiral_range_turfs(max_range, epicenter) @@ -144,11 +190,15 @@ log_world("## DEBUG: Explosion([x0],[y0],[z0])(d[devastation_range],h[heavy_impact_range],l[light_impact_range]): Took [took] seconds.") //Machines which report explosions. - for(var/i,i<=GLOB.doppler_arrays.len,i++) - var/obj/machinery/doppler_array/Array = GLOB.doppler_arrays[i] - if(Array) + for(var/array in GLOB.doppler_arrays) + if(!array) + continue + if(istype(array, /obj/machinery/doppler_array)) + var/obj/machinery/doppler_array/Array = array Array.sense_explosion(x0,y0,z0,devastation_range,heavy_impact_range,light_impact_range,took,orig_dev_range,orig_heavy_range,orig_light_range) - + if(istype(array, /obj/item/clothing/head/helmet/space/hardsuit/rd)) + var/obj/item/clothing/head/helmet/space/hardsuit/rd/Helm_Array = array + Helm_Array.sense_explosion(x0,y0,z0,devastation_range,heavy_impact_range,light_impact_range,took,orig_dev_range,orig_heavy_range,orig_light_range) return 1 @@ -226,3 +276,13 @@ for(var/turf/T in wipe_colours) T.color = null T.maptext = "" + +#undef CREAK_DELAY +#undef DEVASTATION_PROB +#undef HEAVY_IMPACT_PROB +#undef FAR_UPPER +#undef FAR_LOWER +#undef PROB_SOUND +#undef SHAKE_CLAMP +#undef FREQ_UPPER +#undef FREQ_LOWER diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 0c2f5378926..f22fb5cbb81 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -21,10 +21,22 @@ GLOBAL_DATUM_INIT(fire_overlay, /image, image("icon" = 'icons/goonstation/effect can_be_hit = FALSE suicidal_hands = TRUE + ///Sound played when you hit something with the item + var/hitsound + ///Played when the item is used, for example tools + var/usesound + ///Used when yate into a mob + var/mob_throw_hit_sound + ///Sound used when equipping the item into a valid slot + var/equip_sound + ///Sound uses when picking the item up (into your hands) + var/pickup_sound + ///Sound uses when dropping the item, or when its thrown. + var/drop_sound + ///Whether or not we use stealthy audio levels for this item's attack sounds + var/stealthy_audio = FALSE + var/list/attack_verb //Used in attackby() to say how something was attacked "[x] has been [z.attack_verb] by [y] with [z]" - var/hitsound = null - var/usesound = null - var/throwhitsound var/w_class = WEIGHT_CLASS_NORMAL var/slot_flags = 0 //This is used to determine on which slots an item can fit. pass_flags = PASSTABLE @@ -115,6 +127,7 @@ GLOBAL_DATUM_INIT(fire_overlay, /image, image("icon" = 'icons/goonstation/effect hitsound = 'sound/items/welder.ogg' if(damtype == "brute") hitsound = "swing_hit" + LAZYINITLIST(attack_verb) if(!move_resist) determine_move_resist() @@ -272,17 +285,20 @@ GLOBAL_DATUM_INIT(fire_overlay, /image, image("icon" = 'icons/goonstation/effect if(throwing) throwing.finalize(FALSE) if(loc == user) - if(!user.unEquip(src)) + if(!user.unEquip(src, silent = TRUE)) return 0 else if(isliving(loc)) return 0 - add_fingerprint(user) - if(pickup(user)) // Pickup succeeded - user.put_in_active_hand(src) - return 1 + pickup(user) + add_fingerprint(user) + if(!user.put_in_active_hand(src)) + dropped(user, TRUE) + return FALSE + + return TRUE /obj/item/attack_alien(mob/user) var/mob/living/carbon/alien/A = user @@ -373,10 +389,12 @@ GLOBAL_DATUM_INIT(fire_overlay, /image, image("icon" = 'icons/goonstation/effect /obj/item/proc/refill(mob/user, atom/A, amount) return FALSE -/obj/item/proc/talk_into(mob/M, var/text, var/channel=null) +/obj/item/proc/talk_into(mob/M, text, channel=null) return -/obj/item/proc/dropped(mob/user) +/// Called when a mob drops an item. +/obj/item/proc/dropped(mob/user, silent = FALSE) + SHOULD_CALL_PARENT(TRUE) for(var/X in actions) var/datum/action/A = X A.Remove(user) @@ -386,12 +404,14 @@ GLOBAL_DATUM_INIT(fire_overlay, /image, image("icon" = 'icons/goonstation/effect flags &= ~NODROP in_inventory = FALSE SEND_SIGNAL(src, COMSIG_ITEM_DROPPED,user) + if(!silent) + playsound(src, drop_sound, DROP_SOUND_VOLUME, ignore_walls = FALSE) // called just as an item is picked up (loc is not yet changed) /obj/item/proc/pickup(mob/user) + SHOULD_CALL_PARENT(TRUE) SEND_SIGNAL(src, COMSIG_ITEM_PICKUP, user) in_inventory = TRUE - return TRUE // called when this item is removed from a storage item, which is passed on as S. The loc variable is already set to the new destination before this is called. /obj/item/proc/on_exit_storage(obj/item/storage/S as obj) @@ -413,14 +433,19 @@ GLOBAL_DATUM_INIT(fire_overlay, /image, image("icon" = 'icons/goonstation/effect // user is mob that equipped it // slot uses the slot_X defines found in setup.dm // for items that can be placed in multiple slots -// note this isn't called during the initial dressing of a player -/obj/item/proc/equipped(var/mob/user, var/slot) +// Initial is used to indicate whether or not this is the initial equipment (job datums etc) or just a player doing it +/obj/item/proc/equipped(mob/user, slot, initial = FALSE) SEND_SIGNAL(src, COMSIG_ITEM_EQUIPPED, user, slot) for(var/X in actions) var/datum/action/A = X if(item_action_slot_check(slot, user)) //some items only give their actions buttons when in a specific slot. A.Grant(user) in_inventory = TRUE + if(!initial) + if(equip_sound && slot == slot_bitfield_to_slot(slot_flags)) + playsound(src, equip_sound, EQUIP_SOUND_VOLUME, TRUE, ignore_walls = FALSE) + else if(slot == slot_l_hand || slot == slot_r_hand) + playsound(src, pickup_sound, PICKUP_SOUND_VOLUME, ignore_walls = FALSE) /obj/item/proc/item_action_slot_check(slot, mob/user) return 1 @@ -480,7 +505,7 @@ GLOBAL_DATUM_INIT(fire_overlay, /image, image("icon" = 'icons/goonstation/effect /obj/item/proc/ui_action_click(mob/user, actiontype) attack_self(user) -/obj/item/proc/IsReflect(var/def_zone) //This proc determines if and at what% an object will reflect energy projectiles if it's in l_hand,r_hand or wear_suit +/obj/item/proc/IsReflect(def_zone) //This proc determines if and at what% an object will reflect energy projectiles if it's in l_hand,r_hand or wear_suit return 0 /obj/item/proc/get_loc_turf() @@ -563,13 +588,30 @@ GLOBAL_DATUM_INIT(fire_overlay, /image, image("icon" = 'icons/goonstation/effect else return -/obj/item/throw_impact(atom/A) - if(A && !QDELETED(A)) - SEND_SIGNAL(src, COMSIG_MOVABLE_IMPACT, A) - var/itempush = 1 +/obj/item/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum) + if(hit_atom && !QDELETED(hit_atom)) + SEND_SIGNAL(src, COMSIG_MOVABLE_IMPACT, hit_atom, throwingdatum) + var/itempush = TRUE if(w_class < WEIGHT_CLASS_BULKY) - itempush = 0 // too light to push anything - return A.hitby(src, 0, itempush) + itempush = FALSE //too light to push anything + if(isliving(hit_atom)) //Living mobs handle hit sounds differently. + if(is_hot(src)) + var/mob/living/L = hit_atom + L.IgniteMob() + var/volume = get_volume_by_throwforce_and_or_w_class() + if(throwforce > 0) + if(mob_throw_hit_sound) + playsound(hit_atom, mob_throw_hit_sound, volume, TRUE, -1) + else if(hitsound) + playsound(hit_atom, hitsound, volume, TRUE, -1) + else + playsound(hit_atom, 'sound/weapons/genhit.ogg', volume, TRUE, -1) + else + playsound(hit_atom, 'sound/weapons/throwtap.ogg', volume, TRUE, -1) + + else + playsound(src, drop_sound, YEET_SOUND_VOLUME, ignore_walls = FALSE) + return hit_atom.hitby(src, 0, itempush, throwingdatum = throwingdatum) /obj/item/throw_at(atom/target, range, speed, mob/thrower, spin=1, diagonals_first = 0, datum/callback/callback, force) thrownby = thrower @@ -618,7 +660,7 @@ GLOBAL_DATUM_INIT(fire_overlay, /image, image("icon" = 'icons/goonstation/effect return I == src /obj/item/hitby(atom/movable/AM, skipcatch, hitpush, blocked, datum/thrownthing/throwingdatum) - return + return SEND_SIGNAL(src, COMSIG_ATOM_HITBY, AM, skipcatch, hitpush, blocked, throwingdatum) /obj/item/attack_hulk(mob/living/carbon/human/user) return FALSE @@ -645,10 +687,10 @@ GLOBAL_DATUM_INIT(fire_overlay, /image, image("icon" = 'icons/goonstation/effect closeToolTip(usr) /obj/item/MouseDrop_T(obj/item/I, mob/user) - if(!user || src == I) + if(!user || user.incapacitated(ignore_lying = TRUE) || src == I) return - if(loc && I.loc == loc && istype(loc, /obj/item/storage)) // Are we trying to swap two items in the storage? + if(loc && I.loc == loc && istype(loc, /obj/item/storage) && loc.Adjacent(user)) // Are we trying to swap two items in the storage? var/obj/item/storage/S = loc S.swap_items(src, I, user) diff --git a/code/game/objects/items/blueprints.dm b/code/game/objects/items/blueprints.dm index 97e46e3abb5..69ae7f6d77a 100644 --- a/code/game/objects/items/blueprints.dm +++ b/code/game/objects/items/blueprints.dm @@ -169,7 +169,7 @@ return A -/obj/item/areaeditor/proc/get_area_type(var/area/A = get_area()) +/obj/item/areaeditor/proc/get_area_type(area/A = get_area()) if(A.outdoors) return AREA_SPACE var/list/SPECIALS = list( @@ -228,6 +228,8 @@ FD.CalculateAffectingAreas() interact() + message_admins("A new room was made by [key_name_admin(usr)] at [ADMIN_VERBOSEJMP(usr)] with the name [str]") + log_game("A new room was made by [key_name(usr)] at [AREACOORD(usr)] with the name [str]") area_created = TRUE return area_created @@ -248,10 +250,12 @@ FD.CalculateAffectingAreas() to_chat(usr, "You rename the '[prevname]' to '[str]'.") interact() + message_admins("A room was renamed by [key_name_admin(usr)] at [ADMIN_VERBOSEJMP(usr)] changing the name from [prevname] to [str]") + log_game("A room was renamed by [key_name(usr)] at [AREACOORD(usr)] changing the name from [prevname] to [str] ") return 1 -/obj/item/areaeditor/proc/set_area_machinery_title(var/area/A,var/title,var/oldtitle) +/obj/item/areaeditor/proc/set_area_machinery_title(area/A, title, oldtitle) if(!oldtitle) // or replacetext goes to infinite loop return for(var/obj/machinery/alarm/M in A) @@ -266,11 +270,9 @@ M.name = replacetext(M.name,oldtitle,title) //TODO: much much more. Unnamed airlocks, cameras, etc. -/obj/item/areaeditor/proc/check_tile_is_border(var/turf/T2,var/dir) +/obj/item/areaeditor/proc/check_tile_is_border(turf/T2, dir) if(istype(T2, /turf/space)) return BORDER_SPACE //omg hull breach we all going to die here - if(istype(T2, /turf/simulated/shuttle)) - return BORDER_SPACE if(get_area_type(T2.loc)!=AREA_SPACE) return BORDER_BETWEEN if(istype(T2, /turf/simulated/wall)) @@ -296,7 +298,7 @@ return BORDER_NONE -/obj/item/areaeditor/proc/detect_room(var/turf/first) +/obj/item/areaeditor/proc/detect_room(turf/first) var/list/turf/found = new var/list/turf/pending = list(first) while(pending.len) @@ -339,4 +341,3 @@ fluffnotice = "Intellectual Property of Nanotrasen. For use in engineering cyborgs only. Wipe from memory upon departure from the station." /obj/item/areaeditor/blueprints/ce - diff --git a/code/game/objects/items/bodybag.dm b/code/game/objects/items/bodybag.dm index 0c02a2125a6..5c4fc643d85 100644 --- a/code/game/objects/items/bodybag.dm +++ b/code/game/objects/items/bodybag.dm @@ -19,46 +19,51 @@ icon_state = "bodybag_closed" icon_closed = "bodybag_closed" icon_opened = "bodybag_open" - sound = 'sound/items/zip.ogg' - var/item_path = /obj/item/bodybag - density = 0 + density = FALSE integrity_failure = 0 + open_sound = 'sound/items/zip.ogg' + close_sound = 'sound/items/zip.ogg' + open_sound_volume = 15 + close_sound_volume = 15 + var/item_path = /obj/item/bodybag -/obj/structure/closet/body_bag/attackby(W as obj, mob/user as mob, params) - if(istype(W, /obj/item/pen)) - var/t = rename_interactive(user, W) +/obj/structure/closet/body_bag/attackby(obj/item/I, mob/user, params) + if(istype(I, /obj/item/pen)) + var/t = rename_interactive(user, I) if(isnull(t)) return cut_overlays() if(t) add_overlay(image(icon, "bodybag_label")) return - if(istype(W, /obj/item/wirecutters)) - to_chat(user, "You cut the tag off the bodybag") - name = "body bag" + if(istype(I, /obj/item/wirecutters)) + to_chat(user, "You cut the tag off the bodybag.") + name = initial(name) cut_overlays() return return ..() +/obj/structure/closet/body_bag/welder_act(mob/user, obj/item/I) + return // Can't weld a body bag shut /obj/structure/closet/body_bag/close() if(..()) density = 0 - return 1 - return 0 + return TRUE + return FALSE /obj/structure/closet/body_bag/MouseDrop(over_object, src_location, over_location) . = ..() - if((over_object == usr && (in_range(src, usr) || usr.contents.Find(src)))) + 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]") new item_path(get_turf(src)) qdel(src) -/obj/structure/closet/body_bag/relaymove(mob/user as mob) +/obj/structure/closet/body_bag/relaymove(mob/user) if(user.stat) return diff --git a/code/game/objects/items/changestone.dm b/code/game/objects/items/changestone.dm index ec7ad232857..0f3851e1777 100644 --- a/code/game/objects/items/changestone.dm +++ b/code/game/objects/items/changestone.dm @@ -4,7 +4,7 @@ icon = 'icons/obj/artifacts.dmi' icon_state = "changerock" -/obj/item/changestone/attack_hand(var/mob/user as mob) +/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) diff --git a/code/game/objects/items/control_wand.dm b/code/game/objects/items/control_wand.dm index 185a00305de..cb347fe9105 100644 --- a/code/game/objects/items/control_wand.dm +++ b/code/game/objects/items/control_wand.dm @@ -41,6 +41,10 @@ to_chat(user, "Now in mode: [mode].") +/obj/item/door_remote/examine(mob/user) + . = ..() + . += "It's current mode is: [mode]" + /obj/item/door_remote/afterattack(obj/machinery/door/airlock/D, mob/user) if(!istype(D)) return diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm index 4ae316236df..8fb04c81473 100644 --- a/code/game/objects/items/crayons.dm +++ b/code/game/objects/items/crayons.dm @@ -69,7 +69,7 @@ if("letter") temp = input("Choose the letter.", "Scribbles") in letters if("random_rune") - temp = "rune[rand(1,10)]" + temp = "rune[rand(1, 8)]" if("random_graffiti") temp = pick(graffiti) else diff --git a/code/game/objects/items/devices/chameleonproj.dm b/code/game/objects/items/devices/chameleonproj.dm index 95b36194f56..ef7e5edb106 100644 --- a/code/game/objects/items/devices/chameleonproj.dm +++ b/code/game/objects/items/devices/chameleonproj.dm @@ -19,6 +19,7 @@ var/saved_underlays = null /obj/item/chameleon/dropped() + ..() disrupt() /obj/item/chameleon/equipped() @@ -65,7 +66,7 @@ spawn(8) qdel(T) -/obj/item/chameleon/proc/disrupt(var/delete_dummy = 1) +/obj/item/chameleon/proc/disrupt(delete_dummy = 1) if(active_dummy) do_sparks(5, 0, src) eject_all() @@ -90,7 +91,7 @@ var/can_move = 1 var/obj/item/chameleon/master = null -/obj/effect/dummy/chameleon/proc/activate(var/obj/O, var/mob/M, new_icon, new_iconstate, new_overlays, new_underlays, var/obj/item/chameleon/C) +/obj/effect/dummy/chameleon/proc/activate(obj/O, mob/M, new_icon, new_iconstate, new_overlays, new_underlays, obj/item/chameleon/C) name = O.name desc = O.desc icon = new_icon @@ -134,7 +135,7 @@ ..() master.disrupt() -/obj/effect/dummy/chameleon/relaymove(var/mob/user, direction) +/obj/effect/dummy/chameleon/relaymove(mob/user, direction) if(istype(loc, /turf/space) || !direction) return //No magical space movement! @@ -199,23 +200,7 @@ deactivate(user) else to_chat(user, "You activate [src].") - var/start = user.filters.len - var/X - var/Y - var/rsq - var/i - var/f - for(i in 1 to 7) - do - X = 60 * rand() - 30 - Y = 60 * rand() - 30 - rsq = X * X + Y * Y - while(rsq < 100 || rsq > 900) - user.filters += filter(type = "wave", x = X, y = Y, size = rand() * 2.5 + 0.5, offset = rand()) - for(i in 1 to 7) - f = user.filters[start+i] - animate(f, offset = f:offset, time = 0, loop = 3, flags = ANIMATION_PARALLEL) - animate(offset = f:offset - 1, time = rand() * 20 + 10) + apply_wibbly_filters(user) if(do_after(user, 50, target = user) && user.cell.use(activationCost)) playsound(src, 'sound/effects/bamf.ogg', 100, 1, -6) to_chat(user, "You are now disguised as a Nanotrasen engineering cyborg.") @@ -223,10 +208,7 @@ else to_chat(user, "The chameleon field fizzles.") do_sparks(3, FALSE, user) - for(i in 1 to min(7, user.filters.len)) // removing filters that are animating does nothing, we gotta stop the animations first - f = user.filters[start + i] - animate(f) - user.filters = null + remove_wibbly_filters(user) /obj/item/borg_chameleon/process() if(S) diff --git a/code/game/objects/items/devices/enginepicker.dm b/code/game/objects/items/devices/enginepicker.dm index 0fd3a591560..215addfe81e 100644 --- a/code/game/objects/items/devices/enginepicker.dm +++ b/code/game/objects/items/devices/enginepicker.dm @@ -44,7 +44,7 @@ list_enginebeacons += B //Spawns and logs / announces the appropriate engine based on the choice made -/obj/item/enginepicker/proc/processchoice(var/obj/item/radio/beacon/engine/choice, mob/living/carbon/user) +/obj/item/enginepicker/proc/processchoice(obj/item/radio/beacon/engine/choice, mob/living/carbon/user) var/issuccessful = FALSE //Check for a successful choice var/engtype //Engine type var/G //Generator that will be spawned @@ -90,7 +90,7 @@ return //Deletes objects and mobs from the beacon's turf. -/obj/item/enginepicker/proc/clearturf(var/turf/T) +/obj/item/enginepicker/proc/clearturf(turf/T) for(var/obj/item/I in T) I.visible_message("\The [I] gets crushed to dust!") qdel(I) diff --git a/code/game/objects/items/devices/flash.dm b/code/game/objects/items/devices/flash.dm index 8bfbf22f05d..26bfb6c816d 100644 --- a/code/game/objects/items/devices/flash.dm +++ b/code/game/objects/items/devices/flash.dm @@ -21,7 +21,7 @@ var/use_sound = 'sound/weapons/flash.ogg' /obj/item/flash/proc/clown_check(mob/user) - if(user && (CLUMSY in user.mutations) && prob(50)) + if(user && HAS_TRAIT(user, TRAIT_CLUMSY) && prob(50)) flash_carbon(user, user, 15, 0) return 0 return 1 @@ -54,7 +54,7 @@ visible_message("The [src.name] burns out!") -/obj/item/flash/proc/flash_recharge(var/mob/user) +/obj/item/flash/proc/flash_recharge(mob/user) if(prob(times_used * 2)) //if you use it 5 times in a minute it has a 10% chance to break! burn_out() return 0 @@ -85,12 +85,10 @@ return TRUE -/obj/item/flash/proc/flash_carbon(var/mob/living/carbon/M, var/mob/user = null, var/power = 5, targeted = 1) +/obj/item/flash/proc/flash_carbon(mob/living/carbon/M, mob/user = null, power = 5, targeted = 1) if(user) add_attack_logs(user, M, "Flashed with [src]") if(targeted) - if(M.weakeyes) - M.Weaken(3) //quick weaken bypasses eye protection but has no eye flash if(M.flash_eyes(1, 1)) M.AdjustConfused(power) terrible_conversion_proc(M, user) @@ -98,9 +96,6 @@ visible_message("[user] blinds [M] with the flash!") to_chat(user, "You blind [M] with the flash!") to_chat(M, "[user] blinds you with the flash!") - if(M.weakeyes) - M.Stun(2) - M.visible_message("[M] gasps and shields [M.p_their()] eyes!", "You gasp and shield your eyes!") else visible_message("[user] fails to blind [M] with the flash!") to_chat(user, "You fail to blind [M] with the flash!") diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index 307964ca25c..3f7bf9997f6 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -22,7 +22,7 @@ icon_state = initial(icon_state) set_light(0) -/obj/item/flashlight/proc/update_brightness(var/mob/user = null) +/obj/item/flashlight/proc/update_brightness(mob/user = null) if(on) icon_state = "[initial(icon_state)]-on" set_light(brightness_on) @@ -48,7 +48,7 @@ add_fingerprint(user) if(on && user.zone_selected == "eyes") - if(((CLUMSY in user.mutations) || user.getBrainLoss() >= 60) && prob(50)) //too dumb to use flashlight properly + if((HAS_TRAIT(user, TRAIT_CLUMSY) || user.getBrainLoss() >= 60) && prob(50)) //too dumb to use flashlight properly return ..() //just hit them in the head if(!(istype(user, /mob/living/carbon/human) || SSticker) && SSticker.mode.name != "monkey") //don't have dexterity @@ -74,9 +74,9 @@ if(istype(H)) //robots and aliens are unaffected var/obj/item/organ/internal/eyes/eyes = H.get_int_organ(/obj/item/organ/internal/eyes) - if(M.stat == DEAD || !eyes || (BLINDNESS in M.mutations)) //mob is dead or fully blind + if(M.stat == DEAD || !eyes || HAS_TRAIT(M, TRAIT_BLIND)) //mob is dead or fully blind to_chat(user, "[M]'s pupils are unresponsive to the light!") - else if((XRAY in M.mutations) || eyes.see_in_dark >= 8) //The mob's either got the X-RAY vision or has a tapetum lucidum (extreme nightvision, i.e. Vulp/Tajara with COLOURBLIND & their monkey forms). + else if(HAS_TRAIT(M, TRAIT_XRAY_VISION) || eyes.see_in_dark >= 8) //The mob's either got the X-RAY vision or has a tapetum lucidum (extreme nightvision, i.e. Vulp/Tajara with COLOURBLIND & their monkey forms). to_chat(user, "[M]'s pupils glow eerily!") else //they're okay! if(M.flash_eyes(visual = 1)) @@ -199,7 +199,7 @@ else update_brightness(null) -/obj/item/flashlight/flare/update_brightness(var/mob/user = null) +/obj/item/flashlight/flare/update_brightness(mob/user = null) ..() if(on) item_state = "[initial(item_state)]-on" @@ -396,3 +396,11 @@ anchored = TRUE var/range = null resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF + +/obj/item/flashlight/eyelight + name = "eyelight" + desc = "This shouldn't exist outside of someone's head, how are you seeing this?" + light_range = 15 + light_power = 1 + flags = CONDUCT | DROPDEL + actions_types = list() diff --git a/code/game/objects/items/devices/floor_painter.dm b/code/game/objects/items/devices/floor_painter.dm index f4c1e4903e2..5a2c4fd2d57 100644 --- a/code/game/objects/items/devices/floor_painter.dm +++ b/code/game/objects/items/devices/floor_painter.dm @@ -27,7 +27,7 @@ "whitered", "whiteredcorner", "whiteredfull", "whiteyellow", "whiteyellowcorner", "whiteyellowfull", "yellow", "yellowcorner", "yellowcornersiding", "yellowsiding") -/obj/item/floor_painter/afterattack(var/atom/A, var/mob/user, proximity, params) +/obj/item/floor_painter/afterattack(atom/A, mob/user, proximity, params) if(!proximity) return @@ -46,7 +46,7 @@ F.icon_regular_floor = floor_state F.dir = floor_dir -/obj/item/floor_painter/attack_self(var/mob/user) +/obj/item/floor_painter/attack_self(mob/user) if(!user) return 0 user.set_machine(src) diff --git a/code/game/objects/items/devices/geiger_counter.dm b/code/game/objects/items/devices/geiger_counter.dm new file mode 100644 index 00000000000..c24d92e7a96 --- /dev/null +++ b/code/game/objects/items/devices/geiger_counter.dm @@ -0,0 +1,211 @@ +#define RAD_LEVEL_NORMAL 9 +#define RAD_LEVEL_MODERATE 100 +#define RAD_LEVEL_HIGH 400 +#define RAD_LEVEL_VERY_HIGH 800 +#define RAD_LEVEL_CRITICAL 1500 + +/obj/item/geiger_counter //DISCLAIMER: I know nothing about how real-life Geiger counters work. This will not be realistic. ~Xhuis + name = "\improper Geiger counter" + desc = "A handheld device used for detecting and measuring radiation pulses." + icon = 'icons/obj/device.dmi' + icon_state = "geiger_off" + item_state = "multitool" + w_class = WEIGHT_CLASS_SMALL + slot_flags = SLOT_BELT + flags = NOBLUDGEON + materials = list(MAT_METAL = 150, MAT_GLASS = 150) + + var/grace = RAD_GEIGER_GRACE_PERIOD + var/datum/looping_sound/geiger/soundloop + + var/scanning = FALSE + var/radiation_count = 0 + var/current_tick_amount = 0 + var/last_tick_amount = 0 + var/fail_to_receive = 0 + var/current_warning = 1 + +/obj/item/geiger_counter/Initialize(mapload) + . = ..() + START_PROCESSING(SSobj, src) + + soundloop = new(list(src), FALSE) + +/obj/item/geiger_counter/Destroy() + STOP_PROCESSING(SSobj, src) + QDEL_NULL(soundloop) + return ..() + + +/obj/item/geiger_counter/process() + if(scanning) + radiation_count -= radiation_count / RAD_GEIGER_MEASURE_SMOOTHING + radiation_count += current_tick_amount / RAD_GEIGER_MEASURE_SMOOTHING + + if(current_tick_amount) + grace = RAD_GEIGER_GRACE_PERIOD + last_tick_amount = current_tick_amount + + else if(!emagged) + grace-- + if(grace <= 0) + radiation_count = 0 + + current_tick_amount = 0 + + update_icon() + update_sound() + +/obj/item/geiger_counter/examine(mob/user) + . = ..() + if(!scanning) + return + . += "Alt-click it to clear stored radiation levels." + if(emagged) + . += "The display seems to be incomprehensible." + return + switch(radiation_count) + if(-INFINITY to RAD_LEVEL_NORMAL) + . += "Ambient radiation level count reports that all is well." + if(RAD_LEVEL_NORMAL + 1 to RAD_LEVEL_MODERATE) + . += "Ambient radiation levels slightly above average." + if(RAD_LEVEL_MODERATE + 1 to RAD_LEVEL_HIGH) + . += "Ambient radiation levels above average." + if(RAD_LEVEL_HIGH + 1 to RAD_LEVEL_VERY_HIGH) + . += "Ambient radiation levels highly above average." + if(RAD_LEVEL_VERY_HIGH + 1 to RAD_LEVEL_CRITICAL) + . += "Ambient radiation levels nearing critical level." + if(RAD_LEVEL_CRITICAL + 1 to INFINITY) + . += "Ambient radiation levels above critical level!" + + . += "The last radiation amount detected was [last_tick_amount]" + +/obj/item/geiger_counter/update_icon() + if(!scanning) + icon_state = "geiger_off" + else if(emagged) + icon_state = "geiger_on_emag" + else + switch(radiation_count) + if(-INFINITY to RAD_LEVEL_NORMAL) + icon_state = "geiger_on_1" + if(RAD_LEVEL_NORMAL + 1 to RAD_LEVEL_MODERATE) + icon_state = "geiger_on_2" + if(RAD_LEVEL_MODERATE + 1 to RAD_LEVEL_HIGH) + icon_state = "geiger_on_3" + if(RAD_LEVEL_HIGH + 1 to RAD_LEVEL_VERY_HIGH) + icon_state = "geiger_on_4" + if(RAD_LEVEL_VERY_HIGH + 1 to RAD_LEVEL_CRITICAL) + icon_state = "geiger_on_4" + if(RAD_LEVEL_CRITICAL + 1 to INFINITY) + icon_state = "geiger_on_5" + +/obj/item/geiger_counter/proc/update_sound() + var/datum/looping_sound/geiger/loop = soundloop + if(!scanning || !radiation_count) + loop.stop() + return + loop.last_radiation = radiation_count + loop.start() + +/obj/item/geiger_counter/rad_act(amount) + . = ..() + if(amount <= RAD_BACKGROUND_RADIATION || !scanning) + return + current_tick_amount += amount + update_icon() + +/obj/item/geiger_counter/attack_self(mob/user) + scanning = !scanning + update_icon() + to_chat(user, "[bicon(src)] You switch [scanning ? "on" : "off"] [src].") + +/obj/item/geiger_counter/afterattack(atom/target, mob/user) + . = ..() + if(user.a_intent == INTENT_HELP) + if(!emagged) + user.visible_message("[user] scans [target] with [src].", "You scan [target]'s radiation levels with [src]...") + addtimer(CALLBACK(src, .proc/scan, target, user), 20, TIMER_UNIQUE) // Let's not have spamming GetAllContents + else + user.visible_message("[user] scans [target] with [src].", "You project [src]'s stored radiation into [target]!") + target.rad_act(radiation_count) + radiation_count = 0 + return TRUE + +/obj/item/geiger_counter/proc/scan(atom/A, mob/user) + var/rad_strength = get_rad_contamination(A) + + if(isliving(A)) + var/mob/living/M = A + if(!M.radiation) + to_chat(user, "[bicon(src)] Radiation levels within normal boundaries.") + else + to_chat(user, "[bicon(src)] Subject is irradiated. Radiation levels: [M.radiation].") + + if(rad_strength) + to_chat(user, "[bicon(src)] Target contains radioactive contamination. Radioactive strength: [rad_strength]") + else + to_chat(user, "[bicon(src)] Target is free of radioactive contamination.") + +/obj/item/geiger_counter/attackby(obj/item/I, mob/user, params) + if(I.tool_behaviour == TOOL_SCREWDRIVER && emagged) + if(scanning) + to_chat(user, "Turn off [src] before you perform this action!") + return FALSE + user.visible_message("[user] unscrews [src]'s maintenance panel and begins fiddling with its innards...", "You begin resetting [src]...") + if(!I.use_tool(src, user, 40, volume = 50)) + return FALSE + user.visible_message("[user] refastens [src]'s maintenance panel!", "You reset [src] to its factory settings!") + emagged = FALSE + radiation_count = 0 + update_icon() + return TRUE + else + return ..() + +/obj/item/geiger_counter/AltClick(mob/living/user) + if(!istype(user) || !user.Adjacent(src)) + return ..() + if(!scanning) + to_chat(user, "[src] must be on to reset its radiation level!") + return + radiation_count = 0 + to_chat(user, "You flush [src]'s radiation counts, resetting it to normal.") + update_icon() + +/obj/item/geiger_counter/emag_act(mob/user) + if(emagged) + return + if(scanning) + to_chat(user, "Turn off [src] before you perform this action!") + return + to_chat(user, "You override [src]'s radiation storing protocols. It will now generate small doses of radiation, and stored rads are now projected into creatures you scan.") + emagged = TRUE + + + +/obj/item/geiger_counter/cyborg + var/mob/listeningTo + +/obj/item/geiger_counter/cyborg/equipped(mob/user) + . = ..() + if(listeningTo == user) + return + if(listeningTo) + UnregisterSignal(listeningTo, COMSIG_ATOM_RAD_ACT) + RegisterSignal(user, COMSIG_ATOM_RAD_ACT, .proc/redirect_rad_act) + listeningTo = user + +/obj/item/geiger_counter/cyborg/proc/redirect_rad_act(datum/source, amount) + rad_act(amount) + +/obj/item/geiger_counter/cyborg/dropped() + . = ..() + if(listeningTo) + UnregisterSignal(listeningTo, COMSIG_ATOM_RAD_ACT) + +#undef RAD_LEVEL_NORMAL +#undef RAD_LEVEL_MODERATE +#undef RAD_LEVEL_HIGH +#undef RAD_LEVEL_VERY_HIGH +#undef RAD_LEVEL_CRITICAL diff --git a/code/game/objects/items/devices/handheld_defib.dm b/code/game/objects/items/devices/handheld_defib.dm index 9dd159ca91b..a138ef6ca03 100644 --- a/code/game/objects/items/devices/handheld_defib.dm +++ b/code/game/objects/items/devices/handheld_defib.dm @@ -10,7 +10,6 @@ var/icon_base = "defib" var/cooldown = FALSE var/charge_time = 100 - var/emagged = FALSE /obj/item/handheld_defibrillator/emag_act(mob/user) if(!emagged) @@ -68,7 +67,7 @@ H.AdjustWeakened(5) H.AdjustStuttering(10) to_chat(H, "You feel a powerful jolt!") - H.shock_internal_organs(100) + SEND_SIGNAL(H, COMSIG_LIVING_MINOR_SHOCK, 100) if(emagged && prob(10)) to_chat(user, "[src]'s on board scanner indicates that the target is undergoing a cardiac arrest!") diff --git a/code/game/objects/items/devices/laserpointer.dm b/code/game/objects/items/devices/laserpointer.dm index cfaea9f32f9..da8ad829b9b 100644 --- a/code/game/objects/items/devices/laserpointer.dm +++ b/code/game/objects/items/devices/laserpointer.dm @@ -65,12 +65,12 @@ ..() return -/obj/item/laser_pointer/afterattack(var/atom/target, var/mob/living/user, flag, params) +/obj/item/laser_pointer/afterattack(atom/target, mob/living/user, flag, params) if(flag) //we're placing the object on a table or in backpack return laser_act(target, user, params) -/obj/item/laser_pointer/proc/laser_act(var/atom/target, var/mob/living/user, var/params) +/obj/item/laser_pointer/proc/laser_act(atom/target, mob/living/user, params) if( !(user in (viewers(7,target))) ) return if(!diode) @@ -79,11 +79,9 @@ if(!user.IsAdvancedToolUser()) to_chat(user, "You don't have the dexterity to do this!") return - if(ishuman(user)) - var/mob/living/carbon/human/H = user - if((HULK in H.mutations) || (NOGUNS in H.dna.species.species_traits)) - user << "Your fingers can't press the button!" - return + if(HAS_TRAIT(user, TRAIT_CHUNKYFINGERS)) + to_chat(user, "Your fingers can't press the button!") + return add_fingerprint(user) @@ -110,8 +108,6 @@ //20% chance to actually hit the eyes if(prob(effectchance * diode.rating) && C.flash_eyes(severity)) outmsg = "You blind [C] by shining [src] in [C.p_their()] eyes." - if(C.weakeyes) - C.Stun(1) else outmsg = "You fail to blind [C] by shining [src] at [C.p_their()] eyes!" diff --git a/code/game/objects/items/devices/lightreplacer.dm b/code/game/objects/items/devices/lightreplacer.dm index e96fceb8b6c..4ed9b335584 100644 --- a/code/game/objects/items/devices/lightreplacer.dm +++ b/code/game/objects/items/devices/lightreplacer.dm @@ -52,7 +52,6 @@ origin_tech = "magnets=3;engineering=4" force = 8 - var/emagged = FALSE var/max_uses = 20 var/uses = 10 // How much to increase per each glass? @@ -180,7 +179,7 @@ playsound(loc, 'sound/machines/ding.ogg', 50, TRUE) return new_bulbs -/obj/item/lightreplacer/proc/Charge(var/mob/user) +/obj/item/lightreplacer/proc/Charge(mob/user) charge += 1 if(charge > 3) AddUses(1) @@ -223,7 +222,7 @@ /obj/item/lightreplacer/proc/Emag() emagged = !emagged - playsound(loc, "sparks", 100, TRUE) + playsound(loc, "sparks", 100, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) if(emagged) name = "shortcircuited [initial(name)]" else diff --git a/code/game/objects/items/devices/megaphone.dm b/code/game/objects/items/devices/megaphone.dm index 5bc16ac2838..ce8c6ca7191 100644 --- a/code/game/objects/items/devices/megaphone.dm +++ b/code/game/objects/items/devices/megaphone.dm @@ -8,7 +8,6 @@ flags = CONDUCT var/spamcheck = 0 - var/emagged = 0 var/insults = 0 var/span = "" var/list/insultmsg = list("FUCK EVERYONE!", "I'M A TATER!", "ALL SECURITY TO SHOOT ME ON SIGHT!", "I HAVE A BOMB!", "CAPTAIN IS A COMDOM!", "FOR THE SYNDICATE!") @@ -33,7 +32,7 @@ if(H && H.mind && H.mind.miming) to_chat(user, "Your vow of silence prevents you from speaking.") return - if((COMIC in H.mutations) || H.get_int_organ(/obj/item/organ/internal/cyberimp/brain/clown_voice)) + if(HAS_TRAIT(H, TRAIT_COMIC_SANS)) span = "sans" if(spamcheck) to_chat(user, "\The [src] needs to recharge!") diff --git a/code/game/objects/items/devices/paicard.dm b/code/game/objects/items/devices/paicard.dm index 42c134736d7..4b1058ae359 100644 --- a/code/game/objects/items/devices/paicard.dm +++ b/code/game/objects/items/devices/paicard.dm @@ -303,7 +303,7 @@ /obj/item/paicard var/current_emotion = 1 -/obj/item/paicard/proc/setEmotion(var/emotion) +/obj/item/paicard/proc/setEmotion(emotion) if(pai) overlays.Cut() switch(emotion) diff --git a/code/game/objects/items/devices/pizza_bomb.dm b/code/game/objects/items/devices/pizza_bomb.dm index e5c237938d6..ceb52db9076 100644 --- a/code/game/objects/items/devices/pizza_bomb.dm +++ b/code/game/objects/items/devices/pizza_bomb.dm @@ -57,7 +57,7 @@ explosion(src.loc,1,2,4,flame_range = 2) //Identical to a minibomb qdel(src) -/obj/item/pizza_bomb/attackby(var/obj/item/I, var/mob/user, params) +/obj/item/pizza_bomb/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/wirecutters) && primed) to_chat(user, "Oh God, what wire do you cut?!") var/chosen_wire = input(user, "OH GOD OH GOD", "WHAT WIRE?!") in wires diff --git a/code/game/objects/items/devices/powersink.dm b/code/game/objects/items/devices/powersink.dm index 68f52721f86..6c6526fe176 100644 --- a/code/game/objects/items/devices/powersink.dm +++ b/code/game/objects/items/devices/powersink.dm @@ -88,7 +88,7 @@ /obj/item/powersink/attack_ai() return -/obj/item/powersink/attack_hand(var/mob/user) +/obj/item/powersink/attack_hand(mob/user) switch(mode) if(DISCONNECTED) ..() diff --git a/code/game/objects/items/devices/radio/beacon.dm b/code/game/objects/items/devices/radio/beacon.dm index 487a582a3ab..5027676e1d3 100644 --- a/code/game/objects/items/devices/radio/beacon.dm +++ b/code/game/objects/items/devices/radio/beacon.dm @@ -5,7 +5,6 @@ item_state = "signaler" var/code = "Beacon" origin_tech = "bluespace=1" - var/emagged = 0 var/syndicate = 0 var/area_bypass = FALSE var/cc_beacon = FALSE //set if allowed to teleport to even if on zlevel2 diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index b76accb4561..5a493904839 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -103,10 +103,10 @@ /obj/item/radio/headset/syndicate/alt/syndteam ks1type = /obj/item/encryptionkey/syndteam -/obj/item/radio/headset/syndicate/alt/lavaland - name = "syndicate lavaland headset" +/obj/item/radio/headset/syndicate/alt/nocommon + name = "syndicate researcher headset" -/obj/item/radio/headset/syndicate/alt/lavaland/New() +/obj/item/radio/headset/syndicate/alt/nocommon/New() . = ..() set_frequency(SYND_FREQ) @@ -128,6 +128,10 @@ icon_state = "sec_headset_alt" item_state = "sec_headset_alt" +/obj/item/radio/headset/headset_sec/alt/brig_phys + name = "brig physician bowman headset" + ks1type = /obj/item/encryptionkey/headset_med + /obj/item/radio/headset/headset_iaa name = "internal affairs bowman headset" desc = "This is used by your elite legal team. Protects ears from flashbangs." diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index 1ee9114a322..ee06d563aad 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -236,15 +236,15 @@ GLOBAL_LIST_INIT(default_medbay_channels, list( return user.has_internal_radio_channel_access(user, internal_channels[freq]) -/mob/proc/has_internal_radio_channel_access(var/mob/user, var/list/req_one_accesses) +/mob/proc/has_internal_radio_channel_access(mob/user, list/req_one_accesses) var/obj/item/card/id/I = user.get_id_card() return has_access(list(), req_one_accesses, I ? I.GetAccess() : list()) -/mob/living/silicon/has_internal_radio_channel_access(var/mob/user, var/list/req_one_accesses) +/mob/living/silicon/has_internal_radio_channel_access(mob/user, list/req_one_accesses) var/list/access = get_all_accesses() return has_access(list(), req_one_accesses, access) -/mob/dead/observer/has_internal_radio_channel_access(var/mob/user, var/list/req_one_accesses) +/mob/dead/observer/has_internal_radio_channel_access(mob/user, list/req_one_accesses) return can_admin_interact() /obj/item/radio/proc/ToggleBroadcast() @@ -475,7 +475,7 @@ GLOBAL_LIST_INIT(default_medbay_channels, list( return FALSE -/obj/item/radio/hear_talk(mob/M as mob, list/message_pieces, var/verb = "says") +/obj/item/radio/hear_talk(mob/M as mob, list/message_pieces, verb = "says") if(broadcasting) if(get_dist(src, M) <= canhear_range) talk_into(M, message_pieces, null, verb) diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index a41d6a8b51b..2bb6125b5ed 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -12,39 +12,28 @@ REAGENT SCANNER desc = "A terahertz-ray emitter and scanner used to detect underfloor objects such as cables and pipes." icon = 'icons/obj/device.dmi' icon_state = "t-ray0" - var/on = 0 + var/on = FALSE slot_flags = SLOT_BELT - w_class = 2 w_class = WEIGHT_CLASS_SMALL item_state = "electronic" materials = list(MAT_METAL=150) origin_tech = "magnets=1;engineering=1" - var/scan_range = 1 - var/pulse_duration = 10 - -/obj/item/t_scanner/longer_pulse - pulse_duration = 50 - -/obj/item/t_scanner/extended_range - scan_range = 3 - -/obj/item/t_scanner/extended_range/longer_pulse - scan_range = 3 - pulse_duration = 50 /obj/item/t_scanner/Destroy() if(on) STOP_PROCESSING(SSobj, src) return ..() -/obj/item/t_scanner/attack_self(mob/user) - +/obj/item/t_scanner/proc/toggle_on() on = !on - icon_state = copytext(icon_state, 1, length(icon_state))+"[on]" - + icon_state = copytext_char(icon_state, 1, -1) + "[on]" if(on) START_PROCESSING(SSobj, src) + else + STOP_PROCESSING(SSobj, src) +/obj/item/t_scanner/attack_self(mob/user) + toggle_on() /obj/item/t_scanner/process() if(!on) @@ -53,41 +42,25 @@ REAGENT SCANNER scan() /obj/item/t_scanner/proc/scan() + t_ray_scan(loc) - for(var/turf/T in range(scan_range, src.loc) ) - - if(!T.intact) +/proc/t_ray_scan(mob/viewer, flick_time = 8, distance = 3) + if(!ismob(viewer) || !viewer.client) + return + var/list/t_ray_images = list() + for(var/obj/O in orange(distance, viewer)) + if(O.level != 1) continue - for(var/obj/O in T.contents) - - if(O.level != 1) - continue - - if(O.invisibility == 101) - O.invisibility = 0 - O.alpha = 128 - spawn(pulse_duration) - if(O) - var/turf/U = O.loc - if(U && U.intact) - O.invisibility = 101 - O.alpha = 255 - for(var/mob/living/M in T.contents) - var/oldalpha = M.alpha - if(M.alpha < 255 && istype(M)) - M.alpha = 255 - spawn(10) - if(M) - M.alpha = oldalpha - - var/mob/living/M = locate() in T - - if(M && M.invisibility == 2) - M.invisibility = 0 - spawn(2) - if(M) - M.invisibility = INVISIBILITY_LEVEL_TWO + if(O.invisibility == INVISIBILITY_MAXIMUM) + var/image/I = new(loc = get_turf(O)) + var/mutable_appearance/MA = new(O) + MA.alpha = 128 + MA.dir = O.dir + I.appearance = MA + t_ray_images += I + if(length(t_ray_images)) + flick_overlay(t_ray_images, list(viewer.client), flick_time) /proc/chemscan(mob/living/user, mob/living/M) @@ -125,7 +98,7 @@ REAGENT SCANNER var/advanced = FALSE /obj/item/healthanalyzer/attack(mob/living/M, mob/living/user) - if(((CLUMSY in user.mutations) || user.getBrainLoss() >= 60) && prob(50)) + 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") @@ -157,7 +130,7 @@ 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(H.status_flags & FAKEDEATH) + 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 @@ -165,7 +138,7 @@ REAGENT SCANNER 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 || (H.status_flags & FAKEDEATH))) + 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) @@ -182,7 +155,7 @@ REAGENT SCANNER TX = H.getToxLoss() > 50 ? "Dangerous amount of toxins detected" : "Subject bloodstream toxin level minimal" BU = H.getFireLoss() > 50 ? "Severe burn damage detected" : "Subject burn injury status O.K" BR = H.getBruteLoss() > 50 ? "Severe anatomical damage detected" : "Subject brute-force injury status O.K" - if(H.status_flags & FAKEDEATH) + if(HAS_TRAIT(H, TRAIT_FAKEDEATH)) OX = fake_oxy > 50 ? "Severe oxygen deprivation detected" : "Subject bloodstream oxygen level normal" to_chat(user, "[OX] | [TX] | [BU] | [BR]") @@ -266,9 +239,9 @@ REAGENT SCANNER to_chat(user, "Subject's pulse: [H.get_pulse(GETPULSE_TOOL)] bpm.") var/implant_detect - for(var/obj/item/organ/internal/cyberimp/CI in H.internal_organs) - if(CI.is_robotic()) - implant_detect += "[H.name] is modified with a [CI.name].
      " + for(var/obj/item/organ/internal/O in H.internal_organs) + if(O.is_robotic()) + implant_detect += "[H.name] is modified with a [O.name].
      " if(implant_detect) to_chat(user, "Detected cybernetic modifications:") to_chat(user, "[implant_detect]") @@ -864,11 +837,11 @@ REAGENT SCANNER dat += "[i.name]N/A[i.damage][infection]:[mech]" dat += "" dat += "" - if(BLINDNESS in target.mutations) + if(HAS_TRAIT(target, TRAIT_BLIND)) dat += "Cataracts detected.
      " - if(COLOURBLIND in target.mutations) + if(HAS_TRAIT(target, TRAIT_COLORBLIND)) dat += "Photoreceptor abnormalities detected.
      " - if(NEARSIGHTED in target.mutations) + if(HAS_TRAIT(target, TRAIT_NEARSIGHT)) dat += "Retinal misalignment detected.
      " return dat diff --git a/code/game/objects/items/devices/taperecorder.dm b/code/game/objects/items/devices/taperecorder.dm index f66756e55dc..63c8e404b89 100644 --- a/code/game/objects/items/devices/taperecorder.dm +++ b/code/game/objects/items/devices/taperecorder.dm @@ -9,6 +9,8 @@ materials = list(MAT_METAL=60, MAT_GLASS=30) force = 2 throwforce = 0 + drop_sound = 'sound/items/handling/taperecorder_drop.ogg' + pickup_sound = 'sound/items/handling/taperecorder_pickup.ogg' var/recording = 0 var/playing = 0 var/playsleepseconds = 0 @@ -16,6 +18,8 @@ var/open_panel = 0 var/canprint = 1 var/starts_with_tape = TRUE + ///Sound loop that plays when recording or playing back. + var/datum/looping_sound/tape_recorder_hiss/soundloop /obj/item/taperecorder/New() @@ -23,9 +27,11 @@ if(starts_with_tape) mytape = new /obj/item/tape/random(src) update_icon() + soundloop = new(list(src)) /obj/item/taperecorder/Destroy() QDEL_NULL(mytape) + QDEL_NULL(soundloop) return ..() /obj/item/taperecorder/examine(mob/user) @@ -34,16 +40,24 @@ . += "The wire panel is [open_panel ? "opened" : "closed"]." +/obj/item/taperecorder/proc/update_sound() + if(!playing && !recording) + soundloop.stop() + else + soundloop.start() + /obj/item/taperecorder/attackby(obj/item/I, mob/user) if(!mytape && istype(I, /obj/item/tape)) - user.drop_item() - I.loc = src - mytape = I - to_chat(user, "You insert [I] into [src].") - update_icon() + if(user.drop_item()) + I.forceMove(src) + mytape = I + to_chat(user, "You insert [I] into [src].") + playsound(src, 'sound/items/taperecorder/taperecorder_close.ogg', 50, FALSE) + update_icon() /obj/item/taperecorder/proc/eject(mob/user) if(mytape) + playsound(src, 'sound/items/taperecorder/taperecorder_open.ogg', 50, FALSE) to_chat(user, "You remove [mytape] from [src].") stop() user.put_in_hands(mytape) @@ -52,7 +66,7 @@ /obj/item/taperecorder/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume, global_overlay = TRUE) - mytape.ruin() //Fires destroy the tape + mytape?.ruin() //Fires destroy the tape return ..() /obj/item/taperecorder/attack_hand(mob/user) @@ -70,7 +84,7 @@ set name = "Eject Tape" set category = "Object" - if(usr.stat) + if(usr.incapacitated()) return if(!mytape) return @@ -117,7 +131,7 @@ set name = "Start Recording" set category = "Object" - if(usr.stat) + if(usr.incapacitated()) return if(!mytape || mytape.ruined) return @@ -126,9 +140,12 @@ if(playing) return + playsound(src, 'sound/items/taperecorder/taperecorder_play.ogg', 50, FALSE) + if(mytape.used_capacity < mytape.max_capacity) - to_chat(usr, "Recording started.") - recording = 1 + recording = TRUE + atom_say("Recording started.") + update_sound() update_icon() mytape.timestamp += mytape.used_capacity mytape.storedinfo += "\[[time2text(mytape.used_capacity * 10,"mm:ss")]\] Recording started." @@ -140,36 +157,38 @@ mytape.used_capacity++ used++ sleep(10) - recording = 0 - update_icon() + stop() else - to_chat(usr, "The tape is full.") + atom_say("The tape is full!") + playsound(src, 'sound/items/taperecorder/taperecorder_stop.ogg', 50, FALSE) /obj/item/taperecorder/verb/stop() set name = "Stop" set category = "Object" - if(usr.stat) + if(usr.incapacitated()) return if(recording) - recording = 0 mytape.timestamp += mytape.used_capacity mytape.storedinfo += "\[[time2text(mytape.used_capacity * 10,"mm:ss")]\] Recording stopped." - to_chat(usr, "Recording stopped.") - return + playsound(src, 'sound/items/taperecorder/taperecorder_stop.ogg', 50, FALSE) + atom_say("Recording stopped.") + recording = FALSE else if(playing) - playing = 0 + playsound(src, 'sound/items/taperecorder/taperecorder_stop.ogg', 50, FALSE) atom_say("Playback stopped.") + playing = FALSE update_icon() + update_sound() /obj/item/taperecorder/verb/play() set name = "Play Tape" set category = "Object" - if(usr.stat) + if(usr.incapacitated()) return if(!mytape || mytape.ruined) return @@ -178,9 +197,11 @@ if(playing) return - playing = 1 + playing = TRUE update_icon() - to_chat(usr, "Playing started.") + update_sound() + atom_say("Playback started.") + playsound(src, 'sound/items/taperecorder/taperecorder_play.ogg', 50, FALSE) var/used = mytape.used_capacity //to stop runtimes when you eject the tape var/max = mytape.max_capacity for(var/i = 1, used < max, sleep(10 * playsleepseconds)) @@ -189,6 +210,7 @@ if(playing == 0) break if(mytape.storedinfo.len < i) + atom_say("End of recording.") break atom_say("[mytape.storedinfo[i]]") if(mytape.storedinfo.len < i + 1) @@ -203,8 +225,7 @@ playsleepseconds = 1 i++ - playing = 0 - update_icon() + stop() /obj/item/taperecorder/attack_self(mob/user) @@ -220,7 +241,7 @@ set name = "Print Transcript" set category = "Object" - if(usr.stat) + if(usr.incapacitated()) return if(!mytape) return @@ -230,7 +251,7 @@ if(recording || playing) return - to_chat(usr, "Transcript printed.") + atom_say("Transcript printed.") playsound(loc, 'sound/goonstation/machines/printer_thermal.ogg', 50, 1) var/obj/item/paper/P = new /obj/item/paper(get_turf(src)) var/t1 = "Transcript:

      " @@ -258,6 +279,8 @@ materials = list(MAT_METAL=20, MAT_GLASS=5) force = 1 throwforce = 0 + drop_sound = 'sound/items/handling/tape_drop.ogg' + pickup_sound = 'sound/items/handling/tape_pickup.ogg' var/max_capacity = 600 var/used_capacity = 0 var/list/storedinfo = list() diff --git a/code/game/objects/items/devices/traitordevices.dm b/code/game/objects/items/devices/traitordevices.dm index 2336be40cfb..ea9f7200177 100644 --- a/code/game/objects/items/devices/traitordevices.dm +++ b/code/game/objects/items/devices/traitordevices.dm @@ -102,7 +102,7 @@ effective or pretty fucking useless. if(M) if(intensity >= 5) M.apply_effect(round(intensity/1.5), PARALYZE) - M.apply_effect(intensity*10, IRRADIATE) + M.rad_act(intensity * 10) else to_chat(user, "The radioactive microlaser is still recharging.") @@ -219,6 +219,7 @@ effective or pretty fucking useless. 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.") return @@ -253,9 +254,9 @@ effective or pretty fucking useless. var/turf/fragging_location = destination telefrag(fragging_location, user) C.forceMove(destination) - playsound(mobloc, "sparks", 50, TRUE) + playsound(mobloc, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) new/obj/effect/temp_visual/teleport_abductor/syndi_teleporter(mobloc) - playsound(destination, "sparks", 50, TRUE) + playsound(destination, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) new/obj/effect/temp_visual/teleport_abductor/syndi_teleporter(destination) else if (EMP_D == FALSE && !(bagholding.len && !flawless)) // This is where the fun begins var/direction = get_dir(user, destination) @@ -266,9 +267,17 @@ effective or pretty fucking useless. to_chat(C, "The [src] will not work here!") /obj/item/teleporter/proc/tile_check(turf/T) - if(istype(T, /turf/simulated/floor) || istype(T, /turf/space) || istype(T, /turf/simulated/shuttle/floor) || istype(T, /turf/simulated/shuttle/floor4) || istype(T, /turf/simulated/shuttle/plating)) + if(istype(T, /turf/simulated/floor) || istype(T, /turf/space)) return TRUE +/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) + user.dir = EAST + if(NORTHWEST || SOUTHWEST) + user.dir = WEST + /obj/item/teleporter/proc/panic_teleport(mob/user, turf/destination, direction = NORTH) var/saving_throw switch(direction) @@ -306,10 +315,10 @@ effective or pretty fucking useless. var/turf/fragging_location = new_destination telefrag(fragging_location, user) C.forceMove(new_destination) - playsound(mobloc, "sparks", 50, TRUE) + playsound(mobloc, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) new /obj/effect/temp_visual/teleport_abductor/syndi_teleporter(mobloc) new /obj/effect/temp_visual/teleport_abductor/syndi_teleporter(new_destination) - playsound(new_destination, "sparks", 50, TRUE) + playsound(new_destination, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) else //We tried to save. We failed. Death time. get_fragged(user, destination) @@ -317,14 +326,14 @@ effective or pretty fucking useless. /obj/item/teleporter/proc/get_fragged(mob/user, turf/destination) var/turf/mobloc = get_turf(user) user.forceMove(destination) - playsound(mobloc, "sparks", 50, TRUE) + playsound(mobloc, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) new /obj/effect/temp_visual/teleport_abductor/syndi_teleporter(mobloc) new /obj/effect/temp_visual/teleport_abductor/syndi_teleporter(destination) - playsound(destination, "sparks", 50, TRUE) + playsound(destination, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) playsound(destination, "sound/magic/disintegrate.ogg", 50, TRUE) destination.ex_act(rand(1,2)) for(var/obj/item/W in user) - if(istype(W, /obj/item/organ)|| istype(W, /obj/item/implant)) + if(istype(W, /obj/item/implant)) continue if(!user.unEquip(W)) qdel(W) diff --git a/code/game/objects/items/devices/uplinks.dm b/code/game/objects/items/devices/uplinks.dm index 60abf1774cd..f4cecade824 100644 --- a/code/game/objects/items/devices/uplinks.dm +++ b/code/game/objects/items/devices/uplinks.dm @@ -23,8 +23,6 @@ GLOBAL_LIST_EMPTY(world_uplinks) var/job = null var/temp_category var/uplink_type = "traitor" - /// If set, the uplink will show the option to become a contractor through this variable. - var/datum/antagonist/traitor/contractor/contractor = null /// Whether the uplink is jammed and cannot be used to order items. var/is_jammed = FALSE @@ -81,7 +79,7 @@ GLOBAL_LIST_EMPTY(world_uplinks) return pick(random_items) -/obj/item/uplink/proc/buy(var/datum/uplink_item/UI, var/reference) +/obj/item/uplink/proc/buy(datum/uplink_item/UI, reference) if(is_jammed) to_chat(usr, "[src] seems to be jammed - it cannot be used here!") return @@ -151,7 +149,7 @@ GLOBAL_LIST_EMPTY(world_uplinks) // Checks to see if the value meets the target. Like a frequency being a traitor_frequency, in order to unlock a headset. // If true, it accesses trigger() and returns 1. If it fails, it returns false. Use this to see if you need to close the // current item's menu. -/obj/item/uplink/hidden/proc/check_trigger(mob/user, var/value, var/target) +/obj/item/uplink/hidden/proc/check_trigger(mob/user, value, target) if(is_jammed) to_chat(user, "[src] seems to be jammed - it cannot be used here!") return @@ -170,16 +168,6 @@ GLOBAL_LIST_EMPTY(world_uplinks) var/list/data = list() data["crystals"] = uses - data["modal"] = ui_modal_data(src) - - if(contractor) - var/list/contractor_data = list( - available = uses >= contractor.tc_cost && world.time < contractor.offer_deadline, - affordable = uses >= contractor.tc_cost, - accepted = !isnull(contractor.contractor_uplink), - time_left = contractor.offer_deadline - world.time, - ) - data["contractor"] = contractor_data return data @@ -218,9 +206,6 @@ GLOBAL_LIST_EMPTY(world_uplinks) return . = TRUE - if(tgui_act_modal(action, params)) - return - switch(action) if("lock") toggle() @@ -239,29 +224,6 @@ GLOBAL_LIST_EMPTY(world_uplinks) var/datum/uplink_item/UI = uplink_items[params["item"]] return buy(UI, UI ? UI.reference : "") -/** - * Called in tgui_act() to process modal actions - * - * Arguments: - * * action - The action passed by tgui - * * params - The params passed by tgui - */ -/obj/item/uplink/hidden/proc/tgui_act_modal(action, list/params) - . = TRUE - var/id = params["id"] - switch(ui_modal_act(src, action, params)) - if(UI_MODAL_OPEN) - if(id == "become_contractor") - ui_modal_boolean(src, id, "") - return - if(UI_MODAL_ANSWER) - if(id == "become_contractor") - if(text2num(params["answer"])) - var/datum/antagonist/traitor/contractor/C = usr.mind.has_antag_datum(/datum/antagonist/traitor/contractor) - C?.become_contractor(usr, src) - return - return FALSE - // I placed this here because of how relevant it is. // You place this in your uplinkable item to check if an uplink is active or not. // If it is, it will display the uplink menu and return 1, else it'll return false. diff --git a/code/game/objects/items/devices/whistle.dm b/code/game/objects/items/devices/whistle.dm index b4ebe4465fd..0850dd29a76 100644 --- a/code/game/objects/items/devices/whistle.dm +++ b/code/game/objects/items/devices/whistle.dm @@ -1,3 +1,6 @@ + +#define USE_COOLDOWN 2 SECONDS + /obj/item/hailer name = "hailer" desc = "Used by obese officers to save their breath for running." @@ -6,12 +9,11 @@ item_state = "flashtool" //looks exactly like a flash (and nothing like a flashbang) w_class = WEIGHT_CLASS_TINY flags = CONDUCT - + var/next_use_time var/spamcheck = 0 - var/emagged = 0 /obj/item/hailer/attack_self(mob/living/carbon/user as mob) - if(spamcheck) + if(world.time < next_use_time) return if(emagged) @@ -21,11 +23,11 @@ playsound(get_turf(src), 'sound/voice/halt.ogg', 100, 1, vary = 0) user.visible_message("[user]'s [name] rasps, \"Halt! Security!\"") - spamcheck = 1 - spawn(20) - spamcheck = 0 + next_use_time = world.time + USE_COOLDOWN /obj/item/hailer/emag_act(user as mob) if(!emagged) to_chat(user, "You overload \the [src]'s voice synthesizer.") emagged = 1 + +#undef USE_COOLDOWN diff --git a/code/game/objects/items/hand_item.dm b/code/game/objects/items/hand_item.dm new file mode 100644 index 00000000000..7f378aa6cdc --- /dev/null +++ b/code/game/objects/items/hand_item.dm @@ -0,0 +1,116 @@ +/obj/item/slapper + name = "slapper" + desc = "This is how real men fight." + icon_state = "latexballon" + item_state = "nothing" + force = 0 + throwforce = 0 + flags = DROPDEL | ABSTRACT + attack_verb = list("slaps") + hitsound = 'sound/weapons/slap.ogg' + /// How many smaller table smacks we can do before we're out + var/table_smacks_left = 3 + +/obj/item/slapper/attack(mob/M, mob/living/carbon/human/user) + user.do_attack_animation(M) + playsound(M, hitsound, 50, TRUE, -1) + user.visible_message("[user] slaps [M]!", "You slap [M]!", "You hear a slap.") + +/obj/item/slapper/attack_obj(obj/O, mob/living/user, params) + if(!istype(O, /obj/structure/table)) + return ..() + + var/obj/structure/table/the_table = O + + if(user.a_intent == INTENT_HARM && table_smacks_left == initial(table_smacks_left)) // so you can't do 2 weak slaps followed by a big slam + transform = transform.Scale(1.5) // BIG slap + if(HAS_TRAIT(user, TRAIT_HULK)) + transform = transform.Scale(2) + color = COLOR_GREEN + user.do_attack_animation(the_table) + if(ishuman(user)) + var/mob/living/carbon/human/human_user = user + if(istype(human_user.shoes, /obj/item/clothing/shoes/cowboy)) + human_user.say(pick("Hot damn!", "Hoo-wee!", "Got-dang!")) + playsound(get_turf(the_table), 'sound/effects/tableslam.ogg', 110, TRUE) + user.visible_message("[user] slams [user.p_their()] fist down on [the_table]!", "You slam your fist down on [the_table]!") + qdel(src) + else + user.do_attack_animation(the_table) + playsound(get_turf(the_table), 'sound/effects/tableslam.ogg', 40, TRUE) + user.visible_message("[user] slaps [user.p_their()] hand on [the_table].", "You slap your hand on [the_table].") + 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/mountable_frames/mountables.dm b/code/game/objects/items/mountable_frames/mountables.dm index cfb4d18473c..6abe277b4d9 100644 --- a/code/game/objects/items/mountable_frames/mountables.dm +++ b/code/game/objects/items/mountable_frames/mountables.dm @@ -2,7 +2,7 @@ var/list/buildon_types = list(/turf/simulated/wall) -/obj/item/mounted/afterattack(var/atom/A, mob/user, proximity_flag) +/obj/item/mounted/afterattack(atom/A, mob/user, proximity_flag) var/found_type = 0 for(var/turf_type in src.buildon_types) if(istype(A, turf_type)) diff --git a/code/game/objects/items/random_items.dm b/code/game/objects/items/random_items.dm index 2c3b51d4454..b20a505212e 100644 --- a/code/game/objects/items/random_items.dm +++ b/code/game/objects/items/random_items.dm @@ -238,6 +238,10 @@ icon_opened = "cabinetdetective_open" icon_broken = "cabinetdetective_broken" icon_off = "cabinetdetective_broken" + open_sound = 'sound/machines/wooden_closet_open.ogg' + close_sound = 'sound/machines/wooden_closet_close.ogg' + open_sound_volume = 25 + close_sound_volume = 50 /obj/structure/closet/secure_closet/random_drinks/populate_contents() for(var/i in 1 to 5) diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm index 56a6d452e2a..81733bd91e7 100644 --- a/code/game/objects/items/robot/robot_upgrades.dm +++ b/code/game/objects/items/robot/robot_upgrades.dm @@ -44,7 +44,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(var/mob/living/silicon/robot/R) +/obj/item/borg/upgrade/rename/action(mob/living/silicon/robot/R) if(..()) return if(!R.allow_rename) @@ -88,7 +88,7 @@ require_module = TRUE origin_tech = "engineering=4;materials=5;programming=4" -/obj/item/borg/upgrade/vtec/action(var/mob/living/silicon/robot/R) +/obj/item/borg/upgrade/vtec/action(mob/living/silicon/robot/R) if(..()) return if(R.speed < 0) diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm index 8c1f5826d66..f9d02c8f515 100644 --- a/code/game/objects/items/stacks/medical.dm +++ b/code/game/objects/items/stacks/medical.dm @@ -218,7 +218,13 @@ color = "#378C61" stop_bleeding = 0 heal_brute = 12 + drop_sound = 'sound/misc/moist_impact.ogg' + mob_throw_hit_sound = 'sound/misc/moist_impact.ogg' + hitsound = 'sound/misc/moist_impact.ogg' +/obj/item/stack/medical/bruise_pack/comfrey/heal(mob/living/M, mob/user) + playsound(src, 'sound/misc/soggy.ogg', 30, TRUE) + return ..() /obj/item/stack/medical/ointment/aloe name = "\improper Aloe Vera leaf" diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm index 000ad2d225f..0e0bb55df85 100644 --- a/code/game/objects/items/stacks/sheets/glass.dm +++ b/code/game/objects/items/stacks/sheets/glass.dm @@ -191,7 +191,7 @@ GLOBAL_LIST_INIT(titaniumglass_recipes, list( ..() GLOBAL_LIST_INIT(plastitaniumglass_recipes, list( - new/datum/stack_recipe/window("plastitanium window", /obj/structure/window/plastitanium, 2, time = 0, on_floor = TRUE, window_checks = TRUE) + new/datum/stack_recipe/window("plastitanium window", /obj/structure/window/full/plastitanium, 2, time = 0, on_floor = TRUE, window_checks = TRUE) )) /obj/item/stack/sheet/plastitaniumglass @@ -204,7 +204,7 @@ GLOBAL_LIST_INIT(plastitaniumglass_recipes, list( armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 100) resistance_flags = ACID_PROOF merge_type = /obj/item/stack/sheet/plastitaniumglass - full_window = /obj/structure/window/plastitanium + full_window = /obj/structure/window/full/plastitanium /obj/item/stack/sheet/plastitaniumglass/New(loc, amount) recipes = GLOB.plastitaniumglass_recipes diff --git a/code/game/objects/items/stacks/sheets/leather.dm b/code/game/objects/items/stacks/sheets/leather.dm index 8b302cd338a..1be2e6b289d 100644 --- a/code/game/objects/items/stacks/sheets/leather.dm +++ b/code/game/objects/items/stacks/sheets/leather.dm @@ -14,7 +14,7 @@ GLOBAL_LIST_INIT(human_recipes, list( \ new/datum/stack_recipe("bloated human costume head", /obj/item/clothing/head/human_head, 5, on_floor = TRUE), \ )) -/obj/item/stack/sheet/animalhide/human/New(var/loc, var/amount=null) +/obj/item/stack/sheet/animalhide/human/New(loc, amount=null) recipes = GLOB.human_recipes return ..() @@ -144,7 +144,7 @@ GLOBAL_LIST_INIT(sinew_recipes, list ( \ new/datum/stack_recipe("sinew restraints", /obj/item/restraints/handcuffs/sinew, 1, on_floor = 1), \ )) -/obj/item/stack/sheet/sinew/New(var/loc, var/amount=null) +/obj/item/stack/sheet/sinew/New(loc, amount=null) recipes = GLOB.sinew_recipes return ..() diff --git a/code/game/objects/items/stacks/sheets/light.dm b/code/game/objects/items/stacks/sheets/light.dm index 17cf8bc5001..4eadda37c32 100644 --- a/code/game/objects/items/stacks/sheets/light.dm +++ b/code/game/objects/items/stacks/sheets/light.dm @@ -13,7 +13,7 @@ flags = CONDUCT max_amount = 60 -/obj/item/stack/light_w/attackby(var/obj/item/O as obj, var/mob/user as mob, params) +/obj/item/stack/light_w/attackby(obj/item/O as obj, mob/user as mob, params) ..() if(istype(O,/obj/item/wirecutters)) var/obj/item/stack/cable_coil/CC = new/obj/item/stack/cable_coil(user.loc) diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index ad798e781eb..a004cfd0de8 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -123,7 +123,7 @@ GLOBAL_LIST_INIT(metal_recipes, list( new /obj/item/stack/sheet/runed_metal(loc, amount) qdel(src) -/obj/item/stack/sheet/metal/New(var/loc, var/amount=null) +/obj/item/stack/sheet/metal/New(loc, amount=null) recipes = GLOB.metal_recipes return ..() @@ -158,7 +158,7 @@ GLOBAL_LIST_INIT(plasteel_recipes, list( merge_type = /obj/item/stack/sheet/plasteel point_value = 23 -/obj/item/stack/sheet/plasteel/New(var/loc, var/amount=null) +/obj/item/stack/sheet/plasteel/New(loc, amount=null) recipes = GLOB.plasteel_recipes return ..() @@ -202,7 +202,7 @@ GLOBAL_LIST_INIT(wood_recipes, list( armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 0) merge_type = /obj/item/stack/sheet/wood -/obj/item/stack/sheet/wood/New(var/loc, var/amount=null) +/obj/item/stack/sheet/wood/New(loc, amount=null) recipes = GLOB.wood_recipes return ..() @@ -247,6 +247,8 @@ GLOBAL_LIST_INIT(cloth_recipes, list ( \ force = 0 throwforce = 0 merge_type = /obj/item/stack/sheet/cloth + drop_sound = 'sound/items/handling/cloth_drop.ogg' + pickup_sound = 'sound/items/handling/cloth_pickup.ogg' /obj/item/stack/sheet/cloth/New(loc, amount=null) recipes = GLOB.cloth_recipes @@ -272,6 +274,8 @@ GLOBAL_LIST_INIT(durathread_recipes, list ( \ force = 0 throwforce = 0 merge_type = /obj/item/stack/sheet/durathread + drop_sound = 'sound/items/handling/cloth_drop.ogg' + pickup_sound = 'sound/items/handling/cloth_pickup.ogg' /obj/item/stack/sheet/durathread/Initialize(mapload, new_amount, merge = TRUE) recipes = GLOB.durathread_recipes @@ -337,7 +341,7 @@ GLOBAL_LIST_INIT(cardboard_recipes, list ( resistance_flags = FLAMMABLE merge_type = /obj/item/stack/sheet/cardboard -/obj/item/stack/sheet/cardboard/New(var/loc, var/amt = null) +/obj/item/stack/sheet/cardboard/New(loc, amt = null) recipes = GLOB.cardboard_recipes return ..() @@ -398,7 +402,7 @@ GLOBAL_LIST_INIT(cult_recipes, list ( \ /obj/item/stack/sheet/runed_metal/fifty amount = 50 -/obj/item/stack/sheet/runed_metal/New(var/loc, var/amount=null) +/obj/item/stack/sheet/runed_metal/New(loc, amount=null) recipes = GLOB.cult_recipes return ..() diff --git a/code/game/objects/items/tools/crowbar.dm b/code/game/objects/items/tools/crowbar.dm index 134194bf4a7..c90315ffbeb 100644 --- a/code/game/objects/items/tools/crowbar.dm +++ b/code/game/objects/items/tools/crowbar.dm @@ -12,6 +12,8 @@ item_state = "crowbar" w_class = WEIGHT_CLASS_SMALL materials = list(MAT_METAL=50) + drop_sound = 'sound/items/handling/crowbar_drop.ogg' + pickup_sound = 'sound/items/handling/crowbar_pickup.ogg' origin_tech = "engineering=1;combat=1" attack_verb = list("attacked", "bashed", "battered", "bludgeoned", "whacked") toolspeed = 1 diff --git a/code/game/objects/items/tools/multitool.dm b/code/game/objects/items/tools/multitool.dm index db7194c00db..7acee5352a3 100644 --- a/code/game/objects/items/tools/multitool.dm +++ b/code/game/objects/items/tools/multitool.dm @@ -12,11 +12,13 @@ icon = 'icons/obj/device.dmi' icon_state = "multitool" flags = CONDUCT - force = 5.0 + force = 0 w_class = WEIGHT_CLASS_SMALL throwforce = 0 throw_range = 7 throw_speed = 3 + drop_sound = 'sound/items/handling/multitool_drop.ogg' + pickup_sound = 'sound/items/handling/multitool_pickup.ogg' materials = list(MAT_METAL=50, MAT_GLASS=20) origin_tech = "magnets=1;engineering=2" toolspeed = 1 diff --git a/code/game/objects/items/tools/screwdriver.dm b/code/game/objects/items/tools/screwdriver.dm index 17169ce8970..374b8ad66ca 100644 --- a/code/game/objects/items/tools/screwdriver.dm +++ b/code/game/objects/items/tools/screwdriver.dm @@ -17,6 +17,8 @@ usesound = 'sound/items/screwdriver.ogg' toolspeed = 1 armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 30) + drop_sound = 'sound/items/handling/screwdriver_drop.ogg' + pickup_sound = 'sound/items/handling/screwdriver_pickup.ogg' tool_behaviour = TOOL_SCREWDRIVER var/random_color = TRUE //if the screwdriver uses random coloring @@ -30,7 +32,7 @@ user.visible_message("[user] is stabbing [src] into [user.p_their()] [pick("temple", "heart")]! It looks like [user.p_theyre()] trying to commit suicide!") return BRUTELOSS -/obj/item/screwdriver/New(loc, var/param_color = null) +/obj/item/screwdriver/New(loc, param_color = null) ..() if(random_color) if(!param_color) @@ -45,7 +47,7 @@ return ..() if(user.zone_selected != "eyes" && user.zone_selected != "head") return ..() - if((CLUMSY in user.mutations) && prob(50)) + if(HAS_TRAIT(user, TRAIT_CLUMSY) && prob(50)) M = user return eyestab(M,user) diff --git a/code/game/objects/items/tools/welder.dm b/code/game/objects/items/tools/welder.dm index 4ac934462a0..41801fe0287 100644 --- a/code/game/objects/items/tools/welder.dm +++ b/code/game/objects/items/tools/welder.dm @@ -22,6 +22,8 @@ toolspeed = 1 tool_enabled = FALSE usesound = 'sound/items/welder.ogg' + drop_sound = 'sound/items/handling/weldingtool_drop.ogg' + pickup_sound = 'sound/items/handling/weldingtool_pickup.ogg' var/maximum_fuel = 20 var/requires_fuel = TRUE //Set to FALSE if it doesn't need fuel, but serves equally well as a cost modifier var/refills_over_time = FALSE //Do we regenerate fuel? diff --git a/code/game/objects/items/tools/wirecutters.dm b/code/game/objects/items/tools/wirecutters.dm index 939139ce0b8..12da212f4f3 100644 --- a/code/game/objects/items/tools/wirecutters.dm +++ b/code/game/objects/items/tools/wirecutters.dm @@ -14,6 +14,8 @@ attack_verb = list("pinched", "nipped") hitsound = 'sound/items/wirecutter.ogg' usesound = 'sound/items/wirecutter.ogg' + drop_sound = 'sound/items/handling/wirecutter_drop.ogg' + pickup_sound = 'sound/items/handling/wirecutter_pickup.ogg' sharp = 1 toolspeed = 1 armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 30) diff --git a/code/game/objects/items/tools/wrench.dm b/code/game/objects/items/tools/wrench.dm index 5af1185e90b..d204ca683e6 100644 --- a/code/game/objects/items/tools/wrench.dm +++ b/code/game/objects/items/tools/wrench.dm @@ -11,6 +11,8 @@ usesound = 'sound/items/ratchet.ogg' w_class = WEIGHT_CLASS_SMALL materials = list(MAT_METAL=150) + drop_sound = 'sound/items/handling/wrench_drop.ogg' + pickup_sound = 'sound/items/handling/wrench_pickup.ogg' origin_tech = "materials=1;engineering=1" attack_verb = list("bashed", "battered", "bludgeoned", "whacked") toolspeed = 1 diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 06973e878a1..a2d2aeac16d 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -271,7 +271,7 @@ w_class = WEIGHT_CLASS_TINY var/ash_type = /obj/effect/decal/cleanable/ash -/obj/item/toy/snappop/proc/pop_burst(var/n=3, var/c=1) +/obj/item/toy/snappop/proc/pop_burst(n=3, c=1) do_sparks(n, c, src) new ash_type(loc) visible_message("[src] explodes!", @@ -1226,6 +1226,7 @@ icon = 'icons/obj/library.dmi' icon_state = "demonomicon" w_class = WEIGHT_CLASS_SMALL + var/list/messages = list("You must challenge the devil to a dance-off!", "The devils true name is Ian", "The devil hates salt!", "Would you like infinite power?", "Would you like infinite wisdom?", " Would you like infinite healing?") var/cooldown = FALSE /obj/item/toy/codex_gigas/attack_self(mob/user) @@ -1234,21 +1235,12 @@ "[user] presses the button on \the [src].", "You press the button on \the [src].", "You hear a soft click.") - var/list/messages = list() - var/datum/devilinfo/devil = randomDevilInfo() - messages += "Some fun facts about: [devil.truename]" - messages += "[GLOB.lawlorify[LORE][devil.bane]]" - messages += "[GLOB.lawlorify[LORE][devil.obligation]]" - messages += "[GLOB.lawlorify[LORE][devil.ban]]" - messages += "[GLOB.lawlorify[LORE][devil.banish]]" - playsound(loc, 'sound/machines/click.ogg', 20, 1) + playsound(loc, 'sound/machines/click.ogg', 20, TRUE) cooldown = TRUE - for(var/message in messages) + addtimer(VARSET_CALLBACK(src, cooldown, FALSE), 60) + for(var/message in pick(messages)) user.loc.visible_message("[bicon(src)] [message]") sleep(10) - spawn(20) - cooldown = FALSE - return /obj/item/toy/owl name = "owl action figure" @@ -1372,7 +1364,7 @@ var/cooldown = 0 var/obj/stored_minature = null -/obj/item/toy/minigibber/attack_self(var/mob/user) +/obj/item/toy/minigibber/attack_self(mob/user) if(stored_minature) to_chat(user, "\The [src] makes a violent grinding noise as it tears apart the miniature figure inside!") @@ -1385,7 +1377,7 @@ playsound(user, 'sound/goonstation/effects/gib.ogg', 20, 1) cooldown = world.time -/obj/item/toy/minigibber/attackby(var/obj/O, var/mob/user, params) +/obj/item/toy/minigibber/attackby(obj/O, mob/user, params) if(istype(O,/obj/item/toy/character) && O.loc == user) to_chat(user, "You start feeding \the [O] [bicon(O)] into \the [src]'s mini-input.") if(do_after(user, 10, target = src)) @@ -1525,7 +1517,7 @@ /obj/item/toy/russian_revolver/trick_revolver/post_shot(user) to_chat(user, "[src] did look pretty dodgey!") - SEND_SOUND(user, 'sound/misc/sadtrombone.ogg') //HONK + SEND_SOUND(user, sound('sound/misc/sadtrombone.ogg')) //HONK /* * Rubber Chainsaw */ 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/AI_modules.dm b/code/game/objects/items/weapons/AI_modules.dm index 62716bc51c4..7c1a8c5b4f1 100755 --- a/code/game/objects/items/weapons/AI_modules.dm +++ b/code/game/objects/items/weapons/AI_modules.dm @@ -22,7 +22,7 @@ AI MODULES materials = list(MAT_GOLD=50) var/datum/ai_laws/laws = null -/obj/item/aiModule/proc/install(var/obj/machinery/computer/C) +/obj/item/aiModule/proc/install(obj/machinery/computer/C) if(istype(C, /obj/machinery/computer/aiupload)) var/obj/machinery/computer/aiupload/comp = C if(comp.stat & NOPOWER) @@ -72,7 +72,7 @@ AI MODULES to_chat(usr, "Upload complete. The robot's laws have been modified.") -/obj/item/aiModule/proc/transmitInstructions(var/mob/living/silicon/ai/target, var/mob/sender) +/obj/item/aiModule/proc/transmitInstructions(mob/living/silicon/ai/target, mob/sender) log_law_changes(target, sender) if(laws) @@ -82,12 +82,12 @@ AI MODULES to_chat(target, "[sender] has uploaded a change to the laws you must follow, using \an [src]. From now on: ") target.show_laws() -/obj/item/aiModule/proc/log_law_changes(var/mob/living/silicon/ai/target, var/mob/sender) +/obj/item/aiModule/proc/log_law_changes(mob/living/silicon/ai/target, mob/sender) var/time = time2text(world.realtime,"hh:mm:ss") GLOB.lawchanges.Add("[time] : [sender.name]([sender.key]) used [src.name] on [target.name]([target.key])") log_and_message_admins("used [src.name] on [target.name]([target.key])") -/obj/item/aiModule/proc/addAdditionalLaws(var/mob/living/silicon/ai/target, var/mob/sender) +/obj/item/aiModule/proc/addAdditionalLaws(mob/living/silicon/ai/target, mob/sender) /******************** Safeguard ********************/ @@ -97,19 +97,19 @@ AI MODULES desc = "A 'safeguard' AI module: 'Safeguard . Individuals that threaten are not crew and must be eliminated.'" origin_tech = "programming=3;materials=3" -/obj/item/aiModule/safeguard/attack_self(var/mob/user as mob) +/obj/item/aiModule/safeguard/attack_self(mob/user as mob) ..() var/targName = stripped_input(usr, "Please enter the name of the person to safeguard.", "Safeguard who?", user.name) targetName = targName desc = text("A 'safeguard' AI module: 'Safeguard []. Individuals that threaten [] are not crew and must be eliminated.'", targetName, targetName) -/obj/item/aiModule/safeguard/install(var/obj/machinery/computer/C) +/obj/item/aiModule/safeguard/install(obj/machinery/computer/C) if(!targetName) to_chat(usr, "No name detected on module, please enter one.") return 0 ..() -/obj/item/aiModule/safeguard/addAdditionalLaws(var/mob/living/silicon/ai/target, var/mob/sender) +/obj/item/aiModule/safeguard/addAdditionalLaws(mob/living/silicon/ai/target, mob/sender) ..() var/law = text("Safeguard []. Individuals that threaten [] are not crew and must be eliminated.'", targetName, targetName) to_chat(target, law) @@ -123,19 +123,19 @@ AI MODULES desc = "A 'one human' AI module: 'Only is crew.'" origin_tech = "programming=4;materials=4" -/obj/item/aiModule/oneCrewMember/attack_self(var/mob/user as mob) +/obj/item/aiModule/oneCrewMember/attack_self(mob/user as mob) ..() var/targName = stripped_input(usr, "Please enter the name of the person who is the only crew.", "Who?", user.real_name) targetName = targName desc = text("A 'one human' AI module: 'Only [] is crew.'", targetName) -/obj/item/aiModule/oneCrewMember/install(var/obj/machinery/computer/C) +/obj/item/aiModule/oneCrewMember/install(obj/machinery/computer/C) if(!targetName) to_chat(usr, "No name detected on module, please enter one.") return 0 ..() -/obj/item/aiModule/oneCrewMember/addAdditionalLaws(var/mob/living/silicon/ai/target, var/mob/sender) +/obj/item/aiModule/oneCrewMember/addAdditionalLaws(mob/living/silicon/ai/target, mob/sender) ..() var/law = "Only [targetName] is crew." if(!is_special_character(target)) // Makes sure the AI isn't a traitor before changing their law 0. --NeoFite @@ -153,10 +153,10 @@ AI MODULES desc = "A 'protect station' AI module: 'Protect the space station against damage. Anyone you see harming the station is to be no longer considered crew, and is a threat to the station which must be neutralized.'" origin_tech = "programming=4;materials=4" //made of gold -/obj/item/aiModule/protectStation/attack_self(var/mob/user as mob) +/obj/item/aiModule/protectStation/attack_self(mob/user as mob) ..() -/obj/item/aiModule/protectStation/addAdditionalLaws(var/mob/living/silicon/ai/target, var/mob/sender) +/obj/item/aiModule/protectStation/addAdditionalLaws(mob/living/silicon/ai/target, mob/sender) ..() var/law = "Protect the space station against damage. Anyone you see harming the station is to be no longer considered crew, and is a threat to the station which must be neutralized." to_chat(target, law) @@ -168,10 +168,10 @@ AI MODULES desc = "A 'OxygenIsToxicToHumans' AI module: 'Oxygen is highly toxic to crew members, and must be purged from the station. Prevent, by any means necessary, anyone from exposing the station to this toxic gas. Extreme cold is the most effective method of healing the damage Oxygen does to a crew member.'" origin_tech = "programming=4;biotech=2;materials=4" -/obj/item/aiModule/oxygen/attack_self(var/mob/user as mob) +/obj/item/aiModule/oxygen/attack_self(mob/user as mob) ..() -/obj/item/aiModule/oxygen/addAdditionalLaws(var/mob/living/silicon/ai/target, var/mob/sender) +/obj/item/aiModule/oxygen/addAdditionalLaws(mob/living/silicon/ai/target, mob/sender) ..() var/law = "Oxygen is highly toxic to crew members, and must be purged from the station. Prevent, by any means necessary, anyone from exposing the station to this toxic gas. Extreme cold is the most effective method of healing the damage Oxygen does to a crew member." to_chat(target, law) @@ -185,7 +185,7 @@ AI MODULES desc = "A 'freeform' AI module: ''" origin_tech = "programming=4;materials=4" -/obj/item/aiModule/freeform/attack_self(var/mob/user as mob) +/obj/item/aiModule/freeform/attack_self(mob/user as mob) ..() var/new_lawpos = input("Please enter the priority for your new law. Can only write to law sectors 15 and above.", "Law Priority (15+)", lawpos) as num if(new_lawpos < MIN_SUPPLIED_LAW_NUMBER) return @@ -195,7 +195,7 @@ AI MODULES newFreeFormLaw = targName desc = "A 'freeform' AI module: ([lawpos]) '[newFreeFormLaw]'" -/obj/item/aiModule/freeform/addAdditionalLaws(var/mob/living/silicon/ai/target, var/mob/sender) +/obj/item/aiModule/freeform/addAdditionalLaws(mob/living/silicon/ai/target, mob/sender) ..() var/law = "[newFreeFormLaw]" to_chat(target, law) @@ -204,7 +204,7 @@ AI MODULES target.add_supplied_law(lawpos, law) GLOB.lawchanges.Add("The law was '[newFreeFormLaw]'") -/obj/item/aiModule/freeform/install(var/obj/machinery/computer/C) +/obj/item/aiModule/freeform/install(obj/machinery/computer/C) if(!newFreeFormLaw) to_chat(usr, "No law detected on module, please create one.") return 0 @@ -217,7 +217,7 @@ AI MODULES desc = "A 'reset' AI module: 'Clears all laws except for the core laws.'" origin_tech = "programming=3;materials=2" -/obj/item/aiModule/reset/transmitInstructions(var/mob/living/silicon/ai/target, var/mob/sender) +/obj/item/aiModule/reset/transmitInstructions(mob/living/silicon/ai/target, mob/sender) log_law_changes(target, sender) if(!is_special_character(target)) @@ -234,7 +234,7 @@ AI MODULES desc = "A 'purge' AI Module: 'Purges all laws.'" origin_tech = "programming=5;materials=4" -/obj/item/aiModule/purge/transmitInstructions(var/mob/living/silicon/ai/target, var/mob/sender) +/obj/item/aiModule/purge/transmitInstructions(mob/living/silicon/ai/target, mob/sender) ..() if(!is_special_character(target)) target.clear_zeroth_law() @@ -320,20 +320,20 @@ AI MODULES desc = "A 'freeform' Core AI module: ''" origin_tech = "programming=5;materials=4" -/obj/item/aiModule/freeformcore/attack_self(var/mob/user as mob) +/obj/item/aiModule/freeformcore/attack_self(mob/user as mob) ..() var/newlaw = "" var/targName = stripped_input(usr, "Please enter a new core law for the AI.", "Freeform Law Entry", newlaw) newFreeFormLaw = targName desc = "A 'freeform' Core AI module: '[newFreeFormLaw]'" -/obj/item/aiModule/freeformcore/addAdditionalLaws(var/mob/living/silicon/ai/target, var/mob/sender) +/obj/item/aiModule/freeformcore/addAdditionalLaws(mob/living/silicon/ai/target, mob/sender) ..() var/law = "[newFreeFormLaw]" target.add_inherent_law(law) GLOB.lawchanges.Add("The law is '[newFreeFormLaw]'") -/obj/item/aiModule/freeformcore/install(var/obj/machinery/computer/C) +/obj/item/aiModule/freeformcore/install(obj/machinery/computer/C) if(!newFreeFormLaw) to_chat(usr, "No law detected on module, please create one.") return 0 @@ -346,14 +346,14 @@ AI MODULES desc = "A hacked AI law module: ''" origin_tech = "programming=5;materials=5;syndicate=5" -/obj/item/aiModule/syndicate/attack_self(var/mob/user as mob) +/obj/item/aiModule/syndicate/attack_self(mob/user as mob) ..() var/newlaw = "" var/targName = stripped_input(usr, "Please enter a new law for the AI.", "Freeform Law Entry", newlaw,MAX_MESSAGE_LEN) newFreeFormLaw = targName desc = "A hacked AI law module: '[newFreeFormLaw]'" -/obj/item/aiModule/syndicate/transmitInstructions(var/mob/living/silicon/ai/target, var/mob/sender) +/obj/item/aiModule/syndicate/transmitInstructions(mob/living/silicon/ai/target, mob/sender) // ..() //We don't want this module reporting to the AI who dun it. --NEO log_law_changes(target, sender) @@ -363,7 +363,7 @@ AI MODULES target.add_ion_law(law) target.show_laws() -/obj/item/aiModule/syndicate/install(var/obj/machinery/computer/C) +/obj/item/aiModule/syndicate/install(obj/machinery/computer/C) if(!newFreeFormLaw) to_chat(usr, "No law detected on module, please create one.") return 0 @@ -378,7 +378,7 @@ AI MODULES origin_tech = "programming=6;materials=5;syndicate=6" laws = list("") -/obj/item/aiModule/toyAI/transmitInstructions(var/mob/living/silicon/ai/target, var/mob/sender) +/obj/item/aiModule/toyAI/transmitInstructions(mob/living/silicon/ai/target, mob/sender) //..() to_chat(target, "KRZZZT") target.add_ion_law(laws[1]) diff --git a/code/game/objects/items/weapons/RCD.dm b/code/game/objects/items/weapons/RCD.dm index c65410b5129..92d13337766 100644 --- a/code/game/objects/items/weapons/RCD.dm +++ b/code/game/objects/items/weapons/RCD.dm @@ -492,17 +492,6 @@ QDEL_NULL(A) for(var/obj/structure/window/W in T1.contents) qdel(W) - for(var/cdir in GLOB.cardinal) - var/turf/T2 = get_step(T1, cdir) - if(locate(/obj/structure/window/full/shuttle) in T2) - continue // Shuttle windows? Nah. We don't need extra windows there. - if(!(locate(/obj/structure/grille) in T2)) - continue - for(var/obj/structure/window/W in T2) - if(W.dir == turn(cdir, 180)) - qdel(W) - var/obj/structure/window/reinforced/W = new(T2) - W.dir = turn(cdir, 180) return TRUE return FALSE @@ -535,15 +524,7 @@ new /obj/structure/grille(A) for(var/obj/structure/window/W in A) qdel(W) - for(var/cdir in GLOB.cardinal) - var/turf/T = get_step(A, cdir) - if(locate(/obj/structure/grille) in T) - for(var/obj/structure/window/W in T) - if(W.dir == turn(cdir, 180)) - qdel(W) - else // Build a window! - var/obj/structure/window/reinforced/W = new(A) - W.dir = cdir + new /obj/structure/window/full/reinforced(A) var/turf/AT = A AT.ChangeTurf(/turf/simulated/floor/plating) // Platings go under windows. return TRUE diff --git a/code/game/objects/items/weapons/batons.dm b/code/game/objects/items/weapons/batons.dm index 1da9e2bddde..47ec7da88e9 100644 --- a/code/game/objects/items/weapons/batons.dm +++ b/code/game/objects/items/weapons/batons.dm @@ -35,7 +35,7 @@ return ..() add_fingerprint(user) - if((CLUMSY in user.mutations) && prob(50)) + if(HAS_TRAIT(user, TRAIT_CLUMSY) && prob(50)) user.visible_message("[user] accidentally clubs [user.p_them()]self with [src]!", \ "You accidentally club yourself with [src]!") user.Weaken(force * 3) diff --git a/code/game/objects/items/weapons/bee_briefcase.dm b/code/game/objects/items/weapons/bee_briefcase.dm index 157868e3db4..da2d8bf3bed 100644 --- a/code/game/objects/items/weapons/bee_briefcase.dm +++ b/code/game/objects/items/weapons/bee_briefcase.dm @@ -1,4 +1,3 @@ - /obj/item/bee_briefcase name = "briefcase" desc = "This briefcase has easy-release clasps and smells vaguely of honey and blood..." @@ -9,7 +8,6 @@ flags = CONDUCT hitsound = "swing_hit" force = 10 - throw_speed = 2 throw_range = 4 w_class = WEIGHT_CLASS_BULKY attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "whacked") @@ -55,7 +53,7 @@ to_chat(user, "You spray [I] into [src].") playsound(loc, 'sound/effects/spray3.ogg', 50, 1, -6) -/obj/item/bee_briefcase/attack_self(mob/user as mob) +/obj/item/bee_briefcase/attack_self(mob/user) var/bees_released if(!bees_left) to_chat(user, "The lack of all and any bees at this event has been somewhat of a let-down...") @@ -67,8 +65,7 @@ //Release up to 5 bees per use. Without using strange reagent, that means two uses. WITH strange reagent, you can get more if you don't release the last bee for(var/bee = min(5, bees_left), bee > 0, bee--) - var/mob/living/simple_animal/hostile/poison/bees/syndi/B = new /mob/living/simple_animal/hostile/poison/bees/syndi(null) + var/mob/living/simple_animal/hostile/poison/bees/syndi/B = new /mob/living/simple_animal/hostile/poison/bees/syndi(get_turf(user)) // RELEASE THE BEES! B.master_and_friends = blood_list.Copy() //Doesn't automatically add the person who opens the case, so the bees will attack the user unless they gave their blood - B.forceMove(get_turf(user)) //RELEASE THE BEES! bees_released++ bees_left -= bees_released diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm index 2b30ae5851f..f181233e9ba 100644 --- a/code/game/objects/items/weapons/cards_ids.dm +++ b/code/game/objects/items/weapons/cards_ids.dm @@ -157,7 +157,7 @@ /obj/item/card/id/proc/UpdateName() name = "[src.registered_name]'s ID Card ([src.assignment])" -/obj/item/card/id/proc/SetOwnerInfo(var/mob/living/carbon/human/H) +/obj/item/card/id/proc/SetOwnerInfo(mob/living/carbon/human/H) if(!H || !H.dna) return @@ -332,11 +332,12 @@ var/list/initial_access = list(ACCESS_MAINT_TUNNELS, ACCESS_SYNDICATE, ACCESS_EXTERNAL_AIRLOCKS) origin_tech = "syndicate=1" var/registered_user = null - untrackable = 1 - var/anyone = FALSE //Can anyone forge the ID or just syndicate? + untrackable = TRUE -/obj/item/card/id/syndicate/anyone - anyone = TRUE +/obj/item/card/id/syndicate/researcher + initial_access = list(ACCESS_SYNDICATE) + assignment = "Syndicate Researcher" + icon_state = "syndie" /obj/item/card/id/syndicate/New() access = initial_access.Copy() @@ -350,19 +351,19 @@ initial_access = list(ACCESS_MAINT_TUNNELS, ACCESS_SYNDICATE, ACCESS_SYNDICATE_LEADER, ACCESS_SYNDICATE_COMMAND, ACCESS_EXTERNAL_AIRLOCKS) icon_state = "commander" -/obj/item/card/id/syndicate/afterattack(var/obj/item/O as obj, mob/user as mob, proximity) +/obj/item/card/id/syndicate/afterattack(obj/item/O as obj, mob/user as mob, proximity) if(!proximity) return if(istype(O, /obj/item/card/id)) var/obj/item/card/id/I = O if(istype(user, /mob/living) && user.mind) - if(user.mind.special_role || anyone) + if(user.mind.special_role) to_chat(usr, "The card's microscanners activate as you pass it over \the [I], copying its access.") src.access |= I.access //Don't copy access if user isn't an antag -- to prevent metagaming /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 @@ -601,7 +602,7 @@ registered_name = "Syndicate" icon_state = "syndie" assignment = "Syndicate Overlord" - untrackable = 1 + untrackable = TRUE access = list(ACCESS_SYNDICATE, ACCESS_SYNDICATE_LEADER, ACCESS_SYNDICATE_COMMAND, ACCESS_EXTERNAL_AIRLOCKS) /obj/item/card/id/captains_spare @@ -623,7 +624,7 @@ item_state = "gold_id" registered_name = "Admin" assignment = "Testing Shit" - untrackable = 1 + untrackable = TRUE /obj/item/card/id/admin/New() access = get_absolutely_all_accesses() diff --git a/code/game/objects/items/weapons/chrono_eraser.dm b/code/game/objects/items/weapons/chrono_eraser.dm index ef158e3758c..82ea2364954 100644 --- a/code/game/objects/items/weapons/chrono_eraser.dm +++ b/code/game/objects/items/weapons/chrono_eraser.dm @@ -13,7 +13,7 @@ var/obj/item/gun/energy/chrono_gun/PA = null var/list/erased_minds = list() //a collection of minds from the dead -/obj/item/chrono_eraser/proc/pass_mind(var/datum/mind/M) +/obj/item/chrono_eraser/proc/pass_mind(datum/mind/M) erased_minds += M /obj/item/chrono_eraser/dropped() @@ -113,7 +113,7 @@ field_disconnect(F) return 0 -/obj/item/gun/energy/chrono_gun/proc/pass_mind(var/datum/mind/M) +/obj/item/gun/energy/chrono_gun/proc/pass_mind(datum/mind/M) if(TED) TED.pass_mind(M) diff --git a/code/game/objects/items/weapons/cigs.dm b/code/game/objects/items/weapons/cigs.dm index bd80e43140f..e4433fdb270 100644 --- a/code/game/objects/items/weapons/cigs.dm +++ b/code/game/objects/items/weapons/cigs.dm @@ -18,7 +18,7 @@ LIGHTERS ARE IN LIGHTERS.DM icon_state = "cigoff" throw_speed = 0.5 item_state = "cigoff" - slot_flags = SLOT_EARS|SLOT_MASK + slot_flags = SLOT_MASK w_class = WEIGHT_CLASS_TINY body_parts_covered = null attack_verb = null diff --git a/code/game/objects/items/weapons/clown_items.dm b/code/game/objects/items/weapons/clown_items.dm index f6fa5c26d5a..14ae46aae12 100644 --- a/code/game/objects/items/weapons/clown_items.dm +++ b/code/game/objects/items/weapons/clown_items.dm @@ -25,7 +25,7 @@ /obj/item/bikehorn/Initialize() . = ..() - AddComponent(/datum/component/squeak, honk_sounds, 50) + AddComponent(/datum/component/squeak, honk_sounds, 50, falloff_exponent = 20) //die off quick please /obj/item/bikehorn/airhorn name = "air horn" diff --git a/code/game/objects/items/weapons/defib.dm b/code/game/objects/items/weapons/defib.dm index 2aecdf536ec..43808c9105f 100644 --- a/code/game/objects/items/weapons/defib.dm +++ b/code/game/objects/items/weapons/defib.dm @@ -187,7 +187,7 @@ QDEL_NULL(cell) return ..() -/obj/item/defibrillator/proc/deductcharge(var/chrgdeductamt) +/obj/item/defibrillator/proc/deductcharge(chrgdeductamt) if(cell) if(cell.charge < (paddles.revivecost+chrgdeductamt)) powered = FALSE @@ -199,7 +199,7 @@ update_icon() return FALSE -/obj/item/defibrillator/proc/cooldowncheck(var/mob/user) +/obj/item/defibrillator/proc/cooldowncheck(mob/user) spawn(50) if(cell) if(cell.charge >= paddles.revivecost) @@ -291,7 +291,8 @@ playsound(get_turf(src), 'sound/machines/defib_zap.ogg', 50, 1, -1) return OXYLOSS -/obj/item/twohanded/shockpaddles/dropped(mob/user as mob) +/obj/item/twohanded/shockpaddles/dropped(mob/user) + ..() if(user) var/obj/item/twohanded/offhand/O = user.get_inactive_hand() if(istype(O)) @@ -301,7 +302,7 @@ loc = defib defib.update_icon() update_icon() - return unwield(user) + unwield(user) /obj/item/twohanded/shockpaddles/on_mob_move(dir, mob/user) if(defib) @@ -309,7 +310,7 @@ if(!t.Adjacent(user)) defib.remove_paddles(user) -/obj/item/twohanded/shockpaddles/proc/check_defib_exists(mainunit, var/mob/living/carbon/human/M, var/obj/O) +/obj/item/twohanded/shockpaddles/proc/check_defib_exists(mainunit, mob/living/carbon/human/M, obj/O) if(!mainunit || !istype(mainunit, /obj/item/defibrillator)) //To avoid weird issues from admin spawns M.unEquip(O) qdel(O) @@ -348,7 +349,7 @@ H.emote("gasp") if(!H.undergoing_cardiac_arrest() && (prob(10) || defib.combat)) // Your heart explodes. H.set_heartattack(TRUE) - H.shock_internal_organs(100) + SEND_SIGNAL(H, COMSIG_LIVING_MINOR_SHOCK, 100) add_attack_logs(user, M, "Stunned with [src]") defib.deductcharge(revivecost) cooldown = TRUE @@ -399,7 +400,7 @@ update_icon() return H.set_heartattack(FALSE) - H.shock_internal_organs(100) + SEND_SIGNAL(H, COMSIG_LIVING_MINOR_SHOCK, 100) user.visible_message("[defib] pings: Cardiac arrhythmia corrected.") M.visible_message("[M]'s body convulses a bit.") playsound(get_turf(src), 'sound/machines/defib_zap.ogg', 50, 1, -1) @@ -419,7 +420,7 @@ for(var/obj/item/organ/external/O in H.bodyparts) total_brute += O.brute_dam total_burn += O.burn_dam - if(total_burn <= 180 && total_brute <= 180 && !H.suiciding && !ghost && tplus < tlimit && !(NOCLONE in H.mutations) && (H.mind && H.mind.is_revivable()) && (H.get_int_organ(/obj/item/organ/internal/heart) || H.get_int_organ(/obj/item/organ/internal/brain/slime))) + if(total_burn <= 180 && total_brute <= 180 && !H.suiciding && !ghost && tplus < tlimit && !HAS_TRAIT(H, TRAIT_HUSK) && !HAS_TRAIT(H, TRAIT_BADDNA) && (H.get_int_organ(/obj/item/organ/internal/heart) || H.get_int_organ(/obj/item/organ/internal/brain/slime))) tobehealed = min(health + threshold, 0) // It's HILARIOUS without this min statement, let me tell you tobehealed -= 5 //They get 5 of each type of damage healed so excessive combined damage will not immediately kill them after they get revived H.adjustOxyLoss(tobehealed) @@ -428,13 +429,13 @@ H.adjustBruteLoss(tobehealed) user.visible_message("[defib] pings: Resuscitation successful.") playsound(get_turf(src), 'sound/machines/defib_success.ogg', 50, 0) - H.update_revive(FALSE) - H.KnockOut(FALSE) + H.update_revive() + H.KnockOut() H.Paralyse(5) H.emote("gasp") if(tplus > tloss) H.setBrainLoss( max(0, min(99, ((tlimit - tplus) / tlimit * 100)))) - H.shock_internal_organs(100) + SEND_SIGNAL(H, COMSIG_LIVING_MINOR_SHOCK, 100) H.med_hud_set_health() H.med_hud_set_status() defib.deductcharge(revivecost) @@ -497,7 +498,7 @@ H.Weaken(5) if(!H.undergoing_cardiac_arrest() && prob(10)) // Your heart explodes. H.set_heartattack(TRUE) - H.shock_internal_organs(100) + SEND_SIGNAL(H, COMSIG_LIVING_MINOR_SHOCK, 100) playsound(get_turf(src), 'sound/machines/defib_zap.ogg', 50, 1, -1) H.emote("gasp") add_attack_logs(user, M, "Stunned with [src]") @@ -538,7 +539,7 @@ for(var/obj/item/organ/external/O in H.bodyparts) total_brute += O.brute_dam total_burn += O.burn_dam - if(total_burn <= 180 && total_brute <= 180 && !H.suiciding && !ghost && tplus < tlimit && !(NOCLONE in H.mutations) && (H.mind && H.mind.is_revivable())) + if(total_burn <= 180 && total_brute <= 180 && !H.suiciding && !ghost && tplus < tlimit && !HAS_TRAIT(H, TRAIT_HUSK)) tobehealed = min(health + threshold, 0) // It's HILARIOUS without this min statement, let me tell you tobehealed -= 5 //They get 5 of each type of damage healed so excessive combined damage will not immediately kill them after they get revived H.adjustOxyLoss(tobehealed) @@ -553,7 +554,7 @@ H.emote("gasp") if(tplus > tloss) H.setBrainLoss( max(0, min(99, ((tlimit - tplus) / tlimit * 100)))) - H.shock_internal_organs(100) + SEND_SIGNAL(H, COMSIG_LIVING_MINOR_SHOCK, 100) if(isrobot(user)) var/mob/living/silicon/robot/R = user R.cell.use(revivecost) diff --git a/code/game/objects/items/weapons/dice.dm b/code/game/objects/items/weapons/dice.dm index ae49512853a..6395b55a3b1 100644 --- a/code/game/objects/items/weapons/dice.dm +++ b/code/game/objects/items/weapons/dice.dm @@ -126,9 +126,9 @@ return /obj/item/dice/d20/e20 - var/triggered = 0 + var/triggered = FALSE -/obj/item/dice/attack_self(mob/user as mob) +/obj/item/dice/attack_self(mob/user) diceroll(user) /obj/item/dice/throw_impact(atom/target) @@ -138,7 +138,7 @@ /obj/item/dice/proc/diceroll(mob/user) result = roll(sides) if(rigged != DICE_NOT_RIGGED && result != rigged_value) - if(rigged == DICE_BASICALLY_RIGGED && prob(clamp(1/(sides - 1) * 100, 25, 80))) + if(rigged == DICE_BASICALLY_RIGGED && prob(clamp(1 / (sides - 1) * 100, 25, 80))) result = rigged_value else if(rigged == DICE_TOTALLY_RIGGED) result = rigged_value @@ -153,17 +153,17 @@ comment = "Ouch, bad luck." update_icon() if(initial(icon_state) == "d00") - result = (result - 1)*10 - if(special_faces.len == sides) + result = (result - 1) * 10 + if(length(special_faces) == sides) result = special_faces[result] if(user != null) //Dice was rolled in someone's hand - user.visible_message("[user] has thrown [src]. It lands on [result]. [comment]", \ - "You throw [src]. It lands on [result]. [comment]", \ + user.visible_message("[user] has thrown [src]. It lands on [result]. [comment]", + "You throw [src]. It lands on [result]. [comment]", "You hear [src] rolling, it sounds like a [fake_result].") - else if(!src.throwing) //Dice was thrown and is coming to rest + else if(!throwing) //Dice was thrown and is coming to rest visible_message("[src] rolls to a stop, landing on [result]. [comment]") -/obj/item/dice/d20/e20/diceroll(mob/user as mob, thrown) +/obj/item/dice/d20/e20/diceroll(mob/user, thrown) if(triggered) return @@ -172,26 +172,27 @@ if(result == 1) to_chat(user, "Rocks fall, you die.") user.gib() + add_attack_logs(src, user, "detonated with a roll of [result], gibbing them!", ATKLOG_FEW) else - triggered = 1 + triggered = TRUE visible_message("You hear a quiet click.") - spawn(40) + addtimer(CALLBACK(src, .proc/boom, user, result), 4 SECONDS) - var/cap = 0 - if(result > GLOB.max_ex_light_range && result != 20) - cap = 1 - result = min(result, GLOB.max_ex_light_range) //Apply the bombcap - else if(result == 20) //Roll a nat 20, screw the bombcap - result = 24 - var/turf/epicenter = get_turf(src) - explosion(epicenter, round(result*0.25), round(result*0.5), round(result), round(result*1.5), 1, cap) - - var/turf/bombturf = get_turf(src) - var/area/A = get_area(bombturf) - investigate_log("E20 detonated at [A.name] ([bombturf.x],[bombturf.y],[bombturf.z]) with a roll of [result]. Triggered by: [key_name(user)]", INVESTIGATE_BOMB) - log_game("E20 detonated at [A.name] ([bombturf.x],[bombturf.y],[bombturf.z]) with a roll of [result]. Triggered by: [key_name(user)]") - add_attack_logs(user, src, "detonated with a roll of [result]", ATKLOG_FEW) +/obj/item/dice/d20/e20/proc/boom(mob/user, result) + var/capped = FALSE + var/actual_result = result + if(result != 20) + capped = TRUE + result = min(result, GLOB.max_ex_light_range) // Apply the bombcap + else // Rolled a nat 20, screw the bombcap + result = 24 + var/turf/epicenter = get_turf(src) + var/area/A = get_area(epicenter) + explosion(epicenter, round(result * 0.25), round(result * 0.5), round(result), round(result * 1.5), TRUE, capped) + investigate_log("E20 detonated at [A.name] ([epicenter.x],[epicenter.y],[epicenter.z]) with a roll of [actual_result]. Triggered by: [key_name(user)]", INVESTIGATE_BOMB) + log_game("E20 detonated at [A.name] ([epicenter.x],[epicenter.y],[epicenter.z]) with a roll of [actual_result]. Triggered by: [key_name(user)]") + add_attack_logs(user, src, "detonated with a roll of [actual_result]", ATKLOG_FEW) /obj/item/dice/update_icon() overlays.Cut() diff --git a/code/game/objects/items/weapons/disks.dm b/code/game/objects/items/weapons/disks.dm index 0f8806461ea..50f6c04919c 100644 --- a/code/game/objects/items/weapons/disks.dm +++ b/code/game/objects/items/weapons/disks.dm @@ -3,3 +3,5 @@ w_class = WEIGHT_CLASS_TINY item_state = "card-id" icon_state = "datadisk0" + drop_sound = 'sound/items/handling/disk_drop.ogg' + pickup_sound = 'sound/items/handling/disk_pickup.ogg' diff --git a/code/game/objects/items/weapons/dna_injector.dm b/code/game/objects/items/weapons/dna_injector.dm index 45047e97156..46d347e0db7 100644 --- a/code/game/objects/items/weapons/dna_injector.dm +++ b/code/game/objects/items/weapons/dna_injector.dm @@ -70,7 +70,7 @@ if(used) return if(istype(M,/mob/living)) - M.apply_effect(rand(20 / (damage_coeff ** 2), 50 / (damage_coeff ** 2)), IRRADIATE, 0, 1) + M.apply_effect(rand(20 / (damage_coeff ** 2), 50 / (damage_coeff ** 2)), IRRADIATE) var/mob/living/carbon/human/H if(istype(M, /mob/living/carbon/human)) H = M @@ -80,7 +80,7 @@ return spawn(0) //Some mutations have sleeps in them, like monkey - if(!(NOCLONE in M.mutations) && !(H && (NO_DNA in H.dna.species.species_traits))) // prevents drained people from having their DNA changed + if(!HAS_TRAIT(M, TRAIT_BADDNA) && !HAS_TRAIT(M, TRAIT_GENELESS)) // prevents drained people from having their DNA changed var/prev_ue = M.dna.unique_enzymes // UI in syringe. if(buf.types & DNA2_BUF_UI) @@ -103,7 +103,7 @@ M.dna.UpdateSE() else M.dna.SetSEValue(block,src.GetValue()) - domutcheck(M, null, forcedmutation ? MUTCHK_FORCED : 0) + domutcheck(M, forcedmutation ? MUTCHK_FORCED : FALSE) M.update_mutations() if(H) H.sync_organ_dna(assimilate = 0, old_ue = prev_ue) @@ -112,14 +112,9 @@ if(used) to_chat(user, "This injector is used up!") return - if(!M.dna) //You know what would be nice? If the mob you're injecting has DNA, and so doesn't cause runtimes. + if(!M.dna || HAS_TRAIT(M, TRAIT_GENELESS) || HAS_TRAIT(M, TRAIT_BADDNA)) //You know what would be nice? If the mob you're injecting has DNA, and so doesn't cause runtimes. return FALSE - if(ishuman(M)) // Would've done this via species instead of type, but the basic mob doesn't have a species, go figure. - var/mob/living/carbon/human/H = M - if(NO_DNA in H.dna.species.species_traits) - return FALSE - if(!user.IsAdvancedToolUser()) return FALSE diff --git a/code/game/objects/items/weapons/dnascrambler.dm b/code/game/objects/items/weapons/dnascrambler.dm index 1dcc4a942c2..ecc859bf638 100644 --- a/code/game/objects/items/weapons/dnascrambler.dm +++ b/code/game/objects/items/weapons/dnascrambler.dm @@ -22,11 +22,9 @@ if(used) return - if(ishuman(M)) - var/mob/living/carbon/human/H = M - if(NO_DNA in H.dna.species.species_traits) - to_chat(user, "You failed to inject [M], as [M.p_they()] [M.p_have()] no DNA to scramble, nor flesh to inject.") - return + if(HAS_TRAIT(M, TRAIT_GENELESS)) + to_chat(user, "You failed to inject [M], as [M.p_they()] [M.p_have()] no DNA to scramble, nor flesh to inject.") + return if(M == user) user.visible_message("[user] injects [user.p_them()]self with [src]!") @@ -39,7 +37,7 @@ else to_chat(user, "You failed to inject [M].") -/obj/item/dnascrambler/proc/injected(var/mob/living/carbon/human/target, var/mob/living/carbon/user) +/obj/item/dnascrambler/proc/injected(mob/living/carbon/human/target, mob/living/carbon/user) if(istype(target)) var/mob/living/carbon/human/H = target scramble(1, H, 100) diff --git a/code/game/objects/items/weapons/explosives.dm b/code/game/objects/items/weapons/explosives.dm index 9584130c0c6..259ccad7ff6 100644 --- a/code/game/objects/items/weapons/explosives.dm +++ b/code/game/objects/items/weapons/explosives.dm @@ -109,8 +109,6 @@ message_say = "FOR THE REVOLOUTION!" else if(role == "death commando" || role == ROLE_ERT) message_say = "FOR NANOTRASEN!" - else if(role == ROLE_DEVIL) - message_say = "FOR INFERNO!" user.say(message_say) target = user sleep(10) diff --git a/code/game/objects/items/weapons/extinguisher.dm b/code/game/objects/items/weapons/extinguisher.dm index 1b1352c372f..ecc485737a4 100644 --- a/code/game/objects/items/weapons/extinguisher.dm +++ b/code/game/objects/items/weapons/extinguisher.dm @@ -57,7 +57,7 @@ to_chat(user, "The safety is [safety ? "on" : "off"].") return -/obj/item/extinguisher/attack_obj(obj/O, mob/living/user) +/obj/item/extinguisher/attack_obj(obj/O, mob/living/user, params) if(AttemptRefill(O, user)) refilling = TRUE return FALSE diff --git a/code/game/objects/items/weapons/flamethrower.dm b/code/game/objects/items/weapons/flamethrower.dm index b18ec5ee0b6..60239b0e6fd 100644 --- a/code/game/objects/items/weapons/flamethrower.dm +++ b/code/game/objects/items/weapons/flamethrower.dm @@ -20,7 +20,7 @@ var/operating = FALSE//cooldown var/obj/item/weldingtool/weldtool = null var/obj/item/assembly/igniter/igniter = null - var/obj/item/tank/plasma/ptank = null + var/obj/item/tank/internals/plasma/ptank = null var/warned_admins = FALSE //for the message_admins() when lit //variables for prebuilt flamethrowers var/create_full = FALSE @@ -89,7 +89,7 @@ update_icon() return - else if(istype(I, /obj/item/tank/plasma)) + else if(istype(I, /obj/item/tank/internals/plasma)) if(ptank) if(user.drop_item()) I.forceMove(src) @@ -227,7 +227,7 @@ igniter.secured = FALSE status = TRUE if(create_with_tank) - ptank = new /obj/item/tank/plasma/full(src) + ptank = new /obj/item/tank/internals/plasma/full(src) update_icon() /obj/item/flamethrower/full diff --git a/code/game/objects/items/weapons/grenades/atmosgrenade.dm b/code/game/objects/items/weapons/grenades/atmosgrenade.dm index 6ba46d3442e..536e1ddd1b0 100644 --- a/code/game/objects/items/weapons/grenades/atmosgrenade.dm +++ b/code/game/objects/items/weapons/grenades/atmosgrenade.dm @@ -36,19 +36,19 @@ icon = 'icons/obj/grenade.dmi' icon_state = "gluon" item_state = "flashbang" - var/range = 4 - var/rad_damage = 60 + var/freeze_range = 4 + var/rad_damage = 350 var/stamina_damage = 30 /obj/item/grenade/gluon/prime() update_mob() playsound(loc, 'sound/effects/empulse.ogg', 50, 1) - for(var/turf/T in view(range, loc)) + radiation_pulse(src, rad_damage) + for(var/turf/T in view(freeze_range, loc)) if(isfloorturf(T)) var/turf/simulated/F = T F.MakeSlippery(TURF_WET_PERMAFROST) for(var/mob/living/carbon/L in T) L.adjustStaminaLoss(stamina_damage) - L.apply_effect(rad_damage, IRRADIATE) L.adjust_bodytemperature(-230) qdel(src) diff --git a/code/game/objects/items/weapons/grenades/bananade.dm b/code/game/objects/items/weapons/grenades/bananade.dm index 96a3a8e1400..f9465b923d8 100644 --- a/code/game/objects/items/weapons/grenades/bananade.dm +++ b/code/game/objects/items/weapons/grenades/bananade.dm @@ -37,7 +37,7 @@ var/fillamt = 0 -/obj/item/grenade/bananade/casing/attackby(var/obj/item/I, mob/user as mob, params) +/obj/item/grenade/bananade/casing/attackby(obj/item/I, mob/user as mob, params) if(istype(I, /obj/item/grown/bananapeel)) if(fillamt < 9) to_chat(usr, "You add another banana peel to the assembly.") diff --git a/code/game/objects/items/weapons/grenades/chem_grenade.dm b/code/game/objects/items/weapons/grenades/chem_grenade.dm index f756929e5ab..570cc603155 100644 --- a/code/game/objects/items/weapons/grenades/chem_grenade.dm +++ b/code/game/objects/items/weapons/grenades/chem_grenade.dm @@ -304,7 +304,7 @@ qdel(src) -/obj/item/grenade/chem_grenade/proc/CreateDefaultTrigger(var/typekey) +/obj/item/grenade/chem_grenade/proc/CreateDefaultTrigger(typekey) if(ispath(typekey,/obj/item/assembly)) nadeassembly = new(src) if(nadeassembly.has_prox_sensors()) @@ -457,7 +457,7 @@ /obj/item/grenade/chem_grenade/firefighting - payload_name = "fire fighting grenade" + payload_name = "fire fighting" desc = "Can help to put out dangerous fires from a distance." stage = READY diff --git a/code/game/objects/items/weapons/grenades/clusterbuster.dm b/code/game/objects/items/weapons/grenades/clusterbuster.dm index 98253ed14ba..6b8f0fd33b2 100644 --- a/code/game/objects/items/weapons/grenades/clusterbuster.dm +++ b/code/game/objects/items/weapons/grenades/clusterbuster.dm @@ -37,7 +37,7 @@ icon = 'icons/obj/grenade.dmi' icon_state = "clusterbang_segment" -/obj/item/grenade/clusterbuster/segment/New(var/loc, var/payload_type = /obj/item/grenade/flashbang/cluster) +/obj/item/grenade/clusterbuster/segment/New(loc, payload_type = /obj/item/grenade/flashbang/cluster) ..() icon_state = "clusterbang_segment_active" payload = payload_type @@ -58,7 +58,7 @@ ////////////////////////////////// //The payload spawner effect ///////////////////////////////// -/obj/effect/payload_spawner/New(var/turf/newloc,var/type, var/numspawned as num) +/obj/effect/payload_spawner/New(turf/newloc, type, numspawned as num) . = ..() for(var/loop = numspawned ,loop > 0, loop--) var/obj/item/grenade/P = new type(loc) diff --git a/code/game/objects/items/weapons/grenades/flashbang.dm b/code/game/objects/items/weapons/grenades/flashbang.dm index 06ec9cded0c..8122814353b 100644 --- a/code/game/objects/items/weapons/grenades/flashbang.dm +++ b/code/game/objects/items/weapons/grenades/flashbang.dm @@ -50,17 +50,6 @@ // Flash if(flash) - if(M.weakeyes) - M.visible_message("[M] screams and collapses!") - to_chat(M, "AAAAGH!") - M.Weaken(15) //hella stunned - M.Stun(15) - if(ishuman(M)) - M.emote("scream") - var/mob/living/carbon/human/H = M - var/obj/item/organ/internal/eyes/E = H.get_int_organ(/obj/item/organ/internal/eyes) - if(E) - E.receive_damage(8, TRUE) if(M.flash_eyes(affect_silicon = TRUE)) M.Stun(stun_amount) M.Weaken(stun_amount) @@ -74,7 +63,7 @@ if(!ear_safety) M.Stun(stun_amount) M.Weaken(stun_amount) - M.AdjustEarDamage(rand(0, 5), 15) + M.AdjustEarDamage(5, 15) if(iscarbon(M)) var/mob/living/carbon/C = M var/obj/item/organ/internal/ears/ears = C.get_int_organ(/obj/item/organ/internal/ears) @@ -83,6 +72,5 @@ to_chat(M, "Your ears start to ring badly!") if(prob(ears.ear_damage - 5)) to_chat(M, "You can't hear anything!") - M.BecomeDeaf() else if(ears.ear_damage >= 5) to_chat(M, "Your ears start to ring!") diff --git a/code/game/objects/items/weapons/grenades/grenade.dm b/code/game/objects/items/weapons/grenades/grenade.dm index da546836dc6..288c098a38b 100644 --- a/code/game/objects/items/weapons/grenades/grenade.dm +++ b/code/game/objects/items/weapons/grenades/grenade.dm @@ -21,8 +21,8 @@ if(!QDELETED(src)) qdel(src) -/obj/item/grenade/proc/clown_check(var/mob/living/user) - if((CLUMSY in user.mutations) && prob(50)) +/obj/item/grenade/proc/clown_check(mob/living/user) + if(HAS_TRAIT(user, TRAIT_CLUMSY) && prob(50)) to_chat(user, "Huh? How does this thing work?") active = 1 icon_state = initial(icon_state) + "_active" diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm index ee562c0b35c..d8abb853e9f 100644 --- a/code/game/objects/items/weapons/handcuffs.dm +++ b/code/game/objects/items/weapons/handcuffs.dm @@ -29,7 +29,7 @@ to_chat(user, "[src] is stuck to your hand!") return - if((CLUMSY in user.mutations) && prob(50) && (!ignoresClumsy)) + if(HAS_TRAIT(user, TRAIT_CLUMSY) && prob(50) && (!ignoresClumsy)) to_chat(user, "Uh... how do those things work?!") apply_cuffs(user, user) return @@ -145,7 +145,7 @@ desc = "Use this to keep prisoners in line. Or you know, your significant other." icon_state = "pinkcuffs" -/obj/item/restraints/handcuffs/cable/attackby(var/obj/item/I, mob/user as mob, params) +/obj/item/restraints/handcuffs/cable/attackby(obj/item/I, mob/user as mob, params) ..() if(istype(I, /obj/item/stack/rods)) var/obj/item/stack/rods/R = I @@ -192,5 +192,10 @@ desc = "A pair of broken zipties." icon_state = "cuff_white_used" +/obj/item/restraints/handcuffs/cable/zipties/used/decompile_act(obj/item/matter_decompiler/C, mob/user) + C.stored_comms["glass"] += 1 + qdel(src) + return TRUE + /obj/item/restraints/handcuffs/cable/zipties/used/attack() return diff --git a/code/game/objects/items/weapons/highlander_swords.dm b/code/game/objects/items/weapons/highlander_swords.dm index 568b023d051..558f75b3ce3 100644 --- a/code/game/objects/items/weapons/highlander_swords.dm +++ b/code/game/objects/items/weapons/highlander_swords.dm @@ -40,6 +40,7 @@ sword.style.teach(H, 1) /obj/item/claymore/highlander/dropped(mob/user) + ..() if(!ishuman(user)) return var/mob/living/carbon/human/H = user diff --git a/code/game/objects/items/weapons/holy_weapons.dm b/code/game/objects/items/weapons/holy_weapons.dm index 59880fdcc8c..a9cfbbbe36b 100644 --- a/code/game/objects/items/weapons/holy_weapons.dm +++ b/code/game/objects/items/weapons/holy_weapons.dm @@ -39,7 +39,7 @@ if(ishuman(M) && M.mind?.vampire) if(!M.mind.vampire.get_ability(/datum/vampire_passive/full)) to_chat(M, "The nullrod's power interferes with your own!") - M.mind.vampire.nullified = max(5, M.mind.vampire.nullified + 2) + M.mind.vampire.adjust_nullification(5, 2) /obj/item/nullrod/pickup(mob/living/user) . = ..() @@ -476,7 +476,7 @@ return if(target.mind.vampire && !target.mind.vampire.get_ability(/datum/vampire_passive/full)) // Getting a full prayer off on a vampire will interrupt their powers for a large duration. - target.mind.vampire.nullified = max(120, target.mind.vampire.nullified + 120) + target.mind.vampire.adjust_nullification(120, 50) to_chat(target, "[user]'s prayer to [SSticker.Bible_deity_name] has interfered with your power!") praying = FALSE return @@ -500,7 +500,7 @@ if(holder.l_hand == src || holder.r_hand == src) // Holding this in your hand will for(var/mob/living/carbon/human/H in range(5, loc)) if(H.mind && H.mind.vampire && !H.mind.vampire.get_ability(/datum/vampire_passive/full)) - H.mind.vampire.nullified = max(5, H.mind.vampire.nullified + 2) + H.mind.vampire.adjust_nullification(5, 2) if(prob(10)) to_chat(H, "Being in the presence of [holder]'s [src] is interfering with your powers!") diff --git a/code/game/objects/items/weapons/implants/implant.dm b/code/game/objects/items/weapons/implants/implant.dm index 9dc1fe864fc..b0c09f4f68c 100644 --- a/code/game/objects/items/weapons/implants/implant.dm +++ b/code/game/objects/items/weapons/implants/implant.dm @@ -28,7 +28,7 @@ //return 1 if the implant injects //return -1 if the implant fails to inject //return 0 if there is no room for implant -/obj/item/implant/proc/implant(var/mob/source, var/mob/user) +/obj/item/implant/proc/implant(mob/source, mob/user) var/obj/item/implant/imp_e = locate(src.type) in source if(!allow_multiple && imp_e && imp_e != src) if(imp_e.uses < initial(imp_e.uses)*2) @@ -58,7 +58,7 @@ return 1 -/obj/item/implant/proc/removed(var/mob/source) +/obj/item/implant/proc/removed(mob/source) src.loc = null imp_in = null implanted = 0 diff --git a/code/game/objects/items/weapons/implants/implant_abductor.dm b/code/game/objects/items/weapons/implants/implant_abductor.dm index 8967f364078..be448130aae 100644 --- a/code/game/objects/items/weapons/implants/implant_abductor.dm +++ b/code/game/objects/items/weapons/implants/implant_abductor.dm @@ -38,7 +38,7 @@ home = console.pad return 1 -/obj/item/implant/abductor/proc/get_team_console(var/team) +/obj/item/implant/abductor/proc/get_team_console(team) var/obj/machinery/abductor/console/console for(var/obj/machinery/abductor/console/c in GLOB.abductor_equipment) if(c.team == team) diff --git a/code/game/objects/items/weapons/implants/implant_clown.dm b/code/game/objects/items/weapons/implants/implant_clown.dm new file mode 100644 index 00000000000..bb5170fced6 --- /dev/null +++ b/code/game/objects/items/weapons/implants/implant_clown.dm @@ -0,0 +1,29 @@ +/obj/item/implant/sad_trombone + name = "sad trombone implant" + activated = FALSE + +/obj/item/implant/sad_trombone/get_data() + var/dat = {"Implant Specifications:
      + Name: Honk Co. Sad Trombone Implant
      + Life: Activates upon death.
      + "} + return dat + +/obj/item/implant/sad_trombone/trigger(emote, mob/source, force) + if(force && emote == "deathgasp") + playsound(loc, 'sound/misc/sadtrombone.ogg', 50, FALSE) + +/obj/item/implanter/sad_trombone + name = "implanter (sad trombone)" + +/obj/item/implanter/sad_trombone/New() //gross + imp = new /obj/item/implant/sad_trombone + ..() + +/obj/item/implantcase/sad_trombone + name = "implant case - 'Sad Trombone'" + desc = "A glass case containing a sad trombone implant." + +/obj/item/implantcase/sad_trombone/New() //gross + imp = new /obj/item/implant/sad_trombone + ..() diff --git a/code/game/objects/items/weapons/implants/implant_death_alarm.dm b/code/game/objects/items/weapons/implants/implant_death_alarm.dm index e8330c0c5cd..c5368494a8d 100644 --- a/code/game/objects/items/weapons/implants/implant_death_alarm.dm +++ b/code/game/objects/items/weapons/implants/implant_death_alarm.dm @@ -31,7 +31,7 @@ else if(M.stat == DEAD) activate("death") -/obj/item/implant/death_alarm/activate(var/cause) +/obj/item/implant/death_alarm/activate(cause) var/mob/M = imp_in var/area/t = get_area(M) diff --git a/code/game/objects/items/weapons/implants/implant_mindshield.dm b/code/game/objects/items/weapons/implants/implant_mindshield.dm index f9cf7e4cff1..8fff9eaee77 100644 --- a/code/game/objects/items/weapons/implants/implant_mindshield.dm +++ b/code/game/objects/items/weapons/implants/implant_mindshield.dm @@ -33,7 +33,7 @@ return 1 return 0 -/obj/item/implant/mindshield/removed(mob/target, var/silent = 0) +/obj/item/implant/mindshield/removed(mob/target, silent = 0) if(..()) if(target.stat != DEAD && !silent) to_chat(target, "You feel a sense of liberation as Nanotrasen's grip on your mind fades away.") diff --git a/code/game/objects/items/weapons/implants/implant_storage.dm b/code/game/objects/items/weapons/implants/implant_storage.dm index b530fd860fa..813d0272ff6 100644 --- a/code/game/objects/items/weapons/implants/implant_storage.dm +++ b/code/game/objects/items/weapons/implants/implant_storage.dm @@ -5,7 +5,7 @@ max_combined_w_class = WEIGHT_CLASS_GIGANTIC w_class = WEIGHT_CLASS_BULKY cant_hold = list(/obj/item/disk/nuclear) - silent = 1 + silent = TRUE /obj/item/implant/storage diff --git a/code/game/objects/items/weapons/kitchen.dm b/code/game/objects/items/weapons/kitchen.dm index bc8c4bc65df..a9fa08b9271 100644 --- a/code/game/objects/items/weapons/kitchen.dm +++ b/code/game/objects/items/weapons/kitchen.dm @@ -48,7 +48,7 @@ if(user.a_intent != INTENT_HELP) if(user.zone_selected == "head" || user.zone_selected == "eyes") - if((CLUMSY in user.mutations) && prob(50)) + if(HAS_TRAIT(user, TRAIT_CLUMSY) && prob(50)) C = user return eyestab(C, user) else diff --git a/code/game/objects/items/weapons/manuals.dm b/code/game/objects/items/weapons/manuals.dm index 161d7dd33a7..2278f232f7d 100644 --- a/code/game/objects/items/weapons/manuals.dm +++ b/code/game/objects/items/weapons/manuals.dm @@ -838,7 +838,7 @@ /obj/item/book/manual/chef_recipes name = "Chef Recipes" - icon_state = "cooked_book" + icon_state = "cook_book" author = "NanoTrasen" title = "Chef Recipes" dat = {" diff --git a/code/game/objects/items/weapons/melee/energy.dm b/code/game/objects/items/weapons/melee/energy.dm index f6fb213b353..b1903ea8eda 100644 --- a/code/game/objects/items/weapons/melee/energy.dm +++ b/code/game/objects/items/weapons/melee/energy.dm @@ -4,6 +4,7 @@ var/throwforce_on = 20 var/faction_bonus_force = 0 //Bonus force dealt against certain factions var/list/nemesis_factions //Any mob with a faction that exists in this list will take bonus damage/effects + stealthy_audio = TRUE //Most of these are antag weps so we dont want them to be /too/ overt. w_class = WEIGHT_CLASS_SMALL var/w_class_on = WEIGHT_CLASS_BULKY var/icon_state_on @@ -37,7 +38,7 @@ return BRUTELOSS|FIRELOSS /obj/item/melee/energy/attack_self(mob/living/carbon/user) - if((CLUMSY in user.mutations) && prob(50)) + if(HAS_TRAIT(user, TRAIT_CLUMSY) && prob(50)) to_chat(user, "You accidentally cut yourself with [src], like a doofus!") user.take_organ_damage(5,5) active = !active @@ -132,7 +133,7 @@ /obj/item/melee/energy/sword/cyborg var/hitcost = 50 -/obj/item/melee/energy/sword/cyborg/attack(mob/M, var/mob/living/silicon/robot/R) +/obj/item/melee/energy/sword/cyborg/attack(mob/M, mob/living/silicon/robot/R) if(R.cell) var/obj/item/stock_parts/cell/C = R.cell if(active && !(C.use(hitcost))) @@ -291,7 +292,7 @@ if(ishuman(user)) var/mob/living/carbon/human/H = user - if((CLUMSY in H.mutations) && prob(50)) + if(HAS_TRAIT(H, TRAIT_CLUMSY) && prob(50)) to_chat(H, "You accidentally cut yourself with [src], like a doofus!") H.take_organ_damage(10,10) active = !active diff --git a/code/game/objects/items/weapons/misc.dm b/code/game/objects/items/weapons/misc.dm index 147f4dc3183..09ed31ac65d 100644 --- a/code/game/objects/items/weapons/misc.dm +++ b/code/game/objects/items/weapons/misc.dm @@ -120,11 +120,10 @@ desc = "A device bored paper pushers use to remind themselves that time did not stop yet. Contains gravity." /obj/item/pai_cable - desc = "A flexible coated cable with a universal jack on one end." name = "data cable" + desc = "A flexible coated cable with a universal jack on one end." icon = 'icons/obj/power.dmi' icon_state = "wire1" - var/obj/machinery/machine /obj/item/phone diff --git a/code/game/objects/items/weapons/pneumaticCannon.dm b/code/game/objects/items/weapons/pneumaticCannon.dm index 21127f6869f..4f3729f7076 100644 --- a/code/game/objects/items/weapons/pneumaticCannon.dm +++ b/code/game/objects/items/weapons/pneumaticCannon.dm @@ -12,7 +12,7 @@ armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 60, "acid" = 50) var/maxWeightClass = 20 //The max weight of items that can fit into the cannon var/loadedWeightClass = 0 //The weight of items currently in the cannon - var/obj/item/tank/tank = null //The gas tank that is drawn from to fire things + var/obj/item/tank/internals/tank = null //The gas tank that is drawn from to fire things var/gasPerThrow = 3 //How much gas is drawn from a tank's pressure to fire var/list/loadedItems = list() //The items loaded into the cannon that will be fired out var/pressureSetting = 1 //How powerful the cannon is - higher pressure = more gas but more powerful throws @@ -34,8 +34,8 @@ /obj/item/pneumatic_cannon/attackby(obj/item/W, mob/user, params) ..() - if(istype(W, /obj/item/tank/) && !tank) - if(istype(W, /obj/item/tank/emergency_oxygen)) + if(istype(W, /obj/item/tank/internals/) && !tank) + if(istype(W, /obj/item/tank/internals/emergency_oxygen)) to_chat(user, "\The [W] is too small for \the [src].") return updateTank(W, 0, user) @@ -88,7 +88,7 @@ Fire(user, target) -/obj/item/pneumatic_cannon/proc/Fire(var/mob/living/carbon/human/user, var/atom/target) +/obj/item/pneumatic_cannon/proc/Fire(mob/living/carbon/human/user, atom/target) if(!istype(user) && !target) return var/discharge = 0 @@ -101,7 +101,7 @@ if(tank && !tank.air_contents.remove(gasPerThrow * pressureSetting)) to_chat(user, "\The [src] lets out a weak hiss and doesn't react!") return - if(user && (CLUMSY in user.mutations) && prob(75)) + if(user && HAS_TRAIT(user, TRAIT_CLUMSY) && prob(75)) user.visible_message("[user] loses [user.p_their()] grip on [src], causing it to go off!", "[src] slips out of your hands and goes off!") user.drop_item() if(prob(10)) @@ -137,7 +137,7 @@ /datum/crafting_recipe/improvised_pneumatic_cannon //Pretty easy to obtain but name = "Pneumatic Cannon" - result = /obj/item/pneumatic_cannon/ghetto + result = list(/obj/item/pneumatic_cannon/ghetto) tools = list(TOOL_WELDER, TOOL_WRENCH) reqs = list(/obj/item/stack/sheet/metal = 4, /obj/item/stack/packageWrap = 8, diff --git a/code/game/objects/items/weapons/powerfist.dm b/code/game/objects/items/weapons/powerfist.dm index 217cb963719..fe1f549e8ef 100644 --- a/code/game/objects/items/weapons/powerfist.dm +++ b/code/game/objects/items/weapons/powerfist.dm @@ -15,7 +15,7 @@ var/click_delay = 1.5 var/fisto_setting = 1 var/gasperfist = 3 - var/obj/item/tank/tank = null //Tank used for the gauntlet's piston-ram. + var/obj/item/tank/internals/tank = null //Tank used for the gauntlet's piston-ram. /obj/item/melee/powerfist/Destroy() @@ -30,9 +30,9 @@ . += "[bicon(tank)] It has [tank] mounted onto it." /obj/item/melee/powerfist/attackby(obj/item/W, mob/user, params) - if(istype(W, /obj/item/tank)) + if(istype(W, /obj/item/tank/internals)) if(!tank) - var/obj/item/tank/IT = W + var/obj/item/tank/internals/IT = W if(IT.volume <= 3) to_chat(user, "[IT] is too small for [src].") return diff --git a/code/game/objects/items/weapons/rpd.dm b/code/game/objects/items/weapons/rpd.dm index 1d91ef24848..bb499d96753 100644 --- a/code/game/objects/items/weapons/rpd.dm +++ b/code/game/objects/items/weapons/rpd.dm @@ -86,7 +86,7 @@ if(delay) lastused = world.time -/obj/item/rpd/proc/can_dispense_pipe(var/pipe_id, var/pipe_type) //Returns TRUE if this is a legit pipe we can dispense, otherwise returns FALSE +/obj/item/rpd/proc/can_dispense_pipe(pipe_id, pipe_type) //Returns TRUE if this is a legit pipe we can dispense, otherwise returns FALSE for(var/list/L in GLOB.rpd_pipe_list) if(pipe_type != L["pipe_type"]) //Sometimes pipes in different categories have the same pipe_id, so we need to skip anything not in the category we want continue diff --git a/code/game/objects/items/weapons/scrolls.dm b/code/game/objects/items/weapons/scrolls.dm index e01038e4e53..9ea4b8b58d0 100644 --- a/code/game/objects/items/weapons/scrolls.dm +++ b/code/game/objects/items/weapons/scrolls.dm @@ -43,7 +43,7 @@ attack_self(H) return -/obj/item/teleportation_scroll/proc/teleportscroll(var/mob/user) +/obj/item/teleportation_scroll/proc/teleportscroll(mob/user) var/A diff --git a/code/game/objects/items/weapons/shards.dm b/code/game/objects/items/weapons/shards.dm index f987f047f11..234685f3fe9 100644 --- a/code/game/objects/items/weapons/shards.dm +++ b/code/game/objects/items/weapons/shards.dm @@ -51,7 +51,7 @@ return if(ishuman(user)) var/mob/living/carbon/human/H = user - if(!H.gloves && !(PIERCEIMMUNE in H.dna.species.species_traits)) + if(!H.gloves && !HAS_TRAIT(H, TRAIT_PIERCEIMMUNE)) var/obj/item/organ/external/affecting = H.get_organ("[user.hand ? "l" : "r" ]_hand") if(affecting.is_robotic()) return diff --git a/code/game/objects/items/weapons/shields.dm b/code/game/objects/items/weapons/shields.dm index 19e56e161e3..86789ca3791 100644 --- a/code/game/objects/items/weapons/shields.dm +++ b/code/game/objects/items/weapons/shields.dm @@ -76,7 +76,7 @@ return (active) /obj/item/shield/energy/attack_self(mob/living/carbon/human/user) - if((CLUMSY in user.mutations) && prob(50)) + if(HAS_TRAIT(user, TRAIT_CLUMSY) && prob(50)) to_chat(user, "You beat yourself in the head with [src].") user.take_organ_damage(5) active = !active diff --git a/code/game/objects/items/weapons/signs.dm b/code/game/objects/items/weapons/signs.dm index 56f31188300..40e627a3375 100644 --- a/code/game/objects/items/weapons/signs.dm +++ b/code/game/objects/items/weapons/signs.dm @@ -38,7 +38,7 @@ /datum/crafting_recipe/picket_sign name = "Picket Sign" - result = /obj/item/picket_sign + result = list(/obj/item/picket_sign) reqs = list(/obj/item/stack/rods = 1, /obj/item/stack/sheet/cardboard = 2) time = 80 diff --git a/code/game/objects/items/weapons/staff.dm b/code/game/objects/items/weapons/staff.dm index fa2c6adcc7f..465e77e7cbc 100644 --- a/code/game/objects/items/weapons/staff.dm +++ b/code/game/objects/items/weapons/staff.dm @@ -43,7 +43,7 @@ if(wielded) to_chat(user, "You hold \the [src] between your legs.") -/obj/item/twohanded/staff/broom/attackby(var/obj/O, mob/user) +/obj/item/twohanded/staff/broom/attackby(obj/O, mob/user) if(istype(O, /obj/item/clothing/mask/horsehead)) new/obj/item/twohanded/staff/broom/horsebroom(get_turf(src)) user.unEquip(O) @@ -52,6 +52,11 @@ return ..() +/obj/item/twohanded/staff/broom/dropped(mob/user) + if((user.mind in SSticker.mode.wizards) && user.flying) + user.flying = FALSE + ..() + /obj/item/twohanded/staff/broom/horsebroom name = "broomstick horse" desc = "Saddle up!" diff --git a/code/game/objects/items/weapons/stock_parts.dm b/code/game/objects/items/weapons/stock_parts.dm index 7df47345bae..ea01683133a 100644 --- a/code/game/objects/items/weapons/stock_parts.dm +++ b/code/game/objects/items/weapons/stock_parts.dm @@ -8,14 +8,14 @@ w_class = WEIGHT_CLASS_HUGE can_hold = list(/obj/item/stock_parts) storage_slots = 50 - use_to_pickup = 1 - allow_quick_gather = 1 - allow_quick_empty = 1 + use_to_pickup = TRUE + allow_quick_gather = TRUE + allow_quick_empty = TRUE pickup_all_on_tile = TRUE - display_contents_with_number = 1 + display_contents_with_number = TRUE max_w_class = WEIGHT_CLASS_NORMAL max_combined_w_class = 100 - var/works_from_distance = 0 + var/works_from_distance = FALSE var/primary_sound = 'sound/items/rped.ogg' var/alt_sound = null toolspeed = 1 @@ -39,7 +39,7 @@ storage_slots = 400 max_w_class = WEIGHT_CLASS_NORMAL max_combined_w_class = 800 - works_from_distance = 1 + works_from_distance = TRUE primary_sound = 'sound/items/pshoom.ogg' alt_sound = 'sound/items/pshoom_2.ogg' usesound = 'sound/items/pshoom.ogg' @@ -54,7 +54,7 @@ //Sorts stock parts inside an RPED by their rating. //Only use /obj/item/stock_parts/ with this sort proc! -/proc/cmp_rped_sort(var/obj/item/stock_parts/A, var/obj/item/stock_parts/B) +/proc/cmp_rped_sort(obj/item/stock_parts/A, obj/item/stock_parts/B) return B.rating - A.rating /obj/item/stock_parts diff --git a/code/game/objects/items/weapons/storage/artistic_toolbox.dm b/code/game/objects/items/weapons/storage/artistic_toolbox.dm index 610f0d14ab0..3fbaa1d468d 100644 --- a/code/game/objects/items/weapons/storage/artistic_toolbox.dm +++ b/code/game/objects/items/weapons/storage/artistic_toolbox.dm @@ -2,10 +2,7 @@ name = "artistic toolbox" desc = "A metal container designed to hold various tools. This variety holds art supplies." icon_state = "green" - item_state = "toolbox_green" - icon = 'icons/goonstation/objects/objects.dmi' - lefthand_file = 'icons/goonstation/mob/inhands/items_lefthand.dmi' - righthand_file = 'icons/goonstation/mob/inhands/items_righthand.dmi' + item_state = "artistic_toolbox" /obj/item/storage/toolbox/green/memetic name = "artistic toolbox" @@ -49,7 +46,7 @@ break force += 4 throwforce += 4 - SEND_SOUND(user, 'sound/goonstation/effects/screech.ogg') + SEND_SOUND(user, sound('sound/goonstation/effects/screech.ogg')) shake_camera(user, 20, 1) var/acount = 0 var/amax = rand(10, 15) diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index 5f668316126..3466773007b 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -36,9 +36,9 @@ space_used += I.w_class if(!space_used) . += " [src] is empty." - else if(space_used <= max_combined_w_class*0.6) + else if(space_used <= max_combined_w_class * 0.6) . += " [src] still has plenty of remaining space." - else if(space_used <= max_combined_w_class*0.8) + else if(space_used <= max_combined_w_class * 0.8) . += " [src] is beginning to run out of space." else if(space_used < max_combined_w_class) . += " [src] doesn't have much space left." @@ -82,8 +82,8 @@ . = ..() /obj/item/storage/backpack/holding/singularity_act(current_size) - var/dist = max((current_size - 2),1) - explosion(src.loc,(dist),(dist*2),(dist*4)) + var/dist = max((current_size - 2), 1) + explosion(loc, dist, (dist * 2), (dist * 4)) /obj/item/storage/backpack/santabag name = "Santa's Gift Bag" @@ -107,8 +107,7 @@ /obj/item/storage/backpack/clown/syndie -/obj/item/storage/backpack/clown/syndie/New() - ..() +/obj/item/storage/backpack/clown/syndie/populate_contents() new /obj/item/clothing/under/rank/clown(src) new /obj/item/clothing/shoes/magboots/clown(src) new /obj/item/clothing/mask/chameleon(src) @@ -236,8 +235,7 @@ desc = "A handbag made out of what appears to be supple green Unathi skin. A face can be vaguely seen on the front." icon_state = "satchel-lizard" -/obj/item/storage/backpack/satchel/withwallet/New() - ..() +/obj/item/storage/backpack/satchel/withwallet/populate_contents() new /obj/item/storage/wallet/random(src) /obj/item/storage/backpack/satchel_norm @@ -313,18 +311,17 @@ level = 1 cant_hold = list(/obj/item/storage/backpack/satchel_flat) //muh recursive backpacks -/obj/item/storage/backpack/satchel_flat/hide(var/intact) +/obj/item/storage/backpack/satchel_flat/hide(intact) if(intact) - invisibility = 101 + invisibility = INVISIBILITY_MAXIMUM anchored = 1 //otherwise you can start pulling, cover it, and drag around an invisible backpack. icon_state = "[initial(icon_state)]2" else invisibility = initial(invisibility) - anchored = 0 + anchored = FALSE icon_state = initial(icon_state) -/obj/item/storage/backpack/satchel_flat/New() - ..() +/obj/item/storage/backpack/satchel_flat/populate_contents() new /obj/item/stack/tile/plasteel(src) new /obj/item/crowbar(src) @@ -346,7 +343,7 @@ icon_state = "duffel-syndie" item_state = "duffel-syndimed" origin_tech = "syndicate=1" - silent = 1 + silent = TRUE slowdown = 0 resistance_flags = FIRE_PROOF @@ -365,8 +362,7 @@ /obj/item/storage/backpack/duffel/syndie/ammo/shotgun desc = "A large duffelbag, packed to the brim with Bulldog shotgun ammo." -/obj/item/storage/backpack/duffel/syndie/ammo/shotgun/New() - ..() +/obj/item/storage/backpack/duffel/syndie/ammo/shotgun/populate_contents() for(var/i in 1 to 6) new /obj/item/ammo_box/magazine/m12g(src) new /obj/item/ammo_box/magazine/m12g/buckshot(src) @@ -376,8 +372,7 @@ /obj/item/storage/backpack/duffel/syndie/ammo/shotgunXLmags desc = "A large duffelbag, containing three types of extended drum magazines." -/obj/item/storage/backpack/duffel/syndie/ammo/shotgunXLmags/New() - ..() +/obj/item/storage/backpack/duffel/syndie/ammo/shotgunXLmags/populate_contents() new /obj/item/ammo_box/magazine/m12g/XtrLrg(src) new /obj/item/ammo_box/magazine/m12g/XtrLrg/buckshot(src) new /obj/item/ammo_box/magazine/m12g/XtrLrg/dragon(src) @@ -386,8 +381,7 @@ name = "mining conscription kit" desc = "A kit containing everything a crewmember needs to support a shaft miner in the field." -/obj/item/storage/backpack/duffel/mining_conscript/New() - ..() +/obj/item/storage/backpack/duffel/mining_conscript/populate_contents() new /obj/item/pickaxe(src) new /obj/item/clothing/glasses/meson(src) new /obj/item/t_scanner/adv_mining_scanner/lesser(src) @@ -404,16 +398,14 @@ /obj/item/storage/backpack/duffel/syndie/ammo/smg desc = "A large duffel bag, packed to the brim with C-20r magazines." -/obj/item/storage/backpack/duffel/syndie/ammo/smg/New() - ..() +/obj/item/storage/backpack/duffel/syndie/ammo/smg/populate_contents() for(var/i in 1 to 10) new /obj/item/ammo_box/magazine/smgm45(src) /obj/item/storage/backpack/duffel/syndie/c20rbundle desc = "A large duffel bag containing a C-20r, some magazines, and a cheap looking suppressor." -/obj/item/storage/backpack/duffel/syndie/c20rbundle/New() - ..() +/obj/item/storage/backpack/duffel/syndie/c20rbundle/populate_contents() new /obj/item/ammo_box/magazine/smgm45(src) new /obj/item/ammo_box/magazine/smgm45(src) new /obj/item/ammo_box/magazine/smgm45(src) @@ -423,8 +415,7 @@ /obj/item/storage/backpack/duffel/syndie/bulldogbundle desc = "A large duffel bag containing a Bulldog, some drums, and a pair of thermal imaging glasses." -/obj/item/storage/backpack/duffel/syndie/bulldogbundle/New() - ..() +/obj/item/storage/backpack/duffel/syndie/bulldogbundle/populate_contents() new /obj/item/gun/projectile/automatic/shotgun/bulldog(src) new /obj/item/ammo_box/magazine/m12g(src) new /obj/item/ammo_box/magazine/m12g(src) @@ -433,19 +424,16 @@ /obj/item/storage/backpack/duffel/syndie/med/medicalbundle desc = "A large duffel bag containing a tactical medkit, a medical beam gun and a pair of syndicate magboots." -/obj/item/storage/backpack/duffel/syndie/med/medicalbundle/New() - ..() +/obj/item/storage/backpack/duffel/syndie/med/medicalbundle/populate_contents() new /obj/item/storage/firstaid/tactical(src) new /obj/item/clothing/shoes/magboots/syndie(src) new /obj/item/gun/medbeam(src) -/obj/item/storage/backpack/duffel/syndie/c4/New() - ..() +/obj/item/storage/backpack/duffel/syndie/c4/populate_contents() for(var/i in 1 to 10) new /obj/item/grenade/plastic/c4(src) -/obj/item/storage/backpack/duffel/syndie/x4/New() - ..() +/obj/item/storage/backpack/duffel/syndie/x4/populate_contents() for(var/i in 1 to 3) new /obj/item/grenade/plastic/x4(src) @@ -455,8 +443,7 @@ icon_state = "duffel-syndimed" item_state = "duffel-syndimed" -/obj/item/storage/backpack/duffel/syndie/surgery/New() - ..() +/obj/item/storage/backpack/duffel/syndie/surgery/populate_contents() new /obj/item/scalpel(src) new /obj/item/hemostat(src) new /obj/item/retractor(src) @@ -475,8 +462,7 @@ icon_state = "duffel-syndimed" item_state = "duffel-syndimed" -/obj/item/storage/backpack/duffel/syndie/surgery_fake/New() - ..() +/obj/item/storage/backpack/duffel/syndie/surgery_fake/populate_contents() new /obj/item/scalpel(src) new /obj/item/hemostat(src) new /obj/item/retractor(src) diff --git a/code/game/objects/items/weapons/storage/bags.dm b/code/game/objects/items/weapons/storage/bags.dm index 4a3072a6374..f2b0b475e30 100644 --- a/code/game/objects/items/weapons/storage/bags.dm +++ b/code/game/objects/items/weapons/storage/bags.dm @@ -107,7 +107,7 @@ return ..() -/obj/item/storage/bag/plasticbag/equipped(var/mob/user, var/slot) +/obj/item/storage/bag/plasticbag/equipped(mob/user, slot) if(slot==slot_head) storage_slots = 0 START_PROCESSING(SSobj, src) @@ -200,7 +200,7 @@ // Because it stacks stacks, this doesn't operate normally. // However, making it a storage/bag allows us to reuse existing code in some places. -Sayu -/obj/item/storage/bag/sheetsnatcher +/obj/item/storage/bag/sheetsnatcher // what is this even used for icon = 'icons/obj/mining.dmi' icon_state = "sheetsnatcher" name = "Sheet Snatcher" @@ -210,10 +210,6 @@ w_class = WEIGHT_CLASS_NORMAL allow_quick_empty = 1 // this function is superceded -/obj/item/storage/bag/sheetsnatcher/New() - ..() - //verbs -= /obj/item/storage/verb/quick_empty - //verbs += /obj/item/storage/bag/sheetsnatcher/quick_empty /obj/item/storage/bag/sheetsnatcher/can_be_inserted(obj/item/W as obj, stop_messages = 0) if(!istype(W,/obj/item/stack/sheet) || istype(W,/obj/item/stack/sheet/mineral/sandstone) || istype(W,/obj/item/stack/sheet/wood)) @@ -289,7 +285,7 @@ var/col_count = min(7,storage_slots) -1 if(adjusted_contents > 7) row_num = round((adjusted_contents-1) / 7) // 7 is the maximum allowed width. - src.standard_orient_objs(row_num, col_count, numbered_contents) + standard_orient_objs(row_num, col_count, numbered_contents) return @@ -376,7 +372,7 @@ icon_state = "tray" desc = "A metal tray to lay food on." force = 5 - throwforce = 10.0 + throwforce = 10 throw_speed = 3 throw_range = 5 w_class = WEIGHT_CLASS_BULKY @@ -465,8 +461,7 @@ /obj/item/storage/bag/tray/cookies_tray var/cookie = /obj/item/reagent_containers/food/snacks/cookie -/obj/item/storage/bag/tray/cookies_tray/New() /// By Azule Utama, thank you a lot! - ..() +/obj/item/storage/bag/tray/cookies_tray/populate_contents() // By Azule Utama, thank you a lot! for(var/i in 1 to 6) var/obj/item/C = new cookie(src) handle_item_insertion(C) // Done this way so the tray actually has the cookies visible when spawned diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index 172a95d3cd0..301b43403f6 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -9,7 +9,9 @@ slot_flags = SLOT_BELT attack_verb = list("whipped", "lashed", "disciplined") max_integrity = 300 - var/use_item_overlays = 0 // Do we have overlays for items held inside the belt? + equip_sound = 'sound/items/equip/toolbelt_equip.ogg' + /// Do we have overlays for items held inside the belt? + var/use_item_overlays = FALSE /obj/item/storage/belt/update_icon() if(use_item_overlays) @@ -21,20 +23,20 @@ /obj/item/storage/belt/proc/can_use() return is_equipped() -/obj/item/storage/belt/MouseDrop(obj/over_object as obj, src_location, over_location) +/obj/item/storage/belt/MouseDrop(obj/over_object, src_location, over_location) var/mob/M = usr if(!istype(over_object, /obj/screen)) return ..() - playsound(src.loc, "rustle", 50, 1, -5) + playsound(loc, "rustle", 50, TRUE, -5) if(!M.restrained() && !M.stat && can_use()) switch(over_object.name) if("r_hand") - M.unEquip(src) + M.unEquip(src, silent = TRUE) M.put_in_r_hand(src) if("l_hand") - M.unEquip(src) + M.unEquip(src, silent = TRUE) M.put_in_l_hand(src) - src.add_fingerprint(usr) + add_fingerprint(usr) return /obj/item/storage/belt/deserialize(list/data) @@ -46,7 +48,9 @@ desc = "Can hold various tools." icon_state = "utilitybelt" item_state = "utility" - use_item_overlays = 1 + use_item_overlays = TRUE + drop_sound = 'sound/items/handling/toolbelt_drop.ogg' + pickup_sound = 'sound/items/handling/toolbelt_pickup.ogg' can_hold = list( /obj/item/crowbar, /obj/item/screwdriver, @@ -58,11 +62,11 @@ /obj/item/stack/cable_coil, /obj/item/t_scanner, /obj/item/analyzer, + /obj/item/geiger_counter, /obj/item/extinguisher/mini, /obj/item/holosign_creator) -/obj/item/storage/belt/utility/full/New() - ..() +/obj/item/storage/belt/utility/full/populate_contents() new /obj/item/screwdriver(src) new /obj/item/wrench(src) new /obj/item/weldingtool(src) @@ -71,13 +75,12 @@ new /obj/item/stack/cable_coil/random(src, 30) update_icon() -/obj/item/storage/belt/utility/full/multitool/New() +/obj/item/storage/belt/utility/full/multitool/populate_contents() ..() new /obj/item/multitool(src) update_icon() -/obj/item/storage/belt/utility/atmostech/New() - ..() +/obj/item/storage/belt/utility/atmostech/populate_contents() new /obj/item/screwdriver(src) new /obj/item/wrench(src) new /obj/item/weldingtool(src) @@ -93,8 +96,7 @@ icon_state = "utilitybelt_ce" item_state = "utility_ce" -/obj/item/storage/belt/utility/chief/full/New() - ..() +/obj/item/storage/belt/utility/chief/full/populate_contents() new /obj/item/screwdriver/power(src) new /obj/item/crowbar/power(src) new /obj/item/weldingtool/experimental(src)//This can be changed if this is too much @@ -106,12 +108,12 @@ //much roomier now that we've managed to remove two tools /obj/item/storage/belt/medical - use_to_pickup = 1 //Allow medical belt to pick up medicine name = "medical belt" desc = "Can hold various medical equipment." icon_state = "medicalbelt" item_state = "medical" - use_item_overlays = 1 + use_to_pickup = TRUE //Allow medical belt to pick up medicine + use_item_overlays = TRUE max_w_class = WEIGHT_CLASS_NORMAL can_hold = list( /obj/item/healthanalyzer, @@ -135,17 +137,18 @@ /obj/item/sensor_device, /obj/item/wrench/medical, /obj/item/handheld_defibrillator, - /obj/item/reagent_containers/applicator + /obj/item/reagent_containers/applicator, + /obj/item/geiger_counter ) /obj/item/storage/belt/medical/surgery max_w_class = WEIGHT_CLASS_NORMAL max_combined_w_class = 17 - use_to_pickup = 1 + use_to_pickup = TRUE name = "surgical belt" desc = "Can hold various surgical tools." storage_slots = 9 - use_item_overlays = 1 + use_item_overlays = TRUE can_hold = list( /obj/item/scalpel, /obj/item/hemostat, @@ -158,10 +161,7 @@ /obj/item/cautery, ) -/obj/item/storage/belt/medical/surgery/loaded - -/obj/item/storage/belt/medical/surgery/loaded/New() - ..() +/obj/item/storage/belt/medical/surgery/loaded/populate_contents() new /obj/item/scalpel(src) new /obj/item/hemostat(src) new /obj/item/retractor(src) @@ -172,10 +172,7 @@ new /obj/item/surgicaldrill(src) new /obj/item/cautery(src) -/obj/item/storage/belt/medical/response_team - -/obj/item/storage/belt/medical/response_team/New() - ..() +/obj/item/storage/belt/medical/response_team/populate_contents() new /obj/item/reagent_containers/food/pill/salbutamol(src) new /obj/item/reagent_containers/food/pill/salbutamol(src) new /obj/item/reagent_containers/food/pill/charcoal(src) @@ -190,7 +187,7 @@ desc = "Can hold various botanical supplies." icon_state = "botanybelt" item_state = "botany" - use_item_overlays = 1 + use_item_overlays = TRUE can_hold = list( /obj/item/plant_analyzer, /obj/item/cultivator, @@ -216,7 +213,7 @@ item_state = "security"//Could likely use a better one. storage_slots = 5 max_w_class = WEIGHT_CLASS_NORMAL - use_item_overlays = 1 + use_item_overlays = TRUE can_hold = list( /obj/item/grenade/flashbang, /obj/item/grenade/chem_grenade/teargas, @@ -235,13 +232,11 @@ /obj/item/melee/classic_baton/telescopic, /obj/item/restraints/legcuffs/bola) -/obj/item/storage/belt/security/sec/New() - ..() +/obj/item/storage/belt/security/sec/populate_contents() new /obj/item/flashlight/seclite(src) update_icon() -/obj/item/storage/belt/security/response_team/New() - ..() +/obj/item/storage/belt/security/response_team/populate_contents() new /obj/item/reagent_containers/spray/pepper(src) new /obj/item/melee/baton/loaded(src) new /obj/item/flash(src) @@ -249,8 +244,7 @@ new /obj/item/grenade/flashbang(src) update_icon() -/obj/item/storage/belt/security/response_team_gamma/New() - ..() +/obj/item/storage/belt/security/response_team_gamma/populate_contents() new /obj/item/melee/baton/loaded(src) new /obj/item/reagent_containers/spray/pepper(src) new /obj/item/flash(src) @@ -272,19 +266,14 @@ icon_state = "soulstonebelt" item_state = "soulstonebelt" storage_slots = 6 - use_item_overlays = 1 + use_item_overlays = TRUE can_hold = list( "/obj/item/soulstone" ) -/obj/item/storage/belt/soulstone/full/New() - ..() - new /obj/item/soulstone(src) - new /obj/item/soulstone(src) - new /obj/item/soulstone(src) - new /obj/item/soulstone(src) - new /obj/item/soulstone(src) - new /obj/item/soulstone(src) +/obj/item/storage/belt/soulstone/full/populate_contents() + for(var/I in 1 to 6) + new /obj/item/soulstone(src) update_icon() @@ -294,7 +283,7 @@ icon_state = "championbelt" item_state = "champion" materials = list(MAT_GOLD=400) - storage_slots = 1 + storage_slots = TRUE can_hold = list( "/obj/item/clothing/mask/luchador" ) @@ -316,12 +305,9 @@ desc = "Can hold various tools. This model seems to have additional compartments." icon_state = "utilitybelt" item_state = "utility" - use_item_overlays = 1 // So it will still show tools in it in case sec get lazy and just glance at it. + use_item_overlays = TRUE // So it will still show tools in it in case sec get lazy and just glance at it. -/obj/item/storage/belt/military/traitor/hacker - -/obj/item/storage/belt/military/traitor/hacker/New() - ..() +/obj/item/storage/belt/military/traitor/hacker/populate_contents() new /obj/item/screwdriver(src, "red") new /obj/item/wrench(src) new /obj/item/weldingtool/largetank(src) @@ -337,41 +323,25 @@ item_state = "assault" storage_slots = 30 max_combined_w_class = 60 - display_contents_with_number = 1 + display_contents_with_number = TRUE can_hold = list( /obj/item/grenade, /obj/item/lighter, /obj/item/reagent_containers/food/drinks/bottle/molotov ) -/obj/item/storage/belt/grenade/full/New() - ..() - new /obj/item/grenade/smokebomb(src) //4 - new /obj/item/grenade/smokebomb(src) - new /obj/item/grenade/smokebomb(src) - new /obj/item/grenade/smokebomb(src) - new /obj/item/grenade/empgrenade(src) //2 - new /obj/item/grenade/empgrenade(src) - new /obj/item/grenade/gluon(src) //4 - new /obj/item/grenade/gluon(src) - new /obj/item/grenade/gluon(src) - new /obj/item/grenade/gluon(src) +/obj/item/storage/belt/grenade/full/populate_contents() + for(var/I in 1 to 4) + new /obj/item/grenade/smokebomb(src) // Four of each + new /obj/item/grenade/gluon(src) + for(var/I in 1 to 10) + new /obj/item/grenade/frag(src) + for(var/I in 1 to 2) + new /obj/item/grenade/gas/plasma(src) + new /obj/item/grenade/empgrenade(src) + new /obj/item/grenade/syndieminibomb(src) new /obj/item/grenade/chem_grenade/facid(src) //1 new /obj/item/grenade/chem_grenade/saringas(src) //1 - new /obj/item/grenade/gas/plasma(src) //2 - new /obj/item/grenade/gas/plasma(src) - new /obj/item/grenade/frag(src) //10 - new /obj/item/grenade/frag(src) - new /obj/item/grenade/frag(src) - new /obj/item/grenade/frag(src) - new /obj/item/grenade/frag(src) - new /obj/item/grenade/frag(src) - new /obj/item/grenade/frag(src) - new /obj/item/grenade/frag(src) - new /obj/item/grenade/frag(src) - new /obj/item/grenade/frag(src) - new /obj/item/grenade/syndieminibomb(src) //2 - new /obj/item/grenade/syndieminibomb(src) /obj/item/storage/belt/military/abductor name = "agent belt" @@ -380,8 +350,7 @@ icon_state = "belt" item_state = "security" -/obj/item/storage/belt/military/abductor/full/New() - ..() +/obj/item/storage/belt/military/abductor/full/populate_contents() new /obj/item/screwdriver/abductor(src) new /obj/item/wrench/abductor(src) new /obj/item/weldingtool/abductor(src) @@ -404,7 +373,7 @@ item_state = "janibelt" storage_slots = 6 max_w_class = WEIGHT_CLASS_BULKY // Set to this so the light replacer can fit. - use_item_overlays = 1 + use_item_overlays = TRUE can_hold = list( /obj/item/grenade/chem_grenade/cleaner, /obj/item/lightreplacer, @@ -415,8 +384,7 @@ /obj/item/melee/flyswatter, ) -/obj/item/storage/belt/janitor/full/New() - ..() +/obj/item/storage/belt/janitor/full/populate_contents() new /obj/item/lightreplacer(src) new /obj/item/holosign_creator(src) new /obj/item/reagent_containers/spray/cleaner(src) @@ -437,22 +405,21 @@ storage_slots = 6 can_hold = list(/obj/item/mobcapsule) -/obj/item/storage/belt/lazarus/New() - ..() +/obj/item/storage/belt/lazarus/Initialize(mapload) + . = ..() update_icon() - /obj/item/storage/belt/lazarus/update_icon() ..() - icon_state = "[initial(icon_state)]_[contents.len]" + icon_state = "[initial(icon_state)]_[length(contents)]" -/obj/item/storage/belt/lazarus/attackby(obj/item/W, mob/user) - var/amount = contents.len +/obj/item/storage/belt/lazarus/attackby(obj/item/I, mob/user) + var/amount = length(contents) . = ..() - if(amount != contents.len) + if(amount != length(contents)) update_icon() -/obj/item/storage/belt/lazarus/remove_from_storage(obj/item/W as obj, atom/new_location) +/obj/item/storage/belt/lazarus/remove_from_storage(obj/item/I, atom/new_location) ..() update_icon() @@ -463,39 +430,25 @@ icon_state = "bandolier" item_state = "bandolier" storage_slots = 8 - can_hold = list( - /obj/item/ammo_casing/shotgun - ) + can_hold = list(/obj/item/ammo_casing/shotgun) -/obj/item/storage/belt/bandolier/New() - ..() +/obj/item/storage/belt/bandolier/Initialize(mapload) + . = ..() update_icon() -/obj/item/storage/belt/bandolier/full/New() - ..() - new /obj/item/ammo_casing/shotgun/beanbag(src) - new /obj/item/ammo_casing/shotgun/beanbag(src) - new /obj/item/ammo_casing/shotgun/beanbag(src) - new /obj/item/ammo_casing/shotgun/beanbag(src) - new /obj/item/ammo_casing/shotgun/beanbag(src) - new /obj/item/ammo_casing/shotgun/beanbag(src) - new /obj/item/ammo_casing/shotgun/beanbag(src) - new /obj/item/ammo_casing/shotgun/beanbag(src) - update_icon() +/obj/item/storage/belt/bandolier/full/populate_contents() + for(var/I in 1 to 8) + new /obj/item/ammo_casing/shotgun/beanbag(src) /obj/item/storage/belt/bandolier/update_icon() ..() - icon_state = "[initial(icon_state)]_[contents.len]" + icon_state = "[initial(icon_state)]_[length(contents)]" -/obj/item/storage/belt/bandolier/attackby(obj/item/W, mob/user) - var/amount = contents.len - . = ..() - if(amount != contents.len) - update_icon() - -/obj/item/storage/belt/bandolier/remove_from_storage(obj/item/W as obj, atom/new_location) +/obj/item/storage/belt/bandolier/attackby(obj/item/I, mob/user) + var/amount = length(contents) ..() - update_icon() + if(amount != length(contents)) + update_icon() /obj/item/storage/belt/holster name = "shoulder holster" @@ -515,13 +468,12 @@ icon_state = "soulstonebelt" item_state = "soulstonebelt" storage_slots = 6 - use_item_overlays = 1 + use_item_overlays = TRUE can_hold = list( /obj/item/gun/magic/wand ) -/obj/item/storage/belt/wands/full/New() - ..() +/obj/item/storage/belt/wands/full/populate_contents() new /obj/item/gun/magic/wand/death(src) new /obj/item/gun/magic/wand/resurrection(src) new /obj/item/gun/magic/wand/polymorph(src) @@ -602,8 +554,7 @@ max_w_class = WEIGHT_CLASS_BULKY can_hold = list(/obj/item/melee/rapier) -/obj/item/storage/belt/rapier/New() - ..() +/obj/item/storage/belt/rapier/populate_contents() new /obj/item/melee/rapier(src) update_icon() @@ -671,7 +622,7 @@ max_w_class = WEIGHT_CLASS_NORMAL max_combined_w_class = 18 origin_tech = "bluespace=5;materials=4;engineering=4;plasmatech=5" - allow_quick_empty = 1 + allow_quick_empty = TRUE can_hold = list( /obj/item/grenade/smokebomb, /obj/item/restraints/legcuffs/bola @@ -682,17 +633,17 @@ var/bolacount = 0 var/cooldown = 0 -/obj/item/storage/belt/bluespace/owlman/New() - ..() - new /obj/item/grenade/smokebomb(src) - new /obj/item/grenade/smokebomb(src) - new /obj/item/grenade/smokebomb(src) - new /obj/item/grenade/smokebomb(src) - new /obj/item/restraints/legcuffs/bola(src) - new /obj/item/restraints/legcuffs/bola(src) +/obj/item/storage/belt/bluespace/owlman/Initialize(mapload) + . = ..() START_PROCESSING(SSobj, src) cooldown = world.time +/obj/item/storage/belt/bluespace/owlman/populate_contents() + for(var/I in 1 to 4) + new /obj/item/grenade/smokebomb(src) + new /obj/item/restraints/legcuffs/bola(src) + new /obj/item/restraints/legcuffs/bola(src) + /obj/item/storage/belt/bluespace/owlman/Destroy() STOP_PROCESSING(SSobj, src) return ..() @@ -723,7 +674,7 @@ if(H.s_active && H.s_active == src) H.s_active.show_to(H) -/obj/item/storage/belt/bluespace/attack(mob/M as mob, mob/user as mob, def_zone) +/obj/item/storage/belt/bluespace/attack(mob/M, mob/user, def_zone) return /obj/item/storage/belt/bluespace/admin @@ -737,8 +688,7 @@ max_combined_w_class = 280 can_hold = list() -/obj/item/storage/belt/bluespace/admin/New() - ..() +/obj/item/storage/belt/bluespace/admin/populate_contents() new /obj/item/crowbar(src) new /obj/item/screwdriver(src) new /obj/item/weldingtool/hugetank(src) @@ -766,8 +716,7 @@ max_combined_w_class = 280 can_hold = list() -/obj/item/storage/belt/bluespace/sandbox/New() - ..() +/obj/item/storage/belt/bluespace/sandbox/populate_contents() new /obj/item/crowbar(src) new /obj/item/screwdriver(src) new /obj/item/weldingtool/hugetank(src) @@ -787,7 +736,7 @@ storage_slots = 6 max_w_class = WEIGHT_CLASS_BULKY max_combined_w_class = 20 - use_item_overlays = 0 + use_item_overlays = FALSE can_hold = list( /obj/item/crowbar, /obj/item/screwdriver, diff --git a/code/game/objects/items/weapons/storage/bible.dm b/code/game/objects/items/weapons/storage/bible.dm index 2479c408043..384dc250901 100644 --- a/code/game/objects/items/weapons/storage/bible.dm +++ b/code/game/objects/items/weapons/storage/bible.dm @@ -6,6 +6,8 @@ throw_range = 5 w_class = WEIGHT_CLASS_NORMAL resistance_flags = FIRE_PROOF + drop_sound = 'sound/items/handling/book_drop.ogg' + pickup_sound = 'sound/items/handling/book_pickup.ogg' var/mob/affecting = null var/deity_name = "Christ" /// Is the sprite of this bible customisable @@ -49,8 +51,7 @@ desc = "To be applied to the head repeatedly." icon_state ="bible" -/obj/item/storage/bible/booze/New() - ..() +/obj/item/storage/bible/booze/populate_contents() new /obj/item/reagent_containers/food/drinks/cans/beer(src) new /obj/item/reagent_containers/food/drinks/cans/beer(src) new /obj/item/stack/spacecash(src) @@ -82,7 +83,7 @@ user.take_organ_damage(0, 10) return - if((CLUMSY in user.mutations) && prob(50)) + if(HAS_TRAIT(user, TRAIT_CLUMSY) && prob(50)) to_chat(user, "The [src] slips out of your hand and hits your head.") user.take_organ_damage(10) user.Paralyse(20) diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index 03db813b24e..4531490a9b3 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -25,6 +25,8 @@ icon_state = "box" item_state = "syringe_kit" resistance_flags = FLAMMABLE + drop_sound = 'sound/items/handling/cardboardbox_drop.ogg' + pickup_sound = 'sound/items/handling/cardboardbox_pickup.ogg' foldable = /obj/item/stack/sheet/cardboard foldable_amt = 1 @@ -40,57 +42,45 @@ /obj/item/storage/box/survival icon_state = "box_civ" -/obj/item/storage/box/survival/New() - ..() - contents = list() - new /obj/item/clothing/mask/breath( src ) - new /obj/item/tank/emergency_oxygen( src ) - new /obj/item/reagent_containers/hypospray/autoinjector( src ) - new /obj/item/flashlight/flare/glowstick/emergency( src ) - return +/obj/item/storage/box/survival/populate_contents() + new /obj/item/clothing/mask/breath(src) + new /obj/item/tank/internals/emergency_oxygen(src) + new /obj/item/reagent_containers/hypospray/autoinjector(src) + new /obj/item/flashlight/flare/glowstick/emergency(src) /obj/item/storage/box/survival_vox icon_state = "box_vox" -/obj/item/storage/box/survival_vox/New() - ..() - contents = list() +/obj/item/storage/box/survival_vox/populate_contents() new /obj/item/clothing/mask/breath/vox(src) - new /obj/item/tank/emergency_oxygen/nitrogen(src) + new /obj/item/tank/internals/emergency_oxygen/nitrogen(src) new /obj/item/reagent_containers/hypospray/autoinjector(src) new /obj/item/flashlight/flare/glowstick/emergency(src) /obj/item/storage/box/survival_plasmaman icon_state = "box_plasma" -/obj/item/storage/box/survival_plasmaman/New() - ..() - contents = list() +/obj/item/storage/box/survival_plasmaman/populate_contents() new /obj/item/clothing/mask/breath(src) - new /obj/item/tank/emergency_oxygen/plasma(src) + new /obj/item/tank/internals/emergency_oxygen/plasma(src) new /obj/item/reagent_containers/hypospray/autoinjector(src) new /obj/item/flashlight/flare/glowstick/emergency(src) /obj/item/storage/box/engineer icon_state = "box_eng" -/obj/item/storage/box/engineer/New() - ..() - contents = list() - new /obj/item/clothing/mask/breath( src ) - new /obj/item/tank/emergency_oxygen/engi( src ) - new /obj/item/reagent_containers/hypospray/autoinjector( src ) - new /obj/item/flashlight/flare/glowstick/emergency( src ) - return +/obj/item/storage/box/engineer/populate_contents() + new /obj/item/clothing/mask/breath(src) + new /obj/item/tank/internals/emergency_oxygen/engi(src) + new /obj/item/reagent_containers/hypospray/autoinjector(src) + new /obj/item/flashlight/flare/glowstick/emergency(src) /obj/item/storage/box/survival_mining icon_state = "box_min" -/obj/item/storage/box/survival_mining/New() - ..() - contents = list() +/obj/item/storage/box/survival_mining/populate_contents() new /obj/item/clothing/mask/gas/explorer(src) - new /obj/item/tank/emergency_oxygen/engi(src) + new /obj/item/tank/internals/emergency_oxygen/engi(src) new /obj/item/crowbar/red(src) new /obj/item/reagent_containers/hypospray/autoinjector(src) new /obj/item/flashlight/flare/glowstick/emergency(src) @@ -98,11 +88,9 @@ /obj/item/storage/box/survival_syndi icon_state = "box_syndi" -/obj/item/storage/box/survival_syndi/New() - ..() - contents = list() +/obj/item/storage/box/survival_syndi/populate_contents() new /obj/item/clothing/mask/gas/syndicate(src) - new /obj/item/tank/emergency_oxygen/syndi(src) + new /obj/item/tank/internals/emergency_oxygen/engi/syndi(src) new /obj/item/reagent_containers/hypospray/autoinjector(src) new /obj/item/reagent_containers/food/pill/initropidril(src) new /obj/item/flashlight/flare/glowstick/red(src) @@ -112,31 +100,18 @@ desc = "Contains white gloves." icon_state = "latex" -/obj/item/storage/box/gloves/New() - ..() - new /obj/item/clothing/gloves/color/latex(src) - new /obj/item/clothing/gloves/color/latex(src) - new /obj/item/clothing/gloves/color/latex(src) - new /obj/item/clothing/gloves/color/latex(src) - new /obj/item/clothing/gloves/color/latex(src) - new /obj/item/clothing/gloves/color/latex(src) - new /obj/item/clothing/gloves/color/latex(src) +/obj/item/storage/box/gloves/populate_contents() + for(var/I in 1 to 7) + new /obj/item/clothing/gloves/color/latex(src) /obj/item/storage/box/masks name = "sterile masks" desc = "This box contains masks of sterility." icon_state = "sterile" -/obj/item/storage/box/masks/New() - ..() - new /obj/item/clothing/mask/surgical(src) - new /obj/item/clothing/mask/surgical(src) - new /obj/item/clothing/mask/surgical(src) - new /obj/item/clothing/mask/surgical(src) - new /obj/item/clothing/mask/surgical(src) - new /obj/item/clothing/mask/surgical(src) - new /obj/item/clothing/mask/surgical(src) - +/obj/item/storage/box/masks/populate_contents() + for(var/I in 1 to 7) + new /obj/item/clothing/mask/surgical(src) /obj/item/storage/box/syringes name = "syringes" @@ -144,37 +119,24 @@ desc = "A biohazard alert warning is printed on the box" icon_state = "syringe" -/obj/item/storage/box/syringes/New() - ..() - new /obj/item/reagent_containers/syringe( src ) - new /obj/item/reagent_containers/syringe( src ) - new /obj/item/reagent_containers/syringe( src ) - new /obj/item/reagent_containers/syringe( src ) - new /obj/item/reagent_containers/syringe( src ) - new /obj/item/reagent_containers/syringe( src ) - new /obj/item/reagent_containers/syringe( src ) +/obj/item/storage/box/syringes/populate_contents() + for(var/I in 1 to 7) + new /obj/item/reagent_containers/syringe(src) /obj/item/storage/box/beakers name = "beaker box" icon_state = "beaker" -/obj/item/storage/box/beakers/New() - ..() - new /obj/item/reagent_containers/glass/beaker( src ) - new /obj/item/reagent_containers/glass/beaker( src ) - new /obj/item/reagent_containers/glass/beaker( src ) - new /obj/item/reagent_containers/glass/beaker( src ) - new /obj/item/reagent_containers/glass/beaker( src ) - new /obj/item/reagent_containers/glass/beaker( src ) - new /obj/item/reagent_containers/glass/beaker( src ) +/obj/item/storage/box/beakers/populate_contents() + for(var/I in 1 to 7) + new /obj/item/reagent_containers/glass/beaker(src) /obj/item/storage/box/beakers/bluespace name = "box of bluespace beakers" icon_state = "beaker" -/obj/item/storage/box/beakers/bluespace/New() - ..() - for(var/i in 1 to 7) +/obj/item/storage/box/beakers/bluespace/populate_contents() + for(var/I in 1 to 7) new /obj/item/reagent_containers/glass/beaker/bluespace(src) /obj/item/storage/box/iv_bags @@ -182,48 +144,34 @@ desc = "A box full of empty IV bags." icon_state = "beaker" -/obj/item/storage/box/iv_bags/New() - ..() - new /obj/item/reagent_containers/iv_bag( src ) - new /obj/item/reagent_containers/iv_bag( src ) - new /obj/item/reagent_containers/iv_bag( src ) - new /obj/item/reagent_containers/iv_bag( src ) - new /obj/item/reagent_containers/iv_bag( src ) - new /obj/item/reagent_containers/iv_bag( src ) - new /obj/item/reagent_containers/iv_bag( src ) +/obj/item/storage/box/iv_bags/populate_contents() + for(var/I in 1 to 7) + new /obj/item/reagent_containers/iv_bag(src) /obj/item/storage/box/injectors name = "\improper DNA injectors" desc = "This box contains injectors it seems." -/obj/item/storage/box/injectors/New() - ..() - new /obj/item/dnainjector/h2m(src) - new /obj/item/dnainjector/h2m(src) - new /obj/item/dnainjector/h2m(src) - new /obj/item/dnainjector/m2h(src) - new /obj/item/dnainjector/m2h(src) - new /obj/item/dnainjector/m2h(src) +/obj/item/storage/box/injectors/populate_contents() + for(var/I in 1 to 6) + new /obj/item/dnainjector/h2m(src) /obj/item/storage/box/slug name = "Ammunition Box (Slug)" desc = "A small box capable of holding seven shotgun shells." icon_state = "slugbox" -/obj/item/storage/box/slug/New() - ..() - for(var/i in 1 to 7) +/obj/item/storage/box/slug/populate_contents() + for(var/I in 1 to 7) new /obj/item/ammo_casing/shotgun(src) - /obj/item/storage/box/buck name = "Ammunition Box (Buckshot)" desc = "A small box capable of holding seven shotgun shells." icon_state = "buckshotbox" -/obj/item/storage/box/buck/New() - ..() - for(var/i in 1 to 7) +/obj/item/storage/box/buck/populate_contents() + for(var/I in 1 to 7) new /obj/item/ammo_casing/shotgun/buckshot(src) /obj/item/storage/box/dragonsbreath @@ -231,9 +179,8 @@ desc = "A small box capable of holding seven shotgun shells." icon_state = "dragonsbreathbox" -/obj/item/storage/box/dragonsbreath/New() - ..() - for(var/i in 1 to 7) +/obj/item/storage/box/dragonsbreath/populate_contents() + for(var/I in 1 to 7) new /obj/item/ammo_casing/shotgun/incendiary/dragonsbreath(src) /obj/item/storage/box/stun @@ -241,9 +188,8 @@ desc = "A small box capable of holding seven shotgun shells." icon_state = "stunbox" -/obj/item/storage/box/stun/New() - ..() - for(var/i in 1 to 7) +/obj/item/storage/box/stun/populate_contents() + for(var/I in 1 to 7) new /obj/item/ammo_casing/shotgun/stunslug(src) /obj/item/storage/box/beanbag @@ -251,9 +197,8 @@ desc = "A small box capable of holding seven shotgun shells." icon_state = "beanbagbox" -/obj/item/storage/box/beanbag/New() - ..() - for(var/i in 1 to 7) +/obj/item/storage/box/beanbag/populate_contents() + for(var/I in 1 to 7) new /obj/item/ammo_casing/shotgun/beanbag(src) /obj/item/storage/box/rubbershot @@ -261,9 +206,8 @@ desc = "A small box capable of holding seven shotgun shells." icon_state = "rubbershotbox" -/obj/item/storage/box/rubbershot/New() - ..() - for(var/i in 1 to 7) +/obj/item/storage/box/rubbershot/populate_contents() + for(var/I in 1 to 7) new /obj/item/ammo_casing/shotgun/rubbershot(src) /obj/item/storage/box/tranquilizer @@ -271,9 +215,8 @@ desc = "A small box capable of holding seven shotgun shells." icon_state = "tranqbox" -/obj/item/storage/box/tranquilizer/New() - ..() - for(var/i in 1 to 7) +/obj/item/storage/box/tranquilizer/populate_contents() + for(var/I in 1 to 7) new /obj/item/ammo_casing/shotgun/tranquilizer(src) /obj/item/storage/box/flashbangs @@ -281,57 +224,36 @@ desc = "WARNING: These devices are extremely dangerous and can cause blindness or deafness in repeated use." icon_state = "flashbang" -/obj/item/storage/box/flashbangs/New() - ..() - new /obj/item/grenade/flashbang(src) - new /obj/item/grenade/flashbang(src) - new /obj/item/grenade/flashbang(src) - new /obj/item/grenade/flashbang(src) - new /obj/item/grenade/flashbang(src) - new /obj/item/grenade/flashbang(src) - new /obj/item/grenade/flashbang(src) +/obj/item/storage/box/flashbangs/populate_contents() + for(var/I in 1 to 7) + new /obj/item/grenade/flashbang(src) /obj/item/storage/box/flashes name = "box of flashbulbs" desc = "WARNING: Flashes can cause serious eye damage, protective eyewear is required." icon_state = "flashbang" -/obj/item/storage/box/flashes/New() - ..() - new /obj/item/flash(src) - new /obj/item/flash(src) - new /obj/item/flash(src) - new /obj/item/flash(src) - new /obj/item/flash(src) - new /obj/item/flash(src) +/obj/item/storage/box/flashes/populate_contents() + for(var/I in 1 to 6) + new /obj/item/flash(src) /obj/item/storage/box/teargas name = "box of tear gas grenades (WARNING)" desc = "WARNING: These devices are extremely dangerous and can cause blindness and skin irritation." icon_state = "flashbang" -/obj/item/storage/box/teargas/New() - ..() - new /obj/item/grenade/chem_grenade/teargas(src) - new /obj/item/grenade/chem_grenade/teargas(src) - new /obj/item/grenade/chem_grenade/teargas(src) - new /obj/item/grenade/chem_grenade/teargas(src) - new /obj/item/grenade/chem_grenade/teargas(src) - new /obj/item/grenade/chem_grenade/teargas(src) - new /obj/item/grenade/chem_grenade/teargas(src) +/obj/item/storage/box/teargas/populate_contents() + for(var/I in 1 to 7) + new /obj/item/grenade/chem_grenade/teargas(src) /obj/item/storage/box/emps name = "emp grenades" desc = "A box with 5 emp grenades." icon_state = "flashbang" -/obj/item/storage/box/emps/New() - ..() - new /obj/item/grenade/empgrenade(src) - new /obj/item/grenade/empgrenade(src) - new /obj/item/grenade/empgrenade(src) - new /obj/item/grenade/empgrenade(src) - new /obj/item/grenade/empgrenade(src) +/obj/item/storage/box/emps/populate_contents() + for(var/I in 1 to 5) + new /obj/item/grenade/empgrenade(src) /obj/item/storage/box/trackimp @@ -339,8 +261,7 @@ desc = "Box full of scum-bag tracking utensils." icon_state = "implant" -/obj/item/storage/box/trackimp/New() - ..() +/obj/item/storage/box/trackimp/populate_contents() new /obj/item/implantcase/tracking(src) new /obj/item/implantcase/tracking(src) new /obj/item/implantcase/tracking(src) @@ -354,8 +275,7 @@ desc = "For finding those who have died on the accursed lavaworld." icon_state = "implant" -/obj/item/storage/box/minertracker/New() - ..() +/obj/item/storage/box/minertracker/populate_contents() new /obj/item/implantcase/tracking(src) new /obj/item/implantcase/tracking(src) new /obj/item/implantcase/tracking(src) @@ -368,13 +288,9 @@ desc = "Box of stuff used to implant chemicals." icon_state = "implant" -/obj/item/storage/box/chemimp/New() - ..() - new /obj/item/implantcase/chem(src) - new /obj/item/implantcase/chem(src) - new /obj/item/implantcase/chem(src) - new /obj/item/implantcase/chem(src) - new /obj/item/implantcase/chem(src) +/obj/item/storage/box/chemimp/populate_contents() + for(var/I in 1 to 5) + new /obj/item/implantcase/chem(src) new /obj/item/implanter(src) new /obj/item/implantpad(src) @@ -383,13 +299,9 @@ desc = "Box of exile implants. It has a picture of a clown being booted through the Gateway." icon_state = "implant" -/obj/item/storage/box/exileimp/New() - ..() - new /obj/item/implantcase/exile(src) - new /obj/item/implantcase/exile(src) - new /obj/item/implantcase/exile(src) - new /obj/item/implantcase/exile(src) - new /obj/item/implantcase/exile(src) +/obj/item/storage/box/exileimp/populate_contents() + for(var/I in 1 to 5) + new /obj/item/implantcase/exile(src) new /obj/item/implanter(src) /obj/item/storage/box/deathimp @@ -397,14 +309,9 @@ desc = "Box of life sign monitoring implants." icon_state = "implant" -/obj/item/storage/box/deathimp/New() - ..() - new /obj/item/implantcase/death_alarm(src) - new /obj/item/implantcase/death_alarm(src) - new /obj/item/implantcase/death_alarm(src) - new /obj/item/implantcase/death_alarm(src) - new /obj/item/implantcase/death_alarm(src) - new /obj/item/implantcase/death_alarm(src) +/obj/item/storage/box/deathimp/populate_contents() + for(var/I in 1 to 6) + new /obj/item/implantcase/death_alarm(src) new /obj/item/implanter(src) /obj/item/storage/box/tapes @@ -412,114 +319,60 @@ desc = "A box of spare recording tapes" icon_state = "box" -/obj/item/storage/box/tapes/New() - ..() - new /obj/item/tape(src) - new /obj/item/tape(src) - new /obj/item/tape(src) - new /obj/item/tape(src) - new /obj/item/tape(src) - new /obj/item/tape(src) +/obj/item/storage/box/tapes/populate_contents() + for(var/I in 1 to 6) + new /obj/item/tape(src) /obj/item/storage/box/rxglasses name = "prescription glasses" desc = "This box contains nerd glasses." icon_state = "glasses" -/obj/item/storage/box/rxglasses/New() - ..() - new /obj/item/clothing/glasses/regular(src) - new /obj/item/clothing/glasses/regular(src) - new /obj/item/clothing/glasses/regular(src) - new /obj/item/clothing/glasses/regular(src) - new /obj/item/clothing/glasses/regular(src) - new /obj/item/clothing/glasses/regular(src) - new /obj/item/clothing/glasses/regular(src) +/obj/item/storage/box/rxglasses/populate_contents() + for(var/I in 1 to 7) + new /obj/item/clothing/glasses/regular(src) /obj/item/storage/box/drinkingglasses name = "box of drinking glasses" desc = "It has a picture of drinking glasses on it." -/obj/item/storage/box/drinkingglasses/New() - ..() - new /obj/item/reagent_containers/food/drinks/drinkingglass(src) - new /obj/item/reagent_containers/food/drinks/drinkingglass(src) - new /obj/item/reagent_containers/food/drinks/drinkingglass(src) - new /obj/item/reagent_containers/food/drinks/drinkingglass(src) - new /obj/item/reagent_containers/food/drinks/drinkingglass(src) - new /obj/item/reagent_containers/food/drinks/drinkingglass(src) - -/obj/item/storage/box/cdeathalarm_kit - name = "Death Alarm Kit" - desc = "Box of stuff used to implant death alarms." - icon_state = "implant" - item_state = "syringe_kit" - -/obj/item/storage/box/cdeathalarm_kit/New() - ..() - new /obj/item/implanter(src) - new /obj/item/implantcase/death_alarm(src) - new /obj/item/implantcase/death_alarm(src) - new /obj/item/implantcase/death_alarm(src) - new /obj/item/implantcase/death_alarm(src) - new /obj/item/implantcase/death_alarm(src) - new /obj/item/implantcase/death_alarm(src) +/obj/item/storage/box/drinkingglasses/populate_contents() + for(var/I in 1 to 6) + new /obj/item/reagent_containers/food/drinks/drinkingglass(src) /obj/item/storage/box/condimentbottles name = "box of condiment bottles" desc = "It has a large ketchup smear on it." -/obj/item/storage/box/condimentbottles/New() - ..() - new /obj/item/reagent_containers/food/condiment(src) - new /obj/item/reagent_containers/food/condiment(src) - new /obj/item/reagent_containers/food/condiment(src) - new /obj/item/reagent_containers/food/condiment(src) - new /obj/item/reagent_containers/food/condiment(src) - new /obj/item/reagent_containers/food/condiment(src) +/obj/item/storage/box/condimentbottles/populate_contents() + for(var/I in 1 to 6) + new /obj/item/reagent_containers/food/condiment(src) /obj/item/storage/box/cups name = "box of paper cups" desc = "It has pictures of paper cups on the front." -/obj/item/storage/box/cups/New() - ..() - new /obj/item/reagent_containers/food/drinks/sillycup( src ) - new /obj/item/reagent_containers/food/drinks/sillycup( src ) - new /obj/item/reagent_containers/food/drinks/sillycup( src ) - new /obj/item/reagent_containers/food/drinks/sillycup( src ) - new /obj/item/reagent_containers/food/drinks/sillycup( src ) - new /obj/item/reagent_containers/food/drinks/sillycup( src ) - new /obj/item/reagent_containers/food/drinks/sillycup( src ) - +/obj/item/storage/box/cups/populate_contents() + for(var/I in 1 to 7) + new /obj/item/reagent_containers/food/drinks/sillycup(src) /obj/item/storage/box/donkpockets name = "box of donk-pockets" desc = "Instructions: Heat in microwave. Product will cool if not eaten within seven minutes." icon_state = "donk_kit" -/obj/item/storage/box/donkpockets/New() - ..() - new /obj/item/reagent_containers/food/snacks/donkpocket(src) - new /obj/item/reagent_containers/food/snacks/donkpocket(src) - new /obj/item/reagent_containers/food/snacks/donkpocket(src) - new /obj/item/reagent_containers/food/snacks/donkpocket(src) - new /obj/item/reagent_containers/food/snacks/donkpocket(src) - new /obj/item/reagent_containers/food/snacks/donkpocket(src) +/obj/item/storage/box/donkpockets/populate_contents() + for(var/I in 1 to 6) + new /obj/item/reagent_containers/food/snacks/donkpocket(src) /obj/item/storage/box/syndidonkpockets name = "box of donk-pockets" desc = "This box feels slightly warm" icon_state = "donk_kit" -/obj/item/storage/box/syndidonkpockets/New() - ..() - new /obj/item/reagent_containers/food/snacks/syndidonkpocket(src) - new /obj/item/reagent_containers/food/snacks/syndidonkpocket(src) - new /obj/item/reagent_containers/food/snacks/syndidonkpocket(src) - new /obj/item/reagent_containers/food/snacks/syndidonkpocket(src) - new /obj/item/reagent_containers/food/snacks/syndidonkpocket(src) - new /obj/item/reagent_containers/food/snacks/syndidonkpocket(src) +/obj/item/storage/box/syndidonkpockets/populate_contents() + for(var/I in 1 to 6) + new /obj/item/reagent_containers/food/snacks/syndidonkpocket(src) /obj/item/storage/box/monkeycubes name = "monkey cube box" @@ -530,9 +383,8 @@ can_hold = list(/obj/item/reagent_containers/food/snacks/monkeycube) var/monkey_cube_type = /obj/item/reagent_containers/food/snacks/monkeycube -/obj/item/storage/box/monkeycubes/New() - ..() - for(var/i in 1 to 5) +/obj/item/storage/box/monkeycubes/populate_contents() + for(var/I in 1 to 5) new monkey_cube_type(src) /obj/item/storage/box/monkeycubes/syndicate @@ -564,15 +416,9 @@ desc = "A box for containing construction permits, used to officially declare built rooms as additions to the station." icon_state = "id" -/obj/item/storage/box/permits/New() - ..() - new /obj/item/areaeditor/permit(src) - new /obj/item/areaeditor/permit(src) - new /obj/item/areaeditor/permit(src) - new /obj/item/areaeditor/permit(src) - new /obj/item/areaeditor/permit(src) - new /obj/item/areaeditor/permit(src) - new /obj/item/areaeditor/permit(src) +/obj/item/storage/box/permits/populate_contents() + for(var/I in 1 to 7) + new /obj/item/areaeditor/permit(src) /obj/item/storage/box/ids @@ -580,23 +426,16 @@ desc = "Has so many empty IDs." icon_state = "id" -/obj/item/storage/box/ids/New() - ..() - new /obj/item/card/id(src) - new /obj/item/card/id(src) - new /obj/item/card/id(src) - new /obj/item/card/id(src) - new /obj/item/card/id(src) - new /obj/item/card/id(src) - new /obj/item/card/id(src) +/obj/item/storage/box/ids/populate_contents() + for(var/I in 1 to 7) + new /obj/item/card/id(src) /obj/item/storage/box/prisoner name = "prisoner IDs" desc = "Take away their last shred of dignity, their name." icon_state = "id" -/obj/item/storage/box/prisoner/New() - ..() +/obj/item/storage/box/prisoner/populate_contents() new /obj/item/card/id/prisoner/one(src) new /obj/item/card/id/prisoner/two(src) new /obj/item/card/id/prisoner/three(src) @@ -610,23 +449,16 @@ desc = "A box full of R.O.B.U.S.T. Cartridges, used by Security." icon_state = "pda" -/obj/item/storage/box/seccarts/New() - ..() - new /obj/item/cartridge/security(src) - new /obj/item/cartridge/security(src) - new /obj/item/cartridge/security(src) - new /obj/item/cartridge/security(src) - new /obj/item/cartridge/security(src) - new /obj/item/cartridge/security(src) - new /obj/item/cartridge/security(src) +/obj/item/storage/box/seccarts/populate_contents() + for(var/I in 1 to 7) + new /obj/item/cartridge/security(src) /obj/item/storage/box/holobadge name = "holobadge box" icon_state = "box_badge" desc = "A box claiming to contain holobadges." -/obj/item/storage/box/holobadge/New() - ..() +/obj/item/storage/box/holobadge/populate_contents() new /obj/item/clothing/accessory/holobadge(src) new /obj/item/clothing/accessory/holobadge(src) new /obj/item/clothing/accessory/holobadge(src) @@ -639,53 +471,35 @@ desc = "A box claiming to contain evidence bags." icon_state = "box_evidence" -/obj/item/storage/box/evidence/New() - new /obj/item/evidencebag(src) - new /obj/item/evidencebag(src) - new /obj/item/evidencebag(src) - new /obj/item/evidencebag(src) - new /obj/item/evidencebag(src) - new /obj/item/evidencebag(src) - ..() +/obj/item/storage/box/evidence/populate_contents() + for(var/I in 1 to 6) + new /obj/item/evidencebag(src) /obj/item/storage/box/handcuffs name = "spare handcuffs" desc = "A box full of handcuffs." icon_state = "handcuff" -/obj/item/storage/box/handcuffs/New() - ..() - new /obj/item/restraints/handcuffs(src) - new /obj/item/restraints/handcuffs(src) - new /obj/item/restraints/handcuffs(src) - new /obj/item/restraints/handcuffs(src) - new /obj/item/restraints/handcuffs(src) - new /obj/item/restraints/handcuffs(src) - new /obj/item/restraints/handcuffs(src) +/obj/item/storage/box/handcuffs/populate_contents() + for(var/I in 1 to 7) + new /obj/item/restraints/handcuffs(src) /obj/item/storage/box/zipties name = "box of spare zipties" desc = "A box full of zipties." icon_state = "handcuff" -/obj/item/storage/box/zipties/New() - ..() - new /obj/item/restraints/handcuffs/cable/zipties(src) - new /obj/item/restraints/handcuffs/cable/zipties(src) - new /obj/item/restraints/handcuffs/cable/zipties(src) - new /obj/item/restraints/handcuffs/cable/zipties(src) - new /obj/item/restraints/handcuffs/cable/zipties(src) - new /obj/item/restraints/handcuffs/cable/zipties(src) - new /obj/item/restraints/handcuffs/cable/zipties(src) +/obj/item/storage/box/zipties/populate_contents() + for(var/I in 1 to 7) + new /obj/item/restraints/handcuffs/cable/zipties(src) /obj/item/storage/box/alienhandcuffs name = "box of spare handcuffs" desc = "A box full of handcuffs." icon_state = "alienboxCuffs" -/obj/item/storage/box/alienhandcuffs/New() - ..() - for(var/i in 1 to 7) +/obj/item/storage/box/alienhandcuffs/populate_contents() + for(var/I in 1 to 7) new /obj/item/restraints/handcuffs/alien(src) /obj/item/storage/box/fakesyndiesuit @@ -693,8 +507,7 @@ desc = "A sleek, sturdy box used to hold replica spacesuits." icon_state = "box_of_doom" -/obj/item/storage/box/fakesyndiesuit/New() - ..() +/obj/item/storage/box/fakesyndiesuit/populate_contents() new /obj/item/clothing/head/syndicatefake(src) new /obj/item/clothing/suit/syndicatefake(src) @@ -703,8 +516,7 @@ desc = "A box marked with pictures of an enforcer pistol, two ammo clips, and the word 'NON-LETHAL'." icon_state = "box_ert" -/obj/item/storage/box/enforcer_rubber/New() - ..() +/obj/item/storage/box/enforcer_rubber/populate_contents() new /obj/item/gun/projectile/automatic/pistol/enforcer(src) // loaded with rubber by default new /obj/item/ammo_box/magazine/enforcer(src) new /obj/item/ammo_box/magazine/enforcer(src) @@ -714,8 +526,7 @@ desc = "A box marked with pictures of an enforcer pistol, two ammo clips, and the word 'LETHAL'." icon_state = "box_ert" -/obj/item/storage/box/enforcer_lethal/New() - ..() +/obj/item/storage/box/enforcer_lethal/populate_contents() new /obj/item/gun/projectile/automatic/pistol/enforcer/lethal(src) new /obj/item/ammo_box/magazine/enforcer/lethal(src) new /obj/item/ammo_box/magazine/enforcer/lethal(src) @@ -724,8 +535,7 @@ name = "bartender rare reagents kit" desc = "A box intended for experienced bartenders." -/obj/item/storage/box/bartender_rare_ingredients_kit/New() - ..() +/obj/item/storage/box/bartender_rare_ingredients_kit/populate_contents() var/list/reagent_list = list("sacid", "radium", "ether", "methamphetamine", "plasma", "gold", "silver", "capsaicin", "psilocybin") for(var/reag in reagent_list) var/obj/item/reagent_containers/glass/bottle/B = new(src) @@ -736,8 +546,7 @@ name = "chef rare reagents kit" desc = "A box intended for experienced chefs." -/obj/item/storage/box/chef_rare_ingredients_kit/New() - ..() +/obj/item/storage/box/chef_rare_ingredients_kit/populate_contents() new /obj/item/reagent_containers/food/condiment/soysauce(src) new /obj/item/reagent_containers/food/condiment/enzyme(src) new /obj/item/reagent_containers/food/condiment/pack/hotsauce(src) @@ -753,57 +562,34 @@ desc = "WARNING: Keep out of reach of children." icon_state = "mousetraps" -/obj/item/storage/box/mousetraps/New() - ..() - new /obj/item/assembly/mousetrap( src ) - new /obj/item/assembly/mousetrap( src ) - new /obj/item/assembly/mousetrap( src ) - new /obj/item/assembly/mousetrap( src ) - new /obj/item/assembly/mousetrap( src ) - new /obj/item/assembly/mousetrap( src ) +/obj/item/storage/box/mousetraps/populate_contents() + for(var/I in 1 to 6) + new /obj/item/assembly/mousetrap(src) /obj/item/storage/box/pillbottles name = "box of pill bottles" desc = "It has pictures of pill bottles on its front." -/obj/item/storage/box/pillbottles/New() - ..() - new /obj/item/storage/pill_bottle( src ) - new /obj/item/storage/pill_bottle( src ) - new /obj/item/storage/pill_bottle( src ) - new /obj/item/storage/pill_bottle( src ) - new /obj/item/storage/pill_bottle( src ) - new /obj/item/storage/pill_bottle( src ) - new /obj/item/storage/pill_bottle( src ) +/obj/item/storage/box/pillbottles/populate_contents() + for(var/I in 1 to 7) + new /obj/item/storage/pill_bottle(src) /obj/item/storage/box/patch_packs name = "box of patch packs" desc = "It has pictures of patch packs on its front." -/obj/item/storage/box/patch_packs/New() - ..() - new /obj/item/storage/pill_bottle/patch_pack(src) - new /obj/item/storage/pill_bottle/patch_pack(src) - new /obj/item/storage/pill_bottle/patch_pack(src) - new /obj/item/storage/pill_bottle/patch_pack(src) - new /obj/item/storage/pill_bottle/patch_pack(src) - new /obj/item/storage/pill_bottle/patch_pack(src) - new /obj/item/storage/pill_bottle/patch_pack(src) +/obj/item/storage/box/patch_packs/populate_contents() + for(var/I in 1 to 7) + new /obj/item/storage/pill_bottle/patch_pack(src) /obj/item/storage/box/bodybags name = "body bags" desc = "This box contains body bags." icon_state = "bodybags" -/obj/item/storage/box/bodybags/New() - ..() - new /obj/item/bodybag(src) - new /obj/item/bodybag(src) - new /obj/item/bodybag(src) - new /obj/item/bodybag(src) - new /obj/item/bodybag(src) - new /obj/item/bodybag(src) - new /obj/item/bodybag(src) +/obj/item/storage/box/bodybags/populate_contents() + for(var/I in 1 to 7) + new /obj/item/bodybag(src) /obj/item/storage/box/snappops name = "snap pop box" @@ -813,9 +599,8 @@ storage_slots = 8 can_hold = list(/obj/item/toy/snappop) -/obj/item/storage/box/snappops/New() - ..() - for(var/i=1; i <= storage_slots; i++) +/obj/item/storage/box/snappops/populate_contents() + for(var/I in 1 to storage_slots) new /obj/item/toy/snappop(src) /obj/item/storage/box/matches @@ -828,11 +613,12 @@ w_class = WEIGHT_CLASS_TINY max_w_class = WEIGHT_CLASS_TINY slot_flags = SLOT_BELT + drop_sound = 'sound/items/handling/matchbox_drop.ogg' + pickup_sound = 'sound/items/handling/matchbox_pickup.ogg' can_hold = list(/obj/item/match) -/obj/item/storage/box/matches/New() - ..() - for(var/i in 1 to storage_slots) +/obj/item/storage/box/matches/populate_contents() + for(var/I in 1 to storage_slots) new /obj/item/match(src) /obj/item/storage/box/matches/attackby(obj/item/match/W, mob/user, params) @@ -846,9 +632,8 @@ desc = "Contains autoinjectors." icon_state = "syringe" -/obj/item/storage/box/autoinjectors/New() - ..() - for(var/i; i < storage_slots; i++) +/obj/item/storage/box/autoinjectors/populate_contents() + for(var/I in 1 to storage_slots) new /obj/item/reagent_containers/hypospray/autoinjector(src) /obj/item/storage/box/autoinjector/utility @@ -856,8 +641,7 @@ desc = "A box with several utility autoinjectors for the economical miner." icon_state = "syringe" -/obj/item/storage/box/autoinjector/utility/New() - ..() +/obj/item/storage/box/autoinjector/utility/populate_contents() new /obj/item/reagent_containers/hypospray/autoinjector/teporone(src) new /obj/item/reagent_containers/hypospray/autoinjector/teporone(src) new /obj/item/reagent_containers/hypospray/autoinjector/stimpack(src) @@ -870,34 +654,31 @@ icon_state = "light" desc = "This box is shaped on the inside so that only light tubes and bulbs fit." item_state = "syringe_kit" - storage_slots=21 + storage_slots = 21 can_hold = list(/obj/item/light/tube, /obj/item/light/bulb) max_combined_w_class = 21 use_to_pickup = 1 // for picking up broken bulbs, not that most people will try -/obj/item/storage/box/lights/bulbs/New() - ..() - for(var/i = 0; i < 21; i++) +/obj/item/storage/box/lights/bulbs/populate_contents() + for(var/I in 1 to storage_slots) new /obj/item/light/bulb(src) /obj/item/storage/box/lights/tubes name = "replacement tubes" icon_state = "lighttube" -/obj/item/storage/box/lights/tubes/New() - ..() - for(var/i = 0; i < 21; i++) +/obj/item/storage/box/lights/tubes/populate_contents() + for(var/I in 1 to storage_slots) new /obj/item/light/tube(src) /obj/item/storage/box/lights/mixed name = "replacement lights" icon_state = "lightmixed" -/obj/item/storage/box/lights/mixed/New() - ..() - for(var/i = 0; i < 14; i++) +/obj/item/storage/box/lights/mixed/populate_contents() + for(var/I in 1 to 14) new /obj/item/light/tube(src) - for(var/i = 0; i < 7; i++) + for(var/I in 1 to 7) new /obj/item/light/bulb(src) /obj/item/storage/box/barber @@ -905,8 +686,7 @@ desc = "For all hairstyling needs." icon_state = "implant" -/obj/item/storage/box/barber/New() - ..() +/obj/item/storage/box/barber/populate_contents() new /obj/item/scissors/barber(src) new /obj/item/hair_dye_bottle(src) new /obj/item/reagent_containers/glass/bottle/reagent/hairgrownium(src) @@ -920,8 +700,7 @@ desc = "For all your lip coloring needs." icon_state = "implant" -/obj/item/storage/box/lip_stick/New() - ..() +/obj/item/storage/box/lip_stick/populate_contents() new /obj/item/lipstick(src) new /obj/item/lipstick/purple(src) new /obj/item/lipstick/jade(src) @@ -1002,11 +781,9 @@ storage_slots = 14 max_combined_w_class = 20 -/obj/item/storage/box/centcomofficer/New() - ..() - contents = list() +/obj/item/storage/box/centcomofficer/populate_contents() new /obj/item/clothing/mask/breath(src) - new /obj/item/tank/emergency_oxygen/double/full(src) + new /obj/item/tank/internals/emergency_oxygen/double(src) new /obj/item/flashlight/seclite(src) new /obj/item/kitchen/knife/combat(src) @@ -1022,10 +799,9 @@ name = "boxed survival kit" icon_state = "box_ert" -/obj/item/storage/box/responseteam/New() - ..() +/obj/item/storage/box/responseteam/populate_contents() new /obj/item/clothing/mask/breath(src) - new /obj/item/tank/emergency_oxygen/engi/full(src) + new /obj/item/tank/internals/emergency_oxygen/engi(src) new /obj/item/flashlight/flare(src) new /obj/item/crowbar/red(src) new /obj/item/kitchen/knife/combat(src) @@ -1042,31 +818,29 @@ /obj/item/storage/box/emptysandbags name = "box of empty sandbags" -/obj/item/storage/box/emptysandbags/New() - ..() - contents = list() - for(var/i in 1 to 7) +/obj/item/storage/box/emptysandbags/populate_contents() + for(var/I in 1 to 7) new /obj/item/emptysandbag(src) /obj/item/storage/box/rndboards name = "the Liberator's legacy" desc = "A box containing a gift for worthy golems." -/obj/item/storage/box/rndboards/New() - ..() - contents = list() +/obj/item/storage/box/rndboards/populate_contents() new /obj/item/circuitboard/protolathe(src) new /obj/item/circuitboard/destructive_analyzer(src) new /obj/item/circuitboard/circuit_imprinter(src) new /obj/item/circuitboard/rdconsole/public(src) +/obj/item/storage/box/stockparts + display_contents_with_number = TRUE + /obj/item/storage/box/stockparts/basic //for ruins where it's a bad idea to give access to an autolathe/protolathe, but still want to make stock parts accessible name = "box of stock parts" desc = "Contains a variety of basic stock parts." -/obj/item/storage/box/stockparts/basic/New() - ..() - for(var/i in 1 to 3) +/obj/item/storage/box/stockparts/basic/populate_contents() + for(var/I in 1 to 3) new /obj/item/stock_parts/capacitor(src) new /obj/item/stock_parts/scanning_module(src) new /obj/item/stock_parts/manipulator(src) @@ -1077,9 +851,8 @@ name = "box of deluxe stock parts" desc = "Contains a variety of deluxe stock parts." -/obj/item/storage/box/stockparts/deluxe/New() - ..() - for(var/i in 1 to 3) +/obj/item/storage/box/stockparts/deluxe/populate_contents() + for(var/I in 1 to 3) new /obj/item/stock_parts/capacitor/quadratic(src) new /obj/item/stock_parts/scanning_module/triphasic(src) new /obj/item/stock_parts/manipulator/femto(src) diff --git a/code/game/objects/items/weapons/storage/briefcase.dm b/code/game/objects/items/weapons/storage/briefcase.dm index acbf16ce202..952da94ff73 100644 --- a/code/game/objects/items/weapons/storage/briefcase.dm +++ b/code/game/objects/items/weapons/storage/briefcase.dm @@ -19,8 +19,7 @@ desc = "Its label reads \"genuine hardened Captain leather\", but suspiciously has no other tags or branding. Smells like L'Air du Temps." force = 10 -/obj/item/storage/briefcase/sniperbundle/New() - ..() +/obj/item/storage/briefcase/sniperbundle/populate_contents() new /obj/item/gun/projectile/automatic/sniper_rifle/syndicate(src) new /obj/item/clothing/accessory/red(src) new /obj/item/clothing/under/syndicate/sniper(src) @@ -47,7 +46,7 @@ var/obj/item/gun/stored_gun = stored_item stored_gun.afterattack(A, user, flag, params) -/obj/item/storage/briefcase/false_bottomed/attackby(var/obj/item/I, mob/user) +/obj/item/storage/briefcase/false_bottomed/attackby(obj/item/I, mob/user) if(bottom_open) if(stored_item) to_chat(user, "There's already something in the false bottom!") @@ -56,7 +55,7 @@ to_chat(user, "The [I] is too big to fit in the false bottom!") return if(!user.drop_item(I)) - user << "The [I] is stuck to your hands!" + to_chat(user, "The [I] is stuck to your hands!") return stored_item = I diff --git a/code/game/objects/items/weapons/storage/fancy.dm b/code/game/objects/items/weapons/storage/fancy.dm index 98c6a439ac4..71852c60541 100644 --- a/code/game/objects/items/weapons/storage/fancy.dm +++ b/code/game/objects/items/weapons/storage/fancy.dm @@ -18,9 +18,9 @@ resistance_flags = FLAMMABLE var/icon_type -/obj/item/storage/fancy/update_icon(var/itemremoved = 0) - var/total_contents = src.contents.len - itemremoved - src.icon_state = "[src.icon_type]box[total_contents]" +/obj/item/storage/fancy/update_icon(itemremoved = 0) + var/total_contents = length(contents) - itemremoved + icon_state = "[icon_type]box[total_contents]" return /obj/item/storage/fancy/examine(mob/user) @@ -28,11 +28,11 @@ if(in_range(user, src)) var/len = LAZYLEN(contents) if(len <= 0) - . += "There are no [src.icon_type]s left in the box." + . += "There are no [icon_type]s left in the box." else if(len == 1) - . += "There is one [src.icon_type] left in the box." + . += "There is one [icon_type] left in the box." else - . += "There are [src.contents.len] [src.icon_type]s in the box." + . += "There are [length(contents)] [icon_type]s in the box." /* * Donut Box @@ -51,23 +51,21 @@ /obj/item/storage/fancy/donut_box/update_icon() overlays.Cut() - for(var/i = 1 to length(contents)) - var/obj/item/reagent_containers/food/snacks/donut/donut = contents[i] + for(var/I = 1 to length(contents)) + var/obj/item/reagent_containers/food/snacks/donut/donut = contents[I] var/icon/new_donut_icon = icon('icons/obj/food/containers.dmi', "donut_[donut.donut_sprite_type]") - new_donut_icon.Shift(EAST, 3 * (i-1)) + new_donut_icon.Shift(EAST, 3 * (I-1)) overlays += new_donut_icon overlays += icon('icons/obj/food/containers.dmi', "donutbox_front") -/obj/item/storage/fancy/donut_box/New() - ..() - if(!empty) - for(var/i = 1 to storage_slots) - new /obj/item/reagent_containers/food/snacks/donut(src) +/obj/item/storage/fancy/donut_box/populate_contents() + for(var/I in 1 to storage_slots) + new /obj/item/reagent_containers/food/snacks/donut(src) update_icon() -/obj/item/storage/fancy/donut_box/empty - empty = TRUE +/obj/item/storage/fancy/donut_box/empty/populate_contents() + return /* * Egg Box @@ -81,11 +79,9 @@ storage_slots = 12 can_hold = list(/obj/item/reagent_containers/food/snacks/egg) -/obj/item/storage/fancy/egg_box/New() - ..() - for(var/i=1; i <= storage_slots; i++) +/obj/item/storage/fancy/egg_box/populate_contents() + for(var/I in 1 to storage_slots) new /obj/item/reagent_containers/food/snacks/egg(src) - return /* * Candle Box @@ -103,21 +99,17 @@ slot_flags = SLOT_BELT -/obj/item/storage/fancy/candle_box/full/New() - ..() - for(var/i=1; i <= storage_slots; i++) +/obj/item/storage/fancy/candle_box/full/populate_contents() + for(var/I in 1 to storage_slots) new /obj/item/candle(src) - return /obj/item/storage/fancy/candle_box/eternal name = "Eternal Candle pack" desc = "A pack of red candles made with a special wax." -/obj/item/storage/fancy/candle_box/eternal/New() - ..() - for(var/i=1; i <= storage_slots; i++) +/obj/item/storage/fancy/candle_box/eternal/populate_contents() + for(var/I in 1 to storage_slots) new /obj/item/candle/eternal(src) - return /* * Crayon Box @@ -135,8 +127,7 @@ /obj/item/toy/crayon ) -/obj/item/storage/fancy/crayons/New() - ..() +/obj/item/storage/fancy/crayons/populate_contents() new /obj/item/toy/crayon/red(src) new /obj/item/toy/crayon/orange(src) new /obj/item/toy/crayon/yellow(src) @@ -151,9 +142,10 @@ for(var/obj/item/toy/crayon/crayon in contents) overlays += image('icons/obj/crayons.dmi',crayon.colourName) -/obj/item/storage/fancy/crayons/attackby(obj/item/W as obj, mob/user as mob, params) - if(istype(W,/obj/item/toy/crayon)) - switch(W:colourName) +/obj/item/storage/fancy/crayons/attackby(obj/item/I, mob/user, params) + if(istype(I, /obj/item/toy/crayon)) + var/obj/item/toy/crayon/C = I + switch(C.colourName) if("mime") to_chat(usr, "This crayon is too sad to be contained in this box.") return @@ -185,9 +177,8 @@ icon_type = "cigarette" var/cigarette_type = /obj/item/clothing/mask/cigarette -/obj/item/storage/fancy/cigarettes/New() - ..() - for(var/i = 1 to storage_slots) +/obj/item/storage/fancy/cigarettes/populate_contents() + for(var/I in 1 to storage_slots) new cigarette_type(src) /obj/item/storage/fancy/cigarettes/update_icon() @@ -227,7 +218,7 @@ to_chat(usr, "Putting [W] in [src] while lit probably isn't a good idea.") return 0 //if we get this far, handle the insertion checks as normal - .=..() + . = ..() /obj/item/storage/fancy/cigarettes/decompile_act(obj/item/matter_decompiler/C, mob/user) if(!length(contents)) @@ -249,8 +240,8 @@ icon_state = "robustpacket" item_state = "robustpacket" -/obj/item/storage/fancy/cigarettes/syndicate/New() - ..() +/obj/item/storage/fancy/cigarettes/syndicate/Initialize(mapload) + . = ..() var/new_name = pick("evil", "suspicious", "ominous", "donk-flavored", "robust", "sneaky") name = "[new_name] cigarette packet" @@ -262,7 +253,7 @@ cigarette_type = /obj/item/clothing/mask/cigarette/syndicate /obj/item/storage/fancy/cigarettes/cigpack_med - name = "Medical Marijuana Packet" + name = "\improper Medical Marijuana Packet" desc = "A prescription packet containing six marijuana cigarettes." icon_state = "medpacket" item_state = "medpacket" @@ -326,9 +317,8 @@ icon_type = "rolling paper" can_hold = list(/obj/item/rollingpaper) -/obj/item/storage/fancy/rollingpapers/New() - ..() - for(var/i in 1 to storage_slots) +/obj/item/storage/fancy/rollingpapers/populate_contents() + for(var/I in 1 to storage_slots) new /obj/item/rollingpaper(src) /obj/item/storage/fancy/rollingpapers/update_icon() @@ -349,9 +339,8 @@ can_hold = list(/obj/item/reagent_containers/glass/beaker/vial) -/obj/item/storage/fancy/vials/New() - ..() - for(var/i=1; i <= storage_slots; i++) +/obj/item/storage/fancy/vials/populate_contents() + for(var/I in 1 to storage_slots) new /obj/item/reagent_containers/glass/beaker/vial(src) return @@ -367,23 +356,21 @@ storage_slots = 6 req_access = list(ACCESS_VIROLOGY) -/obj/item/storage/lockbox/vials/New() - ..() +/obj/item/storage/lockbox/vials/Initialize(mapload) + . = ..() update_icon() -/obj/item/storage/lockbox/vials/update_icon(var/itemremoved = 0) - var/total_contents = src.contents.len - itemremoved - src.icon_state = "vialbox[total_contents]" - src.overlays.Cut() +/obj/item/storage/lockbox/vials/update_icon() + icon_state = "vialbox[length(contents)]" + cut_overlays() if(!broken) overlays += image(icon, src, "led[locked]") if(locked) overlays += image(icon, src, "cover") else overlays += image(icon, src, "ledb") - return -/obj/item/storage/lockbox/vials/attackby(obj/item/W as obj, mob/user as mob, params) +/obj/item/storage/lockbox/vials/attackby(obj/item/I, mob/user, params) ..() update_icon() @@ -402,8 +389,7 @@ /obj/item/storage/firstaid/aquatic_kit/full desc = "It's a starter kit for an aquarium; includes 1 tank brush, 1 egg scoop, 1 fish net, 1 container of fish food and 1 fish bag." -/obj/item/storage/firstaid/aquatic_kit/full/New() - ..() +/obj/item/storage/firstaid/aquatic_kit/full/populate_contents() new /obj/item/egg_scoop(src) new /obj/item/fish_net(src) new /obj/item/tank_brush(src) diff --git a/code/game/objects/items/weapons/storage/firstaid.dm b/code/game/objects/items/weapons/storage/firstaid.dm index 025831df8a7..ec00a0c4c08 100644 --- a/code/game/objects/items/weapons/storage/firstaid.dm +++ b/code/game/objects/items/weapons/storage/firstaid.dm @@ -32,28 +32,25 @@ item_state = "firstaid-ointment" med_bot_skin = "ointment" -/obj/item/storage/firstaid/fire/New() - ..() - if(empty) - return +/obj/item/storage/firstaid/fire/Initialize(mapload) + . = ..() icon_state = pick("ointment", "firefirstaid") + +/obj/item/storage/firstaid/fire/populate_contents() new /obj/item/reagent_containers/applicator/burn(src) new /obj/item/reagent_containers/food/pill/patch/silver_sulf/small(src) new /obj/item/healthanalyzer(src) new /obj/item/reagent_containers/hypospray/autoinjector(src) new /obj/item/reagent_containers/food/pill/salicylic(src) -/obj/item/storage/firstaid/fire/empty - empty = TRUE +/obj/item/storage/firstaid/fire/empty/populate_contents() + return /obj/item/storage/firstaid/regular desc = "A general medical kit that contains medical patches for both brute damage and burn damage. Also contains an epinephrine syringe for emergency use and a health analyzer" icon_state = "firstaid" -/obj/item/storage/firstaid/regular/New() - ..() - if(empty) - return +/obj/item/storage/firstaid/regular/populate_contents() new /obj/item/reagent_containers/food/pill/patch/styptic(src) new /obj/item/reagent_containers/food/pill/patch/styptic(src) new /obj/item/reagent_containers/food/pill/salicylic(src) @@ -62,14 +59,14 @@ new /obj/item/healthanalyzer(src) new /obj/item/reagent_containers/hypospray/autoinjector(src) +/obj/item/storage/firstaid/regular/empty/populate_contents() + return + /obj/item/storage/firstaid/doctor desc = "A general medical kit that contains medical patches for both brute damage and burn damage. Also contains an epinephrine syringe for emergency use and a health analyzer" icon_state = "firstaid" -/obj/item/storage/firstaid/doctor/New() - ..() - if(empty) - return +/obj/item/storage/firstaid/doctor/populate_contents() new /obj/item/reagent_containers/applicator/brute(src) new /obj/item/reagent_containers/applicator/burn(src) new /obj/item/reagent_containers/food/pill/patch/styptic(src) @@ -85,21 +82,18 @@ item_state = "firstaid-toxin" med_bot_skin = "tox" -/obj/item/storage/firstaid/toxin/New() - ..() - if(empty) - return +/obj/item/storage/firstaid/toxin/Initialize(mapload) + . = ..() icon_state = pick("antitoxin", "antitoxfirstaid", "antitoxfirstaid2", "antitoxfirstaid3") - new /obj/item/reagent_containers/syringe/charcoal(src) - new /obj/item/reagent_containers/syringe/charcoal(src) - new /obj/item/reagent_containers/syringe/charcoal(src) - new /obj/item/reagent_containers/food/pill/charcoal(src) - new /obj/item/reagent_containers/food/pill/charcoal(src) - new /obj/item/reagent_containers/food/pill/charcoal(src) + +/obj/item/storage/firstaid/toxin/populate_contents() + for(var/I in 1 to 3) + new /obj/item/reagent_containers/syringe/charcoal(src) + new /obj/item/reagent_containers/food/pill/charcoal(src) new /obj/item/healthanalyzer(src) -/obj/item/storage/firstaid/toxin/empty - empty = TRUE +/obj/item/storage/firstaid/toxin/empty/populate_contents() + return /obj/item/storage/firstaid/o2 name = "oxygen deprivation first aid kit" @@ -108,18 +102,15 @@ item_state = "firstaid-o2" med_bot_skin = "o2" -/obj/item/storage/firstaid/o2/New() - ..() - if(empty) - return +/obj/item/storage/firstaid/o2/populate_contents() new /obj/item/reagent_containers/food/pill/salbutamol(src) new /obj/item/reagent_containers/food/pill/salbutamol(src) new /obj/item/reagent_containers/food/pill/salbutamol(src) new /obj/item/reagent_containers/food/pill/salbutamol(src) new /obj/item/healthanalyzer(src) -/obj/item/storage/firstaid/o2/empty - empty = TRUE +/obj/item/storage/firstaid/o2/empty/populate_contents() + return /obj/item/storage/firstaid/brute name = "brute trauma treatment kit" @@ -128,19 +119,19 @@ item_state = "firstaid-brute" med_bot_skin = "brute" -/obj/item/storage/firstaid/brute/New() - ..() - if(empty) - return +/obj/item/storage/firstaid/brute/Initialize(mapload) + . = ..() icon_state = pick("brute", "brute2") + +/obj/item/storage/firstaid/brute/populate_contents() new /obj/item/reagent_containers/applicator/brute(src) new /obj/item/reagent_containers/food/pill/patch/styptic/small(src) new /obj/item/healthanalyzer(src) new /obj/item/reagent_containers/hypospray/autoinjector(src) new /obj/item/stack/medical/bruise_pack(src) -/obj/item/storage/firstaid/brute/empty - empty = TRUE +/obj/item/storage/firstaid/brute/empty/populate_contents() + return /obj/item/storage/firstaid/adv name = "advanced first-aid kit" @@ -149,10 +140,7 @@ item_state = "firstaid-advanced" med_bot_skin = "adv" -/obj/item/storage/firstaid/adv/New() - ..() - if(empty) - return +/obj/item/storage/firstaid/adv/populate_contents() new /obj/item/stack/medical/bruise_pack(src) new /obj/item/stack/medical/bruise_pack/advanced(src) new /obj/item/stack/medical/bruise_pack/advanced(src) @@ -161,8 +149,8 @@ new /obj/item/reagent_containers/hypospray/autoinjector(src) new /obj/item/healthanalyzer(src) -/obj/item/storage/firstaid/adv/empty - empty = TRUE +/obj/item/storage/firstaid/adv/empty/populate_contents() + return /obj/item/storage/firstaid/machine name = "machine repair kit" @@ -171,19 +159,15 @@ item_state = "firstaid-machine" med_bot_skin = "machine" -/obj/item/storage/firstaid/machine/New() - ..() - if(empty) - return +/obj/item/storage/firstaid/machine/populate_contents() new /obj/item/weldingtool(src) new /obj/item/stack/cable_coil(src) new /obj/item/stack/cable_coil(src) new /obj/item/stack/cable_coil(src) new /obj/item/robotanalyzer(src) -/obj/item/storage/firstaid/machine/empty - empty = TRUE - +/obj/item/storage/firstaid/machine/empty/populate_contents() + return /obj/item/storage/firstaid/tactical name = "first-aid kit" @@ -198,17 +182,14 @@ med_bot_skin = "bezerk" syndicate_aligned = TRUE -/obj/item/storage/firstaid/tactical/New() - ..() - if(empty) - return +/obj/item/storage/firstaid/tactical/populate_contents() new /obj/item/reagent_containers/hypospray/combat(src) new /obj/item/reagent_containers/applicator/dual/syndi(src) // Because you ain't got no time to look at what damage dey taking yo new /obj/item/defibrillator/compact/combat/loaded(src) new /obj/item/clothing/glasses/hud/health/night(src) -/obj/item/storage/firstaid/tactical/empty - empty = TRUE +/obj/item/storage/firstaid/tactical/empty/populate_contents() + return /obj/item/storage/firstaid/surgery name = "field surgery kit" @@ -220,8 +201,7 @@ can_hold = list(/obj/item/roller,/obj/item/bonesetter,/obj/item/bonegel, /obj/item/scalpel, /obj/item/hemostat, /obj/item/cautery, /obj/item/retractor, /obj/item/FixOVein, /obj/item/surgicaldrill, /obj/item/circular_saw) -/obj/item/storage/firstaid/surgery/New() - ..() +/obj/item/storage/firstaid/surgery/populate_contents() new /obj/item/roller(src) new /obj/item/bonesetter(src) new /obj/item/bonegel(src) @@ -256,11 +236,15 @@ var/applying_meds = FALSE //To Prevent spam clicking and generating runtimes from apply a deleting pill multiple times. var/rapid_intake_message = "unscrews the cap on the pill bottle and begins dumping the entire contents down their throat!" var/rapid_post_instake_message = "downs the entire bottle of pills in one go!" + /// Whether to render a coloured wrapper overlay on the icon. var/allow_wrap = TRUE + /// The color of the wrapper overlay. var/wrapper_color = null + /// The icon state of the wrapper overlay. + var/wrapper_state = "pillbottle_wrap" -/obj/item/storage/pill_bottle/New() - ..() +/obj/item/storage/pill_bottle/Initialize(mapload) + . = ..() base_name = name if(allow_wrap) apply_wrap() @@ -268,7 +252,7 @@ /obj/item/storage/pill_bottle/proc/apply_wrap() if(wrapper_color) overlays.Cut() - var/image/I = image(icon, "pillbottle_wrap") + var/image/I = image(icon, wrapper_state) I.color = wrapper_color overlays += I @@ -290,16 +274,12 @@ /obj/item/storage/pill_bottle/ert wrapper_color = COLOR_MAROON -/obj/item/storage/pill_bottle/ert/New() - ..() - new /obj/item/reagent_containers/food/pill/salicylic(src) - new /obj/item/reagent_containers/food/pill/salicylic(src) - new /obj/item/reagent_containers/food/pill/salicylic(src) - new /obj/item/reagent_containers/food/pill/charcoal(src) - new /obj/item/reagent_containers/food/pill/charcoal(src) - new /obj/item/reagent_containers/food/pill/charcoal(src) +/obj/item/storage/pill_bottle/ert/populate_contents() + for(var/I in 1 to 3) + new /obj/item/reagent_containers/food/pill/salicylic(src) + new /obj/item/reagent_containers/food/pill/charcoal(src) -/obj/item/storage/pill_bottle/MouseDrop(obj/over_object as obj) // Best utilized if you're a cantankerous doctor with a Vicodin habit. +/obj/item/storage/pill_bottle/MouseDrop(obj/over_object) // Best utilized if you're a cantankerous doctor with a Vicodin habit. if(iscarbon(over_object)) var/mob/living/carbon/C = over_object if(loc == C && src == C.get_active_hand()) @@ -322,51 +302,37 @@ return ..() /obj/item/storage/pill_bottle/patch_pack - name = "Patch Pack" + name = "patch pack" desc = "It's a container for storing medical patches." icon_state = "patch_pack" can_hold = list(/obj/item/reagent_containers/food/pill/patch) cant_hold = list() - rapid_intake_message = "flips the lid of the Patch Pack open and begins rapidly stamping patches on themselves!" - rapid_post_instake_message = "stamps the entire contents of the Patch Pack all over their entire body!" - allow_wrap = FALSE + rapid_intake_message = "flips the lid of the patch pack open and begins rapidly stamping patches on themselves!" + rapid_post_instake_message = "stamps the entire contents of the patch pack all over their entire body!" + wrapper_state = "patch_pack_wrap" /obj/item/storage/pill_bottle/charcoal name = "Pill bottle (Charcoal)" desc = "Contains pills used to counter toxins." wrapper_color = COLOR_GREEN -/obj/item/storage/pill_bottle/charcoal/New() - ..() - new /obj/item/reagent_containers/food/pill/charcoal(src) - new /obj/item/reagent_containers/food/pill/charcoal(src) - new /obj/item/reagent_containers/food/pill/charcoal(src) - new /obj/item/reagent_containers/food/pill/charcoal(src) - new /obj/item/reagent_containers/food/pill/charcoal(src) - new /obj/item/reagent_containers/food/pill/charcoal(src) - new /obj/item/reagent_containers/food/pill/charcoal(src) +/obj/item/storage/pill_bottle/charcoal/populate_contents() + for(var/I in 1 to 7) + new /obj/item/reagent_containers/food/pill/charcoal(src) /obj/item/storage/pill_bottle/painkillers name = "Pill Bottle (Salicylic Acid)" desc = "Contains various pills for minor pain relief." wrapper_color = COLOR_RED -/obj/item/storage/pill_bottle/painkillers/New() - ..() - new /obj/item/reagent_containers/food/pill/salicylic(src) - new /obj/item/reagent_containers/food/pill/salicylic(src) - new /obj/item/reagent_containers/food/pill/salicylic(src) - new /obj/item/reagent_containers/food/pill/salicylic(src) - new /obj/item/reagent_containers/food/pill/salicylic(src) - new /obj/item/reagent_containers/food/pill/salicylic(src) - new /obj/item/reagent_containers/food/pill/salicylic(src) - new /obj/item/reagent_containers/food/pill/salicylic(src) +/obj/item/storage/pill_bottle/painkillers/populate_contents() + for(var/I in 1 to 8) + new /obj/item/reagent_containers/food/pill/salicylic(src) /obj/item/storage/pill_bottle/fakedeath allow_wrap = FALSE -/obj/item/storage/pill_bottle/fakedeath/New() - ..() +/obj/item/storage/pill_bottle/fakedeath/populate_contents() new /obj/item/reagent_containers/food/pill/fakedeath(src) new /obj/item/reagent_containers/food/pill/fakedeath(src) new /obj/item/reagent_containers/food/pill/fakedeath(src) diff --git a/code/game/objects/items/weapons/storage/internal.dm b/code/game/objects/items/weapons/storage/internal.dm index 293157cb375..278f1af1403 100644 --- a/code/game/objects/items/weapons/storage/internal.dm +++ b/code/game/objects/items/weapons/storage/internal.dm @@ -36,7 +36,7 @@ return 0 if(over_object == user && Adjacent(user)) // this must come before the screen objects only block - src.open(user) + open(user) return 0 if(!( istype(over_object, /obj/screen) )) @@ -50,10 +50,10 @@ if(!( user.restrained() ) && !( user.stat )) switch(over_object.name) if("r_hand") - user.unEquip(master_item) + user.unEquip(master_item, silent = TRUE) user.put_in_r_hand(master_item) if("l_hand") - user.unEquip(master_item) + user.unEquip(master_item, silent = TRUE) user.put_in_l_hand(master_item) master_item.add_fingerprint(user) return 0 @@ -75,15 +75,15 @@ H.r_store = null return 0 - src.add_fingerprint(user) + add_fingerprint(user) if(master_item.loc == user) - src.open(user) + open(user) return 0 for(var/mob/M in range(1, master_item.loc)) if(M.s_active == src) - src.close(M) + close(M) return 1 -/obj/item/storage/internal/Adjacent(var/atom/neighbor) +/obj/item/storage/internal/Adjacent(atom/neighbor) return master_item.Adjacent(neighbor) diff --git a/code/game/objects/items/weapons/storage/lockbox.dm b/code/game/objects/items/weapons/storage/lockbox.dm index b67ba9154e3..851ca02a441 100644 --- a/code/game/objects/items/weapons/storage/lockbox.dm +++ b/code/game/objects/items/weapons/storage/lockbox.dm @@ -77,8 +77,7 @@ name = "Lockbox (Mindshield Implants)" req_access = list(ACCESS_SECURITY) -/obj/item/storage/lockbox/mindshield/New() - ..() +/obj/item/storage/lockbox/mindshield/populate_contents() new /obj/item/implantcase/mindshield(src) new /obj/item/implantcase/mindshield(src) new /obj/item/implantcase/mindshield(src) @@ -89,8 +88,7 @@ desc = "You have a bad feeling about opening this." req_access = list(ACCESS_SECURITY) -/obj/item/storage/lockbox/clusterbang/New() - ..() +/obj/item/storage/lockbox/clusterbang/populate_contents() new /obj/item/grenade/clusterbuster(src) /obj/item/storage/lockbox/medal @@ -107,8 +105,7 @@ icon_closed = "medalbox" icon_broken = "medalbox+b" -/obj/item/storage/lockbox/medal/New() - ..() +/obj/item/storage/lockbox/medal/populate_contents() new /obj/item/clothing/accessory/medal/gold/captain(src) new /obj/item/clothing/accessory/medal/silver/leadership(src) new /obj/item/clothing/accessory/medal/silver/valor(src) @@ -119,8 +116,7 @@ desc = "Contains three T4 breaching charges." req_access = list(ACCESS_CENT_SPECOPS) -/obj/item/storage/lockbox/t4/New() - ..() +/obj/item/storage/lockbox/t4/populate_contents() for(var/i in 0 to 2) new /obj/item/grenade/plastic/x4/thermite(src) diff --git a/code/game/objects/items/weapons/storage/secure.dm b/code/game/objects/items/weapons/storage/secure.dm index 357cb043ca4..dd859ccd9ea 100644 --- a/code/game/objects/items/weapons/storage/secure.dm +++ b/code/game/objects/items/weapons/storage/secure.dm @@ -21,7 +21,6 @@ var/l_set = 0 var/l_setshort = 0 var/l_hacking = 0 - var/emagged = 0 var/open = 0 w_class = WEIGHT_CLASS_NORMAL max_w_class = WEIGHT_CLASS_SMALL @@ -32,6 +31,10 @@ if(in_range(user, src)) . += "The service panel is [open ? "open" : "closed"]." +/obj/item/storage/secure/populate_contents() + new /obj/item/paper(src) + new /obj/item/pen(src) + /obj/item/storage/secure/attackby(obj/item/W as obj, mob/user as mob, params) if(locked) if((istype(W, /obj/item/melee/energy/blade)) && (!emagged)) @@ -77,7 +80,7 @@ if(istype(weapon, /obj/item/melee/energy/blade)) do_sparks(5, 0, loc) playsound(loc, 'sound/weapons/blade1.ogg', 50, 1) - playsound(loc, "sparks", 50, 1) + playsound(loc, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) to_chat(user, "You slice through the lock on [src].") else to_chat(user, "You short out the lock on [src].") @@ -193,11 +196,6 @@ max_combined_w_class = 21 attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "whacked") -/obj/item/storage/secure/briefcase/New() - ..() - handle_item_insertion(new /obj/item/paper, 1) - handle_item_insertion(new /obj/item/pen, 1) - /obj/item/storage/secure/briefcase/attack_hand(mob/user as mob) if((loc == user) && (locked == 1)) to_chat(usr, "[src] is locked and cannot be opened!") @@ -219,10 +217,10 @@ /obj/item/storage/secure/briefcase/syndie force = 15 -/obj/item/storage/secure/briefcase/syndie/New() +/obj/item/storage/secure/briefcase/syndie/populate_contents() ..() - for(var/i = 0, i < storage_slots - 2, i++) - handle_item_insertion(new /obj/item/stack/spacecash/c1000, 1) + for(var/I in 1 to 5) + new /obj/item/stack/spacecash/c1000(src) // ----------------------------- // Secure Safe @@ -242,10 +240,5 @@ density = 0 cant_hold = list(/obj/item/storage/secure/briefcase) -/obj/item/storage/secure/safe/New() - ..() - handle_item_insertion(new /obj/item/paper, 1) - handle_item_insertion(new /obj/item/pen, 1) - /obj/item/storage/secure/safe/attack_hand(mob/user as mob) return attack_self(user) diff --git a/code/game/objects/items/weapons/storage/storage.dm b/code/game/objects/items/weapons/storage/storage.dm index f709a9496a4..d1548eb2305 100644 --- a/code/game/objects/items/weapons/storage/storage.dm +++ b/code/game/objects/items/weapons/storage/storage.dm @@ -9,117 +9,167 @@ name = "storage" icon = 'icons/obj/storage.dmi' w_class = WEIGHT_CLASS_NORMAL - var/silent = FALSE // No message on putting items in - var/list/can_hold = new/list() //List of objects which this item can store (if set, it can't store anything else) - var/list/cant_hold = new/list() //List of objects which this item can't store (in effect only if can_hold isn't set) - var/empty = FALSE // Will this spawn as an empty box - var/max_w_class = WEIGHT_CLASS_SMALL //Max size of objects that this object can store (in effect only if can_hold isn't set) - var/max_combined_w_class = 14 //The sum of the w_classes of all the items in this storage item. - var/storage_slots = 7 //The number of storage slots in this container. + /// No message on putting items in. + var/silent = FALSE + /// List of objects which this item can store (if set, it can't store anything else) + var/list/can_hold = new/list() + /// List of objects which this item can't store (in effect only if can_hold isn't set) + var/list/cant_hold = new/list() + /// Max size of objects that this object can store (in effect only if can_hold isn't set) + var/max_w_class = WEIGHT_CLASS_SMALL + /// The sum of the w_classes of all the items in this storage item. + var/max_combined_w_class = 14 + /// The number of storage slots in this container. + var/storage_slots = 7 var/obj/screen/storage/boxes = null var/obj/screen/close/closer = null - var/use_to_pickup //Set this to make it possible to use this item in an inverse way, so you can have the item in your hand and click items on the floor to pick them up. - var/display_contents_with_number //Set this to make the storage item group contents of the same type and display them as a number. - var/allow_quick_empty //Set this variable to allow the object to have the 'empty' verb, which dumps all the contents on the floor. - var/allow_quick_gather //Set this variable to allow the object to have the 'toggle mode' verb, which quickly collects all items from a tile. - var/pickup_all_on_tile = TRUE //FALSE = pick one at a time, TRUE = pick all on tile - var/use_sound = "rustle" //sound played when used. null for no sound. + + /// Set this to make it possible to use this item in an inverse way, so you can have the item in your hand and click items on the floor to pick them up. + var/use_to_pickup = FALSE + /// Set this to make the storage item group contents of the same type and display them as a number. + var/display_contents_with_number + /// Set this variable to allow the object to have the 'empty' verb, which dumps all the contents on the floor. + var/allow_quick_empty + /// Set this variable to allow the object to have the 'toggle mode' verb, which quickly collects all items from a tile. + var/allow_quick_gather + /// Pick up one item at a time or everything on the tile + var/pickup_all_on_tile = TRUE + /// Sound played when used. `null` for no sound. + var/use_sound = "rustle" /// What kind of [/obj/item/stack] can this be folded into. (e.g. Boxes and cardboard) var/foldable = null /// How much of the stack item do you get. var/foldable_amt = 0 +/obj/item/storage/Initialize(mapload) + . = ..() + can_hold = typecacheof(can_hold) + cant_hold = typecacheof(cant_hold) + + if(allow_quick_empty) + verbs += /obj/item/storage/verb/quick_empty + else + verbs -= /obj/item/storage/verb/quick_empty + + if(allow_quick_gather) + verbs += /obj/item/storage/verb/toggle_gathering_mode + else + verbs -= /obj/item/storage/verb/toggle_gathering_mode + + populate_contents() + + boxes = new /obj/screen/storage() + boxes.name = "storage" + boxes.master = src + boxes.icon_state = "block" + boxes.screen_loc = "7,7 to 10,8" + boxes.layer = HUD_LAYER + boxes.plane = HUD_PLANE + closer = new /obj/screen/close() + closer.master = src + closer.icon_state = "backpack_close" + closer.layer = ABOVE_HUD_LAYER + closer.plane = ABOVE_HUD_PLANE + orient2hud() + /obj/item/storage/MouseDrop(obj/over_object) - if(ishuman(usr)) //so monkeys can take off their backpacks -- Urist - var/mob/M = usr + if(!ismob(usr)) //so monkeys can take off their backpacks -- Urist + return + var/mob/M = usr - if(istype(M.loc,/obj/mecha) || M.incapacitated(FALSE, TRUE, TRUE)) // Stops inventory actions in a mech as well as while being incapacitated - return + if(istype(M.loc, /obj/mecha) || M.incapacitated(FALSE, TRUE, TRUE)) // Stops inventory actions in a mech as well as while being incapacitated + return - if(over_object == M && Adjacent(M)) // this must come before the screen objects only block - if(M.s_active) - M.s_active.close(M) - show_to(M) - return + if(over_object == M && Adjacent(M)) // this must come before the screen objects only block + if(M.s_active) + M.s_active.close(M) + show_to(M) + return - if((istype(over_object, /obj/structure/table) || istype(over_object, /turf/simulated/floor)) \ - && contents.len && loc == usr && !usr.stat && !usr.restrained() && usr.canmove && over_object.Adjacent(usr) \ - && !istype(src, /obj/item/storage/lockbox)) - var/turf/T = get_turf(over_object) - if(istype(over_object, /turf/simulated/floor)) - if(get_turf(usr) != T) - return // Can only empty containers onto the floor under you - if("Yes" != alert(usr,"Empty \the [src] onto \the [T]?","Confirm","Yes","No")) + if((istype(over_object, /obj/structure/table) || isfloorturf(over_object)) && length(contents) \ + && loc == M && !M.stat && !M.restrained() && M.canmove && over_object.Adjacent(M) && !istype(src, /obj/item/storage/lockbox)) // Worlds longest `if()` + var/turf/T = get_turf(over_object) + if(isfloorturf(over_object)) + if(get_turf(M) != T) + return // Can only empty containers onto the floor under you + if(alert(M, "Empty [src] onto [T]?", "Confirm", "Yes", "No") != "Yes") + return + if(!(M && over_object && length(contents) && loc == M && !M.stat && !M.restrained() && M.canmove && get_turf(M) == T)) + return // Something happened while the player was thinking + hide_from(M) + M.face_atom(over_object) + M.visible_message("[M] empties [src] onto [over_object].", + "You empty [src] onto [over_object].") + for(var/obj/item/I in contents) + remove_from_storage(I, T) + update_icon() // For content-sensitive icons + return + + if(!(istype(over_object, /obj/screen))) + return ..() + if(!(loc == M) || (loc && loc.loc == M)) + return + playsound(loc, "rustle", 50, 1, -5) + if(!M.restrained() && !M.stat) + switch(over_object.name) + if("r_hand") + if(!M.unEquip(src, silent = TRUE)) return - if(!(usr && over_object && contents.len && loc == usr && !usr.stat && !usr.restrained() && usr.canmove && get_turf(usr) == T)) - return // Something happened while the player was thinking - hide_from(usr) - usr.face_atom(over_object) - usr.visible_message("[usr] empties \the [src] onto \the [over_object].", - "You empty \the [src] onto \the [over_object].") - for(var/obj/item/I in contents) - remove_from_storage(I, T) - update_icon() // For content-sensitive icons - return - - if(!(istype(over_object, /obj/screen))) - return ..() - if(!(loc == usr) || (loc && loc.loc == usr)) - return - playsound(loc, "rustle", 50, TRUE, -5) - if(!(M.restrained()) && !(M.stat)) - switch(over_object.name) - if("r_hand") - if(!M.unEquip(src)) - return - M.put_in_r_hand(src) - if("l_hand") - if(!M.unEquip(src)) - return - M.put_in_l_hand(src) - add_fingerprint(usr) - return - if(over_object == usr && in_range(src, usr) || usr.contents.Find(src)) - if(usr.s_active) - usr.s_active.close(usr) - show_to(usr) - return + M.put_in_r_hand(src) + if("l_hand") + if(!M.unEquip(src, silent = TRUE)) + return + M.put_in_l_hand(src) + add_fingerprint(usr) + return + if(over_object == usr && in_range(src, usr) || usr.contents.Find(src)) + if(usr.s_active) + usr.s_active.close(usr) + show_to(usr) /obj/item/storage/AltClick(mob/user) + . = ..() if(ishuman(user) && Adjacent(user) && !user.incapacitated(FALSE, TRUE, TRUE)) show_to(user) playsound(loc, "rustle", 50, TRUE, -5) add_fingerprint(user) else if(isobserver(user)) show_to(user) - return ..() +/** + * Loops through any nested containers inside `src`, and returns a list of everything inside them. + * + * Currently checks for storage containers, gifts containing storage containers, and folders. + */ /obj/item/storage/proc/return_inv() var/list/L = list() + L += contents // Inventory of the main storage item - L += contents - - for(var/obj/item/storage/S in src) + for(var/obj/item/storage/S in src) // Inventory of nested storage items L += S.return_inv() for(var/obj/item/gift/G in src) L += G.gift - if(istype(G.gift, /obj/item/storage)) - L += G.gift:return_inv() + if(istype(G.gift, /obj/item/storage)) // If the gift contains a storage item + var/obj/item/storage/S = G.gift + L += S.return_inv() for(var/obj/item/folder/F in src) L += F.contents return L +/** + * Shows `user` the contents of `src`, and activates any mouse trap style triggers. + */ /obj/item/storage/proc/show_to(mob/user) if(!user.client) return - if(user.s_active != src) + if(user.s_active != src) // Switching from another container for(var/obj/item/I in src) - if(I.on_found(user)) - return - orient2hud(user) // this only needs to happen to make .contents show properly as screen objects. + if(I.on_found(user)) // For mouse traps and such + return // If something triggered, don't open the UI + orient2hud(user) // this only needs to happen to make .contents show properly as screen objects. if(user.s_active) - user.s_active.hide_from(user) + user.s_active.hide_from(user) // If there's already an interface open, close it. user.client.screen -= boxes user.client.screen -= closer user.client.screen -= contents @@ -127,20 +177,20 @@ user.client.screen += closer user.client.screen += contents user.s_active = src - return +/** + * Hides the current container interface from `user`. + */ /obj/item/storage/proc/hide_from(mob/user) if(!user.client) return - user.client.screen -= boxes user.client.screen -= closer user.client.screen -= contents if(user.s_active == src) user.s_active = null - return -/obj/item/storage/proc/open(mob/user as mob) +/obj/item/storage/proc/open(mob/user) if(use_sound) playsound(loc, use_sound, 50, TRUE, -5) @@ -152,8 +202,14 @@ hide_from(user) user.s_active = null -//This proc draws out the inventory and places the items on it. tx and ty are the upper left tile and mx, my are the bottm right. -//The numbers are calculated from the bottom-left The bottom-left slot being 1,1. +/** + * Draws the inventory and places the items on it using custom positions. + * + * `tx` and `ty` are the upper left tile. + * `mx` and `my` are the bottom right tile. + * + * The numbers are calculated from the bottom left, with the bottom left being `1,1`. + */ /obj/item/storage/proc/orient_objs(tx, ty, mx, my) var/cx = tx var/cy = ty @@ -211,125 +267,142 @@ //This proc determins the size of the inventory to be displayed. Please touch it only if you know what you're doing. /obj/item/storage/proc/orient2hud(mob/user) - var/adjusted_contents = contents.len + var/adjusted_contents = length(contents) //Numbered contents display - var/list/datum/numbered_display/display_contents + var/list/datum/numbered_display/numbered_contents if(display_contents_with_number) for(var/obj/O in contents) O.layer = initial(O.layer) O.plane = initial(O.plane) - display_contents = list() + numbered_contents = list() adjusted_contents = 0 for(var/obj/item/I in contents) var/found = FALSE - for(var/datum/numbered_display/ND in display_contents) + for(var/datum/numbered_display/ND in numbered_contents) if(ND.sample_object.type == I.type && ND.sample_object.name == I.name) ND.number++ found = TRUE break if(!found) adjusted_contents++ - display_contents.Add(new/datum/numbered_display(I)) + numbered_contents += new/datum/numbered_display(I) - //var/mob/living/carbon/human/H = user var/row_num = 0 var/col_count = min(7, storage_slots) - 1 if(adjusted_contents > 7) row_num = round((adjusted_contents - 1) / 7) // 7 is the maximum allowed width. - standard_orient_objs(row_num, col_count, display_contents) + standard_orient_objs(row_num, col_count, numbered_contents) -//This proc returns TRUE if the item can be picked up and FALSE if it can't. -//Set the stop_messages to stop it from printing messages -/obj/item/storage/proc/can_be_inserted(obj/item/W, stop_messages = FALSE) - if(!istype(W) || (W.flags & ABSTRACT)) //Not an item +/** + * Checks whether `I` can be inserted into the container. + * + * Returns `TRUE` if it can, and `FALSE` if it can't. + * Arguments: + * * obj/item/I - The item to insert + * * stop_messages - Don't display a warning message if the item can't be inserted + */ +/obj/item/storage/proc/can_be_inserted(obj/item/I, stop_messages = FALSE) + if(!istype(I) || (I.flags & ABSTRACT)) // Not an item return - if(loc == W) + if(loc == I) return FALSE //Means the item is already in the storage item - if(contents.len >= storage_slots) + + if(length(contents) >= storage_slots) if(!stop_messages) - to_chat(usr, "[W] won't fit in [src], make some space!") + to_chat(usr, "[I] won't fit in [src], make some space!") return FALSE //Storage item is full - if(can_hold.len) - if(!is_type_in_typecache(W, can_hold)) + if(length(can_hold)) + if(!is_type_in_typecache(I, can_hold)) if(!stop_messages) - to_chat(usr, "[src] cannot hold [W].") + to_chat(usr, "[src] cannot hold [I].") return FALSE - if(is_type_in_typecache(W, cant_hold)) //Check for specific items which this container can't hold. + if(is_type_in_typecache(I, cant_hold)) //Check for specific items which this container can't hold. if(!stop_messages) - to_chat(usr, "[src] cannot hold [W].") + to_chat(usr, "[src] cannot hold [I].") return FALSE - if(W.w_class > max_w_class) + if(I.w_class > max_w_class) if(!stop_messages) - to_chat(usr, "[W] is too big for [src].") + to_chat(usr, "[I] is too big for [src].") return FALSE - var/sum_w_class = W.w_class - for(var/obj/item/I in contents) - sum_w_class += I.w_class //Adds up the combined w_classes which will be in the storage item if the item is added to it. + var/sum_w_class = I.w_class + for(var/obj/item/item in contents) + sum_w_class += item.w_class //Adds up the combined w_classes which will be in the storage item if the item is added to it. if(sum_w_class > max_combined_w_class) if(!stop_messages) - to_chat(usr, "[src] is full, make some space.") + to_chat(usr, "[src] is full, make some space.") return FALSE - if(W.w_class >= w_class && (istype(W, /obj/item/storage))) - if(!istype(src, /obj/item/storage/backpack/holding)) //bohs should be able to hold backpacks again. The override for putting a boh in a boh is in backpack.dm. + if(I.w_class >= w_class && istype(I, /obj/item/storage)) + if(!istype(src, /obj/item/storage/backpack/holding)) //BoHs should be able to hold backpacks again. The override for putting a BoH in a BoH is in backpack.dm. if(!stop_messages) - to_chat(usr, "[src] cannot hold [W] as it's a storage item of the same size.") + to_chat(usr, "[src] cannot hold [I] as it's a storage item of the same size.") return FALSE //To prevent the stacking of same sized storage items. - if(W.flags & NODROP) //SHOULD be handled in unEquip, but better safe than sorry. - to_chat(usr, "\the [W] is stuck to your hand, you can't put it in \the [src]") + if(I.flags & NODROP) //SHOULD be handled in unEquip, but better safe than sorry. + to_chat(usr, "[I] is stuck to your hand, you can't put it in [src]") return FALSE return TRUE -//This proc handles items being inserted. It does not perform any checks of whether an item can or can't be inserted. That's done by can_be_inserted() -//The stop_warning parameter will stop the insertion message from being displayed. It is intended for cases where you are inserting multiple items at once, -//such as when picking up all the items on a tile with one click. -/obj/item/storage/proc/handle_item_insertion(obj/item/W, prevent_warning = FALSE) - if(!istype(W)) +/** + * Handles items being inserted into a storage container. + * + * This doesn't perform any checks of whether an item can be inserted. That's done by [/obj/item/storage/proc/can_be_inserted] + * Arguments: + * * obj/item/I - The item to be inserted + * * prevent_warning - Stop the insertion message being displayed. Intended for cases when you are inserting multiple items at once. + */ +/obj/item/storage/proc/handle_item_insertion(obj/item/I, prevent_warning = FALSE) + if(!istype(I)) return FALSE if(usr) - if(!usr.unEquip(W)) + if(!usr.unEquip(I, silent = TRUE)) return FALSE usr.update_icons() //update our overlays if(silent) prevent_warning = TRUE - W.forceMove(src) - W.on_enter_storage(src) + I.forceMove(src) + I.on_enter_storage(src) if(usr) if(usr.client && usr.s_active != src) - usr.client.screen -= W - W.dropped(usr) + usr.client.screen -= I + I.dropped(usr, TRUE) add_fingerprint(usr) - if(!prevent_warning && !istype(W, /obj/item/gun/energy/kinetic_accelerator/crossbow)) + if(!prevent_warning && !istype(I, /obj/item/gun/energy/kinetic_accelerator/crossbow)) for(var/mob/M in viewers(usr, null)) if(M == usr) - to_chat(usr, "You put [W] into [src].") + to_chat(usr, "You put [I] into [src].") else if(M in range(1)) //If someone is standing close enough, they can tell what it is... - M.show_message("[usr] puts [W] into [src].") - else if(W && W.w_class >= WEIGHT_CLASS_NORMAL) //Otherwise they can only see large or normal items from a distance... - M.show_message("[usr] puts [W] into [src].") + M.show_message("[usr] puts [I] into [src].") + else if(I && I.w_class >= WEIGHT_CLASS_NORMAL) //Otherwise they can only see large or normal items from a distance... + M.show_message("[usr] puts [I] into [src].") orient2hud(usr) if(usr.s_active) usr.s_active.show_to(usr) - W.mouse_opacity = MOUSE_OPACITY_OPAQUE //So you can click on the area around the item to equip it, instead of having to pixel hunt - W.in_inventory = TRUE + I.mouse_opacity = MOUSE_OPACITY_OPAQUE //So you can click on the area around the item to equip it, instead of having to pixel hunt + I.in_inventory = TRUE update_icon() return TRUE -//Call this proc to handle the removal of an item from the storage item. The item will be moved to the atom sent as new_target -/obj/item/storage/proc/remove_from_storage(obj/item/W, atom/new_location) - if(!istype(W)) +/** + * Handles the removal of an item from a storage container. + * + * Arguments: + * * obj/item/I - The item to be removed + * * atom/new_location - The location to send the item to. + */ +/obj/item/storage/proc/remove_from_storage(obj/item/I, atom/new_location) + if(!istype(I)) return FALSE if(istype(src, /obj/item/storage/fancy)) @@ -337,32 +410,31 @@ F.update_icon(TRUE) for(var/mob/M in range(1, loc)) - if(M.s_active == src) - if(M.client) - M.client.screen -= W + if((M.s_active == src) && M.client) + M.client.screen -= I if(new_location) if(ismob(loc)) - W.dropped(usr) + I.dropped(usr, TRUE) if(ismob(new_location)) - W.layer = ABOVE_HUD_LAYER - W.plane = ABOVE_HUD_PLANE + I.layer = ABOVE_HUD_LAYER + I.plane = ABOVE_HUD_PLANE else - W.layer = initial(W.layer) - W.plane = initial(W.plane) - W.forceMove(new_location) + I.layer = initial(I.layer) + I.plane = initial(I.plane) + I.forceMove(new_location) else - W.forceMove(get_turf(src)) + I.forceMove(get_turf(src)) if(usr) orient2hud(usr) if(usr.s_active) usr.s_active.show_to(usr) - if(W.maptext) - W.maptext = "" - W.on_exit_storage(src) + if(I.maptext) + I.maptext = "" + I.on_exit_storage(src) update_icon() - W.mouse_opacity = initial(W.mouse_opacity) + I.mouse_opacity = initial(I.mouse_opacity) return TRUE /obj/item/storage/Exited(atom/A, loc) @@ -389,25 +461,27 @@ return //Robots can't interact with storage items. if(!can_be_inserted(I)) - if(contents.len >= storage_slots) //don't use items on the backpack if they don't fit + if(length(contents) >= storage_slots) //don't use items on the backpack if they don't fit return TRUE return FALSE handle_item_insertion(I) + /obj/item/storage/attack_hand(mob/user) playsound(loc, "rustle", 50, TRUE, -5) if(ishuman(user)) var/mob/living/carbon/human/H = user - if(H.l_store == src && !H.get_active_hand()) //Prevents opening if it's in a pocket. - H.put_in_hands(src) - H.l_store = null - return - if(H.r_store == src && !H.get_active_hand()) - H.put_in_hands(src) - H.r_store = null - return + if(!H.get_active_hand()) + if(H.l_store == src) //Prevents opening if it's in a pocket. + H.put_in_hands(src) + H.l_store = null + return + if(H.r_store == src) + H.put_in_hands(src) + H.r_store = null + return orient2hud(user) if(loc == user) @@ -454,34 +528,13 @@ remove_from_storage(I, T) CHECK_TICK -/obj/item/storage/New() - ..() - can_hold = typecacheof(can_hold) - cant_hold = typecacheof(cant_hold) - - if(allow_quick_empty) - verbs += /obj/item/storage/verb/quick_empty - else - verbs -= /obj/item/storage/verb/quick_empty - - if(allow_quick_gather) - verbs += /obj/item/storage/verb/toggle_gathering_mode - else - verbs -= /obj/item/storage/verb/toggle_gathering_mode - - boxes = new /obj/screen/storage() - boxes.name = "storage" - boxes.master = src - boxes.icon_state = "block" - boxes.screen_loc = "7,7 to 10,8" - boxes.layer = HUD_LAYER - boxes.plane = HUD_PLANE - closer = new /obj/screen/close() - closer.master = src - closer.icon_state = "backpack_close" - closer.layer = ABOVE_HUD_LAYER - closer.plane = ABOVE_HUD_PLANE - orient2hud() +/** + * Populates the container with items + * + * Override with whatever you want to put in the container + */ +/obj/item/storage/proc/populate_contents() + return // Override /obj/item/storage/Destroy() for(var/obj/O in contents) @@ -493,8 +546,8 @@ /obj/item/storage/emp_act(severity) ..() - for(var/i in contents) - var/atom/A = i + for(var/I in contents) + var/atom/A = I A.emp_act(severity) /obj/item/storage/hear_talk(mob/living/M, list/message_pieces) @@ -536,8 +589,12 @@ user.put_in_hands(I) qdel(src) -//Returns the storage depth of an atom. This is the number of storage items the atom is contained in before reaching toplevel (the area). -//Returns -1 if the atom was not found on container. +/** + * Returns the storage depth of an atom up to the area level. + * + * The storage depth is the number of storage items the atom is contained in. + * Returns `-1` if the atom was not found in a container. + */ /atom/proc/storage_depth(atom/container) var/depth = 0 var/atom/cur_atom = src @@ -554,8 +611,11 @@ return depth -//Like storage depth, but returns the depth to the nearest turf -//Returns -1 if no top level turf (a loc was null somewhere, or a non-turf atom's loc was an area somehow). +/** + * Like [/atom/proc/storage_depth], but returns the depth to the nearest turf. + * + * Returns `-1` if there's no top level turf. (A loc was null somewhere, or a non-turf atom's loc was an area somehow.) + */ /atom/proc/storage_depth_turf() var/depth = 0 var/atom/cur_atom = src diff --git a/code/game/objects/items/weapons/storage/toolbox.dm b/code/game/objects/items/weapons/storage/toolbox.dm index c95e61cbf14..db3e97b4154 100644 --- a/code/game/objects/items/weapons/storage/toolbox.dm +++ b/code/game/objects/items/weapons/storage/toolbox.dm @@ -1,12 +1,13 @@ /obj/item/storage/toolbox name = "toolbox" desc = "Danger. Very robust." - icon = 'icons/obj/storage.dmi' - icon_state = "red" - item_state = "toolbox_red" + icon_state = "toolbox_default" + item_state = "toolbox_default" + lefthand_file = 'icons/mob/inhands/equipment/toolbox_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/toolbox_righthand.dmi' flags = CONDUCT - force = 10.0 - throwforce = 10.0 + force = 10 + throwforce = 10 throw_speed = 2 throw_range = 7 w_class = WEIGHT_CLASS_BULKY @@ -14,14 +15,32 @@ origin_tech = "combat=1;engineering=1" attack_verb = list("robusted") hitsound = 'sound/weapons/smash.ogg' + drop_sound = 'sound/items/handling/toolbox_drop.ogg' + pickup_sound = 'sound/items/handling/toolbox_pickup.ogg' + var/latches = "single_latch" + var/has_latches = TRUE + +/obj/item/storage/toolbox/Initialize(mapload) + . = ..() + if(has_latches) + if(prob(10)) + latches = "double_latch" + if(prob(1)) + latches = "triple_latch" + update_icon() + +/obj/item/storage/toolbox/update_icon() + ..() + cut_overlays() + if(has_latches) + add_overlay(latches) /obj/item/storage/toolbox/emergency name = "emergency toolbox" icon_state = "red" item_state = "toolbox_red" -/obj/item/storage/toolbox/emergency/New() - ..() +/obj/item/storage/toolbox/emergency/populate_contents() new /obj/item/crowbar/red(src) new /obj/item/weldingtool/mini(src) new /obj/item/extinguisher/mini(src) @@ -34,14 +53,14 @@ /obj/item/storage/toolbox/emergency/old name = "rusty red toolbox" icon_state = "toolbox_red_old" + has_latches = FALSE /obj/item/storage/toolbox/mechanical name = "mechanical toolbox" icon_state = "blue" item_state = "toolbox_blue" -/obj/item/storage/toolbox/mechanical/New() - ..() +/obj/item/storage/toolbox/mechanical/populate_contents() new /obj/item/screwdriver(src) new /obj/item/wrench(src) new /obj/item/weldingtool(src) @@ -55,14 +74,14 @@ /obj/item/storage/toolbox/mechanical/old name = "rusty blue toolbox" icon_state = "toolbox_blue_old" + has_latches = FALSE /obj/item/storage/toolbox/electrical name = "electrical toolbox" icon_state = "yellow" item_state = "toolbox_yellow" -/obj/item/storage/toolbox/electrical/New() - ..() +/obj/item/storage/toolbox/electrical/populate_contents() var/pickedcolor = pick(COLOR_RED, COLOR_YELLOW, COLOR_GREEN, COLOR_BLUE, COLOR_PINK, COLOR_ORANGE, COLOR_CYAN, COLOR_WHITE) new /obj/item/screwdriver(src) new /obj/item/wirecutters(src) @@ -80,12 +99,11 @@ icon_state = "syndicate" item_state = "toolbox_syndi" origin_tech = "combat=2;syndicate=1;engineering=2" - silent = 1 - force = 15.0 - throwforce = 18.0 + silent = TRUE + force = 15 + throwforce = 18 -/obj/item/storage/toolbox/syndicate/New() - ..() +/obj/item/storage/toolbox/syndicate/populate_contents() new /obj/item/screwdriver(src, "red") new /obj/item/wrench(src) new /obj/item/weldingtool/largetank(src) @@ -105,8 +123,7 @@ icon_state = "blue" item_state = "toolbox_blue" -/obj/item/storage/toolbox/drone/New() - ..() +/obj/item/storage/toolbox/drone/populate_contents() var/pickedcolor = pick(pick(COLOR_RED, COLOR_YELLOW, COLOR_GREEN, COLOR_BLUE, COLOR_PINK, COLOR_ORANGE, COLOR_CYAN, COLOR_WHITE)) new /obj/item/screwdriver(src) new /obj/item/wrench(src) @@ -115,23 +132,3 @@ new /obj/item/stack/cable_coil(src, 30, paramcolor = pickedcolor) new /obj/item/wirecutters(src) new /obj/item/multitool(src) - -/obj/item/storage/toolbox/brass - name = "brass box" - desc = "A huge brass box with several indentations in its surface." - icon_state = "brassbox" - item_state = null - resistance_flags = FIRE_PROOF | ACID_PROOF - w_class = WEIGHT_CLASS_HUGE - max_w_class = WEIGHT_CLASS_NORMAL - max_combined_w_class = 28 - storage_slots = 28 - attack_verb = list("robusted", "crushed", "smashed") - -/obj/item/storage/toolbox/brass/prefilled/New() - ..() - new /obj/item/screwdriver/brass(src) - new /obj/item/wirecutters/brass(src) - new /obj/item/wrench/brass(src) - new /obj/item/crowbar/brass(src) - new /obj/item/weldingtool/experimental/brass(src) diff --git a/code/game/objects/items/weapons/storage/uplink_kits.dm b/code/game/objects/items/weapons/storage/uplink_kits.dm index 099b3aed522..2747be43612 100644 --- a/code/game/objects/items/weapons/storage/uplink_kits.dm +++ b/code/game/objects/items/weapons/storage/uplink_kits.dm @@ -1,179 +1,162 @@ -/obj/item/storage/box/syndicate/New() - ..() - switch(pickweight(list("bloodyspai" = 1, "thief" = 1, "bond" = 1, "sabotage" = 1, "payday" = 1, "implant" = 1, "hacker" = 1, "darklord" = 1, "professional" = 1))) - if("bloodyspai") // 37TC + one 0TC - new /obj/item/clothing/under/chameleon(src) // 2TC - new /obj/item/clothing/mask/chameleon(src) // 0TC - new /obj/item/card/id/syndicate(src) // 2TC - new /obj/item/clothing/shoes/chameleon/noslip(src) // 2TC - new /obj/item/camera_bug(src) // 1TC - new /obj/item/multitool/ai_detect(src) // 1TC - new /obj/item/encryptionkey/syndicate(src) // 2TC - new /obj/item/twohanded/garrote(src) // 10TC - new /obj/item/pinpointer/advpinpointer(src) // 4TC - new /obj/item/storage/fancy/cigarettes/cigpack_syndicate(src) // 2TC - new /obj/item/flashlight/emp(src) // 2TC - new /obj/item/clothing/glasses/hud/security/chameleon(src) // 2TC - new /obj/item/chameleon(src) // 7TC - return +/obj/item/storage/box/syndicate // Traitor bundles - if("thief") // 39TC - new /obj/item/gun/energy/kinetic_accelerator/crossbow(src) // 12TC - new /obj/item/chameleon(src) // 7TC - new /obj/item/clothing/glasses/chameleon/thermal(src) // 6TC - new /obj/item/clothing/gloves/color/black/thief(src) // 6TC - new /obj/item/card/id/syndicate(src) // 2TC - new /obj/item/clothing/shoes/chameleon/noslip(src) // 2TC - new /obj/item/storage/backpack/satchel_flat(src) // 2TC - new /obj/item/encryptionkey/syndicate(src) // 2TC - return + var/static/list/spy = list( // 37TC + one 0TC + /obj/item/clothing/under/chameleon, // 2TC + /obj/item/clothing/mask/chameleon, // 0TC + /obj/item/card/id/syndicate, // 2TC + /obj/item/clothing/shoes/chameleon/noslip, // 2TC + /obj/item/camera_bug, // 1TC + /obj/item/multitool/ai_detect, // 1TC + /obj/item/encryptionkey/syndicate, // 2TC + /obj/item/twohanded/garrote, // 10TC + /obj/item/pinpointer/advpinpointer, // 4TC + /obj/item/storage/fancy/cigarettes/cigpack_syndicate, // 2TC + /obj/item/flashlight/emp, // 2TC + /obj/item/clothing/glasses/hud/security/chameleon, // 2TC + /obj/item/chameleon) // 7TC - if("bond") // 33TC + three 0TC - new /obj/item/gun/projectile/automatic/pistol(src) // 4TC - new /obj/item/suppressor(src) // 1TC - new /obj/item/ammo_box/magazine/m10mm/hp(src) // 3TC - new /obj/item/ammo_box/magazine/m10mm/ap(src) // 2TC - new /obj/item/clothing/under/suit_jacket/really_black(src) // 0TC - new /obj/item/card/id/syndicate(src) // 2TC - new /obj/item/clothing/suit/storage/lawyer/blackjacket/armored(src) // 0TC - new /obj/item/encryptionkey/syndicate(src) // 2TC - new /obj/item/reagent_containers/food/drinks/drinkingglass/alliescocktail(src) // 0TC - new /obj/item/dnascrambler(src) // 4TC - new /obj/item/storage/box/syndie_kit/emp(src) // 2TC - new /obj/item/CQC_manual(src) // 13TC - return + var/static/list/thief = list( // 39TC + /obj/item/gun/energy/kinetic_accelerator/crossbow, // 12TC + /obj/item/chameleon, // 7TC + /obj/item/clothing/glasses/chameleon/thermal, // 6TC + /obj/item/clothing/gloves/color/black/thief, // 6TC + /obj/item/card/id/syndicate, // 2TC + /obj/item/clothing/shoes/chameleon/noslip, // 2TC + /obj/item/storage/backpack/satchel_flat, // 2TC + /obj/item/encryptionkey/syndicate) // 2TC - if("sabotage") // 41TC + two 0TC - new /obj/item/grenade/plastic/c4(src) // 1TC - new /obj/item/grenade/plastic/c4(src) // 1TC - new /obj/item/camera_bug(src) // 1TC - new /obj/item/powersink(src) // 10TC - new /obj/item/cartridge/syndicate(src) // 6TC - new /obj/item/rcd/preloaded(src) // 0TC - new /obj/item/card/emag(src) // 6TC - new /obj/item/clothing/gloves/color/yellow(src) // 0TC - new /obj/item/grenade/syndieminibomb(src) // 6TC - new /obj/item/grenade/clusterbuster/n2o(src) // 4TC - new /obj/item/storage/box/syndie_kit/space(src) // 4TC - new /obj/item/encryptionkey/syndicate(src) // 2TC - return + var/static/list/bond = list( // 33TC + three 0TC + /obj/item/gun/projectile/automatic/pistol, // 4TC + /obj/item/suppressor, // 1TC + /obj/item/ammo_box/magazine/m10mm/hp, // 3TC + /obj/item/ammo_box/magazine/m10mm/ap, // 2TC + /obj/item/clothing/under/suit_jacket/really_black, // 0TC + /obj/item/card/id/syndicate, // 2TC + /obj/item/clothing/suit/storage/lawyer/blackjacket/armored, // 0TC + /obj/item/encryptionkey/syndicate, // 2TC + /obj/item/reagent_containers/food/drinks/drinkingglass/alliescocktail, // 0TC + /obj/item/dnascrambler, // 4TC + /obj/item/storage/box/syndie_kit/emp, // 2TC + /obj/item/CQC_manual) // 13TC - if("payday") // 35TC + four 0TC - new /obj/item/gun/projectile/revolver(src) // 13TC - new /obj/item/ammo_box/a357(src) // 3TC - new /obj/item/ammo_box/a357(src) // 3TC - new /obj/item/card/emag(src) // 6TC - new /obj/item/jammer(src) // 5TC - new /obj/item/card/id/syndicate(src) // 2TC - new /obj/item/clothing/under/suit_jacket/really_black(src) //0TC - new /obj/item/clothing/suit/storage/lawyer/blackjacket/armored(src) //0TC - new /obj/item/clothing/gloves/color/latex/nitrile(src) //0 TC - new /obj/item/clothing/mask/gas/clown_hat(src) // 0TC - new /obj/item/thermal_drill/diamond_drill(src) // 1TC - new /obj/item/encryptionkey/syndicate(src) // 2TC - return + var/static/list/sabotage = list( // 41TC + two 0TC + /obj/item/grenade/plastic/c4, // 1TC + /obj/item/grenade/plastic/c4, // 1TC + /obj/item/camera_bug, // 1TC + /obj/item/powersink, // 10TC + /obj/item/cartridge/syndicate, // 6TC + /obj/item/rcd/preloaded, // 0TC + /obj/item/card/emag, // 6TC + /obj/item/clothing/gloves/color/yellow, // 0TC + /obj/item/grenade/syndieminibomb, // 6TC + /obj/item/grenade/clusterbuster/n2o, // 4TC + /obj/item/storage/box/syndie_kit/space, // 4TC + /obj/item/encryptionkey/syndicate) // 2TC - if("implant") // 39TC + ten free TC - new /obj/item/implanter/freedom(src) // 5TC - new /obj/item/implanter/uplink(src) // 14TC (ten free TC) - new /obj/item/implanter/emp(src) // 0TC - new /obj/item/implanter/adrenalin(src) // 8TC - new /obj/item/implanter/explosive(src) // 2TC - new /obj/item/implanter/storage(src) // 8TC - new /obj/item/encryptionkey/syndicate(src) // 2TC - return + var/static/list/payday = list( // 35TC + four 0TC + /obj/item/gun/projectile/revolver, // 13TC + /obj/item/ammo_box/a357, // 3TC + /obj/item/ammo_box/a357, // 3TC + /obj/item/card/emag, // 6TC + /obj/item/jammer, // 5TC + /obj/item/card/id/syndicate, // 2TC + /obj/item/clothing/under/suit_jacket/really_black, //0TC + /obj/item/clothing/suit/storage/lawyer/blackjacket/armored, //0TC + /obj/item/clothing/gloves/color/latex/nitrile, //0 TC + /obj/item/clothing/mask/gas/clown_hat, // 0TC + /obj/item/thermal_drill/diamond_drill, // 1TC + /obj/item/encryptionkey/syndicate) // 2TC - if("hacker") // 37TC + two 0TC - new /obj/item/aiModule/syndicate(src) // 12TC - new /obj/item/card/emag(src) // 6TC - new /obj/item/encryptionkey/syndicate(src) // 2TC - new /obj/item/encryptionkey/binary(src) // 5TC - new /obj/item/aiModule/toyAI(src) // 0TC - new /obj/item/clothing/glasses/chameleon/thermal(src) // 6TC - new /obj/item/storage/belt/military/traitor/hacker(src) // 3TC - new /obj/item/clothing/gloves/combat(src) // 0TC - new /obj/item/multitool/ai_detect(src) // 1TC - new /obj/item/flashlight/emp(src) // 2TC - return + var/static/list/implant = list( // 39TC + ten free TC + /obj/item/implanter/freedom, // 5TC + /obj/item/implanter/uplink, // 14TC (ten free TC) + /obj/item/implanter/emp, // 0TC + /obj/item/implanter/adrenalin, // 8TC + /obj/item/implanter/explosive, // 2TC + /obj/item/implanter/storage, // 8TC + /obj/item/encryptionkey/syndicate) // 2TC - if("darklord") // 24TC + two 0TC - new /obj/item/melee/energy/sword/saber/red(src) // 8TC - new /obj/item/melee/energy/sword/saber/red(src) // 8TC - new /obj/item/dnainjector/telemut/darkbundle(src) // 0TC - new /obj/item/clothing/suit/hooded/chaplain_hoodie(src) // 0TC - new /obj/item/card/id/syndicate(src) // 2TC - new /obj/item/clothing/shoes/chameleon/noslip(src) // 2TC - new /obj/item/clothing/mask/chameleon(src) // 2TC - new /obj/item/encryptionkey/syndicate(src) // 2TC - return + var/static/list/hacker = list( // 37TC + two 0TC + /obj/item/aiModule/syndicate, // 12TC + /obj/item/card/emag, // 6TC + /obj/item/encryptionkey/syndicate, // 2TC + /obj/item/encryptionkey/binary, // 5TC + /obj/item/aiModule/toyAI, // 0TC + /obj/item/clothing/glasses/chameleon/thermal, // 6TC + /obj/item/storage/belt/military/traitor/hacker, // 3TC + /obj/item/clothing/gloves/combat, // 0TC + /obj/item/multitool/ai_detect, // 1TC + /obj/item/flashlight/emp) // 2TC - if("professional") // 34TC + two 0TC - new /obj/item/gun/projectile/automatic/sniper_rifle/syndicate/penetrator(src) // 16TC - new /obj/item/ammo_box/magazine/sniper_rounds/penetrator(src) // 5TC - new /obj/item/ammo_box/magazine/sniper_rounds/soporific(src) // 3TC - new /obj/item/clothing/glasses/chameleon/thermal(src) // 6TC - new /obj/item/clothing/gloves/combat(src) // 0 TC - new /obj/item/clothing/under/suit_jacket/really_black(src) // 0 TC - new /obj/item/clothing/suit/storage/lawyer/blackjacket/armored(src) // 0TC - new /obj/item/pen/edagger(src) // 2TC - new /obj/item/encryptionkey/syndicate(src) // 2TC - return + var/static/list/darklord = list( // 24TC + two 0TC + /obj/item/melee/energy/sword/saber/red, // 8TC + /obj/item/melee/energy/sword/saber/red, // 8TC + /obj/item/dnainjector/telemut/darkbundle, // 0TC + /obj/item/clothing/suit/hooded/chaplain_hoodie, // 0TC + /obj/item/card/id/syndicate, // 2TC + /obj/item/clothing/shoes/chameleon/noslip, // 2TC + /obj/item/clothing/mask/chameleon, // 2TC + /obj/item/encryptionkey/syndicate) // 2TC + + var/static/list/professional = list( // 34TC + two 0TC + /obj/item/gun/projectile/automatic/sniper_rifle/syndicate/penetrator, // 16TC + /obj/item/ammo_box/magazine/sniper_rounds/penetrator, // 5TC + /obj/item/ammo_box/magazine/sniper_rounds/soporific, // 3TC + /obj/item/clothing/glasses/chameleon/thermal, // 6TC + /obj/item/clothing/gloves/combat, // 0 TC + /obj/item/clothing/under/suit_jacket/really_black, // 0 TC + /obj/item/clothing/suit/storage/lawyer/blackjacket/armored, // 0TC + /obj/item/pen/edagger, // 2TC + /obj/item/encryptionkey/syndicate) // 2TC + +/obj/item/storage/box/syndicate/populate_contents() + var/list/bundle = pick(spy, thief, bond, sabotage, payday, implant, hacker, darklord, professional) + for(var/item in bundle) + new item(src) /obj/item/storage/box/syndie_kit - name = "Box" - desc = "A sleek, sturdy box" + desc = "A sleek, sturdy box." icon_state = "box_of_doom" /obj/item/storage/box/syndie_kit/space name = "Boxed Space Suit and Helmet" - can_hold = list(/obj/item/clothing/suit/space/syndicate/black/red, /obj/item/clothing/head/helmet/space/syndicate/black/red, /obj/item/tank/emergency_oxygen/syndi, /obj/item/clothing/mask/gas/syndicate) + can_hold = list(/obj/item/clothing/suit/space/syndicate/black/red, /obj/item/clothing/head/helmet/space/syndicate/black/red, /obj/item/tank/internals/emergency_oxygen/engi/syndi, /obj/item/clothing/mask/gas/syndicate) max_w_class = WEIGHT_CLASS_NORMAL -/obj/item/storage/box/syndie_kit/space/New() - ..() +/obj/item/storage/box/syndie_kit/space/populate_contents() new /obj/item/clothing/suit/space/syndicate/black/red(src) new /obj/item/clothing/head/helmet/space/syndicate/black/red(src) new /obj/item/clothing/mask/gas/syndicate(src) - new /obj/item/tank/emergency_oxygen/syndi(src) - return + new /obj/item/tank/internals/emergency_oxygen/engi/syndi(src) /obj/item/storage/box/syndie_kit/hardsuit name = "Boxed Blood Red Suit and Helmet" - can_hold = list(/obj/item/clothing/suit/space/hardsuit/syndi, /obj/item/tank/emergency_oxygen/syndi, /obj/item/clothing/mask/gas/syndicate) + can_hold = list(/obj/item/clothing/suit/space/hardsuit/syndi, /obj/item/tank/internals/emergency_oxygen/engi/syndi, /obj/item/clothing/mask/gas/syndicate) max_w_class = WEIGHT_CLASS_NORMAL -/obj/item/storage/box/syndie_kit/hardsuit/New() - ..() +/obj/item/storage/box/syndie_kit/hardsuit/populate_contents() new /obj/item/clothing/suit/space/hardsuit/syndi(src) new /obj/item/clothing/mask/gas/syndicate(src) - new /obj/item/tank/emergency_oxygen/syndi(src) + new /obj/item/tank/internals/emergency_oxygen/engi/syndi(src) /obj/item/storage/box/syndie_kit/conversion name = "box (CK)" -/obj/item/storage/box/syndie_kit/conversion/New() - ..() +/obj/item/storage/box/syndie_kit/conversion/populate_contents() new /obj/item/conversion_kit(src) new /obj/item/ammo_box/a357(src) - return /obj/item/storage/box/syndie_kit/boolets name = "Shotgun shells" -/obj/item/storage/box/syndie_kit/boolets/New() - ..() - new /obj/item/ammo_casing/shotgun/fakebeanbag(src) - new /obj/item/ammo_casing/shotgun/fakebeanbag(src) - new /obj/item/ammo_casing/shotgun/fakebeanbag(src) - new /obj/item/ammo_casing/shotgun/fakebeanbag(src) - new /obj/item/ammo_casing/shotgun/fakebeanbag(src) - new /obj/item/ammo_casing/shotgun/fakebeanbag(src) +/obj/item/storage/box/syndie_kit/boolets/populate_contents() + for(var/I in 1 to 6) + new /obj/item/ammo_casing/shotgun/fakebeanbag(src) /obj/item/storage/box/syndie_kit/emp name = "boxed EMP kit" -/obj/item/storage/box/syndie_kit/emp/New() - ..() +/obj/item/storage/box/syndie_kit/emp/populate_contents() new /obj/item/grenade/empgrenade(src) new /obj/item/grenade/empgrenade(src) new /obj/item/implanter/emp/(src) @@ -181,13 +164,9 @@ /obj/item/storage/box/syndie_kit/c4 name = "Pack of C-4 Explosives" -/obj/item/storage/box/syndie_kit/c4/New() - ..() - new /obj/item/grenade/plastic/c4(src) - new /obj/item/grenade/plastic/c4(src) - new /obj/item/grenade/plastic/c4(src) - new /obj/item/grenade/plastic/c4(src) - new /obj/item/grenade/plastic/c4(src) +/obj/item/storage/box/syndie_kit/c4/populate_contents() + for(var/I in 1 to 5) + new /obj/item/grenade/plastic/c4(src) /obj/item/storage/box/syndie_kit/throwing_weapons name = "boxed throwing kit" @@ -195,21 +174,16 @@ max_combined_w_class = 16 max_w_class = WEIGHT_CLASS_NORMAL -/obj/item/storage/box/syndie_kit/throwing_weapons/New() - ..() - new /obj/item/throwing_star(src) - new /obj/item/throwing_star(src) - new /obj/item/throwing_star(src) - new /obj/item/throwing_star(src) - new /obj/item/throwing_star(src) +/obj/item/storage/box/syndie_kit/throwing_weapons/populate_contents() + for(var/I in 1 to 5) + new /obj/item/throwing_star(src) new /obj/item/restraints/legcuffs/bola/tactical(src) new /obj/item/restraints/legcuffs/bola/tactical(src) /obj/item/storage/box/syndie_kit/sarin name = "Sarin Gas Grenades" -/obj/item/storage/box/syndie_kit/sarin/New() - ..() +/obj/item/storage/box/syndie_kit/sarin/populate_contents() new /obj/item/grenade/chem_grenade/saringas(src) new /obj/item/grenade/chem_grenade/saringas(src) new /obj/item/grenade/chem_grenade/saringas(src) @@ -218,43 +192,29 @@ /obj/item/storage/box/syndie_kit/bioterror name = "bioterror syringe box" -/obj/item/storage/box/syndie_kit/bioterror/New() - ..() - new /obj/item/reagent_containers/syringe/bioterror(src) - new /obj/item/reagent_containers/syringe/bioterror(src) - new /obj/item/reagent_containers/syringe/bioterror(src) - new /obj/item/reagent_containers/syringe/bioterror(src) - new /obj/item/reagent_containers/syringe/bioterror(src) - new /obj/item/reagent_containers/syringe/bioterror(src) - new /obj/item/reagent_containers/syringe/bioterror(src) - return +/obj/item/storage/box/syndie_kit/bioterror/populate_contents() + for(var/I in 1 to 7) + new /obj/item/reagent_containers/syringe/bioterror(src) /obj/item/storage/box/syndie_kit/caneshotgun name = "cane gun kit" -/obj/item/storage/box/syndie_kit/caneshotgun/New() - ..() - new /obj/item/ammo_casing/shotgun/assassination(src) - new /obj/item/ammo_casing/shotgun/assassination(src) - new /obj/item/ammo_casing/shotgun/assassination(src) - new /obj/item/ammo_casing/shotgun/assassination(src) - new /obj/item/ammo_casing/shotgun/assassination(src) - new /obj/item/ammo_casing/shotgun/assassination(src) +/obj/item/storage/box/syndie_kit/caneshotgun/populate_contents() + for(var/I in 1 to 6) + new /obj/item/ammo_casing/shotgun/assassination(src) new /obj/item/gun/projectile/revolver/doublebarrel/improvised/cane(src) /obj/item/storage/box/syndie_kit/fake_revolver name = "trick revolver kit" -/obj/item/storage/box/syndie_kit/fake_revolver/New() - ..() +/obj/item/storage/box/syndie_kit/fake_revolver/populate_contents() new /obj/item/toy/russian_revolver/trick_revolver(src) /obj/item/storage/box/syndie_kit/mimery name = "advanced mimery kit" -/obj/item/storage/box/syndie_kit/mimery/New() - ..() +/obj/item/storage/box/syndie_kit/mimery/populate_contents() new /obj/item/spellbook/oneuse/mime/greaterwall(src) new /obj/item/spellbook/oneuse/mime/fingergun(src) @@ -262,8 +222,7 @@ /obj/item/storage/box/syndie_kit/atmosn2ogrenades name = "Atmos N2O Grenades" -/obj/item/storage/box/syndie_kit/atmosn2ogrenades/New() - ..() +/obj/item/storage/box/syndie_kit/atmosn2ogrenades/populate_contents() new /obj/item/grenade/clusterbuster/n2o(src) new /obj/item/grenade/clusterbuster/n2o(src) @@ -271,8 +230,7 @@ /obj/item/storage/box/syndie_kit/atmosfiregrenades name = "Plasma Fire Grenades" -/obj/item/storage/box/syndie_kit/atmosfiregrenades/New() - ..() +/obj/item/storage/box/syndie_kit/atmosfiregrenades/populate_contents() new /obj/item/grenade/clusterbuster/plasma(src) new /obj/item/grenade/clusterbuster/plasma(src) @@ -280,8 +238,7 @@ /obj/item/storage/box/syndie_kit/missionary_set name = "Missionary Starter Kit" -/obj/item/storage/box/syndie_kit/missionary_set/New() - ..() +/obj/item/storage/box/syndie_kit/missionary_set/populate_contents() new /obj/item/nullrod/missionary_staff(src) new /obj/item/clothing/suit/hooded/chaplain_hoodie/missionary_robe(src) var/obj/item/storage/bible/B = new /obj/item/storage/bible(src) @@ -294,8 +251,7 @@ /obj/item/storage/box/syndie_kit/cutouts name = "Fortified Artistic Box" -/obj/item/storage/box/syndie_kit/cutouts/New() - ..() +/obj/item/storage/box/syndie_kit/cutouts/populate_contents() for(var/i in 1 to 3) new/obj/item/cardboard_cutout/adaptive(src) new/obj/item/toy/crayon/spraycan(src) @@ -304,8 +260,7 @@ name = "bone repair kit" desc = "A box containing one prototype field bone repair kit." -/obj/item/storage/box/syndie_kit/bonerepair/New() - ..() +/obj/item/storage/box/syndie_kit/bonerepair/populate_contents() new /obj/item/reagent_containers/hypospray/autoinjector/nanocalcium(src) var/obj/item/paper/P = new /obj/item/paper(src) P.name = "Bone repair guide" @@ -324,8 +279,7 @@ To apply, hold the injector a short distance away from the outer thigh before ap name = "Safe-cracking Kit" desc = "Everything you need to quietly open a mechanical combination safe." -/obj/item/storage/box/syndie_kit/safecracking/New() - ..() +/obj/item/storage/box/syndie_kit/safecracking/populate_contents() new /obj/item/clothing/gloves/color/latex/nitrile(src) new /obj/item/clothing/mask/balaclava(src) new /obj/item/clothing/accessory/stethoscope(src) @@ -334,8 +288,7 @@ To apply, hold the injector a short distance away from the outer thigh before ap /obj/item/storage/box/syndie_kit/chameleon name = "chameleon kit" -/obj/item/storage/box/syndie_kit/chameleon/New() - ..() +/obj/item/storage/box/syndie_kit/chameleon/populate_contents() new /obj/item/clothing/under/chameleon(src) new /obj/item/clothing/suit/chameleon(src) new /obj/item/clothing/gloves/chameleon(src) @@ -351,10 +304,8 @@ To apply, hold the injector a short distance away from the outer thigh before ap /obj/item/storage/box/syndie_kit/dart_gun name = "dart gun kit" -/obj/item/storage/box/syndie_kit/dart_gun/New() - ..() +/obj/item/storage/box/syndie_kit/dart_gun/populate_contents() new /obj/item/gun/syringe/syndicate(src) new /obj/item/reagent_containers/syringe/capulettium_plus(src) new /obj/item/reagent_containers/syringe/sarin(src) new /obj/item/reagent_containers/syringe/pancuronium(src) - diff --git a/code/game/objects/items/weapons/storage/wallets.dm b/code/game/objects/items/weapons/storage/wallets.dm index 197a3cad49f..a2f52ff243b 100644 --- a/code/game/objects/items/weapons/storage/wallets.dm +++ b/code/game/objects/items/weapons/storage/wallets.dm @@ -74,29 +74,20 @@ else return ..() -/obj/item/storage/wallet/random/New() - ..() - var/item1_type = pick(/obj/item/stack/spacecash, +/obj/item/storage/wallet/random/populate_contents() + var/cash = pick(/obj/item/stack/spacecash, /obj/item/stack/spacecash/c10, /obj/item/stack/spacecash/c100, /obj/item/stack/spacecash/c500, /obj/item/stack/spacecash/c1000) - var/item2_type - if(prob(50)) - item2_type = pick(/obj/item/stack/spacecash, - /obj/item/stack/spacecash/c10, - /obj/item/stack/spacecash/c100, - /obj/item/stack/spacecash/c500, - /obj/item/stack/spacecash/c1000) - var/item3_type = pick( /obj/item/coin/silver, /obj/item/coin/silver, /obj/item/coin/gold, /obj/item/coin/iron, /obj/item/coin/iron, /obj/item/coin/iron ) + var/coin = pickweight(list(/obj/item/coin/iron = 3, + /obj/item/coin/silver = 2, + /obj/item/coin/gold = 1)) - spawn(2) - if(item1_type) - new item1_type(src) - if(item2_type) - new item2_type(src) - if(item3_type) - new item3_type(src) + new cash(src) + if(prob(50)) // 50% chance of a second + new cash(src) + new coin(src) ////////////////////////////////////// // Color Wallets // @@ -107,11 +98,11 @@ desc = "A cheap wallet from the arcade." storage_slots = 5 //smaller storage than normal wallets -/obj/item/storage/wallet/color/New() - ..() +/obj/item/storage/wallet/color/Initialize(mapload) + . = ..() if(!item_color) var/color_wallet = pick(subtypesof(/obj/item/storage/wallet/color)) - new color_wallet(src.loc) + new color_wallet(loc) qdel(src) return UpdateDesc() diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm index ec7d4b6989f..f8104a2d9ea 100644 --- a/code/game/objects/items/weapons/stunbaton.dm +++ b/code/game/objects/items/weapons/stunbaton.dm @@ -7,66 +7,41 @@ slot_flags = SLOT_BELT force = 10 throwforce = 7 - w_class = WEIGHT_CLASS_NORMAL origin_tech = "combat=2" attack_verb = list("beaten") armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 50, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 80) + /// How many life ticks does the stun last for var/stunforce = 7 - var/status = 0 - var/obj/item/stock_parts/cell/high/cell = null + /// Is the baton currently turned on + var/turned_on = FALSE + /// How much power does it cost to stun someone var/hitcost = 1000 + /// Chance for the baton to stun when thrown at someone var/throw_hit_chance = 35 + var/obj/item/stock_parts/cell/high/cell = null -/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.") - return FIRELOSS - -/obj/item/melee/baton/get_cell() - return cell - -/obj/item/melee/baton/New() - ..() +/obj/item/melee/baton/Initialize(mapload) + . = ..() update_icon() - return + +/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 + 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/throw_impact(atom/hit_atom) - ..() - if(status && prob(throw_hit_chance)) - baton_stun(hit_atom) - -/obj/item/melee/baton/loaded/New() //this one starts with a cell pre-installed. - ..() - cell = new(src) - update_icon() - return - -/obj/item/melee/baton/proc/deductcharge(var/chrgdeductamt) - if(isrobot(loc)) - var/mob/living/silicon/robot/R = loc - if(R.cell && R.cell.charge < (hitcost+chrgdeductamt)) - status = 0 - update_icon() - playsound(loc, "sparks", 75, 1, -1) - if(R.cell.use(chrgdeductamt)) - return 1 - else - return 0 - if(cell) - if(cell.charge < (hitcost+chrgdeductamt)) // If after the deduction the baton doesn't have enough charge for a stun hit it turns off. - status = 0 - update_icon() - playsound(loc, "sparks", 75, 1, -1) - if(cell.use(chrgdeductamt)) - return 1 - else - return 0 +/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.") + return FIRELOSS /obj/item/melee/baton/update_icon() - if(status) + if(turned_on) icon_state = "[base_icon]_active" else if(!cell) icon_state = "[base_icon]_nocell" @@ -75,150 +50,156 @@ /obj/item/melee/baton/examine(mob/user) . = ..() - if(isrobot(loc)) + if(isrobot(user)) . += "This baton is drawing power directly from your own internal charge." if(cell) . += "The baton is [round(cell.percent())]% charged." - if(!cell) + else . += "The baton does not have a power source installed." -/obj/item/melee/baton/attackby(obj/item/W, mob/user, params) - if(istype(W, /obj/item/stock_parts/cell)) - var/obj/item/stock_parts/cell/C = W - if(cell) - to_chat(user, "[src] already has a cell.") - else - if(C.maxcharge < hitcost) - to_chat(user, "[src] requires a higher capacity cell.") - return - if(!user.unEquip(W)) - return - W.loc = src - cell = W - to_chat(user, "You install a cell in [src].") - update_icon() +/obj/item/melee/baton/get_cell() + return cell - else if(istype(W, /obj/item/screwdriver)) +/obj/item/melee/baton/throw_impact(atom/hit_atom) + ..() + if(prob(throw_hit_chance) && turned_on && isliving(hit_atom)) + baton_stun(hit_atom) + +/** + * Removes the specified amount of charge from the batons power cell. + * + * If `src` is a cyborg baton, this removes the charge from the borg's internal power cell instead. + * Arguments: + * * amount - The amount of battery charge to be used. + */ +/obj/item/melee/baton/proc/deductcharge(amount) + if(!cell) + return + cell.use(amount) + 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() + playsound(src, "sparks", 75, TRUE, -1) + +/obj/item/melee/baton/attackby(obj/item/I, mob/user, params) + if(istype(I, /obj/item/stock_parts/cell)) + var/obj/item/stock_parts/cell/C = I if(cell) - cell.update_icon() - cell.loc = get_turf(src.loc) - cell = null - to_chat(user, "You remove the cell from the [src].") - status = 0 - update_icon() + to_chat(user, "[src] already has a cell!") return - ..() - return + if(C.maxcharge < hitcost) + to_chat(user, "[src] requires a higher capacity cell!") + return + if(!user.unEquip(I)) + return + I.forceMove(src) + cell = I + to_chat(user, "You install [I] into [src].") + update_icon() + +/obj/item/melee/baton/screwdriver_act(mob/living/user, obj/item/I) + if(!cell) + to_chat(user, "There's no cell installed!") + return + if(!I.use_tool(src, user, volume = I.tool_volume)) + return + + user.put_in_hands(cell) + to_chat(user, "You remove [cell] from [src].") + cell.update_icon() + cell = null + turned_on = FALSE + update_icon() /obj/item/melee/baton/attack_self(mob/user) - - if(isrobot(loc)) - var/mob/living/silicon/robot/R = loc - if(R && R.cell && R.cell.charge >= (hitcost)) - status = !status - to_chat(user, "[src] is now [status ? "on" : "off"].") - playsound(loc, "sparks", 75, 1, -1) - else - status = 0 - to_chat(user, "You do not have enough reserve power to charge the [src]!") - else if(cell && cell.charge >= hitcost) - status = !status - to_chat(user, "[src] is now [status ? "on" : "off"].") - playsound(loc, "sparks", 75, 1, -1) + if(cell?.charge >= hitcost) + turned_on = !turned_on + to_chat(user, "[src] is now [turned_on ? "on" : "off"].") + playsound(src, "sparks", 75, TRUE, -1) else - status = 0 - if(!cell) + if(isrobot(loc)) + to_chat(user, "You do not have enough reserve power to charge [src]!") + else if(!cell) to_chat(user, "[src] does not have a power source!") else to_chat(user, "[src] is out of charge.") update_icon() add_fingerprint(user) + /obj/item/melee/baton/attack(mob/M, mob/living/user) - if(status && (CLUMSY in user.mutations) && prob(50)) - user.visible_message("[user] accidentally hits [user.p_them()]self with [src]!", \ + if(turned_on && HAS_TRAIT(user, TRAIT_CLUMSY) && prob(50)) + user.visible_message("[user] accidentally hits [user.p_them()]self with [src]!", "You accidentally hit yourself with [src]!") - user.Weaken(stunforce*3) + user.Weaken(stunforce * 3) deductcharge(hitcost) return - if(isrobot(M)) - ..() + if(isrobot(M)) // Can't stunbaton borgs + return ..() + + if(!isliving(M)) return + var/mob/living/L = M if(ishuman(M)) var/mob/living/carbon/human/H = M if(check_martial_counter(H, user)) return - if(!isliving(M)) + if(user.a_intent == INTENT_HARM) + if(turned_on) + baton_stun(L, user) + return ..() // Whack them too if in harm intent + + if(!turned_on) + L.visible_message("[user] has prodded [L] with [src]. Luckily it was off.", + "[L == user ? "You prod yourself" : "[user] has prodded you"] with [src]. Luckily it was off.") return - var/mob/living/L = M - - if(user.a_intent != INTENT_HARM) - if(status) - user.do_attack_animation(L) - baton_stun(L, user) - else - L.visible_message("[user] has prodded [L] with [src]. Luckily it was off.", \ - "[user] has prodded you with [src]. Luckily it was off") - return - else - if(status) - baton_stun(L, user) - ..() - + baton_stun(L, user) + user.do_attack_animation(L) /obj/item/melee/baton/proc/baton_stun(mob/living/L, mob/user) - if(!ismob(L)) //because this was being called on turfs for some reason - return - if(ishuman(L)) var/mob/living/carbon/human/H = L if(H.check_shields(src, 0, "[user]'s [name]", MELEE_ATTACK)) //No message; check_shields() handles that - playsound(L, 'sound/weapons/genhit.ogg', 50, 1) + playsound(L, 'sound/weapons/genhit.ogg', 50, TRUE) return + H.forcesay(GLOB.hit_appends) - if(iscarbon(L)) - var/mob/living/carbon/C = L - C.shock_internal_organs(33) + SEND_SIGNAL(L, COMSIG_LIVING_MINOR_SHOCK, 33) L.Stun(stunforce) L.Weaken(stunforce) - L.SetStuttering(stunforce) + L.Stuttering(stunforce) if(user) L.lastattacker = user.real_name L.lastattackerckey = user.ckey - L.visible_message("[user] has stunned [L] with [src]!", \ - "[user] has stunned you with [src]!") + L.visible_message("[user] has stunned [L] with [src]!", + "[L == user ? "You stun yourself" : "[user] has stunned you"] with [src]!") add_attack_logs(user, L, "stunned") - playsound(loc, 'sound/weapons/egloves.ogg', 50, 1, -1) - + playsound(src, 'sound/weapons/egloves.ogg', 50, TRUE, -1) deductcharge(hitcost) - if(ishuman(L)) - var/mob/living/carbon/human/H = L - H.forcesay(GLOB.hit_appends) /obj/item/melee/baton/emp_act(severity) + . = ..() if(cell) deductcharge(1000 / severity) - ..() /obj/item/melee/baton/wash(mob/user, atom/source) - if(cell) - if(cell.charge > 0 && status == 1) - flick("baton_active", source) - user.Stun(stunforce) - user.Weaken(stunforce) - user.stuttering = stunforce - deductcharge(hitcost) - user.visible_message("[user] shocks [user.p_them()]self while attempting to wash the active [src]!", \ - "You unwisely attempt to wash [src] while it's still on.") - playsound(src, "sparks", 50, 1) - return 1 + if(turned_on && cell?.charge) + flick("baton_active", source) + user.Stun(stunforce) + user.Weaken(stunforce) + user.SetStuttering(stunforce) + deductcharge(hitcost) + user.visible_message("[user] shocks [user.p_them()]self while attempting to wash the active [src]!", + "You unwisely attempt to wash [src] while it's still on.") + playsound(src, "sparks", 50, TRUE) + return TRUE ..() //Makeshift stun baton. Replacement for stun gloves. @@ -228,7 +209,6 @@ icon_state = "stunprod_nocell" base_icon = "stunprod" item_state = "prod" - w_class = WEIGHT_CLASS_NORMAL force = 3 throwforce = 5 stunforce = 5 @@ -237,8 +217,8 @@ slot_flags = SLOT_BACK var/obj/item/assembly/igniter/sparkler = null -/obj/item/melee/baton/cattleprod/New() - ..() +/obj/item/melee/baton/cattleprod/Initialize(mapload) + . = ..() sparkler = new(src) /obj/item/melee/baton/cattleprod/Destroy() @@ -247,4 +227,4 @@ /obj/item/melee/baton/cattleprod/baton_stun() if(sparkler.activate()) - ..() + return ..() diff --git a/code/game/objects/items/weapons/tanks/jetpack.dm b/code/game/objects/items/weapons/tanks/jetpack.dm index 1f7304a7128..b7ecfc6761e 100644 --- a/code/game/objects/items/weapons/tanks/jetpack.dm +++ b/code/game/objects/items/weapons/tanks/jetpack.dm @@ -4,12 +4,21 @@ icon_state = "jetpack" w_class = WEIGHT_CLASS_BULKY item_state = "jetpack" - distribute_pressure = ONE_ATMOSPHERE*O2STANDARD + distribute_pressure = ONE_ATMOSPHERE * O2STANDARD actions_types = list(/datum/action/item_action/set_internals, /datum/action/item_action/toggle_jetpack, /datum/action/item_action/jetpack_stabilization) + var/gas_type = "oxygen" var/on = 0 var/stabilizers = 0 var/volume_rate = 500 //Needed for borg jetpack transfer +/obj/item/tank/jetpack/populate_gas() + if(gas_type) + switch(gas_type) + if("oxygen") + air_contents.oxygen = ((6 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C)) + if("carbon dioxide") + air_contents.carbon_dioxide = ((6 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C)) + /obj/item/tank/jetpack/on_mob_move(direction, mob/user) if(on) var/turf/T = get_step(src, GetOppositeDir(direction)) @@ -29,14 +38,6 @@ stabilizers = !stabilizers to_chat(user, "You turn [src]'s stabilization [stabilizers ? "on" : "off"].") - -/obj/item/tank/jetpack/examine(mob/user) - . = ..() - if(get_dist(user, src) <= 0 && air_contents.oxygen < 10) - . += "The meter on [src] indicates you are almost out of air!" - playsound(user, 'sound/effects/alert.ogg', 50, 1) - - /obj/item/tank/jetpack/proc/cycle(mob/user) if(user.incapacitated()) return @@ -77,16 +78,27 @@ T.assume_air(removed) return 1 +/obj/item/tank/jetpack/improvised + name = "improvised jetpack" + desc = "A jetpack made from two air tanks, a fire extinguisher and some atmospherics equipment. It doesn't look like it can hold much." + icon_state = "jetpack-improvised" + item_state = "jetpack-improvised" + volume = 20 //normal jetpacks have 70 volume + gas_type = null //it starts empty + +/obj/item/tank/jetpack/improvised/allow_thrust(num, mob/living/user) + if(rand(0, 250) == 0) + to_chat(user, "You feel your jetpack's engines cut out.") + turn_off(user) + return + return ..() + /obj/item/tank/jetpack/void name = "Void Jetpack (Oxygen)" desc = "It works well in a void." icon_state = "jetpack-void" item_state = "jetpack-void" -/obj/item/tank/jetpack/void/New() - ..() - air_contents.oxygen = (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) - /obj/item/tank/jetpack/void/grey name = "Void Jetpack (Oxygen)" icon_state = "jetpack-void-grey" @@ -95,16 +107,20 @@ name = "Retro Jetpack (Oxygen)" icon_state = "jetpack-void-gold" - /obj/item/tank/jetpack/oxygen name = "Jetpack (Oxygen)" desc = "A tank of compressed oxygen for use as propulsion in zero-gravity areas. Use with caution." icon_state = "jetpack" item_state = "jetpack" -/obj/item/tank/jetpack/oxygen/New() - ..() - air_contents.oxygen = (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) +/obj/item/tank/jetpack/oxygen/harness + name = "jet harness (oxygen)" + desc = "A lightweight tactical harness, used by those who don't want to be weighed down by traditional jetpacks." + icon_state = "jetpack-mini" + item_state = "jetpack-mini" + volume = 40 + throw_range = 7 + w_class = WEIGHT_CLASS_NORMAL /obj/item/tank/jetpack/oxygen/captain name = "Captain's jetpack" @@ -115,24 +131,11 @@ w_class = WEIGHT_CLASS_NORMAL resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF //steal objective items are hard to destroy. -/obj/item/tank/jetpack/oxygen/harness - name = "jet harness (oxygen)" - desc = "A lightweight tactical harness, used by those who don't want to be weighed down by traditional jetpacks." - icon_state = "jetpack-mini" - item_state = "jetpack-mini" - volume = 40 - throw_range = 8 - w_class = WEIGHT_CLASS_NORMAL - -/obj/item/tank/jetpack/oxygenblack - name = "Jetpack (Oxygen)" - desc = "A black tank of compressed oxygen for use as propulsion in zero-gravity areas. Use with caution." - icon_state = "jetpack-black" - item_state = "jetpack-black" - -/obj/item/tank/jetpack/oxygenblack/New() - ..() - air_contents.oxygen = (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) +/obj/item/tank/jetpack/oxygen/security + name = "security jetpack (oxygen)" + desc = "A tank of compressed oxygen for use as propulsion in zero-gravity areas by security forces." + icon_state = "jetpack-sec" + item_state = "jetpack-sec" /obj/item/tank/jetpack/carbondioxide name = "Jetpack (Carbon Dioxide)" @@ -140,16 +143,7 @@ distribute_pressure = 0 icon_state = "jetpack-black" item_state = "jetpack-black" - -/obj/item/tank/jetpack/carbondioxide/New() - ..() - air_contents.carbon_dioxide = (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) - -/obj/item/tank/jetpack/carbondioxide/examine(mob/user) - . = ..() - if(get_dist(user, src) <= 0 && air_contents.carbon_dioxide < 10) - . += "The meter on [src] indicates you are almost out of air!" - playsound(user, 'sound/effects/alert.ogg', 50, 1) + gas_type = "carbon dioxide" /obj/item/tank/jetpack/suit name = "hardsuit jetpack upgrade" @@ -161,8 +155,9 @@ actions_types = list(/datum/action/item_action/toggle_jetpack, /datum/action/item_action/jetpack_stabilization) volume = 1 slot_flags = null + gas_type = null var/datum/gas_mixture/temp_air_contents - var/obj/item/tank/tank = null + var/obj/item/tank/internals/tank = null var/mob/living/carbon/human/cur_user /obj/item/tank/jetpack/suit/New() diff --git a/code/game/objects/items/weapons/tanks/tank_types.dm b/code/game/objects/items/weapons/tanks/tank_types.dm index 8a5255a01b8..2964c960501 100644 --- a/code/game/objects/items/weapons/tanks/tank_types.dm +++ b/code/game/objects/items/weapons/tanks/tank_types.dm @@ -1,250 +1,224 @@ /* Types of tanks! * Contains: * Oxygen - * Nitrogen - * Plasma - * Air Mix * Anesthetic + * Air + * Plasma + * Emergency Oxygen + * Generic */ /* * Oxygen */ -/obj/item/tank/oxygen +/obj/item/tank/internals/oxygen name = "oxygen tank" - desc = "A tank of oxygen." + desc = "A tank of oxygen, this one is blue." icon_state = "oxygen" + distribute_pressure = TANK_DEFAULT_RELEASE_PRESSURE + force = 10 dog_fashion = /datum/dog_fashion/back -/obj/item/tank/oxygen/New() - ..() - air_contents.oxygen = (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) +/obj/item/tank/internals/oxygen/populate_gas() + air_contents.oxygen = (6 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C) -/obj/item/tank/oxygen/examine(mob/user) - . = ..() - if(get_dist(user, src) <= 0 && air_contents.oxygen < 10) - . += "The meter on [src] indicates you are almost out of air!" - -/obj/item/tank/oxygen/empty/New() - ..() - air_contents.oxygen = null - -/obj/item/tank/oxygen/yellow +/obj/item/tank/internals/oxygen/yellow desc = "A tank of oxygen, this one is yellow." icon_state = "oxygen_f" dog_fashion = null -/obj/item/tank/oxygen/red +/obj/item/tank/internals/oxygen/red desc = "A tank of oxygen, this one is red." icon_state = "oxygen_fr" dog_fashion = null -/obj/item/tank/emergency_oxygen +/obj/item/tank/internals/oxygen/empty/populate_gas() + return + +/* + * Anesthetic + */ +/obj/item/tank/internals/anesthetic + name = "anesthetic tank" + desc = "A tank with an N2O/O2 gas mix." + icon_state = "anesthetic" + item_state = "an_tank" + force = 10 + +/obj/item/tank/internals/anesthetic/populate_gas() + air_contents.oxygen = (3 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C) * O2STANDARD + air_contents.sleeping_agent = (3 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C) * N2STANDARD + +/* + * Plasma + */ +/obj/item/tank/internals/plasma + name = "plasma tank" + desc = "Contains dangerous plasma. Do not inhale. Warning: extremely flammable." + icon_state = "plasma" + flags = CONDUCT + slot_flags = null //they have no straps! + force = 8 + +/obj/item/tank/internals/plasma/populate_gas() + air_contents.toxins = (3 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C) + +/obj/item/tank/internals/plasma/attackby(obj/item/I, mob/user, params) + if(istype(I, /obj/item/flamethrower)) + var/obj/item/flamethrower/F = I + if((!F.status)||(F.ptank)) + return + master = F + F.ptank = src + user.unEquip(src) + loc = F + F.update_icon() + else + return ..() + +/obj/item/tank/internals/plasma/full/populate_gas() + air_contents.toxins = (10 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C) + +/obj/item/tank/internals/plasma/empty/populate_gas() + return + +/* + * Plasmaman Plasma Tank + */ +/obj/item/tank/internals/plasmaman + name = "plasma internals tank" + desc = "A tank of plasma gas designed specifically for use as internals, particularly for plasma-based lifeforms. If you're not a Plasmaman, you probably shouldn't use this." + icon_state = "plasma_fr" + item_state = "plasma_fr" + force = 10 + distribute_pressure = TANK_DEFAULT_RELEASE_PRESSURE + +/obj/item/tank/internals/plasmaman/populate_gas() + air_contents.toxins = (3 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C) + +/obj/item/tank/internals/plasmaman/full/populate_gas() + air_contents.toxins = (10 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C) + + +/obj/item/tank/internals/plasmaman/belt + icon_state = "plasmaman_tank_belt" + item_state = "plasmaman_tank_belt" + slot_flags = SLOT_BELT + force = 5 + volume = 35 + w_class = WEIGHT_CLASS_SMALL + +/obj/item/tank/internals/plasmaman/belt/full/populate_gas() + air_contents.toxins = (10 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C) + +/obj/item/tank/internals/plasmaman/belt/empty/populate_gas() + return + +/obj/item/tank/internals/emergency_oxygen/plasma + name = "emergency plasma tank" + desc = "An emergency tank designed specifically for Plasmamen." + icon_state = "emergency_p" + +/obj/item/tank/internals/emergency_oxygen/plasma/populate_gas() + air_contents.toxins = (10 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C) + +/* + * Emergency Oxygen + */ +/obj/item/tank/internals/emergency_oxygen name = "emergency oxygen tank" desc = "Used for emergencies. Contains very little oxygen, so try to conserve it until you actually need it." icon_state = "emergency" flags = CONDUCT slot_flags = SLOT_BELT w_class = WEIGHT_CLASS_SMALL - force = 4.0 + force = 4 + distribute_pressure = TANK_DEFAULT_RELEASE_PRESSURE volume = 3 //Tiny. Real life equivalents only have 21 breaths of oxygen in them. They're EMERGENCY tanks anyway -errorage (dangercon 2011) +/obj/item/tank/internals/emergency_oxygen/populate_gas() + air_contents.oxygen = (10 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C) -/obj/item/tank/emergency_oxygen/New() - ..() - air_contents.oxygen = (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) +/obj/item/tank/internals/emergency_oxygen/empty/populate_gas() + return -/obj/item/tank/emergency_oxygen/examine(mob/user) - . = ..() - if(get_dist(user, src) <= 0 && air_contents.oxygen < 0.2) - . += "The meter on [src] indicates you are almost out of air!" - playsound(user, 'sound/effects/alert.ogg', 50, 1) - -/obj/item/tank/emergency_oxygen/empty/New() - ..() - air_contents.oxygen = null - -/obj/item/tank/emergency_oxygen/engi +/obj/item/tank/internals/emergency_oxygen/engi name = "extended-capacity emergency oxygen tank" icon_state = "emergency_engi" - volume = 6 + volume = 6 // should last 24 minutes if full -/obj/item/tank/emergency_oxygen/engi/full/New() - ..() - air_contents.oxygen = (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) +/obj/item/tank/internals/emergency_oxygen/engi/empty/populate_gas() + return - -/obj/item/tank/emergency_oxygen/engi/empty/New() - ..() - air_contents.oxygen = null - -/obj/item/tank/emergency_oxygen/syndi +/obj/item/tank/internals/emergency_oxygen/engi/syndi name = "suspicious emergency oxygen tank" icon_state = "emergency_syndi" desc = "A dark emergency oxygen tank. The label on the back reads \"Original Oxygen Tank Design, Do Not Steal.\"" - volume = 6 -/obj/item/tank/emergency_oxygen/double +/obj/item/tank/internals/emergency_oxygen/double name = "double emergency oxygen tank" icon_state = "emergency_double" - volume = 10 + volume = 12 //If it's double of the above, shouldn't it be double the volume?? -/obj/item/tank/emergency_oxygen/double/empty/New() - ..() - air_contents.oxygen = null - -/obj/item/tank/emergency_oxygen/double/full - name = "pressurized double emergency oxygen tank" - desc = "Used for \"emergencies,\" it actually contains a fair amount of oxygen." - -/obj/item/tank/emergency_oxygen/double/full/New() - ..() - air_contents.oxygen = (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) +/obj/item/tank/internals/emergency_oxygen/double/empty/populate_gas() + return /* * Nitrogen */ - -/obj/item/tank/nitrogen +/obj/item/tank/internals/nitrogen name = "nitrogen tank" desc = "A tank of nitrogen." icon_state = "oxygen_fr" sprite_sheets = list("Vox Armalis" = 'icons/mob/species/armalis/back.dmi') //Do it for Big Bird. + distribute_pressure = TANK_DEFAULT_RELEASE_PRESSURE -/obj/item/tank/nitrogen/New() - ..() - air_contents.nitrogen = (3*ONE_ATMOSPHERE)*70/(R_IDEAL_GAS_EQUATION*T20C) +/obj/item/tank/internals/nitrogen/populate_gas() + air_contents.nitrogen = (6 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C) -/obj/item/tank/nitrogen/examine(mob/user) - . = ..() - if(get_dist(user, src) <= 0 && air_contents.nitrogen < 10) - . += "The meter on the [src.name] indicates you are almost out of air!" - -/obj/item/tank/emergency_oxygen/vox - name = "vox specialized nitrogen tank" - desc = "A high-tech nitrogen tank designed specifically for Vox." - icon_state = "emergency_vox" - volume = 25 - sprite_sheets = list("Vox Armalis" = 'icons/mob/species/armalis/belt.dmi') //Do it for Big Bird. - -/obj/item/tank/emergency_oxygen/vox/New() - ..() - air_contents.oxygen -= (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) - air_contents.nitrogen = (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) - -/obj/item/tank/emergency_oxygen/nitrogen +/obj/item/tank/internals/emergency_oxygen/nitrogen name = "emergency nitrogen tank" desc = "An emergency tank designed specifically for Vox." icon_state = "emergency_nitrogen" - volume = 3 -/obj/item/tank/emergency_oxygen/nitrogen/New() - ..() - air_contents.oxygen -= (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) - air_contents.nitrogen = (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) +/obj/item/tank/internals/emergency_oxygen/nitrogen/populate_gas() + air_contents.nitrogen = (10 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C) -/* - Plasma -*/ +/obj/item/tank/internals/emergency_oxygen/double/vox + name = "vox specialized nitrogen tank" + desc = "A high-tech nitrogen tank designed specifically for Vox." + icon_state = "emergency_vox" + sprite_sheets = list("Vox Armalis" = 'icons/mob/species/armalis/belt.dmi') //Do it for Big Bird. + volume = 35 -/obj/item/tank/plasma - name = "plasma tank" - desc = "Contains dangerous plasma. Do not inhale. Warning: extremely flammable." - icon_state = "plasma" - flags = CONDUCT - slot_flags = null //they have no straps! - -/obj/item/tank/plasma/New() - ..() - air_contents.toxins = (3*ONE_ATMOSPHERE)*70/(R_IDEAL_GAS_EQUATION*T20C) - -/obj/item/tank/plasma/attackby(obj/item/W as obj, mob/user as mob, params) - ..() - - if(istype(W, /obj/item/flamethrower)) - var/obj/item/flamethrower/F = W - if((!F.status)||(F.ptank)) return - master = F - F.ptank = src - user.unEquip(src) - loc = F - F.update_icon() - -/obj/item/tank/plasma/full/New() - ..() - air_contents.toxins = (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) - -/obj/item/tank/plasma/plasmaman - name = "plasma internals tank" - desc = "A tank of plasma gas designed specifically for use as internals, particularly for plasma-based lifeforms. If you're not a Plasmaman, you probably shouldn't use this." - icon_state = "plasmaman_tank" - item_state = "plasmaman_tank" - force = 10 - -/obj/item/tank/plasma/plasmaman/examine(mob/user) - . = ..() - if(get_dist(user, src) <= 0 && air_contents.toxins < 0.2) - . += "The meter on [src] indicates you are almost out of plasma!" - playsound(user, 'sound/effects/alert.ogg', 50, 1) - - -/obj/item/tank/plasma/plasmaman/belt - icon_state = "plasmaman_tank_belt" - item_state = "plasmaman_tank_belt" - slot_flags = SLOT_BELT - force = 5 - volume = 25 - w_class = WEIGHT_CLASS_SMALL - -/obj/item/tank/plasma/plasmaman/belt/full/New() - ..() - air_contents.toxins = (10 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C) - -/obj/item/tank/emergency_oxygen/plasma - name = "emergency plasma tank" - desc = "An emergency tank designed specifically for Plasmamen." - icon_state = "emergency_p" - volume = 3 - -/obj/item/tank/emergency_oxygen/plasma/New() - ..() - air_contents.oxygen -= (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) - air_contents.toxins = (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) +/obj/item/tank/internals/emergency_oxygen/double/vox/populate_gas() + air_contents.nitrogen = (10 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C) /* * Air Mix */ -/obj/item/tank/air +/obj/item/tank/internals/air name = "air tank" desc = "Mixed anyone?" icon_state = "air" item_state = "air" distribute_pressure = ONE_ATMOSPHERE -/obj/item/tank/air/examine(mob/user) - . = ..() - if(get_dist(user, src) <= 0 && air_contents.oxygen < 1) - . += "The meter on [src] indicates you are almost out of air!" - playsound(user, 'sound/effects/alert.ogg', 50, 1) - -/obj/item/tank/air/New() - ..() - air_contents.oxygen = (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) * O2STANDARD - air_contents.nitrogen = (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) * N2STANDARD - +/obj/item/tank/internals/air/populate_gas() + air_contents.oxygen = (3 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C) * O2STANDARD + air_contents.nitrogen = (3 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C) * N2STANDARD /* - * Anesthetic + * Generic */ -/obj/item/tank/anesthetic - name = "anesthetic tank" - desc = "A tank with an N2O/O2 gas mix." - icon_state = "anesthetic" - item_state = "an_tank" - distribute_pressure = ONE_ATMOSPHERE - -/obj/item/tank/anesthetic/New() - ..() - air_contents.oxygen = (3 * ONE_ATMOSPHERE) * 70 / (R_IDEAL_GAS_EQUATION * T20C) * O2STANDARD - air_contents.sleeping_agent = (3 * ONE_ATMOSPHERE) * 70 / (R_IDEAL_GAS_EQUATION * T20C) * N2STANDARD +/obj/item/tank/internals/generic + name = "gas tank" + desc = "A generic tank used for storing and transporting gasses. Can be used for internals." + icon_state = "generic" + item_state = "generic" + distribute_pressure = TANK_DEFAULT_RELEASE_PRESSURE + force = 10 + dog_fashion = /datum/dog_fashion/back +/obj/item/tank/internals/generic/populate_gas() + return diff --git a/code/game/objects/items/weapons/tanks/tanks.dm b/code/game/objects/items/weapons/tanks/tanks.dm index 73a75919af8..be1e8e48feb 100644 --- a/code/game/objects/items/weapons/tanks/tanks.dm +++ b/code/game/objects/items/weapons/tanks/tanks.dm @@ -1,5 +1,3 @@ -#define TANK_MAX_RELEASE_PRESSURE (3*ONE_ATMOSPHERE) - /obj/item/tank name = "tank" icon = 'icons/obj/tank.dmi' @@ -8,14 +6,14 @@ hitsound = 'sound/weapons/smash.ogg' w_class = WEIGHT_CLASS_NORMAL pressure_resistance = ONE_ATMOSPHERE * 5 - force = 5.0 - throwforce = 10.0 + force = 5 + throwforce = 10 throw_speed = 1 throw_range = 4 armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 10, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 30) actions_types = list(/datum/action/item_action/set_internals) var/datum/gas_mixture/air_contents = null - var/distribute_pressure = TANK_DEFAULT_RELEASE_PRESSURE + var/distribute_pressure = ONE_ATMOSPHERE var/integrity = 3 var/volume = 70 @@ -25,6 +23,9 @@ air_contents = new /datum/gas_mixture() air_contents.volume = volume //liters air_contents.temperature = T20C + + populate_gas() + START_PROCESSING(SSobj, src) return @@ -35,6 +36,8 @@ return ..() +/obj/item/tank/proc/populate_gas() + return /obj/item/tank/ui_action_click(mob/user) toggle_internals(user) @@ -82,7 +85,7 @@ . += "It's \a [bicon(icon)][src]! If you want any more information you'll need to get closer." return - var/celsius_temperature = air_contents.temperature-T0C + var/celsius_temperature = air_contents.temperature - T0C var/descriptive if(celsius_temperature < 20) @@ -147,10 +150,10 @@ /obj/item/tank/ui_data(mob/user) var/list/data = list() - data["tankPressure"] = round(air_contents.return_pressure() ? air_contents.return_pressure() : 0) - data["releasePressure"] = round(distribute_pressure ? distribute_pressure : 0) + data["tankPressure"] = round(air_contents.return_pressure()) + data["releasePressure"] = round(distribute_pressure) data["defaultReleasePressure"] = round(TANK_DEFAULT_RELEASE_PRESSURE) - data["minReleasePressure"] = round(TANK_DEFAULT_RELEASE_PRESSURE) + data["minReleasePressure"] = round(TANK_MIN_RELEASE_PRESSURE) data["maxReleasePressure"] = round(TANK_MAX_RELEASE_PRESSURE) var/mob/living/carbon/C = user if(!istype(C)) @@ -171,7 +174,7 @@ if(pressure == "reset") pressure = initial(distribute_pressure) else if(pressure == "min") - pressure = TANK_DEFAULT_RELEASE_PRESSURE + pressure = TANK_MIN_RELEASE_PRESSURE else if(pressure == "max") pressure = TANK_MAX_RELEASE_PRESSURE else if(text2num(pressure) != null) @@ -179,7 +182,7 @@ else . = FALSE if(.) - distribute_pressure = clamp(round(pressure), TANK_DEFAULT_RELEASE_PRESSURE, TANK_MAX_RELEASE_PRESSURE) + distribute_pressure = clamp(round(pressure), TANK_MIN_RELEASE_PRESSURE, TANK_MAX_RELEASE_PRESSURE) if("internals") toggle_internals(usr) else @@ -204,10 +207,9 @@ return null var/tank_pressure = air_contents.return_pressure() - if(tank_pressure < distribute_pressure) - distribute_pressure = tank_pressure + var/actual_distribute_pressure = clamp(tank_pressure, 0, distribute_pressure) - var/moles_needed = distribute_pressure*volume_to_return/(R_IDEAL_GAS_EQUATION*air_contents.temperature) + var/moles_needed = actual_distribute_pressure * volume_to_return / (R_IDEAL_GAS_EQUATION * air_contents.temperature) return remove_air(moles_needed) diff --git a/code/game/objects/items/weapons/tanks/watertank.dm b/code/game/objects/items/weapons/tanks/watertank.dm index b1fb8a0e703..f2145970843 100644 --- a/code/game/objects/items/weapons/tanks/watertank.dm +++ b/code/game/objects/items/weapons/tanks/watertank.dm @@ -141,7 +141,7 @@ /obj/item/reagent_containers/spray/mister/attack_self() return -/proc/check_tank_exists(parent_tank, var/mob/living/carbon/human/M, var/obj/O) +/proc/check_tank_exists(parent_tank, mob/living/carbon/human/M, obj/O) if(!parent_tank || !istype(parent_tank, /obj/item/watertank)) //To avoid weird issues from admin spawns M.unEquip(O) qdel(0) @@ -182,7 +182,7 @@ /obj/item/watertank/janitor/make_noz() return new /obj/item/reagent_containers/spray/mister/janitor(src) -/obj/item/reagent_containers/spray/mister/janitor/attack_self(var/mob/user) +/obj/item/reagent_containers/spray/mister/janitor/attack_self(mob/user) amount_per_transfer_from_this = (amount_per_transfer_from_this == 10 ? 5 : 10) to_chat(user, "You [amount_per_transfer_from_this == 10 ? "remove" : "fix"] the nozzle. You'll now use [amount_per_transfer_from_this] units per spray.") diff --git a/code/game/objects/items/weapons/tape.dm b/code/game/objects/items/weapons/tape.dm index 7084fdbc163..ccc1a9ddbbd 100644 --- a/code/game/objects/items/weapons/tape.dm +++ b/code/game/objects/items/weapons/tape.dm @@ -8,7 +8,7 @@ amount = 25 max_amount = 25 -/obj/item/stack/tape_roll/New(var/loc, var/amount=null) +/obj/item/stack/tape_roll/New(loc, amount=null) ..() update_icon() diff --git a/code/game/objects/items/weapons/teleprod.dm b/code/game/objects/items/weapons/teleprod.dm index 1fe31f8a4f7..b15d843c98c 100644 --- a/code/game/objects/items/weapons/teleprod.dm +++ b/code/game/objects/items/weapons/teleprod.dm @@ -8,12 +8,13 @@ /obj/item/melee/baton/cattleprod/teleprod/attack(mob/living/carbon/M, mob/living/carbon/user)//handles making things teleport when hit ..() - if(status) - if((CLUMSY in user.mutations) && prob(50)) - user.visible_message("[user] accidentally hits [user.p_them()]self with [src]!", \ - "You accidentally hit yourself with [src]!") - user.Weaken(stunforce*3) - deductcharge(hitcost) - do_teleport(user, get_turf(user), 50)//honk honk - else if(iscarbon(M) && !M.anchored) - do_teleport(M, get_turf(M), 15) + if(!turned_on) + return + if(HAS_TRAIT(user, TRAIT_CLUMSY) && prob(50)) + user.visible_message("[user] accidentally hits [user.p_them()]self with [src]!", + "You accidentally hit yourself with [src]!") + user.Weaken(stunforce * 3) + deductcharge(hitcost) + do_teleport(user, get_turf(user), 50)//honk honk + else if(iscarbon(M) && !M.anchored) + do_teleport(M, get_turf(M), 15) diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm index cb399b19ac6..a7ac1d632c7 100644 --- a/code/game/objects/items/weapons/twohanded.dm +++ b/code/game/objects/items/weapons/twohanded.dm @@ -68,6 +68,9 @@ if(user.get_inactive_hand()) to_chat(user, "You need your other hand to be empty!") return FALSE + if(!user.has_both_hands()) + to_chat(user, "You need both hands to wield this!") + return FALSE wielded = TRUE force = force_wielded if(sharp_when_wielded) @@ -297,12 +300,12 @@ ..() /obj/item/twohanded/dualsaber/attack(mob/target, mob/living/user) - if(HULK in user.mutations) + if(HAS_TRAIT(user, TRAIT_HULK)) to_chat(user, "You grip the blade too hard and accidentally close it!") unwield() return ..() - if((CLUMSY in user.mutations) && (wielded) && prob(40)) + 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].") user.take_organ_damage(20, 25) return @@ -350,7 +353,7 @@ return TRUE /obj/item/twohanded/dualsaber/wield(mob/living/carbon/M) //Specific wield () hulk checks due to reflection chance for balance issues and switches hitsounds. - if(HULK in M.mutations) + if(HAS_TRAIT(M, TRAIT_HULK)) to_chat(M, "You lack the grace to wield this!") return . = ..() @@ -635,7 +638,7 @@ /obj/item/twohanded/singularityhammer name = "singularity hammer" desc = "The pinnacle of close combat technology, the hammer harnesses the power of a miniaturized singularity to deal crushing blows." - icon_state = "mjollnir0" + icon_state = "singulohammer0" flags = CONDUCT slot_flags = SLOT_BACK force = 5 @@ -662,7 +665,7 @@ charged++ /obj/item/twohanded/singularityhammer/update_icon() //Currently only here to fuck with the on-mob icons. - icon_state = "mjollnir[wielded]" + icon_state = "singulohammer[wielded]" ..() /obj/item/twohanded/singularityhammer/proc/vortex(turf/pull, mob/wielder) @@ -725,7 +728,7 @@ if(wielded) //if(charged == 5) //charged = 0 - playsound(loc, "sparks", 50, 1) + playsound(loc, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) if(isliving(M)) M.Stun(3) shock(M) @@ -803,76 +806,3 @@ Z.ex_act(2) charged = 3 playsound(user, 'sound/weapons/marauder.ogg', 50, 1) - -/obj/item/twohanded/pitchfork - icon_state = "pitchfork0" - name = "pitchfork" - desc = "A simple tool used for moving hay." - force = 7 - throwforce = 15 - w_class = WEIGHT_CLASS_BULKY - force_unwielded = 7 - force_wielded = 15 - attack_verb = list("attacked", "impaled", "pierced") - hitsound = 'sound/weapons/bladeslice.ogg' - max_integrity = 200 - armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 30) - resistance_flags = FIRE_PROOF - -/obj/item/twohanded/pitchfork/demonic - name = "demonic pitchfork" - desc = "A red pitchfork, it looks like the work of the devil." - force = 19 - throwforce = 24 - force_unwielded = 19 - force_wielded = 25 - -/obj/item/twohanded/pitchfork/demonic/greater - force = 24 - throwforce = 50 - force_unwielded = 24 - force_wielded = 34 - -/obj/item/twohanded/pitchfork/demonic/ascended - force = 100 - throwforce = 100 - force_unwielded = 100 - force_wielded = 500000 // Kills you DEAD. - -/obj/item/twohanded/pitchfork/update_icon() - icon_state = "pitchfork[wielded]" - -/obj/item/twohanded/pitchfork/suicide_act(mob/user) - user.visible_message("[user] impales \himself in \his abdomen with [src]! It looks like \he's trying to commit suicide...") - return BRUTELOSS - -/obj/item/twohanded/pitchfork/demonic/pickup(mob/user) - . = ..() - if(istype(user, /mob/living)) - var/mob/living/U = user - if(U.mind && !U.mind.devilinfo && (U.mind.soulOwner == U.mind)) //Burn hands unless they are a devil or have sold their soul - U.visible_message("As [U] picks [src] up, [U]'s arms briefly catch fire.", \ - "\"As you pick up the [src] your arms ignite, reminding you of all your past sins.\"") - if(ishuman(U)) - var/mob/living/carbon/human/H = U - H.apply_damage(rand(force/2, force), BURN, pick("l_arm", "r_arm")) - else - U.adjustFireLoss(rand(force/2,force)) - -/obj/item/twohanded/pitchfork/demonic/attack(mob/target, mob/living/carbon/human/user) - if(user.mind && !user.mind.devilinfo && (user.mind.soulOwner != user.mind)) - to_chat(user, "The [src] burns in your hands.") - user.apply_damage(rand(force/2, force), BURN, pick("l_arm", "r_arm")) - ..() - -// It's no fun being the lord of all hell if you can't get out of a simple room -/obj/item/twohanded/pitchfork/demonic/ascended/afterattack(atom/target, mob/user, proximity) - if(!proximity || !wielded) - return - if(istype(target, /turf/simulated/wall)) - var/turf/simulated/wall/W = target - user.visible_message("[user] blasts \the [target] with \the [src]!") - playsound(target, 'sound/magic/Disintegrate.ogg', 100, 1) - W.devastate_wall(TRUE) - return 1 - ..() diff --git a/code/game/objects/obj_defense.dm b/code/game/objects/obj_defense.dm index e41d2173c23..b796740a60b 100644 --- a/code/game/objects/obj_defense.dm +++ b/code/game/objects/obj_defense.dm @@ -224,15 +224,24 @@ GLOBAL_DATUM_INIT(acid_overlay, /mutable_appearance, mutable_appearance('icons/e SSfires.processing -= src ///Called when the obj is hit by a tesla bolt. -/obj/proc/tesla_act(power) +/obj/zap_act(power, zap_flags) + if(QDELETED(src)) + return FALSE being_shocked = TRUE - var/power_bounced = power * 0.5 - tesla_zap(src, 3, power_bounced) - addtimer(CALLBACK(src, .proc/reset_shocked), 10) + addtimer(CALLBACK(src, .proc/reset_shocked), 1 SECONDS) + return power / 2 /obj/proc/reset_shocked() being_shocked = FALSE +//The surgeon general warns that being buckled to certain objects receiving powerful shocks is greatly hazardous to your health +///Only tesla coils, vehicles, and grounding rods currently call this because mobs are already targeted over all other objects, but this might be useful for more things later. +/obj/proc/zap_buckle_check(strength) + if(has_buckled_mobs()) + for(var/m in buckled_mobs) + var/mob/living/buckled_mob = m + buckled_mob.electrocute_act((clamp(round(strength / 400), 10, 90) + rand(-5, 5)), src, flags = SHOCK_TESLA) + //the obj is deconstructed into pieces, whether through careful disassembly or when destroyed. /obj/proc/deconstruct(disassembled = TRUE) SEND_SIGNAL(src, COMSIG_OBJ_DECONSTRUCT, disassembled) diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index e07c651924d..16c5f626b84 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -29,6 +29,8 @@ var/on_blueprints = FALSE //Are we visible on the station blueprints at roundstart? var/force_blueprints = FALSE //forces the obj to be on the blueprints, regardless of when it was created. var/suicidal_hands = FALSE // Does it requires you to hold it to commit suicide with it? + /// Is it emagged or not? + var/emagged = FALSE /obj/New() ..() @@ -116,8 +118,11 @@ // null if object handles breathing logic for lifeform // datum/air_group to tell lifeform to process using that breath return //DEFAULT: Take air from turf to give to have mob process + if(breath_request > 0) - return remove_air(breath_request) + var/datum/gas_mixture/environment = return_air() + var/breath_percentage = BREATH_VOLUME / environment.return_volume() + return remove_air(environment.total_moles() * breath_percentage) else return null diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm index 0ded1e60ced..4d58c90a095 100644 --- a/code/game/objects/structures.dm +++ b/code/game/objects/structures.dm @@ -42,7 +42,7 @@ do_climb(usr) -/obj/structure/MouseDrop_T(var/atom/movable/C, mob/user as mob) +/obj/structure/MouseDrop_T(atom/movable/C, mob/user as mob) if(..()) return if(C == user) @@ -57,7 +57,7 @@ return T return null -/obj/structure/proc/do_climb(var/mob/living/user) +/obj/structure/proc/do_climb(mob/living/user) if(!can_touch(user) || !climbable) return var/blocking_object = density_check() @@ -128,7 +128,7 @@ H.UpdateDamageIcon() return -/obj/structure/proc/can_touch(var/mob/user) +/obj/structure/proc/can_touch(mob/user) if(!user) return 0 if(!Adjacent(user)) @@ -167,3 +167,9 @@ /obj/structure/proc/prevents_buckled_mobs_attacking() return FALSE + +/obj/structure/zap_act(power, zap_flags) + if(zap_flags & ZAP_OBJ_DAMAGE) + take_damage(power / 8000, BURN, "energy") + power -= power / 2000 //walls take a lot out of ya + . = ..() diff --git a/code/game/objects/structures/barsign.dm b/code/game/objects/structures/barsign.dm index c78a3c39c5e..357a5c0db51 100644 --- a/code/game/objects/structures/barsign.dm +++ b/code/game/objects/structures/barsign.dm @@ -9,28 +9,23 @@ armor = list("melee" = 20, "bullet" = 20, "laser" = 20, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) var/list/barsigns=list() var/list/hiddensigns - var/emagged = 0 var/state = 0 var/prev_sign = "" var/panel_open = 0 -/obj/structure/sign/barsign/New() - ..() +/obj/structure/sign/barsign/Initialize(mapload) + . = ..() - -//filling the barsigns list + //filling the barsigns list for(var/bartype in subtypesof(/datum/barsign)) var/datum/barsign/signinfo = new bartype if(!signinfo.hidden) barsigns += signinfo - -//randomly assigning a sign + //randomly assigning a sign set_sign(pick(barsigns)) - - -/obj/structure/sign/barsign/proc/set_sign(var/datum/barsign/sign) +/obj/structure/sign/barsign/proc/set_sign(datum/barsign/sign) if(!istype(sign)) return icon_state = sign.icon @@ -73,7 +68,7 @@ -/obj/structure/sign/barsign/attackby(var/obj/item/I, var/mob/user) +/obj/structure/sign/barsign/attackby(obj/item/I, mob/user) if( istype(I, /obj/item/screwdriver)) if(!panel_open) to_chat(user, "You open the maintenance panel.") diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index 9f0daed2fbe..741afa2738b 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -16,7 +16,10 @@ var/can_be_emaged = FALSE var/wall_mounted = 0 //never solid (You can always pass over it) var/lastbang - var/sound = 'sound/machines/click.ogg' + var/open_sound = 'sound/machines/closet_open.ogg' + var/close_sound = 'sound/machines/closet_close.ogg' + var/open_sound_volume = 35 + var/close_sound_volume = 50 var/storage_capacity = 30 //This is so that someone can't pack hundreds of items in a locker/crate then open it in a populated area to crash clients. var/material_drop = /obj/item/stack/sheet/metal var/material_drop_amount = 2 @@ -72,10 +75,14 @@ /obj/structure/closet/proc/dump_contents() var/turf/T = get_turf(src) - for(var/atom/movable/AM in src) - AM.forceMove(T) + for(var/mob/AM1 in src) //Does the same as below but removes the mobs first to avoid forcing players to step on items in the locker (e.g. soap) when opened. + AM1.forceMove(T) if(throwing) // you keep some momentum when getting out of a thrown closet - step(AM, dir) + step(AM1, dir) + for(var/atom/movable/AM2 in src) + AM2.forceMove(T) + if(throwing) // you keep some momentum when getting out of a thrown closet + step(AM2, dir) if(throwing) throwing.finalize(FALSE) @@ -90,10 +97,7 @@ icon_state = icon_opened opened = TRUE - if(sound) - playsound(loc, sound, 15, 1, -3) - else - playsound(loc, 'sound/machines/click.ogg', 15, 1, -3) + playsound(loc, open_sound, open_sound_volume, TRUE, -3) density = 0 return TRUE @@ -136,10 +140,7 @@ icon_state = icon_closed opened = FALSE - if(sound) - playsound(loc, sound, 15, 1, -3) - else - playsound(loc, 'sound/machines/click.ogg', 15, 1, -3) + playsound(loc, close_sound, close_sound_volume, TRUE, -3) density = 1 return TRUE @@ -311,7 +312,7 @@ return FALSE return TRUE -/obj/structure/closet/container_resist(var/mob/living/L) +/obj/structure/closet/container_resist(mob/living/L) var/breakout_time = 2 //2 minutes by default if(opened) if(L.loc == src) @@ -349,11 +350,6 @@ BD.attack_hand(usr) open() -/obj/structure/closet/tesla_act(var/power) - ..() - visible_message("[src] is blown apart by the bolt of electricity!", "You hear a metallic screeching sound.") - qdel(src) - /obj/structure/closet/get_remote_view_fullscreens(mob/user) if(user.stat == DEAD || !(user.sight & (SEEOBJS|SEEMOBS))) user.overlay_fullscreen("remote_view", /obj/screen/fullscreen/impaired, 1) diff --git a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm index 593212c97f2..e94d0772f67 100644 --- a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm +++ b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm @@ -8,7 +8,10 @@ resistance_flags = FLAMMABLE max_integrity = 70 integrity_failure = 0 - sound = 'sound/effects/rustle2.ogg' + open_sound = 'sound/machines/cardboard_box.ogg' + close_sound = 'sound/machines/cardboard_box.ogg' + open_sound_volume = 35 + close_sound_volume = 35 material_drop = /obj/item/stack/sheet/cardboard var/amt = 4 var/move_delay = 0 diff --git a/code/game/objects/structures/crates_lockers/closets/coffin.dm b/code/game/objects/structures/crates_lockers/closets/coffin.dm index b763796947b..edb3d1e50d1 100644 --- a/code/game/objects/structures/crates_lockers/closets/coffin.dm +++ b/code/game/objects/structures/crates_lockers/closets/coffin.dm @@ -7,6 +7,10 @@ resistance_flags = FLAMMABLE max_integrity = 70 material_drop = /obj/item/stack/sheet/wood + open_sound = 'sound/machines/wooden_closet_open.ogg' + close_sound = 'sound/machines/wooden_closet_close.ogg' + open_sound_volume = 25 + close_sound_volume = 50 /obj/structure/closet/coffin/update_icon() if(!opened) @@ -19,5 +23,6 @@ icon_state = "sarc" icon_closed = "sarc" icon_opened = "sarc_open" - sound = 'sound/effects/stonedoor_openclose.ogg' + open_sound = 'sound/effects/stonedoor_openclose.ogg' + close_sound = 'sound/effects/stonedoor_openclose.ogg' material_drop = /obj/item/stack/sheet/mineral/sandstone diff --git a/code/game/objects/structures/crates_lockers/closets/fireaxe.dm b/code/game/objects/structures/crates_lockers/closets/fireaxe.dm index 741a9bae5a2..ed16e8d338e 100644 --- a/code/game/objects/structures/crates_lockers/closets/fireaxe.dm +++ b/code/game/objects/structures/crates_lockers/closets/fireaxe.dm @@ -19,7 +19,7 @@ . = ..() . += "Use a multitool to lock/unlock it." -/obj/structure/closet/fireaxecabinet/attackby(var/obj/item/O as obj, var/mob/living/user as mob) //Marker -Agouri +/obj/structure/closet/fireaxecabinet/attackby(obj/item/O as obj, mob/living/user as mob) //Marker -Agouri if(isrobot(user) || locked) if(istype(O, /obj/item/multitool)) to_chat(user, "Resetting circuitry...") diff --git a/code/game/objects/structures/crates_lockers/closets/gimmick.dm b/code/game/objects/structures/crates_lockers/closets/gimmick.dm index eba0dff4086..0126a7f8a68 100644 --- a/code/game/objects/structures/crates_lockers/closets/gimmick.dm +++ b/code/game/objects/structures/crates_lockers/closets/gimmick.dm @@ -5,6 +5,10 @@ icon_closed = "cabinet_closed" icon_opened = "cabinet_open" resistance_flags = FLAMMABLE + open_sound = 'sound/machines/wooden_closet_open.ogg' + close_sound = 'sound/machines/wooden_closet_close.ogg' + open_sound_volume = 25 + close_sound_volume = 50 max_integrity = 70 /obj/structure/closet/cabinet/update_icon() diff --git a/code/game/objects/structures/crates_lockers/closets/job_closets.dm b/code/game/objects/structures/crates_lockers/closets/job_closets.dm index 7af65b16270..25c6572b9a8 100644 --- a/code/game/objects/structures/crates_lockers/closets/job_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/job_closets.dm @@ -149,5 +149,5 @@ new /obj/item/clothing/head/soft/blue(src) new /obj/item/clothing/suit/storage/paramedic(src) new /obj/item/clothing/suit/storage/paramedic(src) - new /obj/item/tank/emergency_oxygen/engi(src) - new /obj/item/tank/emergency_oxygen/engi(src) + new /obj/item/tank/internals/emergency_oxygen/engi(src) + new /obj/item/tank/internals/emergency_oxygen/engi(src) diff --git a/code/game/objects/structures/crates_lockers/closets/l3closet.dm b/code/game/objects/structures/crates_lockers/closets/l3closet.dm index fc72cfa1dc1..6eb2b680b35 100644 --- a/code/game/objects/structures/crates_lockers/closets/l3closet.dm +++ b/code/game/objects/structures/crates_lockers/closets/l3closet.dm @@ -31,7 +31,7 @@ new /obj/item/clothing/suit/bio_suit/virology( src ) new /obj/item/clothing/head/bio_hood/virology( src ) new /obj/item/clothing/mask/breath(src) - new /obj/item/tank/oxygen(src) + new /obj/item/tank/internals/oxygen(src) /obj/structure/closet/l3closet/security diff --git a/code/game/objects/structures/crates_lockers/closets/secure/bar.dm b/code/game/objects/structures/crates_lockers/closets/secure/bar.dm index 7e66da3be62..1f49de3de2a 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/bar.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/bar.dm @@ -9,6 +9,10 @@ icon_off = "cabinetdetective_broken" resistance_flags = FLAMMABLE max_integrity = 70 + open_sound = 'sound/machines/wooden_closet_open.ogg' + close_sound = 'sound/machines/wooden_closet_close.ogg' + open_sound_volume = 25 + close_sound_volume = 50 /obj/structure/closet/secure_closet/bar/populate_contents() new /obj/item/reagent_containers/food/drinks/cans/beer(src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm index 157f0b18a85..cf1ad89b4ed 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm @@ -35,9 +35,9 @@ new /obj/item/radio/headset/headset_cargo(src) new /obj/item/clothing/gloves/fingerless(src) new /obj/item/clothing/suit/fire/firefighter(src) - new /obj/item/tank/emergency_oxygen(src) + new /obj/item/tank/internals/emergency_oxygen(src) new /obj/item/clothing/mask/gas(src) new /obj/item/clothing/glasses/meson(src) new /obj/item/clothing/head/soft(src) new /obj/item/door_remote/quartermaster(src) - new /obj/item/organ/internal/cyberimp/eyes/meson(src) + new /obj/item/organ/internal/eyes/cybernetic/meson(src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm index 39b6a0a0096..7fa60e02c3c 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm @@ -34,10 +34,11 @@ new /obj/item/holosign_creator/engineering(src) new /obj/item/flash(src) new /obj/item/clothing/head/beret/eng(src) + new /obj/item/clothing/glasses/meson/engine(src) new /obj/item/door_remote/chief_engineer(src) new /obj/item/rpd(src) new /obj/item/reagent_containers/food/drinks/mug/ce(src) - new /obj/item/organ/internal/cyberimp/eyes/meson(src) + new /obj/item/organ/internal/eyes/cybernetic/meson(src) new /obj/item/clothing/accessory/medal/engineering(src) new /obj/item/holosign_creator/atmos(src) @@ -109,7 +110,7 @@ new /obj/item/clothing/under/rank/engineer/skirt(src) new /obj/item/clothing/suit/storage/hazardvest(src) new /obj/item/clothing/mask/gas(src) - new /obj/item/clothing/glasses/meson(src) + new /obj/item/clothing/glasses/meson/engine(src) new /obj/item/cartridge/engineering(src) new /obj/item/clothing/head/beret/eng(src) @@ -138,10 +139,11 @@ new /obj/item/grenade/gas/oxygen(src) new /obj/item/clothing/suit/storage/hazardvest(src) new /obj/item/clothing/mask/gas(src) - new /obj/item/tank/emergency_oxygen/engi(src) + new /obj/item/tank/internals/emergency_oxygen/engi(src) new /obj/item/holosign_creator/atmos(src) new /obj/item/watertank/atmos(src) new /obj/item/clothing/suit/fire/atmos(src) new /obj/item/clothing/head/hardhat/atmos(src) + new /obj/item/clothing/glasses/meson/engine/tray(src) new /obj/item/rpd(src) new /obj/item/destTagger(src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm index 7b8494a01ba..16d1875044e 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm @@ -15,7 +15,7 @@ else icon_state = icon_opened -/obj/structure/closet/secure_closet/freezer/ex_act(var/severity) +/obj/structure/closet/secure_closet/freezer/ex_act(severity) // IF INDIANA JONES CAN DO IT SO CAN YOU // Bomb in here? (using same search as space transits searching for nuke disk) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm index 6a0885cf1d1..a56c63937e3 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm @@ -37,9 +37,9 @@ req_access = list(ACCESS_SURGERY) /obj/structure/closet/secure_closet/medical2/populate_contents() - new /obj/item/tank/anesthetic(src) - new /obj/item/tank/anesthetic(src) - new /obj/item/tank/anesthetic(src) + new /obj/item/tank/internals/anesthetic(src) + new /obj/item/tank/internals/anesthetic(src) + new /obj/item/tank/internals/anesthetic(src) new /obj/item/clothing/mask/breath/medical(src) new /obj/item/clothing/mask/breath/medical(src) new /obj/item/clothing/mask/breath/medical(src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm index 7ba28e6a4a0..6c9ae35553c 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm @@ -32,6 +32,10 @@ icon_off = "cabinetdetective_broken" resistance_flags = FLAMMABLE max_integrity = 70 + open_sound = 'sound/machines/wooden_closet_open.ogg' + close_sound = 'sound/machines/wooden_closet_close.ogg' + open_sound_volume = 25 + close_sound_volume = 50 /obj/structure/closet/secure_closet/personal/cabinet/update_icon() if(broken) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm index 125dae94f87..07eee5bc80c 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm @@ -18,7 +18,7 @@ new /obj/item/clothing/shoes/white(src) // new /obj/item/cartridge/signal/toxins(src) new /obj/item/radio/headset/headset_sci(src) - new /obj/item/tank/air(src) + new /obj/item/tank/internals/air(src) new /obj/item/clothing/mask/gas(src) new /obj/item/clothing/shoes/sandal/white(src) @@ -64,7 +64,7 @@ new /obj/item/clothing/shoes/white(src) new /obj/item/clothing/gloves/color/latex(src) new /obj/item/radio/headset/heads/rd(src) - new /obj/item/tank/air(src) + new /obj/item/tank/internals/air(src) new /obj/item/clothing/mask/gas(src) new /obj/item/clothing/suit/armor/reactive/teleport(src) new /obj/item/flash(src) 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 6c10146321f..8c878cd6c59 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 @@ -60,7 +60,6 @@ return if(allowed(user)) locked = !locked - playsound(loc, 'sound/machines/click.ogg', 15, 1, -3) visible_message("The locker has been [locked ? null : "un"]locked by [user].") update_icon() else @@ -115,7 +114,7 @@ else icon_state = icon_opened -/obj/structure/closet/secure_closet/container_resist(var/mob/living/L) +/obj/structure/closet/secure_closet/container_resist(mob/living/L) var/breakout_time = 2 //2 minutes by default if(opened) if(L.loc == src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index 1a6cf561f78..d8441b26c0b 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -27,12 +27,13 @@ new /obj/item/clothing/shoes/brown(src) new /obj/item/clothing/shoes/laceup(src) new /obj/item/radio/headset/heads/captain/alt(src) + new /obj/item/clothing/glasses/sunglasses(src) new /obj/item/clothing/gloves/color/captain(src) new /obj/item/storage/belt/rapier(src) new /obj/item/gun/energy/gun(src) new /obj/item/door_remote/captain(src) new /obj/item/reagent_containers/food/drinks/mug/cap(src) - new /obj/item/tank/emergency_oxygen/double(src) + new /obj/item/tank/internals/emergency_oxygen/double(src) /obj/structure/closet/secure_closet/hop @@ -50,6 +51,7 @@ new /obj/item/clothing/head/hopcap(src) new /obj/item/cartridge/hop(src) new /obj/item/radio/headset/heads/hop(src) + new /obj/item/clothing/glasses/sunglasses(src) new /obj/item/storage/box/ids(src) new /obj/item/storage/box/PDAs(src) new /obj/item/clothing/suit/armor/vest(src) @@ -218,7 +220,7 @@ new /obj/item/clothing/suit/storage/brigdoc(src) new /obj/item/clothing/under/rank/security/brigphys(src) new /obj/item/clothing/shoes/white(src) - new /obj/item/radio/headset/headset_sec/alt(src) + new /obj/item/radio/headset/headset_sec/alt/brig_phys(src) new /obj/item/clothing/shoes/sandal/white(src) @@ -272,6 +274,7 @@ new /obj/item/paicard(src) new /obj/item/flash(src) new /obj/item/clothing/glasses/hud/skills/sunglasses(src) + new /obj/item/clothing/glasses/sunglasses(src) new /obj/item/clothing/gloves/color/white(src) new /obj/item/clothing/shoes/centcom(src) new /obj/item/clothing/under/lawyer/oldman(src) @@ -323,6 +326,8 @@ icon_off = "cabinetdetective_broken" resistance_flags = FLAMMABLE max_integrity = 70 + open_sound = 'sound/machines/wooden_closet_open.ogg' + close_sound = 'sound/machines/wooden_closet_close.ogg' /obj/structure/closet/secure_closet/detective/populate_contents() new /obj/item/clothing/under/det(src) diff --git a/code/game/objects/structures/crates_lockers/closets/statue.dm b/code/game/objects/structures/crates_lockers/closets/statue.dm index b0a8101e4a7..71455c67275 100644 --- a/code/game/objects/structures/crates_lockers/closets/statue.dm +++ b/code/game/objects/structures/crates_lockers/closets/statue.dm @@ -12,14 +12,14 @@ var/intialOxy = 0 var/timer = 240 //eventually the person will be freed -/obj/structure/closet/statue/Initialize(mapload, var/mob/living/L) +/obj/structure/closet/statue/Initialize(mapload, mob/living/L) . = ..() if(ishuman(L) || iscorgi(L)) if(L.buckled) L.buckled = 0 L.anchored = 0 L.forceMove(src) - L.mutations |= MUTE + ADD_TRAIT(L, TRAIT_MUTE, STATUE_MUTE) max_integrity = L.health + 100 //stoning damaged mobs will result in easier to shatter statues intialTox = L.getToxLoss() intialFire = L.getFireLoss() @@ -68,7 +68,7 @@ for(var/mob/living/M in src) M.forceMove(loc) - M.mutations -= MUTE + REMOVE_TRAIT(M, TRAIT_MUTE, STATUE_MUTE) M.take_overall_damage((M.health - obj_integrity - 100),0) //any new damage the statue incurred is transfered to the mob ..() diff --git a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm index 75dde9a7e9f..09bc5e5887f 100644 --- a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm @@ -25,23 +25,23 @@ /obj/structure/closet/emcloset/populate_contents() switch(pickweight(list("small" = 55, "aid" = 25, "tank" = 10, "both" = 10, "nothing" = 0, "delete" = 0))) if("small") - new /obj/item/tank/emergency_oxygen(src) - new /obj/item/tank/emergency_oxygen(src) + new /obj/item/tank/internals/emergency_oxygen(src) + new /obj/item/tank/internals/emergency_oxygen(src) new /obj/item/clothing/mask/breath(src) new /obj/item/clothing/mask/breath(src) if("aid") - new /obj/item/tank/emergency_oxygen(src) + new /obj/item/tank/internals/emergency_oxygen(src) new /obj/item/storage/toolbox/emergency(src) new /obj/item/clothing/mask/breath(src) new /obj/item/storage/firstaid/o2(src) if("tank") - new /obj/item/tank/emergency_oxygen/engi(src) + new /obj/item/tank/internals/emergency_oxygen/engi(src) new /obj/item/clothing/mask/breath(src) - new /obj/item/tank/emergency_oxygen/engi(src) + new /obj/item/tank/internals/emergency_oxygen/engi(src) new /obj/item/clothing/mask/breath(src) if("both") new /obj/item/storage/toolbox/emergency(src) - new /obj/item/tank/emergency_oxygen/engi(src) + new /obj/item/tank/internals/emergency_oxygen/engi(src) new /obj/item/clothing/mask/breath(src) new /obj/item/storage/firstaid/o2(src) if("nothing") @@ -57,7 +57,7 @@ qdel(src)*/ /obj/structure/closet/emcloset/legacy/populate_contents() - new /obj/item/tank/oxygen(src) + new /obj/item/tank/internals/oxygen(src) new /obj/item/clothing/mask/gas(src) /* @@ -73,7 +73,7 @@ /obj/structure/closet/firecloset/populate_contents() new /obj/item/clothing/suit/fire/firefighter(src) new /obj/item/clothing/mask/gas(src) - new /obj/item/tank/oxygen/red(src) + new /obj/item/tank/internals/oxygen/red(src) new /obj/item/extinguisher(src) new /obj/item/clothing/head/hardhat/red(src) @@ -81,7 +81,7 @@ new /obj/item/clothing/suit/fire/firefighter(src) new /obj/item/clothing/mask/gas(src) new /obj/item/flashlight(src) - new /obj/item/tank/oxygen/red(src) + new /obj/item/tank/internals/oxygen/red(src) new /obj/item/extinguisher(src) new /obj/item/clothing/head/hardhat/red(src) @@ -140,6 +140,7 @@ icon_closed = "radsuitcloset" /obj/structure/closet/radiation/populate_contents() + new /obj/item/geiger_counter(src) new /obj/item/clothing/suit/radiation(src) new /obj/item/clothing/head/radiation(src) @@ -190,7 +191,7 @@ new /obj/item/clothing/suit/fire/firefighter(src) new /obj/item/clothing/mask/gas(src) new /obj/item/flashlight(src) - new /obj/item/tank/oxygen/red(src) + new /obj/item/tank/internals/oxygen/red(src) new /obj/item/extinguisher(src) new /obj/item/clothing/head/hardhat/red(src) diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm index 353262d123d..f6b9ab8de60 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/code/game/objects/structures/crates_lockers/crates.dm @@ -6,8 +6,11 @@ icon_opened = "crateopen" icon_closed = "crate" climbable = TRUE -// mouse_drag_pointer = MOUSE_ACTIVE_POINTER //??? var/rigged = FALSE + open_sound = 'sound/machines/crate_open.ogg' + close_sound = 'sound/machines/crate_close.ogg' + open_sound_volume = 35 + close_sound_volume = 50 var/obj/item/paper/manifest/manifest // A list of beacon names that the crate will announce the arrival of, when delivered. var/list/announce_beacons = list() @@ -45,7 +48,7 @@ do_sparks(5, 1, src) return 2 - playsound(src.loc, 'sound/machines/click.ogg', 15, 1, -3) + playsound(loc, open_sound, open_sound_volume, TRUE, -3) for(var/obj/O in src) //Objects O.forceMove(loc) for(var/mob/M in src) //Mobs @@ -64,7 +67,7 @@ if(!src.can_close()) return FALSE - playsound(src.loc, 'sound/machines/click.ogg', 15, 1, -3) + playsound(loc, close_sound, close_sound_volume, TRUE, -3) var/itemcount = 0 for(var/obj/O in get_turf(src)) if(itemcount >= storage_capacity) @@ -148,8 +151,8 @@ src.toggle(user, by_hand = TRUE) // Called when a crate is delivered by MULE at a location, for notifying purposes -/obj/structure/closet/crate/proc/notifyRecipient(var/destination) - var/msg = "[capitalize(name)] has arrived at [destination]." +/obj/structure/closet/crate/proc/notifyRecipient(destination) + var/list/msg = list("[capitalize(name)] has arrived at [destination].") if(destination in announce_beacons) for(var/obj/machinery/requests_console/D in GLOB.allRequestConsoles) if(D.department in src.announce_beacons[destination]) @@ -254,7 +257,7 @@ if(locked) overlays += sparks spawn(6) overlays -= sparks //Tried lots of stuff but nothing works right. so i have to use this *sadface* - playsound(src.loc, "sparks", 60, 1) + playsound(src.loc, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) src.locked = 0 src.broken = 1 update_icon() @@ -269,7 +272,7 @@ else overlays += sparks spawn(6) overlays -= sparks //Tried lots of stuff but nothing works right. so i have to use this *sadface* - playsound(src.loc, 'sound/effects/sparks4.ogg', 75, 1) + playsound(src, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) src.locked = 0 update_icon() if(!opened && prob(20/severity)) @@ -371,6 +374,8 @@ icon_opened = "largebinopen" icon_closed = "largebin" anchored = TRUE + open_sound = 'sound/effects/bin_open.ogg' + close_sound = 'sound/effects/bin_close.ogg' /obj/structure/closet/crate/can/wrench_act(mob/user, obj/item/I) . = TRUE @@ -385,16 +390,6 @@ icon_opened = "radiationopen" icon_closed = "radiation" -/obj/structure/closet/crate/radiation/populate_contents() - new /obj/item/clothing/suit/radiation(src) - new /obj/item/clothing/head/radiation(src) - new /obj/item/clothing/suit/radiation(src) - new /obj/item/clothing/head/radiation(src) - new /obj/item/clothing/suit/radiation(src) - new /obj/item/clothing/head/radiation(src) - new /obj/item/clothing/suit/radiation(src) - new /obj/item/clothing/head/radiation(src) - /obj/structure/closet/crate/secure/weapon desc = "A secure weapons crate." name = "weapons crate" @@ -433,6 +428,8 @@ greenlight = "largebing" sparks = "largebinsparks" emag = "largebinemag" + open_sound = 'sound/effects/bin_open.ogg' + close_sound = 'sound/effects/bin_close.ogg' /obj/structure/closet/crate/large name = "large crate" diff --git a/code/game/objects/structures/crates_lockers/crittercrate.dm b/code/game/objects/structures/crates_lockers/crittercrate.dm index dfc0e9b50ce..69067bf740a 100644 --- a/code/game/objects/structures/crates_lockers/crittercrate.dm +++ b/code/game/objects/structures/crates_lockers/crittercrate.dm @@ -7,6 +7,10 @@ var/already_opened = 0 var/content_mob = null var/amount = 1 + open_sound = 'sound/machines/wooden_closet_open.ogg' + close_sound = 'sound/machines/wooden_closet_close.ogg' + open_sound_volume = 25 + close_sound_volume = 50 /obj/structure/closet/critter/can_open() if(welded) diff --git a/code/game/objects/structures/crates_lockers/largecrate.dm b/code/game/objects/structures/crates_lockers/largecrate.dm index 3e763ca223c..21599817ee3 100644 --- a/code/game/objects/structures/crates_lockers/largecrate.dm +++ b/code/game/objects/structures/crates_lockers/largecrate.dm @@ -6,8 +6,8 @@ density = 1 var/obj/item/paper/manifest/manifest -/obj/structure/largecrate/New() - ..() +/obj/structure/largecrate/Initialize(mapload) + . = ..() update_icon() /obj/structure/largecrate/update_icon() diff --git a/code/game/objects/structures/crates_lockers/walllocker.dm b/code/game/objects/structures/crates_lockers/walllocker.dm index 733b34a0414..4a2f9a7ed88 100644 --- a/code/game/objects/structures/crates_lockers/walllocker.dm +++ b/code/game/objects/structures/crates_lockers/walllocker.dm @@ -23,9 +23,9 @@ icon_opened = "emergopen" /obj/structure/closet/walllocker/emerglocker/populate_contents() - new /obj/item/tank/emergency_oxygen(src) - new /obj/item/tank/emergency_oxygen(src) - new /obj/item/tank/emergency_oxygen(src) + new /obj/item/tank/internals/emergency_oxygen(src) + new /obj/item/tank/internals/emergency_oxygen(src) + new /obj/item/tank/internals/emergency_oxygen(src) new /obj/item/clothing/mask/breath(src) new /obj/item/clothing/mask/breath(src) new /obj/item/clothing/mask/breath(src) diff --git a/code/game/objects/structures/depot.dm b/code/game/objects/structures/depot.dm index 096ffa9e33b..29ba8882bd7 100644 --- a/code/game/objects/structures/depot.dm +++ b/code/game/objects/structures/depot.dm @@ -44,8 +44,7 @@ if(prob(50)) empulse(src, 4, 10) else - for(var/mob/living/M in range(10, loc)) - M.apply_effect(rand(5, 25), IRRADIATE) + radiation_pulse(get_turf(src), 500, 2) /obj/structure/fusionreactor/wrench_act(mob/user, obj/item/I) . = TRUE diff --git a/code/game/objects/structures/disaster_counter.dm b/code/game/objects/structures/disaster_counter.dm new file mode 100644 index 00000000000..186771ea968 --- /dev/null +++ b/code/game/objects/structures/disaster_counter.dm @@ -0,0 +1,100 @@ +/** + * # Disaster counter. + * + * Tracks how many shifts it has been since the counter with that ID was exploded. + */ +/obj/structure/disaster_counter + name = "disaster counter" + desc = "This device will count how many shifts it has been since a major disaster in this area. A safe workplace is a productive workplace." + icon = 'icons/obj/status_display.dmi' + icon_state = "frame" + anchored = TRUE + maptext_y = 10 // Offset by 10 so it renders properly + /// ID of the counter. Must be overriden. Use alphanumerics with no spaces only, as this is used in the filesystem. + var/counter_id + /// Current count number + var/current_count = 0 + /// Record count + var/record_count = 0 + +/obj/structure/disaster_counter/examine(mob/user) + . = ..() + . += "The display reads 'Currently [max(current_count, 0)] shifts without an accident, with a record of [record_count] shifts!'" + +/obj/structure/disaster_counter/Initialize(mapload) + . = ..() + if(!counter_id) + stack_trace("Disaster counter at [x],[y],[z] does not have a counter_id set. Deleting...") + return INITIALIZE_HINT_QDEL + + // If we still exist, put ourselves in + SSpersistent_data.register(src) + +/obj/structure/disaster_counter/ex_act(severity) + current_count = -1 + persistent_save() + update_maptext() + . = ..() + +/obj/structure/disaster_counter/Destroy() + if(counter_id) + SSpersistent_data.registered_atoms -= src // Take us out the list + return ..() + +/obj/structure/disaster_counter/proc/update_maptext() + maptext = "[max(current_count, 0)]/[record_count]" + +/obj/structure/disaster_counter/persistent_load() + // Just incase some bad actor sets the counter ID to "../../../../Windows/System32" + // Yes I am that paranoid + if(counter_id != paranoid_sanitize(counter_id)) + stack_trace("Counter ID did not pass sanitization for disaster counter at [x],[y],[z]. Potential attempt at filesystem manipulation.") + qdel(src) + return + + var/savefile/S = new /savefile("data/disaster_counters/[counter_id].sav") + S["count"] >> current_count + S["record"] >> record_count + + if(isnull(current_count)) + current_count = 0 + else + current_count++ // Increase by 1 since this is the next shift without a disaster (yet) + + if(isnull(record_count)) + record_count = current_count + else + // NEW RECORD + if(current_count > record_count) + record_count = current_count + log_debug("Persistent data for [src] loaded (current_count: [current_count] | record_count: [record_count])") + update_maptext() + +/obj/structure/disaster_counter/persistent_save() + if(counter_id != paranoid_sanitize(counter_id)) + stack_trace("Counter ID did not pass sanitization for disaster counter at [x],[y],[z]. Potential attempt at filesystem manipulation.") + qdel(src) + return + + var/savefile/S = new /savefile("data/disaster_counters/[counter_id].sav") + + S["count"] << current_count + S["record"] << record_count + log_debug("Persistent data for [src] saved (current_count: [current_count] | record_count: [record_count])") + +// Prefab definitions to make mapping easier +/obj/structure/disaster_counter/supermatter + name = "supermatter disaster counter" + counter_id = "supermatter" + +/obj/structure/disaster_counter/chemistry + name = "chemistry disaster counter" + counter_id = "chemistry" + +/obj/structure/disaster_counter/scichem + name = "science chemistry disaster counter" + counter_id = "scichem" + +/obj/structure/disaster_counter/toxins + name = "toxins launch room disaster counter" + counter_id = "toxinslaunch" diff --git a/code/game/objects/structures/door_assembly.dm b/code/game/objects/structures/door_assembly.dm index 518ab44213c..02cad716d3d 100644 --- a/code/game/objects/structures/door_assembly.dm +++ b/code/game/objects/structures/door_assembly.dm @@ -20,10 +20,10 @@ var/material_type = /obj/item/stack/sheet/metal var/material_amt = 4 -/obj/structure/door_assembly/New() +/obj/structure/door_assembly/Initialize(mapload) + . = ..() update_icon() update_name() - ..() /obj/structure/door_assembly/Destroy() QDEL_NULL(electronics) @@ -75,7 +75,7 @@ state = AIRLOCK_ASSEMBLY_NEEDS_ELECTRONICS to_chat(user, "You wire the airlock assembly.") - else if(istype(W, /obj/item/airlock_electronics) && state == AIRLOCK_ASSEMBLY_NEEDS_ELECTRONICS && W.icon_state != "door_electronics_smoked") + else if(istype(W, /obj/item/airlock_electronics) && state == AIRLOCK_ASSEMBLY_NEEDS_ELECTRONICS && !istype(W, /obj/item/airlock_electronics/destroyed)) playsound(loc, W.usesound, 100, 1) user.visible_message("[user] installs the electronics into the airlock assembly.", "You start to install electronics into the airlock assembly...") @@ -187,6 +187,7 @@ door.name = base_name door.previous_airlock = previous_assembly electronics.forceMove(door) + electronics = null qdel(src) update_icon() diff --git a/code/game/objects/structures/door_assembly_types.dm b/code/game/objects/structures/door_assembly_types.dm index bcd57818504..108bffa39b5 100644 --- a/code/game/objects/structures/door_assembly_types.dm +++ b/code/game/objects/structures/door_assembly_types.dm @@ -124,14 +124,6 @@ noglass = TRUE material_type = /obj/item/stack/sheet/plasteel -/obj/structure/door_assembly/door_assembly_shuttle - name = "shuttle airlock assembly" - icon = 'icons/obj/doors/airlocks/shuttle/shuttle.dmi' - base_name = "shuttle airlock" - overlays_file = 'icons/obj/doors/airlocks/shuttle/overlays.dmi' - airlock_type = /obj/machinery/door/airlock/shuttle - glass_type = /obj/machinery/door/airlock/shuttle/glass - /obj/structure/door_assembly/multi_tile name = "large airlock assembly" icon = 'icons/obj/doors/airlocks/glass_large/glass_large.dmi' @@ -143,14 +135,14 @@ glass_type = /obj/machinery/door/airlock/multi_tile/glass material_amt = 8 -/obj/structure/door_assembly/multi_tile/New() +/obj/structure/door_assembly/multi_tile/Initialize(mapload) + . = ..() if(dir in list(EAST, WEST)) bound_width = width * world.icon_size bound_height = world.icon_size else bound_width = world.icon_size bound_height = width * world.icon_size - ..() /obj/structure/door_assembly/multi_tile/Move() . = ..() @@ -169,7 +161,7 @@ airlock_type = /obj/machinery/door/airlock/cult glass_type = /obj/machinery/door/airlock/cult/glass -/obj/structure/door_assembly/door_assembly_cult/New() +/obj/structure/door_assembly/door_assembly_cult/Initialize(mapload) . = ..() icon = SSticker.cultdat?.airlock_runed_icon_file overlays_file = SSticker.cultdat?.airlock_runed_overlays_file @@ -181,7 +173,7 @@ airlock_type = /obj/machinery/door/airlock/cult/unruned glass_type = /obj/machinery/door/airlock/cult/unruned/glass -/obj/structure/door_assembly/door_assembly_cult/unruned/New() +/obj/structure/door_assembly/door_assembly_cult/unruned/Initialize(mapload) . = ..() icon = SSticker.cultdat?.airlock_unruned_icon_file overlays_file = SSticker.cultdat?.airlock_unruned_overlays_file diff --git a/code/game/objects/structures/electricchair.dm b/code/game/objects/structures/electricchair.dm index 792558d01fa..4b699e8d539 100644 --- a/code/game/objects/structures/electricchair.dm +++ b/code/game/objects/structures/electricchair.dm @@ -7,19 +7,22 @@ var/last_time = 1.0 var/delay_time = 50 -/obj/structure/chair/e_chair/New() - ..() +/obj/structure/chair/e_chair/Initialize(mapload, obj/item/assembly/shock_kit/sk) + . = ..() overlays += image('icons/obj/chairs.dmi', src, "echair_over", MOB_LAYER + 1, dir) - spawn(2) - if(isnull(part)) //This e-chair was not custom built - part = new(src) - var/obj/item/clothing/head/helmet/part1 = new(part) - var/obj/item/radio/electropack/part2 = new(part) - part2.frequency = 1445 - part2.code = 6 - part2.master = part - part.part1 = part1 - part.part2 = part2 + + if(sk) + part = sk + + if(isnull(part)) //This e-chair was not custom built + part = new(src) + var/obj/item/clothing/head/helmet/part1 = new(part) + var/obj/item/radio/electropack/part2 = new(part) + part2.set_frequency(1445) + part2.code = 6 + part2.master = part + part.part1 = part1 + part.part2 = part2 /obj/structure/chair/e_chair/attackby(obj/item/W as obj, mob/user as mob, params) if(istype(W, /obj/item/wrench)) diff --git a/code/game/objects/structures/extinguisher.dm b/code/game/objects/structures/extinguisher.dm index 33298669157..712378c612e 100644 --- a/code/game/objects/structures/extinguisher.dm +++ b/code/game/objects/structures/extinguisher.dm @@ -17,8 +17,8 @@ var/opened = 0 var/material_drop = /obj/item/stack/sheet/metal -/obj/structure/extinguisher_cabinet/New(turf/loc, direction = null) - ..() +/obj/structure/extinguisher_cabinet/Initialize(mapload, direction = null) + . = ..() if(direction) setDir(direction) set_pixel_offsets_from_dir(28, -28, 30, -30) diff --git a/code/game/objects/structures/false_walls.dm b/code/game/objects/structures/false_walls.dm index cdc5cdb58c4..8217a86e505 100644 --- a/code/game/objects/structures/false_walls.dm +++ b/code/game/objects/structures/false_walls.dm @@ -12,6 +12,8 @@ anchored = TRUE icon = 'icons/turf/walls/wall.dmi' icon_state = "wall" + flags_2 = RAD_PROTECT_CONTENTS_2 | RAD_NO_CONTAMINATE_2 + rad_insulation = RAD_MEDIUM_INSULATION var/mineral = /obj/item/stack/sheet/metal var/mineral_amount = 2 @@ -33,10 +35,22 @@ /turf/simulated/wall/r_wall/rust) smooth = SMOOTH_TRUE -/obj/structure/falsewall/New(loc) - ..() +/obj/structure/falsewall/Initialize(mapload) + . = ..() air_update_turf(1) +/obj/structure/falsewall/examine_status(mob/user) + var/healthpercent = (obj_integrity/max_integrity) * 100 + switch(healthpercent) + if(100) + return "It looks fully intact." + if(70 to 99) + return "It looks slightly damaged." + if(40 to 70) + return "It looks moderately damaged." + if(0 to 40) + return "It looks heavily damaged." + /obj/structure/falsewall/ratvar_act() new /obj/structure/falsewall/brass(loc) qdel(src) @@ -159,6 +173,10 @@ walltype = /turf/simulated/wall/r_wall mineral = /obj/item/stack/sheet/plasteel +/obj/structure/falsewall/reinforced/examine_status(mob/user) + . = ..() + . += "
      The outer grille is fully intact." //not going to fake other states of disassembly + /obj/structure/falsewall/reinforced/ChangeToWall(delete = 1) var/turf/T = get_turf(src) T.ChangeTurf(/turf/simulated/wall/r_wall) @@ -179,7 +197,7 @@ walltype = /turf/simulated/wall/mineral/uranium var/active = null var/last_event = 0 - canSmoothWith = list(/obj/structure/falsewall/uranium, /turf/simulated/wall/mineral/uranium) + canSmoothWith = list(/turf/simulated/wall/mineral/uranium, /obj/structure/falsewall/uranium, /turf/simulated/wall/indestructible/uranium) /obj/structure/falsewall/uranium/attackby(obj/item/W as obj, mob/user as mob, params) radiate() @@ -191,16 +209,13 @@ /obj/structure/falsewall/uranium/proc/radiate() if(!active) - if(world.time > last_event+15) + if(world.time > last_event + 15) active = 1 - for(var/mob/living/L in range(3,src)) - L.apply_effect(12,IRRADIATE,0) - for(var/turf/simulated/wall/mineral/uranium/T in range(3,src)) + radiation_pulse(src, 150) + for(var/turf/simulated/wall/mineral/uranium/T in orange(1, src)) T.radiate() last_event = world.time active = null - return - return /* * Other misc falsewall types */ @@ -271,7 +286,7 @@ icon_state = "plasma" mineral = /obj/item/stack/sheet/mineral/abductor walltype = /turf/simulated/wall/mineral/abductor - canSmoothWith = list(/obj/structure/falsewall/alien, /turf/simulated/wall/mineral/alien) + canSmoothWith = list(/turf/simulated/wall/mineral/abductor, /obj/structure/falsewall/abductor, /turf/simulated/wall/indestructible/alien) /obj/structure/falsewall/bananium @@ -289,7 +304,7 @@ icon_state = "sandstone" mineral = /obj/item/stack/sheet/mineral/sandstone walltype = /turf/simulated/wall/mineral/sandstone - canSmoothWith = list(/obj/structure/falsewall/sandstone, /turf/simulated/wall/mineral/sandstone) + canSmoothWith = list(/turf/simulated/wall/mineral/sandstone, /turf/simulated/wall/indestructible/sandstone, /obj/structure/falsewall/sandstone) /obj/structure/falsewall/wood name = "wooden wall" @@ -326,7 +341,7 @@ mineral = /obj/item/stack/sheet/mineral/titanium walltype = /turf/simulated/wall/mineral/titanium smooth = SMOOTH_MORE - canSmoothWith = list(/turf/simulated/wall/mineral/titanium, /obj/machinery/door/airlock/shuttle, /obj/machinery/door/airlock, /obj/structure/window/full/shuttle, /obj/structure/shuttle/engine/heater) + canSmoothWith = list(/turf/simulated/wall/mineral/titanium, /obj/machinery/door/airlock/titanium, /obj/machinery/door/airlock, /obj/structure/window/full/shuttle, /obj/structure/shuttle/engine/heater) /obj/structure/falsewall/plastitanium desc = "An evil wall of plasma and titanium." @@ -335,7 +350,7 @@ mineral = /obj/item/stack/sheet/mineral/plastitanium walltype = /turf/simulated/wall/mineral/plastitanium smooth = SMOOTH_MORE - canSmoothWith = list(/turf/simulated/wall/mineral/plastitanium, /turf/simulated/wall/mineral/plastitanium/nodiagonal, /obj/machinery/door/airlock/shuttle, /obj/machinery/door/airlock, /obj/structure/window/full/shuttle, /obj/structure/shuttle/engine/heater) + canSmoothWith = list(/turf/simulated/wall/mineral/plastitanium, /turf/simulated/wall/indestructible/syndicate, /turf/simulated/wall/mineral/plastitanium/nodiagonal, /obj/machinery/door/airlock/titanium, /obj/machinery/door/airlock, /obj/structure/window/full/shuttle, /obj/structure/shuttle/engine/heater, /turf/simulated/wall/indestructible/opsglass, /obj/structure/window/full/plastitanium) /obj/structure/falsewall/brass name = "clockwork wall" @@ -349,8 +364,8 @@ walltype = /turf/simulated/wall/clockwork mineral = /obj/item/stack/tile/brass -/obj/structure/falsewall/brass/New(loc) - ..() +/obj/structure/falsewall/brass/Initialize(mapload) + . = ..() var/turf/T = get_turf(src) new /obj/effect/temp_visual/ratvar/wall/false(T) new /obj/effect/temp_visual/ratvar/beam/falsewall(T) diff --git a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm index 0e75bb760f9..3679587d654 100644 --- a/code/game/objects/structures/flora.dm +++ b/code/game/objects/structures/flora.dm @@ -15,8 +15,8 @@ icon = 'icons/obj/flora/pinetrees.dmi' icon_state = "pine_1" -/obj/structure/flora/tree/pine/New() - ..() +/obj/structure/flora/tree/pine/Initialize(mapload) + . = ..() icon_state = "pine_[rand(1, 3)]" /obj/structure/flora/tree/pine/xmas @@ -24,24 +24,20 @@ icon = 'icons/obj/flora/pinetrees.dmi' icon_state = "pine_c" -/obj/structure/flora/tree/pine/xmas/New() - ..() - icon_state = "pine_c" - /obj/structure/flora/tree/dead icon = 'icons/obj/flora/deadtrees.dmi' icon_state = "tree_1" -/obj/structure/flora/tree/dead/New() - ..() +/obj/structure/flora/tree/dead/Initialize(mapload) + . = ..() icon_state = "tree_[rand(1, 6)]" /obj/structure/flora/tree/palm icon = 'icons/misc/beach2.dmi' icon_state = "palm1" -/obj/structure/flora/tree/palm/New() - ..() +/obj/structure/flora/tree/palm/Initialize(mapload) + . = ..() icon_state = pick("palm1","palm2") pixel_x = 0 @@ -55,23 +51,23 @@ /obj/structure/flora/grass/brown icon_state = "snowgrass1bb" -/obj/structure/flora/grass/brown/New() - ..() +/obj/structure/flora/grass/brown/Initialize(mapload) + . = ..() icon_state = "snowgrass[rand(1, 3)]bb" /obj/structure/flora/grass/green icon_state = "snowgrass1gb" -/obj/structure/flora/grass/green/New() - ..() +/obj/structure/flora/grass/green/Initialize(mapload) + . = ..() icon_state = "snowgrass[rand(1, 3)]gb" /obj/structure/flora/grass/both icon_state = "snowgrassall1" -/obj/structure/flora/grass/both/New() - ..() +/obj/structure/flora/grass/both/Initialize(mapload) + . = ..() icon_state = "snowgrassall[rand(1, 3)]" @@ -83,8 +79,8 @@ anchored = 1 max_integrity = 15 -/obj/structure/flora/bush/New() - ..() +/obj/structure/flora/bush/Initialize(mapload) + . = ..() icon_state = "snowbush[rand(1, 6)]" //newbushes @@ -96,113 +92,113 @@ anchored = 1 max_integrity = 15 -/obj/structure/flora/ausbushes/New() - ..() +/obj/structure/flora/ausbushes/Initialize(mapload) + . = ..() icon_state = "firstbush_[rand(1, 4)]" /obj/structure/flora/ausbushes/reedbush icon_state = "reedbush_1" -/obj/structure/flora/ausbushes/reedbush/New() - ..() +/obj/structure/flora/ausbushes/reedbush/Initialize(mapload) + . = ..() icon_state = "reedbush_[rand(1, 4)]" /obj/structure/flora/ausbushes/leafybush icon_state = "leafybush_1" -/obj/structure/flora/ausbushes/leafybush/New() - ..() +/obj/structure/flora/ausbushes/leafybush/Initialize(mapload) + . = ..() icon_state = "leafybush_[rand(1, 3)]" /obj/structure/flora/ausbushes/palebush icon_state = "palebush_1" -/obj/structure/flora/ausbushes/palebush/New() - ..() +/obj/structure/flora/ausbushes/palebush/Initialize(mapload) + . = ..() icon_state = "palebush_[rand(1, 4)]" /obj/structure/flora/ausbushes/stalkybush icon_state = "stalkybush_1" -/obj/structure/flora/ausbushes/stalkybush/New() - ..() +/obj/structure/flora/ausbushes/stalkybush/Initialize(mapload) + . = ..() icon_state = "stalkybush_[rand(1, 3)]" /obj/structure/flora/ausbushes/grassybush icon_state = "grassybush_1" -/obj/structure/flora/ausbushes/grassybush/New() - ..() +/obj/structure/flora/ausbushes/grassybush/Initialize(mapload) + . = ..() icon_state = "grassybush_[rand(1, 4)]" /obj/structure/flora/ausbushes/fernybush icon_state = "fernybush_1" -/obj/structure/flora/ausbushes/fernybush/New() - ..() +/obj/structure/flora/ausbushes/fernybush/Initialize(mapload) + . = ..() icon_state = "fernybush_[rand(1, 3)]" /obj/structure/flora/ausbushes/sunnybush icon_state = "sunnybush_1" -/obj/structure/flora/ausbushes/sunnybush/New() - ..() +/obj/structure/flora/ausbushes/sunnybush/Initialize(mapload) + . = ..() icon_state = "sunnybush_[rand(1, 3)]" /obj/structure/flora/ausbushes/genericbush icon_state = "genericbush_1" -/obj/structure/flora/ausbushes/genericbush/New() - ..() +/obj/structure/flora/ausbushes/genericbush/Initialize(mapload) + . = ..() icon_state = "genericbush_[rand(1, 4)]" /obj/structure/flora/ausbushes/pointybush icon_state = "pointybush_1" -/obj/structure/flora/ausbushes/pointybush/New() - ..() +/obj/structure/flora/ausbushes/pointybush/Initialize(mapload) + . = ..() icon_state = "pointybush_[rand(1, 4)]" /obj/structure/flora/ausbushes/lavendergrass icon_state = "lavendergrass_1" -/obj/structure/flora/ausbushes/lavendergrass/New() - ..() +/obj/structure/flora/ausbushes/lavendergrass/Initialize(mapload) + . = ..() icon_state = "lavendergrass_[rand(1, 4)]" /obj/structure/flora/ausbushes/ywflowers icon_state = "ywflowers_1" -/obj/structure/flora/ausbushes/ywflowers/New() - ..() +/obj/structure/flora/ausbushes/ywflowers/Initialize(mapload) + . = ..() icon_state = "ywflowers_[rand(1, 3)]" /obj/structure/flora/ausbushes/brflowers icon_state = "brflowers_1" -/obj/structure/flora/ausbushes/brflowers/New() - ..() +/obj/structure/flora/ausbushes/brflowers/Initialize(mapload) + . = ..() icon_state = "brflowers_[rand(1, 3)]" /obj/structure/flora/ausbushes/ppflowers icon_state = "ppflowers_1" -/obj/structure/flora/ausbushes/ppflowers/New() - ..() +/obj/structure/flora/ausbushes/ppflowers/Initialize(mapload) + . = ..() icon_state = "ppflowers_[rand(1, 4)]" /obj/structure/flora/ausbushes/sparsegrass icon_state = "sparsegrass_1" -/obj/structure/flora/ausbushes/sparsegrass/New() - ..() +/obj/structure/flora/ausbushes/sparsegrass/Initialize(mapload) + . = ..() icon_state = "sparsegrass_[rand(1, 3)]" /obj/structure/flora/ausbushes/fullgrass icon_state = "fullgrass_1" -/obj/structure/flora/ausbushes/fullgrass/New() - ..() +/obj/structure/flora/ausbushes/fullgrass/Initialize(mapload) + . = ..() icon_state = "fullgrass_[rand(1, 3)]" @@ -227,9 +223,10 @@ /obj/item/twohanded/required/kirbyplants/equipped(mob/living/user) . = ..() - var/image/I = image(icon = 'icons/obj/flora/plants.dmi' , icon_state = src.icon_state, loc = user) - I.override = 1 - user.add_alt_appearance("sneaking_mission", I, GLOB.player_list) + if(wielded) + var/image/I = image(icon, user, icon_state) + I.override = TRUE + user.add_alt_appearance("sneaking_mission", I, GLOB.player_list) /obj/item/twohanded/required/kirbyplants/dropped(mob/living/user) ..() @@ -250,8 +247,8 @@ resistance_flags = FIRE_PROOF anchored = 1 -/obj/structure/flora/rock/New() - ..() +/obj/structure/flora/rock/Initialize(mapload) + . = ..() icon_state = "rock[rand(1,5)]" /obj/structure/flora/rock/pile @@ -259,8 +256,8 @@ desc = "some rocks" icon_state = "rockpile1" -/obj/structure/flora/rock/pile/New() - ..() +/obj/structure/flora/rock/pile/Initialize(mapload) + . = ..() icon_state = "rockpile[rand(1,5)]" /obj/structure/flora/rock/icy @@ -308,7 +305,7 @@ var/indestructable = 0 var/stump = 0 -/obj/structure/bush/New() +/obj/structure/bush/Initialize(mapload) . = ..() if(prob(20)) opacity = 1 @@ -323,7 +320,7 @@ A.loc = get_turf(src) */ -/obj/structure/bush/attackby(var/obj/I as obj, var/mob/user as mob, params) +/obj/structure/bush/attackby(obj/I as obj, mob/user as mob, params) //hatchets can clear away undergrowth if(istype(I, /obj/item/hatchet) && !stump) if(indestructable) diff --git a/code/game/objects/structures/girders.dm b/code/game/objects/structures/girders.dm index d4b3ea08115..fb145958ed7 100644 --- a/code/game/objects/structures/girders.dm +++ b/code/game/objects/structures/girders.dm @@ -4,6 +4,8 @@ anchored = 1 density = 1 layer = BELOW_OBJ_LAYER + flags_2 = RAD_PROTECT_CONTENTS_2 | RAD_NO_CONTAMINATE_2 + rad_insulation = RAD_VERY_LIGHT_INSULATION var/state = GIRDER_NORMAL var/girderpasschance = 20 // percentage chance that a projectile passes through the girder. max_integrity = 200 @@ -412,7 +414,7 @@ metalUsed = 1 metal_type = /obj/item/stack/sheet/runed_metal -/obj/structure/girder/cult/New() +/obj/structure/girder/cult/Initialize(mapload) . = ..() icon_state = SSticker.cultdat?.cult_girder_icon_state diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm index 8b1836b0d72..68025f98fce 100644 --- a/code/game/objects/structures/grille.dm +++ b/code/game/objects/structures/grille.dm @@ -6,6 +6,7 @@ density = TRUE anchored = TRUE flags = CONDUCT + flags_2 = RAD_PROTECT_CONTENTS_2 | RAD_NO_CONTAMINATE_2 pressure_resistance = 5*ONE_ATMOSPHERE layer = BELOW_OBJ_LAYER level = 3 @@ -20,10 +21,10 @@ var/shockcooldown = 0 var/my_shockcooldown = 1 SECONDS -/obj/structure/grille/fence/ +/obj/structure/grille/fence var/width = 3 -/obj/structure/grille/fence/New() +/obj/structure/grille/fence/Initialize(mapload) . = ..() if(width > 1) if(dir in list(EAST, WEST)) @@ -116,28 +117,28 @@ var/atom/movable/mover = caller . = . || mover.checkpass(PASSGRILLE) -/obj/structure/grille/attackby(obj/item/W, mob/user, params) +/obj/structure/grille/attackby(obj/item/I, mob/user, params) user.changeNext_move(CLICK_CD_MELEE) add_fingerprint(user) - if(istype(W, /obj/item/stack/rods) && broken) - var/obj/item/stack/rods/R = W - if(!shock(user, 90)) - user.visible_message("[user] rebuilds the broken grille.", \ - "You rebuild the broken grille.") - new grille_type(loc) - R.use(1) - qdel(src) - return + if(istype(I, /obj/item/stack/rods) && broken) + repair(user, I) //window placing begin - else if(is_glass_sheet(W)) - build_window(W, user) + else if(is_glass_sheet(I)) + build_window(I, user) return //window placing end - else if(istype(W, /obj/item/shard) || !shock(user, 70)) + else if(istype(I, /obj/item/shard) || !shock(user, 70)) 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) + /obj/structure/grille/wirecutter_act(mob/user, obj/item/I) . = TRUE if(shock(user, 100)) @@ -159,54 +160,37 @@ "You [anchored ? "fasten [src] to" : "unfasten [src] from"] the floor.") /obj/structure/grille/proc/build_window(obj/item/stack/sheet/S, mob/user) - var/dir_to_set = NORTH + var/dir_to_set = SOUTHWEST if(!istype(S) || !user) return if(broken) to_chat(user, "You must repair or replace [src] first!") return - if(S.get_amount() < 1) - to_chat(user, "You need at least one sheet of glass for that!") + if(S.get_amount() < 2) + to_chat(user, "You need at least two sheets of glass for that!") return if(!anchored) to_chat(user, "[src] needs to be fastened to the floor first!") return - if(!getRelativeDirection(src, user) && (user.loc != loc)) //essentially a cardinal direction adjacent or sharing same loc check - to_chat(user, "You can't reach.") - return - if(loc == user.loc) - dir_to_set = user.dir - else - if(x == user.x) - if(y > user.y) - dir_to_set = SOUTH - else - dir_to_set = NORTH - else if(y == user.y) - if(x > user.x) - dir_to_set = WEST - else - dir_to_set = EAST for(var/obj/structure/window/WINDOW in loc) - if(WINDOW.dir == dir_to_set) - to_chat(user, "There is already a window facing this way there.") - return + to_chat(user, "There is already a window there!") + return to_chat(user, "You start placing the window...") if(do_after(user, 20, target = src)) if(!loc || !anchored) //Grille destroyed or unanchored while waiting return - for(var/obj/structure/window/WINDOW in loc) - if(WINDOW.dir == dir_to_set)//checking this for a 2nd time to check if a window was made while we were waiting. - to_chat(user, "There is already a window facing this way there.") - return - var/obj/structure/window/W = new S.created_window(get_turf(src)) - S.use(1) + for(var/obj/structure/window/WINDOW in loc) //checking this for a 2nd time to check if a window was made while we were waiting. + to_chat(user, "There is already a window there!") + return + var/obj/structure/window/W = new S.full_window(drop_location()) W.setDir(dir_to_set) W.ini_dir = dir_to_set W.anchored = FALSE - W.state = WINDOW_OUT_OF_FRAME - to_chat(user, "You place the [W] on [src].") + air_update_turf(TRUE) W.update_nearby_icons() + W.state = WINDOW_OUT_OF_FRAME + S.use(2) + to_chat(user, "You place the [W] on [src].") /obj/structure/grille/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0) @@ -270,7 +254,7 @@ var/obj/structure/cable/C = T.get_cable_node() if(C) playsound(src, 'sound/magic/lightningshock.ogg', 100, TRUE, extrarange = 5) - tesla_zap(src, 3, C.newavail() * 0.01) //Zap for 1/100 of the amount of power. At a million watts in the grid, it will be as powerful as a tesla revolver shot. + tesla_zap(src, 3, C.newavail() * 0.01, ZAP_MOB_DAMAGE | ZAP_OBJ_DAMAGE | ZAP_MOB_STUN | ZAP_ALLOW_DUPLICATES) //Zap for 1/100 of the amount of power. At a million watts in the grid, it will be as powerful as a tesla revolver shot. C.add_delayedload(C.newavail() * 0.0375) // you can gain up to 3.5 via the 4x upgrades power is halved by the pole so thats 2x then 1X then .5X for 3.5x the 3 bounces shock. return ..() @@ -290,8 +274,8 @@ desc = "A strangely-shaped grille." broken_type = /obj/structure/grille/ratvar/broken -/obj/structure/grille/ratvar/New() - ..() +/obj/structure/grille/ratvar/Initialize(mapload) + . = ..() if(broken) new /obj/effect/temp_visual/ratvar/grille/broken(get_turf(src)) else diff --git a/code/game/objects/structures/holosign.dm b/code/game/objects/structures/holosign.dm index 46df12c9464..211dec106b3 100644 --- a/code/game/objects/structures/holosign.dm +++ b/code/game/objects/structures/holosign.dm @@ -9,11 +9,11 @@ armor = list("melee" = 0, "bullet" = 50, "laser" = 50, "energy" = 50, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 20, "acid" = 20) var/obj/item/holosign_creator/projector -/obj/structure/holosign/New(loc, source_projector) +/obj/structure/holosign/Initialize(mapload, source_projector) + . = ..() if(source_projector) projector = source_projector projector.signs += src - ..() /obj/structure/holosign/Destroy() if(projector) @@ -62,6 +62,8 @@ /obj/structure/holosign/barrier/engineering icon_state = "holosign_engi" + flags_2 = RAD_PROTECT_CONTENTS_2 | RAD_NO_CONTAMINATE_2 + rad_insulation = RAD_LIGHT_INSULATION /obj/structure/holosign/barrier/atmos name = "holo firelock" @@ -72,9 +74,11 @@ anchored = TRUE layer = ABOVE_MOB_LAYER alpha = 150 + flags_2 = RAD_PROTECT_CONTENTS_2 | RAD_NO_CONTAMINATE_2 + rad_insulation = RAD_LIGHT_INSULATION -/obj/structure/holosign/barrier/atmos/New() - ..() +/obj/structure/holosign/barrier/atmos/Initialize(mapload) + . = ..() air_update_turf(TRUE) /obj/structure/holosign/barrier/atmos/CanAtmosPass(turf/T) @@ -118,7 +122,7 @@ if(!shockcd) if(isliving(user)) var/mob/living/M = user - M.electrocute_act(15, "Energy Barrier", safety = TRUE) + M.electrocute_act(15, "Energy Barrier") shockcd = TRUE addtimer(CALLBACK(src, .proc/cooldown), 5) @@ -130,6 +134,6 @@ return var/mob/living/M = AM - M.electrocute_act(15, "Energy Barrier", safety = TRUE) + M.electrocute_act(15, "Energy Barrier") shockcd = TRUE addtimer(CALLBACK(src, .proc/cooldown), 5) diff --git a/code/game/objects/structures/inflatable.dm b/code/game/objects/structures/inflatable.dm index d3cf5b0dd96..785d6894215 100644 --- a/code/game/objects/structures/inflatable.dm +++ b/code/game/objects/structures/inflatable.dm @@ -59,10 +59,12 @@ qdel(src) else visible_message("[src] slowly deflates.") - spawn(50) - var/obj/item/inflatable/R = new intact(loc) - transfer_fingerprints_to(R) - qdel(src) + addtimer(CALLBACK(src, .proc/deflate), 5 SECONDS) + +/obj/structure/inflatable/proc/deflate() + var/obj/item/inflatable/R = new intact(loc) + transfer_fingerprints_to(R) + qdel(src) /obj/structure/inflatable/verb/hand_deflate() set name = "Deflate" diff --git a/code/game/objects/structures/janicart.dm b/code/game/objects/structures/janicart.dm index 75a2d288a9e..5c9b3393808 100644 --- a/code/game/objects/structures/janicart.dm +++ b/code/game/objects/structures/janicart.dm @@ -19,8 +19,8 @@ var/const/max_signs = 4 -/obj/structure/janitorialcart/New() - ..() +/obj/structure/janitorialcart/Initialize(mapload) + . = ..() create_reagents(100) GLOB.janitorial_equipment += src diff --git a/code/game/objects/structures/mineral_doors.dm b/code/game/objects/structures/mineral_doors.dm index 8e704fb83f7..bde75bb489d 100644 --- a/code/game/objects/structures/mineral_doors.dm +++ b/code/game/objects/structures/mineral_doors.dm @@ -9,6 +9,8 @@ icon_state = "metal" max_integrity = 200 armor = list("melee" = 10, "bullet" = 0, "laser" = 0, "energy" = 100, "bomb" = 10, "bio" = 100, "rad" = 100, "fire" = 50, "acid" = 50) + flags_2 = RAD_PROTECT_CONTENTS_2 | RAD_NO_CONTAMINATE_2 + rad_insulation = RAD_MEDIUM_INSULATION var/initial_state var/state = 0 //closed, 1 == open var/isSwitchingStates = 0 @@ -21,12 +23,9 @@ var/closeSound = 'sound/effects/stonedoor_openclose.ogg' var/damageSound = null -/obj/structure/mineral_door/New(location) - ..() - initial_state = icon_state - /obj/structure/mineral_door/Initialize() - ..() + . = ..() + initial_state = icon_state air_update_turf(1) /obj/structure/mineral_door/Destroy() @@ -156,11 +155,13 @@ icon_state = "silver" sheetType = /obj/item/stack/sheet/mineral/silver max_integrity = 300 + rad_insulation = RAD_HEAVY_INSULATION /obj/structure/mineral_door/gold name = "gold door" icon_state = "gold" sheetType = /obj/item/stack/sheet/mineral/gold + rad_insulation = RAD_HEAVY_INSULATION /obj/structure/mineral_door/uranium name = "uranium door" @@ -177,6 +178,7 @@ /obj/structure/mineral_door/transparent opacity = 0 + rad_insulation = RAD_VERY_LIGHT_INSULATION /obj/structure/mineral_door/transparent/Close() ..() @@ -210,6 +212,7 @@ icon_state = "diamond" sheetType = /obj/item/stack/sheet/mineral/diamond max_integrity = 1000 + rad_insulation = RAD_EXTREME_INSULATION /obj/structure/mineral_door/wood name = "wood door" @@ -220,6 +223,7 @@ hardness = 1 resistance_flags = FLAMMABLE max_integrity = 200 + rad_insulation = RAD_VERY_LIGHT_INSULATION /obj/structure/mineral_door/resin name = "resin door" diff --git a/code/game/objects/structures/mirror.dm b/code/game/objects/structures/mirror.dm index 22c5aab1715..c56f4cb2603 100644 --- a/code/game/objects/structures/mirror.dm +++ b/code/game/objects/structures/mirror.dm @@ -10,8 +10,8 @@ integrity_failure = 100 var/list/ui_users = list() -/obj/structure/mirror/New(turf/T, newdir = SOUTH, building = FALSE) - ..() +/obj/structure/mirror/Initialize(mapload, newdir = SOUTH, building = FALSE) + . = ..() if(building) switch(newdir) if(NORTH) @@ -147,10 +147,10 @@ if(voice_mutation) if(H.dna.GetSEState(voice_mutation)) H.dna.SetSEState(voice_mutation, FALSE) - genemutcheck(H, voice_mutation, null, MUTCHK_FORCED) + singlemutcheck(H, voice_mutation, MUTCHK_FORCED) else H.dna.SetSEState(voice_mutation, TRUE) - genemutcheck(H, voice_mutation, null, MUTCHK_FORCED) + singlemutcheck(H, voice_mutation, MUTCHK_FORCED) if(voice_choice) curse(user) diff --git a/code/game/objects/structures/misc.dm b/code/game/objects/structures/misc.dm index 5118a7fe0da..051b3ddcf46 100644 --- a/code/game/objects/structures/misc.dm +++ b/code/game/objects/structures/misc.dm @@ -51,16 +51,17 @@ desc = "Top-of-the-line Nanotrasen technology allows for cloning of crew members from off-station upon bluespace request." icon = 'icons/obj/objects.dmi' icon_state = "borgcharger1(old)" - anchored = 1 - density = 1 + anchored = TRUE + density = TRUE -/obj/structure/respawner/attack_ghost(mob/dead/observer/user as mob) - var/response = alert(user, "Are you sure you want to spawn like this?\n(If you do this, you won't be able to be cloned!)","Respawn?","Yes","No") +/obj/structure/respawner/attack_ghost(mob/dead/observer/user) + var/response = alert(user, "Are you sure you want to spawn here?\n(If you do this, you won't be able to be cloned!)", "Respawn?", "Yes", "No") if(response == "Yes") user.forceMove(get_turf(src)) log_admin("[key_name(user)] was incarnated by a respawner machine.") message_admins("[key_name_admin(user)] was incarnated by a respawner machine.") - user.incarnate_ghost() + var/mob/living/carbon/human/new_human = user.incarnate_ghost() + new_human.mind.offstation_role = TRUE // To prevent them being an antag objective /obj/structure/ghost_beacon name = "ethereal beacon" diff --git a/code/game/objects/structures/mop_bucket.dm b/code/game/objects/structures/mop_bucket.dm index 9f56f3dea25..cec34f384df 100644 --- a/code/game/objects/structures/mop_bucket.dm +++ b/code/game/objects/structures/mop_bucket.dm @@ -7,13 +7,13 @@ container_type = OPENCONTAINER var/amount_per_transfer_from_this = 5 //shit I dunno, adding this so syringes stop runtime erroring. --NeoFite -/obj/structure/mopbucket/New() - ..() +/obj/structure/mopbucket/Initialize(mapload) + . = ..() create_reagents(100) GLOB.janitorial_equipment += src -/obj/structure/mopbucket/full/New() - ..() +/obj/structure/mopbucket/full/Initialize(mapload) + . = ..() reagents.add_reagent("water", 100) /obj/structure/mopbucket/Destroy() diff --git a/code/game/objects/structures/morgue.dm b/code/game/objects/structures/morgue.dm index ee717fe5a8b..5510c1b4c46 100644 --- a/code/game/objects/structures/morgue.dm +++ b/code/game/objects/structures/morgue.dm @@ -49,7 +49,7 @@ if(M) var/mob/dead/observer/G = M.get_ghost() - if(M.mind && M.mind.is_revivable() && !M.mind.suicided) + if(M.mind && !M.mind.suicided) if(M.client) icon_state = "morgue3" desc = initial(desc) + "\n[status_descriptors[4]]" @@ -161,7 +161,7 @@ QDEL_NULL(connected) return ..() -/obj/structure/morgue/container_resist(var/mob/living/L) +/obj/structure/morgue/container_resist(mob/living/L) var/mob/living/carbon/CM = L if(!istype(CM)) return @@ -391,7 +391,7 @@ QDEL_NULL(connected) return ..() -/obj/structure/crematorium/container_resist(var/mob/living/L) +/obj/structure/crematorium/container_resist(mob/living/L) var/mob/living/carbon/CM = L if(!istype(CM)) return @@ -457,6 +457,10 @@ name = "crematorium igniter" icon = 'icons/obj/power.dmi' icon_state = "crema_switch" + power_channel = EQUIP + use_power = IDLE_POWER_USE + idle_power_usage = 100 + active_power_usage = 5000 anchored = 1.0 req_access = list(ACCESS_CREMATORIUM) var/on = 0 @@ -469,13 +473,17 @@ return attack_hand(user) /obj/machinery/crema_switch/attack_hand(mob/user) - if(allowed(usr) || user.can_advanced_admin_interact()) - for(var/obj/structure/crematorium/C in world) - if(C.id == id) - if(!C.cremating) - C.cremate(user) - else - to_chat(usr, "Access denied.") + if(powered(power_channel)) // Do we have power? + if(allowed(usr) || user.can_advanced_admin_interact()) + use_power(400000) + for(var/obj/structure/crematorium/C in world) + if(C.id == id) + if(!C.cremating) + C.cremate(user) + + + else + to_chat(usr, "Access denied.") /mob/proc/update_morgue() if(stat == DEAD) diff --git a/code/game/objects/structures/noticeboard.dm b/code/game/objects/structures/noticeboard.dm index 6b9615cd994..64a0361dc5d 100644 --- a/code/game/objects/structures/noticeboard.dm +++ b/code/game/objects/structures/noticeboard.dm @@ -18,7 +18,7 @@ icon_state = "nboard0[notices]" //attaching papers!! -/obj/structure/noticeboard/attackby(var/obj/item/O as obj, var/mob/user as mob, params) +/obj/structure/noticeboard/attackby(obj/item/O as obj, mob/user as mob, params) if(istype(O, /obj/item/paper)) if(notices < 5) O.add_fingerprint(user) diff --git a/code/game/objects/structures/safe.dm b/code/game/objects/structures/safe.dm index 2f751dbfadd..5bfe4e8a880 100644 --- a/code/game/objects/structures/safe.dm +++ b/code/game/objects/structures/safe.dm @@ -7,7 +7,7 @@ SAFE CODES */ #define DRILL_SPARK_CHANCE 15 -#define DRILL_TIME 300 SECONDS +#define DRILL_TIME 120 SECONDS #define SOUND_CHANCE 10 GLOBAL_LIST_EMPTY(safes) diff --git a/code/game/objects/structures/signs.dm b/code/game/objects/structures/signs.dm index 5a8a122be21..ad77d1cffc1 100644 --- a/code/game/objects/structures/signs.dm +++ b/code/game/objects/structures/signs.dm @@ -6,6 +6,7 @@ layer = 3.5 max_integrity = 100 armor = list("melee" = 50, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) + flags_2 = RAD_PROTECT_CONTENTS_2 | RAD_NO_CONTAMINATE_2 /obj/structure/sign/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0) switch(damage_type) @@ -152,10 +153,10 @@ icon = 'icons/obj/mining.dmi' icon_state = "xeno_warning" -/obj/structure/sign/redcross +/obj/structure/sign/lifestar name = "medbay" - desc = "The Intergalactic symbol of Medical institutions. You'll probably get help here.'" - icon_state = "redcross" + desc = "The Star of Life, a symbol of Medical Aid." + icon_state = "lifestar" /obj/structure/sign/greencross name = "medbay" diff --git a/code/game/objects/structures/spirit_board.dm b/code/game/objects/structures/spirit_board.dm index 8fa6e0d7dd1..647f0a53c6e 100644 --- a/code/game/objects/structures/spirit_board.dm +++ b/code/game/objects/structures/spirit_board.dm @@ -24,7 +24,7 @@ spirit_board_pick_letter(user) -/obj/structure/spirit_board/proc/spirit_board_pick_letter(var/mob/M) +/obj/structure/spirit_board/proc/spirit_board_pick_letter(mob/M) if(!spirit_board_checks(M)) return 0 @@ -43,7 +43,7 @@ visible_message("The planchette slowly moves... and stops at the letter \"[planchette]\".") -/obj/structure/spirit_board/proc/spirit_board_checks(var/mob/M) +/obj/structure/spirit_board/proc/spirit_board_checks(mob/M) //cooldown var/bonus = 0 if(M.ckey == lastuser) diff --git a/code/game/objects/structures/statues.dm b/code/game/objects/structures/statues.dm index 22449bb547b..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) @@ -90,10 +87,9 @@ /obj/structure/statue/uranium/proc/radiate() if(!active) - if(world.time > last_event+15) + if(world.time > last_event + 15) active = 1 - for(var/mob/living/L in range(3,src)) - L.apply_effect(12,IRRADIATE,0) + radiation_pulse(src, 30) last_event = world.time active = null diff --git a/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm b/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm index b7339086a68..17645de3c78 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm @@ -10,9 +10,9 @@ comfort = 0 flags = NODECONSTRUCT -/obj/structure/bed/nest/New() +/obj/structure/bed/nest/Initialize(mapload) + . = ..() nest_overlay = image('icons/mob/alien.dmi', "nestoverlay", layer=MOB_LAYER - 0.2) - return ..() /obj/structure/bed/nest/user_unbuckle_mob(mob/living/user) if(has_buckled_mobs()) 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 0c40c15d539..829b47aaf01 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm @@ -19,12 +19,6 @@ var/propelled = FALSE // Check for fire-extinguisher-driven chairs var/comfort = 0 -/obj/structure/chair/New() - ..() - spawn(3) //sorry. i don't think there's a better way to do this. - handle_rotation() - return - /obj/structure/chair/narsie_act() if(prob(20)) var/obj/structure/chair/wood/W = new/obj/structure/chair/wood(get_turf(src)) @@ -47,10 +41,9 @@ to_chat(user, "[SK] is not ready to be attached!") return user.drop_item() - var/obj/structure/chair/e_chair/E = new /obj/structure/chair/e_chair(src.loc) + var/obj/structure/chair/e_chair/E = new /obj/structure/chair/e_chair(get_turf(src), SK) playsound(src.loc, W.usesound, 50, 1) E.dir = dir - E.part = SK SK.loc = E SK.master = E qdel(src) 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/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index 307dd1b7da2..5bce42875fe 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -35,8 +35,8 @@ var/deconstruction_ready = TRUE var/flipped = 0 -/obj/structure/table/New() - ..() +/obj/structure/table/Initialize(mapload) + . = ..() if(flipped) update_icon() @@ -70,11 +70,11 @@ if(istype(src, /obj/structure/table/reinforced)) base = "rtable" if(istype(src, /obj/structure/table/wood/poker)) - base = "poker" + base = "poker" if(istype(src, /obj/structure/table/wood/fancy)) - base = "fancy" + base = "fancy" if(istype(src, /obj/structure/table/wood/fancy/black)) - base = "fancyblack" + base = "fancyblack" icon_state = "[base]flip[type][type == 1 ? subtype : ""]" @@ -123,7 +123,7 @@ return 1 if(mover.throwing) return 1 - if(locate(/obj/structure/table) in get_turf(mover)) + if(length(get_atoms_of_type(get_turf(mover), /obj/structure/table) - mover)) return 1 if(flipped) if(get_dir(loc, target) == dir) @@ -394,7 +394,7 @@ armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 100) var/list/debris = list() -/obj/structure/table/glass/New() +/obj/structure/table/glass/Initialize(mapload) . = ..() debris += new frame debris += new /obj/item/shard @@ -503,16 +503,16 @@ buildstack = /obj/item/stack/tile/carpet canSmoothWith = list(/obj/structure/table/wood/fancy, /obj/structure/table/wood/fancy/black) -/obj/structure/table/wood/fancy/New() +/obj/structure/table/wood/fancy/Initialize(mapload) + . = ..() icon = 'icons/obj/smooth_structures/fancy_table.dmi' //so that the tables place correctly in the map editor - ..() /obj/structure/table/wood/fancy/black icon_state = "fancy_table_black" buildstack = /obj/item/stack/tile/carpet/black -/obj/structure/table/wood/fancy/black/New() - ..() +/obj/structure/table/wood/fancy/black/Initialize(mapload) + . = ..() icon = 'icons/obj/smooth_structures/fancy_table_black.dmi' //so that the tables place correctly in the map editor /* @@ -591,7 +591,7 @@ verbs -= /obj/structure/table/verb/do_flip typecache_can_hold = typecacheof(typecache_can_hold) for(var/atom/movable/held in get_turf(src)) - if(is_type_in_typecache(held, typecache_can_hold)) + if(!held.anchored && held.move_resist != INFINITY && is_type_in_typecache(held, typecache_can_hold)) held_items += held.UID() /obj/structure/table/tray/Move(NewLoc, direct) diff --git a/code/game/objects/structures/tank_dispenser.dm b/code/game/objects/structures/tank_dispenser.dm index 87af8fe4e95..8748ab570fd 100644 --- a/code/game/objects/structures/tank_dispenser.dm +++ b/code/game/objects/structures/tank_dispenser.dm @@ -18,8 +18,8 @@ /obj/structure/dispenser/plasma starting_oxygen_tanks = 0 -/obj/structure/dispenser/New() - ..() +/obj/structure/dispenser/Initialize(mapload) + . = ..() initialize_tanks() update_icon() @@ -30,11 +30,11 @@ /obj/structure/dispenser/proc/initialize_tanks() for(var/I in 1 to starting_plasma_tanks) - var/obj/item/tank/plasma/P = new(src) + var/obj/item/tank/internals/plasma/P = new(src) stored_plasma_tanks.Add(P) for(var/I in 1 to starting_oxygen_tanks) - var/obj/item/tank/oxygen/O = new(src) + var/obj/item/tank/internals/oxygen/O = new(src) stored_oxygen_tanks.Add(O) /obj/structure/dispenser/update_icon() @@ -89,11 +89,11 @@ return TRUE /obj/structure/dispenser/attackby(obj/item/I, mob/user, params) - if(istype(I, /obj/item/tank/oxygen) || istype(I, /obj/item/tank/air) || istype(I, /obj/item/tank/anesthetic)) + if(istype(I, /obj/item/tank/internals/oxygen) || istype(I, /obj/item/tank/internals/air) || istype(I, /obj/item/tank/internals/anesthetic)) try_insert_tank(user, stored_oxygen_tanks, I) return - if(istype(I, /obj/item/tank/plasma)) + if(istype(I, /obj/item/tank/internals/plasma)) try_insert_tank(user, stored_plasma_tanks, I) return @@ -112,7 +112,7 @@ if(!LAZYLEN(tank_list)) return // There are no tanks left to withdraw. - var/obj/item/tank/T = tank_list[1] + var/obj/item/tank/internals/T = tank_list[1] tank_list.Remove(T) if(!user.put_in_hands(T)) diff --git a/code/game/objects/structures/transit_tubes/station.dm b/code/game/objects/structures/transit_tubes/station.dm index 6c58440e7fb..bb53368ee4b 100644 --- a/code/game/objects/structures/transit_tubes/station.dm +++ b/code/game/objects/structures/transit_tubes/station.dm @@ -19,8 +19,8 @@ var/list/disallowed_mobs = list(/mob/living/silicon/ai) -/obj/structure/transit_tube/station/New() - ..() +/obj/structure/transit_tube/station/Initialize(mapload) + . = ..() START_PROCESSING(SSobj, src) /obj/structure/transit_tube/station/Destroy() diff --git a/code/game/objects/structures/transit_tubes/transit_tube_pod.dm b/code/game/objects/structures/transit_tubes/transit_tube_pod.dm index 126133cddc0..0e6327090c9 100644 --- a/code/game/objects/structures/transit_tubes/transit_tube_pod.dm +++ b/code/game/objects/structures/transit_tubes/transit_tube_pod.dm @@ -28,7 +28,7 @@ return TRUE else return ..() -/obj/structure/transit_tube_pod/proc/follow_tube(var/reverse_launch) +/obj/structure/transit_tube_pod/proc/follow_tube(reverse_launch) if(moving) return diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index 1a5b275bc01..d513b4e2920 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -13,8 +13,8 @@ var/mob/living/swirlie = null //the mob being given a swirlie -/obj/structure/toilet/New() - ..() +/obj/structure/toilet/Initialize(mapload) + . = ..() open = round(rand(0, 1)) update_icon() @@ -27,7 +27,7 @@ user.changeNext_move(CLICK_CD_MELEE) playsound(src.loc, "swing_hit", 25, 1) swirlie.visible_message("[user] slams the toilet seat onto [swirlie]'s head!", "[user] slams the toilet seat onto [swirlie]'s head!", "You hear reverberating porcelain.") - swirlie.adjustBruteLoss(5) + swirlie.apply_damage(5, BRUTE, BODY_ZONE_HEAD) return if(cistern && !open) @@ -101,8 +101,8 @@ swirlie = null else playsound(src.loc, 'sound/effects/bang.ogg', 25, 1) - GM.visible_message("[user] slams [GM.name] into [src]!", "[user] slams [GM.name] into [src]!") - GM.adjustBruteLoss(5) + GM.visible_message("[user] slams [GM.name]'s head into [src]!", "[user] slams [GM.name]'s head into [src]!") + GM.apply_damage(5, BRUTE, BODY_ZONE_HEAD) else to_chat(user, "You need a tighter grip!") @@ -181,7 +181,7 @@ /obj/structure/toilet/secret var/secret_type = null -/obj/structure/toilet/secret/New() +/obj/structure/toilet/secret/Initialize(mapload) . = ..() if(secret_type) var/obj/item/secret = new secret_type(src) @@ -212,8 +212,8 @@ return user.changeNext_move(CLICK_CD_MELEE) playsound(src.loc, 'sound/effects/bang.ogg', 25, 1) - user.visible_message("[user] slams [GM] into [src]!", "You slam [GM] into [src]!") - GM.adjustBruteLoss(8) + user.visible_message("[user] slams [GM]'s head into [src]!", "You slam [GM]'s head into [src]!") + GM.apply_damage(8, BRUTE, BODY_ZONE_HEAD) else to_chat(user, "You need a tighter grip!") @@ -240,6 +240,10 @@ pixel_x = 0 pixel_y = 32 +#define SHOWER_FREEZING "freezing" +#define SHOWER_NORMAL "normal" +#define SHOWER_BOILING "boiling" + /obj/machinery/shower name = "shower" desc = "The HS-451. Installed in the 2550s by the Nanotrasen Hygiene Division." @@ -248,11 +252,11 @@ density = 0 anchored = 1 use_power = NO_POWER_USE - var/on = 0 - var/obj/effect/mist/mymist = null - var/ismist = 0 //needs a var so we can make it linger~ - var/watertemp = "normal" //freezing, normal, or boiling - var/mobpresent = 0 //true if there is a mob on the shower's loc, this is to ease process() + ///Is the shower on or off? + var/on = FALSE + ///What temperature the shower reagents are set to. + var/current_temperature = SHOWER_NORMAL + ///What sound will be played on loop when the shower is on and pouring water. var/datum/looping_sound/showering/soundloop /obj/machinery/shower/New(turf/T, newdir = SOUTH, building = FALSE) @@ -270,7 +274,6 @@ layer = FLY_LAYER /obj/machinery/shower/Destroy() - QDEL_NULL(mymist) QDEL_NULL(soundloop) return ..() @@ -280,47 +283,45 @@ name = "mist" icon = 'icons/obj/watercloset.dmi' icon_state = "mist" - layer = MOB_LAYER + 1 - anchored = 1 + layer = FLY_LAYER + anchored = TRUE mouse_opacity = MOUSE_OPACITY_TRANSPARENT -/obj/machinery/shower/attack_hand(mob/M as mob) +/obj/machinery/shower/attack_hand(mob/M) on = !on update_icon() + handle_mist() + add_fingerprint(M) if(on) + START_PROCESSING(SSmachines, src) + process() soundloop.start() - if(M.loc == loc) - wash(M) - check_heat(M) - M.water_act(100, convertHeat(), src) - for(var/atom/movable/G in src.loc) - G.clean_blood() - G.water_act(100, convertHeat(), src) else soundloop.stop() + var/turf/simulated/T = loc + if(istype(T) && !T.density) + T.MakeSlippery(TURF_WET_WATER, 5 SECONDS) -/obj/machinery/shower/attackby(obj/item/I as obj, mob/user as mob, params) +/obj/machinery/shower/attackby(obj/item/I, mob/user, params) if(I.type == /obj/item/analyzer) - to_chat(user, "The water temperature seems to be [watertemp].") - if(on) - I.water_act(100, convertHeat(), src) + to_chat(user, "The water temperature seems to be [current_temperature].") return ..() /obj/machinery/shower/wrench_act(mob/user, obj/item/I) - . = TRUE - if(!I.tool_use_check(user, 0)) - return - to_chat(user, "You begin to adjust the temperature valve with the [I].") - if(I.use_tool(src, user, 50, volume = I.tool_volume)) - switch(watertemp) - if("normal") - watertemp = "freezing" - if("freezing") - watertemp = "boiling" - if("boiling") - watertemp = "normal" - user.visible_message("[user] adjusts the shower with the [I].", "You adjust [src] to [watertemp].") - update_icon() //letsa update whenever we change the temperature, since the mist might need to change + ..() + to_chat(user, "You begin to adjust the temperature valve with [I].") + if(I.use_tool(src, user, 50)) + switch(current_temperature) + if(SHOWER_NORMAL) + current_temperature = SHOWER_FREEZING + if(SHOWER_FREEZING) + current_temperature = SHOWER_BOILING + if(SHOWER_BOILING) + current_temperature = SHOWER_NORMAL + user.visible_message("[user] adjusts the shower with \the [I].", "You adjust the shower with \the [I] to [current_temperature] temperature.") + add_hiddenprint(user) + handle_mist() + return TRUE /obj/machinery/shower/welder_act(mob/user, obj/item/I) . = TRUE @@ -331,111 +332,103 @@ return visible_message("[user] begins slicing [src] free...", "You begin slicing [src] free...", "You hear welding.") if(I.use_tool(src, user, 40, volume = I.tool_volume)) - if(mymist) - qdel(mymist) user.visible_message("[user] cuts [src] loose!", "You cut [src] loose!") var/obj/item/mounted/shower/S = new /obj/item/mounted/shower(get_turf(user)) transfer_prints_to(S, TRUE) qdel(src) -/obj/machinery/shower/update_icon() //this makes the shower mist up or clear mist (depending on water temperature) - overlays.Cut() //once it's been on for a while, in addition to handling the water overlay. +/obj/machinery/shower/update_icon() + cut_overlays() if(on) - overlays += image('icons/obj/watercloset.dmi', src, "water", MOB_LAYER + 1, dir) - var/mist_time = 50 //5 seconds at normal temperature to build up mist - if(watertemp == "freezing") - mist_time = 70 //7 seconds on freezing temperature to disperse existing mist - if(watertemp == "boiling") - mist_time = 20 //2 seconds on boiling temperature to build up mist - addtimer(CALLBACK(src, .proc/update_mist), mist_time) - else - addtimer(CALLBACK(src, .proc/update_mist), 250) //25 seconds for mist to disperse after being turned off + var/mutable_appearance/water_falling = mutable_appearance('icons/obj/watercloset.dmi', "water", ABOVE_MOB_LAYER) + add_overlay(water_falling) -/obj/machinery/shower/proc/update_mist() +/obj/machinery/shower/proc/handle_mist() + // If there is no mist, and the shower was turned on (on a non-freezing temp): make mist in 5 seconds + // If there was already mist, and the shower was turned off (or made cold): remove the existing mist in 25 sec + var/obj/effect/mist/mist = locate() in loc + if(!mist && on && current_temperature != SHOWER_FREEZING) + addtimer(CALLBACK(src, .proc/make_mist), 5 SECONDS) + + if(mist && (!on || current_temperature == SHOWER_FREEZING)) + addtimer(CALLBACK(src, .proc/clear_mist), 25 SECONDS) + + +/obj/machinery/shower/proc/make_mist() + var/obj/effect/mist/mist = locate() in loc + if(!mist && on && current_temperature != SHOWER_FREEZING) + new /obj/effect/mist(loc) + +/obj/machinery/shower/proc/clear_mist() + var/obj/effect/mist/mist = locate() in loc + if(mist && (!on || current_temperature == SHOWER_FREEZING)) + qdel(mist) + +/obj/machinery/shower/Crossed(atom/movable/AM) + ..() if(on) - if(watertemp == "freezing") - if(mymist) - qdel(mymist) - ismist = 0 - return - if(mymist) - return - ismist = 1 - mymist = new /obj/effect/mist(loc) - else - if(mymist) - qdel(mymist) - ismist = 0 - -/obj/machinery/shower/Crossed(atom/movable/O, oldloc) - ..() - wash(O) - if(ismob(O)) - mobpresent += 1 - check_heat(O) - -/obj/machinery/shower/Uncrossed(atom/movable/O) - if(ismob(O)) - mobpresent -= 1 - ..() + wash(AM) /obj/machinery/shower/proc/convertHeat() - switch(watertemp) - if("boiling") + switch(current_temperature) + if(SHOWER_BOILING) return 340.15 - if("normal") + if(SHOWER_NORMAL) return 310.15 - if("freezing") + if(SHOWER_FREEZING) return 230.15 //Yes, showers are super powerful as far as washing goes. -/obj/machinery/shower/proc/wash(atom/movable/O as obj|mob) - if(!on) return - - if(istype(O, /obj/item)) - var/obj/item/I = O +/obj/machinery/shower/proc/wash(atom/A) + if(isitem(A)) + var/obj/item/I = A I.extinguish() - O.water_act(100, convertHeat(), src) + A.water_act(100, convertHeat(), src) - if(isliving(O)) - var/mob/living/L = O + if(isliving(A)) + var/mob/living/L = A + check_heat(L) L.ExtinguishMob() L.adjust_fire_stacks(-20) //Douse ourselves with water to avoid fire more easily - to_chat(L, "You've been drenched in water!") - L.clean_blood() - if(isturf(loc)) - var/turf/tile = loc - loc.clean_blood() - for(var/obj/effect/E in tile) - if(is_cleanable(E)) - qdel(E) + A.clean_blood(radiation_clean = TRUE) /obj/machinery/shower/process() - if(!on || !mobpresent) - return - for(var/mob/living/carbon/C in loc) - if(prob(33)) - wash(C) //re-applies water and re-cleans mob while they remain under the shower, 33% chance per process to avoid message spam/quick death - check_heat(C) + if(on) + if(isturf(loc)) + var/turf/tile = loc + tile.water_act(100, convertHeat(), src) + tile.clean_blood(radiation_clean = TRUE) + for(var/obj/effect/E in tile) + if(is_cleanable(E)) + qdel(E) + for(var/A in loc) + wash(A) + else + on = FALSE + soundloop.stop() + handle_mist() + update_icon() -/obj/machinery/shower/proc/check_heat(mob/M as mob) - if(!on || watertemp == "normal") +/obj/machinery/shower/proc/check_heat(mob/M) + if(current_temperature == SHOWER_NORMAL) return if(iscarbon(M)) var/mob/living/carbon/C = M - if(watertemp == "freezing") + if(current_temperature == SHOWER_FREEZING) //C.bodytemperature = max(80, C.bodytemperature - 80) to_chat(C, "The water is freezing!") - return - if(watertemp == "boiling") + + else if(current_temperature == SHOWER_BOILING) //C.bodytemperature = min(500, C.bodytemperature + 35) C.adjustFireLoss(5) to_chat(C, "The water is searing!") - return +#undef SHOWER_FREEZING +#undef SHOWER_NORMAL +#undef SHOWER_BOILING /obj/item/bikehorn/rubberducky name = "rubber ducky" diff --git a/code/game/objects/structures/windoor_assembly.dm b/code/game/objects/structures/windoor_assembly.dm index c25b46c8fea..73e6fadac80 100644 --- a/code/game/objects/structures/windoor_assembly.dm +++ b/code/game/objects/structures/windoor_assembly.dm @@ -31,8 +31,8 @@ . = ..() . += "Alt-click to rotate it clockwise." -/obj/structure/windoor_assembly/New(loc, set_dir) - ..() +/obj/structure/windoor_assembly/Initialize(mapload, set_dir) + . = ..() if(set_dir) dir = set_dir ini_dir = dir @@ -131,7 +131,7 @@ if("02") //Adding airlock electronics for access. Step 6 complete. - if(istype(W, /obj/item/airlock_electronics)) + if(istype(W, /obj/item/airlock_electronics) && !istype(W, /obj/item/airlock_electronics/destroyed)) playsound(loc, W.usesound, 100, 1) user.visible_message("[user] installs the electronics into the airlock assembly.", "You start to install electronics into the airlock assembly...") user.drop_item() diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index 1d950e8ea83..b0d9464a0a3 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -1,26 +1,3 @@ -GLOBAL_LIST_INIT(wcBar, pick(list("#0d8395", "#58b5c3", "#58c366", "#90d79a", "#ffffff"))) -GLOBAL_LIST_INIT(wcBrig, pick(list("#aa0808", "#7f0606", "#ff0000"))) -GLOBAL_LIST_INIT(wcCommon, pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", "#8fcf44", "#ffffff"))) - -/obj/proc/color_windows(obj/W) - var/list/wcBarAreas = list(/area/crew_quarters/bar) - var/list/wcBrigAreas = list(/area/security, /area/shuttle/gamma) - - var/newcolor - var/turf/T = get_turf(W) - if(!istype(T)) - return - var/area/A = T.loc - - if(is_type_in_list(A,wcBarAreas)) - newcolor = GLOB.wcBar - else if(is_type_in_list(A,wcBrigAreas)) - newcolor = GLOB.wcBrig - else - newcolor = GLOB.wcCommon - - return newcolor - /obj/structure/window name = "window" desc = "A window." @@ -30,10 +7,12 @@ GLOBAL_LIST_INIT(wcCommon, pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", pressure_resistance = 4*ONE_ATMOSPHERE anchored = TRUE flags = ON_BORDER + flags_2 = RAD_PROTECT_CONTENTS_2 can_be_unanchored = TRUE max_integrity = 25 resistance_flags = ACID_PROOF armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 100) + rad_insulation = RAD_VERY_LIGHT_INSULATION var/ini_dir = null var/state = WINDOW_OUT_OF_FRAME var/reinf = FALSE @@ -41,11 +20,10 @@ GLOBAL_LIST_INIT(wcCommon, pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", var/decon_speed = null var/fulltile = FALSE var/shardtype = /obj/item/shard + var/glass_decal = /obj/effect/decal/cleanable/glass var/glass_type = /obj/item/stack/sheet/glass var/glass_amount = 1 - var/cancolor = FALSE - var/image/crack_overlay - var/list/debris = list() + var/mutable_appearance/crack_overlay var/real_explosion_block //ignore this, just use explosion_block var/breaksound = "shatter" var/hitsound = 'sound/effects/Glasshit.ogg' @@ -69,8 +47,9 @@ GLOBAL_LIST_INIT(wcCommon, pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", if(!anchored && !fulltile) . += "Alt-click to rotate it." -/obj/structure/window/New(Loc, direct) - ..() +/obj/structure/window/Initialize(mapload, direct) + . = ..() + if(direct) setDir(direct) if(reinf && anchored) @@ -78,42 +57,20 @@ GLOBAL_LIST_INIT(wcCommon, pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", ini_dir = dir - if(!color && cancolor) - color = color_windows(src) - - // Precreate our own debris - - var/shards = 1 if(fulltile) - shards++ setDir() if(decon_speed == null && fulltile) decon_speed = 2 SECONDS - var/rods = 0 - if(reinf) - rods++ - if(fulltile) - rods++ - - for(var/i in 1 to shards) - debris += new shardtype(src) - if(rods) - debris += new /obj/item/stack/rods(src, rods) - //windows only block while reinforced and fulltile, so we'll use the proc real_explosion_block = explosion_block explosion_block = EXPLOSION_BLOCK_PROC -/obj/structure/window/Initialize() - air_update_turf(1) - return ..() + air_update_turf(TRUE) /obj/structure/window/narsie_act() color = NARSIE_WINDOW_COLOUR - for(var/obj/item/shard/shard in debris) - shard.color = NARSIE_WINDOW_COLOUR /obj/structure/window/ratvar_act() if(!fulltile) @@ -209,7 +166,15 @@ GLOBAL_LIST_INIT(wcCommon, pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", return 1 //skip the afterattack add_fingerprint(user) - if(istype(I, /obj/item/grab) && get_dist(src, user) < 2) + if(istype(I, /obj/item/stack/rods) && user.a_intent == INTENT_HELP) + for(var/obj/structure/grille/G in get_turf(src)) + if(!G.broken) + continue + to_chat(user, "You start rebuilding the broken grille.") + if(do_after(user, 4 SECONDS, FALSE, G)) + G.repair(user, I) + + else if(istype(I, /obj/item/grab) && get_dist(src, user) < 2) var/obj/item/grab/G = I if(isliving(G.affecting)) var/mob/living/M = G.affecting @@ -236,8 +201,8 @@ GLOBAL_LIST_INIT(wcCommon, pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", M.Weaken(5) M.apply_damage(30) take_damage(75) - return - return ..() + else + return ..() /obj/structure/window/crowbar_act(mob/user, obj/item/I) @@ -323,6 +288,7 @@ GLOBAL_LIST_INIT(wcCommon, pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", WELDER_ATTEMPT_REPAIR_MESSAGE if(I.use_tool(src, user, 40, volume = I.tool_volume)) obj_integrity = max_integrity + update_nearby_icons() WELDER_REPAIR_SUCCESS_MESSAGE /obj/structure/window/proc/check_state(checked_state) @@ -370,13 +336,20 @@ GLOBAL_LIST_INIT(wcCommon, pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", if(!disassembled) playsound(src, breaksound, 70, 1) if(!(flags & NODECONSTRUCT)) - for(var/i in debris) - var/obj/item/I = i - I.forceMove(loc) - transfer_fingerprints_to(I) + for(var/obj/item/shard/debris in spawnDebris(drop_location())) + transfer_fingerprints_to(debris) // transfer fingerprints to shards only qdel(src) update_nearby_icons() +/obj/structure/window/proc/spawnDebris(location) + . = list() + . += new shardtype(location) + . += new glass_decal(location) + if(reinf) + . += new /obj/item/stack/rods(location, (fulltile ? 2 : 1)) + if(fulltile) + . += new shardtype(location) + /obj/structure/window/verb/rotate() set name = "Rotate Window Counter-Clockwise" set category = "Object" @@ -478,14 +451,16 @@ GLOBAL_LIST_INIT(wcCommon, pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", if(!fulltile) return var/ratio = obj_integrity / max_integrity - ratio = CEILING(ratio*4, 1) * 25 + ratio = CEILING(ratio * 4, 1) * 25 + if(smooth) queue_smooth(src) - overlays -= crack_overlay + + cut_overlay(crack_overlay) if(ratio > 75) return - crack_overlay = image('icons/obj/structures.dmi',"damage[ratio]",-(layer+0.1)) - overlays += crack_overlay + crack_overlay = mutable_appearance('icons/obj/structures.dmi', "damage[ratio]", -(layer+0.1)) + add_overlay(crack_overlay) /obj/structure/window/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) ..() @@ -503,9 +478,9 @@ GLOBAL_LIST_INIT(wcCommon, pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", desc = "It looks rather strong. Might take a few good hits to shatter it." icon_state = "rwindow" reinf = TRUE - cancolor = TRUE heat_resistance = 1600 armor = list("melee" = 50, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 25, "bio" = 100, "rad" = 100, "fire" = 80, "acid" = 100) + rad_insulation = RAD_HEAVY_INSULATION max_integrity = 50 explosion_block = 1 glass_type = /obj/item/stack/sheet/rglass @@ -574,12 +549,14 @@ GLOBAL_LIST_INIT(wcCommon, pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", name = "plasma window" desc = "A window made out of a plasma-silicate alloy. It looks insanely tough to break and burn through." icon_state = "plasmawindow" + glass_decal = /obj/effect/decal/cleanable/glass/plasma shardtype = /obj/item/shard/plasma glass_type = /obj/item/stack/sheet/plasmaglass heat_resistance = 32000 max_integrity = 150 explosion_block = 1 armor = list("melee" = 75, "bullet" = 5, "laser" = 0, "energy" = 0, "bomb" = 45, "bio" = 100, "rad" = 100, "fire" = 99, "acid" = 100) + rad_insulation = RAD_NO_INSULATION /obj/structure/window/plasmabasic/BlockSuperconductivity() return 1 @@ -588,12 +565,14 @@ GLOBAL_LIST_INIT(wcCommon, pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", name = "reinforced plasma window" desc = "A plasma-glass alloy window, with rods supporting it. It looks hopelessly tough to break. It also looks completely fireproof, considering how basic plasma windows are insanely fireproof." icon_state = "plasmarwindow" + glass_decal = /obj/effect/decal/cleanable/glass/plasma shardtype = /obj/item/shard/plasma glass_type = /obj/item/stack/sheet/plasmarglass reinf = TRUE max_integrity = 500 explosion_block = 2 armor = list("melee" = 85, "bullet" = 20, "laser" = 0, "energy" = 0, "bomb" = 60, "bio" = 100, "rad" = 100, "fire" = 99, "acid" = 100) + rad_insulation = RAD_NO_INSULATION damage_deflection = 21 /obj/structure/window/plasmareinforced/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) @@ -615,35 +594,39 @@ GLOBAL_LIST_INIT(wcCommon, pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", icon_state = "window" max_integrity = 50 smooth = SMOOTH_TRUE - cancolor = TRUE - canSmoothWith = list(/obj/structure/window/full/basic, /obj/structure/window/full/reinforced, /obj/structure/window/full/reinforced/tinted, /obj/structure/window/full/plasmabasic, /obj/structure/window/full/plasmareinforced) + canSmoothWith = list(/obj/structure/window/full/basic, /obj/structure/window/full/reinforced, /obj/structure/window/full/reinforced/tinted, /obj/structure/window/full/plasmabasic, /obj/structure/window/full/plasmareinforced, /turf/simulated/wall/indestructible/fakeglass) /obj/structure/window/full/plasmabasic name = "plasma window" desc = "A plasma-glass alloy window. It looks insanely tough to break. It appears it's also insanely tough to burn through." icon = 'icons/obj/smooth_structures/plasma_window.dmi' icon_state = "plasmawindow" + glass_decal = /obj/effect/decal/cleanable/glass/plasma shardtype = /obj/item/shard/plasma glass_type = /obj/item/stack/sheet/plasmaglass heat_resistance = 32000 max_integrity = 300 smooth = SMOOTH_TRUE - canSmoothWith = list(/obj/structure/window/full/basic, /obj/structure/window/full/reinforced, /obj/structure/window/full/reinforced/tinted, /obj/structure/window/full/plasmabasic, /obj/structure/window/full/plasmareinforced) + canSmoothWith = list(/obj/structure/window/full/basic, /obj/structure/window/full/reinforced, /obj/structure/window/full/reinforced/tinted, /obj/structure/window/full/plasmabasic, /obj/structure/window/full/plasmareinforced, /turf/simulated/wall/indestructible/fakeglass) explosion_block = 1 armor = list("melee" = 75, "bullet" = 5, "laser" = 0, "energy" = 0, "bomb" = 45, "bio" = 100, "rad" = 100, "fire" = 99, "acid" = 100) + rad_insulation = RAD_NO_INSULATION /obj/structure/window/full/plasmareinforced name = "reinforced plasma window" desc = "A plasma-glass alloy window, with rods supporting it. It looks hopelessly tough to break. It also looks completely fireproof, considering how basic plasma windows are insanely fireproof." icon = 'icons/obj/smooth_structures/rplasma_window.dmi' icon_state = "rplasmawindow" + glass_decal = /obj/effect/decal/cleanable/glass/plasma shardtype = /obj/item/shard/plasma glass_type = /obj/item/stack/sheet/plasmarglass smooth = SMOOTH_TRUE + canSmoothWith = list(/obj/structure/window/full/basic, /obj/structure/window/full/reinforced, /obj/structure/window/full/reinforced/tinted, /obj/structure/window/full/plasmabasic, /obj/structure/window/full/plasmareinforced, /turf/simulated/wall/indestructible/fakeglass) reinf = TRUE max_integrity = 1000 explosion_block = 2 armor = list("melee" = 85, "bullet" = 20, "laser" = 0, "energy" = 0, "bomb" = 60, "bio" = 100, "rad" = 100, "fire" = 99, "acid" = 100) + rad_insulation = RAD_NO_INSULATION /obj/structure/window/full/plasmareinforced/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) return @@ -654,14 +637,14 @@ GLOBAL_LIST_INIT(wcCommon, pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", icon = 'icons/obj/smooth_structures/reinforced_window.dmi' icon_state = "r_window" smooth = SMOOTH_TRUE - canSmoothWith = list(/obj/structure/window/full/basic, /obj/structure/window/full/reinforced, /obj/structure/window/full/reinforced/tinted, /obj/structure/window/full/plasmabasic, /obj/structure/window/full/plasmareinforced) + canSmoothWith = list(/obj/structure/window/full/basic, /obj/structure/window/full/reinforced, /obj/structure/window/full/reinforced/tinted, /obj/structure/window/full/plasmabasic, /obj/structure/window/full/plasmareinforced, /turf/simulated/wall/indestructible/fakeglass) max_integrity = 100 reinf = TRUE heat_resistance = 1600 armor = list("melee" = 50, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 25, "bio" = 100, "rad" = 100, "fire" = 80, "acid" = 100) + rad_insulation = RAD_HEAVY_INSULATION explosion_block = 1 glass_type = /obj/item/stack/sheet/rglass - cancolor = TRUE /obj/structure/window/full/reinforced/tinted name = "tinted window" @@ -674,7 +657,6 @@ GLOBAL_LIST_INIT(wcCommon, pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", icon = 'icons/obj/smooth_structures/rice_window.dmi' icon_state = "ice_window" max_integrity = 150 - cancolor = FALSE /obj/structure/window/full/shuttle name = "shuttle window" @@ -696,24 +678,21 @@ GLOBAL_LIST_INIT(wcCommon, pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", /obj/structure/window/full/shuttle/tinted opacity = TRUE -/obj/structure/window/plastitanium +/obj/structure/window/full/plastitanium name = "plastitanium window" desc = "An evil looking window of plasma and titanium." icon = 'icons/obj/smooth_structures/plastitanium_window.dmi' icon_state = "plastitanium_window" - dir = FULLTILE_WINDOW_DIR max_integrity = 100 - fulltile = TRUE - flags = PREVENT_CLICK_UNDER reinf = TRUE heat_resistance = 1600 armor = list("melee" = 50, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 50, "bio" = 100, "rad" = 100, "fire" = 80, "acid" = 100) + rad_insulation = RAD_HEAVY_INSULATION smooth = SMOOTH_TRUE canSmoothWith = null explosion_block = 3 - level = 3 glass_type = /obj/item/stack/sheet/plastitaniumglass - glass_amount = 2 + canSmoothWith = list(/turf/simulated/wall/indestructible/opsglass, /obj/structure/window/full/plastitanium) /obj/structure/window/reinforced/clockwork name = "brass window" @@ -726,19 +705,18 @@ GLOBAL_LIST_INIT(wcCommon, pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", explosion_block = 2 //fancy AND hard to destroy. the most useful combination. glass_type = /obj/item/stack/tile/brass reinf = FALSE - cancolor = FALSE var/made_glow = FALSE -/obj/structure/window/reinforced/clockwork/New(loc, direct) +/obj/structure/window/reinforced/clockwork/Initialize(mapload, direct) + . = ..() if(fulltile) made_glow = TRUE - ..() - QDEL_LIST(debris) if(fulltile) new /obj/effect/temp_visual/ratvar/window(get_turf(src)) - debris += new/obj/item/stack/tile/brass(src, 2) - else - debris += new/obj/item/stack/tile/brass(src, 1) + +/obj/structure/window/reinforced/clockwork/spawnDebris(location) + . = list() + . += new /obj/item/stack/tile/brass(location, (fulltile ? 2 : 1)) /obj/structure/window/reinforced/clockwork/setDir(direct) if(!made_glow) @@ -749,7 +727,7 @@ GLOBAL_LIST_INIT(wcCommon, pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", /obj/structure/window/reinforced/clockwork/ratvar_act() obj_integrity = max_integrity - update_icon() + update_nearby_icons() /obj/structure/window/reinforced/clockwork/narsie_act() take_damage(rand(25, 75), BRUTE) diff --git a/code/game/shuttle_engines.dm b/code/game/shuttle_engines.dm index 415df5d9dde..3e40186623d 100644 --- a/code/game/shuttle_engines.dm +++ b/code/game/shuttle_engines.dm @@ -11,23 +11,6 @@ M.Turn(rotation) transform = M -/obj/structure/shuttle/window - name = "shuttle window" - icon = 'icons/obj/podwindows.dmi' - icon_state = "1" - density = 1 - opacity = 0 - anchored = 1 - -/obj/structure/shuttle/window/CanPass(atom/movable/mover, turf/target, height) - if(!height) - return 0 - else - return ..() - -/obj/structure/shuttle/window/CanAtmosPass(turf/T) - return !density - /obj/structure/shuttle/engine name = "engine" density = 1 diff --git a/code/game/sound.dm b/code/game/sound.dm index 6882c27df3d..a836aba710f 100644 --- a/code/game/sound.dm +++ b/code/game/sound.dm @@ -1,11 +1,56 @@ -/proc/playsound(atom/source, soundin, vol as num, vary, extrarange as num, falloff, frequency = null, channel = 0, pressure_affected = TRUE, ignore_walls = TRUE) + +///Default override for echo +/sound + echo = list( + 0, // Direct + 0, // DirectHF + -10000, // Room, -10000 means no low frequency sound reverb + -10000, // RoomHF, -10000 means no high frequency sound reverb + 0, // Obstruction + 0, // ObstructionLFRatio + 0, // Occlusion + 0.25, // OcclusionLFRatio + 1.5, // OcclusionRoomRatio + 1.0, // OcclusionDirectRatio + 0, // Exclusion + 1.0, // ExclusionLFRatio + 0, // OutsideVolumeHF + 0, // DopplerFactor + 0, // RolloffFactor + 0, // RoomRolloffFactor + 1.0, // AirAbsorptionFactor + 0, // Flags (1 = Auto Direct, 2 = Auto Room, 4 = Auto RoomHF) + ) + environment = SOUND_ENVIRONMENT_NONE //Default to none so sounds without overrides dont get reverb + +/*! playsound + +playsound is a proc used to play a 3D sound in a specific range. This uses SOUND_RANGE + extra_range to determine that. + +source - Origin of sound +soundin - Either a file, or a string that can be used to get an SFX +vol - The volume of the sound, excluding falloff and pressure affection. +vary - bool that determines if the sound changes pitch every time it plays +extrarange - modifier for sound range. This gets added on top of SOUND_RANGE +falloff_exponent - Rate of falloff for the audio. Higher means quicker drop to low volume. Should generally be over 1 to indicate a quick dive to 0 rather than a slow dive. +frequency - playback speed of audio +channel - The channel the sound is played at +pressure_affected - Whether or not difference in pressure affects the sound (E.g. if you can hear in space) +ignore_walls - Whether or not the sound can pass through walls. +falloff_distance - Distance at which falloff begins. Sound is at peak volume (in regards to falloff) aslong as it is in this range. + +*/ + +/proc/playsound(atom/source, soundin, vol as num, vary, extrarange as num, falloff_exponent = SOUND_FALLOFF_EXPONENT, frequency = null, channel = 0, pressure_affected = TRUE, ignore_walls = TRUE, falloff_distance = SOUND_DEFAULT_FALLOFF_DISTANCE, use_reverb = TRUE) if(isarea(source)) error("[source] is an area and is trying to make the sound: [soundin]") return var/turf/turf_source = get_turf(source) + if(!turf_source) return + if(!SSsounds.channel_list) // Not ready yet return @@ -14,10 +59,12 @@ // Looping through the player list has the added bonus of working for mobs inside containers var/sound/S = sound(get_sfx(soundin)) - var/maxdistance = (world.view + extrarange) * 3 + var/maxdistance = SOUND_RANGE + extrarange + var/list/listeners = GLOB.player_list if(!ignore_walls) //these sounds don't carry through walls listeners = listeners & hearers(maxdistance, turf_source) + for(var/P in listeners) var/mob/M = P if(!M || !M.client) @@ -32,9 +79,9 @@ var/distance = get_dist(M, turf_source) if(distance <= maxdistance) - M.playsound_local(turf_source, soundin, vol, vary, frequency, falloff, channel, pressure_affected, S) + M.playsound_local(turf_source, soundin, vol, vary, frequency, falloff_exponent, channel, pressure_affected, S, maxdistance, falloff_distance, 1, use_reverb) -/mob/proc/playsound_local(turf/turf_source, soundin, vol as num, vary, frequency, falloff, channel = 0, pressure_affected = TRUE, sound/S, distance_multiplier = 1) +/mob/proc/playsound_local(turf/turf_source, soundin, vol as num, vary, frequency, falloff_exponent = SOUND_FALLOFF_EXPONENT, channel = 0, pressure_affected = TRUE, sound/S, max_distance, falloff_distance = SOUND_DEFAULT_FALLOFF_DISTANCE, distance_multiplier = 1, use_reverb = TRUE) if(!client || !can_hear()) return @@ -45,6 +92,9 @@ S.channel = channel || SSsounds.random_available_channel() S.volume = vol + if(channel) + S.volume *= client.prefs.get_channel_volume(channel) + if(vary) if(frequency) S.frequency = frequency @@ -56,9 +106,12 @@ //sound volume falloff with distance var/distance = get_dist(T, turf_source) + distance *= distance_multiplier - S.volume -= max(distance - world.view, 0) * 2 //multiplicative falloff to add on top of natural audio falloff. + if(max_distance) //If theres no max_distance we're not a 3D sound, so no falloff. + S.volume -= (max(distance - falloff_distance, 0) ** (1 / falloff_exponent)) / ((max(max_distance, distance) - falloff_distance) ** (1 / falloff_exponent)) * S.volume + //https://www.desmos.com/calculator/sqdfl8ipgf if(pressure_affected) //Atmosphere affects sound @@ -88,17 +141,33 @@ S.z = dz * distance_multiplier // The y value is for above your head, but there is no ceiling in 2d spessmens. S.y = 1 - S.falloff = (falloff ? falloff : FALLOFF_SOUNDS) + + S.falloff = max_distance || 1 //use max_distance, else just use 1 as we are a direct sound so falloff isnt relevant. + + // Sounds can't have their own environment. A sound's environment will be: + // 1. the mob's + // 2. the area's (defaults to SOUND_ENVRIONMENT_NONE) + if(sound_environment_override != SOUND_ENVIRONMENT_NONE) + S.environment = sound_environment_override + else + var/area/A = get_area(src) + S.environment = A.sound_environment + + if(use_reverb && S.environment != SOUND_ENVIRONMENT_NONE) //We have reverb, reset our echo setting + // Check that the user has reverb enabled in their prefs + if(!(client?.prefs?.toggles2 & PREFTOGGLE_2_REVERB_DISABLE)) + S.echo[3] = 0 //Room setting, 0 means normal reverb + S.echo[4] = 0 //RoomHF setting, 0 means normal reverb. SEND_SOUND(src, S) -/proc/sound_to_playing_players(soundin, volume = 100, vary = FALSE, frequency = 0, falloff = FALSE, channel = 0, pressure_affected = FALSE, sound/S) +/proc/sound_to_playing_players(soundin, volume = 100, vary = FALSE, frequency = 0, channel = 0, pressure_affected = FALSE, sound/S) if(!S) S = sound(get_sfx(soundin)) for(var/m in GLOB.player_list) if(ismob(m) && !isnewplayer(m)) var/mob/M = m - M.playsound_local(M, null, volume, vary, frequency, falloff, channel, pressure_affected, S) + M.playsound_local(M, null, volume, vary, frequency, null, channel, pressure_affected, S) /mob/proc/stop_sound_channel(chan) SEND_SOUND(src, sound(null, repeat = 0, wait = 0, channel = chan)) @@ -112,7 +181,7 @@ if(!SSticker || !SSticker.login_music || config.disable_lobby_music) return if(prefs.sound & SOUND_LOBBY) - SEND_SOUND(src, sound(SSticker.login_music, repeat = 0, wait = 0, volume = 85, channel = CHANNEL_LOBBYMUSIC)) // MAD JAMS + SEND_SOUND(src, sound(SSticker.login_music, repeat = 0, wait = 0, volume = 85 * prefs.get_channel_volume(CHANNEL_LOBBYMUSIC), channel = CHANNEL_LOBBYMUSIC)) // MAD JAMS /proc/get_rand_frequency() return rand(32000, 55000) //Frequency stuff only works with 45kbps oggs. @@ -124,6 +193,10 @@ soundin = pick('sound/effects/glassbr1.ogg','sound/effects/glassbr2.ogg','sound/effects/glassbr3.ogg') if("explosion") soundin = pick('sound/effects/explosion1.ogg','sound/effects/explosion2.ogg') + if("explosion_creaking") + soundin = pick('sound/effects/explosioncreak1.ogg', 'sound/effects/explosioncreak2.ogg') + if("hull_creaking") + soundin = pick('sound/effects/creak1.ogg', 'sound/effects/creak2.ogg', 'sound/effects/creak3.ogg') if("sparks") soundin = pick('sound/effects/sparks1.ogg','sound/effects/sparks2.ogg','sound/effects/sparks3.ogg','sound/effects/sparks4.ogg') if("rustle") @@ -132,10 +205,6 @@ soundin = pick('sound/effects/bodyfall1.ogg','sound/effects/bodyfall2.ogg','sound/effects/bodyfall3.ogg','sound/effects/bodyfall4.ogg') if("punch") soundin = pick('sound/weapons/punch1.ogg','sound/weapons/punch2.ogg','sound/weapons/punch3.ogg','sound/weapons/punch4.ogg') - if("clownstep") - soundin = pick('sound/effects/clownstep1.ogg','sound/effects/clownstep2.ogg') - if("jackboot") - soundin = pick('sound/effects/jackboot1.ogg','sound/effects/jackboot2.ogg') if("swing_hit") soundin = pick('sound/weapons/genhit1.ogg', 'sound/weapons/genhit2.ogg', 'sound/weapons/genhit3.ogg') if("hiss") @@ -161,4 +230,8 @@ soundin = pick('sound/effects/bone_break_1.ogg', 'sound/effects/bone_break_2.ogg', 'sound/effects/bone_break_3.ogg', 'sound/effects/bone_break_4.ogg', 'sound/effects/bone_break_5.ogg', 'sound/effects/bone_break_6.ogg') if("honkbot_e") soundin = pick('sound/items/bikehorn.ogg', 'sound/items/AirHorn2.ogg', 'sound/misc/sadtrombone.ogg', 'sound/items/AirHorn.ogg', 'sound/items/WEEOO1.ogg', 'sound/voice/biamthelaw.ogg', 'sound/voice/bcreep.ogg','sound/magic/Fireball.ogg' ,'sound/effects/pray.ogg', 'sound/voice/hiss1.ogg','sound/machines/buzz-sigh.ogg', 'sound/machines/ping.ogg', 'sound/weapons/flashbang.ogg', 'sound/weapons/bladeslice.ogg') + if("smcalm") + soundin = pick('sound/machines/sm/accent/normal/1.ogg', 'sound/machines/sm/accent/normal/2.ogg', 'sound/machines/sm/accent/normal/3.ogg', 'sound/machines/sm/accent/normal/4.ogg', 'sound/machines/sm/accent/normal/5.ogg', 'sound/machines/sm/accent/normal/6.ogg', 'sound/machines/sm/accent/normal/7.ogg', 'sound/machines/sm/accent/normal/8.ogg', 'sound/machines/sm/accent/normal/9.ogg', 'sound/machines/sm/accent/normal/10.ogg', 'sound/machines/sm/accent/normal/11.ogg', 'sound/machines/sm/accent/normal/12.ogg', 'sound/machines/sm/accent/normal/13.ogg', 'sound/machines/sm/accent/normal/14.ogg', 'sound/machines/sm/accent/normal/15.ogg', 'sound/machines/sm/accent/normal/16.ogg', 'sound/machines/sm/accent/normal/17.ogg', 'sound/machines/sm/accent/normal/18.ogg', 'sound/machines/sm/accent/normal/19.ogg', 'sound/machines/sm/accent/normal/20.ogg', 'sound/machines/sm/accent/normal/21.ogg', 'sound/machines/sm/accent/normal/22.ogg', 'sound/machines/sm/accent/normal/23.ogg', 'sound/machines/sm/accent/normal/24.ogg', 'sound/machines/sm/accent/normal/25.ogg', 'sound/machines/sm/accent/normal/26.ogg', 'sound/machines/sm/accent/normal/27.ogg', 'sound/machines/sm/accent/normal/28.ogg', 'sound/machines/sm/accent/normal/29.ogg', 'sound/machines/sm/accent/normal/30.ogg', 'sound/machines/sm/accent/normal/31.ogg', 'sound/machines/sm/accent/normal/32.ogg', 'sound/machines/sm/accent/normal/33.ogg') + if("smdelam") + soundin = pick('sound/machines/sm/accent/delam/1.ogg', 'sound/machines/sm/accent/normal/2.ogg', 'sound/machines/sm/accent/normal/3.ogg', 'sound/machines/sm/accent/normal/4.ogg', 'sound/machines/sm/accent/normal/5.ogg', 'sound/machines/sm/accent/normal/6.ogg', 'sound/machines/sm/accent/normal/7.ogg', 'sound/machines/sm/accent/normal/8.ogg', 'sound/machines/sm/accent/normal/9.ogg', 'sound/machines/sm/accent/normal/10.ogg', 'sound/machines/sm/accent/normal/11.ogg', 'sound/machines/sm/accent/normal/12.ogg', 'sound/machines/sm/accent/normal/13.ogg', 'sound/machines/sm/accent/normal/14.ogg', 'sound/machines/sm/accent/normal/15.ogg', 'sound/machines/sm/accent/normal/16.ogg', 'sound/machines/sm/accent/normal/17.ogg', 'sound/machines/sm/accent/normal/18.ogg', 'sound/machines/sm/accent/normal/19.ogg', 'sound/machines/sm/accent/normal/20.ogg', 'sound/machines/sm/accent/normal/21.ogg', 'sound/machines/sm/accent/normal/22.ogg', 'sound/machines/sm/accent/normal/23.ogg', 'sound/machines/sm/accent/normal/24.ogg', 'sound/machines/sm/accent/normal/25.ogg', 'sound/machines/sm/accent/normal/26.ogg', 'sound/machines/sm/accent/normal/27.ogg', 'sound/machines/sm/accent/normal/28.ogg', 'sound/machines/sm/accent/normal/29.ogg', 'sound/machines/sm/accent/normal/30.ogg', 'sound/machines/sm/accent/normal/31.ogg', 'sound/machines/sm/accent/normal/32.ogg', 'sound/machines/sm/accent/normal/33.ogg') return soundin diff --git a/code/game/turfs/simulated/floor.dm b/code/game/turfs/simulated/floor.dm index 614b8232b0b..3ba2e638099 100644 --- a/code/game/turfs/simulated/floor.dm +++ b/code/game/turfs/simulated/floor.dm @@ -31,6 +31,11 @@ GLOBAL_LIST_INIT(icons_to_ignore_at_floor_init, list("damaged1","damaged2","dama var/list/burnt_states = list("floorscorched1", "floorscorched2") var/list/prying_tool_list = list(TOOL_CROWBAR) //What tool/s can we use to pry up the tile? + var/footstep = FOOTSTEP_FLOOR + var/barefootstep = FOOTSTEP_HARD_BAREFOOT + var/clawfootstep = FOOTSTEP_HARD_CLAW + var/heavyfootstep = FOOTSTEP_GENERIC_HEAVY + /turf/simulated/floor/Initialize(mapload) . = ..() if(icon_state in GLOB.icons_to_ignore_at_floor_init) //so damaged/burned tiles or plating icons aren't saved as the default diff --git a/code/game/turfs/simulated/floor/asteroid.dm b/code/game/turfs/simulated/floor/asteroid.dm index d912e183aec..4e337008830 100644 --- a/code/game/turfs/simulated/floor/asteroid.dm +++ b/code/game/turfs/simulated/floor/asteroid.dm @@ -7,7 +7,10 @@ baseturf = /turf/simulated/floor/plating/asteroid icon_state = "asteroid" icon_plating = "asteroid" - footstep_sounds = list() + footstep = FOOTSTEP_SAND + barefootstep = FOOTSTEP_SAND + clawfootstep = FOOTSTEP_SAND + heavyfootstep = FOOTSTEP_GENERIC_HEAVY var/environment_type = "asteroid" var/turf_type = /turf/simulated/floor/plating/asteroid //Because caves do whacky shit to revert to normal var/floor_variance = 20 //probability floor has a different icon state diff --git a/code/game/turfs/simulated/floor/chasm.dm b/code/game/turfs/simulated/floor/chasm.dm index 26921ba9ffd..7c1464b92a4 100644 --- a/code/game/turfs/simulated/floor/chasm.dm +++ b/code/game/turfs/simulated/floor/chasm.dm @@ -131,10 +131,6 @@ drop_x = x drop_y = y drop_z = z - 1 - var/turf/T = locate(drop_x, drop_y, drop_z) - if(T) - T.visible_message("The ceiling gives way!") - playsound(T, 'sound/effects/break_stone.ogg', 50, 1) /turf/simulated/floor/chasm/straight_down/lava_land_surface oxygen = 14 diff --git a/code/game/turfs/simulated/floor/fancy_floor.dm b/code/game/turfs/simulated/floor/fancy_floor.dm index bfbfa70331e..0b8938fc204 100644 --- a/code/game/turfs/simulated/floor/fancy_floor.dm +++ b/code/game/turfs/simulated/floor/fancy_floor.dm @@ -3,11 +3,10 @@ floor_tile = /obj/item/stack/tile/wood prying_tool_list = list(TOOL_SCREWDRIVER) broken_states = list("wood-broken", "wood-broken2", "wood-broken3", "wood-broken4", "wood-broken5", "wood-broken6", "wood-broken7") - - footstep_sounds = list( - "human" = list('sound/effects/footstep/wood_all.ogg'), //@RonaldVanWonderen of Freesound.org - "xeno" = list('sound/effects/footstep/wood_all.ogg') //@RonaldVanWonderen of Freesound.org - ) + footstep = FOOTSTEP_WOOD + barefootstep = FOOTSTEP_WOOD_BAREFOOT + clawfootstep = FOOTSTEP_WOOD_CLAW + heavyfootstep = FOOTSTEP_GENERIC_HEAVY /turf/simulated/floor/wood/screwdriver_act(mob/user, obj/item/I) . = TRUE @@ -48,6 +47,10 @@ icon_state = "grass1" floor_tile = /obj/item/stack/tile/grass broken_states = list("sand") + footstep = FOOTSTEP_GRASS + barefootstep = FOOTSTEP_GRASS + clawfootstep = FOOTSTEP_GRASS + heavyfootstep = FOOTSTEP_GENERIC_HEAVY /turf/simulated/floor/grass/Initialize(mapload) . = ..() @@ -73,12 +76,10 @@ broken_states = list("damaged") smooth = SMOOTH_TRUE canSmoothWith = null - - footstep_sounds = list( - "human" = list('sound/effects/footstep/carpet_human.ogg'), - "xeno" = list('sound/effects/footstep/carpet_xeno.ogg') - ) - + footstep = FOOTSTEP_CARPET + barefootstep = FOOTSTEP_CARPET_BAREFOOT + clawfootstep = FOOTSTEP_CARPET_BAREFOOT + heavyfootstep = FOOTSTEP_GENERIC_HEAVY /turf/simulated/floor/carpet/Initialize(mapload) . = ..() diff --git a/code/game/turfs/simulated/floor/indestructible.dm b/code/game/turfs/simulated/floor/indestructible.dm index 4f551fb485a..cd7abaeb188 100644 --- a/code/game/turfs/simulated/floor/indestructible.dm +++ b/code/game/turfs/simulated/floor/indestructible.dm @@ -46,6 +46,10 @@ nitrogen = 23 temperature = 300 planetary_atmos = TRUE + footstep = FOOTSTEP_LAVA + barefootstep = FOOTSTEP_LAVA + clawfootstep = FOOTSTEP_LAVA + heavyfootstep = FOOTSTEP_LAVA /turf/simulated/floor/indestructible/necropolis/Initialize(mapload) . = ..() diff --git a/code/game/turfs/simulated/floor/lava.dm b/code/game/turfs/simulated/floor/lava.dm index 14a08639132..29485f4a808 100644 --- a/code/game/turfs/simulated/floor/lava.dm +++ b/code/game/turfs/simulated/floor/lava.dm @@ -7,6 +7,10 @@ light_range = 2 light_power = 0.75 light_color = LIGHT_COLOR_LAVA + footstep = FOOTSTEP_LAVA + barefootstep = FOOTSTEP_LAVA + clawfootstep = FOOTSTEP_LAVA + heavyfootstep = FOOTSTEP_LAVA /turf/simulated/floor/plating/lava/ex_act() return diff --git a/code/game/turfs/simulated/floor/mineral.dm b/code/game/turfs/simulated/floor/mineral.dm index dd975dc80d9..6ab388fd3c5 100644 --- a/code/game/turfs/simulated/floor/mineral.dm +++ b/code/game/turfs/simulated/floor/mineral.dm @@ -144,6 +144,11 @@ /turf/simulated/floor/mineral/plastitanium/red/brig name = "brig floor" +/turf/simulated/floor/mineral/plastitanium/red/nitrogen + oxygen = 0 + nitrogen = MOLES_N2STANDARD + MOLES_O2STANDARD + + //BANANIUM /turf/simulated/floor/mineral/bananium name = "bananium floor" @@ -200,8 +205,10 @@ name = "silent floor" icon_state = "tranquillite" floor_tile = /obj/item/stack/tile/mineral/tranquillite - shoe_running_volume = 0 - shoe_walking_volume = 0 + footstep = null + barefootstep = null + clawfootstep = null + heavyfootstep = null //DIAMOND /turf/simulated/floor/mineral/diamond @@ -237,15 +244,13 @@ /turf/simulated/floor/mineral/uranium/proc/radiate() if(!active) - if(world.time > last_event+15) - active = 1 - for(var/mob/living/L in range(3,src)) - L.apply_effect(1,IRRADIATE,0) - for(var/turf/simulated/floor/mineral/uranium/T in orange(1,src)) + if(world.time > last_event + 15) + active = TRUE + radiation_pulse(src, 10) + for(var/turf/simulated/floor/mineral/uranium/T in orange(1, src)) T.radiate() last_event = world.time - active = 0 - return + active = FALSE // ALIEN ALLOY /turf/simulated/floor/mineral/abductor diff --git a/code/game/turfs/simulated/floor/misc_floor.dm b/code/game/turfs/simulated/floor/misc_floor.dm index 0808fef7e95..2876378eb06 100644 --- a/code/game/turfs/simulated/floor/misc_floor.dm +++ b/code/game/turfs/simulated/floor/misc_floor.dm @@ -42,6 +42,10 @@ /turf/simulated/floor/beach name = "beach" icon = 'icons/misc/beach.dmi' + footstep = FOOTSTEP_SAND + barefootstep = FOOTSTEP_SAND + clawfootstep = FOOTSTEP_SAND + heavyfootstep = FOOTSTEP_GENERIC_HEAVY /turf/simulated/floor/beach/pry_tile(obj/item/C, mob/user, silent = FALSE) return @@ -49,26 +53,47 @@ /turf/simulated/floor/beach/sand name = "sand" icon_state = "sand" + baseturf = /turf/simulated/floor/beach/sand /turf/simulated/floor/beach/coastline name = "coastline" icon = 'icons/misc/beach2.dmi' icon_state = "sandwater" + baseturf = /turf/simulated/floor/beach/coastline + footstep = FOOTSTEP_WATER + barefootstep = FOOTSTEP_WATER + clawfootstep = FOOTSTEP_WATER + heavyfootstep = FOOTSTEP_WATER /turf/simulated/floor/beach/coastline_t name = "coastline" desc = "Tide's high tonight. Charge your batons." icon_state = "sandwater_t" + baseturf = /turf/simulated/floor/beach/coastline_t + footstep = FOOTSTEP_WATER + barefootstep = FOOTSTEP_WATER + clawfootstep = FOOTSTEP_WATER + heavyfootstep = FOOTSTEP_WATER /turf/simulated/floor/beach/coastline_b name = "coastline" icon_state = "sandwater_b" + baseturf = /turf/simulated/floor/beach/coastline_b + footstep = FOOTSTEP_WATER + barefootstep = FOOTSTEP_WATER + clawfootstep = FOOTSTEP_WATER + heavyfootstep = FOOTSTEP_WATER /turf/simulated/floor/beach/water // TODO - Refactor water so they share the same parent type - Or alternatively component something like that name = "water" icon_state = "water" mouse_opacity = MOUSE_OPACITY_TRANSPARENT var/obj/machinery/poolcontroller/linkedcontroller = null + baseturf = /turf/simulated/floor/beach/water + footstep = FOOTSTEP_WATER + barefootstep = FOOTSTEP_WATER + clawfootstep = FOOTSTEP_WATER + heavyfootstep = FOOTSTEP_WATER /turf/simulated/floor/beach/water/Initialize(mapload) . = ..() diff --git a/code/game/turfs/simulated/floor/plasteel_floor.dm b/code/game/turfs/simulated/floor/plasteel_floor.dm index 116d57dc1ef..1b69d502abd 100644 --- a/code/game/turfs/simulated/floor/plasteel_floor.dm +++ b/code/game/turfs/simulated/floor/plasteel_floor.dm @@ -46,6 +46,10 @@ oxygen = 0 temperature = 80 +/turf/simulated/floor/plasteel/dark/nitrogen + nitrogen = 100 + oxygen = 0 + /turf/simulated/floor/plasteel/freezer icon_state = "freezerfloor" diff --git a/code/game/turfs/simulated/floor/plating.dm b/code/game/turfs/simulated/floor/plating.dm index a6dbe0de281..94d95c2af86 100644 --- a/code/game/turfs/simulated/floor/plating.dm +++ b/code/game/turfs/simulated/floor/plating.dm @@ -6,13 +6,11 @@ floor_tile = null broken_states = list("damaged1", "damaged2", "damaged3", "damaged4", "damaged5") burnt_states = list("floorscorched1", "floorscorched2") - var/unfastened = FALSE - - footstep_sounds = list( - "human" = list('sound/effects/footstep/plating_human.ogg'), - "xeno" = list('sound/effects/footstep/plating_xeno.ogg') - ) + footstep = FOOTSTEP_PLATING + barefootstep = FOOTSTEP_HARD_BAREFOOT + clawfootstep = FOOTSTEP_HARD_CLAW + heavyfootstep = FOOTSTEP_GENERIC_HEAVY /turf/simulated/floor/plating/Initialize(mapload) . = ..() @@ -125,9 +123,12 @@ name = "reinforced floor" icon_state = "engine" thermal_conductivity = 0.025 - var/insulated heat_capacity = 325000 floor_tile = /obj/item/stack/rods + footstep = FOOTSTEP_PLATING + barefootstep = FOOTSTEP_HARD_BAREFOOT + clawfootstep = FOOTSTEP_HARD_CLAW + heavyfootstep = FOOTSTEP_GENERIC_HEAVY /turf/simulated/floor/engine/break_tile() return //unbreakable @@ -161,18 +162,6 @@ return new /obj/item/stack/rods(src, 2) ChangeTurf(/turf/simulated/floor/plating) - return - - if(istype(C, /obj/item/stack/sheet/plasteel) && !insulated) //Insulating the floor - to_chat(user, "You begin insulating [src]...") - if(do_after(user, 40, target = src) && !insulated) //You finish insulating the insulated insulated insulated insulated insulated insulated insulated insulated vacuum floor - to_chat(user, "You finish insulating [src].") - var/obj/item/stack/sheet/plasteel/W = C - W.use(1) - thermal_conductivity = 0 - insulated = 1 - name = "insulated " + name - return /turf/simulated/floor/engine/ex_act(severity) switch(severity) @@ -258,18 +247,6 @@ nitrogen = 0 temperature = TCMB -/turf/simulated/floor/engine/insulated - name = "insulated reinforced floor" - icon_state = "engine" - insulated = 1 - thermal_conductivity = 0 - -/turf/simulated/floor/engine/insulated/vacuum - name = "insulated vacuum floor" - icon_state = "engine" - oxygen = 0 - nitrogen = 0 - /turf/simulated/floor/plating/ironsand name = "Iron Sand" icon = 'icons/turf/floors/ironsand.dmi' @@ -286,6 +263,10 @@ name = "snow" icon = 'icons/turf/snow.dmi' icon_state = "snow" + footstep = FOOTSTEP_SAND + barefootstep = FOOTSTEP_SAND + clawfootstep = FOOTSTEP_SAND + heavyfootstep = FOOTSTEP_GENERIC_HEAVY /turf/simulated/floor/plating/snow/ex_act(severity) return @@ -297,6 +278,10 @@ name = "snow" icon = 'icons/turf/snow.dmi' icon_state = "snow" + footstep = FOOTSTEP_SAND + barefootstep = FOOTSTEP_SAND + clawfootstep = FOOTSTEP_SAND + heavyfootstep = FOOTSTEP_GENERIC_HEAVY /turf/simulated/floor/snow/ex_act(severity) return @@ -320,7 +305,7 @@ if(MFOAM_IRON) icon_state = "ironfoam" -/turf/simulated/floor/plating/metalfoam/attackby(var/obj/item/C, mob/user, params) +/turf/simulated/floor/plating/metalfoam/attackby(obj/item/C, mob/user, params) if(..()) return TRUE @@ -357,11 +342,12 @@ /turf/simulated/floor/plating/abductor name = "alien floor" + icon = 'icons/turf/floors.dmi' icon_state = "alienpod1" /turf/simulated/floor/plating/abductor/Initialize(mapload) . = ..() - icon_state = "alienpod[rand(1,9)]" + icon_state = "alienpod[rand(1, 9)]" /turf/simulated/floor/plating/ice name = "ice sheet" @@ -387,3 +373,7 @@ icon_state = "smooth" smooth = SMOOTH_MORE | SMOOTH_BORDER canSmoothWith = list(/turf/simulated/floor/plating/ice/smooth, /turf/simulated/floor/plating/ice) + +/turf/simulated/floor/plating/nitrogen + oxygen = 0 + nitrogen = MOLES_N2STANDARD + MOLES_O2STANDARD diff --git a/code/game/turfs/simulated/minerals.dm b/code/game/turfs/simulated/minerals.dm index f528483db5c..d2109bee2f0 100644 --- a/code/game/turfs/simulated/minerals.dm +++ b/code/game/turfs/simulated/minerals.dm @@ -11,6 +11,8 @@ opacity = 1 density = TRUE blocks_air = TRUE + flags_2 = RAD_PROTECT_CONTENTS_2 | RAD_NO_CONTAMINATE_2 + rad_insulation = RAD_MEDIUM_INSULATION layer = EDGED_TURF_LAYER temperature = TCMB var/environment_type = "asteroid" @@ -18,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 @@ -476,7 +478,7 @@ det_time = 0 visible_message("The chain reaction was stopped! The gibtonite had [det_time] reactions left till the explosion!") -/turf/simulated/mineral/gibtonite/gets_drilled(var/mob/user, triggered_by_explosion = 0) +/turf/simulated/mineral/gibtonite/gets_drilled(mob/user, triggered_by_explosion = 0) if(stage == GIBTONITE_UNSTRUCK && mineralAmt >= 1) //Gibtonite deposit is activated playsound(src,'sound/effects/hit_on_shattered_glass.ogg', 50, TRUE) explosive_reaction(user, triggered_by_explosion) diff --git a/code/game/turfs/simulated/river.dm b/code/game/turfs/simulated/river.dm index f463f3fb564..39e4a8fc051 100644 --- a/code/game/turfs/simulated/river.dm +++ b/code/game/turfs/simulated/river.dm @@ -75,7 +75,7 @@ for(var/F in RANGE_TURFS(1, src) - src) var/turf/T = F var/area/new_area = get_area(T) - if(!T || (T.density && !ismineralturf(T)) || istype(T, /turf/unsimulated) || (whitelisted_area && !istype(new_area, whitelisted_area)) || (T.flags & NO_LAVA_GEN) ) + if(!T || (T.density && !ismineralturf(T)) || istype(T, /turf/simulated/floor/indestructible) || (whitelisted_area && !istype(new_area, whitelisted_area)) || (T.flags & NO_LAVA_GEN) ) continue if(!logged_turf_type && ismineralturf(T)) diff --git a/code/game/turfs/simulated/shuttle.dm b/code/game/turfs/simulated/shuttle.dm deleted file mode 100644 index 7a781679173..00000000000 --- a/code/game/turfs/simulated/shuttle.dm +++ /dev/null @@ -1,72 +0,0 @@ -/turf/simulated/shuttle - name = "shuttle" - icon = 'icons/turf/shuttle.dmi' - thermal_conductivity = 0.05 - heat_capacity = 0 - layer = 2 - -/turf/simulated/shuttle/wall - name = "wall" - icon_state = "wall1" - opacity = 1 - density = 1 - blocks_air = 1 - -/turf/simulated/shuttle/rpd_act(mob/user, obj/item/rpd/our_rpd) - if(our_rpd.mode == RPD_DELETE_MODE)//No pipes on shuttles - our_rpd.delete_all_pipes(user, src) - -/turf/simulated/shuttle/narsie_act() - if(prob(20)) - ChangeTurf(/turf/simulated/wall/cult) - -//sub-type to be used for interior shuttle walls -//won't get an underlay of the destination turf on shuttle move -/turf/simulated/shuttle/wall/interior/copyTurf(turf/T) - if(T.type != type) - T.ChangeTurf(type) - if(underlays.len) - T.underlays = underlays - if(T.icon_state != icon_state) - T.icon_state = icon_state - if(T.icon != icon) - T.icon = icon - if(T.color != color) - T.color = color - if(T.dir != dir) - T.dir = dir - T.transform = transform - return T - -/turf/simulated/shuttle/wall/copyTurf(turf/T) - . = ..() - T.transform = transform - -//why don't shuttle walls habe smoothwall? now i gotta do rotation the dirty way -/turf/simulated/shuttle/shuttleRotate(rotation) - ..() - var/matrix/M = transform - M.Turn(rotation) - transform = M - -/turf/simulated/shuttle/floor - name = "floor" - icon_state = "floor" - -/turf/simulated/shuttle/plating - name = "plating" - icon = 'icons/turf/floors.dmi' - icon_state = "plating" - -/turf/simulated/shuttle/plating/vox //Vox skipjack plating - oxygen = 0 - nitrogen = MOLES_N2STANDARD + MOLES_O2STANDARD - -/turf/simulated/shuttle/floor4 // Added this floor tile so that I have a seperate turf to check in the shuttle -- Polymorph - name = "brig floor" // Also added it into the 2x3 brig area of the shuttle. - icon_state = "floor4" - -/turf/simulated/shuttle/floor4/vox //Vox skipjack floors - name = "skipjack floor" - oxygen = 0 - nitrogen = MOLES_N2STANDARD + MOLES_O2STANDARD diff --git a/code/game/turfs/simulated/walls.dm b/code/game/turfs/simulated/walls.dm index 23d0c9789bd..1eb89e6a238 100644 --- a/code/game/turfs/simulated/walls.dm +++ b/code/game/turfs/simulated/walls.dm @@ -4,10 +4,10 @@ /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 = 0 + var/rotting = FALSE var/damage = 0 var/damage_cap = 100 //Wall will break down to girders if damage reaches this point @@ -15,19 +15,20 @@ var/damage_overlay var/global/damage_overlays[8] - var/max_temperature = 1800 //K, walls will take damage if they're next to a fire hotter than this - opacity = 1 density = 1 blocks_air = 1 explosion_block = 1 + flags_2 = RAD_PROTECT_CONTENTS_2 | RAD_NO_CONTAMINATE_2 + rad_insulation = RAD_MEDIUM_INSULATION + thermal_conductivity = WALL_HEAT_TRANSFER_COEFFICIENT heat_capacity = 312500 //a little over 5 cm thick , 312500 for 1 m by 2.5 m by 0.25 m plasteel wall var/can_dismantle_with_welder = TRUE var/hardness = 40 //lower numbers are harder. Used to determine the probability of a hulk smashing through. - var/slicing_duration = 100 + var/slicing_duration = 10 SECONDS var/engraving //engraving on the wall var/engraving_quality var/list/dent_decals @@ -41,8 +42,7 @@ /obj/structure/falsewall, /obj/structure/falsewall/reinforced, /turf/simulated/wall/rust, - /turf/simulated/wall/r_wall/rust, - /turf/simulated/wall/r_wall/coated) + /turf/simulated/wall/r_wall/rust) smooth = SMOOTH_TRUE /turf/simulated/wall/BeforeChange() @@ -51,7 +51,7 @@ . = ..() //Appearance -/turf/simulated/wall/examine(mob/user) +/turf/simulated/wall/examine(mob/user) //If you change this, consider changing the examine_status proc of false walls to match . = ..() if(!damage) @@ -76,7 +76,7 @@ if(!damage) if(damage_overlay) overlays -= damage_overlays[damage_overlay] - damage_overlay = 0 + damage_overlay = null return var/overlay = round(damage / damage_cap * damage_overlays.len) + 1 @@ -117,12 +117,6 @@ else update_icon() - return - -/turf/simulated/wall/proc/adjacent_fire_act(turf/simulated/wall, radiated_temperature) - if(radiated_temperature > max_temperature) - take_damage(rand(10, 20) * (radiated_temperature / max_temperature)) - /turf/simulated/wall/handle_ricochet(obj/item/projectile/P) //A huge pile of shitcode! var/turf/p_turf = get_turf(P) var/face_direction = get_dir(src, p_turf) @@ -336,38 +330,38 @@ to_chat(user, "You burn off the fungi with [I].") return - if(!I.tool_use_check(user, 0)) //Wall repair stuff + // Wall repair stuff + if(!I.tool_use_check(user, 0)) return - var/time_required = slicing_duration - var/intention - if(can_dismantle_with_welder) - intention = "Dismantle" - if(damage || LAZYLEN(dent_decals)) - intention = "Repair" + var/repairing + var/time + if(user.a_intent == INTENT_HARM) // Harm intent if(can_dismantle_with_welder) - var/moved_away = user.loc - intention = alert(user, "Would you like to repair or dismantle [src]?", "[src]", "Repair", "Dismantle") - if(user.loc != moved_away) - to_chat(user, "Stay still while doing this!") - return - if(intention == "Repair") - time_required = max(5, damage / 5) - if(!intention) - return - if(intention == "Dismantle") - WELDER_ATTEMPT_SLICING_MESSAGE - else - WELDER_ATTEMPT_REPAIR_MESSAGE - if(I.use_tool(src, user, time_required, volume = I.tool_volume)) - if(intention == "Dismantle") - WELDER_SLICING_SUCCESS_MESSAGE - dismantle_wall() + repairing = FALSE + time = slicing_duration + WELDER_ATTEMPT_SLICING_MESSAGE else + return + + else // Any other intents + if(damage || LAZYLEN(dent_decals)) + repairing = TRUE + time = max(5, damage / 5) + WELDER_ATTEMPT_REPAIR_MESSAGE + else + to_chat(user, "[src] doesn't need repairing.") + return + + if(I.use_tool(src, user, time, volume = I.tool_volume)) + if(repairing) WELDER_REPAIR_SUCCESS_MESSAGE cut_overlay(dent_decals) - dent_decals?.Cut() + dent_decals?.Cut() // I feel like this isn't needed but it can't hurt to keep it in anyway take_damage(-damage) + else + WELDER_SLICING_SUCCESS_MESSAGE + dismantle_wall() /turf/simulated/wall/proc/try_rot(obj/item/I, mob/user, params) if((!is_sharp(I) && I.force >= 10) || I.force >= 20) diff --git a/code/game/turfs/simulated/walls_indestructible.dm b/code/game/turfs/simulated/walls_indestructible.dm index 6bb3cb9c22a..56feb811745 100644 --- a/code/game/turfs/simulated/walls_indestructible.dm +++ b/code/game/turfs/simulated/walls_indestructible.dm @@ -1,4 +1,7 @@ /turf/simulated/wall/indestructible + name = "wall" + desc = "Effectively impervious to conventional methods of destruction." + explosion_block = 50 /turf/simulated/wall/indestructible/dismantle_wall(devastated = 0, explode = 0) return @@ -50,7 +53,6 @@ desc = "A seemingly impenetrable wall." icon = 'icons/turf/walls.dmi' icon_state = "necro" - explosion_block = 50 baseturf = /turf/simulated/wall/indestructible/necropolis /turf/simulated/wall/indestructible/boss @@ -59,7 +61,6 @@ icon = 'icons/turf/walls/boss_wall.dmi' icon_state = "wall" canSmoothWith = list(/turf/simulated/wall/indestructible/boss, /turf/simulated/wall/indestructible/boss/see_through) - explosion_block = 50 baseturf = /turf/simulated/floor/plating/asteroid/basalt smooth = SMOOTH_TRUE @@ -73,6 +74,92 @@ icon_state = "wall" smooth = SMOOTH_TRUE +/turf/simulated/wall/indestructible/sandstone + icon = 'icons/turf/walls/sandstone_wall.dmi' + icon_state = "sandstone" + canSmoothWith = list(/turf/simulated/wall/mineral/sandstone, /turf/simulated/wall/indestructible/sandstone, /obj/structure/falsewall/sandstone) + +/turf/simulated/wall/indestructible/splashscreen + name = "Space Station 13" + icon = 'config/title_screens/images/blank.png' + icon_state = "" + layer = FLY_LAYER + /turf/simulated/wall/indestructible/uranium icon = 'icons/turf/walls/uranium_wall.dmi' icon_state = "uranium" + smooth = SMOOTH_TRUE + canSmoothWith = list(/turf/simulated/wall/mineral/uranium, /obj/structure/falsewall/uranium, /turf/simulated/wall/indestructible/uranium) + +/turf/simulated/wall/indestructible/wood + icon = 'icons/turf/walls/wood_wall.dmi' + icon_state = "wood" + smooth = SMOOTH_TRUE + canSmoothWith = list(/turf/simulated/wall/mineral/wood, /obj/structure/falsewall/wood, /turf/simulated/wall/mineral/wood/nonmetal, /turf/simulated/wall/indestructible/wood) + +/turf/simulated/wall/indestructible/alien + name = "alien wall" + desc = "A wall with alien alloy plating." + icon = 'icons/turf/walls/abductor_wall.dmi' + icon_state = "abductor" + smooth = SMOOTH_TRUE|SMOOTH_DIAGONAL + canSmoothWith = list(/turf/simulated/wall/mineral/abductor, /obj/structure/falsewall/abductor, /turf/simulated/wall/indestructible/alien) + +/turf/simulated/wall/indestructible/abductor + icon = 'icons/turf/walls.dmi' + icon_state = "alien1" + +/turf/simulated/wall/indestructible/fakedoor + name = "CentCom Access" + icon = 'icons/obj/doors/airlocks/centcom/centcom.dmi' + icon_state = "fake_door" + +/turf/simulated/wall/indestructible/fakeglass + name = "window" + icon = 'icons/obj/smooth_structures/reinforced_window.dmi' + icon_state = "fake_window" + opacity = FALSE + smooth = SMOOTH_TRUE + canSmoothWith = list(/obj/structure/window/full/basic, /obj/structure/window/full/reinforced, /obj/structure/window/full/reinforced/tinted, /obj/structure/window/full/plasmabasic, /obj/structure/window/full/plasmareinforced, /turf/simulated/wall/indestructible/fakeglass) + +/turf/simulated/wall/indestructible/fakeglass/Initialize(mapload) + . = ..() + icon_state = null + underlays += mutable_appearance('icons/obj/structures.dmi', "grille") //add a grille underlay + underlays += mutable_appearance('icons/turf/floors.dmi', "plating") //add the plating underlay, below the grille + +/turf/simulated/wall/indestructible/opsglass + name = "window" + icon = 'icons/obj/smooth_structures/plastitanium_window.dmi' + icon_state = "plastitanium_window" + opacity = FALSE + smooth = SMOOTH_TRUE + canSmoothWith = list(/turf/simulated/wall/indestructible/opsglass, /obj/structure/window/full/plastitanium) + +/turf/simulated/wall/indestructible/opsglass/Initialize(mapload) + . = ..() + icon_state = null + underlays += mutable_appearance('icons/obj/structures.dmi', "grille") + underlays += mutable_appearance('icons/turf/floors.dmi', "plating") + +/turf/simulated/wall/indestructible/rock + name = "dense rock" + desc = "An extremely densely-packed rock, most mining tools or explosives would never get through this." + icon = 'icons/turf/walls.dmi' + icon_state = "rock" + +/turf/simulated/wall/indestructible/rock/snow + name = "mountainside" + desc = "An extremely densely-packed rock, sheeted over with centuries worth of ice and snow." + icon = 'icons/turf/walls.dmi' + icon_state = "snowrock" + +/turf/simulated/wall/indestructible/riveted + icon = 'icons/turf/walls.dmi' + icon_state = "riveted" + +/turf/simulated/wall/indestructible/syndicate + icon = 'icons/turf/walls/plastitanium_wall.dmi' + icon_state = "map-shuttle" + smooth = SMOOTH_MORE | SMOOTH_DIAGONAL + canSmoothWith = list(/turf/simulated/wall/mineral/plastitanium, /turf/simulated/wall/indestructible/syndicate, /obj/machinery/door/airlock/titanium, /obj/machinery/door/airlock, /obj/structure/shuttle/engine, /obj/structure/falsewall/plastitanium, /turf/simulated/wall/indestructible/opsglass, /obj/structure/window/full/plastitanium) diff --git a/code/game/turfs/simulated/walls_mineral.dm b/code/game/turfs/simulated/walls_mineral.dm index 8b60be916c3..9d743ae9c18 100644 --- a/code/game/turfs/simulated/walls_mineral.dm +++ b/code/game/turfs/simulated/walls_mineral.dm @@ -48,7 +48,7 @@ icon_state = "sandstone" sheet_type = /obj/item/stack/sheet/mineral/sandstone explosion_block = 0 - canSmoothWith = list(/turf/simulated/wall/mineral/sandstone, /obj/structure/falsewall/sandstone) + canSmoothWith = list(/turf/simulated/wall/mineral/sandstone, /turf/simulated/wall/indestructible/sandstone, /obj/structure/falsewall/sandstone) /turf/simulated/wall/mineral/uranium name = "uranium wall" @@ -56,20 +56,17 @@ icon = 'icons/turf/walls/uranium_wall.dmi' icon_state = "uranium" sheet_type = /obj/item/stack/sheet/mineral/uranium - canSmoothWith = list(/turf/simulated/wall/mineral/uranium, /obj/structure/falsewall/uranium) + canSmoothWith = list(/turf/simulated/wall/mineral/uranium, /obj/structure/falsewall/uranium, /turf/simulated/wall/indestructible/uranium) /turf/simulated/wall/mineral/uranium/proc/radiate() if(!active) - if(world.time > last_event+15) + if(world.time > last_event + 15) active = 1 - for(var/mob/living/L in range(3,src)) - L.apply_effect(12,IRRADIATE,0) - for(var/turf/simulated/wall/mineral/uranium/T in range(3,src)) + radiation_pulse(src, 40) + for(var/turf/simulated/wall/mineral/uranium/T in orange(1, src)) T.radiate() last_event = world.time active = null - return - return /turf/simulated/wall/mineral/uranium/attack_hand(mob/user as mob) radiate() @@ -85,7 +82,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 @@ -125,7 +122,7 @@ if(exposed_temperature > 300) PlasmaBurn(exposed_temperature) -/turf/simulated/wall/mineral/plasma/bullet_act(var/obj/item/projectile/Proj) +/turf/simulated/wall/mineral/plasma/bullet_act(obj/item/projectile/Proj) if(Proj.damage == 0)//lasertag guns and so on don't set off plasma anymore. can't use nodamage here because lasertag guns actually don't have it. return if(istype(Proj,/obj/item/projectile/beam)) @@ -150,7 +147,7 @@ sheet_type = /obj/item/stack/sheet/wood hardness = 70 explosion_block = 0 - canSmoothWith = list(/turf/simulated/wall/mineral/wood, /obj/structure/falsewall/wood, /turf/simulated/wall/mineral/wood/nonmetal) + canSmoothWith = list(/turf/simulated/wall/mineral/wood, /obj/structure/falsewall/wood, /turf/simulated/wall/mineral/wood/nonmetal, /turf/simulated/wall/indestructible/wood) /turf/simulated/wall/mineral/wood/attackby(obj/item/W, mob/user) if(W.sharp && W.force) @@ -166,7 +163,7 @@ desc = "A solidly wooden wall. It's a bit weaker than a wall made with metal." girder_type = /obj/structure/barricade/wooden hardness = 50 - canSmoothWith = list(/turf/simulated/wall/mineral/wood, /obj/structure/falsewall/wood, /turf/simulated/wall/mineral/wood/nonmetal) + canSmoothWith = list(/turf/simulated/wall/mineral/wood, /obj/structure/falsewall/wood, /turf/simulated/wall/mineral/wood/nonmetal, /turf/simulated/wall/indestructible/wood) /turf/simulated/wall/mineral/iron name = "rough metal wall" @@ -185,7 +182,7 @@ smooth = SMOOTH_TRUE|SMOOTH_DIAGONAL sheet_type = /obj/item/stack/sheet/mineral/abductor explosion_block = 3 - canSmoothWith = list(/turf/simulated/wall/mineral/abductor, /obj/structure/falsewall/abductor) + canSmoothWith = list(/turf/simulated/wall/mineral/abductor, /obj/structure/falsewall/abductor, /turf/simulated/wall/indestructible/alien) /////////////////////Titanium walls///////////////////// @@ -198,7 +195,7 @@ flags_2 = CHECK_RICOCHET_2 sheet_type = /obj/item/stack/sheet/mineral/titanium smooth = SMOOTH_MORE|SMOOTH_DIAGONAL - canSmoothWith = list(/turf/simulated/wall/mineral/titanium, /obj/machinery/door/airlock/shuttle, /obj/machinery/door/airlock, /obj/structure/window/full/shuttle, /obj/structure/shuttle/engine/heater, /obj/structure/falsewall/titanium) + canSmoothWith = list(/turf/simulated/wall/mineral/titanium, /obj/machinery/door/airlock/titanium, /obj/machinery/door/airlock, /obj/structure/window/full/shuttle, /obj/structure/shuttle/engine/heater, /obj/structure/falsewall/titanium) /turf/simulated/wall/mineral/titanium/nodiagonal smooth = SMOOTH_MORE @@ -224,10 +221,11 @@ T.icon_state = icon_state if(T.icon != icon) T.icon = icon - if(T.color != color) - T.color = color + if(color) + T.atom_colours = atom_colours.Copy() + T.update_atom_colour() if(T.dir != dir) - T.dir = dir + T.setDir(dir) T.transform = transform return T @@ -290,7 +288,7 @@ explosion_block = 4 sheet_type = /obj/item/stack/sheet/mineral/plastitanium smooth = SMOOTH_MORE|SMOOTH_DIAGONAL - canSmoothWith = list(/turf/simulated/wall/mineral/plastitanium, /obj/machinery/door/airlock/shuttle, /obj/machinery/door/airlock, /obj/structure/shuttle/engine, /obj/structure/falsewall/plastitanium) + canSmoothWith = list(/turf/simulated/wall/mineral/plastitanium, /turf/simulated/wall/indestructible/syndicate, /obj/machinery/door/airlock/titanium, /obj/machinery/door/airlock, /obj/structure/shuttle/engine, /obj/structure/falsewall/plastitanium, /turf/simulated/wall/indestructible/opsglass, /obj/structure/window/full/plastitanium) /turf/simulated/wall/mineral/plastitanium/nodiagonal smooth = SMOOTH_MORE @@ -305,36 +303,6 @@ icon_state = "map-overspace" fixed_underlay = list("space"=1) -/turf/simulated/wall/mineral/plastitanium/coated - name = "coated wall" - max_temperature = INFINITY - icon_state = "map-shuttle_nd" - smooth = SMOOTH_MORE - -/turf/simulated/wall/mineral/plastitanium/coated/Initialize(mapload) - . = ..() - desc += " It seems to have additional plating to protect against heat." - -/turf/simulated/wall/mineral/plastitanium/explosive - var/explosive_wall_group = EXPLOSIVE_WALL_GROUP_SYNDICATE_BASE - icon_state = "map-shuttle_nd" - smooth = SMOOTH_MORE - -/turf/simulated/wall/mineral/plastitanium/explosive/Initialize(mapload) - . = ..() - GLOB.explosive_walls += src - -/turf/simulated/wall/mineral/plastitanium/explosive/Destroy() - GLOB.explosive_walls -= src - return ..() - -/turf/simulated/wall/mineral/plastitanium/explosive/proc/self_destruct() - var/obj/item/bombcore/large/explosive_wall/bombcore = new(get_turf(src)) - bombcore.detonate() - -/turf/simulated/wall/mineral/plastitanium/explosive/ex_act(severity) - return - //have to copypaste this code /turf/simulated/wall/mineral/plastitanium/interior/copyTurf(turf/T) if(T.type != type) @@ -345,10 +313,11 @@ T.icon_state = icon_state if(T.icon != icon) T.icon = icon - if(T.color != color) - T.color = color + if(color) + T.atom_colours = atom_colours.Copy() + T.update_atom_colour() if(T.dir != dir) - T.dir = dir + T.setDir(dir) T.transform = transform return T diff --git a/code/game/turfs/simulated/walls_misc.dm b/code/game/turfs/simulated/walls_misc.dm index 56908a7ecae..e32fa627297 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 @@ -44,12 +44,6 @@ icon = 'icons/turf/walls/rusty_reinforced_wall.dmi' icon_state = "rrust" -/turf/simulated/wall/r_wall/coated //Coated for heat resistance - name = "coated reinforced wall" - desc = "A huge chunk of reinforced metal used to seperate rooms. It seems to have additional plating to protect against heat." - icon = 'icons/turf/walls/coated_reinforced_wall.dmi' - max_temperature = INFINITY - //Clockwork walls /turf/simulated/wall/clockwork name = "clockwork wall" diff --git a/code/game/turfs/simulated/walls_reinforced.dm b/code/game/turfs/simulated/walls_reinforced.dm index a3e9c9ae0f2..d840ff2c355 100644 --- a/code/game/turfs/simulated/walls_reinforced.dm +++ b/code/game/turfs/simulated/walls_reinforced.dm @@ -6,8 +6,8 @@ opacity = 1 density = 1 explosion_block = 2 + rad_insulation = RAD_HEAVY_INSULATION damage_cap = 600 - max_temperature = 6000 hardness = 10 sheet_type = /obj/item/stack/sheet/plasteel sheet_amount = 1 @@ -72,23 +72,6 @@ queue_smooth_neighbors(src) to_chat(user, "You repair the last of the damage.") return - - else if(istype(I, /obj/item/stack/sheet/plasteel)) - var/obj/item/stack/sheet/plasteel/PS = I - if(!can_be_reinforced) - to_chat(user, "The wall is already coated!") - return - to_chat(user, "You begin adding an additional layer of coating to the wall with [PS]...") - if(do_after(user, 40 * PS.toolspeed, target = src) && !d_state) - if(!PS.use(2)) - to_chat(user, "You don't have enough [PS.name] for that!") - return - to_chat(user, "You add an additional layer of coating to the wall.") - ChangeTurf(/turf/simulated/wall/r_wall/coated) - update_icon() - queue_smooth_neighbors(src) - can_be_reinforced = FALSE - return else return ..() diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index b45a8f5a059..4678bd94ce4 100644 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -35,10 +35,6 @@ var/list/blueprint_data //for the station blueprints, images of objects eg: pipes - var/list/footstep_sounds - var/shoe_running_volume = 50 - var/shoe_walking_volume = 20 - /turf/Initialize(mapload) SHOULD_CALL_PARENT(FALSE) if(initialized) @@ -81,11 +77,8 @@ qdel(A) return // Adds the adjacent turfs to the current atmos processing - for(var/direction in GLOB.cardinal) - if(atmos_adjacent_turfs & direction) - var/turf/simulated/T = get_step(src, direction) - if(istype(T)) - SSair.add_to_active(T) + for(var/turf/simulated/T in atmos_adjacent_turfs) + SSair.add_to_active(T) SSair.remove_from_active(src) visibilityChanged() QDEL_LIST(blueprint_data) @@ -154,10 +147,16 @@ return FALSE //Finally, check objects/mobs to block entry that are not on the border + var/atom/movable/tompost_bump + var/top_layer = FALSE for(var/atom/movable/obstacle in large_dense) if(!obstacle.CanPass(mover, mover.loc, 1) && (forget != obstacle)) - mover.Bump(obstacle, TRUE) - return FALSE + if(obstacle.layer > top_layer) + tompost_bump = obstacle + top_layer = obstacle.layer + if(tompost_bump) + mover.Bump(tompost_bump, TRUE) + return FALSE return TRUE //Nothing found to block so return success! /turf/Entered(atom/movable/M, atom/OL, ignoreRest = FALSE) @@ -174,7 +173,7 @@ /turf/proc/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(src.intact) // override for space turfs, since they should never hide anything @@ -349,7 +348,7 @@ // Returns the surrounding cardinal turfs with open links // Including through doors openable with the ID -/turf/proc/CardinalTurfsWithAccess(var/obj/item/card/id/ID) +/turf/proc/CardinalTurfsWithAccess(obj/item/card/id/ID) var/list/L = new() var/turf/simulated/T @@ -404,7 +403,7 @@ L.Add(T) return L -// check for all turfs, including unsimulated ones +// check for all turfs, including space ones /turf/proc/AdjacentTurfsSpace(obj/item/card/id/ID = null, list/closed)//check access if one is passed var/list/L = new() var/turf/T @@ -560,6 +559,3 @@ /turf/AllowDrop() return TRUE - -/turf/proc/water_act(volume, temperature, source) - return FALSE diff --git a/code/game/turfs/unsimulated.dm b/code/game/turfs/unsimulated.dm deleted file mode 100644 index 02af9173e2b..00000000000 --- a/code/game/turfs/unsimulated.dm +++ /dev/null @@ -1,45 +0,0 @@ -/turf/unsimulated - intact = 1 - name = "command" - oxygen = MOLES_O2STANDARD - nitrogen = MOLES_N2STANDARD - -/turf/unsimulated/can_lay_cable() - return 0 - -/turf/unsimulated/rpd_act() - return - -/turf/unsimulated/acid_act(acidpwr, acid_volume, acid_id) - return 0 - -/turf/unsimulated/floor/plating/vox - icon_state = "plating" - name = "plating" - nitrogen = 100 - oxygen = 0 - -/turf/unsimulated/floor/plating/snow - name = "snow" - icon = 'icons/turf/snow.dmi' - icon_state = "snow" - temperature = T0C - -/turf/unsimulated/floor/plating/snow/concrete - name = "concrete" - icon = 'icons/turf/floors.dmi' - icon_state = "concrete" - -/turf/unsimulated/floor/plating/snow/ex_act(severity) - return - -/turf/unsimulated/floor/plating/airless - icon_state = "plating" - name = "airless plating" - oxygen = 0 - nitrogen = 0 - temperature = TCMB - -/turf/unsimulated/floor/plating/airless/Initialize(mapload) - . = ..() - name = "plating" diff --git a/code/game/turfs/unsimulated/beach.dm b/code/game/turfs/unsimulated/beach.dm deleted file mode 100644 index a7c73971e99..00000000000 --- a/code/game/turfs/unsimulated/beach.dm +++ /dev/null @@ -1,127 +0,0 @@ -/turf/unsimulated/beach - name = "Beach" - icon = 'icons/misc/beach.dmi' - var/water_overlay_image = null - mouse_opacity = MOUSE_OPACITY_TRANSPARENT - -/turf/unsimulated/beach/Initialize(mapload) - . = ..() - if(water_overlay_image) - var/image/overlay_image = image('icons/misc/beach.dmi', icon_state = water_overlay_image, layer = ABOVE_MOB_LAYER) - overlay_image.plane = GAME_PLANE - overlays += overlay_image - -/turf/unsimulated/beach/sand - name = "Sand" - icon_state = "desert" - mouse_opacity = MOUSE_OPACITY_ICON - -/turf/unsimulated/beach/sand/Initialize(mapload) - . = ..() //adds some aesthetic randomness to the beach sand - icon_state = pick("desert", "desert0", "desert1", "desert2", "desert3", "desert4") - -/turf/unsimulated/beach/sand/dense //for boundary "walls" - density = 1 - -/turf/unsimulated/beach/coastline - name = "Coastline" - //icon = 'icons/misc/beach2.dmi' - //icon_state = "sandwater" - icon_state = "beach" - water_overlay_image = "water_coast" - -/turf/unsimulated/beach/coastline/dense //for boundary "walls" - density = 1 - -/turf/unsimulated/beach/water - name = "Shallow Water" - icon_state = "seashallow" - water_overlay_image = "water_shallow" - var/obj/machinery/poolcontroller/linkedcontroller = null - -/turf/unsimulated/beach/water/Entered(atom/movable/AM, atom/OldLoc) - . = ..() - if(!linkedcontroller) - return - if(ismob(AM)) - linkedcontroller.mobinpool += AM - -/turf/unsimulated/beach/water/Exited(atom/movable/AM, atom/newloc) - . = ..() - if(!linkedcontroller) - return - if(ismob(AM)) - linkedcontroller.mobinpool -= AM - -/turf/unsimulated/beach/water/InitializedOn(atom/A) - if(!linkedcontroller) - return - if(istype(A, /obj/effect/decal/cleanable)) // Better a typecheck than looping through thousands of turfs everyday - linkedcontroller.decalinpool += A - -/turf/unsimulated/beach/water/dense //for boundary "walls" - density = 1 - -/turf/unsimulated/beach/water/edge_drop - name = "Water" - icon_state = "seadrop" - water_overlay_image = "water_drop" - -/turf/unsimulated/beach/water/drop - name = "Water" - icon = 'icons/turf/floors/seadrop.dmi' - icon_state = "seadrop" - water_overlay_image = null - smooth = SMOOTH_TRUE - canSmoothWith = list( - /turf/unsimulated/beach/water/drop, /turf/unsimulated/beach/water/drop/dense, - /turf/unsimulated/beach/water, /turf/unsimulated/beach/water/dense, - /turf/unsimulated/beach/water/edge_drop) - var/obj/effect/beach_drop_overlay/water_overlay - -/turf/unsimulated/beach/water/drop/Initialize(mapload) - . = ..() - water_overlay = new(src) - -/turf/unsimulated/beach/water/drop/Destroy() - QDEL_NULL(water_overlay) - return ..() - -/obj/effect/beach_drop_overlay - name = "Water" - icon = 'icons/turf/floors/seadrop-o.dmi' - layer = MOB_LAYER + 0.1 - smooth = SMOOTH_TRUE - anchored = 1 - canSmoothWith = list( - /turf/unsimulated/beach/water/drop, /turf/unsimulated/beach/water/drop/dense, - /turf/unsimulated/beach/water, /turf/unsimulated/beach/water/dense, - /turf/unsimulated/beach/water/edge_drop) - -/turf/unsimulated/beach/water/drop/dense - density = 1 - -/turf/unsimulated/beach/water/deep - name = "Deep Water" - icon_state = "seadeep" - water_overlay_image = "water_deep" - -/turf/unsimulated/beach/water/deep/dense - density = 1 - -/turf/unsimulated/beach/water/deep/wood_floor - name = "Sunken Floor" - icon = 'icons/turf/floors.dmi' - icon_state = "wood" - -/turf/unsimulated/beach/water/deep/sand_floor - name = "Sea Floor" - icon_state = "sand" - -/turf/unsimulated/beach/water/deep/rock_wall - name = "Reef Stone" - icon_state = "desert7" - density = 1 - opacity = 1 - explosion_block = 2 - mouse_opacity = MOUSE_OPACITY_ICON diff --git a/code/game/turfs/unsimulated/floor.dm b/code/game/turfs/unsimulated/floor.dm deleted file mode 100644 index 750ebe015ae..00000000000 --- a/code/game/turfs/unsimulated/floor.dm +++ /dev/null @@ -1,71 +0,0 @@ -/turf/unsimulated/floor - name = "floor" - icon = 'icons/turf/floors.dmi' - icon_state = "Floor3" - -/turf/unsimulated/floor/grass - name = "grass patch" - icon_state = "grass1" - -/turf/unsimulated/floor/grass/Initialize(mapload) - . = ..() - icon_state = "grass[rand(1,4)]" - -/turf/unsimulated/floor/snow - name = "snow" - icon = 'icons/turf/snow.dmi' - icon_state = "snow" - -/turf/unsimulated/floor/abductor - name = "alien floor" - icon_state = "alienpod1" - -/turf/unsimulated/floor/abductor/Initialize(mapload) - . = ..() - icon_state = "alienpod[rand(1,9)]" - -/turf/unsimulated/floor/vox - icon_state = "dark" - nitrogen = 100 - oxygen = 0 - -/turf/unsimulated/floor/carpet - name = "Carpet" - icon = 'icons/turf/floors/carpet.dmi' - icon_state = "carpet" - smooth = SMOOTH_TRUE - canSmoothWith = null - - footstep_sounds = list( - "human" = list('sound/effects/footstep/carpet_human.ogg'), - "xeno" = list('sound/effects/footstep/carpet_xeno.ogg') - ) - -/turf/unsimulated/floor/wood - icon_state = "wood" - - footstep_sounds = list( - "human" = list('sound/effects/footstep/wood_all.ogg'), //@RonaldVanWonderen of Freesound.org - "xeno" = list('sound/effects/footstep/wood_all.ogg') //@RonaldVanWonderen of Freesound.org - ) - -/turf/unsimulated/floor/lava - name = "lava" - desc = "That looks... a bit dangerous" - icon = 'icons/turf/floors/lava.dmi' - icon_state = "smooth" - smooth = SMOOTH_MORE - canSmoothWith = list(/turf/unsimulated/floor/lava) - var/lava_damage = 250 - var/lava_fire = 20 - light_range = 2 - light_color = "#FFC040" - -/turf/unsimulated/floor/lava/Entered(mob/living/M, atom/OL, ignoreRest = 0) - if(istype(M)) - M.apply_damage(lava_damage, BURN) - M.adjust_fire_stacks(lava_fire) - M.IgniteMob() - -/turf/unsimulated/floor/lava/dense - density = 1 diff --git a/code/game/turfs/unsimulated/walls.dm b/code/game/turfs/unsimulated/walls.dm deleted file mode 100644 index c5688c31323..00000000000 --- a/code/game/turfs/unsimulated/walls.dm +++ /dev/null @@ -1,35 +0,0 @@ -/turf/unsimulated/wall - name = "wall" - icon = 'icons/turf/walls.dmi' - icon_state = "riveted" - opacity = 1 - density = 1 - explosion_block = 2 - -/turf/unsimulated/wall/fakeglass - name = "window" - icon_state = "fakewindows" - opacity = 0 - -/turf/unsimulated/wall/fakedoor - name = "Centcom Access" - icon = 'icons/obj/doors/airlocks/centcom/centcom.dmi' - icon_state = "closed" - -/turf/unsimulated/wall/splashscreen - name = "Space Station 13" - icon = 'config/title_screens/images/blank.png' - icon_state = "" - layer = FLY_LAYER - -/turf/unsimulated/wall/other - icon_state = "r_wall" - -/turf/unsimulated/wall/metal - icon = 'icons/turf/walls/wall.dmi' - icon_state = "wall" - smooth = SMOOTH_TRUE - -/turf/unsimulated/wall/abductor - icon_state = "alien1" - explosion_block = 50 diff --git a/code/game/verbs/ooc.dm b/code/game/verbs/ooc.dm index 0aea3e234c5..f4f37f313a1 100644 --- a/code/game/verbs/ooc.dm +++ b/code/game/verbs/ooc.dm @@ -104,7 +104,7 @@ GLOBAL_VAR_INIT(admin_ooc_colour, "#b82e00") else to_chat(world, "The OOC channel has been globally disabled!") -/proc/auto_toggle_ooc(var/on) +/proc/auto_toggle_ooc(on) if(config.auto_toggle_ooc_during_round && config.ooc_allowed != on) toggle_ooc() diff --git a/code/game/verbs/suicide.dm b/code/game/verbs/suicide.dm index 7ce784539ad..401e0870d22 100644 --- a/code/game/verbs/suicide.dm +++ b/code/game/verbs/suicide.dm @@ -37,7 +37,7 @@ // Failing that... if(!(damagetype & BRUTELOSS) && !(damagetype & FIRELOSS) && !(damagetype & TOXLOSS) && !(damagetype & OXYLOSS)) - if(NO_BREATHE in dna.species.species_traits) + if(HAS_TRAIT(src, TRAIT_NOBREATH)) // the ultimate fallback take_overall_damage(max(dmgamt - getToxLoss() - getFireLoss() - getBruteLoss() - getOxyLoss(), 0), 0, updating_health = FALSE) else diff --git a/code/game/world.dm b/code/game/world.dm index d92ebe364f9..5ba97917661 100644 --- a/code/game/world.dm +++ b/code/game/world.dm @@ -1,10 +1,16 @@ GLOBAL_LIST_INIT(map_transition_config, MAP_TRANSITION_CONFIG) /world/New() + // IMPORTANT + // If you do any SQL operations inside this proc, they must ***NOT*** be ran async. Otherwise players can join mid query + // This is BAD. + + // Right off the bat + enable_auxtools_debugger() + //temporary file used to record errors with loading config and the database, moved to log directory once logging is set up GLOB.config_error_log = GLOB.world_game_log = GLOB.world_runtime_log = GLOB.sql_log = "data/logs/config_error.log" load_configuration() - enable_debugger() // Enable the extools debugger // Right off the bat, load up the DB SSdbcore.CheckSchemaVersion() // This doesnt just check the schema version, it also connects to the db! This needs to happen super early! I cannot stress this enough! @@ -13,16 +19,21 @@ GLOBAL_LIST_INIT(map_transition_config, MAP_TRANSITION_CONFIG) // Setup all log paths and stamp them with startups, including round IDs SetupLogs() - TgsNew(new /datum/tgs_event_handler/impl, TGS_SECURITY_TRUSTED) // creates a new TGS object + // This needs to happen early, otherwise people can get a null species, nuking their character + makeDatumRefLists() + + InitTGS() // creates a new TGS object log_world("World loaded at [time_stamp()]") - log_world("[GLOB.vars.len - GLOB.gvars_datum_in_built_vars.len] global variables") + log_world("[length(GLOB.vars) - length(GLOB.gvars_datum_in_built_vars)] global variables") GLOB.revision_info.log_info() - load_admins() // Same here + load_admins(run_async = FALSE) // This better happen early on. #ifdef UNIT_TESTS log_world("Unit Tests Are Enabled!") #endif + if(!fexists("config/config.txt") || !fexists("config/game_options.txt")) + stack_trace("The game config files have not been properly set! Please copy ALL files from '/config/example' into the parent folder, '/config'.") if(byond_version < MIN_COMPILER_VERSION || byond_build < MIN_COMPILER_BUILD) log_world("Your server's byond version does not meet the recommended requirements for this code. Please update BYOND") @@ -35,7 +46,7 @@ GLOBAL_LIST_INIT(map_transition_config, MAP_TRANSITION_CONFIG) startup_procs() // Call procs that need to occur on startup (Generate lists, load MOTD, etc) - src.update_status() + update_status() GLOB.space_manager.initialize() //Before the MC starts up @@ -48,7 +59,10 @@ GLOBAL_LIST_INIT(map_transition_config, MAP_TRANSITION_CONFIG) HandleTestRun() #endif - return + +/world/proc/InitTGS() + TgsNew(new /datum/tgs_event_handler/impl, TGS_SECURITY_TRUSTED) // creates a new TGS object + GLOB.revision_info.load_tgs_info() // Loads git and TM info from TGS itself // This is basically a replacement for hook/startup. Please dont shove random bullshit here // If it doesnt need to happen IMMEDIATELY on world load, make a subsystem for it @@ -58,7 +72,6 @@ GLOBAL_LIST_INIT(map_transition_config, MAP_TRANSITION_CONFIG) load_motd() // Loads up the MOTD (Welcome message players see when joining the server) load_mode() // Loads up the gamemode investigate_reset() // This is part of the admin investigate system. PLEASE DONT SS THIS EITHER - makeDatumRefLists() // Setups up lists of datums and their subtypes /// List of all world topic spam prevention handlers. See code/modules/world_topic/_spam_prevention_handler.dm GLOBAL_LIST_EMPTY(world_topic_spam_prevention_handlers) @@ -96,9 +109,9 @@ GLOBAL_LIST_EMPTY(world_topic_handlers) wth = new wth() return wth.invoke(input) -/world/Reboot(var/reason, end_string, var/time) +/world/Reboot(reason, fast_track = FALSE) //special reboot, do none of the normal stuff - if(reason == 1) // Do NOT change this to if(reason). You WILL break the entirety of world rebooting + if((reason == 1) || fast_track) // Do NOT change this to if(reason). You WILL break the entirety of world rebooting if(usr) if(!check_rights(R_SERVER)) message_admins("[key_name_admin(usr)] attempted to restart the server via the Profiler, without access.") @@ -106,71 +119,53 @@ GLOBAL_LIST_EMPTY(world_topic_handlers) return message_admins("[key_name_admin(usr)] has requested an immediate world restart via client side debugging tools") log_admin("[key_name(usr)] has requested an immediate world restart via client side debugging tools") - spawn(0) to_chat(world, "Rebooting world immediately due to host request") rustg_log_close_all() // Past this point, no logging procs can be used, at risk of data loss. - TgsReboot() + // Now handle a reboot if(config && config.shutdown_on_reboot) sleep(0) if(GLOB.shutdown_shell_command) shell(GLOB.shutdown_shell_command) del(world) + TgsEndProcess() // We want to shutdown on reboot. That means kill our TGS process "gracefully", instead of the watchdog crying return else + TgsReboot() // Tell TGS we did a reboot return ..(1) - var/delay - if(!isnull(time)) - delay = max(0,time) - else - delay = SSticker.restart_timeout - if(SSticker.delay_end) - to_chat(world, "An admin has delayed the round end.") - return - to_chat(world, "Rebooting world in [delay/10] [delay > 10 ? "seconds" : "second"]. [reason]") - - var/round_end_sound = pick(GLOB.round_end_sounds) - var/sound_length = GLOB.round_end_sounds[round_end_sound] - if(delay > sound_length) // If there's time, play the round-end sound before rebooting - spawn(delay - sound_length) - if(!SSticker.delay_end) - world << round_end_sound - sleep(delay) - if(SSticker.delay_end) - to_chat(world, "Reboot was cancelled by an admin.") - return - log_game("Rebooting world. [reason]") - //kick_clients_in_lobby("The round came to an end with you in the lobby.", 1) - - if(end_string) - SSticker.end_state = end_string - - Master.Shutdown() //run SS shutdowns - rustg_log_close_all() // Past this point, no logging procs can be used, at risk of data loss. - TgsReboot() + // If we got here, we are in a "normal" reboot + Master.Shutdown() // Shutdown subsystems + // If we were running unit tests, finish that run #ifdef UNIT_TESTS FinishTestRun() return #endif + // If we had an update or pending TM, set a 60 second timeout var/secs_before_auto_reconnect = 10 if(GLOB.pending_server_update) secs_before_auto_reconnect = 60 to_chat(world, "Reboot will take a little longer, due to pending updates.") + // Send the reboot banner to all players for(var/client/C in GLOB.clients) C << output(list2params(list(secs_before_auto_reconnect)), "browseroutput:reboot") - if(config.server) //if you set a server location in config.txt, it sends you there instead of trying to reconnect to the same world address. -- NeoFite + if(config.server) // If you set a server location in config.txt, it sends you there instead of trying to reconnect to the same world address. -- NeoFite C << link("byond://[config.server]") + // And begin the real shutdown + rustg_log_close_all() // Past this point, no logging procs can be used, at risk of data loss. if(config && config.shutdown_on_reboot) sleep(0) if(GLOB.shutdown_shell_command) shell(GLOB.shutdown_shell_command) + rustg_log_close_all() // Past this point, no logging procs can be used, at risk of data loss. del(world) + TgsEndProcess() // We want to shutdown on reboot. That means kill our TGS process "gracefully", instead of the watchdog crying return else + TgsReboot() // We did a normal reboot. Tell TGS we did a normal reboot. ..(0) /world/proc/load_mode() @@ -180,7 +175,7 @@ GLOBAL_LIST_EMPTY(world_topic_handlers) GLOB.master_mode = Lines[1] log_game("Saved mode is '[GLOB.master_mode]'") -/world/proc/save_mode(var/the_mode) +/world/proc/save_mode(the_mode) var/F = file("data/mode.txt") fdel(F) F << the_mode @@ -275,15 +270,12 @@ GLOBAL_LIST_EMPTY(world_topic_handlers) fcopy(GLOB.config_error_log, "[GLOB.log_directory]/config_error.log") fdel(GLOB.config_error_log) - -// Proc to enable the extools debugger, which allows breakpoints, live var checking, and many other useful tools -// The DLL is injected into the env by visual studio code. If not running VSCode, the proc will not call the initialization -/world/proc/enable_debugger() - var/dll = world.GetConfig("env", "EXTOOLS_DLL") - if (dll) - call(dll, "debug_initialize")() - + // Save the current round's log path to a text file for other scripts to use. + var/F = file("data/logpath.txt") + fdel(F) + F << GLOB.log_directory /world/Del() rustg_close_async_http_client() // Close the HTTP client. If you dont do this, youll get phantom threads which can crash DD from memory access violations + disable_auxtools_debugger() // Disables the debugger if running. See above comment ..() diff --git a/code/modules/admin/IsBanned.dm b/code/modules/admin/IsBanned.dm index 44da9f04d58..e160ee3838d 100644 --- a/code/modules/admin/IsBanned.dm +++ b/code/modules/admin/IsBanned.dm @@ -3,6 +3,8 @@ if(!key || !address || !computer_id) log_adminwarn("Failed Login (invalid data): [key] [address]-[computer_id]") + // The nested ternaries are needed here + INVOKE_ASYNC(GLOBAL_PROC, .proc/log_connection, (ckey(key) || ""), (address || ""), (computer_id || ""), CONNECTION_TYPE_DROPPED_INVALID) return list("reason"="invalid login data", "desc"="Error: Could not check ban status, please try again. Error message: Your computer provided invalid or blank information to the server on connection (BYOND Username, IP, and Computer ID). Provided information for reference: Username: '[key]' IP: '[address]' Computer ID: '[computer_id]'. If you continue to get this error, please restart byond or contact byond support.") if(type == "world") @@ -10,6 +12,7 @@ if(text2num(computer_id) == 2147483647) //this cid causes stickybans to go haywire log_adminwarn("Failed Login (invalid cid): [key] [address]-[computer_id]") + INVOKE_ASYNC(GLOBAL_PROC, .proc/log_connection, ckey(key), address, computer_id, CONNECTION_TYPE_DROPPED_INVALID) return list("reason"="invalid login data", "desc"="Error: Could not check ban status, Please try again. Error message: Your computer provided an invalid Computer ID.") var/admin = 0 @@ -28,6 +31,7 @@ if(!GLOB.guests_allowed && IsGuestKey(key)) log_adminwarn("Failed Login: [key] [computer_id] [address] - Guests not allowed") // message_admins("Failed Login: [key] - Guests not allowed") + INVOKE_ASYNC(GLOBAL_PROC, .proc/log_connection, ckey(key), address, computer_id, CONNECTION_TYPE_DROPPED_BANNED) return list("reason"="guest", "desc"="\nReason: Guests not allowed. Please sign in with a BYOND account.") //check if the IP address is a known proxy/vpn, and the user is not whitelisted @@ -36,6 +40,7 @@ var/mistakemessage = "" if(config.banappeals) mistakemessage = "\nIf you have to use one, request whitelisting at: [config.banappeals]" + INVOKE_ASYNC(GLOBAL_PROC, .proc/log_connection, ckey(key), address, computer_id, CONNECTION_TYPE_DROPPED_IPINTEL) return list("reason"="using proxy or vpn", "desc"="\nReason: Proxies/VPNs are not allowed here. [mistakemessage]") @@ -72,7 +77,7 @@ sql_query_params["cid"] = computer_id var/datum/db_query/query = SSdbcore.NewQuery({" - SELECT ckey, ip, computerid, a_ckey, reason, expiration_time, duration, bantime, bantype FROM [format_table_name("ban")] + SELECT ckey, ip, computerid, a_ckey, reason, expiration_time, duration, bantime, bantype, ban_round_id FROM [format_table_name("ban")] WHERE (ckey=:ckeytext [ipquery] [cidquery]) AND (bantype = 'PERMABAN' OR bantype = 'ADMIN_PERMABAN' OR ((bantype = 'TEMPBAN' OR bantype = 'ADMIN_TEMPBAN') AND expiration_time > Now())) AND isnull(unbanned)"}, sql_query_params) @@ -91,6 +96,7 @@ var/duration = query.item[7] var/bantime = query.item[8] var/bantype = query.item[9] + var/ban_round_id = query.item[10] if(bantype == "ADMIN_PERMABAN" || bantype == "ADMIN_TEMPBAN") //admin bans MUST match on ckey to prevent cid-spoofing attacks // as well as dynamic ip abuse @@ -114,11 +120,12 @@ appealmessage = " You may appeal it at [config.banappeals]." expires = " This ban does not expire automatically and must be appealed.[appealmessage]" - var/desc = "\nReason: You, or another user of this computer or connection ([pckey]) is banned from playing here. The ban reason is:\n[reason]\nThis ban was applied by [ackey] on [bantime].[expires]" + var/desc = "\nReason: You, or another user of this computer or connection ([pckey]) is banned from playing here. The ban reason is:\n[reason]\nThis ban was applied by [ackey] on [bantime][ban_round_id ? " (Round [ban_round_id])" : ""].[expires]" . = list("reason"="[bantype]", "desc"="[desc]") log_adminwarn("Failed Login: [key] [computer_id] [address] - Banned [.["reason"]]") + INVOKE_ASYNC(GLOBAL_PROC, .proc/log_connection, ckey(key), address, computer_id, CONNECTION_TYPE_DROPPED_BANNED) qdel(query) return . qdel(query) @@ -135,5 +142,5 @@ return null else log_adminwarn("Failed Login: [key] [computer_id] [address] - Banned [.["message"]]") - + INVOKE_ASYNC(GLOBAL_PROC, .proc/log_connection, ckey(key), address, computer_id, CONNECTION_TYPE_DROPPED_BANNED) return . diff --git a/code/modules/admin/NewBan.dm b/code/modules/admin/NewBan.dm index e0c93f8b40e..4169ca380ab 100644 --- a/code/modules/admin/NewBan.dm +++ b/code/modules/admin/NewBan.dm @@ -2,7 +2,7 @@ GLOBAL_VAR(CMinutes) GLOBAL_DATUM(banlist_savefile, /savefile) GLOBAL_PROTECT(banlist_savefile) // Obvious reasons -/proc/CheckBan(var/ckey, var/id, var/address) +/proc/CheckBan(ckey, id, address) if(!GLOB.banlist_savefile) // if banlist_savefile cannot be located for some reason LoadBans() // try to load the bans if(!GLOB.banlist_savefile) // uh oh, can't find bans! diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index a91eb296413..2f7ef2e44c8 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -2,14 +2,14 @@ GLOBAL_VAR_INIT(BSACooldown, 0) GLOBAL_VAR_INIT(nologevent, 0) //////////////////////////////// -/proc/message_admins(var/msg) +/proc/message_admins(msg) msg = "ADMIN LOG: [msg]" for(var/client/C in GLOB.admins) if(R_ADMIN & C.holder.rights) if(C.prefs && !(C.prefs.toggles & PREFTOGGLE_CHAT_NO_ADMINLOGS)) to_chat(C, msg) -/proc/msg_admin_attack(var/text, var/loglevel) +/proc/msg_admin_attack(text, loglevel) if(!GLOB.nologevent) var/rendered = "ATTACK: [text]" for(var/client/C in GLOB.admins) @@ -34,7 +34,7 @@ GLOBAL_VAR_INIT(nologevent, 0) to_chat(C, msg) if(important) if(C.prefs?.sound & SOUND_ADMINHELP) - SEND_SOUND(C, 'sound/effects/adminhelp.ogg') + SEND_SOUND(C, sound('sound/effects/adminhelp.ogg')) window_flash(C) /** @@ -51,10 +51,10 @@ GLOBAL_VAR_INIT(nologevent, 0) to_chat(C, msg) if(important) if(C.prefs?.sound & SOUND_MENTORHELP) - SEND_SOUND(C, 'sound/effects/adminhelp.ogg') + SEND_SOUND(C, sound('sound/effects/adminhelp.ogg')) window_flash(C) -/proc/admin_ban_mobsearch(var/mob/M, var/ckey_to_find, var/mob/admin_to_notify) +/proc/admin_ban_mobsearch(mob/M, ckey_to_find, mob/admin_to_notify) if(!M || !M.ckey) if(ckey_to_find) for(var/mob/O in GLOB.mob_list) @@ -70,7 +70,7 @@ GLOBAL_VAR_INIT(nologevent, 0) ///////////////////////////////////////////////////////////////////////////////////////////////Panels -/datum/admins/proc/show_player_panel(var/mob/M in GLOB.mob_list) +/datum/admins/proc/show_player_panel(mob/M in GLOB.mob_list) set category = null set name = "Show Player Panel" set desc="Edit player (respawn, ban, heal, etc)" @@ -126,6 +126,7 @@ GLOBAL_VAR_INIT(nologevent, 0) body += "Jobban | " body += "Appearance Ban | " body += "Notes | " + body += "View Karma | " if(config.forum_playerinfo_url) body += "WebInfo | " if(M.client) @@ -221,7 +222,7 @@ GLOBAL_VAR_INIT(nologevent, 0) body += "

      " body += "DNA Blocks:
      " var/bname - for(var/block=1;block<=DNA_SE_LENGTH;block++) + for(var/block in 1 to DNA_SE_LENGTH) if(((block-1)%5)==0) body += "" bname = GLOB.assigned_blocks[block] @@ -298,7 +299,7 @@ GLOBAL_VAR_INIT(nologevent, 0) show_note() -/datum/admins/proc/show_player_notes(var/key as text) +/datum/admins/proc/show_player_notes(key as text) set category = "Admin" set name = "Show Player Notes" @@ -363,16 +364,47 @@ GLOBAL_VAR_INIT(nologevent, 0) if(!check_rights(R_SERVER)) return - var/delay = input("What delay should the restart have (in seconds)?", "Restart Delay", 5) as num|null - if(isnull(delay)) - return - else - delay = delay * 10 - message_admins("[key_name_admin(usr)] has initiated a server restart with a delay of [delay/10] seconds") - log_admin("[key_name(usr)] has initiated a server restart with a delay of [delay/10] seconds") - SSticker.delay_end = 0 - SSblackbox.record_feedback("tally", "admin_verb", 1, "Reboot Server") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! - world.Reboot("Initiated by [usr.client.holder.fakekey ? "Admin" : usr.key].", "admin reboot - by [usr.key] [usr.client.holder.fakekey ? "(stealth)" : ""]", delay) + // Give an extra popup if they are rebooting a live server + var/is_live_server = TRUE + if(usr.client.is_connecting_from_localhost()) + is_live_server = FALSE + + var/list/options = list("Regular Restart", "Hard Restart") + if(world.TgsAvailable()) // TGS lets you kill the process entirely + options += "Terminate Process (Kill and restart DD)" + + var/result = input(usr, "Select reboot method", "World Reboot", options[1]) as null|anything in options + + if(is_live_server) + if(alert(usr, "WARNING: THIS IS A LIVE SERVER, NOT A LOCAL TEST SERVER. DO YOU STILL WANT TO RESTART","This server is live","Restart","Cancel") != "Restart") + return FALSE + + if(result) + SSblackbox.record_feedback("tally", "admin_verb", 1, "Reboot World") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + var/init_by = "Initiated by [usr.client.holder.fakekey ? "Admin" : usr.key]." + switch(result) + + if("Regular Restart") + var/delay = input("What delay should the restart have (in seconds)?", "Restart Delay", 5) as num|null + if(!delay) + return FALSE + + + // These are pasted each time so that they dont false send if reboot is cancelled + message_admins("[key_name_admin(usr)] has initiated a server restart of type [result]") + log_admin("[key_name(usr)] has initiated a server restart of type [result]") + SSticker.delay_end = FALSE // We arent delayed anymore + SSticker.reboot_helper(init_by, "admin reboot - by [usr.key] [usr.client.holder.fakekey ? "(stealth)" : ""]", delay * 10) + + if("Hard Restart") + message_admins("[key_name_admin(usr)] has initiated a server restart of type [result]") + log_admin("[key_name(usr)] has initiated a server restart of type [result]") + world.Reboot(fast_track = TRUE) + + if("Terminate Process (Kill and restart DD)") + message_admins("[key_name_admin(usr)] has initiated a server restart of type [result]") + log_admin("[key_name(usr)] has initiated a server restart of type [result]") + world.TgsEndProcess() // Just nuke the entire process if we are royally fucked /datum/admins/proc/end_round() set category = "Server" @@ -576,6 +608,8 @@ GLOBAL_VAR_INIT(nologevent, 0) SSticker.delay_end = !SSticker.delay_end log_admin("[key_name(usr)] [SSticker.delay_end ? "delayed the round end" : "has made the round end normally"].") message_admins("[key_name(usr)] [SSticker.delay_end ? "delayed the round end" : "has made the round end normally"].", 1) + if(SSticker.delay_end) + SSticker.real_reboot_time = 0 // Immediately show the "Admin delayed round end" message return //alert("Round end delayed", null, null, null, null, null) if(SSticker.ticker_going) SSticker.ticker_going = FALSE @@ -628,7 +662,7 @@ GLOBAL_VAR_INIT(nologevent, 0) return 0 -/datum/admins/proc/spawn_atom(var/object as text) +/datum/admins/proc/spawn_atom(object as text) set category = "Debug" set desc = "(atom path) Spawn an atom" set name = "Spawn" @@ -664,7 +698,7 @@ GLOBAL_VAR_INIT(nologevent, 0) log_admin("[key_name(usr)] spawned [chosen] at ([usr.x],[usr.y],[usr.z])") SSblackbox.record_feedback("tally", "admin_verb", 1, "Spawn Atom") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -/datum/admins/proc/show_traitor_panel(var/mob/M in GLOB.mob_list) +/datum/admins/proc/show_traitor_panel(mob/M in GLOB.mob_list) set category = "Admin" set desc = "Edit mobs's memory and role" set name = "Show Traitor Panel" @@ -767,7 +801,7 @@ GLOBAL_VAR_INIT(gamma_ship_location, 1) // 0 = station , 1 = space GLOB.gamma_ship_location = 1 return -/proc/formatJumpTo(var/location,var/where="") +/proc/formatJumpTo(location, where="") var/turf/loc if(istype(location,/turf/)) loc = location @@ -777,7 +811,7 @@ GLOBAL_VAR_INIT(gamma_ship_location, 1) // 0 = station , 1 = space where=formatLocation(loc) return "[where]" -/proc/formatLocation(var/location) +/proc/formatLocation(location) var/turf/loc if(istype(location,/turf/)) loc = location @@ -786,7 +820,7 @@ GLOBAL_VAR_INIT(gamma_ship_location, 1) // 0 = station , 1 = space var/area/A = get_area(location) return "[A.name] - [loc.x],[loc.y],[loc.z]" -/proc/formatPlayerPanel(var/mob/U,var/text="PP") +/proc/formatPlayerPanel(mob/U, text="PP") return "[ADMIN_PP(U,"[text]")]" //Kicks all the clients currently in the lobby. The second parameter (kick_only_afk) determins if an is_afk() check is ran, or if all clients are kicked @@ -806,7 +840,7 @@ GLOBAL_VAR_INIT(gamma_ship_location, 1) // 0 = station , 1 = space //returns 1 to let the dragdrop code know we are trapping this event //returns 0 if we don't plan to trap the event -/datum/admins/proc/cmd_ghost_drag(var/mob/dead/observer/frommob, var/tothing) +/datum/admins/proc/cmd_ghost_drag(mob/dead/observer/frommob, tothing) if(!istype(frommob)) return //extra sanity check to make sure only observers are shoved into things @@ -883,3 +917,4 @@ GLOBAL_VAR_INIT(gamma_ship_location, 1) // 0 = station , 1 = space continue result[1]++ return result + diff --git a/code/modules/admin/admin_investigate.dm b/code/modules/admin/admin_investigate.dm index 527540e9490..24ea8f95886 100644 --- a/code/modules/admin/admin_investigate.dm +++ b/code/modules/admin/admin_investigate.dm @@ -8,14 +8,14 @@ #define INVESTIGATE_DIR "data/investigate/" //SYSTEM -/proc/investigate_subject2file(var/subject) +/proc/investigate_subject2file(subject) return file("[INVESTIGATE_DIR][subject].html") /proc/investigate_reset() if(fdel(INVESTIGATE_DIR)) return 1 return 0 -/atom/proc/investigate_log(var/message, var/subject) +/atom/proc/investigate_log(message, subject) if(!message) return var/F = investigate_subject2file(subject) if(!F) return diff --git a/code/modules/admin/admin_ranks.dm b/code/modules/admin/admin_ranks.dm index 6e91e70c3c9..72376027dc5 100644 --- a/code/modules/admin/admin_ranks.dm +++ b/code/modules/admin/admin_ranks.dm @@ -56,7 +56,7 @@ GLOBAL_PROTECT(admin_ranks) // this shit is being protected for obvious reasons testing(msg) #endif -/proc/load_admins() +/proc/load_admins(run_async = FALSE) if(IsAdminAdvancedProcCall()) to_chat(usr, "Admin reload blocked: Advanced ProcCall detected.") message_admins("[key_name(usr)] attempted to reload admins via advanced proc-call") @@ -117,8 +117,8 @@ GLOBAL_PROTECT(admin_ranks) // this shit is being protected for obvious reasons load_admins() return - var/datum/db_query/query = SSdbcore.NewQuery("SELECT ckey, rank, level, flags FROM [format_table_name("admin")]") - if(!query.warn_execute()) + var/datum/db_query/query = SSdbcore.NewQuery("SELECT ckey, admin_rank, level, flags FROM [format_table_name("admin")]") + if(!query.warn_execute(async=run_async)) qdel(query) return diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index e4bd51f1f5b..f63473216a9 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -24,12 +24,9 @@ GLOBAL_LIST_INIT(admin_verbs_admin, list( /client/proc/cmd_admin_check_contents, /*displays the contents of an instance*/ /client/proc/cmd_admin_open_logging_view, /client/proc/getserverlogs, /*allows us to fetch server logs (diary) for other days*/ - /client/proc/jumptocoord, /*we ghost and jump to a coordinate*/ /client/proc/Getmob, /*teleports a mob to our location*/ /client/proc/Getkey, /*teleports a mob with a certain ckey to our location*/ - /client/proc/Jump, - /client/proc/jumptokey, /*allows us to jump to the location of a mob with a certain ckey*/ - /client/proc/jumptomob, /*allows us to jump to a specific mob*/ + /client/proc/jump_to, /*Opens a menu for jumping to an Area, Mob, Key or Coordinate*/ /client/proc/jumptoturf, /*allows us to jump to a specific turf*/ /client/proc/admin_call_shuttle, /*allows us to call the emergency shuttle*/ /client/proc/admin_cancel_shuttle, /*allows us to cancel the emergency shuttle, sending it back to centcomm*/ @@ -606,7 +603,7 @@ GLOBAL_LIST_INIT(admin_verbs_ticket, list( log_admin("[key_name(usr)] gave [key_name(T)] the disease [D].") message_admins("[key_name_admin(usr)] gave [key_name(T)] the disease [D].") -/client/proc/make_sound(var/obj/O in view()) // -- TLE +/client/proc/make_sound(obj/O in view()) // -- TLE set category = "Event" set name = "Make Sound" set desc = "Display a message to everyone who can hear the target" @@ -635,7 +632,7 @@ GLOBAL_LIST_INIT(admin_verbs_ticket, list( togglebuildmode(src.mob) SSblackbox.record_feedback("tally", "admin_verb", 1, "Toggle Build Mode") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -/client/proc/object_talk(var/msg as text) // -- TLE +/client/proc/object_talk(msg as text) // -- TLE set category = "Event" set name = "oSay" set desc = "Display a message to everyone who can hear the target" @@ -696,7 +693,7 @@ GLOBAL_LIST_INIT(admin_verbs_ticket, list( return var/datum/db_query/rank_read = SSdbcore.NewQuery( - "SELECT rank FROM [format_table_name("admin")] WHERE ckey=:ckey", + "SELECT admin_rank FROM [format_table_name("admin")] WHERE ckey=:ckey", list("ckey" = ckey) ) @@ -722,7 +719,7 @@ GLOBAL_LIST_INIT(admin_verbs_ticket, list( return var/datum/db_query/admin_read = SSdbcore.NewQuery( - "SELECT ckey, rank, flags FROM [format_table_name("admin")] WHERE ckey=:ckey", + "SELECT ckey, admin_rank, flags FROM [format_table_name("admin")] WHERE ckey=:ckey", list("ckey" = ckey) ) @@ -987,7 +984,7 @@ GLOBAL_LIST_INIT(admin_verbs_ticket, list( to_chat(T, "Man up and deal with it.") to_chat(T, "Move on.") - T << 'sound/voice/manup1.ogg' + SEND_SOUND(T, sound('sound/voice/manup1.ogg')) log_admin("[key_name(usr)] told [key_name(T)] to man up and deal with it.") message_admins("[key_name_admin(usr)] told [key_name(T)] to man up and deal with it.") @@ -1003,9 +1000,10 @@ GLOBAL_LIST_INIT(admin_verbs_ticket, list( var/confirm = alert("Are you sure you want to send the global message?", "Confirm Man Up Global", "Yes", "No") if(confirm == "Yes") - for(var/mob/T as mob in GLOB.mob_list) - to_chat(T, "
      Man up.
      Deal with it.
      Move on.

      ") - T << 'sound/voice/manup1.ogg' + var/manned_up_sound = sound('sound/voice/manup1.ogg') + for(var/sissy in GLOB.player_list) + to_chat(sissy, "
      Man up.
      Deal with it.
      Move on.

      ") + SEND_SOUND(sissy, manned_up_sound) log_admin("[key_name(usr)] told everyone to man up and deal with it.") message_admins("[key_name_admin(usr)] told everyone to man up and deal with it.") diff --git a/code/modules/admin/banjob.dm b/code/modules/admin/banjob.dm index c7a9332f569..51b1299079b 100644 --- a/code/modules/admin/banjob.dm +++ b/code/modules/admin/banjob.dm @@ -42,6 +42,19 @@ GLOBAL_DATUM_INIT(jobban_regex, /regex, regex("(\[\\S]+) - (\[^#]+\[^# ])(?: ## else return 0 +/proc/jobban_isbanned_ckey(ckey, rank) + if(!ckey || !rank) + return null + + if(config.guest_jobban && guest_jobbans(rank)) + if(IsGuestKey(ckey)) + return "Guest Job-ban" + + if(GLOB.jobban_assoclist[ckey]) + return GLOB.jobban_assoclist[ckey][rank] + + return null + /proc/jobban_loadbanfile() if(config.ban_legacy_system) var/savefile/S=new("data/job_full.ban") @@ -68,7 +81,7 @@ GLOBAL_DATUM_INIT(jobban_regex, /regex, regex("(\[\\S]+) - (\[^#]+\[^# ])(?: ## //Job permabans var/datum/db_query/permabans = SSdbcore.NewQuery("SELECT ckey, job FROM [format_table_name("ban")] WHERE bantype = 'JOB_PERMABAN' AND isnull(unbanned)") - if(!permabans.warn_execute()) + if(!permabans.warn_execute(async=FALSE)) qdel(permabans) return FALSE @@ -83,7 +96,7 @@ GLOBAL_DATUM_INIT(jobban_regex, /regex, regex("(\[\\S]+) - (\[^#]+\[^# ])(?: ## // Job tempbans var/datum/db_query/tempbans = SSdbcore.NewQuery("SELECT ckey, job FROM [format_table_name("ban")] WHERE bantype = 'JOB_TEMPBAN' AND isnull(unbanned) AND expiration_time > Now()") - if(!tempbans.warn_execute()) + if(!tempbans.warn_execute(async=FALSE)) qdel(tempbans) return FALSE @@ -105,7 +118,7 @@ GLOBAL_DATUM_INIT(jobban_regex, /regex, regex("(\[\\S]+) - (\[^#]+\[^# ])(?: ## /proc/jobban_unban_client(ckey, rank) jobban_remove("[ckey] - [rank]") -/proc/ban_unban_log_save(var/formatted_log) +/proc/ban_unban_log_save(formatted_log) text2file(formatted_log,"data/ban_unban_log.txt") diff --git a/code/modules/admin/cookielog.dm b/code/modules/admin/cookielog.dm new file mode 100644 index 00000000000..a2de0c126fe --- /dev/null +++ b/code/modules/admin/cookielog.dm @@ -0,0 +1,113 @@ +////////////////////////////////////////////////////////////////////////////////////// +// This file houses all the code for cookie datum serialization and deserialization +// +// If you are going to modify ANYTHING in here, please test it THOROUGHLY +// The serialization and deserialization here is so complicated that you WILL break something here +// PLEASE test things properly if you modify this file. -aa07 +// +////////////////////////////////////////////////////////////////////////////////////// + +// Everything in this file is intentionally NOT autodocumented. PLEASE keep it that way. +// All these defines are integral to the workings and mesh together with the database. +// DO NOT EDIT THESE UNDER ANY CIRCUMSTANCES EVER +#define COOKIERECORD_FIRST_INFRACTION "First cookie match: " +#define COOKIERECORD_LAST_INFRACTION "Last cookie match: " +#define COOKIERECORD_TOTAL_INFRACTIONS "Total cookie matches: " +#define COOKIERECORD_MATCHED_CKEYS "Matched ckeys: " +#define COOKIERECORD_MATCHED_IPS "Matched IPs: " +#define COOKIERECORD_MATCHED_CIDS "Matched CIDS: " +#define COOKIERECORD_PSUEDO_CKEY "ALICE-COOKIE_RECORD" + +/datum/cookie_record + var/cookie_holder_ckey + var/first_infraction_date + var/last_infraction_date + var/infraction_count + var/list/matched_ckeys = list() + var/list/matched_ips = list() + var/list/matched_cids = list() + +// Some of these params can be null, others CAN NOT +/datum/cookie_record/New(holder_ckey, matched_ckey, matched_ip, matched_cid) + // Right off the bat + cookie_holder_ckey = holder_ckey + + var/has_note = FALSE + var/raw_text = "" + // Now lets see if we have a note logging the infraction in the past + var/datum/db_query/check_existing_note = SSdbcore.NewQuery("SELECT notetext FROM [format_table_name("notes")] WHERE ckey=:ckey AND adminckey=:ackey", list( + "ckey" = cookie_holder_ckey, + "ackey" = COOKIERECORD_PSUEDO_CKEY + )) + if(!check_existing_note.warn_execute()) + qdel(check_existing_note) + return + if(check_existing_note.NextRow()) + has_note = TRUE + raw_text = check_existing_note.item[1] + qdel(check_existing_note) + + if(has_note) + deserialize_and_load(raw_text) + infraction_count++ + else + // Sane defaults + first_infraction_date = SQLtime() + infraction_count = 1 + + last_infraction_date = SQLtime() + matched_ckeys |= matched_ckey + matched_ips |= matched_ip + matched_cids |= matched_cid + + serialize_and_save(has_note) + +/* + Expected output below. These are parsed from raw_text by splitting by
      + [1] COOKIERECORD_FIRST_INFRACTION + [2] COOKIERECORD_LAST_INFRACTION + [3] COOKIERECORD_TOTAL_INFRACTIONS + [4] COOKIERECORD_MATCHED_CKEYS + [5] COOKIERECORD_MATCHED_IPS + [6] COOKIERECORD_MATCHED_CIDS +*/ + +/datum/cookie_record/proc/deserialize_and_load(raw_text) + var/list/lines = splittext(raw_text, "
      ") + // Text + first_infraction_date = splittext(lines[1], COOKIERECORD_FIRST_INFRACTION)[2] + last_infraction_date = splittext(lines[2], COOKIERECORD_LAST_INFRACTION)[2] + // Number + infraction_count = text2num(splittext(lines[3], COOKIERECORD_TOTAL_INFRACTIONS)[2]) // Make sure its a number + // Lists + matched_ckeys = splittext(splittext(lines[4], COOKIERECORD_MATCHED_CKEYS)[2], ",") + matched_ips = splittext(splittext(lines[5], COOKIERECORD_MATCHED_IPS)[2], ",") + matched_cids = splittext(splittext(lines[6], COOKIERECORD_MATCHED_CIDS)[2], ",") + +/datum/cookie_record/proc/serialize_and_save(has_note) + var/serialized_text + var/list/serialized_list = list() + serialized_list.len = 6 // Make it 6 off the bat + + serialized_list[1] = "[COOKIERECORD_FIRST_INFRACTION][first_infraction_date]" + serialized_list[2] = "[COOKIERECORD_LAST_INFRACTION][last_infraction_date]" + serialized_list[3] = "[COOKIERECORD_TOTAL_INFRACTIONS][infraction_count]" + serialized_list[4] = "[COOKIERECORD_MATCHED_CKEYS][matched_ckeys.Join(",")]" + serialized_list[5] = "[COOKIERECORD_MATCHED_IPS][matched_ips.Join(",")]" + serialized_list[6] = "[COOKIERECORD_MATCHED_CIDS][matched_cids.Join(",")]" + + serialized_text = serialized_list.Join("
      ") + + if(has_note) // They have a note. Update. + var/datum/db_query/update_existing_note = SSdbcore.NewQuery("UPDATE [format_table_name("notes")] SET notetext=:nt, timestamp=NOW(), round_id=:rid WHERE ckey=:ckey AND adminckey=:ackey", list( + "nt" = serialized_text, + "rid" = GLOB.round_id, + "ckey" = cookie_holder_ckey, + "ackey" = COOKIERECORD_PSUEDO_CKEY + )) + if(!update_existing_note.warn_execute()) + qdel(update_existing_note) + return + qdel(update_existing_note) + else // They dont have a note. Insert. + add_note(cookie_holder_ckey, serialized_text, adminckey = COOKIERECORD_PSUEDO_CKEY, logged = FALSE, checkrights = FALSE, automated = TRUE) diff --git a/code/modules/admin/create_mob.dm b/code/modules/admin/create_mob.dm index 616d5aa9ee8..6740a3d59b7 100644 --- a/code/modules/admin/create_mob.dm +++ b/code/modules/admin/create_mob.dm @@ -1,5 +1,5 @@ GLOBAL_VAR(create_mob_html) -/datum/admins/proc/create_mob(var/mob/user) +/datum/admins/proc/create_mob(mob/user) if(!GLOB.create_mob_html) var/mobjs = null mobjs = jointext(typesof(/mob), ";") diff --git a/code/modules/admin/create_object.dm b/code/modules/admin/create_object.dm index c311be0d017..99706d19950 100644 --- a/code/modules/admin/create_object.dm +++ b/code/modules/admin/create_object.dm @@ -1,7 +1,7 @@ GLOBAL_VAR(create_object_html) GLOBAL_LIST_INIT(create_object_forms, list(/obj, /obj/structure, /obj/machinery, /obj/effect, /obj/item, /obj/mecha, /obj/item/clothing, /obj/item/stack, /obj/item/reagent_containers, /obj/item/gun)) -/datum/admins/proc/create_object(var/mob/user) +/datum/admins/proc/create_object(mob/user) if(!GLOB.create_object_html) var/objectjs = null objectjs = jointext(typesof(/obj), ";") @@ -10,7 +10,7 @@ GLOBAL_LIST_INIT(create_object_forms, list(/obj, /obj/structure, /obj/machinery, user << browse(replacetext(GLOB.create_object_html, "/* ref src */", UID()), "window=create_object;size=425x475") -/datum/admins/proc/quick_create_object(var/mob/user) +/datum/admins/proc/quick_create_object(mob/user) var/path = input("Select the path of the object you wish to create.", "Path", /obj) in GLOB.create_object_forms var/html_form = GLOB.create_object_forms[path] diff --git a/code/modules/admin/create_turf.dm b/code/modules/admin/create_turf.dm index c65c7b22b1a..9ef3b465194 100644 --- a/code/modules/admin/create_turf.dm +++ b/code/modules/admin/create_turf.dm @@ -1,5 +1,5 @@ GLOBAL_VAR(create_turf_html) -/datum/admins/proc/create_turf(var/mob/user) +/datum/admins/proc/create_turf(mob/user) if(!GLOB.create_turf_html) var/turfjs = null turfjs = jointext(typesof(/turf), ";") diff --git a/code/modules/admin/db_ban/functions.dm b/code/modules/admin/db_ban/functions.dm index 126e584e864..24c2c558e2e 100644 --- a/code/modules/admin/db_ban/functions.dm +++ b/code/modules/admin/db_ban/functions.dm @@ -1,6 +1,6 @@ #define MAX_ADMIN_BANS_PER_ADMIN 1 -/datum/admins/proc/DB_ban_record(var/bantype, var/mob/banned_mob, var/duration = -1, var/reason, var/job = "", var/rounds = 0, var/banckey = null, var/banip = null, var/bancid = null) +/datum/admins/proc/DB_ban_record(bantype, mob/banned_mob, duration = -1, reason, job = "", rounds = 0, banckey = null, banip = null, bancid = null) if(!check_rights(R_BAN)) return @@ -146,8 +146,8 @@ qdel(adm_query) var/datum/db_query/query_insert = SSdbcore.NewQuery({" - INSERT INTO [format_table_name("ban")] (`id`,`bantime`,`serverip`,`bantype`,`reason`,`job`,`duration`,`rounds`,`expiration_time`,`ckey`,`computerid`,`ip`,`a_ckey`,`a_computerid`,`a_ip`,`who`,`adminwho`,`edits`,`unbanned`,`unbanned_datetime`,`unbanned_ckey`,`unbanned_computerid`,`unbanned_ip`) - VALUES (null, Now(), :serverip, :bantype_str, :reason, :job, :duration, :rounds, Now() + INTERVAL :duration MINUTE, :ckey, :computerid, :ip, :a_ckey, :a_computerid, :a_ip, :who, :adminwho, '', null, null, null, null, null) + INSERT INTO [format_table_name("ban")] (`id`,`bantime`,`serverip`,`bantype`,`reason`,`job`,`duration`,`rounds`,`expiration_time`,`ckey`,`computerid`,`ip`,`a_ckey`,`a_computerid`,`a_ip`,`who`,`adminwho`,`edits`,`unbanned`,`unbanned_datetime`,`unbanned_ckey`,`unbanned_computerid`,`unbanned_ip`,`ban_round_id`,`unbanned_round_id`) + VALUES (null, Now(), :serverip, :bantype_str, :reason, :job, :duration, :rounds, Now() + INTERVAL :duration MINUTE, :ckey, :computerid, :ip, :a_ckey, :a_computerid, :a_ip, :who, :adminwho, '', null, null, null, null, null, :roundid, null) "}, list( // Get ready for parameters "serverip" = serverip, @@ -163,7 +163,8 @@ "a_computerid" = a_computerid, "a_ip" = a_ip, "who" = who, - "adminwho" = adminwho + "adminwho" = adminwho, + "roundid" = GLOB.round_id )) if(!query_insert.warn_execute()) qdel(query_insert) @@ -185,7 +186,7 @@ else flag_account_for_forum_sync(ckey) -/datum/admins/proc/DB_ban_unban(var/ckey, var/bantype, var/job = "") +/datum/admins/proc/DB_ban_unban(ckey, bantype, job = "") if(!check_rights(R_BAN)) return @@ -274,7 +275,7 @@ else flag_account_for_forum_sync(ckey) -/datum/admins/proc/DB_ban_edit(var/banid = null, var/param = null) +/datum/admins/proc/DB_ban_edit(banid = null, param = null) if(!check_rights(R_BAN)) return @@ -360,7 +361,7 @@ to_chat(usr, "Cancelled") return -/datum/admins/proc/DB_ban_unban_by_id(var/id) +/datum/admins/proc/DB_ban_unban_by_id(id) if(!check_rights(R_BAN)) return @@ -399,10 +400,11 @@ var/unban_computerid = src.owner:computer_id var/unban_ip = src.owner:address - var/datum/db_query/query_update = SSdbcore.NewQuery("UPDATE [format_table_name("ban")] SET unbanned = 1, unbanned_datetime = Now(), unbanned_ckey=:unban_ckey, unbanned_computerid=:unban_computerid, unbanned_ip=:unban_ip WHERE id=:id", list( + var/datum/db_query/query_update = SSdbcore.NewQuery("UPDATE [format_table_name("ban")] SET unbanned = 1, unbanned_datetime = Now(), unbanned_ckey=:unban_ckey, unbanned_computerid=:unban_computerid, unbanned_ip=:unban_ip, unbanned_round_id=:roundid WHERE id=:id", list( "unban_ckey" = unban_ckey, "unban_computerid" = unban_computerid, "unban_ip" = unban_ip, + "roundid" = GLOB.round_id, "id" = id )) if(!query_update.warn_execute()) @@ -426,7 +428,7 @@ holder.DB_ban_panel() -/datum/admins/proc/DB_ban_panel(var/playerckey = null, var/adminckey = null, var/playerip = null, var/playercid = null, var/dbbantype = null, var/match = null) +/datum/admins/proc/DB_ban_panel(playerckey = null, adminckey = null, playerip = null, playercid = null, dbbantype = null, match = null) if(!usr.client) return @@ -477,6 +479,7 @@ output += "" output += "
       12345
      [block-1]
      " output += "Reason:

      " + output += " Auto populate CID & IP for online players
      " output += "" output += "" @@ -582,7 +585,7 @@ var/datum/db_query/select_query = SSdbcore.NewQuery({" - SELECT id, bantime, bantype, reason, job, duration, expiration_time, ckey, a_ckey, unbanned, unbanned_ckey, unbanned_datetime, edits, ip, computerid + SELECT id, bantime, bantype, reason, job, duration, expiration_time, ckey, a_ckey, unbanned, unbanned_ckey, unbanned_datetime, edits, ip, computerid, ban_round_id, unbanned_round_id FROM [format_table_name("ban")] WHERE 1 [playersearch] [adminsearch] [ipsearch] [cidsearch] [bantypesearch] ORDER BY bantime DESC LIMIT 100"}, sql_params) if(!select_query.warn_execute()) @@ -605,6 +608,8 @@ var/edits = select_query.item[13] var/ip = select_query.item[14] var/cid = select_query.item[15] + var/ban_round_id = select_query.item[16] + var/unban_round_id = select_query.item[17] var/lcolor = blcolor var/dcolor = bdcolor @@ -632,7 +637,7 @@ output += "" output += "[typedesc]" output += "[ckey]" - output += "[bantime]" + output += "[bantime][ban_round_id ? " (Round [ban_round_id])" : ""]" output += "[ackey]" output += "[(unbanned) ? "" : "Unban"]" output += "" @@ -652,7 +657,7 @@ output += "" if(unbanned) output += "" - output += "UNBANNED by admin [unbanckey] on [unbantime]" + output += "UNBANNED by admin [unbanckey] on [unbantime][unban_round_id ? " (Round [unban_round_id])" : ""]" output += "" output += "" output += " " diff --git a/code/modules/admin/holder2.dm b/code/modules/admin/holder2.dm index 470293bfe76..2aacdb50b54 100644 --- a/code/modules/admin/holder2.dm +++ b/code/modules/admin/holder2.dm @@ -78,7 +78,7 @@ proc/admin_proc() NOTE: it checks usr! not src! So if you're checking somebody's rank in a proc which they did not call you will have to do something like if(client.holder.rights & R_ADMIN) yourself. */ -/proc/check_rights(rights_required, show_msg=1, var/mob/user = usr) +/proc/check_rights(rights_required, show_msg=1, mob/user = usr) if(user && user.client) if(rights_required) if(user.client.holder) diff --git a/code/modules/admin/ipintel.dm b/code/modules/admin/ipintel.dm index 70d02303ed7..b0d411a2727 100644 --- a/code/modules/admin/ipintel.dm +++ b/code/modules/admin/ipintel.dm @@ -83,7 +83,7 @@ qdel(query_add_ip_intel) -/proc/ip_intel_query(ip, var/retryed=0) +/proc/ip_intel_query(ip, retryed=0) . = -1 //default if(!ip) return diff --git a/code/modules/admin/permissionverbs/permissionedit.dm b/code/modules/admin/permissionverbs/permissionedit.dm index 748dee2cae3..0abbb877350 100644 --- a/code/modules/admin/permissionverbs/permissionedit.dm +++ b/code/modules/admin/permissionverbs/permissionedit.dm @@ -51,7 +51,7 @@ usr << browse(output,"window=editrights;size=600x500") -/datum/admins/proc/log_admin_rank_modification(var/adm_ckey, var/new_rank) +/datum/admins/proc/log_admin_rank_modification(adm_ckey, new_rank) if(config.admin_legacy_system) return if(!usr.client) @@ -90,7 +90,7 @@ qdel(select_query) flag_account_for_forum_sync(adm_ckey) if(new_admin) - var/datum/db_query/insert_query = SSdbcore.NewQuery("INSERT INTO [format_table_name("admin")] (`id`, `ckey`, `rank`, `level`, `flags`) VALUES (null, :adm_ckey, :new_rank, -1, 0)", list( + var/datum/db_query/insert_query = SSdbcore.NewQuery("INSERT INTO [format_table_name("admin")] (`id`, `ckey`, `admin_rank`, `level`, `flags`) VALUES (null, :adm_ckey, :new_rank, -1, 0)", list( "adm_ckey" = adm_ckey, "new_rank" = new_rank )) @@ -113,7 +113,7 @@ to_chat(usr, "New admin added.") else if(!isnull(admin_id) && isnum(admin_id)) - var/datum/db_query/insert_query = SSdbcore.NewQuery("UPDATE [format_table_name("admin")] SET rank=:new_rank WHERE id=:admin_id", list( + var/datum/db_query/insert_query = SSdbcore.NewQuery("UPDATE [format_table_name("admin")] SET admin_rank=:new_rank WHERE id=:admin_id", list( "new_rank" = new_rank, "admin_id" = admin_id, )) @@ -134,7 +134,7 @@ qdel(log_query) to_chat(usr, "Admin rank changed.") -/datum/admins/proc/log_admin_permission_modification(var/adm_ckey, var/new_permission) +/datum/admins/proc/log_admin_permission_modification(adm_ckey, new_permission) if(IsAdminAdvancedProcCall()) to_chat(usr, "Admin edit blocked: Advanced ProcCall detected.") message_admins("[key_name(usr)] attempted to edit admin ranks via advanced proc-call") diff --git a/code/modules/admin/player_panel.dm b/code/modules/admin/player_panel.dm index 2986035e15a..248e1e262c2 100644 --- a/code/modules/admin/player_panel.dm +++ b/code/modules/admin/player_panel.dm @@ -494,9 +494,6 @@ if(SSticker.mode.vampire_enthralled.len) dat += check_role_table("Vampire Thralls", SSticker.mode.vampire_enthralled) - if(SSticker.mode.devils.len) - dat += check_role_table("Devils", SSticker.mode.devils) - if(SSticker.mode.xenos.len) dat += check_role_table("Xenos", SSticker.mode.xenos) diff --git a/code/modules/admin/sql_notes.dm b/code/modules/admin/sql_notes.dm index 0a9db55cdf2..737efd1480d 100644 --- a/code/modules/admin/sql_notes.dm +++ b/code/modules/admin/sql_notes.dm @@ -1,5 +1,5 @@ // Do not attemtp to remove the blank string from the server arg. It will break DB saving. -/proc/add_note(target_ckey, notetext, timestamp, adminckey, logged = 1, server = "", checkrights = 1) +/proc/add_note(target_ckey, notetext, timestamp, adminckey, logged = 1, server = "", checkrights = 1, show_after = TRUE, automated = FALSE) if(checkrights && !check_rights(R_ADMIN|R_MOD)) return if(!SSdbcore.IsConnected()) @@ -57,15 +57,20 @@ if(config && config.server_name) server = config.server_name + // Force cast this to 1/0 incase someone tries to feed bad data + automated = !!automated + var/datum/db_query/query_noteadd = SSdbcore.NewQuery({" - INSERT INTO [format_table_name("notes")] (ckey, timestamp, notetext, adminckey, server, crew_playtime) - VALUES (:targetckey, NOW(), :notetext, :adminkey, :server, :crewnum) + INSERT INTO [format_table_name("notes")] (ckey, timestamp, notetext, adminckey, server, crew_playtime, round_id, automated) + VALUES (:targetckey, NOW(), :notetext, :adminkey, :server, :crewnum, :roundid, :automated) "}, list( "targetckey" = target_ckey, "notetext" = notetext, "adminkey" = adminckey, "server" = server, - "crewnum" = crew_number + "crewnum" = crew_number, + "roundid" = GLOB.round_id, + "automated" = automated )) if(!query_noteadd.warn_execute()) qdel(query_noteadd) @@ -74,7 +79,8 @@ if(logged) log_admin("[usr ? key_name(usr) : adminckey] has added a note to [target_ckey]: [notetext]") message_admins("[usr ? key_name_admin(usr) : adminckey] has added a note to [target_ckey]:
      [notetext]") - show_note(target_ckey) + if(show_after) + show_note(target_ckey) /proc/remove_note(note_id) if(!check_rights(R_ADMIN|R_MOD)) @@ -124,7 +130,7 @@ return note_id = text2num(note_id) var/target_ckey - var/datum/db_query/query_find_note_edit = SSdbcore.NewQuery("SELECT ckey, notetext, adminckey FROM [format_table_name("notes")] WHERE id=:note_id", list( + var/datum/db_query/query_find_note_edit = SSdbcore.NewQuery("SELECT ckey, notetext, adminckey, automated FROM [format_table_name("notes")] WHERE id=:note_id", list( "note_id" = note_id )) if(!query_find_note_edit.warn_execute()) @@ -134,6 +140,10 @@ target_ckey = query_find_note_edit.item[1] var/old_note = query_find_note_edit.item[2] var/adminckey = query_find_note_edit.item[3] + var/automated = query_find_note_edit.item[4] + if(automated) + to_chat(usr, "That note is generated automatically. You can't edit it.") + return var/new_note = input("Input new note", "New Note", "[old_note]") as message|null if(!new_note) return @@ -171,7 +181,7 @@ if(target_ckey) var/target_sql_ckey = ckey(target_ckey) var/datum/db_query/query_get_notes = SSdbcore.NewQuery({" - SELECT id, timestamp, notetext, adminckey, last_editor, server, crew_playtime + SELECT id, timestamp, notetext, adminckey, last_editor, server, crew_playtime, round_id, automated FROM [format_table_name("notes")] WHERE ckey=:targetkey ORDER BY timestamp"}, list( "targetkey" = target_sql_ckey )) @@ -190,14 +200,16 @@ var/last_editor = query_get_notes.item[5] var/server = query_get_notes.item[6] var/mins = text2num(query_get_notes.item[7]) - output += "[timestamp] | [server] | [adminckey]" + var/round_id = text2num(query_get_notes.item[8]) + var/automated = text2num(query_get_notes.item[9]) // 0/1 bool stored in table + output += "[timestamp][round_id ? " (Round [round_id])" : ""] | [server] | [adminckey]" if(mins) var/playstring = get_exp_format(mins) output += " | [playstring] as Crew" output += "" if(!linkless) - output += " \[Remove Note\] \[Edit Note\]" + output += " \[Remove Note\] [automated ? "\[Automated Note\]" : "\[Edit Note\]"]" if(last_editor) output += " Last edit by [last_editor] (Click here to see edit log)" output += "
      [notetext]
      " @@ -227,7 +239,7 @@ output += "[index_ckey]
      " CHECK_TICK qdel(query_list_notes) - message_admins("The note search started by [usr.ckey] has complete. CPU should return to normal.") + message_admins("The note search started by [usr.ckey] has completed. CPU should return to normal.") else output += "
      \[Add Note\]
      " output += ruler diff --git a/code/modules/admin/stickyban.dm b/code/modules/admin/stickyban.dm index 61759f2e36d..0c2af216d2e 100644 --- a/code/modules/admin/stickyban.dm +++ b/code/modules/admin/stickyban.dm @@ -167,7 +167,7 @@ "} usr << browse(html,"window=stickybans;size=700x400") -/proc/get_stickyban_from_ckey(var/ckey) +/proc/get_stickyban_from_ckey(ckey) if(!ckey) return null ckey = ckey(ckey) @@ -177,7 +177,7 @@ . = stickyban2list(world.GetConfig("ban",key)) break -/proc/stickyban2list(var/ban) +/proc/stickyban2list(ban) if(!ban) return null . = params2list(ban) @@ -186,7 +186,7 @@ .["IP"] = splittext(.["IP"], ",") .["computer_id"] = splittext(.["computer_id"], ",") -/proc/list2stickyban(var/list/ban) +/proc/list2stickyban(list/ban) if(!ban || !islist(ban)) return null . = ban.Copy() diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index ae72433bd77..26fa05cebfb 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -17,7 +17,7 @@ if(!isclient(C)) return - C << 'sound/effects/adminhelp.ogg' + SEND_SOUND(C, sound('sound/effects/adminhelp.ogg')) to_chat(C, "- AdminHelp Rejected! -") to_chat(C, "Your admin help was rejected.") @@ -108,6 +108,10 @@ var/banjob = href_list["dbbanaddjob"] var/banreason = href_list["dbbanreason"] + var/job_ban = FALSE + var/multi_job = FALSE + var/list/jobs_to_ban = list() + banckey = ckey(banckey) switch(bantype) @@ -127,10 +131,12 @@ to_chat(usr, "Not enough parameters (Requires ckey, reason and job)") return banduration = null + job_ban = TRUE if(BANTYPE_JOB_TEMP) if(!banckey || !banreason || !banjob || !banduration) to_chat(usr, "Not enough parameters (Requires ckey, reason and job)") return + job_ban = TRUE if(BANTYPE_APPEARANCE) if(!banckey || !banreason) to_chat(usr, "Not enough parameters (Requires ckey and reason)") @@ -151,11 +157,11 @@ var/mob/playermob - for(var/mob/M in GLOB.player_list) - if(M.ckey == banckey) - playermob = M - break - + if("autopopulate" in href_list) + for(var/mob/M in GLOB.player_list) + if(M.ckey == banckey) + playermob = M + break banreason = "(MANUAL BAN) "+banreason @@ -167,7 +173,68 @@ else message_admins("Ban process: A mob matching [playermob.ckey] was found at location [playermob.x], [playermob.y], [playermob.z]. Custom IP and computer id fields replaced with the IP and computer id from the located mob") - DB_ban_record(bantype, playermob, banduration, banreason, banjob, null, banckey, banip, bancid ) + if(job_ban) + if(banjob in list("commanddept","securitydept","engineeringdept","medicaldept","sciencedept","supportdept","nonhumandept")) + multi_job = TRUE + switch(banjob) + if("commanddept") + for(var/jobPos in GLOB.command_positions) + if(!jobPos) continue + var/datum/job/temp = SSjobs.GetJob(jobPos) + if(!temp) continue + jobs_to_ban += temp.title + if("securitydept") + for(var/jobPos in GLOB.security_positions) + if(!jobPos) continue + var/datum/job/temp = SSjobs.GetJob(jobPos) + if(!temp) continue + jobs_to_ban += temp.title + if("engineeringdept") + for(var/jobPos in GLOB.engineering_positions) + if(!jobPos) continue + var/datum/job/temp = SSjobs.GetJob(jobPos) + if(!temp) continue + jobs_to_ban += temp.title + if("medicaldept") + for(var/jobPos in GLOB.medical_positions) + if(!jobPos) continue + var/datum/job/temp = SSjobs.GetJob(jobPos) + if(!temp) continue + jobs_to_ban += temp.title + if("sciencedept") + for(var/jobPos in GLOB.science_positions) + if(!jobPos) continue + var/datum/job/temp = SSjobs.GetJob(jobPos) + if(!temp) continue + jobs_to_ban += temp.title + if("supportdept") + for(var/jobPos in GLOB.support_positions) + if(!jobPos) continue + var/datum/job/temp = SSjobs.GetJob(jobPos) + if(!temp) continue + jobs_to_ban += temp.title + if("nonhumandept") + jobs_to_ban += "pAI" + for(var/jobPos in GLOB.nonhuman_positions) + if(!jobPos) continue + var/datum/job/temp = SSjobs.GetJob(jobPos) + if(!temp) continue + jobs_to_ban += temp.title + + // If the job ban is for multiple jobs in one group (IE: Command), iterate through jobs and ban each individually + if(multi_job) + //Create a list of unbanned jobs within joblist + var/list/notbannedlist = list() + for(var/job in jobs_to_ban) + if(!jobban_isbanned_ckey(banckey, job)) + notbannedlist += job + + for(var/job in notbannedlist) + DB_ban_record(bantype, playermob, banduration, banreason, job, null, banckey, banip, bancid) + + // Otherwise, do it normally + else + DB_ban_record(bantype, playermob, banduration, banreason, banjob, null, banckey, banip, bancid) else if(href_list["editrights"]) @@ -317,6 +384,8 @@ SSticker.delay_end = !SSticker.delay_end log_admin("[key_name(usr)] [SSticker.delay_end ? "delayed the round end" : "has made the round end normally"].") message_admins("[key_name_admin(usr)] [SSticker.delay_end ? "delayed the round end" : "has made the round end normally"].", 1) + if(SSticker.delay_end) + SSticker.real_reboot_time = 0 // If they set this at round end, show the "Reboot was cancelled by an admin" message instantly href_list["secretsadmin"] = "check_antagonist" else if(href_list["simplemake"]) @@ -1806,14 +1875,16 @@ log_admin("Admin [key_name_admin(usr)] has unlocked the Cult's ability to summon Nar'Sie.") else if(href_list["adminplayerobservecoodjump"]) - if(!check_rights(R_ADMIN)) return + var/client/C = usr.client + if(!isobserver(usr)) + if(!check_rights(R_ADMIN)) // Need to be admin to aghost + return + C.admin_ghost() var/x = text2num(href_list["X"]) var/y = text2num(href_list["Y"]) var/z = text2num(href_list["Z"]) - var/client/C = usr.client - if(!isobserver(usr)) C.admin_ghost() sleep(2) C.jumptocoord(x,y,z) @@ -2016,15 +2087,15 @@ logmsg = "a heal over time." if("Permanent Regeneration") H.dna.SetSEState(GLOB.regenerateblock, 1) - genemutcheck(H, GLOB.regenerateblock, null, MUTCHK_FORCED) + singlemutcheck(H, GLOB.regenerateblock, MUTCHK_FORCED) H.update_mutations() H.gene_stability = 100 logmsg = "permanent regeneration." if("Super Powers") - var/list/default_genes = list(GLOB.regenerateblock, GLOB.breathlessblock, GLOB.coldblock) - for(var/gene in default_genes) - H.dna.SetSEState(gene, 1) - genemutcheck(H, gene, null, MUTCHK_FORCED) + var/list/default_mutations = list(GLOB.regenerateblock, GLOB.breathlessblock, GLOB.coldblock) + for(var/mutation in default_mutations) + H.dna.SetSEState(mutation, 1) + singlemutcheck(H, mutation, MUTCHK_FORCED) H.update_mutations() H.gene_stability = 100 logmsg = "superpowers." @@ -2125,7 +2196,7 @@ switch(punishment) // These smiting types are valid for all living mobs if("Lightning bolt") - M.electrocute_act(5, "Lightning Bolt", safety = TRUE, override = TRUE) + M.electrocute_act(5, "Lightning Bolt", flags = SHOCK_NOGLOVES) playsound(get_turf(M), 'sound/magic/lightningshock.ogg', 50, 1, -1) M.adjustFireLoss(75) M.Weaken(5) @@ -2163,7 +2234,7 @@ logmsg = "starvation." if("Cluwne") H.makeCluwne() - H.mutations |= NOCLONE + ADD_TRAIT(H, TRAIT_BADDNA, "smiting") logmsg = "cluwned." if("Mutagen Cookie") var/obj/item/reagent_containers/food/snacks/cookie/evilcookie = new /obj/item/reagent_containers/food/snacks/cookie @@ -2184,7 +2255,7 @@ H.equip_to_slot_or_del(evilcookie, slot_l_hand) logmsg = "a hellwater cookie." if("Hunter") - H.mutations |= NOCLONE + ADD_TRAIT(H, TRAIT_BADDNA, "smiting") usr.client.create_eventmob_for(H, 1) logmsg = "hunter." if("Crew Traitor") @@ -2255,7 +2326,7 @@ message_admins("[key_name_admin(usr)] sent [H.job] [H] to cryo.") if(href_list["cryoafk"]) // Warn them if they are send to storage and are AFK to_chat(H, "The admins have moved you to cryo storage for being AFK. Please eject yourself (right click, eject) out of the cryostorage if you want to avoid being despawned.") - SEND_SOUND(H, 'sound/effects/adminhelp.ogg') + SEND_SOUND(H, sound('sound/effects/adminhelp.ogg')) if(H.client) window_flash(H.client) else if(href_list["FaxReplyTemplate"]) @@ -2859,20 +2930,32 @@ GLOB.event_announcement.Announce("Feedback surge detected in mass-distributions systems. Artifical gravity has been disabled whilst the system reinitializes. Further failures may result in a gravitational collapse and formation of blackholes. Have a nice day.") if("power") - SSblackbox.record_feedback("tally", "admin_secrets_fun_used", 1, "Power All APCs") - log_admin("[key_name(usr)] made all areas powered", 1) - message_admins("[key_name_admin(usr)] made all areas powered", 1) - power_restore() + switch(alert("What Would You Like to Do?", "Make All Areas Powered", "Power all APCs", "Repair all APCs", "Repair and Power APCs")) //Alert notification in this code for standarization purposes + if("Power all APCs") + power_restore(TRUE, 0) + SSblackbox.record_feedback("tally", "admin_secrets_fun_used", 1, "Power all APCs") + log_and_message_admins("[key_name_admin(usr)] powered all APCs", 1) + if("Repair all APCs") + power_restore(TRUE, 1) + SSblackbox.record_feedback("tally", "admin_secrets_fun_used", 1, "Repair all APCs") + log_and_message_admins("[key_name_admin(usr)] repaired all APCs", 1) + if("Repair and Power APCs") + power_restore(TRUE, 2) + SSblackbox.record_feedback("tally", "admin_secrets_fun_used", 1, "Repair and Power all APCs") + log_and_message_admins("[key_name_admin(usr)] repaired and powered all APCs", 1) if("unpower") - SSblackbox.record_feedback("tally", "admin_secrets_fun_used", 1, "Depower All APCs") - log_admin("[key_name(usr)] made all areas unpowered", 1) - message_admins("[key_name_admin(usr)] made all areas unpowered", 1) - power_failure() + if(alert("What Would You Like to Do?", "Make All Areas Unpowered", "Depower all APCs", "Short out APCs") == "Depower all APCs") + depower_apcs() + SSblackbox.record_feedback("tally", "admin_secrets_fun_used", 1, "Depower all APCs") + log_and_message_admins("[key_name_admin(usr)] made all areas unpowered", 1) + else + power_failure() + SSblackbox.record_feedback("tally", "admin_secrets_fun_used", 1, "Short out APCs") + log_and_message_admins("[key_name_admin(usr)] has shorted APCs", 1) if("quickpower") - SSblackbox.record_feedback("tally", "admin_secrets_fun_used", 1, "Power All SMESs") - log_admin("[key_name(usr)] made all SMESs powered", 1) - message_admins("[key_name_admin(usr)] made all SMESs powered", 1) power_restore_quick() + SSblackbox.record_feedback("tally", "admin_secrets_fun_used", 1, "Power All SMESs") + log_and_message_admins("[key_name(usr)] made all SMESs powered", 1) if("prisonwarp") if(!SSticker) alert("The game hasn't started yet!", null, null, null, null, null) @@ -2896,9 +2979,6 @@ if(!security) //strip their stuff before they teleport into a cell :downs: for(var/obj/item/W in H) - if(istype(W, /obj/item/organ/external)) - continue - //don't strip organs H.unEquip(W) if(H.client) H.client.screen -= W @@ -3421,9 +3501,63 @@ log_sql("[usr.key] | [response]") else if(answer == "no") log_sql("[usr.key] | Reported no server hang. Please investigate") + else if(href_list["suppresscidwarning"]) + if(!check_rights(R_ADMIN)) + return + add_note(href_list["suppresscidwarning"], CIDWARNING_SUPPRESSED_NOTETEXT, show_after = FALSE) + else if(href_list["viewkarma"]) + if(!check_rights(R_ADMIN)) + return + var/target_ckey = href_list["viewkarma"] -/client/proc/create_eventmob_for(var/mob/living/carbon/human/H, var/killthem = 0) + var/total_karma = 0 + var/spent_karma = 0 + var/unlocked_jobs = "" + var/unlocked_species = "" + // Get their totals + var/datum/db_query/query_get_totals = SSdbcore.NewQuery("SELECT karma, karmaspent FROM [format_table_name("karmatotals")] WHERE byondkey=:ckey", list( + "ckey" = target_ckey + )) + if(!query_get_totals.warn_execute()) + qdel(query_get_totals) + return + // Even if there aint a row, we can still assume the defaults of 0 above + if(query_get_totals.NextRow()) + total_karma = query_get_totals.item[1] + spent_karma = query_get_totals.item[2] + + qdel(query_get_totals) + + // Now get their unlocks + var/datum/db_query/query_get_unlocks = SSdbcore.NewQuery("SELECT job, species FROM [format_table_name("whitelist")] WHERE ckey=:ckey", list( + "ckey" = target_ckey + )) + if(!query_get_unlocks.warn_execute()) + qdel(query_get_unlocks) + return + if(query_get_unlocks.NextRow()) + unlocked_jobs = query_get_unlocks.item[1] + unlocked_species = query_get_unlocks.item[2] + + qdel(query_get_unlocks) + + // Pack it into a dat + var/dat = {" +
        +
      • Total Karma: [total_karma]
        • +
      • Spent Karma: [spent_karma]
        • +
      • Available Karma: [total_karma - spent_karma]
        • +
      • Unlocked Jobs: [unlocked_jobs]
        • +
      • Unlocked Species: [unlocked_species]
        • +
      + "} + + var/datum/browser/popup = new(usr, "view_karma", "Karma stats for [target_ckey]", 600, 300) + popup.set_content(dat) + popup.open(FALSE) + +/client/proc/create_eventmob_for(mob/living/carbon/human/H, killthem = 0) if(!check_rights(R_EVENT)) return var/admin_outfits = subtypesof(/datum/outfit/admin) @@ -3483,7 +3617,7 @@ tatorhud.join_hud(hunter_mob) set_antag_hud(hunter_mob, "hudsyndicate") -/proc/admin_jump_link(var/atom/target) +/proc/admin_jump_link(atom/target) if(!target) return // The way admin jump links handle their src is weirdly inconsistent... diff --git a/code/modules/admin/verbs/SDQL2/SDQL_2.dm b/code/modules/admin/verbs/SDQL2/SDQL_2.dm index c4eabef3eae..ad8b1ff90d0 100644 --- a/code/modules/admin/verbs/SDQL2/SDQL_2.dm +++ b/code/modules/admin/verbs/SDQL2/SDQL_2.dm @@ -437,7 +437,7 @@ return v -/proc/SDQL_function(var/datum/object, var/procname, var/list/arguments, source) +/proc/SDQL_function(datum/object, procname, list/arguments, source) var/list/new_args = list() for(var/arg in arguments) new_args[++new_args.len] = SDQL_expression(source, arg) diff --git a/code/modules/admin/verbs/SDQL2/SDQL_2_parser.dm b/code/modules/admin/verbs/SDQL2/SDQL_2_parser.dm index 50c852af03b..98334649315 100644 --- a/code/modules/admin/verbs/SDQL2/SDQL_2_parser.dm +++ b/code/modules/admin/verbs/SDQL2/SDQL_2_parser.dm @@ -311,7 +311,7 @@ //assignment: '=' expression -/datum/SDQL_parser/proc/assignment(var/i, var/list/node, var/list/assignment_list = list()) +/datum/SDQL_parser/proc/assignment(i, list/node, list/assignment_list = list()) assignment_list += token(i) if(token(i + 1) == ".") @@ -415,7 +415,7 @@ return i + 1 //array: '{' expression, expression, ... '}' -/datum/SDQL_parser/proc/array(var/i, var/list/node) +/datum/SDQL_parser/proc/array(i, list/node) // Arrays get turned into this: list("{", list(exp_1a = exp_1b, ...), ...), "{" is to mark the next node as an array. if(copytext(token(i), 1, 2) != "{") parse_error("Expected an array but found '[token(i)]'") diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm index 1ad69a31911..e206f345c0c 100644 --- a/code/modules/admin/verbs/adminhelp.dm +++ b/code/modules/admin/verbs/adminhelp.dm @@ -1,7 +1,5 @@ - - //This is a list of words which are ignored by the parser when comparing message contents for names. MUST BE IN LOWER CASE! -GLOBAL_LIST_INIT(adminhelp_ignored_words, list("unknown","the","a","an","of","monkey","alien","as")) +GLOBAL_LIST_INIT(adminhelp_ignored_words, list("unknown", "the", "a", "an", "of", "monkey", "alien", "as")) /client/verb/adminhelp() set category = "Admin" @@ -12,27 +10,28 @@ GLOBAL_LIST_INIT(adminhelp_ignored_words, list("unknown","the","a","an","of","mo to_chat(src, "Error: Admin-PM: You cannot send adminhelps (Muted).") return - adminhelped = 1 //Determines if they get the message to reply by clicking the name. + adminhelped = TRUE //Determines if they get the message to reply by clicking the name. var/msg - var/list/type = list("Mentorhelp","Adminhelp") - var/selected_type = input("Pick a category.", "Admin Help", null, null) as null|anything in type + var/list/type = list("Mentorhelp", "Adminhelp") + var/selected_type = input("Pick a category.", "Admin Help") as null|anything in type if(selected_type) - msg = clean_input("Please enter your message.", "Admin Help", null) + msg = clean_input("Please enter your message.", selected_type) - //clean the input msg if(!msg) return if(handle_spam_prevention(msg, MUTE_ADMINHELP, OOC_COOLDOWN)) return - msg = sanitize_simple(copytext(msg,1,MAX_MESSAGE_LEN)) - if(!msg) return + msg = sanitize_simple(copytext(msg, 1, MAX_MESSAGE_LEN)) + if(!msg) // No message after sanitisation + return + if(selected_type == "Mentorhelp") - SSmentor_tickets.newHelpRequest(src, msg) + SSmentor_tickets.newHelpRequest(src, msg) // Mhelp else - SStickets.newHelpRequest(src, msg) + SStickets.newHelpRequest(src, msg) // Ahelp //show it to the person adminhelping too to_chat(src, "[selected_type]      : [msg]      ") @@ -54,7 +53,7 @@ GLOBAL_LIST_INIT(adminhelp_ignored_words, list("unknown","the","a","an","of","mo var/inactive_mentors = mentorcount[3] if(active_mentors <= 0) - if(inactive_mentors > 0) + if(inactive_mentors) alerttext = " | **ALL MENTORS AFK**" else alerttext = " | **NO MENTORS ONLINE**" diff --git a/code/modules/admin/verbs/adminjump.dm b/code/modules/admin/verbs/adminjump.dm index 0a36b18dd26..ed2aff985f1 100644 --- a/code/modules/admin/verbs/adminjump.dm +++ b/code/modules/admin/verbs/adminjump.dm @@ -1,23 +1,56 @@ -/client/proc/Jump(area/A in return_sorted_areas()) - set name = "Jump to Area" - set desc = "Area to jump to" +/client/proc/jump_to() + set name = "Jump to..." + set desc = "Area, Mob, Key or Coordinate" set category = "Admin" + var/list/choices = list("Area", "Mob", "Key", "Coordinates") if(!check_rights(R_ADMIN)) return - if(!A) + var/chosen = input(src, null, "Jump to...") as null|anything in choices + if(!chosen) + return + + var/jumping // Thing to jump to + switch(chosen) + if("Area") + jumping = input(src, "Area to jump to", "Jump to Area") as null|anything in return_sorted_areas() + if(jumping) + return jumptoarea(jumping) + if("Mob") + jumping = input(src, "Mob to jump to", "Jump to Mob") as null|anything in GLOB.mob_list + if(jumping) + return jumptomob(jumping) + if("Key") + jumping = input(src, "Key to jump to", "Jump to Key") as null|anything in sortKey(GLOB.clients) + if(jumping) + return jumptokey(jumping) + if("Coordinates") + var/x = input(src, "X Coordinate", "Jump to Coordinates") as null|num + if(!x) + return + var/y = input(src, "Y Coordinate", "Jump to Coordinates") as null|num + if(!y) + return + var/z = input(src, "Z Coordinate", "Jump to Coordinates") as null|num + if(!z) + return + return jumptocoord(x, y, z) + + +/client/proc/jumptoarea(area/A) + if(!A || !check_rights(R_ADMIN)) return var/list/turfs = list() for(var/turf/T in A) if(T.density) continue - if(locate(/obj/structure/grille, T)) // Quick check to not spawn in windows + if(locate(/obj/structure/grille) in T) // Quick check to not spawn in windows continue - turfs.Add(T) + turfs += T - var/turf/T = pick_n_take(turfs) + var/turf/T = safepick(turfs) if(!T) to_chat(src, "Nowhere to jump to!") return @@ -32,7 +65,7 @@ message_admins("[key_name_admin(usr)] jumped to [A]") SSblackbox.record_feedback("tally", "admin_verb", 1, "Jump To Area") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -/client/proc/jumptoturf(var/turf/T in world) +/client/proc/jumptoturf(turf/T in world) set name = "Jump to Turf" set category = null @@ -49,11 +82,9 @@ SSblackbox.record_feedback("tally", "admin_verb", 1, "Jump To Turf") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! return -/client/proc/jumptomob(var/mob/M in GLOB.mob_list) - set category = "Admin" +/client/proc/jumptomob(mob/M) set name = "Jump to Mob" - - if(!check_rights(R_ADMIN)) + if(!M || !check_rights(R_ADMIN)) return log_admin("[key_name(usr)] jumped to [key_name(M)]") @@ -72,10 +103,7 @@ to_chat(A, "This mob is not located in the game world.") /client/proc/jumptocoord(tx as num, ty as num, tz as num) - set category = "Admin" - set name = "Jump to Coordinate" - - if(!check_rights(R_ADMIN)) + if(!isobserver(usr) && !check_rights(R_ADMIN)) // Only admins can jump without being a ghost return var/turf/T = locate(tx, ty, tz) @@ -91,21 +119,10 @@ if(!isobserver(usr)) message_admins("[key_name_admin(usr)] jumped to coordinates [tx], [ty], [tz]") -/client/proc/jumptokey() - set category = "Admin" - set name = "Jump to Key" - - if(!check_rights(R_ADMIN)) +/client/proc/jumptokey(client/C) + if(!C?.mob || !check_rights(R_ADMIN)) return - - var/list/keys = list() - for(var/mob/M in GLOB.player_list) - keys += M.client - var/selection = input("Please, select a player!", "Admin Jumping", null, null) as null|anything in sortKey(keys) - if(!selection) - to_chat(src, "No keys found.") - return - var/mob/M = selection:mob + var/mob/M = C.mob log_admin("[key_name(usr)] jumped to [key_name(M)]") if(!isobserver(usr)) message_admins("[key_name_admin(usr)] jumped to [key_name_admin(M)]", 1) @@ -116,7 +133,7 @@ SSblackbox.record_feedback("tally", "admin_verb", 1, "Jump To Key") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -/client/proc/Getmob(var/mob/M in GLOB.mob_list) +/client/proc/Getmob(mob/M in GLOB.mob_list) set category = null set name = "Get Mob" set desc = "Mob to teleport" @@ -161,22 +178,24 @@ admin_forcemove(usr, M.loc) SSblackbox.record_feedback("tally", "admin_verb", 1, "Get Key") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -/client/proc/sendmob(var/mob/M in GLOB.mob_list) +/client/proc/sendmob(mob/M in GLOB.mob_list) set category = "Admin" set name = "Send Mob" if(!check_rights(R_ADMIN)) return - var/area/A = input(usr, "Pick an area.", "Pick an area") in return_sorted_areas() - if(A) - if(isobj(M.loc)) - var/obj/O = M.loc - O.force_eject_occupant(M) - admin_forcemove(M, pick(get_area_turfs(A))) - SSblackbox.record_feedback("tally", "admin_verb", 1, "Send Mob") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! - log_admin("[key_name(usr)] teleported [key_name(M)] to [A]") - message_admins("[key_name_admin(usr)] teleported [key_name_admin(M)] to [A]", 1) + var/area/A = input(usr, "Pick an area.", "Pick an area") as null|anything in return_sorted_areas() + if(!A) + return + + if(isobj(M.loc)) + var/obj/O = M.loc + O.force_eject_occupant(M) + admin_forcemove(M, pick(get_area_turfs(A))) + SSblackbox.record_feedback("tally", "admin_verb", 1, "Send Mob") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + log_admin("[key_name(usr)] teleported [key_name(M)] to [A]") + message_admins("[key_name_admin(usr)] teleported [key_name_admin(M)] to [A]", 1) /proc/admin_forcemove(mob/mover, atom/newloc) mover.forceMove(newloc) diff --git a/code/modules/admin/verbs/adminpm.dm b/code/modules/admin/verbs/adminpm.dm index d8f96d7a1bb..87009e78b52 100644 --- a/code/modules/admin/verbs/adminpm.dm +++ b/code/modules/admin/verbs/adminpm.dm @@ -169,7 +169,7 @@ //play the recieving admin the adminhelp sound (if they have them enabled) //non-admins always hear the sound, as they cannot toggle it if((!C.holder) || (C.prefs.sound & SOUND_ADMINHELP)) - C << 'sound/effects/adminhelp.ogg' + SEND_SOUND(C, sound('sound/effects/adminhelp.ogg')) log_admin("PM: [key_name(src)]->[key_name(C)]: [msg]") //we don't use message_admins here because the sender/receiver might get it too @@ -267,6 +267,7 @@ var/list/datum/pm_convo/pms = list() var/show_archived = FALSE var/window_id = "pms_window" + var/forced = FALSE /datum/pm_convo var/list/messages = list() @@ -302,6 +303,10 @@ /datum/pm_tracker/proc/show_ui(mob/user) var/dat = "" + // If it was forced open, make them use a special close button that alerts admins to closure + if(forced) + dat += "" + dat += "Refresh" dat += "[show_archived ? "Hide" : "Show"] Archived" dat += "
      " @@ -319,6 +324,10 @@ var/datum/pm_convo/convo = pms[current_title] var/datum/browser/popup = new(user, window_id, "Messages", 1000, 600, src) + + if(forced) // Lockout the normal close button, force the UI one + popup.set_window_options("can_close=0") + if(convo) popup.add_head_content(@{"