diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index ccd774cdaa8..894a16ac470 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -5,6 +5,7 @@
### AffectedArc07
# Actual Code
+/code/controllers/subsystem/instancing.dm @AffectedArc07
/code/controllers/subsystem/mapping.dm @AffectedArc07
/code/controllers/subsystem/ticker.dm @AffectedArc07
/tgui/ @AffectedArc07
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 6a6d87c2d1e..177bfd0b335 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -38,6 +38,11 @@ actual development.
of a pull request needs to be removed/changed, you may simply modify that single commit.
Due to limitations of the engine, this may not always be possible; but do try your best.
+ * Keep your pull requests small and reviewable whenever possible. Do not bundle unrelated
+ fixes even if not bundling them generates more pull requests. In case of mapping PRs that add features -
+ consult a maintainer on whether it would be appropriate to split up the PR to add the
+ feature to multiple maps individually.
+
* Document and explain your pull requests thoroughly. Failure to do so will delay a PR as
we question why changes were made. This is especially important if you're porting a PR
from another codebase (i.e. TG) and divert from the original. Explaining with single
@@ -460,7 +465,7 @@ SS13 has a lot of legacy code that's never been updated. Here are some examples
```DM
//Bad
var/datum/db_query/query_watch = SSdbcore.NewQuery("SELECT reason FROM [format_table_name("watch")] WHERE ckey='[target_ckey]'")
-
+
//Good
var/datum/db_query/query_watch = SSdbcore.NewQuery("SELECT reason FROM [format_table_name("watch")] WHERE ckey=:target_ckey", list(
"target_ckey" = target_ckey
@@ -497,11 +502,13 @@ in the SQL/updates folder.
* Queries must never specify the database, be it in code, or in text files in the repo.
### Mapping Standards
+* For map edit PRs, we do not accept 'change for the sake of change' remaps, unless you have very good reasoning to do so. Maintainers reserve the right to close your PR if we disagree with your reasoning.
+
* Map Merge
* The following guideline for map merging applies to people who are **NOT** using StrongDMM, please see the StrongDMM section if you are.
* You **MUST** run Map Merge prior to opening your PR when updating existing maps to minimize the change differences (even when using third party mapping programs such as FastDMM.)
* Failure to run Map Merge on a map after using third party mapping programs (such as FastDMM) greatly increases the risk of the map's key dictionary becoming corrupted by future edits after running map merge. Resolving the corruption issue involves rebuilding the map's key dictionary;
-
+
* StrongDMM
* When using StrongDMM, the following options **MUST** be enabled to avoid file bloat. They can be found under `File > Preferences > Save Options` in SDMM.
* Map save format: This **MUST** be set to **TGM** if you do not want to run Map Merge. Enabling this setting means SDMM will automatically map merge, letting you skip manual merging.
@@ -521,10 +528,10 @@ in the SQL/updates folder.
* NEVER run cables under wall turfs.
* Keep floor turf variations to a minimum. Generally, more than 3 floor turf types in one room is bad design.
* Run air pipes together where possible. The first example below is to be avoided, the second is optimal:
-
+
 
- * Pipe layouts should be logical and predictable, easy to understand at a glance. Always avoid complex layouts like in this example:
-
+ * Pipe layouts should be logical and predictable, easy to understand at a glance. Always avoid complex layouts like in this example:
+

* Decals are to be used sparingly. Good map design does not require warning tape around everything. Decal overuse contributes to maptick slowdown.
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
new file mode 100644
index 00000000000..7d4716f9122
--- /dev/null
+++ b/.github/FUNDING.yml
@@ -0,0 +1 @@
+patreon: ParadiseStation
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4b5975725c0..f60633cb9b8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -55,6 +55,9 @@ jobs:
unit_tests_and_sql:
name: Unit Tests + SQL Validation
runs-on: ubuntu-20.04
+ strategy:
+ matrix:
+ maptype: ['/datum/map/cyberiad', '/datum/map/delta', '/datum/map/metastation']
services:
mariadb:
image: mariadb:latest
@@ -86,6 +89,7 @@ jobs:
tools/ci/install_byond.sh
source $HOME/BYOND/byond/bin/byondsetup
tools/ci/dm.sh -DCIBUILDING paradise.dme
+ echo '${{ matrix.maptype }}' > data/next_map.txt
tools/ci/run_server.sh
windows_dll_tests:
diff --git a/.github/workflows/generate_autodoc.yml b/.github/workflows/generate_autodoc.yml
index 44eb69eb570..93a21c05a69 100644
--- a/.github/workflows/generate_autodoc.yml
+++ b/.github/workflows/generate_autodoc.yml
@@ -2,7 +2,8 @@ name: Generate Documentation
on:
schedule:
- - cron: "0 0 * * *" # Every day at the very start of the day
+ - cron: "0 0 * * *" # Every day at the very start of the day. Except it happens an hour and a half later because actions backlog
+ workflow_dispatch:
jobs:
generate_docs:
@@ -14,10 +15,11 @@ jobs:
with:
fetch-depth: 1
ref: master
-
+ - name: 'Install DMDOC'
+ run: bash tools/ci/install_dmdoc.sh
- name: 'Generate Documentation'
run: |
- ./tools/github-actions/doc-generator
+ ~/dmdoc
touch dmdoc/.nojekyll
# Nojekyll is important to disable jeykll syntax, which can mess with files that start with underscores
diff --git a/SQL/paradise_schema.sql b/SQL/paradise_schema.sql
index 3ed1cbca688..47d04aa39ce 100644
--- a/SQL/paradise_schema.sql
+++ b/SQL/paradise_schema.sql
@@ -114,6 +114,7 @@ CREATE TABLE `death` (
`pod` text NOT NULL COMMENT 'Place of death',
`coord` text NOT NULL COMMENT 'X, Y, Z POD',
`tod` datetime NOT NULL COMMENT 'Time of death',
+ `server_id` TEXT NULL DEFAULT NULL,
`job` text NOT NULL,
`special` text NOT NULL,
`name` text NOT NULL,
@@ -197,6 +198,7 @@ CREATE TABLE `ban` (
`bantime` datetime NOT NULL,
`ban_round_id` INT(11) NULL DEFAULT NULL,
`serverip` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL,
+ `server_id` VARCHAR(50) NULL DEFAULT NULL COLLATE utf8mb4_general_ci,
`bantype` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL,
`reason` mediumtext COLLATE utf8mb4_unicode_ci NOT NULL,
`job` varchar(32) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
@@ -320,6 +322,7 @@ CREATE TABLE `karma` (
`receiverspecial` text,
`isnegative` tinyint(1) DEFAULT NULL,
`spenderip` text NOT NULL,
+ `server_id` TEXT NULL DEFAULT NULL,
`time` datetime NOT NULL,
PRIMARY KEY (`id`)
) ENGINE=InnoDB AUTO_INCREMENT=73614 DEFAULT CHARSET=utf8mb4;
@@ -374,6 +377,7 @@ CREATE TABLE `legacy_population` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`playercount` int(11) DEFAULT NULL,
`admincount` int(11) DEFAULT NULL,
+ `server_id` VARCHAR(50) NULL DEFAULT NULL,
`time` datetime NOT NULL,
PRIMARY KEY (`id`)
) ENGINE=InnoDB AUTO_INCREMENT=2550 DEFAULT CHARSET=utf8mb4;
@@ -532,6 +536,7 @@ CREATE TABLE `connection_log` (
`ckey` varchar(32) NOT NULL,
`ip` varchar(32) NOT NULL,
`computerid` varchar(32) NOT NULL,
+ `server_id` VARCHAR(50) NULL DEFAULT NULL,
`result` ENUM('ESTABLISHED','DROPPED - IPINTEL','DROPPED - BANNED','DROPPED - INVALID') NOT NULL DEFAULT 'ESTABLISHED' COLLATE 'utf8mb4_general_ci',
PRIMARY KEY (`id`),
KEY `ckey` (`ckey`),
@@ -584,6 +589,7 @@ CREATE TABLE `round` (
`shuttle_name` VARCHAR(64) NULL,
`map_name` VARCHAR(32) NULL,
`station_name` VARCHAR(80) NULL,
+ `server_id` VARCHAR(50) NULL,
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
@@ -597,5 +603,29 @@ CREATE TABLE `2fa_secrets` (
`date_setup` DATETIME NOT NULL DEFAULT current_timestamp(),
`last_time` DATETIME NULL DEFAULT NULL,
PRIMARY KEY (`ckey`) USING BTREE
-)
-COLLATE='utf8mb4_general_ci' ENGINE=InnoDB;
+) COLLATE='utf8mb4_general_ci' ENGINE=InnoDB;
+
+--
+-- Table structure for table `pai_saves`
+--
+CREATE TABLE `pai_saves` (
+ `id` INT(11) NOT NULL AUTO_INCREMENT,
+ `ckey` VARCHAR(50) NOT NULL COLLATE 'utf8mb4_general_ci',
+ `pai_name` LONGTEXT NULL DEFAULT NULL COLLATE 'utf8mb4_general_ci',
+ `description` LONGTEXT NULL DEFAULT NULL COLLATE 'utf8mb4_general_ci',
+ `preferred_role` LONGTEXT NULL DEFAULT NULL COLLATE 'utf8mb4_general_ci',
+ `ooc_comments` LONGTEXT NULL DEFAULT NULL COLLATE 'utf8mb4_general_ci',
+ PRIMARY KEY (`id`) USING BTREE,
+ UNIQUE INDEX `ckey` (`ckey`) USING BTREE
+) COLLATE='utf8mb4_general_ci' ENGINE=InnoDB;
+
+--
+-- Table structure for table `instance_data_cache`
+--
+CREATE TABLE `instance_data_cache` (
+ `server_id` VARCHAR(50) NOT NULL COLLATE 'utf8mb4_general_ci',
+ `key_name` VARCHAR(50) NOT NULL COLLATE 'utf8mb4_general_ci',
+ `key_value` VARCHAR(12345) NOT NULL COLLATE 'utf8mb4_general_ci',
+ `last_updated` TIMESTAMP NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+ PRIMARY KEY (`server_id`, `key_name`) USING HASH
+) COLLATE='utf8mb4_general_ci' ENGINE=MEMORY;
diff --git a/SQL/updates/25-26.sql b/SQL/updates/25-26.sql
new file mode 100644
index 00000000000..93e6fc3db04
--- /dev/null
+++ b/SQL/updates/25-26.sql
@@ -0,0 +1,13 @@
+# Updates DB from 25-25, -AffectedArc07
+# Adds a pAI saves table to the DB
+
+CREATE TABLE `pai_saves` (
+ `id` INT(11) NOT NULL AUTO_INCREMENT,
+ `ckey` VARCHAR(50) NOT NULL COLLATE 'utf8mb4_general_ci',
+ `pai_name` LONGTEXT NULL DEFAULT NULL COLLATE 'utf8mb4_general_ci',
+ `description` LONGTEXT NULL DEFAULT NULL COLLATE 'utf8mb4_general_ci',
+ `preferred_role` LONGTEXT NULL DEFAULT NULL COLLATE 'utf8mb4_general_ci',
+ `ooc_comments` LONGTEXT NULL DEFAULT NULL COLLATE 'utf8mb4_general_ci',
+ PRIMARY KEY (`id`) USING BTREE,
+ UNIQUE INDEX `ckey` (`ckey`) USING BTREE
+) COLLATE='utf8mb4_general_ci' ENGINE=InnoDB;
diff --git a/SQL/updates/26-27.sql b/SQL/updates/26-27.sql
new file mode 100644
index 00000000000..cdc66928d91
--- /dev/null
+++ b/SQL/updates/26-27.sql
@@ -0,0 +1,32 @@
+# Updates DB from 26 to 27 -AffectedArc07
+# Adds a new table for instance data caching, and server_id fields on other tables
+
+CREATE TABLE `instance_data_cache` (
+ `server_id` VARCHAR(50) NOT NULL COLLATE 'utf8mb4_general_ci',
+ `key_name` VARCHAR(50) NOT NULL COLLATE 'utf8mb4_general_ci',
+ `key_value` VARCHAR(12345) NOT NULL COLLATE 'utf8mb4_general_ci',
+ `last_updated` TIMESTAMP NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+ PRIMARY KEY (`server_id`, `key_name`) USING HASH
+) COLLATE='utf8mb4_general_ci' ENGINE=MEMORY;
+
+ALTER TABLE `ban`
+ ADD COLUMN `server_id` VARCHAR(50) NULL DEFAULT NULL AFTER `serverip`;
+
+ALTER TABLE `connection_log`
+ ADD COLUMN `server_id` VARCHAR(50) NULL DEFAULT NULL AFTER `computerid`;
+
+ALTER TABLE `death`
+ ADD COLUMN `server_id` TEXT NULL AFTER `tod`;
+
+ALTER TABLE `karma`
+ ADD COLUMN `server_id` TEXT NULL AFTER `spenderip`;
+
+ALTER TABLE `legacy_population`
+ ADD COLUMN `server_id` VARCHAR(50) NULL DEFAULT NULL AFTER `admincount`;
+
+# Notes already has a column for this
+ALTER TABLE `notes`
+ CHANGE COLUMN `server` `server` VARCHAR(50) NULL COLLATE 'utf8mb4_general_ci' AFTER `edits`;
+
+ALTER TABLE `round`
+ ADD COLUMN `server_id` VARCHAR(50) NULL DEFAULT NULL AFTER `station_name`;
diff --git a/_build_dependencies.sh b/_build_dependencies.sh
index 8cef5ce91b9..61b02c2ca10 100644
--- a/_build_dependencies.sh
+++ b/_build_dependencies.sh
@@ -1,9 +1,9 @@
# This file has all the information on what versions of libraries are thrown into the code
# For dreamchecker
-export SPACEMANDMM_TAG=suite-1.6
+export SPACEMANDMM_TAG=suite-1.7.1
# For TGUI
export NODE_VERSION=12
# Byond Major
-export BYOND_MAJOR=513
+export BYOND_MAJOR=514
# Byond Minor
-export BYOND_MINOR=1528
+export BYOND_MINOR=1566
diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm
index e5f0121446b..49340e999c9 100644
--- a/_maps/map_files/Delta/delta.dmm
+++ b/_maps/map_files/Delta/delta.dmm
@@ -131,7 +131,7 @@
/obj/machinery/access_button{
command = "cycle_exterior";
frequency = 1379;
- master_tag = "tradedock";
+ master_tag = "tradedock_outer";
name = "exterior access button";
pixel_x = 24;
pixel_y = 4
@@ -211,12 +211,13 @@
/turf/simulated/floor/plating,
/area/shuttle/pod_1)
"adg" = (
-/turf/simulated/wall/mineral/titanium,
-/area/shuttle/pod_2)
-"adh" = (
-/obj/effect/spawner/window/shuttle,
+/obj/structure/closet/emcloset,
/turf/simulated/floor/plating,
-/area/shuttle/pod_2)
+/area/hallway/secondary/entry)
+"adh" = (
+/obj/effect/decal/warning_stripes/east,
+/turf/simulated/floor/plating,
+/area/hallway/secondary/entry)
"adt" = (
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 5
@@ -257,18 +258,11 @@
/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/pod_1)
"adz" = (
-/obj/machinery/status_display{
- layer = 4;
- pixel_x = 32
- },
-/obj/machinery/light{
- dir = 4
- },
-/obj/structure/chair/comfy/shuttle{
+/obj/machinery/light/small{
dir = 1
},
-/turf/simulated/floor/mineral/titanium/blue,
-/area/shuttle/pod_2)
+/turf/simulated/floor/plating,
+/area/hallway/secondary/entry)
"adK" = (
/obj/machinery/light/small{
dir = 4
@@ -280,6 +274,13 @@
/obj/structure/shuttle/engine/propulsion/burst,
/turf/simulated/wall/mineral/titanium,
/area/shuttle/pod_1)
+"adM" = (
+/obj/structure/window/reinforced,
+/obj/structure/window/reinforced{
+ dir = 4
+ },
+/turf/space,
+/area/space)
"adN" = (
/turf/simulated/wall/r_wall,
/area/hallway/secondary/entry)
@@ -293,20 +294,6 @@
},
/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/pod_1)
-"adP" = (
-/obj/item/radio/intercom{
- dir = 4;
- pixel_x = 28
- },
-/obj/structure/chair/comfy/shuttle{
- dir = 1
- },
-/turf/simulated/floor/mineral/titanium/blue,
-/area/shuttle/pod_2)
-"adQ" = (
-/obj/structure/shuttle/engine/propulsion/burst,
-/turf/simulated/wall/mineral/titanium,
-/area/shuttle/pod_2)
"adT" = (
/obj/docking_port/stationary{
dir = 2;
@@ -371,16 +358,8 @@
/turf/simulated/floor/plasteel,
/area/hallway/secondary/entry)
"aeg" = (
-/obj/docking_port/mobile/pod{
- id = "pod2";
- name = "escape pod 2"
- },
-/obj/machinery/door/airlock/titanium{
- id_tag = "s_docking_airlock";
- name = "Escape Pod Hatch"
- },
-/turf/simulated/floor/mineral/titanium/blue,
-/area/shuttle/pod_2)
+/turf/simulated/floor/plating,
+/area/hallway/secondary/entry)
"aey" = (
/obj/machinery/light/small{
dir = 8
@@ -421,10 +400,11 @@
},
/area/hallway/secondary/entry)
"aeK" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/external,
-/turf/simulated/floor/plasteel,
-/area/hallway/secondary/entry)
+/obj/structure/shuttle/engine/propulsion/burst{
+ dir = 8
+ },
+/turf/simulated/wall/mineral/titanium,
+/area/shuttle/pod_4)
"aeL" = (
/obj/item/twohanded/required/kirbyplants,
/turf/simulated/floor/plasteel{
@@ -470,8 +450,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door/airlock/engineering{
name = "Aux Construction Site"
@@ -513,8 +492,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 6
@@ -528,8 +506,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 8
@@ -543,8 +520,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/sign/electricshock{
pixel_y = -32
@@ -619,7 +595,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 4
},
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plating,
/area/maintenance/auxsolarstarboard)
"afm" = (
/obj/structure/cable{
@@ -647,7 +623,7 @@
pixel_y = 32
},
/obj/effect/decal/warning_stripes/yellow,
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plating,
/area/maintenance/auxsolarstarboard)
"afn" = (
/obj/structure/cable{
@@ -661,7 +637,7 @@
name = "Engineering External Access";
req_access_txt = "10;13"
},
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plating,
/area/maintenance/auxsolarstarboard)
"afw" = (
/obj/docking_port/stationary{
@@ -694,8 +670,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel{
@@ -709,10 +684,6 @@
icon_state = "brown"
},
/area/hallway/secondary/entry)
-"afA" = (
-/obj/structure/reagent_dispensers/fueltank,
-/turf/simulated/floor/engine,
-/area/engine/mechanic_workshop/hanger)
"afB" = (
/obj/structure/chair/office/dark{
dir = 4
@@ -726,11 +697,12 @@
/area/maintenance/auxsolarstarboard)
"afC" = (
/obj/structure/cable,
+/obj/effect/decal/warning_stripes/southeast,
/obj/machinery/power/solar_control{
+ dir = 8;
id = "auxsolareast";
name = "Fore Starboard Solar Control"
},
-/obj/effect/decal/warning_stripes/southeast,
/turf/simulated/floor/plating,
/area/maintenance/auxsolarstarboard)
"afJ" = (
@@ -993,9 +965,6 @@
},
/turf/simulated/floor/plasteel,
/area/hallway/secondary/entry)
-"agI" = (
-/turf/simulated/wall/r_wall,
-/area/security/podbay)
"agJ" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 6
@@ -1008,13 +977,6 @@
icon_state = "neutralfull"
},
/area/hallway/secondary/entry)
-"agK" = (
-/turf/simulated/wall/r_wall,
-/area/engine/mechanic_workshop/hanger)
-"agL" = (
-/obj/effect/decal/warning_stripes/east,
-/turf/simulated/floor/engine/vacuum,
-/area/engine/mechanic_workshop/hanger)
"agT" = (
/obj/item/clothing/suit/storage/hazardvest,
/obj/item/clothing/suit/storage/hazardvest,
@@ -1046,99 +1008,6 @@
/obj/machinery/cell_charger,
/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/arrival/station)
-"agY" = (
-/obj/structure/table/reinforced,
-/obj/item/clothing/suit/jacket/pilot,
-/obj/item/clothing/head/beret/sec,
-/obj/machinery/light_switch{
- pixel_x = -25
- },
-/obj/item/spacepod_key{
- id = 100000
- },
-/obj/item/gps,
-/obj/machinery/newscaster/security_unit{
- pixel_y = 32
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/security/podbay)
-"agZ" = (
-/obj/structure/table/reinforced,
-/obj/item/flashlight,
-/obj/item/radio{
- pixel_y = 6
- },
-/obj/machinery/camera{
- c_tag = "Sec Pod Office";
- network = list("Security","SS13")
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/security/podbay)
-"aha" = (
-/obj/structure/table/reinforced,
-/obj/item/book/manual/security_space_law,
-/obj/machinery/power/apc{
- dir = 1;
- name = "north bump";
- pixel_y = 24
- },
-/obj/structure/cable{
- d2 = 2;
- icon_state = "0-2"
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/security/podbay)
-"ahb" = (
-/obj/structure/table,
-/obj/machinery/cell_charger,
-/obj/item/storage/toolbox/mechanical{
- pixel_y = 10
- },
-/obj/item/stock_parts/cell/high{
- charge = 100;
- maxcharge = 15000
- },
-/obj/item/clothing/glasses/welding,
-/obj/machinery/light/small{
- dir = 1
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/security/podbay)
-"ahc" = (
-/obj/structure/rack,
-/obj/item/tank/internals/oxygen,
-/obj/item/clothing/suit/space/hardsuit/security,
-/obj/item/clothing/mask/breath,
-/obj/item/clothing/shoes/magboots,
-/obj/item/tank/jetpack/oxygen,
-/obj/item/radio/intercom{
- pixel_y = 28
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/security/podbay)
-"ahd" = (
-/obj/effect/spawner/window/reinforced,
-/turf/simulated/floor/plating,
-/area/security/podbay)
-"ahe" = (
-/turf/simulated/floor/engine,
-/area/engine/mechanic_workshop/hanger)
-"ahf" = (
-/obj/machinery/camera{
- c_tag = "Hanger North"
- },
-/turf/simulated/floor/engine,
-/area/engine/mechanic_workshop/hanger)
"ahg" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 8
@@ -1151,12 +1020,6 @@
icon_state = "neutralfull"
},
/area/hallway/secondary/entry)
-"ahh" = (
-/obj/item/radio/intercom{
- pixel_y = 28
- },
-/turf/simulated/floor/engine,
-/area/engine/mechanic_workshop/hanger)
"ahi" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 8
@@ -1169,38 +1032,6 @@
icon_state = "neutralfull"
},
/area/hallway/secondary/entry)
-"ahj" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 8;
- icon_state = "1-8"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/security/podbay)
-"ahk" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 10
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/security/podbay)
-"ahl" = (
-/obj/structure/sign/securearea{
- desc = "A warning sign which reads 'EXTERNAL AIRLOCK'";
- icon_state = "space";
- layer = 4;
- name = "EXTERNAL AIRLOCK";
- pixel_x = 32;
- pixel_y = null
- },
-/turf/simulated/floor/engine,
-/area/engine/mechanic_workshop/hanger)
"ahv" = (
/obj/structure/lattice,
/turf/space,
@@ -1246,12 +1077,6 @@
"ahC" = (
/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/arrival/station)
-"ahD" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 6
- },
-/turf/simulated/floor/engine,
-/area/engine/mechanic_workshop/hanger)
"ahE" = (
/obj/machinery/door/airlock/titanium{
id_tag = "s_docking_airlock"
@@ -1266,184 +1091,15 @@
/obj/effect/decal/warning_stripes/west,
/turf/simulated/floor/plasteel,
/area/hallway/secondary/entry)
-"ahG" = (
-/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 = 10
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/security/podbay)
-"ahH" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/security/podbay)
-"ahI" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/security/podbay)
-"ahJ" = (
-/obj/machinery/door/airlock/security/glass{
- name = "Security Pods";
- req_access_txt = "71"
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/security/podbay)
-"ahK" = (
-/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 8
- },
-/turf/simulated/floor/engine,
-/area/engine/mechanic_workshop/hanger)
-"ahL" = (
-/obj/machinery/door_control{
- desc = "A remote control-switch for the pod doors.";
- id = "npodbay";
- name = "Pod Door Control";
- pixel_x = 32;
- pixel_y = null
- },
-/turf/simulated/floor/engine,
-/area/engine/mechanic_workshop/hanger)
-"ahM" = (
-/obj/structure/sign/securearea{
- desc = "A warning sign which reads 'KEEP CLEAR OF DOCKING AREA'.";
- name = "KEEP CLEAR: DOCKING AREA"
- },
-/turf/simulated/wall/r_wall,
-/area/engine/mechanic_workshop/hanger)
-"ahT" = (
-/obj/effect/decal/warning_stripes/east,
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/obj/structure/cable{
- d1 = 2;
- d2 = 4;
- icon_state = "2-4"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/turf/simulated/floor/plasteel,
-/area/hallway/secondary/entry)
"ahV" = (
/obj/item/twohanded/required/kirbyplants,
/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/arrival/station)
"ahW" = (
-/obj/machinery/hologram/holopad,
/obj/machinery/light,
+/obj/machinery/hologram/holopad,
/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/arrival/station)
-"ahX" = (
-/obj/structure/closet/secure_closet/security,
-/obj/item/spacepod_equipment/weaponry/laser,
-/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 1
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/security/podbay)
-"ahY" = (
-/obj/machinery/door_control{
- desc = "A remote control-switch for the pod doors.";
- id = "npodbay";
- name = "Pod Door Control";
- pixel_y = -24;
- req_access_txt = "71"
- },
-/turf/simulated/floor/engine,
-/area/security/podbay)
-"ahZ" = (
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/security/podbay)
-"aia" = (
-/obj/structure/chair/office/dark{
- dir = 4
- },
-/obj/effect/landmark/start{
- name = "Security Pod Pilot"
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/security/podbay)
-"aib" = (
-/obj/machinery/computer/security{
- network = list("SS13","Research Outpost","Mining Outpost")
- },
-/obj/machinery/firealarm{
- dir = 4;
- pixel_x = 28
- },
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
- dir = 1
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/security/podbay)
-"aif" = (
-/obj/machinery/door/airlock/security/glass{
- name = "Security Pods";
- req_access_txt = "71"
- },
-/obj/effect/decal/warning_stripes/west,
-/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,
-/area/security/podbay)
-"aig" = (
-/obj/structure/spacepoddoor{
- luminosity = 3
- },
-/obj/machinery/door/poddoor/multi_tile/three_tile_ver{
- id_tag = "secpodbay";
- req_access_txt = "71"
- },
-/turf/simulated/floor/engine,
-/area/security/podbay)
"aik" = (
/obj/machinery/light{
dir = 1
@@ -1485,13 +1141,6 @@
},
/turf/simulated/floor/plasteel,
/area/hallway/secondary/entry)
-"air" = (
-/obj/effect/decal/warning_stripes/red/partial,
-/turf/simulated/floor/engine{
- icon_state = "stage_stairs";
- name = "reinforced stairs"
- },
-/area/security/podbay)
"ais" = (
/obj/machinery/light{
dir = 1
@@ -1500,87 +1149,6 @@
/obj/effect/decal/warning_stripes/yellow,
/turf/simulated/floor/plasteel,
/area/hallway/secondary/entry)
-"ait" = (
-/obj/structure/window/reinforced{
- dir = 1;
- layer = 2.9
- },
-/obj/structure/window/reinforced{
- dir = 4
- },
-/obj/machinery/portable_atmospherics/canister/oxygen,
-/obj/effect/decal/warning_stripes/red/hollow,
-/obj/machinery/light{
- dir = 8
- },
-/obj/effect/decal/warning_stripes/east,
-/turf/simulated/floor/plasteel,
-/area/security/podbay)
-"aiu" = (
-/obj/structure/spacepoddoor{
- luminosity = 3
- },
-/obj/machinery/door/poddoor/multi_tile/four_tile_ver{
- id_tag = "npodbay"
- },
-/turf/simulated/floor/engine,
-/area/engine/mechanic_workshop/hanger)
-"aiv" = (
-/obj/effect/decal/warning_stripes/southwestcorner,
-/obj/machinery/door_control{
- desc = "A remote control-switch for the pod doors.";
- id = "npodbay";
- name = "Pod Door Control";
- pixel_x = -24;
- req_access_txt = "71"
- },
-/turf/simulated/floor/engine,
-/area/engine/mechanic_workshop/hanger)
-"aiw" = (
-/obj/effect/decal/warning_stripes/east,
-/obj/machinery/light/small,
-/turf/simulated/floor/engine/vacuum,
-/area/engine/mechanic_workshop/hanger)
-"aix" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/engine,
-/area/engine/mechanic_workshop/hanger)
-"aiy" = (
-/obj/structure/spacepoddoor{
- luminosity = 3
- },
-/turf/simulated/floor/engine,
-/area/engine/mechanic_workshop/hanger)
-"aiz" = (
-/obj/effect/decal/warning_stripes/east,
-/obj/machinery/light/small{
- dir = 1
- },
-/turf/simulated/floor/engine/vacuum,
-/area/engine/mechanic_workshop/hanger)
-"aiA" = (
-/obj/structure/window/reinforced{
- dir = 1;
- layer = 2.9
- },
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/structure/reagent_dispensers/fueltank,
-/obj/effect/decal/warning_stripes/red/hollow,
-/obj/effect/decal/warning_stripes/south,
-/turf/simulated/floor/plasteel,
-/area/security/podbay)
-"aiB" = (
-/obj/structure/window/reinforced{
- dir = 1;
- layer = 2.9
- },
-/obj/machinery/space_heater,
-/obj/effect/decal/warning_stripes/red/hollow,
-/obj/effect/decal/warning_stripes/south,
-/turf/simulated/floor/plasteel,
-/area/security/podbay)
"aiE" = (
/obj/structure/closet/emcloset,
/obj/effect/decal/warning_stripes/yellow,
@@ -1622,51 +1190,6 @@
/obj/effect/decal/warning_stripes/yellow,
/turf/simulated/floor/plasteel,
/area/hallway/secondary/entry)
-"aiL" = (
-/obj/effect/decal/warning_stripes/east,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/structure/cable{
- d1 = 1;
- d2 = 4;
- icon_state = "1-4"
- },
-/turf/simulated/floor/plasteel,
-/area/hallway/secondary/entry)
-"aiM" = (
-/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/machinery/floodlight{
- on = 1
- },
-/turf/simulated/floor/engine,
-/area/engine/mechanic_workshop/hanger)
-"aiN" = (
-/turf/simulated/floor/engine,
-/area/security/podbay)
-"aiO" = (
-/obj/structure/spacepoddoor{
- luminosity = 3
- },
-/turf/simulated/floor/engine,
-/area/security/podbay)
-"aiP" = (
-/obj/effect/decal/warning_stripes/west,
-/turf/simulated/floor/engine,
-/area/engine/mechanic_workshop/hanger)
"aiT" = (
/obj/effect/decal/warning_stripes/east,
/obj/structure/cable{
@@ -1694,22 +1217,6 @@
},
/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/arrival/station)
-"aiW" = (
-/obj/structure/rack{
- dir = 1
- },
-/obj/item/extinguisher,
-/obj/item/storage/toolbox/mechanical{
- pixel_x = -2;
- pixel_y = -1
- },
-/obj/item/radio{
- pixel_y = 6
- },
-/obj/effect/decal/warning_stripes/red/hollow,
-/obj/effect/decal/warning_stripes/east,
-/turf/simulated/floor/plasteel,
-/area/security/podbay)
"aiX" = (
/obj/structure/chair{
dir = 4
@@ -1720,66 +1227,21 @@
/obj/effect/decal/warning_stripes/yellow,
/turf/simulated/floor/plasteel,
/area/hallway/secondary/entry)
-"aiY" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/turf/simulated/floor/engine,
-/area/engine/mechanic_workshop/hanger)
"ajd" = (
/obj/item/radio/beacon,
/obj/effect/decal/warning_stripes/yellow,
/turf/simulated/floor/plasteel,
/area/hallway/secondary/entry)
-"aje" = (
-/obj/machinery/camera{
- c_tag = "Sec Pod Bay";
- dir = 4;
- network = list("Security","SS13");
- pixel_y = -22
- },
-/obj/effect/decal/warning_stripes/red/hollow,
-/obj/effect/decal/warning_stripes/east,
-/turf/simulated/floor/plasteel,
-/area/security/podbay)
"ajf" = (
/obj/structure/closet/firecloset,
/obj/effect/decal/warning_stripes/yellow,
/turf/simulated/floor/plasteel,
/area/hallway/secondary/entry)
-"ajg" = (
-/obj/machinery/hologram/holopad,
-/turf/simulated/floor/engine,
-/area/security/podbay)
-"ajh" = (
-/obj/spacepod/sec{
- dir = 4;
- req_access_txt = "71"
- },
-/turf/simulated/floor/engine,
-/area/security/podbay)
-"aji" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 9
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/turf/simulated/floor/engine,
-/area/engine/mechanic_workshop/hanger)
"ajy" = (
/obj/item/twohanded/required/kirbyplants,
/obj/effect/decal/warning_stripes/yellow,
/turf/simulated/floor/plasteel,
/area/hallway/secondary/entry)
-"ajC" = (
-/obj/effect/decal/warning_stripes/red/hollow,
-/obj/effect/decal/warning_stripes/east,
-/turf/simulated/floor/plasteel,
-/area/security/podbay)
"ajD" = (
/obj/structure/table/reinforced,
/obj/item/clipboard,
@@ -1792,13 +1254,6 @@
/obj/item/storage/pill_bottle/dice,
/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/arrival/station)
-"ajG" = (
-/obj/machinery/alarm{
- dir = 1;
- pixel_y = -24
- },
-/turf/simulated/floor/engine,
-/area/engine/mechanic_workshop/hanger)
"ajH" = (
/obj/effect/decal/warning_stripes/east,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -1807,6 +1262,12 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4";
+ tag = "90Curve"
+ },
/turf/simulated/floor/plasteel,
/area/hallway/secondary/entry)
"ajI" = (
@@ -1833,10 +1294,6 @@
icon_state = "redyellowfull"
},
/area/maintenance/fore2)
-"ajK" = (
-/obj/effect/decal/warning_stripes/northwestcorner,
-/turf/simulated/floor/engine,
-/area/engine/mechanic_workshop/hanger)
"ajL" = (
/turf/simulated/floor/plasteel{
icon_state = "redyellowfull"
@@ -1906,152 +1363,6 @@
},
/turf/simulated/floor/plasteel,
/area/hallway/secondary/entry)
-"akc" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 1
- },
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/engine/mechanic_workshop)
-"akd" = (
-/obj/machinery/camera{
- c_tag = "Mechanic's Office"
- },
-/obj/machinery/firealarm{
- dir = 8;
- pixel_x = -26;
- pixel_y = 28
- },
-/obj/structure/cable{
- d1 = 2;
- d2 = 4;
- icon_state = "2-4"
- },
-/obj/machinery/requests_console{
- department = "Mechanic";
- departmentType = 2;
- name = "Mechanic's Workshop Requests Console";
- pixel_y = 30
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/structure/cable{
- d1 = 2;
- d2 = 8;
- icon_state = "2-8"
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/engine/mechanic_workshop)
-"ake" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/structure/cable{
- d2 = 8;
- icon_state = "0-8"
- },
-/obj/machinery/power/apc{
- dir = 1;
- name = "north bump";
- pixel_y = 24
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/structure/rack,
-/obj/random/toolbox,
-/obj/item/wrench,
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/engine/mechanic_workshop)
-"akf" = (
-/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/effect/spawner/window/reinforced,
-/turf/simulated/floor/plating,
-/area/engine/mechanic_workshop)
-"akg" = (
-/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/machinery/mecha_part_fabricator/spacepod,
-/obj/effect/decal/warning_stripes/yellow/hollow,
-/turf/simulated/floor/engine,
-/area/engine/mechanic_workshop/hanger)
-"akh" = (
-/obj/structure/cable{
- d1 = 2;
- d2 = 8;
- icon_state = "2-8";
- tag = ""
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/turf/simulated/floor/engine,
-/area/engine/mechanic_workshop/hanger)
-"aki" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
- dir = 8
- },
-/turf/simulated/floor/engine,
-/area/engine/mechanic_workshop/hanger)
-"akj" = (
-/obj/machinery/camera{
- c_tag = "Hanger South";
- 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;
- pixel_y = null
- },
-/turf/simulated/floor/engine,
-/area/engine/mechanic_workshop/hanger)
"akw" = (
/obj/structure/table/reinforced,
/obj/item/paper_bin,
@@ -2076,32 +1387,8 @@
/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/arrival/station)
"akB" = (
-/turf/simulated/wall,
-/area/engine/mechanic_workshop)
-"akC" = (
-/obj/machinery/computer/podtracker,
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
- dir = 1
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/engine/mechanic_workshop)
-"akE" = (
-/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 1
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/engine/mechanic_workshop)
-"akF" = (
-/obj/machinery/door/airlock/engineering/glass{
- name = "Mechanic Workshop";
- req_access_txt = "70"
- },
-/turf/simulated/floor/engine,
-/area/engine/mechanic_workshop)
+/turf/simulated/wall/r_wall,
+/area/maintenance/fore2)
"akG" = (
/obj/machinery/atmospherics/unary/vent_pump/on,
/turf/simulated/floor/plasteel{
@@ -2109,24 +1396,6 @@
icon_state = "arrival"
},
/area/hallway/secondary/entry)
-"akH" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/turf/simulated/floor/engine,
-/area/engine/mechanic_workshop/hanger)
-"akI" = (
-/obj/machinery/firealarm{
- dir = 4;
- pixel_x = 28
- },
-/obj/machinery/light/small{
- dir = 4
- },
-/turf/simulated/floor/engine,
-/area/engine/mechanic_workshop/hanger)
"akU" = (
/obj/machinery/door/airlock/external{
id_tag = "specops_home";
@@ -2135,26 +1404,6 @@
/obj/effect/decal/warning_stripes/west,
/turf/simulated/floor/plasteel,
/area/hallway/secondary/entry)
-"akV" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/engineering/glass{
- name = "Mechanic Workshop";
- req_access_txt = "70"
- },
-/obj/effect/decal/warning_stripes/west,
-/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"
- },
-/turf/simulated/floor/plasteel,
-/area/engine/mechanic_workshop)
"akY" = (
/obj/machinery/status_display,
/turf/simulated/wall/mineral/titanium,
@@ -2169,109 +1418,10 @@
/obj/machinery/ai_status_display,
/turf/simulated/wall/mineral/titanium,
/area/shuttle/arrival/station)
-"alc" = (
-/obj/machinery/door/firedoor,
-/obj/structure/table/reinforced,
-/obj/machinery/door/window/westright{
- name = "Mechanic's Desk";
- req_access = null;
- req_access_txt = "70"
- },
-/obj/machinery/cell_charger,
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/engine/mechanic_workshop)
-"ald" = (
-/obj/structure/chair/office/light{
- dir = 8
- },
-/obj/effect/landmark/start{
- name = "Mechanic"
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/engine/mechanic_workshop)
-"ale" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2";
- tag = ""
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/engine/mechanic_workshop)
-"alf" = (
-/obj/structure/table/reinforced,
-/obj/item/stack/sheet/plasteel,
-/obj/item/stack/rods,
-/obj/item/storage/box/lights/mixed,
-/obj/machinery/alarm{
- dir = 1;
- pixel_y = -24
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/engine/mechanic_workshop)
-"alg" = (
-/obj/effect/spawner/window/reinforced,
-/turf/simulated/floor/plating,
-/area/engine/mechanic_workshop)
-"alh" = (
-/obj/structure/table,
-/obj/item/pod_parts/core,
-/obj/item/circuitboard/mecha/pod,
-/obj/item/clothing/glasses/welding{
- pixel_y = 12
- },
-/obj/item/gps,
-/obj/effect/decal/warning_stripes/yellow/hollow,
-/turf/simulated/floor/engine,
-/area/engine/mechanic_workshop/hanger)
-"ali" = (
-/obj/machinery/door_control{
- id = "mechpod";
- name = "Mechanic's Inner Door Control";
- pixel_y = -24;
- req_access_txt = "70"
- },
-/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/effect/decal/warning_stripes/yellow/hollow,
-/turf/simulated/floor/engine,
-/area/engine/mechanic_workshop/hanger)
-"alj" = (
-/obj/structure/cable,
-/obj/machinery/power/apc{
- name = "south bump";
- pixel_y = -24
- },
-/obj/machinery/computer/rdconsole/mechanics,
-/turf/simulated/floor/engine,
-/area/engine/mechanic_workshop/hanger)
"alk" = (
/obj/effect/spawner/random_spawners/wall_rusted_maybe,
/turf/simulated/wall,
/area/maintenance/fore2)
-"all" = (
-/obj/machinery/light/small,
-/turf/simulated/floor/engine,
-/area/engine/mechanic_workshop/hanger)
"alm" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 1
@@ -2346,22 +1496,6 @@
/obj/effect/decal/warning_stripes/east,
/turf/simulated/floor/plasteel,
/area/hallway/secondary/entry)
-"alz" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2";
- tag = ""
- },
-/obj/machinery/door/airlock/maintenance{
- name = "Mechanic Workshop";
- req_access_txt = "70"
- },
-/turf/simulated/floor/plasteel,
-/area/maintenance/fore2)
-"alA" = (
-/turf/simulated/wall/r_wall,
-/area/engine/mechanic_workshop)
"alE" = (
/obj/docking_port/stationary{
dwidth = 2;
@@ -2405,15 +1539,15 @@
dir = 4
},
/obj/effect/decal/warning_stripes/east,
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2";
+ tag = ""
+ },
/turf/simulated/floor/plasteel,
/area/hallway/secondary/entry)
"alM" = (
-/obj/structure/cable{
- d1 = 2;
- d2 = 8;
- icon_state = "2-8";
- tag = ""
- },
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
dir = 5;
@@ -2484,11 +1618,6 @@
/turf/space,
/area/space/nearstation)
"alX" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 4;
- icon_state = "1-4"
- },
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/warning_stripes/yellow,
/turf/simulated/floor/plasteel{
@@ -2511,6 +1640,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plating,
/area/maintenance/fore2)
"ama" = (
@@ -2523,6 +1657,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plating,
/area/maintenance/fore2)
"amb" = (
@@ -2532,15 +1671,14 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plating,
/area/maintenance/fore2)
"amc" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2";
- tag = ""
- },
/obj/effect/decal/warning_stripes/yellow,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -2548,6 +1686,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{
dir = 4;
icon_state = "neutral"
@@ -2663,8 +1807,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
@@ -2722,8 +1865,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
@@ -2828,8 +1970,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/turf/simulated/floor/plasteel{
dir = 1;
@@ -2967,8 +2108,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -3035,6 +2175,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
@@ -3112,8 +2253,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plating,
/area/maintenance/fore2)
@@ -3129,10 +2269,10 @@
"aoe" = (
/obj/structure/table,
/obj/random/toolbox,
+/obj/effect/decal/warning_stripes/yellow,
/obj/machinery/newscaster{
pixel_x = 32
},
-/obj/effect/decal/warning_stripes/yellow,
/turf/simulated/floor/plasteel,
/area/hallway/secondary/entry)
"aof" = (
@@ -3143,13 +2283,13 @@
/area/maintenance/fore2)
"aog" = (
/obj/effect/decal/cleanable/cobweb2,
-/obj/machinery/newscaster{
- pixel_x = 32
- },
/obj/structure/sink/kitchen{
desc = "A sink used for washing one's hands and face. It looks rusty and home-made";
name = "old sink";
- pixel_y = 28
+ pixel_y = 25
+ },
+/obj/machinery/newscaster{
+ pixel_x = 32
},
/turf/simulated/floor/plasteel{
icon_state = "red"
@@ -3168,7 +2308,7 @@
/obj/structure/sink/kitchen{
desc = "A sink used for washing one's hands and face. It looks rusty and home-made";
name = "old sink";
- pixel_y = 28
+ pixel_y = 25
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
@@ -3179,8 +2319,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door/airlock/maintenance{
req_access_txt = "12"
@@ -3197,8 +2336,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/warning_stripes/yellow,
/turf/simulated/floor/plasteel{
@@ -3299,8 +2437,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/warning_stripes/yellow,
/turf/simulated/floor/plasteel{
@@ -3427,9 +2564,7 @@
/obj/machinery/firealarm{
pixel_y = 32
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/security/vacantoffice)
"aoZ" = (
/obj/machinery/light_switch{
@@ -3438,9 +2573,7 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/security/vacantoffice)
"apa" = (
/obj/structure/table/wood,
@@ -3482,8 +2615,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/photocopier,
/obj/machinery/atmospherics/unary/vent_pump/on,
@@ -3544,8 +2676,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/table/reinforced,
/obj/item/crowbar,
@@ -3571,8 +2702,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
@@ -3584,8 +2714,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small{
@@ -3600,8 +2729,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
@@ -3753,9 +2881,7 @@
"apQ" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/security/vacantoffice)
"apR" = (
/obj/structure/table/wood,
@@ -3790,8 +2916,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plating,
/area/maintenance/fore)
@@ -3919,16 +3044,13 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
-/obj/machinery/hologram/holopad,
/obj/effect/decal/warning_stripes/yellow/hollow,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
@@ -3936,6 +3058,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 6
},
+/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
@@ -3984,8 +3107,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/cleanable/dirt,
/obj/item/cigbutt/roach,
@@ -4026,7 +3148,10 @@
/turf/simulated/wall,
/area/maintenance/fore2)
"aqq" = (
-/turf/simulated/wall/r_wall/rust,
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "red"
+ },
/area/security/permabrig)
"aqu" = (
/obj/machinery/door/firedoor,
@@ -4072,23 +3197,17 @@
/obj/machinery/status_display{
pixel_y = 32
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/maintenance/electrical_shop)
"aqz" = (
/obj/item/twohanded/required/kirbyplants,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/maintenance/electrical_shop)
"aqA" = (
/obj/structure/table/wood,
/obj/item/paper_bin,
/obj/item/pen,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/maintenance/electrical_shop)
"aqB" = (
/obj/structure/table/wood,
@@ -4109,9 +3228,7 @@
pixel_x = 4;
pixel_y = 3
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/maintenance/electrical_shop)
"aqD" = (
/obj/item/twohanded/required/kirbyplants,
@@ -4121,17 +3238,13 @@
/obj/machinery/status_display{
pixel_y = 32
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/maintenance/electrical_shop)
"aqE" = (
/obj/structure/table/wood,
/obj/item/clipboard,
/obj/item/apc_electronics,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/maintenance/electrical_shop)
"aqF" = (
/turf/simulated/floor/plasteel{
@@ -4190,9 +3303,7 @@
/area/security/vacantoffice)
"aqN" = (
/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/security/vacantoffice)
"aqO" = (
/obj/structure/table/wood,
@@ -4219,7 +3330,9 @@
/obj/machinery/ai_status_display{
pixel_x = -32
},
-/obj/machinery/computer/crew,
+/obj/machinery/computer/crew{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 10;
icon_state = "blue"
@@ -4229,8 +3342,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -4301,12 +3413,11 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/hologram/holopad,
/obj/effect/decal/warning_stripes/yellow/hollow,
+/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
@@ -4320,7 +3431,9 @@
/obj/machinery/status_display{
pixel_x = 32
},
-/obj/machinery/computer/prisoner,
+/obj/machinery/computer/prisoner{
+ dir = 8
+ },
/turf/simulated/floor/plasteel{
dir = 6;
icon_state = "red"
@@ -4338,7 +3451,9 @@
/area/maintenance/fore2)
"arf" = (
/obj/effect/decal/cleanable/cobweb,
-/obj/machinery/computer/arcade,
+/obj/machinery/computer/arcade{
+ dir = 4
+ },
/turf/simulated/floor/plating,
/area/maintenance/fore2)
"arg" = (
@@ -4411,9 +3526,7 @@
},
/area/maintenance/electrical_shop)
"ars" = (
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/maintenance/electrical_shop)
"art" = (
/obj/structure/chair/comfy/brown{
@@ -4441,9 +3554,7 @@
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 4
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/maintenance/electrical_shop)
"arv" = (
/obj/structure/chair/comfy/brown{
@@ -4459,9 +3570,7 @@
/area/maintenance/electrical_shop)
"arw" = (
/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/maintenance/electrical_shop)
"arx" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -4474,9 +3583,7 @@
"ary" = (
/obj/structure/computerframe,
/obj/item/stack/cable_coil/random,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/maintenance/electrical_shop)
"arz" = (
/obj/machinery/atmospherics/unary/portables_connector{
@@ -4510,20 +3617,17 @@
/turf/simulated/floor/carpet,
/area/security/vacantoffice)
"arD" = (
-/obj/machinery/hologram/holopad,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/obj/machinery/hologram/holopad,
+/turf/simulated/floor/wood,
/area/security/vacantoffice)
"arE" = (
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
@@ -4531,48 +3635,38 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 9
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/security/vacantoffice)
"arF" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 8
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/security/vacantoffice)
"arG" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
- },
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
+ icon_state = "4-8"
},
+/turf/simulated/floor/wood,
/area/security/vacantoffice)
"arH" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/effect/decal/warning_stripes/yellow,
/turf/simulated/floor/plasteel{
@@ -4602,7 +3696,9 @@
/obj/item/radio/intercom{
pixel_x = -28
},
-/obj/machinery/computer/card,
+/obj/machinery/computer/card{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "bluefull"
},
@@ -4611,8 +3707,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 1;
@@ -4632,8 +3727,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/table/reinforced,
/obj/item/folder/blue,
@@ -4647,14 +3741,12 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/turf/simulated/floor/plasteel{
@@ -4678,13 +3770,13 @@
},
/area/hallway/secondary/entry)
"arP" = (
-/obj/machinery/hologram/holopad,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/machinery/hologram/holopad,
/turf/simulated/floor/carpet,
/area/hallway/secondary/entry)
"arQ" = (
@@ -4696,8 +3788,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/machinery/door/firedoor,
/obj/machinery/door/window/brigdoor/southright{
@@ -4711,8 +3802,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/table/reinforced,
/obj/item/folder/red,
@@ -4738,8 +3828,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 1;
@@ -4768,7 +3857,9 @@
dir = 1;
pixel_x = 28
},
-/obj/machinery/computer/security,
+/obj/machinery/computer/security{
+ dir = 8
+ },
/turf/simulated/floor/plasteel{
icon_state = "redfull"
},
@@ -4777,8 +3868,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/landmark{
name = "blobstart"
@@ -4801,8 +3891,8 @@
},
/area/maintenance/fore2)
"arX" = (
-/obj/machinery/computer/arcade,
/obj/effect/decal/cleanable/dirt,
+/obj/machinery/computer/arcade,
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "dark"
@@ -4826,8 +3916,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/chair/stool,
/turf/simulated/floor/plasteel{
@@ -4908,15 +3997,11 @@
/obj/item/clipboard,
/obj/item/airalarm_electronics,
/obj/item/airlock_electronics,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/maintenance/electrical_shop)
"asm" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/maintenance/electrical_shop)
"asn" = (
/obj/effect/spawner/window/reinforced,
@@ -4926,9 +4011,7 @@
"aso" = (
/obj/structure/computerframe,
/obj/item/circuitboard/secure_data,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/maintenance/electrical_shop)
"asp" = (
/obj/machinery/light/small{
@@ -4951,32 +4034,24 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
- },
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
+ icon_state = "1-2"
},
+/turf/simulated/floor/wood,
/area/security/vacantoffice)
"ast" = (
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/security/vacantoffice)
"asu" = (
/obj/structure/table/wood,
/obj/item/camera_film,
/obj/item/camera_film,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/security/vacantoffice)
"asv" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
@@ -4988,7 +4063,9 @@
/obj/machinery/status_display{
pixel_x = -32
},
-/obj/machinery/computer/med_data,
+/obj/machinery/computer/med_data{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 9;
icon_state = "blue"
@@ -4998,8 +4075,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel{
@@ -5040,8 +4116,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel{
@@ -5085,7 +4160,9 @@
/obj/machinery/ai_status_display{
pixel_x = 32
},
-/obj/machinery/computer/secure_data,
+/obj/machinery/computer/secure_data{
+ dir = 8
+ },
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "red"
@@ -5114,8 +4191,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
dir = 5;
@@ -5228,8 +4304,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/structure/cable{
d1 = 1;
@@ -5297,7 +4372,7 @@
/area/engine/controlroom)
"ate" = (
/obj/structure/table/wood,
-/obj/item/circuitboard/arcade,
+/obj/item/circuitboard/arcade/battle,
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "dark"
@@ -5314,9 +4389,7 @@
/area/maintenance/electrical_shop)
"atg" = (
/obj/structure/chair/stool,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/maintenance/electrical_shop)
"ath" = (
/obj/effect/decal/cleanable/dirt,
@@ -5329,22 +4402,18 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/structure/chair/comfy/brown{
dir = 4
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/maintenance/electrical_shop)
"atj" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/table/wood,
/obj/item/folder/red,
@@ -5352,16 +4421,13 @@
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/maintenance/electrical_shop)
"atk" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/chair/comfy/brown{
dir = 8
@@ -5370,27 +4436,21 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/maintenance/electrical_shop)
"atl" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
- },
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
+ icon_state = "4-8"
},
+/turf/simulated/floor/wood,
/area/maintenance/electrical_shop)
"atm" = (
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/turf/simulated/floor/wood{
broken = 1;
@@ -5402,9 +4462,7 @@
/obj/machinery/status_display{
pixel_x = 32
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/maintenance/electrical_shop)
"ato" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -5460,9 +4518,7 @@
/area/security/vacantoffice)
"atu" = (
/obj/item/twohanded/required/kirbyplants,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/security/vacantoffice)
"atv" = (
/obj/structure/cable,
@@ -5470,31 +4526,24 @@
name = "south bump";
pixel_y = -24
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/security/vacantoffice)
"atw" = (
/obj/structure/table/wood,
/obj/item/camera,
/obj/machinery/light/small,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/security/vacantoffice)
"atx" = (
/obj/structure/table/wood,
/obj/item/flashlight/lamp,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/security/vacantoffice)
"aty" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
@@ -5515,8 +4564,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 1
@@ -5580,10 +4628,10 @@
},
/area/hallway/secondary/entry)
"atG" = (
+/obj/structure/closet/wardrobe/red,
/obj/machinery/newscaster/security_unit{
pixel_x = -30
},
-/obj/structure/closet/wardrobe/red,
/turf/simulated/floor/plasteel{
dir = 10;
icon_state = "red"
@@ -5593,8 +4641,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
@@ -5647,8 +4694,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
@@ -5660,8 +4706,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -5675,8 +4720,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 6
@@ -5865,10 +4909,10 @@
/area/maintenance/electrical_shop)
"aui" = (
/obj/machinery/light/small,
+/obj/effect/decal/cleanable/dirt,
/obj/machinery/newscaster{
pixel_y = -32
},
-/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "dark"
@@ -5898,16 +4942,13 @@
pixel_y = -28
},
/obj/structure/chair/stool,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/maintenance/electrical_shop)
"aul" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/wood{
@@ -5917,16 +4958,12 @@
/area/maintenance/electrical_shop)
"aum" = (
/obj/machinery/light/small,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/maintenance/electrical_shop)
"aun" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/maintenance/electrical_shop)
"auo" = (
/obj/structure/cable,
@@ -5935,20 +4972,16 @@
name = "south bump";
pixel_y = -24
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/maintenance/electrical_shop)
"aup" = (
/obj/structure/table/wood,
+/obj/item/folder/red,
+/obj/item/lighter/zippo,
/obj/machinery/newscaster{
pixel_x = 32
},
-/obj/item/folder/red,
-/obj/item/lighter/zippo,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/maintenance/electrical_shop)
"auq" = (
/obj/machinery/door/airlock/maintenance,
@@ -5959,8 +4992,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
@@ -5982,8 +5014,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door/airlock/maintenance{
name = "Security Maintenance";
@@ -5999,8 +5030,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
dir = 4;
@@ -6131,13 +5161,10 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door/airlock/maintenance,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/maintenance/electrical_shop)
"auN" = (
/obj/machinery/door/airlock/maintenance,
@@ -6180,8 +5207,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
@@ -6190,8 +5216,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
@@ -6203,8 +5228,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
dir = 1;
@@ -6215,8 +5239,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/light/small{
dir = 1
@@ -6227,8 +5250,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 1;
@@ -6245,8 +5267,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/cleanable/dirt,
/obj/structure/sign/poster/official/obey{
@@ -6296,14 +5317,12 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/effect/decal/warning_stripes/yellow,
/turf/simulated/floor/plasteel{
@@ -6315,8 +5334,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/door/airlock/maintenance{
req_access_txt = "12"
@@ -6328,8 +5346,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door/airlock/maintenance{
name = "Checkpoint Maintenance";
@@ -6362,8 +5379,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
@@ -6384,8 +5400,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
@@ -6395,7 +5410,9 @@
/turf/simulated/floor/plating,
/area/maintenance/fore2)
"avn" = (
-/obj/machinery/computer/arcade,
+/obj/machinery/computer/arcade{
+ dir = 1
+ },
/turf/simulated/floor/plating,
/area/maintenance/fore2)
"avo" = (
@@ -6491,20 +5508,17 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/effect/decal/warning_stripes/north,
/turf/simulated/floor/plasteel,
@@ -6568,8 +5582,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small{
@@ -6584,8 +5597,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 1;
@@ -6598,8 +5610,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
@@ -6613,8 +5624,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 1
@@ -6628,8 +5638,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -6647,8 +5656,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -6663,8 +5671,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -6678,14 +5685,12 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 1
@@ -6819,8 +5824,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -6840,8 +5844,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
@@ -6884,16 +5887,16 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/navbeacon{
- codes_txt = "patrol;next_patrol=hall1";
- location = "hall15"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 1
},
+/obj/machinery/navbeacon{
+ codes_txt = "patrol;next_patrol=hall1";
+ location = "hall15"
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
@@ -6949,14 +5952,12 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
@@ -6968,8 +5969,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
@@ -6981,14 +5981,12 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -7108,8 +6106,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/warning_stripes/east,
/turf/simulated/floor/plasteel{
@@ -7143,8 +6140,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
icon_state = "yellowfull"
@@ -7158,8 +6154,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
dir = 4;
@@ -7178,8 +6173,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -7190,8 +6184,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/warning_stripes/west,
/turf/simulated/floor/plasteel{
@@ -7203,8 +6196,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -7215,8 +6207,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 6
@@ -7229,8 +6220,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 8
@@ -7244,8 +6234,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/structure/table/reinforced,
/obj/machinery/alarm{
@@ -7278,6 +6267,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel,
/area/maintenance/fore2)
"awZ" = (
@@ -7291,8 +6285,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small{
@@ -7328,8 +6321,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -7363,8 +6355,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/effect/decal/warning_stripes/yellow,
/turf/simulated/floor/plasteel{
@@ -7402,8 +6393,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
@@ -7443,8 +6433,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
@@ -7458,8 +6447,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/warning_stripes/yellow/hollow,
/turf/simulated/floor/plasteel{
@@ -7473,8 +6461,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
@@ -7488,8 +6475,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/warning_stripes/yellow,
@@ -7508,8 +6494,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -7528,8 +6513,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/door/airlock/maintenance{
@@ -7552,8 +6536,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -7824,8 +6807,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/item/twohanded/required/kirbyplants,
/obj/structure/sign/nosmoking_2{
@@ -7877,14 +6859,12 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 1;
d2 = 4;
- icon_state = "1-4";
- tag = ""
+ icon_state = "1-4"
},
/turf/simulated/floor/greengrid,
/area/engine/controlroom)
@@ -7898,16 +6878,13 @@
/obj/structure/table/wood,
/obj/item/camera_film,
/obj/effect/decal/cleanable/cobweb2,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/maintenance/fore)
"ayi" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -7992,6 +6969,9 @@
/obj/machinery/newscaster{
pixel_y = 32
},
+/obj/structure/sign/nosmoking_2{
+ pixel_x = 32
+ },
/turf/simulated/floor/plasteel,
/area/janitor)
"ayp" = (
@@ -8056,8 +7036,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/door/airlock/maintenance{
req_access_txt = "12"
@@ -8098,8 +7077,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door/airlock/maintenance{
name = "Cargo Bay Warehouse Maintenance";
@@ -8185,8 +7163,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/visible{
dir = 6
@@ -8223,11 +7200,10 @@
/turf/simulated/floor/plating,
/area/engine/controlroom)
"ayV" = (
-/obj/structure/cable{
+/obj/structure/cable/yellow{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/effect/decal/warning_stripes/east,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -8276,14 +7252,10 @@
/area/maintenance/fore)
"azd" = (
/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/maintenance/fore)
"aze" = (
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/maintenance/fore)
"azf" = (
/obj/structure/disposalpipe/segment{
@@ -8303,8 +7275,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -8339,8 +7310,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
@@ -8365,10 +7335,11 @@
/area/janitor)
"azm" = (
/obj/structure/reagent_dispensers/watertank,
-/obj/structure/sign/nosmoking_2{
- pixel_x = 32
- },
/obj/effect/decal/warning_stripes/yellow/hollow,
+/obj/machinery/firealarm{
+ dir = 4;
+ pixel_x = 28
+ },
/turf/simulated/floor/plasteel,
/area/janitor)
"azn" = (
@@ -8385,8 +7356,7 @@
},
/obj/structure/sink{
dir = 8;
- pixel_x = -12;
- pixel_y = 2
+ pixel_x = -12
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/warning_stripes/yellow/hollow,
@@ -8438,8 +7408,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 9
@@ -8493,8 +7462,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
@@ -8536,6 +7504,13 @@
/area/quartermaster/sorting)
"azF" = (
/obj/effect/decal/cleanable/cobweb2,
+/obj/machinery/door_control{
+ id = "qm_warehouse";
+ name = "Warehouse Door Control";
+ pixel_x = 24;
+ pixel_y = -3;
+ req_access_txt = "31"
+ },
/turf/simulated/floor/plating,
/area/quartermaster/sorting)
"azG" = (
@@ -8543,6 +7518,13 @@
/obj/item/stack/packageWrap,
/obj/item/hand_labeler,
/obj/effect/decal/warning_stripes/yellow/hollow,
+/obj/machinery/door_control{
+ id = "qm_warehouse";
+ name = "Warehouse Door Control";
+ pixel_x = -24;
+ pixel_y = -3;
+ req_access_txt = "31"
+ },
/turf/simulated/floor/plasteel{
dir = 9;
icon_state = "brown"
@@ -8662,11 +7644,10 @@
/turf/simulated/floor/plating,
/area/maintenance/disposal)
"azT" = (
-/obj/structure/cable{
+/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/door/poddoor/shutters/radiation/preopen{
id_tag = "engsm"
@@ -8684,11 +7665,10 @@
},
/area/engine/controlroom)
"azV" = (
-/obj/structure/cable{
+/obj/structure/cable/yellow{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/effect/decal/warning_stripes/west,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -8709,7 +7689,7 @@
dir = 4
},
/obj/machinery/power/rad_collector,
-/obj/structure/cable{
+/obj/structure/cable/yellow{
d2 = 8;
icon_state = "0-8"
},
@@ -8738,14 +7718,14 @@
dir = 8
},
/obj/machinery/power/rad_collector,
-/obj/structure/cable{
+/obj/structure/cable/yellow{
d2 = 4;
icon_state = "0-4"
},
/turf/simulated/floor/engine,
/area/engine/supermatter)
"aAd" = (
-/obj/structure/cable{
+/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
icon_state = "4-8"
@@ -8789,8 +7769,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -8835,9 +7814,7 @@
"aAo" = (
/obj/structure/table/wood,
/obj/item/camera,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/maintenance/fore)
"aAp" = (
/obj/structure/chair/comfy/brown{
@@ -8884,14 +7861,13 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
-/obj/machinery/hologram/holopad,
/obj/effect/decal/warning_stripes/yellow/hollow,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -8917,11 +7893,15 @@
},
/area/janitor)
"aAx" = (
-/obj/item/reagent_containers/glass/bucket,
-/obj/structure/janitorialcart,
-/obj/machinery/firealarm{
- dir = 4;
- pixel_x = 28
+/obj/structure/window/reinforced{
+ dir = 1;
+ layer = 2.9
+ },
+/obj/structure/window/reinforced,
+/obj/effect/decal/warning_stripes/yellow,
+/obj/machinery/door/window/westleft{
+ name = "Janitoral Delivery";
+ req_access_txt = "26"
},
/turf/simulated/floor/plating,
/area/janitor)
@@ -8989,8 +7969,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -9009,8 +7988,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -9026,8 +8004,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
dir = 4;
@@ -9038,8 +8015,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door/airlock{
name = "Auxillary Restrooms"
@@ -9056,8 +8032,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
@@ -9075,8 +8050,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 4
@@ -9156,6 +8130,10 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/machinery/door/poddoor/shutters{
+ id_tag = "qm_warehouse";
+ name = "Warehouse Shutters"
+ },
/turf/simulated/floor/plasteel,
/area/quartermaster/sorting)
"aAT" = (
@@ -9217,8 +8195,8 @@
/turf/simulated/floor/plasteel,
/area/quartermaster/storage)
"aBa" = (
-/obj/machinery/conveyor/north{
- id = "QMLoad2"
+/obj/machinery/conveyor/south{
+ id = "QMLoad"
},
/turf/simulated/floor/plating,
/area/quartermaster/storage)
@@ -9232,11 +8210,10 @@
/turf/simulated/floor/plating,
/area/maintenance/fore)
"aBf" = (
-/obj/structure/cable{
+/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/warning_stripes/west,
/obj/machinery/door/poddoor/shutters/radiation/preopen{
@@ -9264,7 +8241,7 @@
dir = 4
},
/obj/machinery/power/rad_collector,
-/obj/structure/cable{
+/obj/structure/cable/yellow{
d2 = 8;
icon_state = "0-8"
},
@@ -9273,7 +8250,9 @@
"aBj" = (
/obj/machinery/door/firedoor,
/obj/effect/decal/warning_stripes/yellow,
-/obj/machinery/door/airlock/public/glass,
+/obj/machinery/door/airlock/public/glass{
+ name = "Public Access"
+ },
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel{
@@ -9290,7 +8269,7 @@
dir = 8
},
/obj/machinery/power/rad_collector,
-/obj/structure/cable{
+/obj/structure/cable/yellow{
d2 = 4;
icon_state = "0-4"
},
@@ -9300,8 +8279,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/camera{
c_tag = "Supermatter East";
@@ -9396,9 +8374,7 @@
/obj/structure/table/wood,
/obj/item/storage/fancy/crayons,
/obj/machinery/light/small,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/maintenance/fore)
"aBu" = (
/obj/structure/mirror{
@@ -9407,8 +8383,7 @@
},
/obj/structure/sink{
dir = 8;
- pixel_x = -12;
- pixel_y = 2
+ pixel_x = -12
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/warning_stripes/yellow/hollow,
@@ -9418,8 +8393,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -9438,10 +8412,12 @@
},
/obj/structure/sink{
dir = 8;
- pixel_x = -12;
- pixel_y = 2
+ pixel_x = -12
},
/obj/effect/decal/warning_stripes/yellow/hollow,
+/obj/structure/reagent_dispensers/spacecleanertank{
+ pixel_x = -32
+ },
/turf/simulated/floor/plasteel,
/area/janitor)
"aBx" = (
@@ -9453,6 +8429,8 @@
/obj/machinery/light_switch{
pixel_y = -26
},
+/obj/item/reagent_containers/glass/bucket,
+/obj/structure/janitorialcart,
/turf/simulated/floor/plasteel{
icon_state = "whitegreen"
},
@@ -9492,8 +8470,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -9509,8 +8486,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -9519,7 +8495,14 @@
/area/maintenance/fore)
"aBE" = (
/obj/structure/disposalpipe/segment,
-/obj/structure/table/reinforced,
+/obj/machinery/door/window{
+ dir = 2;
+ name = "Bar Door";
+ req_access_txt = "25"
+ },
+/obj/structure/window/reinforced{
+ dir = 8
+ },
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "dark"
@@ -9530,8 +8513,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
@@ -9577,8 +8559,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -9595,6 +8576,10 @@
name = "Cargo Bay";
req_access_txt = "31"
},
+/obj/machinery/door/poddoor/shutters{
+ id_tag = "qm_warehouse";
+ name = "Warehouse Shutters"
+ },
/turf/simulated/floor/plasteel,
/area/quartermaster/sorting)
"aBP" = (
@@ -9629,7 +8614,9 @@
"aBU" = (
/obj/machinery/door/firedoor,
/obj/effect/decal/warning_stripes/yellow,
-/obj/machinery/door/airlock/public/glass,
+/obj/machinery/door/airlock/public/glass{
+ name = "Public Access"
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "neutralcorner"
@@ -9646,8 +8633,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/item/twohanded/required/kirbyplants,
/obj/effect/decal/warning_stripes/yellow/hollow,
@@ -9674,8 +8660,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -9693,8 +8678,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -9711,8 +8695,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/visible/yellow{
dir = 4
@@ -9731,7 +8714,7 @@
dir = 4
},
/obj/machinery/power/rad_collector,
-/obj/structure/cable{
+/obj/structure/cable/yellow{
d2 = 8;
icon_state = "0-8"
},
@@ -9743,7 +8726,7 @@
dir = 8
},
/obj/machinery/power/rad_collector,
-/obj/structure/cable{
+/obj/structure/cable/yellow{
d2 = 4;
icon_state = "0-4"
},
@@ -9802,8 +8785,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door/airlock{
name = "Custodial Closet";
@@ -9847,13 +8829,13 @@
/area/maintenance/fore)
"aCu" = (
/obj/machinery/light/small,
-/obj/machinery/newscaster{
- pixel_x = -32
- },
/obj/structure/toilet{
dir = 8
},
/obj/effect/decal/cleanable/vomit,
+/obj/machinery/newscaster{
+ pixel_x = -32
+ },
/turf/simulated/floor/plating,
/area/crew_quarters/toilet)
"aCv" = (
@@ -9863,8 +8845,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/door/airlock/maintenance{
req_access_txt = "12"
@@ -9887,8 +8868,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plating,
/area/quartermaster/sorting)
@@ -9896,8 +8876,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/landmark{
name = "blobstart"
@@ -9908,8 +8887,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -9962,12 +8940,12 @@
/turf/simulated/floor/plasteel,
/area/quartermaster/sorting)
"aCJ" = (
+/obj/effect/decal/warning_stripes/yellow,
/obj/machinery/navbeacon{
codes_txt = "delivery;dir=4";
dir = 4;
location = "QM #1"
},
-/obj/effect/decal/warning_stripes/yellow,
/turf/simulated/floor/plasteel,
/area/quartermaster/storage)
"aCK" = (
@@ -9996,7 +8974,7 @@
/area/quartermaster/storage)
"aCO" = (
/obj/machinery/conveyor_switch/oneway{
- id = "QMLoad2"
+ id = "QMLoad"
},
/turf/simulated/floor/plasteel{
dir = 4;
@@ -10025,17 +9003,15 @@
},
/area/maintenance/fore)
"aCS" = (
-/obj/structure/cable{
+/obj/structure/cable/yellow{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
-/obj/structure/cable{
+/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/warning_stripes/east,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -10048,17 +9024,15 @@
/turf/simulated/floor/plating,
/area/maintenance/fore)
"aCU" = (
-/obj/structure/cable{
+/obj/structure/cable/yellow{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
-/obj/structure/cable{
+/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/warning_stripes/west,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -10146,11 +9120,10 @@
/turf/simulated/floor/plating,
/area/engine/controlroom)
"aDh" = (
-/obj/structure/cable{
+/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/visible{
dir = 10
@@ -10244,8 +9217,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/turf/simulated/floor/plating,
/area/maintenance/fore)
@@ -10253,8 +9225,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plating,
/area/maintenance/fore)
@@ -10262,8 +9233,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
icon_state = "neutral"
@@ -10273,8 +9243,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 1;
@@ -10294,8 +9263,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -10309,8 +9277,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 1
@@ -10327,8 +9294,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/warning_stripes/yellow/hollow,
/turf/simulated/floor/plasteel,
@@ -10357,8 +9323,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/structure/cable{
d1 = 1;
@@ -10424,8 +9389,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -10439,8 +9403,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/door/airlock/maintenance{
name = "Cargo Bay Warehouse Maintenance";
@@ -10455,14 +9418,12 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/warning_stripes/yellow,
@@ -10484,8 +9445,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/warning_stripes/yellow,
@@ -10498,8 +9458,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/warning_stripes/yellow/hollow,
@@ -10512,25 +9471,24 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/warning_stripes/yellow,
/turf/simulated/floor/plasteel,
/area/quartermaster/sorting)
"aDS" = (
-/obj/structure/plasticflaps,
/obj/effect/decal/warning_stripes/yellow,
+/obj/structure/plasticflaps,
/turf/simulated/floor/plasteel,
/area/quartermaster/sorting)
"aDT" = (
+/obj/effect/decal/warning_stripes/yellow,
/obj/machinery/navbeacon{
codes_txt = "delivery;dir=4";
dir = 4;
location = "QM #2"
},
-/obj/effect/decal/warning_stripes/yellow,
/mob/living/simple_animal/bot/mulebot{
home_destination = "QM #2";
suffix = "#2"
@@ -10554,8 +9512,8 @@
},
/area/quartermaster/storage)
"aDY" = (
-/obj/machinery/conveyor/northwest{
- id = "QMLoad2"
+/obj/machinery/conveyor/southeast/ccw{
+ id = "QMLoad"
},
/turf/simulated/floor/plating,
/area/quartermaster/storage)
@@ -10602,11 +9560,10 @@
},
/area/engine/controlroom)
"aEe" = (
-/obj/structure/cable{
+/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/light{
dir = 8
@@ -10638,6 +9595,10 @@
pixel_x = -24;
shock_proof = 1
},
+/obj/structure/cable/yellow{
+ d2 = 4;
+ icon_state = "0-4"
+ },
/turf/simulated/floor/engine,
/area/engine/supermatter)
"aEi" = (
@@ -10657,7 +9618,7 @@
/turf/simulated/floor/plasteel,
/area/engine/controlroom)
"aEk" = (
-/obj/structure/cable{
+/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
icon_state = "4-8"
@@ -10684,7 +9645,7 @@
},
/area/engine/controlroom)
"aEn" = (
-/obj/structure/cable{
+/obj/structure/cable/yellow{
d1 = 1;
d2 = 4;
icon_state = "1-4"
@@ -10700,8 +9661,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/unary/portables_connector{
dir = 8
@@ -10722,7 +9682,7 @@
/turf/simulated/floor/plasteel,
/area/hydroponics/abandoned_garden)
"aEs" = (
-/obj/structure/cable{
+/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
icon_state = "4-8"
@@ -10743,8 +9703,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/cleanable/dirt,
/obj/structure/disposalpipe/segment,
@@ -10769,8 +9728,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small,
@@ -10782,8 +9740,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
@@ -10794,8 +9751,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
@@ -10804,8 +9760,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/light/small{
dir = 1
@@ -10832,8 +9787,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
dir = 1;
@@ -10863,8 +9817,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/closet/crate,
/obj/effect/decal/warning_stripes/yellow/hollow,
@@ -10878,8 +9831,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
@@ -10892,8 +9844,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 1;
@@ -10915,8 +9866,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/unary/vent_pump/on{
@@ -10931,8 +9881,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/mining/glass{
@@ -10970,14 +9919,9 @@
/area/quartermaster/office)
"aEO" = (
/obj/machinery/light/small,
-/obj/machinery/newscaster{
- pixel_x = -32
- },
-/obj/structure/toilet{
- dir = 8
- },
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/warning_stripes/yellow/hollow,
+/obj/machinery/recharge_station,
/turf/simulated/floor/plasteel,
/area/crew_quarters/toilet)
"aEP" = (
@@ -11007,8 +9951,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -11106,30 +10049,28 @@
/turf/simulated/floor/plasteel,
/area/engine/controlroom)
"aFe" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8";
- tag = ""
- },
/obj/machinery/atmospherics/pipe/simple/visible{
dir = 4
},
/obj/effect/decal/warning_stripes/north,
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel,
/area/engine/controlroom)
"aFf" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8";
- tag = ""
- },
/obj/machinery/atmospherics/trinary/filter{
dir = 8;
filter_type = "n2"
},
/obj/effect/decal/warning_stripes/north,
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel,
/area/engine/controlroom)
"aFg" = (
@@ -11141,14 +10082,13 @@
/turf/simulated/wall/r_wall,
/area/engine/supermatter)
"aFi" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8";
- tag = ""
- },
/obj/machinery/atmospherics/pipe/manifold/visible,
/obj/effect/decal/warning_stripes/north,
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel,
/area/engine/controlroom)
"aFj" = (
@@ -11164,8 +10104,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/unary/portables_connector{
dir = 8
@@ -11174,11 +10113,10 @@
/turf/simulated/floor/plasteel,
/area/engine/controlroom)
"aFl" = (
-/obj/structure/cable{
+/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/visible{
dir = 9
@@ -11218,20 +10156,19 @@
/obj/machinery/light{
dir = 8
},
+/obj/effect/decal/warning_stripes/yellow,
/obj/machinery/navbeacon{
codes_txt = "delivery;dir=4";
dir = 4;
location = "QM #3"
},
-/obj/effect/decal/warning_stripes/yellow,
/turf/simulated/floor/plasteel,
/area/quartermaster/storage)
"aFq" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
@@ -11293,8 +10230,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -11352,8 +10288,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
@@ -11374,8 +10309,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel,
@@ -11425,7 +10359,8 @@
name = "Cargo Docking Hatch";
req_access_txt = "31"
},
-/turf/simulated/floor/plasteel,
+/obj/machinery/door/firedoor,
+/turf/simulated/floor/plating,
/area/quartermaster/storage)
"aFO" = (
/obj/effect/decal/cleanable/dirt,
@@ -11441,9 +10376,6 @@
/area/hydroponics/abandoned_garden)
"aFQ" = (
/obj/machinery/light/small,
-/obj/machinery/newscaster{
- pixel_x = -32
- },
/obj/structure/toilet{
dir = 8
},
@@ -11452,6 +10384,9 @@
name = "Civilian"
},
/obj/effect/decal/warning_stripes/yellow/hollow,
+/obj/machinery/newscaster{
+ pixel_x = -32
+ },
/turf/simulated/floor/plasteel,
/area/crew_quarters/toilet)
"aFR" = (
@@ -11463,11 +10398,10 @@
/turf/simulated/wall,
/area/quartermaster/storage)
"aFV" = (
-/obj/structure/cable{
+/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/warning_stripes/west,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -11481,27 +10415,25 @@
},
/area/engine/controlroom)
"aFX" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8";
- tag = ""
- },
/obj/machinery/atmospherics/binary/pump{
dir = 8;
name = "Gas to Filter";
on = 1
},
/obj/effect/decal/warning_stripes/north,
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
/turf/simulated/floor/plasteel,
/area/engine/controlroom)
"aFY" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8";
- tag = ""
- },
/obj/machinery/atmospherics/pipe/manifold/visible,
/obj/machinery/camera{
c_tag = "Supermatter South";
@@ -11512,50 +10444,52 @@
icon_state = "0-4"
},
/obj/effect/decal/warning_stripes/north,
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel,
/area/engine/supermatter)
"aFZ" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8";
- tag = ""
- },
/obj/machinery/atmospherics/pipe/simple/visible{
dir = 4
},
/obj/effect/decal/warning_stripes/north,
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel,
/area/engine/supermatter)
"aGa" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8";
- tag = ""
- },
/obj/machinery/atmospherics/pipe/manifold/visible,
/obj/machinery/meter,
/obj/effect/decal/warning_stripes/north,
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel,
/area/engine/controlroom)
"aGb" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 8;
- icon_state = "1-8"
- },
-/obj/structure/cable{
- d1 = 2;
- d2 = 8;
- icon_state = "2-8";
- tag = ""
- },
/obj/machinery/atmospherics/pipe/simple/visible{
dir = 4
},
/obj/effect/decal/warning_stripes/northwestcorner,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/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,
/area/engine/controlroom)
"aGc" = (
@@ -11589,8 +10523,7 @@
"aGe" = (
/obj/structure/sink{
dir = 8;
- pixel_x = -12;
- pixel_y = 2
+ pixel_x = -12
},
/obj/structure/sign/nosmoking_2{
pixel_x = -32
@@ -11600,12 +10533,12 @@
/turf/simulated/floor/plasteel,
/area/hydroponics/abandoned_garden)
"aGf" = (
-/obj/machinery/door/poddoor{
- id_tag = "QMLoaddoor2";
- name = "supply dock loading door"
+/obj/machinery/conveyor/east{
+ id = "QMLoad"
},
-/obj/machinery/conveyor/west{
- id = "QMLoad2"
+/obj/machinery/door/poddoor{
+ id_tag = "QMLoaddoor";
+ name = "supply dock loading door"
},
/turf/simulated/floor/plating,
/area/quartermaster/storage)
@@ -11613,8 +10546,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/machinery/atmospherics/pipe/simple/visible{
dir = 9
@@ -11638,6 +10570,7 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 1
},
+/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
@@ -11647,8 +10580,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/turf/simulated/floor/plasteel,
/area/hydroponics/abandoned_garden)
@@ -11656,8 +10588,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel,
/area/hydroponics/abandoned_garden)
@@ -11665,8 +10596,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -11677,8 +10607,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel,
@@ -11750,12 +10679,12 @@
/obj/item/radio/intercom{
pixel_y = 28
},
-/obj/structure/reagent_dispensers/beerkeg,
/obj/machinery/firealarm{
dir = 8;
pixel_x = -26;
pixel_y = 28
},
+/obj/machinery/bottler,
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "dark"
@@ -11782,7 +10711,7 @@
/area/crew_quarters/bar)
"aGx" = (
/obj/structure/sink/kitchen{
- pixel_y = 28
+ pixel_y = 25
},
/obj/machinery/camera{
c_tag = "Bar Backroom"
@@ -11815,6 +10744,7 @@
pixel_x = 26;
pixel_y = 26
},
+/obj/item/gun/projectile/revolver/doublebarrel,
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "dark"
@@ -11927,8 +10857,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 1;
@@ -11975,10 +10904,10 @@
/turf/simulated/floor/plating,
/area/quartermaster/sorting)
"aGP" = (
-/obj/structure/plasticflaps/mining,
-/obj/machinery/conveyor/west{
- id = "QMLoad2"
+/obj/machinery/conveyor/east{
+ id = "QMLoad"
},
+/obj/structure/plasticflaps/mining,
/turf/simulated/floor/plating,
/area/quartermaster/storage)
"aGQ" = (
@@ -12010,15 +10939,6 @@
/obj/machinery/seed_extractor,
/turf/simulated/floor/plasteel,
/area/security/permabrig)
-"aGU" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8";
- tag = ""
- },
-/turf/simulated/floor/plasteel,
-/area/security/permabrig)
"aGV" = (
/obj/structure/cable{
d1 = 4;
@@ -12029,8 +10949,10 @@
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 4
},
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "neutralfull"
+ },
/area/security/permabrig)
"aGW" = (
/obj/structure/lattice,
@@ -12057,7 +10979,7 @@
"aHb" = (
/obj/structure/sink{
dir = 4;
- pixel_x = 9
+ pixel_x = 12
},
/obj/structure/sign/botany{
pixel_x = 32
@@ -12066,11 +10988,10 @@
/turf/simulated/floor/plasteel,
/area/hydroponics/abandoned_garden)
"aHc" = (
-/obj/structure/cable{
+/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/warning_stripes/east,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -12126,8 +11047,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -12144,14 +11064,12 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
-/obj/structure/cable{
+/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 9
@@ -12175,8 +11093,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/warning_stripes/east,
/turf/simulated/floor/plasteel,
@@ -12228,8 +11145,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/warning_stripes/yellow,
@@ -12264,8 +11180,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/barricade/wooden,
/obj/machinery/door/airlock/maintenance{
@@ -12329,8 +11244,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/warning_stripes/yellow,
/turf/simulated/floor/plasteel{
@@ -12339,7 +11253,9 @@
},
/area/crew_quarters/sleep)
"aHI" = (
-/obj/structure/plasticflaps,
+/obj/structure/plasticflaps{
+ opacity = 1
+ },
/obj/machinery/navbeacon{
codes_txt = "delivery;dir=4";
dir = 4;
@@ -12362,8 +11278,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -12410,13 +11325,13 @@
},
/area/crew_quarters/bar)
"aHP" = (
-/obj/machinery/hologram/holopad,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
},
+/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "dark"
@@ -12439,21 +11354,16 @@
},
/area/crew_quarters/bar)
"aHS" = (
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
- },
/obj/structure/disposalpipe/sortjunction{
dir = 2;
icon_state = "pipe-j2s";
name = "Bar Junction";
- sortType = 4
+ sortType = 19
},
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 1;
@@ -12467,13 +11377,13 @@
},
/area/crew_quarters/sleep)
"aHT" = (
-/obj/structure/plasticflaps{
- opacity = 1
- },
/obj/machinery/conveyor{
dir = 4;
id = "cargodelivery"
},
+/obj/structure/plasticflaps{
+ opacity = 1
+ },
/turf/simulated/floor/plating,
/area/quartermaster/office)
"aHU" = (
@@ -12487,8 +11397,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/warning_stripes/yellow,
/turf/simulated/floor/plasteel,
@@ -12497,8 +11406,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/door/airlock/maintenance{
req_access_txt = "12"
@@ -12512,8 +11420,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/maintenance{
@@ -12563,10 +11470,6 @@
/obj/machinery/ai_status_display{
pixel_y = 32
},
-/obj/structure/extinguisher_cabinet{
- pixel_x = 25;
- pixel_y = 32
- },
/obj/structure/chair/sofa/left,
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
@@ -12596,14 +11499,14 @@
/area/quartermaster/storage)
"aIf" = (
/obj/machinery/door_control{
- id = "QMLoaddoor2";
+ id = "QMLoaddoor";
layer = 4;
name = "Loading Doors";
pixel_x = 24;
pixel_y = 8
},
/obj/machinery/door_control{
- id = "QMLoaddoor";
+ id = "QMLoaddoor2";
layer = 4;
name = "Loading Doors";
pixel_x = 24;
@@ -12617,24 +11520,17 @@
/turf/simulated/floor/plasteel,
/area/quartermaster/storage)
"aIg" = (
-/obj/structure/disposalpipe/segment,
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2";
- tag = ""
+/obj/machinery/door/poddoor{
+ id_tag = "justice_blast";
+ name = "Justice Blast Door"
},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 4
+/obj/effect/decal/warning_stripes/south,
+/obj/effect/decal/warning_stripes/north,
+/obj/structure/grille{
+ layer = 2.69
},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 8
- },
-/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "neutralfull"
- },
-/area/hallway/primary/fore)
+/turf/simulated/floor/plasteel,
+/area/security/execution)
"aIh" = (
/obj/machinery/conveyor/southeast{
id = "cargodelivery"
@@ -12642,38 +11538,41 @@
/turf/simulated/floor/plating,
/area/quartermaster/office)
"aIi" = (
-/obj/machinery/conveyor/northeast{
- id = "QMLoad"
+/obj/machinery/conveyor/southwest/ccw{
+ id = "QMLoad2"
},
/turf/simulated/floor/plating,
/area/quartermaster/storage)
"aIj" = (
-/obj/machinery/door/poddoor{
- id_tag = "QMLoaddoor";
- name = "supply dock loading door"
+/obj/machinery/conveyor/west{
+ id = "QMLoad2"
},
-/obj/machinery/conveyor/east{
- id = "QMLoad"
+/obj/machinery/door/poddoor{
+ id_tag = "QMLoaddoor2";
+ name = "supply dock loading door"
},
/turf/simulated/floor/plating,
/area/quartermaster/storage)
"aIk" = (
-/obj/structure/plasticflaps/mining,
-/obj/machinery/conveyor/east{
- id = "QMLoad"
+/obj/machinery/conveyor/west{
+ id = "QMLoad2"
},
+/obj/structure/plasticflaps/mining,
/turf/simulated/floor/plating,
/area/quartermaster/storage)
"aIl" = (
/obj/item/reagent_containers/glass/bottle/nutrient/ez,
/obj/item/reagent_containers/glass/bottle/nutrient/ez,
-/turf/simulated/floor/plating,
+/turf/simulated/floor/plasteel{
+ icon_state = "red"
+ },
/area/security/permabrig)
"aIm" = (
/obj/item/reagent_containers/glass/bucket,
-/obj/effect/decal/cleanable/dirt,
/obj/machinery/hydroponics/constructable,
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ icon_state = "red"
+ },
/area/security/permabrig)
"aIn" = (
/obj/structure/cable{
@@ -12682,20 +11581,25 @@
icon_state = "1-2";
tag = ""
},
-/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ icon_state = "red"
+ },
/area/security/permabrig)
"aIo" = (
/obj/item/plant_analyzer,
/obj/machinery/hydroponics/constructable,
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ icon_state = "red"
+ },
/area/security/permabrig)
"aIp" = (
/obj/item/cultivator,
/obj/item/reagent_containers/spray/pestspray,
-/turf/simulated/floor/plating,
+/turf/simulated/floor/plasteel{
+ icon_state = "red"
+ },
/area/security/permabrig)
"aIq" = (
/obj/machinery/atmospherics/unary/portables_connector,
@@ -12721,8 +11625,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/machinery/camera{
c_tag = "Port Fore Solars";
@@ -12813,8 +11716,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/machinery/atmospherics/pipe/simple/visible{
dir = 10
@@ -12849,8 +11751,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/effect/decal/warning_stripes/south,
/turf/simulated/floor/plasteel,
@@ -12859,8 +11760,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/warning_stripes/south,
/turf/simulated/floor/plasteel,
@@ -12869,8 +11769,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/light,
/obj/machinery/status_display{
@@ -12883,8 +11782,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/firealarm{
dir = 1;
@@ -12897,35 +11795,31 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/warning_stripes/southwestcorner,
/turf/simulated/floor/plasteel,
/area/engine/controlroom)
"aIH" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8";
- tag = ""
- },
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
+ },
/turf/simulated/floor/plasteel,
/area/engine/controlroom)
"aII" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/warning_stripes/southeastcorner,
/turf/simulated/floor/plasteel,
@@ -12934,8 +11828,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/light,
/obj/effect/decal/warning_stripes/south,
@@ -12950,18 +11843,16 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/effect/decal/warning_stripes/south,
/turf/simulated/floor/plasteel,
/area/engine/controlroom)
"aIL" = (
-/obj/structure/cable{
+/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/warning_stripes/south,
/turf/simulated/floor/plasteel,
@@ -13008,8 +11899,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
icon_state = "neutral"
@@ -13022,11 +11912,11 @@
dir = 4;
pixel_y = -22
},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/newscaster{
pixel_x = -32
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "neutralcorner"
@@ -13040,8 +11930,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/warning_stripes/yellow,
/obj/machinery/atmospherics/unary/vent_pump/on{
@@ -13063,8 +11952,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/light/small{
dir = 4
@@ -13100,10 +11988,10 @@
},
/area/crew_quarters/bar)
"aIY" = (
-/obj/item/twohanded/required/kirbyplants,
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 1
},
+/obj/structure/reagent_dispensers/beerkeg,
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "dark"
@@ -13152,8 +12040,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/mining/glass{
@@ -13168,8 +12055,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -13180,8 +12066,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/warning_stripes/north,
/turf/simulated/floor/plasteel{
@@ -13212,7 +12097,9 @@
},
/area/quartermaster/storage)
"aJk" = (
-/obj/machinery/computer/arcade/orion_trail,
+/obj/machinery/computer/arcade/orion_trail{
+ dir = 8
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "yellow"
@@ -13220,6 +12107,9 @@
/area/quartermaster/storage)
"aJm" = (
/obj/effect/decal/warning_stripes/north,
+/obj/structure/extinguisher_cabinet{
+ pixel_x = -25
+ },
/turf/simulated/floor/plasteel,
/area/quartermaster/storage)
"aJn" = (
@@ -13263,19 +12153,18 @@
},
/area/quartermaster/storage)
"aJs" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8";
- tag = ""
- },
/obj/machinery/atmospherics/pipe/manifold/visible,
/obj/effect/decal/warning_stripes/north,
/obj/machinery/door_control{
id = "engsm";
name = "Radiation Shutters Control";
pixel_y = 24;
- req_access_txt = "10"
+ req_access_txt = "24"
+ },
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel,
/area/engine/controlroom)
@@ -13320,7 +12209,7 @@
/obj/machinery/atmospherics/pipe/simple/heat_exchanging,
/obj/structure/lattice/catwalk,
/turf/space,
-/area/space)
+/area/space/nearstation)
"aJz" = (
/obj/machinery/atmospherics/pipe/simple/visible/yellow,
/obj/structure/lattice/catwalk,
@@ -13336,8 +12225,12 @@
/area/security/permabrig)
"aJC" = (
/obj/structure/table,
+/obj/item/book/manual/chef_recipes,
/obj/item/clothing/head/chefhat,
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "neutralfull"
+ },
/area/security/permabrig)
"aJD" = (
/obj/item/twohanded/required/kirbyplants,
@@ -13345,8 +12238,8 @@
/turf/simulated/floor/plasteel,
/area/engine/controlroom)
"aJE" = (
-/obj/machinery/conveyor/north{
- id = "QMLoad"
+/obj/machinery/conveyor/south{
+ id = "QMLoad2"
},
/turf/simulated/floor/plating,
/area/quartermaster/storage)
@@ -13412,10 +12305,9 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plating,
/area/maintenance/auxsolarport)
"aJL" = (
/obj/machinery/atmospherics/unary/vent_pump/high_volume{
@@ -13440,10 +12332,9 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plating,
/area/maintenance/auxsolarport)
"aJM" = (
/obj/structure/cable{
@@ -13454,8 +12345,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/effect/decal/warning_stripes/east,
/turf/simulated/floor/plating,
@@ -13465,19 +12355,22 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/warning_stripes/northwest,
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel,
/area/maintenance/incinerator)
"aJO" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/binary/pump{
name = "Gas to Turbine"
@@ -13489,8 +12382,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/visible,
/obj/effect/decal/warning_stripes/north,
@@ -13500,14 +12392,12 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/visible,
/obj/effect/decal/warning_stripes/north,
@@ -13569,8 +12459,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/atmos/glass{
@@ -13597,8 +12486,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plating,
/area/engine/controlroom)
@@ -13606,8 +12494,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/atmos/glass{
@@ -13651,8 +12538,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
@@ -13663,8 +12549,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -13678,8 +12563,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -13697,14 +12581,12 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -13721,18 +12603,14 @@
"aKh" = (
/obj/structure/table/wood,
/obj/item/flashlight/lamp,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/crew_quarters/sleep)
"aKi" = (
/obj/structure/table/wood,
/obj/item/folder,
/obj/item/pen,
/obj/machinery/atmospherics/unary/vent_scrubber/on,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/crew_quarters/sleep)
"aKj" = (
/obj/machinery/status_display{
@@ -13740,21 +12618,17 @@
},
/obj/structure/bed,
/obj/item/bedsheet/orange,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/crew_quarters/sleep)
"aKk" = (
/obj/structure/dresser,
/turf/simulated/floor/plasteel{
- icon_state = "wood"
+ icon_state = "barber"
},
-/area/crew_quarters/sleep)
+/area/civilian/barber)
"aKl" = (
/obj/structure/closet/secure_closet/personal/cabinet,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/crew_quarters/sleep)
"aKm" = (
/obj/item/radio/intercom{
@@ -13789,14 +12663,20 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plating,
/area/maintenance/auxsolarport)
"aKp" = (
/obj/structure/table/wood,
-/obj/item/gun/projectile/revolver/doublebarrel,
+/obj/item/wrench,
+/obj/item/stack/sheet/glass/fifty,
+/obj/item/stack/sheet/metal/fifty,
+/obj/item/stack/cable_coil/random{
+ pixel_x = 2;
+ pixel_y = 3
+ },
+/obj/item/stack/cable_coil/random,
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "dark"
@@ -13840,14 +12720,14 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/landmark{
name = "lightsout"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
@@ -13862,6 +12742,8 @@
dir = 4
},
/obj/effect/decal/warning_stripes/northeast,
+/obj/structure/table,
+/obj/machinery/recharger,
/turf/simulated/floor/plasteel,
/area/quartermaster/office)
"aKw" = (
@@ -13879,8 +12761,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/turf/simulated/floor/plasteel{
@@ -13895,16 +12776,6 @@
/obj/effect/spawner/lootdrop/maintenance,
/turf/simulated/floor/plating,
/area/quartermaster/office)
-"aKA" = (
-/obj/item/twohanded/required/kirbyplants,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "whitepurplecorner"
- },
-/area/medical/research)
"aKB" = (
/obj/structure/chair,
/turf/simulated/floor/plasteel{
@@ -13913,9 +12784,12 @@
},
/area/quartermaster/storage)
"aKC" = (
-/obj/structure/disposalpipe/junction,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/disposalpipe/junction{
+ dir = 2;
+ icon_state = "pipe-y"
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -13984,20 +12858,18 @@
/obj/machinery/status_display{
pixel_y = 32
},
-/obj/machinery/computer/library/public,
/obj/structure/table,
-/turf/simulated/floor/plasteel,
-/area/security/permabrig)
-"aKS" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel,
+/obj/machinery/computer/library/public,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "red"
+ },
/area/security/permabrig)
"aKT" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 1;
@@ -14017,7 +12889,10 @@
/turf/simulated/floor/plasteel,
/area/security/permabrig)
"aKU" = (
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "red"
+ },
/area/security/permabrig)
"aKV" = (
/obj/machinery/status_display{
@@ -14034,11 +12909,10 @@
/turf/simulated/wall,
/area/security/execution)
"aKX" = (
-/obj/structure/cable{
+/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/atmos/glass{
@@ -14049,11 +12923,12 @@
/area/engine/controlroom)
"aKY" = (
/obj/structure/cable,
+/obj/effect/decal/warning_stripes/southwest,
/obj/machinery/power/solar_control{
+ dir = 4;
id = "portsolar";
name = "Aft Port Solar Control"
},
-/obj/effect/decal/warning_stripes/southwest,
/turf/simulated/floor/plating,
/area/maintenance/auxsolarport)
"aKZ" = (
@@ -14147,8 +13022,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -14156,12 +13030,6 @@
},
/area/maintenance/incinerator)
"aLj" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8";
- tag = ""
- },
/obj/structure/cable{
d1 = 1;
d2 = 8;
@@ -14182,8 +13050,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/warning_stripes/west,
/turf/simulated/floor/plasteel{
@@ -14195,14 +13062,12 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 9
@@ -14223,8 +13088,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/atmos/glass{
@@ -14238,8 +13102,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/warning_stripes/northwest,
/turf/simulated/floor/plasteel,
@@ -14269,6 +13132,11 @@
name = "Fore Port Solar Access";
req_access_txt = "32"
},
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel,
/area/maintenance/auxsolarport)
"aLs" = (
@@ -14283,8 +13151,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/firealarm{
dir = 8;
@@ -14294,14 +13161,14 @@
/turf/simulated/floor/plasteel,
/area/engine/controlroom)
"aLw" = (
-/obj/structure/cable,
-/obj/structure/cable{
+/obj/machinery/power/terminal,
+/obj/effect/decal/warning_stripes/south,
+/obj/structure/cable/yellow,
+/obj/structure/cable/yellow{
d1 = 1;
d2 = 4;
icon_state = "1-4"
},
-/obj/machinery/power/terminal,
-/obj/effect/decal/warning_stripes/south,
/turf/simulated/floor/plasteel,
/area/engine/controlroom)
"aLx" = (
@@ -14341,8 +13208,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/light/small{
dir = 4
@@ -14357,9 +13223,7 @@
/obj/machinery/newscaster{
pixel_x = -32
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/crew_quarters/sleep)
"aLF" = (
/obj/structure/chair/office/dark{
@@ -14368,17 +13232,13 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/crew_quarters/sleep)
"aLG" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/crew_quarters/sleep)
"aLH" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -14387,9 +13247,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/crew_quarters/sleep)
"aLI" = (
/obj/machinery/door/airlock/maintenance{
@@ -14401,9 +13259,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/crew_quarters/sleep)
"aLJ" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
@@ -14444,15 +13300,7 @@
/area/crew_quarters/bar)
"aLN" = (
/obj/machinery/light,
-/obj/structure/closet/gmcloset,
-/obj/item/wrench,
-/obj/item/stack/sheet/glass/fifty,
-/obj/item/stack/sheet/metal/fifty,
-/obj/item/stack/cable_coil/random{
- pixel_x = 2;
- pixel_y = 3
- },
-/obj/item/stack/cable_coil/random,
+/obj/machinery/vending/bardrobe,
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "dark"
@@ -14498,7 +13346,7 @@
name = "Civilian"
},
/turf/simulated/floor/plasteel{
- icon_state = "redyellowfull"
+ icon_state = "bar"
},
/area/crew_quarters/bar)
"aLT" = (
@@ -14510,12 +13358,12 @@
/turf/simulated/wall,
/area/crew_quarters/bar/atrium)
"aLV" = (
+/obj/effect/decal/warning_stripes/yellow,
/obj/machinery/navbeacon{
codes_txt = "delivery;dir=4";
dir = 4;
location = "QM #4"
},
-/obj/effect/decal/warning_stripes/yellow,
/mob/living/simple_animal/bot/mulebot{
home_destination = "QM #4";
suffix = "#4"
@@ -14566,8 +13414,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -14589,7 +13436,6 @@
},
/area/quartermaster/office)
"aMb" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 8;
initialize_directions = 11
@@ -14598,6 +13444,12 @@
dir = 8;
initialize_directions = 11
},
+/obj/structure/cable{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -14618,13 +13470,13 @@
},
/area/quartermaster/storage)
"aMd" = (
-/obj/machinery/hologram/holopad,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 9
},
+/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
@@ -14676,6 +13528,7 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 8
},
+/mob/living/carbon/human/monkey/punpun,
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "dark"
@@ -14710,20 +13563,28 @@
},
/area/ai_monitored/storage/eva)
"aMq" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/chair/stool,
-/turf/simulated/floor/plating,
+/obj/structure/chair/stool{
+ dir = 1
+ },
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "neutralfull"
+ },
/area/security/permabrig)
"aMu" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
+ },
+/obj/structure/chair/stool{
+ dir = 4
},
-/obj/structure/chair/stool,
/obj/machinery/atmospherics/unary/vent_scrubber/on,
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "neutralfull"
+ },
/area/security/permabrig)
"aMv" = (
/turf/simulated/wall/r_wall,
@@ -14735,13 +13596,18 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "whitebluecorner"
},
/area/medical/medbay)
"aMx" = (
-/obj/structure/cable{
+/obj/structure/cable/yellow{
d2 = 8;
icon_state = "0-8"
},
@@ -14785,9 +13651,7 @@
"aMD" = (
/obj/structure/dresser,
/obj/machinery/atmospherics/unary/vent_pump/on,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/crew_quarters/sleep)
"aME" = (
/obj/structure/cable{
@@ -14859,6 +13723,11 @@
/area/engine/controlroom)
"aMO" = (
/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "vault"
@@ -14873,8 +13742,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/warning_stripes/yellow,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -14893,12 +13761,13 @@
d2 = 4;
icon_state = "1-4"
},
-/obj/machinery/computer/monitor{
- name = "Engineering Power Monitoring Console"
- },
/obj/machinery/status_display{
pixel_y = -32
},
+/obj/machinery/computer/monitor{
+ dir = 1;
+ name = "Engineering Power Monitoring Console"
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "dark"
@@ -14908,8 +13777,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d2 = 8;
@@ -14917,7 +13785,10 @@
},
/obj/machinery/light/small,
/obj/machinery/power/smes,
-/turf/simulated/floor/greengrid,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "dark"
+ },
/area/engine/controlroom)
"aMU" = (
/obj/structure/cable{
@@ -14960,8 +13831,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
@@ -14972,9 +13842,7 @@
"aNa" = (
/obj/structure/table/wood,
/obj/item/paper_bin,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/crew_quarters/sleep)
"aNb" = (
/obj/effect/decal/warning_stripes/yellow/hollow,
@@ -14989,15 +13857,11 @@
"aNc" = (
/obj/machinery/light,
/obj/structure/closet/wardrobe/mixed,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/crew_quarters/sleep)
"aNd" = (
/obj/structure/table/wood,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/crew_quarters/sleep)
"aNe" = (
/obj/structure/closet/emcloset,
@@ -15019,8 +13883,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/alarm{
dir = 8;
@@ -15039,7 +13902,7 @@
pixel_x = -28
},
/turf/simulated/floor/plasteel{
- icon_state = "redyellowfull"
+ icon_state = "bar"
},
/area/crew_quarters/bar)
"aNj" = (
@@ -15052,12 +13915,12 @@
pixel_x = 24
},
/turf/simulated/floor/plasteel{
- icon_state = "redyellowfull"
+ icon_state = "bar"
},
/area/crew_quarters/bar)
"aNk" = (
/obj/machinery/conveyor_switch/oneway{
- id = "QMLoad"
+ id = "QMLoad2"
},
/turf/simulated/floor/plasteel{
dir = 4;
@@ -15081,8 +13944,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
dir = 4;
@@ -15120,8 +13982,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
@@ -15176,8 +14037,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/mining/glass{
@@ -15231,14 +14091,16 @@
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
},
-/turf/simulated/floor/plating,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "redcorner"
+ },
/area/security/permabrig)
"aNE" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 1
@@ -15246,16 +14108,17 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 6
},
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "neutralfull"
+ },
/area/security/permabrig)
-"aNF" = (
+"aNG" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
-/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
@@ -15263,79 +14126,32 @@
dir = 4
},
/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "redcorner"
+ dir = 8;
+ icon_state = "neutralfull"
},
/area/security/permabrig)
-"aNG" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8";
- tag = ""
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/turf/simulated/floor/plasteel,
-/area/security/permabrig)
"aNI" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
-/turf/simulated/floor/plasteel,
-/area/security/permabrig)
-"aNJ" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8";
- tag = ""
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "neutralfull"
},
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/turf/simulated/floor/plasteel,
-/area/security/permabrig)
-"aNK" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8";
- tag = ""
- },
-/turf/simulated/floor/plating,
/area/security/permabrig)
"aNL" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -15347,17 +14163,18 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "neutralfull"
},
-/turf/simulated/floor/plasteel,
/area/security/permabrig)
"aNM" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -15366,8 +14183,8 @@
dir = 4
},
/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "redcorner"
+ dir = 8;
+ icon_state = "neutralfull"
},
/area/security/permabrig)
"aNN" = (
@@ -15376,27 +14193,40 @@
d2 = 8;
icon_state = "1-8"
},
-/obj/structure/chair/stool,
+/obj/structure/chair/stool{
+ dir = 4
+ },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 9
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
},
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "neutralfull"
+ },
/area/security/permabrig)
"aNO" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/table,
/obj/item/storage/box/donkpockets,
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "neutralfull"
+ },
/area/security/permabrig)
"aNP" = (
/obj/machinery/light/small{
dir = 4
},
-/obj/structure/chair/stool,
-/turf/simulated/floor/plating,
+/obj/structure/chair/stool{
+ dir = 8
+ },
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "red"
+ },
/area/security/permabrig)
"aNQ" = (
/obj/machinery/light/small{
@@ -15409,7 +14239,6 @@
name = "EXTERNAL AIRLOCK";
pixel_x = -32
},
-/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "vault"
@@ -15476,9 +14305,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/crew_quarters/sleep)
"aNY" = (
/obj/machinery/atmospherics/pipe/manifold/visible,
@@ -15497,7 +14324,9 @@
pixel_x = 24
},
/obj/effect/decal/warning_stripes/yellow/hollow,
-/obj/machinery/computer/sm_monitor,
+/obj/machinery/computer/sm_monitor{
+ dir = 8
+ },
/turf/simulated/floor/plasteel,
/area/engine/controlroom)
"aOa" = (
@@ -15516,7 +14345,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel{
- icon_state = "redyellowfull"
+ icon_state = "bar"
},
/area/crew_quarters/bar)
"aOd" = (
@@ -15524,8 +14353,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/visible{
dir = 10
@@ -15593,8 +14421,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/atmos/glass{
@@ -15660,16 +14487,13 @@
/area/maintenance/gambling_den)
"aOu" = (
/obj/item/twohanded/required/kirbyplants,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/maintenance/gambling_den)
"aOv" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
@@ -15749,7 +14573,7 @@
/area/crew_quarters/bar)
"aOG" = (
/turf/simulated/floor/plasteel{
- icon_state = "redyellowfull"
+ icon_state = "bar"
},
/area/crew_quarters/bar)
"aOH" = (
@@ -15785,10 +14609,10 @@
},
/area/quartermaster/office)
"aOL" = (
-/obj/machinery/hologram/holopad,
/obj/effect/decal/warning_stripes/yellow/hollow,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
@@ -15799,10 +14623,10 @@
/turf/simulated/wall,
/area/quartermaster/office)
"aON" = (
-/obj/structure/plasticflaps,
/obj/machinery/conveyor{
id = "cargodisposals"
},
+/obj/structure/plasticflaps,
/turf/simulated/floor/plating,
/area/quartermaster/office)
"aOO" = (
@@ -15815,8 +14639,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
@@ -15828,7 +14651,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel{
- icon_state = "redyellowfull"
+ icon_state = "bar"
},
/area/crew_quarters/bar)
"aOR" = (
@@ -15858,61 +14681,75 @@
/turf/space,
/area/space/nearstation)
"aOX" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/ai_status_display{
- pixel_y = -32
+/obj/machinery/atmospherics/pipe/simple/hidden{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "red"
},
-/turf/simulated/floor/plating,
/area/security/permabrig)
"aOY" = (
/obj/structure/table,
/obj/item/storage/pill_bottle/dice,
-/turf/simulated/floor/plating,
+/obj/machinery/atmospherics/unary/outlet_injector/on{
+ dir = 8
+ },
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "neutralfull"
+ },
/area/security/permabrig)
"aOZ" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/table,
/obj/item/paper,
/obj/item/pen,
-/turf/simulated/floor/plasteel,
-/area/security/permabrig)
-"aPa" = (
-/obj/structure/chair/stool,
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "neutralfull"
+ },
/area/security/permabrig)
"aPb" = (
-/obj/effect/decal/cleanable/dirt,
/mob/living/simple_animal/mouse,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/plasteel,
+/obj/machinery/atmospherics/pipe/simple/hidden{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "neutralfull"
+ },
/area/security/permabrig)
"aPd" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
},
/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "redcorner"
+ dir = 8;
+ icon_state = "neutralfull"
},
/area/security/permabrig)
"aPe" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plating,
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "neutralfull"
+ },
/area/security/permabrig)
"aPf" = (
/obj/machinery/alarm{
dir = 8;
pixel_x = 24
},
-/obj/effect/decal/cleanable/dirt,
/obj/item/twohanded/required/kirbyplants,
-/turf/simulated/floor/plating,
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "red"
+ },
/area/security/permabrig)
"aPg" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
@@ -15953,8 +14790,18 @@
},
/area/security/execution)
"aPj" = (
-/turf/simulated/wall/r_wall/rust,
-/area/security/execution)
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "neutralfull"
+ },
+/area/security/permabrig)
"aPk" = (
/obj/machinery/door/poddoor{
id_tag = "turbinevent";
@@ -16009,8 +14856,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/door/airlock/glass{
autoclose = 0;
@@ -16027,8 +14873,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/engine,
/area/maintenance/incinerator)
@@ -16036,8 +14881,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/door/airlock/glass{
autoclose = 0;
@@ -16054,8 +14898,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -16066,8 +14909,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/warning_stripes/yellow,
/turf/simulated/floor/plasteel{
@@ -16094,13 +14936,13 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel{
- icon_state = "redyellowfull"
+ icon_state = "bar"
},
/area/crew_quarters/bar)
"aPv" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/small,
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ icon_state = "red"
+ },
/area/security/permabrig)
"aPw" = (
/obj/effect/landmark/start{
@@ -16145,8 +14987,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/carpet,
@@ -16189,12 +15030,19 @@
/turf/simulated/floor/plasteel,
/area/engine/controlroom)
"aPF" = (
-/obj/machinery/atmospherics/pipe/simple/visible/cyan{
+/obj/machinery/atmospherics/pipe/simple/visible/yellow{
dir = 4
},
-/obj/effect/decal/warning_stripes/north,
-/obj/machinery/atmospherics/unary/vent_scrubber/on,
-/turf/simulated/floor/plasteel,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 6
+ },
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "neutralfull"
+ },
/area/atmos)
"aPG" = (
/obj/machinery/light{
@@ -16256,13 +15104,10 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/chair/stool,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/maintenance/gambling_den)
"aPO" = (
/obj/machinery/light/small{
@@ -16275,13 +15120,13 @@
},
/area/maintenance/gambling_den)
"aPP" = (
-/obj/machinery/newscaster{
- pixel_y = 32
- },
/obj/machinery/status_display{
pixel_x = -32
},
/obj/structure/closet/secure_closet/clown,
+/obj/machinery/newscaster{
+ pixel_y = 32
+ },
/turf/simulated/floor/plasteel{
icon_state = "redbluefull"
},
@@ -16351,9 +15196,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/maintenance/gambling_den)
"aPW" = (
/turf/simulated/floor/carpet,
@@ -16362,8 +15205,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/turf/simulated/floor/carpet,
@@ -16377,18 +15219,11 @@
icon_state = "grimy"
},
/area/crew_quarters/bar/atrium)
-"aPZ" = (
-/obj/structure/table/wood,
-/turf/simulated/floor/plasteel{
- dir = 5;
- icon_state = "dark"
- },
-/area/crew_quarters/bar)
"aQb" = (
/obj/structure/table/wood,
/obj/item/storage/pill_bottle/dice,
/turf/simulated/floor/plasteel{
- icon_state = "redyellowfull"
+ icon_state = "bar"
},
/area/crew_quarters/bar)
"aQc" = (
@@ -16401,14 +15236,14 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel{
- icon_state = "redyellowfull"
+ icon_state = "bar"
},
/area/crew_quarters/bar)
"aQd" = (
/obj/structure/table/wood,
/obj/item/reagent_containers/food/drinks/cans/cola,
/turf/simulated/floor/plasteel{
- icon_state = "redyellowfull"
+ icon_state = "bar"
},
/area/crew_quarters/bar)
"aQe" = (
@@ -16433,8 +15268,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/chair/office/dark{
dir = 8
@@ -16454,14 +15288,12 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 4
@@ -16484,8 +15316,8 @@
},
/area/quartermaster/office)
"aQi" = (
-/obj/structure/plasticflaps,
/obj/effect/decal/warning_stripes/yellow,
+/obj/structure/plasticflaps,
/turf/simulated/floor/plasteel,
/area/quartermaster/office)
"aQj" = (
@@ -16500,7 +15332,7 @@
dir = 4
},
/obj/machinery/door/firedoor,
-/turf/simulated/floor/plating,
+/turf/simulated/floor/wood,
/area/medical/psych)
"aQk" = (
/obj/structure/table,
@@ -16514,8 +15346,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -16539,9 +15370,13 @@
},
/area/quartermaster/storage)
"aQo" = (
-/obj/structure/table/wood,
-/obj/machinery/computer/med_data/laptop,
-/turf/simulated/floor/wood,
+/obj/structure/chair/comfy/lime{
+ dir = 4
+ },
+/obj/machinery/computer/med_data/laptop{
+ dir = 1
+ },
+/turf/simulated/floor/carpet,
/area/medical/psych)
"aQp" = (
/obj/machinery/door/firedoor,
@@ -16563,9 +15398,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/maintenance/gambling_den)
"aQr" = (
/obj/effect/spawner/lootdrop/maintenance,
@@ -16580,18 +15413,18 @@
/obj/machinery/light{
dir = 4
},
-/obj/machinery/conveyor/northeast/ccw{
- id = "QMLoad"
+/obj/machinery/conveyor/southwest{
+ id = "QMLoad2"
},
/turf/simulated/floor/plating,
/area/quartermaster/storage)
"aQt" = (
+/obj/structure/chair/stool/bar,
/obj/machinery/newscaster{
pixel_x = -32
},
-/obj/structure/chair/stool/bar,
/turf/simulated/floor/plasteel{
- icon_state = "redyellowfull"
+ icon_state = "bar"
},
/area/crew_quarters/bar)
"aQu" = (
@@ -16627,53 +15460,75 @@
/turf/simulated/floor/plating,
/area/maintenance/gambling_den)
"aQx" = (
-/obj/structure/table,
-/obj/item/book/manual/chef_recipes,
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 4
},
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "red"
+ },
/area/security/permabrig)
"aQy" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "neutralfull"
+ },
/area/security/permabrig)
"aQB" = (
/obj/structure/table,
-/turf/simulated/floor/plating,
+/obj/item/toy/figure/crew/syndie,
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "neutralfull"
+ },
/area/security/permabrig)
"aQC" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/table,
/obj/item/deck/cards,
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "neutralfull"
+ },
/area/security/permabrig)
"aQD" = (
-/obj/structure/chair/stool,
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plating,
+/obj/structure/chair/stool{
+ dir = 8
+ },
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "neutralfull"
+ },
/area/security/permabrig)
"aQG" = (
/obj/structure/chair/stool,
-/turf/simulated/floor/plating,
+/turf/simulated/floor/plasteel{
+ icon_state = "redcorner"
+ },
/area/security/permabrig)
"aQH" = (
/obj/machinery/computer/cryopod{
pixel_y = -32
},
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ dir = 0;
+ icon_state = "red"
+ },
/area/security/permabrig)
"aQI" = (
/obj/machinery/cryopod,
-/turf/simulated/floor/plating,
+/turf/simulated/floor/plasteel{
+ dir = 6;
+ icon_state = "red"
+ },
/area/security/permabrig)
"aQJ" = (
/turf/simulated/floor/plasteel{
@@ -16743,6 +15598,7 @@
pixel_y = -24
},
/obj/machinery/computer/turbine_computer{
+ dir = 1;
id = "incineratorturbine"
},
/turf/simulated/floor/plasteel{
@@ -16860,13 +15716,13 @@
/obj/structure/window/reinforced{
dir = 4
},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 4
+/obj/item/tank/internals/emergency_oxygen,
+/obj/item/tank/internals/emergency_oxygen,
+/obj/item/clothing/mask/breath,
+/obj/item/clothing/mask/breath,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 6
},
-/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{
dir = 5;
icon_state = "caution"
@@ -16884,7 +15740,9 @@
pixel_x = -22
},
/obj/effect/decal/warning_stripes/yellow/hollow,
-/obj/structure/closet/wardrobe/atmospherics_yellow,
+/obj/machinery/shower{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/engine/controlroom)
"aRb" = (
@@ -16942,7 +15800,7 @@
dir = 4
},
/turf/simulated/floor/plasteel{
- icon_state = "redyellowfull"
+ icon_state = "bar"
},
/area/crew_quarters/bar)
"aRf" = (
@@ -17020,22 +15878,17 @@
},
/area/maintenance/gambling_den)
"aRm" = (
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/maintenance/gambling_den)
"aRn" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/chair/stool,
/obj/machinery/atmospherics/unary/vent_pump/on,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/maintenance/gambling_den)
"aRo" = (
/obj/machinery/slot_machine,
@@ -17066,8 +15919,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
icon_state = "redbluefull"
@@ -17081,7 +15933,7 @@
dir = 4
},
/turf/simulated/floor/plasteel{
- icon_state = "redyellowfull"
+ icon_state = "bar"
},
/area/crew_quarters/bar)
"aRt" = (
@@ -17096,14 +15948,12 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/effect/decal/warning_stripes/yellow,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
@@ -17115,8 +15965,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/light/small{
dir = 4
@@ -17143,7 +15992,7 @@
dir = 4
},
/turf/simulated/floor/plasteel{
- icon_state = "redyellowfull"
+ icon_state = "bar"
},
/area/crew_quarters/bar)
"aRy" = (
@@ -17171,7 +16020,7 @@
/obj/structure/table/wood,
/obj/item/reagent_containers/food/snacks/cheesiehonkers,
/turf/simulated/floor/plasteel{
- icon_state = "redyellowfull"
+ icon_state = "bar"
},
/area/crew_quarters/bar)
"aRD" = (
@@ -17179,14 +16028,14 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel{
- icon_state = "redyellowfull"
+ icon_state = "bar"
},
/area/crew_quarters/bar)
"aRE" = (
/obj/structure/table/wood,
/obj/item/deck/cards,
/turf/simulated/floor/plasteel{
- icon_state = "redyellowfull"
+ icon_state = "bar"
},
/area/crew_quarters/bar)
"aRH" = (
@@ -17233,7 +16082,13 @@
"aRM" = (
/obj/structure/table,
/obj/item/folder/yellow,
-/obj/item/destTagger,
+/obj/item/destTagger{
+ pixel_x = -4
+ },
+/obj/item/rcs{
+ pixel_x = 8;
+ pixel_y = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "brown"
},
@@ -17242,8 +16097,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -17281,8 +16135,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
@@ -17300,8 +16153,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -17309,6 +16161,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "white"
@@ -17369,11 +16224,8 @@
/obj/machinery/atmospherics/pipe/simple/visible/yellow{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 6
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 5
+ dir = 4
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -17394,64 +16246,61 @@
},
/area/hallway/primary/fore)
"aSh" = (
-/obj/structure/table/glass,
-/obj/item/reagent_containers/glass/bottle/morphine,
-/obj/item/reagent_containers/syringe,
+/obj/machinery/computer/security{
+ dir = 4;
+ network = list("SS13","Research Outpost","Mining Outpost")
+ },
/turf/simulated/floor/plasteel{
dir = 9;
- icon_state = "whitered"
+ icon_state = "red"
},
/area/security/permabrig)
"aSi" = (
-/obj/structure/table/glass,
-/obj/item/folder/blue,
-/obj/item/healthanalyzer,
/obj/machinery/light{
dir = 1;
on = 1
},
-/obj/machinery/newscaster{
- pixel_y = 32
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
dir = 1;
- icon_state = "whitered"
+ icon_state = "red"
},
/area/security/permabrig)
"aSj" = (
-/obj/structure/table/glass,
-/obj/item/reagent_containers/glass/bottle/morphine,
-/obj/item/reagent_containers/syringe,
+/obj/machinery/atmospherics/pipe/simple/hidden,
+/obj/structure/table/reinforced,
+/obj/machinery/recharger,
/turf/simulated/floor/plasteel{
dir = 5;
- icon_state = "whitered"
+ icon_state = "red"
},
/area/security/permabrig)
"aSl" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/plating,
-/area/security/permabrig)
-"aSm" = (
-/obj/machinery/light/small,
-/obj/item/twohanded/required/kirbyplants,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/ai_status_display{
- pixel_y = -32
+/turf/simulated/floor/plasteel{
+ dir = 0;
+ icon_state = "red"
},
-/turf/simulated/floor/plasteel,
/area/security/permabrig)
"aSn" = (
-/obj/structure/chair/stool,
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel,
+/obj/structure/chair/stool{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "neutralfull"
+ },
/area/security/permabrig)
"aSp" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -17468,11 +16317,19 @@
/obj/machinery/ai_status_display{
pixel_y = -32
},
-/turf/simulated/floor/plating,
+/turf/simulated/floor/plasteel{
+ dir = 0;
+ icon_state = "red"
+ },
/area/security/permabrig)
"aSs" = (
-/obj/machinery/computer/arcade,
-/turf/simulated/floor/plating,
+/obj/machinery/computer/arcade{
+ dir = 1
+ },
+/turf/simulated/floor/plasteel{
+ dir = 6;
+ icon_state = "red"
+ },
/area/security/permabrig)
"aSt" = (
/obj/effect/spawner/window/reinforced,
@@ -17500,8 +16357,8 @@
},
/area/security/execution)
"aSw" = (
-/obj/machinery/conveyor/east{
- id = "QMLoad"
+/obj/machinery/conveyor/west{
+ id = "QMLoad2"
},
/turf/simulated/floor/plating,
/area/quartermaster/storage)
@@ -17600,8 +16457,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/visible/cyan{
dir = 4
@@ -17615,9 +16471,7 @@
/obj/machinery/atmospherics/pipe/simple/visible/green{
dir = 4
},
-/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 1
- },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
@@ -17681,8 +16535,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -17690,19 +16543,16 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/maintenance/gambling_den)
"aSS" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/door/airlock/maintenance{
- req_access_txt = "12"
+ req_access_txt = "46"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -17716,23 +16566,21 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
-/obj/machinery/hologram/holopad,
/obj/effect/decal/warning_stripes/yellow/hollow,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
+/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel,
/area/crew_quarters/theatre)
"aSU" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -17750,8 +16598,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/warning_stripes/yellow,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -17766,8 +16613,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 1;
@@ -17786,8 +16632,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -17802,11 +16647,11 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/maintenance{
+ name = "Entertainment Office";
req_access_txt = "46"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -17824,8 +16669,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/warning_stripes/yellow/hollow,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
@@ -17849,14 +16693,12 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/structure/cable{
d1 = 1;
@@ -17870,19 +16712,21 @@
},
/area/crew_quarters/sleep)
"aTb" = (
-/obj/machinery/hologram/holopad,
/obj/item/radio/intercom{
pixel_y = -28
},
/obj/effect/decal/warning_stripes/yellow/hollow,
-/turf/simulated/floor/plasteel,
+/obj/machinery/hologram/holopad,
+/turf/simulated/floor/plasteel{
+ dir = 0;
+ icon_state = "red"
+ },
/area/security/permabrig)
"aTc" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/maintenance{
@@ -17894,8 +16738,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
dir = 5;
@@ -17906,21 +16749,20 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
icon_state = "grimy"
},
/area/crew_quarters/bar/atrium)
"aTf" = (
-/obj/machinery/hologram/holopad,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/machinery/hologram/holopad,
/turf/simulated/floor/carpet,
/area/crew_quarters/bar/atrium)
"aTg" = (
@@ -17947,7 +16789,7 @@
/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
/turf/simulated/floor/plasteel{
- icon_state = "redyellowfull"
+ icon_state = "bar"
},
/area/crew_quarters/bar)
"aTi" = (
@@ -17966,8 +16808,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 4
@@ -17986,8 +16827,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -18009,7 +16849,7 @@
"aTp" = (
/obj/structure/chair/stool/bar,
/turf/simulated/floor/plasteel{
- icon_state = "redyellowfull"
+ icon_state = "bar"
},
/area/crew_quarters/bar)
"aTq" = (
@@ -18056,6 +16896,11 @@
/area/quartermaster/storage)
"aTw" = (
/obj/structure/table/reinforced,
+/obj/item/stamp/granted,
+/obj/item/stamp/granted{
+ pixel_x = 3;
+ pixel_y = 3
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
@@ -18065,8 +16910,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel{
@@ -18143,28 +16987,40 @@
},
/area/quartermaster/qm)
"aTF" = (
-/obj/structure/bed,
-/obj/item/clothing/suit/straight_jacket,
-/obj/item/clothing/mask/muzzle,
-/obj/item/clothing/glasses/sunglasses/blindfold,
+/obj/machinery/light{
+ dir = 8
+ },
+/obj/machinery/computer/area_atmos/area{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 8;
- icon_state = "whitered"
+ icon_state = "red"
},
/area/security/permabrig)
"aTG" = (
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/unary/vent_scrubber/on,
/turf/simulated/floor/plasteel{
- icon_state = "white"
+ dir = 8;
+ icon_state = "neutralfull"
},
/area/security/permabrig)
"aTH" = (
-/obj/structure/bed,
-/obj/item/clothing/suit/straight_jacket,
-/obj/item/clothing/mask/muzzle,
-/obj/item/clothing/glasses/sunglasses/blindfold,
+/obj/machinery/atmospherics/pipe/simple/hidden,
+/obj/machinery/computer/security/telescreen{
+ desc = "Used for watching Prison Wing holding areas.";
+ name = "Prison Monitor";
+ network = list("Prison");
+ pixel_x = 30
+ },
/turf/simulated/floor/plasteel{
dir = 4;
- icon_state = "whitered"
+ icon_state = "red"
},
/area/security/permabrig)
"aTI" = (
@@ -18184,8 +17040,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door/airlock/glass{
name = "Prison"
@@ -18230,8 +17085,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 6
@@ -18250,6 +17104,12 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 6
},
+/obj/machinery/door_control{
+ id = "justice_blast";
+ name = "Space Vent";
+ pixel_y = 34;
+ req_access_txt = "2"
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "darkred"
@@ -18264,8 +17124,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -18282,8 +17141,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -18304,8 +17162,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/structure/closet/secure_closet/injection,
/obj/machinery/atmospherics/unary/vent_scrubber/on{
@@ -18357,8 +17214,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/warning_stripes/yellow,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -18400,6 +17256,9 @@
},
/obj/item/stack/packageWrap,
/obj/item/hand_labeler,
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 10;
icon_state = "caution"
@@ -18410,6 +17269,9 @@
dir = 6
},
/obj/effect/decal/warning_stripes/west,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/atmos)
"aTZ" = (
@@ -18432,9 +17294,6 @@
/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 = "neutralfull"
@@ -18478,8 +17337,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/visible/yellow{
dir = 4
@@ -18550,7 +17408,7 @@
dir = 4
},
/turf/simulated/floor/plasteel{
- icon_state = "redyellowfull"
+ icon_state = "bar"
},
/area/crew_quarters/bar)
"aUk" = (
@@ -18591,7 +17449,7 @@
dir = 4
},
/turf/simulated/floor/plasteel{
- icon_state = "redyellowfull"
+ icon_state = "bar"
},
/area/crew_quarters/bar)
"aUp" = (
@@ -18619,8 +17477,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plating,
/area/maintenance/gambling_den)
@@ -18628,8 +17485,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/barricade/wooden,
/obj/machinery/door/airlock/maintenance,
@@ -18639,14 +17495,12 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/effect/decal/warning_stripes/yellow,
/turf/simulated/floor/plasteel,
@@ -18660,7 +17514,7 @@
dir = 5
},
/turf/simulated/floor/plasteel{
- icon_state = "redyellowfull"
+ icon_state = "bar"
},
/area/crew_quarters/bar)
"aUx" = (
@@ -18705,7 +17559,7 @@
dir = 4
},
/turf/simulated/floor/plasteel{
- icon_state = "redyellowfull"
+ icon_state = "bar"
},
/area/crew_quarters/bar)
"aUC" = (
@@ -18723,8 +17577,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
dir = 4;
@@ -18770,7 +17623,7 @@
"aUI" = (
/obj/structure/table/wood,
/turf/simulated/floor/plasteel{
- icon_state = "redyellowfull"
+ icon_state = "bar"
},
/area/crew_quarters/bar)
"aUJ" = (
@@ -18779,7 +17632,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel{
- icon_state = "redyellowfull"
+ icon_state = "bar"
},
/area/crew_quarters/bar)
"aUL" = (
@@ -18788,7 +17641,7 @@
icon_state = "pipe-y"
},
/turf/simulated/floor/plasteel{
- icon_state = "redyellowfull"
+ icon_state = "bar"
},
/area/crew_quarters/bar)
"aUM" = (
@@ -18804,6 +17657,14 @@
},
/obj/structure/table/reinforced,
/obj/item/paper_bin,
+/obj/item/stack/sheet/metal{
+ amount = 50
+ },
+/obj/item/stack/sheet/glass{
+ amount = 50;
+ pixel_x = 3;
+ pixel_y = 3
+ },
/obj/machinery/newscaster{
layer = 3.3;
pixel_x = -27
@@ -18827,8 +17688,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -18838,14 +17698,9 @@
},
/area/quartermaster/office)
"aUQ" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2";
- tag = ""
- },
-/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 8
+/obj/machinery/atmospherics/pipe/simple/visible/cyan,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -18853,10 +17708,10 @@
},
/area/atmos)
"aUR" = (
-/obj/machinery/ai_status_display{
+/obj/machinery/photocopier,
+/obj/machinery/status_display/supply_display{
pixel_y = 32
},
-/obj/machinery/photocopier,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "brown"
@@ -18907,8 +17762,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
dir = 1;
@@ -18932,8 +17786,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/light{
dir = 8
@@ -18968,7 +17821,9 @@
},
/area/quartermaster/storage)
"aVa" = (
-/obj/machinery/computer/supplycomp,
+/obj/machinery/computer/supplycomp{
+ dir = 8
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
@@ -19003,8 +17858,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/chair/office/dark{
dir = 4
@@ -19024,7 +17878,9 @@
},
/area/quartermaster/qm)
"aVj" = (
-/obj/machinery/computer/supplycomp,
+/obj/machinery/computer/supplycomp{
+ dir = 8
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "brown"
@@ -19034,23 +17890,29 @@
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
},
+/obj/machinery/firealarm{
+ dir = 8;
+ pixel_x = -24
+ },
/turf/simulated/floor/plasteel{
dir = 8;
- icon_state = "whitered"
+ icon_state = "red"
},
/area/security/permabrig)
"aVl" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
- dir = 8
+/obj/machinery/door/window/brigdoor{
+ dir = 8;
+ name = "Riot Control";
+ req_access_txt = "2"
},
-/obj/machinery/firealarm{
- dir = 4;
- pixel_x = 24
+/obj/structure/window/reinforced{
+ dir = 1;
+ layer = 2.9
},
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "whitered"
+/obj/machinery/atmospherics/unary/portables_connector{
+ dir = 1
},
+/turf/simulated/floor/plating,
/area/security/permabrig)
"aVm" = (
/obj/structure/bed,
@@ -19065,7 +17927,6 @@
/area/security/permabrig)
"aVn" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 8
},
@@ -19086,16 +17947,17 @@
network = list("SS13","Security")
},
/obj/structure/chair/stool,
-/turf/simulated/floor/plating,
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "red"
+ },
/area/security/permabrig)
"aVp" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
-/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 6
},
@@ -19137,7 +17999,10 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 6
},
-/turf/simulated/floor/plating,
+/turf/simulated/floor/plasteel{
+ dir = 0;
+ icon_state = "neutral"
+ },
/area/security/permabrig)
"aVt" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
@@ -19152,7 +18017,6 @@
network = list("SS13","Security")
},
/obj/structure/chair/stool,
-/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "red"
@@ -19180,8 +18044,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/chair/office/dark{
@@ -19207,8 +18070,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
dir = 4;
@@ -19367,31 +18229,24 @@
},
/area/atmos)
"aVN" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8";
- tag = ""
- },
/obj/machinery/atmospherics/pipe/simple/visible/green{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
},
/area/atmos)
"aVO" = (
-/obj/structure/cable{
- d1 = 2;
- d2 = 8;
- icon_state = "2-8";
- tag = ""
- },
-/obj/machinery/atmospherics/pipe/simple/visible/green{
- dir = 4
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 1
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -19412,7 +18267,7 @@
},
/obj/structure/chair/stool/bar,
/turf/simulated/floor/plasteel{
- icon_state = "redyellowfull"
+ icon_state = "bar"
},
/area/crew_quarters/bar)
"aVR" = (
@@ -19517,8 +18372,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/item/twohanded/required/kirbyplants,
/turf/simulated/floor/plasteel{
@@ -19543,7 +18397,7 @@
/obj/structure/table/wood,
/obj/item/reagent_containers/food/snacks/chips,
/turf/simulated/floor/plasteel{
- icon_state = "redyellowfull"
+ icon_state = "bar"
},
/area/crew_quarters/bar)
"aWh" = (
@@ -19552,26 +18406,26 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel{
- icon_state = "redyellowfull"
+ icon_state = "bar"
},
/area/crew_quarters/bar)
"aWi" = (
/obj/structure/table/wood,
/obj/item/reagent_containers/food/drinks/britcup,
/turf/simulated/floor/plasteel{
- icon_state = "redyellowfull"
+ icon_state = "bar"
},
/area/crew_quarters/bar)
"aWj" = (
/obj/structure/chair/stool,
/turf/simulated/floor/plasteel{
- icon_state = "redyellowfull"
+ icon_state = "bar"
},
/area/crew_quarters/bar)
"aWk" = (
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
- icon_state = "redyellowfull"
+ icon_state = "bar"
},
/area/crew_quarters/bar)
"aWl" = (
@@ -19594,8 +18448,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 4
@@ -19653,8 +18506,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -19665,8 +18517,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 1;
@@ -19682,8 +18533,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
dir = 4;
@@ -19699,8 +18549,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 1;
@@ -19716,8 +18565,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -19728,8 +18576,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 8
@@ -19746,8 +18593,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -19769,8 +18615,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
@@ -19789,14 +18634,12 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -19828,8 +18671,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -19849,8 +18691,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -19871,8 +18712,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -19932,20 +18772,21 @@
},
/area/quartermaster/qm)
"aWK" = (
-/obj/structure/table/glass,
-/obj/item/storage/firstaid/regular,
+/obj/structure/table,
+/obj/item/wrench,
+/obj/item/screwdriver,
+/obj/item/reagent_containers/spray/cleaner,
/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "whitered"
+ dir = 10;
+ icon_state = "red"
},
/area/security/permabrig)
"aWL" = (
-/obj/structure/bed/roller,
-/obj/machinery/iv_drip,
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "whitered"
+/obj/machinery/portable_atmospherics/canister/sleeping_agent,
+/obj/structure/window/reinforced{
+ dir = 8
},
+/turf/simulated/floor/plating,
/area/security/permabrig)
"aWM" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
@@ -19955,7 +18796,6 @@
id = "Cell 1";
pixel_x = -22
},
-/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "red"
@@ -19965,8 +18805,10 @@
/obj/machinery/newscaster{
pixel_y = -32
},
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ dir = 0;
+ icon_state = "red"
+ },
/area/security/permabrig)
"aWO" = (
/obj/structure/table,
@@ -19985,14 +18827,16 @@
id = "Cell 2";
pixel_x = -22
},
-/turf/simulated/floor/plating,
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "red"
+ },
/area/security/permabrig)
"aWQ" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
@@ -20029,8 +18873,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 8
@@ -20053,12 +18896,12 @@
},
/area/security/execution)
"aWV" = (
-/obj/machinery/newscaster{
- pixel_y = -32
- },
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 5
},
+/obj/machinery/newscaster{
+ pixel_y = -32
+ },
/turf/simulated/floor/plasteel{
icon_state = "darkred"
},
@@ -20220,6 +19063,7 @@
dir = 4
},
/obj/machinery/meter,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
@@ -20265,24 +19109,17 @@
},
/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 = 8;
icon_state = "neutralfull"
},
/area/atmos)
"aXs" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2";
- tag = ""
- },
-/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "neutralfull"
- },
-/area/atmos)
-"aXt" = (
/obj/machinery/atmospherics/pipe/simple/visible/cyan{
dir = 6;
initialize_directions = 6
@@ -20338,8 +19175,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel,
/area/maintenance/fore)
@@ -20365,14 +19201,12 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/turf/simulated/floor/plasteel{
dir = 4;
@@ -20381,11 +19215,11 @@
/area/crew_quarters/sleep)
"aXB" = (
/obj/structure/table/wood,
+/obj/item/twohanded/staff/broom,
+/obj/item/clothing/head/witchwig,
/obj/machinery/newscaster{
pixel_x = -32
},
-/obj/item/twohanded/staff/broom,
-/obj/item/clothing/head/witchwig,
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "dark"
@@ -20425,10 +19259,13 @@
},
/area/crew_quarters/bar/atrium)
"aXG" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 8
- },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
@@ -20441,7 +19278,7 @@
pixel_y = -28
},
/turf/simulated/floor/plasteel{
- icon_state = "redyellowfull"
+ icon_state = "bar"
},
/area/crew_quarters/bar)
"aXI" = (
@@ -20449,15 +19286,14 @@
dir = 8
},
/turf/simulated/floor/plasteel{
- icon_state = "redyellowfull"
+ icon_state = "bar"
},
/area/crew_quarters/bar)
"aXJ" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/disposalpipe/segment{
dir = 4
@@ -20467,10 +19303,10 @@
},
/area/maintenance/fore)
"aXK" = (
+/obj/effect/decal/warning_stripes/yellow,
/obj/structure/plasticflaps{
opacity = 1
},
-/obj/effect/decal/warning_stripes/yellow,
/turf/simulated/floor/plasteel,
/area/quartermaster/office)
"aXL" = (
@@ -20481,7 +19317,6 @@
},
/area/quartermaster/office)
"aXM" = (
-/obj/machinery/hologram/holopad,
/obj/effect/decal/warning_stripes/yellow/hollow,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
@@ -20489,20 +19324,16 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 9
},
+/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
},
/area/quartermaster/office)
"aXN" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2";
- tag = ""
- },
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
- dir = 8
+/obj/machinery/atmospherics/pipe/manifold/visible/cyan{
+ dir = 8;
+ initialize_directions = 11
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -20529,6 +19360,7 @@
"aXS" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel,
/area/quartermaster/miningdock)
"aXT" = (
@@ -20555,15 +19387,14 @@
},
/area/atmos)
"aXX" = (
+/obj/structure/disposalpipe/segment,
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
@@ -20573,8 +19404,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/disposalpipe/segment{
dir = 4
@@ -20585,11 +19415,11 @@
},
/area/hallway/primary/central)
"aXZ" = (
+/obj/structure/disposalpipe/segment,
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 4
@@ -20597,7 +19427,6 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 8
},
-/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
@@ -20605,6 +19434,9 @@
/area/hallway/primary/fore)
"aYa" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on,
+/obj/item/radio/intercom{
+ pixel_y = 28
+ },
/turf/simulated/floor/plasteel{
icon_state = "redfull"
},
@@ -20629,8 +19461,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
@@ -20693,32 +19524,42 @@
},
/area/quartermaster/qm)
"aYj" = (
-/obj/machinery/computer/security/mining,
+/obj/machinery/computer/security/mining{
+ dir = 8
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "brown"
},
/area/quartermaster/qm)
"aYk" = (
-/obj/effect/spawner/window/reinforced,
-/obj/structure/cable{
- d2 = 2;
- icon_state = "0-2"
+/turf/simulated/floor/plasteel{
+ dir = 9;
+ icon_state = "red"
},
-/turf/simulated/floor/plating,
/area/security/permabrig)
"aYl" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/medical/glass{
- id_tag = null;
- name = "Brig Medical Bay";
- req_one_access_txt = "63"
- },
/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"
+ },
+/obj/structure/cable{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
+ },
+/obj/structure/cable{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
/turf/simulated/floor/plasteel{
dir = 1;
- icon_state = "whitehall"
+ icon_state = "red"
},
/area/security/permabrig)
"aYo" = (
@@ -20735,8 +19576,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/door/airlock/security/glass{
@@ -20761,14 +19601,12 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/security{
- name = "Execution Room";
- req_access = null;
+ name = "Prisoner Re-education Centre";
req_access_txt = "1"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -20813,6 +19651,7 @@
},
/obj/machinery/atmospherics/pipe/simple/visible/green,
/obj/machinery/computer/general_air_control/large_tank_control{
+ dir = 4;
frequency = 1441;
input_tag = "co2_in";
name = "Carbon Dioxide Supply Control";
@@ -20913,11 +19752,11 @@
"aYH" = (
/obj/structure/table/reinforced,
/obj/item/wrench,
+/obj/item/tank/internals/emergency_oxygen/engi,
+/obj/effect/decal/warning_stripes/yellow/hollow,
/obj/machinery/newscaster{
pixel_x = 32
},
-/obj/item/tank/internals/emergency_oxygen/engi,
-/obj/effect/decal/warning_stripes/yellow/hollow,
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "caution"
@@ -20936,6 +19775,11 @@
dir = 8
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
@@ -20996,8 +19840,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/structure/disposalpipe/segment{
dir = 4;
@@ -21015,8 +19858,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -21040,14 +19882,12 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/effect/decal/warning_stripes/yellow,
/obj/structure/disposalpipe/sortjunction{
@@ -21064,8 +19904,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/warning_stripes/yellow,
/obj/structure/disposalpipe/segment{
@@ -21079,8 +19918,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/door/airlock/maintenance{
req_access_txt = "12"
@@ -21094,8 +19932,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -21116,8 +19953,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/effect/landmark{
name = "lightsout"
@@ -21147,7 +19983,7 @@
dir = 4
},
/turf/simulated/floor/plasteel{
- icon_state = "redyellowfull"
+ icon_state = "bar"
},
/area/crew_quarters/bar)
"aZc" = (
@@ -21160,7 +19996,7 @@
},
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
- icon_state = "redyellowfull"
+ icon_state = "bar"
},
/area/crew_quarters/bar)
"aZd" = (
@@ -21174,20 +20010,13 @@
},
/area/hallway/primary/fore)
"aZe" = (
-/obj/structure/disposalpipe/segment,
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2";
- tag = ""
+/obj/structure/disposalpipe/segment{
+ dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "neutralfull"
+ icon_state = "dark"
},
-/area/hallway/primary/fore)
+/area/bridge)
"aZf" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/glass,
@@ -21308,7 +20137,10 @@
id = "Cell 3";
pixel_x = -22
},
-/turf/simulated/floor/plating,
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "red"
+ },
/area/security/permabrig)
"aZs" = (
/obj/machinery/door/firedoor,
@@ -21353,8 +20185,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
@@ -21436,8 +20267,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -21467,37 +20297,28 @@
},
/area/security/permabrig)
"aZH" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2";
- tag = ""
- },
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/turf/simulated/floor/plasteel{
icon_state = "redcorner"
},
/area/security/permabrig)
"aZI" = (
-/obj/structure/cable{
- d1 = 2;
- d2 = 8;
- icon_state = "2-8";
- tag = ""
- },
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
/turf/simulated/floor/plasteel{
icon_state = "redcorner"
},
@@ -21506,16 +20327,12 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
- d1 = 1;
+ d1 = 4;
d2 = 8;
- icon_state = "1-8"
- },
-/obj/structure/sign/greencross{
- pixel_y = 32
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
icon_state = "redcorner"
@@ -21525,8 +20342,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/door_control{
desc = "A remote control-switch to lock down the prison wing's blast doors";
@@ -21547,8 +20363,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/status_display{
pixel_y = 32
@@ -21561,8 +20376,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -21581,14 +20395,12 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/machinery/status_display{
pixel_y = 32
@@ -21601,8 +20413,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 1;
@@ -21619,14 +20430,12 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/machinery/flasher_button{
id = "Cell 2";
@@ -21647,14 +20456,12 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/machinery/status_display{
pixel_y = 32
@@ -21671,14 +20478,12 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/machinery/firealarm{
pixel_y = 24
@@ -21704,14 +20509,12 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/machinery/door/airlock/security/glass{
name = "Prison Wing";
@@ -21731,8 +20534,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/warning_stripes/east,
/turf/simulated/floor/plasteel,
@@ -21753,9 +20555,8 @@
dir = 4;
pixel_x = 28
},
-/obj/structure/chair/stool/bar,
/turf/simulated/floor/plasteel{
- icon_state = "redyellowfull"
+ icon_state = "bar"
},
/area/crew_quarters/bar)
"baa" = (
@@ -21783,8 +20584,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/warning_stripes/yellow,
/turf/simulated/floor/plasteel,
@@ -21815,8 +20615,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/mining/glass{
@@ -21848,8 +20647,8 @@
dir = 8
},
/obj/machinery/atmospherics/trinary/filter{
- filter_type = "co2";
- name = "co2 filter";
+ filter_type = 3;
+ name = "Gas filter (CO2 tank)";
on = 1
},
/turf/simulated/floor/plasteel{
@@ -21861,7 +20660,6 @@
/obj/machinery/atmospherics/unary/portables_connector{
dir = 4
},
-/obj/machinery/portable_atmospherics/canister,
/obj/effect/decal/warning_stripes/yellow/hollow,
/turf/simulated/floor/plasteel{
dir = 8;
@@ -21902,8 +20700,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -21921,6 +20718,11 @@
"bau" = (
/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 = 8;
icon_state = "neutralfull"
@@ -21938,20 +20740,6 @@
icon_state = "dark"
},
/area/construction/hallway)
-"baw" = (
-/obj/machinery/atmospherics/trinary/mixer{
- dir = 1;
- name = "air mixer";
- node1_concentration = 0.8;
- node2_concentration = 0.2;
- on = 1;
- target_pressure = 4500
- },
-/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "neutralfull"
- },
-/area/atmos)
"bax" = (
/obj/structure/window/reinforced{
dir = 4
@@ -22034,8 +20822,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -22048,8 +20835,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door/airlock/maintenance{
name = "Hydroponics Maintenance";
@@ -22094,8 +20880,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door/firedoor,
/obj/effect/decal/warning_stripes/south,
@@ -22135,7 +20920,6 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 4
},
-/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "neutral"
@@ -22143,23 +20927,22 @@
/area/security/permabrig)
"baQ" = (
/obj/structure/sink/kitchen{
- pixel_y = 30
+ pixel_y = 25
},
/obj/effect/decal/warning_stripes/southwest,
/turf/simulated/floor/plasteel,
/area/crew_quarters/kitchen)
"baR" = (
+/obj/item/twohanded/required/kirbyplants,
/obj/machinery/newscaster{
pixel_x = -32
},
-/obj/item/twohanded/required/kirbyplants,
/turf/simulated/floor/plasteel{
- icon_state = "redyellowfull"
+ icon_state = "bar"
},
/area/crew_quarters/bar)
"baS" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
},
@@ -22174,7 +20957,7 @@
dir = 1
},
/turf/simulated/floor/plasteel{
- icon_state = "redyellowfull"
+ icon_state = "bar"
},
/area/crew_quarters/bar)
"baU" = (
@@ -22252,7 +21035,9 @@
},
/area/quartermaster/office)
"bbb" = (
-/obj/machinery/computer/supplycomp,
+/obj/machinery/computer/supplycomp{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "brown"
},
@@ -22279,14 +21064,14 @@
pixel_x = -4;
pixel_y = 4
},
-/obj/machinery/newscaster{
- layer = 3.3;
- pixel_y = -27
- },
/obj/item/radio/intercom{
dir = 4;
pixel_x = 28
},
+/obj/machinery/newscaster{
+ layer = 3.3;
+ pixel_y = -27
+ },
/turf/simulated/floor/plasteel{
dir = 6;
icon_state = "brown"
@@ -22303,10 +21088,8 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
-/obj/machinery/hologram/holopad,
/obj/effect/landmark/start{
name = "Quartermaster"
},
@@ -22317,6 +21100,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
@@ -22333,8 +21117,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/mining/glass{
@@ -22355,7 +21138,6 @@
d2 = 8;
icon_state = "1-8"
},
-/obj/machinery/hologram/holopad,
/obj/effect/decal/warning_stripes/yellow/hollow,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -22363,6 +21145,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
@@ -22401,8 +21184,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 1;
@@ -22421,8 +21203,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -22437,8 +21218,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -22460,14 +21240,12 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 1
@@ -22481,17 +21259,12 @@
},
/area/security/permabrig)
"bbs" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2";
- tag = ""
+/obj/machinery/light/small{
+ dir = 1
},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
/turf/simulated/floor/plasteel{
dir = 1;
- icon_state = "redcorner"
+ icon_state = "red"
},
/area/security/permabrig)
"bbt" = (
@@ -22528,8 +21301,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -22761,15 +21533,13 @@
/turf/simulated/floor/plasteel,
/area/atmos)
"bbV" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2";
- tag = ""
- },
/obj/effect/landmark/start{
name = "Life Support Specialist"
},
+/obj/machinery/atmospherics/pipe/simple/visible/cyan,
+/obj/machinery/atmospherics/pipe/simple/visible/yellow{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
@@ -22786,6 +21556,7 @@
},
/obj/machinery/atmospherics/pipe/simple/visible/green,
/obj/machinery/computer/general_air_control/large_tank_control{
+ dir = 8;
frequency = 1441;
input_tag = "o2_in";
name = "Oxygen Supply Control";
@@ -22838,8 +21609,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/warning_stripes/yellow/hollow,
/obj/structure/disposalpipe/segment,
@@ -22870,10 +21640,8 @@
/turf/simulated/floor/plasteel,
/area/hydroponics)
"bci" = (
-/obj/item/radio/intercom{
- pixel_y = 28
- },
/obj/effect/decal/warning_stripes/yellow/hollow,
+/obj/machinery/vending/hydrodrobe,
/turf/simulated/floor/plasteel,
/area/hydroponics)
"bcj" = (
@@ -22881,6 +21649,9 @@
/obj/item/wrench,
/obj/item/clothing/suit/apron,
/obj/effect/decal/warning_stripes/yellow/hollow,
+/obj/item/radio/intercom{
+ pixel_y = 28
+ },
/turf/simulated/floor/plasteel,
/area/hydroponics)
"bck" = (
@@ -22918,8 +21689,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/warning_stripes/yellow,
/turf/simulated/floor/plasteel{
@@ -22928,8 +21698,15 @@
},
/area/crew_quarters/sleep)
"bcn" = (
-/obj/structure/plasticflaps,
/obj/effect/decal/warning_stripes/yellow,
+/obj/structure/plasticflaps{
+ opacity = 1
+ },
+/obj/machinery/navbeacon{
+ codes_txt = "delivery";
+ dir = 4;
+ location = "Kitchen"
+ },
/turf/simulated/floor/plasteel,
/area/crew_quarters/kitchen)
"bcp" = (
@@ -22964,7 +21741,7 @@
c_tag = "Kitchen Backroom"
},
/obj/structure/sink/kitchen{
- pixel_y = 30
+ pixel_y = 25
},
/obj/effect/decal/warning_stripes/southeast,
/turf/simulated/floor/plasteel,
@@ -22995,16 +21772,11 @@
/turf/simulated/floor/plasteel,
/area/crew_quarters/bar)
"bcx" = (
-/obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/condiment/saltshaker,
-/obj/item/reagent_containers/food/drinks/britcup,
/obj/machinery/door/firedoor,
-/obj/machinery/door/window{
- dir = 2;
+/obj/machinery/door/airlock/public/glass{
name = "Kitchen";
req_access_txt = "28"
},
-/obj/effect/decal/warning_stripes/yellow,
/turf/simulated/floor/plasteel,
/area/crew_quarters/kitchen)
"bcy" = (
@@ -23015,6 +21787,7 @@
dir = 10
},
/obj/machinery/computer/general_air_control/large_tank_control{
+ dir = 8;
frequency = 1443;
input_tag = "air_in";
name = "Mixed Air Supply Control";
@@ -23028,8 +21801,8 @@
},
/area/atmos)
"bcz" = (
-/obj/structure/closet/chefcloset,
/obj/effect/decal/warning_stripes/yellow/hollow,
+/obj/machinery/vending/chefdrobe,
/turf/simulated/floor/plasteel{
icon_state = "freezerfloor"
},
@@ -23137,11 +21910,12 @@
/area/quartermaster/storage)
"bcL" = (
/obj/machinery/light,
+/obj/effect/decal/warning_stripes/yellow/hollow,
+/obj/machinery/vending/cargodrobe,
/obj/machinery/newscaster{
layer = 3.3;
pixel_y = -27
},
-/obj/effect/decal/warning_stripes/yellow/hollow,
/turf/simulated/floor/plasteel{
icon_state = "purple"
},
@@ -23150,8 +21924,8 @@
/obj/machinery/light{
dir = 1
},
-/obj/machinery/computer/supplycomp/public,
/obj/effect/decal/warning_stripes/yellow/hollow,
+/obj/machinery/computer/supplycomp/public,
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "brown"
@@ -23181,15 +21955,11 @@
"bcP" = (
/turf/simulated/wall,
/area/hallway/primary/port)
-"bcU" = (
-/obj/structure/table/reinforced,
-/obj/item/folder/red,
-/obj/item/pen,
-/turf/simulated/floor/plasteel,
-/area/security/permabrig)
"bcV" = (
-/obj/machinery/recharger,
-/obj/structure/table/reinforced,
+/obj/structure/rack,
+/obj/item/clothing/suit/straight_jacket,
+/obj/item/clothing/mask/muzzle,
+/obj/item/clothing/glasses/sunglasses/blindfold,
/turf/simulated/floor/plasteel,
/area/security/permabrig)
"bcW" = (
@@ -23202,8 +21972,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/door/firedoor,
@@ -23220,6 +21989,11 @@
opacity = 0
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
/turf/simulated/floor/plasteel,
/area/security/permabrig)
"bcY" = (
@@ -23238,8 +22012,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/closet/secure_closet/brig,
/turf/simulated/floor/plasteel{
@@ -23250,8 +22023,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel,
@@ -23303,8 +22075,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/table,
/obj/item/restraints/handcuffs,
@@ -23415,8 +22186,8 @@
/obj/structure/window/reinforced,
/obj/machinery/atmospherics/trinary/filter{
dir = 1;
- filter_type = "o2";
- name = "oxygen filter";
+ filter_type = 1;
+ name = "Gas filter (O2 tank)";
on = 1
},
/turf/simulated/floor/plasteel{
@@ -23472,8 +22243,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
@@ -23487,8 +22257,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -23502,14 +22271,12 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -23523,8 +22290,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 6
@@ -23541,8 +22307,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -23559,8 +22324,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/warning_stripes/yellow,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -23575,8 +22339,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/door/airlock/glass{
name = "Hydroponics";
@@ -23594,14 +22357,12 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
@@ -23636,8 +22397,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/door/airlock/freezer{
req_access_txt = "28"
@@ -23656,8 +22416,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/warning_stripes/yellow,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -23674,8 +22433,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -23691,8 +22449,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/landmark/start{
name = "Chef"
@@ -23708,8 +22465,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 9
@@ -23754,11 +22510,18 @@
},
/area/crew_quarters/kitchen)
"bdR" = (
-/obj/structure/sink/kitchen{
- pixel_y = 30
+/obj/structure/table/reinforced,
+/obj/machinery/door/window{
+ dir = 2;
+ name = "Kitchen";
+ req_access_txt = "28"
},
+/obj/item/reagent_containers/food/drinks/britcup,
+/obj/item/reagent_containers/food/condiment/saltshaker,
+/obj/effect/decal/warning_stripes/yellow,
+/obj/machinery/door/firedoor,
/turf/simulated/floor/plasteel{
- icon_state = "redfull"
+ icon_state = "bar"
},
/area/crew_quarters/kitchen)
"bdS" = (
@@ -23777,7 +22540,9 @@
req_access_txt = "28"
},
/obj/effect/decal/warning_stripes/yellow,
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ icon_state = "bar"
+ },
/area/crew_quarters/kitchen)
"bdU" = (
/turf/simulated/wall,
@@ -23835,6 +22600,7 @@
/area/construction/hallway)
"bea" = (
/obj/effect/decal/warning_stripes/yellow/hollow,
+/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
@@ -23914,8 +22680,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
@@ -23924,10 +22689,10 @@
},
/area/quartermaster/miningdock)
"bel" = (
+/obj/effect/decal/warning_stripes/yellow,
/obj/structure/plasticflaps{
opacity = 1
},
-/obj/effect/decal/warning_stripes/yellow,
/turf/simulated/floor/plasteel,
/area/quartermaster/miningdock)
"bem" = (
@@ -23975,8 +22740,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/mining{
@@ -23990,8 +22754,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/effect/decal/warning_stripes/yellow,
@@ -24057,6 +22820,7 @@
},
/obj/machinery/atmospherics/pipe/simple/visible/green,
/obj/machinery/computer/general_air_control/large_tank_control{
+ dir = 4;
frequency = 1441;
input_tag = "tox_in";
name = "Toxin Supply Control";
@@ -24069,7 +22833,9 @@
},
/area/atmos)
"beI" = (
-/obj/machinery/computer/secure_data,
+/obj/machinery/computer/secure_data{
+ dir = 8
+ },
/turf/simulated/floor/plasteel{
icon_state = "grimy"
},
@@ -24110,11 +22876,11 @@
/obj/machinery/light{
dir = 4
},
-/obj/structure/closet/wardrobe/atmospherics_yellow,
/obj/effect/decal/warning_stripes/yellow/hollow,
/obj/structure/closet/fireaxecabinet{
pixel_x = 30
},
+/obj/machinery/vending/atmosdrobe,
/turf/simulated/floor/plasteel{
dir = 6;
icon_state = "caution"
@@ -24128,19 +22894,15 @@
/turf/simulated/floor/plasteel,
/area/atmos)
"beP" = (
-/obj/machinery/atmospherics/pipe/simple/visible/yellow{
- dir = 5
- },
+/obj/machinery/atmospherics/pipe/manifold/visible/yellow,
/obj/effect/decal/warning_stripes/east,
/turf/simulated/floor/plasteel,
/area/atmos)
"beQ" = (
-/obj/machinery/atmospherics/binary/pump{
- dir = 8;
- name = "N2 to Pure";
- target_pressure = 101
- },
/obj/machinery/atmospherics/pipe/simple/visible/green,
+/obj/machinery/atmospherics/pipe/simple/visible/yellow{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "vault"
@@ -24230,16 +22992,22 @@
/turf/simulated/floor/plasteel,
/area/hydroponics)
"bfb" = (
-/obj/structure/plasticflaps,
/obj/effect/decal/warning_stripes/yellow,
+/obj/structure/plasticflaps{
+ opacity = 1
+ },
+/obj/machinery/navbeacon{
+ codes_txt = "delivery";
+ dir = 8;
+ location = "Hydroponics"
+ },
/turf/simulated/floor/plasteel,
/area/hydroponics)
"bfc" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/warning_stripes/yellow,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -24302,11 +23070,11 @@
},
/area/crew_quarters/kitchen)
"bfj" = (
+/obj/structure/closet/secure_closet/freezer/fridge,
+/obj/effect/decal/warning_stripes/yellow,
/obj/machinery/newscaster{
pixel_x = -32
},
-/obj/structure/closet/secure_closet/freezer/fridge,
-/obj/effect/decal/warning_stripes/yellow,
/turf/simulated/floor/plasteel{
icon_state = "redfull"
},
@@ -24326,7 +23094,9 @@
req_access_txt = "28"
},
/obj/effect/decal/warning_stripes/yellow,
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ icon_state = "bar"
+ },
/area/crew_quarters/kitchen)
"bfm" = (
/obj/machinery/kitchen_machine/oven,
@@ -24350,7 +23120,9 @@
req_access_txt = "28"
},
/obj/effect/decal/warning_stripes/yellow,
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ icon_state = "bar"
+ },
/area/crew_quarters/kitchen)
"bfp" = (
/obj/machinery/door/firedoor,
@@ -24395,8 +23167,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/visible/cyan,
/turf/simulated/floor/plasteel{
@@ -24432,8 +23203,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/door/firedoor,
/obj/effect/decal/warning_stripes/yellow,
@@ -24486,8 +23256,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
@@ -24557,20 +23326,14 @@
/turf/simulated/floor/plasteel,
/area/engine/gravitygenerator)
"bfR" = (
-/obj/structure/cable{
- d2 = 2;
- icon_state = "0-2"
- },
-/obj/machinery/power/apc{
- dir = 1;
- name = "north bump";
- pixel_y = 24
- },
-/obj/structure/table/glass,
/obj/machinery/alarm{
dir = 4;
pixel_x = -24
},
+/obj/machinery/disposal,
+/obj/structure/disposalpipe/trunk{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 9;
icon_state = "whitered"
@@ -24612,14 +23375,12 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/effect/decal/warning_stripes/north,
@@ -24630,8 +23391,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/warning_stripes/north,
/turf/simulated/floor/plasteel,
@@ -24640,8 +23400,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/warning_stripes/west,
/obj/machinery/door/airlock/security{
@@ -24662,8 +23421,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/closet/l3closet/security,
/obj/effect/decal/cleanable/dirt,
@@ -24689,8 +23447,7 @@
dir = 8
},
/obj/machinery/atmospherics/trinary/filter{
- filter_type = "plasma";
- name = "waste filter";
+ name = "Gas filter (Toxins tank)";
on = 1
},
/turf/simulated/floor/plasteel{
@@ -24740,7 +23497,7 @@
/area/atmos)
"bgg" = (
/obj/machinery/atmospherics/pipe/simple/visible/cyan{
- dir = 5
+ dir = 4
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -24774,7 +23531,10 @@
},
/area/atmos)
"bgj" = (
-/obj/machinery/atmospherics/pipe/manifold4w/visible/yellow,
+/obj/machinery/atmospherics/pipe/simple/visible/yellow,
+/obj/machinery/atmospherics/pipe/simple/visible/yellow{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "dark"
@@ -24833,8 +23593,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/glass{
@@ -24859,11 +23618,11 @@
},
/area/crew_quarters/kitchen)
"bgv" = (
-/obj/machinery/hologram/holopad,
/obj/effect/landmark/start{
name = "Chef"
},
/obj/effect/decal/warning_stripes/yellow/hollow,
+/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -24872,8 +23631,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door/firedoor,
/obj/effect/decal/warning_stripes/yellow,
@@ -25012,8 +23770,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
@@ -25065,8 +23822,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
@@ -25136,12 +23892,6 @@
/obj/item/clothing/accessory/stethoscope,
/obj/item/storage/belt/medical,
/obj/item/clothing/glasses/hud/health,
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2";
- tag = ""
- },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "whitered"
@@ -25149,28 +23899,41 @@
/area/security/medbay)
"bhc" = (
/obj/structure/sink{
- pixel_y = 26
+ pixel_y = 25
},
/obj/machinery/atmospherics/unary/vent_scrubber/on,
+/obj/structure/disposalpipe/segment{
+ dir = 2;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "whitered"
},
/area/security/medbay)
"bhd" = (
+/obj/machinery/power/apc{
+ dir = 1;
+ name = "north bump";
+ pixel_x = 24
+ },
+/obj/structure/cable{
+ d2 = 8;
+ icon_state = "0-8"
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "whitered"
},
/area/security/medbay)
"bhf" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/photocopier/faxmachine/longrange{
department = "Magistrate's Office"
},
/obj/structure/table/wood,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "cult"
},
@@ -25179,8 +23942,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/door/firedoor,
@@ -25232,6 +23994,7 @@
icon_state = "0-2"
},
/obj/machinery/power/apc{
+ cell_type = 25000;
dir = 1;
name = "north bump";
pixel_y = 24
@@ -25282,6 +24045,7 @@
},
/obj/machinery/atmospherics/pipe/simple/visible/green,
/obj/machinery/computer/general_air_control/large_tank_control{
+ dir = 8;
frequency = 1441;
input_tag = "n2_in";
name = "Nitrogen Supply Control";
@@ -25294,9 +24058,7 @@
},
/area/atmos)
"bhr" = (
-/obj/machinery/atmospherics/binary/valve/open{
- name = "SM Coolant loop"
- },
+/obj/machinery/atmospherics/pipe/simple/visible/yellow,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "dark"
@@ -25375,10 +24137,10 @@
/obj/structure/table/glass,
/obj/item/clipboard,
/obj/item/toy/figure/crew/botanist,
+/obj/effect/decal/warning_stripes/yellow/hollow,
/obj/machinery/newscaster{
pixel_y = 32
},
-/obj/effect/decal/warning_stripes/yellow/hollow,
/turf/simulated/floor/plasteel,
/area/hydroponics)
"bhC" = (
@@ -25405,8 +24167,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -25444,19 +24205,25 @@
},
/area/storage/primary)
"bhK" = (
-/obj/item/radio/intercom{
- pixel_y = 28
+/obj/structure/sink/kitchen{
+ pixel_y = 25
},
/turf/simulated/floor/plasteel{
icon_state = "white"
},
/area/crew_quarters/kitchen)
"bhL" = (
-/mob/living/carbon/human/monkey/punpun,
-/turf/simulated/floor/plasteel{
- icon_state = "redfull"
+/obj/effect/decal/warning_stripes/north,
+/obj/structure/disposalpipe/segment{
+ dir = 4
},
-/area/crew_quarters/kitchen)
+/obj/structure/cable{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
+/turf/simulated/floor/plasteel,
+/area/engine/engineering)
"bhN" = (
/obj/structure/table/reinforced,
/obj/item/reagent_containers/food/condiment/flour,
@@ -25475,8 +24242,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 8
@@ -25631,8 +24397,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -25649,8 +24414,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -25681,8 +24445,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -25704,8 +24467,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -25723,14 +24485,12 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -25840,15 +24600,9 @@
dir = 4
},
/obj/structure/cable{
- d1 = 2;
+ d1 = 4;
d2 = 8;
- icon_state = "2-8"
- },
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -25878,8 +24632,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -25917,14 +24670,12 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/structure/closet/secure_closet/security,
/turf/simulated/floor/plasteel{
@@ -25936,8 +24687,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/alarm{
pixel_y = 24
@@ -25952,8 +24702,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/light{
dir = 1;
@@ -25973,13 +24722,12 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
- },
-/obj/machinery/newscaster{
- pixel_y = 32
+ icon_state = "4-8"
},
/obj/structure/closet/secure_closet/security,
+/obj/machinery/newscaster/security_unit{
+ pixel_y = 32
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "red"
@@ -25991,7 +24739,7 @@
d2 = 8;
icon_state = "1-8"
},
-/obj/item/twohanded/required/kirbyplants,
+/obj/machinery/vending/secdrobe,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "red"
@@ -26025,7 +24773,9 @@
},
/area/security/main)
"biF" = (
-/obj/machinery/computer/security,
+/obj/machinery/computer/security{
+ dir = 8
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -26046,14 +24796,12 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/structure/cable{
d2 = 2;
@@ -26205,7 +24953,6 @@
},
/area/atmos)
"biU" = (
-/obj/machinery/hologram/holopad,
/obj/effect/decal/warning_stripes/yellow/hollow,
/obj/effect/decal/warning_stripes/yellow/hollow,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
@@ -26218,6 +24965,7 @@
dir = 2;
icon_state = "pipe-c"
},
+/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
@@ -26230,6 +24978,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 9
},
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
@@ -26244,9 +24997,9 @@
},
/area/storage/primary)
"biX" = (
-/obj/machinery/hologram/holopad,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "vault"
@@ -26266,8 +25019,8 @@
/obj/structure/window/reinforced,
/obj/machinery/atmospherics/trinary/filter{
dir = 1;
- filter_type = "n2";
- name = "nitrogen filter";
+ filter_type = 2;
+ name = "Gas filter (N2 tank)";
on = 1
},
/turf/simulated/floor/plasteel{
@@ -26308,8 +25061,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/cleanable/dirt,
/obj/structure/disposalpipe/segment,
@@ -26321,8 +25073,7 @@
"bje" = (
/obj/structure/sink{
dir = 8;
- pixel_x = -12;
- pixel_y = 2
+ pixel_x = -12
},
/obj/machinery/alarm{
dir = 4;
@@ -26410,13 +25161,12 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
-/obj/machinery/hologram/holopad,
/obj/effect/decal/warning_stripes/yellow/hollow,
/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
+/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel,
/area/crew_quarters/sleep)
"bjo" = (
@@ -26433,7 +25183,7 @@
/area/crew_quarters/sleep)
"bjp" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
+/obj/machinery/door/airlock/public/glass{
name = "Kitchen";
req_access_txt = "28"
},
@@ -26516,8 +25266,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -26525,7 +25274,7 @@
dir = 1;
icon_state = "pipe-j2s";
name = "Kitchen Junction";
- sortType = 21
+ sortType = 20
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -26543,7 +25292,9 @@
/area/hallway/primary/fore)
"bjD" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass,
+/obj/machinery/door/airlock/glass{
+ name = "Primary tool storage"
+ },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel{
@@ -26581,8 +25332,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel,
/area/quartermaster/miningdock)
@@ -26610,8 +25360,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
@@ -26673,8 +25422,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
@@ -26687,8 +25435,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/turf/simulated/floor/plasteel{
@@ -26706,30 +25453,28 @@
/obj/item/clothing/gloves/color/latex,
/obj/item/healthanalyzer,
/obj/item/reagent_containers/spray/cleaner,
-/obj/structure/cable{
- d1 = 1;
- d2 = 4;
- icon_state = "1-4"
- },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "whitered"
},
/area/security/medbay)
"bka" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8";
- tag = ""
- },
-/obj/machinery/hologram/holopad,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 6
},
+/obj/structure/disposalpipe/segment{
+ dir = 1;
+ icon_state = "pipe-c"
+ },
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
+/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -26747,6 +25492,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -26780,6 +25528,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "whitered"
@@ -26789,8 +25540,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 1;
@@ -26803,6 +25553,10 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 2;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "red"
@@ -26812,14 +25566,12 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -26827,14 +25579,24 @@
},
/area/security/brig)
"bkf" = (
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/command/glass{
+ name = "Bridge";
+ req_access_txt = "19"
+ },
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "red"
+ dir = 8;
+ icon_state = "vault"
},
-/area/security/brig)
+/area/bridge)
"bkg" = (
/obj/machinery/door/firedoor,
/obj/effect/decal/warning_stripes/south,
@@ -26855,8 +25617,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -26886,6 +25647,9 @@
dir = 4;
network = list("Interrogation")
},
+/obj/machinery/newscaster/security_unit{
+ pixel_x = -32
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -26903,24 +25667,26 @@
},
/area/security/main)
"bkn" = (
-/obj/machinery/computer/secure_data,
/obj/machinery/firealarm{
dir = 4;
pixel_x = 24
},
+/obj/machinery/computer/secure_data{
+ dir = 8
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
/area/security/main)
"bko" = (
/obj/structure/bed/dogbed,
-/obj/machinery/computer/security/telescreen/entertainment{
- pixel_y = 32
- },
/obj/machinery/camera{
c_tag = "Head of Security's Office";
network = list("SS13","Security")
},
+/obj/machinery/computer/security/telescreen/entertainment{
+ pixel_y = 32
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "vault"
@@ -26928,7 +25694,7 @@
/area/security/hos)
"bkp" = (
/obj/structure/table/wood,
-/obj/machinery/photocopier/faxmachine/longrange{
+/obj/machinery/photocopier/faxmachine{
department = "Head of Security's Office"
},
/turf/simulated/floor/plasteel{
@@ -26940,8 +25706,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/table/wood,
/obj/item/taperecorder,
@@ -27012,6 +25777,7 @@
},
/obj/machinery/atmospherics/pipe/simple/visible/green,
/obj/machinery/computer/general_air_control/large_tank_control{
+ dir = 4;
frequency = 1441;
input_tag = "n2o_in";
name = "Nitrous Oxide Supply Control";
@@ -27060,8 +25826,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/warning_stripes/south,
/turf/simulated/floor/plasteel,
@@ -27070,8 +25835,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
@@ -27082,8 +25846,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/door/airlock/maintenance,
/turf/simulated/floor/plasteel,
@@ -27092,8 +25855,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/warning_stripes/southwestcorner,
/turf/simulated/floor/plasteel,
@@ -27102,14 +25864,12 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -27121,22 +25881,21 @@
/area/atmos)
"bkK" = (
/obj/structure/cable{
- d1 = 4;
+ d1 = 1;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "1-8"
},
/obj/effect/decal/warning_stripes/southeastcorner,
/turf/simulated/floor/plasteel,
/area/atmos)
"bkL" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 8;
- icon_state = "1-8"
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 8
+ },
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "neutralfull"
},
-/obj/effect/decal/warning_stripes/south,
-/turf/simulated/floor/plasteel,
/area/atmos)
"bkM" = (
/obj/effect/decal/warning_stripes/south,
@@ -27154,10 +25913,13 @@
},
/area/atmos)
"bkP" = (
-/obj/machinery/atmospherics/pipe/simple/visible/yellow,
/obj/machinery/light/small{
dir = 4
},
+/obj/machinery/atmospherics/binary/pump{
+ dir = 0;
+ name = "Pure to SM"
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "dark"
@@ -27230,8 +25992,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -27247,8 +26008,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/turf/simulated/floor/plasteel{
@@ -27256,25 +26016,26 @@
},
/area/security/permabrig)
"blf" = (
+/obj/structure/foodcart,
+/obj/effect/decal/warning_stripes/yellow,
/obj/machinery/firealarm{
dir = 1;
pixel_y = -24
},
-/obj/effect/decal/warning_stripes/yellow/hollow,
/turf/simulated/floor/plasteel,
/area/crew_quarters/kitchen)
"blg" = (
-/obj/structure/foodcart,
+/obj/machinery/light,
+/obj/machinery/vending/dinnerware,
/obj/effect/decal/warning_stripes/yellow,
/turf/simulated/floor/plasteel,
/area/crew_quarters/kitchen)
"blh" = (
-/obj/machinery/light,
-/obj/machinery/vending/dinnerware,
+/obj/machinery/icemachine,
+/obj/effect/decal/warning_stripes/yellow,
/obj/machinery/status_display{
pixel_y = -32
},
-/obj/effect/decal/warning_stripes/yellow,
/turf/simulated/floor/plasteel,
/area/crew_quarters/kitchen)
"bli" = (
@@ -27290,11 +26051,6 @@
},
/area/crew_quarters/kitchen)
"blj" = (
-/obj/machinery/icemachine,
-/obj/effect/decal/warning_stripes/yellow,
-/turf/simulated/floor/plasteel,
-/area/crew_quarters/kitchen)
-"blk" = (
/obj/structure/rack,
/obj/item/storage/box/donkpockets,
/obj/item/storage/box/donkpockets,
@@ -27302,7 +26058,7 @@
/obj/effect/decal/warning_stripes/yellow/hollow,
/turf/simulated/floor/plasteel,
/area/crew_quarters/kitchen)
-"bll" = (
+"blk" = (
/obj/structure/table/reinforced,
/obj/item/reagent_containers/food/snacks/mint,
/obj/item/reagent_containers/food/condiment/enzyme,
@@ -27310,6 +26066,10 @@
/obj/machinery/reagentgrinder,
/turf/simulated/floor/plasteel,
/area/crew_quarters/kitchen)
+"bll" = (
+/obj/machinery/kitchen_machine/candy_maker,
+/turf/simulated/floor/plasteel,
+/area/crew_quarters/kitchen)
"blm" = (
/obj/machinery/kitchen_machine/grill,
/turf/simulated/floor/plasteel,
@@ -27330,12 +26090,6 @@
/obj/effect/decal/warning_stripes/yellow/hollow,
/turf/simulated/floor/plasteel,
/area/crew_quarters/kitchen)
-"blp" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
-/area/security/medbay)
"blq" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -27415,8 +26169,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/warning_stripes/yellow,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -27455,7 +26208,9 @@
},
/area/hallway/primary/fore)
"blA" = (
-/obj/machinery/computer/merch,
+/obj/machinery/computer/merch{
+ dir = 1
+ },
/turf/simulated/floor/plasteel{
dir = 6;
icon_state = "brown"
@@ -27562,8 +26317,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/mining{
@@ -27640,14 +26394,17 @@
/obj/structure/sink/kitchen{
desc = "A sink used for washing one's hands and face. It looks rusty and home-made";
name = "old sink";
- pixel_y = 28
+ pixel_y = 25
},
/obj/machinery/camera{
c_tag = "Perma-Brig Garden";
network = list("SS13","Security")
},
/obj/item/reagent_containers/glass/bucket,
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "red"
+ },
/area/security/permabrig)
"blS" = (
/obj/structure/closet/secure_closet/brigdoc,
@@ -27686,6 +26443,7 @@
pixel_x = -32
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "red"
@@ -27695,8 +26453,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -27728,8 +26485,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/chair/office/dark{
dir = 4
@@ -27762,9 +26518,6 @@
},
/area/security/main)
"bmd" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/table/reinforced,
/obj/item/paper_bin,
/obj/item/pen,
@@ -27806,8 +26559,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/unary/vent_pump/on,
/turf/simulated/floor/plasteel{
@@ -27834,12 +26586,12 @@
/area/crew_quarters/heads/hos)
"bml" = (
/obj/structure/dresser,
-/obj/machinery/newscaster{
- pixel_y = 32
- },
/obj/machinery/light_switch{
pixel_x = -26
},
+/obj/machinery/newscaster{
+ pixel_y = 32
+ },
/turf/simulated/floor/plasteel{
icon_state = "grimy"
},
@@ -27938,8 +26690,8 @@
dir = 8
},
/obj/machinery/atmospherics/trinary/filter{
- filter_type = "n2o";
- name = "n2o filter";
+ filter_type = 4;
+ name = "Gas filter (N2O tank)";
on = 1
},
/turf/simulated/floor/plasteel{
@@ -28036,8 +26788,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/visible/purple{
dir = 4
@@ -28082,14 +26833,14 @@
},
/obj/item/grenade/chem_grenade/metalfoam,
/obj/item/grenade/chem_grenade/metalfoam,
-/obj/machinery/newscaster{
- pixel_y = -32
- },
/obj/machinery/atmospherics/pipe/simple/visible/purple{
dir = 4
},
/obj/effect/decal/warning_stripes/yellow/hollow,
/obj/effect/decal/warning_stripes/yellow/hollow,
+/obj/machinery/newscaster{
+ pixel_y = -32
+ },
/turf/simulated/floor/plasteel,
/area/atmos)
"bmK" = (
@@ -28135,9 +26886,9 @@
/turf/simulated/floor/plating,
/area/atmos)
"bmO" = (
+/obj/effect/decal/warning_stripes/yellow/hollow,
/obj/structure/disposalpipe/trunk,
/obj/machinery/disposal,
-/obj/effect/decal/warning_stripes/yellow/hollow,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "red"
@@ -28219,8 +26970,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/glass{
@@ -28371,8 +27121,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/turf/simulated/floor/plating,
/area/security/prisonershuttle)
@@ -28388,35 +27137,27 @@
},
/area/security/brig)
"bnq" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 2;
- d2 = 4;
- icon_state = "2-4";
- tag = ""
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
+ d2 = 8;
+ icon_state = "2-8"
},
/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "neutralfull"
+ icon_state = "white"
},
-/area/security/brig)
+/area/security/medbay)
"bnr" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -28424,12 +27165,12 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "redcorner"
},
/area/security/brig)
"bnt" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable{
d2 = 4;
icon_state = "0-4"
@@ -28439,6 +27180,7 @@
name = "west bump";
pixel_x = -24
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "red"
@@ -28448,14 +27190,12 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -28489,8 +27229,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d2 = 2;
@@ -28516,8 +27255,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/table/wood,
/obj/item/flashlight/lamp,
@@ -28527,7 +27265,9 @@
},
/area/security/hos)
"bnI" = (
-/obj/machinery/computer/card/minor/hos,
+/obj/machinery/computer/card/minor/hos{
+ dir = 8
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "vault"
@@ -28540,7 +27280,9 @@
},
/area/crew_quarters/heads/hos)
"bnL" = (
-/obj/machinery/computer/prisoner,
+/obj/machinery/computer/prisoner{
+ dir = 8
+ },
/turf/simulated/floor/plasteel{
icon_state = "grimy"
},
@@ -28663,8 +27405,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -28742,9 +27483,9 @@
},
/area/tcommsat/chamber)
"boi" = (
-/obj/machinery/hologram/holopad,
/obj/effect/decal/warning_stripes/yellow/hollow,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
@@ -28776,8 +27517,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
@@ -28864,8 +27604,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
@@ -28960,8 +27699,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -28973,6 +27711,9 @@
dir = 4;
icon_state = "pipe-c"
},
+/obj/machinery/newscaster{
+ pixel_y = 32
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "neutralcorner"
@@ -28982,11 +27723,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 1
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
@@ -28994,6 +27731,9 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 10
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "neutralcorner"
@@ -29007,8 +27747,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/disposalpipe/segment{
dir = 4
@@ -29019,8 +27758,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/warning_stripes/yellow,
/obj/structure/disposalpipe/segment,
@@ -29046,11 +27784,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
+ icon_state = "4-8"
},
/obj/machinery/door/airlock/maintenance{
name = "Mining Maintenance";
@@ -29065,15 +27799,13 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/filingcabinet/filingcabinet,
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/turf/simulated/floor/plasteel{
dir = 1;
@@ -29091,12 +27823,10 @@
},
/area/security/prisonershuttle)
"boN" = (
-/obj/machinery/computer/security{
- network = list("SS13","Mining Outpost")
- },
/obj/item/radio/intercom{
pixel_y = 28
},
+/obj/machinery/computer/security,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "red"
@@ -29106,11 +27836,11 @@
/obj/machinery/ai_status_display{
pixel_y = 32
},
-/obj/machinery/computer/secure_data,
/obj/machinery/camera{
c_tag = "Labour Camp Access";
network = list("SS13","Security")
},
+/obj/machinery/computer/secure_data,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "red"
@@ -29131,26 +27861,19 @@
},
/area/security/prisonershuttle)
"boR" = (
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "red"
},
/area/security/brig)
"boS" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/landmark{
name = "lightsout"
@@ -29161,24 +27884,19 @@
},
/area/security/brig)
"boT" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/simulated/floor/plasteel{
dir = 8;
- icon_state = "red"
+ icon_state = "vault"
},
-/area/security/main)
+/area/bridge)
"boU" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/chair/office/dark{
dir = 4
@@ -29193,9 +27911,6 @@
},
/area/security/main)
"boV" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/table/reinforced,
/obj/item/storage/secure/briefcase,
/turf/simulated/floor/plasteel{
@@ -29209,8 +27924,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
dir = 9;
@@ -29218,9 +27932,6 @@
},
/area/security/prisonershuttle)
"boX" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/table/reinforced,
/obj/item/reagent_containers/food/snacks/donut/jelly/cherryjelly,
/turf/simulated/floor/plasteel{
@@ -29229,9 +27940,6 @@
},
/area/security/main)
"boY" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/photocopier,
/turf/simulated/floor/plasteel{
dir = 8;
@@ -29239,44 +27947,39 @@
},
/area/security/main)
"boZ" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/machinery/atmospherics/unary/vent_scrubber/on,
+/obj/structure/disposalpipe/segment{
+ dir = 4;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "red"
},
/area/security/main)
"bpa" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
/area/security/main)
"bpb" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 1;
@@ -29286,47 +27989,46 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/machinery/door/airlock/command/glass{
name = "Head of Security";
req_access_txt = "58"
},
/obj/machinery/door/firedoor,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "grimy"
},
/area/security/hos)
"bpc" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
},
/turf/simulated/floor/plasteel{
icon_state = "grimy"
},
/area/security/hos)
"bpd" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
},
/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel{
@@ -29334,14 +28036,10 @@
},
/area/security/hos)
"bpe" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 1;
@@ -29351,26 +28049,24 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/structure/table/wood,
/obj/item/folder/red,
/obj/item/stamp/hos,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "grimy"
},
/area/security/hos)
"bpf" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/chair/comfy/brown{
dir = 8
@@ -29378,20 +28074,22 @@
/obj/effect/landmark/start{
name = "Head of Security"
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "grimy"
},
/area/security/hos)
"bpg" = (
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
- },
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 2;
+ icon_state = "pipe-c"
},
/turf/simulated/floor/plasteel{
icon_state = "grimy"
@@ -29401,8 +28099,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
dir = 1;
@@ -29453,7 +28150,9 @@
icon_state = "4-8";
tag = ""
},
-/obj/machinery/computer/crew,
+/obj/machinery/computer/crew{
+ dir = 8
+ },
/turf/simulated/floor/plasteel{
icon_state = "grimy"
},
@@ -29702,8 +28401,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/binary/pump{
dir = 4;
@@ -29782,8 +28480,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/machinery/light/small{
dir = 1
@@ -29801,8 +28498,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/disposalpipe/segment{
dir = 4
@@ -29816,8 +28512,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/warning_stripes/yellow,
/obj/structure/disposalpipe/segment{
@@ -29829,8 +28524,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/cleanable/dirt,
/obj/structure/disposalpipe/segment{
@@ -29842,8 +28536,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/disposalpipe/segment{
dir = 4
@@ -29857,8 +28550,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/cleanable/dirt,
/obj/structure/disposalpipe/segment{
@@ -29873,8 +28565,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small,
@@ -29887,8 +28578,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/disposalpipe/segment{
dir = 4
@@ -29899,8 +28589,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/disposalpipe/segment{
dir = 4
@@ -29916,8 +28605,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/disposalpipe/junction{
dir = 8;
@@ -29927,10 +28615,10 @@
/area/maintenance/fore)
"bqh" = (
/obj/machinery/hydroponics/constructable,
+/obj/effect/decal/warning_stripes/yellow,
/obj/machinery/newscaster{
pixel_x = -32
},
-/obj/effect/decal/warning_stripes/yellow,
/turf/simulated/floor/plasteel,
/area/hydroponics)
"bqi" = (
@@ -29982,14 +28670,12 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 8
@@ -30019,8 +28705,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
@@ -30044,13 +28729,12 @@
dir = 1;
icon_state = "neutralcorner"
},
-/area/bridge/meeting_room)
+/area/hallway/primary/central/south)
"bqs" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/navbeacon{
codes_txt = "patrol;next_patrol=hall2";
@@ -30078,14 +28762,15 @@
/obj/effect/landmark{
name = "lightsout"
},
-/obj/machinery/navbeacon{
- codes_txt = "patrol;next_patrol=hall15";
- location = "hall14"
- },
/obj/structure/disposalpipe/segment{
dir = 1;
icon_state = "pipe-c"
},
+/obj/machinery/hologram/holopad,
+/obj/machinery/navbeacon{
+ codes_txt = "patrol;next_patrol=hall15";
+ location = "hall14"
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
@@ -30095,8 +28780,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -30108,15 +28792,15 @@
dir = 4
},
/turf/simulated/floor/plasteel{
- icon_state = "neutralcorner"
+ dir = 8;
+ icon_state = "bluecorner"
},
/area/hallway/primary/central)
"bqx" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
@@ -30145,27 +28829,25 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 4
},
-/obj/machinery/navbeacon{
- codes_txt = "patrol;next_patrol=hall14";
- location = "hall13"
- },
/obj/structure/disposalpipe/sortjunction{
dir = 8;
name = "Quartermaster Junction";
sortType = 3
},
+/obj/machinery/navbeacon{
+ codes_txt = "patrol;next_patrol=hall14";
+ location = "hall13"
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
@@ -30193,11 +28875,8 @@
/turf/simulated/wall/rust,
/area/maintenance/starboard)
"bqJ" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/hologram/holopad,
/obj/effect/decal/warning_stripes/yellow/hollow,
+/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
@@ -30207,8 +28886,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel,
/area/security/prisonershuttle)
@@ -30237,34 +28915,28 @@
},
/area/security/prisonershuttle)
"bqQ" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 8
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 8
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "red"
},
/area/security/brig)
"bqR" = (
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
- },
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -30272,20 +28944,20 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
},
/area/security/brig)
"bqS" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -30293,20 +28965,19 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "red"
},
/area/security/brig)
"bqT" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -30318,8 +28989,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 1;
@@ -30330,28 +29000,30 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "redfull";
tag = null
},
/area/security/main)
"bqU" = (
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 8;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel{
dir = 10;
icon_state = "red"
@@ -30364,8 +29036,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 1;
@@ -30388,8 +29059,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -30414,8 +29084,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -30431,8 +29100,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -30451,6 +29119,7 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 1
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 6;
icon_state = "red"
@@ -30473,8 +29142,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -30489,8 +29157,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -30520,8 +29187,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 1
@@ -30537,24 +29203,24 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/obj/machinery/computer/security{
- network = list("SS13","Mining Outpost")
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/machinery/computer/security{
+ dir = 1
+ },
/turf/simulated/floor/plasteel{
icon_state = "grimy"
},
/area/security/hos)
"bri" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "grimy"
},
@@ -30563,10 +29229,12 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/obj/machinery/computer/prisoner,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/machinery/computer/prisoner{
+ dir = 8
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "vault"
@@ -30657,9 +29325,7 @@
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/library)
"bru" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on,
@@ -30669,9 +29335,7 @@
"brv" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/library)
"brw" = (
/obj/structure/lattice,
@@ -30702,8 +29366,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 5
@@ -30869,14 +29532,13 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
+/obj/structure/disposalpipe/segment,
/obj/machinery/navbeacon{
codes_txt = "patrol;next_patrol=engi3";
location = "engi2"
},
-/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
@@ -30899,8 +29561,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/cleanable/dirt,
/obj/structure/disposalpipe/segment,
@@ -30964,18 +29625,20 @@
},
/area/hallway/primary/central)
"bsg" = (
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/light,
/turf/simulated/floor/plasteel{
- icon_state = "neutralcorner"
+ dir = 8;
+ icon_state = "neutralfull"
},
/area/hallway/primary/central)
"bsh" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
},
@@ -31073,8 +29736,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d2 = 4;
@@ -31093,41 +29755,36 @@
/turf/simulated/floor/plasteel,
/area/quartermaster/miningdock)
"bsD" = (
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
- },
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4;
+ icon_state = "pipe-c"
},
/turf/simulated/floor/plasteel,
/area/security/prisonershuttle)
"bsE" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/table/reinforced,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 6
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "vault"
},
/area/security/prisonershuttle)
"bsF" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/table/reinforced,
/obj/item/phone,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -31136,20 +29793,19 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "vault"
},
/area/security/prisonershuttle)
"bsG" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -31157,26 +29813,24 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "red"
},
/area/security/prisonershuttle)
"bsH" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/machinery/door/airlock/security/glass{
name = "Labor Camp Office";
@@ -31189,20 +29843,18 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "redfull"
},
/area/security/prisonershuttle)
"bsI" = (
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
- },
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 4
@@ -31210,6 +29862,11 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/sortjunction{
+ dir = 8;
+ name = "Brig Physisian Junction";
+ sortType = 24
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "red"
@@ -31225,6 +29882,7 @@
req_access_txt = "63";
req_one_access_txt = null
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -31251,8 +29909,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
icon_state = "grimy"
@@ -31262,8 +29919,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 1
@@ -31295,9 +29951,6 @@
/area/security/hos)
"bsY" = (
/obj/structure/table/wood,
-/obj/machinery/newscaster{
- pixel_x = 32
- },
/obj/structure/extinguisher_cabinet{
pixel_x = 28;
pixel_y = -30
@@ -31306,6 +29959,9 @@
pixel_y = -32
},
/obj/machinery/computer/med_data/laptop,
+/obj/machinery/newscaster{
+ pixel_x = 32
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "vault"
@@ -31315,11 +29971,12 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/warning_stripes/west,
-/obj/machinery/computer/shuttle/labor,
+/obj/machinery/computer/shuttle/labor{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "red"
@@ -31481,14 +30138,12 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -31502,8 +30157,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/warning_stripes/east,
/obj/machinery/atmospherics/pipe/simple/visible/cyan{
@@ -31515,8 +30169,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/atmos/glass{
@@ -31532,8 +30185,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/warning_stripes/yellow,
/obj/machinery/atmospherics/pipe/simple/visible/cyan{
@@ -31545,8 +30197,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/portable_atmospherics/canister/sleeping_agent,
/obj/effect/decal/warning_stripes/yellow/hollow,
@@ -31559,8 +30210,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/machinery/portable_atmospherics/canister/nitrogen,
/obj/effect/decal/warning_stripes/yellow/hollow,
@@ -31599,14 +30249,12 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
@@ -31660,8 +30308,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/disposalpipe/segment{
dir = 2;
@@ -31676,8 +30323,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/door/airlock/maintenance,
/obj/structure/disposalpipe/segment{
@@ -31711,17 +30357,15 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
-/obj/machinery/hologram/holopad,
/obj/effect/decal/warning_stripes/yellow/hollow,
+/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
@@ -31756,23 +30400,21 @@
/turf/simulated/floor/plasteel,
/area/security/prisonershuttle)
"btU" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door/window/brigdoor{
dir = 1
},
/obj/effect/decal/warning_stripes/north,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/security/prisonershuttle)
"btV" = (
@@ -31798,8 +30440,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
@@ -31814,14 +30455,12 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/effect/decal/warning_stripes/north,
/obj/machinery/door/window/brigdoor{
@@ -31850,27 +30489,36 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plating,
/area/security/prisonershuttle)
"bub" = (
-/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/disposalpipe/sortjunction{
+ dir = 1;
+ icon_state = "pipe-j2s";
+ name = "Captain's Junction";
+ sortType = 18
},
/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "neutralfull"
+ dir = 4;
+ icon_state = "neutralcorner"
},
-/area/security/brig)
+/area/hallway/primary/central)
"buc" = (
-/turf/simulated/wall,
-/area/security/interrogation)
+/obj/effect/decal/warning_stripes/yellow,
+/obj/machinery/access_button{
+ command = "cycle_interior";
+ frequency = 1379;
+ master_tag = "tradedock_inner";
+ name = "exterior access button";
+ pixel_x = 4;
+ pixel_y = 24
+ },
+/turf/simulated/floor/plasteel,
+/area/hallway/secondary/entry)
"bud" = (
/obj/structure/chair/office/dark{
dir = 4
@@ -31894,11 +30542,11 @@
},
/area/security/interrogation)
"buf" = (
-/obj/machinery/hologram/holopad,
/obj/machinery/light{
dir = 1;
on = 1
},
+/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -31918,6 +30566,7 @@
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -31970,8 +30619,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/table/wood,
/obj/item/storage/fancy/donut_box,
@@ -31990,15 +30638,15 @@
},
/area/security/hos)
"bun" = (
-/obj/structure/disposalpipe/trunk{
- dir = 1
- },
-/obj/machinery/disposal,
/obj/machinery/light,
/obj/machinery/alarm{
dir = 1;
pixel_y = -24
},
+/obj/structure/disposalpipe/trunk{
+ dir = 1
+ },
+/obj/machinery/disposal,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "vault"
@@ -32124,8 +30772,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/warning_stripes/south,
/obj/machinery/atmospherics/pipe/simple/visible/yellow{
@@ -32168,8 +30815,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/warning_stripes/north,
/obj/machinery/atmospherics/pipe/simple/visible/yellow{
@@ -32188,8 +30834,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/disposalpipe/segment{
dir = 4
@@ -32232,8 +30877,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/manifold/visible/yellow{
dir = 1
@@ -32271,14 +30915,12 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/structure/cable{
d2 = 2;
@@ -32297,8 +30939,7 @@
"buP" = (
/obj/structure/sink{
dir = 8;
- pixel_x = -12;
- pixel_y = 2
+ pixel_x = -12
},
/obj/effect/decal/warning_stripes/yellow/hollow,
/turf/simulated/floor/plasteel,
@@ -32318,7 +30959,7 @@
"buS" = (
/obj/structure/sink{
dir = 4;
- pixel_x = 10
+ pixel_x = 12
},
/obj/effect/decal/warning_stripes/yellow/hollow,
/turf/simulated/floor/plasteel,
@@ -32346,14 +30987,12 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/effect/decal/warning_stripes/yellow,
/turf/simulated/floor/plasteel,
@@ -32362,8 +31001,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -32403,6 +31041,7 @@
/obj/machinery/status_display{
pixel_y = 32
},
+/obj/structure/closet/secure_closet/freezer/money,
/turf/simulated/floor/greengrid,
/area/security/nuke_storage)
"bvf" = (
@@ -32419,12 +31058,19 @@
},
/area/security/nuke_storage)
"bvg" = (
-/obj/structure/closet/secure_closet/freezer/money,
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "vault"
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
},
-/area/security/nuke_storage)
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "neutralfull"
+ },
+/area/hallway/primary/fore)
"bvh" = (
/obj/structure/lattice,
/obj/structure/grille,
@@ -32434,14 +31080,12 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/window/reinforced{
dir = 1;
@@ -32450,13 +31094,12 @@
/turf/simulated/floor/plasteel,
/area/security/prisonershuttle)
"bvm" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/security/prisonershuttle)
"bvn" = (
@@ -32469,12 +31112,14 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -32483,8 +31128,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -32492,6 +31136,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 9
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -32500,12 +31147,14 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "vault"
@@ -32516,13 +31165,15 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/firealarm{
dir = 1;
pixel_y = -24
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -32552,8 +31203,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 1;
@@ -32564,19 +31214,25 @@
dir = 8
},
/obj/effect/spawner/window/reinforced,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plating,
/area/security/interrogation)
"bvx" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/button/windowtint{
id = 1;
pixel_x = 25
},
+/obj/structure/disposalpipe/segment{
+ dir = 8;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -32616,8 +31272,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 8
@@ -32717,16 +31372,13 @@
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/library)
"bvM" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/atmos/glass{
@@ -32768,8 +31420,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 1;
@@ -32789,8 +31440,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/disposalpipe/segment{
dir = 4
@@ -32804,8 +31454,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/door/window{
base_state = "right";
@@ -32833,16 +31482,20 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
- },
-/obj/structure/plasticflaps{
- opacity = 1
+ icon_state = "2-8"
},
/obj/effect/decal/warning_stripes/yellow,
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/structure/plasticflaps{
+ opacity = 1
+ },
+/obj/machinery/navbeacon{
+ codes_txt = "delivery";
+ dir = 8;
+ location = "Atmospherics"
+ },
/turf/simulated/floor/plasteel,
/area/atmos)
"bvT" = (
@@ -32855,6 +31508,7 @@
"bvU" = (
/obj/machinery/atmospherics/pipe/simple/visible/cyan,
/obj/machinery/computer/general_air_control/large_tank_control{
+ dir = 4;
frequency = 1441;
input_tag = "waste_in";
name = "Gas Mix Tank Control";
@@ -32875,8 +31529,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/rack,
/obj/item/circuitboard/robotics{
@@ -32891,20 +31544,17 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/structure/rack,
/obj/item/circuitboard/communications{
@@ -32923,8 +31573,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/rack,
/obj/item/circuitboard/aicore{
@@ -32979,8 +31628,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/structure/cable{
d2 = 4;
@@ -33000,8 +31648,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d2 = 4;
@@ -33025,8 +31672,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/machinery/door/poddoor{
density = 0;
@@ -33064,14 +31710,12 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/machinery/door/poddoor{
density = 0;
@@ -33102,8 +31746,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/structure/cable{
d2 = 2;
@@ -33127,8 +31770,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/door/poddoor{
density = 0;
@@ -33148,8 +31790,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/machinery/door/poddoor{
density = 0;
@@ -33231,19 +31872,17 @@
},
/area/security/nuke_storage)
"bwy" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "red"
},
@@ -33273,6 +31912,7 @@
name = "Security Blast Door";
opacity = 0
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "red"
@@ -33393,9 +32033,6 @@
},
/area/turret_protected/ai)
"bwL" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/turf/simulated/floor/plasteel{
dir = 1;
@@ -33502,8 +32139,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/warning_stripes/yellow,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -33521,14 +32157,14 @@
/obj/item/wrench,
/obj/item/crowbar,
/obj/item/analyzer,
-/obj/machinery/newscaster{
- pixel_x = -32
- },
/obj/machinery/camera{
c_tag = "Atmospherics Front Desk";
dir = 4;
network = list("SS13","Engineering")
},
+/obj/machinery/newscaster{
+ pixel_x = -32
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "caution"
@@ -33564,8 +32200,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
@@ -33640,8 +32275,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/computer/med_data,
/turf/simulated/floor/plasteel{
@@ -33671,12 +32305,9 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
- },
-/obj/machinery/computer/security{
- network = list("SS13","Mining Outpost")
+ icon_state = "1-2"
},
+/obj/machinery/computer/security,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "darkred"
@@ -33702,8 +32333,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/computer/station_alert,
/turf/simulated/floor/plasteel{
@@ -33713,19 +32343,18 @@
/area/bridge)
"bxv" = (
/obj/machinery/computer/atmos_alert,
-/obj/machinery/computer/atmos_alert,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "darkyellow"
},
/area/bridge)
"bxw" = (
-/obj/machinery/computer/monitor,
/obj/structure/cable{
d2 = 2;
icon_state = "0-2";
pixel_y = 1
},
+/obj/machinery/computer/monitor,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "darkyellow"
@@ -33735,8 +32364,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door/airlock/maintenance{
name = "Auxiliary Storage";
@@ -33753,8 +32381,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 8
@@ -33772,8 +32399,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -33789,8 +32415,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -33810,8 +32435,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -33827,8 +32451,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -33842,8 +32465,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
@@ -33858,8 +32480,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/greengrid,
/area/security/nuke_storage)
@@ -33886,7 +32507,6 @@
},
/area/security/prisonershuttle)
"bxK" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable{
d1 = 1;
d2 = 4;
@@ -33904,6 +32524,7 @@
opacity = 0
},
/obj/machinery/door/firedoor,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "redfull"
},
@@ -33950,8 +32571,10 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -34006,6 +32629,9 @@
},
/turf/simulated/floor/greengrid,
/area/turret_protected/ai)
+"bya" = (
+/turf/simulated/wall,
+/area/space)
"byb" = (
/obj/structure/cable{
d1 = 4;
@@ -34163,9 +32789,6 @@
/turf/simulated/floor/plasteel,
/area/engine/break_room)
"byt" = (
-/obj/machinery/newscaster{
- pixel_x = -32
- },
/obj/structure/rack,
/obj/item/stack/cable_coil/random,
/obj/item/stack/cable_coil/random,
@@ -34188,8 +32811,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/atmos/glass{
@@ -34205,7 +32827,9 @@
/obj/machinery/status_display{
pixel_x = -32
},
-/obj/machinery/computer/security/engineering,
+/obj/machinery/computer/security/engineering{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "caution"
@@ -34217,7 +32841,6 @@
d2 = 4;
icon_state = "1-4"
},
-/obj/machinery/hologram/holopad,
/obj/effect/landmark/start{
name = "Life Support Specialist"
},
@@ -34225,6 +32848,7 @@
/obj/machinery/atmospherics/pipe/simple/visible/cyan{
dir = 5
},
+/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
@@ -34234,8 +32858,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/visible/cyan{
dir = 4
@@ -34249,8 +32872,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/chair/office/dark{
dir = 4
@@ -34272,8 +32894,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/structure/table/reinforced,
/obj/item/folder/yellow,
@@ -34304,8 +32925,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/manifold/visible/cyan{
dir = 1
@@ -34334,20 +32954,17 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/machinery/door/airlock/highsecurity{
name = "Secure Tech Storage";
@@ -34360,14 +32977,12 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/warning_stripes/yellow/hollow,
@@ -34381,8 +32996,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/disposalpipe/segment{
dir = 2;
@@ -34394,14 +33008,12 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/turf/simulated/floor/plating,
/area/maintenance/fore)
@@ -34409,8 +33021,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/cleanable/dirt,
/obj/structure/disposalpipe/segment{
@@ -34423,7 +33034,9 @@
"byN" = (
/obj/machinery/door/firedoor,
/obj/effect/decal/warning_stripes/yellow,
-/obj/machinery/door/airlock/public/glass,
+/obj/machinery/door/airlock/public/glass{
+ name = "Public Access"
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "neutralcorner"
@@ -34433,8 +33046,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -34447,14 +33059,12 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -34499,8 +33109,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/chair/office/dark{
dir = 1
@@ -34526,13 +33135,20 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+ dir = 8
+ },
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
- icon_state = "dark"
+ dir = 8;
+ icon_state = "neutralfull"
},
-/area/bridge)
+/area/hallway/primary/fore)
"byX" = (
/obj/structure/chair/office/dark{
dir = 4
@@ -34580,8 +33196,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/machinery/door/poddoor{
density = 0;
@@ -34627,7 +33242,10 @@
/turf/space,
/area/space)
"bzg" = (
-/obj/structure/disposalpipe/segment,
+/obj/structure/disposalpipe/segment{
+ dir = 8;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
@@ -34637,8 +33255,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/machinery/light/small{
dir = 1
@@ -34678,18 +33295,15 @@
/turf/simulated/floor/plating,
/area/security/brig)
"bzm" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -34706,8 +33320,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -34723,14 +33336,12 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 1
@@ -34746,8 +33357,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/light,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -34764,8 +33374,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
@@ -34796,10 +33405,10 @@
},
/area/turret_protected/ai)
"bzx" = (
-/obj/machinery/hologram/holopad,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -34856,9 +33465,6 @@
},
/area/engine/gravitygenerator)
"bzF" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel{
dir = 8;
@@ -34956,8 +33562,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d2 = 2;
@@ -34992,8 +33597,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/warning_stripes/south,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -35006,7 +33610,9 @@
/turf/simulated/floor/plasteel,
/area/engine/break_room)
"bzX" = (
-/obj/machinery/computer/atmoscontrol,
+/obj/machinery/computer/atmoscontrol{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "caution"
@@ -35064,8 +33670,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/visible/cyan{
dir = 5
@@ -35111,8 +33716,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/warning_stripes/yellow,
/turf/simulated/floor/plasteel,
@@ -35133,8 +33737,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
@@ -35229,8 +33832,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/computer/supplycomp,
/turf/simulated/floor/plasteel{
@@ -35242,8 +33844,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel{
@@ -35254,8 +33855,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/unary/vent_pump/on,
/turf/simulated/floor/plasteel{
@@ -35266,8 +33866,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/turf/simulated/floor/plasteel{
@@ -35297,8 +33896,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/computer/shuttle/mining,
/turf/simulated/floor/plasteel{
@@ -35375,8 +33973,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 1;
@@ -35386,8 +33983,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
@@ -35404,8 +34000,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -35422,14 +34017,12 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/structure/cable{
d1 = 1;
@@ -35471,8 +34064,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 4
@@ -35486,6 +34078,7 @@
/obj/machinery/light/small{
dir = 4
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "red"
@@ -35518,14 +34111,12 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/machinery/door/window/brigdoor{
dir = 2;
@@ -35668,8 +34259,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/warning_stripes/east,
/turf/simulated/floor/plasteel,
@@ -35729,8 +34319,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/engineering/glass{
@@ -35756,14 +34345,12 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/engineering/glass{
@@ -35826,8 +34413,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
dir = 1;
@@ -35838,14 +34424,12 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -35878,17 +34462,21 @@
dir = 1;
pixel_y = -24
},
-/obj/machinery/computer/station_alert,
+/obj/machinery/computer/station_alert{
+ dir = 1
+ },
/turf/simulated/floor/plasteel{
icon_state = "caution"
},
/area/atmos)
"bBL" = (
/obj/machinery/light,
+/obj/machinery/computer/atmos_alert{
+ dir = 1
+ },
/obj/machinery/newscaster{
pixel_y = -32
},
-/obj/machinery/computer/atmos_alert,
/turf/simulated/floor/plasteel{
icon_state = "caution"
},
@@ -35923,8 +34511,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 6
@@ -35969,8 +34556,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -36010,13 +34596,12 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
+/obj/effect/decal/warning_stripes/yellow,
/obj/structure/plasticflaps{
opacity = 1
},
-/obj/effect/decal/warning_stripes/yellow,
/turf/simulated/floor/plasteel,
/area/storage/primary)
"bBX" = (
@@ -36061,8 +34646,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/warning_stripes/yellow,
/turf/simulated/floor/plasteel,
@@ -36093,13 +34677,13 @@
/area/storage/primary)
"bCd" = (
/obj/structure/table/reinforced,
-/obj/machinery/newscaster{
- pixel_y = 32
- },
/obj/item/storage/belt/utility,
/obj/item/weldingtool,
/obj/item/clothing/head/welding,
/obj/effect/decal/warning_stripes/yellow/hollow,
+/obj/machinery/newscaster{
+ pixel_y = 32
+ },
/turf/simulated/floor/plasteel,
/area/storage/primary)
"bCe" = (
@@ -36115,8 +34699,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -36149,8 +34732,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 1;
@@ -36160,8 +34742,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -36190,8 +34771,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 1;
@@ -36201,8 +34781,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -36224,8 +34803,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -36241,8 +34819,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 1
@@ -36258,14 +34835,12 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 1
@@ -36292,8 +34867,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 1;
@@ -36303,8 +34877,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -36323,8 +34896,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 1;
@@ -36343,8 +34915,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -36361,14 +34932,13 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 1
},
/obj/machinery/door/window/brigdoor/southright{
- req_access_txt = "30"
+ name = "Captains seat"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -36386,8 +34956,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 1
@@ -36399,8 +34968,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
icon_state = "darkblue"
@@ -36410,8 +34978,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 1;
@@ -36431,8 +34998,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -36440,8 +35006,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 4;
- icon_state = "1-4";
- tag = ""
+ icon_state = "1-4"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -36454,8 +35019,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 1;
@@ -36479,8 +35043,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -36499,14 +35062,12 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 1
@@ -36533,8 +35094,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -36550,8 +35110,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 1;
@@ -36561,8 +35120,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -36584,8 +35142,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -36602,8 +35159,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -36620,14 +35176,12 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -36673,16 +35227,18 @@
/turf/simulated/floor/plating,
/area/security/brig)
"bCL" = (
-/obj/structure/disposalpipe/sortjunction{
- dir = 8;
- name = "HoS Junction";
- sortType = 18
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "neutralfull"
+ icon_state = "darkblue"
},
-/area/hallway/primary/starboard)
+/area/bridge)
"bCM" = (
/obj/structure/disposalpipe/segment{
dir = 2;
@@ -36690,9 +35246,9 @@
},
/turf/simulated/floor/plasteel{
dir = 4;
- icon_state = "redcorner"
+ icon_state = "red"
},
-/area/hallway/primary/starboard)
+/area/security/brig)
"bCN" = (
/obj/effect/spawner/window/reinforced,
/obj/structure/cable,
@@ -36802,11 +35358,11 @@
pixel_x = 32;
pixel_y = 32
},
+/obj/machinery/ai_slipper,
/obj/machinery/newscaster/security_unit{
pixel_x = -32;
pixel_y = 32
},
-/obj/machinery/ai_slipper,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -36893,7 +35449,6 @@
/turf/simulated/floor/plasteel,
/area/engine/gravitygenerator)
"bDf" = (
-/obj/machinery/hologram/holopad,
/obj/effect/decal/warning_stripes/yellow/hollow,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -36901,6 +35456,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
@@ -36933,8 +35489,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/highsecurity{
@@ -36953,14 +35508,12 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/effect/decal/warning_stripes/west,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
@@ -36975,24 +35528,22 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
-/obj/machinery/hologram/holopad,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel,
/area/engine/gravitygenerator)
"bDl" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/warning_stripes/east,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -37007,8 +35558,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/warning_stripes/southwest,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -37023,8 +35573,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/warning_stripes/south,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -37039,8 +35588,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 1;
@@ -37060,8 +35608,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/warning_stripes/southeast,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
@@ -37074,8 +35621,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/engineering{
@@ -37095,8 +35641,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/warning_stripes/west,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
@@ -37109,8 +35654,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -37131,8 +35675,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 1
@@ -37152,14 +35695,12 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 4
@@ -37189,8 +35730,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -37201,16 +35741,15 @@
},
/area/hallway/primary/port)
"bDD" = (
-/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance{
- lootcount = 3;
- name = "3maintenance loot spawner"
+/obj/structure/chair,
+/obj/machinery/camera{
+ c_tag = "Psych Foyer"
},
-/obj/machinery/light/small{
- dir = 1
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "whitebluecorner"
},
-/turf/simulated/floor/plating,
-/area/maintenance/starboard)
+/area/hallway/primary/central)
"bDE" = (
/obj/item/twohanded/required/kirbyplants,
/obj/machinery/status_display{
@@ -37231,8 +35770,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -37292,8 +35830,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
dir = 9;
@@ -37304,8 +35841,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
dir = 1;
@@ -37376,8 +35912,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/command/glass{
@@ -37423,8 +35958,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -37448,8 +35982,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -37466,8 +35999,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 1;
@@ -37477,8 +36009,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -37527,18 +36058,17 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
-/obj/machinery/computer/communications,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/computer/communications,
/turf/simulated/floor/carpet,
/area/bridge)
"bEh" = (
/obj/structure/table/wood,
-/obj/machinery/computer/security/wooden_tv,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/computer/security/wooden_tv,
/turf/simulated/floor/carpet,
/area/bridge)
"bEi" = (
@@ -37560,8 +36090,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/command/glass{
@@ -37577,11 +36106,14 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment{
+ dir = 4;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -37590,6 +36122,9 @@
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -37598,8 +36133,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/command/glass{
@@ -37613,6 +36147,9 @@
name = "Bridge Blast Doors";
opacity = 0
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "vault"
@@ -37644,10 +36181,10 @@
},
/area/hallway/primary/central)
"bEr" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/light{
dir = 8
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "redcorner"
@@ -37662,15 +36199,17 @@
},
/area/security/brig)
"bEw" = (
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
+/obj/machinery/camera{
+ c_tag = "Security Hallway South";
+ dir = 8;
+ network = list("SS13","Security")
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
- dir = 1;
+ dir = 4;
icon_state = "redcorner"
},
-/area/hallway/primary/starboard)
+/area/security/brig)
"bEx" = (
/turf/simulated/wall/r_wall,
/area/security/warden)
@@ -37694,8 +36233,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
@@ -37766,13 +36304,12 @@
},
/area/engine/gravitygenerator)
"bEH" = (
-/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance{
- lootcount = 3;
- name = "3maintenance loot spawner"
+/obj/item/twohanded/required/kirbyplants,
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "whitebluecorner"
},
-/turf/simulated/floor/plating,
-/area/maintenance/starboard)
+/area/hallway/primary/central)
"bEI" = (
/turf/simulated/floor/plasteel{
dir = 8;
@@ -37783,8 +36320,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/engineering{
@@ -37820,8 +36356,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/warning_stripes/west,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -37908,8 +36443,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
dir = 1;
@@ -37920,8 +36454,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -37998,8 +36531,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/unary/vent_pump/on,
/turf/simulated/floor/plasteel{
@@ -38087,8 +36619,8 @@
},
/area/storage/primary)
"bFp" = (
-/obj/machinery/hologram/holopad,
/obj/effect/decal/warning_stripes/yellow/hollow,
+/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
@@ -38109,8 +36641,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 8
@@ -38215,8 +36746,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/chair/comfy/black{
dir = 1
@@ -38263,8 +36793,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
@@ -38296,8 +36825,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -38333,8 +36861,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/turf/simulated/floor/plating,
/area/security/detectives_office)
@@ -38363,8 +36890,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/turf/simulated/floor/plating,
/area/security/detectives_office)
@@ -38396,8 +36922,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/machinery/light/small{
dir = 1
@@ -38498,8 +37023,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/obj/structure/cable{
d1 = 2;
@@ -38590,10 +37114,10 @@
/turf/simulated/floor/plasteel,
/area/engine/gravitygenerator)
"bGw" = (
+/obj/effect/decal/warning_stripes/southeast,
/obj/machinery/newscaster{
pixel_y = -32
},
-/obj/effect/decal/warning_stripes/southeast,
/turf/simulated/floor/plasteel,
/area/engine/gravitygenerator)
"bGx" = (
@@ -38614,8 +37138,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/warning_stripes/southwest,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -38681,14 +37204,12 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 8
@@ -38709,8 +37230,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -38730,8 +37250,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -38749,8 +37268,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/engineering/glass{
@@ -38775,8 +37293,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/warning_stripes/west,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -38797,8 +37314,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/warning_stripes/east,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
@@ -38817,8 +37333,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/landmark{
name = "lightsout"
@@ -38841,8 +37356,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 1;
@@ -38852,8 +37366,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/engineering/glass{
@@ -38878,8 +37391,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -38899,16 +37411,13 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
-/obj/machinery/hologram/holopad,
/obj/effect/decal/warning_stripes/yellow/hollow,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
@@ -38916,6 +37425,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 6
},
+/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
@@ -38930,14 +37440,12 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 4
@@ -38985,8 +37493,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
@@ -39000,8 +37507,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -39110,14 +37616,10 @@
},
/area/storage/primary)
"bHf" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -39126,6 +37628,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/maintenance/starboard)
"bHg" = (
@@ -39139,8 +37644,8 @@
/turf/simulated/floor/plating,
/area/crew_quarters/sleep)
"bHh" = (
-/obj/machinery/hologram/holopad,
/obj/effect/decal/warning_stripes/yellow/hollow,
+/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
@@ -39165,8 +37670,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/door/firedoor,
@@ -39176,9 +37680,7 @@
req_access_txt = "19"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/bridge/meeting_room)
"bHm" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
@@ -39224,8 +37726,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -39301,8 +37802,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/door/firedoor,
@@ -39313,9 +37813,8 @@
req_access_txt = "20"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/obj/structure/disposalpipe/segment,
+/turf/simulated/floor/wood,
/area/crew_quarters/captain)
"bHA" = (
/obj/machinery/power/apc{
@@ -39336,20 +37835,17 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -39360,8 +37856,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -39375,8 +37870,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/door/airlock/maintenance,
/turf/simulated/floor/plating,
@@ -39385,8 +37879,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel,
@@ -39395,8 +37888,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
@@ -39414,8 +37906,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel,
/area/maintenance/starboard2)
@@ -39423,8 +37914,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/effect/decal/cleanable/cobweb2,
/obj/effect/decal/cleanable/dirt,
@@ -39432,12 +37922,10 @@
/turf/simulated/floor/plasteel,
/area/maintenance/starboard2)
"bHJ" = (
-/obj/structure/table/wood,
-/obj/item/clipboard,
-/obj/item/toy/figure/crew/detective,
/obj/structure/extinguisher_cabinet{
pixel_x = -28
},
+/obj/machinery/vending/detdrobe,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -39446,8 +37934,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/closet/secure_closet/detective,
/turf/simulated/floor/plasteel{
@@ -39479,24 +37966,32 @@
/obj/structure/table/wood,
/obj/item/taperecorder,
/obj/item/restraints/handcuffs,
+/obj/structure/disposalpipe/segment{
+ dir = 4;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
/area/security/detectives_office)
"bHN" = (
/obj/structure/filingcabinet/security,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
/area/security/detectives_office)
"bHO" = (
-/obj/structure/disposalpipe/trunk,
-/obj/machinery/disposal,
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
+ },
+/obj/machinery/disposal,
+/obj/structure/disposalpipe/trunk{
+ dir = 8
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -39548,19 +38043,21 @@
},
/area/hallway/primary/starboard)
"bHU" = (
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/plasteel{
+/obj/structure/disposalpipe/segment{
dir = 4;
- icon_state = "redcorner"
+ icon_state = "pipe-c"
},
-/area/hallway/primary/starboard)
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "red"
+ },
+/area/security/brig)
"bHV" = (
/obj/effect/decal/warning_stripes/east,
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel,
/area/security/brig)
@@ -39568,8 +38065,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
dir = 4;
@@ -39580,14 +38076,12 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/structure/cable{
d1 = 1;
@@ -39623,8 +38117,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
@@ -39636,18 +38129,20 @@
},
/area/security/brig)
"bHZ" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
+ },
+/obj/structure/disposalpipe/sortjunction{
+ dir = 8;
+ name = "Security Junction";
+ sortType = 8
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -39781,10 +38276,10 @@
"bIt" = (
/obj/structure/table/reinforced,
/obj/item/clipboard,
+/obj/item/gps/engineering,
/obj/machinery/newscaster{
pixel_y = 32
},
-/obj/item/gps/engineering,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -39849,8 +38344,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -39962,8 +38456,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -40023,7 +38516,9 @@
/area/storage/primary)
"bIV" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass,
+/obj/machinery/door/airlock/glass{
+ name = "Primary tool storage"
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
@@ -40043,32 +38538,24 @@
/obj/machinery/newscaster{
pixel_y = 32
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/bridge/meeting_room)
"bIZ" = (
/obj/structure/reagent_dispensers/water_cooler,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/bridge/meeting_room)
"bJa" = (
/obj/item/twohanded/required/kirbyplants,
/obj/machinery/light{
dir = 1
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/bridge/meeting_room)
"bJb" = (
/obj/machinery/firealarm{
pixel_y = 24
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/bridge/meeting_room)
"bJc" = (
/obj/structure/cable{
@@ -40080,9 +38567,7 @@
name = "north bump";
pixel_y = 24
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/bridge/meeting_room)
"bJd" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -40102,34 +38587,26 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
- },
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
+ icon_state = "1-2"
},
+/turf/simulated/floor/wood,
/area/bridge/meeting_room)
"bJf" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 8
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/crew_quarters/captain)
"bJg" = (
/obj/structure/table/wood,
/obj/item/paicard,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/bridge/meeting_room)
"bJi" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door/airlock/highsecurity{
name = "AI Upload";
@@ -40145,88 +38622,77 @@
/obj/structure/table/wood,
/obj/item/clipboard,
/obj/item/toy/figure/crew/captain,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/crew_quarters/captain)
"bJk" = (
/obj/machinery/light_switch{
pixel_x = 8;
pixel_y = 26
},
-/obj/structure/disposalpipe/trunk,
/obj/machinery/disposal,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
+/obj/structure/disposalpipe/trunk{
+ dir = 4
},
+/turf/simulated/floor/wood,
/area/crew_quarters/captain)
"bJl" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
+/obj/structure/disposalpipe/segment{
+ dir = 8;
+ icon_state = "pipe-c"
},
+/turf/simulated/floor/wood,
/area/crew_quarters/captain)
"bJm" = (
/obj/machinery/light{
dir = 1;
in_use = 1
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/crew_quarters/captain)
"bJn" = (
/obj/machinery/firealarm{
pixel_y = 24
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/crew_quarters/captain)
"bJo" = (
/obj/machinery/ai_status_display{
pixel_y = 32
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/crew_quarters/captain)
"bJp" = (
/obj/structure/sign/bobross{
pixel_y = 32
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/crew_quarters/captain)
"bJq" = (
/obj/machinery/status_display{
pixel_y = 32
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/crew_quarters/captain)
"bJr" = (
/obj/item/twohanded/required/kirbyplants,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/crew_quarters/captain)
"bJs" = (
-/obj/machinery/computer/security/mining,
+/obj/effect/decal/warning_stripes/yellow/hollow,
+/obj/machinery/computer/security/mining{
+ dir = 1
+ },
/obj/machinery/newscaster{
layer = 3.3;
pixel_y = -27
},
-/obj/effect/decal/warning_stripes/yellow/hollow,
/turf/simulated/floor/plasteel,
/area/quartermaster/miningdock)
"bJt" = (
@@ -40241,8 +38707,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/door/airlock/maintenance{
name = "Detective Maintenance";
@@ -40254,8 +38719,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -40270,8 +38734,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
@@ -40284,8 +38747,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -40298,30 +38760,27 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "grimy"
},
/area/security/detectives_office)
"bJz" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable{
d1 = 1;
d2 = 8;
@@ -40585,8 +39044,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -40657,8 +39115,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -40677,8 +39134,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 1;
@@ -40688,8 +39144,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/command/glass{
@@ -40711,8 +39166,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -40732,8 +39186,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -40753,14 +39206,12 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 4
@@ -40768,7 +39219,6 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 4
},
-/obj/structure/disposalpipe/segment,
/obj/structure/disposalpipe/sortjunction{
name = "CE's Junction";
sortType = 5
@@ -40784,21 +39234,6 @@
icon_state = "yellow"
},
/area/engine/break_room)
-"bKt" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/structure/disposalpipe/junction{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "purplecorner"
- },
-/area/hallway/primary/central)
"bKu" = (
/obj/structure/rack,
/obj/item/circuitboard/teleporter_hub{
@@ -40816,15 +39251,6 @@
icon_state = "neutralfull"
},
/area/storage/tech)
-"bKv" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "neutralcorner"
- },
-/area/crew_quarters/sleep)
"bKw" = (
/obj/structure/sign/electricshock,
/turf/simulated/wall,
@@ -40864,8 +39290,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/warning_stripes/west,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -40880,9 +39305,6 @@
/turf/simulated/floor/plasteel,
/area/engine/break_room)
"bKD" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 1
},
@@ -40910,8 +39332,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/structure/table/wood,
/obj/item/clothing/mask/cigarette/cigar{
@@ -40929,9 +39350,7 @@
pixel_y = -4;
req_one_access_txt = "18"
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/bridge/meeting_room)
"bKG" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -40977,8 +39396,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/carpet,
/area/bridge/meeting_room)
@@ -40987,14 +39405,10 @@
pixel_x = -8;
pixel_y = -26
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/bridge/meeting_room)
"bKN" = (
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/bridge/meeting_room)
"bKO" = (
/obj/machinery/vending/coffee,
@@ -41025,8 +39439,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -41064,20 +39477,13 @@
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
},
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
- },
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/crew_quarters/captain)
"bLa" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 4
@@ -41085,26 +39491,16 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 8
},
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
- },
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/crew_quarters/captain)
"bLb" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/crew_quarters/captain)
"bLc" = (
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/crew_quarters/captain)
"bLd" = (
/obj/structure/chair/comfy/brown{
@@ -41113,33 +39509,25 @@
/obj/effect/landmark/start{
name = "Captain"
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/crew_quarters/captain)
"bLe" = (
/obj/structure/table/wood,
/obj/item/storage/fancy/donut_box,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/crew_quarters/captain)
"bLf" = (
/obj/structure/chair/comfy/brown{
dir = 8
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/crew_quarters/captain)
"bLg" = (
/obj/machinery/alarm{
dir = 8;
pixel_x = 24
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/crew_quarters/captain)
"bLh" = (
/turf/simulated/wall,
@@ -41171,15 +39559,14 @@
},
/area/storage/tools)
"bLk" = (
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
- },
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 2;
+ icon_state = "pipe-c"
},
/turf/simulated/floor/plasteel,
/area/storage/tools)
@@ -41229,13 +39616,14 @@
/area/security/detectives_office)
"bLs" = (
/obj/structure/table/wood,
+/obj/item/clipboard,
+/obj/item/toy/figure/crew/detective,
/obj/item/clothing/glasses/sunglasses,
/turf/simulated/floor/plasteel{
icon_state = "carpet"
},
/area/security/detectives_office)
"bLt" = (
-/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "carpet"
},
@@ -41245,7 +39633,9 @@
name = "Detective Requests Console";
pixel_x = 30
},
-/obj/machinery/computer/med_data,
+/obj/machinery/computer/med_data{
+ dir = 8
+ },
/turf/simulated/floor/plasteel{
icon_state = "carpet"
},
@@ -41275,18 +39665,17 @@
},
/area/security/brig)
"bLy" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/alarm{
dir = 4;
pixel_x = -24
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "redcorner"
},
/area/hallway/primary/starboard)
"bLz" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/light{
dir = 4
},
@@ -41310,12 +39699,6 @@
/obj/machinery/light{
dir = 8
},
-/obj/machinery/camera{
- c_tag = "Research Toxins Storage Room";
- dir = 4;
- network = list("Research","SS13");
- pixel_y = -22
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel{
dir = 1;
@@ -41323,9 +39706,7 @@
},
/area/security/brig)
"bLD" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "redcorner"
@@ -41335,8 +39716,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/computer/crew,
/turf/simulated/floor/plasteel{
@@ -41375,7 +39755,6 @@
},
/area/security/processing)
"bLK" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable{
d1 = 1;
d2 = 2;
@@ -41490,8 +39869,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/warning_stripes/yellow,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -41509,8 +39887,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door/airlock/hatch{
name = "MiniSat Transit Tube";
@@ -41538,12 +39915,13 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door/firedoor,
/obj/effect/decal/warning_stripes/yellow,
-/obj/machinery/door/airlock/public/glass,
+/obj/machinery/door/airlock/public/glass{
+ name = "Public Access"
+ },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/disposalpipe/segment,
@@ -41555,19 +39933,21 @@
"bMb" = (
/obj/machinery/door/firedoor,
/obj/effect/decal/warning_stripes/yellow,
-/obj/machinery/door/airlock/public/glass,
+/obj/machinery/door/airlock/public/glass{
+ name = "Public Access"
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "browncorner"
},
/area/hallway/primary/fore)
"bMc" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/camera{
c_tag = "Primary Security Hallway North";
dir = 4;
pixel_y = -22
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "redcorner"
@@ -41577,8 +39957,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 1;
@@ -41626,7 +40005,9 @@
/obj/machinery/status_display{
pixel_x = -32
},
-/obj/machinery/computer/card/minor/ce,
+/obj/machinery/computer/card/minor/ce{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -41667,8 +40048,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -41680,8 +40060,10 @@
/turf/simulated/floor/plating,
/area/crew_quarters/chief)
"bMn" = (
-/obj/machinery/computer/shuttle/mining,
/obj/effect/decal/warning_stripes/yellow/hollow,
+/obj/machinery/computer/shuttle/mining{
+ dir = 1
+ },
/turf/simulated/floor/plasteel,
/area/quartermaster/miningdock)
"bMo" = (
@@ -41696,7 +40078,9 @@
},
/area/engine/break_room)
"bMp" = (
-/obj/machinery/computer/drone_control,
+/obj/machinery/computer/drone_control{
+ dir = 1
+ },
/turf/simulated/floor/plasteel{
dir = 7;
icon_state = "yellow"
@@ -41728,8 +40112,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -41810,11 +40193,15 @@
},
/area/storage/tech)
"bMD" = (
-/obj/structure/sign/poster/random{
- pixel_x = -32
+/obj/structure/table,
+/obj/item/paper_bin{
+ pixel_y = 5
},
-/turf/simulated/floor/plating,
-/area/maintenance/starboard)
+/obj/item/pen/multi,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/hallway/primary/central)
"bME" = (
/obj/structure/table/reinforced,
/obj/machinery/light{
@@ -41834,8 +40221,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
dir = 4;
@@ -41887,14 +40273,12 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/structure/cable{
d1 = 1;
@@ -41902,28 +40286,22 @@
icon_state = "1-4"
},
/obj/machinery/photocopier,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/bridge/meeting_room)
"bMN" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/hologram/holopad,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/bridge/meeting_room)
"bMO" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/table/wood,
/obj/item/folder/blue,
@@ -41936,8 +40314,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/chair/comfy/brown{
dir = 4
@@ -41964,8 +40341,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/table/wood,
/obj/item/folder/red,
@@ -41973,8 +40349,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 4;
- icon_state = "1-4";
- tag = ""
+ icon_state = "1-4"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -41993,8 +40368,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 1;
@@ -42007,17 +40381,13 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/bridge/meeting_room)
"bMU" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 8
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/bridge/meeting_room)
"bMV" = (
/obj/machinery/light{
@@ -42052,8 +40422,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/table/glass,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -42080,8 +40449,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 1;
@@ -42089,51 +40457,39 @@
icon_state = "1-4"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/hologram/holopad,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/obj/machinery/hologram/holopad,
+/turf/simulated/floor/wood,
/area/crew_quarters/captain)
"bNe" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
- },
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
+ icon_state = "4-8"
},
+/turf/simulated/floor/wood,
/area/crew_quarters/captain)
"bNf" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/chair/comfy/brown{
dir = 4
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/crew_quarters/captain)
"bNg" = (
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/structure/table/wood,
/obj/item/clothing/mask/cigarette/cigar,
/obj/item/clothing/mask/cigarette/cigar,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/crew_quarters/captain)
"bNh" = (
/obj/machinery/light{
@@ -42142,9 +40498,7 @@
/obj/structure/extinguisher_cabinet{
pixel_x = 28
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/crew_quarters/captain)
"bNi" = (
/obj/structure/rack,
@@ -42177,7 +40531,6 @@
},
/area/storage/tools)
"bNk" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable{
d1 = 1;
d2 = 8;
@@ -42189,6 +40542,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
@@ -42236,13 +40590,13 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/chair/office/dark{
dir = 4
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "grimy"
},
@@ -42256,7 +40610,6 @@
},
/area/security/detectives_office)
"bNt" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/chair/office/dark{
dir = 8
},
@@ -42274,13 +40627,17 @@
/obj/machinery/status_display{
pixel_x = 32
},
-/obj/machinery/computer/secure_data,
+/obj/machinery/computer/secure_data{
+ dir = 8
+ },
/turf/simulated/floor/plasteel{
icon_state = "carpet"
},
/area/security/detectives_office)
"bNv" = (
-/obj/machinery/computer/secure_data,
+/obj/machinery/computer/secure_data{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "redcorner"
@@ -42316,16 +40673,13 @@
/turf/simulated/floor/plasteel,
/area/quartermaster/miningdock)
"bNC" = (
+/obj/effect/decal/warning_stripes/yellow,
/obj/structure/plasticflaps{
opacity = 1
},
-/obj/effect/decal/warning_stripes/yellow,
/turf/simulated/floor/plasteel,
/area/maintenance/starboard)
"bND" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/chair{
dir = 1
},
@@ -42335,18 +40689,17 @@
},
/area/security/processing)
"bNE" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
+/obj/structure/disposalpipe/segment,
+/obj/structure/disposalpipe/segment,
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "redcorner"
},
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/turf/simulated/floor/plasteel,
-/area/security/processing)
+/area/security/brig)
"bNF" = (
-/obj/machinery/computer/secure_data,
+/obj/machinery/computer/secure_data{
+ dir = 8
+ },
/turf/simulated/floor/plasteel{
dir = 6;
icon_state = "red"
@@ -42361,28 +40714,19 @@
},
/area/security/processing)
"bNH" = (
-/obj/structure/disposalpipe/sortjunction{
- dir = 1;
- name = "Brig Equipment Storage";
- sortType = 8
- },
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
-/obj/machinery/hologram/holopad,
/obj/effect/decal/warning_stripes/yellow/hollow,
+/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
},
/area/security/brig)
"bNI" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/effect/spawner/window/reinforced,
/obj/structure/cable{
d2 = 2;
@@ -42455,8 +40799,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/visible/yellow{
dir = 5
@@ -42482,13 +40825,12 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/engineering/glass{
name = "Engineering";
- req_access_txt = "10"
+ req_access_txt = "32"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -42518,7 +40860,6 @@
},
/area/engine/break_room)
"bNZ" = (
-/obj/machinery/computer/atmos_alert,
/obj/machinery/camera{
c_tag = "Chief Engineer's Office";
dir = 4;
@@ -42532,6 +40873,9 @@
name = "Chief Engineer Requests Console";
pixel_x = -32
},
+/obj/machinery/computer/atmos_alert{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -42570,8 +40914,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
icon_state = "redcorner"
@@ -42581,8 +40924,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 4
@@ -42599,8 +40941,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 1;
@@ -42676,8 +41017,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -42720,8 +41060,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/warning_stripes/yellow,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -42739,21 +41078,20 @@
/area/storage/tech)
"bOu" = (
/obj/structure/table/reinforced,
-/obj/machinery/newscaster{
- pixel_y = -32
- },
/obj/item/wrench,
/obj/item/crowbar,
/obj/item/paicard,
/obj/effect/decal/warning_stripes/yellow,
+/obj/machinery/newscaster{
+ pixel_y = -32
+ },
/turf/simulated/floor/plasteel,
/area/storage/tech)
"bOv" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/warning_stripes/yellow,
/turf/simulated/floor/plasteel{
@@ -42825,9 +41163,7 @@
},
/obj/structure/table/wood,
/obj/item/book/manual/security_space_law,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/bridge/meeting_room)
"bOF" = (
/obj/structure/chair/comfy/beige{
@@ -42848,14 +41184,11 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/crew_quarters/heads/hop)
"bOI" = (
/obj/structure/chair/comfy/brown{
@@ -42871,8 +41204,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/item/pen,
/turf/simulated/floor/carpet,
@@ -42882,25 +41214,22 @@
pixel_x = 32;
pixel_y = -32
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/bridge/meeting_room)
"bOL" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/crew_quarters/heads/hop)
"bOM" = (
-/obj/machinery/computer/account_database,
+/obj/machinery/computer/account_database{
+ dir = 8
+ },
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "dark"
@@ -42920,12 +41249,10 @@
/turf/simulated/floor/bluegrid,
/area/turret_protected/ai_upload)
"bOQ" = (
-/obj/machinery/hologram/holopad,
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 9
@@ -42933,6 +41260,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
},
+/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -42957,6 +41285,9 @@
/obj/structure/bed/dogbed{
name = "fox box"
},
+/obj/machinery/newscaster/security_unit{
+ pixel_x = -32
+ },
/mob/living/simple_animal/pet/dog/fox/Renault,
/turf/simulated/floor/plasteel{
dir = 5;
@@ -42968,13 +41299,7 @@
dir = 1;
pixel_y = -28
},
-/obj/machinery/newscaster{
- pixel_x = -32;
- pixel_y = -32
- },
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/crew_quarters/captain)
"bOW" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -42988,23 +41313,18 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/chair/comfy/brown,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/crew_quarters/captain)
"bOY" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -43024,18 +41344,14 @@
name = "south bump";
pixel_y = -24
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/crew_quarters/captain)
"bPb" = (
/obj/machinery/camera{
c_tag = "Captain's Room";
dir = 8
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/crew_quarters/captain)
"bPc" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -43072,9 +41388,9 @@
},
/area/storage/tools)
"bPf" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/storage/tools)
"bPg" = (
@@ -43133,6 +41449,9 @@
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 4
},
+/obj/machinery/newscaster/security_unit{
+ pixel_y = -32
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -43149,13 +41468,13 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "grimy"
},
@@ -43169,27 +41488,25 @@
},
/area/security/detectives_office)
"bPp" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/table/wood,
-/obj/machinery/computer/security/wooden_tv,
-/turf/simulated/floor/plasteel{
- icon_state = "carpet"
- },
-/area/security/detectives_office)
-"bPq" = (
-/obj/structure/table/wood,
-/obj/item/storage/secure/safe{
- pixel_x = 32
- },
/obj/item/flashlight/lamp,
/obj/item/reagent_containers/food/drinks/flask/detflask,
/turf/simulated/floor/plasteel{
icon_state = "carpet"
},
/area/security/detectives_office)
+"bPq" = (
+/obj/machinery/computer/arcade{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ dir = 5;
+ icon_state = "dark"
+ },
+/area/maintenance/fore2)
"bPr" = (
/obj/machinery/computer/security{
- network = list("SS13","Mining Outpost")
+ dir = 4
},
/turf/simulated/floor/plasteel{
dir = 1;
@@ -43210,8 +41527,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d2 = 4;
@@ -43224,8 +41540,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/table/reinforced,
/obj/item/paper_bin,
@@ -43246,6 +41561,9 @@
d2 = 8;
icon_state = "4-8"
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/security/processing)
"bPw" = (
@@ -43259,6 +41577,10 @@
d2 = 8;
icon_state = "2-8"
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel,
/area/security/processing)
"bPx" = (
@@ -43267,12 +41589,13 @@
d2 = 8;
icon_state = "4-8"
},
-/turf/simulated/floor/plasteel,
-/area/security/processing)
-"bPy" = (
/obj/structure/disposalpipe/segment{
dir = 4
},
+/turf/simulated/floor/plasteel,
+/area/security/processing)
+"bPy" = (
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "red"
@@ -43284,16 +41607,16 @@
d2 = 8;
icon_state = "4-8"
},
+/obj/structure/disposalpipe/segment{
+ dir = 8;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "red"
},
/area/security/brig)
"bPA" = (
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
- },
/obj/machinery/light{
dir = 4
},
@@ -43311,8 +41634,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/door/airlock/security/glass{
name = "Security Office";
@@ -43355,8 +41677,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/embedded_controller/radio/airlock/airlock_controller{
id_tag = "station_ai_airlock";
@@ -43384,8 +41705,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/door/airlock/external{
frequency = 1379;
@@ -43579,8 +41899,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door/airlock/maintenance{
name = "Mining Maintenance";
@@ -43615,8 +41934,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/structure/table/reinforced,
/obj/item/folder/blue,
@@ -43638,13 +41956,12 @@
name = "MiniSat Transit Tube";
req_one_access_txt = "32;19"
},
-/obj/machinery/door/poddoor{
- icon_state = "open";
- id_tag = "transitlock";
- name = "Transit Tube Blast Doors"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/door/poddoor/preopen{
+ id_tag = "transitlock";
+ name = "Transit Tube Lockdown"
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -43666,8 +41983,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/table/reinforced,
/obj/item/clipboard,
@@ -43752,6 +42068,9 @@
icon_state = "1-8"
},
/obj/machinery/door/firedoor,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -43844,11 +42163,11 @@
/turf/simulated/floor/plasteel,
/area/crew_quarters/kitchen)
"bQz" = (
+/obj/machinery/door/firedoor,
+/obj/effect/decal/warning_stripes/yellow,
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/door/firedoor,
-/obj/effect/decal/warning_stripes/yellow,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "neutralcorner"
@@ -43858,8 +42177,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/warning_stripes/north,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -43907,9 +42225,7 @@
},
/obj/item/storage/briefcase,
/obj/item/storage/secure/briefcase,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/bridge/meeting_room)
"bQF" = (
/obj/item/radio/intercom{
@@ -43917,16 +42233,12 @@
pixel_y = -28
},
/obj/machinery/slot_machine,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/bridge/meeting_room)
"bQG" = (
/obj/item/twohanded/required/kirbyplants,
/obj/machinery/light,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/bridge/meeting_room)
"bQH" = (
/obj/machinery/alarm{
@@ -43937,9 +42249,7 @@
c_tag = "Command Meeting Room";
dir = 1
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/bridge/meeting_room)
"bQI" = (
/turf/simulated/wall,
@@ -43950,12 +42260,9 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
- },
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
+ icon_state = "1-2"
},
+/turf/simulated/floor/wood,
/area/bridge/meeting_room)
"bQK" = (
/obj/machinery/alarm{
@@ -43979,8 +42286,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/ai_slipper,
/turf/simulated/floor/bluegrid,
@@ -44020,8 +42326,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/table/wood,
/obj/machinery/door/window{
@@ -44035,7 +42340,6 @@
/obj/item/stamp/captain,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/disposalpipe/segment,
/turf/simulated/floor/carpet/black,
/area/crew_quarters/captain)
"bQR" = (
@@ -44063,16 +42367,12 @@
/obj/machinery/photocopier/faxmachine/longrange{
department = "Captain's Office"
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/crew_quarters/captain)
"bQU" = (
/obj/structure/table/wood,
/obj/machinery/recharger,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/crew_quarters/captain)
"bQV" = (
/obj/structure/sign/directions/engineering{
@@ -44092,33 +42392,30 @@
/turf/simulated/floor/plating,
/area/storage/tools)
"bQX" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/door/airlock/glass{
name = "Auxiliary Tool Storage";
req_access_txt = "12"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/storage/tools)
"bRa" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/door/airlock/security/glass{
@@ -44126,6 +42423,7 @@
req_access_txt = "4"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "red"
@@ -44136,8 +42434,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d2 = 8;
@@ -44146,29 +42443,24 @@
/turf/simulated/floor/plating,
/area/security/detectives_office)
"bRc" = (
-/obj/structure/disposalpipe/segment,
-/obj/effect/spawner/window/reinforced,
-/obj/structure/cable{
- d2 = 8;
- icon_state = "0-8"
+/obj/effect/decal/warning_stripes/yellow,
+/obj/structure/disposalpipe/segment{
+ dir = 4
},
-/turf/simulated/floor/plating,
-/area/security/detectives_office)
+/turf/simulated/floor/plasteel,
+/area/maintenance/starboard2)
"bRd" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/firealarm{
dir = 8;
pixel_x = -24
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "redcorner"
},
/area/hallway/primary/starboard)
"bRe" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/effect/decal/warning_stripes/east,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -44176,12 +42468,12 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/turf/simulated/floor/plasteel,
-/area/security/brig)
-"bRf" = (
/obj/structure/disposalpipe/segment{
dir = 4
},
+/turf/simulated/floor/plasteel,
+/area/security/brig)
+"bRf" = (
/obj/effect/decal/warning_stripes/yellow,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -44190,12 +42482,12 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/turf/simulated/floor/plasteel,
-/area/security/brig)
-"bRg" = (
/obj/structure/disposalpipe/segment{
dir = 4
},
+/turf/simulated/floor/plasteel,
+/area/security/brig)
+"bRg" = (
/obj/machinery/door/firedoor,
/obj/effect/decal/warning_stripes/west,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -44216,29 +42508,27 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/turf/simulated/floor/plasteel,
-/area/security/brig)
-"bRh" = (
/obj/structure/disposalpipe/segment{
dir = 4
},
+/turf/simulated/floor/plasteel,
+/area/security/brig)
+"bRh" = (
/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "redcorner"
},
/area/security/brig)
"bRi" = (
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
- },
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -44246,6 +42536,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
@@ -44258,6 +42551,10 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 8;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "redcorner"
@@ -44347,8 +42644,8 @@
},
/area/construction/hallway)
"bRt" = (
-/obj/machinery/computer/teleporter,
/obj/effect/decal/warning_stripes/southeast,
+/obj/machinery/computer/teleporter,
/turf/simulated/floor/plating,
/area/turret_protected/aisat)
"bRu" = (
@@ -44391,9 +42688,6 @@
/turf/simulated/floor/plasteel,
/area/maintenance/starboard)
"bRx" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 8
- },
/obj/structure/showcase{
density = 0;
dir = 4;
@@ -44404,6 +42698,9 @@
pixel_y = 2
},
/obj/effect/decal/warning_stripes/south,
+/obj/machinery/atmospherics/pipe/simple/visible/cyan{
+ dir = 5
+ },
/turf/simulated/floor/plating,
/area/turret_protected/aisat)
"bRz" = (
@@ -44552,7 +42849,9 @@
/obj/machinery/status_display{
pixel_x = -32
},
-/obj/machinery/computer/station_alert,
+/obj/machinery/computer/station_alert{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -44575,8 +42874,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/table/reinforced,
/obj/item/cartridge/engineering{
@@ -44626,8 +42924,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 1;
@@ -44637,8 +42934,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/command/glass{
@@ -44659,8 +42955,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -44676,8 +42971,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -44693,14 +42987,12 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/effect/landmark/start{
name = "Chief Engineer"
@@ -44730,8 +43022,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/item/radio/beacon,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -44746,8 +43037,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door/firedoor,
/obj/effect/decal/warning_stripes/yellow,
@@ -44760,8 +43050,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -44796,8 +43085,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 1;
@@ -44815,8 +43103,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
dir = 4;
@@ -44831,9 +43118,7 @@
},
/obj/machinery/meter,
/obj/effect/decal/warning_stripes/south,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 9
- },
+/obj/machinery/atmospherics/pipe/manifold/visible/cyan,
/turf/simulated/floor/plating,
/area/turret_protected/aisat)
"bSv" = (
@@ -44845,8 +43130,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -44864,8 +43148,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
dir = 1;
@@ -44876,8 +43159,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
dir = 1;
@@ -44895,8 +43177,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
dir = 1;
@@ -44917,8 +43198,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 1;
@@ -44954,8 +43234,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -44976,11 +43255,13 @@
},
/area/turret_protected/ai_upload)
"bSJ" = (
-/obj/machinery/computer/aiupload,
/obj/machinery/flasher{
id = "AI";
pixel_y = -21
},
+/obj/machinery/computer/aiupload{
+ dir = 1
+ },
/turf/simulated/floor/bluegrid,
/area/turret_protected/ai_upload)
"bSK" = (
@@ -44993,10 +43274,12 @@
/turf/simulated/floor/bluegrid,
/area/turret_protected/ai_upload)
"bSL" = (
-/obj/machinery/computer/borgupload,
/obj/item/radio/intercom/private{
pixel_y = -28
},
+/obj/machinery/computer/borgupload{
+ dir = 1
+ },
/turf/simulated/floor/bluegrid,
/area/turret_protected/ai_upload)
"bSM" = (
@@ -45021,7 +43304,9 @@
name = "Captain Requests Console";
pixel_x = -30
},
-/obj/machinery/computer/card,
+/obj/machinery/computer/card{
+ dir = 4
+ },
/turf/simulated/floor/carpet/black,
/area/crew_quarters/captain)
"bSP" = (
@@ -45033,8 +43318,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/chair/comfy/brown{
dir = 1
@@ -45044,7 +43328,6 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/disposalpipe/segment,
/turf/simulated/floor/carpet/black,
/area/crew_quarters/captain)
"bSR" = (
@@ -45064,9 +43347,7 @@
/area/crew_quarters/captain/bedroom)
"bSU" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 8
- },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/disposalpipe/segment{
dir = 1;
icon_state = "pipe-c"
@@ -45109,11 +43390,11 @@
},
/area/hallway/primary/starboard)
"bSY" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/disposalpipe/junction{
dir = 8
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "cautioncorner"
@@ -45137,6 +43418,9 @@
dir = 1
},
/obj/effect/decal/warning_stripes/south,
+/obj/machinery/atmospherics/pipe/simple/hidden/universal{
+ dir = 4
+ },
/turf/simulated/floor/plating,
/area/turret_protected/aisat)
"bTd" = (
@@ -45151,37 +43435,40 @@
/turf/simulated/floor/plasteel,
/area/storage/tools)
"bTf" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/junction{
+ dir = 8
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "neutralcorner"
},
/area/hallway/primary/starboard)
"bTg" = (
-/obj/structure/disposalpipe/segment,
-/obj/structure/disposalpipe/segment{
- dir = 4
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
},
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "redcorner"
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/junction{
+ dir = 1;
+ icon_state = "pipe-j2"
},
-/area/hallway/primary/starboard)
+/turf/simulated/floor/plating,
+/area/maintenance/starboard2)
"bTh" = (
+/obj/machinery/atmospherics/unary/vent_scrubber/on,
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/atmospherics/unary/vent_scrubber/on,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "redcorner"
@@ -45201,8 +43488,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -45310,7 +43596,9 @@
icon_state = "2-4";
tag = ""
},
-/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 1
+ },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
@@ -45342,7 +43630,6 @@
},
/area/turret_protected/aisat)
"bTw" = (
-/obj/machinery/hologram/holopad,
/obj/structure/cable{
d1 = 4;
d2 = 8;
@@ -45360,6 +43647,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -45413,9 +43701,9 @@
icon_state = "2-4";
tag = ""
},
-/mob/living/simple_animal/bot/secbot/pingsky,
/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
+/mob/living/simple_animal/bot/secbot/pingsky,
/turf/simulated/floor/plasteel{
icon_state = "grimy"
},
@@ -45508,7 +43796,6 @@
},
/area/turret_protected/aisat)
"bTK" = (
-/obj/machinery/hologram/holopad,
/obj/structure/cable{
d1 = 4;
d2 = 8;
@@ -45520,6 +43807,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "vault"
@@ -45613,13 +43901,13 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/machinery/hologram/holopad,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "vault"
@@ -45680,8 +43968,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/warning_stripes/west,
/turf/simulated/floor/plasteel,
@@ -45690,8 +43977,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/door/firedoor,
/obj/effect/decal/warning_stripes/yellow,
@@ -45704,8 +43990,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -45716,8 +44001,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -45816,8 +44100,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
dir = 1;
@@ -45865,16 +44148,15 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
icon_state = "grimy"
},
/area/crew_quarters/chief)
"bUq" = (
-/obj/machinery/hologram/holopad,
/obj/effect/decal/warning_stripes/yellow/hollow,
+/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
@@ -45884,8 +44166,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door/airlock/engineering{
name = "Tech Storage";
@@ -45899,8 +44180,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 8
@@ -45921,8 +44201,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door/airlock/maintenance,
/turf/simulated/floor/plasteel,
@@ -45936,7 +44215,7 @@
},
/obj/machinery/door/airlock/engineering/glass{
name = "Engineering Break Room";
- req_access_txt = "10"
+ req_access_txt = "32"
},
/obj/machinery/door/firedoor,
/obj/structure/disposalpipe/segment{
@@ -45954,8 +44233,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/disposalpipe/segment{
dir = 4
@@ -45966,7 +44244,6 @@
},
/area/engine/break_room)
"bUw" = (
-/obj/machinery/hologram/holopad,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
@@ -45976,6 +44253,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
@@ -46022,12 +44300,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
- },
-/obj/machinery/navbeacon{
- codes_txt = "patrol;next_patrol=engi2";
- location = "engi1"
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
@@ -46035,22 +44308,26 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
},
+/obj/machinery/navbeacon{
+ codes_txt = "patrol;next_patrol=engi2";
+ location = "engi1"
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
},
/area/hallway/primary/port)
"bUC" = (
-/obj/machinery/navbeacon{
- codes_txt = "patrol;next_patrol=hall4";
- location = "engi3"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/machinery/navbeacon{
+ codes_txt = "patrol;next_patrol=hall4";
+ location = "engi3"
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
@@ -46063,6 +44340,9 @@
icon_state = "1-8"
},
/obj/effect/decal/warning_stripes/south,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 10
+ },
/turf/simulated/floor/plating,
/area/turret_protected/aisat)
"bUG" = (
@@ -46098,13 +44378,13 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 4
},
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 4
+ },
/obj/machinery/navbeacon{
codes_txt = "patrol;next_patrol=engi1";
location = "hall3"
},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 4
- },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
@@ -46114,8 +44394,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/navbeacon{
codes_txt = "patrol;next_patrol=hall5";
@@ -46148,10 +44427,9 @@
/area/hallway/primary/central)
"bUP" = (
/obj/effect/spawner/window/reinforced/plasma,
-/obj/machinery/door/poddoor{
- icon_state = "open";
+/obj/machinery/door/poddoor/preopen{
id_tag = "transitlock";
- name = "Transit Tube Blast Doors"
+ name = "Transit Tube Lockdown"
},
/turf/simulated/floor/plating,
/area/engine/break_room)
@@ -46166,38 +44444,32 @@
},
/obj/item/paper_bin,
/obj/item/stamp/hop,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/crew_quarters/heads/hop)
"bUR" = (
/obj/item/twohanded/required/kirbyplants,
/obj/machinery/keycard_auth{
pixel_y = 26
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/crew_quarters/heads/hop)
"bUT" = (
/obj/item/twohanded/required/kirbyplants,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/crew_quarters/heads/hop)
"bUU" = (
/obj/structure/table/wood,
/obj/item/storage/box/ids,
/obj/item/storage/box/PDAs,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/crew_quarters/heads/hop)
"bUV" = (
-/obj/machinery/computer/communications,
/obj/machinery/ai_status_display{
pixel_x = -32
},
+/obj/machinery/computer/communications{
+ dir = 4
+ },
/turf/simulated/floor/carpet/black,
/area/crew_quarters/captain)
"bUW" = (
@@ -46215,12 +44487,10 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/disposalpipe/segment,
/turf/simulated/floor/carpet/black,
/area/crew_quarters/captain)
"bUY" = (
@@ -46282,21 +44552,20 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/structure/cable{
d1 = 1;
d2 = 4;
icon_state = "1-4"
},
+/obj/effect/landmark{
+ name = "lightsout"
+ },
/obj/machinery/navbeacon{
codes_txt = "patrol;next_patrol=hall13";
location = "hall12"
},
-/obj/effect/landmark{
- name = "lightsout"
- },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
@@ -46306,15 +44575,18 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+ dir = 8
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/navbeacon{
codes_txt = "patrol;next_patrol=hall11";
location = "hall10"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
@@ -46334,8 +44606,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -46352,8 +44623,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 1
@@ -46387,14 +44657,12 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -46414,49 +44682,37 @@
icon_state = "1-4";
tag = "90Curve"
},
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
},
/area/hallway/primary/starboard)
"bVm" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
-/obj/structure/cable{
- 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
+/obj/structure/disposalpipe/junction{
+ dir = 1
},
/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "neutralfull"
+ dir = 4;
+ icon_state = "redcorner"
},
-/area/hallway/primary/starboard)
+/area/security/brig)
"bVn" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -46471,14 +44727,12 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 1
@@ -46492,12 +44746,7 @@
},
/area/hallway/primary/starboard)
"bVp" = (
-/obj/machinery/navbeacon{
- codes_txt = "patrol;next_patrol=hall12";
- location = "hall11"
- },
/obj/item/radio/beacon,
-/mob/living/simple_animal/bot/secbot/beepsky,
/obj/structure/cable{
d1 = 1;
d2 = 8;
@@ -46509,6 +44758,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 9
},
+/obj/machinery/navbeacon{
+ codes_txt = "patrol;next_patrol=hall12";
+ location = "hall11"
+ },
+/mob/living/simple_animal/bot/secbot/beepsky,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
@@ -46577,8 +44831,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/door/firedoor,
/obj/effect/decal/warning_stripes/yellow,
@@ -46597,8 +44850,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/door/firedoor,
/obj/effect/decal/warning_stripes/yellow,
@@ -46608,11 +44860,11 @@
},
/area/hallway/primary/port)
"bVD" = (
+/obj/machinery/door/firedoor,
+/obj/effect/decal/warning_stripes/yellow,
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/door/firedoor,
-/obj/effect/decal/warning_stripes/yellow,
/turf/simulated/floor/plasteel{
icon_state = "neutralcorner"
},
@@ -46621,12 +44873,11 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
-/obj/machinery/door/airlock/glass{
- name = "Magistrate's Office";
- req_access_txt = "74"
+/obj/machinery/door/airlock{
+ name = "Court";
+ req_access_txt = "38"
},
/turf/simulated/floor/plasteel,
/area/crew_quarters/courtroom)
@@ -46848,12 +45099,14 @@
name = "east bump";
pixel_x = 24
},
-/obj/machinery/computer/prisoner,
/obj/machinery/camera{
c_tag = "Warden's Office";
dir = 8;
network = list("SS13","Security")
},
+/obj/machinery/computer/prisoner{
+ dir = 8
+ },
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "red"
@@ -46910,7 +45163,9 @@
pixel_y = -8;
req_access_txt = "11"
},
-/obj/machinery/computer/security/engineering,
+/obj/machinery/computer/security/engineering{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -47001,8 +45256,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
dir = 10;
@@ -47023,13 +45277,13 @@
/area/engine/break_room)
"bWw" = (
/obj/machinery/light,
-/obj/machinery/newscaster/security_unit{
- pixel_y = -32
- },
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 1
},
/obj/structure/table/wood,
+/obj/machinery/newscaster{
+ pixel_y = -32
+ },
/turf/simulated/floor/plasteel{
dir = 0;
icon_state = "yellow"
@@ -47058,7 +45312,7 @@
},
/obj/machinery/alarm{
dir = 1;
- pixel_y = -22
+ pixel_y = -24
},
/obj/item/twohanded/required/kirbyplants,
/turf/simulated/floor/plasteel{
@@ -47076,8 +45330,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -47203,9 +45456,7 @@
},
/area/crew_quarters/heads/hop)
"bWR" = (
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/crew_quarters/heads/hop)
"bWT" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
@@ -47218,16 +45469,13 @@
/obj/machinery/computer/security/telescreen/entertainment{
pixel_x = 32
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/crew_quarters/heads/hop)
"bWW" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door/airlock/command{
id_tag = "captainofficedoor";
@@ -47237,10 +45485,7 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/crew_quarters/captain)
"bWX" = (
/turf/simulated/wall,
@@ -47261,9 +45506,7 @@
},
/area/crew_quarters/captain/bedroom)
"bXa" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 8
- },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/disposalpipe/segment{
dir = 4;
@@ -47290,9 +45533,6 @@
},
/area/hallway/primary/starboard)
"bXf" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
},
@@ -47301,6 +45541,9 @@
pixel_y = -24
},
/obj/machinery/light,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "neutralcorner"
},
@@ -47309,8 +45552,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -47325,38 +45567,36 @@
/turf/simulated/floor/plasteel,
/area/lawoffice)
"bXh" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
},
/turf/simulated/floor/plasteel{
icon_state = "neutralcorner"
},
/area/hallway/primary/starboard)
"bXi" = (
+/obj/machinery/light,
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/light,
/turf/simulated/floor/plasteel{
icon_state = "neutralcorner"
},
/area/hallway/primary/starboard)
"bXj" = (
-/obj/structure/disposalpipe/junction{
- dir = 4;
- icon_state = "pipe-j2"
- },
/obj/machinery/power/apc{
name = "south bump";
pixel_y = -24
},
/obj/structure/cable,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "neutralcorner"
},
@@ -47370,17 +45610,16 @@
},
/area/hallway/primary/starboard)
"bXl" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/disposalpipe/junction{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "redcorner"
},
@@ -47395,7 +45634,7 @@
/turf/simulated/floor/plating,
/area/turret_protected/aisat)
"bXn" = (
-/obj/structure/disposalpipe/segment{
+/obj/structure/disposalpipe/junction{
dir = 4
},
/turf/simulated/floor/plasteel{
@@ -47431,18 +45670,19 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/public/glass,
+/obj/machinery/door/airlock/public/glass{
+ name = "Public Access"
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "neutralcorner"
},
/area/hallway/primary/port)
"bXB" = (
-/obj/structure/disposalpipe/junction{
+/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/simulated/floor/plasteel{
@@ -47453,7 +45693,9 @@
"bXC" = (
/obj/machinery/door/firedoor,
/obj/effect/decal/warning_stripes/yellow,
-/obj/machinery/door/airlock/public/glass,
+/obj/machinery/door/airlock/public/glass{
+ name = "Public Access"
+ },
/obj/structure/disposalpipe/segment{
dir = 4
},
@@ -47463,12 +45705,12 @@
},
/area/hallway/primary/starboard)
"bXD" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/camera{
c_tag = "Primary Security Hallway"
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "neutralcorner"
@@ -47667,15 +45909,18 @@
/turf/simulated/wall,
/area/engine/engineering)
"bYa" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2";
- tag = ""
+/obj/machinery/light{
+ dir = 4
},
-/obj/structure/lattice/catwalk,
-/turf/space,
-/area/space/nearstation)
+/obj/machinery/status_display{
+ pixel_x = 32
+ },
+/obj/structure/disposalpipe/segment,
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "redcorner"
+ },
+/area/hallway/primary/starboard)
"bYb" = (
/obj/structure/sign/securearea{
desc = "A warning sign which reads 'RADIOACTIVE AREA'";
@@ -47701,8 +45946,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
dir = 0;
@@ -47736,15 +45980,14 @@
/turf/space,
/area/space/nearstation)
"bYm" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8";
- tag = ""
+/obj/structure/disposalpipe/segment{
+ dir = 1;
+ icon_state = "pipe-c"
},
-/obj/structure/lattice/catwalk,
-/turf/space,
-/area/space/nearstation)
+/turf/simulated/floor/plasteel{
+ icon_state = "cult"
+ },
+/area/magistrateoffice)
"bYn" = (
/obj/structure/sign/directions/evac{
pixel_y = -8
@@ -47783,10 +46026,11 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
+ },
+/obj/machinery/computer/card{
+ dir = 1
},
-/obj/machinery/computer/card,
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "dark"
@@ -47796,37 +46040,20 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
-/area/crew_quarters/heads/hop)
-"bYs" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8";
- tag = ""
- },
-/turf/simulated/floor/carpet,
+/turf/simulated/floor/wood,
/area/crew_quarters/heads/hop)
"bYu" = (
/obj/machinery/status_display{
pixel_x = 32
},
/obj/machinery/pdapainter,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/crew_quarters/heads/hop)
"bYv" = (
/turf/simulated/wall/r_wall,
/area/ntrep)
-"bYw" = (
-/turf/simulated/wall,
-/area/civilian/barber)
"bYx" = (
/turf/simulated/wall/r_wall,
/area/blueshield)
@@ -47835,36 +46062,30 @@
/obj/machinery/computer/security/telescreen/entertainment{
pixel_x = -32
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/crew_quarters/captain/bedroom)
"bYz" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/crew_quarters/captain/bedroom)
"bYA" = (
/obj/machinery/light_switch{
pixel_x = -8;
pixel_y = 26
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/crew_quarters/captain/bedroom)
"bYB" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/public/glass,
+/obj/machinery/door/airlock/public/glass{
+ name = "Public Access"
+ },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
@@ -47892,8 +46113,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 4
@@ -47934,12 +46154,13 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/door/firedoor,
/obj/effect/decal/warning_stripes/yellow,
-/obj/machinery/door/airlock/public/glass,
+/obj/machinery/door/airlock/public/glass{
+ name = "Public Access"
+ },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
@@ -47962,8 +46183,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -47971,9 +46191,8 @@
name = "Internal Affairs Office";
req_access_txt = "38"
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/obj/structure/disposalpipe/segment,
+/turf/simulated/floor/wood,
/area/lawoffice)
"bYP" = (
/obj/machinery/door/poddoor/shutters{
@@ -47989,21 +46208,26 @@
req_access_txt = "74"
},
/obj/machinery/door/firedoor,
-/turf/simulated/floor/plating,
+/obj/structure/disposalpipe/segment,
+/turf/simulated/floor/plasteel{
+ icon_state = "cult"
+ },
/area/magistrateoffice)
"bYQ" = (
-/obj/structure/disposalpipe/segment,
-/obj/effect/spawner/window/reinforced,
-/obj/machinery/door/poddoor/shutters{
- density = 0;
- dir = 2;
- icon_state = "open";
- id_tag = "magistrate";
- name = "Magistrate Privacy Shutters";
- opacity = 0
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
},
-/turf/simulated/floor/plating,
-/area/magistrateoffice)
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/structure/chair/sofa/corp,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/medical/medbay)
"bYR" = (
/obj/effect/spawner/window/reinforced,
/obj/machinery/door/poddoor/shutters{
@@ -48047,8 +46271,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -48059,8 +46282,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -48077,8 +46299,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 1
@@ -48095,8 +46316,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -48114,8 +46334,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
@@ -48123,8 +46342,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
@@ -48146,8 +46364,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/obj/structure/cable{
d2 = 8;
@@ -48185,7 +46402,9 @@
},
/area/turret_protected/aisat)
"bZi" = (
-/obj/machinery/door/airlock/public/glass,
+/obj/machinery/door/airlock/public/glass{
+ name = "Court gallery"
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -48322,14 +46541,18 @@
name = "Engineering Junction";
sortType = 4
},
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel,
/area/engine/engineering)
"bZA" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/warning_stripes/north,
/turf/simulated/floor/plasteel,
@@ -48338,8 +46561,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 1;
@@ -48354,8 +46576,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d2 = 8;
@@ -48367,8 +46588,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d2 = 8;
@@ -48377,7 +46597,10 @@
/obj/machinery/power/smes{
charge = 2e+006
},
-/turf/simulated/floor/greengrid,
+/turf/simulated/floor/plasteel{
+ dir = 5;
+ icon_state = "dark"
+ },
/area/engine/engineering)
"bZE" = (
/obj/structure/cable{
@@ -48387,7 +46610,10 @@
/obj/machinery/power/smes{
charge = 2e+006
},
-/turf/simulated/floor/greengrid,
+/turf/simulated/floor/plasteel{
+ dir = 5;
+ icon_state = "dark"
+ },
/area/engine/engineering)
"bZG" = (
/obj/effect/decal/cleanable/dirt,
@@ -48398,15 +46624,6 @@
},
/area/maintenance/port)
"bZI" = (
-/obj/structure/cable{
- d2 = 2;
- icon_state = "0-2"
- },
-/obj/machinery/power/apc{
- dir = 1;
- name = "north bump";
- pixel_y = 24
- },
/obj/structure/closet/crate,
/obj/effect/spawner/lootdrop/maintenance{
lootcount = 3;
@@ -48416,11 +46633,11 @@
/area/maintenance/port)
"bZJ" = (
/obj/structure/table/wood,
-/obj/machinery/computer/library,
/obj/machinery/light_switch{
pixel_x = 4;
pixel_y = 26
},
+/obj/machinery/computer/library,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -48485,12 +46702,12 @@
/obj/structure/table/wood,
/obj/item/folder,
/obj/item/pen,
-/obj/machinery/newscaster{
- pixel_y = 32
- },
/obj/machinery/light/small{
dir = 1
},
+/obj/machinery/newscaster{
+ pixel_y = 32
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -48508,10 +46725,10 @@
/obj/item/radio/intercom{
pixel_y = 26
},
+/obj/effect/decal/cleanable/cobweb,
/obj/machinery/computer/security/telescreen/entertainment{
pixel_x = -32
},
-/obj/effect/decal/cleanable/cobweb,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -48534,8 +46751,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 8
@@ -48558,10 +46774,12 @@
/turf/simulated/wall/r_wall,
/area/crew_quarters/heads/hop)
"bZX" = (
-/obj/machinery/computer/secure_data,
/obj/machinery/light{
dir = 8
},
+/obj/machinery/computer/secure_data{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "dark"
@@ -48573,78 +46791,57 @@
/obj/machinery/photocopier/faxmachine{
department = "Head of Personnel's Office"
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/crew_quarters/heads/hop)
"cab" = (
/obj/structure/closet/secure_closet/ntrep,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/ntrep)
"cac" = (
/obj/machinery/computer/secure_data,
-/turf/simulated/floor/carpet,
+/obj/machinery/newscaster/security_unit{
+ pixel_y = 32
+ },
+/turf/simulated/floor/carpet/black,
/area/ntrep)
"cad" = (
/obj/structure/table/wood,
/obj/machinery/photocopier/faxmachine/longrange{
department = "NT Representative's Office"
},
-/turf/simulated/floor/carpet,
+/turf/simulated/floor/carpet/black,
/area/ntrep)
"cae" = (
-/obj/item/flag/nt,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/obj/structure/bookcase,
+/obj/item/book/manual/sop_command,
+/obj/item/book/manual/sop_engineering,
+/obj/item/book/manual/sop_general,
+/obj/item/book/manual/sop_legal,
+/obj/item/book/manual/sop_medical,
+/obj/item/book/manual/sop_science,
+/obj/item/book/manual/sop_security,
+/obj/item/book/manual/sop_service,
+/obj/item/book/manual/sop_supply,
+/turf/simulated/floor/wood,
/area/ntrep)
"caf" = (
-/obj/machinery/dye_generator,
-/obj/machinery/alarm{
- dir = 4;
- pixel_x = -24
+/obj/structure/chair/sofa/right,
+/obj/structure/sign/poster/official/random{
+ pixel_y = 32
},
-/turf/simulated/floor/plasteel{
- icon_state = "barber"
- },
-/area/civilian/barber)
+/turf/simulated/floor/wood,
+/area/ntrep)
"cag" = (
-/obj/machinery/power/apc{
- dir = 1;
- name = "north bump";
- pixel_y = 24
- },
-/obj/structure/chair/barber{
- dir = 4
- },
-/obj/structure/cable{
- d2 = 2;
- icon_state = "0-2"
- },
-/turf/simulated/floor/plasteel{
- icon_state = "barber"
- },
-/area/civilian/barber)
+/obj/structure/chair/sofa,
+/turf/simulated/floor/wood,
+/area/ntrep)
"cah" = (
-/obj/structure/table/reinforced,
-/obj/structure/mirror{
- pixel_x = 28
- },
-/obj/item/razor,
-/obj/machinery/camera{
- c_tag = "Barber Shop"
- },
-/turf/simulated/floor/plasteel{
- icon_state = "barber"
- },
-/area/civilian/barber)
+/obj/structure/chair/sofa/corner,
+/turf/simulated/floor/wood,
+/area/ntrep)
"cai" = (
/obj/item/flag/nt,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/blueshield)
"caj" = (
/obj/structure/table/wood,
@@ -48655,15 +46852,16 @@
/area/blueshield)
"cak" = (
/obj/machinery/computer/crew,
+/obj/machinery/newscaster/security_unit{
+ pixel_y = 32
+ },
/turf/simulated/floor/plasteel{
icon_state = "bcarpet05"
},
/area/blueshield)
"cal" = (
/obj/structure/closet/secure_closet/blueshield,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/blueshield)
"cam" = (
/obj/structure/table/wood,
@@ -48679,8 +46877,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
@@ -48688,7 +46885,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
},
-/obj/structure/disposalpipe/segment,
/turf/simulated/floor/carpet/black,
/area/crew_quarters/captain/bedroom)
"cao" = (
@@ -48698,9 +46894,7 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 1
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/crew_quarters/captain/bedroom)
"cap" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
@@ -48709,17 +46903,13 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/crew_quarters/captain/bedroom)
"caq" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 1
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/crew_quarters/captain/bedroom)
"car" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -48783,13 +46973,13 @@
},
/area/crew_quarters/courtroom)
"caz" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/camera{
c_tag = "Primary Security Hallway East";
dir = 1
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "redcorner"
},
@@ -48848,54 +47038,49 @@
/obj/structure/extinguisher_cabinet{
pixel_x = -28
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/obj/item/clipboard,
+/obj/item/toy/figure/crew/lawyer,
+/turf/simulated/floor/wood,
/area/lawoffice)
"caH" = (
/obj/structure/table/wood,
-/obj/item/clipboard,
-/obj/item/toy/figure/crew/lawyer,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
+/obj/machinery/photocopier/faxmachine/longrange{
+ department = "IAA Office"
},
+/turf/simulated/floor/wood,
/area/lawoffice)
"caI" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
+/obj/structure/disposalpipe/segment{
+ dir = 1;
+ icon_state = "pipe-c"
},
+/turf/simulated/floor/wood,
/area/lawoffice)
"caJ" = (
-/obj/machinery/photocopier/faxmachine/longrange{
- department = "Magistrate's Office"
- },
-/obj/structure/table/wood,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
+/obj/structure/disposalpipe/segment{
+ dir = 2;
+ icon_state = "pipe-c"
},
+/turf/simulated/floor/wood,
/area/lawoffice)
"caK" = (
/obj/machinery/firealarm{
dir = 4;
pixel_x = 24
},
-/obj/structure/closet/lawcloset,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/obj/structure/filingcabinet/security,
+/turf/simulated/floor/wood,
/area/lawoffice)
"caM" = (
/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
+ dir = 4
},
/obj/machinery/computer/prisoner{
req_access = null;
@@ -48919,8 +47104,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 8
@@ -48934,8 +47118,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/door_timer/cell_5{
pixel_y = -32
@@ -48950,7 +47133,6 @@
/obj/item/radio/intercom{
pixel_y = 26
},
-/obj/machinery/computer/med_data/laptop,
/obj/machinery/flasher_button{
id = "hopflash";
pixel_x = -38;
@@ -48977,6 +47159,7 @@
pixel_x = -24;
pixel_y = 8
},
+/obj/machinery/computer/med_data/laptop,
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "dark"
@@ -49232,6 +47415,11 @@
dir = 4;
icon_state = "pipe-c"
},
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plasteel{
icon_state = "yellowfull"
},
@@ -49259,6 +47447,12 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/chair/sofa/corp/corner{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "whiteblue"
@@ -49339,9 +47533,7 @@
dir = 1;
in_use = 1
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/crew_quarters/captain/bedroom)
"cbB" = (
/obj/effect/decal/cleanable/dirt,
@@ -49351,12 +47543,6 @@
/turf/simulated/wall,
/area/maintenance/port)
"cbE" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2";
- tag = ""
- },
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small{
dir = 4;
@@ -49405,8 +47591,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10;
@@ -49424,13 +47609,13 @@
/obj/structure/chair/comfy/black{
dir = 8
},
-/obj/machinery/newscaster{
- pixel_x = 32
- },
/obj/machinery/camera{
c_tag = "Library North";
dir = 8
},
+/obj/machinery/newscaster{
+ pixel_x = 32
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -49495,8 +47680,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/warning_stripes/south,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -49508,8 +47692,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/item/twohanded/required/kirbyplants,
/turf/simulated/floor/plasteel{
@@ -49538,8 +47721,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -49562,9 +47744,10 @@
},
/area/hallway/primary/central)
"cbW" = (
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
+/obj/machinery/keycard_auth{
+ pixel_x = -24
},
+/turf/simulated/floor/wood,
/area/ntrep)
"cbX" = (
/obj/structure/table/wood,
@@ -49574,7 +47757,7 @@
pixel_x = -5;
pixel_y = 12
},
-/turf/simulated/floor/carpet,
+/turf/simulated/floor/carpet/black,
/area/ntrep)
"cbY" = (
/obj/structure/chair/office/dark{
@@ -49583,51 +47766,54 @@
/obj/effect/landmark/start{
name = "Nanotrasen Representative"
},
-/turf/simulated/floor/carpet,
+/turf/simulated/floor/carpet/black,
/area/ntrep)
"cbZ" = (
/obj/structure/chair/comfy/black{
dir = 8
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
+/obj/structure/cable{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
},
+/turf/simulated/floor/wood,
/area/ntrep)
"cca" = (
-/obj/machinery/newscaster{
- pixel_x = -32
- },
-/turf/simulated/floor/plasteel{
- icon_state = "barber"
- },
-/area/civilian/barber)
+/obj/structure/table/wood,
+/obj/item/reagent_containers/food/drinks/bottle/whiskey,
+/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass,
+/turf/simulated/floor/wood,
+/area/ntrep)
"ccb" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2";
- tag = ""
+/obj/structure/table/wood,
+/obj/item/clothing/mask/cigarette/cigar/cohiba{
+ pixel_x = 3;
+ pixel_y = -3
},
-/turf/simulated/floor/plasteel{
- icon_state = "barber"
+/obj/item/clothing/mask/cigarette/cigar/havana{
+ pixel_x = -3;
+ pixel_y = 3
},
-/area/civilian/barber)
+/turf/simulated/floor/wood,
+/area/ntrep)
"ccc" = (
-/obj/structure/table/reinforced,
+/obj/structure/chair/sofa{
+ dir = 8
+ },
+/obj/structure/sign/poster/official/random{
+ pixel_x = 32
+ },
/obj/machinery/computer/security/telescreen/entertainment{
pixel_x = 32
},
-/turf/simulated/floor/plasteel{
- icon_state = "barber"
- },
-/area/civilian/barber)
+/turf/simulated/floor/wood,
+/area/ntrep)
"ccd" = (
/obj/structure/chair/comfy/black{
dir = 4
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/blueshield)
"cce" = (
/obj/structure/table/wood,
@@ -49647,9 +47833,7 @@
},
/area/blueshield)
"ccg" = (
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/blueshield)
"cch" = (
/obj/structure/table/wood,
@@ -49672,73 +47856,51 @@
/obj/effect/landmark/start{
name = "Captain"
},
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
- },
/turf/simulated/floor/carpet/black,
/area/crew_quarters/captain/bedroom)
"ccj" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 1
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/crew_quarters/captain/bedroom)
"cck" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
-/obj/machinery/hologram/holopad,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
- },
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/obj/machinery/hologram/holopad,
+/turf/simulated/floor/wood,
/area/crew_quarters/captain/bedroom)
"ccl" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/crew_quarters/captain/bedroom)
"ccm" = (
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/machinery/door/window{
dir = 8;
@@ -49804,8 +47966,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
@@ -49819,8 +47980,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -49834,8 +47994,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 1;
@@ -49857,8 +48016,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -49885,14 +48043,12 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -49900,16 +48056,13 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 1
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/lawoffice)
"ccz" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -49943,8 +48096,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
@@ -49955,6 +48107,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "grimy"
},
@@ -49964,10 +48117,8 @@
dir = 8;
pixel_x = 24
},
-/obj/structure/filingcabinet/security,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/obj/structure/closet/lawcloset,
+/turf/simulated/floor/wood,
/area/lawoffice)
"ccD" = (
/obj/item/radio/intercom/department/security{
@@ -49991,10 +48142,10 @@
/turf/simulated/floor/carpet,
/area/magistrateoffice)
"ccF" = (
-/obj/machinery/hologram/holopad,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
},
+/obj/machinery/hologram/holopad,
/turf/simulated/floor/carpet,
/area/magistrateoffice)
"ccG" = (
@@ -50004,7 +48155,7 @@
},
/area/magistrateoffice)
"ccL" = (
-/obj/structure/closet/secure_closet,
+/obj/structure/closet,
/obj/machinery/light/small{
dir = 8
},
@@ -50013,7 +48164,7 @@
},
/area/security/evidence)
"ccM" = (
-/obj/structure/closet/secure_closet,
+/obj/structure/closet,
/obj/machinery/power/apc{
dir = 1;
name = "north bump";
@@ -50046,7 +48197,7 @@
},
/area/crew_quarters/courtroom)
"ccP" = (
-/obj/structure/closet/secure_closet,
+/obj/structure/closet,
/obj/machinery/light/small{
dir = 4
},
@@ -50160,8 +48311,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/warning_stripes/yellow,
/turf/simulated/floor/plasteel{
@@ -50291,9 +48441,7 @@
/obj/machinery/light{
dir = 8
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/library)
"cdy" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -50316,9 +48464,7 @@
/obj/machinery/light/small{
dir = 4
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/library)
"cdB" = (
/obj/structure/sign/nosmoking_2,
@@ -50335,7 +48481,9 @@
/turf/simulated/wall/r_wall,
/area/crew_quarters/heads/hop)
"cdE" = (
-/obj/machinery/computer/supplycomp,
+/obj/machinery/computer/supplycomp{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "dark"
@@ -50354,8 +48502,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/carpet,
@@ -50367,98 +48514,60 @@
},
/obj/item/clipboard,
/obj/item/toy/figure/crew/hop,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/crew_quarters/heads/hop)
"cdI" = (
-/obj/machinery/keycard_auth{
- pixel_x = -24
- },
/obj/machinery/door/window{
dir = 2;
name = "Desk Door";
req_access_txt = "73"
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
+/obj/machinery/light{
+ dir = 8
},
+/turf/simulated/floor/wood,
/area/ntrep)
"cdJ" = (
/obj/structure/table/wood,
/obj/item/folder,
/obj/item/pen/multi/fountain,
-/turf/simulated/floor/carpet,
+/turf/simulated/floor/carpet/black,
/area/ntrep)
"cdK" = (
/obj/structure/table/wood,
/obj/item/stamp/rep,
-/turf/simulated/floor/carpet,
+/turf/simulated/floor/carpet/black,
/area/ntrep)
"cdL" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on,
-/obj/machinery/light{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
-/area/ntrep)
-"cdM" = (
-/obj/effect/landmark/start{
- name = "Barber"
- },
-/obj/machinery/light/small{
- dir = 8
- },
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- icon_state = "barber"
- },
-/area/civilian/barber)
-"cdN" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
-/obj/structure/chair/barber{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 10
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 6
- },
-/turf/simulated/floor/plasteel{
- icon_state = "barber"
- },
-/area/civilian/barber)
+/turf/simulated/floor/wood,
+/area/ntrep)
+"cdN" = (
+/obj/structure/table/wood,
+/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass,
+/obj/item/storage/fancy/donut_box,
+/turf/simulated/floor/wood,
+/area/ntrep)
"cdO" = (
-/obj/structure/table/reinforced,
-/obj/structure/mirror{
- pixel_x = 28
- },
-/obj/item/razor,
-/obj/machinery/atmospherics/unary/vent_pump/on{
+/obj/structure/chair/sofa/left{
dir = 8
},
-/turf/simulated/floor/plasteel{
- icon_state = "barber"
+/obj/machinery/light{
+ dir = 4
},
-/area/civilian/barber)
+/turf/simulated/floor/wood,
+/area/ntrep)
"cdP" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/obj/machinery/light{
dir = 8
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/blueshield)
"cdQ" = (
/obj/structure/table/wood,
@@ -50495,9 +48604,7 @@
/obj/machinery/keycard_auth{
pixel_x = 24
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/blueshield)
"cdT" = (
/obj/structure/table/wood,
@@ -50516,23 +48623,17 @@
dir = 1;
pixel_y = -24
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/crew_quarters/captain/bedroom)
"cdW" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/crew_quarters/captain/bedroom)
"cdX" = (
/obj/machinery/firealarm{
@@ -50544,9 +48645,7 @@
c_tag = "Captain's Quarters";
dir = 1
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/crew_quarters/captain/bedroom)
"cdY" = (
/obj/structure/cable,
@@ -50619,8 +48718,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
dir = 1;
@@ -50648,19 +48746,13 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
- },
-/obj/machinery/newscaster{
- pixel_x = -32
- },
-/obj/machinery/light{
- dir = 8
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
+/obj/machinery/newscaster/security_unit{
+ pixel_x = -32
},
+/turf/simulated/floor/wood,
/area/lawoffice)
"cen" = (
/obj/structure/table/wood,
@@ -50682,30 +48774,29 @@
},
/area/lawoffice)
"cep" = (
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
- },
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/junction{
+ dir = 1
+ },
/turf/simulated/floor/plasteel{
icon_state = "grimy"
},
/area/lawoffice)
"ceq" = (
+/obj/machinery/light{
+ dir = 4
+ },
/obj/structure/disposalpipe/trunk{
dir = 8
},
/obj/machinery/disposal,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/lawoffice)
"cer" = (
/obj/structure/chair/comfy/brown{
@@ -50714,6 +48805,9 @@
/obj/effect/landmark/start{
name = "Magistrate"
},
+/obj/machinery/newscaster/security_unit{
+ pixel_x = -32
+ },
/turf/simulated/floor/carpet,
/area/magistrateoffice)
"ces" = (
@@ -50733,42 +48827,26 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
},
/area/security/brig)
-"cez" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8";
- tag = ""
- },
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "redcorner"
- },
-/area/security/brig)
"ceA" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/door/airlock/security{
- name = "Security-Storage Backroom";
- req_access = null;
+ name = "Evidence Storage";
req_access_txt = "63"
},
/obj/machinery/door/firedoor,
@@ -50780,8 +48858,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -50841,8 +48918,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
@@ -50890,8 +48966,11 @@
/turf/simulated/floor/bluegrid,
/area/tcommsat/chamber)
"ceQ" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
+/obj/structure/disposalpipe/sortjunction{
+ dir = 8;
+ icon_state = "pipe-j2s";
+ name = "Chemistry Junction";
+ sortType = 11
},
/turf/simulated/floor/plasteel{
dir = 6;
@@ -50976,9 +49055,7 @@
/area/engine/engineering)
"cfa" = (
/obj/structure/closet/secure_closet/captains,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/crew_quarters/captain/bedroom)
"cfb" = (
/obj/structure/disposalpipe/segment,
@@ -51040,14 +49117,14 @@
name = "Station Intercom (General)";
pixel_y = -29
},
-/obj/machinery/computer/station_alert,
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
+/obj/machinery/computer/station_alert,
/obj/machinery/computer/monitor{
+ dir = 1;
name = "Grid Power Monitoring Computer"
},
/turf/simulated/floor/plasteel{
@@ -51060,12 +49137,13 @@
pixel_x = 28;
pixel_y = -28
},
-/obj/machinery/computer/atmos_alert,
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
+ },
+/obj/machinery/computer/atmos_alert{
+ dir = 1
},
/turf/simulated/floor/plasteel{
dir = 5;
@@ -51076,8 +49154,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/wall/r_wall,
/area/engine/engineering)
@@ -51086,8 +49163,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/spawner/lootdrop/maintenance,
/obj/effect/decal/cleanable/dirt,
@@ -51097,14 +49173,12 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/turf/simulated/floor/plating,
/area/maintenance/port)
@@ -51130,27 +49204,19 @@
dir = 4;
pixel_x = -24
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/library)
"cfr" = (
/obj/structure/chair/office/dark,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/library)
"cfs" = (
/obj/item/twohanded/required/kirbyplants,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/library)
"cft" = (
/obj/machinery/bookbinder,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/library)
"cfu" = (
/obj/structure/bookcase,
@@ -51160,25 +49226,20 @@
/obj/machinery/newscaster{
pixel_y = 32
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/library)
"cfv" = (
/obj/structure/chair/comfy/red,
/obj/effect/landmark/start{
name = "Civilian"
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/library)
"cfw" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -51192,39 +49253,31 @@
/obj/structure/extinguisher_cabinet{
pixel_y = 32
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/library)
"cfy" = (
/obj/structure/bookcase,
/obj/machinery/light{
dir = 1
},
-/obj/machinery/newscaster{
- pixel_y = 32
- },
/obj/machinery/camera{
c_tag = "Library Starboard"
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
+/obj/machinery/newscaster{
+ pixel_y = 32
},
+/turf/simulated/floor/wood,
/area/library)
"cfz" = (
/obj/structure/chair/comfy/red,
/obj/item/radio/intercom{
pixel_y = 26
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/library)
"cfA" = (
/obj/machinery/vending/coffee,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/library)
"cfB" = (
/obj/machinery/light/small,
@@ -51241,10 +49294,11 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
+ },
+/obj/machinery/computer/security/mining{
+ dir = 4
},
-/obj/machinery/computer/security/mining,
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "dark"
@@ -51254,89 +49308,50 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/chair/office/dark,
/obj/effect/landmark/start{
name = "Head of Personnel"
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/crew_quarters/heads/hop)
"cfE" = (
/obj/structure/table/wood,
/obj/machinery/recharger,
-/obj/machinery/newscaster{
+/obj/machinery/newscaster/security_unit{
pixel_x = 32
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/crew_quarters/heads/hop)
-"cfF" = (
-/obj/machinery/light{
- dir = 8
- },
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
-/area/ntrep)
"cfG" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
},
-/turf/simulated/floor/carpet,
+/turf/simulated/floor/carpet/black,
/area/ntrep)
"cfH" = (
-/turf/simulated/floor/carpet,
+/turf/simulated/floor/carpet/black,
/area/ntrep)
"cfI" = (
/obj/structure/cable{
+ d1 = 1;
d2 = 2;
- icon_state = "0-2"
- },
-/obj/machinery/power/apc{
- cell_type = 25000;
- dir = 4;
- name = "east bump";
- pixel_x = 24;
- shock_proof = 1
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/ntrep)
-"cfJ" = (
-/obj/item/twohanded/required/kirbyplants,
-/turf/simulated/floor/plasteel{
- icon_state = "barber"
- },
-/area/civilian/barber)
"cfK" = (
-/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,
-/turf/simulated/floor/plasteel{
- icon_state = "barber"
- },
-/area/civilian/barber)
+/turf/simulated/floor/wood,
+/area/ntrep)
"cfL" = (
-/obj/structure/dresser,
-/turf/simulated/floor/plasteel{
- icon_state = "barber"
- },
-/area/civilian/barber)
+/obj/item/flag/nt,
+/turf/simulated/floor/wood,
+/area/ntrep)
"cfM" = (
/obj/structure/cable{
d2 = 2;
@@ -51351,9 +49366,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 6
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/blueshield)
"cfN" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
@@ -51372,16 +49385,13 @@
/obj/machinery/light{
dir = 4
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/blueshield)
"cfQ" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/door/airlock/command{
@@ -51391,15 +49401,13 @@
req_access_txt = "20"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/crew_quarters/captain/bedroom)
"cfR" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -51462,9 +49470,7 @@
/obj/effect/landmark/start{
name = "Internal Affairs Agent"
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/lawoffice)
"cgb" = (
/obj/structure/table/wood,
@@ -51487,15 +49493,14 @@
},
/area/lawoffice)
"cgd" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "grimy"
},
@@ -51507,7 +49512,7 @@
/turf/simulated/floor/carpet,
/area/magistrateoffice)
"cgg" = (
-/obj/structure/closet/secure_closet,
+/obj/structure/closet,
/obj/machinery/alarm{
pixel_y = 24
},
@@ -51545,10 +49550,6 @@
/turf/simulated/floor/carpet,
/area/magistrateoffice)
"cgj" = (
-/obj/machinery/disposal,
-/obj/structure/disposalpipe/trunk{
- dir = 1
- },
/obj/machinery/light,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -51564,6 +49565,10 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/machinery/disposal,
+/obj/structure/disposalpipe/trunk{
+ dir = 1
+ },
/turf/simulated/floor/plasteel{
icon_state = "cult"
},
@@ -51576,8 +49581,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -51593,8 +49597,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 4
@@ -51608,19 +49611,17 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/turf/simulated/floor/plasteel,
/area/security/brig)
"cgo" = (
-/obj/structure/closet/secure_closet,
+/obj/structure/closet,
/obj/item/radio/intercom{
dir = 8;
pixel_y = -28
@@ -51647,6 +49648,7 @@
/obj/structure/window/reinforced{
dir = 8
},
+/obj/structure/closet,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -51768,15 +49770,15 @@
},
/area/engine/engineering)
"cgK" = (
-/obj/machinery/door/airlock/glass{
- name = "Magistrate's Office";
- req_access_txt = "74"
+/obj/machinery/door/airlock{
+ name = "Court";
+ req_access_txt = "38"
},
/turf/simulated/floor/plasteel,
/area/crew_quarters/courtroom)
"cgL" = (
-/obj/machinery/hologram/holopad,
/obj/effect/decal/warning_stripes/yellow/hollow,
+/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
@@ -51819,9 +49821,7 @@
c_tag = "Magistrate's Office";
dir = 8
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/lawoffice)
"cgW" = (
/obj/structure/table/wood,
@@ -51829,17 +49829,13 @@
/obj/machinery/newscaster{
pixel_x = -32
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/library)
"cgX" = (
/obj/structure/table/wood,
/obj/item/folder,
/obj/item/pen,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/library)
"cgY" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on,
@@ -51855,7 +49851,10 @@
},
/area/toxins/xenobiology)
"cha" = (
-/obj/structure/disposalpipe/segment,
+/obj/structure/disposalpipe/segment{
+ dir = 4;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "whiteblue"
@@ -51863,7 +49862,9 @@
/area/medical/medbay)
"chb" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/public/glass,
+/obj/machinery/door/airlock/public/glass{
+ name = "Public Access"
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralcorner"
@@ -51899,9 +49900,7 @@
/obj/structure/table/wood,
/obj/item/folder/blue,
/obj/item/pen,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/crew_quarters/heads/hop)
"chh" = (
/obj/structure/table/wood,
@@ -51913,84 +49912,78 @@
/area/crew_quarters/heads/hop)
"chj" = (
/obj/machinery/photocopier,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/crew_quarters/heads/hop)
"chk" = (
-/obj/structure/bookcase,
-/obj/item/book/manual/sop_command,
-/obj/item/book/manual/sop_engineering,
-/obj/item/book/manual/sop_general,
-/obj/item/book/manual/sop_legal,
-/obj/item/book/manual/sop_medical,
-/obj/item/book/manual/sop_science,
-/obj/item/book/manual/sop_security,
-/obj/item/book/manual/sop_service,
-/obj/item/book/manual/sop_supply,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
+/obj/machinery/vending/coffee/free,
+/obj/structure/sign/poster/official/random{
+ pixel_x = -32
},
+/turf/simulated/floor/wood,
/area/ntrep)
"chl" = (
/obj/machinery/hologram/holopad,
-/turf/simulated/floor/carpet,
+/turf/simulated/floor/carpet/black,
/area/ntrep)
"chm" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/light_switch{
pixel_x = 25
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/ntrep)
"chn" = (
-/obj/effect/spawner/window/reinforced,
+/obj/structure/cable{
+ d2 = 4;
+ icon_state = "0-4"
+ },
+/obj/effect/spawner/window/reinforced/polarized,
/turf/simulated/floor/plating,
-/area/civilian/barber)
+/area/ntrep)
"cho" = (
/obj/structure/cable{
- d1 = 1;
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
+/obj/structure/cable{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
+ },
+/obj/structure/cable{
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "0-2"
},
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
- name = "Barber Shop"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/plasteel{
- icon_state = "barber"
- },
-/area/civilian/barber)
+/obj/effect/spawner/window/reinforced/polarized,
+/turf/simulated/floor/plating,
+/area/ntrep)
"chp" = (
-/turf/simulated/wall/r_wall,
-/area/civilian/barber)
+/obj/structure/cable{
+ d2 = 8;
+ icon_state = "0-8"
+ },
+/obj/effect/spawner/window/reinforced/polarized,
+/turf/simulated/floor/plating,
+/area/ntrep)
"chq" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/light_switch{
pixel_x = -25
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/blueshield)
"chr" = (
/obj/machinery/hologram/holopad,
@@ -52007,18 +50000,18 @@
/obj/item/reagent_containers/food/drinks/bottle/whiskey,
/obj/item/reagent_containers/food/drinks/drinkingglass,
/obj/item/reagent_containers/food/drinks/drinkingglass,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/blueshield)
"cht" = (
/turf/simulated/wall/r_wall,
/area/teleporter)
"chu" = (
/obj/machinery/light,
-/obj/machinery/computer/monitor,
/obj/structure/cable,
/obj/effect/decal/warning_stripes/north,
+/obj/machinery/computer/monitor{
+ dir = 1
+ },
/turf/simulated/floor/plating,
/area/turret_protected/aisat)
"chv" = (
@@ -52038,8 +50031,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -52048,17 +50040,13 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/turf/simulated/floor/plating,
/area/teleporter)
"chy" = (
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
@@ -52067,10 +50055,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
},
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
- },
/turf/simulated/floor/plating,
/area/teleporter)
"chz" = (
@@ -52108,12 +50092,10 @@
},
/area/crew_quarters/courtroom)
"chG" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door/airlock/maintenance,
/turf/simulated/floor/plasteel,
@@ -52122,8 +50104,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -52170,37 +50151,28 @@
dir = 8;
pixel_x = -28
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/lawoffice)
"chM" = (
/obj/structure/table/wood,
/obj/item/paper_bin,
/obj/item/pen,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/lawoffice)
"chN" = (
/obj/item/twohanded/required/kirbyplants,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/lawoffice)
"chO" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/obj/structure/disposalpipe/segment,
+/turf/simulated/floor/wood,
/area/lawoffice)
"chP" = (
/obj/structure/rack,
@@ -52209,28 +50181,23 @@
pixel_y = 4
},
/obj/item/storage/secure/briefcase,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/lawoffice)
"chQ" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/machinery/door/airlock/security/glass{
id_tag = "BrigEast";
@@ -52296,8 +50263,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/engineering/glass{
@@ -52460,9 +50426,7 @@
/obj/effect/landmark/start{
name = "Civilian"
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/library)
"civ" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
@@ -52503,7 +50467,9 @@
"ciA" = (
/obj/machinery/door/firedoor,
/obj/effect/decal/warning_stripes/yellow,
-/obj/machinery/door/airlock/public/glass,
+/obj/machinery/door/airlock/public/glass{
+ name = "Public Access"
+ },
/obj/structure/disposalpipe/segment{
dir = 4
},
@@ -52521,9 +50487,7 @@
/obj/machinery/newscaster{
pixel_x = -32
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/crew_quarters/heads/hop)
"ciD" = (
/obj/structure/chair/office/dark{
@@ -52538,9 +50502,7 @@
pixel_x = 24
},
/mob/living/simple_animal/pet/dog/corgi/Ian,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/crew_quarters/heads/hop)
"ciF" = (
/obj/machinery/photocopier,
@@ -52551,9 +50513,7 @@
dir = 1;
pixel_y = -24
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/ntrep)
"ciG" = (
/obj/structure/cable{
@@ -52562,16 +50522,13 @@
icon_state = "2-4"
},
/obj/item/flag/nt,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/ntrep)
"ciH" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/alarm{
dir = 1;
@@ -52585,16 +50542,13 @@
dir = 4
},
/obj/machinery/disposal,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/ntrep)
"ciI" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 2;
@@ -52604,8 +50558,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
@@ -52617,12 +50570,9 @@
dir = 2;
icon_state = "pipe-c"
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/ntrep)
"ciJ" = (
-/obj/effect/spawner/window/reinforced,
/obj/structure/cable{
d2 = 8;
icon_state = "0-8"
@@ -52633,31 +50583,32 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/effect/spawner/window/reinforced/polarized,
/turf/simulated/floor/plating,
/area/ntrep)
"ciL" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2";
- tag = ""
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 1
},
-/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
-/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
-/turf/simulated/floor/plasteel{
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 1;
- icon_state = "neutral"
- },
-/area/bridge/meeting_room)
-"ciM" = (
-/obj/structure/sign/barber{
- pixel_x = -4;
- pixel_y = 32
+ initialize_directions = 11
},
/obj/machinery/light{
dir = 1;
on = 1
},
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "neutral"
+ },
+/area/hallway/primary/central/south)
+"ciM" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
@@ -52668,7 +50619,7 @@
dir = 4;
icon_state = "neutralcorner"
},
-/area/bridge/meeting_room)
+/area/hallway/primary/central/south)
"ciN" = (
/obj/effect/spawner/window/reinforced,
/obj/structure/cable{
@@ -52687,14 +50638,12 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/structure/cable{
d1 = 2;
@@ -52711,16 +50660,13 @@
dir = 4;
icon_state = "pipe-c"
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/blueshield)
"ciP" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/alarm{
dir = 1;
@@ -52734,21 +50680,16 @@
dir = 8
},
/obj/machinery/disposal,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/blueshield)
"ciQ" = (
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/item/flag/nt,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/blueshield)
"ciR" = (
/obj/machinery/photocopier,
@@ -52759,9 +50700,7 @@
dir = 1;
pixel_y = -24
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/blueshield)
"ciS" = (
/turf/simulated/wall,
@@ -52774,8 +50713,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/door/airlock/maintenance{
@@ -52783,7 +50721,6 @@
req_access_txt = "17"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/teleporter)
"ciV" = (
@@ -52817,6 +50754,7 @@
icon_state = "0-4"
},
/obj/machinery/computer/monitor{
+ dir = 1;
name = "Grid Power Monitoring Computer"
},
/turf/simulated/floor/plasteel{
@@ -52890,8 +50828,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 1
@@ -52941,12 +50878,10 @@
},
/area/crew_quarters/courtroom)
"cjk" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/door/airlock/maintenance{
@@ -52954,6 +50889,7 @@
req_access_txt = "38"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/maintenance/starboard2)
"cjl" = (
@@ -53024,8 +50960,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel,
/area/security/range)
@@ -53090,8 +51025,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/warning_stripes/yellow,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -53262,12 +51196,10 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/teleporter)
"cka" = (
@@ -53280,27 +51212,15 @@
/turf/simulated/floor/plating,
/area/maintenance/port)
"cke" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 4;
- icon_state = "1-4"
- },
-/obj/structure/cable{
- d1 = 1;
- d2 = 8;
- icon_state = "1-8"
- },
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/turf/simulated/floor/plasteel,
/area/maintenance/port)
@@ -53308,8 +51228,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/door/airlock/maintenance{
name = "Library Maintenance";
@@ -53330,8 +51249,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -53340,7 +51258,6 @@
},
/area/library)
"cki" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 4;
initialize_directions = 11
@@ -53349,20 +51266,22 @@
dir = 8;
initialize_directions = 11
},
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
/area/medical/medbay)
"ckj" = (
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/library)
"ckk" = (
/obj/machinery/hologram/holopad,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/library)
"ckl" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
@@ -53393,7 +51312,7 @@
/obj/machinery/light{
dir = 1
},
-/obj/structure/filingcabinet,
+/obj/structure/closet/secure_closet/hop2,
/turf/simulated/floor/carpet,
/area/crew_quarters/heads/hop)
"ckp" = (
@@ -53403,16 +51322,13 @@
/obj/structure/extinguisher_cabinet{
pixel_x = -26
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/crew_quarters/heads/hop)
"ckq" = (
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/turf/simulated/floor/carpet,
/area/crew_quarters/heads/hop)
@@ -53431,21 +51347,19 @@
/obj/machinery/ai_status_display{
pixel_x = 32
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/obj/structure/filingcabinet,
+/turf/simulated/floor/wood,
/area/crew_quarters/heads/hop)
"ckt" = (
-/obj/effect/spawner/window/reinforced,
/obj/structure/cable,
+/obj/effect/spawner/window/reinforced/polarized,
/turf/simulated/floor/plating,
/area/ntrep)
"cku" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/command{
@@ -53453,22 +51367,19 @@
req_access_txt = "73"
},
/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/ntrep)
"ckv" = (
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
},
-/area/bridge/meeting_room)
+/area/hallway/primary/central/south)
"ckw" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/command{
@@ -53476,13 +51387,11 @@
req_access_txt = "67"
},
/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/blueshield)
"ckx" = (
-/obj/effect/spawner/window/reinforced,
/obj/structure/cable,
+/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
/area/blueshield)
"cky" = (
@@ -53515,20 +51424,12 @@
},
/obj/structure/table,
/obj/item/hand_tele,
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
- },
/turf/simulated/floor/plasteel,
/area/teleporter)
"ckC" = (
/obj/structure/table,
/obj/machinery/cell_charger,
/obj/item/stock_parts/cell/high,
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
- },
/turf/simulated/floor/plasteel,
/area/teleporter)
"ckD" = (
@@ -53540,10 +51441,6 @@
req_access_txt = "17"
},
/obj/effect/decal/warning_stripes/east,
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
- },
/turf/simulated/floor/plasteel,
/area/teleporter)
"ckE" = (
@@ -53555,9 +51452,6 @@
/area/security/range)
"ckF" = (
/obj/machinery/teleport/hub,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/turf/simulated/floor/plating,
/area/teleporter)
"ckG" = (
@@ -53566,9 +51460,6 @@
id_tag = "teleaccessshutter";
name = "Teleporter Access Shutters"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/turf/simulated/floor/plasteel,
/area/teleporter)
"ckH" = (
@@ -53576,36 +51467,26 @@
dir = 4
},
/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "neutralcorner"
+ icon_state = "white"
},
-/area/hallway/primary/central)
+/area/medical/research)
"ckI" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2";
- tag = ""
+/obj/structure/railing/corner{
+ dir = 1
},
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/medical/research)
+"ckJ" = (
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "neutralfull"
- },
-/area/hallway/primary/central)
-"ckJ" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/disposalpipe/junction{
dir = 1;
- icon_state = "pipe-j2"
+ icon_state = "whiteblue"
},
-/turf/simulated/floor/plasteel{
- icon_state = "neutralcorner"
- },
-/area/hallway/primary/central)
+/area/medical/medbay)
"ckK" = (
/obj/structure/chair{
dir = 4
@@ -53649,8 +51530,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel{
@@ -53672,15 +51552,10 @@
},
/area/crew_quarters/courtroom)
"ckR" = (
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
- },
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/effect/landmark{
name = "blobstart"
@@ -53689,37 +51564,27 @@
/area/maintenance/starboard2)
"ckS" = (
/obj/structure/disposalpipe/segment{
- dir = 4
+ dir = 8;
+ icon_state = "pipe-c"
},
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8";
- tag = ""
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "whiteblue"
},
-/turf/simulated/floor/plasteel,
-/area/maintenance/starboard2)
+/area/medical/medbay)
"ckT" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plating,
/area/maintenance/starboard2)
"ckU" = (
-/obj/structure/disposalpipe/junction{
- dir = 8
- },
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 1;
@@ -53732,17 +51597,17 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
},
+/obj/structure/disposalpipe/segment{
+ dir = 1;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plating,
/area/maintenance/starboard2)
"ckV" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -53753,17 +51618,16 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/turf/simulated/floor/plating,
-/area/maintenance/starboard2)
-"ckW" = (
/obj/structure/disposalpipe/segment{
dir = 4
},
+/turf/simulated/floor/plating,
+/area/maintenance/starboard2)
+"ckW" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -53771,17 +51635,16 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/turf/simulated/floor/plating,
-/area/maintenance/starboard2)
-"ckX" = (
/obj/structure/disposalpipe/segment{
dir = 4
},
+/turf/simulated/floor/plating,
+/area/maintenance/starboard2)
+"ckX" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -53792,17 +51655,16 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/turf/simulated/floor/plating,
-/area/maintenance/starboard2)
-"ckY" = (
/obj/structure/disposalpipe/segment{
dir = 4
},
+/turf/simulated/floor/plating,
+/area/maintenance/starboard2)
+"ckY" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -53811,24 +51673,21 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/maintenance/starboard2)
"ckZ" = (
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
- },
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 1
@@ -53836,14 +51695,17 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 1
},
+/obj/structure/disposalpipe/segment{
+ dir = 2;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plating,
/area/maintenance/starboard2)
"cla" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -53861,8 +51723,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/warning_stripes/west,
@@ -53884,14 +51745,12 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -53906,8 +51765,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 1
@@ -53919,8 +51777,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/door/window{
dir = 8;
@@ -53938,8 +51795,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plating,
/area/security/range)
@@ -53947,8 +51803,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
@@ -53957,8 +51812,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/landmark{
name = "blobstart"
@@ -53969,14 +51823,12 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/effect/decal/warning_stripes/yellow/hollow,
/obj/structure/target_stake,
@@ -53995,8 +51847,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/engineering/glass{
@@ -54039,8 +51890,8 @@
/turf/simulated/floor/plasteel,
/area/engine/engineering)
"clt" = (
-/obj/structure/closet/wardrobe/engineering_yellow,
/obj/effect/decal/warning_stripes/yellow,
+/obj/machinery/vending/engidrobe,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "yellow"
@@ -54069,8 +51920,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
@@ -54088,7 +51938,6 @@
},
/area/maintenance/port)
"clA" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
},
@@ -54101,8 +51950,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -54112,9 +51960,7 @@
/area/library)
"clC" = (
/obj/structure/bookcase,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/library)
"clD" = (
/obj/structure/table/wood,
@@ -54177,11 +52023,11 @@
},
/area/library)
"clI" = (
+/obj/structure/bed,
+/obj/item/bedsheet/hop,
/obj/machinery/newscaster{
pixel_x = -32
},
-/obj/structure/bed,
-/obj/item/bedsheet/hop,
/turf/simulated/floor/carpet,
/area/crew_quarters/heads/hop)
"clJ" = (
@@ -54205,24 +52051,19 @@
name = "Head of Personnel Bedroom";
req_access_txt = "57"
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/crew_quarters/heads/hop)
"clL" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/crew_quarters/heads/hop)
"clM" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -54239,8 +52080,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 4
@@ -54256,47 +52096,36 @@
dir = 4;
pixel_x = 28
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/crew_quarters/heads/hop)
"clQ" = (
/obj/structure/cable{
d1 = 1;
d2 = 4;
- icon_state = "1-4";
- tag = ""
+ icon_state = "1-4"
},
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "neutralcorner"
},
-/area/bridge/meeting_room)
+/area/hallway/primary/central/south)
"clS" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "neutralcorner"
},
-/area/bridge/meeting_room)
+/area/hallway/primary/central/south)
"clT" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2";
- tag = ""
- },
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/structure/cable{
d1 = 2;
@@ -54305,17 +52134,21 @@
},
/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 = 8;
icon_state = "neutralfull"
},
-/area/bridge/meeting_room)
+/area/hallway/primary/central/south)
"clU" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/camera{
c_tag = "Central Ring Hallway Center"
@@ -54324,20 +52157,19 @@
dir = 4;
icon_state = "neutralcorner"
},
-/area/bridge/meeting_room)
+/area/hallway/primary/central/south)
"clV" = (
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "neutralcorner"
},
-/area/bridge/meeting_room)
+/area/hallway/primary/central/south)
"clW" = (
/obj/structure/rack,
/obj/item/storage/toolbox/emergency,
@@ -54372,22 +52204,17 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/obj/machinery/hologram/holopad,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
- },
+/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel,
/area/teleporter)
"cma" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -54395,10 +52222,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/obj/structure/disposalpipe/junction{
- dir = 4;
- icon_state = "pipe-j2"
- },
/turf/simulated/floor/plasteel,
/area/teleporter)
"cmb" = (
@@ -54410,8 +52233,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 9
@@ -54419,24 +52241,15 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 4
},
-/obj/structure/disposalpipe/junction{
- dir = 4;
- icon_state = "pipe-j2"
- },
/turf/simulated/floor/plasteel,
/area/teleporter)
"cmc" = (
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/effect/decal/warning_stripes/east,
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
- },
/turf/simulated/floor/plasteel,
/area/teleporter)
"cmd" = (
@@ -54490,8 +52303,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 1
@@ -54514,15 +52326,10 @@
},
/area/crew_quarters/courtroom)
"cmn" = (
-/obj/structure/disposalpipe/segment,
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2";
- tag = ""
+/turf/simulated/floor/plasteel{
+ icon_state = "neutralcorner"
},
-/turf/simulated/floor/plating,
-/area/maintenance/starboard2)
+/area/hallway/primary/aft)
"cmo" = (
/obj/structure/closet,
/obj/effect/spawner/lootdrop/maintenance{
@@ -54541,17 +52348,17 @@
/turf/simulated/floor/plasteel,
/area/maintenance/starboard2)
"cmt" = (
-/obj/structure/closet/wardrobe/grey,
-/turf/simulated/floor/plating,
-/area/maintenance/starboard)
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/hallway/primary/central)
"cmv" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/maintenance/starboard)
"cmx" = (
@@ -54592,8 +52399,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/warning_stripes/south,
@@ -54639,8 +52445,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plating,
/area/security/range)
@@ -54657,10 +52462,10 @@
/area/engine/engineering)
"cmM" = (
/obj/structure/closet/secure_closet/engineering_personal,
+/obj/effect/decal/warning_stripes/yellow,
/obj/machinery/newscaster{
pixel_y = -32
},
-/obj/effect/decal/warning_stripes/yellow,
/turf/simulated/floor/plasteel,
/area/engine/engineering)
"cmN" = (
@@ -54844,20 +52649,15 @@
name = "west bump";
pixel_x = -24
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/library)
"cni" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
- },
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
+ icon_state = "4-8"
},
+/turf/simulated/floor/wood,
/area/library)
"cnj" = (
/obj/structure/cable{
@@ -54921,16 +52721,13 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/disposal,
/obj/structure/disposalpipe/trunk{
dir = 4
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/crew_quarters/heads/hop)
"cnr" = (
/obj/machinery/firealarm{
@@ -54940,16 +52737,13 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/crew_quarters/heads/hop)
"cns" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -54957,9 +52751,7 @@
dir = 2;
icon_state = "pipe-c"
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/crew_quarters/heads/hop)
"cnt" = (
/obj/item/twohanded/required/kirbyplants,
@@ -54967,9 +52759,7 @@
pixel_x = -8;
pixel_y = -24
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/crew_quarters/heads/hop)
"cnv" = (
/obj/machinery/hologram/holopad,
@@ -54986,26 +52776,25 @@
},
/area/hallway/primary/central)
"cnx" = (
+/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";
- tag = ""
+ icon_state = "1-2"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
},
-/area/bridge/meeting_room)
+/area/hallway/primary/central/south)
"cny" = (
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "neutralcorner"
},
-/area/bridge/meeting_room)
+/area/hallway/primary/central/south)
"cnz" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -55056,8 +52845,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/warning_stripes/east,
/turf/simulated/floor/plasteel,
@@ -55070,7 +52858,9 @@
/turf/simulated/floor/plating,
/area/security/range)
"cnG" = (
-/obj/machinery/computer/teleporter,
+/obj/machinery/computer/teleporter{
+ dir = 8
+ },
/turf/simulated/floor/plating,
/area/teleporter)
"cnH" = (
@@ -55112,8 +52902,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
icon_state = "neutral"
@@ -55134,9 +52923,6 @@
},
/area/crew_quarters/courtroom)
"cnO" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/door/firedoor,
/obj/effect/decal/warning_stripes/yellow,
/turf/simulated/floor/plasteel{
@@ -55148,19 +52934,19 @@
/turf/simulated/wall,
/area/crew_quarters/locker)
"cnR" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/door/airlock/maintenance,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/maintenance/starboard2)
"cnS" = (
+/obj/effect/decal/warning_stripes/yellow,
/obj/structure/plasticflaps{
opacity = 1
},
@@ -55168,15 +52954,13 @@
codes_txt = "delivery;dir=1";
location = "Security"
},
-/obj/effect/decal/warning_stripes/yellow,
/turf/simulated/floor/plasteel,
/area/security/range)
"cnT" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door/airlock/maintenance{
name = "Security Maintenance";
@@ -55280,7 +53064,7 @@
/area/engine/engineering)
"cog" = (
/obj/effect/decal/cleanable/dirt,
-/obj/machinery/the_singularitygen,
+/obj/machinery/the_singularitygen/tesla,
/turf/simulated/floor/plating,
/area/engine/engineering)
"coh" = (
@@ -55329,17 +53113,22 @@
icon_state = "1-2"
},
/obj/effect/decal/warning_stripes/northeastcorner,
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel,
/area/engine/engineering)
"com" = (
-/obj/structure/cable/yellow{
- d2 = 2;
- icon_state = "0-2"
- },
/obj/machinery/power/terminal{
dir = 1
},
/obj/effect/decal/warning_stripes/northeast,
+/obj/structure/cable{
+ d2 = 8;
+ icon_state = "0-8"
+ },
/turf/simulated/floor/plasteel,
/area/engine/engineering)
"coo" = (
@@ -55347,11 +53136,6 @@
/obj/effect/decal/warning_stripes/northeast,
/turf/simulated/floor/plasteel,
/area/engine/engine_smes)
-"cop" = (
-/obj/machinery/the_singularitygen,
-/obj/effect/decal/warning_stripes/yellow/hollow,
-/turf/simulated/floor/plasteel,
-/area/engine/engine_smes)
"coq" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/door/firedoor,
@@ -55396,9 +53180,7 @@
/obj/machinery/light{
dir = 8
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/library)
"cox" = (
/obj/structure/table/wood,
@@ -55441,8 +53223,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/door/firedoor,
@@ -55460,9 +53241,7 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/crew_quarters/heads/hop)
"coC" = (
/obj/effect/spawner/window/reinforced,
@@ -55471,14 +53250,14 @@
icon_state = "0-2"
},
/turf/simulated/floor/plating,
-/area/bridge/meeting_room)
+/area/hallway/primary/central/south)
"coD" = (
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "neutralcorner"
},
-/area/bridge/meeting_room)
+/area/hallway/primary/central/south)
"coE" = (
/obj/machinery/door/firedoor,
/obj/effect/decal/warning_stripes/yellow,
@@ -55580,17 +53359,15 @@
},
/area/crew_quarters/courtroom)
"coQ" = (
-/obj/structure/disposalpipe/segment,
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2";
- tag = ""
+/obj/structure/disposalpipe/segment{
+ dir = 8;
+ icon_state = "pipe-c"
},
/turf/simulated/floor/plasteel{
- icon_state = "dark"
+ dir = 8;
+ icon_state = "neutralfull"
},
-/area/crew_quarters/locker)
+/area/crew_quarters/fitness)
"coR" = (
/obj/structure/closet/secure_closet/personal,
/turf/simulated/floor/plasteel{
@@ -55626,11 +53403,11 @@
},
/area/maintenance/starboard2)
"coW" = (
-/obj/structure/disposalpipe/trunk{
- dir = 8
- },
-/obj/machinery/disposal,
/obj/effect/decal/warning_stripes/yellow/hollow,
+/obj/machinery/disposal,
+/obj/structure/disposalpipe/trunk{
+ dir = 1
+ },
/turf/simulated/floor/plasteel{
icon_state = "neutralcorner"
},
@@ -55639,8 +53416,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plating,
/area/maintenance/starboard2)
@@ -55661,8 +53437,16 @@
/area/maintenance/starboard2)
"cpa" = (
/obj/effect/decal/cleanable/cobweb2,
-/obj/structure/closet/secure_closet/security,
+/obj/structure/closet/secure_closet{
+ anchored = 1;
+ name = "Evidence Storage";
+ req_access_txt = "4"
+ },
/obj/item/restraints/handcuffs/pinkcuffs,
+/obj/item/clothing/under/rank/security,
+/obj/item/clothing/under/rank/security,
+/obj/item/grenade/barrier,
+/obj/item/book/manual/security_space_law,
/turf/simulated/floor/plating,
/area/maintenance/starboard2)
"cpb" = (
@@ -55837,7 +53621,6 @@
},
/area/engine/engineering)
"cpt" = (
-/obj/machinery/hologram/holopad,
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
@@ -55851,17 +53634,13 @@
dir = 4
},
/obj/structure/disposalpipe/segment,
+/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
},
/area/engine/engineering)
"cpu" = (
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/obj/structure/cable/yellow{
d1 = 1;
d2 = 8;
@@ -55878,11 +53657,6 @@
},
/area/engine/engineering)
"cpv" = (
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 8;
- icon_state = "1-8"
- },
/obj/effect/decal/warning_stripes/east,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -55984,8 +53758,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/warning_stripes/yellow,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -55995,13 +53768,11 @@
},
/area/toxins/xenobiology)
"cpH" = (
+/obj/effect/decal/cleanable/cobweb,
/obj/machinery/newscaster{
pixel_x = -32
},
-/obj/effect/decal/cleanable/cobweb,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/library)
"cpJ" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -56044,8 +53815,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 1
@@ -56091,13 +53861,12 @@
dir = 1;
icon_state = "neutralcorner"
},
-/area/bridge/meeting_room)
+/area/hallway/primary/central/south)
"cpS" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
@@ -56109,7 +53878,7 @@
dir = 1;
icon_state = "neutralcorner"
},
-/area/bridge/meeting_room)
+/area/hallway/primary/central/south)
"cpT" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -56121,7 +53890,7 @@
dir = 1;
icon_state = "neutralcorner"
},
-/area/bridge/meeting_room)
+/area/hallway/primary/central/south)
"cpU" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -56142,7 +53911,7 @@
dir = 1;
icon_state = "neutralcorner"
},
-/area/bridge/meeting_room)
+/area/hallway/primary/central/south)
"cpV" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -56160,13 +53929,12 @@
dir = 1;
icon_state = "neutralcorner"
},
-/area/bridge/meeting_room)
+/area/hallway/primary/central/south)
"cpW" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -56178,7 +53946,7 @@
dir = 1;
icon_state = "neutralcorner"
},
-/area/bridge/meeting_room)
+/area/hallway/primary/central/south)
"cpX" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -56193,7 +53961,7 @@
dir = 1;
icon_state = "neutralcorner"
},
-/area/bridge/meeting_room)
+/area/hallway/primary/central/south)
"cpY" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -56209,13 +53977,12 @@
dir = 1;
icon_state = "neutralcorner"
},
-/area/bridge/meeting_room)
+/area/hallway/primary/central/south)
"cqb" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
@@ -56226,7 +53993,7 @@
dir = 8;
icon_state = "neutralfull"
},
-/area/bridge/meeting_room)
+/area/hallway/primary/central/south)
"cqc" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -56241,7 +54008,7 @@
dir = 8;
icon_state = "neutralfull"
},
-/area/bridge/meeting_room)
+/area/hallway/primary/central/south)
"cqd" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 1
@@ -56257,7 +54024,7 @@
dir = 4;
icon_state = "neutralcorner"
},
-/area/bridge/meeting_room)
+/area/hallway/primary/central/south)
"cqe" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -56275,13 +54042,12 @@
dir = 4;
icon_state = "neutralcorner"
},
-/area/bridge/meeting_room)
+/area/hallway/primary/central/south)
"cqf" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -56296,7 +54062,7 @@
dir = 4;
icon_state = "neutralcorner"
},
-/area/bridge/meeting_room)
+/area/hallway/primary/central/south)
"cqg" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -56317,13 +54083,10 @@
dir = 4;
icon_state = "neutralcorner"
},
-/area/bridge/meeting_room)
+/area/hallway/primary/central/south)
"cqh" = (
/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
+/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
/obj/structure/disposalpipe/segment{
dir = 4
},
@@ -56331,7 +54094,7 @@
dir = 4;
icon_state = "neutralcorner"
},
-/area/bridge/meeting_room)
+/area/hallway/primary/central/south)
"cqj" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -56347,7 +54110,7 @@
dir = 4;
icon_state = "neutralcorner"
},
-/area/bridge/meeting_room)
+/area/hallway/primary/central/south)
"cqk" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -56363,7 +54126,7 @@
dir = 4;
icon_state = "neutralcorner"
},
-/area/bridge/meeting_room)
+/area/hallway/primary/central/south)
"cql" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -56379,7 +54142,7 @@
dir = 4;
icon_state = "neutralcorner"
},
-/area/bridge/meeting_room)
+/area/hallway/primary/central/south)
"cqn" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -56399,8 +54162,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -56453,9 +54215,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/obj/machinery/door/airlock/glass{
- name = "Magistrate's Office";
- req_access_txt = "74"
+/obj/machinery/door/airlock{
+ name = "Court";
+ req_access_txt = "38"
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -56481,12 +54243,10 @@
},
/area/crew_quarters/courtroom)
"cqv" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/extinguisher_cabinet{
pixel_x = -28
@@ -56565,18 +54325,17 @@
},
/area/maintenance/starboard)
"cqD" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 8;
initialize_directions = 11
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/maintenance/starboard2)
"cqE" = (
@@ -56590,8 +54349,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 1;
@@ -56607,8 +54365,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 8
@@ -56658,11 +54415,6 @@
/obj/effect/decal/warning_stripes/northeast,
/turf/simulated/floor/plating/airless,
/area/space/nearstation)
-"cqP" = (
-/obj/machinery/the_singularitygen/tesla,
-/obj/effect/decal/warning_stripes/yellow/hollow,
-/turf/simulated/floor/plasteel,
-/area/engine/engine_smes)
"cqQ" = (
/obj/effect/decal/warning_stripes/east,
/turf/simulated/floor/plating/airless,
@@ -56754,7 +54506,7 @@
dir = 4;
icon_state = "neutralcorner"
},
-/area/bridge/meeting_room)
+/area/hallway/primary/central/south)
"crf" = (
/obj/machinery/power/tesla_coil,
/obj/effect/decal/cleanable/dirt,
@@ -56779,19 +54531,17 @@
dir = 1
},
/obj/machinery/light,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/library)
"crl" = (
/obj/structure/table/wood,
/obj/item/storage/pill_bottle/dice,
-/obj/machinery/computer/security/telescreen/entertainment{
- pixel_y = -32
- },
/obj/structure/window/reinforced{
dir = 8
},
+/obj/machinery/computer/security/telescreen/entertainment{
+ pixel_y = -32
+ },
/turf/simulated/floor/plasteel{
icon_state = "grimy"
},
@@ -56834,8 +54584,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 1;
@@ -56854,8 +54603,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
icon_state = "neutralcorner"
@@ -56865,8 +54613,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 4
@@ -56883,8 +54630,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
@@ -56894,13 +54640,12 @@
dir = 8;
icon_state = "neutralcorner"
},
-/area/bridge/meeting_room)
+/area/hallway/primary/central/south)
"crw" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/camera{
c_tag = "Central Ring Hallway Center";
@@ -56910,13 +54655,12 @@
dir = 8;
icon_state = "neutralcorner"
},
-/area/bridge/meeting_room)
+/area/hallway/primary/central/south)
"crx" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 1;
@@ -56928,43 +54672,39 @@
dir = 8;
icon_state = "neutralcorner"
},
-/area/bridge/meeting_room)
+/area/hallway/primary/central/south)
"cry" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralcorner"
},
-/area/bridge/meeting_room)
+/area/hallway/primary/central/south)
"crz" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralcorner"
},
-/area/bridge/meeting_room)
+/area/hallway/primary/central/south)
"crA" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 1;
@@ -56974,33 +54714,30 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralcorner"
},
-/area/bridge/meeting_room)
+/area/hallway/primary/central/south)
"crB" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/light/small,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralcorner"
},
-/area/bridge/meeting_room)
+/area/hallway/primary/central/south)
"crC" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/sign/securearea{
desc = "A warning sign which reads 'HIGH VOLTAGE'";
@@ -57014,20 +54751,19 @@
dir = 8;
icon_state = "neutralcorner"
},
-/area/bridge/meeting_room)
+/area/hallway/primary/central/south)
"crE" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/chair/comfy/black,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
},
-/area/bridge/meeting_room)
+/area/hallway/primary/central/south)
"crF" = (
/obj/structure/cable{
d1 = 1;
@@ -57037,27 +54773,24 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/item/radio/beacon,
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
},
-/area/bridge/meeting_room)
+/area/hallway/primary/central/south)
"crG" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/chair/comfy/black,
/obj/effect/landmark/start{
@@ -57067,13 +54800,12 @@
dir = 8;
icon_state = "neutralfull"
},
-/area/bridge/meeting_room)
+/area/hallway/primary/central/south)
"crH" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/table/wood,
/obj/item/storage/fancy/donut_box,
@@ -57081,13 +54813,12 @@
dir = 8;
icon_state = "neutralfull"
},
-/area/bridge/meeting_room)
+/area/hallway/primary/central/south)
"crI" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/sign/securearea{
@@ -57100,25 +54831,23 @@
/turf/simulated/floor/plasteel{
icon_state = "neutralcorner"
},
-/area/bridge/meeting_room)
+/area/hallway/primary/central/south)
"crJ" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/light/small,
/turf/simulated/floor/plasteel{
icon_state = "neutralcorner"
},
-/area/bridge/meeting_room)
+/area/hallway/primary/central/south)
"crK" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 1;
@@ -57128,38 +54857,34 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/turf/simulated/floor/plasteel{
icon_state = "neutralcorner"
},
-/area/bridge/meeting_room)
+/area/hallway/primary/central/south)
"crN" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel{
icon_state = "neutralcorner"
},
-/area/bridge/meeting_room)
+/area/hallway/primary/central/south)
"crO" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 1
@@ -57172,18 +54897,17 @@
/turf/simulated/floor/plasteel{
icon_state = "neutralcorner"
},
-/area/bridge/meeting_room)
+/area/hallway/primary/central/south)
"crP" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
icon_state = "neutralcorner"
},
-/area/bridge/meeting_room)
+/area/hallway/primary/central/south)
"crQ" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -57200,13 +54924,12 @@
dir = 4;
icon_state = "neutralcorner"
},
-/area/bridge/meeting_room)
+/area/hallway/primary/central/south)
"crR" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -57217,14 +54940,12 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
@@ -57245,12 +54966,10 @@
},
/area/hallway/primary/central)
"crV" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atm{
pixel_x = -32
@@ -57289,6 +55008,10 @@
},
/area/crew_quarters/locker)
"csa" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "neutral"
@@ -57298,8 +55021,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/structure/cable{
d1 = 1;
@@ -57316,6 +55038,9 @@
/area/maintenance/starboard2)
"csc" = (
/obj/machinery/door/airlock/maintenance,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/maintenance/starboard2)
"csd" = (
@@ -57331,7 +55056,6 @@
pixel_y = -24
},
/obj/structure/table,
-/obj/item/clothing/under/rank/security,
/turf/simulated/floor/plating,
/area/maintenance/starboard2)
"csf" = (
@@ -57350,11 +55074,13 @@
/area/maintenance/starboard2)
"csh" = (
/obj/structure/rack,
-/obj/item/storage/box/flashes,
/obj/structure/reagent_dispensers/peppertank{
pixel_y = -32
},
/obj/effect/decal/cleanable/dirt,
+/obj/item/reagent_containers/spray/pepper,
+/obj/item/reagent_containers/spray/pepper,
+/obj/item/reagent_containers/spray/pepper,
/turf/simulated/floor/plating,
/area/maintenance/starboard2)
"csi" = (
@@ -57573,8 +55299,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -57604,10 +55329,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
},
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
- },
/turf/simulated/floor/plasteel,
/area/teleporter)
"csM" = (
@@ -57622,7 +55343,7 @@
/obj/effect/spawner/window/reinforced,
/obj/structure/cable,
/turf/simulated/floor/plating,
-/area/bridge/meeting_room)
+/area/hallway/primary/central/south)
"csO" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 8
@@ -57634,7 +55355,7 @@
dir = 8;
icon_state = "neutralcorner"
},
-/area/bridge/meeting_room)
+/area/hallway/primary/central/south)
"csP" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -57646,7 +55367,7 @@
dir = 8;
icon_state = "neutralfull"
},
-/area/bridge/meeting_room)
+/area/hallway/primary/central/south)
"csQ" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 8
@@ -57655,23 +55376,22 @@
dir = 8;
icon_state = "neutralfull"
},
-/area/bridge/meeting_room)
+/area/hallway/primary/central/south)
"csR" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
-/obj/machinery/hologram/holopad,
/obj/effect/landmark{
name = "lightsout"
},
+/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
},
-/area/bridge/meeting_room)
+/area/hallway/primary/central/south)
"csS" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
@@ -57680,7 +55400,7 @@
dir = 8;
icon_state = "neutralfull"
},
-/area/bridge/meeting_room)
+/area/hallway/primary/central/south)
"csT" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -57692,7 +55412,7 @@
dir = 8;
icon_state = "neutralfull"
},
-/area/bridge/meeting_room)
+/area/hallway/primary/central/south)
"csU" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 4
@@ -57703,7 +55423,7 @@
/turf/simulated/floor/plasteel{
icon_state = "neutralcorner"
},
-/area/bridge/meeting_room)
+/area/hallway/primary/central/south)
"csV" = (
/turf/simulated/wall/r_wall,
/area/gateway)
@@ -57712,26 +55432,24 @@
dir = 1;
icon_state = "neutralcorner"
},
-/area/bridge/meeting_room)
+/area/hallway/primary/central/south)
"csX" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/door/firedoor,
/obj/effect/decal/warning_stripes/yellow,
/turf/simulated/floor/plasteel{
icon_state = "neutralcorner"
},
-/area/bridge/meeting_room)
+/area/hallway/primary/central/south)
"csY" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/door/firedoor,
@@ -57746,41 +55464,45 @@
/obj/machinery/vending/cigarette,
/obj/effect/decal/warning_stripes/yellow,
/turf/simulated/floor/plasteel,
-/area/bridge/meeting_room)
+/area/hallway/primary/central/south)
"cta" = (
/obj/machinery/vending/coffee,
/obj/effect/decal/warning_stripes/yellow,
/turf/simulated/floor/plasteel,
-/area/bridge/meeting_room)
+/area/hallway/primary/central/south)
"ctb" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/disposalpipe/segment{
- dir = 1;
+ dir = 8;
icon_state = "pipe-c"
},
/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "neutralcorner"
+ icon_state = "white"
},
-/area/hallway/primary/central)
+/area/medical/chemistry)
"ctc" = (
/obj/effect/decal/warning_stripes/yellow,
/turf/simulated/floor/plasteel,
/area/maintenance/starboard2)
"ctd" = (
+/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/disposalpipe/segment{
dir = 4
},
/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "neutralcorner"
+ icon_state = "whitebluefull"
},
-/area/hallway/primary/central)
+/area/medical/medbay)
"ctf" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel{
@@ -57803,29 +55525,32 @@
},
/area/hallway/primary/central)
"ctj" = (
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "neutralcorner"
+ icon_state = "white"
},
-/area/hallway/primary/central)
+/area/medical/medbay)
"ctk" = (
/obj/machinery/vending/cola,
/obj/effect/decal/warning_stripes/yellow,
/turf/simulated/floor/plasteel,
-/area/bridge/meeting_room)
+/area/hallway/primary/central/south)
"ctl" = (
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
- },
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
dir = 1;
@@ -57886,10 +55611,6 @@
},
/area/medical/medbay)
"cts" = (
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/universal,
/turf/simulated/floor/plasteel{
dir = 8;
@@ -57911,13 +55632,12 @@
},
/area/crew_quarters/courtroom)
"ctv" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/maintenance/starboard)
"ctw" = (
@@ -57973,12 +55693,6 @@
icon_state = "neutralcorner"
},
/area/crew_quarters/fitness)
-"ctC" = (
-/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "neutral"
- },
-/area/crew_quarters/fitness)
"ctD" = (
/obj/structure/closet/masks,
/turf/simulated/floor/plasteel{
@@ -58065,11 +55779,11 @@
/area/library)
"ctL" = (
/obj/structure/table/wood,
-/obj/item/storage/fancy/candle_box,
-/obj/item/storage/fancy/candle_box,
/obj/machinery/computer/security/telescreen/entertainment{
pixel_x = 32
},
+/obj/item/storage/fancy/candle_box/full,
+/obj/item/storage/fancy/candle_box/full,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -58167,8 +55881,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/door/firedoor,
@@ -58198,36 +55911,32 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/turf/simulated/floor/plating,
-/area/bridge/meeting_room)
+/area/hallway/primary/central/south)
"cua" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralcorner"
},
-/area/bridge/meeting_room)
+/area/hallway/primary/central/south)
"cub" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/table/wood,
/obj/item/paper_bin,
@@ -58235,13 +55944,12 @@
dir = 8;
icon_state = "neutralfull"
},
-/area/bridge/meeting_room)
+/area/hallway/primary/central/south)
"cuc" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/chair/comfy/black{
dir = 1
@@ -58253,7 +55961,7 @@
dir = 8;
icon_state = "neutralfull"
},
-/area/bridge/meeting_room)
+/area/hallway/primary/central/south)
"cud" = (
/obj/structure/cable{
d1 = 1;
@@ -58263,20 +55971,18 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
},
-/area/bridge/meeting_room)
+/area/hallway/primary/central/south)
"cue" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/chair/comfy/black{
dir = 1
@@ -58285,46 +55991,43 @@
dir = 8;
icon_state = "neutralfull"
},
-/area/bridge/meeting_room)
+/area/hallway/primary/central/south)
"cuf" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/item/twohanded/required/kirbyplants,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
},
-/area/bridge/meeting_room)
+/area/hallway/primary/central/south)
"cug" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel{
icon_state = "neutralcorner"
},
-/area/bridge/meeting_room)
+/area/hallway/primary/central/south)
"cuh" = (
/obj/effect/spawner/window/reinforced,
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/structure/cable{
d2 = 8;
icon_state = "0-8"
},
/turf/simulated/floor/plating,
-/area/bridge/meeting_room)
+/area/hallway/primary/central/south)
"cuk" = (
/obj/structure/closet/secure_closet/exile,
/obj/effect/decal/warning_stripes/yellow/hollow,
@@ -58346,16 +56049,14 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/turf/simulated/floor/plasteel,
/area/gateway)
@@ -58379,6 +56080,7 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 8
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
@@ -58453,8 +56155,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -58521,7 +56222,6 @@
},
/area/crew_quarters/locker)
"cuC" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 4;
initialize_directions = 11
@@ -58541,10 +56241,6 @@
},
/area/crew_quarters/locker)
"cuF" = (
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
- },
/obj/structure/cable{
d1 = 1;
d2 = 4;
@@ -58556,17 +56252,17 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
},
+/obj/structure/disposalpipe/segment{
+ dir = 1;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plating,
/area/maintenance/starboard2)
"cuG" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -58575,17 +56271,16 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/turf/simulated/floor/plating,
-/area/maintenance/starboard2)
-"cuH" = (
/obj/structure/disposalpipe/segment{
dir = 4
},
+/turf/simulated/floor/plating,
+/area/maintenance/starboard2)
+"cuH" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -58593,17 +56288,16 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/turf/simulated/floor/plasteel,
-/area/maintenance/starboard2)
-"cuI" = (
/obj/structure/disposalpipe/segment{
dir = 4
},
+/turf/simulated/floor/plasteel,
+/area/maintenance/starboard2)
+"cuI" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -58612,14 +56306,16 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/maintenance/starboard2)
"cuJ" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door/airlock/glass{
name = "Cabin"
@@ -58627,14 +56323,10 @@
/turf/simulated/floor/plasteel,
/area/crew_quarters/locker)
"cuK" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -58642,21 +56334,19 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "neutralcorner"
},
/area/crew_quarters/fitness)
"cuL" = (
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
- },
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
@@ -58664,6 +56354,10 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
},
+/obj/structure/disposalpipe/segment{
+ dir = 2;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
@@ -58812,8 +56506,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/turf/simulated/floor/plating,
/area/maintenance/port)
@@ -58821,8 +56514,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
@@ -58834,8 +56526,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small{
@@ -58850,8 +56541,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 1;
@@ -58861,8 +56551,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel,
@@ -58912,10 +56601,6 @@
},
/area/medical/research)
"cvm" = (
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
- },
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 1;
initialize_directions = 11
@@ -58923,6 +56608,9 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 1
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -58936,12 +56624,12 @@
/area/library)
"cvo" = (
/obj/structure/cult/archives,
-/obj/machinery/newscaster{
- pixel_x = -32
- },
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 4
},
+/obj/machinery/newscaster{
+ pixel_x = -32
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -58973,12 +56661,12 @@
},
/area/library)
"cvr" = (
-/obj/machinery/newscaster{
- pixel_x = 32
- },
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 8
},
+/obj/machinery/newscaster{
+ pixel_x = 32
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -59031,8 +56719,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel{
@@ -59072,8 +56759,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/table/reinforced,
/obj/machinery/cell_charger,
@@ -59094,37 +56780,36 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralcorner"
},
-/area/bridge/meeting_room)
+/area/hallway/primary/central/south)
"cvE" = (
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralcorner"
},
-/area/bridge/meeting_room)
+/area/hallway/primary/central/south)
"cvF" = (
/turf/simulated/floor/plasteel{
icon_state = "neutral"
},
-/area/bridge/meeting_room)
+/area/hallway/primary/central/south)
"cvG" = (
/turf/simulated/floor/plasteel{
icon_state = "neutralcorner"
},
-/area/bridge/meeting_room)
+/area/hallway/primary/central/south)
"cvH" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel{
icon_state = "neutralcorner"
},
-/area/bridge/meeting_room)
+/area/hallway/primary/central/south)
"cvI" = (
/obj/effect/spawner/window/reinforced,
/obj/structure/cable{
@@ -59150,8 +56835,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/closet/secure_closet/medical1,
/obj/effect/decal/warning_stripes/yellow/hollow,
@@ -59161,14 +56845,12 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -59234,16 +56916,12 @@
},
/area/medical/chemistry)
"cvV" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/door/airlock/glass{
name = "Cabin"
},
/turf/simulated/floor/plasteel,
/area/crew_quarters/locker)
"cvW" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/light,
/turf/simulated/floor/plasteel{
dir = 8;
@@ -59251,9 +56929,6 @@
},
/area/hallway/primary/central)
"cvX" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/alarm{
dir = 1;
pixel_y = -24
@@ -59269,14 +56944,10 @@
/turf/simulated/floor/plasteel,
/area/gateway)
"cvZ" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -59284,28 +56955,34 @@
},
/area/crew_quarters/locker)
"cwa" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
+/obj/machinery/door/airlock/public/glass{
+ name = "Public Access"
},
-/obj/machinery/door/airlock/public/glass,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "neutralcorner"
},
/area/crew_quarters/locker)
"cwc" = (
-/obj/structure/disposalpipe/segment{
+/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/disposalpipe/junction{
+ dir = 8
+ },
/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "neutralfull"
+ icon_state = "white"
},
-/area/crew_quarters/locker)
+/area/medical/medbay)
"cwd" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/effect/landmark{
name = "lightsout"
},
@@ -59314,15 +56991,6 @@
icon_state = "neutralfull"
},
/area/crew_quarters/locker)
-"cwe" = (
-/obj/structure/disposalpipe/junction,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "neutralfull"
- },
-/area/crew_quarters/locker)
"cwf" = (
/obj/structure/closet/wardrobe/grey,
/obj/machinery/ai_status_display{
@@ -59349,8 +57017,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -59358,6 +57025,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "whitebluefull"
},
@@ -59366,8 +57036,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -59375,6 +57044,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -59481,8 +57153,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel,
/area/maintenance/port)
@@ -59670,8 +57341,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
@@ -59684,8 +57354,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 1;
@@ -59707,8 +57376,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 6
@@ -59721,8 +57389,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 9
@@ -59753,36 +57420,28 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/command/glass{
- name = "Corporate Lounge";
- req_one_access_txt = "19"
- },
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
+/obj/machinery/door/airlock/public/glass{
+ id_tag = "pub_room";
+ name = "Public Meeting Room"
},
+/turf/simulated/floor/wood,
/area/assembly/showroom)
"cxc" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/command/glass{
- name = "Corporate Lounge";
- req_one_access_txt = "19"
- },
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
+/obj/machinery/door/airlock/public/glass{
+ id_tag = "pub_room";
+ name = "Public Meeting Room"
},
+/turf/simulated/floor/wood,
/area/assembly/showroom)
"cxd" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/hologram/holopad,
/obj/effect/decal/warning_stripes/yellow/hollow,
+/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
@@ -59797,8 +57456,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 1;
@@ -59816,8 +57474,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel,
/area/gateway)
@@ -59883,8 +57540,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/light{
dir = 8
@@ -59940,7 +57596,6 @@
/turf/simulated/floor/plasteel,
/area/medical/research)
"cxv" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel{
@@ -59955,12 +57610,10 @@
},
/area/crew_quarters/locker)
"cxx" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 8;
@@ -59970,6 +57623,7 @@
dir = 8;
initialize_directions = 11
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
@@ -60025,7 +57679,6 @@
},
/area/crew_quarters/fitness)
"cxD" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 8;
initialize_directions = 11
@@ -60077,8 +57730,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/table,
/obj/item/paper/pamphlet,
@@ -60095,8 +57747,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plating,
/area/engine/engine_smes)
@@ -60134,7 +57785,7 @@
dir = 1;
icon_state = "neutralcorner"
},
-/area/bridge/meeting_room)
+/area/hallway/primary/central/south)
"cxP" = (
/obj/effect/spawner/random_spawners/wall_rusted_maybe,
/turf/simulated/wall,
@@ -60143,8 +57794,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -60294,42 +57944,33 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/window/reinforced{
dir = 4
},
/obj/structure/window/reinforced,
/obj/structure/showcase,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/assembly/showroom)
"cyi" = (
/obj/structure/bookcase,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/assembly/showroom)
"cyj" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/assembly/showroom)
"cyk" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/carpet,
/area/assembly/showroom)
@@ -60338,7 +57979,7 @@
pixel_y = 32
},
/obj/machinery/camera{
- c_tag = "Showroom"
+ c_tag = "Public Meeting Room"
},
/turf/simulated/floor/carpet,
/area/assembly/showroom)
@@ -60350,25 +57991,20 @@
/area/assembly/showroom)
"cyo" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/assembly/showroom)
"cyp" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/window/reinforced,
/obj/structure/window/reinforced{
dir = 8
},
/obj/structure/showcase,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/assembly/showroom)
"cyq" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -60402,8 +58038,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 4
@@ -60411,6 +58046,7 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 8
},
+/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
@@ -60446,8 +58082,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d2 = 2;
@@ -60528,10 +58163,10 @@
/turf/simulated/floor/plasteel,
/area/crew_quarters/locker/locker_toilet)
"cyG" = (
+/obj/effect/decal/warning_stripes/yellow/hollow,
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/effect/decal/warning_stripes/yellow/hollow,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -60578,8 +58213,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/closet/wardrobe/white,
/turf/simulated/floor/plasteel{
@@ -60591,8 +58225,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -60603,8 +58236,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/chair/stool,
/turf/simulated/floor/plasteel{
@@ -60616,8 +58248,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/table,
/obj/item/folder,
@@ -60631,8 +58262,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/table,
/obj/item/paicard,
@@ -60648,8 +58278,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/table,
/turf/simulated/floor/plasteel{
@@ -60661,14 +58290,12 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/chair/stool,
/obj/effect/landmark/start{
@@ -60680,12 +58307,10 @@
},
/area/crew_quarters/locker)
"cyR" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -60747,35 +58372,35 @@
},
/area/crew_quarters/sleep)
"cyW" = (
-/obj/structure/table/wood,
-/obj/item/paper_bin,
-/obj/machinery/status_display{
- layer = 4;
- pixel_y = 32
- },
-/obj/item/pen,
-/obj/machinery/light{
+/obj/machinery/power/apc{
dir = 1;
- in_use = 1
+ name = "north bump";
+ pixel_y = 24
+ },
+/obj/structure/chair/barber{
+ dir = 4
+ },
+/obj/structure/cable{
+ d2 = 2;
+ icon_state = "0-2"
},
/turf/simulated/floor/plasteel{
- icon_state = "wood"
+ icon_state = "barber"
},
-/area/crew_quarters/sleep)
+/area/civilian/barber)
"cyX" = (
-/obj/item/radio/intercom{
- pixel_x = 26;
- pixel_y = 28
+/obj/structure/table/reinforced,
+/obj/structure/mirror{
+ pixel_x = 28
+ },
+/obj/item/razor,
+/obj/machinery/camera{
+ c_tag = "Barber Shop"
},
-/obj/structure/closet/secure_closet/personal/cabinet,
-/obj/item/clothing/under/lawyer/black,
-/obj/item/clothing/under/lawyer/blue,
-/obj/item/clothing/under/kilt,
-/obj/item/clothing/head/beret,
/turf/simulated/floor/plasteel{
- icon_state = "wood"
+ icon_state = "barber"
},
-/area/crew_quarters/sleep)
+/area/civilian/barber)
"cyY" = (
/obj/machinery/cryopod/right,
/turf/simulated/floor/plasteel{
@@ -60787,12 +58412,12 @@
dir = 1;
in_use = 1
},
-/obj/machinery/computer/cryopod{
- pixel_y = 32
- },
/obj/machinery/camera{
c_tag = "Cryodorms Fore"
},
+/obj/machinery/computer/cryopod{
+ pixel_y = 32
+ },
/turf/simulated/floor/plasteel{
icon_state = "freezerfloor"
},
@@ -60818,21 +58443,6 @@
icon_state = "neutralcorner"
},
/area/crew_quarters/fitness)
-"czc" = (
-/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,
-/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "neutralfull"
- },
-/area/crew_quarters/fitness)
"czd" = (
/obj/effect/spawner/window/reinforced,
/obj/structure/cable{
@@ -60978,14 +58588,12 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/engineering/glass{
@@ -61005,8 +58613,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/landmark{
name = "blobstart"
@@ -61018,7 +58625,6 @@
},
/area/maintenance/port)
"czu" = (
-/obj/machinery/hologram/holopad,
/obj/effect/decal/warning_stripes/yellow/hollow,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 9
@@ -61026,6 +58632,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
},
+/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
@@ -61050,8 +58657,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
dir = 4;
@@ -61122,8 +58728,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/structure/cable{
d2 = 4;
@@ -61139,23 +58744,18 @@
name = "west bump";
pixel_x = -24
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/assembly/showroom)
"czK" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 4
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/assembly/showroom)
"czL" = (
/obj/structure/cable{
@@ -61174,19 +58774,15 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
- },
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
+ icon_state = "1-2"
},
+/turf/simulated/floor/wood,
/area/assembly/showroom)
"czM" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 1;
@@ -61202,14 +58798,12 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/structure/table/wood,
/obj/item/storage/fancy/donut_box,
@@ -61219,8 +58813,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/table/wood,
/obj/item/reagent_containers/food/drinks/bottle/whiskey,
@@ -61230,8 +58823,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 1;
@@ -61247,8 +58839,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/table/wood,
/obj/item/paper_bin,
@@ -61259,29 +58850,23 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/assembly/showroom)
"czS" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 8
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/assembly/showroom)
"czT" = (
/obj/structure/cable{
@@ -61292,16 +58877,13 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/machinery/alarm{
dir = 8;
pixel_x = 24
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/assembly/showroom)
"czU" = (
/obj/structure/urinal{
@@ -61314,8 +58896,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -61368,13 +58949,12 @@
dir = 4;
icon_state = "neutralcorner"
},
-/area/bridge/meeting_room)
+/area/hallway/primary/central/south)
"cAb" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/unary/vent_pump/on,
/obj/effect/decal/warning_stripes/north,
@@ -61429,8 +59009,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -61460,8 +59039,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/vending/shoedispenser,
/turf/simulated/floor/plasteel{
@@ -61473,8 +59051,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -61495,28 +59072,25 @@
},
/area/crew_quarters/sleep)
"cAo" = (
-/obj/structure/table/wood,
/obj/machinery/newscaster{
pixel_x = -32
},
-/obj/item/folder,
-/obj/item/razor,
/turf/simulated/floor/plasteel{
- icon_state = "wood"
+ icon_state = "barber"
},
-/area/crew_quarters/sleep)
+/area/civilian/barber)
"cAp" = (
-/obj/structure/chair/office/dark{
- dir = 8
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
- icon_state = "wood"
+ icon_state = "barber"
},
-/area/crew_quarters/sleep)
+/area/civilian/barber)
"cAq" = (
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/crew_quarters/sleep)
"cAr" = (
/turf/simulated/floor/plasteel{
@@ -61659,8 +59233,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plating,
/area/engine/engine_smes)
@@ -61679,8 +59252,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel{
@@ -61691,8 +59263,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -61703,8 +59274,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/warning_stripes/east,
/turf/simulated/floor/plasteel,
@@ -61759,8 +59329,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plating,
/area/maintenance/port)
@@ -61872,20 +59441,18 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/door/firedoor,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralcorner"
},
-/area/bridge/meeting_room)
+/area/hallway/primary/central/south)
"cBh" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/public/glass,
-/obj/structure/disposalpipe/segment{
- dir = 4
+/obj/machinery/door/airlock/public/glass{
+ name = "Public Access"
},
/turf/simulated/floor/plasteel{
dir = 4;
@@ -61948,8 +59515,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/table/wood,
/obj/item/clipboard,
@@ -61969,8 +59535,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/table/wood,
/obj/item/clothing/mask/cigarette/cigar/havana{
@@ -62004,8 +59569,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/table/wood,
/obj/item/storage/secure/briefcase,
@@ -62043,8 +59607,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 1;
@@ -62054,8 +59617,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/command{
@@ -62074,8 +59636,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -62097,6 +59658,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
},
+/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel,
/area/gateway)
"cBE" = (
@@ -62122,8 +59684,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -62133,8 +59694,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 1;
@@ -62148,8 +59708,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel,
/area/crew_quarters/locker/locker_toilet)
@@ -62157,8 +59716,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
@@ -62169,8 +59727,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/light,
/turf/simulated/floor/plasteel,
@@ -62179,8 +59736,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/door/airlock{
name = "Unisex Restrooms"
@@ -62222,18 +59778,13 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
icon_state = "neutralcorner"
},
/area/crew_quarters/locker)
"cBT" = (
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel{
@@ -62264,18 +59815,32 @@
},
/area/crew_quarters/sleep)
"cBW" = (
-/obj/item/twohanded/required/kirbyplants,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
+/obj/effect/landmark/start{
+ name = "Barber"
},
-/area/crew_quarters/sleep)
+/obj/machinery/light/small{
+ dir = 8
+ },
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "barber"
+ },
+/area/civilian/barber)
"cBX" = (
-/obj/structure/bed,
-/obj/item/bedsheet/brown,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
+/obj/structure/table/reinforced,
+/obj/structure/mirror{
+ pixel_x = 28
},
-/area/crew_quarters/sleep)
+/obj/item/razor,
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 8
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "barber"
+ },
+/area/civilian/barber)
"cBY" = (
/obj/machinery/cryopod/right,
/obj/machinery/newscaster{
@@ -62315,8 +59880,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/effect/decal/warning_stripes/yellow,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -62453,8 +60017,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -62471,8 +60034,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/disposalpipe/segment{
dir = 8;
@@ -62527,8 +60089,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
@@ -62617,8 +60178,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/table/wood,
/obj/item/folder/yellow,
@@ -62648,8 +60208,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/hologram/holopad,
/turf/simulated/floor/carpet,
@@ -62674,8 +60233,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/table/wood,
/obj/item/radio/intercom{
@@ -62705,7 +60263,9 @@
/area/gateway)
"cCY" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/public/glass,
+/obj/machinery/door/airlock/public/glass{
+ name = "Public Access"
+ },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
@@ -62738,8 +60298,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/landmark{
name = "lightsout"
@@ -62760,8 +60319,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -62809,8 +60367,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -62824,7 +60381,6 @@
},
/area/crew_quarters/locker)
"cDp" = (
-/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -62845,11 +60401,11 @@
/area/crew_quarters/fitness)
"cDs" = (
/obj/structure/table/reinforced,
+/obj/item/stack/packageWrap,
+/obj/item/hand_labeler,
/obj/machinery/newscaster{
pixel_x = 32
},
-/obj/item/stack/packageWrap,
-/obj/item/hand_labeler,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -62947,9 +60503,6 @@
/area/engine/engine_smes)
"cDC" = (
/obj/structure/table/reinforced,
-/obj/machinery/newscaster{
- pixel_x = 32
- },
/obj/item/stack/sheet/plasteel{
amount = 25
},
@@ -62959,6 +60512,9 @@
pixel_y = -3
},
/obj/effect/decal/warning_stripes/yellow/hollow,
+/obj/machinery/newscaster{
+ pixel_x = 32
+ },
/turf/simulated/floor/plasteel,
/area/engine/engine_smes)
"cDD" = (
@@ -63010,8 +60566,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/warning_stripes/south,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -63082,8 +60637,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
dir = 9;
@@ -63186,8 +60740,7 @@
"cEj" = (
/obj/structure/sink{
dir = 8;
- pixel_x = -12;
- pixel_y = 2
+ pixel_x = -12
},
/obj/effect/decal/warning_stripes/yellow/hollow,
/turf/simulated/floor/plasteel,
@@ -63236,11 +60789,9 @@
/turf/simulated/floor/plasteel,
/area/gateway)
"cEq" = (
-/obj/structure/toilet{
- dir = 8
- },
/obj/machinery/light/small,
/obj/effect/decal/warning_stripes/yellow/hollow,
+/obj/machinery/recharge_station,
/turf/simulated/floor/plasteel,
/area/crew_quarters/locker/locker_toilet)
"cEr" = (
@@ -63263,17 +60814,27 @@
},
/area/crew_quarters/sleep)
"cEu" = (
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/glass{
- name = "Cabin"
+ name = "Barber Shop"
},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel{
- icon_state = "wood"
+ icon_state = "barber"
},
-/area/crew_quarters/sleep)
+/area/civilian/barber)
"cEv" = (
/obj/machinery/door/airlock/glass{
name = "Cabin"
},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel{
icon_state = "freezerfloor"
},
@@ -63313,12 +60874,14 @@
/turf/simulated/wall/r_wall/rust,
/area/engine/engineering)
"cEB" = (
-/obj/structure/plasticflaps,
+/obj/effect/decal/warning_stripes/yellow,
+/obj/structure/plasticflaps{
+ opacity = 1
+ },
/obj/machinery/navbeacon{
codes_txt = "delivery;dir=1";
location = "Engineering"
},
-/obj/effect/decal/warning_stripes/yellow,
/turf/simulated/floor/plasteel,
/area/engine/engineering)
"cEC" = (
@@ -63343,14 +60906,13 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "neutralcorner"
},
-/area/bridge/meeting_room)
+/area/hallway/primary/central/south)
"cEL" = (
/turf/simulated/floor/plasteel{
dir = 4;
@@ -63451,8 +61013,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
dir = 4;
@@ -63513,9 +61074,15 @@
},
/area/hallway/primary/central)
"cFd" = (
-/obj/item/rack_parts,
-/turf/simulated/floor/plating,
-/area/maintenance/starboard)
+/obj/structure/chair,
+/obj/machinery/light{
+ dir = 1
+ },
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "whitebluecorner"
+ },
+/area/hallway/primary/central)
"cFe" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
@@ -63581,8 +61148,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -63592,18 +61158,20 @@
},
/area/crew_quarters/sleep)
"cFo" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
+/obj/structure/disposalpipe/segment{
+ dir = 4
},
/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "neutralcorner"
+ icon_state = "white"
},
-/area/crew_quarters/sleep)
+/area/medical/medbay)
"cFp" = (
/obj/machinery/door/firedoor,
/obj/effect/decal/warning_stripes/yellow,
@@ -63616,8 +61184,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/unary/vent_pump/on,
/turf/simulated/floor/plasteel{
@@ -63629,14 +61196,16 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
+ },
+/obj/structure/sign/barber{
+ pixel_x = 4;
+ pixel_y = 32
},
/turf/simulated/floor/plasteel{
dir = 1;
@@ -63647,9 +61216,15 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "neutral"
@@ -63659,12 +61234,15 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/camera{
c_tag = "Dorm Hallway Starboard"
},
+/obj/structure/sign/barber{
+ pixel_x = -4;
+ pixel_y = 32
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "neutralcorner"
@@ -63674,8 +61252,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
dir = 4;
@@ -63686,8 +61263,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/door/airlock/glass{
name = "Cabin"
@@ -63698,8 +61274,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
dir = 1;
@@ -63707,21 +61282,19 @@
},
/area/crew_quarters/fitness)
"cFy" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
@@ -63845,26 +61418,8 @@
/turf/simulated/floor/plasteel,
/area/maintenance/port)
"cFN" = (
-/obj/machinery/embedded_controller/radio/airlock/airlock_controller{
- id_tag = "sw_maint_airlock";
- pixel_y = 25;
- tag_airpump = "sw_maint_pump";
- tag_chamber_sensor = "sw_maint_sensor";
- tag_exterior_door = "sw_maint_outer";
- tag_interior_door = "sw_maint_inner"
- },
-/obj/machinery/airlock_sensor{
- id_tag = "sw_maint_sensor";
- pixel_y = 33
- },
-/obj/effect/decal/warning_stripes/yellow,
-/obj/machinery/atmospherics/unary/vent_pump/high_volume{
- dir = 4;
- frequency = 1379;
- id_tag = "sw_maint_pump"
- },
-/turf/simulated/floor/plasteel,
-/area/maintenance/port)
+/turf/simulated/wall/mineral/titanium,
+/area/shuttle/pod_4)
"cFO" = (
/obj/effect/decal/warning_stripes/yellow,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -63873,19 +61428,17 @@
},
/area/maintenance/port)
"cFP" = (
-/obj/machinery/access_button{
- command = "cycle_interior";
- frequency = 1379;
- master_tag = "sw_maint_airlock";
- name = "interior access button";
- pixel_x = -24;
- pixel_y = 24
+/obj/docking_port/mobile/pod{
+ dir = 4;
+ id = "pod4";
+ name = "escape pod 4"
},
-/obj/machinery/atmospherics/pipe/simple/visible{
- dir = 10
+/obj/machinery/door/airlock/titanium{
+ id_tag = "s_docking_airlock";
+ name = "Escape Pod Hatch"
},
-/turf/simulated/floor/plating,
-/area/maintenance/port)
+/turf/simulated/floor/mineral/titanium/blue,
+/area/shuttle/pod_4)
"cFR" = (
/obj/structure/grille{
density = 0;
@@ -63949,8 +61502,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -63967,8 +61519,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -63993,8 +61544,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -64012,14 +61562,12 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/effect/decal/warning_stripes/yellow,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -64037,8 +61585,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -64055,8 +61602,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -64077,8 +61623,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/light/small{
dir = 1
@@ -64102,14 +61647,12 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -64127,8 +61670,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -64146,8 +61688,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -64167,8 +61708,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 1;
@@ -64191,8 +61731,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -64212,8 +61751,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/light/small{
dir = 1
@@ -64231,8 +61769,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 1;
@@ -64253,8 +61790,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -64272,8 +61808,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -64290,8 +61825,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/landmark{
name = "blobstart"
@@ -64311,8 +61845,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -64330,8 +61863,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -64350,8 +61882,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
@@ -64370,14 +61901,12 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -64395,8 +61924,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -64411,20 +61939,19 @@
/turf/simulated/floor/plating,
/area/maintenance/port)
"cGw" = (
-/obj/machinery/door/airlock/external{
- frequency = 1379;
- id_tag = "sw_maint_outer";
- locked = 1;
- name = "West Maintenance External Access"
+/obj/item/radio/intercom{
+ pixel_y = 25
},
-/turf/simulated/floor/plasteel,
-/area/maintenance/port)
+/obj/structure/chair/comfy/shuttle{
+ dir = 4
+ },
+/turf/simulated/floor/mineral/titanium/blue,
+/area/shuttle/pod_4)
"cGx" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
@@ -64451,19 +61978,18 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 8
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/obj/machinery/navbeacon{
codes_txt = "patrol;next_patrol=hall6";
location = "hall5"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
@@ -64473,8 +61999,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 1;
@@ -64490,8 +62015,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/obj/machinery/navbeacon{
@@ -64507,8 +62031,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/navbeacon{
codes_txt = "patrol;next_patrol=hall9";
@@ -64536,12 +62059,12 @@
icon_state = "1-4";
tag = "90Curve"
},
-/obj/structure/cable{
- d1 = 1;
- d2 = 8;
- icon_state = "1-8"
- },
/obj/machinery/atmospherics/unary/vent_scrubber/on,
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/obj/machinery/navbeacon{
codes_txt = "patrol;next_patrol=hall10";
location = "hall9"
@@ -64555,8 +62078,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 8;
@@ -64569,7 +62091,7 @@
/obj/structure/disposalpipe/sortjunction{
dir = 1;
name = "Medbay Junction";
- sortType = 13
+ sortType = 9
},
/turf/simulated/floor/plasteel{
icon_state = "neutralcorner"
@@ -64588,16 +62110,15 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/obj/machinery/door/airlock/maintenance,
/obj/structure/disposalpipe/segment{
dir = 4
},
-/turf/simulated/floor/wood,
-/area/maintenance/starboard)
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "whitebluecorner"
+ },
+/area/hallway/primary/central)
"cGI" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
@@ -64611,26 +62132,18 @@
tag = ""
},
/obj/machinery/door/airlock/maintenance,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plating,
/area/maintenance/starboard)
"cGJ" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
+/obj/structure/disposalpipe/segment,
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "whitepurplecorner"
},
-/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";
- tag = ""
- },
-/turf/simulated/floor/plating,
-/area/maintenance/starboard)
+/area/medical/research)
"cGK" = (
/obj/effect/decal/warning_stripes/north,
/turf/simulated/floor/plasteel{
@@ -64648,15 +62161,10 @@
},
/area/hallway/primary/central)
"cGM" = (
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
- },
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -64664,6 +62172,10 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 2;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plating,
/area/maintenance/starboard)
"cGN" = (
@@ -64721,7 +62233,6 @@
},
/area/crew_quarters/sleep)
"cGS" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
@@ -64761,8 +62272,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -64820,7 +62330,9 @@
},
/area/crew_quarters/fitness)
"cHb" = (
-/obj/machinery/computer/HolodeckControl,
+/obj/machinery/computer/HolodeckControl{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/crew_quarters/fitness)
"cHc" = (
@@ -64836,21 +62348,21 @@
/turf/simulated/floor/plasteel,
/area/crew_quarters/fitness)
"cHe" = (
-/obj/machinery/portable_atmospherics/canister/air,
-/obj/machinery/atmospherics/unary/portables_connector{
- dir = 1
+/obj/machinery/status_display{
+ layer = 4;
+ pixel_y = 32
},
-/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "neutral"
+/obj/machinery/light,
+/obj/structure/chair/comfy/shuttle{
+ dir = 4
},
-/area/maintenance/port)
+/turf/simulated/floor/mineral/titanium/blue,
+/area/shuttle/pod_4)
"cHi" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door/airlock/engineering{
name = "Electrical Maintenance";
@@ -64876,8 +62388,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/warning_stripes/yellow,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
@@ -64913,8 +62424,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -64932,8 +62442,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
dir = 4;
@@ -64971,8 +62480,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
@@ -65027,22 +62535,6 @@
icon_state = "purplecorner"
},
/area/hallway/primary/central)
-"cHF" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
- },
-/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "purplecorner"
- },
-/area/hallway/primary/central)
"cHG" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -65050,11 +62542,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/obj/structure/disposalpipe/sortjunction{
- dir = 4;
- name = "Research Junction";
- sortType = 20
- },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "purplecorner"
@@ -65072,9 +62559,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "purplecorner"
@@ -65087,10 +62571,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
- },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "purplecorner"
@@ -65112,10 +62592,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
- },
/turf/simulated/floor/plasteel{
icon_state = "bluecorner"
},
@@ -65128,9 +62604,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/turf/simulated/floor/plasteel{
icon_state = "bluecorner"
},
@@ -65156,10 +62629,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/obj/structure/disposalpipe/sortjunction{
+/obj/structure/disposalpipe/segment{
dir = 4;
- name = "CMO's Junction";
- sortType = 20
+ icon_state = "pipe-c"
},
/turf/simulated/floor/plasteel{
icon_state = "bluecorner"
@@ -65254,19 +62726,7 @@
icon_state = "neutral"
},
/area/crew_quarters/sleep)
-"cIe" = (
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
- },
-/turf/simulated/floor/plasteel{
- icon_state = "neutralcorner"
- },
-/area/crew_quarters/sleep)
"cIg" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 1
},
@@ -65276,9 +62736,6 @@
},
/area/crew_quarters/sleep)
"cIh" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/light,
/obj/machinery/firealarm{
dir = 1;
@@ -65290,9 +62747,6 @@
},
/area/crew_quarters/sleep)
"cIi" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable,
/obj/machinery/power/apc{
name = "south bump";
@@ -65308,61 +62762,46 @@
},
/area/crew_quarters/sleep)
"cIj" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/turf/simulated/floor/plasteel{
icon_state = "neutral"
},
/area/crew_quarters/sleep)
"cIk" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/turf/simulated/floor/plasteel{
icon_state = "neutralcorner"
},
/area/crew_quarters/sleep)
"cIl" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/light,
/turf/simulated/floor/plasteel{
icon_state = "neutralcorner"
},
/area/crew_quarters/sleep)
"cIm" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/door/airlock/glass{
name = "Cabin"
},
/turf/simulated/floor/plasteel,
/area/crew_quarters/sleep)
"cIn" = (
-/obj/structure/disposalpipe/segment{
+/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 8;
- icon_state = "neutralcorner"
+ icon_state = "whitepurplecorner"
},
-/area/crew_quarters/fitness)
+/area/medical/research)
"cIo" = (
-/obj/structure/disposalpipe/junction{
- dir = 1;
- icon_state = "pipe-j2"
- },
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
@@ -65372,8 +62811,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/warning_stripes/west,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -65396,20 +62834,19 @@
/turf/simulated/floor/plasteel,
/area/crew_quarters/fitness)
"cIs" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 4;
initialize_directions = 11
},
/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
-/obj/machinery/hologram/holopad,
/obj/effect/decal/warning_stripes/yellow/hollow,
+/obj/structure/disposalpipe/segment,
+/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
@@ -65421,18 +62858,9 @@
/turf/simulated/floor/plasteel,
/area/crew_quarters/fitness)
"cIu" = (
-/obj/machinery/door/airlock/external{
- frequency = 1379;
- id_tag = "sw_maint_inner";
- locked = 1;
- name = "West Maintenance External Access";
- req_access_txt = "10;13"
- },
-/obj/machinery/atmospherics/pipe/simple/visible{
- dir = 4
- },
+/obj/effect/spawner/window/shuttle,
/turf/simulated/floor/plating,
-/area/maintenance/port)
+/area/shuttle/pod_4)
"cIv" = (
/obj/structure/girder,
/turf/simulated/floor/plasteel{
@@ -65454,8 +62882,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/door/airlock/maintenance{
req_access_txt = "12"
@@ -65492,8 +62919,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
@@ -65594,16 +63020,21 @@
/turf/simulated/floor/plating,
/area/medical/research)
"cIX" = (
-/obj/structure/disposalpipe/segment,
-/obj/effect/spawner/window/reinforced,
-/turf/simulated/floor/plating,
-/area/medical/research)
-"cIY" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/door/firedoor,
/obj/effect/decal/warning_stripes/south,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/medical/research)
+"cIY" = (
+/obj/structure/disposalpipe/segment{
+ dir = 1;
+ icon_state = "pipe-c"
+ },
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "whitepurplecorner"
+ },
+/area/medical/research)
"cIZ" = (
/obj/machinery/status_display,
/turf/simulated/wall,
@@ -65628,10 +63059,9 @@
/turf/simulated/wall,
/area/medical/research)
"cJc" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
+/obj/machinery/door/airlock/public/glass{
+ name = "Public Access"
},
-/obj/machinery/door/airlock/public/glass,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralcorner"
@@ -65682,9 +63112,9 @@
/turf/simulated/wall,
/area/medical/medbay)
"cJj" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/door/firedoor,
/obj/effect/decal/warning_stripes/south,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/medical/medbay)
"cJk" = (
@@ -65695,8 +63125,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/door/airlock/maintenance,
@@ -65704,8 +63133,8 @@
/turf/simulated/floor/plasteel,
/area/maintenance/starboard)
"cJm" = (
-/obj/machinery/hologram/holopad,
/obj/effect/decal/warning_stripes/yellow/hollow,
+/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel,
/area/crew_quarters/fitness)
"cJn" = (
@@ -65732,16 +63161,30 @@
/turf/simulated/floor/plasteel,
/area/assembly/chargebay)
"cJr" = (
-/obj/machinery/vending/medical,
+/obj/structure/table/glass,
+/obj/item/tank/internals/emergency_oxygen/nitrogen{
+ pixel_x = 5;
+ pixel_y = 5
+ },
+/obj/item/tank/internals/emergency_oxygen/nitrogen{
+ pixel_x = 5
+ },
+/obj/item/tank/internals/emergency_oxygen/plasma{
+ pixel_x = -5;
+ pixel_y = 5
+ },
+/obj/item/tank/internals/emergency_oxygen/plasma{
+ pixel_x = -5
+ },
/turf/simulated/floor/plasteel{
icon_state = "whitebluefull"
},
/area/medical/medbay2)
"cJs" = (
+/obj/structure/closet/secure_closet/medical3,
/obj/machinery/newscaster{
pixel_y = 32
},
-/obj/structure/closet/secure_closet/medical3,
/turf/simulated/floor/plasteel{
icon_state = "whitebluefull"
},
@@ -65766,9 +63209,9 @@
},
/area/medical/medbay2)
"cJv" = (
+/obj/effect/decal/warning_stripes/yellow/hollow,
/obj/structure/disposalpipe/trunk,
/obj/machinery/disposal,
-/obj/effect/decal/warning_stripes/yellow/hollow,
/turf/simulated/floor/plasteel{
icon_state = "whitebluefull"
},
@@ -65892,10 +63335,10 @@
/turf/simulated/floor/plating,
/area/maintenance/port)
"cJL" = (
-/obj/machinery/shieldgen,
-/obj/effect/decal/warning_stripes/northeast,
-/turf/simulated/floor/plasteel,
-/area/maintenance/port)
+/obj/machinery/door/airlock/external,
+/obj/machinery/door/firedoor,
+/turf/simulated/floor/plating,
+/area/hallway/secondary/entry)
"cJM" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/door/airlock/atmos{
@@ -65915,6 +63358,7 @@
/area/maintenance/port)
"cJP" = (
/obj/effect/decal/warning_stripes/west,
+/obj/machinery/shieldgen,
/turf/simulated/floor/plasteel,
/area/maintenance/port)
"cJR" = (
@@ -65956,14 +63400,12 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/warning_stripes/yellow,
/turf/simulated/floor/plasteel,
/area/maintenance/electrical)
"cJY" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 8
},
@@ -65981,10 +63423,10 @@
/area/maintenance/electrical)
"cKa" = (
/obj/structure/table/reinforced,
+/obj/effect/decal/warning_stripes/yellow,
/obj/machinery/newscaster{
pixel_y = 32
},
-/obj/effect/decal/warning_stripes/yellow,
/turf/simulated/floor/plasteel,
/area/maintenance/electrical)
"cKb" = (
@@ -65996,8 +63438,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/light/small{
dir = 8
@@ -66048,8 +63489,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/warning_stripes/northwest,
/turf/simulated/floor/plasteel{
@@ -66065,8 +63505,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/effect/landmark{
name = "blobstart"
@@ -66104,21 +63543,17 @@
"cKr" = (
/turf/simulated/wall/r_wall,
/area/medical/research)
-"cKs" = (
-/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 8
- },
-/turf/simulated/floor/engine,
-/area/toxins/explab)
"cKt" = (
/obj/machinery/atmospherics/unary/portables_connector,
/obj/effect/decal/warning_stripes/northwest,
/turf/simulated/floor/plasteel,
/area/maintenance/electrical)
"cKu" = (
-/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/heat_exchanging{
+ dir = 6
+ },
/turf/simulated/floor/engine,
-/area/toxins/explab)
+/area/toxins/mixing)
"cKv" = (
/obj/effect/spawner/window/reinforced,
/obj/structure/cable{
@@ -66145,22 +63580,30 @@
},
/area/medical/research)
"cKx" = (
-/obj/structure/disposalpipe/segment,
-/obj/structure/chair,
+/obj/structure/chair/office/light{
+ dir = 8
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "whitepurplecorner"
},
/area/medical/research)
"cKy" = (
+/obj/item/twohanded/required/kirbyplants,
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "whitepurplecorner"
+ icon_state = "dark"
},
-/area/medical/research)
+/area/medical/cmo)
"cKz" = (
-/obj/structure/chair,
+/obj/item/twohanded/required/kirbyplants,
+/turf/simulated/floor/plasteel{
+ icon_state = "bluecorner"
+ },
+/area/hallway/primary/aft)
+"cKA" = (
+/obj/item/paicard,
+/obj/structure/chair/sofa/corp/right,
/obj/effect/landmark/start{
name = "Civilian"
},
@@ -66169,52 +63612,37 @@
icon_state = "whitepurplecorner"
},
/area/medical/research)
-"cKA" = (
-/obj/structure/table,
-/obj/item/paicard,
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "whitepurplecorner"
- },
-/area/medical/research)
"cKB" = (
-/obj/item/twohanded/required/kirbyplants,
/obj/machinery/light{
dir = 1;
on = 1
},
+/obj/structure/chair/sofa/corp,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "whitepurple"
},
/area/medical/research)
"cKC" = (
-/obj/structure/table,
-/obj/item/stack/cable_coil/random,
-/obj/item/assembly/igniter,
-/obj/item/assembly/timer{
- pixel_x = 4;
- pixel_y = 4
- },
+/obj/structure/chair/sofa/corp/left,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "whitepurplecorner"
},
/area/medical/research)
"cKD" = (
-/obj/structure/chair,
+/obj/structure/railing/corner,
+/obj/machinery/atmospherics/unary/vent_scrubber/on,
/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "whitepurplecorner"
+ icon_state = "white"
},
/area/medical/research)
"cKE" = (
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "whitepurplecorner"
+ icon_state = "white"
},
-/area/medical/research)
+/area/medical/genetics)
"cKF" = (
/turf/simulated/floor/plasteel{
dir = 4;
@@ -66235,6 +63663,12 @@
/obj/structure/table,
/obj/item/clothing/gloves/color/latex,
/obj/item/clothing/glasses/science,
+/obj/item/assembly/timer{
+ pixel_x = 4;
+ pixel_y = 4
+ },
+/obj/item/assembly/igniter,
+/obj/item/stack/cable_coil/random,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "whitepurplecorner"
@@ -66244,23 +63678,17 @@
/obj/structure/sign/science,
/turf/simulated/wall,
/area/medical/research)
-"cKL" = (
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/plasteel{
- icon_state = "bluecorner"
- },
-/area/hallway/primary/aft)
"cKM" = (
-/obj/structure/table,
-/obj/item/storage/box/bodybags,
-/obj/item/pen,
+/obj/structure/chair/sofa/corp/corner{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "whitebluecorner"
},
/area/medical/medbay)
"cKN" = (
-/obj/structure/chair,
+/obj/structure/chair/sofa/corp/left,
/obj/effect/landmark/start{
name = "Civilian"
},
@@ -66276,15 +63704,18 @@
},
/area/medical/medbay)
"cKP" = (
-/obj/structure/chair,
+/obj/structure/chair/comfy/teal,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "whitebluecorner"
},
/area/medical/medbay)
"cKQ" = (
-/obj/structure/table,
-/obj/item/stack/medical/bruise_pack/advanced,
+/obj/structure/table/holotable,
+/obj/item/reagent_containers/food/drinks/coffee{
+ pixel_x = -6;
+ pixel_y = 6
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "whitebluecorner"
@@ -66294,30 +63725,33 @@
/obj/machinery/light{
dir = 1
},
-/obj/machinery/vending/medical,
+/obj/structure/chair/comfy/teal,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "whiteblue"
},
/area/medical/medbay)
"cKS" = (
-/obj/structure/table,
-/obj/item/stack/medical/ointment/advanced,
+/obj/structure/table/tray,
+/obj/item/stack/medical/bruise_pack/advanced{
+ pixel_x = -7;
+ pixel_y = 7
+ },
+/obj/item/stack/medical/ointment/advanced{
+ pixel_x = 4;
+ pixel_y = 5
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "whitebluecorner"
},
/area/medical/medbay)
"cKT" = (
-/obj/structure/chair,
-/obj/effect/landmark/start{
- name = "Civilian"
- },
+/obj/structure/railing,
/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "whitebluecorner"
+ icon_state = "white"
},
-/area/medical/medbay)
+/area/medical/research)
"cKU" = (
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
@@ -66332,7 +63766,10 @@
},
/area/medical/medbay)
"cKW" = (
-/obj/structure/chair,
+/obj/structure/chair/comfy/teal,
+/obj/effect/landmark/start{
+ name = "Civilian"
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "whitebluecorner"
@@ -66353,25 +63790,29 @@
"cKY" = (
/turf/simulated/wall,
/area/medical/medbay)
-"cKZ" = (
-/obj/structure/table,
-/obj/item/storage/toolbox/electrical,
-/turf/simulated/floor/plating,
-/area/maintenance/starboard)
"cLa" = (
-/obj/structure/table,
-/obj/item/storage/toolbox/mechanical,
-/turf/simulated/floor/plating,
-/area/maintenance/starboard)
-"cLb" = (
-/obj/structure/table_frame,
-/turf/simulated/floor/plating,
-/area/maintenance/starboard)
-"cLd" = (
-/obj/structure/cable{
- d2 = 4;
- icon_state = "0-4"
+/obj/machinery/door/poddoor/shutters{
+ density = 0;
+ dir = 2;
+ icon_state = "open";
+ id_tag = "psychoffice";
+ name = "Privacy Shutters";
+ opacity = 0
},
+/obj/effect/spawner/window/reinforced,
+/obj/machinery/door/firedoor,
+/turf/simulated/floor/plating,
+/area/medical/psych)
+"cLb" = (
+/obj/machinery/door/airlock/medical{
+ id_tag = "psychfoyer";
+ name = "Psych Office";
+ req_access_txt = "64"
+ },
+/obj/machinery/door/firedoor,
+/turf/simulated/floor/wood,
+/area/hallway/primary/central)
+"cLd" = (
/obj/machinery/power/apc{
dir = 8;
name = "west bump";
@@ -66382,6 +63823,16 @@
dir = 4;
network = list("SS13","Medical")
},
+/obj/structure/table/glass,
+/obj/item/storage/box/autoinjectors{
+ pixel_x = 4;
+ pixel_y = 4
+ },
+/obj/item/storage/box/iv_bags,
+/obj/item/storage/box/pillbottles{
+ pixel_x = -5;
+ pixel_y = -5
+ },
/turf/simulated/floor/plasteel{
icon_state = "whitebluefull"
},
@@ -66390,14 +63841,12 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/turf/simulated/floor/plasteel{
dir = 1;
@@ -66408,8 +63857,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
dir = 1;
@@ -66417,46 +63865,39 @@
},
/area/medical/medbay2)
"cLg" = (
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
- },
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 1;
+ icon_state = "pipe-c"
},
/turf/simulated/floor/plasteel{
icon_state = "whitebluefull"
},
/area/medical/medbay2)
"cLh" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/door/airlock/maintenance{
name = "Medbay Maintenance";
req_access_txt = "5"
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/medical/medbay2)
"cLi" = (
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
- },
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 1;
@@ -66464,14 +63905,17 @@
icon_state = "1-4"
},
/obj/effect/decal/warning_stripes/yellow,
+/obj/structure/disposalpipe/segment{
+ dir = 8;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel,
/area/maintenance/starboard)
"cLk" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
@@ -66486,8 +63930,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 1
@@ -66501,14 +63944,10 @@
/turf/simulated/floor/plasteel,
/area/maintenance/starboard)
"cLm" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -66517,6 +63956,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/maintenance/starboard2)
"cLn" = (
@@ -66537,9 +63979,7 @@
pixel_x = 26;
pixel_y = 28
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/crew_quarters/sleep)
"cLp" = (
/turf/simulated/floor/carpet,
@@ -66558,6 +63998,9 @@
pixel_y = 28
},
/obj/machinery/cryopod,
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+ dir = 8
+ },
/turf/simulated/floor/plasteel{
icon_state = "freezerfloor"
},
@@ -66615,7 +64058,7 @@
},
/obj/effect/decal/warning_stripes/yellow,
/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
-/obj/structure/closet/secure_closet/scientist,
+/obj/structure/closet/bombcloset,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "whitepurplecorner"
@@ -66635,21 +64078,19 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door/airlock/maintenance{
name = "Science Maintenance";
req_access_txt = "47"
},
/turf/simulated/floor/plasteel,
-/area/medical/research)
+/area/maintenance/port)
"cLC" = (
/obj/item/clothing/gloves/color/black,
/obj/item/wrench,
/obj/item/crowbar/red,
-/obj/machinery/light/small,
-/obj/effect/decal/warning_stripes/southwest,
+/obj/effect/decal/warning_stripes/west,
/turf/simulated/floor/plasteel,
/area/maintenance/port)
"cLD" = (
@@ -66690,14 +64131,12 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/effect/decal/warning_stripes/north,
/turf/simulated/floor/plasteel,
@@ -66718,8 +64157,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/warning_stripes/north,
/turf/simulated/floor/plasteel,
@@ -66728,8 +64166,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
@@ -66751,8 +64188,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -66812,13 +64248,16 @@
},
/area/toxins/xenobiology)
"cLV" = (
-/obj/structure/closet/wardrobe/white,
-/obj/effect/decal/warning_stripes/yellow,
+/obj/structure/table/wood,
+/obj/machinery/kitchen_machine/microwave{
+ pixel_x = -3;
+ pixel_y = 6
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "whitepurplefull"
},
-/area/medical/research)
+/area/toxins/misc_lab)
"cLW" = (
/obj/machinery/door/airlock/maintenance,
/turf/simulated/floor/plasteel,
@@ -66827,14 +64266,13 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "whitepurple"
},
-/area/medical/research)
+/area/toxins/misc_lab)
"cLY" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -66844,16 +64282,14 @@
/obj/machinery/ai_status_display{
pixel_y = 32
},
-/obj/structure/extinguisher_cabinet{
- pixel_x = -28;
- pixel_y = 30
+/obj/structure/chair/comfy/purp{
+ dir = 8
},
-/obj/machinery/vending/cola,
/turf/simulated/floor/plasteel{
- dir = 9;
+ dir = 1;
icon_state = "whitepurple"
},
-/area/medical/research)
+/area/toxins/misc_lab)
"cMb" = (
/obj/item/radio/intercom{
dir = 1;
@@ -66867,21 +64303,26 @@
dir = 1;
icon_state = "whitepurple"
},
-/area/medical/research)
+/area/toxins/misc_lab)
"cMc" = (
/obj/machinery/status_display{
pixel_y = 32
},
-/obj/structure/chair/comfy/purp,
+/obj/machinery/vending/snack,
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "whitepurple"
},
-/area/medical/research)
+/area/toxins/misc_lab)
"cMd" = (
/obj/structure/table,
-/obj/item/folder/white,
-/obj/item/assembly/infra,
+/obj/item/folder/white{
+ pixel_y = 12
+ },
+/obj/machinery/cell_charger{
+ pixel_x = -4
+ },
+/obj/item/stock_parts/cell/high,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "whitepurplecorner"
@@ -66890,11 +64331,11 @@
"cMe" = (
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
- icon_state = "white"
+ dir = 1;
+ icon_state = "whitepurplecorner"
},
/area/medical/research)
"cMf" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 6
},
@@ -66906,9 +64347,22 @@
},
/area/medical/research)
"cMg" = (
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+ dir = 8;
+ initialize_directions = 11
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 8;
+ initialize_directions = 11
+ },
+/obj/structure/disposalpipe/junction{
+ dir = 4;
+ icon_state = "pipe-y"
},
/turf/simulated/floor/plasteel{
icon_state = "white"
@@ -66918,41 +64372,46 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
-/area/medical/research)
+/turf/simulated/floor/plating,
+/area/medical/morgue)
"cMj" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
},
-/obj/machinery/hologram/holopad,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
/area/medical/research)
"cMk" = (
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
},
-/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
-/area/medical/research)
+/obj/effect/decal/warning_stripes/yellow,
+/obj/structure/disposalpipe/segment,
+/turf/simulated/floor/plasteel,
+/area/maintenance/apmaint)
"cMl" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 4;
- initialize_directions = 11
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 8;
- initialize_directions = 11
- },
-/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
-/area/medical/research)
+/obj/effect/decal/warning_stripes/east,
+/obj/structure/table/reinforced,
+/obj/machinery/reagentgrinder,
+/obj/item/storage/box/beakers,
+/obj/item/reagent_containers/glass/beaker/large,
+/obj/item/reagent_containers/glass/beaker/large,
+/obj/item/reagent_containers/glass/beaker/large,
+/obj/item/reagent_containers/glass/beaker/large,
+/obj/item/reagent_containers/glass/beaker/large,
+/obj/item/reagent_containers/glass/beaker/large,
+/obj/item/reagent_containers/glass/beaker/large,
+/obj/item/reagent_containers/glass/beaker/large,
+/obj/item/reagent_containers/glass/beaker/large,
+/obj/item/reagent_containers/glass/beaker/large,
+/turf/simulated/floor/engine,
+/area/toxins/misc_lab)
"cMm" = (
/turf/simulated/floor/plasteel{
icon_state = "white"
@@ -66966,7 +64425,9 @@
},
/area/medical/research)
"cMo" = (
-/obj/item/twohanded/required/kirbyplants,
+/obj/structure/chair/sofa/corp/right{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "whitebluecorner"
@@ -67040,8 +64501,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -67054,20 +64514,11 @@
icon_state = "cmo"
},
/area/medical/medbay2)
-"cMD" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
-/area/toxins/mixing)
"cME" = (
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -67079,7 +64530,14 @@
/turf/simulated/floor/plasteel,
/area/maintenance/starboard)
"cMF" = (
-/obj/structure/plasticflaps,
+/obj/structure/plasticflaps{
+ opacity = 1
+ },
+/obj/machinery/navbeacon{
+ codes_txt = "delivery";
+ dir = 8;
+ location = "Medbay"
+ },
/turf/simulated/floor/plasteel,
/area/medical/medbay2)
"cMG" = (
@@ -67110,17 +64568,15 @@
"cMM" = (
/obj/structure/bed,
/obj/item/bedsheet/red,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/crew_quarters/sleep)
"cMN" = (
/obj/structure/table/wood,
+/obj/item/storage/briefcase,
+/obj/item/cane,
/obj/machinery/newscaster{
pixel_x = -32
},
-/obj/item/storage/briefcase,
-/obj/item/cane,
/turf/simulated/floor/carpet,
/area/crew_quarters/sleep)
"cMO" = (
@@ -67130,14 +64586,14 @@
/turf/simulated/floor/carpet,
/area/crew_quarters/sleep)
"cMP" = (
-/obj/machinery/newscaster{
- pixel_x = -32
- },
-/obj/machinery/cryopod/right,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel{
- icon_state = "freezerfloor"
+ dir = 8;
+ icon_state = "neutralfull"
},
-/area/crew_quarters/sleep)
+/area/hallway/secondary/entry)
"cMQ" = (
/obj/machinery/vending/snack,
/obj/effect/decal/warning_stripes/yellow,
@@ -67206,8 +64662,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -67232,8 +64687,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
@@ -67273,10 +64727,6 @@
/turf/simulated/floor/plating,
/area/toxins/xenobiology)
"cNl" = (
-/obj/structure/disposalpipe/trunk{
- dir = 1
- },
-/obj/machinery/disposal,
/obj/structure/window/reinforced{
dir = 8
},
@@ -67285,6 +64735,10 @@
pixel_y = 32
},
/obj/effect/decal/warning_stripes/yellow/hollow,
+/obj/structure/disposalpipe/trunk{
+ dir = 1
+ },
+/obj/machinery/disposal,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -67293,8 +64747,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/warning_stripes/yellow,
/turf/simulated/floor/plasteel{
@@ -67324,8 +64777,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/research{
@@ -67349,14 +64801,12 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/machinery/door/poddoor/preopen{
id_tag = "xeno4";
@@ -67372,26 +64822,24 @@
},
/area/toxins/xenobiology)
"cNr" = (
-/obj/structure/disposalpipe/segment,
/obj/effect/spawner/window/reinforced,
/obj/structure/cable{
d2 = 8;
icon_state = "0-8"
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/toxins/xenobiology)
"cNs" = (
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/machinery/door/poddoor/preopen{
id_tag = "xeno5";
@@ -67410,14 +64858,12 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/machinery/door/poddoor/preopen{
id_tag = "xeno6";
@@ -67445,14 +64891,12 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/machinery/door/airlock/research/glass{
autoclose = 0;
@@ -67479,35 +64923,20 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
icon_state = "white"
},
-/area/medical/research)
-"cNy" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
+/area/toxins/misc_lab)
+"cNA" = (
+/obj/structure/chair/comfy/purp{
dir = 8
},
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "whitepurplecorner"
- },
-/area/medical/research)
-"cNA" = (
-/obj/machinery/vending/snack,
-/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "whitepurple"
- },
-/area/medical/research)
-"cNB" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
-/area/medical/research)
+/area/toxins/misc_lab)
"cND" = (
/obj/item/twohanded/required/kirbyplants,
/turf/simulated/floor/plasteel{
@@ -67516,32 +64945,24 @@
},
/area/medical/research)
"cNE" = (
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
- icon_state = "whitepurple"
+ dir = 1;
+ icon_state = "neutral"
},
-/area/medical/research)
+/area/maintenance/apmaint)
"cNF" = (
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 1;
initialize_directions = 11
},
+/obj/structure/railing{
+ dir = 4
+ },
+/obj/structure/table/glass,
+/obj/item/stock_parts/cell/high,
/turf/simulated/floor/plasteel{
icon_state = "whitepurple"
},
@@ -67553,9 +64974,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/turf/simulated/floor/plasteel{
- icon_state = "whitepurple"
- },
+/obj/structure/flora/ausbushes/sunnybush,
+/obj/structure/flora/ausbushes/brflowers,
+/turf/simulated/floor/grass,
/area/medical/research)
"cNH" = (
/obj/effect/landmark{
@@ -67567,30 +64988,28 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/turf/simulated/floor/plasteel{
- icon_state = "whitepurple"
- },
+/turf/simulated/floor/grass,
/area/medical/research)
"cNI" = (
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/disposalpipe/segment{
+ dir = 4;
+ icon_state = "pipe-c"
},
/turf/simulated/floor/plasteel{
- icon_state = "whitepurple"
+ icon_state = "redyellowfull"
},
-/area/medical/research)
+/area/maintenance/apmaint)
"cNJ" = (
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 1
- },
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/railing{
+ dir = 8
+ },
+/obj/structure/table/glass,
+/obj/item/paicard,
/turf/simulated/floor/plasteel{
icon_state = "whitepurple"
},
@@ -67630,7 +65049,6 @@
/turf/simulated/floor/plasteel,
/area/medical/research)
"cNN" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
@@ -67651,7 +65069,6 @@
},
/area/hallway/primary/aft)
"cNP" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
@@ -67703,6 +65120,10 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel{
dir = 9;
icon_state = "whiteblue"
@@ -67715,12 +65136,29 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 1
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/rack/holorack,
+/obj/item/paper/pamphlet{
+ pixel_x = -5;
+ pixel_y = 3
+ },
+/obj/item/paper/pamphlet{
+ pixel_x = 7;
+ pixel_y = 3
+ },
+/obj/item/paper/pamphlet{
+ pixel_x = -3
+ },
+/obj/item/paper/pamphlet{
+ pixel_x = 10
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
/area/medical/medbay)
"cNV" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
@@ -67728,6 +65166,11 @@
dir = 1;
initialize_directions = 11
},
+/obj/structure/disposalpipe/junction{
+ dir = 1;
+ icon_state = "pipe-j2"
+ },
+/obj/item/twohanded/required/kirbyplants,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -67792,25 +65235,35 @@
/turf/space,
/area/space/nearstation)
"cOa" = (
-/obj/structure/chair/comfy/lime{
- dir = 4
- },
/obj/machinery/door_control{
id = "psychoffice";
name = "Privacy Shutters Control";
- pixel_x = -25
+ pixel_x = -25;
+ pixel_y = 5
},
-/turf/simulated/floor/carpet,
+/obj/structure/chair/office/light{
+ dir = 4
+ },
+/obj/effect/landmark/start{
+ name = "Psychiatrist"
+ },
+/obj/machinery/door_control{
+ id = "psychfoyer";
+ layer = 3.3;
+ name = "Psych Foyer Doors";
+ normaldoorcontrol = 1;
+ pixel_x = -25;
+ pixel_y = -6
+ },
+/turf/simulated/floor/wood,
/area/medical/psych)
"cOb" = (
-/obj/machinery/light{
- dir = 1
+/obj/structure/table/wood,
+/obj/item/paper_bin{
+ pixel_y = 5
},
-/obj/item/radio/intercom{
- dir = 1;
- pixel_y = 25
- },
-/turf/simulated/floor/carpet,
+/obj/item/pen/multi,
+/turf/simulated/floor/wood,
/area/medical/psych)
"cOc" = (
/obj/machinery/firealarm{
@@ -67821,14 +65274,10 @@
pixel_x = 28;
pixel_y = 30
},
-/obj/structure/bed/psych,
-/turf/simulated/floor/carpet,
+/turf/simulated/floor/wood,
/area/medical/psych)
"cOd" = (
/obj/structure/table,
-/obj/machinery/newscaster{
- pixel_y = 32
- },
/obj/item/storage/box/bodybags{
pixel_x = 5;
pixel_y = 5
@@ -67839,6 +65288,9 @@
pixel_x = 5;
pixel_y = 5
},
+/obj/machinery/newscaster{
+ pixel_y = 32
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "whitebluecorner"
@@ -67955,27 +65407,22 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plating,
/area/maintenance/starboard)
"cOp" = (
/obj/structure/table/wood,
+/obj/item/paper_bin,
+/obj/item/pen,
/obj/machinery/newscaster{
pixel_x = -32
},
-/obj/item/paper_bin,
-/obj/item/pen,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/crew_quarters/sleep)
"cOq" = (
/obj/structure/chair/office/dark,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/crew_quarters/sleep)
"cOr" = (
/obj/structure/table/wood,
@@ -68050,14 +65497,12 @@
/turf/simulated/floor/plasteel,
/area/maintenance/electrical)
"cOB" = (
-/obj/machinery/atmospherics/binary/volume_pump{
- name = "Ports to Distro"
+/obj/machinery/atmospherics/unary/portables_connector{
+ dir = 8
},
-/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "caution"
- },
-/area/maintenance/electrical)
+/obj/effect/decal/warning_stripes/west,
+/turf/simulated/floor/plasteel,
+/area/atmos)
"cOC" = (
/obj/structure/table/reinforced,
/obj/effect/decal/warning_stripes/yellow/hollow,
@@ -68076,10 +65521,8 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
-/obj/machinery/hologram/holopad,
/obj/effect/decal/warning_stripes/yellow/hollow,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 6
@@ -68087,6 +65530,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
},
+/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
@@ -68150,8 +65594,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/warning_stripes/yellow,
/turf/simulated/floor/plasteel{
@@ -68185,8 +65628,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/warning_stripes/yellow/hollow,
/obj/machinery/atmospherics/unary/vent_pump/on{
@@ -68251,10 +65693,8 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
-/obj/effect/decal/warning_stripes/yellow,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "whitepurple"
@@ -68264,26 +65704,13 @@
/obj/structure/sign/biohazard,
/turf/simulated/wall,
/area/toxins/xenobiology)
-"cOZ" = (
-/obj/machinery/chem_master,
-/obj/effect/decal/warning_stripes/yellow/hollow,
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "whitepurple"
- },
-/area/toxins/xenobiology)
"cPa" = (
-/obj/machinery/chem_dispenser,
/obj/item/radio/intercom{
dir = 4;
name = "Station Intercom (General)";
pixel_x = 29;
pixel_y = 22
},
-/obj/structure/reagent_dispensers/fueltank/chem{
- pixel_y = 32
- },
-/obj/effect/decal/warning_stripes/yellow,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "whitepurple"
@@ -68304,8 +65731,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/warning_stripes/east,
/turf/simulated/floor/plasteel{
@@ -68314,97 +65740,51 @@
},
/area/toxins/xenobiology)
"cPe" = (
-/obj/structure/chair/office/light{
- dir = 1;
- pixel_y = 3
- },
/obj/effect/decal/warning_stripes/northwest,
/turf/simulated/floor/plasteel,
/area/toxins/xenobiology)
"cPf" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
+/obj/machinery/camera{
+ c_tag = "Experimention Lab";
+ dir = 1;
+ network = list("Research","SS13")
+ },
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+ dir = 8
},
/turf/simulated/floor/engine,
/area/toxins/explab)
"cPg" = (
/obj/structure/cable{
d1 = 1;
- d2 = 4;
- icon_state = "1-4"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 6
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 6
+ d2 = 8;
+ icon_state = "1-8"
},
/turf/simulated/floor/plasteel{
icon_state = "white"
},
-/area/medical/research)
+/area/toxins/misc_lab)
"cPh" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8";
- tag = ""
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
},
/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "whitepurplecorner"
+ icon_state = "white"
},
-/area/medical/research)
+/area/toxins/misc_lab)
"cPi" = (
/obj/machinery/atmospherics/pipe/manifold/visible,
/obj/effect/decal/warning_stripes/southeast,
/turf/simulated/floor/plasteel,
/area/maintenance/electrical)
-"cPj" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/structure/cable{
- d1 = 2;
- d2 = 8;
- icon_state = "2-8";
- tag = ""
- },
-/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "whitepurple"
- },
-/area/medical/research)
"cPk" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 10
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 9
- },
/obj/effect/landmark/start{
name = "Scientist"
},
/turf/simulated/floor/plasteel{
icon_state = "white"
},
-/area/medical/research)
-"cPl" = (
-/obj/structure/table/wood,
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "whitepurple"
- },
-/area/medical/research)
+/area/toxins/misc_lab)
"cPn" = (
/turf/simulated/floor/plasteel{
dir = 8;
@@ -68412,7 +65792,6 @@
},
/area/medical/research)
"cPo" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel{
@@ -68420,9 +65799,13 @@
},
/area/medical/research)
"cPq" = (
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
- dir = 1
+/obj/structure/railing{
+ dir = 4
+ },
+/obj/structure/table/glass,
+/obj/item/gps,
+/obj/item/flash{
+ pixel_x = -5
},
/turf/simulated/floor/plasteel{
dir = 1;
@@ -68430,23 +65813,22 @@
},
/area/medical/research)
"cPr" = (
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "whitepurple"
- },
+/obj/structure/flora/bush,
+/turf/simulated/floor/grass,
/area/medical/research)
"cPs" = (
-/obj/structure/disposalpipe/segment,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "whitepurple"
+ icon_state = "redyellowfull"
},
-/area/medical/research)
+/area/maintenance/apmaint)
"cPt" = (
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 1
+/obj/structure/railing{
+ dir = 8
},
+/obj/structure/table/glass,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "whitepurple"
@@ -68477,25 +65859,13 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
},
/area/hallway/primary/aft)
-"cPz" = (
-/obj/structure/disposalpipe/sortjunction{
- dir = 1;
- name = "Chemistry Junction";
- sortType = 13
- },
-/turf/simulated/floor/plasteel{
- icon_state = "bluecorner"
- },
-/area/hallway/primary/aft)
"cPA" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/door/firedoor,
/obj/effect/decal/warning_stripes/east,
/turf/simulated/floor/plasteel,
@@ -68504,18 +65874,13 @@
/turf/simulated/wall/r_wall,
/area/maintenance/starboardsolar)
"cPD" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 10;
icon_state = "whiteblue"
},
/area/medical/medbay)
"cPE" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
},
@@ -68525,13 +65890,13 @@
/area/medical/medbay)
"cPF" = (
/obj/structure/disposalpipe/segment{
- dir = 2;
+ dir = 8;
icon_state = "pipe-c"
},
/turf/simulated/floor/plasteel{
- icon_state = "whiteblue"
+ icon_state = "redyellowfull"
},
-/area/medical/medbay)
+/area/maintenance/apmaint)
"cPH" = (
/obj/effect/landmark{
name = "lightsout"
@@ -68541,13 +65906,13 @@
},
/area/medical/medbay)
"cPI" = (
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+ dir = 1
+ },
/obj/structure/disposalpipe/segment{
dir = 1;
icon_state = "pipe-c"
},
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
- dir = 1
- },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -68584,12 +65949,12 @@
},
/area/medical/medbay)
"cPM" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/disposalpipe/segment{
dir = 2;
icon_state = "pipe-c"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -68604,17 +65969,17 @@
name = "Privacy Shutters";
opacity = 0
},
+/obj/machinery/door/firedoor,
/turf/simulated/floor/plating,
/area/medical/psych)
"cPQ" = (
-/turf/simulated/floor/carpet,
+/turf/simulated/floor/wood,
/area/medical/psych)
"cPR" = (
-/obj/item/twohanded/required/kirbyplants,
/obj/structure/sign/poster/random{
pixel_x = 32
},
-/turf/simulated/floor/carpet,
+/turf/simulated/floor/wood,
/area/medical/psych)
"cPS" = (
/obj/effect/spawner/window/reinforced,
@@ -68688,16 +66053,10 @@
/turf/space,
/area/space/nearstation)
"cPY" = (
-/obj/machinery/access_button{
- command = "cycle_exterior";
- frequency = 1379;
- master_tag = "sw_maint_airlock";
- name = "exterior access button";
- pixel_x = 24;
- pixel_y = 24
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "neutral"
},
-/obj/structure/lattice/catwalk,
-/turf/space,
/area/space/nearstation)
"cPZ" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -68717,9 +66076,6 @@
/turf/simulated/floor/plasteel,
/area/maintenance/starboard)
"cQb" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/medical/glass{
id_tag = "medbayfoyer";
@@ -68729,6 +66085,9 @@
/obj/effect/mapping_helpers/airlock/unres{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "whiteblue"
},
@@ -68740,9 +66099,6 @@
/obj/structure/toilet{
dir = 4
},
-/obj/machinery/newscaster{
- pixel_y = 32
- },
/obj/effect/landmark{
name = "xeno_spawn";
pixel_x = -1
@@ -68750,6 +66106,9 @@
/obj/machinery/light/small{
dir = 1
},
+/obj/machinery/newscaster{
+ pixel_y = 32
+ },
/turf/simulated/floor/plating,
/area/medical/medbay3)
"cQd" = (
@@ -68769,17 +66128,13 @@
},
/obj/machinery/light,
/obj/item/paicard,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/crew_quarters/sleep)
"cQf" = (
/obj/structure/closet/secure_closet/personal/cabinet,
/obj/item/clothing/under/maid,
/obj/item/clothing/suit/browntrenchcoat,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/crew_quarters/sleep)
"cQg" = (
/obj/structure/dresser,
@@ -68800,13 +66155,13 @@
/area/crew_quarters/sleep)
"cQj" = (
/obj/machinery/light,
-/obj/machinery/computer/cryopod{
- pixel_y = -32
- },
/obj/machinery/camera{
c_tag = "Cryodorms Aft";
dir = 1
},
+/obj/machinery/computer/cryopod{
+ pixel_y = -32
+ },
/turf/simulated/floor/plasteel{
icon_state = "freezerfloor"
},
@@ -68879,13 +66234,9 @@
/turf/simulated/floor/plating,
/area/crew_quarters/fitness)
"cQs" = (
-/obj/structure/table,
-/obj/machinery/light/small{
- dir = 1
- },
/obj/effect/decal/warning_stripes/northwest,
/turf/simulated/floor/plasteel,
-/area/maintenance/port)
+/area/hallway/secondary/entry)
"cQu" = (
/obj/effect/decal/warning_stripes/yellow,
/turf/simulated/floor/plasteel{
@@ -68894,29 +66245,23 @@
},
/area/maintenance/port)
"cQv" = (
-/obj/machinery/space_heater,
-/obj/effect/decal/warning_stripes/northeast,
+/obj/structure/sign/pods{
+ pixel_x = -32
+ },
+/obj/effect/decal/warning_stripes/west,
/turf/simulated/floor/plasteel,
-/area/maintenance/port)
+/area/hallway/secondary/entry)
"cQw" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8";
- tag = ""
- },
-/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
+ dir = 6
},
-/obj/machinery/door/airlock/research{
- name = "Research Break Room";
- req_access_txt = "47"
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 10
},
/turf/simulated/floor/plasteel{
icon_state = "white"
},
-/area/medical/research)
+/area/toxins/misc_lab)
"cQx" = (
/obj/machinery/meter,
/obj/machinery/atmospherics/pipe/simple/visible{
@@ -68939,8 +66284,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/effect/decal/warning_stripes/northwest,
/turf/simulated/floor/plating,
@@ -68972,8 +66316,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/effect/decal/warning_stripes/northeast,
/turf/simulated/floor/plating,
@@ -68983,8 +66326,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d2 = 2;
@@ -69011,8 +66353,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door/window/brigdoor{
dir = 2;
@@ -69031,14 +66372,14 @@
},
/area/toxins/xenobiology)
"cQI" = (
-/obj/structure/disposalpipe/trunk{
- dir = 1
- },
-/obj/machinery/disposal,
/obj/structure/window/reinforced{
dir = 8
},
/obj/effect/decal/warning_stripes/yellow/hollow,
+/obj/structure/disposalpipe/trunk{
+ dir = 1
+ },
+/obj/machinery/disposal,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -69051,10 +66392,10 @@
/obj/item/stack/sheet/mineral/plasma,
/obj/item/reagent_containers/glass/beaker,
/obj/item/reagent_containers/dropper,
+/obj/effect/decal/warning_stripes/north,
/obj/machinery/newscaster{
pixel_x = 32
},
-/obj/effect/decal/warning_stripes/north,
/turf/simulated/floor/plasteel,
/area/toxins/xenobiology)
"cQK" = (
@@ -69071,14 +66412,12 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/effect/decal/warning_stripes/east,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -69111,8 +66450,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/turf/simulated/floor/plasteel{
@@ -69141,8 +66479,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/door/firedoor,
/obj/effect/decal/warning_stripes/east,
@@ -69161,8 +66498,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
icon_state = "white"
@@ -69170,14 +66506,16 @@
/area/toxins/xenobiology)
"cQU" = (
/obj/effect/decal/warning_stripes/west,
+/obj/structure/chair/office/light{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/toxins/xenobiology)
"cQV" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/warning_stripes/east,
/turf/simulated/floor/plasteel{
@@ -69198,34 +66536,13 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "neutral"
},
/area/maintenance/port)
-"cQZ" = (
-/obj/structure/cable,
-/obj/machinery/power/apc{
- dir = 8;
- name = "west bump";
- pixel_x = -24
- },
-/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "whitepurple"
- },
-/area/medical/research)
-"cRa" = (
-/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 1
- },
-/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
-/area/medical/research)
"cRb" = (
/obj/machinery/disposal,
/obj/structure/disposalpipe/trunk{
@@ -69235,14 +66552,15 @@
dir = 4;
icon_state = "whitepurple"
},
-/area/medical/research)
+/area/toxins/misc_lab)
"cRc" = (
-/obj/effect/spawner/window/reinforced,
-/obj/structure/disposalpipe/segment{
- dir = 4
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/public/glass{
+ name = "Public Access"
},
-/turf/simulated/floor/plating,
-/area/medical/research)
+/obj/structure/disposalpipe/segment,
+/turf/simulated/floor/plasteel,
+/area/hallway/primary/aft)
"cRd" = (
/obj/item/twohanded/required/kirbyplants,
/turf/simulated/floor/plasteel{
@@ -69252,12 +66570,10 @@
/area/medical/research)
"cRe" = (
/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel{
- icon_state = "white"
+ icon_state = "redyellowfull"
},
-/area/medical/research)
+/area/maintenance/apmaint)
"cRf" = (
/obj/structure/cable{
d1 = 2;
@@ -69278,24 +66594,21 @@
},
/area/medical/research)
"cRh" = (
-/obj/structure/disposalpipe/junction{
- dir = 1
- },
/turf/simulated/floor/plasteel{
icon_state = "bluecorner"
},
/area/hallway/primary/aft)
"cRi" = (
+/obj/effect/decal/cleanable/dirt,
/obj/structure/disposalpipe/segment{
- dir = 4
+ dir = 8;
+ icon_state = "pipe-c"
},
-/obj/effect/spawner/window/reinforced,
-/turf/simulated/floor/plating,
-/area/medical/medbay)
+/turf/simulated/floor/plasteel{
+ icon_state = "neutral"
+ },
+/area/maintenance/apmaint)
"cRj" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/item/twohanded/required/kirbyplants,
/turf/simulated/floor/plasteel{
dir = 8;
@@ -69311,10 +66624,7 @@
},
/area/medical/medbay)
"cRl" = (
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
- },
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "whiteblue"
@@ -69368,13 +66678,15 @@
dir = 10;
initialize_directions = 10
},
+/obj/machinery/hologram/holopad,
/turf/simulated/floor/wood,
/area/medical/psych)
"cRr" = (
-/obj/structure/closet/secure_closet/psychiatrist,
-/obj/item/clipboard{
- pixel_x = -5
+/obj/item/radio/intercom{
+ dir = 1;
+ pixel_x = 28
},
+/obj/item/twohanded/required/kirbyplants,
/turf/simulated/floor/wood,
/area/medical/psych)
"cRt" = (
@@ -69396,8 +66708,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -69437,8 +66748,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -69471,7 +66781,6 @@
},
/area/crew_quarters/fitness)
"cRB" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable{
d1 = 1;
d2 = 8;
@@ -69480,11 +66789,11 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
@@ -69503,10 +66812,8 @@
/turf/simulated/floor/plating,
/area/maintenance/starboardsolar)
"cRD" = (
-/obj/structure/rack,
-/obj/effect/decal/warning_stripes/west,
-/turf/simulated/floor/plasteel,
-/area/maintenance/port)
+/turf/simulated/wall/mineral/titanium,
+/area/shuttle/pod_2)
"cRE" = (
/obj/machinery/light/small{
dir = 8
@@ -69562,8 +66869,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/landmark{
name = "blobstart"
@@ -69594,8 +66900,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/machinery/door/window/brigdoor{
dir = 8;
@@ -69629,8 +66934,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/warning_stripes/west,
/turf/simulated/floor/plasteel{
@@ -69641,8 +66945,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/landmark/start{
name = "Scientist"
@@ -69661,8 +66964,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -69689,14 +66991,12 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/effect/landmark{
name = "lightsout"
@@ -69731,8 +67031,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -69753,8 +67052,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/effect/landmark/start{
name = "Scientist"
@@ -69778,10 +67076,12 @@
/turf/simulated/floor/plasteel,
/area/toxins/xenobiology)
"cSh" = (
-/obj/machinery/computer/camera_advanced/xenobio,
/obj/machinery/status_display{
pixel_x = 32
},
+/obj/machinery/computer/camera_advanced/xenobio{
+ dir = 8
+ },
/turf/simulated/floor/plasteel,
/area/toxins/xenobiology)
"cSi" = (
@@ -69796,15 +67096,6 @@
icon_state = "dark"
},
/area/toxins/xenobiology)
-"cSj" = (
-/obj/machinery/newscaster{
- pixel_x = -32
- },
-/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "whitepurple"
- },
-/area/medical/research)
"cSl" = (
/obj/machinery/light/small{
dir = 1
@@ -69823,25 +67114,23 @@
/obj/item/airlock_electronics,
/obj/item/stack/sheet/glass,
/obj/item/assembly/signaler,
+/obj/item/assembly/infra,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "whitepurplecorner"
},
/area/medical/research)
"cSn" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "whitepurplecorner"
},
/area/medical/research)
"cSp" = (
-/obj/structure/table,
/obj/machinery/light,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "whitepurplecorner"
@@ -69860,33 +67149,37 @@
},
/area/toxins/xenobiology)
"cSr" = (
-/obj/structure/disposalpipe/segment,
-/obj/structure/table,
-/obj/item/paper_bin,
-/obj/item/pen,
+/obj/structure/railing/corner{
+ dir = 8
+ },
+/obj/machinery/atmospherics/unary/vent_pump/on,
/turf/simulated/floor/plasteel{
- icon_state = "whitepurplecorner"
+ icon_state = "white"
},
/area/medical/research)
"cSs" = (
-/obj/structure/disposalpipe/trunk{
- dir = 1
+/obj/structure/table/glass,
+/obj/item/book/random{
+ pixel_x = 2;
+ pixel_y = 4
},
-/obj/machinery/disposal,
/turf/simulated/floor/plasteel{
- icon_state = "whitepurplecorner"
+ icon_state = "white"
},
-/area/medical/research)
+/area/medical/medbay)
"cSt" = (
/turf/simulated/floor/plasteel{
icon_state = "whitepurplecorner"
},
/area/medical/research)
"cSu" = (
-/obj/machinery/autolathe,
-/turf/simulated/floor/plasteel{
- icon_state = "whitepurplecorner"
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/turf/simulated/floor/grass,
/area/medical/research)
"cSv" = (
/obj/structure/table,
@@ -69936,8 +67229,8 @@
},
/area/medical/medbay)
"cSB" = (
-/obj/structure/disposalpipe/segment,
/obj/item/twohanded/required/kirbyplants,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "whitebluecorner"
@@ -69985,17 +67278,20 @@
},
/area/medical/medbay)
"cSG" = (
-/obj/structure/table,
-/obj/item/paper_bin,
-/obj/item/pen,
+/obj/machinery/vending/coffee,
/turf/simulated/floor/plasteel{
icon_state = "whitebluecorner"
},
/area/medical/medbay)
"cSH" = (
-/obj/structure/disposalpipe/segment,
/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"
+ },
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -70013,7 +67309,6 @@
/turf/simulated/floor/wood,
/area/medical/psych)
"cSJ" = (
-/obj/machinery/hologram/holopad,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
},
@@ -70026,14 +67321,17 @@
/obj/machinery/ai_status_display{
pixel_x = 32
},
+/obj/structure/closet/secure_closet/psychiatrist,
+/obj/item/clipboard{
+ pixel_x = -5
+ },
/turf/simulated/floor/wood,
/area/medical/psych)
"cSL" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -70072,6 +67370,7 @@
/turf/simulated/wall,
/area/medical/medbay2)
"cSP" = (
+/obj/machinery/vending/medical,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -70080,8 +67379,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door/airlock/medical/glass{
id_tag = "MedbayFoyer";
@@ -70119,7 +67417,7 @@
"cST" = (
/obj/structure/sink{
dir = 4;
- pixel_x = 10
+ pixel_x = 12
},
/obj/effect/decal/cleanable/vomit,
/obj/effect/decal/cleanable/dirt,
@@ -70224,9 +67522,9 @@
},
/area/crew_quarters/fitness)
"cTg" = (
-/obj/effect/spawner/random_spawners/wall_rusted_probably,
-/turf/simulated/wall/rust,
-/area/maintenance/port)
+/obj/effect/spawner/window/shuttle,
+/turf/simulated/floor/plating,
+/area/shuttle/pod_2)
"cTh" = (
/obj/machinery/atmospherics/pipe/manifold/visible{
dir = 1
@@ -70235,12 +67533,15 @@
/turf/simulated/floor/plasteel,
/area/maintenance/electrical)
"cTi" = (
-/obj/structure/reagent_dispensers/fueltank,
-/obj/effect/decal/warning_stripes/southwest,
-/turf/simulated/floor/plasteel,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/reagent_containers/glass/bucket,
+/obj/item/bikehorn/rubberducky,
+/turf/simulated/floor/plasteel{
+ icon_state = "neutral"
+ },
/area/maintenance/port)
"cTj" = (
-/obj/structure/closet/secure_closet/engineering_welding,
+/obj/structure/closet/toolcloset,
/turf/simulated/floor/plating,
/area/maintenance/electrical)
"cTk" = (
@@ -70277,8 +67578,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/light/small{
dir = 8
@@ -70300,25 +67600,23 @@
},
/area/toxins/xenobiology)
"cTq" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/effect/spawner/window/reinforced,
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plating,
/area/toxins/xenobiology)
"cTr" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/warning_stripes/west,
/turf/simulated/floor/plasteel{
@@ -70330,8 +67628,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/door/window/brigdoor{
id = null;
@@ -70357,14 +67654,12 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/effect/decal/warning_stripes/west,
/turf/simulated/floor/plasteel{
@@ -70375,8 +67670,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/warning_stripes/yellow,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -70393,14 +67687,12 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/machinery/camera{
c_tag = "Xenobio West";
@@ -70419,8 +67711,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/warning_stripes/west,
/obj/effect/decal/warning_stripes/east,
@@ -70450,8 +67741,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
@@ -70461,7 +67751,6 @@
},
/area/toxins/xenobiology)
"cTB" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/research{
name = "Research Division Access";
@@ -70470,10 +67759,10 @@
/obj/effect/decal/warning_stripes/south,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/medical/research)
"cTC" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/research{
name = "Research Division Access";
@@ -70494,8 +67783,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 8;
@@ -70505,8 +67793,8 @@
dir = 4;
initialize_directions = 11
},
-/obj/machinery/hologram/holopad,
/obj/effect/decal/warning_stripes/yellow/hollow,
+/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -70564,31 +67852,43 @@
/obj/machinery/light{
dir = 8
},
-/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 4
+/obj/structure/table/reinforced,
+/obj/item/clothing/mask/gas,
+/obj/item/crowbar,
+/obj/item/storage/box/pillbottles,
+/obj/item/storage/box/monkeycubes,
+/obj/item/stack/sheet/glass{
+ amount = 50;
+ pixel_x = 3;
+ pixel_y = 3
},
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "whitepurplecorner"
+/obj/item/stack/sheet/metal{
+ amount = 50
},
-/area/medical/research)
+/obj/item/stack/sheet/mineral/plasma{
+ layer = 2.9
+ },
+/turf/simulated/floor/engine,
+/area/toxins/misc_lab)
"cTJ" = (
-/obj/structure/chair/comfy/purp,
-/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "whitepurple"
- },
-/area/medical/research)
-"cTL" = (
/obj/item/twohanded/required/kirbyplants,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/toxins/misc_lab)
+"cTL" = (
/obj/machinery/light_switch{
pixel_x = 26
},
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "whitepurple"
+/obj/machinery/camera{
+ c_tag = "Research Chemistry";
+ dir = 8;
+ network = list("Research","SS13","Security")
},
-/area/medical/research)
+/obj/machinery/chem_dispenser,
+/obj/item/reagent_containers/glass/beaker/large,
+/turf/simulated/floor/engine,
+/area/toxins/misc_lab)
"cTM" = (
/obj/machinery/processor{
desc = "A machine used to process slimes and retrieve their extract.";
@@ -70627,15 +67927,15 @@
/turf/simulated/wall,
/area/toxins/lab)
"cTS" = (
-/obj/structure/disposalpipe/segment,
-/obj/effect/spawner/window/reinforced,
-/obj/machinery/door/poddoor/shutters/preopen{
- dir = 2;
- id_tag = "researchdesk1";
- name = "Research Desk Shutters"
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
},
-/turf/simulated/floor/plating,
-/area/toxins/lab)
+/obj/structure/disposalpipe/segment,
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "neutralfull"
+ },
+/area/hallway/primary/aft)
"cTT" = (
/obj/effect/spawner/window/reinforced,
/obj/machinery/door/poddoor/shutters/preopen{
@@ -70653,7 +67953,6 @@
},
/area/medical/research)
"cTV" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/light{
dir = 8
},
@@ -70666,7 +67965,6 @@
},
/area/hallway/primary/aft)
"cTW" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/extinguisher_cabinet{
pixel_x = 28
},
@@ -70687,7 +67985,7 @@
/turf/simulated/floor/plating,
/area/medical/medbay)
"cTZ" = (
-/obj/machinery/smartfridge/secure/chemistry,
+/obj/machinery/smartfridge/medbay,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -70711,13 +68009,13 @@
/turf/simulated/floor/plasteel,
/area/medical/medbay)
"cUb" = (
-/obj/structure/disposalpipe/segment,
/obj/effect/spawner/window/reinforced,
/obj/machinery/door/poddoor/shutters/preopen{
dir = 2;
id_tag = "chemdesk1";
name = "Chemistry Desk Shutters"
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/medical/medbay)
"cUc" = (
@@ -70782,14 +68080,9 @@
network = list("Medical","SS13","Security")
},
/obj/structure/cable,
-/turf/simulated/floor/wood,
-/area/medical/psych)
-"cUh" = (
-/obj/structure/chair/office/light,
-/obj/effect/landmark/start{
- name = "Psychiatrist"
- },
-/turf/simulated/floor/wood,
+/obj/structure/table/wood,
+/obj/item/flashlight/lamp/green,
+/turf/simulated/floor/carpet,
/area/medical/psych)
"cUi" = (
/obj/machinery/light{
@@ -70799,7 +68092,7 @@
dir = 8;
pixel_x = 24
},
-/turf/simulated/floor/wood,
+/turf/simulated/floor/carpet,
/area/medical/psych)
"cUj" = (
/obj/machinery/light{
@@ -70833,8 +68126,7 @@
},
/area/medical/medbay3)
"cUm" = (
-/obj/structure/closet/wardrobe/medical_white,
-/obj/item/storage/backpack/satchel_med,
+/obj/machinery/vending/medidrobe,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "neutralcorner"
@@ -70866,11 +68158,11 @@
},
/area/medical/medbay3)
"cUq" = (
+/obj/effect/decal/warning_stripes/yellow/hollow,
/obj/structure/disposalpipe/trunk{
dir = 8
},
/obj/machinery/disposal,
-/obj/effect/decal/warning_stripes/yellow/hollow,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "neutralcorner"
@@ -70895,27 +68187,22 @@
/obj/machinery/defibrillator_mount/loaded{
pixel_y = 30
},
+/obj/item/reagent_containers/spray/cleaner,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "whiteblue"
},
/area/medical/medbay3)
"cUu" = (
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
- },
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 8;
@@ -70931,31 +68218,13 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8";
- tag = ""
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- icon_state = "neutral"
- },
-/area/maintenance/starboard)
+/turf/simulated/floor/plasteel,
+/area/hallway/primary/aft)
"cUw" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -70967,14 +68236,10 @@
/turf/simulated/floor/plating,
/area/maintenance/starboard)
"cUx" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -70986,14 +68251,10 @@
/turf/simulated/floor/plating,
/area/maintenance/starboard)
"cUy" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -71007,14 +68268,10 @@
},
/area/maintenance/starboard)
"cUA" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -71022,17 +68279,16 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/turf/simulated/floor/plating,
-/area/maintenance/starboard)
-"cUB" = (
/obj/structure/disposalpipe/segment{
dir = 4
},
+/turf/simulated/floor/plating,
+/area/maintenance/starboard)
+"cUB" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 1
@@ -71043,14 +68299,10 @@
/turf/simulated/floor/plating,
/area/maintenance/starboard)
"cUC" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -71065,14 +68317,10 @@
},
/area/maintenance/starboard)
"cUD" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -71084,14 +68332,10 @@
/turf/simulated/floor/plasteel,
/area/maintenance/starboard)
"cUE" = (
-/obj/structure/disposalpipe/junction{
- dir = 4
- },
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -71105,10 +68349,6 @@
},
/area/crew_quarters/fitness)
"cUF" = (
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
- },
/obj/structure/cable{
d1 = 1;
d2 = 8;
@@ -71116,6 +68356,7 @@
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
@@ -71202,12 +68443,6 @@
icon_state = "neutral"
},
/area/maintenance/starboard)
-"cUN" = (
-/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "escape"
- },
-/area/crew_quarters/fitness)
"cUO" = (
/obj/structure/table/wood,
/obj/item/storage/fancy/crayons,
@@ -71217,14 +68452,28 @@
},
/area/crew_quarters/fitness)
"cUP" = (
-/obj/structure/mopbucket,
-/obj/item/mop,
-/turf/simulated/floor/plating,
-/area/maintenance/port)
+/obj/machinery/status_display{
+ layer = 4;
+ pixel_x = 32
+ },
+/obj/machinery/light{
+ dir = 4
+ },
+/obj/structure/chair/comfy/shuttle{
+ dir = 1
+ },
+/turf/simulated/floor/mineral/titanium/blue,
+/area/shuttle/pod_2)
"cUQ" = (
-/obj/item/reagent_containers/glass/bucket,
-/turf/simulated/floor/plating,
-/area/maintenance/port)
+/obj/item/radio/intercom{
+ dir = 4;
+ pixel_x = 28
+ },
+/obj/structure/chair/comfy/shuttle{
+ dir = 1
+ },
+/turf/simulated/floor/mineral/titanium/blue,
+/area/shuttle/pod_2)
"cUR" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/sign/securearea,
@@ -71249,8 +68498,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/structure/cable{
d1 = 1;
@@ -71265,8 +68513,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/effect/decal/warning_stripes/west,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -71281,15 +68528,15 @@
},
/area/toxins/xenobiology)
"cUV" = (
-/obj/machinery/disposal,
-/obj/structure/disposalpipe/trunk{
- dir = 8
- },
/obj/structure/window/reinforced{
dir = 1;
layer = 2.9
},
/obj/effect/decal/warning_stripes/yellow/hollow,
+/obj/machinery/disposal,
+/obj/structure/disposalpipe/trunk{
+ dir = 8
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -71303,18 +68550,18 @@
},
/area/toxins/xenobiology)
"cUX" = (
-/obj/machinery/hologram/holopad,
/obj/effect/decal/warning_stripes/yellow/hollow,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
/area/toxins/xenobiology)
"cUY" = (
-/obj/structure/disposalpipe/segment,
/obj/effect/decal/warning_stripes/northwest,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/medical/research)
"cUZ" = (
@@ -71333,10 +68580,12 @@
},
/area/toxins/xenobiology)
"cVc" = (
-/obj/structure/disposalpipe/segment,
-/obj/effect/decal/warning_stripes/northeast,
+/obj/structure/disposalpipe/junction{
+ dir = 1;
+ icon_state = "pipe-y"
+ },
/turf/simulated/floor/plasteel,
-/area/medical/research)
+/area/hallway/primary/aft)
"cVd" = (
/obj/structure/closet/firecloset,
/obj/effect/decal/warning_stripes/yellow/hollow,
@@ -71345,11 +68594,9 @@
},
/area/medical/research)
"cVe" = (
-/obj/structure/disposalpipe/trunk{
- dir = 4
- },
-/obj/machinery/disposal,
/obj/effect/decal/warning_stripes/northeast,
+/obj/machinery/disposal,
+/obj/structure/disposalpipe/trunk,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "whitepurplecorner"
@@ -71364,8 +68611,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/landmark/start{
name = "Scientist"
@@ -71387,25 +68633,19 @@
/turf/simulated/floor/plating,
/area/toxins/xenobiology)
"cVj" = (
-/obj/structure/table/wood,
/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "whitepurple"
+ icon_state = "white"
},
-/area/medical/research)
+/area/toxins/misc_lab)
"cVl" = (
-/obj/structure/table/wood,
-/obj/item/storage/box/donkpockets,
/obj/machinery/firealarm{
dir = 4;
pixel_x = 24;
pixel_y = -1
},
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "whitepurple"
- },
-/area/medical/research)
+/obj/machinery/chem_master,
+/turf/simulated/floor/engine,
+/area/toxins/misc_lab)
"cVm" = (
/obj/machinery/smartfridge/secure/extract,
/obj/machinery/light_switch{
@@ -71421,8 +68661,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/warning_stripes/southwest,
/turf/simulated/floor/plasteel,
@@ -71446,28 +68685,18 @@
/obj/effect/decal/warning_stripes/south,
/turf/simulated/floor/plasteel,
/area/toxins/xenobiology)
-"cVq" = (
-/obj/effect/decal/warning_stripes/yellow/hollow,
-/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
-/area/medical/research)
"cVr" = (
/obj/structure/sign/nosmoking_2,
/turf/simulated/wall,
/area/toxins/lab)
"cVs" = (
-/obj/structure/disposalpipe/segment,
/obj/effect/decal/warning_stripes/west,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/medical/research)
"cVt" = (
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
- },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "whitepurplecorner"
@@ -71511,9 +68740,6 @@
},
/area/toxins/lab)
"cVy" = (
-/obj/machinery/newscaster{
- pixel_y = 32
- },
/obj/structure/table,
/obj/item/stack/sheet/metal/fifty,
/obj/item/stack/sheet/glass/fifty{
@@ -71522,6 +68748,9 @@
},
/obj/item/wrench,
/obj/item/clothing/glasses/welding,
+/obj/machinery/newscaster{
+ pixel_y = 32
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "whitepurplecorner"
@@ -71536,7 +68765,6 @@
/turf/simulated/floor/plating,
/area/toxins/lab)
"cVA" = (
-/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "purplecorner"
@@ -71554,19 +68782,19 @@
"cVE" = (
/obj/structure/table/glass,
/obj/item/folder/white,
+/obj/item/assembly/timer{
+ pixel_x = -3;
+ pixel_y = -3
+ },
+/obj/item/assembly/igniter,
+/obj/item/assembly/igniter,
+/obj/item/assembly/timer{
+ pixel_x = -3;
+ pixel_y = -3
+ },
/obj/machinery/newscaster{
pixel_y = 32
},
-/obj/item/assembly/timer{
- pixel_x = -3;
- pixel_y = -3
- },
-/obj/item/assembly/igniter,
-/obj/item/assembly/igniter,
-/obj/item/assembly/timer{
- pixel_x = -3;
- pixel_y = -3
- },
/turf/simulated/floor/plasteel{
dir = 9;
icon_state = "whiteyellow"
@@ -71599,31 +68827,27 @@
/obj/effect/landmark/start{
name = "Chemist"
},
+/obj/structure/disposalpipe/segment{
+ dir = 4;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel,
/area/medical/chemistry)
"cVI" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/chem_dispenser,
/obj/effect/decal/warning_stripes/east,
+/obj/structure/disposalpipe/junction{
+ dir = 1;
+ icon_state = "pipe-j2"
+ },
/turf/simulated/floor/plasteel,
/area/medical/chemistry)
-"cVJ" = (
-/obj/machinery/camera{
- c_tag = "Research Hallway North";
- dir = 8;
- network = list("Research","SS13")
- },
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "whitepurplecorner"
- },
-/area/medical/research)
"cVK" = (
-/obj/structure/closet/wardrobe/chemistry_white,
/obj/effect/decal/warning_stripes/northwest,
/obj/structure/reagent_dispensers/fueltank/chem{
pixel_x = 32
},
+/obj/machinery/vending/chemdrobe,
/turf/simulated/floor/plasteel,
/area/medical/chemistry)
"cVL" = (
@@ -71636,7 +68860,9 @@
/turf/simulated/floor/plating,
/area/maintenance/starboardsolar)
"cVM" = (
-/obj/machinery/computer/med_data,
+/obj/machinery/computer/med_data{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "whitebluecorner"
@@ -71676,25 +68902,17 @@
},
/area/medical/medbay)
"cVQ" = (
-/obj/structure/table/wood,
-/obj/item/paper_bin{
- pixel_y = 5
- },
-/obj/item/pen/multi,
-/turf/simulated/floor/wood,
+/turf/simulated/floor/carpet,
/area/medical/psych)
"cVR" = (
-/obj/structure/table/wood,
-/obj/item/flashlight/lamp/green,
-/obj/item/storage/briefcase,
-/turf/simulated/floor/wood,
+/obj/structure/bed/psych,
+/turf/simulated/floor/carpet,
/area/medical/psych)
"cVS" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -71707,8 +68925,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
@@ -71758,17 +68975,16 @@
},
/area/assembly/robotics)
"cWb" = (
-/obj/structure/disposalpipe/segment,
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2";
- tag = ""
+/obj/effect/decal/warning_stripes/north,
+/obj/machinery/light{
+ dir = 1;
+ on = 1
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/plating,
-/area/maintenance/starboard)
+/obj/structure/disposalpipe/junction{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel,
+/area/hallway/secondary/exit)
"cWc" = (
/turf/simulated/wall/rust,
/area/medical/medbay3)
@@ -71776,11 +68992,11 @@
/turf/simulated/wall,
/area/medical/medbay3)
"cWe" = (
-/obj/structure/disposalpipe/trunk{
- dir = 1
- },
-/obj/machinery/disposal,
/obj/effect/decal/warning_stripes/yellow/hollow,
+/obj/machinery/disposal,
+/obj/structure/disposalpipe/trunk{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralcorner"
@@ -71811,10 +69027,7 @@
/area/crew_quarters/fitness)
"cWi" = (
/obj/structure/chair/stool,
-/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "escape"
- },
+/turf/simulated/floor/plasteel,
/area/crew_quarters/fitness)
"cWj" = (
/obj/machinery/vending/coffee,
@@ -71824,18 +69037,21 @@
},
/area/medical/medbay3)
"cWk" = (
-/obj/structure/table,
-/obj/item/bikehorn/rubberducky,
-/obj/effect/decal/warning_stripes/west,
-/turf/simulated/floor/plasteel,
+/obj/structure/lattice,
+/turf/simulated/wall/r_wall,
/area/maintenance/port)
"cWl" = (
/obj/effect/decal/warning_stripes/east,
+/obj/machinery/shieldgen,
/turf/simulated/floor/plasteel,
/area/maintenance/port)
"cWm" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/warning_stripes/yellow,
+/obj/machinery/portable_atmospherics/canister/air,
+/obj/machinery/atmospherics/unary/portables_connector{
+ layer = 2
+ },
/turf/simulated/floor/plasteel,
/area/maintenance/port)
"cWn" = (
@@ -71914,8 +69130,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -71928,30 +69143,11 @@
icon_state = "neutral"
},
/area/maintenance/port)
-"cWu" = (
-/obj/machinery/camera{
- c_tag = "Research Break Room";
- dir = 8;
- network = list("Research","SS13","Security")
- },
-/obj/machinery/light{
- dir = 4
- },
-/obj/machinery/alarm{
- dir = 8;
- pixel_x = 24
- },
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "whitepurple"
- },
-/area/medical/research)
"cWv" = (
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -71977,8 +69173,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -71996,8 +69191,8 @@
},
/area/toxins/xenobiology)
"cWz" = (
-/obj/machinery/hologram/holopad,
/obj/effect/decal/warning_stripes/yellow/hollow,
+/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
@@ -72013,8 +69208,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/warning_stripes/west,
/turf/simulated/floor/plasteel{
@@ -72031,12 +69225,12 @@
},
/area/toxins/xenobiology)
"cWD" = (
-/obj/structure/disposalpipe/segment,
/obj/effect/spawner/window/reinforced,
/obj/structure/cable{
d2 = 4;
icon_state = "0-4"
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/toxins/xenobiology)
"cWE" = (
@@ -72112,10 +69306,12 @@
},
/area/toxins/xenobiology)
"cWH" = (
-/obj/structure/disposalpipe/segment,
-/obj/effect/decal/warning_stripes/east,
+/obj/effect/decal/warning_stripes/north,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
-/area/medical/research)
+/area/hallway/secondary/exit)
"cWI" = (
/turf/simulated/floor/plasteel{
dir = 8;
@@ -72126,8 +69322,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 1;
@@ -72144,20 +69339,16 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
icon_state = "white"
},
/area/toxins/xenobiology)
"cWL" = (
-/obj/structure/table,
/obj/machinery/status_display{
pixel_y = -32
},
-/obj/item/gps,
-/obj/item/flash,
/obj/machinery/camera{
c_tag = "Research Lobby";
dir = 1;
@@ -72180,37 +69371,30 @@
/obj/item/stock_parts/matter_bin,
/obj/item/stock_parts/micro_laser,
/obj/effect/decal/warning_stripes/east,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "whitepurplecorner"
},
/area/toxins/lab)
"cWN" = (
-/obj/structure/chair/comfy/purp{
- dir = 1
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+ dir = 8
},
/turf/simulated/floor/plasteel{
- dir = 10;
- icon_state = "whitepurple"
+ icon_state = "white"
},
-/area/medical/research)
-"cWO" = (
-/obj/machinery/light,
-/turf/simulated/floor/plasteel{
- icon_state = "whitepurple"
- },
-/area/medical/research)
+/area/toxins/misc_lab)
"cWP" = (
-/obj/structure/table/wood,
-/obj/machinery/kitchen_machine/microwave{
- pixel_x = -3;
- pixel_y = 6
+/obj/machinery/light{
+ dir = 4
},
-/turf/simulated/floor/plasteel{
- dir = 6;
- icon_state = "whitepurple"
+/obj/structure/reagent_dispensers/fueltank/chem{
+ pixel_x = 32
},
-/area/medical/research)
+/obj/machinery/chem_heater,
+/turf/simulated/floor/engine,
+/area/toxins/misc_lab)
"cWQ" = (
/obj/machinery/r_n_d/destructive_analyzer,
/obj/effect/decal/warning_stripes/northwest,
@@ -72293,26 +69477,25 @@
},
/area/toxins/xenobiology)
"cXb" = (
-/obj/structure/closet/emcloset,
/obj/item/radio/intercom{
dir = 1;
name = "Station Intercom (General)";
pixel_y = -29
},
/obj/effect/decal/warning_stripes/yellow/hollow,
+/obj/structure/closet/emcloset,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
/area/medical/research)
"cXc" = (
-/obj/structure/disposalpipe/segment,
/obj/effect/decal/warning_stripes/southwest,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/medical/research)
"cXd" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/camera{
c_tag = "Central Hallway South 1";
dir = 8
@@ -72344,14 +69527,15 @@
/area/medical/chemistry)
"cXh" = (
/obj/effect/decal/warning_stripes/south,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/medical/chemistry)
"cXi" = (
+/obj/effect/decal/warning_stripes/southeast,
/obj/structure/disposalpipe/trunk{
dir = 1
},
/obj/machinery/disposal,
-/obj/effect/decal/warning_stripes/southeast,
/turf/simulated/floor/plasteel,
/area/medical/chemistry)
"cXj" = (
@@ -72368,8 +69552,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -72395,11 +69578,13 @@
},
/area/medical/medbay3)
"cXm" = (
-/obj/machinery/computer/crew,
/obj/item/radio/intercom{
dir = 8;
pixel_x = -28
},
+/obj/machinery/computer/crew{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "whiteblue"
@@ -72460,8 +69645,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 2;
@@ -72475,9 +69659,6 @@
},
/area/medical/medbay3)
"cXz" = (
-/obj/machinery/hologram/holopad{
- pixel_y = -16
- },
/obj/effect/landmark/start{
name = "Medical Doctor"
},
@@ -72492,6 +69673,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 9
},
+/obj/machinery/hologram/holopad{
+ pixel_y = -16
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -72600,10 +69784,7 @@
"cXP" = (
/obj/structure/table/wood,
/obj/item/stack/packageWrap,
-/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "escape"
- },
+/turf/simulated/floor/plasteel,
/area/crew_quarters/fitness)
"cXQ" = (
/obj/structure/table/wood,
@@ -72614,16 +69795,31 @@
},
/area/crew_quarters/fitness)
"cXR" = (
-/obj/structure/reagent_dispensers/watertank,
-/obj/machinery/light/small,
-/turf/simulated/floor/plating,
+/obj/machinery/embedded_controller/radio/airlock/airlock_controller{
+ id_tag = "sw_maint_airlock";
+ pixel_y = 25;
+ tag_airpump = "sw_maint_pump";
+ tag_chamber_sensor = "sw_maint_sensor";
+ tag_exterior_door = "sw_maint_outer";
+ tag_interior_door = "sw_maint_inner"
+ },
+/obj/machinery/airlock_sensor{
+ id_tag = "sw_maint_sensor";
+ pixel_y = 33
+ },
+/obj/effect/decal/warning_stripes/yellow,
+/obj/machinery/atmospherics/unary/vent_pump/high_volume{
+ dir = 4;
+ frequency = 1379;
+ id_tag = "sw_maint_pump"
+ },
+/turf/simulated/floor/plasteel,
/area/maintenance/port)
"cXS" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/warning_stripes/yellow,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
@@ -72635,6 +69831,9 @@
/area/maintenance/port)
"cXT" = (
/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/visible{
+ dir = 9
+ },
/turf/simulated/floor/plasteel,
/area/maintenance/port)
"cXU" = (
@@ -72664,8 +69863,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
@@ -72674,8 +69872,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
icon_state = "neutral"
@@ -72685,8 +69882,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plating,
/area/maintenance/port)
@@ -72694,8 +69890,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 1;
@@ -72714,10 +69909,6 @@
},
/area/maintenance/port)
"cYh" = (
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
- },
/obj/structure/closet/wardrobe/yellow,
/turf/simulated/floor/plasteel{
icon_state = "neutralcorner"
@@ -72739,9 +69930,11 @@
/area/medical/research)
"cYk" = (
/obj/structure/disposalpipe/segment,
-/obj/effect/decal/warning_stripes/southeast,
-/turf/simulated/floor/plasteel,
-/area/medical/research)
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "neutralfull"
+ },
+/area/hallway/secondary/exit)
"cYl" = (
/obj/structure/closet/l3closet/scientist,
/obj/effect/decal/warning_stripes/yellow/hollow,
@@ -72762,25 +69955,28 @@
/obj/item/stock_parts/manipulator,
/obj/item/stock_parts/manipulator,
/obj/effect/decal/warning_stripes/east,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "whitepurplecorner"
},
/area/toxins/lab)
"cYn" = (
-/obj/machinery/computer/rdconsole/core,
/obj/effect/decal/warning_stripes/southwest,
+/obj/machinery/computer/rdconsole/core{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/toxins/lab)
"cYo" = (
/obj/structure/extinguisher_cabinet{
- pixel_x = 28
+ pixel_y = -32
},
+/obj/item/twohanded/required/kirbyplants,
/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "whitepurplecorner"
+ icon_state = "white"
},
-/area/medical/research)
+/area/toxins/misc_lab)
"cYq" = (
/obj/effect/decal/warning_stripes/south,
/turf/simulated/floor/plasteel,
@@ -72791,47 +69987,6 @@
/obj/effect/decal/warning_stripes/southeast,
/turf/simulated/floor/plasteel,
/area/toxins/lab)
-"cYs" = (
-/obj/machinery/door/firedoor,
-/obj/effect/decal/warning_stripes/south,
-/obj/effect/decal/warning_stripes/north,
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "whitepurplecorner"
- },
-/area/medical/research)
-"cYt" = (
-/obj/machinery/door/firedoor,
-/obj/effect/decal/warning_stripes/south,
-/obj/effect/decal/warning_stripes/north,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
-/area/medical/research)
-"cYu" = (
-/obj/machinery/door/firedoor,
-/obj/effect/decal/warning_stripes/south,
-/obj/effect/decal/warning_stripes/north,
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "whitepurplecorner"
- },
-/area/medical/research)
-"cYv" = (
-/obj/structure/table,
-/obj/item/storage/box/bodybags{
- pixel_x = 5;
- pixel_y = 5
- },
-/obj/item/storage/box/gloves,
-/obj/effect/decal/warning_stripes/yellow,
-/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "whitepurplefull"
- },
-/area/medical/research)
"cYy" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel{
@@ -72839,26 +69994,13 @@
},
/area/toxins/lab)
"cYz" = (
-/obj/structure/table,
-/obj/item/crowbar,
-/obj/item/wrench,
-/obj/item/clothing/mask/gas,
-/obj/effect/decal/warning_stripes/yellow,
-/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "whitepurplefull"
- },
-/area/medical/research)
+/obj/effect/spawner/window/reinforced,
+/turf/simulated/floor/plating,
+/area/toxins/misc_lab)
"cYA" = (
-/obj/item/twohanded/required/kirbyplants,
-/obj/effect/decal/warning_stripes/yellow,
-/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "whitepurplefull"
- },
-/area/medical/research)
+/turf/simulated/wall,
+/area/toxins/misc_lab)
"cYB" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/research{
name = "Research Division Access";
@@ -72867,10 +70009,10 @@
/obj/effect/decal/warning_stripes/north,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/medical/research)
"cYC" = (
-/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "orangecorner"
},
@@ -72902,6 +70044,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -72958,8 +70101,14 @@
},
/area/medical/medbay)
"cYM" = (
-/obj/item/twohanded/required/kirbyplants,
+/obj/structure/table,
/obj/machinery/light/small,
+/obj/item/storage/box/masks,
+/obj/item/storage/box/gloves{
+ pixel_x = 5;
+ pixel_y = 5
+ },
+/obj/item/reagent_containers/spray/cleaner,
/turf/simulated/floor/plasteel{
icon_state = "whitebluecorner"
},
@@ -72973,9 +70122,14 @@
},
/area/medical/morgue)
"cYO" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -73013,8 +70167,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
icon_state = "white"
@@ -73034,6 +70187,11 @@
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 4
},
+/obj/item/storage/box/masks,
+/obj/item/storage/box/gloves{
+ pixel_x = 5;
+ pixel_y = 5
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralcorner"
@@ -73097,12 +70255,10 @@
},
/area/maintenance/starboard)
"cZd" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/sign/examroom{
@@ -73175,8 +70331,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door/airlock/maintenance{
name = "Gambling Den"
@@ -73222,7 +70377,6 @@
/turf/simulated/floor/plasteel,
/area/maintenance/electrical)
"cZr" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/research{
name = "Research Division Access";
@@ -73248,6 +70402,7 @@
/obj/item/stack/sheet/glass,
/obj/item/stack/sheet/glass,
/obj/effect/decal/warning_stripes/southeast,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "whitepurple"
@@ -73256,15 +70411,6 @@
"cZt" = (
/turf/simulated/wall,
/area/medical/research)
-"cZu" = (
-/obj/machinery/door/firedoor,
-/obj/effect/decal/warning_stripes/west,
-/obj/effect/decal/warning_stripes/east,
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "whitepurplecorner"
- },
-/area/medical/research)
"cZv" = (
/obj/structure/table/reinforced,
/obj/item/folder,
@@ -73291,18 +70437,8 @@
/turf/simulated/wall,
/area/medical/research)
"cZy" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/door/firedoor,
-/obj/effect/decal/warning_stripes/west,
-/obj/effect/decal/warning_stripes/east,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -73311,8 +70447,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
icon_state = "white"
@@ -73322,13 +70457,12 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/hologram/holopad{
pixel_x = -16
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -73407,8 +70541,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 9
@@ -73416,6 +70549,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -73452,6 +70586,7 @@
"cZM" = (
/obj/machinery/door/firedoor,
/obj/effect/decal/warning_stripes/yellow,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "whitebluecorner"
@@ -73470,8 +70605,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
icon_state = "whiteblue"
@@ -73483,7 +70617,6 @@
},
/area/medical/medbay3)
"cZR" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
},
@@ -73507,18 +70640,15 @@
},
/area/medical/medbay3)
"cZT" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 8;
@@ -73539,9 +70669,9 @@
},
/area/medical/medbay3)
"cZV" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "neutral"
},
@@ -73664,8 +70794,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plating,
/area/maintenance/gambling_den)
@@ -73688,8 +70817,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -73705,8 +70833,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -73723,8 +70850,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -73738,8 +70864,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
@@ -73797,8 +70922,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -73807,6 +70931,9 @@
dir = 1;
initialize_directions = 11
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
@@ -73836,12 +70963,11 @@
},
/area/medical/research)
"daB" = (
-/obj/structure/sign/poster/official/nanotrasen_logo{
- pixel_x = 32;
- pixel_y = 32
- },
+/obj/machinery/door/firedoor,
+/obj/effect/decal/warning_stripes/west,
+/obj/effect/decal/warning_stripes/east,
/turf/simulated/floor/plasteel{
- dir = 4;
+ dir = 1;
icon_state = "whitepurplecorner"
},
/area/medical/research)
@@ -73870,11 +70996,11 @@
/turf/simulated/wall/rust,
/area/toxins/xenobiology)
"daE" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
- dir = 4;
+ dir = 1;
icon_state = "whitepurplecorner"
},
/area/medical/research)
@@ -73884,8 +71010,8 @@
on = 1
},
/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "whitepurplecorner"
+ dir = 1;
+ icon_state = "whitepurple"
},
/area/medical/research)
"daG" = (
@@ -73908,11 +71034,15 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
/area/toxins/lab)
"daI" = (
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "whitepurplecorner"
@@ -73935,8 +71065,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/table,
/obj/item/disk/tech_disk{
@@ -73968,9 +71097,6 @@
},
/area/hallway/primary/aft)
"daO" = (
-/obj/structure/disposalpipe/junction{
- dir = 1
- },
/obj/structure/sign/chemistry{
pixel_x = 32;
pixel_y = 32
@@ -73980,9 +71106,6 @@
},
/area/hallway/primary/aft)
"daP" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/table/reinforced,
/obj/item/paper_bin,
/turf/simulated/floor/plasteel{
@@ -73990,17 +71113,17 @@
},
/area/hallway/primary/aft)
"daQ" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
},
-/obj/effect/spawner/window/reinforced,
-/obj/machinery/door/poddoor/shutters/preopen{
+/obj/structure/disposalpipe/segment,
+/turf/simulated/floor/plasteel{
dir = 8;
- id_tag = "chemdesk2";
- name = "Chemistry Desk Shutters"
+ icon_state = "neutralfull"
},
-/turf/simulated/floor/plating,
-/area/medical/chemistry)
+/area/hallway/secondary/exit)
"daR" = (
/obj/item/crowbar,
/obj/effect/decal/cleanable/dirt,
@@ -74043,8 +71166,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
icon_state = "white"
@@ -74064,11 +71186,11 @@
/obj/machinery/door/window/westleft{
dir = 4;
name = "Chemistry Desk";
- req_access_txt = "5; 33"
+ req_one_access_txt = "5;33"
},
/obj/machinery/door/window/westleft{
name = "Chemistry Desk";
- req_access_txt = "5; 33"
+ req_access_txt = "33"
},
/turf/simulated/floor/plasteel{
icon_state = "white"
@@ -74100,9 +71222,14 @@
},
/area/medical/cmo)
"dbb" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "whitebluefull"
},
@@ -74117,9 +71244,6 @@
},
/area/maintenance/starboardsolar)
"dbd" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/chem_dispenser,
/obj/effect/decal/warning_stripes/north,
/turf/simulated/floor/plasteel,
@@ -74142,6 +71266,7 @@
},
/area/medical/medbay)
"dbj" = (
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "whitepurple"
},
@@ -74150,8 +71275,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door/airlock/maintenance,
/turf/simulated/floor/plasteel,
@@ -74187,12 +71311,10 @@
/turf/simulated/floor/plating,
/area/maintenance/apmaint)
"dbq" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/sign/greencross{
@@ -74217,8 +71339,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door/firedoor,
/obj/effect/decal/warning_stripes/yellow,
@@ -74266,18 +71387,17 @@
"dbA" = (
/obj/item/hemostat,
/obj/effect/decal/cleanable/dirt,
+/obj/structure/table/tray,
/obj/machinery/newscaster{
pixel_y = -32
},
-/obj/structure/table/tray,
/turf/simulated/floor/plating,
/area/medical/surgery)
"dbB" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -74292,12 +71412,12 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/maintenance/apmaint)
"dbD" = (
@@ -74309,8 +71429,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plating,
/area/maintenance/gambling_den)
@@ -74318,15 +71437,13 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
/area/maintenance/gambling_den)
"dbF" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/medical/glass{
id_tag = null;
@@ -74334,6 +71451,7 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -74349,8 +71467,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 9
@@ -74366,11 +71483,11 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/maintenance/apmaint)
"dbJ" = (
@@ -74396,6 +71513,7 @@
/obj/machinery/light{
dir = 8
},
+/obj/structure/reagent_dispensers/fueltank,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "whitepurple"
@@ -74422,27 +71540,26 @@
},
/area/medical/research)
"dbR" = (
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
- icon_state = "white"
+ dir = 8;
+ icon_state = "neutralfull"
},
-/area/medical/research)
+/area/hallway/secondary/exit)
"dbS" = (
-/obj/structure/disposalpipe/segment{
+/obj/item/radio/beacon,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/obj/item/radio/beacon,
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -74467,41 +71584,37 @@
},
/area/toxins/lab)
"dbV" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
+/obj/item/twohanded/required/kirbyplants,
+/obj/effect/decal/warning_stripes/yellow,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
-/area/medical/research)
-"dbW" = (
-/obj/structure/disposalpipe/segment{
dir = 8;
- icon_state = "pipe-c"
+ icon_state = "neutralfull"
},
+/area/hallway/secondary/exit)
+"dbW" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
+/obj/structure/disposalpipe/sortjunction{
+ dir = 2;
+ icon_state = "pipe-j2s";
+ name = "Research Junction";
+ sortType = 12
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
/area/medical/research)
"dbX" = (
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -74513,6 +71626,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "whitepurple"
@@ -74538,6 +71654,10 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 8;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "whitepurplecorner"
@@ -74547,8 +71667,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/landmark/start{
name = "Scientist"
@@ -74596,11 +71715,11 @@
},
/area/hallway/primary/aft)
"dcg" = (
-/obj/structure/disposalpipe/trunk{
- dir = 8
- },
-/obj/machinery/disposal,
/obj/effect/decal/warning_stripes/northeast,
+/obj/machinery/disposal,
+/obj/structure/disposalpipe/trunk{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/medical/chemistry)
"dch" = (
@@ -74664,8 +71783,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -74682,8 +71800,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 1
@@ -74697,8 +71814,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
@@ -74707,24 +71823,29 @@
},
/area/medical/medbay)
"dcr" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/effect/landmark{
name = "lightsout"
},
/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/structure/disposalpipe/junction{
+ dir = 1
+ },
/turf/simulated/floor/plasteel{
icon_state = "whitebluefull"
},
@@ -74737,8 +71858,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -74746,6 +71866,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel{
dir = 1;
@@ -74756,14 +71879,12 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 1;
@@ -74772,6 +71893,9 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 1
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "whitebluefull"
},
@@ -74780,8 +71904,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 1;
@@ -74794,6 +71917,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -74802,43 +71928,40 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 1
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
/area/medical/medbay)
"dcy" = (
-/obj/structure/disposalpipe/junction{
- dir = 4;
- icon_state = "pipe-y"
- },
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
+/obj/structure/disposalpipe/junction{
+ dir = 8;
+ icon_state = "pipe-y"
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
/area/medical/medbay)
"dcz" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -74858,14 +71981,10 @@
},
/area/maintenance/apmaint)
"dcB" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/warning_stripes/yellow,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -74877,10 +71996,6 @@
/turf/simulated/floor/plasteel,
/area/maintenance/starboard)
"dcC" = (
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
- },
/obj/structure/cable{
d1 = 1;
d2 = 8;
@@ -74889,8 +72004,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 4;
@@ -74907,14 +72021,13 @@
},
/area/maintenance/starboard)
"dcD" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/door/airlock/medical/glass{
- id_tag = "";
name = "Staff Room";
req_access_txt = "5"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/medical/medbay3)
"dcE" = (
@@ -74926,8 +72039,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -74943,8 +72055,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -75006,8 +72117,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
@@ -75020,12 +72130,9 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
- },
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
+ icon_state = "1-2"
},
+/turf/simulated/floor/wood,
/area/maintenance/gambling_den)
"dcQ" = (
/turf/simulated/floor/plasteel{
@@ -75054,24 +72161,18 @@
/area/hallway/primary/aft)
"dcT" = (
/obj/structure/chair/wood,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/maintenance/gambling_den)
"dcU" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/table/wood/poker,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/maintenance/gambling_den)
"dcV" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
@@ -75138,21 +72239,11 @@
},
/turf/simulated/floor/plasteel,
/area/hallway/primary/aft)
-"dde" = (
-/obj/machinery/door/firedoor,
-/obj/effect/decal/warning_stripes/west,
-/obj/effect/decal/warning_stripes/east,
-/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "whitepurplecorner"
- },
-/area/medical/research)
"ddf" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -75186,9 +72277,8 @@
/area/toxins/lab)
"ddk" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/public/glass,
-/obj/structure/disposalpipe/segment{
- dir = 4
+/obj/machinery/door/airlock/public/glass{
+ name = "Public Access"
},
/turf/simulated/floor/plasteel{
icon_state = "neutralcorner"
@@ -75218,11 +72308,11 @@
/turf/simulated/floor/plasteel,
/area/hallway/primary/central)
"ddn" = (
+/obj/effect/decal/warning_stripes/yellow,
/obj/structure/disposalpipe/trunk{
dir = 1
},
/obj/machinery/disposal,
-/obj/effect/decal/warning_stripes/yellow,
/turf/simulated/floor/plasteel,
/area/hallway/primary/central)
"ddo" = (
@@ -75282,8 +72372,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -75310,18 +72399,22 @@
},
/area/maintenance/apmaint)
"ddw" = (
-/obj/structure/disposalpipe/segment,
+/obj/item/twohanded/required/kirbyplants,
+/obj/effect/decal/warning_stripes/yellow,
+/obj/machinery/disposal,
+/obj/structure/disposalpipe/trunk{
+ dir = 1
+ },
/turf/simulated/floor/plasteel{
dir = 8;
- icon_state = "whitepurplecorner"
+ icon_state = "neutralfull"
},
-/area/medical/research)
+/area/hallway/secondary/exit)
"ddx" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -75334,12 +72427,9 @@
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 4
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/library/abandoned)
"ddA" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel{
@@ -75350,9 +72440,7 @@
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 8
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/library/abandoned)
"ddC" = (
/obj/effect/spawner/window/reinforced,
@@ -75402,8 +72490,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
@@ -75458,18 +72545,13 @@
},
/area/hallway/primary/aft)
"ddL" = (
-/obj/machinery/smartfridge/medbay,
+/obj/machinery/smartfridge/secure/medbay,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/obj/machinery/door/window/westleft{
- dir = 4;
- name = "Chemistry Desk";
- req_access_txt = "5; 33"
- },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -75478,8 +72560,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/door/firedoor,
/obj/effect/decal/warning_stripes/yellow,
@@ -75489,6 +72570,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -75535,8 +72619,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
icon_state = "whiteyellow"
@@ -75546,8 +72629,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/light_switch{
pixel_x = 4;
@@ -75613,8 +72695,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -75625,15 +72706,14 @@
},
/area/maintenance/apmaint)
"ddX" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "whitebluefull"
},
@@ -75642,8 +72722,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 8;
@@ -75675,8 +72754,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
dir = 4;
@@ -75684,14 +72762,10 @@
},
/area/medical/medbay)
"dec" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/door/airlock/maintenance{
name = "Medbay Maintenance";
@@ -75709,8 +72783,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -75719,7 +72792,9 @@
},
/area/medical/medbay)
"deh" = (
-/obj/structure/disposalpipe/segment,
+/obj/structure/disposalpipe/junction{
+ dir = 1
+ },
/turf/simulated/floor/plasteel{
icon_state = "whitebluecorner"
},
@@ -75755,8 +72830,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -75791,8 +72865,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/shower{
dir = 4
@@ -75860,16 +72933,13 @@
/obj/effect/decal/cleanable/cobweb,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/library/abandoned)
"deA" = (
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/structure/cable{
d2 = 2;
@@ -75897,8 +72967,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -75908,8 +72977,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d2 = 4;
@@ -75929,8 +72997,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d2 = 4;
@@ -75947,15 +73014,13 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable,
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/structure/grille,
/obj/structure/window/reinforced{
@@ -75971,8 +73036,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -76045,8 +73109,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -76061,8 +73124,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -76081,10 +73143,10 @@
/obj/item/wrench,
/obj/item/crowbar,
/obj/item/clothing/mask/gas,
+/obj/effect/decal/warning_stripes/yellow/hollow,
/obj/machinery/newscaster{
pixel_x = -32
},
-/obj/effect/decal/warning_stripes/yellow/hollow,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "whitepurplecorner"
@@ -76123,7 +73185,12 @@
},
/area/library/abandoned)
"deV" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on,
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2";
+ tag = ""
+ },
/turf/simulated/floor/plasteel{
icon_state = "whitegreen"
},
@@ -76132,8 +73199,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
@@ -76169,8 +73235,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
@@ -76246,8 +73311,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d2 = 4;
@@ -76265,8 +73329,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/structure/cable{
d2 = 2;
@@ -76320,8 +73383,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/research{
@@ -76333,7 +73395,6 @@
},
/area/assembly/chargebay)
"dft" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/door/firedoor,
/obj/effect/decal/warning_stripes/yellow,
/turf/simulated/floor/plasteel{
@@ -76351,8 +73412,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/medical/glass{
@@ -76423,22 +73483,19 @@
},
/area/medical/medbay)
"dfF" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/medical/glass{
id_tag = null;
name = "Patient Room";
req_access_txt = "5"
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "cmo"
},
/area/medical/medbay)
"dfG" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
@@ -76449,8 +73506,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -76465,8 +73521,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -76495,8 +73550,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d2 = 2;
@@ -76518,8 +73572,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable,
/obj/structure/grille,
@@ -76561,8 +73614,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
@@ -76589,8 +73641,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -76620,8 +73671,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
icon_state = "white"
@@ -76695,8 +73745,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -76713,8 +73762,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 4;
- icon_state = "1-4";
- tag = ""
+ icon_state = "1-4"
},
/turf/simulated/floor/plasteel{
icon_state = "white"
@@ -76740,18 +73788,15 @@
/turf/simulated/floor/plasteel,
/area/toxins/misc_lab)
"dgq" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/effect/decal/warning_stripes/north,
/turf/simulated/floor/plasteel,
@@ -76760,8 +73805,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/door/airlock/maintenance{
name = "Xenobiology Maintenance";
@@ -76788,8 +73832,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/warning_stripes/west,
/turf/simulated/floor/plasteel,
@@ -76803,7 +73846,6 @@
},
/area/medical/research)
"dgw" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/door/firedoor,
/obj/machinery/firealarm{
dir = 4;
@@ -76823,17 +73865,16 @@
},
/area/medical/medbay)
"dgy" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door/firedoor,
/obj/effect/decal/warning_stripes/yellow,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -76849,8 +73890,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door/firedoor,
/obj/effect/decal/warning_stripes/yellow,
@@ -76861,7 +73901,6 @@
},
/area/medical/medbay)
"dgC" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/light{
dir = 8
},
@@ -76940,11 +73979,11 @@
dir = 1;
on = 1
},
-/obj/machinery/computer/cloning,
/obj/structure/sign/nosmoking_2{
pixel_y = 32
},
/obj/machinery/atmospherics/unary/vent_scrubber/on,
+/obj/machinery/computer/cloning,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "whitepurplecorner"
@@ -76968,6 +74007,8 @@
},
/area/medical/genetics_cloning)
"dgM" = (
+/obj/machinery/disposal,
+/obj/structure/disposalpipe/trunk,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "whitebluecorner"
@@ -76982,6 +74023,7 @@
/obj/item/storage/box/bodybags,
/obj/item/pen,
/obj/machinery/atmospherics/unary/vent_pump/on,
+/obj/item/reagent_containers/spray/cleaner,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "whitepurplecorner"
@@ -77012,15 +74054,14 @@
/turf/simulated/floor/plating,
/area/maintenance/apmaint)
"dgQ" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -77068,6 +74109,7 @@
},
/obj/item/screwdriver,
/obj/effect/decal/warning_stripes/north,
+/obj/item/reagent_containers/spray/cleaner,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -77085,8 +74127,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -77146,8 +74187,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/turf/simulated/floor/plating,
/area/maintenance/starboard)
@@ -77265,9 +74305,7 @@
/obj/structure/chair/wood{
dir = 4
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/maintenance/gambling_den)
"dhx" = (
/obj/effect/landmark{
@@ -77294,11 +74332,8 @@
/obj/structure/girder,
/obj/structure/grille,
/obj/machinery/door/poddoor{
- density = 0;
- icon_state = "pdoor0";
id_tag = "maintrobotics";
- name = "Decrepit Blast Door";
- opacity = 0
+ name = "Decrepit Blast Door"
},
/obj/effect/decal/warning_stripes/east,
/obj/effect/decal/warning_stripes/west,
@@ -77308,8 +74343,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/door/airlock/maintenance{
name = "Experimentor Maintenance";
@@ -77336,8 +74370,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 1;
@@ -77365,8 +74398,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/effect/decal/warning_stripes/south,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -77385,8 +74417,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 1;
@@ -77411,8 +74442,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/warning_stripes/south,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -77431,28 +74461,23 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 1;
- initialize_directions = 11
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
},
-/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
/area/toxins/explab)
"dhL" = (
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
- },
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -77460,19 +74485,18 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/table/reinforced,
+/obj/effect/decal/warning_stripes/northwest,
+/obj/item/book/manual/experimentor,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
/area/toxins/explab)
"dhM" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -77480,6 +74504,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/chair/office/light,
+/obj/effect/landmark/start{
+ name = "Scientist"
+ },
+/obj/effect/decal/warning_stripes/north,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -77507,36 +74536,34 @@
},
/area/crew_quarters/hor)
"dhQ" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
/area/toxins/explab)
"dhR" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable{
d1 = 1;
d2 = 8;
icon_state = "1-8"
},
-/obj/structure/table/reinforced,
-/obj/item/taperecorder,
-/obj/item/stack/sheet/mineral/plasma,
-/obj/effect/decal/warning_stripes/northwest,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/table/reinforced,
+/obj/item/hand_labeler,
+/obj/item/stack/packageWrap,
+/obj/effect/decal/warning_stripes/northeast,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -77564,34 +74591,18 @@
},
/area/toxins/xenobiology)
"dhT" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/hologram/holopad,
-/obj/structure/chair/office/light,
-/obj/effect/landmark/start{
- name = "Scientist"
- },
-/obj/effect/decal/warning_stripes/north,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
/area/toxins/explab)
"dhU" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/structure/table/reinforced,
-/obj/item/clipboard,
-/obj/item/folder/white,
-/obj/item/pen,
-/obj/effect/decal/warning_stripes/northeast,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
@@ -77603,9 +74614,6 @@
},
/area/toxins/explab)
"dhV" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/effect/decal/warning_stripes/yellow,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -77613,14 +74621,14 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "whitepurplecorner"
},
/area/toxins/explab)
"dhW" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/effect/decal/warning_stripes/yellow/hollow,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -77628,6 +74636,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -77645,9 +74656,6 @@
},
/area/medical/research)
"dhY" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/effect/decal/warning_stripes/west,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -77655,16 +74663,15 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/turf/simulated/floor/plasteel,
-/area/medical/research)
-"dhZ" = (
/obj/structure/disposalpipe/segment{
dir = 4
},
+/turf/simulated/floor/plasteel,
+/area/medical/research)
+"dhZ" = (
/obj/effect/landmark{
name = "lightsout"
},
-/obj/machinery/hologram/holopad,
/obj/effect/decal/warning_stripes/yellow/hollow,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 4;
@@ -77673,43 +74680,45 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel,
/area/medical/research)
"dia" = (
+/obj/effect/decal/cleanable/dirt,
/obj/structure/disposalpipe/segment{
dir = 2;
icon_state = "pipe-c"
},
-/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel,
/area/toxins/misc_lab)
"dib" = (
+/obj/effect/decal/warning_stripes/east,
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/effect/decal/warning_stripes/east,
/turf/simulated/floor/plasteel,
/area/medical/research)
"dic" = (
+/obj/effect/decal/warning_stripes/west,
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/effect/decal/warning_stripes/west,
/turf/simulated/floor/plasteel,
/area/toxins/misc_lab)
"did" = (
-/obj/structure/disposalpipe/junction{
- dir = 4;
- icon_state = "pipe-j2"
- },
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/warning_stripes/yellow/hollow,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/toxins/misc_lab)
"die" = (
@@ -77725,8 +74734,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/warning_stripes/southwest,
/turf/simulated/floor/plasteel,
@@ -77736,8 +74744,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d2 = 2;
@@ -77759,26 +74766,20 @@
},
/area/medical/research)
"dii" = (
-/obj/structure/disposalpipe/sortjunction{
- dir = 1;
- name = "Robotics Junction";
- sortType = 13
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
-/area/medical/research)
-"dij" = (
/obj/structure/disposalpipe/segment{
dir = 2;
icon_state = "pipe-c"
},
/turf/simulated/floor/plasteel{
- icon_state = "whitepurplecorner"
+ icon_state = "white"
},
/area/medical/research)
+"dij" = (
+/obj/structure/grille,
+/turf/space,
+/area/space/nearstation)
"dik" = (
/turf/simulated/floor/plasteel{
dir = 1;
@@ -77817,14 +74818,15 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/effect/decal/warning_stripes/northwest,
/turf/simulated/floor/plasteel,
/area/assembly/chargebay)
"dio" = (
-/obj/machinery/computer/mech_bay_power_console,
+/obj/machinery/computer/mech_bay_power_console{
+ dir = 8
+ },
/turf/simulated/floor/bluegrid,
/area/assembly/chargebay)
"dip" = (
@@ -77834,8 +74836,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/warning_stripes/north,
/turf/simulated/floor/plasteel,
@@ -77844,8 +74845,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 1;
@@ -77884,7 +74884,6 @@
},
/area/assembly/chargebay)
"diu" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/camera{
c_tag = "Central Hallway South 2";
dir = 4
@@ -77909,10 +74908,10 @@
/turf/simulated/floor/plasteel,
/area/medical/paramedic)
"diy" = (
-/obj/machinery/hologram/holopad,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -77921,8 +74920,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 4;
- icon_state = "1-4";
- tag = ""
+ icon_state = "1-4"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 6
@@ -77979,6 +74977,9 @@
/area/maintenance/apmaint)
"diE" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -77989,6 +74990,9 @@
d2 = 4;
icon_state = "1-4"
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "whitepurplecorner"
@@ -78005,8 +75009,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/medical/glass{
@@ -78014,27 +75017,31 @@
name = "Medbay Cloning";
req_access_txt = "5"
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "whitepurple"
},
/area/medical/genetics_cloning)
"diI" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/junction{
+ dir = 1;
+ icon_state = "pipe-j2"
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -78043,8 +75050,10 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
},
/turf/simulated/floor/plasteel{
dir = 1;
@@ -78109,8 +75118,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -78199,9 +75207,7 @@
/obj/structure/chair/wood{
dir = 8
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/maintenance/gambling_den)
"djb" = (
/obj/structure/table/reinforced,
@@ -78216,8 +75222,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/door/airlock/maintenance,
/obj/structure/barricade/wooden,
@@ -78234,17 +75239,13 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/girder,
/obj/structure/grille,
/obj/machinery/door/poddoor{
- density = 0;
- icon_state = "pdoor0";
id_tag = "maintrobotics";
- name = "Decrepit Blast Door";
- opacity = 0
+ name = "Decrepit Blast Door"
},
/obj/effect/decal/warning_stripes/east,
/obj/effect/decal/warning_stripes/west,
@@ -78264,15 +75265,15 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/warning_stripes/yellow,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+ dir = 1;
+ initialize_directions = 11
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 1
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -78283,8 +75284,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/warning_stripes/southeast,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -78313,8 +75313,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -78331,8 +75330,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 1;
@@ -78358,8 +75356,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/warning_stripes/yellow,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -78373,10 +75370,9 @@
},
/area/medical/research)
"djn" = (
-/obj/structure/table,
-/obj/item/stack/medical/bruise_pack,
-/obj/item/stack/medical/ointment,
/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{
dir = 8;
icon_state = "whitepurplecorner"
@@ -78384,8 +75380,12 @@
/area/toxins/explab)
"djo" = (
/obj/effect/decal/warning_stripes/yellow,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/door_control{
+ id = "experimentor";
+ name = "Experimentor Control";
+ pixel_x = -6;
+ pixel_y = -26
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "whitepurplecorner"
@@ -78407,12 +75407,9 @@
},
/area/crew_quarters/hor)
"djs" = (
-/obj/structure/table/reinforced,
-/obj/item/clothing/gloves/color/white,
-/obj/item/clothing/gloves/color/white,
-/obj/item/clothing/glasses/science,
-/obj/item/clothing/glasses/science,
-/obj/effect/decal/warning_stripes/northwest,
+/obj/machinery/computer/rdconsole/experiment{
+ dir = 1
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "whitepurplecorner"
@@ -78420,16 +75417,17 @@
/area/toxins/explab)
"djt" = (
/obj/structure/table/reinforced,
-/obj/item/book/manual/experimentor,
-/obj/item/healthanalyzer,
-/obj/effect/decal/warning_stripes/northwestcorner,
+/obj/item/clothing/gloves/color/white,
+/obj/item/clothing/gloves/color/white,
+/obj/item/clothing/glasses/science,
+/obj/item/clothing/glasses/science,
+/obj/effect/decal/warning_stripes/east,
/turf/simulated/floor/plasteel{
- icon_state = "whitepurple"
+ dir = 8;
+ icon_state = "whitepurplecorner"
},
/area/toxins/explab)
"dju" = (
-/obj/machinery/computer/rdconsole/experiment,
-/obj/effect/decal/warning_stripes/yellow/hollow,
/turf/simulated/floor/plasteel{
icon_state = "whitepurplecorner"
},
@@ -78439,20 +75437,20 @@
/turf/simulated/wall,
/area/toxins/explab)
"djw" = (
-/obj/structure/table/reinforced,
-/obj/item/stack/packageWrap,
-/obj/item/hand_labeler,
-/obj/effect/decal/warning_stripes/northeastcorner,
+/obj/machinery/vending/wallmed{
+ name = "Emergency NanoMed";
+ pixel_y = -32
+ },
/turf/simulated/floor/plasteel{
icon_state = "whitepurplecorner"
},
/area/toxins/explab)
"djx" = (
-/obj/structure/table/reinforced,
/obj/machinery/light,
-/obj/item/paper_bin,
-/obj/item/pen,
-/obj/effect/decal/warning_stripes/northeast,
+/obj/structure/disposalpipe/trunk{
+ dir = 1
+ },
+/obj/machinery/disposal,
/turf/simulated/floor/plasteel{
icon_state = "whitepurplecorner"
},
@@ -78514,33 +75512,30 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/effect/decal/warning_stripes/south,
/turf/simulated/floor/plasteel,
/area/toxins/misc_lab)
"djG" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 1;
d2 = 4;
icon_state = "1-4";
- tag = "90Curve"
+ tag = null
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
},
/turf/simulated/floor/plasteel{
dir = 1;
@@ -78548,20 +75543,15 @@
},
/area/crew_quarters/hor)
"djH" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 6
@@ -78569,20 +75559,19 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 6
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "whitepurple"
},
/area/crew_quarters/hor)
"djI" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -78590,34 +75579,32 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "whitepurplecorner"
},
/area/crew_quarters/hor)
"djJ" = (
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/effect/decal/warning_stripes/yellow,
/obj/structure/disposalpipe/segment{
dir = 1;
icon_state = "pipe-c"
},
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8";
- tag = ""
- },
-/obj/effect/decal/warning_stripes/yellow,
/turf/simulated/floor/plasteel,
/area/toxins/misc_lab)
"djK" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 1;
@@ -78630,19 +75617,18 @@
req_access = null;
req_access_txt = "30"
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
/area/crew_quarters/hor)
"djL" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -78650,21 +75636,19 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "whitepurplecorner"
},
/area/medical/research)
"djM" = (
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
- },
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 4;
@@ -78674,6 +75658,11 @@
dir = 4;
initialize_directions = 11
},
+/obj/structure/disposalpipe/sortjunction{
+ dir = 2;
+ name = "RD Junction 1";
+ sortType = 13
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -78703,8 +75692,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/door/airlock/maintenance{
name = "Paramedic's maintenance";
@@ -78779,6 +75767,10 @@
dir = 1;
initialize_directions = 11
},
+/obj/structure/disposalpipe/segment{
+ dir = 4;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -78788,6 +75780,9 @@
dir = 4
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -78799,6 +75794,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "whitebluecorner"
},
@@ -78819,24 +75817,31 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "whitebluecorner"
},
/area/medical/medbay)
"dkg" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 4;
initialize_directions = 11
},
/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
+/obj/structure/disposalpipe/sortjunction{
+ dir = 1;
+ icon_state = "pipe-j2s";
+ name = "Genetics Junction";
+ sortType = 23
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -78861,6 +75866,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "whiteblue"
},
@@ -78946,8 +75954,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable,
/obj/structure/grille,
@@ -78982,12 +75989,12 @@
},
/area/medical/research)
"dkx" = (
-/obj/structure/disposalpipe/trunk{
- dir = 1
- },
-/obj/machinery/disposal,
/obj/machinery/light,
/obj/effect/decal/warning_stripes/yellow/hollow,
+/obj/structure/table/reinforced,
+/obj/item/taperecorder,
+/obj/item/stack/sheet/mineral/plasma,
+/obj/effect/decal/warning_stripes/west,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "whitepurplecorner"
@@ -79032,36 +76039,35 @@
/turf/simulated/floor/plating,
/area/maintenance/apmaint)
"dkD" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door_control{
- id = "experimentor";
- name = "Experimentor Control";
- pixel_x = -26
+/obj/machinery/atmospherics/trinary/mixer{
+ dir = 1;
+ name = "air mixer";
+ node1_concentration = 0.8;
+ node2_concentration = 0.2;
+ on = 1;
+ target_pressure = 4500
},
-/obj/machinery/door/poddoor/preopen{
- id_tag = "experimentor";
- name = "Experimentor Blast Door"
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "neutralfull"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/engine,
-/area/toxins/explab)
+/area/atmos)
"dkE" = (
/obj/structure/sign/securearea,
/turf/simulated/wall/r_wall,
/area/toxins/explab)
"dkF" = (
-/obj/machinery/status_display,
-/turf/simulated/wall/r_wall,
-/area/toxins/explab)
-"dkH" = (
+/obj/effect/spawner/window/reinforced,
/obj/machinery/door/poddoor/preopen{
id_tag = "experimentor";
name = "Experimentor Blast Door"
},
-/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
/area/toxins/explab)
+"dkH" = (
+/obj/machinery/status_display,
+/turf/simulated/wall/r_wall,
+/area/toxins/mixing)
"dkI" = (
/turf/simulated/wall/r_wall,
/area/toxins/mixing)
@@ -79074,22 +76080,22 @@
/turf/simulated/floor/plating,
/area/toxins/mixing)
"dkL" = (
-/obj/structure/disposalpipe/junction{
- dir = 4
- },
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/effect/decal/warning_stripes/yellow,
+/obj/structure/disposalpipe/sortjunction{
+ dir = 4;
+ name = "RD Junction 2";
+ sortType = 13
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "whitepurplecorner"
@@ -79103,8 +76109,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/engine,
/area/toxins/misc_lab)
@@ -79115,14 +76120,10 @@
/turf/simulated/floor/engine,
/area/toxins/misc_lab)
"dkQ" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/warning_stripes/yellow,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -79131,16 +76132,19 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "whitepurplecorner"
},
/area/crew_quarters/hor)
"dkR" = (
-/obj/machinery/hologram/holopad,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -79149,8 +76153,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/chair/office/light,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
@@ -79175,14 +76178,10 @@
},
/area/crew_quarters/hor)
"dkU" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 1;
@@ -79201,6 +76200,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -79218,8 +76220,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 8;
@@ -79229,12 +76230,12 @@
dir = 8;
initialize_directions = 11
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
/area/medical/research)
"dkX" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
@@ -79284,13 +76285,13 @@
/turf/simulated/floor/plasteel,
/area/assembly/chargebay)
"dlb" = (
-/obj/machinery/hologram/holopad,
/obj/effect/landmark/start{
name = "Roboticist"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel,
/area/assembly/chargebay)
"dlc" = (
@@ -79306,7 +76307,6 @@
},
/area/medical/medbay)
"dle" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/alarm{
dir = 8;
pixel_x = 24
@@ -79401,6 +76401,7 @@
"dlq" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -79453,8 +76454,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -79481,7 +76481,6 @@
/turf/simulated/wall,
/area/medical/surgery)
"dlA" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 6
},
@@ -79489,6 +76488,7 @@
dir = 10;
initialize_directions = 10
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "redbluefull"
},
@@ -79520,9 +76520,9 @@
},
/area/hallway/secondary/exit)
"dlE" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "whitebluecorner"
@@ -79532,8 +76532,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
@@ -79555,8 +76554,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/cleanable/blood,
/turf/simulated/floor/plasteel{
@@ -79586,15 +76584,11 @@
/area/maintenance/port)
"dlO" = (
/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 5
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/engine,
/area/toxins/explab)
"dlP" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 8
},
/turf/simulated/floor/engine,
/area/toxins/explab)
@@ -79611,13 +76605,19 @@
},
/area/toxins/mixing)
"dlS" = (
+/obj/machinery/atmospherics/unary/portables_connector{
+ dir = 8
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "whitepurplecorner"
},
/area/toxins/mixing)
"dlT" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 8;
+ initialize_directions = 11
+ },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel{
dir = 1;
@@ -79625,13 +76625,15 @@
},
/area/toxins/mixing)
"dlU" = (
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 8
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "whitepurplecorner"
},
/area/toxins/mixing)
"dlV" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable,
/obj/machinery/power/apc{
dir = 8;
@@ -79643,18 +76645,20 @@
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "whitepurplecorner"
},
/area/crew_quarters/hor)
"dlW" = (
-/obj/machinery/hologram/holopad,
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
+/obj/structure/disposalpipe/segment,
+/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -79663,31 +76667,27 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/engine,
/area/toxins/misc_lab)
"dlY" = (
-/obj/machinery/firealarm{
- dir = 8;
- pixel_x = -26
+/obj/machinery/atmospherics/binary/pump{
+ dir = 8
},
-/obj/structure/closet/bombcloset,
-/obj/effect/decal/warning_stripes/southeast,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "whitepurplecorner"
},
/area/toxins/mixing)
"dlZ" = (
-/obj/structure/closet/bombcloset,
+/obj/structure/closet/secure_closet/scientist,
/obj/machinery/light_switch{
pixel_x = 26;
pixel_y = 26
},
-/obj/effect/decal/warning_stripes/southwest,
+/obj/effect/decal/warning_stripes/west,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "whitepurplecorner"
@@ -79697,8 +76697,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
icon_state = "white"
@@ -79708,8 +76707,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 1;
@@ -79751,7 +76749,6 @@
/turf/simulated/floor/greengrid,
/area/assembly/chargebay)
"dmh" = (
-/obj/structure/disposalpipe/segment,
/obj/item/radio/intercom{
dir = 4;
pixel_x = 28
@@ -79886,9 +76883,9 @@
},
/area/medical/surgeryobs)
"dmA" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -79914,8 +76911,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
@@ -80103,8 +77099,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
@@ -80113,42 +77108,66 @@
},
/area/maintenance/port)
"dnc" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/engine,
-/area/toxins/explab)
-"dnd" = (
-/mob/living/simple_animal/pet/dog/pug,
-/turf/simulated/floor/engine,
-/area/toxins/explab)
-"dne" = (
-/obj/effect/landmark{
- name = "revenantspawn"
- },
-/turf/simulated/floor/engine,
-/area/toxins/explab)
-"dnf" = (
/obj/machinery/r_n_d/experimentor,
/turf/simulated/floor/engine,
/area/toxins/explab)
+"dnd" = (
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/structure/cable{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "neutralfull"
+ },
+/area/security/brig)
+"dne" = (
+/obj/structure/cable{
+ d2 = 2;
+ icon_state = "0-2"
+ },
+/obj/machinery/power/apc{
+ dir = 1;
+ name = "north bump";
+ pixel_y = 24
+ },
+/turf/simulated/floor/wood,
+/area/ntrep)
+"dnf" = (
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
+/turf/simulated/floor/wood,
+/area/ntrep)
"dng" = (
/turf/simulated/floor/engine,
/area/toxins/explab)
"dnh" = (
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
+/obj/machinery/atmospherics/pipe/manifold/visible{
+ dir = 8
},
/turf/simulated/floor/engine,
-/area/toxins/explab)
+/area/toxins/mixing)
"dni" = (
/obj/effect/decal/warning_stripes/east,
/turf/simulated/floor/engine,
/area/toxins/misc_lab)
"dnj" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 4;
- initialize_directions = 11
- },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 8;
initialize_directions = 11
@@ -80158,17 +77177,16 @@
},
/area/toxins/mixing)
"dnk" = (
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/effect/decal/warning_stripes/yellow,
/obj/structure/disposalpipe/trunk{
dir = 1
},
/obj/machinery/disposal,
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8";
- tag = ""
- },
-/obj/effect/decal/warning_stripes/yellow,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "whitepurple"
@@ -80194,8 +77212,10 @@
/obj/machinery/ai_status_display{
pixel_x = 32
},
-/obj/machinery/computer/card/minor/rd,
/obj/effect/decal/warning_stripes/yellow/hollow,
+/obj/machinery/computer/card/minor/rd{
+ dir = 8
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "whitepurple"
@@ -80205,8 +77225,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 1;
@@ -80215,7 +77234,9 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/computer/aifixer,
+/obj/machinery/computer/aifixer{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -80224,8 +77245,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/chair/office/light{
dir = 1;
@@ -80239,15 +77259,15 @@
},
/area/crew_quarters/hor)
"dnr" = (
-/obj/machinery/alarm{
- dir = 4;
- pixel_x = -24
- },
-/obj/effect/decal/warning_stripes/yellow,
-/obj/machinery/atmospherics/unary/vent_pump/on{
+/obj/machinery/atmospherics/pipe/simple/insulated{
dir = 4
},
-/obj/structure/closet/secure_closet/scientist,
+/obj/machinery/computer/general_air_control{
+ dir = 4;
+ frequency = 1222;
+ name = "Bomb Mix Monitor";
+ sensors = list("burn_sensor" = "Burn Mix")
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "whitepurplecorner"
@@ -80269,8 +77289,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/warning_stripes/west,
/turf/simulated/floor/plasteel,
@@ -80286,7 +77305,9 @@
},
/area/assembly/chargebay)
"dnA" = (
-/obj/machinery/computer/mech_bay_power_console,
+/obj/machinery/computer/mech_bay_power_console{
+ dir = 8
+ },
/turf/simulated/floor/greengrid,
/area/assembly/chargebay)
"dnB" = (
@@ -80307,7 +77328,6 @@
},
/area/assembly/chargebay)
"dnC" = (
-/obj/structure/disposalpipe/segment,
/obj/effect/decal/warning_stripes/west,
/turf/simulated/floor/plasteel,
/area/hallway/primary/aft)
@@ -80315,12 +77335,6 @@
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/hallway/primary/aft)
-"dnE" = (
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/plasteel{
- icon_state = "purplecorner"
- },
-/area/hallway/primary/aft)
"dnF" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/research{
@@ -80338,9 +77352,7 @@
},
/area/assembly/chargebay)
"dnG" = (
-/obj/structure/extinguisher_cabinet{
- pixel_y = 30
- },
+/obj/machinery/vending/genedrobe,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "whitepurplecorner"
@@ -80403,6 +77415,7 @@
name = "Genetics";
req_access_txt = "9"
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -80412,8 +77425,8 @@
dir = 1;
on = 1
},
-/obj/machinery/computer/scan_consolenew,
/obj/effect/decal/warning_stripes/southwest,
+/obj/machinery/computer/scan_consolenew,
/turf/simulated/floor/plasteel,
/area/medical/genetics)
"dnO" = (
@@ -80507,14 +77520,12 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 8;
@@ -80557,8 +77568,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -80592,7 +77602,6 @@
},
/area/medical/surgeryobs)
"doi" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 4;
initialize_directions = 11
@@ -80605,6 +77614,7 @@
d2 = 8;
icon_state = "2-8"
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -80646,8 +77656,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -80770,7 +77779,7 @@
/obj/machinery/light,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 5
+ dir = 4
},
/turf/simulated/floor/engine,
/area/toxins/explab)
@@ -80788,14 +77797,16 @@
/area/medical/chemistry)
"doD" = (
/obj/machinery/light,
+/obj/machinery/atmospherics/pipe/simple/insulated{
+ dir = 9
+ },
/turf/simulated/floor/engine,
-/area/toxins/explab)
+/area/toxins/mixing)
"doE" = (
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/turf/simulated/floor/plasteel{
icon_state = "white"
@@ -80820,11 +77831,11 @@
pixel_x = 29;
pixel_y = 22
},
-/obj/effect/decal/warning_stripes/yellow,
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 8
},
/obj/structure/closet/secure_closet/scientist,
+/obj/effect/decal/warning_stripes/west,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "whitepurplecorner"
@@ -80852,11 +77863,12 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
-/obj/machinery/computer/mecha,
/obj/effect/decal/warning_stripes/yellow/hollow,
+/obj/machinery/computer/mecha{
+ dir = 8
+ },
/turf/simulated/floor/plasteel{
icon_state = "whitepurplecorner"
},
@@ -80865,8 +77877,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -80877,8 +77888,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 1;
@@ -80900,7 +77910,11 @@
/obj/machinery/atmospherics/unary/thermomachine/heater{
dir = 8
},
-/obj/effect/decal/warning_stripes/northwest,
+/obj/machinery/firealarm{
+ dir = 4;
+ pixel_x = 28
+ },
+/obj/effect/decal/warning_stripes/west,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "whitepurplecorner"
@@ -80929,7 +77943,6 @@
},
/area/assembly/chargebay)
"doS" = (
-/obj/structure/disposalpipe/segment,
/obj/effect/decal/warning_stripes/west,
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
@@ -80956,8 +77969,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/landmark/start{
name = "Cyborg"
@@ -80980,7 +77992,6 @@
/turf/simulated/floor/greengrid,
/area/assembly/chargebay)
"doY" = (
-/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralcorner"
@@ -80995,11 +78006,6 @@
},
/area/hallway/primary/aft)
"dpa" = (
-/obj/structure/disposalpipe/sortjunction{
- dir = 1;
- name = "Genetics Junction";
- sortType = 13
- },
/turf/simulated/floor/plasteel{
icon_state = "purplecorner"
},
@@ -81026,9 +78032,6 @@
},
/area/assembly/chargebay)
"dpd" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 6
},
@@ -81038,14 +78041,10 @@
},
/area/medical/genetics)
"dpe" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -81114,6 +78113,7 @@
"dpm" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -81134,18 +78134,15 @@
/turf/simulated/floor/grass,
/area/medical/genetics)
"dpr" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 8;
@@ -81155,6 +78152,11 @@
dir = 8;
initialize_directions = 11
},
+/obj/structure/disposalpipe/sortjunction{
+ dir = 1;
+ name = "CMO's Junction";
+ sortType = 10
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -81163,8 +78165,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -81172,6 +78173,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "whitebluecorner"
},
@@ -81183,8 +78187,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -81192,6 +78195,10 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 2;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -81200,14 +78207,12 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -81224,8 +78229,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
@@ -81243,8 +78247,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -81255,8 +78258,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -81266,8 +78268,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 1;
@@ -81277,8 +78278,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/machinery/door/airlock/command/glass{
name = "Chief Medical Officer";
@@ -81290,6 +78290,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -81298,8 +78301,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -81310,14 +78312,12 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/effect/landmark{
name = "lightsout"
@@ -81349,6 +78349,16 @@
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
},
+/obj/structure/table,
+/obj/item/storage/box/masks,
+/obj/item/storage/box/gloves{
+ pixel_x = 5;
+ pixel_y = 5
+ },
+/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.";
+ name = "Surgery Cleaner"
+ },
/turf/simulated/floor/plasteel{
icon_state = "darkblue"
},
@@ -81359,7 +78369,6 @@
},
/area/medical/surgeryobs)
"dpI" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable{
d1 = 1;
d2 = 2;
@@ -81367,6 +78376,7 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -81434,14 +78444,10 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/table/reinforced,
/obj/machinery/light,
-/obj/machinery/newscaster{
- pixel_y = -32
- },
/obj/item/radio/intercom{
dir = 0;
pixel_x = -28;
@@ -81451,6 +78457,9 @@
department = "Research Director's Office"
},
/obj/effect/decal/warning_stripes/yellow/hollow,
+/obj/machinery/newscaster{
+ pixel_y = -32
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "whitepurplecorner"
@@ -81480,7 +78489,9 @@
/turf/simulated/floor/greengrid,
/area/medical/research)
"dpV" = (
-/obj/machinery/computer/mech_bay_power_console,
+/obj/machinery/computer/mech_bay_power_console{
+ dir = 1
+ },
/turf/simulated/floor/greengrid,
/area/medical/research)
"dpW" = (
@@ -81505,8 +78516,16 @@
dir = 8
},
/obj/machinery/portable_atmospherics/scrubber,
-/obj/structure/sign/nosmoking_2{
- pixel_x = -32
+/obj/machinery/door_control{
+ id = "toxmix1";
+ name = "Space Vent";
+ pixel_x = -32;
+ req_access_txt = "47"
+ },
+/obj/machinery/ignition_switch{
+ id = "toxinsigniter";
+ pixel_x = -32;
+ pixel_y = 8
},
/turf/simulated/floor/plasteel{
dir = 1;
@@ -81536,8 +78555,10 @@
/obj/machinery/status_display{
pixel_x = 32
},
-/obj/machinery/computer/robotics,
/obj/effect/decal/warning_stripes/yellow/hollow,
+/obj/machinery/computer/robotics{
+ dir = 8
+ },
/turf/simulated/floor/plasteel{
icon_state = "whitepurplecorner"
},
@@ -81628,8 +78649,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/warning_stripes/south,
/turf/simulated/floor/plasteel,
@@ -81674,8 +78694,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel{
@@ -81701,8 +78720,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 1;
@@ -81712,8 +78730,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/machinery/door/airlock/command/glass{
name = "Chief Medical Officer";
@@ -81724,17 +78741,11 @@
},
/area/medical/cmo)
"dqw" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
/area/medical/genetics)
"dqx" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
},
@@ -81744,9 +78755,6 @@
},
/area/medical/genetics)
"dqz" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
@@ -81755,10 +78763,6 @@
},
/area/medical/genetics)
"dqA" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/hologram/holopad,
/obj/effect/landmark/start{
name = "Geneticist"
},
@@ -81768,15 +78772,13 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
},
+/obj/structure/disposalpipe/segment,
+/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
/area/medical/genetics)
"dqB" = (
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
- },
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 8
},
@@ -81802,15 +78804,14 @@
},
/area/medical/medbay)
"dqF" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -81830,8 +78831,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -81927,8 +78927,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -82050,6 +79049,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
dir = 5
},
+/obj/structure/sign/nosmoking_2{
+ pixel_x = -32
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "whitepurple"
@@ -82067,20 +79069,19 @@
/turf/simulated/floor/plating,
/area/maintenance/port)
"drp" = (
-/obj/structure/cable{
- d1 = 2;
- d2 = 8;
- icon_state = "2-8";
- tag = ""
+/obj/machinery/button/windowtint{
+ pixel_y = -24
},
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "neutral"
- },
-/area/maintenance/port)
+/obj/item/twohanded/required/kirbyplants,
+/turf/simulated/floor/wood,
+/area/ntrep)
"drr" = (
/obj/machinery/atmospherics/unary/portables_connector,
/obj/machinery/portable_atmospherics/pump,
+/obj/machinery/alarm{
+ dir = 4;
+ pixel_x = -24
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "whitepurplecorner"
@@ -82105,8 +79106,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 1;
@@ -82165,8 +79165,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 9
@@ -82201,8 +79200,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/effect/decal/warning_stripes/south,
/turf/simulated/floor/plasteel,
@@ -82227,9 +79225,6 @@
},
/area/assembly/chargebay)
"drH" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/effect/decal/warning_stripes/yellow/hollow,
/turf/simulated/floor/plasteel,
/area/medical/genetics)
@@ -82262,7 +79257,6 @@
},
/area/hallway/primary/aft)
"drL" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/sign/science{
pixel_x = -32;
pixel_y = 32
@@ -82273,7 +79267,6 @@
},
/area/hallway/primary/aft)
"drM" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/sign/science{
pixel_x = 32;
pixel_y = 32
@@ -82286,13 +79279,13 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door/firedoor,
/obj/effect/decal/warning_stripes/yellow,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -82310,8 +79303,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
icon_state = "white"
@@ -82369,13 +79361,6 @@
icon_state = "white"
},
/area/medical/genetics)
-"drY" = (
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "whitepurple"
- },
-/area/medical/genetics)
"drZ" = (
/obj/structure/window/reinforced,
/obj/structure/window/reinforced{
@@ -82415,6 +79400,7 @@
/obj/structure/bed/dogbed{
name = "kitty basket"
},
+/obj/structure/disposalpipe/segment,
/mob/living/simple_animal/pet/cat/Runtime,
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -82424,8 +79410,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel{
@@ -82446,8 +79431,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/structure/chair/office/light,
/turf/simulated/floor/plasteel{
@@ -82494,8 +79478,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/light/small{
dir = 8
@@ -82509,8 +79492,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door/airlock/maintenance,
/turf/simulated/floor/plasteel,
@@ -82561,8 +79543,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -82570,7 +79551,6 @@
},
/area/maintenance/port)
"dsu" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/door/firedoor,
/obj/effect/decal/warning_stripes/yellow,
/turf/simulated/floor/plasteel{
@@ -82591,8 +79571,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
@@ -82607,8 +79586,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
@@ -82639,8 +79617,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/warning_stripes/yellow/hollow,
@@ -82650,8 +79627,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/landmark/start{
name = "Research Director"
@@ -82683,8 +79659,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/research/glass{
@@ -82696,7 +79671,6 @@
},
/area/assembly/robotics)
"dsI" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/door/firedoor,
/obj/effect/decal/warning_stripes/yellow,
/turf/simulated/floor/plasteel{
@@ -82798,8 +79772,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -82839,9 +79812,6 @@
},
/area/medical/genetics)
"dsU" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/medical{
name = "Genetics Office";
@@ -82851,8 +79821,10 @@
/area/medical/genetics)
"dsV" = (
/obj/machinery/light,
-/obj/machinery/computer/scan_consolenew,
/obj/effect/decal/warning_stripes/northwest,
+/obj/machinery/computer/scan_consolenew{
+ dir = 1
+ },
/turf/simulated/floor/plasteel,
/area/medical/genetics)
"dsW" = (
@@ -82868,18 +79840,23 @@
/area/medical/genetics)
"dsX" = (
/obj/structure/table/glass,
-/obj/machinery/computer/med_data/laptop,
/obj/structure/mirror{
pixel_y = -30
},
+/obj/structure/disposalpipe/segment{
+ dir = 1;
+ icon_state = "pipe-c"
+ },
+/obj/machinery/computer/med_data/laptop{
+ dir = 1
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
/area/medical/genetics)
"dsY" = (
/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
+ dir = 4
},
/obj/machinery/newscaster{
pixel_y = -32
@@ -82906,37 +79883,31 @@
pixel_x = -32;
pixel_y = -32
},
+/obj/structure/disposalpipe/trunk{
+ dir = 4
+ },
+/obj/machinery/disposal,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "whitepurplecorner"
},
/area/medical/medbay)
"dtc" = (
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
- },
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/disposalpipe/junction{
+ dir = 1;
+ icon_state = "pipe-j2"
+ },
/turf/simulated/floor/plasteel{
icon_state = "whiteblue"
},
/area/medical/medbay)
-"dtd" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/item/twohanded/required/kirbyplants,
-/turf/simulated/floor/plasteel{
- icon_state = "whitebluecorner"
- },
-/area/medical/medbay)
"dte" = (
/obj/item/twohanded/required/kirbyplants,
/obj/machinery/alarm{
@@ -82946,11 +79917,11 @@
/turf/simulated/floor/plasteel,
/area/gateway)
"dtf" = (
+/obj/effect/decal/warning_stripes/yellow/hollow,
/obj/structure/disposalpipe/trunk{
dir = 8
},
/obj/machinery/disposal,
-/obj/effect/decal/warning_stripes/yellow/hollow,
/turf/simulated/floor/plasteel,
/area/medical/genetics)
"dtg" = (
@@ -82973,14 +79944,12 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/structure/table/glass,
/obj/item/paper_bin,
@@ -82995,8 +79964,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 1;
@@ -83018,8 +79986,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/table/glass,
/obj/machinery/computer/med_data/laptop,
@@ -83054,8 +80021,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
dir = 1;
@@ -83063,7 +80029,6 @@
},
/area/medical/surgery1)
"dtn" = (
-/obj/machinery/hologram/holopad,
/obj/structure/cable{
d1 = 1;
d2 = 8;
@@ -83071,6 +80036,7 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "darkblue"
@@ -83083,8 +80049,6 @@
/turf/simulated/wall/r_wall,
/area/medical/research)
"dtq" = (
-/obj/structure/disposalpipe/segment,
-/obj/machinery/hologram/holopad,
/obj/structure/cable{
d1 = 1;
d2 = 4;
@@ -83092,6 +80056,8 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/disposalpipe/segment,
+/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel{
dir = 9;
icon_state = "darkblue"
@@ -83101,8 +80067,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/landmark/start{
name = "Medical Doctor"
@@ -83139,8 +80104,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/structure/cable{
d1 = 2;
@@ -83158,8 +80122,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plating,
/area/maintenance/starboard)
@@ -83167,8 +80130,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable{
@@ -83185,8 +80147,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
dir = 1;
@@ -83197,26 +80158,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel,
/area/hallway/secondary/construction)
-"dtC" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8";
- tag = ""
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
-/area/medical/medbay)
"dtD" = (
/obj/structure/cable{
d1 = 4;
@@ -83240,8 +80181,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/warning_stripes/yellow,
@@ -83351,13 +80291,9 @@
},
/area/toxins/mixing)
"dtS" = (
-/obj/machinery/camera{
- c_tag = "Research Hallway";
- network = list("Research","SS13")
- },
/obj/structure/closet/walllocker/emerglocker/north,
/turf/simulated/floor/plasteel{
- dir = 4;
+ dir = 1;
icon_state = "whitepurplecorner"
},
/area/medical/research)
@@ -83372,26 +80308,25 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
-/obj/machinery/hologram/holopad,
/obj/effect/decal/warning_stripes/yellow/hollow,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 4;
initialize_directions = 11
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel{
icon_state = "whitepurplefull"
},
/area/toxins/mixing)
"dtW" = (
+/obj/effect/decal/warning_stripes/yellow,
+/obj/structure/closet/secure_closet/scientist,
/obj/machinery/newscaster{
pixel_x = 32
},
-/obj/effect/decal/warning_stripes/yellow,
-/obj/structure/closet/secure_closet/scientist,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "whitepurple"
@@ -83426,8 +80361,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/turf/simulated/floor/plasteel{
icon_state = "whitepurplecorner"
@@ -83435,30 +80369,23 @@
/area/crew_quarters/hor)
"dub" = (
/obj/structure/table/wood,
-/obj/machinery/newscaster{
- pixel_y = -32
- },
/obj/item/radio/intercom{
dir = 4;
pixel_x = 28
},
/obj/item/flashlight/lamp,
+/obj/machinery/newscaster{
+ pixel_y = -32
+ },
/turf/simulated/floor/plasteel{
icon_state = "whitepurplecorner"
},
/area/crew_quarters/hor)
-"duc" = (
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/plasteel{
- icon_state = "whitepurplecorner"
- },
-/area/medical/research)
"due" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/warning_stripes/yellow,
/turf/simulated/floor/plasteel{
@@ -83547,17 +80474,16 @@
/turf/simulated/wall,
/area/medical/morgue)
"dul" = (
-/obj/structure/disposalpipe/trunk{
- dir = 8
- },
-/obj/machinery/disposal,
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/warning_stripes/yellow/hollow,
+/obj/machinery/disposal,
+/obj/structure/disposalpipe/trunk{
+ dir = 1
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -83570,8 +80496,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/door/airlock/maintenance{
@@ -83579,6 +80504,7 @@
req_access_txt = "5"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/medical/morgue)
"dur" = (
@@ -83608,8 +80534,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 8;
@@ -83643,10 +80568,12 @@
/obj/machinery/ai_status_display{
pixel_x = 32
},
-/obj/machinery/computer/card/minor/cmo,
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 8
},
+/obj/machinery/computer/card/minor/cmo{
+ dir = 8
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -83686,11 +80613,13 @@
},
/area/medical/surgery1)
"duA" = (
-/obj/machinery/computer/operating,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
},
+/obj/machinery/computer/operating{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "darkblue"
@@ -83699,7 +80628,7 @@
"duB" = (
/obj/structure/sink{
dir = 4;
- pixel_x = 11
+ pixel_x = 12
},
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 8
@@ -83747,8 +80676,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 8;
@@ -83793,8 +80721,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 8;
@@ -83913,22 +80840,21 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door/airlock/maintenance{
name = "Robotics Maintenance";
req_access_txt = "29"
},
/obj/effect/decal/warning_stripes/south,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/maintenance/fpmaint2)
"dva" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -83956,8 +80882,8 @@
/turf/simulated/wall/r_wall,
/area/toxins/misc_lab)
"dve" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/purple{
- dir = 10
+/obj/machinery/atmospherics/unary/portables_connector{
+ dir = 8
},
/turf/simulated/floor/plasteel{
icon_state = "white"
@@ -83990,16 +80916,15 @@
},
/area/medical/research)
"dvj" = (
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "whitepurplecorner"
},
@@ -84008,8 +80933,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/effect/decal/warning_stripes/northwest,
/turf/simulated/floor/plasteel,
@@ -84018,8 +80942,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/warning_stripes/north,
/turf/simulated/floor/plasteel,
@@ -84046,19 +80969,28 @@
/obj/effect/landmark/start{
name = "Roboticist"
},
+/obj/effect/decal/warning_stripes/southeastcorner,
/turf/simulated/floor/plasteel,
/area/assembly/robotics)
"dvp" = (
-/obj/structure/window/reinforced/polarized,
-/obj/effect/decal/warning_stripes/south,
-/obj/machinery/computer/rdconsole/robotics,
-/turf/simulated/floor/plasteel,
+/obj/structure/window/reinforced/polarized{
+ dir = 8
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
/area/assembly/robotics)
"dvq" = (
-/obj/structure/window/reinforced/polarized,
-/obj/effect/decal/warning_stripes/southeast,
-/obj/structure/filingcabinet/chestdrawer,
-/turf/simulated/floor/plasteel,
+/obj/structure/mirror{
+ pixel_x = 32
+ },
+/obj/structure/sink{
+ dir = 4;
+ pixel_x = 12
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
/area/assembly/robotics)
"dvr" = (
/obj/structure/chair/office/light{
@@ -84086,8 +81018,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/turf/simulated/floor/plasteel{
@@ -84157,11 +81088,11 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/medical/morgue)
"dvE" = (
@@ -84175,12 +81106,12 @@
name = "Emergency NanoMed";
pixel_y = -32
},
-/obj/machinery/newscaster{
- pixel_x = -32
- },
/obj/machinery/photocopier/faxmachine{
department = "Chief Medical Officer's Office"
},
+/obj/machinery/newscaster{
+ pixel_x = -32
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -84195,8 +81126,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -84220,7 +81150,6 @@
},
/area/medical/cmo)
"dvJ" = (
-/obj/machinery/computer/crew,
/obj/machinery/requests_console{
announcementConsole = 1;
department = "Chief Medical Officer's Desk";
@@ -84228,6 +81157,9 @@
name = "Chief Medical Officer Requests Console";
pixel_x = 30
},
+/obj/machinery/computer/crew{
+ dir = 8
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -84283,10 +81215,10 @@
/turf/simulated/floor/plating,
/area/medical/research)
"dvQ" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 10;
icon_state = "darkblue"
@@ -84323,8 +81255,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/warning_stripes/yellow,
@@ -84332,6 +81263,7 @@
/area/maintenance/port)
"dvX" = (
/obj/structure/closet,
+/obj/effect/spawner/lootdrop/maintenance,
/turf/simulated/floor/plasteel{
dir = 6;
icon_state = "neutral"
@@ -84406,8 +81338,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/research{
@@ -84417,8 +81348,8 @@
/turf/simulated/floor/plasteel,
/area/toxins/misc_lab)
"dwe" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/purple{
- dir = 4
+/obj/machinery/atmospherics/pipe/simple/hidden/purple{
+ dir = 10
},
/turf/simulated/floor/plasteel{
icon_state = "white"
@@ -84459,7 +81390,9 @@
dir = 4;
pixel_x = -24
},
-/obj/machinery/computer/rdservercontrol,
+/obj/machinery/computer/rdservercontrol{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -84537,8 +81470,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/warning_stripes/west,
/turf/simulated/floor/plasteel,
@@ -84564,7 +81496,6 @@
},
/area/hallway/primary/aft)
"dwu" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/camera{
c_tag = "Central Hallway South 3";
dir = 8
@@ -84588,8 +81519,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel{
@@ -84632,12 +81562,12 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/medical/morgue)
"dwF" = (
@@ -84719,6 +81649,10 @@
dir = 1;
network = list("Medical","SS13")
},
+/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.";
+ name = "Surgery Cleaner"
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "whiteblue"
@@ -84740,8 +81674,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/effect/decal/cleanable/dirt,
@@ -84792,9 +81725,7 @@
/obj/machinery/newscaster{
pixel_y = 32
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/crew_quarters/theatre)
"dwU" = (
/turf/simulated/floor/plasteel{
@@ -84806,9 +81737,7 @@
dir = 8;
name = "Abandoned Theater"
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/crew_quarters/theatre)
"dwW" = (
/obj/item/twohanded/required/kirbyplants,
@@ -84909,10 +81838,10 @@
dir = 8;
pixel_x = 24
},
+/obj/effect/decal/warning_stripes/southeast,
/obj/machinery/newscaster{
pixel_y = 32
},
-/obj/effect/decal/warning_stripes/southeast,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -84950,14 +81879,14 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/warning_stripes/yellow,
/turf/simulated/floor/plasteel,
/area/toxins/storage)
"dxl" = (
/obj/structure/table/reinforced,
+/obj/effect/decal/warning_stripes/west,
/obj/machinery/computer/security/telescreen{
desc = "Used for watching the test chamber.";
dir = 4;
@@ -84965,7 +81894,6 @@
name = "Test Chamber Telescreen";
network = list("Toxins")
},
-/obj/effect/decal/warning_stripes/west,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -85060,14 +81988,12 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/machinery/atmospherics/pipe/manifold/hidden{
dir = 1
@@ -85080,8 +82006,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 9
@@ -85094,8 +82019,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/door/airlock/command{
name = "Server Room";
@@ -85110,8 +82034,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -85122,15 +82045,14 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -85141,22 +82063,19 @@
/turf/simulated/floor/plasteel,
/area/assembly/robotics)
"dxA" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 6
},
/obj/effect/landmark/start{
name = "Medical Doctor"
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "cmo"
},
/area/medical/medbay)
"dxB" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/research/glass{
name = "Robotics Lab";
@@ -85168,15 +82087,14 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
/area/assembly/robotics)
"dxC" = (
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
- },
/obj/effect/decal/warning_stripes/yellow,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -85184,6 +82102,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/sortjunction{
+ dir = 4;
+ name = "Robotics Junction";
+ sortType = 14
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -85192,8 +82115,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/warning_stripes/west,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -85202,6 +82124,10 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 2;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel,
/area/assembly/robotics)
"dxE" = (
@@ -85216,8 +82142,9 @@
},
/area/medical/research)
"dxF" = (
-/obj/structure/disposalpipe/junction{
- dir = 1
+/obj/structure/disposalpipe/segment{
+ dir = 4;
+ icon_state = "pipe-c"
},
/turf/simulated/floor/plasteel{
icon_state = "neutralcorner"
@@ -85227,8 +82154,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/centcom{
@@ -85242,9 +82168,8 @@
},
/area/medical/morgue)
"dxH" = (
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/junction{
+ dir = 4
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -85259,8 +82184,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 6
@@ -85268,6 +82192,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
@@ -85277,8 +82204,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -85286,6 +82212,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
@@ -85302,13 +82231,15 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
@@ -85318,8 +82249,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -85327,6 +82257,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -85346,8 +82279,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -85355,14 +82287,16 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/medical/morgue)
"dxR" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 1
@@ -85374,14 +82308,16 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plating,
/area/medical/morgue)
"dxS" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -85390,20 +82326,21 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plating,
/area/medical/morgue)
"dxT" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 4;
@@ -85414,6 +82351,10 @@
dir = 4;
initialize_directions = 11
},
+/obj/structure/disposalpipe/segment{
+ dir = 8;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
@@ -85429,8 +82370,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/door/firedoor,
/obj/effect/decal/warning_stripes/yellow,
@@ -85470,8 +82410,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 4;
@@ -85486,12 +82425,12 @@
},
/area/medical/medbay)
"dya" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/medical{
name = "Operating Theatre Storage";
req_access_txt = "45"
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "showroomfloor"
},
@@ -85512,8 +82451,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -85535,8 +82473,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plating,
/area/crew_quarters/theatre)
@@ -85573,12 +82510,12 @@
/area/medical/medbay)
"dyl" = (
/obj/item/twohanded/required/kirbyplants,
-/obj/machinery/newscaster{
- pixel_x = -32
- },
/obj/machinery/light/small{
dir = 8
},
+/obj/machinery/newscaster{
+ pixel_x = -32
+ },
/turf/simulated/floor/plating,
/area/security/detectives_office)
"dym" = (
@@ -85657,8 +82594,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
icon_state = "neutral"
@@ -85676,7 +82612,8 @@
"dyy" = (
/obj/machinery/driver_button{
id_tag = "toxinsdriver";
- pixel_x = -26
+ pixel_x = -26;
+ range = 18
},
/obj/structure/chair/office/dark{
dir = 8
@@ -85695,8 +82632,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -85714,7 +82650,9 @@
/area/toxins/mixing)
"dyC" = (
/obj/effect/decal/warning_stripes/northwest,
-/obj/machinery/computer/area_atmos,
+/obj/machinery/computer/area_atmos{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -85723,8 +82661,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/warning_stripes/north,
/turf/simulated/floor/plasteel{
@@ -85757,8 +82694,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/effect/decal/warning_stripes/southwest,
/obj/machinery/atmospherics/unary/vent_pump/on,
@@ -85807,22 +82743,22 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
/area/medical/research)
"dyM" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/rack,
/obj/item/storage/firstaid,
/obj/item/storage/firstaid,
/obj/item/paicard,
/obj/effect/decal/warning_stripes/yellow/hollow,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -85831,26 +82767,28 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/warning_stripes/west,
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/assembly/robotics)
"dyO" = (
-/obj/effect/decal/warning_stripes/southeastcorner,
+/obj/effect/decal/warning_stripes/east,
/turf/simulated/floor/plasteel,
/area/assembly/robotics)
"dyP" = (
+/obj/effect/decal/warning_stripes/yellow,
/obj/machinery/navbeacon{
codes_txt = "delivery;dir=1";
location = "Robotics"
},
-/obj/structure/plasticflaps,
-/obj/effect/decal/warning_stripes/yellow,
+/obj/structure/plasticflaps{
+ opacity = 1
+ },
/turf/simulated/floor/plasteel,
/area/assembly/robotics)
"dyR" = (
@@ -85868,18 +82806,26 @@
},
/area/assembly/robotics)
"dyT" = (
-/obj/structure/window/reinforced/polarized,
-/obj/effect/decal/warning_stripes/south,
-/obj/machinery/r_n_d/circuit_imprinter,
-/obj/item/reagent_containers/glass/beaker/sulphuric,
-/turf/simulated/floor/plasteel,
-/area/assembly/robotics)
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8";
+ tag = ""
+ },
+/obj/structure/cable{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
+ },
+/obj/structure/lattice/catwalk,
+/turf/space,
+/area/maintenance/auxsolarstarboard)
"dyU" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/firealarm{
dir = 8;
pixel_x = -24
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "vault"
@@ -85889,8 +82835,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel{
@@ -85926,8 +82871,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -85944,9 +82888,6 @@
/turf/simulated/floor/plasteel,
/area/medical/morgue)
"dzi" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable{
d1 = 1;
d2 = 4;
@@ -85958,16 +82899,18 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
},
/turf/simulated/floor/plasteel,
/area/maintenance/starboard)
"dzj" = (
-/obj/machinery/hologram/holopad,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "cmo"
@@ -86002,8 +82945,8 @@
},
/area/medical/cmo)
"dzm" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/unary/vent_pump/on,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "showroomfloor"
},
@@ -86031,9 +82974,7 @@
/obj/machinery/light_switch{
pixel_x = -26
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/crew_quarters/theatre)
"dzr" = (
/obj/structure/chair/wood{
@@ -86103,8 +83044,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 1;
@@ -86140,8 +83080,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/door/airlock/research{
name = "Toxin Mixing";
@@ -86160,8 +83099,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -86178,8 +83116,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/light_switch{
pixel_x = -26;
@@ -86215,8 +83152,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -86237,14 +83173,12 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
@@ -86256,8 +83190,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -86307,8 +83240,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/warning_stripes/yellow,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -86325,8 +83257,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/research{
@@ -86345,8 +83276,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 1;
@@ -86441,8 +83371,9 @@
d1 = 1;
d2 = 4;
icon_state = "1-4";
- tag = "90Curve"
+ tag = null
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -86462,10 +83393,6 @@
},
/area/medical/research)
"dzV" = (
-/obj/structure/disposalpipe/trunk{
- dir = 1
- },
-/obj/machinery/disposal,
/obj/structure/cable{
d2 = 4;
icon_state = "0-4"
@@ -86476,6 +83403,10 @@
pixel_x = -24
},
/obj/effect/decal/warning_stripes/yellow,
+/obj/structure/disposalpipe/trunk{
+ dir = 1
+ },
+/obj/machinery/disposal,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -86484,16 +83415,15 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/warning_stripes/southwest,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/assembly/robotics)
"dzX" = (
@@ -86501,12 +83431,13 @@
/turf/simulated/floor/plasteel,
/area/assembly/robotics)
"dzY" = (
+/obj/machinery/computer/operating{
+ dir = 1;
+ name = "Robotics Operating Computer"
+ },
/obj/machinery/newscaster{
pixel_y = -32
},
-/obj/machinery/computer/operating{
- name = "Robotics Operating Computer"
- },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -86607,8 +83538,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -86618,8 +83548,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -86634,16 +83563,21 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
/area/medical/morgue)
"dAp" = (
/obj/structure/table/glass,
+/obj/machinery/computer/med_data/laptop{
+ dir = 1
+ },
/obj/machinery/newscaster{
pixel_y = -32
},
-/obj/machinery/computer/med_data/laptop,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "cmo"
@@ -86678,8 +83612,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 8;
@@ -86694,24 +83627,21 @@
},
/area/medical/medbay)
"dAu" = (
-/obj/structure/disposalpipe/junction{
- dir = 1;
- icon_state = "pipe-y"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 9
},
+/obj/structure/disposalpipe/junction{
+ dir = 1;
+ icon_state = "pipe-y"
+ },
/turf/simulated/floor/plasteel{
icon_state = "showroomfloor"
},
/area/medical/surgery2)
"dAv" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/camera{
c_tag = "Medbay Surgery East Storage";
dir = 1
@@ -86719,16 +83649,19 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 9
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "showroomfloor"
},
/area/medical/surgery2)
"dAw" = (
+/obj/machinery/iv_drip,
/obj/structure/disposalpipe/segment{
dir = 8;
icon_state = "pipe-c"
},
-/obj/machinery/iv_drip,
/turf/simulated/floor/plasteel{
icon_state = "showroomfloor"
},
@@ -86740,14 +83673,12 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 8;
@@ -86763,31 +83694,25 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/machinery/door/airlock/maintenance,
/obj/structure/barricade/wooden,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/crew_quarters/theatre)
"dAB" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/crew_quarters/theatre)
"dAC" = (
/obj/structure/cable{
@@ -86798,17 +83723,13 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 1
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/crew_quarters/theatre)
"dAD" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/crew_quarters/theatre)
"dAE" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
@@ -86830,8 +83751,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/warning_stripes/yellow/hollow,
@@ -86847,8 +83767,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/warning_stripes/west,
@@ -86912,8 +83831,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
dir = 1;
@@ -86949,8 +83867,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/warning_stripes/yellow,
/turf/simulated/floor/plasteel{
@@ -86960,12 +83877,10 @@
"dAU" = (
/obj/machinery/door/window/southright{
dir = 1;
- name = "Toxins Launcher";
- req_access_txt = "7"
+ name = "Toxins Launcher"
},
/obj/machinery/door/window/southright{
- name = "Toxins Launcher";
- req_access_txt = "7"
+ name = "Toxins Launcher"
},
/obj/effect/decal/warning_stripes/arrow,
/obj/effect/decal/warning_stripes/yellow/partial,
@@ -86975,8 +83890,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/warning_stripes/yellow,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -86988,8 +83902,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/effect/decal/warning_stripes/yellow,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -87095,12 +84008,10 @@
},
/area/toxins/server)
"dBh" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/maintenance{
@@ -87110,10 +84021,10 @@
/obj/effect/decal/warning_stripes/south,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/medical/research)
"dBj" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/firealarm{
dir = 4;
pixel_x = 24
@@ -87121,9 +84032,9 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "neutralcorner"
},
@@ -87136,8 +84047,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/door/airlock/maintenance,
@@ -87148,11 +84058,10 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door/airlock/maintenance{
- name = "Medbay Maintenance";
+ name = "Virology Lobby";
req_access_txt = "5"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -87169,9 +84078,7 @@
},
/area/medical/medbay)
"dBq" = (
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/crew_quarters/theatre)
"dBr" = (
/obj/structure/chair/wood{
@@ -87182,11 +84089,11 @@
},
/area/crew_quarters/theatre)
"dBt" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -87239,18 +84146,15 @@
/turf/simulated/floor/plasteel,
/area/maintenance/apmaint)
"dBD" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/research/glass{
@@ -87285,8 +84189,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/warning_stripes/yellow,
/turf/simulated/floor/plasteel,
@@ -87295,8 +84198,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/warning_stripes/yellow,
/turf/simulated/floor/plasteel,
@@ -87308,9 +84210,6 @@
/obj/item/bonegel,
/obj/item/FixOVein,
/obj/item/surgicaldrill,
-/obj/structure/mirror{
- pixel_x = 32
- },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -87319,8 +84218,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -87330,19 +84228,17 @@
},
/area/hallway/primary/aft)
"dBQ" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "neutralcorner"
},
@@ -87357,9 +84253,6 @@
},
/area/hallway/primary/aft)
"dBS" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/centcom{
id_tag = null;
@@ -87367,6 +84260,9 @@
opacity = 1;
req_access_txt = "6"
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -87375,8 +84271,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -87391,8 +84286,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plating,
/area/maintenance/aft)
@@ -87400,8 +84294,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
@@ -87410,14 +84303,12 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/turf/simulated/floor/plating,
/area/maintenance/aft)
@@ -87425,8 +84316,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
@@ -87438,8 +84328,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/spawner/random_spawners/oil_maybe,
/turf/simulated/floor/plating,
@@ -87448,8 +84337,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/turf/simulated/floor/plating,
/area/maintenance/aft)
@@ -87461,8 +84349,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
@@ -87474,8 +84361,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
dir = 1;
@@ -87486,8 +84372,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 1;
@@ -87502,8 +84387,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/light/small{
dir = 1
@@ -87524,8 +84408,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -87661,14 +84544,12 @@
/turf/simulated/wall/indestructible/riveted,
/area/toxins/test_area)
"dCz" = (
-/obj/machinery/camera{
- active_power_usage = 0;
- c_tag = "Bomb Test Site";
- dir = 4;
- invuln = 1;
- network = list("SS13,Toxins")
- },
/obj/item/target,
+/obj/machinery/camera{
+ c_tag = "Research Toxins Test Chamber East";
+ dir = 4;
+ network = list("Toxins","Research","SS13")
+ },
/turf/simulated/floor/plasteel/airless/indestructible,
/area/toxins/test_area)
"dCA" = (
@@ -87688,8 +84569,9 @@
/area/toxins/mixing)
"dCD" = (
/obj/machinery/door/poddoor{
- id_tag = "toxindriver";
- name = "Toxins Podlock"
+ id_tag = "toxinsdriver";
+ name = "Toxins Launcher Bay Door";
+ protected = 0
},
/obj/structure/fans/tiny,
/turf/simulated/floor/plating,
@@ -87700,7 +84582,7 @@
"dCF" = (
/obj/machinery/mass_driver{
dir = 8;
- id_tag = "toxindriver"
+ id_tag = "toxinsdriver"
},
/obj/effect/decal/warning_stripes/west,
/turf/simulated/floor/plating/airless,
@@ -87795,14 +84677,12 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 6
@@ -87810,14 +84690,14 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 6
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/maintenance/apmaint)
"dCW" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -87832,8 +84712,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -87850,15 +84729,15 @@
/obj/machinery/light{
dir = 8
},
-/obj/machinery/newscaster{
- pixel_x = -32
- },
/obj/item/storage/toolbox/mechanical,
/obj/item/storage/toolbox/electrical,
/obj/item/screwdriver,
/obj/item/multitool,
/obj/item/clothing/head/welding,
/obj/effect/decal/warning_stripes/yellow/hollow,
+/obj/machinery/newscaster{
+ pixel_x = -32
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -87875,12 +84754,10 @@
/turf/simulated/floor/plasteel,
/area/hallway/primary/aft)
"dDb" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -87907,13 +84784,13 @@
},
/area/hallway/primary/aft)
"dDd" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "neutralcorner"
},
@@ -88028,8 +84905,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -88079,8 +84955,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -88094,8 +84969,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -88110,8 +84984,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -88138,14 +85011,12 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
@@ -88157,8 +85028,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -88175,8 +85045,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -88191,8 +85060,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -88209,8 +85077,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -88224,8 +85091,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -88270,9 +85136,7 @@
/area/crew_quarters/theatre)
"dDJ" = (
/obj/item/twohanded/required/kirbyplants,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/crew_quarters/theatre)
"dDK" = (
/obj/item/twohanded/required/kirbyplants,
@@ -88280,9 +85144,7 @@
dir = 1;
pixel_y = -24
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/crew_quarters/theatre)
"dDL" = (
/obj/machinery/vending/cigarette,
@@ -88335,8 +85197,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 1;
@@ -88349,8 +85210,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plating,
/area/maintenance/apmaint)
@@ -88358,8 +85218,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -88375,8 +85234,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plating,
/area/maintenance/apmaint)
@@ -88384,8 +85242,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/turf/simulated/floor/plasteel{
dir = 4;
@@ -88412,26 +85269,29 @@
"dEl" = (
/obj/machinery/door/firedoor,
/obj/effect/decal/warning_stripes/yellow,
-/obj/machinery/door/airlock/public/glass,
+/obj/machinery/door/airlock/public/glass{
+ name = "Public Access"
+ },
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel,
/area/hallway/primary/aft)
"dEm" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/door/firedoor,
/obj/effect/decal/warning_stripes/yellow,
-/obj/machinery/door/airlock/public/glass,
+/obj/machinery/door/airlock/public/glass{
+ name = "Public Access"
+ },
/turf/simulated/floor/plasteel,
/area/hallway/primary/aft)
"dEn" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/warning_stripes/yellow/hollow,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -88504,8 +85364,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/warning_stripes/yellow,
/turf/simulated/floor/plasteel,
@@ -88589,8 +85448,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 9
@@ -88622,8 +85480,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
dir = 4;
@@ -88646,8 +85503,7 @@
},
/obj/structure/sink{
dir = 8;
- pixel_x = -12;
- pixel_y = 2
+ pixel_x = -12
},
/turf/simulated/floor/plating,
/area/maintenance/apmaint)
@@ -88669,16 +85525,8 @@
},
/area/maintenance/apmaint)
"dER" = (
-/obj/machinery/camera{
- c_tag = "Experimention Lab";
- dir = 1;
- network = list("Research","SS13")
- },
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
- dir = 8
- },
-/turf/simulated/floor/engine,
-/area/toxins/explab)
+/turf/simulated/wall,
+/area/hallway/primary/central/south)
"dES" = (
/obj/structure/rack,
/obj/effect/spawner/lootdrop/maintenance{
@@ -88760,9 +85608,6 @@
},
/area/hallway/primary/aft)
"dFb" = (
-/obj/machinery/newscaster{
- pixel_x = 32
- },
/obj/machinery/light{
dir = 4
},
@@ -88770,6 +85615,9 @@
pixel_y = 24
},
/obj/item/twohanded/required/kirbyplants,
+/obj/machinery/newscaster{
+ pixel_x = 32
+ },
/turf/simulated/floor/plasteel,
/area/hallway/primary/aft)
"dFc" = (
@@ -88823,8 +85671,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/barricade/wooden,
/obj/machinery/door/airlock/maintenance,
@@ -88871,14 +85718,14 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/effect/landmark{
name = "blobstart"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/maintenance/apmaint)
"dFu" = (
@@ -88935,6 +85782,7 @@
pixel_x = -4;
pixel_y = 4
},
+/obj/item/reagent_containers/spray/cleaner,
/obj/machinery/button/windowtint{
id = 1;
pixel_x = 24
@@ -89105,9 +85953,6 @@
/turf/simulated/floor/plasteel,
/area/maintenance/apmaint)
"dGa" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/effect/spawner/window/reinforced,
/obj/structure/cable{
d2 = 4;
@@ -89133,20 +85978,15 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/maintenance/apmaint)
"dGh" = (
-/obj/machinery/power/apc{
- dir = 8;
- name = "west bump";
- pixel_x = -24
- },
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 4
},
@@ -89163,10 +86003,10 @@
},
/area/hallway/primary/aft)
"dGm" = (
+/obj/machinery/vending/snack,
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/vending/snack,
/turf/simulated/floor/plasteel,
/area/hallway/primary/aft)
"dGn" = (
@@ -89282,14 +86122,14 @@
/area/medical/virology)
"dGx" = (
/obj/structure/table/glass,
-/obj/machinery/newscaster{
- pixel_x = -32
- },
/obj/item/radio/intercom{
pixel_y = 28
},
/obj/item/paper_bin,
/obj/machinery/atmospherics/unary/vent_pump/on,
+/obj/machinery/newscaster{
+ pixel_x = -32
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "whitegreencorner"
@@ -89321,10 +86161,10 @@
/obj/machinery/light/small{
dir = 4
},
+/obj/machinery/atmospherics/unary/vent_scrubber/on,
/obj/machinery/computer/security/telescreen/entertainment{
pixel_y = 32
},
-/obj/machinery/atmospherics/unary/vent_scrubber/on,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "whitegreencorner"
@@ -89387,8 +86227,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -89456,7 +86295,6 @@
},
/area/hallway/primary/aft)
"dGT" = (
-/obj/structure/closet/wardrobe/robotics_black,
/obj/structure/window/reinforced{
dir = 4
},
@@ -89465,12 +86303,12 @@
dir = 1;
pixel_y = -24
},
+/obj/machinery/vending/robodrobe,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
/area/assembly/robotics)
"dGU" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
@@ -89691,10 +86529,10 @@
"dHo" = (
/obj/structure/table/glass,
/obj/item/flashlight/lamp,
+/obj/machinery/atmospherics/unary/vent_pump/on,
/obj/machinery/newscaster{
pixel_y = 32
},
-/obj/machinery/atmospherics/unary/vent_pump/on,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -89717,15 +86555,15 @@
/area/medical/virology)
"dHq" = (
/obj/structure/table/glass,
-/obj/machinery/computer/security/telescreen/entertainment{
- pixel_y = 32
- },
/obj/item/radio/intercom{
dir = 4;
pixel_x = 28
},
-/obj/machinery/computer/med_data/laptop,
/obj/machinery/atmospherics/unary/vent_scrubber/on,
+/obj/machinery/computer/security/telescreen/entertainment{
+ pixel_y = 32
+ },
+/obj/machinery/computer/med_data/laptop,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -89746,9 +86584,7 @@
"dHt" = (
/obj/structure/bookcase,
/obj/effect/decal/cleanable/cobweb2,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/library/abandoned)
"dHu" = (
/obj/structure/table/wood,
@@ -89799,14 +86635,12 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -89821,8 +86655,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -89846,8 +86679,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -89861,8 +86693,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -89878,8 +86709,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -89894,14 +86724,12 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 1;
@@ -89920,8 +86748,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -89938,8 +86765,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -89956,8 +86782,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -89976,8 +86801,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 4;
@@ -89988,6 +86812,7 @@
dir = 4;
initialize_directions = 11
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/maintenance/apmaint)
"dHN" = (
@@ -90021,11 +86846,10 @@
},
/area/assembly/robotics)
"dHS" = (
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
- },
/obj/machinery/vending/cigarette,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/hallway/primary/aft)
"dHT" = (
@@ -90048,22 +86872,24 @@
/obj/machinery/light{
dir = 4
},
+/obj/structure/disposalpipe/trunk{
+ dir = 8
+ },
+/obj/machinery/disposal,
/turf/simulated/floor/plasteel,
/area/hallway/primary/aft)
"dHX" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/mirror{
pixel_x = -32
},
/obj/structure/sink{
dir = 8;
- pixel_x = -12;
- pixel_y = 2
+ pixel_x = -12
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
@@ -90134,16 +86960,15 @@
},
/area/maintenance/port)
"dIg" = (
-/obj/machinery/atmospherics/unary/portables_connector{
- dir = 4
- },
/obj/machinery/camera{
c_tag = "Research Toxins Mixing North";
dir = 4;
network = list("Research","SS13");
pixel_y = -22
},
-/obj/machinery/portable_atmospherics/scrubber,
+/obj/machinery/atmospherics/binary/pump{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "whitepurplecorner"
@@ -90160,7 +86985,6 @@
/turf/simulated/floor/engine,
/area/toxins/misc_lab)
"dIi" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/camera{
c_tag = "Research Central Hall";
dir = 8;
@@ -90273,15 +87097,11 @@
"dIp" = (
/obj/structure/bookcase,
/obj/effect/decal/cleanable/cobweb,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/library/abandoned)
"dIq" = (
/obj/structure/bookcase,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/library/abandoned)
"dIr" = (
/obj/effect/landmark{
@@ -90294,17 +87114,14 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
icon_state = "grimy"
},
/area/library/abandoned)
"dIu" = (
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/library/abandoned)
"dIv" = (
/obj/effect/landmark{
@@ -90336,6 +87153,10 @@
"dIC" = (
/obj/effect/decal/warning_stripes/yellow/hollow,
/obj/structure/closet/wardrobe/toxins_white,
+/obj/structure/disposalpipe/trunk{
+ dir = 4
+ },
+/obj/machinery/disposal,
/turf/simulated/floor/plasteel{
dir = 10;
icon_state = "neutral"
@@ -90354,13 +87175,13 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/door/airlock/maintenance,
/obj/effect/decal/warning_stripes/south,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/maintenance/apmaint)
"dIH" = (
@@ -90368,13 +87189,17 @@
/area/hallway/secondary/exit)
"dII" = (
/obj/structure/cable,
-/obj/machinery/door/airlock/public/glass,
+/obj/machinery/door/airlock/public/glass{
+ name = "Public Access"
+ },
/obj/effect/decal/warning_stripes/south,
/obj/machinery/door/firedoor,
/turf/simulated/floor/plasteel,
/area/hallway/secondary/exit)
"dIJ" = (
-/obj/machinery/door/airlock/public/glass,
+/obj/machinery/door/airlock/public/glass{
+ name = "Public Access"
+ },
/obj/effect/decal/warning_stripes/south,
/obj/machinery/door/firedoor,
/turf/simulated/floor/plasteel,
@@ -90397,8 +87222,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/camera{
c_tag = "Mech Lab";
@@ -90601,8 +87425,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/wood{
broken = 1;
@@ -90613,19 +87436,15 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
- },
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
+ icon_state = "4-8"
},
+/turf/simulated/floor/wood,
/area/library/abandoned)
"dJo" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
icon_state = "grimy"
@@ -90707,19 +87526,27 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/effect/decal/warning_stripes/northwest,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment{
+ dir = 1;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel,
/area/hallway/secondary/exit)
"dJC" = (
+/obj/effect/decal/warning_stripes/north,
+/obj/structure/disposalpipe/sortjunction{
+ dir = 4;
+ name = "Chapel Junction";
+ sortType = 17
+ },
/obj/machinery/newscaster{
pixel_y = 32
},
-/obj/effect/decal/warning_stripes/north,
/turf/simulated/floor/plasteel,
/area/hallway/secondary/exit)
"dJD" = (
@@ -90872,7 +87699,7 @@
},
/area/medical/virology)
"dJZ" = (
-/obj/structure/closet/wardrobe/virology_white,
+/obj/machinery/vending/virodrobe,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -90934,11 +87761,11 @@
/area/chapel/office)
"dKf" = (
/obj/structure/table/wood,
-/obj/item/storage/fancy/candle_box{
+/obj/item/storage/fancy/candle_box/full{
pixel_x = 2;
pixel_y = 3
},
-/obj/item/storage/fancy/candle_box,
+/obj/item/storage/fancy/candle_box/full,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -90972,8 +87799,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -91009,8 +87835,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/effect/decal/warning_stripes/west,
@@ -91027,8 +87852,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -91074,33 +87898,14 @@
/turf/simulated/floor/plating,
/area/maintenance/starboardsolar)
"dKz" = (
-/obj/effect/spawner/window/reinforced,
-/obj/structure/cable{
- d2 = 4;
- icon_state = "0-4"
- },
-/obj/structure/cable{
- d1 = 2;
- d2 = 4;
- icon_state = "2-4";
- tag = ""
- },
-/turf/simulated/floor/plating,
-/area/medical/virology)
+/obj/item/stack/cable_coil/random,
+/turf/space,
+/area/space)
"dKA" = (
-/obj/effect/spawner/window/reinforced,
-/obj/structure/cable{
- d2 = 2;
- icon_state = "0-2"
- },
-/obj/structure/cable{
- d1 = 2;
- d2 = 4;
- icon_state = "2-4";
- tag = ""
- },
-/turf/simulated/floor/plating,
-/area/medical/virology)
+/obj/structure/lattice,
+/obj/item/stack/cable_coil/random,
+/turf/space,
+/area/space/nearstation)
"dKB" = (
/obj/effect/spawner/window/reinforced,
/obj/structure/cable{
@@ -91162,8 +87967,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -91190,8 +87994,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -91200,14 +88003,14 @@
},
/area/chapel/main)
"dKO" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/centcom{
name = "Chapel";
opacity = 1
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -91227,18 +88030,15 @@
/turf/simulated/floor/plasteel,
/area/hallway/secondary/exit)
"dKV" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/effect/landmark/start{
name = "Medical Doctor"
@@ -91251,6 +88051,7 @@
dir = 8;
initialize_directions = 11
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -91259,14 +88060,12 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/effect/decal/warning_stripes/yellow,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
@@ -91284,8 +88083,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door/airlock/maintenance{
name = "Crematorium Maintenance";
@@ -91301,8 +88099,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/warning_stripes/yellow,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -91318,8 +88115,7 @@
},
/obj/structure/sink{
dir = 8;
- pixel_x = -12;
- pixel_y = 2
+ pixel_x = -12
},
/obj/effect/decal/warning_stripes/yellow/hollow,
/turf/simulated/floor/plasteel,
@@ -91350,8 +88146,7 @@
"dLd" = (
/obj/structure/sink{
dir = 8;
- pixel_x = -12;
- pixel_y = 2
+ pixel_x = -12
},
/obj/structure/mirror{
pixel_x = -32
@@ -91408,10 +88203,10 @@
/obj/machinery/light/small{
dir = 1
},
-/mob/living/carbon/human/monkey,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/mob/living/carbon/human/monkey,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "whitegreencorner"
@@ -91433,10 +88228,10 @@
/obj/machinery/light/small{
dir = 1
},
-/mob/living/carbon/human/monkey,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/mob/living/carbon/human/monkey,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "whitegreencorner"
@@ -91463,8 +88258,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -91495,8 +88289,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/landmark/start{
name = "Chaplain"
@@ -91527,8 +88320,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 4;
@@ -91554,13 +88346,13 @@
},
/area/chapel/main)
"dLx" = (
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+ dir = 8
+ },
/obj/structure/disposalpipe/segment{
dir = 4;
icon_state = "pipe-c"
},
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
- dir = 8
- },
/turf/simulated/floor/plasteel{
icon_state = "grimy"
},
@@ -91574,9 +88366,6 @@
},
/area/chapel/main)
"dLz" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable{
d1 = 1;
d2 = 4;
@@ -91585,31 +88374,36 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/effect/decal/warning_stripes/west,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/hallway/secondary/exit)
"dLA" = (
+/obj/effect/decal/warning_stripes/yellow,
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/effect/decal/warning_stripes/yellow,
/turf/simulated/floor/plasteel,
/area/hallway/secondary/exit)
"dLD" = (
-/obj/machinery/door/airlock/public/glass,
-/obj/structure/disposalpipe/segment,
+/obj/machinery/door/airlock/public/glass{
+ name = "Public Access"
+ },
/obj/effect/decal/warning_stripes/south,
/obj/machinery/door/firedoor,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/hallway/secondary/exit)
"dLE" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 8;
+ icon_state = "pipe-c"
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -91625,8 +88419,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -91637,8 +88430,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -91649,17 +88441,12 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/warning_stripes/east,
/turf/simulated/floor/plasteel,
/area/hallway/secondary/exit)
"dLI" = (
-/obj/machinery/navbeacon{
- codes_txt = "patrol;next_patrol=hall8";
- location = "hall7"
- },
/obj/machinery/door/airlock/security/glass{
name = "Holding Area";
req_access_txt = "63"
@@ -91667,8 +88454,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 2;
@@ -91681,6 +88467,10 @@
icon_state = "2-8"
},
/obj/machinery/door/firedoor,
+/obj/machinery/navbeacon{
+ codes_txt = "patrol;next_patrol=hall8";
+ location = "hall7"
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
@@ -91697,7 +88487,6 @@
/turf/simulated/floor/plasteel,
/area/hallway/secondary/exit)
"dLP" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/door/firedoor,
/obj/structure/cable{
d1 = 1;
@@ -91713,6 +88502,7 @@
/obj/machinery/holosign/surgery{
id = "surgery2"
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -91729,24 +88519,36 @@
},
/area/medical/virology)
"dLR" = (
-/obj/structure/chair/office/dark{
- dir = 1
- },
-/turf/simulated/floor/plasteel{
- icon_state = "whitegreen"
- },
-/area/medical/virology)
-"dLT" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2";
tag = ""
},
+/obj/structure/table/glass,
+/obj/structure/reagent_dispensers/virusfood{
+ pixel_x = -32
+ },
+/obj/machinery/reagentgrinder,
+/obj/effect/decal/warning_stripes/east,
/turf/simulated/floor/plasteel{
- icon_state = "whitegreen"
+ dir = 1;
+ icon_state = "whitegreencorner"
},
/area/medical/virology)
+"dLT" = (
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "neutralfull"
+ },
+/area/hallway/primary/central/south)
"dLU" = (
/obj/structure/cable{
d1 = 4;
@@ -91791,15 +88593,11 @@
dir = 4;
pixel_x = -24
},
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/library/abandoned)
"dMd" = (
/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/library/abandoned)
"dMe" = (
/obj/item/twohanded/required/kirbyplants,
@@ -91882,9 +88680,6 @@
/turf/simulated/floor/plasteel,
/area/hallway/secondary/exit)
"dMr" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
@@ -91895,13 +88690,6 @@
/turf/simulated/floor/plasteel,
/area/hallway/secondary/exit)
"dMs" = (
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
- },
-/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 8
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
@@ -91924,6 +88712,31 @@
/turf/simulated/floor/plasteel,
/area/medical/virology)
"dMw" = (
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8";
+ tag = ""
+ },
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
+/obj/structure/cable{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4";
+ tag = ""
+ },
+/obj/machinery/smartfridge/secure/chemistry/virology/preloaded,
+/obj/effect/decal/warning_stripes/east,
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "whitegreen"
+ },
+/area/medical/virology)
+"dMx" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
@@ -91935,7 +88748,7 @@
icon_state = "whitegreen"
},
/area/medical/virology)
-"dMx" = (
+"dMy" = (
/obj/structure/disposalpipe/segment{
dir = 4;
icon_state = "pipe-c"
@@ -91962,26 +88775,6 @@
icon_state = "whitegreen"
},
/area/medical/virology)
-"dMy" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8";
- tag = ""
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 5
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 6
- },
-/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
-/area/medical/virology)
"dMz" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -91997,12 +88790,6 @@
d2 = 4;
icon_state = "1-4"
},
-/obj/structure/cable{
- d1 = 2;
- d2 = 4;
- icon_state = "2-4";
- tag = ""
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
@@ -92015,22 +88802,13 @@
},
/area/medical/virology)
"dMA" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2";
- tag = ""
+/obj/item/storage/secure/safe{
+ pixel_x = 32
},
-/obj/structure/table/glass,
-/obj/item/clothing/gloves/color/latex,
-/obj/item/healthanalyzer,
-/obj/item/clothing/glasses/hud/health,
-/obj/effect/decal/warning_stripes/southeastcorner,
/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "whitegreencorner"
+ icon_state = "grimy"
},
-/area/medical/virology)
+/area/security/detectives_office)
"dMB" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -92117,19 +88895,17 @@
},
/area/medical/virology)
"dMG" = (
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2";
+ tag = ""
+ },
/obj/structure/table/glass,
-/obj/item/folder/white,
-/obj/item/pen/red,
-/obj/item/stack/sheet/mineral/plasma{
- amount = 5
- },
-/obj/machinery/requests_console{
- department = "Virology";
- departmentType = 3;
- name = "Virology Requests Console";
- pixel_y = 30
- },
-/obj/effect/decal/warning_stripes/south,
+/obj/item/clothing/gloves/color/latex,
+/obj/item/healthanalyzer,
+/obj/item/clothing/glasses/hud/health,
+/obj/effect/decal/warning_stripes/southeastcorner,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "whitegreencorner"
@@ -92147,9 +88923,7 @@
/obj/structure/table/wood,
/obj/item/paper_bin,
/obj/item/pen,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/library/abandoned)
"dMJ" = (
/obj/structure/chair/office/dark,
@@ -92191,8 +88965,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/landmark{
name = "blobstart"
@@ -92239,8 +89012,8 @@
},
/area/chapel/main)
"dMW" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/chair/wood,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "chapel"
@@ -92296,20 +89069,46 @@
},
/area/hallway/secondary/exit)
"dNi" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2";
- tag = ""
+/obj/structure/table/glass,
+/obj/item/folder/white,
+/obj/item/pen/red,
+/obj/item/stack/sheet/mineral/plasma{
+ amount = 5
},
+/obj/machinery/requests_console{
+ department = "Virology";
+ departmentType = 3;
+ name = "Virology Requests Console";
+ pixel_y = 30
+ },
+/obj/effect/decal/warning_stripes/south,
/obj/machinery/computer/pandemic,
-/obj/effect/decal/warning_stripes/southeast,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "whitegreencorner"
},
/area/medical/virology)
"dNj" = (
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2";
+ tag = ""
+ },
+/obj/structure/table/glass,
+/obj/item/reagent_containers/spray/cleaner,
+/obj/item/reagent_containers/dropper,
+/obj/machinery/alarm{
+ dir = 4;
+ pixel_x = -24
+ },
+/obj/effect/decal/warning_stripes/east,
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "whitegreencorner"
+ },
+/area/medical/virology)
+"dNk" = (
/obj/structure/chair/office/dark{
dir = 8
},
@@ -92321,7 +89120,7 @@
icon_state = "whitegreen"
},
/area/medical/virology)
-"dNk" = (
+"dNl" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable{
d1 = 1;
@@ -92334,7 +89133,7 @@
icon_state = "whitegreen"
},
/area/medical/virology)
-"dNl" = (
+"dNm" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
},
@@ -92343,19 +89142,7 @@
icon_state = "whitegreen"
},
/area/medical/virology)
-"dNm" = (
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "whitegreen"
- },
-/area/medical/virology)
"dNn" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2";
- tag = ""
- },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "whitegreen"
@@ -92368,8 +89155,7 @@
"dNs" = (
/obj/structure/sink{
dir = 8;
- pixel_x = -12;
- pixel_y = 2
+ pixel_x = -12
},
/turf/simulated/floor/plasteel{
dir = 1;
@@ -92428,9 +89214,7 @@
/obj/structure/table/wood,
/obj/item/folder,
/obj/item/pen,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/library/abandoned)
"dNz" = (
/obj/item/twohanded/required/kirbyplants,
@@ -92442,16 +89226,12 @@
/area/library/abandoned)
"dNA" = (
/obj/structure/table/wood,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/library/abandoned)
"dNB" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/library/abandoned)
"dNC" = (
/obj/machinery/light/small,
@@ -92461,9 +89241,7 @@
"dND" = (
/obj/structure/table/wood,
/obj/item/storage/fancy/crayons,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/library/abandoned)
"dNE" = (
/obj/structure/table/wood,
@@ -92495,14 +89273,13 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
- },
-/obj/machinery/newscaster{
- pixel_x = 32
+ icon_state = "2-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/newscaster{
+ pixel_x = 32
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -92522,8 +89299,8 @@
},
/area/chapel/main)
"dNM" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/chair/wood,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "chapel"
@@ -92574,6 +89351,19 @@
/turf/space,
/area/space)
"dNW" = (
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2";
+ tag = ""
+ },
+/obj/effect/decal/warning_stripes/southeast,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "whitegreencorner"
+ },
+/area/medical/virology)
+"dNX" = (
/obj/structure/filingcabinet/chestdrawer,
/obj/effect/decal/warning_stripes/yellow/hollow,
/turf/simulated/floor/plasteel{
@@ -92581,7 +89371,7 @@
icon_state = "whitegreen"
},
/area/medical/virology)
-"dNX" = (
+"dNY" = (
/obj/machinery/light{
dir = 1;
on = 1
@@ -92602,19 +89392,6 @@
icon_state = "whitegreencorner"
},
/area/medical/virology)
-"dNY" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2";
- tag = ""
- },
-/obj/effect/decal/warning_stripes/yellow/hollow,
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "whitegreencorner"
- },
-/area/medical/virology)
"dNZ" = (
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
@@ -92628,23 +89405,16 @@
},
/area/medical/surgery)
"dOc" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2";
- tag = ""
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
},
-/obj/structure/table/glass,
-/obj/structure/reagent_dispensers/virusfood{
- pixel_x = -32
+/obj/structure/window/reinforced/polarized,
+/obj/effect/decal/warning_stripes/south,
+/obj/machinery/computer/rdconsole/robotics{
+ dir = 1
},
-/obj/machinery/reagentgrinder,
-/obj/effect/decal/warning_stripes/east,
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "whitegreencorner"
- },
-/area/medical/virology)
+/turf/simulated/floor/plasteel,
+/area/assembly/robotics)
"dOd" = (
/turf/simulated/floor/plasteel{
dir = 8;
@@ -92766,6 +89536,7 @@
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
+/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -92826,8 +89597,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small{
@@ -92842,8 +89612,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door/airlock/centcom{
name = "Chapel Morgue";
@@ -92921,6 +89690,16 @@
},
/area/hallway/secondary/exit)
"dOD" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/r_n_d/circuit_imprinter,
+/obj/item/reagent_containers/glass/beaker/sulphuric,
+/obj/structure/window/reinforced/polarized,
+/obj/effect/decal/warning_stripes/south,
+/turf/simulated/floor/plasteel,
+/area/assembly/robotics)
+"dOE" = (
/obj/effect/spawner/window/reinforced,
/obj/structure/cable{
d2 = 4;
@@ -92934,26 +89713,21 @@
},
/turf/simulated/floor/plating,
/area/medical/virology)
-"dOE" = (
-/obj/effect/spawner/window/reinforced,
-/obj/structure/cable,
+"dOF" = (
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8"
+ icon_state = "1-8";
+ tag = ""
},
-/turf/simulated/floor/plating,
-/area/medical/virology)
-"dOF" = (
-/obj/effect/spawner/window/reinforced,
-/obj/structure/cable,
/obj/structure/cable{
- d1 = 1;
- d2 = 4;
- icon_state = "1-4"
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
},
-/turf/simulated/floor/plating,
-/area/medical/virology)
+/obj/structure/lattice/catwalk,
+/turf/space,
+/area/maintenance/starboardsolar)
"dOG" = (
/obj/machinery/light{
dir = 8
@@ -92986,8 +89760,7 @@
},
/obj/structure/sink{
dir = 8;
- pixel_x = -12;
- pixel_y = 2
+ pixel_x = -12
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -93029,9 +89802,6 @@
},
/obj/structure/table/glass,
/obj/item/paper_bin,
-/obj/machinery/newscaster{
- pixel_x = 32
- },
/obj/machinery/camera{
c_tag = "Mining Dock External";
dir = 8
@@ -93040,6 +89810,9 @@
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
},
+/obj/machinery/newscaster{
+ pixel_x = 32
+ },
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "whitegreencorner"
@@ -93059,8 +89832,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plating,
/area/maintenance/apmaint)
@@ -93099,8 +89871,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
dir = 4;
@@ -93111,8 +89882,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
dir = 1;
@@ -93207,7 +89977,6 @@
},
/area/medical/virology)
"dPn" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable{
d1 = 1;
d2 = 2;
@@ -93215,6 +89984,7 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "whiteblue"
},
@@ -93270,9 +90040,11 @@
/area/maintenance/apmaint)
"dPu" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/public/glass,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/door/airlock/public/glass{
+ name = "Public Access"
+ },
/turf/simulated/floor/plasteel,
/area/hallway/primary/aft)
"dPv" = (
@@ -93303,8 +90075,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -93577,8 +90348,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -93589,6 +90359,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
@@ -93722,7 +90495,6 @@
},
/area/assembly/robotics)
"dQr" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/power/apc{
dir = 4;
name = "east bump";
@@ -93732,6 +90504,7 @@
d2 = 2;
icon_state = "0-2"
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "neutralcorner"
},
@@ -93740,8 +90513,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/door/airlock/maintenance,
/turf/simulated/floor/plasteel,
@@ -93763,16 +90535,10 @@
},
/area/medical/surgery2)
"dQv" = (
+/obj/effect/spawner/window/reinforced,
/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8";
- tag = ""
- },
-/obj/structure/cable{
- d1 = 1;
d2 = 4;
- icon_state = "1-4"
+ icon_state = "0-4"
},
/obj/structure/cable{
d1 = 2;
@@ -93780,12 +90546,7 @@
icon_state = "2-4";
tag = ""
},
-/obj/machinery/smartfridge/secure/chemistry/virology/preloaded,
-/obj/effect/decal/warning_stripes/east,
-/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "whitegreen"
- },
+/turf/simulated/floor/plating,
/area/medical/virology)
"dQw" = (
/obj/structure/disposalpipe/segment{
@@ -93892,32 +90653,26 @@
name = "revenantspawn"
},
/obj/effect/decal/warning_stripes/yellow,
-/mob/living/carbon/human/monkey,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/mob/living/carbon/human/monkey,
/turf/simulated/floor/plasteel{
icon_state = "whitegreen"
},
/area/medical/virology)
"dQH" = (
+/obj/effect/spawner/window/reinforced,
/obj/structure/cable{
- d1 = 1;
d2 = 2;
- icon_state = "1-2";
+ icon_state = "0-2"
+ },
+/obj/structure/cable{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4";
tag = ""
},
-/obj/structure/table/glass,
-/obj/item/reagent_containers/spray/cleaner,
-/obj/item/reagent_containers/dropper,
-/obj/machinery/alarm{
- dir = 4;
- pixel_x = -24
- },
-/obj/effect/decal/warning_stripes/east,
-/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "whitegreencorner"
- },
+/turf/simulated/floor/plating,
/area/medical/virology)
"dQI" = (
/obj/effect/decal/warning_stripes/north,
@@ -93984,7 +90739,7 @@
pixel_y = -25
},
/obj/effect/decal/warning_stripes/yellow,
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plating,
/area/maintenance/portsolar)
"dQM" = (
/obj/structure/cable{
@@ -94173,6 +90928,16 @@
/turf/simulated/floor/plasteel,
/area/maintenance/portsolar)
"dRf" = (
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "whitegreen"
+ },
+/area/medical/virology)
+"dRg" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
@@ -94188,7 +90953,7 @@
icon_state = "whitegreencorner"
},
/area/medical/virology)
-"dRg" = (
+"dRh" = (
/obj/structure/table/glass,
/obj/structure/sign/deathsposal{
pixel_y = -32
@@ -94200,7 +90965,7 @@
icon_state = "whitegreencorner"
},
/area/medical/virology)
-"dRh" = (
+"dRi" = (
/obj/machinery/disposal,
/obj/structure/disposalpipe/trunk{
dir = 1
@@ -94217,13 +90982,6 @@
icon_state = "whitegreencorner"
},
/area/medical/virology)
-"dRi" = (
-/obj/item/twohanded/required/kirbyplants,
-/obj/effect/decal/warning_stripes/yellow/hollow,
-/turf/simulated/floor/plasteel{
- icon_state = "whitegreen"
- },
-/area/medical/virology)
"dRj" = (
/obj/effect/decal/warning_stripes/north,
/turf/simulated/floor/plasteel,
@@ -94259,8 +91017,8 @@
},
/area/maintenance/apmaint)
"dRn" = (
-/obj/machinery/hologram/holopad,
/obj/effect/decal/warning_stripes/yellow/hollow,
+/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
@@ -94268,11 +91026,12 @@
/area/hallway/secondary/exit)
"dRo" = (
/obj/structure/cable,
+/obj/effect/decal/warning_stripes/southwest,
/obj/machinery/power/solar_control{
+ dir = 4;
id = "portsolar";
name = "Aft Port Solar Control"
},
-/obj/effect/decal/warning_stripes/southwest,
/turf/simulated/floor/plating,
/area/maintenance/portsolar)
"dRp" = (
@@ -94301,10 +91060,10 @@
/obj/item/clothing/gloves/color/black,
/obj/item/clothing/suit/storage/hazardvest,
/obj/item/clothing/mask/breath,
+/obj/item/reagent_containers/food/drinks/coffee,
/obj/machinery/newscaster{
pixel_x = 32
},
-/obj/item/reagent_containers/food/drinks/coffee,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -94323,8 +91082,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -94644,12 +91402,6 @@
icon_state = "dark"
},
/area/chapel/office)
-"dSl" = (
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/chapel/office)
"dSm" = (
/obj/machinery/light_switch{
pixel_x = 24;
@@ -94721,6 +91473,17 @@
},
/turf/simulated/floor/plasteel,
/area/hallway/secondary/exit)
+"dSz" = (
+/obj/structure/window/reinforced{
+ dir = 1;
+ layer = 2.9
+ },
+/obj/structure/window/reinforced{
+ dir = 4
+ },
+/obj/structure/lattice,
+/turf/space,
+/area/space/nearstation)
"dSA" = (
/obj/structure/table/reinforced,
/obj/item/stack/sheet/metal/fifty{
@@ -94824,8 +91587,8 @@
},
/area/chapel/office)
"dSK" = (
-/obj/machinery/hologram/holopad,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel{
icon_state = "grimy"
},
@@ -94836,13 +91599,6 @@
icon_state = "grimy"
},
/area/chapel/office)
-"dSM" = (
-/obj/structure/disposalpipe/segment,
-/obj/structure/chair/office/dark,
-/turf/simulated/floor/plasteel{
- icon_state = "grimy"
- },
-/area/chapel/office)
"dSN" = (
/obj/item/twohanded/required/kirbyplants,
/turf/simulated/floor/plasteel{
@@ -94879,7 +91635,10 @@
/area/maintenance/apmaint)
"dST" = (
/obj/effect/decal/warning_stripes/north,
-/obj/structure/disposalpipe/segment,
+/obj/structure/disposalpipe/segment{
+ dir = 8;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel,
/area/hallway/secondary/exit)
"dSU" = (
@@ -94894,7 +91653,6 @@
},
/area/hallway/secondary/exit)
"dSV" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/alarm{
dir = 4;
pixel_x = -24
@@ -94928,13 +91686,6 @@
},
/turf/simulated/floor/plating,
/area/hallway/secondary/exit)
-"dSZ" = (
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "neutralfull"
- },
-/area/hallway/secondary/exit)
"dTa" = (
/obj/structure/flora/ausbushes/ywflowers,
/obj/structure/flora/ausbushes/brflowers,
@@ -94947,9 +91698,6 @@
/turf/simulated/floor/grass,
/area/hallway/secondary/exit)
"dTe" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/research/glass{
name = "Experimentor";
@@ -94961,6 +91709,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -94997,7 +91748,6 @@
/turf/simulated/floor/plasteel,
/area/hallway/secondary/exit)
"dTi" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/power/apc{
dir = 8;
name = "west bump";
@@ -95119,9 +91869,7 @@
},
/area/chapel/office)
"dTs" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -95136,11 +91884,7 @@
},
/area/chapel/office)
"dTu" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
+/obj/machinery/atmospherics/unary/vent_scrubber/on,
/turf/simulated/floor/plasteel{
icon_state = "whitegreen"
},
@@ -95155,20 +91899,15 @@
icon_state = "4-8";
tag = ""
},
-/obj/structure/cable{
- d1 = 1;
- d2 = 4;
- icon_state = "1-4"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
+ dir = 5
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
+ dir = 6
},
+/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "whitegreen"
+ icon_state = "white"
},
/area/medical/virology)
"dTw" = (
@@ -95280,34 +92019,16 @@
},
/area/hallway/secondary/exit)
"dTJ" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "red"
},
/area/hallway/secondary/exit)
-"dTK" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8";
- tag = ""
- },
-/obj/structure/disposalpipe/sortjunction{
- name = "Chapel Junction";
- sortType = 17
- },
-/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "neutralfull"
- },
-/area/hallway/secondary/exit)
"dTV" = (
/obj/machinery/power/solar{
name = "Aft Starboard Solar Panel"
@@ -95399,7 +92120,7 @@
/area/chapel/office)
"dUf" = (
/obj/structure/table/wood,
-/obj/item/storage/fancy/donut_box,
+/obj/item/reagent_containers/food/drinks/bottle/holywater,
/turf/simulated/floor/carpet,
/area/chapel/office)
"dUg" = (
@@ -95434,7 +92155,6 @@
/turf/simulated/floor/plasteel,
/area/hallway/secondary/exit)
"dUk" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable{
d1 = 1;
d2 = 8;
@@ -95675,11 +92395,11 @@
/area/chapel/office)
"dUL" = (
/obj/structure/table/wood,
-/obj/item/storage/fancy/candle_box{
+/obj/item/storage/fancy/candle_box/full{
pixel_x = 2;
pixel_y = 3
},
-/obj/item/storage/fancy/candle_box,
+/obj/item/storage/fancy/candle_box/full,
/turf/simulated/floor/plasteel{
icon_state = "grimy"
},
@@ -95728,17 +92448,17 @@
/area/chapel/office)
"dUQ" = (
/obj/structure/table/wood,
-/obj/machinery/newscaster{
- pixel_x = 32
- },
/obj/machinery/light{
dir = 4
},
-/obj/item/storage/fancy/candle_box{
+/obj/item/storage/fancy/candle_box/full{
pixel_x = 2;
pixel_y = 3
},
-/obj/item/storage/fancy/candle_box,
+/obj/item/storage/fancy/candle_box/full,
+/obj/machinery/newscaster{
+ pixel_x = 32
+ },
/turf/simulated/floor/carpet,
/area/chapel/office)
"dUR" = (
@@ -95762,22 +92482,6 @@
/obj/effect/decal/warning_stripes/southwest,
/turf/simulated/floor/plasteel,
/area/hallway/secondary/exit)
-"dUU" = (
-/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
- },
-/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "neutralfull"
- },
-/area/hallway/secondary/exit)
"dUY" = (
/obj/machinery/light,
/obj/machinery/alarm{
@@ -95818,27 +92522,11 @@
temperature = 80
},
/area/toxins/server)
-"dVe" = (
-/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 = 8;
- icon_state = "neutralfull"
- },
-/area/hallway/secondary/exit)
"dVj" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -95876,8 +92564,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -95910,11 +92597,6 @@
icon_state = "dark"
},
/area/medical/cmo)
-"dVw" = (
-/obj/machinery/disposal,
-/obj/structure/disposalpipe/trunk,
-/turf/simulated/floor/plasteel,
-/area/hallway/primary/aft)
"dVx" = (
/obj/structure/table/wood,
/obj/item/ashtray/plastic,
@@ -95937,8 +92619,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/effect/decal/warning_stripes/east,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -96003,8 +92684,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/warning_stripes/yellow,
@@ -96016,8 +92696,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/door/airlock/maintenance{
@@ -96036,14 +92715,14 @@
/turf/simulated/floor/plating,
/area/engine/engineering)
"dWj" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/research/glass{
name = "Research Division";
req_access_txt = "47"
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -96057,8 +92736,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/effect/decal/warning_stripes/yellow,
/turf/simulated/floor/plasteel{
@@ -96069,8 +92747,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/warning_stripes/yellow/hollow,
/obj/machinery/atmospherics/unary/vent_scrubber/on{
@@ -96091,8 +92768,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door/airlock/maintenance,
/turf/simulated/floor/plasteel,
@@ -96101,8 +92777,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door/airlock/maintenance{
name = "Toxin Mixing Lab Maintenance";
@@ -96111,12 +92786,12 @@
/turf/simulated/floor/plasteel,
/area/toxins/mixing)
"dWp" = (
-/obj/structure/disposalpipe/trunk,
-/obj/machinery/disposal,
/obj/structure/window/reinforced{
dir = 4
},
/obj/effect/decal/warning_stripes/yellow/hollow,
+/obj/structure/disposalpipe/trunk,
+/obj/machinery/disposal,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -96125,8 +92800,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door/window/brigdoor{
dir = 1;
@@ -96158,8 +92832,6 @@
},
/area/toxins/xenobiology)
"dWs" = (
-/obj/structure/disposalpipe/trunk,
-/obj/machinery/disposal,
/obj/structure/window/reinforced{
dir = 4
},
@@ -96168,6 +92840,8 @@
pixel_y = -32
},
/obj/effect/decal/warning_stripes/yellow/hollow,
+/obj/structure/disposalpipe/trunk,
+/obj/machinery/disposal,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -96188,10 +92862,10 @@
},
/area/toxins/xenobiology)
"dWu" = (
+/obj/effect/decal/warning_stripes/yellow/hollow,
/obj/machinery/newscaster{
pixel_y = -32
},
-/obj/effect/decal/warning_stripes/yellow/hollow,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -96226,8 +92900,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 4
@@ -96240,8 +92913,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 4
@@ -96307,12 +92979,12 @@
/turf/simulated/floor/plating,
/area/hallway/secondary/exit)
"dWK" = (
-/obj/machinery/hologram/holopad,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 4;
initialize_directions = 11
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
@@ -96322,17 +92994,16 @@
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 4
},
-/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
},
/area/hallway/primary/aft)
"dWM" = (
-/obj/structure/disposalpipe/junction{
- dir = 8
- },
/obj/machinery/vending/coffee,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/hallway/primary/aft)
"dWN" = (
@@ -96342,22 +93013,12 @@
icon_state = "dark"
},
/area/medical/cmo)
-"dWO" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/door/firedoor,
-/obj/effect/decal/warning_stripes/yellow,
-/turf/simulated/floor/plasteel{
- icon_state = "neutralcorner"
- },
-/area/hallway/primary/central)
"dWP" = (
+/obj/effect/decal/warning_stripes/yellow,
/obj/structure/disposalpipe/trunk{
dir = 1
},
/obj/machinery/disposal,
-/obj/effect/decal/warning_stripes/yellow,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
@@ -96382,22 +93043,15 @@
/area/hallway/primary/central)
"dWS" = (
/obj/item/twohanded/required/kirbyplants,
-/obj/machinery/light,
-/obj/machinery/status_display{
- pixel_y = -32
- },
/obj/effect/decal/warning_stripes/yellow/hollow,
/turf/simulated/floor/plasteel{
- dir = 5;
- icon_state = "whitegreencorner"
+ icon_state = "whitegreen"
},
/area/medical/virology)
"dWT" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2";
- tag = ""
+/obj/machinery/light,
+/obj/machinery/status_display{
+ pixel_y = -32
},
/obj/effect/decal/warning_stripes/yellow/hollow,
/turf/simulated/floor/plasteel{
@@ -96470,8 +93124,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/door/airlock/maintenance{
@@ -96564,9 +93217,10 @@
},
/area/medical/virology)
"dXj" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/public/glass,
+/obj/machinery/door/airlock/public/glass{
+ name = "Public Access"
+ },
/turf/simulated/floor/plasteel,
/area/hallway/primary/aft)
"dXk" = (
@@ -96592,7 +93246,6 @@
/turf/simulated/floor/plasteel,
/area/maintenance/apmaint)
"dXm" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/door/airlock/security/glass{
name = "Holding Area";
req_access_txt = "63"
@@ -96655,8 +93308,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 9
},
-/obj/effect/decal/warning_stripes/east,
-/obj/item/twohanded/required/kirbyplants,
+/obj/effect/decal/warning_stripes/southeast,
+/obj/structure/filingcabinet/chestdrawer,
+/obj/structure/window/reinforced/polarized,
/turf/simulated/floor/plasteel,
/area/assembly/robotics)
"dXs" = (
@@ -96702,13 +93356,13 @@
},
/area/medical/research)
"dXw" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "showroomfloor"
},
@@ -96832,13 +93486,13 @@
c_tag = "Chapel South";
dir = 1
},
-/obj/machinery/hologram/holopad,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 9
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
},
+/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel{
icon_state = "grimy"
},
@@ -96861,6 +93515,9 @@
pixel_y = 24
},
/obj/effect/decal/warning_stripes/southwest,
+/obj/machinery/newscaster{
+ pixel_y = -30
+ },
/turf/simulated/floor/plasteel,
/area/hallway/secondary/exit)
"dXQ" = (
@@ -96964,21 +93621,24 @@
/obj/structure/table/glass,
/obj/item/clipboard,
/obj/item/toy/figure/crew/geneticist,
+/obj/structure/extinguisher_cabinet{
+ pixel_y = 30
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "whitepurplecorner"
},
/area/medical/genetics)
"dYc" = (
-/obj/machinery/newscaster{
- pixel_y = 32
- },
/obj/structure/table/glass,
/obj/item/storage/box/beakers{
pixel_x = 5;
pixel_y = 5
},
/obj/item/storage/box/masks,
+/obj/machinery/newscaster{
+ pixel_y = 32
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "whitepurplecorner"
@@ -96993,15 +93653,10 @@
},
/area/medical/genetics)
"dYi" = (
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
- },
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -97029,19 +93684,7 @@
icon_state = "whitepurplecorner"
},
/area/medical/genetics)
-"dYk" = (
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
- },
-/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
-/area/medical/genetics)
"dYl" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
},
@@ -97091,9 +93734,7 @@
/area/maintenance/gambling_den)
"dYu" = (
/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
- },
+/turf/simulated/floor/wood,
/area/maintenance/gambling_den)
"dYw" = (
/obj/effect/decal/warning_stripes/northwest,
@@ -97369,14 +94010,24 @@
/area/chapel/office)
"dYV" = (
/obj/structure/rack,
+/obj/item/storage/secure/briefcase,
/obj/machinery/newscaster{
pixel_y = -32
},
-/obj/item/storage/secure/briefcase,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
/area/crew_quarters/chief)
+"dZb" = (
+/obj/machinery/camera{
+ c_tag = "Research Hallway";
+ network = list("Research","SS13")
+ },
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "whitepurplecorner"
+ },
+/area/medical/research)
"dZi" = (
/obj/docking_port/stationary{
dir = 4;
@@ -97480,8 +94131,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
@@ -97497,6 +94147,12 @@
},
/turf/simulated/floor/plasteel,
/area/security/permasolitary)
+"elb" = (
+/obj/machinery/door/airlock/external{
+ name = "Escape Pod"
+ },
+/turf/space,
+/area/maintenance/port)
"emr" = (
/obj/effect/spawner/window/reinforced,
/obj/structure/cable,
@@ -97507,6 +94163,24 @@
},
/turf/simulated/floor/plating,
/area/security/prisonershuttle)
+"emK" = (
+/obj/machinery/door/poddoor/shutters/preopen{
+ dir = 2;
+ id_tag = "researchdesk1";
+ name = "Research Desk Shutters"
+ },
+/obj/machinery/autolathe,
+/obj/machinery/door/window/southleft{
+ name = "Research Lab Desk";
+ req_access_txt = "7"
+ },
+/obj/machinery/door/window/northleft,
+/obj/structure/window/reinforced{
+ dir = 8;
+ pixel_x = -4
+ },
+/turf/simulated/floor/plating,
+/area/toxins/lab)
"eqc" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/unary/vent_pump/on,
@@ -97549,6 +94223,25 @@
/obj/effect/decal/warning_stripes/northwest,
/turf/simulated/floor/plasteel,
/area/security/securearmoury)
+"esK" = (
+/obj/machinery/atmospherics/pipe/simple/insulated{
+ dir = 4
+ },
+/obj/structure/window/plasmareinforced{
+ dir = 4
+ },
+/obj/structure/window/plasmareinforced{
+ dir = 8
+ },
+/obj/structure/grille,
+/obj/structure/window/plasmareinforced{
+ dir = 1
+ },
+/turf/simulated/floor/plating,
+/area/toxins/mixing)
+"euc" = (
+/turf/simulated/wall/r_wall,
+/area/hallway/primary/central/south)
"eud" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
@@ -97565,6 +94258,18 @@
},
/turf/simulated/floor/plasteel,
/area/security/permasolitary)
+"ewj" = (
+/obj/structure/railing{
+ dir = 1
+ },
+/obj/machinery/disposal,
+/obj/structure/disposalpipe/trunk{
+ dir = 8
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/medical/research)
"ewF" = (
/obj/structure/cable{
d2 = 2;
@@ -97578,9 +94283,6 @@
dir = 4
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "purplecorner"
@@ -97595,6 +94297,13 @@
icon_state = "neutral"
},
/area/maintenance/starboard)
+"eAi" = (
+/obj/structure/window/reinforced{
+ dir = 1;
+ layer = 2.9
+ },
+/turf/space,
+/area/space)
"eCs" = (
/obj/structure/cable{
d1 = 4;
@@ -97605,7 +94314,10 @@
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 8
},
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "neutralfull"
+ },
/area/security/permabrig)
"eDh" = (
/obj/structure/rack,
@@ -97651,9 +94363,9 @@
/area/security/brig)
"eNm" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/command/glass{
- name = "Corporate Lounge";
- req_one_access_txt = "19"
+/obj/machinery/door/airlock/public/glass{
+ id_tag = "pub_room";
+ name = "Public Meeting Room"
},
/turf/simulated/floor/carpet,
/area/assembly/showroom)
@@ -97661,14 +94373,12 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
@@ -97681,6 +94391,14 @@
icon_state = "barber"
},
/area/security/permabrig)
+"eOL" = (
+/obj/structure/disposalpipe/junction{
+ dir = 8
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/medical/research)
"ePS" = (
/obj/structure/lattice,
/turf/simulated/wall/r_wall,
@@ -97699,17 +94417,11 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
- },
-/turf/simulated/floor/plasteel{
- icon_state = "wood"
+ icon_state = "1-2"
},
+/turf/simulated/floor/wood,
/area/crew_quarters/theatre)
"eSe" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/door/airlock/medical{
name = "Operating Theatre Storage";
req_access_txt = "45"
@@ -97720,12 +94432,19 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "showroomfloor"
},
/area/medical/surgery2)
"eSX" = (
/obj/item/twohanded/required/kirbyplants,
+/obj/structure/disposalpipe/segment{
+ dir = 4;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "redcorner"
@@ -97735,14 +94454,12 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel,
@@ -97756,14 +94473,12 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/structure/cable{
d1 = 1;
@@ -97817,11 +94532,30 @@
/obj/machinery/hydroponics/constructable,
/obj/item/seeds/chili,
/obj/item/seeds/chili,
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "red"
+ },
/area/security/permabrig)
+"ffm" = (
+/obj/structure/chair{
+ dir = 1
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/hallway/primary/central)
"fhF" = (
/turf/space,
/area/shuttle/gamma/station)
+"fjv" = (
+/obj/effect/landmark{
+ name = "revenantspawn"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/mob/living/simple_animal/pet/dog/pug,
+/turf/simulated/floor/engine,
+/area/toxins/explab)
"fjJ" = (
/obj/machinery/camera{
c_tag = "Security Armory";
@@ -97868,6 +94602,12 @@
},
/turf/simulated/floor/plasteel,
/area/security/securearmoury)
+"fqy" = (
+/obj/item/twohanded/required/kirbyplants,
+/turf/simulated/floor/plasteel{
+ icon_state = "barber"
+ },
+/area/civilian/barber)
"frp" = (
/obj/structure/flora/ausbushes/sunnybush,
/obj/structure/flora/ausbushes/lavendergrass,
@@ -97886,14 +94626,39 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/turf/simulated/floor/plasteel,
/area/security/seceqstorage)
+"fuR" = (
+/obj/effect/decal/warning_stripes/east,
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+ dir = 8
+ },
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2";
+ tag = ""
+ },
+/turf/simulated/floor/plasteel,
+/area/hallway/secondary/entry)
+"fxr" = (
+/obj/machinery/door/airlock/external{
+ frequency = 1379;
+ id_tag = "sw_maint_inner";
+ locked = 1;
+ name = "West Maintenance External Access";
+ req_access_txt = "10;13"
+ },
+/obj/machinery/atmospherics/pipe/simple/visible{
+ dir = 4
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/port)
"fzQ" = (
/obj/effect/spawner/window/reinforced,
/obj/structure/cable,
@@ -97919,6 +94684,14 @@
icon_state = "dark"
},
/area/tcommsat/chamber)
+"fBm" = (
+/obj/effect/decal/warning_stripes/west,
+/obj/structure/table/reinforced,
+/obj/item/reagent_containers/dropper/precision,
+/obj/item/storage/box/syringes,
+/obj/item/reagent_containers/dropper,
+/turf/simulated/floor/engine,
+/area/toxins/misc_lab)
"fDE" = (
/obj/effect/spawner/window/reinforced,
/obj/structure/cable{
@@ -97936,8 +94709,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/warning_stripes/north,
/turf/simulated/floor/plasteel,
@@ -97987,11 +94759,6 @@
name = "Security Checkpoint";
req_access_txt = "1"
},
-/obj/machinery/door/window/brigdoor{
- dir = 3;
- name = "Security Checkpoint";
- req_access_txt = "1"
- },
/obj/item/folder/red,
/obj/item/folder/red,
/obj/machinery/door/poddoor{
@@ -98015,6 +94782,13 @@
icon_state = "grimy"
},
/area/security/detectives_office)
+"fMg" = (
+/obj/structure/chair/office/light{
+ dir = 4
+ },
+/obj/effect/decal/warning_stripes/west,
+/turf/simulated/floor/engine,
+/area/toxins/misc_lab)
"fPC" = (
/obj/structure/table/reinforced,
/obj/item/flash,
@@ -98031,6 +94805,14 @@
icon_state = "red"
},
/area/security/seceqstorage)
+"fPS" = (
+/obj/structure/window/reinforced,
+/obj/structure/window/reinforced{
+ dir = 8
+ },
+/obj/structure/lattice,
+/turf/space,
+/area/space/nearstation)
"fTZ" = (
/turf/simulated/wall/rust,
/area/security/detectives_office)
@@ -98052,16 +94834,16 @@
/turf/simulated/floor/plating,
/area/security/brig)
"fVZ" = (
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 1;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel{
icon_state = "showroomfloor"
},
@@ -98080,12 +94862,31 @@
/turf/simulated/floor/plating,
/area/security/prisonershuttle)
"ggp" = (
-/obj/machinery/vending/coffee,
+/obj/machinery/vending/coffee/free,
/obj/structure/sign/electricshock{
pixel_y = 32
},
-/turf/simulated/floor/plating,
+/turf/simulated/floor/plasteel{
+ dir = 5;
+ icon_state = "red"
+ },
/area/security/permabrig)
+"giz" = (
+/obj/structure/table/glass,
+/obj/item/book/random{
+ pixel_y = 6
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/medical/medbay)
+"gkk" = (
+/obj/machinery/hologram/holopad,
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "neutralfull"
+ },
+/area/hallway/secondary/exit)
"glQ" = (
/obj/structure/window/reinforced{
dir = 8
@@ -98100,7 +94901,10 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/machinery/atmospherics/unary/vent_scrubber/on,
+/obj/machinery/atmospherics/unary/vent_pump/on,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "red"
@@ -98109,6 +94913,17 @@
"goP" = (
/turf/simulated/wall,
/area/security/processing)
+"gpU" = (
+/obj/structure/plasticflaps{
+ opacity = 1
+ },
+/obj/machinery/navbeacon{
+ codes_txt = "delivery";
+ dir = 8;
+ location = "Janitor"
+ },
+/turf/simulated/floor/plating,
+/area/janitor)
"gpX" = (
/obj/effect/landmark{
name = "blobstart"
@@ -98118,12 +94933,31 @@
icon_state = "neutral"
},
/area/maintenance/starboard)
+"gqM" = (
+/obj/structure/reagent_dispensers/watertank,
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "whitepurplecorner"
+ },
+/area/medical/research)
+"gsy" = (
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2";
+ tag = ""
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/plasteel{
+ icon_state = "dark"
+ },
+/area/chapel/office)
"gwn" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/rack,
/obj/item/gun/energy/gun{
@@ -98149,9 +94983,6 @@
},
/area/security/processing)
"gxd" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/chair{
dir = 1
},
@@ -98180,22 +95011,31 @@
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/warning_stripes/north,
/obj/machinery/light,
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plating,
/area/quartermaster/storage)
"gyY" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/command/glass{
- name = "Corporate Lounge";
- req_one_access_txt = "19"
+/obj/machinery/door/airlock/public/glass{
+ id_tag = "pub_room";
+ name = "Public Meeting Room"
},
/turf/simulated/floor/carpet,
/area/assembly/showroom)
+"gzU" = (
+/obj/machinery/atmospherics/unary/vent_pump/on,
+/obj/machinery/newscaster{
+ pixel_y = 32
+ },
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "arrival"
+ },
+/area/hallway/secondary/entry)
"gBV" = (
/turf/simulated/floor/plasteel{
dir = 1;
@@ -98222,15 +95062,14 @@
/turf/simulated/floor/plating,
/area/hallway/secondary/exit)
"gGu" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/maintenance/starboard2)
"gGJ" = (
@@ -98265,7 +95104,6 @@
/turf/simulated/floor/plating,
/area/hallway/secondary/entry)
"gJk" = (
-/obj/machinery/hologram/holopad,
/obj/effect/decal/warning_stripes/yellow/hollow,
/obj/structure/cable{
d1 = 2;
@@ -98273,6 +95111,7 @@
icon_state = "2-4"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
@@ -98301,8 +95140,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel,
/area/security/permasolitary)
@@ -98315,9 +95153,37 @@
icon_state = "grimy"
},
/area/security/detectives_office)
+"gTA" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "yellowfull"
+ },
+/area/engine/engineering)
"gTW" = (
/turf/simulated/floor/plasteel,
/area/security/securearmoury)
+"gUi" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 10
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 6
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "freezerfloor"
+ },
+/area/crew_quarters/sleep)
"haD" = (
/obj/structure/cable{
d2 = 8;
@@ -98346,13 +95212,30 @@
icon_state = "red"
},
/area/security/seceqstorage)
+"haY" = (
+/obj/structure/closet/wardrobe/atmospherics_yellow,
+/turf/simulated/floor/plating,
+/area/maintenance/electrical)
+"hbU" = (
+/obj/structure/chair/office/dark{
+ dir = 1
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "whitegreen"
+ },
+/area/medical/virology)
"hch" = (
-/obj/structure/chair/stool,
+/obj/structure/chair/stool{
+ dir = 8
+ },
/obj/machinery/firealarm{
dir = 4;
pixel_x = 24
},
-/turf/simulated/floor/plating,
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "red"
+ },
/area/security/permabrig)
"hcQ" = (
/obj/structure/bed,
@@ -98390,8 +95273,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel,
/area/security/permasolitary)
@@ -98399,8 +95281,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -98409,12 +95290,32 @@
icon_state = "redcorner"
},
/area/security/brig)
+"hgq" = (
+/obj/machinery/atmospherics/unary/passive_vent{
+ dir = 4
+ },
+/turf/simulated/floor/engine,
+/area/toxins/mixing)
"hjo" = (
/obj/structure/closet/crate,
/obj/effect/landmark/costume/random,
/obj/effect/spawner/lootdrop/maintenance,
/turf/simulated/floor/plating,
/area/maintenance/starboard)
+"hly" = (
+/obj/structure/table/wood,
+/turf/simulated/floor/plasteel{
+ dir = 5;
+ icon_state = "dark"
+ },
+/area/crew_quarters/bar)
+"hlY" = (
+/obj/machinery/atmospherics/pipe/manifold/visible/yellow{
+ dir = 4
+ },
+/obj/effect/decal/warning_stripes/east,
+/turf/simulated/floor/plasteel,
+/area/atmos)
"hmC" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -98446,8 +95347,18 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/turf/simulated/floor/plating,
-/area/maintenance/starboard)
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/hallway/primary/central)
+"hsQ" = (
+/obj/structure/chair/sofa/corp/right{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "whiteblue"
+ },
+/area/medical/medbay)
"hzb" = (
/obj/machinery/light{
dir = 4
@@ -98457,6 +95368,27 @@
icon_state = "redcorner"
},
/area/security/permasolitary)
+"hzl" = (
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "dark"
+ },
+/area/turret_protected/aisat)
+"hAi" = (
+/obj/machinery/vending/scidrobe,
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "whitepurple"
+ },
+/area/toxins/misc_lab)
"hDZ" = (
/obj/docking_port/stationary{
dir = 8;
@@ -98473,7 +95405,7 @@
/obj/machinery/light{
dir = 1
},
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plating,
/area/quartermaster/storage)
"hHM" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -98482,17 +95414,38 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/sortjunction{
+ dir = 1;
+ name = "HoS Junction";
+ sortType = 7
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "red"
},
/area/security/brig)
+"hJG" = (
+/turf/simulated/floor/plasteel/stairs,
+/area/medical/research)
+"hLa" = (
+/obj/effect/spawner/window/reinforced,
+/obj/structure/cable{
+ d2 = 8;
+ icon_state = "0-8"
+ },
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden,
+/turf/simulated/floor/plating,
+/area/security/permabrig)
"hLZ" = (
/obj/structure/table/glass,
/obj/item/hemostat{
@@ -98513,14 +95466,41 @@
layer = 4;
pixel_y = -32
},
+/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.";
+ name = "Surgery Cleaner"
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "whiteblue"
},
/area/medical/surgery1)
+"hMu" = (
+/obj/effect/spawner/window/reinforced,
+/obj/structure/cable,
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
+/turf/simulated/floor/plating,
+/area/medical/virology)
"hOL" = (
/turf/simulated/floor/carpet,
/area/magistrateoffice)
+"hPT" = (
+/obj/machinery/door/airlock/atmos/glass{
+ heat_proof = 1;
+ name = "Supermatter Chamber";
+ req_one_access_txt = "24; 10"
+ },
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/engine,
+/area/engine/supermatter)
"hTk" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/rack,
@@ -98553,9 +95533,6 @@
/turf/simulated/wall,
/area/magistrateoffice)
"hTW" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/camera{
c_tag = "Medbay Surgery East Storage";
dir = 1
@@ -98564,16 +95541,43 @@
dir = 4
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "showroomfloor"
},
/area/medical/surgery1)
-"hZF" = (
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "redcorner"
+"hWz" = (
+/obj/effect/spawner/window/reinforced,
+/obj/structure/cable{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
},
-/area/hallway/primary/starboard)
+/obj/structure/cable{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
+ },
+/obj/structure/cable{
+ d2 = 2;
+ icon_state = "0-2"
+ },
+/turf/simulated/floor/plating,
+/area/security/permabrig)
+"hZR" = (
+/obj/structure/chair/stool{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "neutralfull"
+ },
+/area/security/permabrig)
"ibc" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -98603,8 +95607,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel,
/area/security/securearmoury)
@@ -98616,19 +95619,29 @@
/turf/simulated/floor/plasteel,
/area/security/securearmoury)
"ifj" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "showroomfloor"
},
/area/medical/surgery2)
+"iiv" = (
+/obj/machinery/navbeacon{
+ codes_txt = "delivery";
+ location = "Science"
+ },
+/obj/structure/plasticflaps{
+ opacity = 1
+ },
+/turf/simulated/floor/plating,
+/area/toxins/misc_lab)
"iiM" = (
/obj/structure/window/reinforced{
dir = 8
@@ -98636,20 +95649,46 @@
/obj/structure/piano,
/turf/simulated/floor/plating,
/area/crew_quarters/theatre)
+"iiY" = (
+/obj/machinery/atmospherics/pipe/simple/visible/cyan{
+ dir = 4
+ },
+/obj/effect/decal/warning_stripes/north,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/floor/plasteel,
+/area/atmos)
+"ijT" = (
+/obj/machinery/atmospherics/pipe/simple/visible/cyan{
+ dir = 5
+ },
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "neutralfull"
+ },
+/area/atmos)
"ipD" = (
/obj/structure/closet/wardrobe/pjs,
-/turf/simulated/floor/plating,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "red"
+ },
/area/security/permabrig)
"isz" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/vending/sustenance,
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ dir = 9;
+ icon_state = "red"
+ },
/area/security/permabrig)
+"iuU" = (
+/obj/item/twohanded/required/kirbyplants,
+/turf/simulated/floor/wood,
+/area/crew_quarters/sleep)
"iwQ" = (
/obj/machinery/light_switch{
pixel_y = 26
@@ -98671,8 +95710,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/turf/simulated/floor/plasteel,
/area/security/prisonershuttle)
@@ -98688,20 +95726,27 @@
},
/area/maintenance/starboard)
"iDa" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/door_control{
id = "magistrate";
name = "Privacy Shutters Control";
pixel_y = 25
},
/obj/structure/table/wood,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/obj/machinery/computer/secure_data/laptop,
/turf/simulated/floor/plasteel{
icon_state = "cult"
},
/area/magistrateoffice)
+"iDz" = (
+/obj/machinery/door/poddoor{
+ id_tag = "toxmix1";
+ name = "Space Vent"
+ },
+/turf/simulated/floor/engine,
+/area/toxins/mixing)
"iFx" = (
/obj/structure/sink{
dir = 8;
@@ -98722,6 +95767,28 @@
icon_state = "whiteblue"
},
/area/medical/surgery2)
+"iIw" = (
+/obj/machinery/atmospherics/unary/vent_scrubber/on,
+/obj/machinery/newscaster{
+ pixel_y = 32
+ },
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "arrival"
+ },
+/area/hallway/secondary/entry)
+"iIY" = (
+/obj/machinery/light{
+ dir = 8
+ },
+/obj/structure/table/wood,
+/obj/item/storage/briefcase,
+/obj/machinery/light_switch{
+ pixel_x = -26;
+ pixel_y = -4
+ },
+/turf/simulated/floor/wood,
+/area/medical/psych)
"iKj" = (
/obj/machinery/light_switch{
pixel_x = -23;
@@ -98737,18 +95804,20 @@
icon_state = "whiteblue"
},
/area/medical/surgery2)
+"iLr" = (
+/obj/item/relic,
+/turf/simulated/floor/engine,
+/area/toxins/explab)
"iLL" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/machinery/door/airlock/security/glass{
name = "Prison Wing";
@@ -98761,27 +95830,38 @@
/obj/structure/closet/emcloset,
/turf/simulated/floor/plating,
/area/maintenance/starboard)
+"iPQ" = (
+/obj/machinery/light/small{
+ dir = 1
+ },
+/obj/structure/rack,
+/obj/effect/spawner/lootdrop/maintenance{
+ lootcount = 2;
+ name = "2maintenance loot spawner"
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/port)
"iTV" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/warning_stripes/northwestcorner,
/turf/simulated/floor/plasteel,
/area/security/securearmoury)
"iUc" = (
-/obj/effect/decal/cleanable/dirt,
/obj/item/twohanded/required/kirbyplants,
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "red"
+ },
/area/security/permabrig)
"iVO" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/effect/decal/cleanable/dirt,
@@ -98798,6 +95878,12 @@
/obj/effect/decal/warning_stripes/south,
/turf/simulated/floor/plasteel,
/area/security/securearmoury)
+"iWE" = (
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "whitebluecorner"
+ },
+/area/hallway/primary/central)
"iXX" = (
/obj/structure/cable{
d1 = 1;
@@ -98811,7 +95897,7 @@
/obj/machinery/door/window/brigdoor{
dir = 2;
name = "Warden's Desk";
- req_access_txt = "3"
+ req_access_txt = "63"
},
/obj/machinery/door/window/brigdoor{
dir = 1;
@@ -98834,6 +95920,27 @@
icon_state = "cult"
},
/area/magistrateoffice)
+"jbq" = (
+/obj/structure/table/reinforced,
+/obj/item/clothing/mask/gas,
+/obj/item/clothing/mask/gas,
+/obj/item/wrench,
+/obj/item/clothing/glasses/science,
+/obj/item/reagent_containers/spray/cleaner{
+ desc = "Someone has crossed out the 'Space' from Space Cleaner and written in Chemistry. Scrawled on the back is, 'Okay, whoever filled this with polytrinic acid, it was only funny the first time. It was hard enough replacing the CMO's first cat!'";
+ name = "Chemistry Cleaner"
+ },
+/turf/simulated/floor/engine,
+/area/toxins/misc_lab)
+"jdF" = (
+/obj/machinery/disposal,
+/obj/structure/disposalpipe/trunk{
+ dir = 8
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "whitebluecorner"
+ },
+/area/medical/medbay)
"jgO" = (
/obj/machinery/door/airlock/security/glass{
id_tag = "Brig";
@@ -98848,8 +95955,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/obj/structure/cable{
d1 = 2;
@@ -98857,6 +95963,9 @@
icon_state = "2-8"
},
/obj/machinery/door/firedoor,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -98868,9 +95977,9 @@
},
/area/engine/break_room)
"jkU" = (
+/obj/effect/decal/warning_stripes/yellow/hollow,
/obj/structure/disposalpipe/trunk,
/obj/machinery/disposal,
-/obj/effect/decal/warning_stripes/yellow/hollow,
/turf/simulated/floor/plasteel{
icon_state = "showroomfloor"
},
@@ -98885,6 +95994,26 @@
icon_state = "redcorner"
},
/area/security/permasolitary)
+"jsi" = (
+/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";
+ tag = ""
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/hallway/primary/central)
"jsV" = (
/obj/structure/cable{
d1 = 4;
@@ -98917,6 +96046,31 @@
icon_state = "dark"
},
/area/security/processing)
+"jBp" = (
+/obj/machinery/door/poddoor{
+ density = 0;
+ icon_state = "open";
+ id_tag = "Prison Gate";
+ name = "Prison Lockdown Blast Doors";
+ opacity = 0
+ },
+/obj/effect/spawner/window/reinforced,
+/obj/structure/cable{
+ d2 = 8;
+ icon_state = "0-8"
+ },
+/turf/simulated/floor/plating,
+/area/security/permabrig)
+"jBy" = (
+/obj/structure/window/reinforced{
+ dir = 1;
+ layer = 2.9
+ },
+/obj/structure/window/reinforced{
+ dir = 4
+ },
+/turf/space,
+/area/space)
"jCt" = (
/obj/structure/table/reinforced,
/turf/simulated/floor/plasteel{
@@ -98925,18 +96079,29 @@
},
/area/security/warden)
"jCU" = (
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
- },
/obj/structure/sign/poster/official/random{
pixel_y = 32
},
/obj/structure/filingcabinet,
+/obj/structure/disposalpipe/segment{
+ dir = 2;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel{
icon_state = "cult"
},
/area/magistrateoffice)
+"jFV" = (
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "yellowfull"
+ },
+/area/engine/engineering)
"jHa" = (
/obj/machinery/atm{
pixel_x = -32
@@ -98946,23 +96111,65 @@
icon_state = "neutralcorner"
},
/area/crew_quarters/fitness)
+"jHd" = (
+/obj/machinery/door/airlock/glass{
+ name = "Cabin"
+ },
+/turf/simulated/floor/wood,
+/area/crew_quarters/sleep)
"jIs" = (
/turf/simulated/wall/r_wall,
/area/security/evidence)
"jIV" = (
-/obj/machinery/hologram/holopad,
/obj/effect/decal/warning_stripes/yellow/hollow,
/obj/structure/cable{
d1 = 1;
d2 = 4;
- icon_state = "1-4";
- tag = ""
+ icon_state = "1-4"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel,
/area/security/seceqstorage)
+"jKp" = (
+/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";
+ tag = ""
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "whitebluecorner"
+ },
+/area/hallway/primary/central)
+"jLu" = (
+/obj/machinery/atmospherics/pipe/simple/hidden{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "redcorner"
+ },
+/area/security/permabrig)
+"jLB" = (
+/obj/effect/spawner/window/reinforced,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/simulated/floor/plating,
+/area/toxins/misc_lab)
"jQY" = (
/turf/simulated/wall/r_wall,
/area/security/seceqstorage)
@@ -98977,18 +96184,15 @@
},
/area/hallway/primary/central)
"jUH" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 8
@@ -98998,6 +96202,12 @@
icon_state = "neutralfull"
},
/area/security/brig)
+"jVL" = (
+/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{
+ dir = 8
+ },
+/turf/simulated/floor/engine,
+/area/toxins/mixing)
"jYK" = (
/obj/effect/spawner/window/reinforced,
/obj/structure/cable{
@@ -99013,16 +96223,46 @@
},
/turf/simulated/floor/plating,
/area/security/seceqstorage)
+"jYY" = (
+/obj/structure/table/reinforced,
+/obj/machinery/door/firedoor,
+/obj/machinery/door/window/southleft{
+ name = "Medbay Desk";
+ req_access_txt = "5"
+ },
+/obj/effect/decal/warning_stripes/yellow,
+/obj/item/paper_bin,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/medical/medbay)
+"kdR" = (
+/obj/machinery/door/airlock/external{
+ frequency = 1379;
+ id_tag = "sw_maint_outer";
+ locked = 1;
+ name = "West Maintenance External Access"
+ },
+/turf/simulated/floor/plasteel,
+/area/maintenance/port)
+"keD" = (
+/obj/machinery/atmospherics/pipe/simple/hidden{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "neutralfull"
+ },
+/area/security/permabrig)
"khY" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/maintenance/starboard2)
"kii" = (
@@ -99036,11 +96276,8 @@
pixel_x = -24
},
/obj/item/ammo_box/shotgun/rubbershot,
-/obj/item/ammo_box/shotgun/buck,
/obj/item/storage/box/rubbershot,
/obj/item/storage/box/rubbershot,
-/obj/item/storage/box/buck,
-/obj/item/storage/box/buck,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "vault"
@@ -99053,6 +96290,13 @@
},
/turf/simulated/floor/plasteel,
/area/security/permabrig)
+"kjL" = (
+/obj/structure/disposalpipe/segment,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "whitebluecorner"
+ },
+/area/medical/medbay)
"kkM" = (
/obj/vehicle/secway,
/obj/item/key/security,
@@ -99061,6 +96305,12 @@
icon_state = "vault"
},
/area/security/securearmoury)
+"klh" = (
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "whitebluecorner"
+ },
+/area/hallway/primary/central)
"klk" = (
/obj/machinery/firealarm{
dir = 1;
@@ -99080,8 +96330,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -99111,6 +96360,15 @@
},
/turf/simulated/floor/plating,
/area/hallway/secondary/entry)
+"kpI" = (
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2";
+ tag = ""
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/port)
"kxq" = (
/obj/structure/table/wood,
/obj/item/paper_bin,
@@ -99120,29 +96378,23 @@
},
/area/security/detectives_office)
"kyq" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/table/reinforced,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "vault"
},
/area/security/prisonershuttle)
-"kzg" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
+"kyU" = (
/obj/effect/spawner/window/reinforced,
-/obj/structure/cable{
- d2 = 2;
- icon_state = "0-2"
- },
+/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
-/area/security/warden)
+/area/maintenance/port)
"kCi" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -99162,7 +96414,7 @@
/obj/machinery/door/window/brigdoor{
dir = 2;
name = "Secure Armory";
- req_access_txt = "3"
+ req_access_txt = "63"
},
/obj/machinery/door/window/brigdoor{
dir = 1;
@@ -99181,8 +96433,18 @@
icon_state = "1-2"
},
/obj/item/clipboard,
-/turf/simulated/floor/plating,
+/turf/simulated/floor/plasteel{
+ dir = 9;
+ icon_state = "red"
+ },
/area/security/permabrig)
+"kRz" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/toxins/misc_lab)
"kSX" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -99201,20 +96463,38 @@
icon_state = "vault"
},
/area/security/securearmoury)
+"kTW" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "dark"
+ },
+/area/chapel/office)
"kVM" = (
+/obj/effect/decal/warning_stripes/yellow/hollow,
/obj/structure/disposalpipe/trunk,
/obj/machinery/disposal,
-/obj/effect/decal/warning_stripes/yellow/hollow,
/turf/simulated/floor/plasteel{
icon_state = "showroomfloor"
},
/area/medical/surgery2)
+"kWO" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/railing/corner{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/medical/research)
"kYe" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/warning_stripes/east,
/obj/effect/decal/warning_stripes/west,
@@ -99238,6 +96518,26 @@
icon_state = "solarpanel"
},
/area/maintenance/auxsolarstarboard)
+"lah" = (
+/obj/machinery/dye_generator,
+/obj/machinery/alarm{
+ dir = 4;
+ pixel_x = -24
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "barber"
+ },
+/area/civilian/barber)
+"lee" = (
+/obj/structure/table/glass,
+/obj/item/grown/sunflower{
+ pixel_x = -2;
+ pixel_y = 2
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/medical/medbay)
"ljZ" = (
/obj/machinery/door/poddoor{
density = 0;
@@ -99269,38 +96569,12 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
icon_state = "red"
},
/area/security/seceqstorage)
-"loP" = (
-/obj/structure/disposalpipe/segment,
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2";
- tag = ""
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/structure/cable{
- d1 = 2;
- d2 = 4;
- icon_state = "2-4";
- tag = ""
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "neutralfull"
- },
-/area/security/brig)
"lso" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -99327,14 +96601,10 @@
},
/area/crew_quarters/courtroom)
"ltY" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -99343,6 +96613,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/maintenance/starboard)
"luc" = (
@@ -99353,6 +96626,12 @@
icon_state = "grimy"
},
/area/security/detectives_office)
+"lxh" = (
+/obj/effect/decal/warning_stripes/southeast,
+/obj/effect/spawner/lootdrop/maintenance,
+/obj/structure/rack,
+/turf/simulated/floor/plating,
+/area/maintenance/port)
"lzY" = (
/obj/structure/table/wood,
/obj/machinery/alarm{
@@ -99397,8 +96676,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -99406,7 +96684,9 @@
},
/area/security/securearmoury)
"lEt" = (
-/obj/machinery/door/airlock/public/glass,
+/obj/machinery/door/airlock/public/glass{
+ name = "Court gallery"
+ },
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel{
@@ -99447,8 +96727,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/closet/secure_closet/security,
/obj/machinery/atmospherics/unary/vent_pump/on{
@@ -99458,6 +96737,19 @@
icon_state = "red"
},
/area/security/seceqstorage)
+"lKc" = (
+/obj/structure/disposalpipe/segment,
+/obj/structure/chair/office/dark,
+/turf/simulated/floor/plasteel{
+ icon_state = "grimy"
+ },
+/area/chapel/office)
+"lMo" = (
+/turf/simulated/floor/plasteel{
+ dir = 0;
+ icon_state = "red"
+ },
+/area/security/permabrig)
"lVO" = (
/obj/machinery/turretid/lethal{
control_area = "\improper Telecoms Central Compartment";
@@ -99468,6 +96760,17 @@
icon_state = "dark"
},
/area/turret_protected/aisat)
+"lVT" = (
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/machinery/hologram/holopad,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/toxins/explab)
"lZw" = (
/obj/machinery/ai_status_display{
pixel_x = -32
@@ -99475,8 +96778,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -99484,12 +96786,16 @@
icon_state = "redcorner"
},
/area/security/permasolitary)
+"maf" = (
+/obj/structure/mopbucket,
+/obj/item/mop,
+/turf/simulated/floor/plating,
+/area/maintenance/port)
"meB" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 8
@@ -99511,6 +96817,13 @@
icon_state = "dark"
},
/area/security/interrogation)
+"mfl" = (
+/obj/effect/decal/warning_stripes/east,
+/obj/machinery/atmospherics/unary/thermomachine/freezer{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel,
+/area/atmos)
"mft" = (
/obj/effect/spawner/window/reinforced,
/obj/machinery/door/poddoor{
@@ -99532,6 +96845,14 @@
"mhu" = (
/turf/simulated/wall/r_wall,
/area/security/permasolitary)
+"mhT" = (
+/obj/structure/reagent_dispensers/fueltank/chem{
+ pixel_x = -32;
+ pixel_y = null
+ },
+/obj/machinery/chem_heater,
+/turf/simulated/floor/engine,
+/area/toxins/misc_lab)
"miL" = (
/turf/simulated/floor/plasteel{
dir = 1;
@@ -99563,12 +96884,21 @@
/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
/area/security/brig)
+"mlR" = (
+/obj/machinery/atmospherics/unary/outlet_injector{
+ dir = 4;
+ frequency = 1443;
+ icon_state = "on";
+ id = "air_in";
+ on = 1
+ },
+/turf/simulated/floor/engine,
+/area/toxins/mixing)
"mmw" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/chair/stool,
/obj/effect/landmark/start{
@@ -99577,8 +96907,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/machinery/alarm{
pixel_y = 24
@@ -99592,8 +96921,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -99604,6 +96932,16 @@
icon_state = "redcorner"
},
/area/security/permabrig)
+"mnG" = (
+/obj/item/twohanded/required/kirbyplants,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "whitepurplecorner"
+ },
+/area/medical/research)
"moa" = (
/obj/structure/window/reinforced{
dir = 8
@@ -99641,18 +96979,34 @@
icon_state = "vault"
},
/area/security/securearmoury)
+"mrW" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/newscaster{
+ pixel_y = -32
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "neutralcorner"
+ },
+/area/hallway/primary/starboard)
+"mtx" = (
+/obj/item/radio/beacon,
+/turf/simulated/floor/plasteel/airless,
+/area/toxins/test_area)
"mtL" = (
-/obj/effect/decal/cleanable/dirt,
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8";
tag = ""
},
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "neutralfull"
+ },
/area/security/permabrig)
"mtR" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable{
d1 = 4;
d2 = 8;
@@ -99665,6 +97019,7 @@
/area/hallway/primary/starboard)
"muI" = (
/obj/machinery/hologram/holopad,
+/obj/structure/railing,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -99705,10 +97060,19 @@
dir = 8
},
/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "whitepurplecorner"
+ dir = 8;
+ icon_state = "whitepurple"
},
-/area/medical/research)
+/area/toxins/misc_lab)
+"mzZ" = (
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+ dir = 8
+ },
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "neutralfull"
+ },
+/area/atmos)
"mDm" = (
/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
@@ -99734,39 +97098,35 @@
},
/turf/simulated/floor/plasteel,
/area/security/permasolitary)
-"mHf" = (
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
- },
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "red"
- },
-/area/security/brig)
"mHP" = (
-/obj/structure/disposalpipe/sortjunction{
- dir = 1;
- name = "Security Junction";
- sortType = 13
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "redcorner"
},
/area/hallway/primary/starboard)
+"mIp" = (
+/obj/machinery/atmospherics/pipe/simple/heat_exchanging,
+/obj/machinery/sparker{
+ id = "toxinsigniter";
+ pixel_x = -20
+ },
+/turf/simulated/floor/engine,
+/area/toxins/mixing)
"mKe" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 2;
@@ -99778,6 +97138,32 @@
icon_state = "neutralfull"
},
/area/security/brig)
+"mLW" = (
+/obj/machinery/door/firedoor,
+/obj/effect/decal/warning_stripes/west,
+/obj/effect/decal/warning_stripes/east,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/medical/research)
+"mMt" = (
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "neutralfull"
+ },
+/area/engine/engineering)
"mOF" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -99803,8 +97189,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/flasher_button{
id = "Cell 3";
@@ -99821,6 +97206,13 @@
icon_state = "redcorner"
},
/area/security/permabrig)
+"mTO" = (
+/obj/machinery/air_sensor{
+ frequency = 1222;
+ id_tag = "burn_sensor"
+ },
+/turf/simulated/floor/engine,
+/area/toxins/mixing)
"mWj" = (
/obj/machinery/door/airlock/external{
frequency = 1379;
@@ -99838,11 +97230,69 @@
},
/turf/simulated/floor/plating,
/area/hallway/secondary/entry)
+"mYH" = (
+/obj/machinery/newscaster{
+ pixel_x = -32
+ },
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "neutralcorner"
+ },
+/area/crew_quarters/fitness)
+"mZY" = (
+/obj/structure/disposalpipe/segment{
+ dir = 1;
+ icon_state = "pipe-c"
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/medical/genetics_cloning)
+"nbz" = (
+/obj/machinery/camera{
+ c_tag = "Research Break Room";
+ dir = 4;
+ network = list("Research","SS13")
+ },
+/obj/machinery/vending/cola,
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "whitepurple"
+ },
+/area/toxins/misc_lab)
"nbE" = (
/obj/machinery/hydroponics/constructable,
/obj/item/seeds/ambrosia,
-/turf/simulated/floor/plating,
+/turf/simulated/floor/plasteel{
+ dir = 6;
+ icon_state = "red"
+ },
/area/security/permabrig)
+"ncs" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/structure/flora/ausbushes/lavendergrass,
+/turf/simulated/floor/grass,
+/area/medical/research)
+"ncT" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/chair/sofa/corp,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/medical/medbay)
"ncZ" = (
/obj/machinery/light/small{
dir = 8
@@ -99850,8 +97300,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
@@ -99871,6 +97320,15 @@
icon_state = "redcorner"
},
/area/security/brig)
+"neQ" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/hologram/holopad,
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "neutralfull"
+ },
+/area/hallway/primary/aft)
"nfo" = (
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
@@ -99885,14 +97343,16 @@
/obj/item/clothing/gloves/botanic_leather,
/obj/item/reagent_containers/spray/pestspray,
/obj/item/reagent_containers/spray/pestspray,
-/turf/simulated/floor/plating,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "red"
+ },
/area/security/permabrig)
"nit" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
dir = 4;
@@ -99900,7 +97360,6 @@
},
/area/security/warden)
"njE" = (
-/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small{
dir = 1
},
@@ -99914,12 +97373,6 @@
icon_state = "barber"
},
/area/security/permabrig)
-"nkh" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/simulated/floor/plasteel,
-/area/security/processing)
"nli" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/sign/poster/official/cleanliness{
@@ -99931,11 +97384,10 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/computer/security{
- network = list("SS13","Mining Outpost")
+ dir = 8
},
/turf/simulated/floor/plasteel{
icon_state = "redfull"
@@ -99950,8 +97402,32 @@
/obj/machinery/hydroponics/constructable,
/obj/item/seeds/orange,
/obj/item/seeds/orange,
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "red"
+ },
/area/security/permabrig)
+"nqC" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/newscaster{
+ pixel_y = 32
+ },
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "neutralcorner"
+ },
+/area/hallway/primary/central)
+"nte" = (
+/obj/machinery/atmospherics/pipe/simple/insulated{
+ dir = 4
+ },
+/turf/simulated/floor/engine,
+/area/toxins/mixing)
"nvc" = (
/obj/structure/table/reinforced,
/obj/machinery/recharger,
@@ -99965,16 +97441,15 @@
/area/security/warden)
"nCz" = (
/obj/structure/table/wood,
-/obj/item/storage/fancy/candle_box,
-/obj/item/storage/fancy/candle_box,
+/obj/item/storage/fancy/candle_box/full,
+/obj/item/storage/fancy/candle_box/full,
/turf/simulated/floor/plating,
/area/crew_quarters/theatre)
"nDV" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/chair{
dir = 1
@@ -99984,14 +97459,17 @@
},
/area/security/prisonershuttle)
"nFL" = (
-/obj/machinery/computer/security/telescreen/entertainment{
- pixel_y = 32
- },
/obj/machinery/light/small{
dir = 1
},
/obj/machinery/smartfridge/drying_rack,
-/turf/simulated/floor/plating,
+/obj/machinery/computer/security/telescreen/entertainment{
+ pixel_y = 32
+ },
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "red"
+ },
/area/security/permabrig)
"nFN" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -100000,6 +97478,20 @@
icon_state = "darkblue"
},
/area/ai_monitored/storage/eva)
+"nFX" = (
+/obj/effect/spawner/window/reinforced,
+/turf/simulated/floor/plating,
+/area/civilian/barber)
+"nGA" = (
+/obj/effect/spawner/window/reinforced,
+/obj/structure/cable,
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
+/turf/simulated/floor/plating,
+/area/medical/virology)
"nGL" = (
/obj/machinery/bodyscanner{
dir = 4
@@ -100010,14 +97502,18 @@
},
/area/medical/surgery1)
"nHs" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 6
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
},
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel{
- icon_state = "white"
+ dir = 8;
+ icon_state = "neutralfull"
},
/area/security/permabrig)
"nJr" = (
@@ -100056,8 +97552,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -100066,7 +97561,6 @@
},
/area/security/permasolitary)
"nQq" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/atm{
pixel_x = 32
},
@@ -100089,8 +97583,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -100103,6 +97596,12 @@
icon_state = "dark"
},
/area/medical/surgery1)
+"nXf" = (
+/obj/machinery/computer/security/wooden_tv,
+/turf/simulated/floor/plasteel{
+ icon_state = "carpet"
+ },
+/area/security/detectives_office)
"nYz" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/firealarm{
@@ -100115,6 +97614,29 @@
icon_state = "redcorner"
},
/area/security/brig)
+"nZa" = (
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8";
+ tag = ""
+ },
+/obj/structure/lattice/catwalk,
+/turf/space,
+/area/space/nearstation)
+"oaB" = (
+/obj/effect/spawner/window/reinforced,
+/obj/structure/cable{
+ d2 = 8;
+ icon_state = "0-8"
+ },
+/obj/structure/cable{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
+ },
+/turf/simulated/floor/plating,
+/area/security/permabrig)
"obL" = (
/obj/structure/chair{
dir = 8
@@ -100152,7 +97674,6 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/effect/decal/cleanable/dirt,
/obj/machinery/camera{
c_tag = "Perma-Brig General Population West";
dir = 4;
@@ -100162,14 +97683,16 @@
dir = 8;
pixel_x = -24
},
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "red"
+ },
/area/security/permabrig)
"ohh" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel,
/area/security/seceqstorage)
@@ -100177,6 +97700,22 @@
/obj/structure/filingcabinet,
/turf/simulated/floor/plating,
/area/security/detectives_office)
+"ops" = (
+/obj/structure/window/reinforced,
+/obj/structure/lattice,
+/turf/space,
+/area/space/nearstation)
+"orz" = (
+/obj/structure/window/reinforced{
+ dir = 1;
+ layer = 2.9
+ },
+/obj/structure/window/reinforced{
+ dir = 8
+ },
+/obj/structure/lattice,
+/turf/space,
+/area/space/nearstation)
"osS" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -100185,8 +97724,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -100198,17 +97736,57 @@
icon_state = "neutral"
},
/area/maintenance/fore2)
+"oyG" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/chair/sofa/corp/corner,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "whiteblue"
+ },
+/area/medical/medbay)
+"ozX" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/railing{
+ dir = 1
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/medical/research)
+"oAd" = (
+/obj/structure/chair/sofa/corp/left{
+ dir = 8
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "whiteblue"
+ },
+/area/medical/medbay)
"oBE" = (
/obj/effect/spawner/lootdrop/maintenance,
/obj/item/vending_refill/coffee,
/turf/simulated/floor/plating,
/area/maintenance/starboard)
+"oBS" = (
+/obj/structure/window/reinforced{
+ dir = 4
+ },
+/turf/space,
+/area/space)
"oDD" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
@@ -100219,6 +97797,12 @@
"oEG" = (
/turf/simulated/floor/plating,
/area/space/nearstation)
+"oHv" = (
+/obj/structure/table/reinforced,
+/turf/simulated/floor/plasteel{
+ icon_state = "barber"
+ },
+/area/civilian/barber)
"oHY" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -100233,6 +97817,36 @@
icon_state = "dark"
},
/area/crew_quarters/courtroom)
+"oMO" = (
+/obj/structure/window/reinforced{
+ dir = 8
+ },
+/obj/structure/lattice,
+/turf/space,
+/area/space/nearstation)
+"oNd" = (
+/turf/simulated/wall,
+/area/civilian/barber)
+"oOe" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/hologram/holopad,
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "neutralfull"
+ },
+/area/quartermaster/storage)
+"oQs" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plasteel{
+ icon_state = "wood"
+ },
+/area/maintenance/gambling_den)
"oSH" = (
/obj/effect/spawner/window/reinforced,
/obj/structure/cable,
@@ -100270,17 +97884,40 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel,
/area/security/brig)
+"oXY" = (
+/obj/machinery/cryopod/right,
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "freezerfloor"
+ },
+/area/crew_quarters/sleep)
+"oZY" = (
+/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"
+ },
+/obj/machinery/atmospherics/pipe/simple/visible/yellow{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "neutralfull"
+ },
+/area/atmos)
"pcv" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -100301,10 +97938,11 @@
icon_state = "neutralcorner"
},
/area/hallway/primary/central)
+"pfE" = (
+/obj/effect/spawner/window/reinforced,
+/turf/simulated/floor/plating,
+/area/space)
"pgF" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/security/glass{
id_tag = "BrigWest";
@@ -100325,6 +97963,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/security/brig)
"phv" = (
@@ -100337,8 +97978,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/structure/chair/stool,
/obj/effect/landmark/start{
@@ -100349,6 +97989,30 @@
icon_state = "red"
},
/area/security/seceqstorage)
+"pjY" = (
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+ dir = 8;
+ initialize_directions = 11
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 4;
+ initialize_directions = 11
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/toxins/misc_lab)
+"plm" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/plasteel{
+ icon_state = "neutralcorner"
+ },
+/area/crew_quarters/sleep)
+"pnF" = (
+/obj/structure/window/reinforced,
+/turf/space,
+/area/space)
"ppj" = (
/obj/machinery/door/firedoor,
/obj/effect/decal/warning_stripes/yellow,
@@ -100367,6 +98031,20 @@
icon_state = "redfull"
},
/area/security/seceqstorage)
+"pxj" = (
+/obj/machinery/portable_atmospherics/scrubber/huge/stationary,
+/turf/simulated/floor/plasteel{
+ dir = 10;
+ icon_state = "red"
+ },
+/area/security/permabrig)
+"pAC" = (
+/obj/machinery/light/small{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plating,
+/area/maintenance/port)
"pBz" = (
/obj/structure/closet/secure_closet/personal/cabinet,
/obj/item/clothing/suit/browntrenchcoat,
@@ -100375,12 +98053,37 @@
/obj/item/clothing/head/fedora,
/turf/simulated/floor/plating,
/area/security/detectives_office)
+"pDD" = (
+/obj/structure/chair{
+ dir = 1
+ },
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "whitebluecorner"
+ },
+/area/hallway/primary/central)
+"pGk" = (
+/obj/structure/flora/ausbushes/lavendergrass,
+/obj/structure/railing{
+ dir = 6;
+ pixel_x = 6;
+ pixel_y = -4
+ },
+/obj/item/twohanded/required/kirbyplants{
+ pixel_y = 7
+ },
+/obj/structure/railing/corner{
+ dir = 9;
+ pixel_x = 2;
+ pixel_y = -28
+ },
+/turf/simulated/floor/grass,
+/area/medical/research)
"pGr" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
icon_state = "red"
@@ -100396,6 +98099,29 @@
icon_state = "neutralfull"
},
/area/hallway/secondary/exit)
+"pML" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/structure/chair/sofa/corp/right{
+ dir = 8
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "whitepurple"
+ },
+/area/medical/research)
+"pOq" = (
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/machinery/hologram/holopad,
+/turf/simulated/floor/plasteel,
+/area/security/prisonershuttle)
"pOB" = (
/obj/effect/decal/warning_stripes/east,
/obj/machinery/atmospherics/unary/vent_pump/on{
@@ -100414,12 +98140,22 @@
icon_state = "grimy"
},
/area/crew_quarters/theatre)
+"pPG" = (
+/obj/structure/flora/ausbushes/sparsegrass,
+/obj/structure/flora/bush,
+/turf/simulated/floor/grass,
+/area/medical/research)
+"pRe" = (
+/obj/structure/table/wood,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/toxins/misc_lab)
"pRg" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/door_control{
id = "Secure Gate";
@@ -100446,6 +98182,10 @@
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 8;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "red"
@@ -100467,6 +98207,13 @@
/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
/area/hallway/primary/starboard)
+"pVN" = (
+/obj/structure/window/reinforced{
+ dir = 4
+ },
+/obj/structure/lattice,
+/turf/space,
+/area/space/nearstation)
"pWQ" = (
/obj/effect/spawner/window/reinforced,
/obj/structure/cable{
@@ -100482,6 +98229,11 @@
},
/turf/simulated/floor/plating,
/area/security/permabrig)
+"pWT" = (
+/obj/machinery/door/airlock/maintenance,
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plating,
+/area/maintenance/port)
"pXX" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/obj/machinery/camera{
@@ -100516,12 +98268,23 @@
/turf/space,
/area/space)
"qeU" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/door/airlock{
- name = "Bathroom"
+/obj/machinery/ai_status_display{
+ pixel_x = -32
+ },
+/turf/simulated/floor/plasteel{
+ dir = 10;
+ icon_state = "red"
+ },
+/area/security/permabrig)
+"qfH" = (
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2";
+ tag = ""
},
/turf/simulated/floor/plating,
-/area/security/permabrig)
+/area/maintenance/apmaint)
"qgr" = (
/turf/simulated/floor/plasteel{
dir = 1;
@@ -100559,14 +98322,39 @@
icon_state = "dark"
},
/area/crew_quarters/courtroom)
+"qqh" = (
+/obj/machinery/cryopod,
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 8
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "freezerfloor"
+ },
+/area/crew_quarters/sleep)
"qqW" = (
/obj/structure/table,
/obj/machinery/kitchen_machine/microwave,
-/turf/simulated/floor/plating,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "red"
+ },
/area/security/permabrig)
"qrT" = (
/turf/simulated/wall/r_wall,
/area/tcommsat/chamber)
+"qxp" = (
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2";
+ tag = ""
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "neutral"
+ },
+/area/maintenance/apmaint)
"qzr" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -100581,7 +98369,7 @@
dir = 1;
icon_state = "neutralcorner"
},
-/area/bridge/meeting_room)
+/area/hallway/primary/central/south)
"qHs" = (
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 10;
@@ -100615,6 +98403,14 @@
},
/turf/simulated/floor/plating,
/area/security/permabrig)
+"qOO" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/hologram/holopad,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/toxins/misc_lab)
"qRT" = (
/obj/structure/cable{
d1 = 4;
@@ -100647,6 +98443,31 @@
icon_state = "red"
},
/area/security/warden)
+"qWp" = (
+/obj/machinery/atmospherics/pipe/simple/insulated{
+ dir = 4
+ },
+/obj/machinery/meter{
+ layer = 3.31
+ },
+/obj/structure/window/plasmareinforced{
+ dir = 4
+ },
+/obj/structure/window/plasmareinforced{
+ dir = 8
+ },
+/obj/structure/grille,
+/turf/simulated/floor/plating,
+/area/toxins/mixing)
+"qWs" = (
+/obj/machinery/computer/arcade{
+ dir = 1
+ },
+/turf/simulated/floor/plasteel{
+ dir = 5;
+ icon_state = "dark"
+ },
+/area/maintenance/fore2)
"qXF" = (
/obj/machinery/alarm{
pixel_y = 24
@@ -100665,8 +98486,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/turf/simulated/floor/plasteel{
icon_state = "redcorner"
@@ -100683,8 +98503,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/unary/vent_pump/on,
/turf/simulated/floor/plasteel{
@@ -100696,14 +98515,34 @@
/obj/effect/spawner/lootdrop/maintenance,
/turf/simulated/floor/plating,
/area/maintenance/starboard)
+"qZV" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/chair/sofa/corp,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "whiteblue"
+ },
+/area/medical/medbay)
+"raB" = (
+/obj/structure/grille/broken,
+/obj/structure/lattice,
+/turf/space,
+/area/space/nearstation)
"raK" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
-/obj/structure/closet/wardrobe/red,
+/obj/machinery/vending/secdrobe,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "red"
@@ -100712,8 +98551,14 @@
"rbw" = (
/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{
- icon_state = "white"
+ dir = 0;
+ icon_state = "red"
},
/area/security/permabrig)
"reo" = (
@@ -100726,14 +98571,11 @@
},
/obj/item/seeds/carrot,
/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "redcorner"
+ dir = 9;
+ icon_state = "red"
},
/area/security/permabrig)
"reH" = (
-/obj/machinery/newscaster{
- pixel_x = 32
- },
/obj/machinery/light{
dir = 4
},
@@ -100742,6 +98584,7 @@
dir = 8;
network = list("SS13","Security")
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "red"
@@ -100758,33 +98601,49 @@
icon_state = "darkblue"
},
/area/medical/surgery2)
-"rjr" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
+"rke" = (
+/obj/structure/window/reinforced{
+ dir = 8
},
-/turf/simulated/floor/plasteel{
- icon_state = "neutralcorner"
+/turf/space,
+/area/space)
+"rkv" = (
+/obj/structure/rack,
+/obj/effect/spawner/lootdrop/maintenance{
+ lootcount = 3;
+ name = "3maintenance loot spawner"
},
-/area/hallway/primary/central)
+/turf/simulated/floor/plating,
+/area/maintenance/port)
"rkB" = (
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel,
/area/security/warden)
+"rkJ" = (
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "neutralfull"
+ },
+/area/crew_quarters/sleep)
+"rkV" = (
+/obj/machinery/light/small,
+/obj/effect/decal/warning_stripes/southwest,
+/obj/effect/spawner/lootdrop/maintenance,
+/obj/structure/rack,
+/turf/simulated/floor/plating,
+/area/maintenance/port)
"rmq" = (
/turf/simulated/floor/plasteel{
dir = 6;
@@ -100806,6 +98665,20 @@
icon_state = "darkblue"
},
/area/medical/surgery2)
+"rtH" = (
+/obj/structure/table/wood,
+/obj/item/storage/box/donkpockets,
+/obj/structure/extinguisher_cabinet{
+ pixel_y = 30
+ },
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "whitepurple"
+ },
+/area/toxins/misc_lab)
+"rvc" = (
+/turf/simulated/wall/r_wall,
+/area/space/nearstation)
"rvx" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 8
@@ -100815,6 +98688,24 @@
icon_state = "neutralfull"
},
/area/hallway/secondary/exit)
+"rBP" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/hologram/holopad,
+/turf/simulated/floor/plasteel{
+ icon_state = "arrival"
+ },
+/area/hallway/secondary/entry)
+"rCe" = (
+/obj/machinery/atmospherics/pipe/simple/insulated{
+ dir = 10
+ },
+/turf/simulated/floor/engine,
+/area/toxins/mixing)
"rCw" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 8;
@@ -100824,6 +98715,18 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel,
/area/hallway/secondary/exit)
+"rCJ" = (
+/obj/structure/chair/comfy/purp{
+ dir = 4
+ },
+/obj/machinery/alarm{
+ pixel_y = 24
+ },
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "whitepurple"
+ },
+/area/toxins/misc_lab)
"rDp" = (
/obj/structure/cable{
d2 = 4;
@@ -100844,6 +98747,35 @@
/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
/area/security/brig)
+"rHU" = (
+/obj/structure/chair,
+/obj/machinery/newscaster{
+ pixel_y = 32
+ },
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "whitebluecorner"
+ },
+/area/hallway/primary/central)
+"rIy" = (
+/obj/machinery/door/airlock/research{
+ name = "Research Break Room"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/toxins/misc_lab)
+"rIK" = (
+/obj/structure/cable{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plating,
+/area/maintenance/port)
"rNi" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -100895,8 +98827,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 4
@@ -100906,8 +98837,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/turf/simulated/floor/plasteel{
icon_state = "redcorner"
@@ -100926,8 +98856,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/machinery/door/poddoor{
density = 0;
@@ -100939,6 +98868,16 @@
/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
/area/security/brig)
+"rUS" = (
+/obj/machinery/door_control{
+ id = "pub_room";
+ name = "Door Bolt Control";
+ normaldoorcontrol = 1;
+ pixel_y = 25;
+ specialfunctions = 4
+ },
+/turf/simulated/floor/carpet,
+/area/assembly/showroom)
"rZK" = (
/obj/structure/cable{
d1 = 1;
@@ -100958,15 +98897,21 @@
icon_state = "2-4";
tag = ""
},
-/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 6
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
},
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "neutralfull"
+ },
/area/security/permabrig)
+"sak" = (
+/obj/structure/table/wood,
+/turf/simulated/floor/wood,
+/area/medical/psych)
"scA" = (
/obj/machinery/firealarm{
dir = 8;
@@ -100978,6 +98923,33 @@
icon_state = "red"
},
/area/hallway/secondary/exit)
+"sdP" = (
+/obj/structure/cable/yellow{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
+ },
+/turf/simulated/floor/engine,
+/area/engine/supermatter)
+"seE" = (
+/obj/machinery/access_button{
+ command = "cycle_exterior";
+ frequency = 1379;
+ master_tag = "sw_maint_airlock";
+ name = "exterior access button";
+ pixel_x = 24;
+ pixel_y = 24
+ },
+/obj/structure/lattice/catwalk,
+/turf/space,
+/area/space/nearstation)
+"seQ" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/floor/engine,
+/area/toxins/explab)
"shi" = (
/obj/structure/cable{
d2 = 2;
@@ -101009,13 +98981,31 @@
},
/turf/simulated/floor/plating,
/area/hallway/secondary/entry)
-"soN" = (
+"sjV" = (
/obj/structure/disposalpipe/segment,
-/obj/machinery/computer/operating,
+/obj/structure/chair/sofa/corp/right{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "whitepurple"
+ },
+/area/medical/research)
+"slE" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/remains/robot,
+/obj/effect/decal/cleanable/blood/oil,
+/turf/simulated/floor/plating,
+/area/maintenance/port)
+"soN" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 9
},
+/obj/structure/disposalpipe/segment,
+/obj/machinery/computer/operating{
+ dir = 8
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "darkblue"
@@ -101033,6 +99023,22 @@
icon_state = "red"
},
/area/security/seceqstorage)
+"spS" = (
+/obj/item/twohanded/required/kirbyplants,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 10;
+ initialize_directions = 10
+ },
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "vault"
+ },
+/area/atmos)
+"sso" = (
+/obj/structure/lattice,
+/obj/structure/grille/broken,
+/turf/space,
+/area/space/nearstation)
"ssp" = (
/obj/machinery/door/airlock/security/glass{
name = "Solitary Confinement";
@@ -101047,11 +99053,18 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel,
/area/security/permasolitary)
+"ssy" = (
+/obj/structure/table/reinforced,
+/obj/machinery/cell_charger,
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "neutralfull"
+ },
+/area/space)
"suy" = (
/obj/machinery/firealarm{
dir = 1;
@@ -101067,8 +99080,22 @@
"swV" = (
/obj/machinery/hydroponics/constructable,
/obj/item/seeds/glowshroom,
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ dir = 10;
+ icon_state = "red"
+ },
/area/security/permabrig)
+"sxS" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/door/airlock/research{
+ name = "Research Chemistry";
+ req_access_txt = "7"
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/toxins/misc_lab)
"sAW" = (
/obj/structure/closet/secure_closet/medical2,
/turf/simulated/floor/plasteel{
@@ -101082,25 +99109,25 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/machinery/atmospherics/unary/vent_pump/on,
+/obj/machinery/atmospherics/unary/vent_scrubber/on,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "red"
},
/area/security/processing)
"sEN" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/structure/cable{
d1 = 2;
@@ -101112,19 +99139,79 @@
icon_state = "neutralfull"
},
/area/security/brig)
+"sGz" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+ dir = 8
+ },
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "neutralfull"
+ },
+/area/atmos)
+"sMj" = (
+/obj/machinery/atmospherics/pipe/simple/heat_exchanging{
+ dir = 5
+ },
+/turf/simulated/floor/engine,
+/area/toxins/mixing)
+"sOo" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 9
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "freezerfloor"
+ },
+/area/crew_quarters/sleep)
+"sPz" = (
+/obj/machinery/light/small{
+ dir = 1
+ },
+/obj/structure/sign/vacuum{
+ pixel_y = 32
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/port)
"sPS" = (
/obj/structure/cable,
-/obj/machinery/power/solar_control{
- id = "starboardsolar";
- name = "Aft Starboard Solar Control"
- },
/obj/machinery/alarm{
dir = 1;
pixel_y = -24
},
/obj/effect/decal/warning_stripes/southeast,
+/obj/machinery/power/solar_control{
+ dir = 8;
+ id = "starboardsolar";
+ name = "Aft Starboard Solar Control"
+ },
/turf/simulated/floor/plating,
/area/maintenance/starboardsolar)
+"sQr" = (
+/mob/living/simple_animal/mouse,
+/turf/simulated/floor/plating,
+/area/maintenance/port)
+"sQZ" = (
+/obj/machinery/access_button{
+ command = "cycle_interior";
+ frequency = 1379;
+ master_tag = "sw_maint_airlock";
+ name = "interior access button";
+ pixel_x = -24;
+ pixel_y = 24
+ },
+/obj/machinery/atmospherics/pipe/simple/visible{
+ dir = 4
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/port)
"sTz" = (
/obj/structure/closet/secure_closet/security,
/turf/simulated/floor/plasteel{
@@ -101136,8 +99223,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/door/airlock/security{
- name = "Security-Storage Backroom";
- req_access = null;
+ name = "Evidence Storage";
req_access_txt = "63"
},
/obj/machinery/door/firedoor,
@@ -101160,17 +99246,30 @@
icon_state = "redcorner"
},
/area/security/brig)
+"sYw" = (
+/obj/machinery/disposal,
+/obj/structure/disposalpipe/trunk,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "whitebluecorner"
+ },
+/area/medical/medbay)
"sYQ" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
icon_state = "grimy"
},
/area/security/detectives_office)
+"sZp" = (
+/obj/machinery/light/small,
+/turf/simulated/floor/plasteel{
+ icon_state = "neutral"
+ },
+/area/maintenance/port)
"sZT" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -101180,10 +99279,8 @@
},
/area/maintenance/starboard)
"tah" = (
-/obj/structure/disposalpipe/trunk{
- dir = 8
- },
/obj/machinery/disposal,
+/obj/structure/disposalpipe/trunk,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "red"
@@ -101196,8 +99293,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -101215,7 +99311,10 @@
/obj/effect/decal/cleanable/cobweb2,
/obj/item/seeds/tower,
/obj/item/seeds/amanita,
-/turf/simulated/floor/plating,
+/turf/simulated/floor/plasteel{
+ dir = 5;
+ icon_state = "red"
+ },
/area/security/permabrig)
"tgs" = (
/obj/structure/chair/office/dark,
@@ -101226,12 +99325,21 @@
"tgE" = (
/turf/simulated/wall/r_wall,
/area/maintenance/starboard)
+"tiC" = (
+/obj/machinery/atmospherics/binary/pump{
+ dir = 4;
+ name = "N2 to Pure"
+ },
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "neutralfull"
+ },
+/area/atmos)
"tiS" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -101244,6 +99352,18 @@
icon_state = "redcorner"
},
/area/security/permabrig)
+"tke" = (
+/obj/structure/table,
+/obj/item/storage/box/bodybags{
+ pixel_x = 5;
+ pixel_y = 5
+ },
+/obj/item/storage/box/gloves,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "whitepurplecorner"
+ },
+/area/medical/research)
"tks" = (
/turf/simulated/floor/plasteel{
icon_state = "wood"
@@ -101268,20 +99388,43 @@
/turf/simulated/floor/plasteel,
/area/security/permasolitary)
"tsN" = (
-/obj/structure/chair/comfy/purp{
- dir = 1
- },
+/obj/structure/closet/secure_closet/scientist,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "whitepurple"
},
-/area/medical/research)
+/area/toxins/misc_lab)
"tvq" = (
-/obj/structure/table,
-/obj/item/toy/figure/crew/syndie,
-/obj/item/paper_bin,
-/turf/simulated/floor/plating,
+/obj/machinery/portable_atmospherics/scrubber/huge/stationary,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "red"
+ },
/area/security/permabrig)
+"tvI" = (
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "neutralcorner"
+ },
+/area/crew_quarters/sleep)
+"txW" = (
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/machinery/newscaster{
+ pixel_y = -32
+ },
+/turf/simulated/floor/plasteel,
+/area/crew_quarters/locker/locker_toilet)
"tFw" = (
/obj/effect/spawner/window/reinforced,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -101295,7 +99438,6 @@
/area/security/processing)
"tFK" = (
/obj/item/soap/nanotrasen,
-/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small{
dir = 4
},
@@ -101303,14 +99445,15 @@
/obj/machinery/shower{
pixel_y = 22
},
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ icon_state = "freezerfloor"
+ },
/area/security/permabrig)
"tFO" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 1;
@@ -101320,14 +99463,16 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/machinery/door/airlock/security/glass{
name = "Warden's Office";
req_access_txt = "3"
},
/obj/machinery/door/firedoor,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/security/warden)
"tHf" = (
@@ -101338,12 +99483,10 @@
/turf/simulated/floor/plating,
/area/crew_quarters/theatre)
"tJH" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/spawner/window/reinforced,
/obj/structure/cable{
@@ -101362,12 +99505,38 @@
icon_state = "neutralfull"
},
/area/security/brig)
+"tLE" = (
+/obj/structure/chair/comfy/purp{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/toxins/misc_lab)
+"tMu" = (
+/obj/machinery/door/firedoor,
+/obj/effect/decal/warning_stripes/west,
+/obj/effect/decal/warning_stripes/east,
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "whitepurplecorner"
+ },
+/area/medical/research)
+"tNq" = (
+/obj/item/radio/intercom{
+ dir = 1;
+ pixel_x = 28
+ },
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "whitebluecorner"
+ },
+/area/hallway/primary/central)
"tNO" = (
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/machinery/firealarm{
pixel_y = 26
@@ -101377,6 +99546,14 @@
icon_state = "red"
},
/area/security/warden)
+"tOv" = (
+/obj/machinery/atmospherics/pipe/simple/hidden{
+ dir = 6
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "red"
+ },
+/area/security/permabrig)
"tOM" = (
/obj/machinery/door/airlock/security/glass{
name = "Solitary Confinement";
@@ -101391,8 +99568,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel,
/area/security/permasolitary)
@@ -101400,8 +99576,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -101413,12 +99588,14 @@
},
/area/security/brig)
"tRM" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "red"
@@ -101455,8 +99632,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -101466,6 +99642,25 @@
},
/turf/simulated/floor/plating,
/area/security/range)
+"tXj" = (
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/structure/chair/barber{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 10
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 6
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "barber"
+ },
+/area/civilian/barber)
"uil" = (
/obj/machinery/atmospherics/unary/portables_connector{
dir = 8
@@ -101481,8 +99676,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -101511,8 +99705,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -101528,9 +99721,6 @@
dir = 4
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/turf/simulated/floor/plasteel{
icon_state = "bluecorner"
},
@@ -101560,6 +99750,10 @@
/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
/area/security/brig)
+"unt" = (
+/obj/effect/decal/warning_stripes/east,
+/turf/simulated/floor/plasteel,
+/area/maintenance/port)
"uod" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -101614,6 +99808,20 @@
icon_state = "dark"
},
/area/security/interrogation)
+"uza" = (
+/obj/machinery/atmospherics/pipe/simple/insulated{
+ dir = 4
+ },
+/obj/structure/window/plasmareinforced{
+ dir = 4
+ },
+/obj/structure/window/plasmareinforced{
+ dir = 8
+ },
+/obj/structure/grille,
+/obj/structure/window/plasmareinforced,
+/turf/simulated/floor/plating,
+/area/toxins/mixing)
"uAP" = (
/obj/structure/chair/office/dark{
dir = 4
@@ -101636,14 +99844,25 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "vault"
},
/area/security/securearmoury)
+"uKI" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/security/medbay)
"uQK" = (
/obj/machinery/bodyscanner,
/turf/simulated/floor/plasteel{
@@ -101651,20 +99870,8 @@
icon_state = "whiteblue"
},
/area/medical/surgery2)
-"uSJ" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/effect/spawner/window/reinforced,
-/obj/structure/cable{
- d2 = 2;
- icon_state = "0-2"
- },
-/turf/simulated/floor/plating,
-/area/security/main)
"uUu" = (
/obj/effect/decal/cleanable/cobweb,
-/obj/effect/decal/cleanable/dirt,
/obj/structure/toilet{
pixel_y = 8
},
@@ -101673,7 +99880,7 @@
dir = 8
},
/obj/item/seeds/ambrosia,
-/turf/simulated/floor/plating,
+/turf/simulated/floor/plasteel,
/area/security/permabrig)
"uVQ" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
@@ -101708,8 +99915,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -101752,6 +99958,19 @@
icon_state = "red"
},
/area/security/seceqstorage)
+"veH" = (
+/obj/machinery/atmospherics/pipe/simple/visible/yellow{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "neutralfull"
+ },
+/area/atmos)
"vhT" = (
/obj/structure/chair/office/dark{
dir = 8
@@ -101762,8 +99981,10 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
},
/obj/machinery/computer/security/telescreen{
desc = "Used for watching interrogations.";
@@ -101779,24 +100000,39 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "redcorner"
},
-/turf/simulated/floor/plasteel,
/area/security/permabrig)
+"viE" = (
+/obj/machinery/power/apc{
+ dir = 8;
+ name = "west bump";
+ pixel_x = -24
+ },
+/obj/structure/cable{
+ d2 = 4;
+ icon_state = "0-4"
+ },
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "whitepurple"
+ },
+/area/toxins/misc_lab)
"vmw" = (
/obj/structure/fans/tiny,
/obj/structure/cable{
d1 = 1;
d2 = 4;
- icon_state = "1-4";
- tag = ""
+ icon_state = "1-4"
},
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/door/airlock/external{
id_tag = "laborcamp_home";
@@ -101810,8 +100046,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/warning_stripes/southwest,
/obj/machinery/alarm{
@@ -101823,12 +100058,25 @@
icon_state = "red"
},
/area/security/prisonershuttle)
+"vnM" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 5
+ },
+/turf/simulated/floor/engine,
+/area/toxins/explab)
"voo" = (
/obj/structure/table,
/obj/item/clothing/shoes/orange,
/obj/item/clothing/under/color/orange/prison,
/turf/simulated/floor/plating,
/area/maintenance/starboard)
+"vrp" = (
+/obj/structure/chair/office/light{
+ dir = 8
+ },
+/obj/effect/decal/warning_stripes/east,
+/turf/simulated/floor/engine,
+/area/toxins/misc_lab)
"vrB" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/medical{
@@ -101839,6 +100087,13 @@
icon_state = "showroomfloor"
},
/area/medical/surgery1)
+"vrF" = (
+/obj/effect/decal/warning_stripes/west,
+/obj/structure/disaster_counter/scichem{
+ pixel_y = 32
+ },
+/turf/simulated/floor/engine,
+/area/toxins/misc_lab)
"vsy" = (
/obj/item/twohanded/required/kirbyplants,
/obj/machinery/power/apc{
@@ -101866,6 +100121,14 @@
icon_state = "red"
},
/area/security/brig)
+"vzs" = (
+/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
+/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "neutralfull"
+ },
+/area/crew_quarters/sleep)
"vzz" = (
/obj/machinery/light{
dir = 4
@@ -101896,12 +100159,22 @@
icon_state = "dark"
},
/area/tcommsat/chamber)
+"vDY" = (
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "yellowfull"
+ },
+/area/engine/engineering)
"vEh" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
dir = 9;
@@ -101934,12 +100207,15 @@
icon_state = "wood-broken"
},
/area/security/detectives_office)
+"vFq" = (
+/obj/machinery/chem_master,
+/turf/simulated/floor/engine,
+/area/toxins/misc_lab)
"vGw" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 8
@@ -101951,6 +100227,36 @@
icon_state = "red"
},
/area/security/warden)
+"vGz" = (
+/obj/structure/cable{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/port)
+"vGB" = (
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2";
+ tag = ""
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "neutral"
+ },
+/area/maintenance/port)
+"vJs" = (
+/obj/structure/chair/sofa/corp/left{
+ dir = 8
+ },
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "whitepurple"
+ },
+/area/medical/research)
"vJK" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/rack,
@@ -101965,6 +100271,28 @@
},
/turf/simulated/floor/plasteel,
/area/security/securearmoury)
+"vKt" = (
+/obj/structure/shuttle/engine/propulsion/burst,
+/turf/simulated/wall/mineral/titanium,
+/area/shuttle/pod_2)
+"vKB" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/structure/flora/ausbushes/sunnybush,
+/obj/structure/flora/ausbushes/ppflowers,
+/turf/simulated/floor/grass,
+/area/medical/research)
+"vLu" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/toxins/misc_lab)
"vLN" = (
/obj/structure/table/wood,
/obj/item/instrument/violin,
@@ -102001,9 +100329,31 @@
icon_state = "red"
},
/area/hallway/secondary/exit)
+"vUu" = (
+/obj/docking_port/mobile/pod{
+ id = "pod2";
+ name = "escape pod 2"
+ },
+/obj/machinery/door/airlock/titanium{
+ id_tag = "s_docking_airlock";
+ name = "Escape Pod Hatch"
+ },
+/turf/simulated/floor/mineral/titanium/blue,
+/area/shuttle/pod_2)
+"vVf" = (
+/obj/machinery/chem_dispenser,
+/obj/item/reagent_containers/glass/beaker/large,
+/turf/simulated/floor/engine,
+/area/toxins/misc_lab)
"vXX" = (
/turf/space,
/area/space/nearstation)
+"vYC" = (
+/turf/simulated/floor/plasteel{
+ dir = 9;
+ icon_state = "whitepurple"
+ },
+/area/toxins/misc_lab)
"wdH" = (
/obj/effect/spawner/window/reinforced,
/obj/machinery/door/poddoor/shutters{
@@ -102041,6 +100391,31 @@
icon_state = "neutralfull"
},
/area/hallway/secondary/exit)
+"why" = (
+/obj/machinery/cryopod/right,
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+ dir = 8
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "freezerfloor"
+ },
+/area/crew_quarters/sleep)
+"wil" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/door/poddoor/preopen{
+ id_tag = "experimentor";
+ name = "Experimentor Blast Door"
+ },
+/obj/machinery/door/firedoor,
+/turf/simulated/floor/engine,
+/area/toxins/explab)
+"wiR" = (
+/obj/structure/chair/office/light,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/medical/medbay)
"wmQ" = (
/obj/item/radio/intercom{
pixel_y = 28
@@ -102059,6 +100434,18 @@
icon_state = "red"
},
/area/security/processing)
+"wtE" = (
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/floor/plasteel{
+ icon_state = "barber"
+ },
+/area/civilian/barber)
"wtK" = (
/obj/structure/lattice,
/obj/structure/sign/electricshock{
@@ -102080,6 +100467,14 @@
/obj/structure/closet/radiation,
/turf/simulated/floor/plasteel,
/area/engine/controlroom)
+"wGL" = (
+/obj/machinery/newscaster/security_unit{
+ pixel_x = -32
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "dark"
+ },
+/area/bridge)
"wIT" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/rack,
@@ -102115,6 +100510,33 @@
icon_state = "vault"
},
/area/security/securearmoury)
+"wMv" = (
+/turf/simulated/floor/plasteel{
+ icon_state = "wood"
+ },
+/area/maintenance/gambling_den)
+"wPI" = (
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/machinery/telepad_cargo,
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "brown"
+ },
+/area/quartermaster/office)
+"wRP" = (
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2";
+ tag = ""
+ },
+/obj/structure/lattice/catwalk,
+/turf/space,
+/area/space/nearstation)
"wVr" = (
/obj/effect/spawner/window/reinforced,
/obj/machinery/door/poddoor{
@@ -102143,20 +100565,17 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel,
@@ -102169,33 +100588,36 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/plasteel{
+ dir = 0;
+ icon_state = "red"
},
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel,
/area/security/permabrig)
"xda" = (
-/obj/effect/decal/cleanable/dirt,
/obj/item/cultivator,
/obj/item/reagent_containers/glass/bottle/nutrient/ez,
/obj/machinery/firealarm{
pixel_y = 26
},
-/turf/simulated/floor/plating,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "red"
+ },
/area/security/permabrig)
"xgm" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 9
},
/obj/structure/chair/office/dark,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 9
+ },
/obj/machinery/navbeacon{
codes_txt = "patrol;next_patrol=Armory_North";
location = "Armory_South"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 9
- },
/turf/simulated/floor/plasteel,
/area/security/securearmoury)
"xgR" = (
@@ -102216,8 +100638,26 @@
/obj/structure/barricade/wooden,
/turf/simulated/floor/plasteel,
/area/security/detectives_office)
+"xme" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment,
+/obj/structure/chair/sofa/corp/left{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "whitepurple"
+ },
+/area/medical/research)
"xom" = (
/obj/effect/decal/warning_stripes/north,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 6
+ },
/obj/machinery/navbeacon{
codes_txt = "patrol;next_patrol=Armory_South";
location = "Armory_North"
@@ -102225,11 +100665,29 @@
/mob/living/simple_animal/bot/secbot/armsky{
auto_patrol = 1
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 6
- },
/turf/simulated/floor/plasteel,
/area/security/securearmoury)
+"xoq" = (
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8";
+ tag = ""
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
+"xpu" = (
+/obj/structure/disposalpipe/segment,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/medical/research)
"xqH" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -102242,6 +100700,10 @@
icon_state = "neutralcorner"
},
/area/hallway/primary/central)
+"xtS" = (
+/obj/structure/reagent_dispensers/fueltank,
+/turf/simulated/floor/plating,
+/area/maintenance/port)
"xuC" = (
/obj/structure/cable{
d1 = 1;
@@ -102251,8 +100713,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/effect/landmark/start{
name = "Warden"
@@ -102266,12 +100727,43 @@
"xwk" = (
/obj/structure/sink{
dir = 4;
- pixel_x = 11
+ pixel_x = 12
},
/turf/simulated/floor/plasteel{
icon_state = "showroomfloor"
},
/area/medical/surgery1)
+"xAc" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/railing/corner{
+ dir = 1
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/medical/research)
+"xBJ" = (
+/obj/structure/railing{
+ dir = 10;
+ pixel_x = -6;
+ pixel_y = -4
+ },
+/obj/item/twohanded/required/kirbyplants{
+ pixel_y = 7
+ },
+/obj/structure/railing/corner{
+ dir = 5;
+ pixel_x = -2;
+ pixel_y = -28
+ },
+/turf/simulated/floor/grass,
+/area/medical/research)
+"xCC" = (
+/obj/effect/decal/warning_stripes/north,
+/turf/simulated/floor/plating,
+/area/maintenance/port)
"xDn" = (
/obj/structure/sign/electricshock{
pixel_y = 32
@@ -102292,15 +100784,15 @@
},
/area/security/warden)
"xHj" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "showroomfloor"
},
@@ -102340,8 +100832,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
@@ -102351,14 +100842,10 @@
},
/area/hallway/primary/starboard)
"xQW" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -102369,6 +100856,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plating,
/area/maintenance/starboard)
"xUI" = (
@@ -102385,8 +100875,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
@@ -102403,16 +100892,29 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
/area/security/interrogation)
+"ydp" = (
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "neutral"
+ },
+/area/maintenance/port)
"yds" = (
/obj/structure/cable{
d2 = 4;
@@ -102434,8 +100936,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/turf/simulated/floor/plating,
/area/security/brig)
@@ -102468,7 +100969,7 @@
dir = 4;
icon_state = "neutralcorner"
},
-/area/bridge/meeting_room)
+/area/hallway/primary/central/south)
"ygH" = (
/turf/simulated/wall/r_wall,
/area/security/permabrig)
@@ -102479,8 +100980,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel,
@@ -107999,21 +106499,21 @@ aaa
aaa
aaa
aaa
-abi
-abi
-abi
-abi
-abj
-abi
-abi
-abi
-abj
-abi
-abi
-abi
-abj
-abi
-abi
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -108256,21 +106756,21 @@ aaa
aaa
aaa
aaa
-abi
aaa
-bmo
-bpm
-bmo
-bpm
-bmo
-bpm
-bmo
-bpm
-bmo
-bpm
-bmo
aaa
-abi
+oBS
+bpm
+pVN
+bpm
+pVN
+bpm
+oBS
+oBS
+oBS
+oBS
+oBS
+aaa
+aaa
aaa
aaa
aaa
@@ -108513,8 +107013,8 @@ aaa
aaa
aaa
aaa
-abj
-bkt
+aaa
+pnF
bpn
brp
bRu
@@ -108526,8 +107026,8 @@ brp
brp
brp
cpb
-brs
-abi
+bLR
+aaa
aaa
aaa
aaa
@@ -108757,20 +107257,20 @@ aaa
aaa
aaa
aaa
-abj
-abi
-abi
-abi
-abi
-abi
-abj
-abi
-abi
-abj
-abi
-abi
-abi
-abi
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
bku
bpo
bLM
@@ -108784,7 +107284,7 @@ bms
bnR
bpo
brr
-abj
+aaa
aaa
aaa
aaa
@@ -109014,21 +107514,21 @@ aaa
aaa
aaa
aaa
-abj
aaa
+abj
bpm
-bmo
-bmo
-bpm
-bmo
-bmo
-bpm
-bmo
-bmo
-bpm
-bmo
-bpm
-bnM
+oBS
+oBS
+oBS
+oBS
+oBS
+oBS
+oBS
+oBS
+oBS
+oBS
+oBS
+bPR
bpo
brr
bNM
@@ -109040,8 +107540,8 @@ bNM
bNM
bkt
bpo
-brs
-abi
+bLR
+aaa
aaa
aaa
aaa
@@ -109271,7 +107771,7 @@ aaa
aaa
aaa
aaa
-abi
+aaa
bku
bpn
brp
@@ -109298,13 +107798,13 @@ bNM
bkt
bpo
brr
-abi
-abi
-abi
-abi
-abi
-abi
-abi
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -109528,8 +108028,8 @@ aaa
aaa
aaa
aaa
-abi
-bkt
+aaa
+ops
bpo
brq
bpu
@@ -109554,14 +108054,14 @@ cgI
bNM
bkt
bpo
-bLS
-bmo
+dSz
+pVN
bpm
-bmo
-bmo
+pVN
+oBS
bpm
aaa
-abi
+aaa
aaa
aaa
aaa
@@ -109785,8 +108285,8 @@ aaa
aaa
aaa
aaa
-abi
-bkt
+aaa
+pnF
bpo
brr
abj
@@ -109817,8 +108317,8 @@ brp
brp
brp
cpb
-brs
-abi
+eAi
+aaa
aaa
aaa
aaa
@@ -110042,7 +108542,7 @@ aaa
aaa
aaa
aaa
-abj
+aaa
bku
bpo
brs
@@ -110062,7 +108562,7 @@ btd
bNM
bPP
bUD
-bTL
+hzl
bXI
chE
bNM
@@ -110074,8 +108574,8 @@ bpu
bms
bPC
bpo
-brr
-abi
+eAi
+aaa
aaa
aaa
aaa
@@ -110299,8 +108799,8 @@ aaa
aaa
aaa
aaa
-abi
-bkt
+aaa
+ops
bpo
brs
aaa
@@ -110331,8 +108831,8 @@ qrT
abj
bku
bpo
-brs
-abj
+eAi
+aaa
aaa
aaa
aaa
@@ -110554,9 +109054,9 @@ aaa
aaa
aaa
aaa
-abi
-abi
-abi
+aaa
+aaa
+aaa
bku
bpo
brr
@@ -110588,10 +109088,10 @@ qrT
qrT
bkt
bpo
-brr
-abi
-abi
-abi
+eAi
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -110811,10 +109311,10 @@ aaa
aaa
aaa
aaa
-abi
aaa
-bmo
-bnM
+aaa
+oBS
+adM
bpo
brs
aaa
@@ -110845,10 +109345,10 @@ qrT
qrT
bkt
bpo
-bLS
-bpm
+jBy
+oBS
+aaa
aaa
-abi
aaa
aaa
aaa
@@ -111068,8 +109568,8 @@ aaa
aaa
aaa
aaa
-abi
-bkt
+aaa
+pnF
bmp
cqK
bpq
@@ -111104,8 +109604,8 @@ bku
bmq
cqK
csk
-brr
-abi
+eAi
+aaa
aaa
aaa
aaa
@@ -111325,7 +109825,7 @@ aaa
aaa
aaa
aaa
-abi
+aaa
bku
bmq
bnO
@@ -111361,8 +109861,8 @@ bkt
bmq
cqL
bpq
-brs
-abi
+eAi
+aaa
aaa
aaa
aaa
@@ -111582,8 +110082,8 @@ aaa
aaa
aaa
aaa
-abj
-bkt
+aaa
+pnF
bav
bnP
bvv
@@ -111618,8 +110118,8 @@ cKl
bav
bnP
btk
-brr
-abj
+eAi
+aaa
aaa
aaa
aaa
@@ -111839,7 +110339,7 @@ aaa
aaa
aaa
aaa
-abi
+aaa
bku
baE
bcA
@@ -111875,8 +110375,8 @@ bkt
brT
bsb
btx
-brs
-abi
+eAi
+aaa
aaa
aaa
aaa
@@ -112096,8 +110596,8 @@ aaa
aaa
aaa
aaa
-abi
-bkt
+aaa
+ops
bmr
cqM
bps
@@ -112132,8 +110632,8 @@ bku
cpd
cqM
csl
-brr
-abi
+eAi
+aaa
aaa
aaa
aaa
@@ -112353,10 +110853,10 @@ aaa
aaa
aaa
aaa
-abi
aaa
-bms
-bnR
+abj
+oMO
+fPS
bJP
brs
aaa
@@ -112387,10 +110887,10 @@ qrT
qrT
bkt
bJP
-bLM
+orz
bpu
aaa
-abi
+aaa
aaa
aaa
aaa
@@ -112610,9 +111110,9 @@ aaa
aaa
aaa
aaa
-abi
-abi
-abi
+aaa
+aaa
+aaa
bku
bJP
brr
@@ -112645,9 +111145,9 @@ qrT
bkt
bJP
brr
-abi
-abi
-abi
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -112869,8 +111369,8 @@ aaa
aaa
aaa
aaa
-abi
-bkt
+aaa
+pnF
bJP
brs
aaa
@@ -112901,8 +111401,8 @@ qrT
abj
bku
bJP
-brs
-abi
+bLR
+aaa
aaa
aaa
aaa
@@ -113126,8 +111626,8 @@ aaa
aaa
aaa
aaa
-abj
-bkt
+aaa
+pnF
bJP
brs
abj
@@ -113159,7 +111659,7 @@ bmo
cnY
bJP
brr
-abi
+aaa
aaa
aaa
aaa
@@ -113383,8 +111883,8 @@ aaa
aaa
aaa
aaa
-abi
-bkt
+aaa
+pnF
bJP
brr
alW
@@ -113415,8 +111915,8 @@ chS
chS
chS
cpe
-brs
-abj
+eAi
+aaa
aaa
aaa
aaa
@@ -113640,8 +112140,8 @@ aaa
aaa
aaa
aaa
-abi
-bkt
+aaa
+pnF
bJP
brw
bpm
@@ -113666,14 +112166,14 @@ bXO
bNM
bkt
bJP
-bLM
-bms
+orz
+oMO
bpu
-bms
-bms
-bms
+rke
+rke
+rke
+aaa
aaa
-abi
aaa
aaa
aaa
@@ -113897,7 +112397,7 @@ aaa
aaa
aaa
aaa
-abi
+aaa
bku
bJY
chS
@@ -113924,13 +112424,13 @@ bNM
bkt
bJP
brr
-abi
-abi
-abj
-abi
-abi
-abi
-abi
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -114154,21 +112654,21 @@ aaa
aaa
aaa
aaa
-abi
aaa
+abj
bpu
-bms
-bms
+oMO
+rke
+rke
+rke
+rke
+rke
+rke
+rke
+rke
+rke
bpu
-bms
-bms
-bpu
-bms
-bms
-bpu
-bms
-bpu
-bnR
+fPS
bJP
bLR
bNM
@@ -114180,11 +112680,11 @@ bNM
bNM
bku
bJP
-brs
-abi
+eAi
+aaa
+aaa
aaa
aaa
-abj
aaa
aaa
aaa
@@ -114411,20 +112911,20 @@ aaa
aaa
aaa
aaa
-abi
-abi
-abi
-abi
-abj
-abi
-abi
-abi
-abj
-abi
-abi
-abi
-abi
-abi
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
bku
bJP
bLS
@@ -114437,11 +112937,11 @@ brw
bmo
bnM
bJP
-brr
-abi
+eAi
+aaa
+aaa
aaa
aaa
-abj
aaa
aaa
aaa
@@ -114678,11 +113178,11 @@ aaa
aaa
aaa
aaa
-abj
aaa
-abj
-abi
-bkt
+aaa
+aaa
+aaa
+pnF
bJY
bLT
bRv
@@ -114694,11 +113194,11 @@ chS
chS
chS
cpe
-brs
-abj
-abj
-abj
-abj
+eAi
+aaa
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -114935,12 +113435,12 @@ aaa
aaa
aaa
aaa
-abj
aaa
-abj
-abj
aaa
-bnR
+aaa
+aaa
+aaa
+fPS
bLU
bLM
bPC
@@ -114948,13 +113448,9 @@ bmq
bTS
bpq
brq
-bms
+oMO
bpu
-bms
-aaa
-abi
-aaa
-aaa
+oMO
abj
aaa
aaa
@@ -115005,6 +113501,10 @@ aaa
aaa
aaa
aaa
+aaa
+aaa
+aaa
+aaa
abj
aaa
abj
@@ -115192,11 +113692,11 @@ aaa
aaa
aaa
aaa
-abj
aaa
-abj
-abi
-abi
+aaa
+aaa
+aaa
+aaa
bku
bLV
brr
@@ -115205,14 +113705,14 @@ bRL
bTQ
bmY
brr
-abi
-abi
-abi
-abj
-abi
-abj
-abj
-abi
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -115449,11 +113949,11 @@ aaa
aaa
aaa
aaa
-abi
aaa
-abj
aaa
-abj
+aaa
+aaa
+aaa
aaa
bUJ
aaa
@@ -115463,13 +113963,13 @@ bTR
bpq
brr
aaa
-abj
aaa
aaa
aaa
-abj
aaa
-abi
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -115706,11 +114206,11 @@ aaa
aaa
aaa
aaa
-abi
aaa
-abi
aaa
-abj
+aaa
+aaa
+aaa
aaa
bUJ
aaa
@@ -115720,13 +114220,13 @@ bTS
bpq
brr
aaa
-abj
aaa
aaa
aaa
-abi
-abj
-abi
+aaa
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -115963,12 +114463,12 @@ aaa
aaa
aaa
aaa
-abi
aaa
-abi
aaa
-abj
-abj
+aaa
+aaa
+aaa
+aaa
bUJ
abj
bPS
@@ -115976,14 +114476,14 @@ bRM
bTT
bVX
bPS
-abj
-abj
-abj
-abj
-abj
-abi
aaa
-abi
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -116220,11 +114720,11 @@ aaa
aaa
aaa
aaa
-abj
aaa
-abi
aaa
-abj
+aaa
+aaa
+aaa
aaa
bUJ
aaa
@@ -116234,13 +114734,13 @@ bTU
bVY
bXQ
aaa
-abj
aaa
aaa
aaa
-abi
-abj
-abi
+aaa
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -116477,11 +114977,11 @@ aaa
aaa
aaa
aaa
-abi
-abj
-abi
aaa
-abj
+aaa
+aaa
+aaa
+aaa
aaa
bUJ
aaa
@@ -116491,13 +114991,13 @@ bZw
bVZ
bXR
aaa
-abj
aaa
aaa
aaa
-abj
aaa
-abi
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -116548,7 +115048,7 @@ dyo
dzv
dAH
dAH
-dAH
+mtx
dAH
dAH
dFf
@@ -116734,12 +115234,12 @@ aaa
aaa
aaa
aaa
-abi
aaa
-abi
-abj
-abj
-abj
+aaa
+aaa
+aaa
+aaa
+aaa
bUJ
abj
bPV
@@ -116747,14 +115247,14 @@ abj
chw
abj
bPV
-abj
-abj
-abj
-abj
-abj
-abi
aaa
-abj
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -116991,11 +115491,11 @@ aaa
aaa
aaa
aaa
-abi
aaa
-abj
aaa
-abj
+aaa
+aaa
+aaa
aaa
bUJ
aaa
@@ -117005,13 +115505,13 @@ chw
bWa
bXS
aaa
-abj
aaa
aaa
aaa
-abi
-abj
-abi
+aaa
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -117248,11 +115748,11 @@ aaa
aaa
aaa
aaa
-abj
aaa
-abi
aaa
-abj
+aaa
+aaa
+aaa
aaa
bUJ
aaa
@@ -117262,13 +115762,13 @@ cjl
bWb
bXT
aaa
-abj
aaa
aaa
aaa
-abi
aaa
-abi
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -117505,11 +116005,11 @@ aaa
aaa
aaa
aaa
-abi
aaa
-abi
aaa
-abj
+aaa
+aaa
+aaa
aaa
bUJ
aaa
@@ -117519,13 +116019,13 @@ cnH
bWc
abj
aaa
-abj
aaa
aaa
aaa
-abi
-abj
-abi
+aaa
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -117762,12 +116262,12 @@ aaa
aaa
aaa
aaa
-abi
aaa
-abi
-abj
-abj
-abj
+aaa
+aaa
+aaa
+aaa
+aaa
bVf
bXG
bYl
@@ -117775,14 +116275,14 @@ abj
coi
abj
abj
-abj
-abj
-abj
-abj
-abj
-abj
aaa
-abi
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -118019,11 +116519,11 @@ aaa
aaa
aaa
aaa
-abi
aaa
-abj
aaa
-abj
+aaa
+aaa
+aaa
aaa
abj
aaa
@@ -118033,13 +116533,13 @@ csr
aaa
abj
aaa
-abj
aaa
aaa
aaa
-abi
-abj
-abi
+aaa
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -118276,11 +116776,11 @@ aaa
aaa
aaa
aaa
-abi
-abj
-abi
aaa
-abj
+aaa
+aaa
+aaa
+aaa
aaa
abj
aaa
@@ -118290,13 +116790,13 @@ csr
aaa
abj
aaa
-abj
aaa
aaa
aaa
-abi
aaa
-abj
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -118533,12 +117033,12 @@ aaa
aaa
aaa
aaa
-abj
aaa
-abi
-abj
-abj
-abj
+aaa
+aaa
+aaa
+aaa
+aaa
abj
abj
bUJ
@@ -118546,14 +117046,14 @@ abj
coi
abj
abj
-abj
-abj
-abj
-abj
-abj
-abi
aaa
-abi
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -118790,9 +117290,9 @@ aaa
aaa
aaa
aaa
-abi
aaa
-abj
+aaa
+aaa
aaa
aaa
aaa
@@ -118804,13 +117304,13 @@ csr
aaa
abj
aaa
-abj
aaa
aaa
aaa
-abi
-abj
-abi
+aaa
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -119047,9 +117547,9 @@ aaa
aaa
aaa
aaa
-abi
-abj
-abi
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -119061,13 +117561,13 @@ csr
aaa
abj
aaa
-abj
aaa
aaa
aaa
-abj
aaa
-abi
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -119304,27 +117804,27 @@ aaa
aaa
aaa
aaa
-abi
aaa
-abi
+aaa
+aaa
+aaa
+aaa
+aaa
abj
abj
-abj
-abj
-abj
-bYm
+nZa
abj
coi
abj
abj
-abj
-abj
-abj
-abj
-abj
-abi
-abj
-abi
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -119561,27 +118061,27 @@ aaa
aaa
aaa
aaa
-abi
-abj
-abi
+aaa
+aaa
+aaa
aaa
aaa
aaa
abj
aaa
-bYm
+nZa
aaa
csr
aaa
abj
aaa
-abj
aaa
aaa
aaa
-abi
aaa
-abj
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -119818,27 +118318,27 @@ aaa
aaa
aaa
aaa
-abi
aaa
-abj
+aaa
+aaa
aaa
aaa
aaa
abj
aaa
-bYm
+nZa
aaa
csr
aaa
abj
aaa
-abj
aaa
aaa
aaa
-abi
aaa
-abi
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -120031,13 +118531,19 @@ aaa
aaa
aaa
aaa
-abi
+dij
abj
-abi
+dij
abj
-abi
-abi
-abi
+dij
+dij
+dij
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -120075,27 +118581,21 @@ aaa
aaa
aaa
aaa
-abi
-abj
-abi
abj
abj
-abj
-abj
-abj
-bYm
+nZa
abj
coi
abj
abj
-abj
-abj
-abj
-abj
-abj
-abi
-abj
-abi
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -120284,21 +118784,23 @@ aaa
aaa
aaa
aaa
-abi
-abi
-abj
-abi
-abi
+dij
+dij
+aGW
+dij
+dij
aaa
abj
aaa
abj
aaa
-abi
-abi
+dij
+dij
abj
-abi
-abi
+dij
+dij
+aaa
+aaa
aaa
aaa
aaa
@@ -120332,27 +118834,25 @@ aaa
aaa
aaa
aaa
-abj
aaa
-abj
aaa
aaa
aaZ
abj
aaa
-bYm
+nZa
aaa
csr
aaa
abj
aaa
-abj
aaa
aaa
aaa
-abi
aaa
-abj
+aaa
+aaa
+aaa
aaa
aaa
aaZ
@@ -120541,7 +119041,7 @@ aaa
aaa
aaa
aaa
-abi
+dij
aaa
abj
aaa
@@ -120555,7 +119055,19 @@ abj
aaa
abj
aaa
-abi
+dij
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -120583,64 +119095,52 @@ aaa
aaa
aaa
aaa
-abi
-abi
-abj
-abi
-abi
-abi
-abj
-abi
-abi
-abi
-abj
-abi
abj
abj
-bYm
+nZa
aaa
csr
aaa
abj
aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+dmq
+dmq
+dmq
+dmq
+cJK
+cJK
+cHA
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+acF
abj
aaa
aaa
aaa
-abj
-aaa
-abj
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
aaa
aaa
aaa
@@ -120798,7 +119298,7 @@ aaa
aaa
aaa
aaa
-abi
+dij
aaa
ash
asV
@@ -120840,47 +119340,59 @@ aaa
aaa
aaa
aaa
-abi
aaa
aaa
-abj
-aaa
-abj
-aaa
-abj
-aaa
-abj
-aaa
-abj
aaa
aaa
-bYm
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+nZa
abj
coi
abj
abj
aaa
-abj
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+cRD
+cRD
+cRD
+vKt
+xCC
+cHA
+cXX
+cXX
+cHA
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
aaa
abj
-abi
-abi
-abi
-abi
-abj
-abi
-abi
-abj
-abi
-abi
-abi
-abi
-abi
-abi
-abj
-abj
-abj
-aaa
acF
aaa
aaa
@@ -120904,18 +119416,6 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
abj
aaa
abj
@@ -121069,7 +119569,7 @@ ash
ata
atY
aaa
-abi
+dij
aaa
aaa
aaa
@@ -121097,63 +119597,63 @@ aaa
aaa
aaa
aaa
-abi
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+dij
abj
-abi
-abi
-aaa
-abi
-abi
-abi
-abi
-abj
-abi
-abi
-abi
-abj
-bYm
+nZa
aaa
csr
aaa
abj
aaa
-abj
-aaa
-abj
-aaa
-aaa
-abj
aaa
aaa
aaa
-abj
aaa
aaa
aaa
-abj
aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+cTg
+cUP
+cUQ
+vUu
+xCC
+elb
+drn
+drn
+cHA
abj
aaa
aaa
aaa
aaa
-abj
+aaa
+aaa
+aaa
acF
-abj
-abj
-abi
-abi
-abi
-abj
-abi
-abi
-abi
-abj
-abi
-abi
-abj
-abi
-abi
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -121312,7 +119812,7 @@ aaa
aaa
aaa
aaa
-abi
+dij
abj
ash
ata
@@ -121326,7 +119826,7 @@ ash
ata
atY
abj
-abi
+dij
aaa
aaa
aaa
@@ -121354,63 +119854,63 @@ aaa
aaa
aaa
aaa
-abi
aaa
-abi
+aaa
+aaa
+acF
+acF
+acF
abj
abj
abj
-abj
-abj
-abj
-abj
-abj
-abj
-abi
+acF
+acF
+acF
+dij
aaa
-bYm
+nZa
aaa
csr
aaa
abj
-abj
-abi
-abi
-abi
-abj
-abi
-abi
-abi
-abj
-abi
-abi
-abi
-abj
-abi
-abi
-abi
-abj
-abi
-abi
-abi
-abj
aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+cRD
+cRD
+cRD
+vKt
+xCC
+cHA
+sPz
+cXU
+cHA
+bya
+pfE
+pfE
+cHA
+cHA
+aaa
+aaa
+abj
acF
-aaa
abj
aaa
-abj
aaa
-abj
-aaa
-abj
-aaa
-abj
-aaa
-abj
-abj
-aaa
-abi
aaa
aaa
aaa
@@ -121569,7 +120069,7 @@ aaa
aaa
aaa
aaa
-abi
+dij
aaa
ash
ata
@@ -121611,10 +120111,10 @@ aaa
aaa
aaa
aaa
-abj
aaa
-abi
-abj
+aaa
+aaa
+acF
bwN
bwN
bwN
@@ -121622,52 +120122,52 @@ bwN
bwN
bwN
bwN
+acF
abj
abj
-abj
-bYm
+nZa
abj
coi
abj
abj
-abj
aaa
abj
-aaa
abj
-aaa
abj
-aaa
abj
-aaa
abj
-aaa
abj
-aaa
abj
-aaa
abj
-aaa
abj
-aaa
abj
abj
+abj
+abj
+abj
+abj
+abj
+abj
+abj
+cWk
+dmq
+cHA
+cHA
+drn
+slE
+drn
+pAC
+dpX
+cLA
+dtU
+cHA
+cHA
+aaa
+abj
acF
abj
-abi
-abi
-abi
-abj
-abi
-abi
-abi
-abj
-abi
-abj
-abi
-abi
-abj
-abj
+aaa
+aaa
aaa
aaa
aaa
@@ -121823,10 +120323,10 @@ aaa
aaa
aaa
aaa
-abi
+dij
abj
-abi
-abi
+dij
+dij
aaa
ash
ata
@@ -121868,10 +120368,10 @@ aaa
aaa
aaa
aaa
-abi
-abj
-abi
-abj
+aaa
+aaa
+aaa
+acF
bwN
bzE
bzE
@@ -121879,14 +120379,14 @@ bDb
bzE
bzE
bwN
-abj
-abi
+acF
+dij
aaa
-bYm
+nZa
aaa
csr
aaa
-aaa
+abj
bXU
cba
cba
@@ -121908,23 +120408,23 @@ cie
cie
cie
bXU
-aaa
-acF
+xtS
+cPY
+drn
+dhG
+drn
+drn
+drn
+dhG
+drn
+cCy
+cHA
aaa
abj
+seE
+bPS
+vXX
aaa
-abj
-abj
-abj
-aaa
-abj
-abj
-abj
-aaa
-abj
-abj
-abj
-abi
aaa
aaa
aaa
@@ -122080,7 +120580,7 @@ aaa
aaa
aaa
aaa
-abi
+dij
aaa
abj
abj
@@ -122125,9 +120625,9 @@ aaa
aaa
aaa
aaa
-abi
aaa
-abj
+aaa
+aaa
abj
bwN
bzE
@@ -122137,9 +120637,9 @@ bBi
bGB
bwN
abj
-abi
+dij
aaa
-bYm
+nZa
aaa
csr
aaa
@@ -122165,23 +120665,23 @@ bXU
bXU
bXU
bXU
-abj
+iPQ
cPY
+drn
cHA
cHA
+cHA
+cHA
+cHA
+drn
+maf
cJK
+aaa
cHA
+kdR
cHA
-cHA
-cJK
-cHA
-cHA
-cCx
-cJK
-cCx
-cCx
-abj
-abi
+vXX
+aaa
aaa
aaa
aaa
@@ -122337,7 +120837,7 @@ aaa
aaa
aaa
aaa
-abi
+dij
abj
apF
aEc
@@ -122382,9 +120882,9 @@ aaa
aaa
aaa
aaa
-abi
-abj
-abi
+aaa
+aaa
+aaa
abj
bwN
bzE
@@ -122396,7 +120896,7 @@ bwN
abj
abj
abj
-bYm
+nZa
abj
coi
abj
@@ -122422,23 +120922,23 @@ cie
cie
cie
bXU
-dmq
-cGw
+rkv
+drn
+dhG
cHA
-cjV
cJP
cLC
+rkV
cHA
-cQs
-cRD
+drn
cTi
-cTg
-cUP
-cWk
-cXR
-cCx
+cJK
+aaa
+cHA
+cXR
+cHA
+aaa
aaa
-abi
aaa
aaa
aaa
@@ -122594,7 +121094,7 @@ aaa
aaa
aaa
aaa
-abi
+dij
aaa
abj
abj
@@ -122625,7 +121125,6 @@ abj
acF
aaa
abj
-abj
aaa
aaa
aaa
@@ -122639,10 +121138,11 @@ aaa
aaa
aaa
aaa
-abj
aaa
-abi
-abj
+aaa
+aaa
+aaa
+acF
bwN
bzE
bBi
@@ -122651,9 +121151,9 @@ bBi
bzE
bwN
abj
-abi
+dij
aaa
-bYm
+nZa
aaa
csr
aaa
@@ -122680,22 +121180,22 @@ abj
cbb
bXU
dmq
-cFN
-cHA
-cJL
-cWl
-cYb
-cHA
-cQv
drn
-drn
-cTg
-cUQ
+cXU
+cHA
cWl
-cYb
-cCx
-abj
-abj
+unt
+lxh
+cHA
+sQr
+sZp
+cHA
+aaa
+cHA
+fxr
+cHA
+vXX
+aaa
aaa
aaa
aaa
@@ -122851,8 +121351,8 @@ aaa
aaa
aaa
aaa
-abi
-abi
+dij
+dij
abj
abj
aaa
@@ -122881,25 +121381,25 @@ aPk
aNT
aWR
abj
-abi
-abj
-abj
-abi
-abi
-abi
-abi
-abi
-abj
-abi
-abi
-abi
-abi
-abi
-abj
-abi
-abj
-abi
abj
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+acF
bwN
bzE
bzE
@@ -122910,7 +121410,7 @@ bwN
abj
abj
aaa
-bYm
+nZa
aaa
csr
aaa
@@ -122937,19 +121437,19 @@ cda
cbb
cDx
bXU
-cIu
+drn
+dhG
cHA
cHA
-cjX
-cLz
+pWT
cHA
cHA
-cjX
+dtU
+drn
+cJK
cHA
cHA
-cHA
-cjX
-cHA
+sQZ
cHA
abj
aaa
@@ -123111,7 +121611,7 @@ aaa
aaa
aaa
aaa
-abi
+dij
aaa
ash
atL
@@ -123125,7 +121625,7 @@ ash
atL
atY
aaa
-abi
+dij
aaa
abj
abj
@@ -123138,25 +121638,25 @@ aPl
aGZ
aSx
aTS
-aaa
-abj
-aaa
-abj
-aaa
-abj
-aaa
-abj
-aaa
-abj
-aaa
-abj
-aaa
-abj
-aaa
abj
aaa
aaa
-abj
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+acF
bwN
bzG
bBl
@@ -123166,7 +121666,7 @@ bGs
bwN
abj
bVs
-bYa
+wRP
bYJ
abj
csr
@@ -123194,8 +121694,8 @@ cCg
cbb
cDx
bXU
-cFP
-cHe
+dhG
+drn
cIv
dhG
cLA
@@ -123207,7 +121707,7 @@ cLA
drn
cWm
cXT
-cHA
+kyU
abj
aaa
aaa
@@ -123368,7 +121868,7 @@ aaa
aaa
aaa
aaa
-abi
+dij
aaa
ash
atL
@@ -123381,8 +121881,8 @@ abj
ash
atL
atY
-abj
-abi
+dKA
+dij
abj
abj
aGX
@@ -123395,24 +121895,24 @@ aPm
aGZ
aGZ
aZY
-abi
-abi
-abi
-abi
-abi
-abj
-abi
-abi
-abi
-abi
-abi
-abj
-abi
-abi
-abi
-abi
-abi
abj
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
abj
bwN
bzH
@@ -123625,7 +122125,7 @@ aaa
aaa
aaa
aaa
-abi
+dij
aaa
ash
atL
@@ -123639,7 +122139,7 @@ ash
atL
atY
aaa
-abi
+dij
aaa
abj
aGY
@@ -123662,7 +122162,7 @@ aaa
abj
abj
abj
-aaa
+abj
abj
abj
abj
@@ -123734,8 +122234,8 @@ dbz
dbz
aaa
aaa
-abi
-abi
+aaa
+aaa
aaa
aaa
aaa
@@ -124139,7 +122639,7 @@ aaZ
aaa
aaa
aaa
-abi
+dij
aaa
abj
aaa
@@ -124153,7 +122653,7 @@ abj
aaa
abj
aaa
-abi
+dij
abj
abj
aGY
@@ -124251,7 +122751,7 @@ dbz
aMW
aMW
abj
-abi
+aaa
aaa
aaa
aaa
@@ -124395,11 +122895,11 @@ aaa
aaa
aaa
aaa
-abj
-abi
-abi
-abj
-abi
+aaa
+dij
+dij
+aGW
+dij
abj
aaa
abj
@@ -124407,12 +122907,12 @@ aaa
abj
aaa
abj
-abi
-abj
-abi
-abi
-abj
+dij
+aGW
+dij
+dij
abj
+aaa
aGY
aGY
aLr
@@ -124485,7 +122985,7 @@ bLP
cJR
cLD
cMV
-cOB
+cLD
cQx
cLD
cJR
@@ -124508,8 +123008,8 @@ dpR
aOs
aMW
abj
-abi
-abi
+aaa
+aaa
aaa
aaa
aaa
@@ -124652,24 +123152,24 @@ aaa
aaa
aaa
aaa
+aaa
+aaa
+aaa
+aaa
+dij
+dij
+dij
+dij
+dij
+dij
+dij
+dij
+dij
+abj
+abj
+abj
abj
aaa
-abj
-aaa
-abi
-abi
-abi
-abi
-abi
-abi
-abi
-abi
-abi
-abj
-abj
-abj
-abj
-abj
aGZ
aIt
aMO
@@ -124768,7 +123268,7 @@ abj
abj
abj
abj
-abi
+aaa
aaa
aaa
abj
@@ -124914,7 +123414,7 @@ aaa
aaa
aaa
aaa
-abj
+aaa
aaa
abj
aaa
@@ -124924,7 +123424,7 @@ aaa
abj
aaa
aaa
-abi
+aaa
aaa
acF
aHa
@@ -124996,7 +123496,7 @@ bXU
cFT
cHk
cIx
-cJT
+haY
cLF
cMX
cOC
@@ -125016,8 +123516,8 @@ dhw
diY
dkr
dYt
-dYu
-dYu
+oQs
+oQs
dcX
dqZ
aMY
@@ -125025,7 +123525,7 @@ abj
aaa
aaa
abj
-abi
+aaa
aaa
aaa
abj
@@ -125171,7 +123671,7 @@ aaa
aaa
aaa
aaa
-abj
+aaa
aaa
abj
abj
@@ -125274,7 +123774,7 @@ dfM
dfM
dfM
dmN
-aRm
+wMv
dcX
dra
dbz
@@ -125282,7 +123782,7 @@ dbz
dbz
aaa
abj
-abi
+abj
abj
abj
abj
@@ -125428,9 +123928,9 @@ aaa
aaa
aaa
aaa
-abi
-aaa
-abi
+dij
+dij
+dij
aaa
aAe
aBV
@@ -125532,8 +124032,8 @@ dfN
aUp
dmO
aSP
-aRm
-aRm
+wMv
+wMv
aUp
aUp
dbz
@@ -125685,9 +124185,9 @@ aaa
aaa
aaa
aaa
-abi
-abj
-abi
+dij
+rvc
+dij
abj
aAi
ayG
@@ -125942,9 +124442,9 @@ aaa
aaa
aaa
aaa
-abj
-aaa
-abi
+dij
+rvc
+dij
aaa
aAi
aAi
@@ -126194,14 +124694,14 @@ aaa
aaa
aaa
aaa
-abi
-abj
-abi
-abi
-abi
-abi
-abj
-abi
+aaa
+aaa
+aaa
+aaa
+aaa
+dij
+rvc
+dij
abj
aAi
ayG
@@ -126302,10 +124802,10 @@ dfN
dcX
dcX
dmO
-aRm
+wMv
dYy
drd
-aRm
+wMv
dtL
aMW
abj
@@ -126451,14 +124951,14 @@ aaa
aaa
aaa
aaa
-abi
-abj
+aaa
+aaa
aaa
aaa
abj
-abj
-abj
-abj
+dij
+dij
+dij
abj
aAi
aDC
@@ -126477,9 +124977,9 @@ aMG
aOb
aPH
aQV
-aPF
+aSD
aSc
-aSI
+aVF
aXj
aYz
bam
@@ -126559,7 +125059,7 @@ aUp
dcX
dfN
dmO
-dYu
+oQs
dYz
drc
aUp
@@ -126708,11 +125208,11 @@ aaa
aaa
aaa
aaa
-abi
+aaa
+aaa
abj
-abj
-abi
-abi
+aaa
+aaa
abj
atd
atd
@@ -126855,13 +125355,13 @@ aaa
aaa
aaa
aaa
-abi
-abi
-abi
+dij
+dij
+dij
abj
-abj
-abi
-abi
+sso
+dij
+dij
aaa
aaa
aaa
@@ -126965,7 +125465,7 @@ aaa
aaa
aaa
aaa
-abi
+aaa
aaa
abj
aaa
@@ -126992,10 +125492,10 @@ aOg
aPy
aQX
aSD
-aUc
-aVF
+aPF
+aSI
aXl
-ban
+aVO
ban
bbP
ban
@@ -127073,7 +125573,7 @@ dja
aSP
aRm
dmQ
-aRm
+wMv
dcX
drf
aMW
@@ -127081,7 +125581,7 @@ abj
aaa
aaa
abj
-abi
+aaa
aaa
aaa
abj
@@ -127108,21 +125608,21 @@ aaa
aaa
aaa
aaa
-abi
+dij
abj
abj
-abi
-abi
+dij
+dij
aaa
aaa
abj
aaa
aaa
-abi
-abi
-abj
-abi
-abi
+dij
+dij
+sso
+dij
+dij
aaa
aaa
aaa
@@ -127222,9 +125722,9 @@ aaa
aaa
aaa
aaa
-abi
-abj
-abi
+dij
+dij
+dij
abj
atd
atd
@@ -127338,7 +125838,7 @@ abj
abj
abj
abj
-abi
+abj
abj
abj
abj
@@ -127365,7 +125865,7 @@ aaa
aaa
aaa
aaa
-abi
+dij
aaa
aaa
abj
@@ -127379,7 +125879,7 @@ aaa
abj
aaa
aaa
-abi
+dij
aaa
aaa
aaa
@@ -127479,9 +125979,9 @@ aaa
aaa
aaa
aaa
-abj
-aaa
-abi
+dij
+rvc
+dij
abj
atd
aua
@@ -127504,15 +126004,15 @@ aLn
aML
aOg
aPH
-aQZ
-aSD
-aUc
+spS
+iiY
+veH
aVI
aXn
aYD
+cOB
bap
-bap
-bap
+cOB
beK
aXq
bhk
@@ -127595,7 +126095,7 @@ abj
aaa
aaa
abj
-abi
+aaa
aaa
aaa
abj
@@ -127622,7 +126122,7 @@ aaa
aaa
aaa
aaa
-abi
+dij
aaa
dTV
dYL
@@ -127636,7 +126136,7 @@ dTV
dYL
dVn
aaa
-abj
+sso
aaa
aaa
aaa
@@ -127736,9 +126236,9 @@ aaa
aaa
aaa
aaa
-abi
-abj
-abi
+dij
+rvc
+dij
aaa
atd
aub
@@ -127852,7 +126352,7 @@ cZt
cZt
cZt
abj
-abi
+aaa
aaa
aaa
abj
@@ -127879,7 +126379,7 @@ aaa
aaa
aaa
aaa
-abj
+sso
aaa
dTV
dYM
@@ -127893,7 +126393,7 @@ dTV
dYM
dVn
aaa
-abi
+dij
aaa
aaa
aaa
@@ -127993,9 +126493,9 @@ aaa
aaa
aaa
aaa
-abi
-aaa
-abi
+dij
+rvc
+dij
abj
atd
aub
@@ -128136,7 +126636,7 @@ aaa
aaa
aaa
aaa
-abj
+sso
abj
dTV
dYM
@@ -128150,7 +126650,7 @@ dTV
dYM
dVn
abj
-abi
+dij
aaa
aaa
aaa
@@ -128250,9 +126750,9 @@ aaa
aaa
aaa
aaa
-abi
-abj
-abj
+dij
+rvc
+dij
aaa
atd
aub
@@ -128393,7 +126893,7 @@ aaa
aaa
aaa
aaa
-abi
+dij
aaa
dTV
dYM
@@ -128507,9 +127007,9 @@ aaa
aaa
aaa
aaa
-abj
-aaa
-abi
+dij
+rvc
+dij
abj
atd
aue
@@ -128644,13 +127144,13 @@ aaa
aaa
aaa
aaa
-abi
-abi
+dij
+dij
aaa
-abi
-abi
+dij
+dij
aaa
-abi
+dij
aaa
dTV
dYM
@@ -128665,9 +127165,9 @@ dYM
dVn
aaa
abj
-abi
-abi
-abi
+dij
+dij
+dij
aaa
aaa
aaa
@@ -128764,9 +127264,9 @@ aaa
aaa
aaa
aaa
-abi
-abj
-abi
+dij
+rvc
+dij
aaa
atd
aub
@@ -128826,16 +127326,16 @@ bWK
bWK
bYo
bXZ
-bZx
+bhL
cbp
-cgN
-bos
-cgN
-cfb
-cgN
-cfb
-cgN
-cfb
+mMt
+gTA
+mMt
+jFV
+mMt
+jFV
+mMt
+vDY
cpt
cfb
cgN
@@ -128901,7 +127401,7 @@ aaa
abj
abj
abj
-abi
+dij
abj
abj
abj
@@ -128924,7 +127424,7 @@ aaa
aaa
abj
aaa
-abi
+dij
aaa
aaa
aaa
@@ -129021,9 +127521,9 @@ aaa
aaa
aaa
aaa
-abi
-aaa
-abi
+dij
+rvc
+dij
abj
atd
aud
@@ -129036,8 +127536,8 @@ aAa
aBX
aAa
aCZ
-aAa
-aCZ
+sdP
+hPT
aFX
aGi
aIH
@@ -129053,7 +127553,7 @@ aVM
aXq
aYI
bhp
-bhp
+mfl
bhp
beO
aXn
@@ -129158,7 +127658,7 @@ abj
acF
aaa
aaa
-abi
+dij
abj
dQB
dQB
@@ -129278,9 +127778,9 @@ aaa
aaa
aaa
aaa
-abi
-aaa
-abj
+dij
+rvc
+dij
aaa
atd
aub
@@ -129310,11 +127810,11 @@ aVN
aXr
aYJ
bau
-bau
+oZY
bau
aXG
aXr
-bau
+sGz
biV
bkK
bmH
@@ -129394,7 +127894,7 @@ dfW
dYG
cZt
abj
-abi
+dij
aaa
aaa
abj
@@ -129438,7 +127938,7 @@ aaa
aaa
abj
aaa
-abi
+dij
aaa
aaa
aaa
@@ -129535,9 +128035,9 @@ aaa
aaa
aaa
aaa
-abi
-abj
-abi
+dij
+rvc
+dij
abj
atd
aue
@@ -129563,17 +128063,17 @@ aPG
aRf
aSD
aTZ
-aVO
+aVF
aXs
aUQ
-aXs
+dkD
bbV
-aXs
+aYK
aXN
-aXs
-aXs
-aXs
-bkL
+ijT
+mzZ
+ban
+bkM
bmI
aOg
aOg
@@ -129651,7 +128151,7 @@ dfW
duS
cZt
abj
-abi
+dij
aaa
aaa
abj
@@ -129672,13 +128172,13 @@ abj
acF
aaa
aaa
-abi
+dij
abj
dYI
abj
aaa
aaa
-abi
+dij
aaa
dTV
dYO
@@ -129693,9 +128193,9 @@ dYO
dVn
aaa
abj
-abi
-abi
-abi
+dij
+dij
+dij
aaa
aaa
aaa
@@ -129792,9 +128292,9 @@ aaa
aaa
aaa
aaa
-abi
-abj
-abi
+dij
+rvc
+dij
aaa
atd
aub
@@ -129821,12 +128321,12 @@ aRg
aSD
aTZ
aVF
-aXt
-aYK
-baw
-aYK
-aYK
-aYK
+bgg
+bkL
+bgg
+aTZ
+ban
+tiC
bgg
ban
ban
@@ -129908,7 +128408,7 @@ drk
duU
cZt
abj
-abi
+dij
aaa
aaa
abj
@@ -129929,13 +128429,13 @@ aaa
abj
abj
abj
-abi
+dij
abj
dYJ
abj
aaa
aaa
-abi
+dij
aaa
dTV
dYO
@@ -130049,9 +128549,9 @@ aaa
aaa
aaa
aaa
-abj
-abj
-abi
+dij
+rvc
+dij
abj
atd
aub
@@ -130081,7 +128581,7 @@ aVP
aXu
aYL
aXu
-bbW
+hlY
bbW
beP
bgh
@@ -130119,8 +128619,8 @@ bXU
bQr
bQr
clv
-cop
-cqP
+cnb
+cnb
buB
cso
cuR
@@ -130165,7 +128665,7 @@ dfW
duV
cZt
abj
-abi
+dij
aaa
aaa
abj
@@ -130181,9 +128681,9 @@ aaa
abj
aaa
aaa
-abi
-abi
-abi
+dij
+dij
+dij
abj
abj
abj
@@ -130192,7 +128692,7 @@ dYK
abj
abj
aaa
-abi
+dij
abj
dTV
dYO
@@ -130206,7 +128706,7 @@ dTV
dYO
dVn
abj
-abi
+dij
aaa
aaa
aaa
@@ -130306,9 +128806,9 @@ aaa
aaa
aaa
aaa
-abi
-abj
-abj
+dij
+rvc
+dij
abj
atd
auf
@@ -130449,7 +128949,7 @@ dQK
dPp
abj
aaa
-abi
+dij
aaa
dTV
dYO
@@ -130463,7 +128963,7 @@ dTV
dYO
dVn
aaa
-abi
+dij
aaa
aaa
aaa
@@ -130563,9 +129063,9 @@ aaa
aaa
aaa
aaa
-abi
-aaa
-abi
+dij
+rvc
+dij
abj
atd
aug
@@ -130688,17 +129188,17 @@ acF
abj
abj
abj
-abi
-abi
+dij
+dij
abj
-abi
-abi
-abi
-abi
-abi
+dij
+dij
+dij
+dij
+dij
abj
-abi
-abi
+dij
+dij
abj
abj
dPp
@@ -130706,7 +129206,7 @@ dQL
dPp
abj
abj
-abi
+raB
aaa
dTV
dYP
@@ -130720,7 +129220,7 @@ dTV
dYP
dVn
aaa
-abi
+dij
aaa
aaa
aaa
@@ -130820,9 +129320,9 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
-abi
+dij
+dij
+dij
abj
atd
atd
@@ -130963,12 +129463,12 @@ dQO
dPp
dPp
abj
-abj
+aaa
aaa
aaa
abj
aaa
-aaa
+dKz
dTV
dYP
dVn
@@ -130977,7 +129477,7 @@ aaa
abj
aaa
aaa
-abi
+dij
aaa
aaa
aaa
@@ -131203,15 +129703,15 @@ dXX
acF
abj
aaa
-abi
-abi
-abi
-abi
-abi
+dij
+dij
+dij
+dij
+dij
abj
-abi
-abi
-abi
+dij
+dij
+dij
aaa
abj
dPq
@@ -131220,21 +129720,21 @@ dQQ
dRo
dPq
abj
-abi
aaa
-abi
-abi
+aaa
+dij
+dij
aaa
aaa
aaa
abj
aaa
aaa
-abj
-abi
-abi
-abj
-abi
+sso
+dij
+dij
+sso
+dij
aaa
aaa
aaa
@@ -131441,9 +129941,9 @@ dhH
djk
cAS
cAS
-dna
+vGB
doA
-cAS
+kpI
dro
dIf
cHA
@@ -131480,14 +129980,14 @@ abj
aaa
aaa
aaa
-abj
+sso
aaa
-abi
-abi
-abj
-abi
-abi
+dij
+dij
abj
+dij
+dij
+sso
aaa
aaa
aaa
@@ -131737,9 +130237,9 @@ abj
abj
abj
aaa
-abj
aaa
-abj
+aaa
+aaa
aaa
aaa
aaa
@@ -131953,10 +130453,10 @@ deQ
dga
djf
djn
-ddi
-dng
-dng
-dng
+wil
+seQ
+fjv
+vnM
ddi
cYc
cXU
@@ -131993,10 +130493,10 @@ dPq
dku
ddy
abj
-abi
-abj
aaa
-abi
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -132210,7 +130710,7 @@ deR
dgb
dhK
djo
-dkD
+ddi
dlO
dnc
doB
@@ -132243,17 +130743,17 @@ dNy
dFg
dOO
dPr
-deW
+qxp
dQM
dcA
dbp
dSn
dlc
abj
-abi
-abi
-abj
-abi
+aaa
+aaa
+aaa
+aaa
aaa
aaa
aaZ
@@ -132469,7 +130969,7 @@ dhL
dkx
dkE
dlP
-dnd
+dng
cPf
ddi
cQY
@@ -132510,7 +131010,7 @@ abj
abj
abj
aaa
-abi
+aaa
aaa
aaa
aaa
@@ -132725,9 +131225,9 @@ dgf
dhM
djs
dkF
-dlP
-dne
-cPf
+dng
+iLr
+dng
ddi
cQY
cXU
@@ -132766,9 +131266,9 @@ dbw
dQS
dbw
abj
-abj
-abj
-abj
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -132940,10 +131440,10 @@ bWH
cHA
bZI
cbE
-cly
-dna
-cHs
-cAS
+dhG
+dtP
+cNh
+drn
cke
cly
dna
@@ -132977,15 +131477,15 @@ cIM
cIM
ddi
dxr
-dge
+lVT
dge
dhR
djt
dkH
-cKs
-dnf
-dER
-ddi
+dkI
+dkI
+dkI
+dkI
cYc
dsr
cHA
@@ -133023,9 +131523,9 @@ dSA
dTf
dQb
abj
-abi
aaa
-abi
+aaa
+aaa
aaa
aaa
aaa
@@ -133238,11 +131738,11 @@ dgc
dgf
dhT
dju
-dkH
+dkI
cKu
-dng
-dng
-ddi
+mIp
+sMj
+dkI
cQY
dhG
cHA
@@ -133280,9 +131780,9 @@ dSF
dUi
dTW
abj
-abi
-abj
-abi
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -133495,14 +131995,14 @@ dgc
dgc
dhU
djw
-dkH
-dng
-dng
-dng
-ddi
-cYe
-drn
-cLA
+dkI
+jVL
+mTO
+jVL
+dkI
+vGz
+cAS
+ydp
drn
dvV
dxh
@@ -133527,7 +132027,7 @@ dHs
dNC
dFg
dEi
-dPw
+xoq
dQe
dRj
dRB
@@ -133537,9 +132037,9 @@ dSG
dUl
dTW
abj
-abi
aaa
-abi
+aaa
+aaa
aaa
aaa
aaa
@@ -133752,14 +132252,14 @@ dgc
dgg
dhQ
djx
-dkF
-dng
+dkI
+rCe
dnh
doD
-ddi
-drp
-dst
-cly
+dkI
+dmq
+dmq
+rIK
dst
dvW
dWn
@@ -133794,9 +132294,9 @@ dSO
dUS
dQS
abj
-abj
aaa
-abj
+aaa
+aaa
aaa
aaa
aaa
@@ -134009,13 +132509,13 @@ dgj
dgk
dhV
djy
-ddi
-dng
-dng
-dng
-ddi
-dsq
-cNh
+dkI
+mlR
+nte
+hgq
+iDz
+vXX
+dmq
dtP
cNh
dvX
@@ -134051,9 +132551,9 @@ dSQ
dlJ
dQS
abj
-abi
-abj
-abi
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -134267,9 +132767,9 @@ dds
dTe
djv
dkI
-dkI
-dkI
-dkI
+esK
+qWp
+uza
dkI
dkI
dkI
@@ -134308,9 +132808,9 @@ dSW
dTj
dbw
abj
-abi
aaa
-abi
+aaa
+aaa
aaa
aaa
aaa
@@ -134516,9 +133016,9 @@ cTM
cVm
cWT
dto
-cND
+tke
dbO
-cPn
+gqM
cZx
dgl
dhW
@@ -134562,12 +133062,12 @@ dRF
dkh
dSq
dTg
-dOQ
+qfH
dTW
abj
-abj
aaa
-abi
+aaa
+aaa
aaa
aaa
aaa
@@ -134782,7 +133282,7 @@ dhY
dhD
dkK
dlS
-cMD
+dve
dve
dwe
dCN
@@ -134822,9 +133322,9 @@ dSH
dVo
dTW
abj
-abi
-abj
-abi
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -135079,9 +133579,9 @@ dSI
dTl
dQb
abj
-abi
aaa
-abj
+aaa
+aaa
aaa
aaa
aaa
@@ -135279,7 +133779,7 @@ cIO
bQx
cLU
cNw
-cOZ
+cQP
cVf
cVf
cSc
@@ -135287,7 +133787,7 @@ cVf
cWK
cWV
dvN
-dau
+cND
dbP
cPn
cIW
@@ -135336,9 +133836,9 @@ dbw
dbw
dbw
abj
-abi
-abj
-abj
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -135416,7 +133916,7 @@ aaa
acC
acC
acC
-afb
+buc
adv
adZ
adZ
@@ -135595,7 +134095,7 @@ aaa
abj
aaa
aaa
-abj
+aaa
aaa
aaa
aaa
@@ -135687,7 +134187,7 @@ ajZ
ajZ
ajZ
ajZ
-ajZ
+cMP
ajZ
ajZ
ajZ
@@ -135790,9 +134290,9 @@ cDW
cGr
dmq
dmq
-cKr
-cKr
-cKr
+dvf
+dvf
+dvf
cPb
cQJ
cSh
@@ -135852,7 +134352,7 @@ abj
abj
abj
abj
-abj
+aaa
aaa
aaa
aaa
@@ -136047,17 +134547,17 @@ dhG
cGs
cHw
cIQ
-cZt
+cYA
cLV
-cKr
-cKr
-cKr
-cKr
-cKr
-cKr
-cKr
-cKr
-cKr
+dvf
+dvf
+dvf
+dvf
+dvf
+dvf
+dvf
+dvf
+dvf
dau
dbP
cPn
@@ -136109,7 +134609,7 @@ dTX
dIx
dIx
abj
-abi
+aaa
aaa
aaa
aaa
@@ -136213,7 +134713,7 @@ acC
adb
adb
adb
-anl
+iIw
anK
adb
aoS
@@ -136304,20 +134804,20 @@ drn
cGt
cHx
cXU
-cZt
-dau
+iiv
+vYC
mzQ
-dau
-dau
-dau
+viE
+nbz
+cYA
cTI
+mhT
+vVf
+vFq
+cYA
dau
-dau
-dau
-cYs
-dau
-dbR
-ddw
+dbP
+cPn
dBD
dgq
did
@@ -136366,7 +134866,7 @@ dTY
dUJ
dIx
abj
-abi
+aaa
aaa
aaa
aaa
@@ -136565,14 +135065,14 @@ cLB
cLX
cNx
cPg
-daA
-daA
+cTJ
+cYA
cMl
-daA
-daA
-daA
-cYt
-daA
+dni
+vrp
+dni
+cYz
+dau
dbS
cPn
dfe
@@ -136614,7 +135114,7 @@ dRu
dPE
dQi
dQU
-dRu
+gsy
dRM
dSe
dRM
@@ -136623,7 +135123,7 @@ dTZ
dUK
dTX
abj
-abi
+aaa
aaa
aaa
aaa
@@ -136818,20 +135318,20 @@ cJO
cGv
drn
cIS
-cZt
-cMn
-cKF
+cYA
+rCJ
+tLE
+cPh
+cVj
+cYz
+cVj
+cVj
cPh
-cKF
-cVJ
-cNy
-cKF
-cKF
cYo
-cYu
+cYA
daB
-dbV
-cPn
+mLW
+tMu
dff
dff
czd
@@ -136880,9 +135380,9 @@ dUb
dUL
dTX
aaa
-abj
aaa
-abi
+aaa
+aaa
aaa
aaa
aaa
@@ -137075,20 +135575,20 @@ cHA
cIz
cHA
cHA
-cZt
-cZt
-cZt
+cYA
+rtH
+pRe
cQw
-cZt
-cZt
-cIW
-cIW
-cIW
-cZt
-cZt
-cZu
+vLu
+rIy
+kRz
+qOO
+pjY
+kRz
+sxS
+ctm
cZy
-dde
+cPn
dff
dgs
die
@@ -137137,9 +135637,9 @@ dUb
dUM
dTX
abj
-abi
aaa
-abi
+aaa
+aaa
aaa
aaa
aaa
@@ -137332,19 +135832,19 @@ bst
cGx
cHB
bvV
-cZt
+cYA
cMa
cNA
-cPj
-cQZ
-cSj
+cWN
+cVj
+cYz
cTJ
cVj
cWN
-cIW
-cYv
-cKF
-dbV
+cVj
+cYA
+dau
+dbP
cPn
dfg
dgt
@@ -137394,9 +135894,9 @@ dUc
dUN
dIx
abj
-abi
-abj
-abi
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -137589,19 +136089,19 @@ cDd
cGy
xqH
ddm
-cZt
+cYA
cMb
-cNB
+cVj
cPk
-cRa
-muI
-cMm
-cMm
-cWO
-cIW
+cTJ
+cYA
+vrF
+fMg
+dmd
+fBm
cYz
-cKF
-dbV
+dau
+dbP
cPn
dfh
dhN
@@ -137653,7 +136153,7 @@ dIx
abj
aaa
aaa
-abi
+aaa
aaa
aaa
aaa
@@ -137756,7 +136256,7 @@ alY
afb
alY
ant
-anP
+rBP
aoo
aoX
apM
@@ -137846,19 +136346,19 @@ cEL
btE
cHC
ddn
-cZt
+cYA
cMc
-cPl
+hAi
tsN
cRb
-cWu
+cYA
cTL
cVl
cWP
-cIW
+jbq
cYA
-cKF
-dbV
+dau
+dbP
cPn
dfi
dhO
@@ -137908,9 +136408,9 @@ dml
dUO
dIx
abj
-abi
-abj
-abi
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -138056,7 +136556,7 @@ bhH
bjp
bQc
aYZ
-boo
+nqC
bqu
bhX
bsv
@@ -138103,19 +136603,19 @@ cFp
dxV
ddl
cIV
-cZt
-cIW
-cIW
-cIW
-cRc
-cZt
-cZt
-cZt
-cZt
-cZt
-cZt
+cYA
+cYz
+cYz
+cYz
+jLB
+cYA
+cYA
+cYA
+cYA
+cYA
+cYA
dtS
-dbV
+dbP
cPn
dfj
dhP
@@ -138160,14 +136660,14 @@ dXI
dJx
dSi
dSJ
-dTs
+kTW
dml
dSi
dTX
abj
-abi
aaa
-abi
+aaa
+aaa
aaa
aaa
aaa
@@ -138364,15 +136864,15 @@ cKw
cMd
cND
cPn
-aKA
+mnG
cSm
cZt
cTU
-cVq
+cMm
cXb
cZt
-cKF
-dbV
+dZb
+dbP
cPn
dfk
dig
@@ -138394,10 +136894,10 @@ dwi
dwi
cKr
dCQ
-dEP
-dFr
-dFr
-dGc
+cNI
+cRe
+cRe
+cRi
dJy
dHE
dID
@@ -138422,9 +136922,9 @@ dUe
dUP
dTX
aaa
-abj
aaa
-abi
+aaa
+aaa
aaa
aaa
aaZ
@@ -138615,10 +137115,10 @@ cDO
csK
cEL
bqu
-cHE
-cIX
+bIG
+cIW
cKx
-cMe
+cMm
cMf
cPo
aKC
@@ -138630,10 +137130,10 @@ cXc
cYB
daE
dbW
-cPn
-cPn
-dih
-cPn
+cGJ
+cGJ
+cIn
+cIY
djL
dkV
cPn
@@ -138651,7 +137151,7 @@ dXv
cRd
cZt
dCR
-dFr
+cPs
dEP
dOO
dGc
@@ -138679,9 +137179,9 @@ dUh
dYT
dTX
aaa
-abj
aaa
-abj
+aaa
+aaa
aaa
aaa
aaa
@@ -138872,13 +137372,13 @@ cEb
csK
cGY
bqu
-cHF
-cIY
-cKy
+cHE
+cIX
cMe
-cNE
-cPr
-cMm
+xpu
+xme
+sjV
+eOL
cPn
cKI
cUZ
@@ -138888,7 +137388,7 @@ cKI
daF
cvm
ddA
-cRe
+daA
cxD
dii
djM
@@ -138900,15 +137400,15 @@ drN
dyL
dyL
dyL
-dkW
+cMg
cZH
dxx
-cNx
+cMj
dzT
dbj
dBh
-dik
-dFr
+cNE
+cPF
dOO
dFr
dID
@@ -138929,16 +137429,16 @@ dMm
dPL
dRz
dRP
-dSl
-dSM
+dTs
+lKc
dUg
dUR
dYT
dTX
abj
-abi
aaa
-abi
+aaa
+aaa
aaa
aaa
aaa
@@ -139055,7 +137555,7 @@ aBb
axb
axc
axb
-axb
+gpU
axb
axb
aDF
@@ -139130,33 +137630,33 @@ cEP
cIT
bqu
cHG
-cIY
-cKy
-cMg
+cJa
+dau
+cKD
cNF
cPq
-cMe
-ddw
+kWO
+cPn
cTC
-cVc
-cWH
-cYk
+dje
+dfR
+djD
cZr
-cKE
+cKF
dbX
cSt
dfm
dgv
-dij
-duc
+cSt
+cSt
dkX
-duc
-duc
+cSt
+cSt
dIi
dsu
-duc
-duc
-duc
+cSt
+cSt
+cSt
dvj
dgv
cSt
@@ -139193,9 +137693,9 @@ dUQ
dYU
dIx
abj
-abi
-abj
-abi
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -139362,11 +137862,11 @@ bQH
ciB
bUR
chi
-bYs
+cbT
chi
-bYs
+cbT
cnv
-bYs
+cbT
chh
ciD
ckq
@@ -139386,14 +137886,14 @@ cEr
cEQ
cIT
bqu
-bIG
+cHG
cIW
-cKz
-cMi
+cND
+cKT
cNG
cPr
-cMm
-cRd
+ozX
+cPn
cZx
cVd
cZG
@@ -139450,9 +137950,9 @@ dIx
dIx
dIx
abj
-abj
aaa
-abi
+aaa
+aaa
aaa
aaa
aaa
@@ -139582,11 +138082,11 @@ aKq
aFA
aFA
aOF
-aPZ
+hly
aRA
aRd
aRA
-aPZ
+hly
aIZ
aYZ
aYZ
@@ -139643,13 +138143,13 @@ cEr
cER
cIT
bqu
-bIG
+cHG
cIW
cKA
-cMi
-cNG
-cPr
-cMm
+cKT
+cSu
+pGk
+xAc
cSp
cTQ
cVr
@@ -139709,9 +138209,9 @@ dWH
dYQ
acF
aaa
-abj
aaa
-abi
+aaa
+aaa
aaa
aaa
aaa
@@ -139799,7 +138299,7 @@ ajZ
ajZ
ajZ
ajZ
-ajZ
+cMP
ajZ
ajZ
ajZ
@@ -139851,7 +138351,7 @@ aZa
bdN
bfj
bgy
-bhL
+bdP
aZh
blm
bmZ
@@ -139903,10 +138403,10 @@ qZt
exL
cIZ
cKB
-cMj
+muI
cNH
-cPr
-cMm
+hJG
+ckH
cWL
cTR
cVe
@@ -139934,7 +138434,7 @@ dzW
dEn
dEn
duZ
-dEy
+cMk
dCV
dbC
dbI
@@ -139964,11 +138464,11 @@ dIH
uil
dIH
abj
-abj
aaa
-abi
-abj
-abi
+aaa
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -140103,7 +138603,7 @@ aWj
aLS
aUj
aOG
-aTp
+aOG
bcx
bdP
bdQ
@@ -140157,15 +138657,15 @@ cEN
csK
cES
bqu
-bIG
+cHG
cIW
cKC
-cMk
-cNI
-cPs
-cMe
-cSr
-cTS
+cKT
+ncs
+xBJ
+kWO
+cSt
+cTT
cVt
daJ
daJ
@@ -140201,8 +138701,8 @@ dfu
dfu
dIH
dJC
-dKo
-dKo
+cYk
+cYk
dLE
dXJ
dKo
@@ -140221,11 +138721,11 @@ dIH
dIH
dIH
abj
-abi
-abj
-abi
aaa
-abi
+aaa
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -140379,7 +138879,7 @@ abj
bwe
bAx
bCp
-byW
+bAB
bFC
bHk
bJg
@@ -140414,14 +138914,14 @@ cCK
csK
cET
bqu
-bIG
+cHG
cIW
-cKD
-cMm
-cNG
-cPr
-cMm
-cRg
+cMn
+cKT
+vKB
+pPG
+ewj
+cSt
cTR
cVu
cWY
@@ -140457,13 +138957,13 @@ dGh
dGP
dHN
dHU
-dQI
-dKo
-dKo
-dLE
-dXJ
-dNa
-dNa
+cWb
+cYk
+cYk
+daQ
+dbR
+dbV
+ddw
dNa
dKo
dKo
@@ -140478,9 +138978,9 @@ dSP
dUT
dIH
abj
-abj
aaa
-abi
+aaa
+aaa
aaa
aaa
aaa
@@ -140617,9 +139117,9 @@ aUJ
aWh
aUw
aOG
-aOG
-aYZ
+aTp
bdR
+bdP
bgv
bgB
bhR
@@ -140651,13 +139151,13 @@ bOZ
cab
cbW
cdI
-cfF
+cfK
chk
ciF
bYv
aaa
aaa
-bHk
+dER
cpV
cry
csK
@@ -140671,14 +139171,14 @@ csK
csK
cEU
bqu
-bKt
-cIY
-cKE
-cMe
+cHG
+cJa
+cKF
+cSr
cNJ
cPt
-cMe
-cSs
+ckI
+cSt
cTT
cVv
cYy
@@ -140699,7 +139199,7 @@ dqm
dsL
dvl
dui
-dvn
+dOc
dvp
dam
dFw
@@ -140714,10 +139214,10 @@ dGl
dGS
dHT
dII
-dJD
+cWH
dKo
dKo
-dLE
+dLG
dXJ
dNb
dNN
@@ -140735,9 +139235,9 @@ dWA
dVb
dIO
aaa
-abj
aaa
-abj
+aaa
+aaa
aaa
aaa
aaa
@@ -140891,7 +139391,7 @@ aaa
bwd
bxm
byR
-byU
+wGL
bCl
byU
bFy
@@ -140928,12 +139428,12 @@ cCL
cEe
cEL
bqu
-bIG
+cHG
cJa
cKF
cMm
-cNG
-cPr
+pML
+vJs
cMm
cSt
cTF
@@ -140956,8 +139456,8 @@ dsH
due
dvm
dws
-dvn
-dyT
+dOD
+dav
dav
dyR
dzY
@@ -140971,10 +139471,10 @@ dGl
dGS
dHT
dIJ
-dJD
+cWH
dKo
-dKo
-dLE
+gkk
+dLG
dXJ
dNc
dNO
@@ -140992,9 +139492,9 @@ dUm
dVb
dIO
abj
-abj
aaa
-abi
+aaa
+aaa
aaa
aaa
aaa
@@ -141169,12 +139669,12 @@ cfG
chl
ciH
bYv
-bHk
-bHk
-bHk
+dER
+dER
+dER
cpX
crB
-bHj
+euc
ctZ
csN
cxa
@@ -141185,15 +139685,15 @@ cCM
cEf
cEL
bqu
-bIG
+cHG
cIW
cKG
cMm
cNK
cPu
cMm
-cSu
-cTT
+cSt
+emK
cVx
cWR
cYq
@@ -141229,10 +139729,10 @@ dGS
dHQ
dLD
dST
-dSZ
-dSZ
-dTK
-dUU
+dKo
+dKo
+dLG
+dXJ
dNb
dNP
dOw
@@ -141249,9 +139749,9 @@ dUn
dVb
dIO
abj
-abi
-abj
-abi
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -141442,7 +139942,7 @@ cyk
gyY
cEV
cGz
-bIG
+cHG
cIW
cKH
cMn
@@ -141489,7 +139989,7 @@ dXC
dKp
dKp
dLF
-dVe
+dXJ
dOu
dNQ
dOx
@@ -141498,7 +139998,7 @@ dPN
dQF
dNQ
dRH
-dKo
+gkk
dXJ
dSU
dNQ
@@ -141506,9 +140006,9 @@ dOw
dUY
dIH
abj
-abi
aaa
-abj
+aaa
+aaa
aaa
aaa
aaa
@@ -141676,10 +140176,10 @@ bMX
bOT
aaa
bOZ
-bOZ
-bOZ
-bOZ
-bOZ
+dne
+dnf
+cfK
+drp
bYv
ciJ
bYv
@@ -141736,7 +140236,7 @@ dql
dBH
dCX
dfu
-dVw
+dHT
dcV
dGU
dWL
@@ -141746,7 +140246,7 @@ dQI
dKo
dKo
dLG
-dVe
+dXJ
dNb
bGr
dOw
@@ -141763,9 +140263,9 @@ dUp
suy
dIH
abj
-abi
aaa
-abi
+aaa
+aaa
aaa
aaa
aaa
@@ -141932,11 +140432,11 @@ bQL
bSJ
bOT
aaa
-bYw
+bOZ
caf
cca
-cdM
-cfJ
+cfK
+cfK
chn
cpT
csW
@@ -141978,7 +140478,7 @@ diu
dnC
doS
dnC
-dnD
+dHT
doY
dft
drL
@@ -141993,7 +140493,7 @@ doY
doY
dDb
dXj
-dnD
+dHT
dcV
dGU
dGU
@@ -142020,9 +140520,9 @@ dUq
dUZ
dIH
abj
-abi
-abj
-abi
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -142140,30 +140640,30 @@ asB
aBj
azv
aAG
-aZe
-aZe
-aZe
+aXX
+aXX
+aXX
aGI
-aIg
+aXZ
aGI
-aZe
-aZe
+aXX
+aXX
aKu
-aZe
-aZe
-aZe
-aZe
-aZe
+aXX
+aXX
+aXX
+aXX
+aXX
aTj
aWm
-aZe
-aZe
aXX
aXX
+bvg
+bvg
bgw
-aXZ
-aXX
-aXX
+byW
+bvg
+bvg
bhP
bjB
bar
@@ -142175,7 +140675,7 @@ btH
aaa
bwh
bxr
-byW
+bAB
bAy
bCt
bEg
@@ -142189,7 +140689,7 @@ bQM
bSK
bOT
abj
-bYw
+bOZ
cag
ccb
cdN
@@ -142198,15 +140698,15 @@ cho
ciL
cnx
clT
-cnx
-cnx
+dLT
+dLT
cqb
crF
csR
cud
cvF
cxa
-cBo
+rUS
czN
cBq
cCP
@@ -142240,7 +140740,7 @@ doZ
dfB
doZ
doZ
-doZ
+neQ
doZ
dwt
doZ
@@ -142254,7 +140754,7 @@ dEZ
dcj
dWK
dcS
-dHT
+cUv
dXn
dXn
dXn
@@ -142277,9 +140777,9 @@ dUr
dVb
dIO
abj
-abj
aaa
-abi
+aaa
+aaa
aaa
aaa
aaa
@@ -142446,7 +140946,7 @@ bQL
bSL
bOT
aaa
-bYw
+bOZ
cah
ccc
cdO
@@ -142472,12 +140972,12 @@ cFa
cGB
cHK
dEm
-cKL
-cKL
-cNP
-cPz
+cKz
cRh
-diw
+cNP
+cRh
+cRh
+cmn
cTW
cYC
cXd
@@ -142487,16 +140987,16 @@ daO
cYC
cYC
dgw
-diw
-diw
+cmn
+cmn
dle
cJY
dmh
-dnE
+dpa
dpa
dsI
drM
-dnE
+dpa
nQq
cTW
dwu
@@ -142506,12 +141006,12 @@ dQr
dBj
dBQ
dDd
-dXj
+cRc
dnD
dGo
dGo
-dcV
-dnD
+cTS
+cVc
dXm
dSV
dTi
@@ -142534,9 +141034,9 @@ dUs
dVb
dIO
aaa
-abj
aaa
-abj
+aaa
+aaa
aaa
aaa
aaa
@@ -142733,7 +141233,7 @@ cJk
cJg
cNQ
cPA
-cRi
+cJg
cJk
cTX
cVD
@@ -142791,9 +141291,9 @@ dUt
dVc
dIO
abj
-abj
aaa
-abi
+aaa
+aaa
aaa
aaa
aaa
@@ -142984,12 +141484,12 @@ cBo
eNm
cFa
bqu
-cHN
+cHK
cJg
cKM
cMo
cNR
-cPL
+cSA
cRj
cSx
cTX
@@ -142997,7 +141497,7 @@ cVE
cXf
cYD
cXe
-daQ
+cVD
dcl
cVD
dgD
@@ -143048,9 +141548,9 @@ dKP
dXQ
dIH
abj
-abi
-abj
-abi
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -143225,12 +141725,12 @@ cfN
chr
ciP
bYx
-bHk
-bHk
-bHk
+dER
+dER
+dER
cqe
crJ
-bHj
+euc
cuh
csN
cxa
@@ -143241,13 +141741,13 @@ cCS
cEf
cFa
bqu
-cHN
+cHK
cJg
cKN
-cMq
+cSs
cNS
-cRk
-cRk
+cMq
+wiR
cSy
cTY
cVF
@@ -143271,7 +141771,7 @@ dsO
duk
cYN
dww
-dww
+cMi
dwz
dAd
dwB
@@ -143305,7 +141805,7 @@ dIO
dIO
dIO
abj
-abi
+aaa
aaa
aaa
aaa
@@ -143498,7 +141998,7 @@ cCT
cEe
cFa
bqu
-cHN
+cHK
cJh
cKO
dea
@@ -143666,7 +142166,7 @@ aaa
aaa
aaa
adb
-akG
+gzU
als
aoC
apl
@@ -143693,7 +142193,7 @@ aJf
aKy
aLZ
aNo
-aNo
+wPI
aQh
aRO
aJd
@@ -143741,7 +142241,7 @@ ciR
bYx
aaa
aaa
-bHk
+dER
cqg
crP
csV
@@ -143755,7 +142255,7 @@ csV
csV
cEY
bqu
-cHN
+cHK
cJh
cKO
dea
@@ -143768,7 +142268,7 @@ cVH
cXh
cYF
dlW
-cXg
+ctb
cXg
ddN
dgD
@@ -143779,7 +142279,7 @@ dfv
dfv
dYc
dYi
-dYk
+drX
drX
dsQ
duk
@@ -143896,10 +142396,10 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
-adN
adb
+acC
+acC
+acC
adb
adb
adb
@@ -144012,12 +142512,12 @@ cCV
csV
cFa
bqu
-cHN
+cHK
cJg
cKP
dea
cbr
-cPF
+hsQ
cha
cSB
cUb
@@ -144153,13 +142653,13 @@ aaa
aaa
aaa
aaa
-adg
-adg
-adg
-adQ
-aey
acC
-afc
+adg
+aeg
+aeg
+acC
+cQs
+cQv
adZ
adZ
agm
@@ -144269,13 +142769,13 @@ cCW
csV
cEZ
bqu
-cHN
+cHK
cJg
cKQ
dea
-cNS
-cMq
-cUn
+bYQ
+lee
+ckJ
cSA
cTZ
cZF
@@ -144410,26 +142910,26 @@ aaa
aaa
aaa
aaa
-adh
+acC
adz
-adP
aeg
-aez
-aeK
+aeg
+cJL
afh
aea
+aea
afM
ajZ
ahg
ajZ
-ahi
+ajZ
+ajZ
+ajZ
+cMP
ajZ
ajZ
ajZ
ajZ
-ajZ
-ajZ
-ahi
ahg
ajZ
ajZ
@@ -144492,7 +142992,7 @@ bwf
aos
bCy
bEl
-bFP
+bCL
bHz
bJl
bLa
@@ -144530,9 +143030,9 @@ ukK
cJi
cKR
cMr
-cbr
+qZV
cPH
-cUn
+ckJ
cSD
cTY
cVK
@@ -144667,30 +143167,30 @@ aaa
aaa
aaa
aaa
-adg
-adg
-adg
-adQ
-aeA
+acC
+adh
+adh
+adh
acC
afj
aeb
+aeb
afN
agn
agH
aiT
-ahT
+aiT
aiT
aiT
aiT
aiT
aiT
akb
-aiL
-agB
-aeb
+aiT
+fuR
+aiT
alK
-aeb
+aiT
ajH
amB
amL
@@ -144783,13 +143283,13 @@ dte
csV
cFa
bqu
-cHN
+cHK
cJg
cKS
dea
-cNS
-cMq
-cUn
+ncT
+giz
+ckJ
cSE
cTX
cXe
@@ -144924,29 +143424,29 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
-adN
adb
+aeK
+cFP
+aeK
adb
adb
adb
adb
afa
adb
-agI
-agI
-aif
-agI
-agI
-agI
-agI
-agI
-agI
-akV
-akB
-alc
-akB
+adN
+adN
+adN
+adN
+adN
+adN
+adN
+adN
+adN
+adN
+adN
+adN
+axm
axm
awY
axm
@@ -145005,7 +143505,7 @@ abj
bwf
bAG
bCl
-byU
+aZe
bFQ
bWX
bJn
@@ -145040,13 +143540,13 @@ cDa
csV
cFa
bqu
-cHN
+cHK
cJg
-cKT
+dbn
dea
-cbr
-dea
-cUn
+oyG
+oAd
+ckJ
cRm
cJg
cVM
@@ -145181,28 +143681,28 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
-abj
-abj
+adb
+cFN
+cGw
+cFN
adb
aeL
afd
afx
afP
ago
-agI
-agY
-ahG
-ahX
-ait
-aiW
-aje
-ajC
-agI
-akc
-akC
-ald
+adN
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
akB
alJ
alZ
@@ -145262,7 +143762,7 @@ aaa
bwf
bAt
bCl
-byU
+aZe
bFx
bWX
bJo
@@ -145303,7 +143803,7 @@ cKU
cMs
cNV
cPI
-cUn
+ckJ
cSF
cUc
cVN
@@ -145438,29 +143938,29 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
-aaa
-abj
+adN
+cFN
+cHe
+cFN
adb
aeM
afe
afy
afQ
agp
-agI
-agZ
-ahH
-ahZ
-air
-aiN
-aiN
-ajg
-agI
-akd
-ale
-ale
-alz
+adN
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+akB
alX
ama
amC
@@ -145519,7 +144019,7 @@ aaa
bwf
aot
bCA
-bEk
+bkf
asz
bHx
bJp
@@ -145560,7 +144060,7 @@ cKV
dea
cbH
ceQ
-cUn
+ckS
cSF
cUd
cUn
@@ -145572,14 +144072,14 @@ dco
cSA
dfz
dgM
-diC
+mZY
dkb
dlq
dnM
dpm
dpm
dqA
-drX
+cKE
dsX
duk
dvz
@@ -145696,29 +144196,29 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
-abj
+cFN
+cIu
+cFN
adb
aeN
aff
afz
afR
agq
-agI
-aha
-ahj
-ahZ
-air
-aiN
-aiN
-ajh
-agI
-ake
-akE
-alf
+adN
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
akB
-aps
+auu
amb
amD
aoE
@@ -145732,7 +144232,7 @@ arW
asJ
aKd
aux
-arW
+qWs
axm
axu
ayD
@@ -145776,7 +144276,7 @@ aaa
bwf
bAs
bCB
-bAs
+boT
bAs
bHx
bJq
@@ -145819,7 +144319,7 @@ cNS
cRk
cMq
cSF
-cUd
+jYY
cVO
cnX
cSF
@@ -145836,7 +144336,7 @@ dta
dnQ
dpn
dqB
-drY
+dpn
dsY
duk
duk
@@ -145954,27 +144454,27 @@ aaa
aaa
aaa
aaa
-abi
-abj
+aaa
+aaa
aeB
aeB
afg
aeB
aeB
aeC
-agI
-ahb
-ahI
-aia
-aiA
-aiN
-aiN
-aiN
-agI
-akf
-akF
-alg
-alA
+adN
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+akB
alM
amc
amE
@@ -146033,7 +144533,7 @@ btH
bwf
bAr
bCl
-byU
+aZe
bFR
bHx
bJr
@@ -146211,7 +144711,7 @@ aaa
aaa
aaa
aaa
-abi
+dij
abj
aeB
dtF
@@ -146219,19 +144719,19 @@ duO
dGZ
aeB
abj
-agI
-ahc
-ahk
-aib
-aiB
-aiN
-aiN
-ahY
-agI
-akg
-ahe
-alh
-agK
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+akB
alN
amd
amF
@@ -146468,27 +144968,27 @@ aaa
aaa
aaa
aaa
-abi
-abi
+dij
+dij
aeC
dtG
afi
afB
aeB
aaa
-agI
-ahd
-ahJ
-agI
-agI
-aiO
-aiO
-aig
-agI
-aiM
-ahe
-ali
-agK
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+akB
alO
ame
amG
@@ -146499,7 +144999,7 @@ apo
apw
aqp
arf
-arW
+bPq
auu
atP
axf
@@ -146547,7 +145047,7 @@ bwm
bza
bEo
bCC
-bEo
+bqv
bEo
bHA
bwm
@@ -146565,7 +145065,7 @@ bwm
bwm
bwm
ciV
-ckH
+bwm
bwm
bwm
coE
@@ -146733,19 +145233,19 @@ afk
afC
aeB
abj
-agK
-ahe
-ahe
-ahe
-aiv
-aiP
-aiP
-aiP
-ajK
-akh
-akH
-alj
-agK
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+akB
alP
ajI
ajM
@@ -146804,7 +145304,7 @@ btK
bva
bva
bCD
-bva
+bsg
bFM
bHB
bva
@@ -146822,7 +145322,7 @@ bva
bva
bva
bva
-ckI
+bva
bva
bva
bSi
@@ -146990,19 +145490,19 @@ afl
aeC
aeC
abj
-agK
-ahf
-ahe
-ahe
-ahe
-ahe
-ahe
-ahe
-ahe
-aiY
-ahe
-afA
-agK
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+akB
alQ
amf
amG
@@ -147017,7 +145517,7 @@ auu
asM
atR
asK
-arW
+qWs
ayS
osS
wXI
@@ -147028,7 +145528,7 @@ aCN
aBS
aCN
aCN
-aLa
+oOe
aBS
aBS
aBS
@@ -147061,7 +145561,7 @@ bxz
bzb
bEq
bCE
-bEq
+bub
bHm
bHC
bEq
@@ -147079,15 +145579,15 @@ pfp
cfS
cnw
cnC
-ckJ
+bSF
cme
bSF
jUC
cqp
crT
-ctb
+bEq
cuo
-rjr
+bSF
bSF
cyA
bSF
@@ -147110,7 +145610,7 @@ cKV
cKV
cKV
cKV
-don
+ctd
cSF
dil
cSF
@@ -147122,7 +145622,7 @@ cSF
dps
cSF
dsc
-dtd
+cRm
duk
dvE
dwF
@@ -147247,19 +145747,19 @@ afm
aeC
abj
abj
-agK
-ahe
-ahe
-ahD
-aix
-aix
-aix
-aix
-aix
-aji
-ahe
-ajG
-agK
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+akB
alR
amg
amH
@@ -147351,11 +145851,11 @@ cxn
cxn
cxn
cxn
-bng
+rHU
cGF
-bng
-bng
-bng
+iWE
+pDD
+cYP
cYP
cYP
cPO
@@ -147504,19 +146004,19 @@ afn
aeC
abj
abj
-agK
-ahh
-ahe
-ahK
-ahe
-ahe
-ahe
-ahe
-ahe
-aki
-ahe
-ahe
-agK
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+akB
alS
ajJ
amI
@@ -147551,7 +146051,7 @@ aQr
aCN
aKK
azL
-aTw
+ssy
aVa
aWy
aBS
@@ -147585,7 +146085,7 @@ bPd
bLh
bSW
bVg
-bXc
+mrW
bYH
cav
ccp
@@ -147599,9 +146099,9 @@ cvu
coI
cqq
bYH
-ctd
+cEL
cuu
-bqv
+bIX
cxn
cyB
cAc
@@ -147612,8 +146112,8 @@ cFd
hos
cmt
bMD
-cKZ
-cYP
+cLa
+iIY
cOa
cPQ
cRp
@@ -147634,7 +146134,7 @@ dFE
dmt
dnU
dpu
-dqH
+cKy
dsd
dul
dur
@@ -147746,34 +146246,34 @@ aaa
aaa
aaa
aaa
-abi
-abi
+dij
+dij
abj
-abi
-abi
+dij
+dij
abj
-abi
+dij
+aaa
+aaa
aaa
-abj
-abj
abj
aec
abj
abj
aaa
-agK
-ahe
-ahe
-ahe
-ahe
-ahe
-ahe
-ahe
-ahe
-ahe
-ahe
-all
-agK
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+akB
alT
ajL
ajN
@@ -147856,9 +146356,9 @@ cax
cax
cax
bYK
-ctd
+cEL
cuu
-bqv
+bIX
cxn
cyC
cAd
@@ -147866,16 +146366,16 @@ cBF
cAc
cxn
bDD
-buF
-boG
-boG
+jsi
+cmt
+ffm
cLa
-cYP
+sak
cOb
cPQ
cRq
cSJ
-cUh
+cVQ
cVQ
cYP
cYR
@@ -147999,38 +146499,38 @@ aaa
aaa
aaa
aaa
-abi
-abi
+dij
+dij
abj
-abi
-abi
-aaa
+dij
+dij
+dKz
aaa
abj
aaa
aaa
-abi
-abi
-abj
-abi
+dij
+dij
+aGW
+dij
abj
acp
abj
-abi
abj
-agK
-ahe
-ahe
-ahe
-ahe
-ahe
-ahe
-ahe
-ahe
-ahe
-ahe
-ahe
-agK
+abj
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+akB
alQ
amG
ajL
@@ -148115,7 +146615,7 @@ chC
lEt
ctf
cus
-bsg
+bhX
cxn
cyD
bBk
@@ -148123,11 +146623,11 @@ cAc
cyD
cxn
bEH
-cGJ
-boG
-boG
+jKp
+tNq
+klh
cLb
-cYP
+cPQ
cOc
cPR
cRr
@@ -148161,7 +146661,7 @@ dmt
dCd
dDh
dEq
-aaa
+abj
aaa
aaa
aaa
@@ -148256,7 +146756,7 @@ aaa
aaa
aaa
aaa
-abi
+dij
aaa
aaa
abj
@@ -148273,21 +146773,21 @@ aaa
abj
acp
aaa
-abi
abj
-agK
-ahe
-ahl
-ahL
-ahe
-ahe
-ahe
-ahe
-ahe
-akj
-akI
-ahe
-agK
+abj
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+akB
axm
amh
amh
@@ -148370,9 +146870,9 @@ cay
cax
cqr
bYK
-ctj
+cFa
cuu
-bqv
+bIX
cxn
cxn
cAe
@@ -148381,8 +146881,8 @@ cxn
cxn
bng
cGI
-cJp
-dfK
+bng
+bng
bng
cYP
cYP
@@ -148395,7 +146895,7 @@ cYP
cJg
cJg
daZ
-dcn
+ctj
ddU
cKY
diG
@@ -148530,21 +147030,21 @@ aaa
abj
acp
abj
-abi
abj
-agK
-agK
-agK
-agK
-aiy
-aiy
-aiy
-aiu
-agK
-agK
-agK
-agK
-agK
+abj
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+akB
abj
acF
acF
@@ -148627,9 +147127,9 @@ ccq
coK
cqr
bYH
-ctj
+cFa
cuu
-bqv
+bIX
cxn
cyF
bBu
@@ -148637,7 +147137,7 @@ cEj
cEj
cEn
cxn
-cGJ
+buF
boG
cJo
bRw
@@ -148649,10 +147149,10 @@ cKO
cUj
cKO
cKO
-cKO
+sYw
cZM
-cKO
-dqW
+kjL
+cwc
cSA
cJg
dgS
@@ -148678,9 +147178,9 @@ dEp
abj
abj
aaa
-aaa
-aaa
-aaa
+abj
+abj
+abj
aaa
aaa
aaa
@@ -148770,7 +147270,7 @@ aaa
aaa
aaa
aaa
-abi
+dij
aaa
kYo
acf
@@ -148792,12 +147292,12 @@ abj
aaa
aaa
aaa
-ahM
-aiz
-agL
-agL
-aiw
-ahM
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -148909,7 +147409,7 @@ dbi
dbi
cZN
dbi
-dco
+cFo
dfE
cKY
cJg
@@ -148939,13 +147439,13 @@ dFG
dFG
dFG
aaa
-dKz
-dIc
-dFG
-dFI
-dFG
-dFH
-dOD
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -149027,7 +147527,7 @@ aaa
aaa
aaa
aaa
-abi
+dij
abj
kYo
acf
@@ -149044,8 +147544,8 @@ abj
abj
acp
aaa
-abi
-abi
+abj
+aaa
aaa
aaa
aaa
@@ -149111,7 +147611,7 @@ bng
bng
abj
btL
-bvg
+btL
bwv
bxG
bwv
@@ -149143,7 +147643,7 @@ cqr
bYH
cnO
cti
-dWO
+bSz
cxn
cyH
cAh
@@ -149166,7 +147666,7 @@ cKV
cKV
dci
cMq
-don
+ctd
cSA
dgx
cSA
@@ -149196,12 +147696,12 @@ dLd
dLY
dIW
abj
-dFJ
-dMA
-dOc
dQv
-dQH
-dRf
+dIc
+dFG
+dFI
+dFG
+dFH
dOE
abj
aaa
@@ -149301,7 +147801,7 @@ aaa
abj
acp
abj
-abi
+abj
aaa
aaa
aaa
@@ -149398,9 +147898,9 @@ cnK
coM
cqt
bYH
-ctj
+cFa
cuu
-ckH
+bwm
cxn
czU
bBu
@@ -149453,15 +147953,15 @@ dLQ
dMa
dFG
aaa
-dFG
+dFJ
dMG
dLR
dMw
dNj
dRg
-dFG
+hMu
abj
-abi
+aaa
aaa
aaa
aaa
@@ -149538,10 +148038,10 @@ aaa
aaa
aaa
aaa
-abi
-abj
-abi
-abi
+dij
+aGW
+dij
+dij
abj
kYo
acf
@@ -149558,7 +148058,7 @@ aaa
abj
acp
aaa
-abi
+aaa
aaa
aaa
aaa
@@ -149655,13 +148155,13 @@ cnL
coN
cqt
bYH
-ctj
+cFa
cuu
-ckH
+bwm
cxn
czU
bBu
-cBK
+txW
cxn
cxn
cxn
@@ -149710,15 +148210,15 @@ dLU
dMv
dIX
abj
-dKA
+dFG
dNi
-dLT
+hbU
dMx
dNk
dRh
-dOF
+dFG
+aaa
aaa
-abi
aaa
aaa
aaa
@@ -149795,7 +148295,7 @@ aaa
aaa
aaa
aaa
-abi
+dij
aaa
abj
aaa
@@ -149814,9 +148314,9 @@ abj
abj
abj
acp
+aaa
abj
-abi
-abj
+aaa
aaa
aaa
aaa
@@ -149836,9 +148336,9 @@ aaa
aaa
abj
aaa
-abi
-abi
-abi
+aaa
+aaa
+aaa
abj
asc
aqG
@@ -149912,7 +148412,7 @@ cnM
coO
cqt
bYH
-ctj
+cFa
cuu
cvW
cxn
@@ -149967,17 +148467,17 @@ dHa
dFG
dFG
aaa
-dKB
+dQH
dNW
deV
dMy
dNl
dRi
-dKB
+nGA
+aaa
+aaa
+aaa
aaa
-abj
-abj
-abi
aaa
aaa
aaa
@@ -150095,7 +148595,7 @@ aaa
aaa
aaa
aaa
-abi
+aaa
abj
asd
asR
@@ -150169,9 +148669,9 @@ cnM
coM
cqt
bYH
-ctj
+cFa
cuu
-ckH
+bwm
cxn
cyJ
cAf
@@ -150224,17 +148724,17 @@ dHb
dFG
aaa
aaa
-dFG
+dKB
dNX
dTu
dTv
dNm
dWS
-dFG
+dKB
abj
-abi
-abj
-abi
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -150309,7 +148809,7 @@ aaa
aaa
aaa
aaa
-abi
+dij
aaa
abj
aaa
@@ -150329,7 +148829,6 @@ abj
abj
abj
abj
-abi
abj
aaa
aaa
@@ -150353,6 +148852,7 @@ aaa
aaa
aaa
aaa
+aaa
abj
asd
asS
@@ -150426,7 +148926,7 @@ cnN
coP
cqu
bYH
-ctj
+cFa
cuv
cvX
cxn
@@ -150481,16 +148981,16 @@ dHc
dIc
abj
abj
-dFH
+dFG
dNY
-dLT
+dRf
dMz
dNn
dWT
-dIc
+dFG
+aaa
+aaa
aaa
-abi
-abj
aaa
aaa
aaa
@@ -150566,10 +149066,10 @@ aaa
aaa
aaa
aaa
-abi
-abi
-abi
-abi
+dij
+dij
+dij
+dij
abj
kYo
acj
@@ -150583,10 +149083,11 @@ kYo
acj
aco
abj
-abi
-abj
-abi
-abi
+dij
+aaa
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -150609,7 +149110,6 @@ aaa
aaa
aaa
aaa
-abi
abj
asd
asT
@@ -150748,8 +149248,8 @@ dFG
abj
abj
abj
-abi
-abi
+aaa
+aaa
aaa
aaa
aaa
@@ -150826,7 +149326,7 @@ aaa
aaa
aaa
aaa
-abi
+dij
aaa
kYo
acj
@@ -150840,9 +149340,9 @@ kYo
acj
aco
aaa
-abi
-abj
-abj
+dij
+aaa
+aaa
aaa
aaa
aaa
@@ -150923,9 +149423,9 @@ bJz
bLt
bNt
bPp
-bRc
-bTg
-bVm
+bFU
+rOn
+bVk
bXj
bYM
caG
@@ -150935,9 +149435,9 @@ cga
chL
bYM
ckR
-cmn
+coX
chG
-coQ
+cDn
cqv
crV
ctl
@@ -151083,7 +149583,7 @@ aaa
aaa
aaa
aaa
-abj
+aGW
abj
kYo
acj
@@ -151097,7 +149597,7 @@ kYo
acj
aco
abj
-abi
+dij
aaa
aaa
aaa
@@ -151129,8 +149629,8 @@ abj
aaa
abj
aaa
-abi
-abi
+aaa
+aaa
aaa
aaa
aaa
@@ -151176,10 +149676,10 @@ aaa
aaa
bFS
bHP
-dDN
+dMA
bLu
bNu
-bPq
+nXf
bFS
bTh
bVn
@@ -151191,7 +149691,7 @@ cen
cgb
chM
bYM
-ckS
+bHH
cmo
cnP
coR
@@ -151340,7 +149840,7 @@ aaa
aaa
aaa
aaa
-abi
+dij
aaa
kYo
acj
@@ -151354,7 +149854,7 @@ kYo
acj
aco
aaa
-abi
+dij
aaa
aaa
aaa
@@ -151456,7 +149956,7 @@ cqw
crW
ctn
byo
-cwc
+crW
crW
cyM
crW
@@ -151597,10 +150097,10 @@ aaa
aaa
aaa
aaa
-abi
+dij
aaa
kYo
-acj
+dyT
aco
aaa
kYo
@@ -151608,7 +150108,7 @@ acj
aco
aaa
kYo
-acj
+dyT
aco
aaa
abj
@@ -151713,7 +150213,7 @@ cqw
crX
cto
cuy
-cwc
+crW
cxr
cyN
crX
@@ -151854,21 +150354,21 @@ aaa
aaa
aaa
aaa
-abi
+dij
aaa
aaa
abj
aaa
aaa
kYo
-acj
+dyT
aco
aaa
aaa
abj
aaa
-aaa
-abi
+dKz
+dij
aaa
aaa
aaa
@@ -151993,8 +150493,8 @@ cYZ
cZW
cUr
cKV
-dtC
-cSF
+dqW
+cPJ
cJg
dhe
dye
@@ -152036,7 +150536,7 @@ dFG
dFG
dFG
abj
-abi
+aaa
aaa
aaa
aaa
@@ -152111,21 +150611,21 @@ aaa
aaa
aaa
aaa
-abi
-abi
+dij
+dij
abj
-abi
-abi
+dij
+dij
aaa
aaa
abj
aaa
aaa
-abi
-abi
+dij
+dij
abj
-abi
-abi
+dij
+dij
aaa
aaa
aaa
@@ -152227,7 +150727,7 @@ cqy
crY
ctq
cuA
-cwc
+crW
cxt
cyP
crW
@@ -152251,7 +150751,7 @@ cZX
cWd
dbn
dcz
-cSF
+jdF
cKY
dhf
diO
@@ -152293,9 +150793,9 @@ dQx
dXf
dFG
abj
-abi
-abj
-abi
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -152372,13 +150872,13 @@ aaa
aaa
aaa
aaa
-abi
-abi
+dij
+dij
abj
-abi
-abi
+dij
+dij
abj
-abi
+dij
aaa
aaa
aaa
@@ -152456,8 +150956,8 @@ bxJ
vnm
bno
eSX
-hZF
-bEw
+bFX
+bFX
bEr
bFX
bMc
@@ -152470,7 +150970,7 @@ bTj
bVg
bXn
bYP
-bXW
+bYm
ccD
cer
cgf
@@ -152550,9 +151050,9 @@ dQy
dXg
dNr
aaa
-abj
aaa
-abi
+aaa
+aaa
aaa
aaa
aaa
@@ -152713,8 +151213,8 @@ bvm
bwy
bxK
bzg
-bzg
-bCL
+bJF
+bJF
bJF
bJF
bHT
@@ -152726,7 +151226,7 @@ meB
bTk
bVp
bXB
-bYQ
+bYR
caM
ccE
ces
@@ -152741,7 +151241,7 @@ cqA
crZ
cts
cuC
-cwe
+cxv
cxv
cyR
cxv
@@ -152807,9 +151307,9 @@ dGw
dGw
dFG
abj
-abi
-abj
-abi
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -152971,16 +151471,16 @@ bwz
bxL
bHS
bAN
-bCM
-bHU
-bHU
-bHU
-bHU
+bAN
+bAN
+bAN
+bAN
+bAN
bLz
-bHU
+bAN
mtR
mHP
-bLz
+bYa
bVq
bXp
bYR
@@ -153005,9 +151505,9 @@ cAm
cYh
cDp
cvV
-cFo
+cFv
cGS
-cIe
+cIk
aFx
cLn
cbm
@@ -153016,8 +151516,8 @@ cQd
cRz
cjF
cUu
-cWb
-cWb
+dyd
+dyd
cZd
cZT
dbq
@@ -153064,9 +151564,9 @@ dQz
dXg
dNr
aaa
-abj
aaa
-abi
+aaa
+aaa
aaa
aaa
aaa
@@ -153223,7 +151723,7 @@ boN
bqN
kyq
btX
-bqK
+pOq
esa
bno
bCK
@@ -153272,7 +151772,7 @@ aFx
aFx
aFx
cSX
-cUv
+dDE
cXI
dlz
dlz
@@ -153321,9 +151821,9 @@ dQA
dXf
dFG
abj
-abi
-abj
-abi
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -153468,11 +151968,11 @@ rTE
pcv
aZE
bbo
-bcU
+bcV
bex
bhc
-blp
-blp
+uKI
+bnq
bka
blT
bno
@@ -153509,7 +152009,7 @@ brS
bgs
coU
cJn
-ctc
+bRc
cqI
brS
cqI
@@ -153524,12 +152024,12 @@ cGT
cIg
aFx
cAq
-cBW
+iuU
cOp
aKh
aFx
cSY
-cUv
+dDE
cXI
cZb
cZY
@@ -153580,7 +152080,7 @@ dFG
abj
aaa
aaa
-abi
+aaa
aaa
aaa
aaa
@@ -153766,7 +152266,7 @@ gGu
cnR
gGu
cqD
-gGu
+bTg
khY
cuF
cqI
@@ -153778,8 +152278,8 @@ aFv
cEt
bEY
cGV
-bKv
-cEu
+cIc
+jHd
cAq
cAq
cOq
@@ -153835,9 +152335,9 @@ abj
abj
abj
abj
-abi
-abj
-abi
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -153971,7 +152471,7 @@ aaa
abj
ygH
ygH
-aqq
+ygH
yez
mhu
mhu
@@ -154081,18 +152581,18 @@ dJj
dJZ
dFG
abj
-abi
-abi
-abi
-abj
-abi
-abi
-abi
aaa
-abi
-abi
-abi
-abi
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -154224,19 +152724,19 @@ aaa
aaa
acF
abj
-abi
+mkp
aaa
-aqq
-tFK
-qeU
-abQ
-aKS
ygH
+tFK
+kju
+aYk
+qeU
+aJJ
aSh
aTF
aVk
aWK
-aYk
+aJJ
aZH
bbr
bcX
@@ -154246,7 +152746,7 @@ bhg
biu
bkd
blV
-bnp
+boR
boR
bqQ
bsI
@@ -154284,12 +152784,12 @@ csd
bqj
ckW
brS
-aFx
-aFx
-aFx
-aFx
-aFx
-aFx
+oNd
+oNd
+oNd
+oNd
+oNd
+oNd
cFr
cGW
cIi
@@ -154338,15 +152838,15 @@ dFG
dFG
dFG
aaa
-abj
aaa
aaa
aaa
aaa
aaa
-abj
aaa
-abj
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -154481,22 +152981,22 @@ aaa
aaa
aaa
aaa
-abi
+mkp
abj
ygH
aJx
nli
-abQ
+bbs
aPv
-ygH
+hWz
aSi
aTG
nHs
rbw
aYl
aZI
-bbs
-aml
+bbv
+jBp
beA
bfW
bLB
@@ -154507,25 +153007,25 @@ blW
boS
bqR
bHZ
-bub
-loP
+blW
+dnd
tJH
-bub
+blW
bzm
-bHZ
-bub
-bub
-bub
+mKe
+blW
+blW
+blW
jUH
-bub
-bub
+blW
+blW
bNH
sEN
bRi
mKe
blW
blW
-bnq
+dnd
caO
blW
cey
@@ -154541,15 +153041,15 @@ cse
bgs
cuG
cjm
-aFx
-aKh
+oNd
+lah
cAo
cBW
-cAq
-aFx
+fqy
+nFX
bEY
cGV
-bKv
+cIc
aFx
cLp
cMN
@@ -154557,7 +153057,7 @@ cOr
cQg
aFx
cTa
-cUv
+dDE
dlz
cZh
dac
@@ -154595,16 +153095,16 @@ aaa
abj
abj
abj
-abi
-abi
-abj
-abj
-abj
-abi
-abi
-abi
-abi
-abi
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -154738,19 +153238,19 @@ aaa
aaa
aaa
aaa
-abi
+mkp
aaa
ygH
uUu
kju
-abQ
aKU
-ygH
+tOv
+hLa
aSj
aTH
aVl
aWL
-aYk
+aJA
aZJ
bbt
bdi
@@ -154761,23 +153261,23 @@ biw
bHW
blX
blX
-bkf
-bqS
blX
+bqS
+bCM
reH
hHM
bwA
-bxQ
+bLD
bnr
bAT
-bxQ
-bxQ
-bxQ
-bNm
-bxQ
-bxQ
bLD
-mEG
+bLD
+bLD
+bEw
+bLD
+bNE
+bLD
+bVm
bRj
bxQ
bxQ
@@ -154785,7 +153285,7 @@ bXt
bYW
bNm
bxQ
-cez
+mEG
bxQ
chR
cju
@@ -154798,14 +153298,14 @@ csf
bgt
cuH
bqj
-aFx
+oNd
cyW
cAp
-cAq
-cAq
+tXj
+wtE
cEu
cFs
-cGV
+rkJ
cIj
cJy
cLp
@@ -154814,7 +153314,7 @@ cLp
cQi
aFx
cSY
-cUv
+dDE
dlz
cZi
daR
@@ -154844,13 +153344,13 @@ moa
iiM
aOx
abj
-abi
-abi
-abi
-abj
-abi
-abi
-abi
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -155002,11 +153502,11 @@ xDn
aJx
iUc
aOX
+oaB
+fcg
ygH
ygH
ygH
-aqq
-ygH
ygH
bOc
bbt
@@ -155018,10 +153518,10 @@ bhh
bwE
blY
bhh
-uSJ
+bhi
bqT
bsL
-buc
+bsL
xXw
bsL
biv
@@ -155055,12 +153555,12 @@ brS
bgs
cuH
cmq
-aFx
+oNd
cyX
-cAq
+oHv
cBX
aKk
-aFx
+nFX
cFv
cGV
cIk
@@ -155071,7 +153571,7 @@ cLp
cQh
aFx
cTb
-cUA
+dDD
dlz
cZj
daS
@@ -155103,9 +153603,9 @@ dEt
abj
aaa
aaa
-abj
aaa
-abj
+aaa
+aaa
aaa
aaa
aaa
@@ -155248,8 +153748,8 @@ aaa
aaa
aaa
aaa
-abi
-abi
+aaa
+aaa
aaa
aaa
abj
@@ -155258,9 +153758,9 @@ aml
kOC
ofZ
aND
-abQ
+jLu
aQx
-aQB
+pxj
aJx
aVm
aWM
@@ -155275,7 +153775,7 @@ bix
bmO
blZ
bnt
-boT
+blZ
bqU
bsL
bkj
@@ -155312,12 +153812,12 @@ csg
bgs
ckX
cmr
-aFx
-aFx
-aFx
-aFx
-aFx
-aFx
+oNd
+oNd
+oNd
+oNd
+oNd
+oNd
cFu
cGV
cIk
@@ -155328,7 +153828,7 @@ aFx
aFx
aFx
cjn
-cUv
+dDE
dlz
dlz
dbr
@@ -155358,12 +153858,12 @@ dCu
tHf
dEt
abj
-abj
-abi
-abi
-abi
-abi
-abi
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -155505,7 +154005,7 @@ aaa
aaa
aaa
aaa
-abi
+aaa
abj
ygH
ygH
@@ -155513,7 +154013,7 @@ qJC
ygH
ygH
ipD
-abQ
+aPe
aNE
aPb
aQy
@@ -155547,7 +154047,7 @@ bGj
bLB
bJM
bLF
-bNE
+bLF
bPv
bRl
obL
@@ -155573,19 +154073,19 @@ aFx
cyY
cyY
cBY
-cyY
+why
bmW
cFv
cGV
cIl
bmW
-cyY
-cMP
+oXY
+cBY
cyY
cyY
aFx
cTc
-cUA
+dDD
cqC
cMH
cMH
@@ -155615,9 +154115,9 @@ dCv
vLN
dDG
abj
-abj
aaa
-abj
+aaa
+aaa
aaa
aaa
aaa
@@ -155762,26 +154262,26 @@ aaa
aaa
aaa
aaa
-abi
+aaa
abj
-aqq
+ygH
reo
aGT
swV
ygH
nFL
-aKU
-aNF
-aKS
-abQ
-aSm
+aPe
+aNG
+keD
+aPe
+aSr
aJx
aVo
aWO
aJx
aZK
bbt
-aqq
+ygH
ygH
aJA
bhh
@@ -155804,7 +154304,7 @@ bGk
bLB
bGp
bLG
-nkh
+bLG
bPw
hTr
gwZ
@@ -155830,13 +154330,13 @@ aFx
cyZ
cAr
cAr
-cAr
+gUi
cEv
-cFv
-cGV
-cIk
+tvI
+vzs
+plm
cEv
-cAr
+sOo
cAr
cAr
cQj
@@ -155872,9 +154372,9 @@ bLn
bLn
bLn
abj
-abi
aaa
-abj
+aaa
+aaa
aaa
aaa
aaa
@@ -156023,13 +154523,13 @@ aaa
abj
ygH
xda
-aGU
+mtL
aIl
aJx
aKR
aMq
aNG
-abQ
+hZR
aSn
aWN
aJx
@@ -156061,7 +154561,7 @@ bGl
bLB
bJN
bLG
-nkh
+bLG
bPx
bRl
bNG
@@ -156087,7 +154587,7 @@ aFx
cza
cAs
cAs
-cAs
+qqh
bmW
bFh
cGT
@@ -156129,9 +154629,9 @@ dCw
dDO
bLn
abj
-abi
-abj
-abi
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -156283,12 +154783,12 @@ feV
aGV
aIm
aJJ
-aKS
aKU
-aNF
+aPe
+aNG
aOY
aQB
-aPe
+lMo
aJx
aVm
aWP
@@ -156386,9 +154886,9 @@ luc
dDN
mDm
abj
-abi
-abj
-abi
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -156541,7 +155041,7 @@ rZK
aIn
aKT
aSp
-aSp
+aPj
aNI
aOZ
aQC
@@ -156602,10 +155102,10 @@ czb
cAt
cBZ
jHa
-ctx
+mYH
cFx
cGX
-cIn
+cJz
cJz
cLs
cMQ
@@ -156645,7 +155145,7 @@ mDm
abj
aaa
aaa
-abi
+aaa
aaa
aaa
aaa
@@ -156798,11 +155298,11 @@ eCs
aIo
aJA
aKU
-aKS
-aNJ
-aPa
+aPe
+aNM
aQD
-aKU
+aQD
+lMo
aJx
aVq
aWO
@@ -156830,8 +155330,8 @@ bBa
bBa
bBa
bBa
-bBa
-bBa
+bHU
+bPy
bPy
bPz
bRo
@@ -156853,25 +155353,25 @@ abj
csj
ctx
cuL
-czc
+cIo
cxx
-czc
-czc
-czc
-czc
-czc
+cIo
+cIo
+cIo
+cIo
+cIo
cFy
cIs
cIo
-czc
-czc
-czc
-czc
-czc
+cIo
+cIo
+cIo
+cIo
+cIo
cRB
-czc
+cIo
cUF
-cuM
+coQ
cJz
csj
abj
@@ -156900,9 +155400,9 @@ dAF
tks
mDm
abj
-abj
-abj
-abj
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -157056,9 +155556,9 @@ aIp
aJx
aKV
fFd
-aNK
-abQ
-aKU
+aNL
+aPe
+aPe
aTb
aJx
aJx
@@ -157086,7 +155586,7 @@ blX
blX
blX
blX
-mHf
+blX
tRM
bLK
bPA
@@ -157157,9 +155657,9 @@ phv
wAE
fTZ
aaa
-abj
aaa
-abi
+aaa
+aaa
aaa
aaa
aaa
@@ -157304,18 +155804,18 @@ aaa
aaa
aaa
aaZ
-abi
+aaa
abj
ygH
tge
eQg
nbE
-aqq
+ygH
njE
eNI
aNL
-aKS
-aKS
+aPe
+aPe
aSr
aJx
aVr
@@ -157343,7 +155843,7 @@ bBc
bJL
bEx
bEx
-kzg
+bEA
tFO
bIe
bEx
@@ -157413,10 +155913,10 @@ bLn
mDm
bLn
bLn
-abi
-abj
aaa
-abj
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -157561,7 +156061,7 @@ aaa
aaa
aaa
aaa
-abi
+aaa
abj
ygH
ygH
@@ -157569,11 +156069,11 @@ pWQ
ygH
ygH
tvq
-aKU
+aPe
aNM
-aKS
aPe
aPe
+lMo
aTK
aVs
baS
@@ -157581,7 +156081,7 @@ aYq
aZM
bbv
bdd
-aqq
+ygH
aaa
bhh
biG
@@ -157618,7 +156118,7 @@ aaa
aaa
abj
abj
-abi
+dij
abj
abj
csj
@@ -157647,16 +156147,16 @@ cXN
csj
abj
aaa
-abi
-abi
-abi
-abi
-abi
aaa
-abi
aaa
-abi
-abi
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
cPS
cPS
dGX
@@ -157672,9 +156172,9 @@ abj
abj
abj
abj
-abi
-abi
-abi
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -157821,7 +156321,7 @@ aaa
aaa
aaa
aaa
-abj
+aaa
aaa
qli
isz
@@ -157920,18 +156420,18 @@ dKx
cPS
abj
abj
-abi
-abi
-abi
+dij
+dij
+dij
abj
-abi
-abi
-abi
+dij
+dij
+dij
aaa
abj
-aaa
-aaa
-abi
+abj
+abj
+sso
aaa
aaa
aaa
@@ -158078,16 +156578,16 @@ aaa
aaa
aaa
aaa
-abi
+aaa
aaa
pWQ
qqW
-aKU
+aPe
aJC
aNO
aPe
aQH
-aPj
+aMv
aMv
aMv
aMv
@@ -158131,8 +156631,8 @@ abj
abj
alW
abj
-abi
-abi
+dij
+dij
abj
abj
csj
@@ -158160,7 +156660,7 @@ cOt
cWh
csj
abj
-abi
+aaa
aaa
aaa
aaa
@@ -158177,7 +156677,7 @@ qRT
cPS
abj
abj
-abi
+dij
abj
aaa
aaa
@@ -158188,7 +156688,7 @@ aaa
abj
aaa
aaa
-abj
+sso
aaa
aaa
aaa
@@ -158335,11 +156835,11 @@ aaa
aaa
aaa
aaa
-abi
+aaa
aaa
ygH
ggp
-aKU
+aqq
hch
aNP
aPf
@@ -158417,7 +156917,7 @@ cuM
cWh
csj
abj
-abi
+aaa
aaa
aaa
aaa
@@ -158428,7 +156928,7 @@ aaa
aaZ
aaa
aaa
-abj
+aaa
aaa
fGG
abj
@@ -158438,14 +156938,14 @@ abj
aaa
aaa
dak
-daC
+daz
dbc
aaa
aaa
abj
aaa
aaa
-abi
+dij
aaa
aaa
aaa
@@ -158592,7 +157092,7 @@ aaa
aaa
aaa
aaa
-abj
+aaa
abj
ygH
ygH
@@ -158647,7 +157147,7 @@ abj
abj
abj
abj
-abi
+dij
abj
csj
ctB
@@ -158685,7 +157185,7 @@ aaa
aaa
aaa
aaa
-abi
+abj
abj
cSN
abj
@@ -158699,7 +157199,7 @@ daC
dbc
aaa
dak
-daC
+daz
dbc
aaa
abj
@@ -158854,7 +157354,7 @@ aaa
acF
abj
abj
-aIO
+aIg
aNQ
aPg
aQJ
@@ -158907,9 +157407,9 @@ aaa
aaa
aaa
csj
-ctC
-ctC
-ctC
+cFK
+cFK
+cFK
csj
csj
csj
@@ -158926,12 +157426,12 @@ csj
csj
csj
csj
-cUN
+cFK
cWi
cXP
csj
abj
-abi
+aaa
aaa
aaa
aaa
@@ -158959,7 +157459,7 @@ dak
daC
dbc
aaa
-abi
+dij
aaa
aaa
aaa
@@ -159188,7 +157688,6 @@ dlC
cXQ
csj
abj
-abi
aaa
aaa
aaa
@@ -159199,8 +157698,9 @@ aaa
aaa
aaa
aaa
-abi
+aaa
abj
+aaa
cTN
abj
aaa
@@ -159456,7 +157956,7 @@ aaa
aaa
aaa
aaa
-abi
+abj
aaa
cTN
abj
@@ -159473,7 +157973,7 @@ dak
daC
dbc
aaa
-abi
+dij
aaa
aaa
aaa
@@ -159627,7 +158127,7 @@ aaa
aKW
aMv
aMv
-aPj
+aMv
aMv
aMv
aTQ
@@ -159636,7 +158136,7 @@ aWX
aMv
bad
bbH
-aqq
+ygH
abj
aaa
abj
@@ -159702,7 +158202,6 @@ abj
abj
abj
abj
-abi
aaa
aaa
aaa
@@ -159713,7 +158212,8 @@ aaa
aaa
aaa
aaa
-abi
+aaa
+abj
abj
cTN
abj
@@ -159730,10 +158230,10 @@ dak
daC
dbc
aaa
-abi
+dij
abj
-abi
-abi
+dij
+dij
aaa
aaa
aaa
@@ -159957,9 +158457,6 @@ csj
abj
aaa
aaa
-abi
-abi
-abi
aaa
aaa
aaa
@@ -159970,7 +158467,10 @@ aaa
aaa
aaa
aaa
-abj
+aaa
+aaa
+aaa
+aaa
aaa
cTN
abj
@@ -159990,7 +158490,7 @@ aaa
aaa
abj
aaa
-abi
+dij
aaa
aaa
aaa
@@ -160135,25 +158635,25 @@ aaa
aaa
aaa
aaa
-abi
-abi
-abi
aaa
-abi
-abi
-abi
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
aaa
aMv
aMv
-aPj
-aPj
+aMv
+aMv
aMv
bda
bbE
bdf
aJx
aaa
-abj
+aaa
aaa
aZw
bmn
@@ -160191,7 +158691,7 @@ aaa
aaa
aaa
aaa
-abi
+aaa
abj
abj
abj
@@ -160212,7 +158712,6 @@ cwl
abj
csj
abj
-abi
aaa
aaa
aaa
@@ -160227,7 +158726,8 @@ aaa
aaa
aaa
aaa
-abi
+aaa
+aaa
abj
cTN
ewF
@@ -160247,7 +158747,7 @@ cYU
cYU
rnO
abj
-abi
+dij
aaa
aaa
aaa
@@ -160410,7 +158910,7 @@ bvB
bdg
fcg
aaa
-abj
+aaa
aaa
aZw
aZw
@@ -160423,12 +158923,12 @@ aaa
abj
abj
abj
-abi
-abi
-abi
-abi
+mkp
+mkp
+mkp
+mkp
abj
-abi
+mkp
fhF
fhF
fhF
@@ -160438,7 +158938,7 @@ fhF
fhF
abj
abj
-abi
+mkp
aaa
aaa
aaa
@@ -160469,7 +158969,6 @@ cQq
aaa
csj
abj
-abi
aaa
aaa
aaa
@@ -160484,7 +158983,8 @@ aaa
aaa
aaa
aaa
-abi
+aaa
+abj
aaa
aaa
abj
@@ -160497,14 +158997,14 @@ abj
cTN
abj
abj
-abj
+dKA
daG
abj
aaa
aaa
abj
aaa
-abj
+sso
aaa
aaa
aaa
@@ -160667,25 +159167,25 @@ abQ
bdh
aJx
aaa
-abj
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
aaa
aaa
abj
-aaa
-abj
-aaa
-abj
-aaa
-aaa
abj
aaa
abj
abj
aaa
-abj
-abj
-aaa
-abi
+mkp
fhF
fhF
fhF
@@ -160695,7 +159195,8 @@ fhF
fhF
abj
aaa
-abi
+mkp
+aaa
aaa
aaa
aaa
@@ -160707,7 +159208,6 @@ aaa
aaa
aaa
aaa
-abi
abj
csj
aaa
@@ -160726,7 +159226,7 @@ cQq
aaa
csj
abj
-abi
+aaa
aaa
aaa
aaa
@@ -160741,8 +159241,8 @@ aaa
aaa
aaa
aaa
-abi
-abi
+abj
+abj
abj
abj
aaa
@@ -160758,10 +159258,10 @@ dak
daT
dbc
aaa
-abi
-abi
+dij
+dij
abj
-abi
+dij
aaa
aaa
aaa
@@ -160923,25 +159423,25 @@ bab
bcW
bab
aJx
-abj
-abi
-abi
-abi
-abj
-abi
-abi
-abi
-abi
-abi
-abi
-abj
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
aaa
abj
abj
abj
-abi
-abi
-abi
+mkp
+mkp
+mkp
abj
fhF
fhF
@@ -160952,7 +159452,8 @@ fhF
fhF
abj
aaa
-abi
+mkp
+aaa
aaa
aaa
aaa
@@ -160964,7 +159465,6 @@ aaa
aaa
aaa
aaa
-abi
abj
csi
abj
@@ -160983,7 +159483,7 @@ cQr
abj
csi
abj
-abi
+aaa
aaa
aaa
aaa
@@ -161015,7 +159515,7 @@ dak
daT
dbc
aaa
-abi
+dij
aaa
aaa
aaa
@@ -161173,7 +159673,7 @@ aaa
aaa
aaa
aaa
-abi
+aaa
abj
aJx
bac
@@ -161184,10 +159684,10 @@ aaa
aaa
aaa
aaa
-abj
aaa
aaa
-abj
+aaa
+aaa
aaa
aaa
aaa
@@ -161209,7 +159709,7 @@ fhF
fhF
mkp
abj
-abi
+mkp
aaa
aaa
aaa
@@ -161257,8 +159757,8 @@ aaa
aaa
aaa
aaa
-vXX
-abi
+aaa
+dij
aaa
dak
daT
@@ -161272,7 +159772,7 @@ dak
daT
dbc
abj
-abi
+dij
aaa
aaa
aaa
@@ -161430,24 +159930,24 @@ aaa
aaa
aaa
aaa
-abi
+aaa
abj
aJx
bpr
bbI
bpr
aJx
-abj
-abj
-abi
-abi
-abi
-abi
-abi
-abj
-abi
-abi
-abj
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
aaa
aaa
abj
@@ -161456,7 +159956,7 @@ aaa
aaa
aaa
aaa
-oEG
+mkp
fhF
fhF
fhF
@@ -161497,7 +159997,6 @@ csj
csj
csj
abj
-abi
aaa
aaa
aaa
@@ -161514,8 +160013,9 @@ aaa
aaa
aaa
aaa
-vXX
-abi
+aaa
+aaa
+dij
abj
dak
daT
@@ -161707,14 +160207,14 @@ aaa
aaa
aaa
aaa
-abi
+mkp
aaa
aaa
aaa
aaa
aaa
bPS
-oEG
+mkp
mkp
abj
abj
@@ -161772,10 +160272,10 @@ aaa
aaa
aaa
aaa
-abi
+dij
aaa
dak
-daT
+dOF
dbc
aaa
dak
@@ -161783,10 +160283,10 @@ daT
dbc
aaa
dak
-daT
+dOF
dbc
aaa
-abi
+dij
aaa
aaa
aaa
@@ -161964,7 +160464,7 @@ aaa
aaa
aaa
aaa
-abi
+mkp
aaa
aaa
aaa
@@ -161994,10 +160494,10 @@ aaa
aaa
aaa
aaa
-abi
-abi
aaa
-abi
+aaa
+aaa
+aaa
abj
csi
cFJ
@@ -162007,8 +160507,6 @@ cJJ
csi
abj
aaa
-abi
-abi
aaa
aaa
aaa
@@ -162029,21 +160527,23 @@ aaa
aaa
aaa
aaa
-abi
+aaa
+aaa
+dij
aaa
aaa
aaa
aaa
aaa
dak
-daT
+dOF
dbc
aaa
aaa
aaa
aaa
aaa
-abi
+dij
aaa
aaa
aaa
@@ -162221,7 +160721,7 @@ aaa
aaa
aaa
aaa
-abi
+mkp
aaa
aaa
aaa
@@ -162229,11 +160729,11 @@ aaa
aaa
aaa
aaa
-abi
-abi
-abi
-abi
-abi
+mkp
+mkp
+mkp
+mkp
+mkp
aaa
aaa
aaa
@@ -162286,19 +160786,19 @@ aaa
aaa
aaa
aaa
-abi
-abi
+dij
+dij
abj
-abi
-abi
+dij
+dij
aaa
aaa
aaa
aaa
aaa
-abi
+dij
abj
-abi
+dij
abj
abj
aaa
@@ -162547,13 +161047,13 @@ aaa
aaa
aaa
aaa
-abi
-abi
+dij
+dij
abj
-abi
-abi
+dij
+dij
abj
-abi
+dij
aaa
aaa
aaa
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index 37caea366cd..ad41c5fb5fd 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -664,8 +664,7 @@
dir = 4
},
/turf/simulated/floor/plasteel{
- dir = 9;
- icon_state = "warndark"
+ icon_state = "dark"
},
/area/security/permabrig)
"add" = (
@@ -673,8 +672,7 @@
dir = 8
},
/turf/simulated/floor/plasteel{
- dir = 5;
- icon_state = "warndark"
+ icon_state = "dark"
},
/area/security/permabrig)
"ade" = (
@@ -682,8 +680,7 @@
dir = 1
},
/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "warndark"
+ icon_state = "dark"
},
/area/security/permabrig)
"adf" = (
@@ -863,8 +860,7 @@
dir = 4
},
/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "warndark"
+ icon_state = "dark"
},
/area/security/permabrig)
"ady" = (
@@ -877,20 +873,15 @@
dir = 8
},
/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "warndark"
+ icon_state = "dark"
},
/area/security/permabrig)
"adz" = (
-/obj/structure/bed,
-/obj/item/clothing/suit/straight_jacket,
-/obj/item/clothing/glasses/sunglasses/blindfold,
-/obj/item/clothing/mask/muzzle,
-/obj/item/radio/electropack,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 1
},
+/obj/structure/chair/e_chair,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -949,16 +940,6 @@
icon_state = "floorgrime"
},
/area/security/permabrig)
-"adF" = (
-/obj/structure/table,
-/obj/item/clothing/glasses/welding,
-/obj/item/storage/toolbox/mechanical,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high,
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/security/podbay)
"adG" = (
/obj/structure/cable{
d2 = 2;
@@ -972,18 +953,6 @@
icon_state = "solarpanel"
},
/area/solar/auxstarboard)
-"adH" = (
-/obj/structure/rack,
-/obj/item/tank/jetpack/oxygen,
-/obj/item/clothing/shoes/magboots,
-/obj/machinery/camera{
- c_tag = "Engineering Secure Storage South";
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/security/podbay)
"adI" = (
/obj/machinery/newscaster{
pixel_y = 32
@@ -1089,20 +1058,17 @@
icon_state = "dark"
},
/area/security/permabrig)
-"adZ" = (
-/obj/machinery/suit_storage_unit/security/secure,
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/security/podbay)
"aea" = (
/obj/machinery/camera{
c_tag = "Prisoner Education Chamber";
dir = 4
},
+/obj/structure/table,
+/obj/item/clothing/suit/straight_jacket,
+/obj/item/clothing/mask/muzzle,
+/obj/item/clothing/glasses/sunglasses/blindfold,
/turf/simulated/floor/plasteel{
- dir = 10;
- icon_state = "warndark"
+ icon_state = "dark"
},
/area/security/permabrig)
"aeb" = (
@@ -1110,15 +1076,14 @@
name = "justice injector"
},
/turf/simulated/floor/plasteel{
- dir = 6;
- icon_state = "warndark"
+ icon_state = "dark"
},
/area/security/permabrig)
"aec" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel{
- icon_state = "warndark"
+ icon_state = "dark"
},
/area/security/permabrig)
"aed" = (
@@ -1238,10 +1203,7 @@
id_tag = "executionfireblast";
opacity = 0
},
-/turf/simulated/floor/plasteel{
- dir = 9;
- icon_state = "warndark"
- },
+/turf/simulated/floor/plating,
/area/security/permabrig)
"aey" = (
/obj/machinery/door/window/brigdoor{
@@ -1283,10 +1245,7 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/plasteel{
- dir = 9;
- icon_state = "warndark"
- },
+/turf/simulated/floor/plating,
/area/security/permabrig)
"aeA" = (
/obj/structure/cable{
@@ -1331,14 +1290,6 @@
icon_state = "white"
},
/area/security/permabrig)
-"aeM" = (
-/obj/structure/grille,
-/obj/structure/sign/securearea{
- desc = "A warning sign which reads 'KEEP CLEAR OF DOCKING AREA'.";
- name = "KEEP CLEAR: DOCKING AREA"
- },
-/turf/space,
-/area/security/podbay)
"aeN" = (
/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
@@ -1414,15 +1365,6 @@
icon_state = "whitered"
},
/area/security/permabrig)
-"aeV" = (
-/obj/structure/grille,
-/obj/structure/sign/securearea{
- desc = "A warning sign which reads 'KEEP CLEAR OF DOCKING AREA'.";
- name = "KEEP CLEAR: DOCKING AREA"
- },
-/obj/effect/decal/warning_stripes/east,
-/turf/simulated/floor/engine,
-/area/security/podbay)
"aeW" = (
/obj/structure/table,
/obj/item/reagent_containers/glass/bottle/morphine{
@@ -1451,8 +1393,8 @@
},
/obj/item/reagent_containers/dropper,
/obj/item/assembly/signaler{
- pixel_x = -3;
- pixel_y = 2
+ code = 6;
+ frequency = 1445
},
/obj/machinery/alarm{
dir = 4;
@@ -1605,10 +1547,6 @@
/obj/structure/lattice/catwalk,
/turf/space,
/area/solar/auxstarboard)
-"afr" = (
-/obj/effect/spawner/window/reinforced,
-/turf/simulated/floor/plating,
-/area/security/podbay)
"afu" = (
/obj/machinery/door/poddoor{
density = 0;
@@ -1817,17 +1755,6 @@
icon_state = "floorgrime"
},
/area/security/permabrig)
-"afR" = (
-/obj/effect/decal/warning_stripes/north,
-/obj/machinery/door_control{
- desc = "A remote control-switch for the pod doors.";
- id = "secpodbay";
- name = "Pod Door Control";
- pixel_y = 24;
- req_access_txt = "71"
- },
-/turf/simulated/floor/engine,
-/area/security/podbay)
"afS" = (
/obj/structure/bed,
/obj/machinery/camera{
@@ -1985,10 +1912,6 @@
/obj/structure/lattice,
/turf/space,
/area/security/armoury)
-"agd" = (
-/obj/effect/decal/warning_stripes/east,
-/turf/simulated/floor/engine,
-/area/security/podbay)
"age" = (
/obj/structure/cable{
d1 = 1;
@@ -2034,16 +1957,6 @@
},
/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/pod_3)
-"agj" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/security/glass{
- name = "Security Pods";
- req_access_txt = "71"
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/security/podbay)
"agk" = (
/obj/effect/spawner/window/shuttle,
/turf/simulated/floor/plating,
@@ -2414,9 +2327,6 @@
pixel_x = -26;
pixel_y = 34
},
-/obj/item/spacepod_key{
- id = 100000
- },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -2427,29 +2337,12 @@
/area/maintenance/auxsolarport)
"agY" = (
/obj/structure/rack,
-/obj/item/storage/box/buck{
- pixel_x = -3;
- pixel_y = 3
- },
-/obj/item/storage/box/buck,
-/obj/item/storage/box/buck{
- pixel_x = 3;
- pixel_y = -3
- },
+/obj/item/storage/box/tranquilizer,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "vault"
},
/area/security/armoury)
-"agZ" = (
-/obj/machinery/space_heater,
-/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/security/podbay)
"aha" = (
/obj/machinery/computer/prisoner,
/turf/simulated/floor/plasteel{
@@ -2465,12 +2358,12 @@
},
/area/security/hos)
"ahc" = (
-/obj/machinery/computer/secure_data,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
+/obj/machinery/computer/secure_data,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -2481,12 +2374,6 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/machinery/computer/security/telescreen{
- desc = "Used for watching Prison Wing holding areas.";
- name = "Prison Monitor";
- network = list("Prison");
- pixel_y = 30
- },
/obj/machinery/camera{
c_tag = "Prison Hallway Port";
network = list("SS13","Prison")
@@ -2502,6 +2389,12 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/machinery/computer/security/telescreen{
+ desc = "Used for watching Prison Wing holding areas.";
+ name = "Prison Monitor";
+ network = list("Prison");
+ pixel_y = 30
+ },
/turf/simulated/floor/plasteel{
icon_state = "redcorner"
},
@@ -2558,18 +2451,6 @@
/area/crew_quarters/fitness{
name = "\improper Recreation Area"
})
-"ahl" = (
-/obj/machinery/firealarm{
- dir = 8;
- pixel_x = -26;
- pixel_y = 28
- },
-/obj/effect/decal/warning_stripes/blue/hollow,
-/obj/machinery/portable_atmospherics/canister/oxygen,
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/security/podbay)
"ahq" = (
/obj/structure/cable/yellow{
d1 = 1;
@@ -2591,12 +2472,6 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/machinery/computer/security/telescreen{
- desc = "Used for watching Prison Wing holding areas.";
- name = "Prison Monitor";
- network = list("Prison");
- pixel_y = 30
- },
/obj/structure/cable/yellow{
d1 = 2;
d2 = 4;
@@ -2608,6 +2483,12 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/machinery/computer/security/telescreen{
+ desc = "Used for watching Prison Wing holding areas.";
+ name = "Prison Monitor";
+ network = list("Prison");
+ pixel_y = 30
+ },
/turf/simulated/floor/plasteel{
icon_state = "redcorner"
},
@@ -3081,20 +2962,6 @@
icon_state = "redcorner"
},
/area/security/permabrig)
-"aid" = (
-/turf/simulated/wall/r_wall,
-/area/security/podbay)
-"aie" = (
-/obj/effect/decal/warning_stripes/northwest,
-/obj/machinery/alarm{
- pixel_y = 24
- },
-/turf/simulated/floor/engine,
-/area/security/podbay)
-"aif" = (
-/obj/machinery/ai_status_display,
-/turf/simulated/wall/r_wall,
-/area/security/podbay)
"aig" = (
/obj/machinery/shower{
dir = 4
@@ -3291,20 +3158,6 @@
icon_state = "redcorner"
},
/area/security/permabrig)
-"aiC" = (
-/obj/effect/decal/warning_stripes/yellow/hollow,
-/obj/machinery/light_switch{
- name = "light switch ";
- pixel_y = -22
- },
-/obj/structure/reagent_dispensers/fueltank,
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
- dir = 8
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/security/podbay)
"aiE" = (
/obj/structure/table,
/obj/item/folder/red{
@@ -3642,7 +3495,9 @@
name = "\improper Arcade"
})
"ajm" = (
-/obj/machinery/computer/arcade/battle,
+/obj/machinery/computer/arcade/battle{
+ dir = 4
+ },
/turf/simulated/floor/carpet/arcade,
/area/crew_quarters/fitness{
name = "\improper Arcade"
@@ -3693,14 +3548,6 @@
icon_state = "whitered"
},
/area/security/brig)
-"ajv" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/security/podbay)
"ajw" = (
/obj/structure/extinguisher_cabinet{
pixel_x = 27
@@ -3723,6 +3570,10 @@
pixel_x = -24;
pixel_y = -20
},
+/obj/machinery/disposal,
+/obj/structure/disposalpipe/trunk{
+ dir = 4
+ },
/obj/machinery/computer/security/telescreen{
desc = "Used for watching certain areas.";
dir = 1;
@@ -3730,10 +3581,6 @@
network = list("Prison","MiniSat","tcomm");
pixel_y = -30
},
-/obj/machinery/disposal,
-/obj/structure/disposalpipe/trunk{
- dir = 4
- },
/turf/simulated/floor/plasteel{
icon_state = "vault"
},
@@ -3780,14 +3627,14 @@
/turf/simulated/wall/r_wall,
/area/maintenance/auxsolarport)
"ajC" = (
-/obj/machinery/power/solar_control{
- id = "foreport";
- name = "Fore Port Solar Control"
- },
/obj/structure/cable{
d2 = 4;
icon_state = "0-4"
},
+/obj/machinery/power/solar_control{
+ id = "foreport";
+ name = "Fore Port Solar Control"
+ },
/turf/simulated/floor/plating,
/area/maintenance/auxsolarport)
"ajD" = (
@@ -4258,26 +4105,12 @@
d2 = 8;
icon_state = "4-8"
},
-/mob/living/simple_animal/hostile/retaliate/araneus,
/obj/structure/disposalpipe/segment{
dir = 4
},
+/mob/living/simple_animal/hostile/retaliate/araneus,
/turf/simulated/floor/carpet,
/area/security/hos)
-"akC" = (
-/obj/structure/table/reinforced,
-/obj/machinery/light{
- dir = 8
- },
-/obj/item/clothing/head/beret/sec,
-/obj/item/clothing/suit/jacket/pilot,
-/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/security/podbay)
"akD" = (
/turf/simulated/wall,
/area/security/brig)
@@ -4398,23 +4231,6 @@
icon_state = "vault"
},
/area/security/armoury)
-"akO" = (
-/obj/machinery/firealarm{
- dir = 8;
- pixel_x = -26;
- pixel_y = 28
- },
-/obj/machinery/alarm{
- dir = 4;
- pixel_x = -22
- },
-/obj/structure/table/reinforced,
-/obj/item/radio,
-/obj/item/flashlight,
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/security/podbay)
"akP" = (
/obj/machinery/camera{
c_tag = "Engineering - Storage"
@@ -4860,20 +4676,6 @@
icon_state = "showroomfloor"
},
/area/security/main)
-"alE" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
- dir = 8
- },
-/obj/machinery/light_switch{
- name = "light switch ";
- pixel_y = -22
- },
-/obj/structure/table/reinforced,
-/obj/item/book/manual/security_space_law,
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/security/podbay)
"alF" = (
/turf/simulated/floor/plasteel{
dir = 1;
@@ -4890,46 +4692,11 @@
},
/area/security/main)
"alH" = (
-/obj/structure/closet/wardrobe/red,
+/obj/machinery/vending/secdrobe,
/turf/simulated/floor/plasteel{
icon_state = "showroomfloor"
},
/area/security/main)
-"alI" = (
-/obj/machinery/door/airlock/security/glass{
- name = "Security Pods";
- req_access_txt = "71"
- },
-/obj/machinery/door/firedoor,
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/turf/simulated/floor/plating,
-/area/security/podbay)
-"alK" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/security/podbay)
"alL" = (
/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
@@ -5113,7 +4880,9 @@
name = "\improper Recreation Area"
})
"ami" = (
-/obj/machinery/computer/HolodeckControl,
+/obj/machinery/computer/HolodeckControl{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/crew_quarters/fitness{
name = "\improper Recreation Area"
@@ -5312,34 +5081,14 @@
/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
/area/security/brig)
-"amF" = (
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "red"
- },
-/area/security/main)
"amG" = (
/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/simple/hidden/supply{
- dir = 4
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 10
},
/turf/simulated/floor/plasteel{
dir = 1;
@@ -5361,9 +5110,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "red"
@@ -5391,12 +5137,6 @@
d2 = 8;
icon_state = "1-8"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 9
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 9
- },
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "red"
@@ -5424,12 +5164,12 @@
/turf/simulated/floor/plating,
/area/security/brig)
"amM" = (
-/obj/machinery/computer/secure_data,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
+/obj/machinery/computer/secure_data,
/turf/simulated/floor/plasteel{
icon_state = "vault"
},
@@ -5633,9 +5373,6 @@
"ano" = (
/turf/space,
/area/maintenance/auxsolarstarboard)
-"anq" = (
-/turf/simulated/wall/r_wall,
-/area/engine/mechanic_workshop)
"anr" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -5876,6 +5613,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
},
+/obj/structure/closet/secure_closet/security,
/turf/simulated/floor/plasteel{
icon_state = "showroomfloor"
},
@@ -6084,20 +5822,6 @@
icon_state = "dark"
},
/area/crew_quarters/sleep)
-"aol" = (
-/obj/effect/decal/warning_stripes/north,
-/obj/machinery/light{
- dir = 1
- },
-/turf/simulated/floor/engine,
-/area/security/podbay)
-"aom" = (
-/obj/machinery/door/poddoor/multi_tile/four_tile_ver{
- id_tag = "secpodbay"
- },
-/obj/structure/spacepoddoor,
-/turf/simulated/floor/engine,
-/area/security/podbay)
"aon" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/security/glass{
@@ -6308,9 +6032,6 @@
icon_state = "whitered"
},
/area/security/brig)
-"aoN" = (
-/turf/simulated/floor/engine,
-/area/engine/mechanic_workshop)
"aoS" = (
/obj/machinery/conveyor/north{
id = "garbage"
@@ -6705,10 +6426,6 @@
icon_state = "vault"
},
/area/engine/gravitygenerator)
-"apK" = (
-/obj/effect/decal/warning_stripes/north,
-/turf/simulated/floor/engine,
-/area/security/podbay)
"apL" = (
/obj/structure/cable/yellow{
d1 = 4;
@@ -6899,15 +6616,15 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/machinery/computer/security/telescreen/entertainment{
- pixel_y = -32
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/machinery/computer/security/telescreen/entertainment{
+ pixel_y = -32
+ },
/turf/simulated/floor/plasteel{
icon_state = "red"
},
@@ -7690,7 +7407,6 @@
/area/security/brig)
"asa" = (
/obj/structure/rack,
-/obj/item/lock_buster,
/obj/item/storage/box/flashbangs{
pixel_x = -2;
pixel_y = -2
@@ -7776,10 +7492,6 @@
},
/turf/simulated/floor/plating,
/area/engine/gravitygenerator)
-"ask" = (
-/obj/structure/spacepoddoor,
-/turf/simulated/floor/engine,
-/area/security/podbay)
"asl" = (
/obj/structure/disposalpipe/trunk{
dir = 4
@@ -8165,14 +7877,14 @@
/turf/simulated/wall,
/area/maintenance/auxsolarstarboard)
"asU" = (
-/obj/machinery/power/solar_control{
- id = "forestarboard";
- name = "Fore Starboard Solar Control"
- },
/obj/structure/cable{
d2 = 4;
icon_state = "0-4"
},
+/obj/machinery/power/solar_control{
+ id = "forestarboard";
+ name = "Fore Starboard Solar Control"
+ },
/turf/simulated/floor/plating,
/area/maintenance/auxsolarstarboard)
"asV" = (
@@ -8188,13 +7900,6 @@
},
/area/security/brig)
"asW" = (
-/obj/machinery/computer/security/telescreen{
- desc = "Used for watching Prison Wing holding areas.";
- dir = 1;
- name = "Prison Monitor";
- network = list("Prison");
- pixel_x = 30
- },
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
@@ -8204,13 +7909,17 @@
dir = 8
},
/obj/machinery/vending/security,
+/obj/machinery/computer/security/telescreen{
+ desc = "Used for watching Prison Wing holding areas.";
+ dir = 1;
+ name = "Prison Monitor";
+ network = list("Prison");
+ pixel_x = 30
+ },
/turf/simulated/floor/plasteel{
icon_state = "showroomfloor"
},
/area/security/warden)
-"asZ" = (
-/turf/simulated/floor/engine,
-/area/security/podbay)
"ata" = (
/obj/effect/spawner/lootdrop/maintenance,
/turf/simulated/floor/plating/airless,
@@ -8736,10 +8445,6 @@
icon_state = "redcorner"
},
/area/security/brig)
-"aui" = (
-/obj/effect/decal/warning_stripes/west,
-/turf/simulated/floor/engine,
-/area/security/podbay)
"auj" = (
/obj/structure/chair/stool{
pixel_y = 8
@@ -8960,6 +8665,7 @@
/area/maintenance/fore)
"auM" = (
/obj/machinery/computer/security{
+ dir = 4;
name = "Labor Camp Monitoring";
network = list("Labor")
},
@@ -9135,10 +8841,6 @@
icon_state = "redcorner"
},
/area/security/brig)
-"ava" = (
-/obj/spacepod/sec,
-/turf/simulated/floor/engine,
-/area/security/podbay)
"avb" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/security/glass{
@@ -9160,9 +8862,6 @@
},
/area/security/brig)
"avd" = (
-/obj/machinery/computer/security{
- network = list("SS13","Research Outpost","Mining Outpost")
- },
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
@@ -9173,6 +8872,10 @@
d2 = 4;
icon_state = "2-4"
},
+/obj/machinery/computer/security{
+ dir = 4;
+ network = list("SS13","Research Outpost","Mining Outpost")
+ },
/turf/simulated/floor/plasteel{
icon_state = "showroomfloor"
},
@@ -9502,17 +9205,6 @@
"avN" = (
/turf/simulated/wall/mineral/titanium,
/area/shuttle/pod_4)
-"avO" = (
-/obj/item/radio/intercom/department/security,
-/turf/simulated/wall/r_wall,
-/area/security/podbay)
-"avP" = (
-/obj/machinery/computer/podtracker,
-/turf/simulated/floor/plasteel{
- dir = 5;
- icon_state = "vault"
- },
-/area/engine/mechanic_workshop)
"avQ" = (
/obj/effect/landmark{
name = "xeno_spawn";
@@ -9591,10 +9283,10 @@
name = "Port Maintenance"
})
"avY" = (
-/mob/living/simple_animal/mouse,
/obj/structure/disposalpipe/segment{
dir = 4
},
+/mob/living/simple_animal/mouse,
/turf/simulated/floor/plating,
/area/maintenance/fpmaint2{
name = "Port Maintenance"
@@ -9676,10 +9368,12 @@
c_tag = "Labor Shuttle Control Desk";
dir = 4
},
-/obj/machinery/computer/shuttle/labor,
/obj/machinery/light{
dir = 8
},
+/obj/machinery/computer/shuttle/labor{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -9830,14 +9524,6 @@
},
/turf/simulated/floor/plating,
/area/maintenance/starboard)
-"aww" = (
-/obj/effect/decal/warning_stripes/south,
-/turf/simulated/floor/engine,
-/area/security/podbay)
-"awx" = (
-/obj/effect/decal/warning_stripes/southwest,
-/turf/simulated/floor/engine,
-/area/security/podbay)
"awy" = (
/obj/structure/cable/yellow{
d1 = 1;
@@ -9916,7 +9602,9 @@
},
/area/security/main)
"awH" = (
-/obj/machinery/computer/secure_data,
+/obj/machinery/computer/secure_data{
+ dir = 4
+ },
/obj/machinery/computer/security/telescreen{
desc = "Used for watching Prison Wing holding areas.";
dir = 1;
@@ -10167,10 +9855,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
- },
/obj/structure/disposalpipe/sortjunction{
dir = 4;
icon_state = "pipe-j2s";
@@ -10483,7 +10167,9 @@
},
/area/security/main)
"axG" = (
-/obj/machinery/computer/prisoner,
+/obj/machinery/computer/prisoner{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -10821,22 +10507,6 @@
},
/turf/simulated/floor/plating,
/area/maintenance/starboard)
-"ays" = (
-/obj/structure/closet/secure_closet/security,
-/obj/item/spacepod_equipment/weaponry/laser,
-/obj/machinery/power/apc{
- dir = 4;
- name = "Security Podbay APC";
- pixel_x = 25
- },
-/obj/structure/cable/yellow{
- d2 = 8;
- icon_state = "0-8"
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/security/podbay)
"ayt" = (
/obj/structure/cable/yellow{
d1 = 1;
@@ -10848,7 +10518,9 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/machinery/computer/prisoner,
+/obj/machinery/computer/prisoner{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "showroomfloor"
},
@@ -11282,17 +10954,6 @@
},
/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{
- icon_state = "stage_stairs"
- },
-/area/security/podbay)
"azu" = (
/obj/item/stack/sheet/cardboard,
/obj/item/flashlight,
@@ -11356,31 +11017,16 @@
name = "Port Maintenance"
})
"azC" = (
-/obj/machinery/computer/cryopod{
- pixel_y = -25
- },
/obj/effect/landmark{
name = "JoinLateCryo"
},
+/obj/machinery/computer/cryopod{
+ pixel_y = -25
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
/area/crew_quarters/sleep)
-"azD" = (
-/obj/structure/spacepoddoor,
-/obj/machinery/door/poddoor/multi_tile/three_tile_ver{
- id_tag = "mechpodbay"
- },
-/turf/simulated/floor/plasteel{
- dir = 5;
- icon_state = "vault"
- },
-/area/engine/mechanic_workshop)
-"azE" = (
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/security/podbay)
"azF" = (
/obj/structure/cable/yellow{
d2 = 2;
@@ -11886,7 +11532,6 @@
/turf/simulated/floor/wood,
/area/crew_quarters/mrchangs)
"aAE" = (
-/obj/effect/spawner/window/reinforced,
/obj/structure/cable/yellow{
d2 = 4;
icon_state = "0-4"
@@ -11895,6 +11540,7 @@
id_tag = "Secure Gate";
name = "brig shutters"
},
+/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
/area/security/brig)
"aAH" = (
@@ -11995,15 +11641,15 @@
},
/area/security/brig)
"aAO" = (
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 4
+ },
/obj/machinery/computer/security/telescreen{
dir = 4;
name = "MiniSat Monitor";
network = list("MiniSat","tcomm");
pixel_x = -29
},
-/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 4
- },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "yellow"
@@ -12267,16 +11913,6 @@
},
/turf/simulated/floor/wood,
/area/crew_quarters/mrchangs)
-"aBK" = (
-/obj/structure/cable/yellow{
- d1 = 2;
- d2 = 4;
- icon_state = "2-4"
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/security/podbay)
"aBL" = (
/obj/structure/cable/yellow{
d2 = 4;
@@ -12591,7 +12227,6 @@
/turf/simulated/floor/plating/airless,
/area/space/nearstation)
"aCr" = (
-/obj/effect/spawner/window/reinforced,
/obj/structure/cable/yellow{
d2 = 8;
icon_state = "0-8"
@@ -12600,6 +12235,7 @@
id_tag = "Secure Gate";
name = "brig shutters"
},
+/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
/area/security/brig)
"aCs" = (
@@ -12724,20 +12360,22 @@
name = "\improper Warehouse"
})
"aCF" = (
-/obj/effect/spawner/window/reinforced,
/obj/structure/cable/yellow,
-/obj/structure/cable/yellow{
- d2 = 4;
- icon_state = "0-4"
- },
-/obj/structure/cable/yellow{
- d2 = 8;
- icon_state = "0-8"
- },
/obj/machinery/door/poddoor/preopen{
id_tag = "Secure Gate";
name = "brig shutters"
},
+/obj/effect/spawner/window/reinforced,
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
/turf/simulated/floor/plating,
/area/security/brig)
"aCG" = (
@@ -13077,7 +12715,9 @@
/area/maintenance/starboard)
"aDg" = (
/obj/structure/table,
-/obj/machinery/computer/crew,
+/obj/machinery/computer/crew{
+ dir = 8
+ },
/turf/simulated/floor/plasteel{
icon_state = "showroomfloor"
},
@@ -14224,7 +13864,9 @@
dir = 8;
pixel_x = 24
},
-/obj/machinery/computer/secure_data,
+/obj/machinery/computer/secure_data{
+ dir = 8
+ },
/turf/simulated/floor/carpet,
/area/security/detectives_office)
"aFy" = (
@@ -14311,12 +13953,12 @@
},
/area/crew_quarters/sleep)
"aFH" = (
+/obj/structure/table/wood,
/obj/machinery/computer/security/wooden_tv{
density = 0;
pixel_x = 3;
pixel_y = 2
},
-/obj/structure/table/wood,
/obj/machinery/computer/security/telescreen{
desc = "Used for watching Prison Wing holding areas.";
name = "Prison Monitor";
@@ -14371,18 +14013,8 @@
},
/area/crew_quarters/sleep)
"aFM" = (
-/obj/structure/rack{
- dir = 8;
- layer = 2.9
- },
-/obj/item/clothing/gloves/color/yellow,
-/obj/item/clothing/gloves/color/yellow,
-/obj/item/clothing/gloves/color/yellow,
-/obj/item/clothing/suit/storage/hazardvest,
-/obj/item/clothing/suit/storage/hazardvest,
-/obj/item/tank/internals/emergency_oxygen/engi,
-/obj/item/tank/internals/emergency_oxygen/engi,
/obj/effect/decal/warning_stripes/yellow,
+/obj/machinery/vending/engidrobe,
/turf/simulated/floor/plasteel,
/area/engine/engineering)
"aFO" = (
@@ -14486,7 +14118,18 @@
/obj/machinery/camera{
c_tag = "Engineering - Fore"
},
-/obj/effect/decal/warning_stripes/northwest,
+/obj/effect/decal/warning_stripes/yellow,
+/obj/structure/rack{
+ dir = 8;
+ layer = 2.9
+ },
+/obj/item/clothing/gloves/color/yellow,
+/obj/item/clothing/gloves/color/yellow,
+/obj/item/clothing/gloves/color/yellow,
+/obj/item/clothing/suit/storage/hazardvest,
+/obj/item/clothing/suit/storage/hazardvest,
+/obj/item/tank/internals/emergency_oxygen/engi,
+/obj/item/tank/internals/emergency_oxygen/engi,
/turf/simulated/floor/plasteel,
/area/engine/engineering)
"aGc" = (
@@ -14787,10 +14430,12 @@
/turf/simulated/floor/carpet,
/area/security/detectives_office)
"aGH" = (
-/obj/machinery/computer/med_data,
/obj/machinery/newscaster{
pixel_x = 28
},
+/obj/machinery/computer/med_data{
+ dir = 8
+ },
/turf/simulated/floor/carpet,
/area/security/detectives_office)
"aGI" = (
@@ -14922,10 +14567,10 @@
/turf/simulated/floor/plating,
/area/maintenance/starboard)
"aGX" = (
+/obj/machinery/suit_storage_unit/ce/secure,
/obj/machinery/computer/security/telescreen/entertainment{
pixel_y = -29
},
-/obj/machinery/suit_storage_unit/ce/secure,
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "vault"
@@ -15064,7 +14709,9 @@
/obj/machinery/light{
dir = 8
},
-/obj/machinery/computer/shuttle/mining,
+/obj/machinery/computer/shuttle/mining{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 9;
icon_state = "brown"
@@ -15289,7 +14936,6 @@
name = "Storage Wing"
})
"aHS" = (
-/obj/machinery/computer/secure_data,
/obj/machinery/flasher_button{
id = "secentranceflasher";
name = "Brig Entrance Flash Control";
@@ -15331,6 +14977,7 @@
pixel_y = 27;
req_access_txt = "63"
},
+/obj/machinery/computer/secure_data,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -15436,18 +15083,7 @@
},
/area/crew_quarters/sleep)
"aIa" = (
-/obj/structure/rack{
- dir = 8;
- layer = 2.9
- },
-/obj/item/storage/briefcase{
- pixel_x = -3;
- pixel_y = 2
- },
-/obj/item/storage/secure/briefcase{
- pixel_x = 2;
- pixel_y = -2
- },
+/obj/machinery/vending/detdrobe,
/turf/simulated/floor/plasteel{
icon_state = "grimy"
},
@@ -15784,7 +15420,9 @@
name = "Port Maintenance"
})
"aIN" = (
-/obj/machinery/computer/security/mining,
+/obj/machinery/computer/security/mining{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/quartermaster/miningdock{
name = "\improper Mining Office"
@@ -17257,9 +16895,8 @@
icon_state = "1-2"
},
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/centcom{
- name = "Courtroom";
- opacity = 1
+/obj/machinery/door/airlock{
+ name = "Courtroom"
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -17384,13 +17021,13 @@
})
"aMc" = (
/obj/effect/decal/cleanable/dirt,
-/mob/living/simple_animal/mouse,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/mob/living/simple_animal/mouse,
/turf/simulated/floor/plating,
/area/maintenance/fore)
"aMd" = (
@@ -17761,6 +17398,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/machinery/vending/cargodrobe,
/turf/simulated/floor/plasteel,
/area/quartermaster/storage)
"aMU" = (
@@ -18371,12 +18009,12 @@
/turf/simulated/floor/engine,
/area/engine/engineering)
"aOb" = (
-/obj/machinery/computer/security{
- network = list("SS13","Research Outpost","Mining Outpost")
- },
/obj/machinery/newscaster/security_unit{
pixel_y = -30
},
+/obj/machinery/computer/security{
+ network = list("SS13","Research Outpost","Mining Outpost")
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -18443,6 +18081,10 @@
pixel_x = -4;
pixel_y = 2
},
+/obj/item/restraints/handcuffs,
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 1
+ },
/obj/machinery/computer/security/telescreen{
desc = "Used for watching Prison Wing holding areas.";
dir = 1;
@@ -18450,10 +18092,6 @@
network = list("Prison");
pixel_y = -30
},
-/obj/item/restraints/handcuffs,
-/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 1
- },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -19036,8 +18674,8 @@
})
"aPK" = (
/obj/structure/table,
-/obj/machinery/computer/guestpass,
/obj/effect/decal/warning_stripes/yellow,
+/obj/machinery/computer/guestpass,
/turf/simulated/floor/plasteel,
/area/engine/engineering)
"aPL" = (
@@ -19901,11 +19539,11 @@
},
/area/security/brig)
"aRQ" = (
-/mob/living/simple_animal/mouse,
/obj/machinery/atmospherics/binary/valve,
/obj/structure/disposalpipe/segment{
dir = 4
},
+/mob/living/simple_animal/mouse,
/turf/simulated/floor/plasteel{
icon_state = "floorgrime"
},
@@ -19957,14 +19595,14 @@
/obj/structure/table/wood,
/obj/item/book/manual/security_space_law,
/obj/item/book/manual/security_space_law,
+/obj/item/cartridge/lawyer,
+/obj/item/pen/multi,
/obj/machinery/computer/security/telescreen{
desc = "Used for watching Prison Wing holding areas.";
name = "Prison Monitor";
network = list("Prison");
pixel_y = 30
},
-/obj/item/cartridge/lawyer,
-/obj/item/pen/multi,
/turf/simulated/floor/wood,
/area/lawoffice)
"aRX" = (
@@ -20156,7 +19794,9 @@
})
"aSC" = (
/obj/effect/decal/warning_stripes/yellow,
-/obj/machinery/computer/sm_monitor,
+/obj/machinery/computer/sm_monitor{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/engine/engineering)
"aSD" = (
@@ -20205,8 +19845,10 @@
pixel_x = -27;
pixel_y = 5
},
-/obj/machinery/computer/supplycomp,
/obj/effect/decal/warning_stripes/yellow/hollow,
+/obj/machinery/computer/supplycomp{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/quartermaster/storage)
"aSH" = (
@@ -20326,7 +19968,6 @@
},
/area/turret_protected/ai_upload)
"aSV" = (
-/obj/machinery/computer/borgupload,
/obj/structure/window/reinforced{
dir = 1
},
@@ -20342,6 +19983,7 @@
name = "Cyborg Upload Console Window";
req_access_txt = "16"
},
+/obj/machinery/computer/borgupload,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -20353,7 +19995,6 @@
},
/area/turret_protected/ai_upload)
"aSX" = (
-/obj/machinery/computer/aiupload,
/obj/structure/window/reinforced{
dir = 1
},
@@ -20371,6 +20012,7 @@
name = "Upload Console Window";
req_access_txt = "16"
},
+/obj/machinery/computer/aiupload,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -20986,10 +20628,7 @@
d2 = 8;
icon_state = "2-8"
},
-/obj/machinery/ai_slipper{
- icon_state = "motion0";
- uses = 8
- },
+/obj/machinery/ai_slipper,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
},
@@ -21213,12 +20852,12 @@
/turf/simulated/floor/plating,
/area/engine/engineering)
"aUL" = (
-/obj/machinery/computer/station_alert,
/obj/structure/sign/double/map/right{
desc = "A framed picture of the station. Clockwise from security at the top (red), you see engineering (yellow), science (purple), escape (red and white), medbay (green), arrivals (blue and white), and finally cargo (brown).";
icon_state = "map-right-MS";
pixel_y = 32
},
+/obj/machinery/computer/station_alert,
/turf/simulated/floor/plasteel{
icon_state = "vault"
},
@@ -22145,7 +21784,6 @@
/turf/simulated/floor/plasteel,
/area/quartermaster/storage)
"aWN" = (
-/obj/machinery/computer/atmos_alert,
/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";
@@ -22155,15 +21793,18 @@
dir = 8;
pixel_x = -26
},
+/obj/machinery/computer/atmos_alert,
/turf/simulated/floor/plasteel{
icon_state = "vault"
},
/area/engine/engineering)
"aWO" = (
-/obj/machinery/computer/supplycomp,
/obj/machinery/light_switch{
pixel_x = -23
},
+/obj/machinery/computer/supplycomp{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 10;
icon_state = "brown"
@@ -22256,9 +21897,6 @@
d2 = 4;
icon_state = "0-4"
},
-/obj/machinery/computer/monitor{
- name = "Engineering Power Monitoring Console"
- },
/obj/machinery/status_display{
layer = 4;
pixel_y = 32
@@ -22266,6 +21904,9 @@
/obj/machinery/camera{
c_tag = "Engineering - Power Monitoring"
},
+/obj/machinery/computer/monitor{
+ name = "Engineering Power Monitoring Console"
+ },
/turf/simulated/floor/plasteel{
icon_state = "vault"
},
@@ -22292,9 +21933,8 @@
/area/turret_protected/ai_upload)
"aXb" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/centcom{
- name = "Courtroom";
- opacity = 1
+/obj/machinery/door/airlock{
+ name = "Courtroom"
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -22400,7 +22040,9 @@
/turf/simulated/floor/engine,
/area/engine/engineering)
"aXt" = (
-/obj/machinery/computer/security/mining,
+/obj/machinery/computer/security/mining{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "brown"
@@ -22887,12 +22529,7 @@
/turf/simulated/floor/plasteel,
/area/hallway/primary/fore)
"aYA" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced/tinted{
- dir = 5;
- max_integrity = 120;
- reinf = 0
- },
+/obj/effect/spawner/window/reinforced/polarized,
/turf/simulated/floor/plating,
/area/crew_quarters/courtroom)
"aYC" = (
@@ -23561,6 +23198,11 @@
},
/obj/structure/table,
/obj/item/storage/fancy/donut_box,
+/obj/machinery/button/windowtint{
+ dir = 4;
+ pixel_x = -26;
+ range = 10
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -23939,9 +23581,6 @@
name = "Arrivals"
})
"baL" = (
-/obj/machinery/newscaster{
- pixel_y = -32
- },
/obj/machinery/light,
/obj/machinery/camera{
c_tag = "Courtroom - Gallery";
@@ -24101,7 +23740,7 @@
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/engineering/glass{
name = "Engineering";
- req_access_txt = "32"
+ req_one_access_txt = "32;70"
},
/obj/structure/cable/yellow{
d1 = 4;
@@ -24622,12 +24261,6 @@
},
/area/engine/engineering)
"bcl" = (
-/obj/machinery/turretid{
- control_area = "\improper AI Upload Chamber";
- icon_state = "control_stun";
- name = "AI Upload turret control";
- pixel_y = 28
- },
/obj/item/radio/intercom{
broadcasting = 1;
frequency = 1447;
@@ -24656,6 +24289,12 @@
network = list("AIUpload");
pixel_x = -29
},
+/obj/machinery/turretid/stun{
+ control_area = "\improper AI Upload Chamber";
+ name = "AI Upload Turret Control";
+ pixel_y = 28;
+ req_access = list(75)
+ },
/turf/simulated/floor/plasteel{
dir = 6;
icon_state = "vault"
@@ -24680,13 +24319,6 @@
/obj/machinery/light/small{
dir = 4
},
-/obj/machinery/computer/security/telescreen{
- desc = "Used for watching areas on the MiniSat.";
- dir = 8;
- name = "MiniSat Monitor";
- network = list("MiniSat","tcomm");
- pixel_x = 29
- },
/obj/machinery/camera/motion{
c_tag = "AI Upload Foyer";
network = list("SS13","RD","AIUpload")
@@ -24694,6 +24326,13 @@
/obj/machinery/alarm{
pixel_y = 24
},
+/obj/machinery/computer/security/telescreen{
+ desc = "Used for watching areas on the MiniSat.";
+ dir = 8;
+ name = "MiniSat Monitor";
+ network = list("MiniSat","tcomm");
+ pixel_x = 29
+ },
/turf/simulated/floor/plasteel{
dir = 10;
icon_state = "vault"
@@ -26074,7 +25713,9 @@
network = list("Singulo");
pixel_x = 32
},
-/obj/machinery/computer/drone_control,
+/obj/machinery/computer/drone_control{
+ dir = 8
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "yellow"
@@ -27167,13 +26808,14 @@
},
/area/storage/tech)
"bhK" = (
-/obj/structure/reagent_dispensers/spacecleanertank{
- pixel_y = 30
- },
/obj/structure/disposalpipe/segment{
dir = 2;
icon_state = "pipe-c"
},
+/obj/structure/closet/jcloset,
+/obj/machinery/light_switch{
+ pixel_x = 23
+ },
/turf/simulated/floor/plasteel,
/area/janitor)
"bhL" = (
@@ -27494,7 +27136,6 @@
name = "Customs"
})
"biy" = (
-/obj/machinery/computer/card,
/obj/machinery/light{
dir = 1
},
@@ -27506,6 +27147,7 @@
/obj/machinery/camera{
c_tag = "Customs Checkpoint"
},
+/obj/machinery/computer/card,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "red"
@@ -27515,8 +27157,9 @@
})
"biz" = (
/obj/effect/decal/warning_stripes/southwest,
-/obj/structure/closet/wardrobe/atmospherics_yellow,
+/obj/structure/rack,
/obj/item/flashlight,
+/obj/item/painter,
/turf/simulated/floor/plasteel,
/area/atmos)
"biA" = (
@@ -27525,8 +27168,9 @@
pixel_y = 28
},
/obj/effect/decal/warning_stripes/southeast,
-/obj/structure/closet/wardrobe/atmospherics_yellow,
+/obj/structure/rack,
/obj/item/flashlight,
+/obj/item/painter,
/turf/simulated/floor/plasteel,
/area/atmos)
"biB" = (
@@ -27640,7 +27284,9 @@
/turf/simulated/floor/carpet,
/area/crew_quarters/theatre)
"biN" = (
-/obj/machinery/computer/supplycomp,
+/obj/machinery/computer/supplycomp{
+ dir = 1
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "brown"
@@ -27688,9 +27334,7 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/machinery/ai_slipper{
- icon_state = "motion0"
- },
+/obj/machinery/ai_slipper,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/bluegrid,
/area/turret_protected/ai)
@@ -27719,8 +27363,7 @@
/area/hallway/primary/central)
"biY" = (
/obj/structure/reagent_dispensers/watertank,
-/obj/machinery/light_switch{
- pixel_x = 8;
+/obj/structure/reagent_dispensers/spacecleanertank{
pixel_y = 30
},
/turf/simulated/floor/plasteel{
@@ -28092,6 +27735,8 @@
/obj/machinery/light{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/obj/machinery/computer/security/telescreen{
desc = "A telescreen that connects to the engine's camera network.";
dir = 8;
@@ -28100,8 +27745,6 @@
network = list("engine");
pixel_x = 30
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "vault"
@@ -28132,8 +27775,8 @@
},
/area/engine/chiefs_office)
"bjJ" = (
-/obj/machinery/computer/supplycomp/public,
/obj/effect/decal/warning_stripes/yellow,
+/obj/machinery/computer/supplycomp/public,
/turf/simulated/floor/plasteel{
dir = 9;
icon_state = "brown"
@@ -28264,9 +27907,7 @@
},
/area/turret_protected/ai)
"bjY" = (
-/obj/machinery/ai_slipper{
- icon_state = "motion0"
- },
+/obj/machinery/ai_slipper,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/bluegrid,
/area/turret_protected/ai)
@@ -28622,7 +28263,7 @@
"bkL" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 9
+ dir = 5
},
/turf/simulated/floor/plating,
/area/janitor)
@@ -28632,6 +28273,9 @@
d2 = 4;
icon_state = "2-4"
},
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+ dir = 8
+ },
/turf/simulated/floor/plasteel{
icon_state = "floorgrime"
},
@@ -28801,21 +28445,6 @@
/area/hallway/secondary/construction{
name = "\improper Garden"
})
-"bli" = (
-/obj/effect/spawner/window/reinforced,
-/turf/simulated/floor/plating,
-/area/engine/mechanic_workshop)
-"blj" = (
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/turf/simulated/floor/plasteel{
- dir = 5;
- icon_state = "vault"
- },
-/area/engine/mechanic_workshop)
"bll" = (
/obj/structure/closet/emcloset,
/obj/structure/sign/double/map/left{
@@ -28947,9 +28576,7 @@
name = "\improper MiniSat Exterior"
})
"blF" = (
-/obj/machinery/ai_slipper{
- icon_state = "motion0"
- },
+/obj/machinery/ai_slipper,
/obj/machinery/flasher{
id = "AI";
pixel_x = 24;
@@ -29563,13 +29190,13 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 5
- },
/mob/living/simple_animal/lizard{
name = "Wags-His-Tail";
real_name = "Wags-His-Tail"
},
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 1
+ },
/turf/simulated/floor/plasteel{
icon_state = "floorgrime"
},
@@ -29583,9 +29210,6 @@
/obj/effect/landmark/start{
name = "Janitor"
},
-/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 8
- },
/turf/simulated/floor/plasteel{
icon_state = "floorgrime"
},
@@ -29736,14 +29360,12 @@
pixel_x = -24
},
/obj/structure/table,
-/obj/item/clothing/gloves/color/orange,
-/obj/item/storage/box/mousetraps,
-/obj/item/storage/box/mousetraps,
/obj/structure/cable/yellow{
d2 = 4;
icon_state = "0-4"
},
/obj/item/key/janitor,
+/obj/item/reagent_containers/spray/cleaner,
/turf/simulated/floor/plasteel{
icon_state = "floorgrime"
},
@@ -29758,10 +29380,10 @@
/turf/simulated/floor/plating,
/area/maintenance/starboard)
"bmS" = (
-/obj/machinery/computer/secure_data,
/obj/machinery/newscaster/security_unit{
pixel_y = 30
},
+/obj/machinery/computer/secure_data,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "red"
@@ -30073,20 +29695,6 @@
/area/crew_quarters/captain{
name = "\improper Captain's Quarters"
})
-"bnC" = (
-/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/plasteel,
-/area/engine/break_room)
"bnE" = (
/obj/machinery/light_switch{
pixel_x = 28
@@ -30221,9 +29829,7 @@
name = "\improper MiniSat Exterior"
})
"bnQ" = (
-/obj/machinery/ai_slipper{
- icon_state = "motion0"
- },
+/obj/machinery/ai_slipper,
/turf/simulated/floor/bluegrid,
/area/turret_protected/ai)
"bnR" = (
@@ -30496,6 +30102,8 @@
/obj/item/grenade/chem_grenade/cleaner,
/obj/item/grenade/chem_grenade/cleaner,
/obj/item/grenade/chem_grenade/cleaner,
+/obj/item/storage/box/mousetraps,
+/obj/item/storage/box/mousetraps,
/turf/simulated/floor/plasteel{
icon_state = "floorgrime"
},
@@ -30650,12 +30258,12 @@
name = "Station Intercom (General)";
pixel_x = -27
},
-/obj/machinery/computer/security/telescreen/entertainment{
- pixel_y = 32
- },
/obj/item/paper/safe_code{
owner = "captain"
},
+/obj/machinery/computer/security/telescreen/entertainment{
+ pixel_y = 32
+ },
/turf/simulated/floor/carpet,
/area/crew_quarters/captain{
name = "\improper Captain's Quarters"
@@ -30663,13 +30271,11 @@
"boN" = (
/obj/item/restraints/legcuffs/beartrap,
/obj/item/restraints/legcuffs/beartrap,
-/obj/structure/table,
/obj/machinery/requests_console{
department = "Janitorial";
departmentType = 1;
pixel_x = -29
},
-/obj/item/reagent_containers/spray/cleaner,
/obj/machinery/camera{
c_tag = "Custodial Closet";
dir = 4
@@ -30677,9 +30283,12 @@
/obj/machinery/light/small{
dir = 8
},
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
- dir = 4
+/obj/item/mop,
+/obj/item/reagent_containers/glass/bucket,
+/obj/structure/rack{
+ dir = 1
},
+/obj/item/clothing/gloves/color/orange,
/turf/simulated/floor/plasteel{
icon_state = "floorgrime"
},
@@ -31240,8 +30849,6 @@
dir = 4;
pixel_x = 11
},
-/obj/item/reagent_containers/glass/bucket,
-/obj/item/mop,
/obj/machinery/firealarm{
dir = 4;
pixel_x = 24
@@ -31771,9 +31378,7 @@
/turf/space,
/area/space/nearstation)
"bqZ" = (
-/obj/machinery/ai_slipper{
- icon_state = "motion0"
- },
+/obj/machinery/ai_slipper,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 1
},
@@ -32412,7 +32017,9 @@
},
/area/bridge)
"bsi" = (
-/obj/machinery/computer/merch,
+/obj/machinery/computer/merch{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 10;
icon_state = "brown"
@@ -32781,57 +32388,6 @@
},
/turf/simulated/floor/plasteel,
/area/engine/break_room)
-"bsZ" = (
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/machinery/door_control{
- id = "mechpod";
- name = "Mechanic's Inner Door Control";
- pixel_y = -24;
- req_access_txt = "70"
- },
-/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/structure/cable/yellow{
- d2 = 8;
- icon_state = "0-8"
- },
-/obj/machinery/power/apc{
- 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{
- dir = 5;
- icon_state = "vault"
- },
-/area/engine/mechanic_workshop)
"btb" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 8
@@ -32843,16 +32399,6 @@
/area/turret_protected/aisat_interior{
name = "\improper MiniSat Central Foyer"
})
-"btc" = (
-/obj/machinery/door_control{
- desc = "A remote control-switch for the pod doors.";
- id = "mechpodbay";
- name = "Pod Door Control";
- pixel_y = -24;
- req_access_txt = "70"
- },
-/turf/simulated/floor/engine,
-/area/engine/mechanic_workshop)
"btd" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/poddoor/shutters{
@@ -33265,19 +32811,19 @@
},
/area/bridge)
"btV" = (
-/obj/machinery/computer/communications,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/computer/communications,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
/area/bridge)
"btW" = (
+/obj/structure/table/glass,
/obj/machinery/computer/security/wooden_tv{
pixel_x = 1;
pixel_y = 6
},
-/obj/structure/table/glass,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -33303,10 +32849,10 @@
name = "Station Intercom (General)";
pixel_y = 29
},
-/obj/machinery/computer/teleporter,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 6
},
+/obj/machinery/computer/sm_monitor,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -33425,7 +32971,6 @@
name = "\improper Captain's Quarters"
})
"buh" = (
-/obj/machinery/computer/communications,
/obj/item/radio/intercom{
dir = 8;
name = "Station Intercom (Captain)";
@@ -33438,6 +32983,9 @@
pixel_x = 24;
pixel_y = 24
},
+/obj/machinery/computer/communications{
+ dir = 8
+ },
/turf/simulated/floor/wood,
/area/crew_quarters/captain{
name = "\improper Captain's Quarters"
@@ -33490,13 +33038,13 @@
d2 = 4;
icon_state = "2-4"
},
-/obj/machinery/computer/security/mining,
/obj/machinery/keycard_auth{
pixel_y = 24
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
},
+/obj/machinery/computer/security/mining,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -33955,9 +33503,7 @@
/obj/machinery/light_switch{
pixel_x = -23
},
-/obj/machinery/ai_slipper{
- icon_state = "motion0"
- },
+/obj/machinery/ai_slipper,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -34226,9 +33772,7 @@
name = "\improper MiniSat Teleporter Foyer"
})
"bvx" = (
-/obj/machinery/ai_slipper{
- icon_state = "motion0"
- },
+/obj/machinery/ai_slipper,
/obj/machinery/turretid/stun{
control_area = "\improper AI Satellite Antechamber";
name = "AI Antechamber Turret Control";
@@ -34599,7 +34143,9 @@
/obj/machinery/newscaster/security_unit{
pixel_x = 32
},
-/obj/machinery/computer/security/mining,
+/obj/machinery/computer/security/mining{
+ dir = 8
+ },
/turf/simulated/floor/wood,
/area/crew_quarters/heads)
"bwd" = (
@@ -35309,9 +34855,7 @@
name = "\improper MiniSat Teleporter Foyer"
})
"bxx" = (
-/obj/machinery/ai_slipper{
- icon_state = "motion0"
- },
+/obj/machinery/ai_slipper,
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
@@ -35666,14 +35210,14 @@
},
/area/hallway/primary/port)
"bye" = (
+/obj/structure/bed/dogbed/ian,
+/mob/living/simple_animal/pet/dog/corgi/Ian,
/obj/machinery/computer/security/telescreen{
desc = "Used for watching Prison Wing holding areas.";
name = "Prison Monitor";
network = list("Prison");
pixel_y = 30
},
-/obj/structure/bed/dogbed/ian,
-/mob/living/simple_animal/pet/dog/corgi/Ian,
/turf/simulated/floor/wood,
/area/crew_quarters/heads)
"byf" = (
@@ -35707,7 +35251,6 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/disposalpipe/segment,
/obj/structure/disposalpipe/sortjunction{
dir = 1;
name = "Custodial Junction";
@@ -35980,6 +35523,14 @@
pixel_x = -3;
pixel_y = 5
},
+/obj/item/storage/briefcase{
+ pixel_x = -3;
+ pixel_y = 2
+ },
+/obj/item/storage/secure/briefcase{
+ pixel_x = 2;
+ pixel_y = -2
+ },
/turf/simulated/floor/carpet,
/area/security/detectives_office)
"byE" = (
@@ -36051,7 +35602,6 @@
},
/area/civilian/barber)
"byJ" = (
-/obj/machinery/computer/card,
/obj/machinery/light/small{
dir = 4
},
@@ -36062,6 +35612,9 @@
name = "Captain RC";
pixel_x = 32
},
+/obj/machinery/computer/card{
+ dir = 8
+ },
/turf/simulated/floor/wood,
/area/crew_quarters/captain{
name = "\improper Captain's Quarters"
@@ -36091,14 +35644,10 @@
/turf/simulated/floor/wood,
/area/crew_quarters/bar)
"byN" = (
-/obj/structure/closet/gmcloset{
- desc = "It's a storage unit.";
- name = "spare gear"
- },
-/obj/item/wrench,
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 8
},
+/obj/machinery/vending/bardrobe,
/turf/simulated/floor/wood,
/area/crew_quarters/bar)
"byO" = (
@@ -36147,7 +35696,7 @@
"byV" = (
/obj/machinery/door/airlock/maintenance{
name = "Engineering Foyer Maintenance";
- req_one_access_txt = "32;19"
+ req_one_access_txt = "32;19;70"
},
/turf/simulated/floor/plating,
/area/engine/break_room)
@@ -36224,9 +35773,7 @@
/turf/space,
/area/space/nearstation)
"bze" = (
-/obj/machinery/ai_slipper{
- icon_state = "motion0"
- },
+/obj/machinery/ai_slipper,
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
@@ -36372,9 +35919,7 @@
dir = 1;
layer = 2.9
},
-/obj/machinery/ai_slipper{
- icon_state = "motion0"
- },
+/obj/machinery/ai_slipper,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
@@ -36440,10 +35985,10 @@
name = "\improper MiniSat Exterior"
})
"bzr" = (
+/obj/machinery/vending/cigarette,
/obj/machinery/computer/security/telescreen/entertainment{
pixel_y = -30
},
-/obj/machinery/vending/cigarette,
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "cafeteria"
@@ -36606,9 +36151,7 @@
/obj/machinery/door/airlock/public/glass{
name = "Library"
},
-/turf/simulated/floor/plasteel{
- icon_state = "carpetsymbol"
- },
+/turf/simulated/floor/carpet,
/area/library)
"bzN" = (
/obj/machinery/door/firedoor,
@@ -36617,9 +36160,7 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/plasteel{
- icon_state = "carpetsymbol"
- },
+/turf/simulated/floor/carpet,
/area/library)
"bzO" = (
/obj/structure/sign/directions/engineering{
@@ -37063,7 +36604,9 @@
})
"bAT" = (
/obj/machinery/light,
-/obj/machinery/computer/station_alert,
+/obj/machinery/computer/station_alert{
+ dir = 1
+ },
/obj/machinery/computer/security/telescreen{
dir = 1;
name = "MiniSat Monitor";
@@ -37321,10 +36864,10 @@
/obj/machinery/light_switch{
pixel_x = -23
},
+/obj/machinery/cryopod/robot,
/obj/machinery/computer/cryopod/robot{
pixel_y = -28
},
-/obj/machinery/cryopod/robot,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "darkbluecorners"
@@ -37598,11 +37141,15 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/machinery/computer/secure_data,
+/obj/machinery/computer/secure_data{
+ dir = 1
+ },
/turf/simulated/floor/wood,
/area/crew_quarters/heads)
"bCa" = (
-/obj/machinery/computer/card,
+/obj/machinery/computer/card{
+ dir = 1
+ },
/turf/simulated/floor/wood,
/area/crew_quarters/heads)
"bCb" = (
@@ -37937,11 +37484,11 @@
/turf/simulated/floor/wood,
/area/crew_quarters/bar)
"bCJ" = (
-/obj/machinery/computer/arcade,
/obj/machinery/alarm{
dir = 8;
pixel_x = 24
},
+/obj/machinery/computer/arcade,
/obj/machinery/computer/security/telescreen/entertainment{
pixel_y = 32
},
@@ -38956,7 +38503,6 @@
/turf/simulated/floor/engine,
/area/engine/engineering)
"bEM" = (
-/obj/machinery/computer/atmos_alert,
/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";
@@ -38965,6 +38511,7 @@
/obj/machinery/camera{
c_tag = "Atmospherics - Control Room"
},
+/obj/machinery/computer/atmos_alert,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "caution"
@@ -39181,14 +38728,15 @@
name = "Arrivals"
})
"bFf" = (
-/obj/machinery/computer/monitor{
- name = "Grid Power Monitoring Computer"
- },
/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_x = 5;
pixel_y = -26
},
+/obj/machinery/computer/monitor{
+ dir = 1;
+ name = "Grid Power Monitoring Computer"
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -39274,11 +38822,6 @@
/area/security/vacantoffice)
"bFr" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/centcom{
- name = "Vacant Office";
- opacity = 1;
- req_access_txt = "32"
- },
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
@@ -39286,9 +38829,11 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/plasteel{
- icon_state = "carpetsymbol"
+/obj/machinery/door/airlock{
+ id_tag = null;
+ name = "Vacant Office"
},
+/turf/simulated/floor/wood,
/area/security/vacantoffice)
"bFs" = (
/obj/structure/cable/yellow{
@@ -40125,11 +39670,13 @@
/turf/simulated/floor/wood,
/area/security/vacantoffice)
"bHi" = (
-/obj/machinery/computer/message_monitor,
/obj/machinery/alarm{
dir = 4;
pixel_x = -24
},
+/obj/machinery/computer/message_monitor{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "grimy"
},
@@ -40307,13 +39854,13 @@
})
"bHC" = (
/obj/machinery/light,
+/mob/living/simple_animal/pet/dog/fox/Renault,
/obj/machinery/computer/security/telescreen{
dir = 1;
name = "MiniSat Monitor";
network = list("MiniSat","tcomm");
pixel_y = -29
},
-/mob/living/simple_animal/pet/dog/fox/Renault,
/turf/simulated/floor/carpet,
/area/crew_quarters/captain{
name = "\improper Captain's Quarters"
@@ -40430,12 +39977,7 @@
},
/area/crew_quarters/bar)
"bHR" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced/tinted{
- dir = 5;
- max_integrity = 120;
- reinf = 0
- },
+/obj/effect/spawner/window/reinforced/polarized,
/turf/simulated/floor/plating,
/area/crew_quarters/bar)
"bHS" = (
@@ -40519,18 +40061,9 @@
icon_state = "neutralcorner"
},
/area/atmos)
-"bIe" = (
-/obj/machinery/atmospherics/binary/volume_pump/on{
- dir = 4;
- name = "External to Filter"
- },
-/turf/simulated/floor/plasteel{
- icon_state = "neutralcorner"
- },
-/area/atmos)
"bIf" = (
-/obj/machinery/atmospherics/pipe/simple/visible/purple{
- dir = 10
+/obj/machinery/atmospherics/pipe/simple/hidden/purple{
+ dir = 4
},
/turf/simulated/floor/plasteel{
icon_state = "neutralcorner"
@@ -40538,12 +40071,16 @@
/area/atmos)
"bIg" = (
/obj/machinery/computer/general_air_control{
+ dir = 8;
frequency = 1443;
level = 3;
name = "Distribution and Waste Monitor";
pixel_y = -2;
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/machinery/atmospherics/pipe/simple/hidden/purple{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "caution"
@@ -40561,11 +40098,10 @@
},
/area/medical/reception)
"bIi" = (
-/obj/structure/table,
-/obj/item/storage/belt/utility,
-/obj/item/t_scanner,
-/obj/item/t_scanner,
-/obj/item/t_scanner,
+/obj/machinery/atmospherics/binary/volume_pump/on{
+ dir = 4;
+ name = "External to Filter"
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "caution"
@@ -40577,6 +40113,9 @@
d2 = 2;
icon_state = "1-2"
},
+/obj/machinery/atmospherics/pipe/simple/visible/purple{
+ dir = 10
+ },
/turf/simulated/floor/plasteel,
/area/atmos)
"bIk" = (
@@ -40832,17 +40371,18 @@
name = "\improper Auxiliary Restrooms"
})
"bIY" = (
-/obj/machinery/computer/general_air_control{
- frequency = 1441;
- 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/machinery/requests_console{
department = "Atmospherics";
departmentType = 4;
name = "Atmos RC";
pixel_x = 30
},
+/obj/machinery/computer/general_air_control{
+ dir = 8;
+ frequency = 1441;
+ 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")
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "caution"
@@ -41352,9 +40892,8 @@
/area/crew_quarters/bar)
"bJK" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/centcom{
- name = "Club";
- opacity = 1
+/obj/machinery/door/airlock/public{
+ name = "Club"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -41465,9 +41004,6 @@
},
/area/atmos)
"bJU" = (
-/obj/machinery/atmospherics/pipe/simple/visible/purple{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
@@ -41484,9 +41020,6 @@
name = "Atmospherics Monitoring";
req_access_txt = "24"
},
-/obj/machinery/atmospherics/pipe/simple/visible/purple{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
@@ -41507,9 +41040,7 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/machinery/atmospherics/pipe/simple/visible/purple{
- dir = 10
- },
+/obj/machinery/atmospherics/pipe/simple/visible/purple,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 1
},
@@ -41528,7 +41059,11 @@
/turf/simulated/floor/plasteel,
/area/atmos)
"bJZ" = (
-/obj/structure/closet/crate,
+/obj/structure/table,
+/obj/item/storage/belt/utility,
+/obj/item/t_scanner,
+/obj/item/t_scanner,
+/obj/item/t_scanner,
/turf/simulated/floor/plasteel,
/area/atmos)
"bKa" = (
@@ -41569,14 +41104,15 @@
/turf/simulated/floor/plasteel,
/area/atmos)
"bKg" = (
+/obj/machinery/atmospherics/pipe/simple/visible/cyan,
/obj/machinery/computer/general_air_control/large_tank_control{
+ dir = 8;
frequency = 1441;
input_tag = "waste_in";
name = "Gas Mix Tank Control";
output_tag = "waste_out";
sensors = list("waste_sensor" = "Tank")
},
-/obj/machinery/atmospherics/pipe/simple/visible/cyan,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "green"
@@ -42269,9 +41805,8 @@
icon_state = "4-8"
},
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/centcom{
- name = "Club";
- opacity = 1
+/obj/machinery/door/airlock/public{
+ name = "Club"
},
/turf/simulated/floor/plasteel{
icon_state = "bar"
@@ -42283,11 +41818,6 @@
d2 = 4;
icon_state = "2-4"
},
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 1
},
@@ -42451,9 +41981,8 @@
},
/area/atmos)
"bLU" = (
-/obj/machinery/atmospherics/binary/volume_pump/on{
- dir = 8;
- name = "Air to External"
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 4
},
/obj/structure/disposalpipe/segment{
dir = 4
@@ -42463,7 +41992,7 @@
},
/area/atmos)
"bLV" = (
-/obj/machinery/atmospherics/pipe/simple/visible/cyan{
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
dir = 4
},
/obj/structure/disposalpipe/segment{
@@ -42485,7 +42014,7 @@
pixel_y = -26;
req_access_txt = "24"
},
-/obj/machinery/atmospherics/pipe/simple/visible/cyan{
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
dir = 4
},
/obj/machinery/disposal,
@@ -42905,6 +42434,10 @@
/obj/effect/decal/warning_stripes/yellow/partial{
dir = 1
},
+/obj/machinery/ticket_machine{
+ layer = 4;
+ pixel_x = 32
+ },
/turf/simulated/floor/plasteel,
/area/bridge/meeting_room{
name = "\improper Command Hallway"
@@ -42932,10 +42465,6 @@
},
/obj/effect/decal/warning_stripes/arrow,
/obj/effect/decal/warning_stripes/yellow/partial,
-/obj/machinery/ticket_machine{
- layer = 4;
- pixel_x = -32
- },
/turf/simulated/floor/plasteel,
/area/bridge/meeting_room{
name = "\improper Command Hallway"
@@ -43301,7 +42830,9 @@
name = "E.V.A. Storage"
})
"bNN" = (
-/obj/machinery/computer/card/minor/rd,
+/obj/machinery/computer/card/minor/rd{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "cafeteria"
@@ -43316,7 +42847,10 @@
/obj/machinery/light{
dir = 8
},
-/obj/machinery/atmospherics/pipe/simple/visible/cyan,
+/obj/machinery/atmospherics/binary/volume_pump/on{
+ dir = 1;
+ name = "Air to External"
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "caution"
@@ -43366,17 +42900,6 @@
},
/turf/simulated/floor/plating,
/area/security/detectives_office)
-"bNW" = (
-/obj/effect/spawner/window/reinforced,
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/turf/simulated/floor/plating,
-/area/hallway/secondary/entry{
- name = "Arrivals"
- })
"bNX" = (
/obj/structure/window/reinforced{
dir = 4
@@ -43597,15 +43120,15 @@
/area/library)
"bOw" = (
/obj/structure/table/wood,
-/obj/machinery/computer/security/telescreen/entertainment{
- pixel_x = -32
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
},
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
},
+/obj/machinery/computer/security/telescreen/entertainment{
+ pixel_x = -32
+ },
/turf/simulated/floor/wood,
/area/library)
"bOx" = (
@@ -44227,16 +43750,6 @@
/area/toxins/xenobiology{
name = "\improper Secure Lab"
})
-"bPL" = (
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/security/podbay)
"bPO" = (
/obj/structure/foodcart,
/turf/simulated/floor/plasteel{
@@ -44252,16 +43765,6 @@
/area/security/vacantoffice)
"bPS" = (
/obj/effect/decal/warning_stripes/southeast,
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 4;
- icon_state = "1-4"
- },
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 8;
- icon_state = "1-8"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel,
@@ -44332,7 +43835,11 @@
/obj/structure/window/reinforced{
dir = 1
},
-/obj/structure/closet/secure_closet/medical2,
+/obj/structure/table,
+/obj/item/tank/internals/anesthetic,
+/obj/item/clothing/mask/breath/medical,
+/obj/item/storage/firstaid/machine,
+/obj/item/storage/firstaid/machine,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -44624,22 +44131,12 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/machinery/firealarm{
- dir = 8;
+/obj/machinery/button/windowtint{
+ dir = 4;
pixel_x = -26
},
/turf/simulated/floor/wood,
/area/crew_quarters/bar)
-"bQN" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/public/glass{
- name = "Pod Bay"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/plating,
-/area/hallway/secondary/entry{
- name = "Arrivals"
- })
"bQO" = (
/obj/structure/cable/yellow{
d1 = 1;
@@ -44665,6 +44162,10 @@
/area/crew_quarters/bar)
"bQQ" = (
/obj/machinery/vending/coffee,
+/obj/machinery/firealarm{
+ dir = 1;
+ pixel_y = -24
+ },
/turf/simulated/floor/carpet,
/area/crew_quarters/bar)
"bQR" = (
@@ -44706,7 +44207,6 @@
pixel_x = 6;
pixel_y = -30
},
-/obj/machinery/computer/card/minor/cmo,
/obj/machinery/keycard_auth{
pixel_x = -26;
pixel_y = -7
@@ -44717,6 +44217,9 @@
pixel_x = -26;
pixel_y = 4
},
+/obj/machinery/computer/card/minor/cmo{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "barber"
@@ -45172,19 +44675,6 @@
/area/ai_monitored/storage/eva{
name = "E.V.A. Storage"
})
-"bRR" = (
-/obj/structure/chair,
-/obj/effect/landmark/start{
- name = "Civilian"
- },
-/obj/machinery/light{
- dir = 1
- },
-/obj/effect/decal/warning_stripes/north,
-/turf/simulated/floor/plasteel,
-/area/hallway/secondary/entry{
- name = "Arrivals"
- })
"bRS" = (
/obj/structure/cable/yellow{
d1 = 4;
@@ -45333,11 +44823,11 @@
c_tag = "Club - Aft";
dir = 1
},
+/obj/item/clothing/mask/cigarette/pipe,
+/obj/structure/table/wood,
/obj/machinery/computer/security/telescreen/entertainment{
pixel_y = -29
},
-/obj/item/clothing/mask/cigarette/pipe,
-/obj/structure/table/wood,
/turf/simulated/floor/carpet,
/area/crew_quarters/bar)
"bSk" = (
@@ -45421,17 +44911,18 @@
name = "\improper Command Hallway"
})
"bSs" = (
+/obj/machinery/atmospherics/pipe/simple/visible/green,
+/obj/structure/window/reinforced{
+ dir = 4
+ },
/obj/machinery/computer/general_air_control/large_tank_control{
+ dir = 8;
frequency = 1441;
input_tag = "n2o_in";
name = "Nitrous Oxide Supply Control";
output_tag = "n2o_out";
sensors = list("n2o_sensor" = "Tank")
},
-/obj/machinery/atmospherics/pipe/simple/visible/green,
-/obj/structure/window/reinforced{
- dir = 4
- },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "escape"
@@ -45804,33 +45295,6 @@
icon_state = "whiteblue"
},
/area/medical/paramedic)
-"bTf" = (
-/obj/machinery/computer/security{
- network = list("SS13","Research Outpost","Mining Outpost")
- },
-/obj/machinery/light{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/security/podbay)
-"bTg" = (
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 8;
- icon_state = "1-8"
- },
-/obj/effect/landmark/start{
- name = "Security Pod Pilot"
- },
-/obj/structure/chair/office/dark{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/security/podbay)
"bTh" = (
/obj/machinery/computer/account_database,
/turf/simulated/floor/bluegrid,
@@ -46103,23 +45567,13 @@
/turf/simulated/floor/plasteel,
/area/gateway)
"bTH" = (
-/obj/machinery/camera{
- c_tag = "Arrivals - Aft Arm - Far";
- dir = 1
+/obj/machinery/newscaster{
+ pixel_y = -32
},
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
+/turf/simulated/floor/plasteel{
+ icon_state = "dark"
},
-/obj/effect/decal/warning_stripes/south,
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
- dir = 4
- },
-/turf/simulated/floor/plasteel,
-/area/hallway/secondary/entry{
- name = "Arrivals"
- })
+/area/crew_quarters/courtroom)
"bTI" = (
/obj/machinery/hologram/holopad,
/obj/structure/cable/yellow{
@@ -46131,17 +45585,6 @@
/area/teleporter{
name = "\improper Teleporter Room"
})
-"bTJ" = (
-/obj/structure/cable/yellow{
- d1 = 2;
- d2 = 4;
- icon_state = "2-4"
- },
-/obj/effect/decal/warning_stripes/south,
-/turf/simulated/floor/plasteel,
-/area/hallway/secondary/entry{
- name = "Arrivals"
- })
"bTK" = (
/obj/machinery/alarm{
dir = 1;
@@ -46468,12 +45911,6 @@
/area/construction/hallway{
name = "\improper MiniSat Exterior"
})
-"bUB" = (
-/obj/effect/decal/warning_stripes/east,
-/turf/simulated/floor/plasteel,
-/area/hallway/secondary/entry{
- name = "Arrivals"
- })
"bUC" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 9
@@ -46506,19 +45943,15 @@
})
"bUI" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/centcom{
- name = "Quiet Room";
- opacity = 1
- },
-/turf/simulated/floor/plasteel{
- icon_state = "carpetsymbol"
+/obj/machinery/door/airlock/glass{
+ name = "Quiet Room"
},
+/turf/simulated/floor/carpet,
/area/library)
"bUJ" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/centcom{
- name = "Quiet Room";
- opacity = 1
+/obj/machinery/door/airlock/glass{
+ name = "Quiet Room"
},
/obj/structure/cable/yellow{
d1 = 1;
@@ -46527,9 +45960,7 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/plasteel{
- icon_state = "carpetsymbol"
- },
+/turf/simulated/floor/carpet,
/area/library)
"bUK" = (
/obj/machinery/door/morgue{
@@ -46576,73 +46007,23 @@
name = "E.V.A. Storage"
})
"bUO" = (
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
+/obj/machinery/door/airlock/external{
+ id_tag = "specops_home";
+ locked = 1
},
-/obj/effect/decal/warning_stripes/south,
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 1
- },
-/turf/simulated/floor/plasteel,
-/area/hallway/secondary/entry{
- name = "Arrivals"
- })
+/turf/simulated/floor/plating,
+/area/hallway/secondary/entry)
"bUP" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel,
/area/ai_monitored/storage/eva{
name = "E.V.A. Storage"
})
-"bUQ" = (
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/effect/decal/warning_stripes/south,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/turf/simulated/floor/plasteel,
-/area/hallway/secondary/entry{
- name = "Arrivals"
- })
"bUR" = (
/obj/machinery/door/airlock/welded,
/turf/simulated/floor/plating,
/area/maintenance/aft)
"bUS" = (
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/effect/decal/warning_stripes/south,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 1
- },
-/turf/simulated/floor/plasteel,
-/area/hallway/secondary/entry{
- name = "Arrivals"
- })
-"bUT" = (
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/effect/decal/warning_stripes/southwestcorner,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
@@ -46667,18 +46048,9 @@
name = "Station Intercom (General)";
pixel_y = -25
},
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/effect/decal/warning_stripes/south,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 4
- },
/turf/simulated/floor/plasteel,
/area/hallway/secondary/entry{
name = "Arrivals"
@@ -46743,8 +46115,8 @@
"bVd" = (
/obj/structure/table/wood,
/obj/item/folder,
-/obj/item/stamp/centcom,
/obj/item/pen/multi/fountain,
+/obj/item/stamp/rep,
/turf/simulated/floor/carpet,
/area/ntrep)
"bVe" = (
@@ -47132,11 +46504,6 @@
d2 = 8;
icon_state = "1-8"
},
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
/obj/effect/decal/warning_stripes/east,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -47321,11 +46688,6 @@
dir = 4;
pixel_x = -24
},
-/obj/structure/cable/yellow{
- d1 = 2;
- d2 = 4;
- icon_state = "2-4"
- },
/obj/effect/decal/warning_stripes/southwest,
/turf/simulated/floor/plasteel,
/area/teleporter{
@@ -47471,18 +46833,12 @@
name = "E.V.A. Storage"
})
"bWB" = (
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/obj/effect/decal/warning_stripes/south,
/turf/simulated/floor/plasteel,
/area/teleporter{
name = "\improper Teleporter Room"
})
"bWC" = (
-/obj/structure/cable/yellow,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "vault"
@@ -47517,7 +46873,6 @@
name = "\improper Teleporter Room"
})
"bWF" = (
-/obj/structure/cable/yellow,
/obj/machinery/shieldwallgen,
/turf/simulated/floor/plasteel{
dir = 4;
@@ -47615,11 +46970,6 @@
/obj/item/clothing/mask/gas,
/obj/structure/table,
/obj/item/radio/off,
-/obj/structure/cable/yellow{
- d1 = 2;
- d2 = 8;
- icon_state = "2-8"
- },
/obj/effect/decal/warning_stripes/yellow/hollow,
/turf/simulated/floor/plasteel,
/area/teleporter{
@@ -48141,7 +47491,9 @@
},
/area/crew_quarters/kitchen)
"bXY" = (
-/obj/machinery/computer/teleporter,
+/obj/machinery/computer/teleporter{
+ dir = 1
+ },
/turf/simulated/floor/plating,
/area/teleporter{
name = "\improper Teleporter Room"
@@ -48170,17 +47522,18 @@
/turf/simulated/floor/wood,
/area/blueshield)
"bYc" = (
+/obj/machinery/atmospherics/pipe/simple/visible/green,
+/obj/structure/window/reinforced{
+ dir = 4
+ },
/obj/machinery/computer/general_air_control/large_tank_control{
+ dir = 8;
frequency = 1441;
input_tag = "tox_in";
name = "Toxin Supply Control";
output_tag = "tox_out";
sensors = list("tox_sensor" = "Tank")
},
-/obj/machinery/atmospherics/pipe/simple/visible/green,
-/obj/structure/window/reinforced{
- dir = 4
- },
/turf/simulated/floor/plasteel{
icon_state = "purplefull"
},
@@ -48374,13 +47727,13 @@
},
/area/crew_quarters/kitchen)
"bYv" = (
-/obj/machinery/computer/security/telescreen/entertainment{
- pixel_x = 30
- },
/obj/machinery/photocopier,
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 8
},
+/obj/machinery/computer/security/telescreen/entertainment{
+ pixel_x = 30
+ },
/turf/simulated/floor/wood,
/area/library)
"bYw" = (
@@ -48489,7 +47842,9 @@
pixel_y = -24;
req_access_txt = "67"
},
-/obj/machinery/computer/crew,
+/obj/machinery/computer/crew{
+ dir = 1
+ },
/turf/simulated/floor/wood,
/area/blueshield)
"bYK" = (
@@ -48524,7 +47879,9 @@
pixel_y = -24;
req_access_txt = "73"
},
-/obj/machinery/computer/secure_data,
+/obj/machinery/computer/secure_data{
+ dir = 1
+ },
/turf/simulated/floor/wood,
/area/ntrep)
"bYO" = (
@@ -49174,18 +48531,6 @@
/obj/effect/decal/warning_stripes/west,
/turf/simulated/floor/plating,
/area/maintenance/starboard)
-"caq" = (
-/obj/machinery/door_control{
- desc = "A remote control-switch for the pod doors.";
- id = "escapepodbay";
- name = "Pod Door Control";
- pixel_x = -24;
- req_access_txt = "13"
- },
-/turf/simulated/floor/engine,
-/area/hallway/secondary/entry{
- name = "Arrivals"
- })
"car" = (
/turf/simulated/floor/plasteel{
dir = 1;
@@ -49446,16 +48791,11 @@
/turf/simulated/floor/plasteel,
/area/crew_quarters/kitchen)
"caT" = (
-/obj/structure/closet{
- name = "spare parts locker"
- },
-/obj/item/rack_parts,
-/obj/item/rack_parts,
-/obj/item/wrench,
/obj/structure/window/reinforced{
dir = 4
},
/obj/effect/decal/warning_stripes/yellow,
+/obj/machinery/vending/chefdrobe,
/turf/simulated/floor/plasteel,
/area/crew_quarters/kitchen)
"caU" = (
@@ -49506,8 +48846,8 @@
/turf/simulated/floor/plating,
/area/crew_quarters/hor)
"caZ" = (
-/mob/living/simple_animal/mouse,
/obj/structure/disposalpipe/segment,
+/mob/living/simple_animal/mouse,
/turf/simulated/floor/plating,
/area/maintenance/starboard)
"cba" = (
@@ -49622,12 +48962,8 @@
/turf/simulated/floor/engine/co2,
/area/atmos)
"cbn" = (
-/obj/structure/table/glass,
-/obj/item/book/manual/sop_service{
- pixel_x = 2;
- pixel_y = 5
- },
/obj/effect/decal/warning_stripes/south,
+/obj/machinery/vending/hydrodrobe,
/turf/simulated/floor/plasteel,
/area/hydroponics)
"cbo" = (
@@ -49726,7 +49062,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
},
-/obj/structure/disposalpipe/segment,
/obj/structure/disposalpipe/sortjunction{
dir = 1;
icon_state = "pipe-j2s";
@@ -50318,17 +49653,18 @@
},
/area/hallway/primary/central)
"ccT" = (
+/obj/machinery/atmospherics/pipe/simple/visible/green,
+/obj/structure/window/reinforced{
+ dir = 4
+ },
/obj/machinery/computer/general_air_control/large_tank_control{
+ dir = 8;
frequency = 1441;
input_tag = "co2_in";
name = "Carbon Dioxide Supply Control";
output_tag = "co2_out";
sensors = list("co2_sensor" = "Tank")
},
-/obj/machinery/atmospherics/pipe/simple/visible/green,
-/obj/structure/window/reinforced{
- dir = 4
- },
/turf/simulated/floor/plasteel{
icon_state = "vault"
},
@@ -50655,15 +49991,16 @@
},
/area/gateway)
"cdC" = (
-/obj/machinery/power/solar_control{
- id = "aftport";
- name = "Aft Port Solar Control"
- },
/obj/structure/cable{
d2 = 4;
icon_state = "0-4"
},
/obj/structure/cable,
+/obj/machinery/power/solar_control{
+ dir = 1;
+ id = "aftport";
+ name = "Aft Port Solar Control"
+ },
/turf/simulated/floor/plating,
/area/maintenance/portsolar)
"cdD" = (
@@ -50697,16 +50034,6 @@
/area/maintenance/fpmaint2{
name = "Port Maintenance"
})
-"cdG" = (
-/obj/machinery/light{
- dir = 1;
- on = 1
- },
-/obj/structure/reagent_dispensers/watertank,
-/turf/simulated/floor/plasteel,
-/area/hallway/secondary/entry{
- name = "Arrivals"
- })
"cdH" = (
/obj/structure/closet,
/obj/item/flashlight,
@@ -50777,16 +50104,6 @@
icon_state = "vault"
},
/area/atmos)
-"cdR" = (
-/obj/structure/grille,
-/obj/structure/sign/securearea{
- desc = "A warning sign which reads 'KEEP CLEAR OF DOCKING AREA'.";
- name = "KEEP CLEAR: DOCKING AREA";
- pixel_y = 32
- },
-/obj/effect/decal/warning_stripes/south,
-/turf/simulated/floor/engine/vacuum,
-/area/space/nearstation)
"cdS" = (
/obj/machinery/atmospherics/binary/pump{
dir = 8;
@@ -50818,17 +50135,6 @@
/area/medical/medbay2{
name = "Medbay Storage"
})
-"cdV" = (
-/obj/machinery/door/poddoor/multi_tile/four_tile_hor{
- id_tag = "escapepodbay"
- },
-/obj/structure/spacepoddoor{
- dir = 4
- },
-/turf/simulated/floor/engine,
-/area/hallway/secondary/entry{
- name = "Arrivals"
- })
"cdW" = (
/turf/simulated/floor/plasteel{
dir = 8;
@@ -51123,14 +50429,6 @@
icon_state = "whiteblue"
},
/area/medical/paramedic)
-"ceM" = (
-/obj/structure/spacepoddoor{
- dir = 4
- },
-/turf/simulated/floor/engine,
-/area/hallway/secondary/entry{
- name = "Arrivals"
- })
"ceN" = (
/obj/structure/cable/yellow{
d1 = 1;
@@ -51211,11 +50509,11 @@
/turf/simulated/floor/mech_bay_recharge_floor,
/area/maintenance/aft)
"ceV" = (
-/obj/machinery/computer/mech_bay_power_console,
/obj/structure/cable/yellow{
d2 = 2;
icon_state = "0-2"
},
+/obj/machinery/computer/mech_bay_power_console,
/turf/simulated/floor/bluegrid,
/area/maintenance/aft)
"ceW" = (
@@ -51542,7 +50840,7 @@
name = "Station Intercom (Medbay)";
pixel_y = 30
},
-/obj/structure/closet/wardrobe/medical_white,
+/obj/machinery/vending/medidrobe,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "whiteblue"
@@ -51656,7 +50954,6 @@
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/visible/yellow,
-/obj/machinery/atmospherics/pipe/simple/visible/yellow,
/turf/simulated/floor/plating,
/area/maintenance/incinerator)
"cfM" = (
@@ -51688,6 +50985,7 @@
/area/atmos)
"cfQ" = (
/obj/machinery/atmospherics/pipe/simple/visible/cyan,
+/obj/machinery/meter,
/turf/simulated/floor/plasteel,
/area/atmos)
"cfR" = (
@@ -52468,6 +51766,9 @@
/obj/effect/landmark{
name = "lightsout"
},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -52485,6 +51786,12 @@
icon_state = "1-2"
},
/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 10
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -52643,7 +51950,9 @@
dir = 8;
pixel_x = 24
},
-/obj/machinery/computer/crew,
+/obj/machinery/computer/crew{
+ dir = 8
+ },
/turf/simulated/floor/plasteel{
dir = 6;
icon_state = "whiteblue"
@@ -52699,6 +52008,8 @@
icon_state = "1-2"
},
/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -52985,16 +52296,17 @@
/area/atmos)
"ciN" = (
/obj/structure/window/reinforced,
+/obj/machinery/atmospherics/pipe/simple/visible/green{
+ dir = 4
+ },
/obj/machinery/computer/general_air_control/large_tank_control{
+ dir = 1;
frequency = 1441;
input_tag = "n2_in";
name = "Nitrogen Supply Control";
output_tag = "n2_out";
sensors = list("n2_sensor" = "Tank")
},
-/obj/machinery/atmospherics/pipe/simple/visible/green{
- dir = 4
- },
/turf/simulated/floor/plasteel{
icon_state = "redfull"
},
@@ -53040,16 +52352,17 @@
/area/atmos)
"ciR" = (
/obj/structure/window/reinforced,
+/obj/machinery/atmospherics/pipe/simple/visible/green{
+ dir = 4
+ },
/obj/machinery/computer/general_air_control/large_tank_control{
+ dir = 1;
frequency = 1441;
input_tag = "o2_in";
name = "Oxygen Supply Control";
output_tag = "o2_out";
sensors = list("o2_sensor" = "Tank")
},
-/obj/machinery/atmospherics/pipe/simple/visible/green{
- dir = 4
- },
/turf/simulated/floor/plasteel{
icon_state = "bluefull"
},
@@ -53101,7 +52414,11 @@
/area/atmos)
"ciV" = (
/obj/structure/window/reinforced,
+/obj/machinery/atmospherics/pipe/simple/visible/green{
+ dir = 4
+ },
/obj/machinery/computer/general_air_control/large_tank_control{
+ dir = 1;
frequency = 1443;
input_tag = "air_in";
name = "Mixed Air Supply Control";
@@ -53109,9 +52426,6 @@
pressure_setting = 2000;
sensors = list("air_sensor" = "Tank")
},
-/obj/machinery/atmospherics/pipe/simple/visible/green{
- dir = 4
- },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "barber"
@@ -53384,6 +52698,8 @@
icon_state = "1-2"
},
/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel{
icon_state = "whiteblue"
},
@@ -53693,8 +53009,9 @@
},
/area/atmos)
"ckm" = (
-/obj/machinery/atmospherics/pipe/simple/visible/cyan{
- dir = 4
+/obj/machinery/atmospherics/binary/valve/digital/open{
+ dir = 8;
+ name = "Mixed Air Outlet Valve"
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -54191,10 +53508,12 @@
})
"cll" = (
/obj/item/wrench,
-/obj/item/clothing/suit/apron,
-/obj/item/clothing/accessory/armband/hydro,
/obj/structure/table/glass,
/obj/effect/decal/warning_stripes/northwest,
+/obj/item/book/manual/sop_service{
+ pixel_x = 2;
+ pixel_y = 5
+ },
/turf/simulated/floor/plasteel,
/area/hydroponics)
"clm" = (
@@ -54952,11 +54271,11 @@
icon_state = "map-left-MS";
pixel_y = 32
},
+/obj/item/storage/box/donkpockets,
+/obj/structure/table/glass,
/obj/machinery/computer/security/telescreen/entertainment{
pixel_x = -32
},
-/obj/item/storage/box/donkpockets,
-/obj/structure/table/glass,
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "cafeteria"
@@ -55237,6 +54556,7 @@
pixel_x = -31
},
/obj/machinery/computer/turbine_computer{
+ dir = 1;
id = "incineratorturbine"
},
/turf/simulated/floor/plating,
@@ -55736,10 +55056,10 @@
/obj/item/multitool{
pixel_x = 3
},
+/obj/effect/decal/warning_stripes/east,
/obj/machinery/computer/guestpass{
pixel_y = 30
},
-/obj/effect/decal/warning_stripes/east,
/turf/simulated/floor/plasteel,
/area/toxins/lab)
"coI" = (
@@ -56135,6 +55455,8 @@
icon_state = "1-2"
},
/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel{
icon_state = "whitebluefull"
},
@@ -56180,7 +55502,6 @@
dir = 4;
network = list("SS13","Medbay")
},
-/obj/structure/filingcabinet/filingcabinet,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "whiteblue"
@@ -56249,10 +55570,10 @@
/area/medical/reception)
"cpN" = (
/obj/structure/table,
-/obj/machinery/computer/guestpass,
/obj/machinery/camera{
c_tag = "Medbay Surgery 1 North"
},
+/obj/machinery/computer/guestpass,
/turf/simulated/floor/plasteel{
dir = 9;
icon_state = "whiteblue"
@@ -56260,7 +55581,9 @@
/area/medical/reception)
"cpO" = (
/obj/structure/table,
-/obj/machinery/computer/crew,
+/obj/machinery/computer/crew{
+ dir = 8
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "whiteblue"
@@ -56568,12 +55891,14 @@
},
/area/medical/research)
"cqv" = (
-/obj/machinery/computer/rdconsole/core,
/obj/machinery/alarm{
dir = 4;
pixel_x = -24
},
/obj/effect/decal/warning_stripes/south,
+/obj/machinery/computer/rdconsole/core{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/toxins/lab)
"cqw" = (
@@ -56884,6 +56209,8 @@
icon_state = "1-2"
},
/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "whiteblue"
@@ -57829,13 +57156,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
- },
/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -58101,7 +57424,9 @@
/turf/simulated/floor/plating/airless,
/area/maintenance/incinerator)
"ctw" = (
-/obj/machinery/computer/arcade/orion_trail,
+/obj/machinery/computer/arcade/orion_trail{
+ dir = 4
+ },
/turf/simulated/floor/carpet/arcade,
/area/crew_quarters/fitness{
name = "\improper Arcade"
@@ -58266,12 +57591,14 @@
},
/area/medical/surgery1)
"ctW" = (
-/obj/machinery/computer/operating,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
+/obj/machinery/computer/operating{
+ dir = 8
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -58332,19 +57659,18 @@
},
/area/medical/exam_room)
"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
},
+/obj/machinery/vending/chemdrobe,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
/area/medical/chemistry)
"cuj" = (
-/obj/machinery/computer/rdconsole/experiment,
/obj/effect/decal/warning_stripes/south,
+/obj/machinery/computer/rdconsole/experiment,
/turf/simulated/floor/plasteel,
/area/toxins/explab)
"cuk" = (
@@ -58667,7 +57993,9 @@
/area/medical/reception)
"cuU" = (
/obj/structure/table,
-/obj/machinery/computer/crew,
+/obj/machinery/computer/crew{
+ dir = 1
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "whiteblue"
@@ -58773,6 +58101,7 @@
maxcharge = 15000
},
/obj/effect/decal/warning_stripes/south,
+/obj/machinery/recharger,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "whitepurple"
@@ -59165,7 +58494,9 @@
/area/medical/reception)
"cvM" = (
/obj/structure/table,
-/obj/machinery/computer/crew,
+/obj/machinery/computer/crew{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "whiteblue"
},
@@ -60231,6 +59562,10 @@
name = "privacy shutters";
opacity = 0
},
+/obj/structure/cable/yellow{
+ d2 = 2;
+ icon_state = "0-2"
+ },
/turf/simulated/floor/plating,
/area/medical/cmo)
"cyt" = (
@@ -60483,7 +59818,6 @@
},
/area/medical/research)
"czc" = (
-/obj/machinery/computer/aifixer,
/obj/machinery/requests_console{
announcementConsole = 1;
department = "Research Director's Desk";
@@ -60495,6 +59829,9 @@
/obj/structure/window/reinforced{
dir = 4
},
+/obj/machinery/computer/aifixer{
+ dir = 8
+ },
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "cafeteria"
@@ -60540,6 +59877,16 @@
/obj/machinery/camera{
c_tag = "Medbay Surgery 1 North"
},
+/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{
dir = 8;
icon_state = "barber"
@@ -60572,6 +59919,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/cable/yellow{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -60737,6 +60089,11 @@
pixel_y = 2
},
/obj/item/clothing/accessory/stethoscope,
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "barber"
@@ -60763,6 +60120,11 @@
/obj/item/folder/white,
/obj/item/stamp/cmo,
/obj/item/clothing/glasses/hud/health,
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "barber"
@@ -60941,10 +60303,12 @@
},
/area/crew_quarters/hor)
"czT" = (
-/obj/machinery/computer/robotics,
/obj/structure/window/reinforced{
dir = 4
},
+/obj/machinery/computer/robotics{
+ dir = 8
+ },
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "cafeteria"
@@ -61340,7 +60704,6 @@
/turf/simulated/floor/plating,
/area/toxins/test_area)
"cAM" = (
-/obj/machinery/computer/area_atmos,
/obj/machinery/light/small{
dir = 1
},
@@ -61348,6 +60711,7 @@
pixel_y = 32
},
/obj/effect/decal/warning_stripes/northeast,
+/obj/machinery/computer/area_atmos,
/turf/simulated/floor/plasteel,
/area/toxins/storage)
"cAN" = (
@@ -61357,10 +60721,12 @@
},
/area/crew_quarters/hor)
"cAO" = (
-/obj/machinery/computer/mecha,
/obj/structure/window/reinforced{
dir = 4
},
+/obj/machinery/computer/mecha{
+ dir = 8
+ },
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "cafeteria"
@@ -61507,13 +60873,13 @@
/turf/space,
/area/solar/port)
"cBf" = (
+/obj/structure/table/reinforced,
/obj/machinery/computer/security/telescreen{
desc = "Used for watching the RD's goons from the safety of his office.";
name = "Research Monitor";
network = list("RD");
pixel_y = 2
},
-/obj/structure/table/reinforced,
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "cafeteria"
@@ -61610,12 +60976,27 @@
name = "Chief Medical Officer's Office";
req_access_txt = "40"
},
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
+/obj/structure/cable/yellow{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "barber"
},
/area/medical/cmo)
"cBs" = (
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "barber"
@@ -61625,6 +61006,11 @@
/obj/effect/landmark/start{
name = "Chief Medical Officer"
},
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "barber"
@@ -61632,6 +61018,16 @@
/area/medical/cmo)
"cBu" = (
/obj/machinery/hologram/holopad,
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "barber"
@@ -61683,12 +61079,14 @@
},
/area/medical/genetics_cloning)
"cBz" = (
-/obj/machinery/computer/scan_consolenew,
/obj/machinery/camera{
c_tag = "Genetics Lab";
dir = 4;
network = list("SS13","Medbay")
},
+/obj/machinery/computer/scan_consolenew{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "whitebluefull"
},
@@ -61729,7 +61127,9 @@
},
/area/medical/genetics)
"cBD" = (
-/obj/machinery/computer/scan_consolenew,
+/obj/machinery/computer/scan_consolenew{
+ dir = 8
+ },
/turf/simulated/floor/plasteel{
icon_state = "whitebluefull"
},
@@ -62615,9 +62015,8 @@
/obj/machinery/light_switch{
pixel_y = 28
},
-/obj/structure/rack,
/obj/effect/decal/warning_stripes/south,
-/obj/item/painter,
+/obj/machinery/vending/atmosdrobe,
/turf/simulated/floor/plasteel,
/area/atmos)
"cDe" = (
@@ -62694,10 +62093,6 @@
/obj/effect/decal/warning_stripes/north,
/turf/simulated/floor/plasteel,
/area/medical/cryo)
-"cDn" = (
-/obj/effect/decal/warning_stripes/south,
-/turf/simulated/floor/engine/vacuum,
-/area/space/nearstation)
"cDo" = (
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 5
@@ -62944,23 +62339,23 @@
/area/toxins/storage)
"cDO" = (
/obj/structure/bed/dogbed,
-/mob/living/simple_animal/pet/cat/Runtime,
/obj/machinery/light_switch{
pixel_y = -25
},
+/mob/living/simple_animal/pet/cat/Runtime,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "barber"
},
/area/medical/cmo)
"cDP" = (
-/obj/machinery/computer/security/telescreen/entertainment{
- pixel_y = -32
- },
/obj/machinery/disposal,
/obj/structure/disposalpipe/trunk{
dir = 1
},
+/obj/machinery/computer/security/telescreen/entertainment{
+ pixel_y = -32
+ },
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "cafeteria"
@@ -63397,10 +62792,12 @@
},
/area/medical/genetics_cloning)
"cEW" = (
-/obj/machinery/computer/cloning,
/obj/machinery/light{
dir = 4
},
+/obj/machinery/computer/cloning{
+ dir = 8
+ },
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "whiteblue"
@@ -63590,11 +62987,11 @@
/turf/simulated/floor/mech_bay_recharge_floor,
/area/assembly/chargebay)
"cFo" = (
-/obj/machinery/computer/mech_bay_power_console,
/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = 20
},
+/obj/machinery/computer/mech_bay_power_console,
/turf/simulated/floor/bluegrid{
icon_state = "gcircuit"
},
@@ -63683,9 +63080,8 @@
name = "\improper Toxins Lab"
})
"cFD" = (
-/obj/machinery/atmospherics/trinary/filter{
- dir = 8;
- req_access = "0"
+/obj/machinery/atmospherics/trinary/mixer{
+ dir = 8
},
/turf/simulated/floor/plasteel{
icon_state = "white"
@@ -64118,11 +63514,11 @@
name = "\improper Toxins Lab"
})
"cGz" = (
-/obj/structure/closet/secure_closet/scientist,
/obj/structure/window/reinforced{
dir = 4
},
/obj/effect/decal/warning_stripes/south,
+/obj/machinery/vending/scidrobe,
/turf/simulated/floor/plasteel,
/area/toxins/mixing{
name = "\improper Toxins Lab"
@@ -64314,6 +63710,7 @@
pixel_y = 24
},
/obj/effect/decal/warning_stripes/south,
+/obj/machinery/portable_atmospherics/canister,
/turf/simulated/floor/plasteel,
/area/toxins/mixing{
name = "\improper Toxins Lab"
@@ -64338,7 +63735,6 @@
/obj/structure/window/reinforced{
dir = 4
},
-/obj/machinery/portable_atmospherics/canister,
/obj/effect/decal/warning_stripes/south,
/turf/simulated/floor/plasteel,
/area/toxins/mixing{
@@ -65127,11 +64523,11 @@
},
/area/medical/morgue)
"cIp" = (
+/obj/item/reagent_containers/spray/cleaner,
+/obj/structure/table/glass,
/obj/machinery/computer/security/telescreen/entertainment{
pixel_y = -30
},
-/obj/item/reagent_containers/spray/cleaner,
-/obj/structure/table/glass,
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "cafeteria"
@@ -65717,6 +65113,7 @@
/obj/structure/chair{
dir = 4
},
+/obj/effect/decal/warning_stripes/northeast,
/obj/machinery/computer/security/telescreen{
desc = "Used for watching the test chamber.";
dir = 8;
@@ -65725,7 +65122,6 @@
network = list("Toxins");
pixel_x = 30
},
-/obj/effect/decal/warning_stripes/northeast,
/turf/simulated/floor/plasteel,
/area/toxins/mixing{
name = "\improper Toxins Lab"
@@ -66044,7 +65440,7 @@
},
/area/medical/genetics_cloning)
"cKo" = (
-/obj/structure/closet/wardrobe/black,
+/obj/machinery/vending/genedrobe,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -66139,6 +65535,7 @@
pixel_x = 24;
pixel_y = -24
},
+/obj/effect/decal/warning_stripes/southeast,
/obj/machinery/computer/security/telescreen{
desc = "Used for watching the test chamber.";
dir = 8;
@@ -66147,7 +65544,6 @@
network = list("Toxins");
pixel_x = 30
},
-/obj/effect/decal/warning_stripes/southeast,
/turf/simulated/floor/plasteel,
/area/toxins/mixing{
name = "\improper Toxins Lab"
@@ -66188,12 +65584,14 @@
/turf/simulated/floor/plating,
/area/maintenance/aft)
"cKD" = (
-/obj/machinery/computer/operating,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
+/obj/machinery/computer/operating{
+ dir = 8
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -66828,16 +66226,16 @@
})
"cLS" = (
/obj/effect/spawner/window/reinforced,
-/obj/structure/cable/yellow{
- d2 = 4;
- icon_state = "0-4"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/cable/yellow{
+ d2 = 2;
+ icon_state = "0-2"
+ },
/turf/simulated/floor/plating,
/area/hallway/secondary/exit{
name = "\improper Departure Lounge"
@@ -67421,6 +66819,16 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
+/obj/structure/cable/yellow{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "barber"
@@ -67436,6 +66844,11 @@
dir = 4;
icon_state = "pipe-c"
},
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "barber"
@@ -67874,7 +67287,6 @@
},
/area/maintenance/aft)
"cNQ" = (
-/obj/machinery/computer/rdconsole/robotics,
/obj/machinery/requests_console{
department = "Robotics";
departmentType = 2;
@@ -67882,6 +67294,9 @@
pixel_x = -31
},
/obj/effect/decal/warning_stripes/yellow/hollow,
+/obj/machinery/computer/rdconsole/robotics{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -67987,8 +67402,11 @@
pixel_y = -4
},
/obj/effect/decal/warning_stripes/yellow,
-/obj/item/storage/firstaid/machine,
-/obj/item/storage/firstaid/machine,
+/obj/item/clothing/glasses/hud/diagnostic{
+ pixel_x = 2;
+ pixel_y = 5
+ },
+/obj/item/clothing/glasses/hud/diagnostic,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -68337,12 +67755,11 @@
},
/area/medical/virology)
"cOD" = (
-/obj/structure/closet/wardrobe/virology_white,
-/obj/item/storage/backpack/satchel_vir,
/obj/structure/disposalpipe/segment{
dir = 1;
icon_state = "pipe-c"
},
+/obj/machinery/vending/virodrobe,
/turf/simulated/floor/plasteel{
icon_state = "vault"
},
@@ -68487,10 +67904,6 @@
/obj/item/scalpel{
pixel_y = 12
},
-/obj/structure/window/reinforced{
- dir = 1;
- pixel_y = 1
- },
/obj/item/razor{
pixel_y = 5
},
@@ -69007,6 +68420,7 @@
/area/assembly/robotics)
"cPS" = (
/obj/machinery/computer/operating{
+ dir = 1;
name = "Robotics Operating Computer"
},
/turf/simulated/floor/plasteel{
@@ -69027,13 +68441,11 @@
/turf/space,
/area/space/nearstation)
"cPV" = (
-/obj/structure/closet/wardrobe/robotics_black{
- pixel_x = 2
- },
/obj/structure/window/reinforced{
dir = 8
},
/obj/effect/decal/warning_stripes/yellow,
+/obj/machinery/vending/robodrobe,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -69077,7 +68489,9 @@
name = "Station Intercom (General)";
pixel_y = -28
},
-/obj/machinery/computer/rdservercontrol,
+/obj/machinery/computer/rdservercontrol{
+ dir = 1
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -69344,6 +68758,7 @@
pixel_x = -24
},
/obj/effect/decal/warning_stripes/east,
+/obj/structure/cable/yellow,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -69633,11 +69048,8 @@
/turf/simulated/wall,
/area/chapel/office)
"cRi" = (
-/obj/machinery/door/airlock/centcom{
- icon = 'icons/obj/doors/airlocks/station/maintenance.dmi';
+/obj/machinery/door/airlock/maintenance{
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,
@@ -69645,11 +69057,8 @@
/turf/simulated/floor/plating,
/area/maintenance/aft)
"cRj" = (
-/obj/machinery/door/airlock/centcom{
- icon = 'icons/obj/doors/airlocks/station/maintenance.dmi';
+/obj/machinery/door/airlock/maintenance{
name = "Chapel Office Maintenance";
- opacity = 1;
- overlays_file = 'icons/obj/doors/airlocks/station/overlays.dmi';
req_access_txt = "27"
},
/obj/structure/cable/yellow{
@@ -69790,16 +69199,16 @@
},
/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
-/turf/simulated/floor/plasteel,
-/area/hallway/secondary/exit{
- name = "\improper Departure Lounge"
- })
-"cRB" = (
/obj/structure/cable/yellow{
d1 = 1;
d2 = 4;
icon_state = "1-4"
},
+/turf/simulated/floor/plasteel,
+/area/hallway/secondary/exit{
+ name = "\improper Departure Lounge"
+ })
+"cRB" = (
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
@@ -69951,11 +69360,6 @@
},
/area/medical/medbay3)
"cRO" = (
-/obj/structure/cable/yellow{
- d1 = 2;
- d2 = 8;
- icon_state = "2-8"
- },
/obj/machinery/firealarm{
dir = 4;
pixel_x = 24
@@ -70136,16 +69540,10 @@
},
/area/chapel/office)
"cSh" = (
-/obj/item/spellbook/oneuse/smoke{
- name = "mysterious old book of "
- },
/obj/item/reagent_containers/food/drinks/bottle/holywater{
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{
@@ -70518,8 +69916,9 @@
/obj/effect/spawner/window/reinforced,
/obj/structure/cable/yellow,
/obj/structure/cable/yellow{
+ d1 = 1;
d2 = 4;
- icon_state = "0-4"
+ icon_state = "1-4"
},
/turf/simulated/floor/plating,
/area/hallway/secondary/exit{
@@ -70540,11 +69939,6 @@
},
/area/medical/research)
"cSX" = (
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 4;
- icon_state = "1-4"
- },
/obj/effect/decal/warning_stripes/east,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -70552,6 +69946,11 @@
/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,
/area/hallway/secondary/exit{
name = "\improper Departure Lounge"
@@ -70653,11 +70052,11 @@
codes_txt = "patrol;next_patrol=10-Aft-To-Central";
location = "9.4-Escape-4"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 1
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+ dir = 1
},
/turf/simulated/floor/plasteel,
/area/hallway/secondary/exit{
@@ -70943,9 +70342,8 @@
/area/chapel/main)
"cTM" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/centcom{
- name = "Chapel";
- opacity = 1
+/obj/machinery/door/airlock/public/glass{
+ name = "Chapel"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -70953,9 +70351,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
+/turf/simulated/floor/carpet,
/area/chapel/main)
"cTN" = (
/obj/machinery/atmospherics/unary/portables_connector{
@@ -70977,8 +70373,8 @@
name = "\improper Departure Lounge"
})
"cTQ" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 4
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 9
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 4
@@ -71013,18 +70409,15 @@
name = "\improper Departure Lounge"
})
"cTT" = (
-/obj/machinery/computer/secure_data,
-/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
},
+/obj/machinery/computer/secure_data{
+ dir = 1
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "red"
@@ -71192,9 +70585,8 @@
},
/area/chapel/office)
"cUi" = (
-/obj/machinery/door/airlock/centcom{
+/obj/machinery/door/airlock/maintenance{
name = "Crematorium";
- opacity = 1;
req_access_txt = "27"
},
/turf/simulated/floor/plasteel{
@@ -71234,9 +70626,7 @@
"cUn" = (
/obj/structure/grille,
/obj/structure/window/reinforced/tinted{
- dir = 5;
- max_integrity = 120;
- reinf = 0
+ dir = 5
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -71306,13 +70696,10 @@
/area/chapel/main)
"cUt" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/centcom{
- name = "Chapel";
- opacity = 1
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
+/obj/machinery/door/airlock/public/glass{
+ name = "Chapel"
},
+/turf/simulated/floor/carpet,
/area/chapel/main)
"cUu" = (
/obj/effect/decal/warning_stripes/northeastcorner,
@@ -71381,6 +70768,11 @@
d2 = 8;
icon_state = "4-8"
},
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
/turf/simulated/floor/plasteel{
icon_state = "redfull"
},
@@ -71388,11 +70780,6 @@
name = "\improper Departure Lounge"
})
"cUD" = (
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 8;
- icon_state = "1-8"
- },
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
@@ -71876,12 +71263,12 @@
/obj/machinery/light{
dir = 1
},
-/obj/machinery/computer/security/telescreen/entertainment{
- pixel_y = 29
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/machinery/computer/security/telescreen/entertainment{
+ pixel_y = 29
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "whitegreen"
@@ -71953,7 +71340,9 @@
name = "\improper Departure Lounge"
})
"cWc" = (
-/obj/machinery/computer/mech_bay_power_console,
+/obj/machinery/computer/mech_bay_power_console{
+ dir = 1
+ },
/turf/simulated/floor/bluegrid,
/area/assembly/chargebay)
"cWd" = (
@@ -72117,9 +71506,9 @@
/area/chapel/main)
"cWt" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/centcom{
- name = "Funeral Parlour";
- opacity = 1
+/obj/machinery/door/airlock/maintenance{
+ name = "Chapel Office";
+ req_access_txt = "27"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -73626,8 +73015,10 @@
name = "\improper Secure Lab"
})
"cZL" = (
-/obj/machinery/computer/camera_advanced/xenobio,
/obj/effect/decal/warning_stripes/southwestcorner,
+/obj/machinery/computer/camera_advanced/xenobio{
+ dir = 1
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -74250,20 +73641,15 @@
/turf/simulated/wall,
/area/medical/surgeryobs)
"dbv" = (
-/obj/structure/sign/biohazard{
- pixel_x = -32
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
},
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "whitegreen"
+ icon_state = "white"
},
-/area/maintenance/aft)
+/area/medical/medbay2{
+ name = "Medbay Storage"
+ })
"dbw" = (
/obj/item/radio/intercom{
name = "Station Intercom (General)";
@@ -75411,21 +74797,6 @@
/area/toxins/xenobiology{
name = "\improper Secure Lab"
})
-"deC" = (
-/obj/structure/table/reinforced,
-/obj/item/paper_bin{
- pixel_x = -4;
- pixel_y = 10
- },
-/obj/item/pen,
-/obj/machinery/camera{
- c_tag = "Engineering Equipment East";
- dir = 8
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/security/podbay)
"deD" = (
/obj/structure/sign/directions/evac,
/obj/structure/sign/directions/medical{
@@ -75466,15 +74837,6 @@
},
/turf/simulated/wall,
/area/maintenance/maintcentral)
-"deG" = (
-/obj/structure/table/reinforced,
-/obj/item/spacepod_key{
- id = 100000
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/security/podbay)
"deH" = (
/obj/machinery/vending/shoedispenser,
/turf/simulated/floor/plating,
@@ -75556,17 +74918,6 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/structure/cable/yellow{
- d1 = 2;
- d2 = 4;
- icon_state = "2-4"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 6
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 6
- },
/turf/simulated/floor/plasteel{
icon_state = "redfull"
},
@@ -75607,25 +74958,6 @@
icon_state = "chapel"
},
/area/chapel/main)
-"deW" = (
-/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/structure/chair/stool,
/obj/structure/cable/yellow{
@@ -75650,57 +74982,11 @@
icon_state = "chapel"
},
/area/chapel/main)
-"dfa" = (
-/obj/machinery/computer/rdconsole/mechanics,
-/turf/simulated/floor/plasteel{
- dir = 5;
- icon_state = "vault"
- },
-/area/engine/mechanic_workshop)
-"dfg" = (
-/turf/simulated/floor/plasteel{
- dir = 5;
- icon_state = "vault"
- },
-/area/engine/mechanic_workshop)
-"dfh" = (
-/obj/structure/chair/office/light{
- dir = 1;
- pixel_y = 3
- },
-/turf/simulated/floor/plasteel{
- dir = 5;
- icon_state = "vault"
- },
-/area/engine/mechanic_workshop)
"dfi" = (
/obj/effect/decal/warning_stripes/northeastcorner,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
/area/maintenance/aft)
-"dfj" = (
-/obj/effect/decal/warning_stripes/west,
-/obj/effect/decal/warning_stripes/north,
-/obj/machinery/door/poddoor{
- density = 0;
- icon_state = "open";
- id_tag = "mechpod";
- name = "Mechanic's Workshop Inner Door";
- opacity = 0
- },
-/turf/simulated/floor/engine,
-/area/engine/mechanic_workshop)
-"dfk" = (
-/obj/effect/decal/warning_stripes/north,
-/turf/simulated/floor/engine,
-/area/engine/mechanic_workshop)
-"dfl" = (
-/obj/structure/spacepoddoor,
-/turf/simulated/floor/plasteel{
- dir = 5;
- icon_state = "vault"
- },
-/area/engine/mechanic_workshop)
"dfn" = (
/obj/structure/cable/yellow{
d1 = 1;
@@ -75730,39 +75016,15 @@
icon_state = "dark"
},
/area/chapel/main)
-"dfq" = (
-/obj/effect/landmark/start{
- name = "Mechanic"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- dir = 5;
- icon_state = "vault"
- },
-/area/engine/mechanic_workshop)
"dfs" = (
-/obj/machinery/door/airlock/centcom{
+/obj/machinery/door/airlock/maintenance{
name = "Chapel Office";
- opacity = 1;
req_access_txt = "27"
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
/area/chapel/main)
-"dfu" = (
-/obj/effect/decal/warning_stripes/west,
-/obj/machinery/door/poddoor{
- density = 0;
- icon_state = "open";
- id_tag = "mechpod";
- name = "Mechanic's Workshop Inner Door";
- opacity = 0
- },
-/turf/simulated/floor/engine,
-/area/engine/mechanic_workshop)
"dfv" = (
/obj/effect/spawner/window/reinforced,
/obj/machinery/door/poddoor{
@@ -75780,15 +75042,6 @@
icon_state = "chapel"
},
/area/chapel/main)
-"dfx" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 10
- },
-/turf/simulated/floor/plasteel{
- dir = 5;
- icon_state = "vault"
- },
-/area/engine/mechanic_workshop)
"dfz" = (
/obj/structure/cable/yellow{
d1 = 2;
@@ -75805,19 +75058,6 @@
},
/turf/simulated/floor/plasteel,
/area/engine/break_room)
-"dfA" = (
-/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"
- },
-/obj/machinery/door/firedoor,
-/turf/simulated/floor/plasteel,
-/area/engine/mechanic_workshop)
"dfB" = (
/obj/structure/cable/yellow{
d1 = 1;
@@ -75825,12 +75065,6 @@
icon_state = "1-8"
},
/obj/machinery/hologram/holopad,
-/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/scrubbers{
dir = 4
},
@@ -75883,46 +75117,6 @@
/area/toxins/xenobiology{
name = "\improper Secure Lab"
})
-"dfI" = (
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/machinery/vending/cola,
-/turf/simulated/floor/plasteel{
- dir = 5;
- icon_state = "vault"
- },
-/area/engine/mechanic_workshop)
-"dfJ" = (
-/obj/effect/decal/warning_stripes/west,
-/obj/machinery/firealarm{
- dir = 1;
- pixel_y = -24
- },
-/obj/machinery/door/poddoor{
- density = 0;
- icon_state = "open";
- id_tag = "mechpod";
- name = "Mechanic's Workshop Inner Door";
- opacity = 0
- },
-/turf/simulated/floor/engine,
-/area/engine/mechanic_workshop)
-"dfK" = (
-/obj/machinery/alarm{
- dir = 1;
- pixel_y = -24
- },
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
- dir = 1
- },
-/turf/simulated/floor/plasteel{
- dir = 5;
- icon_state = "vault"
- },
-/area/engine/mechanic_workshop)
"dfO" = (
/obj/structure/sign/lifestar,
/turf/simulated/wall,
@@ -76051,11 +75245,6 @@
},
/area/medical/virology)
"dfZ" = (
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
@@ -76100,23 +75289,6 @@
icon_state = "dark"
},
/area/chapel/main)
-"dgh" = (
-/obj/structure/table,
-/obj/item/storage/toolbox/mechanical,
-/obj/item/crowbar,
-/turf/simulated/floor/plasteel,
-/area/hallway/secondary/entry{
- name = "Arrivals"
- })
-"dgi" = (
-/obj/machinery/light{
- dir = 1;
- on = 1
- },
-/turf/simulated/floor/plasteel,
-/area/hallway/secondary/entry{
- name = "Arrivals"
- })
"dgj" = (
/obj/structure/cable/yellow{
d1 = 1;
@@ -76124,65 +75296,16 @@
icon_state = "1-2"
},
/turf/simulated/floor/plasteel,
-/area/hallway/secondary/entry{
- name = "Arrivals"
- })
-"dgk" = (
-/obj/structure/rack,
-/obj/item/clothing/mask/gas,
-/obj/item/clothing/mask/gas,
-/turf/simulated/floor/plasteel,
-/area/hallway/secondary/entry{
- name = "Arrivals"
- })
-"dgm" = (
-/obj/effect/decal/warning_stripes/yellow/hollow,
-/obj/structure/closet/emcloset,
-/obj/item/tank/internals/emergency_oxygen,
-/obj/item/clothing/mask/breath,
-/turf/simulated/floor/plasteel,
-/area/hallway/secondary/entry{
- name = "Arrivals"
- })
-"dgn" = (
-/obj/structure/table,
-/obj/item/flashlight,
-/obj/item/storage/belt/utility,
-/obj/item/stock_parts/cell,
-/turf/simulated/floor/plasteel,
-/area/hallway/secondary/entry{
- name = "Arrivals"
- })
-"dgo" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/plasteel,
-/area/hallway/secondary/entry{
- name = "Arrivals"
- })
-"dgq" = (
-/obj/effect/decal/warning_stripes/yellow/hollow,
-/obj/machinery/portable_atmospherics/canister/oxygen,
-/turf/simulated/floor/plasteel,
/area/hallway/secondary/entry{
name = "Arrivals"
})
"dgr" = (
-/turf/simulated/wall/r_wall,
-/area/hallway/secondary/entry{
- name = "Arrivals"
- })
-"dgt" = (
-/obj/effect/decal/warning_stripes/south,
-/obj/machinery/power/apc{
- dir = 8;
- name = "Escape Podbay APC";
- pixel_x = -25
+/obj/machinery/atmospherics/pipe/simple/visible/purple{
+ dir = 4
},
-/obj/structure/cable/yellow,
-/turf/simulated/floor/plasteel,
-/area/hallway/secondary/entry{
- name = "Arrivals"
- })
+/obj/effect/spawner/window/reinforced,
+/turf/simulated/floor/plating,
+/area/atmos)
"dgu" = (
/obj/structure/cable/yellow{
d1 = 4;
@@ -76200,54 +75323,21 @@
/area/maintenance/fpmaint2{
name = "Port Maintenance"
})
-"dgv" = (
-/obj/effect/decal/warning_stripes/south,
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
- dir = 1
- },
-/turf/simulated/floor/plasteel,
-/area/hallway/secondary/entry{
- name = "Arrivals"
- })
-"dgw" = (
-/obj/effect/decal/warning_stripes/south,
-/obj/effect/decal/warning_stripes/east,
-/turf/simulated/floor/plasteel,
-/area/hallway/secondary/entry{
- name = "Arrivals"
- })
"dgx" = (
/obj/effect/decal/warning_stripes/south,
/turf/simulated/floor/plasteel,
-/area/hallway/secondary/entry{
- name = "Arrivals"
- })
-"dgy" = (
-/obj/structure/extinguisher_cabinet,
-/turf/simulated/wall/r_wall,
-/area/hallway/secondary/entry{
- name = "Arrivals"
- })
-"dgz" = (
-/turf/simulated/floor/engine,
-/area/hallway/secondary/entry{
- name = "Arrivals"
- })
-"dgA" = (
-/obj/machinery/firealarm,
-/turf/simulated/wall/r_wall,
/area/hallway/secondary/entry{
name = "Arrivals"
})
"dgB" = (
+/obj/structure/table/reinforced,
+/obj/effect/decal/warning_stripes/south,
/obj/machinery/computer/security/telescreen{
dir = 1;
name = "Test Chamber Monitor";
network = list("Xeno");
pixel_y = 2
},
-/obj/structure/table/reinforced,
-/obj/effect/decal/warning_stripes/south,
/turf/simulated/floor/plasteel,
/area/toxins/xenobiology{
name = "\improper Secure Lab"
@@ -76257,18 +75347,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
/area/maintenance/aft)
-"dgD" = (
-/obj/machinery/camera{
- c_tag = "Quartermaster's Office";
- dir = 8
- },
-/obj/machinery/light{
- dir = 4
- },
-/turf/simulated/floor/engine,
-/area/hallway/secondary/entry{
- name = "Arrivals"
- })
"dgE" = (
/obj/structure/cable/yellow{
d1 = 4;
@@ -76316,36 +75394,14 @@
/obj/machinery/light/small,
/turf/simulated/floor/plating,
/area/maintenance/starboard)
-"dgJ" = (
-/obj/machinery/light{
- dir = 8
- },
-/obj/machinery/alarm{
- dir = 4;
- pixel_x = -24
- },
-/turf/simulated/floor/engine,
-/area/hallway/secondary/entry{
- name = "Arrivals"
- })
-"dgK" = (
-/obj/machinery/light,
-/turf/simulated/floor/engine,
-/area/engine/mechanic_workshop)
-"dgL" = (
-/obj/machinery/light{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/plasteel,
-/area/engine/break_room)
"dgO" = (
-/obj/machinery/light_switch,
+/obj/structure/sign/pods,
/turf/simulated/wall,
-/area/engine/mechanic_workshop)
+/area/engine/break_room)
"dgW" = (
-/obj/machinery/computer/camera_advanced/xenobio,
+/obj/machinery/computer/camera_advanced/xenobio{
+ dir = 1
+ },
/turf/simulated/floor/plasteel{
icon_state = "whitepurplecorner"
},
@@ -76926,6 +75982,7 @@
dir = 4
},
/obj/effect/spawner/window/reinforced,
+/obj/structure/cable/yellow,
/turf/simulated/floor/plating,
/area/medical/cmo)
"ebA" = (
@@ -77133,15 +76190,20 @@
icon_state = "whitebluefull"
},
/area/medical/reception)
-"eNd" = (
+"eMs" = (
+/obj/effect/decal/warning_stripes/south,
+/obj/effect/decal/warning_stripes/northwestcorner,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/turf/simulated/floor/plasteel{
- dir = 5;
- icon_state = "vault"
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
},
-/area/engine/mechanic_workshop)
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel,
+/area/engine/engineering)
"ePy" = (
/obj/structure/chair/comfy/beige,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -77264,16 +76326,6 @@
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/security/brig)
-"fhW" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/public/glass{
- name = "Pod Bay"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/plating,
-/area/hallway/secondary/entry{
- name = "Arrivals"
- })
"fla" = (
/obj/structure/chair/office/dark{
dir = 8
@@ -77361,12 +76413,21 @@
},
/area/medical/research)
"fwO" = (
-/obj/machinery/door/airlock/external{
- id_tag = "specops_home";
- locked = 1
+/obj/item/twohanded/required/kirbyplants{
+ level = 4.1
},
-/turf/simulated/floor/plating,
-/area/hallway/secondary/entry)
+/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"
+ })
"fxB" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel{
@@ -77532,12 +76593,12 @@
},
/area/hydroponics)
"gbT" = (
-/obj/machinery/door/airlock/external{
- id_tag = "admin_home";
- locked = 1
+/obj/machinery/atmospherics/pipe/simple/visible/cyan{
+ dir = 4
},
+/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
-/area/hallway/secondary/entry)
+/area/atmos)
"gda" = (
/obj/structure/cable/yellow{
d1 = 1;
@@ -78093,6 +77154,17 @@
/area/construction/Storage{
name = "Storage Wing"
})
+"hDX" = (
+/obj/machinery/atmospherics/pipe/simple/visible/cyan,
+/obj/machinery/atmospherics/binary/valve/digital{
+ color = "";
+ dir = 4;
+ name = "CO2 Outlet Valve"
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "dark"
+ },
+/area/atmos)
"hEA" = (
/obj/machinery/camera/autoname{
dir = 4
@@ -78137,11 +77209,13 @@
dir = 4;
pixel_x = 24
},
-/obj/machinery/computer/monitor,
/obj/structure/cable/yellow{
d2 = 8;
icon_state = "0-8"
},
+/obj/machinery/computer/monitor{
+ dir = 8
+ },
/turf/simulated/floor/plasteel{
dir = 6;
icon_state = "yellow"
@@ -78153,6 +77227,17 @@
},
/turf/simulated/floor/plasteel,
/area/security/armoury)
+"hIZ" = (
+/obj/docking_port/stationary{
+ dir = 8;
+ dwidth = 2;
+ height = 11;
+ id = "specops_home";
+ name = "port bay 2";
+ width = 5
+ },
+/turf/space,
+/area/space)
"hKu" = (
/obj/machinery/atmospherics/unary/vent_pump/on,
/turf/simulated/floor/plasteel{
@@ -78289,16 +77374,18 @@
/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
+/obj/structure/chair,
+/obj/effect/landmark/start{
+ name = "Civilian"
},
-/turf/space,
-/area/space)
+/obj/machinery/light{
+ dir = 1
+ },
+/obj/effect/decal/warning_stripes/north,
+/turf/simulated/floor/plasteel,
+/area/hallway/secondary/entry{
+ name = "Arrivals"
+ })
"idx" = (
/obj/structure/cable/yellow{
d1 = 1;
@@ -78546,15 +77633,6 @@
},
/turf/simulated/floor/plasteel,
/area/engine/engineering)
-"iMC" = (
-/obj/effect/decal/warning_stripes/west,
-/obj/machinery/light{
- dir = 8
- },
-/turf/simulated/floor/plasteel,
-/area/hallway/secondary/entry{
- name = "Arrivals"
- })
"iNu" = (
/turf/simulated/floor/plasteel{
dir = 8;
@@ -78644,10 +77722,6 @@
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/turf/simulated/floor/plasteel,
/area/quartermaster/storage)
-"iZY" = (
-/obj/structure/sign/pods,
-/turf/simulated/wall,
-/area/engine/mechanic_workshop)
"jap" = (
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
@@ -78728,6 +77802,18 @@
},
/turf/simulated/floor/wood,
/area/library)
+"juN" = (
+/obj/machinery/camera{
+ c_tag = "Arrivals - Aft Arm - Far";
+ dir = 1
+ },
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel,
+/area/hallway/secondary/entry{
+ name = "Arrivals"
+ })
"jwh" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
@@ -78770,8 +77856,7 @@
},
/area/hallway/primary/central)
"jGE" = (
-/obj/effect/decal/warning_stripes/southeast,
-/obj/effect/decal/warning_stripes/north,
+/obj/effect/decal/warning_stripes/northwest,
/turf/simulated/floor/plasteel,
/area/hallway/secondary/entry)
"jGU" = (
@@ -79013,8 +78098,8 @@
/turf/simulated/floor/bluegrid,
/area/tcommsat/server)
"kxf" = (
-/obj/effect/decal/warning_stripes/northwestcorner,
/obj/effect/decal/warning_stripes/southeastcorner,
+/obj/effect/decal/warning_stripes/north,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
@@ -79113,15 +78198,15 @@
/turf/space,
/area/space/nearstation)
"kKz" = (
-/obj/machinery/computer/cryopod{
- pixel_y = -25
- },
/obj/effect/landmark{
name = "JoinLateCryo"
},
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
},
+/obj/machinery/computer/cryopod{
+ pixel_y = -25
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -79264,6 +78349,10 @@
icon_state = "neutralcorner"
},
/area/crew_quarters/locker)
+"lfm" = (
+/obj/effect/decal/warning_stripes/northeast,
+/turf/simulated/floor/plasteel,
+/area/hallway/secondary/entry)
"lfV" = (
/obj/structure/chair/stool/bar,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -79309,6 +78398,10 @@
},
/turf/simulated/floor/plasteel,
/area/quartermaster/storage)
+"lio" = (
+/obj/effect/decal/warning_stripes/southwest,
+/turf/simulated/floor/plasteel,
+/area/hallway/secondary/entry)
"ljZ" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/wood,
@@ -79337,6 +78430,15 @@
/obj/effect/decal/warning_stripes/southeast,
/turf/simulated/floor/engine,
/area/engine/engineering)
+"lrA" = (
+/obj/structure/sign/biohazard{
+ pixel_x = -32
+ },
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "whitegreen"
+ },
+/area/maintenance/aft)
"lwN" = (
/obj/effect/spawner/lootdrop{
loot = list(/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes);
@@ -79451,12 +78553,6 @@
/obj/effect/decal/warning_stripes/west,
/turf/simulated/floor/engine,
/area/engine/engineering)
-"lPA" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/plasteel,
-/area/hallway/secondary/entry{
- name = "Arrivals"
- })
"lSh" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -79500,18 +78596,6 @@
/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;
@@ -79616,6 +78700,17 @@
/area/construction/hallway{
name = "\improper MiniSat Exterior"
})
+"moV" = (
+/obj/machinery/atmospherics/pipe/simple/visible/cyan,
+/obj/machinery/atmospherics/binary/valve/digital{
+ color = "";
+ dir = 4;
+ name = "Plasma Outlet Valve"
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "dark"
+ },
+/area/atmos)
"msg" = (
/obj/structure/rack,
/obj/effect/spawner/lootdrop/maintenance,
@@ -79845,10 +78940,12 @@
name = "\improper Departure Lounge"
})
"neT" = (
-/obj/effect/decal/warning_stripes/southwest,
/obj/effect/decal/warning_stripes/north,
+/obj/machinery/atmospherics/unary/vent_pump/on,
/turf/simulated/floor/plasteel,
-/area/hallway/secondary/entry)
+/area/hallway/secondary/entry{
+ name = "Arrivals"
+ })
"nhK" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -79985,6 +79082,17 @@
},
/turf/simulated/floor/engine,
/area/engine/engineering)
+"nFC" = (
+/obj/machinery/atmospherics/pipe/simple/visible/cyan,
+/obj/machinery/atmospherics/binary/valve/digital{
+ color = "";
+ dir = 4;
+ name = "N2O Outlet Valve"
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "dark"
+ },
+/area/atmos)
"nHB" = (
/obj/machinery/conveyor{
dir = 4;
@@ -80297,6 +79405,10 @@
icon_state = "neutralcorner"
},
/area/hallway/primary/central)
+"oZX" = (
+/obj/effect/decal/warning_stripes/southeast,
+/turf/simulated/floor/plasteel,
+/area/hallway/secondary/entry)
"pad" = (
/obj/structure/cable/yellow{
d1 = 1;
@@ -80333,6 +79445,18 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/turf/simulated/floor/plasteel,
/area/crew_quarters/locker)
+"pcN" = (
+/obj/effect/spawner/window/reinforced,
+/obj/machinery/door/poddoor{
+ density = 0;
+ icon_state = "open";
+ id_tag = "cmoprivacy";
+ name = "privacy shutters";
+ opacity = 0
+ },
+/obj/structure/cable/yellow,
+/turf/simulated/floor/plating,
+/area/medical/cmo)
"pcW" = (
/obj/structure/cable/yellow{
d1 = 4;
@@ -80393,6 +79517,10 @@
opacity = 0
},
/obj/effect/spawner/window/reinforced,
+/obj/structure/cable/yellow{
+ d2 = 2;
+ icon_state = "0-2"
+ },
/turf/simulated/floor/plating,
/area/medical/cmo)
"pjn" = (
@@ -80447,15 +79575,6 @@
icon_state = "dark"
},
/area/engine/engineering)
-"poJ" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/security/podbay)
"ppw" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
@@ -80616,25 +79735,6 @@
/area/quartermaster/sorting{
name = "\improper Warehouse"
})
-"pOV" = (
-/obj/effect/decal/warning_stripes/south,
-/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 1
- },
-/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;
@@ -80655,18 +79755,6 @@
},
/turf/simulated/floor/plating,
/area/maintenance/aft)
-"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"
- },
-/area/engine/mechanic_workshop)
"pSL" = (
/obj/effect/decal/warning_stripes/northwestcorner,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -80968,9 +80056,7 @@
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 8
- },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "red"
@@ -81041,21 +80127,17 @@
/turf/simulated/floor/plating,
/area/engine/engineering)
"rdz" = (
-/obj/item/twohanded/required/kirbyplants{
- level = 4.1
+/obj/docking_port/stationary{
+ dir = 2;
+ dwidth = 9;
+ height = 18;
+ id = "admin_home";
+ name = "port bay 1";
+ timid = 1;
+ width = 19
},
-/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"
- })
+/turf/space,
+/area/space)
"rfg" = (
/obj/structure/chair/stool/bar,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -81122,6 +80204,13 @@
/area/hallway/secondary/entry{
name = "Arrivals"
})
+"rnY" = (
+/obj/machinery/door/airlock/external{
+ id_tag = "admin_home";
+ locked = 1
+ },
+/turf/simulated/floor/plating,
+/area/hallway/secondary/entry)
"rpg" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable{
@@ -81184,9 +80273,6 @@
/turf/simulated/floor/engine,
/area/engine/supermatter)
"rxV" = (
-/obj/machinery/atmospherics/pipe/simple/visible/purple{
- dir = 5
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
@@ -81429,17 +80515,16 @@
/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
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 5
},
-/turf/space,
-/area/space)
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel,
+/area/hallway/secondary/entry{
+ name = "Arrivals"
+ })
"rUJ" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -81639,15 +80724,11 @@
/turf/simulated/floor/plating,
/area/storage/secure)
"sFz" = (
-/obj/effect/spawner/window/reinforced,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+/obj/machinery/light{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/turf/simulated/floor/plating,
-/area/engine/mechanic_workshop)
+/turf/simulated/floor/plasteel,
+/area/engine/break_room)
"sHl" = (
/obj/structure/chair/comfy/black{
dir = 4
@@ -82050,12 +81131,26 @@
name = "Customs"
})
"uaQ" = (
-/turf/simulated/wall,
-/area/engine/mechanic_workshop)
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "yellow"
+ },
+/area/engine/break_room)
"udB" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/turf/simulated/floor/plasteel,
/area/crew_quarters/locker)
+"uep" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel,
+/area/hallway/secondary/entry{
+ name = "Arrivals"
+ })
"ueD" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 8
@@ -82177,13 +81272,6 @@
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/wood,
/area/crew_quarters/theatre)
-"uDi" = (
-/obj/machinery/atmospherics/unary/vent_pump/on,
-/turf/simulated/floor/plasteel{
- dir = 5;
- icon_state = "vault"
- },
-/area/engine/mechanic_workshop)
"uEN" = (
/obj/effect/landmark/start{
name = "Roboticist"
@@ -82361,14 +81449,6 @@
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)
"vjp" = (
/obj/effect/decal/warning_stripes/west,
/obj/machinery/atmospherics/unary/vent_pump/on{
@@ -82388,23 +81468,10 @@
/obj/structure/lattice/catwalk,
/turf/space,
/area/space/nearstation)
-"vmY" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 9
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- dir = 5;
- icon_state = "vault"
- },
-/area/engine/mechanic_workshop)
"vrH" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/centcom{
- name = "Courtroom";
- opacity = 1
+/obj/machinery/door/airlock{
+ name = "Courtroom"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -82668,6 +81735,13 @@
icon_state = "dark"
},
/area/turret_protected/ai_upload)
+"whC" = (
+/obj/machinery/atmospherics/pipe/simple/visible/cyan{
+ dir = 4
+ },
+/obj/machinery/meter,
+/turf/simulated/floor/plasteel,
+/area/atmos)
"wma" = (
/obj/effect/spawner/window/reinforced,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -82748,11 +81822,12 @@
icon_state = "1-4";
tag = "90Curve"
},
+/obj/structure/cable,
/obj/machinery/power/solar_control{
+ dir = 1;
id = "aftstarboard";
name = "Aft Starboard Solar Control"
},
-/obj/structure/cable,
/turf/simulated/floor/plating,
/area/maintenance/starboardsolar)
"wvO" = (
@@ -82938,20 +82013,6 @@
/area/medical/medbay2{
name = "Medbay Storage"
})
-"xbe" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 9
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 8;
- icon_state = "1-8"
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/security/podbay)
"xfn" = (
/obj/structure/cable/yellow{
d1 = 4;
@@ -82987,9 +82048,6 @@
},
/area/medical/reception)
"xno" = (
-/obj/machinery/atmospherics/pipe/simple/visible/purple{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
@@ -83130,14 +82188,6 @@
/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"
- },
-/area/security/podbay)
"xSh" = (
/obj/structure/cable/yellow{
d1 = 4;
@@ -83157,18 +82207,6 @@
icon_state = "dark"
},
/area/chapel/main)
-"xXW" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/cable/yellow{
- d1 = 2;
- d2 = 4;
- icon_state = "2-4"
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/security/podbay)
"xYR" = (
/obj/structure/closet/crate,
/obj/effect/spawner/lootdrop/maintenance{
@@ -91894,7 +90932,7 @@ aaa
aaa
aaa
aaa
-ibR
+aaa
aaa
aaa
aaa
@@ -92150,10 +91188,10 @@ aaa
aaa
aaa
aaa
-kmF
-fwO
-kmF
-abq
+aaa
+hIZ
+aaa
+aaa
aaa
aaa
aaa
@@ -92408,11 +91446,11 @@ aaa
aaa
aaa
kmF
-bOx
+bUO
kmF
abq
-abq
-abq
+aaa
+aaa
aaa
aaa
aaa
@@ -92665,18 +91703,18 @@ aaa
aaa
aaa
kmF
-fwO
+bOx
kmF
-aUN
-aUN
-aUN
-aUN
-aUN
-aUN
-aUN
-aUN
-aUN
-aUN
+abq
+abq
+abq
+abq
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -92921,19 +91959,19 @@ aaa
aaa
aaa
aaa
-aWD
-rdz
-uWq
-uWq
-uWq
-uWq
-uWq
-uWq
-iMC
-bcy
-gbT
-neT
-gbT
+kmF
+bUO
+kmF
+aUN
+aUN
+kmF
+aUN
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -93178,20 +92216,20 @@ aaa
aaa
aaa
aaa
-aUN
-baI
-bcS
-bUB
-bUB
-bUB
-bUB
-bUB
-bUB
-dgw
-gbT
+aWD
+fwO
+uWq
+rnY
jGE
-gbT
-rTO
+lio
+rnY
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -93435,19 +92473,19 @@ aaa
aaa
aaa
aaa
-bhR
-bRR
-dgx
-aUN
-aUN
-aUN
-dgr
-dgr
-dgr
-dgr
-dgr
-aUN
aUN
+baI
+bBt
+rnY
+lfm
+oZX
+rnY
+rdz
+aaa
+aaa
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -93692,18 +92730,18 @@ aaa
aaa
aaa
aaa
+bhR
+ibR
+bBt
+aWD
aUN
-baI
-dgx
+kmF
aUN
-dgh
-dgn
-dgr
-dgr
-dgr
-dgr
-dgr
-cdR
+aaa
+aaa
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -93949,18 +92987,18 @@ aaa
aaa
aaa
aaa
-aWD
+aUN
baJ
-bTJ
-bNW
-dgj
-dgj
-dgt
-caq
-dgJ
-dgz
-dgr
-cDn
+juN
+aWD
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -94206,18 +93244,18 @@ aaa
aaa
aaa
aaa
-aUN
-baJ
-bTH
aWD
-cdG
-bBt
-dgx
-dgz
-dgz
-dgz
-cdV
-cDn
+baJ
+bUS
+aWD
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -94463,18 +93501,18 @@ aaa
aaa
aaa
aaa
-aUN
+aWD
baJ
-bUO
-bQN
-dgo
-dgo
-dgv
-dgz
-dgz
-dgz
-ceM
-cDn
+bUS
+aWD
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -94724,14 +93762,14 @@ aUN
baJ
bUW
aWD
-dgk
-bBt
-dgx
-dgz
-dgz
-dgz
-ceM
-cDn
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -94980,15 +94018,15 @@ aaa
aWD
bCx
bUS
-fhW
-lPA
-lPA
-pOV
-dgz
-dgz
-dgz
-ceM
-cDn
+aWD
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -95235,17 +94273,17 @@ bKt
aaa
aaa
aUN
-baJ
-bUQ
+neT
+rTO
aWD
-dgi
-bBt
-dgw
-dgz
-dgD
-dgz
-dgr
-cDn
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -95493,16 +94531,16 @@ kmF
abq
aWD
bRV
-bUT
+uep
aWD
-dgm
-dgq
-dgy
-dgA
-dgr
-dgr
-dgr
-cdR
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -104273,7 +103311,7 @@ chy
bZU
cZv
day
-cZv
+lrA
bZU
cQx
bZU
@@ -104530,7 +103568,7 @@ cNZ
cKV
cZq
dax
-dbv
+cZq
deg
cSl
cRj
@@ -105027,7 +104065,7 @@ cxt
csJ
cys
cMP
-cys
+pcN
csJ
csJ
cFd
@@ -105270,7 +104308,7 @@ ccD
cdT
chU
cjt
-cjt
+dbv
cjt
cjt
cLT
@@ -110338,7 +109376,7 @@ aiP
ajM
akg
agA
-alC
+alH
alX
anN
aof
@@ -111400,7 +110438,7 @@ aNA
aNq
aVD
aNC
-aNC
+bTH
aMk
beH
bcX
@@ -114194,7 +113232,7 @@ ugy
akU
als
amQ
-amF
+aoe
apC
apC
apC
@@ -114954,13 +113992,13 @@ aaa
aaa
aaa
aaa
+aaa
+abq
+abq
+abq
+abq
abq
abq
-aaa
-aaa
-aaa
-aaa
-aaa
abq
abq
alP
@@ -115211,19 +114249,19 @@ aaa
aaa
aaa
aaa
-abq
-aid
-aid
-aid
-aid
-avO
-aid
-aid
-aid
-aid
-alI
-aid
-aid
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+atK
+atK
+atK
+atK
atK
atK
apF
@@ -115468,18 +114506,18 @@ aaa
aaa
aaa
aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
abq
-aid
-adF
-adH
-adZ
-ahl
-agZ
-afr
-akC
-akO
-alK
-aid
alq
alq
alq
@@ -115726,17 +114764,17 @@ aaa
aaa
aaa
aaa
-aid
-aie
-aui
-aui
-awx
-azt
-mcY
-poJ
-xXW
-xbe
-aid
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+abq
alq
alq
alq
@@ -115983,17 +115021,17 @@ aaa
aaa
aaa
aaa
-aid
-aol
-asZ
-ava
-aww
-xOM
-agj
-azE
-bPL
-alE
-aid
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+abq
alq
alq
alq
@@ -116239,18 +115277,18 @@ aaa
aaa
aaa
aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
abq
-aif
-apK
-asZ
-asZ
-aww
-ajv
-afr
-aBK
-bTg
-deG
-aid
alq
alq
alq
@@ -116496,18 +115534,18 @@ aaa
aaa
aaa
aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
abq
-aid
-afR
-asZ
-asZ
-aww
-aiC
-aid
-ays
-bTf
-deC
-aid
alq
alq
alq
@@ -116753,18 +115791,18 @@ aaa
aaa
aaa
abq
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
abq
-aid
-ask
-ask
-ask
-aom
-aid
-aid
-aid
-aid
-aid
-aid
alq
alq
alq
@@ -117011,18 +116049,18 @@ aaa
aaa
aaa
aaa
-aeV
-agd
-agd
-agd
-agd
-aeV
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
aaa
abq
abq
-abq
-abq
-aid
anQ
anQ
apI
@@ -117268,14 +116306,14 @@ aaa
aaa
aaa
aaa
-aeM
aaa
aaa
aaa
aaa
-aeM
aaa
-abq
+aaa
+aaa
+aaa
aaa
abq
abq
@@ -123756,7 +122794,7 @@ bxI
bCN
bEM
bGw
-bIe
+bIf
bJT
bLU
bOQ
@@ -124527,9 +123565,9 @@ buz
bCM
bCM
bCM
-bzL
+dgr
bJV
-bNa
+gbT
bCM
bQz
bCM
@@ -124749,8 +123787,8 @@ azs
aCg
aEy
aEz
-aHg
-iof
+aHa
+eMs
aCg
vRY
aJZ
@@ -125287,9 +124325,9 @@ bck
aIu
rDF
bqO
-bnC
+bqO
dfB
-dgL
+foM
foM
aZo
bqT
@@ -125543,10 +124581,10 @@ bfr
hIG
aFR
uaQ
-bli
+bpn
sFz
-dfA
-iZY
+bpn
+bpn
bvt
iRu
bqU
@@ -125798,11 +124836,11 @@ aFR
aFR
aFR
aFR
-uaQ
-pSk
-uDi
-vmY
-blj
+aFR
+bjN
+bjN
+bjN
+bjN
dgO
bjN
rPb
@@ -126055,12 +125093,12 @@ bfz
pUc
pUc
kKa
-anq
-deW
-dfg
-eNd
-bsZ
-anq
+aaa
+aaa
+aaa
+aaa
+aaa
+bnt
bnt
cZS
bxf
@@ -126312,12 +125350,12 @@ aKT
bfz
pUc
rYj
-anq
-avP
-dfh
-eNd
-dfI
-anq
+aaa
+aaa
+aaa
+aaa
+aaa
+bnt
bvu
bly
bxg
@@ -126342,7 +125380,7 @@ cbg
bGG
bGG
nzX
-bPw
+whC
bIq
ciE
ckh
@@ -126569,12 +125607,12 @@ aKT
tgE
pUc
kKa
-anq
-dfa
-dfg
-dfq
-bta
-anq
+aaa
+aaa
+aaa
+aaa
+aaa
+bnt
bsG
bza
fxB
@@ -126826,12 +125864,12 @@ aKT
bfz
pUc
rYj
-anq
-anq
-pPA
-dfx
-dfK
-anq
+aaa
+aaa
+aaa
+aaa
+aaa
+bnt
bvv
bvk
bAt
@@ -127084,11 +126122,11 @@ xLf
qtt
vmT
qtt
-anq
-dfj
-dfu
-dfJ
-anq
+aaa
+aaa
+aaa
+aaa
+aaa
bsI
bwr
aWC
@@ -127341,11 +126379,11 @@ bfz
wxE
wxE
gyy
-anq
-pRy
-aoN
-btc
-anq
+aaa
+aaa
+aaa
+aaa
+aaa
bsJ
bwv
aaa
@@ -127598,11 +126636,11 @@ tgE
wxE
wxE
qtt
-anq
-dfk
-aoN
-aoN
-anq
+aaa
+aaa
+aaa
+aaa
+aaa
bsJ
bwv
aaa
@@ -127615,15 +126653,15 @@ bIs
bKg
bMh
bNe
-bPC
+nFC
bRi
bSU
bPC
-bPC
+moV
bRi
bSU
bRi
-bPC
+hDX
bRi
bSU
ceK
@@ -127855,11 +126893,11 @@ bfz
wxE
wxE
gyy
-anq
-dfk
-aoN
-dgK
-anq
+aaa
+aaa
+aaa
+aaa
+aaa
bsK
bwy
bxj
@@ -128112,11 +127150,11 @@ xLf
vfv
vfv
qtt
-anq
-dfl
-dfl
-azD
-anq
+aaa
+aaa
+aaa
+aaa
+aaa
wAP
bwF
bsN
@@ -128369,11 +127407,11 @@ vmT
vfv
vfv
gyy
-anq
-abq
-abq
-abq
-anq
+aaa
+aaa
+aaa
+aaa
+aaa
bIu
bwL
abq
@@ -136763,7 +135801,7 @@ aaa
aaa
aaa
aaa
-vgQ
+aaa
aaa
aaa
aaa
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/syndiedepot.dmm b/_maps/map_files/RandomRuins/SpaceRuins/syndiedepot.dmm
index 99f4f58e877..ef6903847d5 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/syndiedepot.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/syndiedepot.dmm
@@ -362,12 +362,6 @@
"bf" = (
/turf/simulated/wall/mineral/plastitanium/nodiagonal,
/area/syndicate_depot/outer)
-"bg" = (
-/obj/effect/spawner/random_spawners/syndicate/layout/spacepod,
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/syndicate_depot/core)
"bh" = (
/obj/machinery/light{
dir = 1;
@@ -1758,7 +1752,7 @@ aD
aM
at
aD
-bg
+aD
bn
bu
bz
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/whiteship.dmm b/_maps/map_files/RandomRuins/SpaceRuins/whiteship.dmm
index 23cab65cbb6..663cbddb25d 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/whiteship.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/whiteship.dmm
@@ -290,8 +290,13 @@
/turf/simulated/floor/plating,
/area/shuttle/abandoned)
"by" = (
-/obj/structure/spacepoddoor,
-/turf/simulated/floor/plating,
+/obj/machinery/door_control{
+ id = "whiteshippoddoor";
+ name = "Pod Door Control";
+ pixel_x = -24;
+ pixel_y = 24
+ },
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/abandoned)
"bz" = (
/obj/machinery/door/airlock/public/glass{
@@ -304,11 +309,10 @@
/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/floor/plating,
+/turf/simulated/floor/mineral/titanium,
/area/shuttle/abandoned)
"bD" = (
/obj/machinery/door_control{
diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm
index 833ca217ea4..470e24beb65 100644
--- a/_maps/map_files/cyberiad/cyberiad.dmm
+++ b/_maps/map_files/cyberiad/cyberiad.dmm
@@ -6,6 +6,19 @@
/obj/structure/lattice,
/turf/space,
/area/space/nearstation)
+"aac" = (
+/obj/machinery/alarm{
+ pixel_y = 22
+ },
+/obj/structure/table,
+/obj/item/radio/electropack,
+/obj/item/assembly/signaler,
+/obj/item/healthanalyzer,
+/obj/item/hand_labeler,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/toxins/misc_lab)
"aaQ" = (
/obj/docking_port/stationary/whiteship{
dir = 8;
@@ -1048,17 +1061,6 @@
icon_state = "dark"
},
/area/security/hos)
-"aeE" = (
-/obj/machinery/firealarm{
- dir = 8;
- pixel_x = -24
- },
-/obj/effect/decal/warning_stripes/east,
-/obj/structure/rack,
-/obj/item/tank/internals/oxygen,
-/obj/item/tank/jetpack/oxygen,
-/turf/simulated/floor/plasteel,
-/area/security/podbay)
"aeF" = (
/obj/machinery/door/airlock/external{
id_tag = "laborcamp_home";
@@ -1295,11 +1297,6 @@
},
/turf/simulated/floor/carpet,
/area/security/hos)
-"aeX" = (
-/obj/effect/decal/warning_stripes/east,
-/obj/machinery/suit_storage_unit/security/pod_pilot,
-/turf/simulated/floor/plasteel,
-/area/security/podbay)
"aeY" = (
/obj/effect/spawner/window/reinforced,
/obj/structure/cable{
@@ -1572,14 +1569,6 @@
icon_state = "red"
},
/area/security/main)
-"afL" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 10
- },
-/turf/simulated/floor/plasteel{
- icon_state = "rampbottom"
- },
-/area/security/podbay)
"afM" = (
/obj/structure/table/wood,
/obj/item/flashlight/lamp/green{
@@ -1588,9 +1577,6 @@
pixel_y = 8
},
/obj/item/stamp/hos,
-/obj/item/spacepod_key{
- id = 100000
- },
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 4
},
@@ -1598,14 +1584,6 @@
/obj/item/pen/multi,
/turf/simulated/floor/carpet,
/area/security/hos)
-"afN" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 6
- },
-/turf/simulated/floor/plasteel{
- icon_state = "rampbottom"
- },
-/area/security/podbay)
"afO" = (
/turf/simulated/floor/plating/airless,
/area/space/nearstation)
@@ -1927,21 +1905,27 @@
},
/area/security/brig)
"agR" = (
-/obj/structure/rack,
/obj/structure/window/reinforced{
dir = 1
},
-/obj/structure/window/reinforced{
- dir = 4
- },
-/obj/item/storage/box/buck{
+/obj/structure/rack,
+/obj/item/storage/box/beanbag{
pixel_x = -3;
pixel_y = 3
},
-/obj/item/storage/box/buck,
-/obj/item/storage/box/buck{
- pixel_x = 3;
- pixel_y = -3
+/obj/item/storage/box/beanbag,
+/obj/item/storage/box/beanbag{
+ pixel_x = -3;
+ pixel_y = 3
+ },
+/obj/item/storage/box/beanbag{
+ pixel_x = -3;
+ pixel_y = 3
+ },
+/obj/item/storage/box/beanbag,
+/obj/item/storage/box/beanbag,
+/obj/structure/window/reinforced{
+ dir = 4
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -2143,7 +2127,6 @@
/obj/structure/table,
/obj/effect/decal/warning_stripes/red/hollow,
/obj/item/storage/toolbox/mechanical,
-/obj/item/lock_buster,
/obj/machinery/light{
dir = 1;
on = 1
@@ -2285,26 +2268,6 @@
},
/turf/simulated/floor/plasteel,
/area/security/seceqstorage)
-"aia" = (
-/obj/structure/reagent_dispensers/fueltank,
-/obj/effect/decal/warning_stripes/yellow/hollow,
-/obj/effect/decal/warning_stripes/northeastcorner,
-/obj/machinery/light_switch{
- pixel_x = -25
- },
-/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 4
- },
-/turf/simulated/floor/plasteel,
-/area/security/podbay)
-"aic" = (
-/obj/effect/decal/warning_stripes/north,
-/obj/machinery/space_heater,
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
- dir = 8
- },
-/turf/simulated/floor/plasteel,
-/area/security/podbay)
"aid" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -2426,21 +2389,6 @@
dir = 1
},
/obj/structure/rack,
-/obj/item/storage/box/beanbag{
- pixel_x = -3;
- pixel_y = 3
- },
-/obj/item/storage/box/beanbag,
-/obj/item/storage/box/beanbag{
- pixel_x = -3;
- pixel_y = 3
- },
-/obj/item/storage/box/beanbag{
- pixel_x = -3;
- pixel_y = 3
- },
-/obj/item/storage/box/beanbag,
-/obj/item/storage/box/beanbag,
/obj/item/storage/box/tranquilizer{
pixel_x = 3;
pixel_y = -3
@@ -2816,17 +2764,16 @@
d2 = 8;
icon_state = "1-8"
},
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/obj/structure/disposalpipe/segment{
dir = 8;
icon_state = "pipe-c"
},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 9
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 9
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -2850,9 +2797,6 @@
icon_state = "barber"
},
/area/security/permabrig)
-"ajb" = (
-/turf/simulated/wall/r_wall,
-/area/security/podbay)
"ajc" = (
/obj/structure/table,
/turf/simulated/floor/plasteel{
@@ -2997,63 +2941,6 @@
icon_state = "vault"
},
/area/security/securearmoury)
-"ajs" = (
-/obj/structure/table,
-/obj/machinery/cell_charger,
-/obj/item/storage/toolbox/mechanical{
- pixel_y = 10
- },
-/obj/item/stock_parts/cell/high/plus,
-/obj/effect/decal/warning_stripes/east,
-/obj/item/clothing/glasses/welding,
-/obj/item/radio/intercom/department/security{
- pixel_x = -28
- },
-/turf/simulated/floor/plasteel,
-/area/security/podbay)
-"ajt" = (
-/obj/machinery/alarm{
- pixel_y = 23
- },
-/turf/simulated/floor/engine,
-/area/security/podbay)
-"aju" = (
-/obj/machinery/camera{
- c_tag = "Brig Podbay"
- },
-/obj/machinery/door_control{
- desc = "A remote control-switch for the pod doors.";
- id = "secpodbay";
- name = "Pod Door Control";
- pixel_y = 24;
- req_access_txt = "71"
- },
-/turf/simulated/floor/engine,
-/area/security/podbay)
-"ajv" = (
-/obj/machinery/light{
- dir = 1;
- on = 1
- },
-/obj/machinery/status_display{
- layer = 4;
- pixel_y = 32
- },
-/turf/simulated/floor/engine,
-/area/security/podbay)
-"ajw" = (
-/turf/simulated/floor/engine,
-/area/security/podbay)
-"ajx" = (
-/obj/structure/spacepoddoor{
- luminosity = 3
- },
-/turf/simulated/floor/engine,
-/area/security/podbay)
-"ajy" = (
-/obj/effect/decal/warning_stripes/east,
-/turf/simulated/floor/engine/vacuum,
-/area/security/podbay)
"ajJ" = (
/obj/structure/sign/poster/official/random{
pixel_y = 32
@@ -3297,24 +3184,6 @@
icon_state = "darkredcorners"
},
/area/security/brig)
-"akc" = (
-/obj/structure/table/reinforced,
-/obj/item/clothing/suit/jacket/pilot,
-/obj/item/clothing/head/beret/sec,
-/obj/machinery/light_switch{
- pixel_x = -25
- },
-/obj/item/spacepod_key{
- id = 100000
- },
-/obj/item/gps,
-/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/security/podbay)
"akd" = (
/obj/structure/cable{
d1 = 4;
@@ -3477,12 +3346,6 @@
icon_state = "dark"
},
/area/security/brig)
-"ako" = (
-/obj/spacepod/sec{
- req_access_txt = "71"
- },
-/turf/simulated/floor/engine,
-/area/security/podbay)
"aks" = (
/obj/structure/cable{
d1 = 1;
@@ -3551,22 +3414,6 @@
icon_state = "darkred"
},
/area/security/brig)
-"aky" = (
-/obj/machinery/portable_atmospherics/canister/oxygen,
-/obj/effect/decal/warning_stripes/blue/hollow,
-/obj/effect/decal/warning_stripes/east,
-/turf/simulated/floor/plasteel,
-/area/security/podbay)
-"akz" = (
-/obj/structure/spacepoddoor{
- luminosity = 3
- },
-/obj/machinery/door/poddoor/multi_tile/four_tile_ver{
- id_tag = "secpodbay";
- req_access_txt = "71"
- },
-/turf/simulated/floor/engine,
-/area/security/podbay)
"akB" = (
/turf/simulated/wall/r_wall,
/area/security/range)
@@ -4090,10 +3937,6 @@
icon_state = "darkred"
},
/area/security/brig)
-"als" = (
-/obj/effect/spawner/window/reinforced,
-/turf/simulated/floor/plating,
-/area/security/podbay)
"alt" = (
/obj/effect/spawner/window/reinforced,
/obj/structure/cable,
@@ -4182,18 +4025,6 @@
icon_state = "dark"
},
/area/security/hos)
-"alI" = (
-/obj/structure/grille,
-/turf/simulated/floor/plating/airless,
-/area/security/podbay)
-"alJ" = (
-/obj/structure/grille,
-/obj/structure/sign/securearea{
- desc = "A warning sign which reads 'KEEP CLEAR OF DOCKING AREA'.";
- name = "KEEP CLEAR: DOCKING AREA"
- },
-/turf/simulated/floor/plating/airless,
-/area/security/podbay)
"alK" = (
/obj/effect/spawner/window/reinforced,
/obj/structure/cable,
@@ -4480,21 +4311,6 @@
icon_state = "red"
},
/area/security/main)
-"amg" = (
-/obj/machinery/light,
-/obj/structure/table/reinforced,
-/obj/item/folder/red,
-/obj/item/pen,
-/obj/item/radio/intercom/department/security{
- pixel_y = -28
- },
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
- dir = 1
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/security/podbay)
"amh" = (
/obj/structure/grille/broken,
/obj/structure/lattice,
@@ -4611,10 +4427,6 @@
},
/turf/simulated/floor/plating,
/area/maintenance/fsmaint)
-"amx" = (
-/obj/effect/decal/cleanable/fungus,
-/turf/simulated/wall/r_wall,
-/area/security/podbay)
"amy" = (
/obj/structure/cable{
d1 = 1;
@@ -4827,18 +4639,6 @@
icon_state = "redfull"
},
/area/security/main)
-"amR" = (
-/obj/machinery/computer/security{
- network = list("SS13","Research Outpost","Mining Outpost")
- },
-/obj/machinery/camera{
- c_tag = "Brig Pod Pilot's Office";
- dir = 8
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/security/podbay)
"amS" = (
/obj/machinery/hologram/holopad,
/turf/simulated/floor/carpet,
@@ -4874,10 +4674,6 @@
/obj/structure/lattice/catwalk,
/turf/space,
/area/solar/auxport)
-"amV" = (
-/obj/structure/sign/nosmoking_2,
-/turf/simulated/wall/r_wall,
-/area/security/podbay)
"amW" = (
/obj/structure/lattice,
/obj/structure/grille,
@@ -6559,14 +6355,6 @@
/obj/effect/spawner/lootdrop/maintenance,
/turf/simulated/floor/plating,
/area/maintenance/fsmaint)
-"aqa" = (
-/obj/effect/decal/warning_stripes/north,
-/obj/machinery/hologram/holopad,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/turf/simulated/floor/plasteel,
-/area/security/podbay)
"aqb" = (
/obj/item/storage/secure/safe{
pixel_y = 25
@@ -6581,11 +6369,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel,
/area/security/range)
-"aqe" = (
-/obj/structure/grille,
-/obj/structure/sign/securearea,
-/turf/simulated/floor/plating/airless,
-/area/security/podbay)
"aqn" = (
/obj/item/flag/sec,
/turf/simulated/floor/plating,
@@ -6799,28 +6582,6 @@
"aqI" = (
/turf/simulated/wall/r_wall,
/area/security/brig)
-"aqJ" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/security/glass{
- name = "Security Pods";
- req_access_txt = "71"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/security/podbay)
-"aqK" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/security/glass{
- name = "Security Pods";
- req_access_txt = "71"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/security/podbay)
"aqL" = (
/obj/effect/landmark{
name = "carpspawn"
@@ -7374,21 +7135,6 @@
icon_state = "redcorner"
},
/area/security/processing)
-"arG" = (
-/obj/structure/cable{
- d1 = 2;
- d2 = 4;
- icon_state = "2-4";
- tag = ""
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 4;
- initialize_directions = 11
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/security/podbay)
"arH" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
@@ -7398,34 +7144,6 @@
icon_state = "red"
},
/area/security/permabrig)
-"arI" = (
-/obj/structure/closet/secure_closet/security,
-/obj/structure/cable{
- d2 = 8;
- icon_state = "0-8"
- },
-/obj/item/spacepod_equipment/weaponry/laser,
-/obj/machinery/power/apc{
- dir = 4;
- name = "east bump";
- pixel_x = 24
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/security/podbay)
-"arJ" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8";
- tag = ""
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/security/podbay)
"arK" = (
/obj/machinery/power/apc{
dir = 8;
@@ -7581,22 +7299,6 @@
/obj/effect/spawner/random_barrier/obstruction,
/turf/simulated/floor/plating,
/area/maintenance/fsmaint)
-"asd" = (
-/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"
- },
-/area/security/brig)
"ase" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -7996,75 +7698,6 @@
icon_state = "darkred"
},
/area/security/permabrig)
-"asF" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/security/glass{
- name = "Security Pods";
- req_access_txt = "71"
- },
-/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{
- icon_state = "dark"
- },
-/area/security/podbay)
-"asG" = (
-/obj/machinery/hologram/holopad,
-/obj/structure/cable{
- 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 = 4
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/security/podbay)
-"asH" = (
-/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{
- icon_state = "dark"
- },
-/area/security/podbay)
-"asI" = (
-/obj/structure/chair/office/dark{
- dir = 4
- },
-/obj/effect/landmark/start{
- name = "Security Pod Pilot"
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 4;
- initialize_directions = 11
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/security/podbay)
"asL" = (
/obj/structure/cable{
d1 = 4;
@@ -8683,37 +8316,6 @@
},
/turf/simulated/floor/plating,
/area/maintenance/fsmaint)
-"atU" = (
-/obj/structure/table/reinforced,
-/obj/item/flashlight,
-/obj/item/radio{
- pixel_y = 6
- },
-/obj/machinery/alarm{
- dir = 1;
- pixel_y = -22
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/security/podbay)
-"atV" = (
-/obj/item/twohanded/required/kirbyplants,
-/obj/machinery/firealarm{
- dir = 8;
- pixel_x = -24
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/security/podbay)
-"atW" = (
-/obj/structure/table/reinforced,
-/obj/item/book/manual/security_space_law,
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/security/podbay)
"atX" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 4
@@ -23891,38 +23493,6 @@
icon_state = "bluecorner"
},
/area/hallway/primary/fore)
-"baG" = (
-/obj/structure/rack{
- dir = 8;
- layer = 2.9
- },
-/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;
- pixel_y = -3
- },
-/obj/structure/extinguisher_cabinet{
- pixel_x = -5;
- pixel_y = 30
- },
-/obj/effect/decal/warning_stripes/east,
-/turf/simulated/floor/plasteel,
-/area/escapepodbay)
-"baH" = (
-/obj/machinery/camera{
- c_tag = "Departure Lounge Podbay"
- },
-/obj/machinery/door_control{
- desc = "A remote control-switch for the pod doors.";
- id = "escapepodbay";
- name = "Pod Door Control";
- pixel_y = 24;
- req_access_txt = "13"
- },
-/turf/simulated/floor/engine,
-/area/escapepodbay)
"baI" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock{
@@ -23981,19 +23551,6 @@
},
/turf/simulated/floor/wood,
/area/crew_quarters/bar)
-"baN" = (
-/obj/structure/table,
-/obj/item/storage/toolbox/mechanical,
-/obj/item/crowbar/red,
-/turf/simulated/floor/plasteel,
-/area/escapepodbay)
-"baO" = (
-/obj/structure/table,
-/obj/item/storage/belt/utility,
-/obj/item/stock_parts/cell,
-/obj/item/flashlight,
-/turf/simulated/floor/plasteel,
-/area/escapepodbay)
"baP" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -24003,18 +23560,6 @@
},
/turf/simulated/floor/plating,
/area/maintenance/fsmaint2)
-"baQ" = (
-/obj/machinery/alarm{
- pixel_y = 25
- },
-/turf/simulated/floor/engine,
-/area/escapepodbay)
-"baR" = (
-/obj/machinery/light{
- dir = 1
- },
-/turf/simulated/floor/engine,
-/area/escapepodbay)
"baS" = (
/obj/structure/disposalpipe/segment{
dir = 2;
@@ -24028,19 +23573,6 @@
},
/turf/simulated/floor/plating,
/area/maintenance/fsmaint2)
-"baT" = (
-/turf/simulated/floor/engine,
-/area/escapepodbay)
-"baU" = (
-/obj/structure/spacepoddoor{
- luminosity = 3
- },
-/turf/simulated/floor/engine,
-/area/escapepodbay)
-"baV" = (
-/obj/effect/decal/warning_stripes/east,
-/turf/simulated/floor/engine/vacuum,
-/area/escapepodbay)
"bba" = (
/obj/effect/landmark{
name = "Observer-Start"
@@ -24718,10 +24250,6 @@
},
/turf/simulated/floor/plating,
/area/maintenance/fsmaint2)
-"bcl" = (
-/obj/machinery/hologram/holopad,
-/turf/simulated/floor/plasteel,
-/area/escapepodbay)
"bcm" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -24933,13 +24461,6 @@
},
/turf/simulated/floor/plasteel,
/area/hallway/secondary/entry)
-"bcH" = (
-/turf/simulated/floor/plasteel,
-/area/escapepodbay)
-"bcI" = (
-/obj/effect/decal/warning_stripes/east,
-/turf/simulated/floor/plasteel,
-/area/escapepodbay)
"bcM" = (
/obj/structure/extinguisher_cabinet{
pixel_x = -5;
@@ -26756,23 +26277,6 @@
icon_state = "darkbluecorners"
},
/area/chapel/main)
-"bgc" = (
-/obj/machinery/firealarm{
- dir = 1;
- pixel_y = -24
- },
-/turf/simulated/floor/engine,
-/area/escapepodbay)
-"bgd" = (
-/obj/structure/spacepoddoor{
- luminosity = 3
- },
-/obj/machinery/door/poddoor/multi_tile/four_tile_ver{
- id_tag = "escapepodbay";
- req_one_access_txt = "13"
- },
-/turf/simulated/floor/engine,
-/area/escapepodbay)
"bgf" = (
/obj/structure/table/wood,
/obj/item/candle,
@@ -26829,10 +26333,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel,
/area/hallway/secondary/entry)
-"bgm" = (
-/obj/machinery/light,
-/turf/simulated/floor/engine,
-/area/escapepodbay)
"bgn" = (
/obj/machinery/door/firedoor,
/obj/machinery/light{
@@ -27717,9 +27217,6 @@
icon_state = "hydrofloor"
},
/area/hydroponics)
-"big" = (
-/turf/simulated/wall,
-/area/escapepodbay)
"bih" = (
/obj/machinery/alarm{
dir = 4;
@@ -41054,13 +40551,13 @@
/turf/simulated/floor/plasteel,
/area/hallway/secondary/exit)
"bLp" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 1;
- initialize_directions = 11
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 10;
+ initialize_directions = 10
+ },
/turf/simulated/floor/plasteel,
/area/hallway/secondary/exit)
"bLq" = (
@@ -41081,12 +40578,8 @@
icon_state = "2-4";
tag = ""
},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 10;
- initialize_directions = 10
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
},
/turf/simulated/floor/plasteel,
/area/hallway/secondary/exit)
@@ -42285,8 +41778,6 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel,
/area/hallway/secondary/exit)
"bNx" = (
@@ -43339,17 +42830,6 @@
"bPt" = (
/turf/simulated/wall/r_wall,
/area/medical/research)
-"bPu" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2";
- tag = ""
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/plasteel,
-/area/hallway/secondary/exit)
"bPw" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 4
@@ -45462,16 +44942,6 @@
/obj/machinery/vending/cigarette,
/turf/simulated/floor/plasteel,
/area/hallway/primary/central/sw)
-"bTm" = (
-/obj/structure/table,
-/obj/item/pod_parts/core,
-/obj/item/circuitboard/mecha/pod,
-/obj/item/clothing/glasses/welding{
- pixel_y = 12
- },
-/obj/item/gps,
-/turf/simulated/floor/plasteel,
-/area/engine/mechanic_workshop)
"bTq" = (
/turf/simulated/floor/plating,
/area/quartermaster/storage)
@@ -46255,19 +45725,12 @@
/turf/simulated/floor/plasteel,
/area/hallway/secondary/exit)
"bUT" = (
-/obj/structure/cable{
- d1 = 2;
- d2 = 8;
- icon_state = "2-8"
- },
/obj/structure/cable{
d1 = 1;
- d2 = 2;
- icon_state = "1-2";
- tag = ""
+ d2 = 8;
+ icon_state = "1-8"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/light,
/turf/simulated/floor/plasteel,
/area/hallway/secondary/exit)
"bUU" = (
@@ -46626,21 +46089,6 @@
},
/turf/simulated/floor/plasteel,
/area/quartermaster/office)
-"bVI" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/public/glass{
- name = "Escape Pod Bay"
- },
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2";
- tag = ""
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/plasteel,
-/area/escapepodbay)
"bVJ" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -47244,19 +46692,6 @@
},
/turf/space,
/area/space)
-"bWR" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2";
- tag = ""
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/plasteel{
- icon_state = "ramptop"
- },
-/area/escapepodbay)
"bWS" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/poddoor/shutters{
@@ -48073,32 +47508,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plating,
/area/maintenance/asmaint2)
-"bYo" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/turf/simulated/floor/plasteel,
-/area/escapepodbay)
-"bYp" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 8;
- icon_state = "1-8";
- tag = ""
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 5
- },
-/turf/simulated/floor/plasteel,
-/area/escapepodbay)
-"bYq" = (
-/obj/effect/decal/warning_stripes/east,
-/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 8
- },
-/turf/simulated/floor/plasteel,
-/area/escapepodbay)
"bYr" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 1
@@ -49789,12 +49198,6 @@
},
/turf/simulated/floor/plating,
/area/maintenance/asmaint2)
-"cbb" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
- dir = 1
- },
-/turf/simulated/floor/plasteel,
-/area/escapepodbay)
"cbc" = (
/obj/machinery/light_switch{
pixel_x = 27
@@ -50813,11 +50216,6 @@
},
/turf/simulated/floor/plasteel,
/area/janitor)
-"ccP" = (
-/obj/machinery/portable_atmospherics/canister/oxygen,
-/obj/effect/decal/warning_stripes/yellow/hollow,
-/turf/simulated/floor/plasteel,
-/area/escapepodbay)
"ccQ" = (
/turf/simulated/floor/plasteel{
dir = 8;
@@ -50833,16 +50231,6 @@
/obj/item/grenade/chem_grenade/cleaner,
/turf/simulated/floor/plasteel,
/area/janitor)
-"ccS" = (
-/obj/structure/closet/emcloset,
-/obj/item/clothing/mask/breath,
-/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,
-/turf/simulated/floor/plasteel,
-/area/escapepodbay)
"ccT" = (
/obj/machinery/r_n_d/server/robotics,
/obj/machinery/atmospherics/pipe/simple/heat_exchanging{
@@ -51956,12 +51344,11 @@
/area/janitor)
"cfq" = (
/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 1
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 1;
- initialize_directions = 11
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
},
/turf/simulated/floor/plasteel,
/area/hallway/primary/central/sw)
@@ -53529,8 +52916,6 @@
icon_state = "2-4";
tag = ""
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel,
/area/hallway/primary/central/sw)
"ciz" = (
@@ -54238,7 +53623,6 @@
/obj/machinery/door/airlock/maintenance{
req_access_txt = "12"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/disposalpipe/segment,
/obj/structure/cable{
d1 = 1;
@@ -54246,7 +53630,6 @@
icon_state = "1-2";
tag = ""
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plating,
/area/maintenance/apmaint)
"cjE" = (
@@ -54587,9 +53970,8 @@
icon_state = "1-2";
tag = ""
},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 8;
- initialize_directions = 11
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 5
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 8;
@@ -55149,7 +54531,6 @@
icon_state = "1-2";
tag = ""
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel,
/area/quartermaster/miningdock)
@@ -55203,8 +54584,6 @@
icon_state = "1-2";
tag = ""
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plating,
/area/maintenance/apmaint)
"clz" = (
@@ -56340,12 +55719,6 @@
icon_state = "4-8";
tag = ""
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
/turf/simulated/floor/plasteel,
/area/quartermaster/miningdock)
"cnU" = (
@@ -56359,13 +55732,12 @@
icon_state = "1-4";
tag = ""
},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 5
- },
/obj/effect/landmark/start{
name = "Shaft Miner"
},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 9
+ },
/turf/simulated/floor/plasteel,
/area/quartermaster/miningdock)
"cnV" = (
@@ -56387,18 +55759,12 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8";
tag = ""
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
/turf/simulated/floor/plating,
/area/maintenance/apmaint)
"cnY" = (
@@ -56528,24 +55894,15 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8";
tag = ""
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
/turf/simulated/floor/plating,
/area/maintenance/apmaint)
"coh" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 10
- },
/obj/effect/landmark{
name = "xeno_spawn";
pixel_x = -1
@@ -56560,9 +55917,6 @@
dir = 2;
icon_state = "pipe-c"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 10
- },
/turf/simulated/floor/plating,
/area/maintenance/apmaint)
"coi" = (
@@ -56739,7 +56093,6 @@
},
/area/medical/research)
"coE" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/cable{
d1 = 1;
d2 = 4;
@@ -56755,7 +56108,6 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plating,
/area/maintenance/apmaint)
"coF" = (
@@ -56769,8 +56121,6 @@
icon_state = "1-2";
tag = ""
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plating,
/area/maintenance/apmaint)
"coG" = (
@@ -57868,51 +57218,23 @@
name = "Toxins Launch Room"
})
"cqr" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/obj/structure/disposalpipe/segment{
dir = 1;
icon_state = "pipe-c"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
/obj/structure/cable{
d1 = 1;
d2 = 4;
icon_state = "1-4";
tag = ""
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
/turf/simulated/floor/plating,
/area/maintenance/apmaint)
"cqs" = (
/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable{
- d2 = 4;
- icon_state = "0-4"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 5
- },
-/obj/machinery/power/apc{
- name = "south bump";
- pixel_y = -24
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 5
- },
/turf/simulated/floor/plating,
/area/maintenance/apmaint)
"cqt" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
/obj/structure/cable{
d1 = 4;
d2 = 8;
@@ -57924,9 +57246,6 @@
name = "HoP Office";
sortType = 15
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
/turf/simulated/floor/plating,
/area/maintenance/apmaint)
"cqu" = (
@@ -57934,27 +57253,13 @@
dir = 2;
icon_state = "pipe-c"
},
-/obj/structure/cable{
- d1 = 2;
- d2 = 8;
- icon_state = "2-8";
- tag = ""
- },
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2";
- tag = ""
- },
/obj/machinery/light/small{
dir = 4
},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 4;
- initialize_directions = 11
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
},
/turf/simulated/floor/plating,
/area/maintenance/apmaint)
@@ -58994,19 +58299,6 @@
/area/toxins/launch{
name = "Toxins Launch Room"
})
-"cso" = (
-/obj/machinery/light/small{
- dir = 1
- },
-/obj/structure/chair/stool,
-/turf/simulated/floor/plating,
-/area/maintenance/apmaint)
-"csp" = (
-/obj/effect/landmark{
- name = "blobstart"
- },
-/turf/simulated/floor/plating,
-/area/maintenance/apmaint)
"csq" = (
/obj/structure/chair{
dir = 4
@@ -59567,18 +58859,6 @@
icon_state = "white"
},
/area/medical/virology)
-"cti" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2";
- tag = ""
- },
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/plating,
-/area/maintenance/apmaint)
"ctj" = (
/obj/structure/cable{
d1 = 1;
@@ -59953,9 +59233,6 @@
/area/toxins/launch{
name = "Toxins Launch Room"
})
-"ctR" = (
-/turf/simulated/wall/r_wall,
-/area/blueshield)
"ctS" = (
/obj/structure/cable{
d1 = 1;
@@ -59970,14 +59247,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel,
/area/hallway/primary/aft)
-"ctT" = (
-/obj/machinery/door/window/southleft{
- name = "Assembly Line Delivery";
- req_access_txt = "32"
- },
-/obj/effect/decal/warning_stripes/yellow,
-/turf/simulated/floor/plasteel,
-/area/assembly/assembly_line)
"ctU" = (
/obj/structure/cable{
d1 = 4;
@@ -59995,16 +59264,6 @@
/obj/structure/grille,
/turf/simulated/floor/plating,
/area/maintenance/apmaint)
-"ctW" = (
-/obj/structure/rack{
- dir = 1
- },
-/obj/effect/spawner/lootdrop/maintenance{
- lootcount = 2;
- name = "2maintenance loot spawner"
- },
-/turf/simulated/floor/plating,
-/area/maintenance/apmaint)
"ctX" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -60753,14 +60012,13 @@
/turf/simulated/floor/plating,
/area/maintenance/apmaint)
"cvo" = (
-/turf/simulated/wall,
-/area/maintenance/consarea)
+/obj/effect/turf_decal/loading_area,
+/obj/effect/spawner/random_spawners/blood_often,
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
"cvp" = (
/turf/simulated/wall/r_wall,
/area/maintenance/apmaint)
-"cvq" = (
-/turf/simulated/wall/r_wall,
-/area/storage/tech)
"cvr" = (
/obj/machinery/door/poddoor{
id_tag = "toxinsdriver";
@@ -61412,58 +60670,36 @@
/turf/simulated/floor/plating,
/area/maintenance/apmaint)
"cwA" = (
-/obj/structure/table,
-/obj/machinery/light/small{
- dir = 1
- },
-/obj/item/stack/sheet/metal{
- amount = 2
- },
-/turf/simulated/floor/plating,
+/turf/simulated/wall/r_wall/rust,
/area/maintenance/apmaint)
"cwB" = (
-/obj/structure/chair{
- dir = 8
- },
-/turf/simulated/floor/plating,
-/area/maintenance/apmaint)
-"cwC" = (
-/obj/structure/sign/poster/contraband/random{
- pixel_y = 32
+/obj/machinery/light/small{
+ dir = 1
},
/turf/simulated/floor/plating,
/area/maintenance/apmaint)
"cwD" = (
-/obj/structure/chair{
- dir = 4
- },
-/turf/simulated/floor/plating,
-/area/maintenance/apmaint)
-"cwE" = (
-/obj/structure/table,
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/machinery/light/small{
- dir = 1
- },
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/spawner/random_spawners/cobweb_left_rare,
/turf/simulated/floor/plating,
/area/maintenance/apmaint)
"cwF" = (
-/turf/simulated/floor/plasteel,
-/area/maintenance/consarea)
-"cwG" = (
-/obj/structure/table,
-/obj/machinery/light{
- dir = 1
+/obj/structure/closet/wardrobe/pjs,
+/obj/effect/spawner/random_spawners/blood_often,
+/obj/effect/spawner/lootdrop/maintenance{
+ lootcount = 8;
+ name = "8maintenance loot spawner"
},
/turf/simulated/floor/plating,
-/area/maintenance/consarea)
-"cwH" = (
-/obj/item/screwdriver,
-/turf/simulated/floor/plating,
-/area/maintenance/consarea)
+/area/maintenance/apmaint)
"cwI" = (
+/obj/machinery/light/small{
+ dir = 1
+ },
+/obj/machinery/vending/sovietsoda,
+/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
-/area/maintenance/consarea)
+/area/maintenance/apmaint)
"cwJ" = (
/obj/structure/disposalpipe/segment,
/obj/structure/extinguisher_cabinet{
@@ -62239,19 +61475,23 @@
/turf/simulated/floor/plasteel,
/area/engine/equipmentstorage)
"cyi" = (
-/obj/item/crowbar,
+/obj/machinery/washing_machine,
+/obj/structure/sign/poster/contraband/communist_state{
+ pixel_y = 32
+ },
+/obj/effect/spawner/random_spawners/cobweb_left_rare,
/turf/simulated/floor/plating,
-/area/maintenance/consarea)
+/area/maintenance/apmaint)
"cyj" = (
-/obj/effect/spawner/window/reinforced,
+/obj/machinery/washing_machine,
/turf/simulated/floor/plating,
-/area/maintenance/consarea)
+/area/maintenance/apmaint)
"cyk" = (
/obj/item/stack/sheet/metal{
amount = 10
},
/turf/simulated/floor/plating,
-/area/maintenance/consarea)
+/area/maintenance/apmaint)
"cyl" = (
/obj/structure/cable{
d1 = 1;
@@ -63054,10 +62294,6 @@
},
/turf/simulated/floor/plating,
/area/maintenance/asmaint2)
-"czM" = (
-/obj/structure/girder,
-/turf/simulated/floor/plating,
-/area/maintenance/consarea)
"czN" = (
/obj/machinery/light/small{
dir = 8
@@ -63515,16 +62751,6 @@
/obj/item/card/id,
/turf/simulated/floor/plating,
/area/maintenance/genetics)
-"cAF" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2";
- tag = ""
- },
-/obj/effect/decal/warning_stripes/south,
-/turf/simulated/floor/plating,
-/area/maintenance/apmaint)
"cAG" = (
/obj/machinery/door/airlock/maintenance{
req_access_txt = "12"
@@ -63543,24 +62769,6 @@
},
/turf/simulated/floor/plating,
/area/maintenance/asmaint2)
-"cAH" = (
-/obj/structure/disposalpipe/segment,
-/obj/structure/cable{
- d1 = 2;
- d2 = 8;
- icon_state = "2-8";
- tag = ""
- },
-/obj/structure/cable{
- d1 = 1;
- d2 = 8;
- icon_state = "1-8";
- tag = ""
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/plating,
-/area/maintenance/apmaint)
"cAI" = (
/obj/machinery/atmospherics/pipe/simple/visible/universal,
/obj/structure/disposalpipe/segment{
@@ -63738,8 +62946,20 @@
/turf/simulated/floor/plating,
/area/maintenance/asmaint2)
"cBf" = (
-/obj/machinery/light/small{
- dir = 8
+/obj/item/poster/random_official,
+/obj/item/poster/random_official{
+ pixel_x = 3;
+ pixel_y = 3
+ },
+/obj/item/poster/random_official{
+ pixel_y = 4
+ },
+/obj/structure/rack{
+ dir = 1
+ },
+/obj/effect/spawner/lootdrop/maintenance{
+ lootcount = 8;
+ name = "8maintenance loot spawner"
},
/turf/simulated/floor/plating,
/area/maintenance/apmaint)
@@ -63761,9 +62981,12 @@
/turf/simulated/floor/engine,
/area/maintenance/incinerator)
"cBh" = (
-/obj/item/wrench,
-/turf/simulated/floor/plating,
-/area/maintenance/consarea)
+/obj/structure/table_frame/wood,
+/obj/item/stack/sheet/wood{
+ amount = 2
+ },
+/turf/simulated/floor/transparent/glass/reinforced,
+/area/maintenance/apmaint)
"cBi" = (
/obj/machinery/door/poddoor{
id_tag = "disvent";
@@ -63835,9 +63058,7 @@
},
/area/maintenance/incinerator)
"cBo" = (
-/obj/machinery/light/small{
- dir = 4
- },
+/obj/machinery/hydroponics/soil,
/turf/simulated/floor/plating,
/area/maintenance/apmaint)
"cBp" = (
@@ -64162,18 +63383,6 @@
},
/turf/simulated/floor/plasteel,
/area/engine/controlroom)
-"cBZ" = (
-/obj/machinery/alarm{
- pixel_y = 22
- },
-/obj/structure/table,
-/obj/item/radio/electropack,
-/obj/item/assembly/signaler,
-/obj/item/healthanalyzer,
-/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
-/area/toxins/misc_lab)
"cCa" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -64427,7 +63636,6 @@
autoclose = 0;
frequency = 1449;
heat_proof = 1;
- icon_state = "door_locked";
id_tag = "incinerator_airlock_exterior";
locked = 1;
name = "Mixing Room Exterior Airlock";
@@ -64447,7 +63655,6 @@
autoclose = 0;
frequency = 1449;
heat_proof = 1;
- icon_state = "door_locked";
id_tag = "incinerator_airlock_interior";
locked = 1;
name = "Mixing Room Interior Airlock";
@@ -64470,12 +63677,6 @@
icon_state = "floorgrime"
},
/area/maintenance/incinerator)
-"cCA" = (
-/obj/item/stack/sheet/glass{
- amount = 10
- },
-/turf/simulated/floor/plating,
-/area/maintenance/consarea)
"cCB" = (
/obj/effect/landmark{
name = "xeno_spawn";
@@ -64527,24 +63728,6 @@
},
/turf/simulated/floor/plating,
/area/maintenance/apmaint)
-"cCG" = (
-/obj/structure/cable{
- d1 = 2;
- d2 = 4;
- icon_state = "2-4";
- tag = ""
- },
-/turf/simulated/floor/plating,
-/area/maintenance/consarea)
-"cCH" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8";
- tag = ""
- },
-/turf/simulated/floor/plating,
-/area/maintenance/apmaint)
"cCI" = (
/obj/structure/cable{
d1 = 4;
@@ -65201,7 +64384,11 @@
/turf/simulated/floor/engine,
/area/maintenance/incinerator)
"cDQ" = (
-/obj/structure/closet/toolcloset,
+/obj/machinery/light/small,
+/obj/structure/chair/sofa/left{
+ dir = 1;
+ name = "tatty old sofa"
+ },
/turf/simulated/floor/plating,
/area/maintenance/apmaint)
"cDR" = (
@@ -65217,15 +64404,18 @@
},
/area/construction)
"cDS" = (
-/obj/machinery/light,
-/turf/simulated/floor/plating,
-/area/maintenance/consarea)
-"cDT" = (
-/obj/item/stack/rods{
- amount = 8
+/obj/structure/chair{
+ dir = 1
},
/turf/simulated/floor/plating,
-/area/maintenance/consarea)
+/area/maintenance/apmaint)
+"cDT" = (
+/obj/structure/sign/poster/contraband/rebels_unite{
+ pixel_y = -32
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
"cDU" = (
/obj/machinery/atmospherics/binary/pump{
dir = 4;
@@ -65297,14 +64487,9 @@
},
/area/construction)
"cEb" = (
-/obj/structure/cable,
-/obj/machinery/power/apc{
- dir = 4;
- name = "east bump";
- pixel_x = 24
- },
+/obj/structure/dresser,
/turf/simulated/floor/plating,
-/area/maintenance/consarea)
+/area/maintenance/apmaint)
"cEc" = (
/obj/structure/cable{
d1 = 1;
@@ -65510,17 +64695,30 @@
},
/area/toxins/misc_lab)
"cEv" = (
-/obj/machinery/light{
+/obj/structure/sign/poster/contraband/random{
+ pixel_y = 32
+ },
+/obj/effect/spawner/random_spawners/blood_often,
+/turf/simulated/floor/wood{
+ icon_state = "wood-broken"
+ },
+/area/maintenance/aft)
+"cEw" = (
+/obj/structure/rack{
dir = 1
},
-/turf/simulated/floor/engine,
-/area/engine/mechanic_workshop)
-"cEw" = (
-/obj/machinery/camera{
- c_tag = "Mechanic's Workshop West"
+/obj/item/reagent_containers/food/drinks/bottle/whiskey{
+ pixel_x = -3;
+ pixel_y = -3
},
-/turf/simulated/floor/engine,
-/area/engine/mechanic_workshop)
+/obj/item/reagent_containers/food/drinks/bottle/whiskey,
+/obj/item/reagent_containers/food/drinks/bottle/whiskey{
+ pixel_x = 3;
+ pixel_y = 3
+ },
+/obj/effect/spawner/random_spawners/cobweb_left_rare,
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
"cEx" = (
/obj/effect/spawner/random_spawners/fungus_probably,
/turf/simulated/wall,
@@ -65578,127 +64776,37 @@
},
/area/toxins/xenobiology)
"cEI" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on,
-/turf/simulated/floor/engine,
-/area/engine/mechanic_workshop)
-"cEJ" = (
-/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/mecha_part_fabricator/spacepod,
-/obj/effect/decal/warning_stripes/yellow/hollow,
-/obj/effect/decal/warning_stripes/west,
-/turf/simulated/floor/plasteel,
-/area/engine/mechanic_workshop)
-"cEK" = (
-/obj/machinery/light{
- dir = 1
- },
-/obj/machinery/computer/podtracker,
-/obj/effect/decal/warning_stripes/east,
-/turf/simulated/floor/plasteel,
-/area/engine/mechanic_workshop)
-"cEL" = (
-/obj/machinery/requests_console{
- department = "Mechanic";
- departmentType = 2;
- name = "Mechanic's Workshop Requests Console";
- pixel_y = 30
- },
-/obj/structure/disposalpipe/trunk,
-/obj/machinery/disposal,
-/turf/simulated/floor/plasteel,
-/area/engine/mechanic_workshop)
-"cEM" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8";
- tag = ""
- },
-/obj/machinery/camera{
- c_tag = "Mechanic's Workshop East"
- },
-/obj/machinery/space_heater,
-/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "vault"
- },
-/area/engine/mechanic_workshop)
-"cEN" = (
-/obj/structure/cable{
- d2 = 4;
- icon_state = "0-4"
- },
-/obj/structure/reagent_dispensers/fueltank,
-/obj/machinery/power/apc{
- dir = 1;
- name = "north bump";
- pixel_y = 24
- },
-/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "vault"
- },
-/area/engine/mechanic_workshop)
-"cEO" = (
-/obj/effect/spawner/window/reinforced,
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8";
- tag = ""
+/obj/structure/table/reinforced,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/spawner/lootdrop/maintenance{
+ lootcount = 2;
+ name = "2maintenance loot spawner"
},
/turf/simulated/floor/plating,
-/area/engine/mechanic_workshop)
-"cEP" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8";
- tag = ""
+/area/maintenance/aft)
+"cEJ" = (
+/obj/structure/chair/stool/bar,
+/mob/living/simple_animal/mouse,
+/turf/simulated/floor/wood{
+ icon_state = "wood-broken"
},
-/obj/structure/closet/emcloset,
-/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "vault"
+/area/maintenance/aft)
+"cEK" = (
+/turf/simulated/floor/wood,
+/area/maintenance/aft)
+"cEL" = (
+/obj/structure/table/wood/poker,
+/obj/structure/sign/poster/contraband/random{
+ pixel_y = 32
},
-/area/engine/mechanic_workshop)
-"cEQ" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8";
- tag = ""
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
+"cEM" = (
+/obj/machinery/light/small{
+ dir = 1
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "yellowcorner"
- },
-/area/hallway/primary/aft)
-"cER" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8";
- tag = ""
- },
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
- },
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "yellowcorner"
- },
-/area/hallway/primary/aft)
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
"cES" = (
/obj/item/clothing/mask/cigarette,
/turf/simulated/floor/plating/airless,
@@ -65707,65 +64815,10 @@
/obj/machinery/light/small,
/turf/simulated/floor/plating/airless,
/area/toxins/test_area)
-"cEV" = (
-/obj/machinery/light{
- dir = 1
- },
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8";
- tag = ""
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "yellowcorner"
- },
-/area/hallway/primary/aft)
-"cEW" = (
-/turf/simulated/wall/r_wall,
-/area/engine/mechanic_workshop)
-"cEX" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8";
- tag = ""
- },
-/obj/machinery/status_display{
- layer = 4;
- pixel_y = 32
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "yellowcorner"
- },
-/area/hallway/primary/aft)
"cEY" = (
-/turf/simulated/wall,
-/area/engine/mechanic_workshop)
-"cEZ" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8";
- tag = ""
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/unary/vent_pump/on,
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "yellowcorner"
- },
-/area/hallway/primary/aft)
+/obj/structure/falsewall/reinforced,
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
"cFa" = (
/turf/simulated/wall/r_wall,
/area/hallway/primary/aft)
@@ -65787,18 +64840,12 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plating,
/area/maintenance/asmaint2)
-"cFd" = (
-/obj/structure/sign/securearea{
- desc = "A warning sign which reads 'KEEP CLEAR OF DOCKING AREA'.";
- name = "KEEP CLEAR: DOCKING AREA"
- },
-/turf/simulated/wall/r_wall,
-/area/engine/mechanic_workshop)
"cFe" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/maintenance{
- name = "Alternate Construction Area";
- req_access_txt = "12"
+/obj/effect/decal/cleanable/dirt,
+/obj/item/cultivator,
+/obj/structure/sink{
+ dir = 4;
+ pixel_x = 12
},
/turf/simulated/floor/plating,
/area/maintenance/apmaint)
@@ -65807,29 +64854,15 @@
dir = 8;
icon_state = "pipe-j2"
},
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "yellowcorner"
- },
-/area/hallway/primary/aft)
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
"cFg" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 8;
- icon_state = "1-8";
- tag = ""
- },
-/obj/structure/disposalpipe/junction{
+/obj/structure/disposalpipe/segment{
dir = 1;
- icon_state = "pipe-y"
+ 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 = "yellowcorner"
- },
-/area/hallway/primary/aft)
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
"cFh" = (
/obj/machinery/atmospherics/unary/portables_connector{
dir = 4
@@ -65847,11 +64880,9 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "yellowcorner"
- },
-/area/hallway/primary/aft)
+/obj/structure/girder,
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
"cFj" = (
/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
dir = 9;
@@ -65863,26 +64894,18 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/light{
+/obj/machinery/light/small{
dir = 1
},
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "yellowcorner"
- },
-/area/hallway/primary/aft)
+/obj/structure/closet/firecloset,
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
"cFl" = (
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/camera{
- c_tag = "Aft Primary Hallway 3"
- },
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "yellowcorner"
- },
-/area/hallway/primary/aft)
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
"cFm" = (
/obj/structure/table,
/obj/item/multitool,
@@ -65905,12 +64928,13 @@
layer = 4;
pixel_y = 32
},
-/obj/machinery/atmospherics/unary/vent_pump/on,
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "yellowcorner"
+/obj/machinery/door/airlock/maintenance{
+ locked = 1;
+ name = "Assembly Line Maintenance";
+ req_access_txt = "32"
},
-/area/hallway/primary/aft)
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
"cFp" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -66170,105 +65194,47 @@
},
/area/toxins/misc_lab)
"cFK" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
+/turf/simulated/floor/wood{
+ icon_state = "wood-broken"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/turf/simulated/floor/engine,
-/area/engine/mechanic_workshop)
+/area/maintenance/aft)
"cFL" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 6
+/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"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 5
- },
-/turf/simulated/floor/engine,
-/area/engine/mechanic_workshop)
+/turf/simulated/floor/wood,
+/area/maintenance/aft)
"cFM" = (
-/obj/effect/decal/warning_stripes/west,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/turf/simulated/floor/plasteel,
-/area/engine/mechanic_workshop)
+/obj/structure/table/wood/poker,
+/obj/item/deck/cards,
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
"cFN" = (
-/obj/machinery/door/poddoor{
- density = 0;
- icon_state = "open";
- id_tag = "mechpod";
- name = "Mechanic's Workshop Inner Door";
- opacity = 0
+/obj/structure/table/wood/poker,
+/turf/simulated/floor/wood{
+ broken = 1;
+ icon_state = "wood-broken"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/turf/simulated/floor/engine,
-/area/engine/mechanic_workshop)
-"cFO" = (
-/obj/machinery/hologram/holopad,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/effect/decal/warning_stripes/east,
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 1;
- initialize_directions = 11
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/turf/simulated/floor/plasteel,
-/area/engine/mechanic_workshop)
+/area/maintenance/aft)
"cFP" = (
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
+/obj/structure/table/wood/poker,
+/obj/effect/spawner/lootdrop/maintenance{
+ lootcount = 2;
+ name = "2maintenance loot spawner"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
+/turf/simulated/floor/wood{
+ icon_state = "wood-broken5"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/turf/simulated/floor/plasteel,
-/area/engine/mechanic_workshop)
+/area/maintenance/aft)
"cFQ" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/engine/mechanic_workshop)
-"cFR" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/engine/mechanic_workshop)
+/obj/effect/spawner/random_spawners/blood_maybe,
+/turf/simulated/floor/wood,
+/area/maintenance/aft)
"cFS" = (
/obj/structure/disposalpipe/segment{
dir = 8;
@@ -66285,19 +65251,12 @@
},
/area/toxins/misc_lab)
"cFT" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8";
- tag = ""
- },
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/maintenance{
- name = "Alternate Construction Area";
req_access_txt = "12"
},
/turf/simulated/floor/plating,
-/area/maintenance/consarea)
+/area/maintenance/apmaint)
"cFU" = (
/obj/structure/window/reinforced,
/obj/structure/table/reinforced,
@@ -66317,17 +65276,14 @@
icon_state = "vault"
},
/area/toxins/misc_lab)
-"cFV" = (
-/obj/effect/decal/warning_stripes/west,
-/turf/simulated/floor/engine/vacuum,
-/area/engine/mechanic_workshop)
-"cFW" = (
-/obj/structure/spacepoddoor,
-/turf/simulated/floor/engine,
-/area/engine/mechanic_workshop)
"cFX" = (
-/turf/simulated/floor/engine,
-/area/engine/mechanic_workshop)
+/obj/machinery/light/small{
+ dir = 1
+ },
+/turf/simulated/floor/wood{
+ icon_state = "wood-broken3"
+ },
+/area/maintenance/aft)
"cFY" = (
/obj/structure/window/reinforced,
/obj/structure/window/reinforced{
@@ -66374,29 +65330,6 @@
icon_state = "vault"
},
/area/toxins/misc_lab)
-"cGb" = (
-/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/hallway/primary/aft)
-"cGc" = (
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/turf/simulated/floor/plasteel,
-/area/hallway/primary/aft)
"cGd" = (
/obj/structure/window/reinforced,
/obj/structure/table/reinforced,
@@ -66406,13 +65339,6 @@
icon_state = "vault"
},
/area/toxins/misc_lab)
-"cGe" = (
-/obj/machinery/light{
- dir = 1;
- on = 1
- },
-/turf/simulated/floor/engine,
-/area/engine/mechanic_workshop)
"cGf" = (
/obj/structure/cable{
d1 = 1;
@@ -66420,39 +65346,12 @@
icon_state = "1-2";
tag = ""
},
-/obj/effect/decal/warning_stripes/yellow,
-/turf/simulated/floor/engine,
-/area/engine/mechanic_workshop)
-"cGg" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 1;
- initialize_directions = 11
+/obj/machinery/light/small{
+ dir = 4;
+ pixel_y = 8
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/turf/simulated/floor/plasteel,
-/area/hallway/primary/aft)
-"cGh" = (
-/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
- },
-/obj/machinery/firealarm{
- dir = 1;
- pixel_y = -24
- },
-/turf/simulated/floor/plasteel,
-/area/engine/mechanic_workshop)
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
"cGi" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -66463,24 +65362,13 @@
/turf/simulated/floor/plasteel,
/area/hallway/primary/aft)
"cGj" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- icon_state = "yellowcorner"
- },
-/area/hallway/primary/aft)
+/obj/structure/closet/emcloset,
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
"cGk" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 1;
- initialize_directions = 11
- },
-/turf/simulated/floor/plasteel,
-/area/hallway/primary/aft)
+/obj/structure/grille,
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
"cGl" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -66491,18 +65379,14 @@
},
/turf/simulated/floor/plasteel,
/area/hallway/primary/aft)
-"cGm" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
-/turf/simulated/floor/plasteel,
-/area/hallway/primary/aft)
"cGn" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
+/obj/machinery/door/airlock/maintenance{
+ locked = 1;
+ name = "Assembly Line Maintenance";
+ req_access_txt = "32"
},
-/turf/simulated/floor/plasteel,
-/area/hallway/primary/aft)
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
"cGo" = (
/obj/structure/cable{
d1 = 1;
@@ -66676,60 +65560,35 @@
},
/area/toxins/xenobiology)
"cGC" = (
-/obj/machinery/alarm{
- dir = 1;
- pixel_y = -22
- },
-/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 1
- },
-/turf/simulated/floor/engine,
-/area/engine/mechanic_workshop)
+/obj/effect/spawner/random_spawners/blood_often,
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
"cGD" = (
-/obj/effect/decal/warning_stripes/southwest,
-/turf/simulated/floor/plasteel,
-/area/engine/mechanic_workshop)
+/turf/simulated/floor/wood{
+ broken = 1;
+ icon_state = "wood-broken"
+ },
+/area/maintenance/aft)
"cGE" = (
-/obj/effect/decal/warning_stripes/southeast,
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
- dir = 1
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/wood{
+ icon_state = "wood-broken6"
},
-/turf/simulated/floor/plasteel,
-/area/engine/mechanic_workshop)
-"cGF" = (
-/obj/effect/decal/warning_stripes/south,
-/turf/simulated/floor/plasteel,
-/area/engine/mechanic_workshop)
+/area/maintenance/aft)
"cGG" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
+/obj/item/chair/stool{
+ dir = 8
},
-/area/engine/mechanic_workshop)
-"cGH" = (
-/obj/machinery/door/firedoor,
-/obj/structure/table/reinforced,
-/obj/machinery/door/window/westright{
- name = "Mechanic's Desk";
- req_access = null;
- req_access_txt = "70"
+/obj/effect/spawner/lootdrop/maintenance{
+ lootcount = 8;
+ name = "8maintenance loot spawner"
},
-/obj/machinery/cell_charger,
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/engine/mechanic_workshop)
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
"cGI" = (
-/obj/structure/chair/office/light{
- dir = 4
- },
-/obj/effect/landmark/start{
- name = "Mechanic"
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/engine/mechanic_workshop)
+/obj/machinery/slot_machine,
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
"cGJ" = (
/obj/machinery/atmospherics/unary/portables_connector{
dir = 4
@@ -66762,19 +65621,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/wood,
/area/medical/psych)
-"cGM" = (
-/obj/structure/cable{
- d1 = 2;
- d2 = 4;
- icon_state = "2-4";
- tag = ""
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/plasteel{
- icon_state = "yellowcorner"
- },
-/area/hallway/primary/aft)
"cGN" = (
/obj/machinery/meter,
/obj/machinery/atmospherics/pipe/manifold/hidden/yellow{
@@ -66782,32 +65628,6 @@
},
/turf/simulated/wall,
/area/engine/controlroom)
-"cGO" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8";
- tag = ""
- },
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
- dir = 1
- },
-/turf/simulated/floor/plasteel{
- icon_state = "yellowcorner"
- },
-/area/hallway/primary/aft)
-"cGP" = (
-/obj/structure/cable{
- d1 = 2;
- d2 = 8;
- icon_state = "2-8";
- tag = ""
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/plasteel{
- icon_state = "yellowcorner"
- },
-/area/hallway/primary/aft)
"cGQ" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/cable{
@@ -66858,10 +65678,10 @@
},
/area/gateway)
"cGU" = (
+/obj/effect/decal/warning_stripes/yellow,
/obj/structure/plasticflaps{
opacity = 1
},
-/obj/effect/decal/warning_stripes/yellow/hollow,
/turf/simulated/floor/plasteel,
/area/assembly/assembly_line)
"cGV" = (
@@ -66876,12 +65696,6 @@
icon_state = "dark"
},
/area/gateway)
-"cGW" = (
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/plasteel{
- icon_state = "yellowcorner"
- },
-/area/hallway/primary/aft)
"cGX" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -66973,14 +65787,6 @@
icon_state = "neutralfull"
},
/area/engine/chiefs_office)
-"cHc" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
- dir = 1
- },
-/turf/simulated/floor/plasteel{
- icon_state = "yellowcorner"
- },
-/area/hallway/primary/aft)
"cHd" = (
/obj/structure/closet,
/turf/simulated/floor/plating,
@@ -67206,23 +66012,17 @@
},
/area/toxins/xenobiology)
"cHB" = (
-/obj/machinery/door/poddoor{
- density = 0;
- icon_state = "open";
- id_tag = "mechpod";
- name = "Mechanic's Workshop Inner Door";
- opacity = 0
+/obj/effect/spawner/random_spawners/blood_maybe,
+/turf/simulated/floor/wood{
+ icon_state = "wood-broken3"
},
-/turf/simulated/floor/engine,
-/area/engine/mechanic_workshop)
+/area/maintenance/aft)
"cHC" = (
-/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 1
+/obj/item/chair/stool{
+ dir = 8
},
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/engine/mechanic_workshop)
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
"cHD" = (
/turf/simulated/floor/plasteel,
/area/hallway/primary/aft)
@@ -67233,29 +66033,11 @@
icon_state = "1-2";
tag = ""
},
-/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/maintenance{
req_access_txt = "12"
},
/turf/simulated/floor/plating,
/area/maintenance/apmaint)
-"cHF" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2";
- tag = ""
- },
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/maintenance{
- icon_state = "door_locked";
- locked = 1;
- name = "Assembly Line Maintenance";
- req_access_txt = "32"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/plating,
-/area/assembly/assembly_line)
"cHG" = (
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
@@ -67266,17 +66048,14 @@
},
/turf/simulated/floor/plasteel,
/area/hallway/primary/aft)
-"cHI" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/turf/simulated/floor/plasteel,
-/area/hallway/primary/aft)
"cHJ" = (
/obj/structure/disposalpipe/segment{
dir = 8;
icon_state = "pipe-c"
},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/hallway/primary/aft)
"cHK" = (
@@ -67371,17 +66150,9 @@
/area/engine/break_room)
"cHR" = (
/obj/structure/disposalpipe/segment,
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2";
- tag = ""
- },
/obj/machinery/door/airlock/maintenance{
req_access_txt = "12"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plating,
/area/maintenance/apmaint)
"cHS" = (
@@ -67782,10 +66553,6 @@
icon_state = "white"
},
/area/toxins/misc_lab)
-"cIG" = (
-/obj/machinery/light,
-/turf/simulated/floor/engine,
-/area/engine/mechanic_workshop)
"cIH" = (
/obj/structure/table/reinforced,
/obj/item/taperecorder,
@@ -67797,32 +66564,14 @@
icon_state = "white"
},
/area/toxins/misc_lab)
-"cII" = (
-/obj/structure/spacepoddoor,
-/obj/machinery/door/poddoor/multi_tile/three_tile_ver{
- id_tag = "mechpodbayouter";
- req_access_txt = "70"
- },
-/turf/simulated/floor/engine,
-/area/engine/mechanic_workshop)
"cIJ" = (
-/obj/structure/spacepoddoor,
-/obj/machinery/door/poddoor/multi_tile/three_tile_ver{
- id_tag = "mechpodbay";
- req_access_txt = "70"
- },
-/turf/simulated/floor/engine,
-/area/engine/mechanic_workshop)
+/turf/simulated/wall/rust,
+/area/maintenance/aft)
"cIK" = (
-/obj/machinery/door_control{
- desc = "A remote control-switch for the pod doors.";
- id = "mechpodbay";
- name = "Pod Door Control";
- pixel_y = -24;
- req_access_txt = "70"
+/turf/simulated/floor/wood{
+ icon_state = "wood-broken7"
},
-/turf/simulated/floor/engine,
-/area/engine/mechanic_workshop)
+/area/maintenance/aft)
"cIL" = (
/obj/structure/closet/l3closet/scientist,
/obj/effect/decal/warning_stripes/southeast,
@@ -67830,16 +66579,6 @@
icon_state = "white"
},
/area/toxins/xenobiology)
-"cIM" = (
-/obj/machinery/door_control{
- desc = "A remote control-switch for the pod doors.";
- id = "mechpodbayouter";
- name = "Pod Door Control";
- pixel_y = -24;
- req_access_txt = "70"
- },
-/turf/simulated/floor/engine,
-/area/engine/mechanic_workshop)
"cIN" = (
/obj/structure/cable{
d1 = 1;
@@ -67881,14 +66620,13 @@
/turf/simulated/floor/plating,
/area/maintenance/aft)
"cIQ" = (
+/obj/effect/decal/cleanable/dirt,
/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2";
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8";
tag = ""
},
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel,
/area/assembly/assembly_line)
"cIR" = (
@@ -67898,6 +66636,9 @@
name = "Engineering Main";
sortType = 4
},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/hallway/primary/aft)
"cIS" = (
@@ -68060,17 +66801,6 @@
icon_state = "white"
},
/area/toxins/xenobiology)
-"cJf" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 4;
- icon_state = "1-4";
- tag = ""
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/plasteel,
-/area/assembly/assembly_line)
"cJg" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/unary/vent_pump/on{
@@ -68093,36 +66823,6 @@
},
/turf/simulated/floor/plasteel,
/area/assembly/assembly_line)
-"cJj" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/engineering/glass{
- icon_state = "door_locked";
- locked = 1;
- name = "Assembly Line (KEEP OUT)";
- req_access_txt = "32"
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/turf/simulated/floor/plasteel,
-/area/assembly/assembly_line)
-"cJk" = (
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/turf/simulated/floor/plasteel,
-/area/hallway/primary/aft)
-"cJl" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "yellowcorner"
- },
-/area/hallway/primary/aft)
"cJm" = (
/obj/structure/cable{
d1 = 1;
@@ -68137,16 +66837,6 @@
},
/turf/simulated/floor/plasteel,
/area/hallway/primary/aft)
-"cJn" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 4;
- icon_state = "1-4";
- tag = ""
- },
-/obj/effect/decal/warning_stripes/north,
-/turf/simulated/floor/plating,
-/area/maintenance/aft)
"cJo" = (
/obj/structure/cable{
d2 = 2;
@@ -68472,10 +67162,6 @@
/obj/machinery/atmospherics/pipe/simple/insulated,
/turf/simulated/floor/engine,
/area/toxins/misc_lab)
-"cJS" = (
-/obj/structure/grille,
-/turf/simulated/floor/plating/airless,
-/area/engine/mechanic_workshop)
"cJT" = (
/obj/machinery/door/poddoor{
density = 0;
@@ -68494,61 +67180,13 @@
},
/turf/simulated/floor/engine,
/area/toxins/misc_lab)
-"cJU" = (
-/obj/structure/grille,
-/obj/structure/sign/securearea{
- desc = "A warning sign which reads 'KEEP CLEAR OF DOCKING AREA'.";
- name = "KEEP CLEAR: DOCKING AREA"
- },
-/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,
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/engine/mechanic_workshop)
-"cJX" = (
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/engine/mechanic_workshop)
-"cJY" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/engineering/glass{
- name = "Mechanic Workshop";
- req_access_txt = "70"
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/engine/mechanic_workshop)
+/obj/item/chair/stool,
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
"cJZ" = (
/turf/simulated/wall,
/area/hallway/primary/aft)
-"cKa" = (
-/obj/machinery/door/airlock/maintenance{
- name = "Mechanic Workshop Maintenance";
- req_access = null;
- req_access_txt = "70"
- },
-/turf/simulated/floor/plating,
-/area/maintenance/aft)
"cKb" = (
/turf/simulated/wall,
/area/assembly/assembly_line)
@@ -68569,18 +67207,12 @@
/turf/simulated/floor/plating,
/area/maintenance/asmaint)
"cKd" = (
-/obj/structure/table,
-/obj/item/paper_bin{
- pixel_x = 1;
- pixel_y = 9
+/obj/machinery/slot_machine,
+/obj/structure/sign/poster/contraband/random{
+ pixel_y = -32
},
-/obj/item/folder/yellow,
-/obj/item/pen,
-/obj/item/book/manual/sop_engineering,
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/engine/mechanic_workshop)
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
"cKe" = (
/obj/effect/spawner/window/reinforced,
/obj/structure/disposalpipe/segment,
@@ -68929,9 +67561,10 @@
/turf/simulated/floor/plating,
/area/maintenance/aft)
"cKK" = (
+/obj/item/pen,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/unary/vent_scrubber/on{
- dir = 1
+ dir = 8
},
/turf/simulated/floor/plasteel,
/area/assembly/assembly_line)
@@ -69185,6 +67818,10 @@
d2 = 8;
icon_state = "4-8"
},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 6
+ },
+/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
/area/maintenance/aft)
"cLn" = (
@@ -69199,23 +67836,15 @@
/obj/effect/decal/warning_stripes/north,
/turf/simulated/floor/plating,
/area/assembly/assembly_line)
-"cLo" = (
+"cLp" = (
/obj/structure/cable{
d1 = 2;
d2 = 8;
icon_state = "2-8";
tag = ""
},
-/turf/simulated/floor/plating,
-/area/maintenance/aft)
-"cLp" = (
-/obj/machinery/light/small{
- dir = 1
- },
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 10
},
/turf/simulated/floor/plating,
/area/maintenance/aft)
@@ -69229,60 +67858,6 @@
icon_state = "white"
},
/area/assembly/assembly_line)
-"cLr" = (
-/obj/machinery/door_control{
- id = "mechpod";
- name = "Mechanic's Inner Door Control";
- pixel_y = -24;
- req_access_txt = "70"
- },
-/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
- },
-/turf/simulated/floor/plasteel,
-/area/engine/mechanic_workshop)
-"cLs" = (
-/obj/machinery/light_switch{
- name = "light switch ";
- pixel_y = -22
- },
-/turf/simulated/floor/plasteel{
- dir = 5;
- icon_state = "dark"
- },
-/area/engine/mechanic_workshop)
-"cLt" = (
-/obj/machinery/alarm{
- dir = 1;
- pixel_y = -22
- },
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/machinery/vending/coffee,
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/engine/mechanic_workshop)
-"cLu" = (
-/obj/item/radio/intercom{
- pixel_y = -28
- },
-/obj/machinery/computer/rdconsole/mechanics,
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/engine/mechanic_workshop)
"cLv" = (
/obj/effect/decal/warning_stripes/north,
/turf/simulated/floor/plasteel{
@@ -69306,14 +67881,8 @@
/turf/simulated/floor/plasteel,
/area/assembly/assembly_line)
"cLy" = (
-/obj/structure/rack{
- dir = 8;
- layer = 2.9
- },
-/obj/effect/spawner/lootdrop/maintenance{
- lootcount = 2;
- name = "2maintenance loot spawner"
- },
+/obj/effect/decal/cleanable/dirt,
+/mob/living/simple_animal/mouse,
/turf/simulated/floor/plating,
/area/maintenance/aft)
"cLz" = (
@@ -69378,11 +67947,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel,
/area/assembly/assembly_line)
-"cLI" = (
-/obj/item/stack/cable_coil,
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel,
-/area/assembly/assembly_line)
"cLJ" = (
/obj/structure/closet/fireaxecabinet{
pixel_y = -32
@@ -69406,6 +67970,9 @@
dir = 1;
icon_state = "pipe-c"
},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "yellowcorner"
@@ -69674,22 +68241,14 @@
/obj/item/stack/sheet/cardboard,
/turf/simulated/floor/plating,
/area/maintenance/asmaint2)
-"cMq" = (
+"cMr" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2";
tag = ""
},
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/maintenance{
- req_access_txt = "12"
- },
-/turf/simulated/floor/plating,
-/area/maintenance/aft)
-"cMr" = (
-/obj/structure/table,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plating,
/area/maintenance/aft)
"cMs" = (
@@ -70295,11 +68854,6 @@
"cNG" = (
/turf/simulated/floor/plating,
/area/assembly/assembly_line)
-"cNH" = (
-/obj/item/pen,
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel,
-/area/assembly/assembly_line)
"cNI" = (
/obj/structure/cable{
d1 = 4;
@@ -70418,6 +68972,15 @@
tag = ""
},
/obj/structure/disposalpipe/segment,
+/obj/machinery/door/airlock/maintenance{
+ req_access_txt = "12"
+ },
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2";
+ tag = ""
+ },
/turf/simulated/floor/plasteel{
icon_state = "yellowcorner"
},
@@ -70428,12 +68991,7 @@
dir = 1;
icon_state = "pipe-c"
},
-/obj/structure/cable{
- d1 = 1;
- d2 = 8;
- icon_state = "1-8";
- tag = ""
- },
+/obj/machinery/vending/coffee,
/turf/simulated/floor/plasteel{
icon_state = "yellowcorner"
},
@@ -70622,7 +69180,9 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/mob/living/simple_animal/mouse,
+/obj/machinery/door/airlock/maintenance{
+ req_access_txt = "12"
+ },
/turf/simulated/floor/plating,
/area/maintenance/aft)
"cOr" = (
@@ -70632,20 +69192,6 @@
icon_state = "white"
},
/area/assembly/assembly_line)
-"cOs" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2";
- tag = ""
- },
-/obj/machinery/door/airlock/maintenance{
- req_access_txt = "12"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/plating,
-/area/maintenance/aft)
"cOt" = (
/obj/machinery/door/poddoor{
density = 0;
@@ -70694,10 +69240,6 @@
},
/turf/simulated/floor/engine,
/area/toxins/test_chamber)
-"cOw" = (
-/obj/effect/spawner/window/reinforced,
-/turf/simulated/wall,
-/area/maintenance/aft)
"cOx" = (
/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
@@ -70803,23 +69345,22 @@
/turf/simulated/floor/plasteel,
/area/atmos/distribution)
"cOK" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2";
- tag = ""
- },
/obj/machinery/navbeacon{
codes_txt = "patrol;next_patrol=AIE";
location = "AftH"
},
+/obj/structure/disposalpipe/segment,
/obj/structure/cable{
- d1 = 2;
- d2 = 4;
- icon_state = "2-4";
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8";
tag = ""
},
-/obj/structure/disposalpipe/segment,
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
/turf/simulated/floor/plasteel,
/area/hallway/primary/aft)
"cOL" = (
@@ -71012,9 +69553,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/light/small{
- dir = 1
- },
+/obj/structure/girder,
/turf/simulated/floor/plating,
/area/maintenance/aft)
"cPi" = (
@@ -71056,6 +69595,7 @@
icon_state = "1-8";
tag = ""
},
+/obj/structure/closet/firecloset,
/turf/simulated/floor/plating,
/area/maintenance/aft)
"cPm" = (
@@ -72333,6 +70873,7 @@
dir = 10;
initialize_directions = 10
},
+/obj/structure/girder,
/turf/simulated/floor/plating,
/area/maintenance/aft)
"cRJ" = (
@@ -73029,6 +71570,7 @@
icon_state = "4-8";
tag = ""
},
+/obj/structure/closet/emcloset,
/turf/simulated/floor/plating,
/area/maintenance/aft)
"cTd" = (
@@ -73527,11 +72069,9 @@
},
/obj/machinery/door/airlock/external{
frequency = 1379;
- icon_state = "door_locked";
id_tag = "robotics_solar_outer";
locked = 1;
name = "Engineering External Access";
- req_access = null;
req_access_txt = "10;13"
},
/turf/simulated/floor/plating,
@@ -73575,11 +72115,9 @@
},
/obj/machinery/door/airlock/external{
frequency = 1379;
- icon_state = "door_locked";
id_tag = "robotics_solar_inner";
locked = 1;
name = "Engineering External Access";
- req_access = null;
req_access_txt = "13"
},
/turf/simulated/floor/plating,
@@ -73763,7 +72301,6 @@
pixel_y = 4
},
/obj/item/megaphone,
-/obj/item/lock_buster,
/mob/living/simple_animal/parrot/Poly,
/turf/simulated/floor/plasteel{
dir = 8;
@@ -76247,10 +74784,6 @@
icon_state = "dark"
},
/area/ai_monitored/storage/eva)
-"dat" = (
-/obj/effect/spawner/window/reinforced,
-/turf/simulated/floor/plating,
-/area/escapepodbay)
"dau" = (
/obj/machinery/power/terminal{
dir = 1
@@ -76323,18 +74856,6 @@
},
/turf/simulated/floor/plating,
/area/maintenance/asmaint)
-"daC" = (
-/obj/structure/grille,
-/turf/simulated/floor/plating/airless,
-/area/escapepodbay)
-"daD" = (
-/obj/structure/grille,
-/obj/structure/sign/securearea{
- desc = "A warning sign which reads 'KEEP CLEAR OF DOCKING AREA'.";
- name = "KEEP CLEAR: DOCKING AREA"
- },
-/turf/simulated/floor/plating/airless,
-/area/escapepodbay)
"daE" = (
/obj/structure/cable{
d1 = 4;
@@ -76533,18 +75054,6 @@
},
/turf/simulated/floor/plasteel,
/area/atmos)
-"daZ" = (
-/obj/machinery/power/apc{
- dir = 8;
- name = "Escape Podbay APC";
- pixel_x = -25
- },
-/obj/structure/cable{
- d2 = 4;
- icon_state = "0-4"
- },
-/turf/simulated/floor/plasteel,
-/area/escapepodbay)
"dba" = (
/obj/structure/lattice,
/obj/machinery/atmospherics/pipe/simple/visible/yellow{
@@ -76645,25 +75154,6 @@
},
/turf/simulated/floor/plating,
/area/maintenance/genetics)
-"dbo" = (
-/obj/machinery/light_switch{
- pixel_x = -23
- },
-/turf/simulated/floor/plasteel,
-/area/escapepodbay)
-"dbp" = (
-/obj/machinery/door/airlock/maintenance{
- req_access_txt = "12"
- },
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2";
- tag = ""
- },
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/plating,
-/area/maintenance/aft)
"dbq" = (
/obj/structure/cable{
d1 = 1;
@@ -76803,14 +75293,6 @@
},
/turf/simulated/floor/plating,
/area/maintenance/asmaint)
-"dbH" = (
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/effect/decal/warning_stripes/yellow/hollow,
-/obj/structure/reagent_dispensers/watertank,
-/turf/simulated/floor/plasteel,
-/area/escapepodbay)
"dbJ" = (
/obj/machinery/power/terminal{
dir = 1
@@ -83894,6 +82376,10 @@
},
/turf/simulated/floor/bluegrid,
/area/tcommsat/chamber)
+"dUD" = (
+/obj/item/chair,
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
"dVs" = (
/obj/effect/spawner/window/reinforced,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -83917,6 +82403,17 @@
icon_state = "dark"
},
/area/engine/engineering)
+"efn" = (
+/obj/structure/safe,
+/obj/item/soap/homemade,
+/obj/item/key/janitor{
+ name = "spare key";
+ pixel_y = 7
+ },
+/obj/item/bikehorn/rubberducky,
+/obj/item/clothing/head/crown,
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
"egO" = (
/obj/machinery/meter,
/obj/machinery/atmospherics/pipe/simple/visible{
@@ -83977,6 +82474,18 @@
},
/turf/simulated/floor/plating,
/area/engine/supermatter)
+"eIi" = (
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
"eJr" = (
/obj/effect/decal/warning_stripes/west,
/obj/structure/cable/yellow{
@@ -84002,6 +82511,10 @@
},
/turf/simulated/wall,
/area/maintenance/fsmaint)
+"eLB" = (
+/obj/item/seeds/potato,
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
"eMw" = (
/obj/structure/cable{
d1 = 4;
@@ -84038,6 +82551,10 @@
},
/turf/simulated/floor/plating,
/area/engine/supermatter)
+"eSr" = (
+/obj/item/stack/cable_coil,
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
"eTE" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/wall,
@@ -84047,6 +82564,15 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plating,
/area/crew_quarters/dorms)
+"fbx" = (
+/obj/structure/disposalpipe/segment,
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
+"fcH" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/hydroponics/soil,
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
"fdg" = (
/obj/structure/reflector/single{
anchored = 1;
@@ -84056,6 +82582,18 @@
icon_state = "dark"
},
/area/engine/engineering)
+"fea" = (
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4";
+ tag = ""
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 5
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
"fes" = (
/obj/structure/chair{
dir = 4
@@ -84077,6 +82615,23 @@
},
/turf/simulated/floor/plasteel,
/area/crew_quarters/dorms)
+"fjj" = (
+/obj/machinery/atmospherics/binary/valve,
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
+"fmi" = (
+/obj/effect/spawner/lootdrop/maintenance{
+ lootcount = 3;
+ name = "3maintenance loot spawner"
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
+"fmN" = (
+/obj/machinery/computer/account_database{
+ dir = 4
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
"fqV" = (
/obj/effect/decal/warning_stripes/north,
/obj/machinery/atmospherics/pipe/simple/visible/cyan{
@@ -84108,6 +82663,16 @@
icon_state = "dark"
},
/area/engine/engineering)
+"fIO" = (
+/obj/effect/spawner/window/reinforced,
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8";
+ tag = ""
+ },
+/turf/simulated/floor/plating,
+/area/assembly/assembly_line)
"fKd" = (
/obj/effect/spawner/window/reinforced/plasma,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
@@ -84115,6 +82680,31 @@
},
/turf/simulated/floor/plating,
/area/engine/engineering)
+"fKf" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/engineering/glass{
+ locked = 1;
+ name = "Assembly Line (KEEP OUT)";
+ req_access_txt = "32"
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel,
+/area/assembly/assembly_line)
+"fLH" = (
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/light/small,
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
"fPU" = (
/obj/effect/decal/warning_stripes/west,
/obj/machinery/atmospherics/pipe/simple/visible{
@@ -84123,6 +82713,13 @@
/obj/machinery/meter,
/turf/simulated/floor/engine,
/area/engine/engineering)
+"fQq" = (
+/obj/effect/turf_decal/loading_area{
+ dir = 8
+ },
+/obj/effect/spawner/random_spawners/cobweb_right_frequent,
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
"fRL" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/item/radio/intercom{
@@ -84130,12 +82727,32 @@
},
/turf/simulated/floor/plasteel,
/area/crew_quarters/dorms)
+"fVJ" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/light/small{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
"fWP" = (
/obj/machinery/atmospherics/pipe/simple/visible/red{
dir = 4
},
/turf/simulated/floor/engine,
/area/engine/engineering)
+"fXL" = (
+/obj/machinery/light/small{
+ dir = 8
+ },
+/obj/machinery/atmospherics/unary/tank/air{
+ dir = 4
+ },
+/obj/effect/decal/warning_stripes/north,
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
"fYe" = (
/obj/machinery/light,
/turf/simulated/floor/plasteel{
@@ -84165,6 +82782,12 @@
},
/turf/simulated/floor/plasteel,
/area/crew_quarters/dorms)
+"gjo" = (
+/obj/structure/reagent_dispensers/beerkeg/nuke{
+ name = "Nanotrasen-brand nuclear fizz-sion explosive"
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
"gmW" = (
/obj/machinery/power/emitter{
anchored = 1;
@@ -84177,6 +82800,48 @@
},
/turf/simulated/floor/plating,
/area/engine/engineering)
+"gqA" = (
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2";
+ tag = ""
+ },
+/obj/structure/cable{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8";
+ tag = ""
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 10
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
+"gyA" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8";
+ tag = ""
+ },
+/obj/machinery/power/apc{
+ dir = 1;
+ name = "north bump";
+ pixel_y = 24
+ },
+/obj/structure/cable{
+ d2 = 4;
+ icon_state = "0-4"
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
"gAm" = (
/obj/structure/cable/yellow{
d1 = 2;
@@ -84192,6 +82857,15 @@
icon_state = "dark"
},
/area/engine/engineering)
+"gAJ" = (
+/obj/structure/cable{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4";
+ tag = ""
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
"gCE" = (
/obj/structure/cable{
d1 = 1;
@@ -84263,6 +82937,19 @@
},
/turf/simulated/floor/plating,
/area/toxins/mixing)
+"gSd" = (
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8";
+ tag = ""
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/grille,
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
"gSS" = (
/obj/machinery/atmospherics/pipe/simple/visible/yellow{
dir = 9
@@ -84280,6 +82967,11 @@
/obj/machinery/atmospherics/pipe/simple/visible/cyan,
/turf/simulated/floor/engine,
/area/engine/engineering)
+"heB" = (
+/turf/simulated/floor/wood{
+ icon_state = "wood-broken5"
+ },
+/area/maintenance/aft)
"hsy" = (
/obj/machinery/atmospherics/pipe/simple/insulated{
dir = 4
@@ -84301,6 +82993,18 @@
},
/turf/simulated/floor/plating,
/area/toxins/mixing)
+"hum" = (
+/obj/machinery/door/airlock/vault{
+ locked = 1;
+ name = "abandoned vault";
+ req_access_txt = "32"
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
+"hvi" = (
+/obj/effect/decal/warning_stripes/southeastcorner,
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
"hxf" = (
/obj/machinery/door/airlock/engineering/glass{
name = "Laser Room";
@@ -84324,6 +83028,13 @@
},
/turf/simulated/floor/bluegrid,
/area/tcommsat/chamber)
+"hAA" = (
+/obj/machinery/door/airlock/maintenance{
+ req_access_txt = "12"
+ },
+/obj/effect/decal/cleanable/blood/oil,
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
"hNT" = (
/obj/effect/decal/warning_stripes/southeast,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -84346,6 +83057,14 @@
},
/turf/simulated/floor/engine,
/area/engine/engineering)
+"hSm" = (
+/obj/structure/table/wood,
+/obj/effect/spawner/lootdrop/maintenance{
+ lootcount = 2;
+ name = "2maintenance loot spawner"
+ },
+/turf/simulated/floor/transparent/glass/reinforced,
+/area/maintenance/apmaint)
"idF" = (
/obj/effect/decal/warning_stripes/south,
/obj/machinery/atmospherics/trinary/filter/flipped{
@@ -84354,6 +83073,9 @@
},
/turf/simulated/floor/engine,
/area/engine/engineering)
+"iez" = (
+/turf/simulated/wall/rust,
+/area/maintenance/apmaint)
"ieI" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/binary/pump{
@@ -84406,6 +83128,10 @@
},
/turf/simulated/floor/plating,
/area/engine/engineering)
+"iui" = (
+/obj/effect/decal/warning_stripes/northeastcorner,
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
"ivi" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
@@ -84483,6 +83209,11 @@
/obj/machinery/atmospherics/pipe/simple/visible/green,
/turf/simulated/floor/engine,
/area/engine/engineering)
+"iYO" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light/small,
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
"iZs" = (
/obj/effect/spawner/window/reinforced,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -84506,6 +83237,15 @@
},
/turf/simulated/floor/plating,
/area/engine/engineering)
+"jfb" = (
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/effect/spawner/random_barrier/possibly_welded_airlock,
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
"jnm" = (
/obj/structure/cable{
d1 = 1;
@@ -84550,6 +83290,21 @@
},
/turf/simulated/floor/plating,
/area/engine/engineering)
+"jDJ" = (
+/obj/structure/rack{
+ dir = 1
+ },
+/obj/item/reagent_containers/food/drinks/bottle/whiskey{
+ pixel_x = -3;
+ pixel_y = -3
+ },
+/obj/item/reagent_containers/food/drinks/bottle/whiskey,
+/obj/item/reagent_containers/food/drinks/bottle/whiskey{
+ pixel_x = 3;
+ pixel_y = 3
+ },
+/turf/simulated/floor/wood,
+/area/maintenance/aft)
"jMw" = (
/obj/machinery/door/airlock/titanium,
/turf/simulated/floor/mineral/titanium,
@@ -84561,6 +83316,12 @@
},
/turf/simulated/floor/plasteel,
/area/crew_quarters/dorms)
+"jQG" = (
+/obj/item/stack/sheet/wood{
+ amount = 4
+ },
+/turf/simulated/floor/transparent/glass/reinforced,
+/area/maintenance/apmaint)
"jRV" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 9
@@ -84598,6 +83359,16 @@
},
/turf/simulated/floor/engine,
/area/engine/supermatter)
+"jZu" = (
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2";
+ tag = ""
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
"kbU" = (
/obj/machinery/door/airlock/external{
frequency = 1379;
@@ -84633,6 +83404,31 @@
},
/turf/simulated/floor/plasteel,
/area/crew_quarters/dorms)
+"klK" = (
+/obj/structure/table_frame/wood,
+/obj/item/stack/sheet/wood{
+ amount = 2
+ },
+/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+ pixel_x = -5;
+ pixel_y = 7
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
+"kmw" = (
+/obj/effect/decal/warning_stripes/west,
+/obj/effect/spawner/random_spawners/blood_often,
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
+"krB" = (
+/obj/machinery/light/small{
+ dir = 1
+ },
+/obj/structure/chair/sofa/right{
+ name = "tatty old sofa"
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
"kwt" = (
/obj/machinery/door/poddoor{
density = 0;
@@ -84654,6 +83450,13 @@
},
/turf/simulated/floor/plating,
/area/bridge)
+"kIa" = (
+/obj/structure/rack{
+ dir = 4
+ },
+/obj/effect/spawner/lootdrop/maintenance,
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
"kIR" = (
/obj/structure/lattice/catwalk,
/obj/machinery/atmospherics/pipe/simple/hidden/yellow,
@@ -84720,6 +83523,18 @@
},
/turf/simulated/wall/r_wall,
/area/engine/supermatter)
+"kXY" = (
+/obj/structure/closet/crate{
+ icon_state = "crateopen";
+ name = "Silver Crate";
+ opened = 1
+ },
+/obj/item/paper{
+ info = "I.O.U. some shinies - Mr V. Ox"
+ },
+/mob/living/simple_animal/hostile/scarybat,
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
"kYw" = (
/obj/structure/cable{
d1 = 4;
@@ -84772,6 +83587,15 @@
},
/turf/simulated/floor/engine,
/area/engine/supermatter)
+"lxs" = (
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/structure/girder,
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
"lzm" = (
/obj/machinery/light/small{
dir = 8
@@ -84811,12 +83635,34 @@
},
/turf/simulated/floor/plasteel,
/area/atmos)
+"lMw" = (
+/obj/effect/decal/warning_stripes/east,
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
+"lPK" = (
+/obj/structure/table,
+/obj/structure/bedsheetbin{
+ pixel_x = -1;
+ pixel_y = 2
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
"lQS" = (
/obj/structure/shuttle/engine/propulsion/burst{
dir = 8
},
/turf/simulated/wall/mineral/titanium,
/area/shuttle/pod_3)
+"lUC" = (
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8";
+ tag = ""
+ },
+/turf/simulated/wall,
+/area/hallway/primary/aft)
"lVr" = (
/obj/machinery/atmospherics/pipe/simple/visible/supply{
dir = 10
@@ -84838,6 +83684,24 @@
/obj/machinery/atmospherics/pipe/simple/visible/cyan,
/turf/simulated/floor/engine,
/area/engine/engineering)
+"mar" = (
+/obj/structure/chair/sofa/left{
+ name = "tatty old sofa"
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
+"meF" = (
+/obj/machinery/light/small{
+ dir = 4;
+ pixel_y = 8
+ },
+/obj/effect/spawner/lootdrop/maintenance{
+ lootcount = 3;
+ name = "3maintenance loot spawner"
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
"mkE" = (
/obj/machinery/atmospherics/pipe/simple/hidden/yellow,
/obj/machinery/atmospherics/unary/vent_scrubber/on{
@@ -84923,10 +83787,20 @@
},
/turf/simulated/wall/r_wall,
/area/maintenance/fsmaint)
+"nhn" = (
+/obj/structure/sign/poster/contraband/random{
+ pixel_x = 32
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
"nic" = (
/obj/effect/spawner/window/reinforced/plasma,
/turf/simulated/floor/plating,
/area/engine/supermatter)
+"nps" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/universal,
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
"nqX" = (
/obj/structure/table,
/obj/item/paper{
@@ -84996,6 +83870,13 @@
},
/turf/simulated/floor/plating,
/area/engine/engineering)
+"nQG" = (
+/obj/machinery/atmospherics/pipe/simple/visible{
+ dir = 9
+ },
+/obj/effect/decal/warning_stripes/southeast,
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
"nSi" = (
/obj/effect/decal/warning_stripes/southwest,
/obj/structure/closet/crate/can,
@@ -85029,9 +83910,32 @@
},
/turf/simulated/floor/plasteel,
/area/crew_quarters/dorms)
+"ocN" = (
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/machinery/light/small{
+ dir = 1
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
"omz" = (
/turf/simulated/wall/r_wall,
/area/engine/supermatter)
+"orF" = (
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/structure/grille,
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
"oyv" = (
/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel{
@@ -85045,6 +83949,11 @@
},
/turf/simulated/floor/engine,
/area/engine/engineering)
+"oBH" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/bed,
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
"oBR" = (
/obj/structure/reflector/double{
anchored = 1
@@ -85104,6 +84013,20 @@
/obj/effect/decal/warning_stripes/southwest,
/turf/simulated/floor/engine,
/area/engine/engineering)
+"pgF" = (
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/light/small{
+ dir = 1
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
"phw" = (
/obj/machinery/power/supermatter_crystal/engine,
/turf/simulated/floor/engine,
@@ -85124,6 +84047,16 @@
},
/turf/simulated/floor/plating,
/area/engine/supermatter)
+"pow" = (
+/obj/structure/cable{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4";
+ tag = ""
+ },
+/obj/effect/spawner/random_barrier/obstruction,
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
"pwU" = (
/obj/effect/landmark/battle_mob_point,
/turf/simulated/floor/engine,
@@ -85165,6 +84098,11 @@
},
/turf/simulated/floor/plasteel,
/area/engine/equipmentstorage)
+"pNz" = (
+/obj/effect/decal/warning_stripes/northwestcorner,
+/obj/effect/spawner/random_spawners/blood_often,
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
"pOj" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 6
@@ -85201,6 +84139,20 @@
},
/turf/space,
/area/space/nearstation)
+"pZQ" = (
+/obj/structure/closet/crate{
+ icon_state = "crateopen";
+ name = "Gold Crate";
+ opened = 1
+ },
+/obj/effect/decal/cleanable/cobweb,
+/obj/item/storage/belt/fannypack/yellow,
+/obj/effect/spawner/lootdrop/maintenance{
+ lootcount = 8;
+ name = "8maintenance loot spawner"
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
"qcg" = (
/obj/structure/cable{
d1 = 4;
@@ -85212,6 +84164,28 @@
},
/turf/simulated/floor/engine,
/area/engine/engineering)
+"qdn" = (
+/obj/effect/spawner/window/reinforced,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/turf/simulated/floor/plating,
+/area/assembly/assembly_line)
+"qhK" = (
+/obj/structure/chair/sofa/right{
+ dir = 1;
+ name = "tatty old sofa"
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
+"qjC" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/grille,
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
"qmX" = (
/obj/effect/decal/warning_stripes/east,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
@@ -85248,6 +84222,22 @@
icon_state = "dark"
},
/area/engine/engineering)
+"qrr" = (
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8";
+ tag = ""
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/structure/girder,
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
"qsT" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 9
@@ -85260,6 +84250,10 @@
},
/turf/simulated/wall/r_wall,
/area/engine/engineering)
+"qxh" = (
+/obj/structure/girder,
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
"qCB" = (
/obj/effect/decal/warning_stripes/west,
/obj/structure/cable/yellow{
@@ -85280,6 +84274,22 @@
},
/turf/simulated/floor/plasteel,
/area/crew_quarters/dorms)
+"qGn" = (
+/obj/machinery/atmospherics/unary/tank/air{
+ dir = 4
+ },
+/obj/effect/decal/warning_stripes/south,
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
+"qHe" = (
+/obj/machinery/light/small{
+ dir = 1
+ },
+/obj/machinery/mineral/mint{
+ input_dir = 4
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
"qIn" = (
/obj/structure/table,
/obj/item/stack/sheet/metal/fifty,
@@ -85287,6 +84297,17 @@
icon_state = "dark"
},
/area/engine/engineering)
+"qJc" = (
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
"qOo" = (
/obj/structure/chair{
dir = 4
@@ -85343,6 +84364,13 @@
},
/turf/simulated/floor/plasteel,
/area/atmos)
+"rEx" = (
+/obj/item/chair{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
"rFd" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel,
@@ -85351,6 +84379,15 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/wall,
/area/crew_quarters/dorms)
+"rNJ" = (
+/obj/effect/decal/warning_stripes/southwestcorner,
+/obj/effect/spawner/random_spawners/blood_often,
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
+"rNN" = (
+/obj/effect/spawner/random_spawners/grille_maybe,
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
"rTy" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
@@ -85392,6 +84429,14 @@
},
/turf/simulated/floor/engine,
/area/engine/engineering)
+"rZE" = (
+/mob/living/simple_animal/mouse,
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
+"saD" = (
+/obj/effect/spawner/random_barrier/wall_probably,
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
"scM" = (
/obj/effect/decal/warning_stripes/southwestcorner,
/obj/structure/cable/yellow{
@@ -85426,6 +84471,24 @@
icon_state = "dark"
},
/area/engine/engineering)
+"swy" = (
+/obj/structure/disposalpipe/segment,
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
+"sAz" = (
+/obj/machinery/light/small,
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
+"sFz" = (
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
+/obj/effect/spawner/random_spawners/oil_maybe,
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
"sHt" = (
/turf/simulated/floor/engine,
/area/holodeck/alphadeck)
@@ -85463,6 +84526,11 @@
},
/turf/simulated/floor/plasteel,
/area/crew_quarters/dorms)
+"sZe" = (
+/obj/effect/decal/cleanable/cobweb2,
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
"sZP" = (
/obj/machinery/power/emitter{
anchored = 1;
@@ -85515,12 +84583,29 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/wall/r_wall,
/area/engine/engineering)
+"tAm" = (
+/obj/machinery/meter,
+/obj/machinery/atmospherics/pipe/manifold/visible{
+ dir = 4;
+ initialize_directions = 11
+ },
+/obj/effect/decal/warning_stripes/northeast,
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
"tDn" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
/area/engine/engineering)
+"tDB" = (
+/obj/effect/spawner/random_spawners/blood_maybe,
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
+"tGO" = (
+/obj/structure/girder,
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
"tPd" = (
/obj/machinery/embedded_controller/radio/airlock/airlock_controller{
id_tag = "engineering_east_airlock";
@@ -85553,6 +84638,11 @@
/obj/item/geiger_counter,
/turf/simulated/floor/engine,
/area/engine/engineering)
+"ubb" = (
+/obj/structure/chair,
+/obj/effect/mob_spawn/human/skeleton,
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
"ubz" = (
/obj/structure/table,
/obj/item/rpd,
@@ -85560,6 +84650,13 @@
icon_state = "dark"
},
/area/engine/engineering)
+"ubQ" = (
+/obj/machinery/light/small,
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/wood{
+ icon_state = "wood-broken5"
+ },
+/area/maintenance/aft)
"ufc" = (
/obj/structure/cable{
d2 = 4;
@@ -85593,6 +84690,16 @@
},
/turf/space,
/area/space/nearstation)
+"uPT" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/turf/simulated/floor/plating,
+/area/assembly/assembly_line)
+"uTp" = (
+/obj/effect/spawner/random_barrier/obstruction,
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
"uTu" = (
/obj/structure/window/plasmareinforced{
dir = 8
@@ -85758,6 +84865,15 @@
icon_state = "dark"
},
/area/engine/engineering)
+"war" = (
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
+/turf/simulated/floor/plasteel,
+/area/hallway/primary/aft)
"wbr" = (
/obj/structure/cable{
d1 = 2;
@@ -85782,6 +84898,10 @@
},
/turf/simulated/floor/engine,
/area/engine/supermatter)
+"wlv" = (
+/obj/effect/spawner/random_barrier/possibly_welded_airlock,
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
"wnU" = (
/obj/machinery/alarm{
dir = 4;
@@ -85791,6 +84911,17 @@
icon_state = "dark"
},
/area/engine/engineering)
+"wyI" = (
+/obj/item/stack/cable_coil,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8";
+ tag = ""
+ },
+/turf/simulated/floor/plasteel,
+/area/assembly/assembly_line)
"wEY" = (
/obj/structure/cable{
d1 = 4;
@@ -85876,6 +85007,10 @@
icon_state = "dark"
},
/area/engine/engineering)
+"xvQ" = (
+/obj/effect/spawner/random_spawners/cobweb_left_frequent,
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
"xwz" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -85908,6 +85043,10 @@
},
/turf/simulated/floor/engine,
/area/engine/engineering)
+"xKx" = (
+/obj/structure/closet/emcloset,
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
"xOn" = (
/obj/effect/decal/warning_stripes/northeastcorner,
/obj/machinery/atmospherics/pipe/simple/visible/yellow,
@@ -85935,6 +85074,19 @@
},
/turf/simulated/floor/engine,
/area/engine/engineering)
+"xWX" = (
+/mob/living/simple_animal/hostile/scarybat,
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
+"ycV" = (
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8";
+ tag = ""
+ },
+/turf/simulated/floor/plasteel,
+/area/hallway/primary/aft)
"ykt" = (
/obj/machinery/door/airlock/maintenance{
name = "Atmospherics Maintenance";
@@ -103347,10 +102499,10 @@ cAX
cCy
cAX
cwx
-aaa
-aaa
-aaa
-aaa
+aab
+amh
+aab
+amh
aab
aaa
cNM
@@ -103860,11 +103012,11 @@ czQ
cBa
cCt
cDL
-cFd
+cwx
+aaa
aaa
aaa
aaa
-cJU
aab
aab
cNF
@@ -104117,11 +103269,11 @@ czJ
cBb
cCz
cDX
-cEW
-cFV
-cFV
-cFV
-cJS
+cwx
+aaa
+aaa
+aaa
+aaa
ayi
aab
cpz
@@ -104374,11 +103526,11 @@ czK
cBc
cCB
cDZ
-cEW
-cFW
-cFW
-cII
-cEW
+cwx
+aaa
+aaa
+aaa
+aaa
aaa
aab
cNM
@@ -104631,11 +103783,11 @@ czK
cBd
czJ
cBb
-cEW
-cFX
-cFX
-cFX
-cEW
+cwx
+aaa
+aaa
+aaa
+aaa
ayi
aab
aaa
@@ -104888,11 +104040,11 @@ czR
cBn
cCD
cDO
-cEW
-cGe
-cFX
-cIG
-cEW
+cwx
+aaa
+aaa
+aaa
+aaa
ayi
aab
aaa
@@ -105138,18 +104290,18 @@ aaa
aab
cng
coL
-coL
+cqs
cwx
cwy
cwx
cwx
cCC
cwx
-cEW
-cFX
-cFX
-cFX
-cEW
+cwx
+cOx
+cOx
+cOx
+cOx
cLi
cLi
cLi
@@ -105401,17 +104553,17 @@ csu
csu
csu
cCE
-cAF
+csu
cHE
+cMv
cGf
-cGf
-cGf
-cMq
-cJn
-cLi
-cNA
-cNB
-cMr
+cMv
+cMv
+cNN
+cNC
+kIa
+fXL
+qGn
cLi
aaa
aaa
@@ -105652,23 +104804,23 @@ aaa
aab
cng
ctU
-cgQ
-cwz
-cyg
+coL
+tGO
+meF
+coL
+cqs
+coL
coL
cgQ
-csk
-cqB
-cEY
-cFW
-cFW
+cLi
+cLi
cIJ
-cEY
+cLi
cLm
-dbh
-cNB
-cNB
-cPu
+nps
+fjj
+tAm
+nQG
cOx
aaa
aaa
@@ -105909,22 +105061,22 @@ aaa
aab
cgQ
ctU
-cgQ
-cgQ
-cgQ
-cqF
-cgQ
-cgQ
-cgQ
-cEY
+coL
+cvp
+cwA
+cvp
+cvp
+cwA
+cwA
+cvp
cEw
-cFX
-cIM
-cEY
-cLm
-cLi
-cNC
+jDJ
cNB
+cLi
+qJc
+cNB
+cNB
+cPu
cND
cLi
aaa
@@ -106166,21 +105318,21 @@ aaa
aab
cgQ
ctV
-cgQ
-coL
-coL
coL
+cvp
+pZQ
+cwz
cBf
-coL
-cqz
+oBH
+fmN
cEY
cEv
-cFX
+cEK
cIK
-cEY
-cLm
cLi
+qJc
cLi
+cIJ
cLi
cLi
cLi
@@ -106423,21 +105575,21 @@ aaa
aab
cgQ
ctU
-cgQ
+ctN
cwA
+cqs
+cqs
+xWX
coL
-coL
-cng
-cng
+fmi
cvp
-cEW
cEI
cFL
cGC
-cEY
+cLi
cLp
cMr
-cND
+fea
cLi
aaa
aaa
@@ -106679,23 +105831,23 @@ bYP
aab
aab
cgQ
-ctU
-cgQ
-cwB
-cwB
+ocN
coL
-cng
-aaa
-aaa
-cEW
+cvp
+cwB
+ubb
+gjo
+cqs
+sAz
+cwA
cFX
cFK
-cFX
-cKa
-cLo
-cMv
-cNN
-cOw
+heB
+cLi
+cLi
+cLi
+pgF
+cOx
aab
aab
aaa
@@ -106937,21 +106089,21 @@ aaa
aab
cgQ
ctU
-cgQ
-cwC
coL
+cvp
+efn
coL
-cng
-aaa
-aaa
-cEW
-cHB
+klK
+eSr
+coL
+cvp
+cNB
cFN
cHB
-cEY
-cEY
-cEY
-cLm
+cGI
+cLi
+cGk
+qJc
cOx
aaa
aab
@@ -107194,21 +106346,21 @@ cam
aab
cgQ
ctU
-cqF
-coL
-coL
-coL
-cng
-aaa
-aaa
-cEW
+cqs
+cwA
+sZe
+hvi
+lMw
+iui
+kXY
+cvp
cEJ
cFM
cGD
cJV
-bTm
-cEY
-cLm
+cLi
+cNB
+qJc
cLi
aaa
aaa
@@ -107450,22 +106602,22 @@ cnm
cam
cgQ
cgQ
-ctU
+jfb
cgQ
-cwC
-coL
-coL
-cng
-aaa
-aaa
-cEW
+cvp
+cwA
+cvp
+hum
+cwA
+cvp
+cvp
cEL
cFP
-cGF
-cJV
-cLr
-cEY
-cLm
+cNB
+ubQ
+cLi
+cNB
+orF
cLi
aaa
aab
@@ -107705,24 +106857,24 @@ cfb
cnG
cnl
cam
-coL
+xvQ
coL
ctU
-cgQ
-cwD
-cwD
coL
-cng
-aaa
-aaa
-cEW
+cqF
+cwD
+rNJ
+kmw
+pNz
+coL
+cqF
cEK
-cFO
+cNB
cGE
-cJV
-cGh
-cEY
-cLm
+cNB
+dbh
+cNB
+qJc
cOx
aaa
aaa
@@ -107965,21 +107117,21 @@ cam
cqA
csk
ctU
-cgQ
-cwE
-cqB
coL
-cng
-cng
-cvp
-cEW
-cEN
-cFR
-cJX
-cJW
-cLt
-cEY
-cLm
+cqF
+coL
+fcH
+cqs
+cBo
+coL
+cqF
+cNB
+cNB
+cZw
+cNB
+dbh
+cNB
+qJc
cOx
aaa
aab
@@ -108222,21 +107374,21 @@ cam
cqB
csl
ctU
+ctN
cgQ
-cwB
-cwB
-coL
+krB
+eLB
cBo
coL
cDQ
-cEY
+cgQ
cEM
cFQ
cGG
cHC
-cLs
-cEY
-cLm
+cLi
+cNB
+eIi
cLi
aab
aab
@@ -108479,21 +107631,21 @@ cam
cgQ
cgQ
ctU
-cvo
-cvo
-cvo
-cvo
-cvo
+coL
+cgQ
+mar
+coL
+coL
cFe
-cvo
-cEY
-cEP
-cFR
+qhK
+cgQ
+cZw
+cNB
cGI
cKd
-cLu
-cEY
-cLm
+cLi
+cNA
+fLH
cLi
aaa
aaa
@@ -108736,21 +107888,21 @@ cam
cqE
csm
ctU
-cvo
-cwF
-cwF
-cvo
-cwI
-cwF
-cwF
-cEY
-cEO
-cJY
-cGH
-cEY
-cEY
-cEY
-cLm
+coL
+iez
+cgQ
+saD
+wlv
+iez
+cgQ
+cgQ
+dbh
+dbh
+cLi
+cLi
+cIJ
+qxh
+qJc
cOx
aaa
aaa
@@ -108992,22 +108144,22 @@ cam
coP
cqG
cgQ
-ctU
-cvo
-cwF
+lxs
+coL
+cgQ
cyi
-cwI
-cwI
-cCA
+coL
+coL
+coL
cwF
-cvo
-cER
-cGc
-cnA
-cJZ
+iez
+cZw
+cNB
+cNB
+cNB
cLy
-cLi
-cLm
+cNB
+qJc
cOx
cOx
cQy
@@ -109250,21 +108402,21 @@ cgQ
cgQ
cgQ
ctU
-cvo
-cvo
+coL
+cgQ
cwI
-czM
-cwI
-cwI
-cwF
-cvo
-cEQ
-cGb
-cGM
-cOs
-cIP
-cIP
-cKJ
+coL
+rEx
+coL
+cvm
+cgQ
+cNB
+cZw
+cNB
+cNB
+gAJ
+jZu
+gqA
cIP
cIP
cOq
@@ -109503,31 +108655,31 @@ ciw
bYM
cnX
cnn
-coS
+pow
cqH
csu
-coR
-cvo
-cwG
-cwI
-cwI
-cwI
-cwI
+sFz
+coL
+cgQ
+lPK
+coL
+hSm
+cBh
cDS
-cvo
-cEQ
-cGi
-cMV
+cgQ
+cEM
+cZw
cKb
-cKf
-cKf
-cKf
-cKf
+cKb
+fIO
+cKb
+qdn
cKb
cKb
cRC
cRC
cUc
+rZE
cRG
cNB
cLi
@@ -109761,30 +108913,30 @@ bYM
cnX
cnp
coR
+uTp
+cgQ
cgQ
cgQ
cgQ
-cvo
-cvo
cyj
-cvo
+coL
cBh
-cwI
+jQG
cDT
-cvo
-cEV
-cGg
-cGO
+iez
+cNB
+cNB
cKb
cJx
-cLI
-cNG
+wyI
cNG
+uPT
cOz
cLq
cRK
cRC
cRC
+cNB
cRG
cWn
cOx
@@ -110018,32 +109170,32 @@ bYM
coh
coE
cqs
+coL
cgQ
-cso
-csk
+qHe
cvo
-cwH
-cwI
-cwI
-cwI
-cwI
-cwI
-cvo
-cEZ
+ctN
+tDB
+cqs
+coL
+dUD
+cvm
+cgQ
+cNB
cGk
-cGP
-cHF
+cNK
+cJx
cIQ
-cJf
+cJx
cKK
-cNH
cJx
cLv
cRE
cSS
cKb
+cEM
cRG
-cNB
+rNN
cOx
aaa
aab
@@ -110275,20 +109427,19 @@ bYM
cgQ
cnq
cqr
-cqF
-csp
-cqz
-cvo
-cwI
+coL
+cgQ
+fQq
+fmi
+tGO
cyk
-czM
-cwI
-cCG
+tGO
+nhn
+tDB
cEb
-cvo
-cEX
+cgQ
+cZw
cGj
-cJZ
cKb
cLx
cMt
@@ -110299,7 +109450,8 @@ cLv
cRE
cTd
cKb
-cRG
+rNN
+qrr
cNB
cLi
aab
@@ -110531,22 +109683,21 @@ cgQ
ckp
cgQ
cgQ
-cnX
-cgQ
+gyA
coL
-ctW
-cvo
-cvo
-cvo
-cvo
-cvo
+iez
+cgQ
+cgQ
+cgQ
+cgQ
+iez
+cgQ
cFT
-cvo
-cvo
-cEQ
-cGj
+cgQ
+cgQ
+cZw
+cNB
cGU
-ctT
cLz
cMt
cMC
@@ -110556,8 +109707,9 @@ cOr
cOV
cKb
cKb
-cRG
cNB
+qrr
+rNN
cLi
cLi
cLi
@@ -110789,20 +109941,19 @@ cgQ
cgQ
cns
cqt
-cgQ
-cgQ
-cgQ
-cgQ
coL
+coL
+cyg
+coL
+xKx
cyp
czN
-cyg
-cCH
coL
-cqF
-cEQ
-cGj
-cJZ
+coL
+coL
+hAA
+cZw
+cNB
cKb
cLB
cMt
@@ -110813,11 +109964,12 @@ cKb
cKb
cKb
cUh
+rNN
cRI
dsU
jSI
cUX
-cZw
+iYO
dar
dbt
ddG
@@ -111046,20 +110198,19 @@ cly
cly
coF
cqu
-cly
-cti
-cti
-cti
-cly
-cly
-cti
-cly
-cAH
-cly
+swy
+swy
+swy
+swy
+swy
+swy
+swy
+swy
+swy
+swy
cHR
cFg
-cGm
-cnA
+cZw
cKb
cLA
cMt
@@ -111067,6 +110218,7 @@ cJx
cNZ
cLf
cKb
+cNB
cPb
dsG
dsG
@@ -111305,18 +110457,17 @@ cgS
cgS
cgS
cgS
-ctR
-cvp
+cgS
+cgQ
cng
cng
cng
cng
cng
-cvp
-cFa
+cgQ
+cgQ
cFf
-cGl
-cGW
+fbx
cKe
cLC
cMt
@@ -111324,6 +110475,7 @@ cJx
cNZ
cLd
cKb
+cNB
cPj
cSU
cSU
@@ -111562,7 +110714,7 @@ clR
coY
cqR
csy
-ctR
+cgS
aaa
aaa
aaa
@@ -111570,10 +110722,9 @@ aaa
aaa
aaa
aaa
-cFa
+cLi
cFk
-cGi
-cnA
+cNB
cKf
cLD
cMw
@@ -111581,6 +110732,7 @@ cME
cMx
cLf
cKb
+cNB
cPj
cSU
cUk
@@ -111819,7 +110971,7 @@ ckt
coX
cqI
csx
-ctR
+cgS
aaa
cwP
cyr
@@ -111827,10 +110979,9 @@ cyr
cyr
cCM
aaa
-cFa
+cLi
cFi
-cGi
-cnA
+cNB
cKb
cLE
cMz
@@ -111838,6 +110989,7 @@ cJx
cJx
cLn
cKb
+cNB
cPj
cSU
cUj
@@ -112076,7 +111228,7 @@ coM
cpf
cqJ
csz
-ctR
+cgS
aaa
cwU
cyt
@@ -112084,10 +111236,9 @@ czT
cBr
cwU
aaa
-cFa
+cLi
cFl
-cGi
-cnA
+cZw
cKb
cKb
cMD
@@ -112095,7 +111246,8 @@ cNG
cNG
cLf
cKb
-cPj
+cNB
+gSd
cSU
dsI
pxP
@@ -112333,7 +111485,7 @@ coH
ckt
cqK
clR
-ctR
+cgS
aaa
cwQ
cys
@@ -112341,10 +111493,9 @@ czS
cBq
cCN
aaa
-cFa
-cFi
-cGi
-cnA
+cLi
+qjC
+cZw
cKf
cLD
cJx
@@ -112352,6 +111503,7 @@ cNG
cOG
cOE
cKb
+cNB
cPj
cSU
dsH
@@ -112590,18 +111742,17 @@ coT
cjc
cqL
cmg
-ctR
-cvq
+cgS
+cvx
cwV
cyv
czV
cBk
cwV
-cvq
-cvq
-cFi
-cGi
-cnA
+cvx
+cvx
+cFl
+cNB
cKf
cLG
cMx
@@ -112609,6 +111760,7 @@ cJx
cJx
cOQ
cKb
+cEM
cPh
cSU
dsK
@@ -112856,9 +112008,8 @@ cBl
cCO
cEd
cvx
-cFi
-cGg
-cHc
+cFl
+cNB
cKf
cLF
cJg
@@ -112866,6 +112017,7 @@ cJx
cJx
cLD
cKb
+cNB
cPj
cSU
dsK
@@ -113113,9 +112265,8 @@ cAj
cAJ
cDW
cvx
-cFk
-cGi
-cnA
+fVJ
+cNB
cKb
cJx
cJi
@@ -113123,6 +112274,7 @@ cJx
cJx
cPv
cKb
+cNB
cPj
cSU
dsL
@@ -113370,9 +112522,8 @@ cBs
cwO
cEe
cvx
-cFi
-cGi
-cnA
+cFl
+cGk
cKb
cJx
cJh
@@ -113380,6 +112531,7 @@ cJx
cJx
cNG
cKb
+cGk
cPj
cSU
dsK
@@ -113627,9 +112779,8 @@ cBu
cwO
cEe
cvx
-cFi
-cGi
-cnA
+cFl
+cZw
cKb
cLH
cJi
@@ -113637,6 +112788,7 @@ cNw
cNG
cNG
cKb
+cNB
cPj
cSU
dsK
@@ -113886,14 +113038,14 @@ cvx
cvx
cFo
cGn
-cnA
cKb
cKb
-cJj
+fKf
cNK
cMU
cNK
cKb
+cNB
cPj
cRR
cFC
@@ -114146,11 +113298,11 @@ cGl
cHG
cKk
cLL
-cJl
cMG
cMG
cPL
cJZ
+cNB
cPj
cRR
cUu
@@ -114403,11 +113555,11 @@ cGi
cHD
cHH
cIR
-cJk
cHG
cHG
+war
cNS
-dbp
+dsG
cPl
cRR
cQE
@@ -114660,10 +113812,10 @@ cGp
cHg
cHL
cHJ
-cHI
cHD
cHD
-cMV
+ycV
+lUC
cJZ
cRR
cRR
@@ -114916,8 +114068,8 @@ ctj
cGo
ctS
cHK
-cIS
cJm
+cIS
cKL
cOK
cNT
@@ -122022,7 +121174,7 @@ aoS
apW
aih
aqX
-asd
+aqW
atg
ame
avq
@@ -122279,7 +121431,7 @@ aih
aih
aih
aqX
-asd
+aqW
akE
amw
avq
@@ -122527,18 +121679,18 @@ aaa
aaa
aaa
aaa
+aaa
+aaa
+aaa
+aaa
+aaa
aab
-ajb
-ajs
-aeE
-aeX
-aky
-aia
-ajb
-ajb
-asF
-ajb
-ajb
+aab
+aqI
+aqI
+aqI
+aqI
+atG
awl
arR
awl
@@ -122785,17 +121937,17 @@ aaa
aaa
aaa
aaa
-ajb
-ajt
-ajw
-ajw
-ajw
-aqa
-als
-akc
-asH
-atV
-ajb
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aab
+aab
+atG
apZ
avq
atr
@@ -123042,17 +122194,17 @@ aaa
aaa
aaa
aaa
-ajb
-ajv
-ajw
-ako
-ajw
-afL
-aqJ
-arG
-asG
-atU
-ajb
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aab
+atG
apY
arS
aqc
@@ -123299,17 +122451,17 @@ aaa
aaa
aaa
aaa
-ajb
-aju
-ajw
-ajw
-ajw
-afN
-aqK
-arJ
-asI
-amg
-ajb
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+atG
aqc
aqc
aqc
@@ -123556,17 +122708,17 @@ aaa
aaa
aaa
aaa
-ajb
-ajw
-ajw
-ajw
-ajw
-aic
-als
-arI
-amR
-atW
-ajb
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+atG
aqb
aCh
ats
@@ -123813,17 +122965,17 @@ aaa
aaa
aaa
aaa
-ajb
-ajx
-ajx
-ajx
-akz
-ajb
-ajb
-ajb
-amV
-ajb
-amx
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+atG
apY
arT
aqc
@@ -124070,16 +123222,16 @@ aaa
aaa
aaa
aaa
-alI
-ajy
-ajy
-ajy
-ajy
-alI
-aab
-aab
-aab
-aab
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
atG
aqc
aqc
@@ -124327,12 +123479,12 @@ aaa
aaa
aaa
aaa
-alJ
aaa
aaa
aaa
aaa
-aqe
+aaa
+aaa
aaa
aaa
aaa
@@ -133926,7 +133078,7 @@ cuQ
bGG
cyR
cAP
-cBZ
+aac
cDw
cDb
cEt
@@ -135703,12 +134855,12 @@ cZk
cZk
cZk
daa
-big
-big
-big
-big
-cjA
aYS
+bGH
+bGH
+bGH
+bGH
+bGH
aaa
dbP
cgs
@@ -135960,13 +135112,13 @@ bxX
bSa
bmm
cYk
-dat
-baN
-daZ
-dbo
-bcH
aYS
aaa
+aaa
+aaa
+aaa
+aaa
+aaa
dbP
cgy
cia
@@ -136213,17 +135365,17 @@ bjR
cYd
bLr
bNw
-bPu
-bPu
-bPu
+cWA
+cWA
+cWA
bUT
-bVI
-bWR
-bYp
-cbb
-dbH
aYS
aaa
+aaa
+aaa
+aaa
+aaa
+aaa
dbZ
cgy
cia
@@ -136474,13 +135626,13 @@ boD
bSc
bmm
dak
-dat
-baO
-bYo
-bcl
-ccP
aYS
aaa
+aaa
+aaa
+aaa
+aaa
+aaa
dbX
cgy
cib
@@ -136731,13 +135883,13 @@ cZm
cZm
cZm
bmm
-big
-baG
-bYq
-bcI
-ccS
aYS
aaa
+aaa
+aaa
+aaa
+aaa
+aaa
dbX
cgs
cgs
@@ -136989,11 +136141,11 @@ bAK
bjR
dam
aYS
-baT
-baT
-baT
-baT
-aYS
+aaa
+aaa
+aaa
+aaa
+aaa
aaa
dca
dcc
@@ -137246,11 +136398,11 @@ cZI
cZn
bmm
aYS
-baQ
-baT
-baT
-bgc
-aYS
+aaa
+aaa
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -137503,11 +136655,11 @@ cZH
bmm
dan
aYS
-baR
-baT
-baT
-bgm
-aYS
+aaa
+aaa
+aaa
+aaa
+aaa
aaa
xWg
qUv
@@ -137760,11 +136912,11 @@ cZJ
cZK
daq
aYS
-baH
-baT
-baT
-baT
-aYS
+aaa
+aaa
+aaa
+aaa
+aaa
aaa
pZO
uDK
@@ -138017,11 +137169,11 @@ bEG
bEG
bEG
aYS
-baT
-baT
-baT
-baT
-aYS
+aaa
+aaa
+aaa
+aaa
+aaa
aaa
xWg
nMi
@@ -138273,12 +137425,12 @@ bjR
aaa
aaa
aaa
-aYS
-baU
-baU
-baU
-bgd
-aYS
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
aaa
pZO
uDK
@@ -138530,12 +137682,12 @@ bjR
aaa
aaa
aaa
-daC
-baV
-baV
-baV
-baV
-daC
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
aaa
xWg
nMi
@@ -138787,12 +137939,12 @@ bjR
aaa
aaa
aaa
-daD
aaa
aaa
aaa
aaa
-daD
+aaa
+aaa
aaa
uxy
xWg
diff --git a/_maps/map_files/generic/Lavaland.dmm b/_maps/map_files/generic/Lavaland.dmm
index 02e8c553456..09a796983da 100644
--- a/_maps/map_files/generic/Lavaland.dmm
+++ b/_maps/map_files/generic/Lavaland.dmm
@@ -886,7 +886,7 @@
},
/obj/effect/decal/cleanable/cobweb,
/obj/machinery/computer/prisoner{
- dir = 1
+ dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 6
@@ -4371,6 +4371,7 @@
"sO" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/computer/security{
+ dir = 4;
network = list("Labor Camp")
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -5275,7 +5276,7 @@
/area/mine/production)
"VJ" = (
/obj/machinery/computer/secure_data{
- dir = 1
+ dir = 8
},
/turf/simulated/floor/plasteel{
dir = 1;
diff --git a/_maps/map_files/generic/centcomm.dmm b/_maps/map_files/generic/centcomm.dmm
index 1acf135edc8..d7bf2abfaa2 100644
--- a/_maps/map_files/generic/centcomm.dmm
+++ b/_maps/map_files/generic/centcomm.dmm
@@ -651,7 +651,9 @@
/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"cH" = (
-/obj/machinery/computer/shuttle/ferry,
+/obj/machinery/computer/shuttle/ferry{
+ dir = 8
+ },
/turf/simulated/floor/plating,
/area/centcom/evac)
"cI" = (
@@ -661,7 +663,9 @@
/turf/simulated/floor/plating/airless,
/area/shuttle/specops)
"cK" = (
-/obj/machinery/computer/shuttle/admin,
+/obj/machinery/computer/shuttle/admin{
+ dir = 8
+ },
/turf/simulated/floor/plating,
/area/centcom/evac)
"cL" = (
@@ -1387,7 +1391,9 @@
/turf/simulated/floor/wood,
/area/syndicate_mothership)
"fi" = (
-/obj/machinery/computer/shuttle/syndicate/recall,
+/obj/machinery/computer/shuttle/syndicate/recall{
+ dir = 1
+ },
/turf/simulated/floor/wood,
/area/syndicate_mothership)
"fj" = (
@@ -1411,8 +1417,8 @@
/turf/simulated/wall/indestructible/riveted,
/area/centcom/gamma)
"fn" = (
-/obj/machinery/computer/library/checkout,
/obj/structure/table/wood,
+/obj/machinery/computer/library/checkout,
/turf/simulated/floor/engine/cult,
/area/wizard_station)
"fo" = (
@@ -2028,7 +2034,9 @@
/turf/simulated/floor/plasteel/dark,
/area/syndicate_mothership)
"hP" = (
-/obj/machinery/computer/communications,
+/obj/machinery/computer/communications{
+ dir = 8
+ },
/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"hQ" = (
@@ -3500,7 +3508,9 @@
/turf/simulated/floor/carpet,
/area/centcom/control)
"mP" = (
-/obj/machinery/computer/pod/deathsquad,
+/obj/machinery/computer/pod/deathsquad{
+ dir = 8
+ },
/turf/simulated/floor/plasteel/dark{
dir = 1;
icon_state = "vault"
@@ -3523,7 +3533,9 @@
/turf/simulated/floor/wood,
/area/centcom/control)
"mV" = (
-/obj/machinery/computer/card/centcom,
+/obj/machinery/computer/card/centcom{
+ dir = 8
+ },
/turf/simulated/floor/wood,
/area/centcom/control)
"mW" = (
@@ -3588,7 +3600,9 @@
/turf/simulated/floor/carpet,
/area/centcom/control)
"nh" = (
-/obj/machinery/computer/communications,
+/obj/machinery/computer/communications{
+ dir = 8
+ },
/turf/simulated/floor/carpet,
/area/centcom/control)
"nj" = (
@@ -4013,9 +4027,9 @@
/area/syndicate_mothership)
"oB" = (
/obj/structure/closet/secure_closet/guncabinet,
-/obj/item/ammo_box/shotgun/buck,
-/obj/item/ammo_box/shotgun/buck,
-/obj/item/ammo_box/shotgun/buck,
+/obj/item/ammo_box/shotgun/beanbag,
+/obj/item/ammo_box/shotgun/beanbag,
+/obj/item/ammo_box/shotgun/beanbag,
/obj/item/gun/projectile/shotgun/automatic/combat,
/obj/item/gun/projectile/shotgun/automatic/combat,
/obj/item/gun/projectile/shotgun/automatic/combat,
@@ -4306,7 +4320,9 @@
d2 = 8;
icon_state = "0-8"
},
-/obj/machinery/computer/mech_bay_power_console,
+/obj/machinery/computer/mech_bay_power_console{
+ dir = 1
+ },
/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/gamma/space)
"pu" = (
@@ -4417,12 +4433,12 @@
/turf/simulated/floor/carpet,
/area/centcom/specops)
"pP" = (
+/obj/structure/table/wood,
/obj/machinery/computer/security/telescreen{
desc = "Used for watching the Special Ops.";
name = "Special Ops. Monitor";
network = list("ERT")
},
-/obj/structure/table/wood,
/turf/simulated/floor/carpet,
/area/centcom/specops)
"pQ" = (
@@ -4430,10 +4446,12 @@
/turf/simulated/floor/plasteel/dark,
/area/centcom/specops)
"pR" = (
-/obj/machinery/computer/station_alert,
/obj/structure/sign/poster/official/nanotrasen_logo{
pixel_x = 32
},
+/obj/machinery/computer/station_alert{
+ dir = 8
+ },
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "darkyellow"
@@ -4940,7 +4958,9 @@
},
/area/centcom/evac)
"rz" = (
-/obj/machinery/computer/communications,
+/obj/machinery/computer/communications{
+ dir = 8
+ },
/turf/simulated/floor/plasteel/dark,
/area/centcom/specops)
"rA" = (
@@ -5185,10 +5205,12 @@
/turf/simulated/floor/wood,
/area/centcom/evac)
"sy" = (
-/obj/machinery/computer/secure_data,
/obj/machinery/light/spot{
dir = 8
},
+/obj/machinery/computer/secure_data{
+ dir = 4
+ },
/turf/simulated/floor/mineral/plastitanium/red,
/area/centcom/evac)
"sz" = (
@@ -6168,7 +6190,9 @@
/turf/simulated/floor/plasteel/grimy,
/area/centcom/specops)
"vf" = (
-/obj/machinery/computer/secure_data,
+/obj/machinery/computer/secure_data{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/centcom/control)
"vg" = (
@@ -6185,7 +6209,9 @@
/turf/simulated/floor/plasteel,
/area/admin)
"vi" = (
-/obj/machinery/computer/med_data,
+/obj/machinery/computer/med_data{
+ dir = 8
+ },
/turf/simulated/floor/plasteel,
/area/centcom/control)
"vj" = (
@@ -6235,11 +6261,11 @@
/turf/simulated/floor/plasteel,
/area/admin)
"vp" = (
-/obj/machinery/computer/mech_bay_power_console,
/obj/structure/cable{
d2 = 2;
icon_state = "0-2"
},
+/obj/machinery/computer/mech_bay_power_console,
/turf/simulated/floor/plasteel,
/area/admin)
"vr" = (
@@ -6257,24 +6283,33 @@
/area/admin)
"vs" = (
/obj/machinery/computer/security{
+ dir = 1;
network = list("SS13","Telecomms","Research Outpost","Mining Outpost","ERT","CentComm","Thunderdome")
},
/turf/simulated/floor/plasteel,
/area/centcom/control)
"vt" = (
-/obj/machinery/computer/station_alert,
+/obj/machinery/computer/station_alert{
+ dir = 1
+ },
/turf/simulated/floor/plasteel,
/area/centcom/control)
"vu" = (
-/obj/machinery/computer/communications,
+/obj/machinery/computer/communications{
+ dir = 1
+ },
/turf/simulated/floor/plasteel,
/area/centcom/control)
"vv" = (
-/obj/machinery/computer/robotics,
+/obj/machinery/computer/robotics{
+ dir = 1
+ },
/turf/simulated/floor/plasteel,
/area/centcom/control)
"vw" = (
-/obj/machinery/computer/crew,
+/obj/machinery/computer/crew{
+ dir = 1
+ },
/turf/simulated/floor/plasteel,
/area/centcom/control)
"vx" = (
@@ -6852,8 +6887,10 @@
/turf/simulated/floor/carpet,
/area/admin)
"wS" = (
-/obj/machinery/computer/secure_data,
/obj/item/paper/sop,
+/obj/machinery/computer/secure_data{
+ dir = 8
+ },
/turf/simulated/floor/carpet,
/area/admin)
"wT" = (
@@ -6881,11 +6918,15 @@
/turf/simulated/floor/carpet,
/area/admin)
"wY" = (
-/obj/machinery/computer/communications,
+/obj/machinery/computer/communications{
+ dir = 4
+ },
/turf/simulated/floor/carpet,
/area/admin)
"wZ" = (
-/obj/machinery/computer/med_data,
+/obj/machinery/computer/med_data{
+ dir = 8
+ },
/turf/simulated/floor/carpet,
/area/admin)
"xa" = (
@@ -7363,7 +7404,9 @@
},
/area/trader_station/sol)
"yJ" = (
-/obj/machinery/computer/communications,
+/obj/machinery/computer/communications{
+ dir = 1
+ },
/turf/simulated/floor/plasteel,
/area/admin)
"yK" = (
@@ -7380,7 +7423,9 @@
},
/area/trader_station/sol)
"yP" = (
-/obj/machinery/computer/atmos_alert,
+/obj/machinery/computer/atmos_alert{
+ dir = 1
+ },
/turf/simulated/floor/plasteel,
/area/admin)
"yQ" = (
@@ -7390,12 +7435,15 @@
},
/area/centcom/evac)
"yR" = (
-/obj/machinery/computer/message_monitor,
/obj/item/paper/monitorkey,
+/obj/machinery/computer/message_monitor{
+ dir = 1
+ },
/turf/simulated/floor/plasteel,
/area/admin)
"yS" = (
/obj/machinery/computer/account_database{
+ dir = 1;
name = "Admin Accounts Database"
},
/turf/simulated/floor/plasteel,
@@ -7407,7 +7455,9 @@
/turf/simulated/floor/plating,
/area/centcom/evac)
"yU" = (
-/obj/machinery/computer/secure_data,
+/obj/machinery/computer/secure_data{
+ dir = 1
+ },
/turf/simulated/floor/plasteel,
/area/admin)
"yV" = (
@@ -7452,7 +7502,9 @@
/turf/simulated/floor/plasteel,
/area/admin)
"zc" = (
-/obj/machinery/computer/arcade,
+/obj/machinery/computer/arcade{
+ dir = 8
+ },
/turf/simulated/floor/mineral/titanium/blue,
/area/centcom/evac)
"zd" = (
@@ -7473,7 +7525,9 @@
/turf/simulated/floor/plasteel/dark,
/area/admin)
"zh" = (
-/obj/machinery/computer/card,
+/obj/machinery/computer/card{
+ dir = 4
+ },
/turf/simulated/floor/mineral/plastitanium/red,
/area/centcom/evac)
"zi" = (
@@ -7944,7 +7998,9 @@
/turf/simulated/floor/plasteel,
/area/admin)
"AS" = (
-/obj/machinery/computer/teleporter,
+/obj/machinery/computer/teleporter{
+ dir = 1
+ },
/turf/simulated/floor/plasteel,
/area/admin)
"AT" = (
@@ -8000,11 +8056,15 @@
/turf/simulated/floor/plasteel/dark,
/area/syndicate_mothership)
"Bb" = (
-/obj/machinery/computer/crew,
+/obj/machinery/computer/crew{
+ dir = 4
+ },
/turf/simulated/floor/mineral/titanium/blue,
/area/centcom/evac)
"Bc" = (
-/obj/machinery/computer/communications,
+/obj/machinery/computer/communications{
+ dir = 8
+ },
/turf/simulated/floor/mineral/titanium/blue,
/area/centcom/evac)
"Bd" = (
@@ -8040,6 +8100,7 @@
/area/centcom/evac)
"Bj" = (
/obj/machinery/computer{
+ dir = 1;
name = "EMERGENCY SHUTTLE COMPUTER"
},
/turf/simulated/floor/mineral/titanium/blue,
@@ -8100,7 +8161,9 @@
/turf/simulated/floor/plasteel/dark,
/area/syndicate_mothership)
"Bv" = (
-/obj/machinery/computer/camera_advanced,
+/obj/machinery/computer/camera_advanced{
+ dir = 8
+ },
/turf/simulated/floor/plasteel/dark,
/area/syndicate_mothership)
"Bw" = (
@@ -8117,6 +8180,7 @@
/area/syndicate_mothership)
"By" = (
/obj/machinery/computer/shuttle/syndicate{
+ dir = 1;
name = "Nuclear Operatives Shuttle Console"
},
/turf/simulated/floor/plasteel/dark,
@@ -9000,7 +9064,9 @@
/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/supply)
"FJ" = (
-/obj/machinery/computer/secure_data,
+/obj/machinery/computer/secure_data{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 10;
icon_state = "darkred"
@@ -9043,7 +9109,9 @@
},
/area/shuttle/escape)
"Ga" = (
-/obj/machinery/computer/shuttle/ert,
+/obj/machinery/computer/shuttle/ert{
+ dir = 1
+ },
/turf/simulated/floor/plasteel/dark,
/area/centcom/specops)
"Gd" = (
@@ -9119,7 +9187,9 @@
/turf/simulated/wall/mineral/plastitanium,
/area/shuttle/syndicate_sit)
"GD" = (
-/obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/sst,
+/obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/sst{
+ dir = 1
+ },
/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate_elite)
"GJ" = (
@@ -9376,10 +9446,12 @@
/turf/simulated/floor/plating,
/area/tdome/tdome2)
"Il" = (
-/obj/machinery/computer/communications,
/obj/item/radio/intercom/specops{
pixel_y = -28
},
+/obj/machinery/computer/communications{
+ dir = 1
+ },
/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/specops)
"Io" = (
@@ -9622,7 +9694,9 @@
/turf/simulated/floor/mineral/plastitanium/red/nitrogen,
/area/shuttle/vox)
"JH" = (
-/obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/sit,
+/obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/sit{
+ dir = 1
+ },
/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate_sit)
"JM" = (
@@ -9636,6 +9710,7 @@
/area/shuttle/administration)
"JO" = (
/obj/machinery/computer/security{
+ dir = 1;
network = list("SS13","Research Outpost","Mining Outpost")
},
/turf/simulated/floor/mineral/plastitanium/red,
@@ -10628,7 +10703,9 @@
},
/area/shuttle/escape)
"PU" = (
-/obj/machinery/computer/shuttle/sit,
+/obj/machinery/computer/shuttle/sit{
+ dir = 1
+ },
/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate_sit)
"PX" = (
@@ -11190,12 +11267,13 @@
},
/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
},
+/obj/machinery/computer/security{
+ dir = 4;
+ network = list("SS13","Research Outpost","Mining Outpost","Telecomms")
+ },
/turf/simulated/floor/plasteel{
dir = 9;
icon_state = "darkred"
@@ -11379,7 +11457,9 @@
},
/area/holodeck/source_knightarena)
"UJ" = (
-/obj/machinery/computer/shuttle/sst,
+/obj/machinery/computer/shuttle/sst{
+ dir = 1
+ },
/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate_elite)
"UK" = (
@@ -11495,6 +11575,7 @@
/area/shuttle/escape)
"Vr" = (
/obj/machinery/computer/camera_advanced/shuttle_docker/admin{
+ dir = 8;
name = "NTV Argos shuttle navigation computer"
},
/turf/simulated/floor/mineral/plastitanium/red,
@@ -11568,7 +11649,9 @@
},
/area/shuttle/escape)
"VS" = (
-/obj/machinery/computer/atmos_alert,
+/obj/machinery/computer/atmos_alert{
+ dir = 8
+ },
/turf/simulated/floor/plasteel{
dir = 6;
icon_state = "darkyellow"
@@ -11600,6 +11683,7 @@
/area/shuttle/vox)
"Wc" = (
/obj/machinery/computer/shuttle/admin{
+ dir = 8;
name = "NTV Argos shuttle console"
},
/turf/simulated/floor/mineral/plastitanium/red,
@@ -12043,7 +12127,6 @@
},
/area/shuttle/escape)
"YV" = (
-/obj/machinery/computer/shuttle/trade/sol,
/obj/machinery/door_control{
id = "soltrader_south";
name = "Trade Deposits Door";
@@ -12057,6 +12140,9 @@
pixel_x = 24;
pixel_y = -8
},
+/obj/machinery/computer/shuttle/trade/sol{
+ dir = 8
+ },
/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/trade/sol)
"YW" = (
diff --git a/_maps/map_files/shuttles/admin_armory.dmm b/_maps/map_files/shuttles/admin_armory.dmm
index d2873d05de7..766ce3e588c 100644
--- a/_maps/map_files/shuttles/admin_armory.dmm
+++ b/_maps/map_files/shuttles/admin_armory.dmm
@@ -565,11 +565,11 @@
layer = 2.9
},
/obj/structure/rack,
-/obj/item/gun/projectile/shotgun/riot/buckshot{
+/obj/item/gun/projectile/shotgun/riot{
pixel_x = -3;
pixel_y = 3
},
-/obj/item/gun/projectile/shotgun/riot/buckshot,
+/obj/item/gun/projectile/shotgun/riot,
/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"Gx" = (
@@ -705,11 +705,11 @@
layer = 2.9
},
/obj/structure/rack,
-/obj/item/gun/projectile/shotgun/riot/buckshot{
+/obj/item/gun/projectile/shotgun/riot{
pixel_x = -3;
pixel_y = 3
},
-/obj/item/gun/projectile/shotgun/riot/buckshot,
+/obj/item/gun/projectile/shotgun/riot,
/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"Ns" = (
@@ -914,11 +914,11 @@
/obj/structure/window/reinforced{
dir = 4
},
-/obj/item/gun/projectile/shotgun/riot/buckshot{
+/obj/item/gun/projectile/shotgun/riot{
pixel_x = -3;
pixel_y = 3
},
-/obj/item/gun/projectile/shotgun/riot/buckshot,
+/obj/item/gun/projectile/shotgun/riot,
/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
diff --git a/code/__DEFINES/_versions.dm b/code/__DEFINES/_versions.dm
new file mode 100644
index 00000000000..83a18de6f73
--- /dev/null
+++ b/code/__DEFINES/_versions.dm
@@ -0,0 +1,2 @@
+/// Version of RUST-G that this codebase wants
+#define RUST_G_VERSION "0.5.0-P"
diff --git a/code/__DEFINES/access.dm b/code/__DEFINES/access.dm
index ea319971a1b..d009770e399 100644
--- a/code/__DEFINES/access.dm
+++ b/code/__DEFINES/access.dm
@@ -66,8 +66,8 @@
#define ACCESS_PARAMEDIC 66
#define ACCESS_BLUESHIELD 67
#define ACCESS_SALVAGE_CAPTAIN 69 // Salvage ship captain's quarters
-#define ACCESS_MECHANIC 70
-#define ACCESS_PILOT 71
+// #define ACCESS_MECHANIC 70 // AA07 2021-10-02 - Removed: Kept for history sake
+// #define ACCESS_PILOT 71 // AA07 2021-10-02 - Removed: Kept for history sake
#define ACCESS_NTREP 73
#define ACCESS_MAGISTRATE 74
#define ACCESS_MINISAT 75
diff --git a/code/__DEFINES/colors.dm b/code/__DEFINES/colors.dm
index fc67f448526..f399915e3e7 100644
--- a/code/__DEFINES/colors.dm
+++ b/code/__DEFINES/colors.dm
@@ -114,3 +114,12 @@
#define PIPE_COLOR_GREEN "#00ff00"
#define PIPE_COLOR_YELLOW "#ffcc00"
#define PIPE_COLOR_PURPLE "#5c1ec0"
+
+///Main colors for UI themes
+#define COLOR_THEME_MIDNIGHT "#6086A0"
+#define COLOR_THEME_PLASMAFIRE "#FFB200"
+#define COLOR_THEME_RETRO "#24CA00"
+#define COLOR_THEME_SLIMECORE "#4FB259"
+#define COLOR_THEME_OPERATIVE "#B8221F"
+#define COLOR_THEME_GLASS "#75A4C4"
+#define COLOR_THEME_CLOCKWORK "#CFBA47"
diff --git a/code/__DEFINES/combat.dm b/code/__DEFINES/combat.dm
index 5bda7374fba..d3655b164f5 100644
--- a/code/__DEFINES/combat.dm
+++ b/code/__DEFINES/combat.dm
@@ -10,6 +10,18 @@
#define STAMINA "stamina"
#define BRAIN "brain"
+//damage flags
+#define MELEE "melee"
+#define BULLET "bullet"
+#define LASER "laser"
+#define ENERGY "energy"
+#define BOMB "bomb"
+#define BIO "bio"
+#define RAD "rad"
+#define FIRE "fire"
+#define ACID "acid"
+#define MAGIC "magic"
+
#define STUN "stun"
#define WEAKEN "weaken"
#define PARALYZE "paralize"
@@ -112,6 +124,17 @@
#define WEAPON_MEDIUM 2
#define WEAPON_HEAVY 3
+//His Grace.
+#define HIS_GRACE_SATIATED 0 //He hungers not. If bloodthirst is set to this, His Grace is asleep.
+#define HIS_GRACE_PECKISH 20 //Slightly hungry.
+#define HIS_GRACE_HUNGRY 60 //Getting closer. Increases damage up to a minimum of 20.
+#define HIS_GRACE_FAMISHED 100 //Dangerous. Increases damage up to a minimum of 25 and cannot be dropped.
+#define HIS_GRACE_STARVING 120 //Incredibly close to breaking loose. Increases damage up to a minimum of 30.
+#define HIS_GRACE_CONSUME_OWNER 140 //His Grace consumes His owner at this point and becomes aggressive.
+#define HIS_GRACE_FALL_ASLEEP 160 //If it reaches this point, He falls asleep and resets.
+
+#define HIS_GRACE_FORCE_BONUS 4 //How much force is gained per kill.
+
#define EXPLODE_NONE 0 //Don't even ask me why we need this.
#define EXPLODE_DEVASTATE 1
#define EXPLODE_HEAVY 2
diff --git a/code/__DEFINES/flags.dm b/code/__DEFINES/flags.dm
index a68646224cf..7e0941d3e65 100644
--- a/code/__DEFINES/flags.dm
+++ b/code/__DEFINES/flags.dm
@@ -103,6 +103,7 @@
#define PASSBLOB 8
#define PASSMOB 16
#define LETPASSTHROW 32
+#define PASSFENCE 64
//turf-only flags
#define NOJAUNT 1
diff --git a/code/__DEFINES/footstep.dm b/code/__DEFINES/footstep.dm
index 469549b8827..65b96577386 100644
--- a/code/__DEFINES/footstep.dm
+++ b/code/__DEFINES/footstep.dm
@@ -7,12 +7,14 @@
#define FOOTSTEP_WATER "water"
#define FOOTSTEP_LAVA "lava"
#define FOOTSTEP_MEAT "meat"
+#define FOOTSTEP_GLASS "glass"
//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"
+#define FOOTSTEP_GLASS_BAREFOOT "glassbarefoot"
//misc footstep sounds
#define FOOTSTEP_GENERIC_HEAVY "heavy"
@@ -83,7 +85,11 @@ GLOBAL_LIST_INIT(footstep, list(
'sound/effects/footstep/lava2.ogg',
'sound/effects/footstep/lava3.ogg'), 100, 0),
FOOTSTEP_MEAT = list(list(
- 'sound/effects/meatslap.ogg'), 100, 0)
+ 'sound/effects/meatslap.ogg'), 100, 0),
+ FOOTSTEP_GLASS = list(list(
+ 'sound/effects/footstep/glass1.ogg',
+ 'sound/effects/footstep/glass2.ogg',
+ 'sound/effects/footstep/glass3.ogg'), 100, 1),
))
//bare footsteps lists
GLOBAL_LIST_INIT(barefootstep, list(
@@ -127,6 +133,10 @@ GLOBAL_LIST_INIT(barefootstep, list(
'sound/effects/footstep/lava3.ogg'), 100, 0),
FOOTSTEP_MEAT = list(list(
'sound/effects/meatslap.ogg'), 100, 0),
+ FOOTSTEP_GLASS_BAREFOOT = list(list(
+ 'sound/effects/footstep/glassbarefoot1.ogg',
+ 'sound/effects/footstep/glassbarefoot2.ogg',
+ 'sound/effects/footstep/glassbarefoot3.ogg'), 100, 1),
))
//claw footsteps lists
@@ -171,6 +181,10 @@ GLOBAL_LIST_INIT(clawfootstep, list(
'sound/effects/footstep/lava3.ogg'), 100, 0),
FOOTSTEP_MEAT = list(list(
'sound/effects/meatslap.ogg'), 100, 0),
+ FOOTSTEP_GLASS_BAREFOOT = list(list(
+ 'sound/effects/footstep/glassbarefoot1.ogg',
+ 'sound/effects/footstep/glassbarefoot2.ogg',
+ 'sound/effects/footstep/glassbarefoot3.ogg'), 100, 1),
))
//heavy footsteps list
diff --git a/code/__DEFINES/genetics.dm b/code/__DEFINES/genetics.dm
index f64022136ef..55701ed9166 100644
--- a/code/__DEFINES/genetics.dm
+++ b/code/__DEFINES/genetics.dm
@@ -74,7 +74,6 @@
//Species traits.
#define NO_BLOOD "no_blood"
-#define NOTRANSSTING "no_trans_sting"
#define IS_WHITELISTED "whitelisted"
#define LIPS "lips"
#define EXOTIC_COLOR "exotic_blood_color"
diff --git a/code/__DEFINES/hud.dm b/code/__DEFINES/hud.dm
index 14e5fc674ce..ec3609c0554 100644
--- a/code/__DEFINES/hud.dm
+++ b/code/__DEFINES/hud.dm
@@ -25,8 +25,9 @@
#define PLANT_PEST_HUD "20"// Pest level
#define PLANT_WEED_HUD "21"// Weed level
#define DIAG_TRACK_HUD "22"// Mech tracking beacon
-#define DIAG_PATH_HUD "23"//Bot path indicators
-#define GLAND_HUD "24"//Gland indicators for abductors
+#define DIAG_AIRLOCK_HUD "23" // Airlock shock overlay
+#define DIAG_PATH_HUD "24"//Bot path indicators
+#define GLAND_HUD "25"//Gland indicators for abductors
//by default everything in the hud_list of an atom is an image
//a value in hud_list with one of these will change that behavior
@@ -38,7 +39,7 @@
#define DATA_HUD_SECURITY_ADVANCED 2
#define DATA_HUD_MEDICAL_BASIC 3
#define DATA_HUD_MEDICAL_ADVANCED 4
-#define DATA_HUD_DIAGNOSTIC 5
+#define DATA_HUD_DIAGNOSTIC_BASIC 5
#define DATA_HUD_DIAGNOSTIC_ADVANCED 6
#define DATA_HUD_HYDROPONIC 7
//antag HUD defines
diff --git a/code/__DEFINES/is_helpers.dm b/code/__DEFINES/is_helpers.dm
index 22ecbc1208e..33de7eb470a 100644
--- a/code/__DEFINES/is_helpers.dm
+++ b/code/__DEFINES/is_helpers.dm
@@ -18,8 +18,6 @@
#define ismecha(A) (istype(A, /obj/mecha))
-#define isspacepod(A) (istype(A, /obj/spacepod))
-
#define iseffect(A) (istype(A, /obj/effect))
#define isclothing(A) (istype(A, /obj/item/clothing))
diff --git a/code/__DEFINES/job.dm b/code/__DEFINES/job.dm
index 349d1b246be..62920ed2a40 100644
--- a/code/__DEFINES/job.dm
+++ b/code/__DEFINES/job.dm
@@ -7,58 +7,59 @@
#define JOBCAT_ENGSEC (1<<0)
-#define JOB_CAPTAIN (1<<0)
-#define JOB_HOS (1<<1)
-#define JOB_WARDEN (1<<2)
+#define JOB_CAPTAIN (1<<0)
+#define JOB_HOS (1<<1)
+#define JOB_WARDEN (1<<2)
#define JOB_DETECTIVE (1<<3)
-#define JOB_OFFICER (1<<4)
+#define JOB_OFFICER (1<<4)
#define JOB_CHIEF (1<<5)
#define JOB_ENGINEER (1<<6)
#define JOB_ATMOSTECH (1<<7)
-#define JOB_AI (1<<8)
-#define JOB_CYBORG (1<<9)
-#define JOB_CENTCOM (1<<10)
+#define JOB_AI (1<<8)
+#define JOB_CYBORG (1<<9)
+#define JOB_CENTCOM (1<<10)
#define JOB_SYNDICATE (1<<11)
+#define JOB_JUDGE (1<<12)
#define JOBCAT_MEDSCI (1<<1)
-#define JOB_RD (1<<0)
+#define JOB_RD (1<<0)
#define JOB_SCIENTIST (1<<1)
-#define JOB_CHEMIST (1<<2)
-#define JOB_CMO (1<<3)
-#define JOB_DOCTOR (1<<4)
-#define JOB_GENETICIST (1<<5)
-#define JOB_VIROLOGIST (1<<6)
+#define JOB_CHEMIST (1<<2)
+#define JOB_CMO (1<<3)
+#define JOB_DOCTOR (1<<4)
+#define JOB_GENETICIST (1<<5)
+#define JOB_VIROLOGIST (1<<6)
#define JOB_PSYCHIATRIST (1<<7)
-#define JOB_ROBOTICIST (1<<8)
+#define JOB_ROBOTICIST (1<<8)
#define JOB_PARAMEDIC (1<<9)
-#define JOB_CORONER (1<<10)
+#define JOB_CORONER (1<<10)
#define JOBCAT_SUPPORT (1<<2)
-#define JOB_HOP (1<<0)
+#define JOB_HOP (1<<0)
#define JOB_BARTENDER (1<<1)
#define JOB_BOTANIST (1<<2)
#define JOB_CHEF (1<<3)
-#define JOB_JANITOR (1<<4)
+#define JOB_JANITOR (1<<4)
#define JOB_LIBRARIAN (1<<5)
#define JOB_QUARTERMASTER (1<<6)
#define JOB_CARGOTECH (1<<7)
#define JOB_MINER (1<<8)
-#define JOB_LAWYER (1<<9)
+#define JOB_LAWYER (1<<9)
#define JOB_CHAPLAIN (1<<10)
#define JOB_CLOWN (1<<11)
#define JOB_MIME (1<<12)
#define JOB_CIVILIAN (1<<13)
#define JOB_EXPLORER (1<<14)
-#define JOBCAT_KARMA (1<<3)
+#define JOBCAT_KARMA (1<<3)
#define JOB_NANO (1<<0)
-#define JOB_BLUESHIELD (1<<1)
-#define JOB_BARBER (1<<3)
-#define JOB_MECHANIC (1<<4)
-#define JOB_BRIGDOC (1<<5)
-#define JOB_JUDGE (1<<6)
-#define JOB_PILOT (1<<7)
+#define JOB_BLUESHIELD (1<<1)
+#define JOB_BARBER (1<<3)
+// #define JOB_MECHANIC (1<<4) // AA07 2021-10-02 - Removed: Kept for history sake
+#define JOB_BRIGDOC (1<<5)
+// #define JOB_JUDGE (1<<6) // AA07 2021-10-09 - Moved to ENGSEC (Non karma): Define kept for history sake
+// #define JOB_PILOT (1<<7) // AA07 2021-10-02 - Removed: Kept for history sake
diff --git a/code/__DEFINES/layers.dm b/code/__DEFINES/layers.dm
index 4950beb7e74..bff5100982a 100644
--- a/code/__DEFINES/layers.dm
+++ b/code/__DEFINES/layers.dm
@@ -26,11 +26,13 @@
#define DISPOSAL_PIPE_LAYER 2.3
#define GAS_PIPE_HIDDEN_LAYER 2.35
#define WIRE_LAYER 2.4
+#define TRANSPARENT_TURF_LAYER 2.41
#define WIRE_TERMINAL_LAYER 2.45
#define GAS_SCRUBBER_LAYER 2.46
#define GAS_PIPE_VISIBLE_LAYER 2.47
#define GAS_FILTER_LAYER 2.48
#define GAS_PUMP_LAYER 2.49
+#define HOLOPAD_LAYER 2.491
#define CONVEYOR_LAYER 2.495
#define LOW_OBJ_LAYER 2.5
#define LOW_SIGIL_LAYER 2.52
diff --git a/code/__DEFINES/machines.dm b/code/__DEFINES/machines.dm
index 521cf632388..f7647d731b3 100644
--- a/code/__DEFINES/machines.dm
+++ b/code/__DEFINES/machines.dm
@@ -25,7 +25,7 @@
#define AUTOLATHE 4 //Uses glass/metal only.
#define CRAFTLATHE 8 //Uses fuck if I know. For use eventually.
#define MECHFAB 16 //Remember, objects utilising this flag should have construction_time and construction_cost vars.
-#define PODFAB 32 //Used by the spacepod part fabricator. Same idea as the mechfab
+// #define PODFAB 32 //Used by the spacepod part fabricator. Same idea as the mechfab // AA 2021-10-02 - Removed. Kept for flag consistency.
#define BIOGENERATOR 64 //Uses biomass
#define SMELTER 128 //uses various minerals
//Note: More then one of these can be added to a design but imprinter and lathe designs are incompatable.
diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm
index 2b95577ef3c..c6b7e9ac430 100644
--- a/code/__DEFINES/misc.dm
+++ b/code/__DEFINES/misc.dm
@@ -365,7 +365,7 @@
#define INVESTIGATE_BOMB "bombs"
// The SQL version required by this version of the code
-#define SQL_VERSION 25
+#define SQL_VERSION 27
// Vending machine stuff
#define CAT_NORMAL 1
diff --git a/code/__DEFINES/preferences.dm b/code/__DEFINES/preferences.dm
index ba292ab65f6..6e85ef5ba14 100644
--- a/code/__DEFINES/preferences.dm
+++ b/code/__DEFINES/preferences.dm
@@ -56,10 +56,11 @@
#define PREFTOGGLE_2_REVERB_DISABLE 512
#define PREFTOGGLE_2_FORCE_WHITE_RUNECHAT 1024
#define PREFTOGGLE_2_SIMPLE_STAT_PANEL 2048
+#define PREFTOGGLE_2_SEE_ITEM_OUTLINES 4096
-#define TOGGLES_2_TOTAL 4095 // If you add or remove a preference toggle above, make sure you update this define with the total value of the toggles combined.
+#define TOGGLES_2_TOTAL 8191 // 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)
+#define TOGGLES_2_DEFAULT (PREFTOGGLE_2_FANCYUI|PREFTOGGLE_2_ITEMATTACK|PREFTOGGLE_2_WINDOWFLASHING|PREFTOGGLE_2_RUNECHAT|PREFTOGGLE_2_DEATHMESSAGE|PREFTOGGLE_2_EMOTE_BUBBLE|PREFTOGGLE_2_SEE_ITEM_OUTLINES)
// Sanity checks
#if TOGGLES_TOTAL > 16777215
@@ -114,3 +115,11 @@
#define _2FA_ENABLED_IP "ENABLED_IP"
/// Client will be prompted for 2FA always
#define _2FA_ENABLED_ALWAYS "ENABLED_ALWAYS"
+
+
+#define MAX_SAVE_SLOTS 30 // Save slots for regular players
+#define MAX_SAVE_SLOTS_MEMBER 30 // Save slots for BYOND members
+
+#define TAB_CHAR 0
+#define TAB_GAME 1
+#define TAB_GEAR 2
diff --git a/code/__DEFINES/rust_g.dm b/code/__DEFINES/rust_g.dm
index 6a331a6131f..4ee84eda941 100644
--- a/code/__DEFINES/rust_g.dm
+++ b/code/__DEFINES/rust_g.dm
@@ -1,80 +1,130 @@
+// rust_g.dm - DM API for rust_g extension library
+//
+// To configure, create a `rust_g.config.dm` and set what you care about from
+// the following options:
+//
+// #define RUST_G "path/to/rust_g"
+// Override the .dll/.so detection logic with a fixed path or with detection
+// logic of your own.
+//
+// #define RUSTG_OVERRIDE_BUILTINS
+// Enable replacement rust-g functions for certain builtins. Off by default.
+
#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")
+// Default automatic RUST_G detection.
+// On Windows, looks in the standard places for `rust_g.dll`.
+// On Linux, looks in `.`, `$LD_LIBRARY_PATH`, and `~/.byond/bin` for either of
+// `librust_g.so` (preferred) or `rust_g` (old).
+
+/* This comment bypasses grep checks */ /var/__rust_g
+
+/proc/__detect_rust_g()
+ if (world.system_type == UNIX)
+ if (fexists("./librust_g.so"))
+ // No need for LD_LIBRARY_PATH badness.
+ return __rust_g = "./librust_g.so"
+ else if (fexists("./rust_g"))
+ // Old dumb filename.
+ return __rust_g = "./rust_g"
+ else if (fexists("[world.GetConfig("env", "HOME")]/.byond/bin/rust_g"))
+ // Old dumb filename in `~/.byond/bin`.
+ return __rust_g = "rust_g"
+ else
+ // It's not in the current directory, so try others
+ return __rust_g = "librust_g.so"
+ else
+ return __rust_g = "rust_g.dll"
+
+#define RUST_G (__rust_g || __detect_rust_g())
#endif
-// Gets the version of RUSTG
+/// Gets the version of rust_g
/proc/rustg_get_version() return call(RUST_G, "get_version")()
-// Defines for internal job subsystem //
-#define RUSTG_JOB_NO_RESULTS_YET "NO RESULTS YET"
-#define RUSTG_JOB_NO_SUCH_JOB "NO SUCH JOB"
-#define RUSTG_JOB_ERROR "JOB PANICKED"
+// Cellular Noise Operations //
-// DMI related operations //
+/**
+ * This proc generates a cellular automata noise grid which can be used in procedural generation methods.
+ *
+ * Returns a single string that goes row by row, with values of 1 representing an alive cell, and a value of 0 representing a dead cell.
+ *
+ * Arguments:
+ * * percentage: The chance of a turf starting closed
+ * * smoothing_iterations: The amount of iterations the cellular automata simulates before returning the results
+ * * birth_limit: If the number of neighboring cells is higher than this amount, a cell is born
+ * * death_limit: If the number of neighboring cells is lower than this amount, a cell dies
+ * * width: The width of the grid.
+ * * height: The height of the grid.
+ */
+#define rustg_cnoise_generate(percentage, smoothing_iterations, birth_limit, death_limit, width, height) \
+ call(RUST_G, "cnoise_generate")(percentage, smoothing_iterations, birth_limit, death_limit, width, height)
+
+// DMI Operations //
#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)
+#define rustg_dmi_resize_png(path, width, height, resizetype) call(RUST_G, "dmi_resize_png")(path, width, height, resizetype)
-// Noise related operations //
-#define rustg_noise_get_at_coordinates(seed, x, y) call(RUST_G, "noise_get_at_coordinates")(seed, x, y)
-
-// File related operations //
+// File Operations //
#define rustg_file_read(fname) call(RUST_G, "file_read")(fname)
+#define rustg_file_exists(fname) call(RUST_G, "file_exists")(fname)
#define rustg_file_write(text, fname) call(RUST_G, "file_write")(text, fname)
#define rustg_file_append(text, fname) call(RUST_G, "file_append")(text, fname)
#ifdef RUSTG_OVERRIDE_BUILTINS
-#define file2text(fname) rustg_file_read(fname)
-#define text2file(text, fname) rustg_file_append(text, fname)
+ #define file2text(fname) rustg_file_read("[fname]")
+ #define text2file(text, fname) rustg_file_append(text, "[fname]")
#endif
-// Git related operations //
+// Git Operations //
#define rustg_git_revparse(rev) call(RUST_G, "rg_git_revparse")(rev)
#define rustg_git_commit_date(rev) call(RUST_G, "rg_git_commit_date")(rev)
-// Hash related operations //
+// Hashing Operations //
#define rustg_hash_string(algorithm, text) call(RUST_G, "hash_string")(algorithm, text)
#define rustg_hash_file(algorithm, fname) call(RUST_G, "hash_file")(algorithm, fname)
+#define rustg_hash_generate_totp(seed) call(RUST_G, "generate_totp")(seed)
+#define rustg_hash_generate_totp_tolerance(seed, tolerance) call(RUST_G, "generate_totp_tolerance")(seed, tolerance)
#define RUSTG_HASH_MD5 "md5"
#define RUSTG_HASH_SHA1 "sha1"
#define RUSTG_HASH_SHA256 "sha256"
#define RUSTG_HASH_SHA512 "sha512"
+#define RUSTG_HASH_XXH64 "xxh64"
+#define RUSTG_HASH_BASE64 "base64"
#ifdef RUSTG_OVERRIDE_BUILTINS
-#define md5(thing) (isfile(thing) ? rustg_hash_file(RUSTG_HASH_MD5, "[thing]") : rustg_hash_string(RUSTG_HASH_MD5, thing))
+ #define md5(thing) (isfile(thing) ? rustg_hash_file(RUSTG_HASH_MD5, "[thing]") : rustg_hash_string(RUSTG_HASH_MD5, thing))
#endif
-// Logging stuff //
-#define rustg_log_write(fname, text) call(RUST_G, "log_write")(fname, text)
-/proc/rustg_log_close_all() return call(RUST_G, "log_close_all")()
-
-// URL encoding stuff
-#define rustg_url_encode(text) call(RUST_G, "url_encode")(text)
-#define rustg_url_decode(text) call(RUST_G, "url_decode")(text)
-
-#ifdef RUSTG_OVERRIDE_BUILTINS
-#define url_encode(text) rustg_url_encode(text)
-#define url_decode(text) rustg_url_decode(text)
-#endif
-
-// HTTP library stuff //
+// HTTP Operations //
#define RUSTG_HTTP_METHOD_GET "get"
#define RUSTG_HTTP_METHOD_PUT "put"
#define RUSTG_HTTP_METHOD_DELETE "delete"
#define RUSTG_HTTP_METHOD_PATCH "patch"
#define RUSTG_HTTP_METHOD_HEAD "head"
#define RUSTG_HTTP_METHOD_POST "post"
-
-// Commented out because this thing locks up the entire DD process when you use it
-// DO NOT USE FOR THE LOVE OF GOD
-// #define rustg_http_request_blocking(method, url, body, headers) call(RUST_G, "http_request_blocking")(method, url, body, headers)
-#define rustg_http_request_async(method, url, body, headers) call(RUST_G, "http_request_async")(method, url, body, headers)
+#define rustg_http_request_blocking(method, url, body, headers, options) call(RUST_G, "http_request_blocking")(method, url, body, headers, options)
+#define rustg_http_request_async(method, url, body, headers, options) call(RUST_G, "http_request_async")(method, url, body, headers, options)
#define rustg_http_check_request(req_id) call(RUST_G, "http_check_request")(req_id)
/proc/rustg_create_async_http_client() return call(RUST_G, "start_http_client")()
/proc/rustg_close_async_http_client() return call(RUST_G, "shutdown_http_client")()
-// SQL stuff //
+// Jobs Subsystem Operations //
+#define RUSTG_JOB_NO_RESULTS_YET "NO RESULTS YET"
+#define RUSTG_JOB_NO_SUCH_JOB "NO SUCH JOB"
+#define RUSTG_JOB_ERROR "JOB PANICKED"
+
+// JSON Operations //
+#define rustg_json_is_valid(text) (call(RUST_G, "json_is_valid")(text) == "true")
+
+// Logging Operations //
+#define rustg_log_write(fname, text) call(RUST_G, "log_write")(fname, text)
+/proc/rustg_log_close_all() return call(RUST_G, "log_close_all")()
+
+// Noise Operations //
+#define rustg_noise_get_at_coordinates(seed, x, y) call(RUST_G, "noise_get_at_coordinates")(seed, x, y)
+
+// SQL Opeartions //
#define rustg_sql_connect_pool(options) call(RUST_G, "sql_connect_pool")(options)
#define rustg_sql_query_async(handle, query, params) call(RUST_G, "sql_query_async")(handle, query, params)
#define rustg_sql_query_blocking(handle, query, params) call(RUST_G, "sql_query_blocking")(handle, query, params)
@@ -82,8 +132,19 @@
#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]")
-// toml2json stuff //
-#define rustg_toml2json(tomlfile) call(RUST_G, "toml2json")(tomlfile)
+// TOML Operations //
+#define rustg_read_toml_file(path) json_decode(call(RUST_G, "toml_file_to_json")(path) || "null")
+
+// Unzip Operations //
+#define rustg_unzip_download_async(url, unzip_directory) call(RUST_G, "unzip_download_async")(url, unzip_directory)
+#define rustg_unzip_check(job_id) call(RUST_G, "unzip_check")("[job_id]")
+
+// URL Encoder/Decoder Operations //
+#define rustg_url_encode(text) call(RUST_G, "url_encode")("[text]")
+#define rustg_url_decode(text) call(RUST_G, "url_decode")(text)
+
+#ifdef RUSTG_OVERRIDE_BUILTINS
+ #define url_encode(text) rustg_url_encode(text)
+ #define url_decode(text) rustg_url_decode(text)
+#endif
-// RUSTG Version //
-#define RUST_G_VERSION "0.4.5-P3"
diff --git a/code/__DEFINES/status_effects.dm b/code/__DEFINES/status_effects.dm
index ce91d2ccf31..aa4b044ed0f 100644
--- a/code/__DEFINES/status_effects.dm
+++ b/code/__DEFINES/status_effects.dm
@@ -13,6 +13,8 @@
// BUFFS //
///////////
+#define STATUS_EFFECT_HISGRACE /datum/status_effect/his_grace //His Grace.
+
#define STATUS_EFFECT_SHADOW_MEND /datum/status_effect/shadow_mend //Quick, powerful heal that deals damage afterwards. Heals 15 brute/burn every second for 3 seconds.
#define STATUS_EFFECT_VOID_PRICE /datum/status_effect/void_price //The price of healing yourself with void energy. Deals 3 brute damage every 3 seconds for 30 seconds.
#define STATUS_EFFECT_EXERCISED /datum/status_effect/exercised //Prevents heart disease
@@ -27,7 +29,6 @@
//#define STATUS_EFFECT_POWERREGEN /datum/status_effect/cyborg_power_regen //Regenerates power on a given cyborg over time
-//#define STATUS_EFFECT_HISGRACE /datum/status_effect/his_grace //His Grace.
//#define STATUS_EFFECT_WISH_GRANTERS_GIFT /datum/status_effect/wish_granters_gift //If you're currently resurrecting with the Wish Granter
@@ -53,7 +54,7 @@
//#define MAX_MANIA_SEVERITY 100 //how high the mania severity can go
//#define MANIA_DAMAGE_TO_CONVERT 90 //how much damage is required before it'll convert affected targets
-//#define STATUS_EFFECT_HISWRATH /datum/status_effect/his_wrath //His Wrath.
+#define STATUS_EFFECT_HISWRATH /datum/status_effect/his_wrath //His Wrath.
#define STATUS_EFFECT_SUMMONEDGHOST /datum/status_effect/cultghost //is a cult ghost: can see dead people, can't manifest more ghosts
diff --git a/code/__HELPERS/AnimationLibrary.dm b/code/__HELPERS/AnimationLibrary.dm
index 1f0c3dd9ab1..738783ed826 100644
--- a/code/__HELPERS/AnimationLibrary.dm
+++ b/code/__HELPERS/AnimationLibrary.dm
@@ -188,3 +188,21 @@
animate(A, transform = matrix(punchstr, MATRIX_ROTATE), pixel_y = 16, time = 2, color = "#eeeeee", easing = BOUNCE_EASING)
animate(transform = matrix(-punchstr, MATRIX_ROTATE), pixel_y = original_y, time = 2, color = "#ffffff", easing = BOUNCE_EASING)
animate(transform = null, time = 3, easing = BOUNCE_EASING)
+
+/proc/animate_rumble(atom/A)
+ var/static/list/transforms
+ if(!transforms)
+ var/matrix/M1 = matrix()
+ var/matrix/M2 = matrix()
+ var/matrix/M3 = matrix()
+ var/matrix/M4 = matrix()
+ M1.Translate(-1, 0)
+ M2.Translate(0, 1)
+ M3.Translate(1, 0)
+ M4.Translate(0, -1)
+ transforms = list(M1, M2, M3, M4)
+
+ animate(A, transform = transforms[1], time = 0.2, loop = -1)
+ animate(transform = transforms[2], time = 0.1)
+ animate(transform = transforms[3], time = 0.2)
+ animate(transform = transforms[4], time = 0.3)
diff --git a/code/__HELPERS/cmp.dm b/code/__HELPERS/cmp.dm
index 612f7b5abef..402ba2c7e3b 100644
--- a/code/__HELPERS/cmp.dm
+++ b/code/__HELPERS/cmp.dm
@@ -51,3 +51,6 @@
return A.plane - B.plane
else
return A.layer - B.layer
+
+/proc/cmp_login_processor_priority(datum/client_login_processor/A, datum/client_login_processor/B)
+ return A.priority - B.priority
diff --git a/code/__HELPERS/global_lists.dm b/code/__HELPERS/global_lists.dm
index 282ad53cd06..118f6c28188 100644
--- a/code/__HELPERS/global_lists.dm
+++ b/code/__HELPERS/global_lists.dm
@@ -77,13 +77,12 @@
for(var/geartype in subtypesof(/datum/gear))
var/datum/gear/G = geartype
- var/use_name = initial(G.display_name)
var/use_category = initial(G.sort_category)
- if(G == initial(G.subtype_path))
+ if(G == initial(G.main_typepath))
continue
- if(!use_name)
+ if(!initial(G.display_name))
stack_trace("Loadout - Missing display name: [G]")
continue
if(!initial(G.cost))
@@ -96,8 +95,8 @@
if(!GLOB.loadout_categories[use_category])
GLOB.loadout_categories[use_category] = new /datum/loadout_category(use_category)
var/datum/loadout_category/LC = GLOB.loadout_categories[use_category]
- GLOB.gear_datums[use_name] = new geartype
- LC.gear[use_name] = GLOB.gear_datums[use_name]
+ GLOB.gear_datums[geartype] = new geartype
+ LC.gear[geartype] = GLOB.gear_datums[geartype]
GLOB.loadout_categories = sortAssoc(GLOB.loadout_categories)
for(var/loadout_category in GLOB.loadout_categories)
@@ -128,6 +127,13 @@
continue
GLOB.world_topic_handlers[wth.topic_key] = topic_handler_type
+ // Setup client login processors.
+ for(var/processor_type in subtypesof(/datum/client_login_processor))
+ var/datum/client_login_processor/CLP = new processor_type
+ GLOB.client_login_processors += CLP
+ // Sort them by priority, lowest first
+ sortTim(GLOB.client_login_processors, /proc/cmp_login_processor_priority)
+
/* // Uncomment to debug chemical reaction list.
/client/verb/debug_chemical_list()
diff --git a/code/__HELPERS/matrices.dm b/code/__HELPERS/matrices.dm
index 0520ab6b077..414a16636ec 100644
--- a/code/__HELPERS/matrices.dm
+++ b/code/__HELPERS/matrices.dm
@@ -3,7 +3,7 @@
Turn(.) //BYOND handles cases such as -270, 360, 540 etc. DOES NOT HANDLE 180 TURNS WELL, THEY TWEEN AND LOOK LIKE SHIT
-/atom/proc/SpinAnimation(speed = 10, loops = -1, clockwise = 1, segments = 3)
+/atom/proc/SpinAnimation(speed = 10, loops = -1, clockwise = 1, segments = 3, parallel = TRUE)
if(!segments)
return
var/segment = 360/segments
@@ -19,7 +19,10 @@
speed /= segments
- animate(src, transform = matrices[1], time = speed, loops)
+ if(parallel)
+ animate(src, transform = matrices[1], time = speed, loops , flags = ANIMATION_PARALLEL)
+ else
+ animate(src, transform = matrices[1], time = speed, loops)
for(var/i in 2 to segments) //2 because 1 is covered above
animate(transform = matrices[i], time = speed)
//doesn't have an object argument because this is "Stacking" with the animate call above
diff --git a/code/__HELPERS/mobs.dm b/code/__HELPERS/mobs.dm
index e836824ad3a..0aa01605808 100644
--- a/code/__HELPERS/mobs.dm
+++ b/code/__HELPERS/mobs.dm
@@ -272,15 +272,19 @@
update_all_mob_security_hud()
return 1
-/*
-Proc for attack log creation, because really why not
-1 argument is the actor
-2 argument is the target of action
-3 is the full description of the action
-4 is whether or not to message admins
-This is always put in the attack log.
-*/
-
+/**
+ * Creates attack (old and new) logs for the user and defense logs for the target.
+ * Will message admins depending on the custom_level, user and target.
+ *
+ * custom_level will determine the log level set. Unless the target is SSD and there is a user doing it
+ * If custom_level is not set then the log level will be determined using the user and the target.
+ *
+ * * Arguments:
+ * * user - The thing doing it. Can be null
+ * * target - The target of the attack
+ * * what_done - What has happened
+ * * custom_level - The log level override
+ */
/proc/add_attack_logs(atom/user, target, what_done, custom_level)
if(islist(target)) // Multi-victim adding
var/list/targets = target
@@ -323,7 +327,7 @@ This is always put in the attack log.
loglevel = ATKLOG_ALMOSTALL
else
loglevel = ATKLOG_ALL // Hitting an object. Not a mob
- if(isLivingSSD(target)) // Attacks on SSDs are shown to admins with any log level except ATKLOG_NONE. Overrides custom level
+ if(user && isLivingSSD(target)) // Attacks on SSDs are shown to admins with any log level except ATKLOG_NONE. Overrides custom level
loglevel = ATKLOG_FEW
diff --git a/code/__HELPERS/sanitize_values.dm b/code/__HELPERS/sanitize_values.dm
index 34e4c96da6a..e50cd9afe96 100644
--- a/code/__HELPERS/sanitize_values.dm
+++ b/code/__HELPERS/sanitize_values.dm
@@ -16,6 +16,10 @@
if(default) return default
if(List && List.len)return pick(List)
+/proc/sanitize_json(json_input)
+ if(length(json_input) && istext(json_input))
+ return json_decode(json_input)
+ return list()
//more specialised stuff
diff --git a/code/__HELPERS/traits.dm b/code/__HELPERS/traits.dm
index 5534c19cdd1..b92fb82f9af 100644
--- a/code/__HELPERS/traits.dm
+++ b/code/__HELPERS/traits.dm
@@ -164,6 +164,9 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
#define TRAIT_BLOODCRAWL_EAT "bloodcrawl_eat"
#define TRAIT_DWARF "dwarf"
#define TRAIT_SILENT_FOOTSTEPS "silent_footsteps" //makes your footsteps completely silent
+#define TRAIT_MESON_VISION "meson_vision"
+#define TRAIT_FLASH_PROTECTION "flash_protection"
+#define TRAIT_NIGHT_VISION "night_vision"
#define TRAIT_COMIC_SANS "comic_sans"
#define TRAIT_NOFINGERPRINTS "no_fingerprints"
diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm
index 4bbc7d03d07..399f669761e 100644
--- a/code/__HELPERS/unsorted.dm
+++ b/code/__HELPERS/unsorted.dm
@@ -464,12 +464,15 @@ Turf and target are seperate in case you want to teleport some distance from a t
if(GLOB.stealthminID[P] == txt)
return P
-// 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(atom/movable/M)
+//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.
+//Optional arg 'type' to stop once it reaches a specific type instead of a turf.
+/proc/get_atom_on_turf(atom/movable/M, stop_type)
var/atom/loc = M
- while(loc && loc.loc && !istype(loc.loc, /turf/))
+ while(loc?.loc && !isturf(loc.loc))
loc = loc.loc
+ if(stop_type && istype(loc, stop_type))
+ break
return loc
/*
@@ -1536,7 +1539,7 @@ GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new)
shift.Translate(0,radius)
transform = shift
- SpinAnimation(rotation_speed, -1, clockwise, rotation_segments)
+ SpinAnimation(rotation_speed, -1, clockwise, rotation_segments, parallel = FALSE)
while(orbiting && orbiting == A && A.loc)
var/targetloc = get_turf(A)
@@ -1551,7 +1554,7 @@ GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new)
if(orbiting == A) //make sure we haven't started orbiting something else.
orbiting = null
- SpinAnimation(0, 0)
+ SpinAnimation(0, 0, parallel = FALSE)
transform = cached_transform
@@ -1774,8 +1777,6 @@ GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new)
/obj/item/robot_parts = "ROBOT_PARTS",
/obj/item/seeds = "SEED",
/obj/item/slime_extract = "SLIME_CORE",
- /obj/item/spacepod_equipment/weaponry = "POD_WEAPON",
- /obj/item/spacepod_equipment = "POD_EQUIP",
/obj/item/stack/sheet/mineral = "MINERAL",
/obj/item/stack/sheet = "SHEET",
/obj/item/stack/tile = "TILE",
@@ -1926,24 +1927,6 @@ GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new)
return pois
-/proc/flash_color(mob_or_client, flash_color="#960000", flash_time=20)
- var/client/C
- if(istype(mob_or_client, /mob))
- var/mob/M = mob_or_client
- if(M.client)
- C = M.client
- else
- return
- else if(istype(mob_or_client, /client))
- C = mob_or_client
-
- if(!istype(C))
- return
-
- C.color = flash_color
- spawn(0)
- animate(C, color = initial(C.color), time = flash_time)
-
#define RANDOM_COLOUR (rgb(rand(0,255),rand(0,255),rand(0,255)))
/proc/make_bit_triplet()
@@ -2078,11 +2061,12 @@ GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new)
/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 connection_log (`datetime`, `ckey`, `ip`, `computerid`, `result`) VALUES(Now(), :ckey, :ip, :cid, :result)", list(
+ var/datum/db_query/query_accesslog = SSdbcore.NewQuery("INSERT INTO connection_log (`datetime`, `ckey`, `ip`, `computerid`, `result`, `server_id`) VALUES(Now(), :ckey, :ip, :cid, :result, :server_id)", 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
+ "result" = connection_type,
+ "server_id" = GLOB.configuration.system.instance_id
))
query_accesslog.warn_execute()
qdel(query_accesslog)
diff --git a/code/_compile_options.dm b/code/_compile_options.dm
index 0e73437dd93..d418f30c78d 100644
--- a/code/_compile_options.dm
+++ b/code/_compile_options.dm
@@ -22,12 +22,12 @@
#define IS_MODE_COMPILED(MODE) (ispath(text2path("/datum/game_mode/"+(MODE))))
//Update this whenever you need to take advantage of more recent byond features
-#define MIN_COMPILER_VERSION 513
-#define MIN_COMPILER_BUILD 1514
+#define MIN_COMPILER_VERSION 514
+#define MIN_COMPILER_BUILD 1554
#if DM_VERSION < MIN_COMPILER_VERSION || DM_BUILD < MIN_COMPILER_BUILD
//Don't forget to update this part
#error Your version of BYOND is too out-of-date to compile this project. Go to https://secure.byond.com/download and update.
-#error You need version 513.1514 or higher
+#error You need version 514.1554 or higher
#endif
// Macros that must exist before world.dm
diff --git a/code/_globalvars/genetics.dm b/code/_globalvars/genetics.dm
index 1119ac364cc..2c49057e636 100644
--- a/code/_globalvars/genetics.dm
+++ b/code/_globalvars/genetics.dm
@@ -5,7 +5,6 @@ GLOBAL_VAR_INIT(deafblock, 0)
GLOBAL_VAR_INIT(hulkblock, 0)
GLOBAL_VAR_INIT(teleblock, 0)
GLOBAL_VAR_INIT(fireblock, 0)
-GLOBAL_VAR_INIT(xrayblock, 0)
GLOBAL_VAR_INIT(clumsyblock, 0)
GLOBAL_VAR_INIT(fakeblock, 0)
GLOBAL_VAR_INIT(coughblock, 0)
@@ -30,6 +29,9 @@ GLOBAL_VAR_INIT(hallucinationblock, 0)
GLOBAL_VAR_INIT(noprintsblock, 0)
GLOBAL_VAR_INIT(shockimmunityblock, 0)
GLOBAL_VAR_INIT(smallsizeblock, 0)
+GLOBAL_VAR_INIT(mesonblock, 0)
+GLOBAL_VAR_INIT(noflashblock, 0)
+GLOBAL_VAR_INIT(nightvisionblock, 0)
///////////////////////////////
// Goon Stuff
diff --git a/code/_globalvars/lists/misc.dm b/code/_globalvars/lists/misc.dm
index 5464ed64bb4..c5afa64cfba 100644
--- a/code/_globalvars/lists/misc.dm
+++ b/code/_globalvars/lists/misc.dm
@@ -56,3 +56,5 @@ GLOBAL_LIST_INIT(cooking_ingredients, list(RECIPE_MICROWAVE = list(), RECIPE_OVE
GLOBAL_LIST_INIT(cooking_reagents, list(RECIPE_MICROWAVE = list(), RECIPE_OVEN = list(), RECIPE_GRILL = list(), RECIPE_CANDY = list()))
#define EGG_LAYING_MESSAGES list("lays an egg.", "squats down and croons.", "begins making a huge racket.", "begins clucking raucously.")
+
+GLOBAL_LIST_EMPTY(client_login_processors)
diff --git a/code/_globalvars/lists/objects.dm b/code/_globalvars/lists/objects.dm
index 4c22d37dc32..ee2fb9b16a1 100644
--- a/code/_globalvars/lists/objects.dm
+++ b/code/_globalvars/lists/objects.dm
@@ -6,7 +6,6 @@ GLOBAL_LIST_INIT(landmarks_list, list()) //list of all landmarks created
GLOBAL_LIST_INIT(surgery_steps, list()) //list of all surgery steps |BS12
GLOBAL_LIST_INIT(side_effects, list()) //list of all medical sideeffects types by thier names |BS12
GLOBAL_LIST_INIT(mechas_list, list()) //list of all mechs. Used by hostile mobs target tracking.
-GLOBAL_LIST_INIT(spacepods_list, list()) //list of all space pods. Used by hostile mobs target tracking.
GLOBAL_LIST_INIT(joblist, list()) //list of all jobstypes, minus borg and AI
GLOBAL_LIST_INIT(airlocks, list()) //list of all airlocks
GLOBAL_LIST_INIT(singularities, list()) //list of all singularities
diff --git a/code/_globalvars/traits.dm b/code/_globalvars/traits.dm
index 39551da14b6..90840095938 100644
--- a/code/_globalvars/traits.dm
+++ b/code/_globalvars/traits.dm
@@ -46,6 +46,9 @@ GLOBAL_LIST_INIT(traits_by_type, list(
"TRAIT_DWARF" = TRAIT_DWARF,
"TRAIT_SILENT_FOOTSTEPS" = TRAIT_SILENT_FOOTSTEPS,
"TRAIT_ALCOHOL_TOLERANCE" = TRAIT_ALCOHOL_TOLERANCE,
+ "TRAIT_MESON_VISION" = TRAIT_MESON_VISION,
+ "TRAIT_FLASH_PROTECTION" = TRAIT_FLASH_PROTECTION,
+ "TRAIT_NIGHT_VISION" = TRAIT_NIGHT_VISION,
"TRAIT_COMIC_SANS" = TRAIT_COMIC_SANS,
"TRAIT_NOFINGERPRINTS" = TRAIT_NOFINGERPRINTS,
diff --git a/code/_onclick/hud/alert.dm b/code/_onclick/hud/alert.dm
index c88dd0671b1..daf7bfe6b52 100644
--- a/code/_onclick/hud/alert.dm
+++ b/code/_onclick/hud/alert.dm
@@ -622,6 +622,13 @@ so as to remain in compliance with the most up-to-date laws."
stone = null
return ..()
+/obj/screen/alert/notify_mapvote
+ name = "Map Vote"
+ desc = "Vote on which map you would like to play on next!"
+ icon_state = "map_vote"
+
+/obj/screen/alert/notify_mapvote/Click()
+ SSvote.browse_to(usr.client)
//OBJECT-BASED
diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm
index 9d4edca6ebb..a2a4aec80c4 100644
--- a/code/_onclick/item_attack.dm
+++ b/code/_onclick/item_attack.dm
@@ -102,7 +102,7 @@
/obj/attacked_by(obj/item/I, mob/living/user)
if(I.force)
user.visible_message("[user] has hit [src] with [I]!", "You hit [src] with [I]!")
- take_damage(I.force, I.damtype, "melee", 1)
+ take_damage(I.force, I.damtype, MELEE, 1)
/mob/living/attacked_by(obj/item/I, mob/living/user, def_zone)
send_item_attack_message(I, user)
diff --git a/code/controllers/configuration/configuration_core.dm b/code/controllers/configuration/configuration_core.dm
index d9494c31652..c96e96016e8 100644
--- a/code/controllers/configuration/configuration_core.dm
+++ b/code/controllers/configuration/configuration_core.dm
@@ -46,6 +46,8 @@ GLOBAL_DATUM_INIT(configuration, /datum/server_configuration, new())
var/datum/configuration_section/url_configuration/url
/// Holder for the voting configuration datum
var/datum/configuration_section/vote_configuration/vote
+ /// Raw data. Stored here to avoid passing data between procs constantly
+ var/list/raw_data = list()
/datum/server_configuration/Destroy(force)
@@ -53,6 +55,16 @@ GLOBAL_DATUM_INIT(configuration, /datum/server_configuration, new())
// This is going to stay existing. I dont care.
return QDEL_HINT_LETMELIVE
+/datum/server_configuration/vv_get_var(var_name)
+ if(var_name == "raw_data") // NO!
+ return FALSE
+ . = ..()
+
+/datum/server_configuration/vv_edit_var(var_name, var_value)
+ if(var_name == "raw_data") // NO!
+ return FALSE
+ . = ..()
+
/datum/server_configuration/CanProcCall(procname)
return FALSE // No thanks
@@ -85,34 +97,66 @@ GLOBAL_DATUM_INIT(configuration, /datum/server_configuration, new())
var/config_file = "config/config.toml"
if(!fexists(config_file))
config_file = "config/example/config.toml" // Fallback to example if user hasnt setup config properly
- var/raw_json = rustg_toml2json(config_file)
- var/list/raw_config_data = json_decode(raw_json)
+ raw_data = rustg_read_toml_file(config_file)
// Now pass through all our stuff
- admin.load_data(raw_config_data["admin_configuration"])
- afk.load_data(raw_config_data["afk_configuration"])
- custom_sprites.load_data(raw_config_data["custom_sprites_configuration"])
- database.load_data(raw_config_data["database_configuration"])
- discord.load_data(raw_config_data["discord_configuration"])
- event.load_data(raw_config_data["event_configuration"])
- gamemode.load_data(raw_config_data["gamemode_configuration"])
- gateway.load_data(raw_config_data["gateway_configuration"])
- general.load_data(raw_config_data["general_configuration"])
- ipintel.load_data(raw_config_data["ipintel_configuration"])
- jobs.load_data(raw_config_data["job_configuration"])
- logging.load_data(raw_config_data["logging_configuration"])
- mc.load_data(raw_config_data["mc_configuration"])
- metrics.load_data(raw_config_data["metrics_configuration"])
- movement.load_data(raw_config_data["movement_configuration"])
- overflow.load_data(raw_config_data["overflow_configuration"])
- ruins.load_data(raw_config_data["ruin_configuration"])
- system.load_data(raw_config_data["system_configuration"])
- url.load_data(raw_config_data["url_configuration"])
- vote.load_data(raw_config_data["voting_configuration"])
+ load_all_sections()
+
+ // Clear our list to save RAM
+ raw_data = list()
// And report the load
DIRECT_OUTPUT(world.log, "Config loaded in [stop_watch(start)]s")
+/datum/server_configuration/proc/load_all_sections()
+ safe_load(admin, "admin_configuration")
+ safe_load(afk, "afk_configuration")
+ safe_load(custom_sprites, "custom_sprites_configuration")
+ safe_load(database, "database_configuration")
+ safe_load(discord, "discord_configuration")
+ safe_load(event, "event_configuration")
+ safe_load(gamemode, "gamemode_configuration")
+ safe_load(gateway, "gateway_configuration")
+ safe_load(general, "general_configuration")
+ safe_load(ipintel, "ipintel_configuration")
+ safe_load(jobs, "job_configuration")
+ safe_load(logging, "logging_configuration")
+ safe_load(mc, "mc_configuration")
+ safe_load(metrics, "metrics_configuration")
+ safe_load(movement, "movement_configuration")
+ safe_load(overflow, "overflow_configuration")
+ safe_load(ruins, "ruin_configuration")
+ safe_load(system, "system_configuration")
+ safe_load(url, "url_configuration")
+ safe_load(vote, "voting_configuration")
+
+// Proc to load up instance-specific overrides
+/datum/server_configuration/proc/load_overrides()
+ var/override_file = "config/overrides_[world.port].toml"
+ if(!fexists(override_file))
+ DIRECT_OUTPUT(world.log, "Overrides not found for this instance.")
+ return
+
+ DIRECT_OUTPUT(world.log, "Overrides found for this instance. Loading them.")
+ var/start = start_watch() // Time tracking
+
+ raw_data = rustg_read_toml_file(override_file)
+
+ // Now safely load our overrides.
+ // Due to the nature of config wrappers, only vars that exist in the config file are applied to the config datums.
+ // This means that an override missing a key doesnt null it out from the main server
+ load_all_sections()
+
+ // Clear our list to save RAM
+ raw_data = list()
+
+ // And report the load
+ DIRECT_OUTPUT(world.log, "Config overrides loaded in [stop_watch(start)]s")
+
+// Only loads the data for a config section if that key exists in the JSON
+/datum/server_configuration/proc/safe_load(datum/configuration_section/CS, section)
+ if(!isnull(raw_data[section]))
+ CS.load_data(raw_data[section])
/datum/configuration_section
/// See __config_defines.dm
diff --git a/code/controllers/configuration/sections/discord_configuration.dm b/code/controllers/configuration/sections/discord_configuration.dm
index 3d51c92aa42..4f34a753707 100644
--- a/code/controllers/configuration/sections/discord_configuration.dm
+++ b/code/controllers/configuration/sections/discord_configuration.dm
@@ -7,6 +7,8 @@
var/forward_all_ahelps = TRUE
/// Admin role to ping if no admins are online. Disables if empty string
var/admin_role_id = ""
+ /// Mentor role to ping if no mentors are online. Disables if empty string
+ var/mentor_role_id = ""
/// List of all URLs for the main webhooks
var/list/main_webhook_urls = list()
/// List of all URLs for the admin webhooks
@@ -21,6 +23,7 @@
CONFIG_LOAD_BOOL(webhooks_enabled, data["enable_discord_webhooks"])
CONFIG_LOAD_BOOL(forward_all_ahelps, data["forward_all_ahelps"])
CONFIG_LOAD_STR(admin_role_id, data["admin_role_id"])
+ CONFIG_LOAD_STR(mentor_role_id, data["mentor_role_id"])
CONFIG_LOAD_LIST(main_webhook_urls, data["main_webhook_urls"])
CONFIG_LOAD_LIST(mentor_webhook_urls, data["mentor_webhook_urls"])
CONFIG_LOAD_LIST(admin_webhook_urls, data["admin_webhook_urls"])
diff --git a/code/controllers/configuration/sections/system_configuration.dm b/code/controllers/configuration/sections/system_configuration.dm
index 42e563d7057..a7623dfacc4 100644
--- a/code/controllers/configuration/sections/system_configuration.dm
+++ b/code/controllers/configuration/sections/system_configuration.dm
@@ -10,16 +10,23 @@
var/medal_hub_password = null
/// Do we want the server to kill on reboot instead of keeping the same DD session
var/shutdown_on_reboot = FALSE
+ /// Is this server a production server (Has higher security and requires 2FA)
+ var/is_production = FALSE
/// If above is true, you can run a shell command
var/shutdown_shell_command = null
/// 2FA backend server host
var/_2fa_auth_host = null
/// List of IP addresses which bypass world topic rate limiting
var/list/topic_ip_ratelimit_bypass = list()
+ /// Server instance ID
+ var/instance_id = "paradise_main"
+ /// Server internal IP
+ var/internal_ip = "127.0.0.1"
/datum/configuration_section/system_configuration/load_data(list/data)
// Use the load wrappers here. That way the default isnt made 'null' if you comment out the config line
CONFIG_LOAD_BOOL(shutdown_on_reboot, data["shutdown_on_reboot"])
+ CONFIG_LOAD_BOOL(is_production, data["is_production"])
CONFIG_LOAD_STR(topic_key, data["communications_password"])
CONFIG_LOAD_STR(medal_hub_address, data["medal_hub_address"])
@@ -28,3 +35,6 @@
CONFIG_LOAD_STR(_2fa_auth_host, data["_2fa_auth_host"])
CONFIG_LOAD_LIST(topic_ip_ratelimit_bypass, data["topic_ip_ratelimit_bypass"])
+
+ CONFIG_LOAD_STR(instance_id, data["instance_id"])
+ CONFIG_LOAD_STR(internal_ip, data["internal_ip"])
diff --git a/code/controllers/master.dm b/code/controllers/master.dm
index d445cf6f3b6..13a2a065a02 100644
--- a/code/controllers/master.dm
+++ b/code/controllers/master.dm
@@ -62,7 +62,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
/// 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/sleep_offline_after_initializations = FALSE // No we dont
var/static/restart_clear = 0
var/static/restart_timeout = 0
diff --git a/code/controllers/subsystem/blackbox.dm b/code/controllers/subsystem/blackbox.dm
index 37e4299b06d..273fd71dbc1 100644
--- a/code/controllers/subsystem/blackbox.dm
+++ b/code/controllers/subsystem/blackbox.dm
@@ -287,8 +287,8 @@ SUBSYSTEM_DEF(blackbox)
lakey = L.lastattackerckey
var/datum/db_query/deathquery = SSdbcore.NewQuery({"
- INSERT INTO death (name, byondkey, job, special, pod, tod, laname, lakey, gender, bruteloss, fireloss, brainloss, oxyloss, coord)
- VALUES (:name, :key, :job, :special, :pod, NOW(), :laname, :lakey, :gender, :bruteloss, :fireloss, :brainloss, :oxyloss, :coord)"},
+ INSERT INTO death (name, byondkey, job, special, pod, tod, laname, lakey, gender, bruteloss, fireloss, brainloss, oxyloss, coord, server_id)
+ VALUES (:name, :key, :job, :special, :pod, NOW(), :laname, :lakey, :gender, :bruteloss, :fireloss, :brainloss, :oxyloss, :coord, :server_id)"},
list(
"name" = L.real_name,
"key" = L.key,
@@ -302,7 +302,8 @@ SUBSYSTEM_DEF(blackbox)
"fireloss" = L.getFireLoss(),
"brainloss" = L.getBrainLoss(),
"oxyloss" = L.getOxyLoss(),
- "coord" = "[L.x], [L.y], [L.z]"
+ "coord" = "[L.x], [L.y], [L.z]",
+ "server_id" = GLOB.configuration.system.instance_id
)
)
deathquery.warn_execute()
diff --git a/code/controllers/subsystem/changelog.dm b/code/controllers/subsystem/changelog.dm
index 55221263033..488be1d32c0 100644
--- a/code/controllers/subsystem/changelog.dm
+++ b/code/controllers/subsystem/changelog.dm
@@ -54,9 +54,8 @@ SUBSYSTEM_DEF(changelog)
/datum/controller/subsystem/changelog/proc/UpdatePlayerChangelogDate(client/C)
if(!ss_ready)
return // Only return here, we dont have to worry about a queue list because this will be called from ShowChangelog()
- // Technically this is only for the date but we can also do the UI button at the same time
- var/datum/preferences/P = GLOB.preferences_datums[C.ckey]
- if(P.toggles & PREFTOGGLE_UI_DARKMODE)
+
+ if(C.prefs.toggles & PREFTOGGLE_UI_DARKMODE)
winset(C, "rpane.changelog", "background-color=#40628a;font-color=#ffffff;font-style=none")
else
winset(C, "rpane.changelog", "background-color=none;font-style=none")
diff --git a/code/controllers/subsystem/dbcore.dm b/code/controllers/subsystem/dbcore.dm
index f6974a2fb17..ed7e8c25596 100644
--- a/code/controllers/subsystem/dbcore.dm
+++ b/code/controllers/subsystem/dbcore.dm
@@ -160,8 +160,8 @@ SUBSYSTEM_DEF(dbcore)
if(!IsConnected())
return
var/datum/db_query/query_round_initialize = SSdbcore.NewQuery(
- "INSERT INTO round (initialize_datetime, server_ip, server_port) VALUES (Now(), INET_ATON(:internet_address), :port)",
- list("internet_address" = world.internet_address || "0", "port" = "[world.port]")
+ "INSERT INTO round (initialize_datetime, server_ip, server_port, server_id) VALUES (Now(), INET_ATON(:internet_address), :port, :server_id)",
+ list("internet_address" = world.internet_address || "0", "port" = "[world.port]", "server_id" = GLOB.configuration.system.instance_id)
)
query_round_initialize.Execute(async = FALSE)
GLOB.round_id = "[query_round_initialize.last_insert_id]"
diff --git a/code/controllers/subsystem/discord.dm b/code/controllers/subsystem/discord.dm
index 11a2a481073..e6dd4438ffe 100644
--- a/code/controllers/subsystem/discord.dm
+++ b/code/controllers/subsystem/discord.dm
@@ -5,6 +5,8 @@ SUBSYSTEM_DEF(discord)
var/enabled = FALSE
/// Last time the administrator ping was dropped. This ensures administrators cannot be mass pinged if a large chunk of ahelps go off at once (IE: tesloose)
var/last_administration_ping = 0
+ /// Last time the mentor ping was dropped. This ensures mentors cannot be mass pinged if a large chunk of mhelps go off at once.
+ var/last_mentor_ping = 0
/datum/controller/subsystem/discord/Initialize(start_timeofday)
if(GLOB.configuration.discord.webhooks_enabled)
@@ -25,7 +27,7 @@ SUBSYSTEM_DEF(discord)
webhook_urls = GLOB.configuration.discord.mentor_webhook_urls
var/datum/discord_webhook_payload/dwp = new()
- dwp.webhook_content = content
+ dwp.webhook_content = "**\[[GLOB.configuration.system.instance_id]]** [content]"
for(var/url in webhook_urls)
SShttp.create_async_request(RUSTG_HTTP_METHOD_POST, url, dwp.serialize2json(), list("content-type" = "application/json"))
@@ -71,10 +73,31 @@ SUBSYSTEM_DEF(discord)
var/message = "[content] [alerttext] [add_ping ? handle_administrator_ping() : ""]"
var/datum/discord_webhook_payload/dwp = new()
- dwp.webhook_content = message
+ dwp.webhook_content = "**\[[GLOB.configuration.system.instance_id]]** [message]"
for(var/url in GLOB.configuration.discord.admin_webhook_urls)
SShttp.create_async_request(RUSTG_HTTP_METHOD_POST, url, dwp.serialize2json(), list("content-type" = "application/json"))
+/datum/controller/subsystem/discord/proc/send2discord_simple_mentor(content)
+ var/alerttext
+ var/list/mentorcounter = staff_countup(R_MENTOR)
+ var/active_mentors = mentorcounter[1]
+ var/inactive_mentors = mentorcounter[3]
+ var/add_ping = FALSE
+
+ if(active_mentors <= 0)
+ add_ping = TRUE
+ if(inactive_mentors)
+ alerttext = "| **ALL MENTORS AFK**"
+ else
+ alerttext = "| **NO MENTORS ONLINE**"
+
+ var/message = "[content] [alerttext][add_ping ? handle_mentor_ping() : ""]"
+
+ var/datum/discord_webhook_payload/dwp = new()
+ dwp.webhook_content = "**\[[GLOB.configuration.system.instance_id]]** [message]"
+ for(var/url in GLOB.configuration.discord.mentor_webhook_urls)
+ SShttp.create_async_request(RUSTG_HTTP_METHOD_POST, url, dwp.serialize2json(), list("content-type" = "application/json"))
+
// Helper to make administrator ping easier
/datum/controller/subsystem/discord/proc/handle_administrator_ping()
// Check if a role is even set
@@ -86,3 +109,13 @@ SUBSYSTEM_DEF(discord)
return "<@&[GLOB.configuration.discord.admin_role_id]>"
return ""
+
+/datum/controller/subsystem/discord/proc/handle_mentor_ping()
+ if(GLOB.configuration.discord.mentor_role_id)
+ if(last_mentor_ping > world.time)
+ return " *(Role pinged recently)*"
+
+ last_mentor_ping = world.time + 60 SECONDS
+ return " <@&[GLOB.configuration.discord.mentor_role_id]>"
+
+ return ""
diff --git a/code/controllers/subsystem/fires.dm b/code/controllers/subsystem/fires.dm
index 2481891000c..4ae71f72841 100644
--- a/code/controllers/subsystem/fires.dm
+++ b/code/controllers/subsystem/fires.dm
@@ -36,7 +36,7 @@ SUBSYSTEM_DEF(fires)
if(O.resistance_flags & ON_FIRE) //in case an object is extinguished while still in currentrun
if(!(O.resistance_flags & FIRE_PROOF))
- O.take_damage(20, BURN, "fire", 0)
+ O.take_damage(20, BURN, FIRE, 0)
else
O.extinguish()
diff --git a/code/controllers/subsystem/instancing.dm b/code/controllers/subsystem/instancing.dm
new file mode 100644
index 00000000000..8fd80a9bad7
--- /dev/null
+++ b/code/controllers/subsystem/instancing.dm
@@ -0,0 +1,184 @@
+SUBSYSTEM_DEF(instancing)
+ name = "Instancing"
+ runlevels = RUNLEVEL_INIT | RUNLEVEL_LOBBY | RUNLEVEL_SETUP | RUNLEVEL_GAME | RUNLEVEL_POSTGAME
+ wait = 30 SECONDS
+ flags = SS_KEEP_TIMING
+
+/datum/controller/subsystem/instancing/Initialize(start_timeofday)
+ // Dont even bother if we arent connected
+ if(!SSdbcore.IsConnected())
+ flags |= SS_NO_FIRE
+ return ..()
+ update_heartbeat() // Make sure you do this before announcing to peers, or no one will hear your announcement
+ var/startup_msg = "The server [GLOB.configuration.general.server_name] is now starting up. The map is [SSmapping.map_datum.fluff_name] ([SSmapping.map_datum.technical_name]). You can connect with the Switch Server verb."
+ message_all_peers(startup_msg)
+ return ..()
+
+/datum/controller/subsystem/instancing/fire(resumed)
+ update_heartbeat()
+ update_playercache()
+
+/**
+ * Playercache updater
+ *
+ * Updates the player cache in the DB. Different from heartbeat so we can force invoke it on player operations
+ */
+/datum/controller/subsystem/instancing/proc/update_playercache(optional_ckey)
+ // You may be wondering, why the fuck is an "optional ckey" variable here
+ // Well, this is invoked in client/New(), and needs to read from GLOB.clients
+ // However, this proc sleeps, and if you sleep during client/New() once the client is in GLOB.clients, stuff breaks bad
+ // (See my comment rambling in client/New())
+ // By passing the ckey through, we can sleep in this proc and still get the data
+ if(!SSdbcore.IsConnected())
+ return
+ // First iterate clients to get ckeys
+ var/list/ckeys = list()
+ for(var/client/C in GLOB.clients) // No code review. I am not doing the `as anything` bullshit, because we *do* need the type checks here to avoid null clients which do happen sometimes
+ ckeys += C.ckey
+ // Add our optional
+ if(optional_ckey)
+ ckeys += optional_ckey
+ // Note: We dont have to sort the list here. The only time this is read for is a search,
+ // and order doesnt matter for that.
+ var/ckey_json = json_encode(ckeys)
+
+ // Yes I care about performance savings this much here to mass execute this shit
+ var/list/datum/db_query/queries = list()
+ queries += SSdbcore.NewQuery("UPDATE instance_data_cache SET key_value=:json WHERE key_name='playerlist' AND server_id=:sid", list(
+ "json" = ckey_json,
+ "sid" = GLOB.configuration.system.instance_id
+ ))
+ queries += SSdbcore.NewQuery("UPDATE instance_data_cache SET key_value=:count WHERE key_name='playercount' AND server_id=:sid", list(
+ "count" = length(ckeys),
+ "sid" = GLOB.configuration.system.instance_id
+ ))
+
+ SSdbcore.MassExecute(queries, TRUE, TRUE, FALSE, FALSE)
+
+/**
+ * Heartbeat updater
+ *
+ * Updates the heartbeat in the DB. Used so other servers can see when this one was alive
+ */
+/datum/controller/subsystem/instancing/proc/update_heartbeat()
+ // this could probably just go in fire() but clean code and profiler ease who cares
+ var/datum/db_query/dbq = SSdbcore.NewQuery("UPDATE instance_data_cache SET key_value=NOW() WHERE key_name='heartbeat' AND server_id=:sid", list(
+ "sid" = GLOB.configuration.system.instance_id
+ ))
+ dbq.warn_execute()
+ qdel(dbq)
+
+/**
+ * Seed data
+ *
+ * Seeds all our data into the DB for other servers to discover from.
+ * This is called during world/New() instead of on initialize so it can be done *instantly*
+ */
+/datum/controller/subsystem/instancing/proc/seed_data()
+ // We need to seed a lot of keys, so lets just use a key-value-pair-map to do this easily
+ var/list/kvp_map = list()
+ kvp_map["server_name"] = GLOB.configuration.general.server_name // Name of the server
+ kvp_map["server_port"] = world.port // Server port (used for redirection and topics)
+ kvp_map["topic_key"] = GLOB.configuration.system.topic_key // Server topic key (used for topics)
+ kvp_map["internal_ip"] = GLOB.configuration.system.internal_ip // Server internal IP (used for topics)
+ kvp_map["playercount"] = length(GLOB.clients) // Server client count (used for status info)
+ kvp_map["playerlist"] = json_encode(list()) // Server client list. Used for dupe login checks. This gets filled in later
+ kvp_map["heartbeat"] = SQLtime() // SQL timestamp for heartbeat purposes. Any server without a heartbeat in the last 60 seconds can be considered dead
+ // Also note for above. You may say "But AA you dont need to JSON encode it, just use "\[]"."
+ // Well to that I say, no. This is meant to be JSON regardless, and it should represent that. This proc is ran once during world/New()
+ // An extra nanosecond of load will make zero difference.
+
+ for(var/key in kvp_map)
+ var/datum/db_query/dbq = SSdbcore.NewQuery("INSERT INTO instance_data_cache (server_id, key_name, key_value) VALUES (:sid, :kn, :kv) ON DUPLICATE KEY UPDATE key_value=:kv2", // Is this necessary? Who knows!
+ list(
+ "sid" = GLOB.configuration.system.instance_id,
+ "kn" = key,
+ "kv" = "[kvp_map[key]]", // String encoding IS necessary since these tables use strings, not ints
+ "kv2" = "[kvp_map[key]]", // Dont know if I need the second but better to be safe
+ )
+ )
+ dbq.warn_execute(FALSE) // Do NOT async execute here because world/New() shouldnt sleep. EVER. You get issues if you do.
+ qdel(dbq)
+
+
+/**
+ * Message all peers
+ *
+ * Wrapper for [topic_all_peers] to format the input into a message topic. Will send a server-wide announcement to the other servers
+ *
+ * Arguments:
+ * * message - Message to send to the other servers
+ */
+/datum/controller/subsystem/instancing/proc/message_all_peers(message)
+ if(!SSdbcore.IsConnected())
+ return
+ var/topic_string = "instance_announce&msg=[url_encode(message)]"
+ topic_all_peers(topic_string)
+
+/**
+ * Sends a topic to all peers
+ *
+ * Sends a raw topic to the other servers. WILL APPEND &key=[commskey] ON THE END. PLEASE ACCOUNT FOR THIS.
+ *
+ * Arguments:
+ * * raw_topic - The raw topic to send to the other servers
+ */
+/datum/controller/subsystem/instancing/proc/topic_all_peers(raw_topic)
+ // Someone here is going to say "AA you shouldnt put load on the DB server you can do sorting in BYOND"
+ // Well let me put it this way. The DB server is an entirely different machine to BYOND, with this entire dataset being stored in its RAM, not even on disk
+ // By making the DB server do the work, we can offload from BYOND, which is already strained
+ var/datum/db_query/dbq1 = SSdbcore.NewQuery({"
+ SELECT server_id, key_name, key_value FROM instance_data_cache WHERE server_id IN
+ (SELECT server_id FROM instance_data_cache WHERE server_id !=:sid AND
+ key_name='heartbeat' AND last_updated BETWEEN NOW() - INTERVAL 60 SECOND AND NOW())
+ AND key_name IN ("topic_key", "internal_ip", "server_port")"}, list(
+ "sid" = GLOB.configuration.system.instance_id
+ ))
+ if(!dbq1.warn_execute())
+ qdel(dbq1)
+ return
+
+ var/servers_outer = list()
+ while(dbq1.NextRow())
+ if(!servers_outer[dbq1.item[1]])
+ servers_outer[dbq1.item[1]] = list()
+
+ servers_outer[dbq1.item[1]][dbq1.item[2]] = dbq1.item[3] // This should assoc load our data
+
+ qdel(dbq1)
+
+ for(var/server in servers_outer)
+ var/server_data = servers_outer[server]
+ world.Export("byond://[server_data["internal_ip"]]:[server_data["server_port"]]?[raw_topic]&key=[server_data["topic_key"]]")
+
+
+/**
+ * Player checker
+ *
+ * Check all connected peers to see if a player exists in the player cache
+ * This is used to make sure players dont log into 2 servers at once
+ * Arguments:
+ * ckey - The ckey to check if they are logged into another server
+ */
+/datum/controller/subsystem/instancing/proc/check_player(ckey)
+ // Please see above rant on L127
+ var/datum/db_query/dbq1 = SSdbcore.NewQuery({"
+ SELECT server_id, key_value FROM instance_data_cache WHERE server_id IN
+ (SELECT server_id FROM instance_data_cache WHERE server_id != :sid AND
+ key_name='heartbeat' AND last_updated BETWEEN NOW() - INTERVAL 60 SECOND AND NOW())
+ AND key_name IN ("playerlist")"}, list(
+ "sid" = GLOB.configuration.system.instance_id
+ ))
+ if(!dbq1.warn_execute())
+ qdel(dbq1)
+ return
+
+ while(dbq1.NextRow())
+ var/list/other_server_cache = json_decode(dbq1.item[2])
+ if(ckey in other_server_cache)
+ var/target_server = dbq1.item[1] // Yes. This var is necessary.
+ qdel(dbq1)
+ return target_server
+
+ qdel(dbq1)
+ return null // If we are here, it means we didnt find our player on another server
diff --git a/code/controllers/subsystem/jobs.dm b/code/controllers/subsystem/jobs.dm
index f7660f4d75a..04e1c5fb5df 100644
--- a/code/controllers/subsystem/jobs.dm
+++ b/code/controllers/subsystem/jobs.dm
@@ -65,7 +65,7 @@ SUBSYSTEM_DEF(jobs)
return type_occupations[jobtype]
/datum/controller/subsystem/jobs/proc/GetPlayerAltTitle(mob/new_player/player, rank)
- return player.client.prefs.GetPlayerAltTitle(GetJob(rank))
+ return player.client.prefs.active_character.GetPlayerAltTitle(GetJob(rank))
/datum/controller/subsystem/jobs/proc/AssignRole(mob/new_player/player, rank, latejoin = 0)
Debug("Running AR, Player: [player], Rank: [rank], LJ: [latejoin]")
@@ -121,7 +121,7 @@ SUBSYSTEM_DEF(jobs)
Debug("Running FOC, Job: [job], Level: [level], Flag: [flag]")
var/list/candidates = list()
for(var/mob/new_player/player in unassigned)
- Debug(" - Player: [player] Banned: [jobban_isbanned(player, job.title)] Old Enough: [!job.player_old_enough(player.client)] AvInPlaytime: [job.available_in_playtime(player.client)] Flag && Be Special: [flag] && [player.client.prefs.be_special] Job Department: [player.client.prefs.GetJobDepartment(job, level)] Job Flag: [job.flag] Job Department Flag = [job.department_flag]")
+ Debug(" - Player: [player] Banned: [jobban_isbanned(player, job.title)] Old Enough: [!job.player_old_enough(player.client)] AvInPlaytime: [job.available_in_playtime(player.client)] Flag && Be Special: [flag] && [player.client.prefs.be_special] Job Department: [player.client.prefs.active_character.GetJobDepartment(job, level)] Job Flag: [job.flag] Job Department Flag = [job.department_flag]")
if(jobban_isbanned(player, job.title))
Debug("FOC isbanned failed, Player: [player]")
continue
@@ -140,7 +140,7 @@ SUBSYSTEM_DEF(jobs)
if(player.mind && (job.title in player.mind.restricted_roles))
Debug("FOC incompatbile with antagonist role, Player: [player]")
continue
- if(player.client.prefs.GetJobDepartment(job, level) & job.flag)
+ if(player.client.prefs.active_character.GetJobDepartment(job, level) & job.flag)
Debug("FOC pass, Player: [player], Level:[level]")
candidates += player
return candidates
@@ -367,12 +367,12 @@ SUBSYSTEM_DEF(jobs)
continue
// If the player wants that job on this level, then try give it to him.
- if(player.client.prefs.GetJobDepartment(job, level) & job.flag)
+ if(player.client.prefs.active_character.GetJobDepartment(job, level) & job.flag)
// If the job isn't filled
if((job.current_positions < job.spawn_positions) || job.spawn_positions == -1)
Debug("DO pass, Player: [player], Level:[level], Job:[job.title]")
- Debug(" - Job Flag: [job.flag] Job Department: [player.client.prefs.GetJobDepartment(job, level)] Job Current Pos: [job.current_positions] Job Spawn Positions = [job.spawn_positions]")
+ Debug(" - Job Flag: [job.flag] Job Department: [player.client.prefs.active_character.GetJobDepartment(job, level)] Job Current Pos: [job.current_positions] Job Spawn Positions = [job.spawn_positions]")
AssignRole(player, job.title)
unassigned -= player
break
@@ -380,7 +380,7 @@ SUBSYSTEM_DEF(jobs)
// Hand out random jobs to the people who didn't get any in the last check
// Also makes sure that they got their preference correct
for(var/mob/new_player/player in unassigned)
- if(player.client.prefs.alternate_option == GET_RANDOM_JOB)
+ if(player.client.prefs.active_character.alternate_option == GET_RANDOM_JOB)
GiveRandomJob(player)
Debug("DO, Standard Check end")
@@ -390,7 +390,7 @@ SUBSYSTEM_DEF(jobs)
// Antags, who have to get in, come first
for(var/mob/new_player/player in unassigned)
if(player.mind.special_role)
- if(player.client.prefs.alternate_option != BE_ASSISTANT)
+ if(player.client.prefs.active_character.alternate_option != BE_ASSISTANT)
GiveRandomJob(player)
if(player in unassigned)
AssignRole(player, "Civilian")
@@ -399,10 +399,10 @@ SUBSYSTEM_DEF(jobs)
// Then we assign what we can to everyone else.
for(var/mob/new_player/player in unassigned)
- if(player.client.prefs.alternate_option == BE_ASSISTANT)
+ if(player.client.prefs.active_character.alternate_option == BE_ASSISTANT)
Debug("AC2 Assistant located, Player: [player]")
AssignRole(player, "Civilian")
- else if(player.client.prefs.alternate_option == RETURN_TO_LOBBY)
+ else if(player.client.prefs.active_character.alternate_option == RETURN_TO_LOBBY)
player.ready = 0
unassigned -= player
@@ -564,11 +564,11 @@ SUBSYSTEM_DEF(jobs)
if(job.barred_by_disability(player.client))
disabled++
continue
- if(player.client.prefs.GetJobDepartment(job, 1) & job.flag)
+ if(player.client.prefs.active_character.GetJobDepartment(job, 1) & job.flag)
high++
- else if(player.client.prefs.GetJobDepartment(job, 2) & job.flag)
+ else if(player.client.prefs.active_character.GetJobDepartment(job, 2) & job.flag)
medium++
- else if(player.client.prefs.GetJobDepartment(job, 3) & job.flag)
+ else if(player.client.prefs.active_character.GetJobDepartment(job, 3) & job.flag)
low++
else never++ //not selected
diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm
index c6e3562bd97..51821f14641 100644
--- a/code/controllers/subsystem/mapping.dm
+++ b/code/controllers/subsystem/mapping.dm
@@ -10,6 +10,8 @@ SUBSYSTEM_DEF(mapping)
var/list/teleportlocs
/// List of all areas that can be accessed via IC and OOC means
var/list/ghostteleportlocs
+ ///List of areas that exist on the station this shift
+ var/list/existing_station_areas
// This has to be here because world/New() uses [station_name()], which looks this datum up
/datum/controller/subsystem/mapping/PreInit()
@@ -89,6 +91,13 @@ SUBSYSTEM_DEF(mapping)
ghostteleportlocs = sortAssoc(ghostteleportlocs)
+ // Now we make a list of areas that exist on the station. Good for if you don't want to select areas that exist for one station but not others. Directly references
+ existing_station_areas = list()
+ for(var/area/AR in world)
+ var/turf/picked = safepick(get_area_turfs(AR.type))
+ if(picked && is_station_level(picked.z))
+ existing_station_areas += AR
+
// World name
if(GLOB.configuration.general.server_name)
world.name = "[GLOB.configuration.general.server_name]: [station_name()]"
diff --git a/code/controllers/subsystem/metrics.dm b/code/controllers/subsystem/metrics.dm
index 7ebaadfae77..181f24cfb08 100644
--- a/code/controllers/subsystem/metrics.dm
+++ b/code/controllers/subsystem/metrics.dm
@@ -23,11 +23,12 @@ SUBSYSTEM_DEF(metrics)
var/list/out = list()
out["@timestamp"] = time_stamp() // This is required by ElasticSearch, complete with this name. DO NOT REMOVE THIS.
out["cpu"] = world.cpu
- // out["maptick"] = world.map_cpu // TODO: 514
+ out["maptick"] = world.map_cpu
out["elapsed_processed"] = world.time
out["elapsed_real"] = (REALTIMEOFDAY - world_init_time)
out["client_count"] = length(GLOB.clients)
out["round_id"] = text2num(GLOB.round_id) // This is so we can filter the metrics by a single round ID
+ out["server_id"] = GLOB.configuration.system.instance_id // And this is so we can filter by instance ID
// Funnel in all SS metrics
var/list/ss_data = list()
diff --git a/code/controllers/subsystem/statistics.dm b/code/controllers/subsystem/statistics.dm
index 63c20742904..01ebaf215f7 100644
--- a/code/controllers/subsystem/statistics.dm
+++ b/code/controllers/subsystem/statistics.dm
@@ -18,10 +18,11 @@ SUBSYSTEM_DEF(statistics)
return
else
var/datum/db_query/statquery = SSdbcore.NewQuery(
- "INSERT INTO legacy_population (playercount, admincount, time) VALUES (:playercount, :admincount, NOW())",
+ "INSERT INTO legacy_population (playercount, admincount, time, server_id) VALUES (:playercount, :admincount, NOW(), :server_id)",
list(
"playercount" = length(GLOB.clients),
- "admincount" = length(GLOB.admins)
+ "admincount" = length(GLOB.admins),
+ "server_id" = GLOB.configuration.system.instance_id
)
)
statquery.warn_execute()
diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm
index 14a952cb36f..5bb1d0eb69f 100644
--- a/code/controllers/subsystem/ticker.dm
+++ b/code/controllers/subsystem/ticker.dm
@@ -287,7 +287,7 @@ SUBSYSTEM_DEF(ticker)
else
log_debug("Playercount: [playercount] versus trigger: [highpop_trigger] - keeping standard job config")
- SSnightshift.check_nightshift()
+ SSnightshift.check_nightshift(TRUE)
#ifdef UNIT_TESTS
RunUnitTests()
@@ -408,12 +408,65 @@ SUBSYSTEM_DEF(ticker)
if(player.mind.assigned_role != player.mind.special_role)
SSjobs.AssignRank(player, player.mind.assigned_role, FALSE)
SSjobs.EquipRank(player, player.mind.assigned_role, FALSE)
- EquipCustomItems(player)
+ equip_cuis(player)
+
if(captainless)
for(var/mob/M in GLOB.player_list)
if(!isnewplayer(M))
to_chat(M, "Captainship not forced on anyone.")
+/datum/controller/subsystem/ticker/proc/equip_cuis(mob/living/carbon/human/H)
+ if(!H.client)
+ return // If they are spawning without a client (somehow), they *cant* have a CUI list
+ for(var/datum/custom_user_item/cui in H.client.cui_entries)
+ // Skip items with invalid character names
+ if((cui.characer_name != H.real_name) && !cui.all_characters_allowed)
+ continue
+
+ var/ok = FALSE
+
+ if(!cui.all_jobs_allowed)
+ var/alt_blocked = FALSE
+ if(H.mind.role_alt_title)
+ if(!(H.mind.role_alt_title in cui.allowed_jobs))
+ alt_blocked = TRUE
+ if(!(H.mind.assigned_role in cui.allowed_jobs) || alt_blocked)
+ continue
+
+ var/obj/item/I = new cui.object_typepath()
+ var/name_override = cui.item_name_override
+ var/desc_override = cui.item_desc_override
+
+ if(name_override)
+ I.name = name_override
+ if(desc_override)
+ I.desc = desc_override
+
+ if(istype(H.back, /obj/item/storage)) // Try to place it in something on the mob's back
+ var/obj/item/storage/S = H.back
+ if(length(S.contents) < S.storage_slots)
+ I.forceMove(H.back)
+ ok = TRUE
+ to_chat(H, "Your [I.name] has been added to your [H.back.name].")
+
+ if(!ok)
+ for(var/obj/item/storage/S in H.contents) // Try to place it in any item that can store stuff, on the mob.
+ if(length(S.contents) < S.storage_slots)
+ I.forceMove(S)
+ ok = TRUE
+ to_chat(H, "Your [I.name] has been added to your [S.name].")
+ break
+
+ if(!ok) // Finally, since everything else failed, place it on the ground
+ var/turf/T = get_turf(H)
+ if(T)
+ I.forceMove(T)
+ to_chat(H, "Your [I.name] is on the [T.name] below you.")
+ else
+ to_chat(H, "Your [I.name] couldnt spawn anywhere on you or even on the floor below you. Please file a bug report.")
+ qdel(I)
+
+
/datum/controller/subsystem/ticker/proc/send_tip_of_the_round()
var/m
if(selected_tip)
diff --git a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm
index 579a6b7c07c..a93d7e443c8 100644
--- a/code/controllers/subsystem/vote.dm
+++ b/code/controllers/subsystem/vote.dm
@@ -209,7 +209,7 @@ SUBSYSTEM_DEF(vote)
/datum/controller/subsystem/vote/proc/initiate_vote(vote_type, initiator_key, code_invoked = FALSE)
if(!mode)
- if(started_time != null && !check_rights(R_ADMIN))
+ if(usr && started_time != null && !check_rights(R_ADMIN)) // Allow the game to call votes whenever. But check other callers
var/next_allowed_time = (started_time + GLOB.configuration.vote.vote_delay)
if(next_allowed_time > world.time)
return 0
@@ -266,8 +266,12 @@ SUBSYSTEM_DEF(vote)
Click here or type vote to place your vote.
You have [GLOB.configuration.vote.vote_time / 10] seconds to vote."})
switch(vote_type)
- if("crew transfer", "gamemode", "custom", "map")
+ if("crew transfer", "gamemode", "custom")
SEND_SOUND(world, sound('sound/ambience/alarm4.ogg'))
+ if("map")
+ SEND_SOUND(world, sound('sound/ambience/alarm4.ogg'))
+ for(var/mob/M in GLOB.player_list)
+ M.throw_alert("Map Vote", /obj/screen/alert/notify_mapvote, timeout_override = GLOB.configuration.vote.vote_time)
if(mode == "gamemode" && SSticker.ticker_going)
SSticker.ticker_going = FALSE
to_chat(world, "Round start has been delayed.")
diff --git a/code/datums/action.dm b/code/datums/action.dm
index be7f82494f9..4ba27fb037d 100644
--- a/code/datums/action.dm
+++ b/code/datums/action.dm
@@ -423,6 +423,13 @@
/datum/action/item_action/remove_badge
name = "Remove Holobadge"
+
+// Clown Acrobat Shoes
+/datum/action/item_action/slipping
+ name = "Tactical Slip"
+ desc = "Activates the clown shoes' ankle-stimulating module, allowing the user to do a short slip forward going under anyone."
+ button_icon_state = "clown"
+
// Jump boots
/datum/action/item_action/bhop
name = "Activate Jump Boots"
diff --git a/code/datums/armor.dm b/code/datums/armor.dm
index 0de7dde1ee7..e764d3384de 100644
--- a/code/datums/armor.dm
+++ b/code/datums/armor.dm
@@ -52,7 +52,7 @@
return vars[rating]
/datum/armor/proc/getList()
- return list("melee" = melee, "bullet" = bullet, "laser" = laser, "energy" = energy, "bomb" = bomb, "bio" = bio, "rad" = rad, "fire" = fire, "acid" = acid, "magic" = magic)
+ return list(MELEE = melee, BULLET = bullet, LASER = laser, ENERGY = energy, BOMB = bomb, BIO = bio, RAD = rad, FIRE = fire, ACID = acid, MAGIC = magic)
/datum/armor/proc/attachArmor(datum/armor/AA)
return getArmor(melee + AA.melee, bullet + AA.bullet, laser + AA.laser, energy + AA.energy, bomb + AA.bomb, bio + AA.bio, rad + AA.rad, fire + AA.fire, acid + AA.acid, magic + AA.magic)
diff --git a/code/datums/cache/crew.dm b/code/datums/cache/crew.dm
index 8eba4030d4a..f2f5bf7a770 100644
--- a/code/datums/cache/crew.dm
+++ b/code/datums/cache/crew.dm
@@ -57,7 +57,7 @@ GLOBAL_DATUM_INIT(crew_repository, /datum/repository/crew, new())
if(C.sensor_mode >= SUIT_SENSOR_TRACKING)
var/area/A = get_area(H)
- crewmemberData["area"] = sanitize(A.name)
+ crewmemberData["area"] = sanitize_simple(A.name)
crewmemberData["x"] = pos.x
crewmemberData["y"] = pos.y
diff --git a/code/datums/components/material_container.dm b/code/datums/components/material_container.dm
index f4b8e84204f..2ea582aab62 100644
--- a/code/datums/components/material_container.dm
+++ b/code/datums/components/material_container.dm
@@ -49,6 +49,10 @@
var/mat_path = possible_mats[id]
materials[id] = new mat_path()
+/datum/component/material_container/Destroy(force, silent)
+ QDEL_LIST_ASSOC_VAL(materials)
+ return ..()
+
/datum/component/material_container/proc/OnExamine(datum/source, mob/user, list/examine_list)
if(show_on_examine)
for(var/I in materials)
diff --git a/code/datums/custom_user_item.dm b/code/datums/custom_user_item.dm
new file mode 100644
index 00000000000..9680a990488
--- /dev/null
+++ b/code/datums/custom_user_item.dm
@@ -0,0 +1,66 @@
+/**
+ * # Custom User Item
+ *
+ * Holder for CUIs
+ *
+ * This datum is a holder that is essentially a "model" of the `customuseritems`
+ * database table, and is used for giving people their CUIs on spawn.
+ * It is instanced as part of the client data loading framework on the client.
+ *
+ */
+/datum/custom_user_item
+ /// Can this be used on all characters?
+ var/all_characters_allowed = FALSE
+ /// Name of the character that can have this item.
+ var/characer_name
+ /// Are all jobs allowed?
+ var/all_jobs_allowed = FALSE
+ /// List of allowed jobs
+ var/list/allowed_jobs = list()
+ /// Custom item typepath
+ var/object_typepath
+ /// Custom item name override
+ var/item_name_override
+ /// Custom item description override
+ var/item_desc_override
+ /// Raw job mask
+ var/raw_job_mask
+
+
+/**
+ * CUI Info Parser
+ *
+ * Parses all the raw info into usable stuff, and also does validity checks
+ * Returns TRUE if its a valid item, and FALSE if not
+ *
+ * Arguments:
+ * * owning_ckey - Player who owns this item. Used for logging purposes.
+ */
+/datum/custom_user_item/proc/parse_info(owning_ckey)
+ . = FALSE // Setting this here means it will return false even if it runtimes
+
+ // Sort path
+ if(!object_typepath || !ispath(object_typepath))
+ stack_trace("Incorrect database entry found in table 'customuseritems' path value is [object_typepath ? object_typepath : "(NULL)"], which doesnt exist. Ask the host to look at CUI entries for [owning_ckey]")
+ return
+
+ // Sort job mask
+ if(raw_job_mask == "*")
+ all_jobs_allowed = TRUE
+ else
+ var/list/local_allowed_jobs = splittext(raw_job_mask, ",")
+ for(var/i in 1 to length(local_allowed_jobs))
+ if(istext(local_allowed_jobs[i]))
+ local_allowed_jobs[i] = trim(local_allowed_jobs[i])
+
+ allowed_jobs = local_allowed_jobs
+
+ // Sort character name
+ if(characer_name == "*")
+ all_characters_allowed = TRUE
+
+ return TRUE
+
+
+/datum/custom_user_item/vv_edit_var(var_name, var_value)
+ return FALSE // fuck off
diff --git a/code/datums/datacore.dm b/code/datums/datacore.dm
index 87aabb95445..7104deef923 100644
--- a/code/datums/datacore.dm
+++ b/code/datums/datacore.dm
@@ -461,10 +461,6 @@ GLOBAL_VAR_INIT(record_id_num, 1001)
clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "detective_s")
clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "brown"), ICON_UNDERLAY)
clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "detective"), ICON_OVERLAY)
- if("Security Pod Pilot")
- clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "secred_s")
- clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "jackboots"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "bomber"), ICON_OVERLAY)
if("Brig Physician")
clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "medical_s")
clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "white"), ICON_UNDERLAY)
@@ -484,10 +480,6 @@ GLOBAL_VAR_INIT(record_id_num, 1001)
clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "atmos_s")
clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY)
clothes_s.Blend(new /icon('icons/mob/clothing/belt.dmi', "utility"), ICON_OVERLAY)
- if("Mechanic")
- clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "mechanic_s")
- clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "orange"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/clothing/belt.dmi', "utility"), ICON_OVERLAY)
if("Roboticist")
clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "robotics_s")
clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY)
diff --git a/code/datums/datumvars.dm b/code/datums/datumvars.dm
index 75f03f3c3d8..2cd1efbc009 100644
--- a/code/datums/datumvars.dm
+++ b/code/datums/datumvars.dm
@@ -893,10 +893,10 @@
if(!result || !A)
return TRUE
- A.armor = A.armor.setRating(armorlist["melee"], armorlist["bullet"], armorlist["laser"], armorlist["energy"], armorlist["bomb"], armorlist["bio"], armorlist["rad"], armorlist["fire"], armorlist["acid"], armorlist["magic"])
+ A.armor = A.armor.setRating(armorlist[MELEE], armorlist[BULLET], armorlist[LASER], armorlist[ENERGY], armorlist[BOMB], armorlist[BIO], armorlist[RAD], armorlist[FIRE], armorlist[ACID], armorlist[MAGIC])
- log_admin("[key_name(usr)] modified the armor on [A] to: melee = [armorlist["melee"]], bullet = [armorlist["bullet"]], laser = [armorlist["laser"]], energy = [armorlist["energy"]], bomb = [armorlist["bomb"]], bio = [armorlist["bio"]], rad = [armorlist["rad"]], fire = [armorlist["fire"]], acid = [armorlist["acid"]], magic = [armorlist["magic"]]")
- message_admins("[key_name(usr)] modified the armor on [A] to: melee = [armorlist["melee"]], bullet = [armorlist["bullet"]], laser = [armorlist["laser"]], energy = [armorlist["energy"]], bomb = [armorlist["bomb"]], bio = [armorlist["bio"]], rad = [armorlist["rad"]], fire = [armorlist["fire"]], acid = [armorlist["acid"]], magic = [armorlist["magic"]]")
+ log_admin("[key_name(usr)] modified the armor on [A] to: melee = [armorlist[MELEE]], bullet = [armorlist[BULLET]], laser = [armorlist[LASER]], energy = [armorlist[ENERGY]], bomb = [armorlist[BOMB]], bio = [armorlist[BIO]], rad = [armorlist[RAD]], fire = [armorlist[FIRE]], acid = [armorlist[ACID]], magic = [armorlist[MAGIC]]")
+ message_admins("[key_name(usr)] modified the armor on [A] to: melee = [armorlist[MELEE]], bullet = [armorlist[BULLET]], laser = [armorlist[LASER]], energy = [armorlist[ENERGY]], bomb = [armorlist[BOMB]], bio = [armorlist[BIO]], rad = [armorlist[RAD]], fire = [armorlist[FIRE]], acid = [armorlist[ACID]], magic = [armorlist[MAGIC]]")
return TRUE
else if(href_list["addreagent"]) /* Made on /TG/, credit to them. */
diff --git a/code/datums/diseases/transformation.dm b/code/datums/diseases/transformation.dm
index 4098e15e2af..29efffd6bdf 100644
--- a/code/datums/diseases/transformation.dm
+++ b/code/datums/diseases/transformation.dm
@@ -17,6 +17,7 @@
var/list/stage5 = list("Oh the humanity!")
var/transformation_text = null
var/new_form = /mob/living/carbon/human
+ var/job_role = null
/datum/disease/transformation/stage_act()
..()
@@ -40,8 +41,8 @@
if(istype(affected_mob, /mob/living/carbon) && affected_mob.stat != DEAD)
if(stage5)
to_chat(affected_mob, pick(stage5))
- if(jobban_isbanned(affected_mob, new_form))
- affected_mob.death(1)
+ if(jobban_isbanned(affected_mob, job_role))
+ affected_mob.death()
return
if(affected_mob.notransform)
return
@@ -133,6 +134,7 @@
stage4 = list("Your skin feels very loose.", "You can feel... something...inside you.")
stage5 = list("Your skin feels as if it's about to burst off!")
new_form = /mob/living/silicon/robot
+ job_role = "Cyborg"
/datum/disease/transformation/robot/stage_act()
@@ -165,6 +167,7 @@
stage4 = list("Your skin feels very tight.", "Your blood boils!", "You can feel... something...inside you.")
stage5 = list("Your skin feels as if it's about to burst off!")
new_form = /mob/living/carbon/alien/humanoid/hunter
+ job_role = ROLE_ALIEN
/datum/disease/transformation/xeno/stage_act()
..()
@@ -248,3 +251,4 @@
stage5 = list("You have become a morph.")
transformation_text = "This transformation does NOT make you an antagonist if you were not one already. If you were not an antagonist, you should not eat any steal objectives or the contents of the armory."
new_form = /mob/living/simple_animal/hostile/morph
+ job_role = ROLE_MORPH
diff --git a/code/datums/helper_datums/construction_datum.dm b/code/datums/helper_datums/construction_datum.dm
index 7c05f7806f9..6695297337d 100644
--- a/code/datums/helper_datums/construction_datum.dm
+++ b/code/datums/helper_datums/construction_datum.dm
@@ -6,6 +6,7 @@
var/list/steps
var/atom/holder
var/result
+ var/index
var/list/steps_desc
var/taskpath = null // Path of job objective completed.
@@ -128,7 +129,6 @@
return TRUE
/datum/construction/reversible
- var/index
/datum/construction/reversible/New(atom)
..()
@@ -168,7 +168,6 @@
#define state_prev "prev"
/datum/construction/reversible2
- var/index
var/base_icon = "durand"
/datum/construction/reversible2/New(atom)
diff --git a/code/datums/http.dm b/code/datums/http.dm
index e7ba1620854..6679b859c65 100644
--- a/code/datums/http.dm
+++ b/code/datums/http.dm
@@ -19,6 +19,8 @@
var/headers
/// URL that the request is being sent to
var/url
+ /// If present, response body will be saved to this file.
+ var/output_file
/// The raw response, which will be decoeded into a [/datum/http_response]
var/_raw_response
/// Callback for executing after async requests. Will be called with an argument of [/datum/http_response] as first argument
@@ -42,7 +44,7 @@ THE METHODS IN THIS FILE ARE TO BE USED BY THE SUBSYSTEM AS A MANGEMENT HUB
* * _body - The body of the request, if applicable
* * _headers - Associative list of HTTP headers to send, if applicab;e
*/
-/datum/http_request/proc/prepare(_method, _url, _body = "", list/_headers)
+/datum/http_request/proc/prepare(_method, _url, _body = "", list/_headers, _output_file)
if(!length(_headers))
headers = ""
else
@@ -51,6 +53,7 @@ THE METHODS IN THIS FILE ARE TO BE USED BY THE SUBSYSTEM AS A MANGEMENT HUB
method = _method
url = _url
body = _body
+ output_file = _output_file
/**
* Blocking executor
@@ -60,7 +63,7 @@ THE METHODS IN THIS FILE ARE TO BE USED BY THE SUBSYSTEM AS A MANGEMENT HUB
*/
/datum/http_request/proc/execute_blocking()
CRASH("Attempted to execute a blocking HTTP request")
- // _raw_response = rustg_http_request_blocking(method, url, body, headers)
+ // _raw_response = rustg_http_request_blocking(method, url, body, headers, build_options())
/**
* Async execution starter
@@ -73,7 +76,7 @@ THE METHODS IN THIS FILE ARE TO BE USED BY THE SUBSYSTEM AS A MANGEMENT HUB
if(in_progress)
CRASH("Attempted to re-use a request object.")
- id = rustg_http_request_async(method, url, body, headers)
+ id = rustg_http_request_async(method, url, body, headers, build_options())
if(isnull(text2num(id)))
_raw_response = "Proc error: [id]"
@@ -81,6 +84,16 @@ THE METHODS IN THIS FILE ARE TO BE USED BY THE SUBSYSTEM AS A MANGEMENT HUB
else
in_progress = TRUE
+/**
+ * Options builder
+ *
+ * Builds options for if we want to download files with SShttp
+ */
+/datum/http_request/proc/build_options()
+ if(output_file)
+ return json_encode(list("output_filename" = output_file, "body_filename" = null))
+ return null
+
/**
* Async completion checker
*
diff --git a/code/datums/hud.dm b/code/datums/hud.dm
index 60fbb9c8194..9eeda5fd9f2 100644
--- a/code/datums/hud.dm
+++ b/code/datums/hud.dm
@@ -2,28 +2,28 @@
GLOBAL_LIST_EMPTY(all_huds)
///GLOBAL HUD LIST
-GLOBAL_LIST_INIT(huds, list( \
- DATA_HUD_SECURITY_BASIC = new/datum/atom_hud/data/human/security/basic(), \
- DATA_HUD_SECURITY_ADVANCED = new/datum/atom_hud/data/human/security/advanced(), \
- DATA_HUD_MEDICAL_BASIC = new/datum/atom_hud/data/human/medical/basic(), \
- DATA_HUD_MEDICAL_ADVANCED = new/datum/atom_hud/data/human/medical/advanced(), \
- DATA_HUD_DIAGNOSTIC = new/datum/atom_hud/data/diagnostic(), \
- DATA_HUD_DIAGNOSTIC_ADVANCED = new/datum/atom_hud/data/diagnostic/advanced(), \
- DATA_HUD_HYDROPONIC = new/datum/atom_hud/data/hydroponic(), \
- ANTAG_HUD_CULT = new/datum/atom_hud/antag(), \
- ANTAG_HUD_REV = new/datum/atom_hud/antag(), \
- ANTAG_HUD_OPS = new/datum/atom_hud/antag(), \
- ANTAG_HUD_WIZ = new/datum/atom_hud/antag(), \
- ANTAG_HUD_SHADOW = new/datum/atom_hud/antag(), \
- ANTAG_HUD_TRAITOR = new/datum/atom_hud/antag/hidden(),\
- ANTAG_HUD_NINJA = new/datum/atom_hud/antag/hidden(),\
- ANTAG_HUD_CHANGELING = new/datum/atom_hud/antag/hidden(),\
- 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_EVENTMISC = new/datum/atom_hud/antag/hidden(),\
- ANTAG_HUD_BLOB = new/datum/atom_hud/antag/hidden()\
-))
+GLOBAL_LIST_INIT(huds, list(
+ DATA_HUD_SECURITY_BASIC = new/datum/atom_hud/data/human/security/basic(),
+ DATA_HUD_SECURITY_ADVANCED = new/datum/atom_hud/data/human/security/advanced(),
+ DATA_HUD_MEDICAL_BASIC = new/datum/atom_hud/data/human/medical/basic(),
+ DATA_HUD_MEDICAL_ADVANCED = new/datum/atom_hud/data/human/medical/advanced(),
+ DATA_HUD_DIAGNOSTIC_BASIC = new/datum/atom_hud/data/diagnostic/basic(),
+ DATA_HUD_DIAGNOSTIC_ADVANCED = new/datum/atom_hud/data/diagnostic/advanced(),
+ DATA_HUD_HYDROPONIC = new/datum/atom_hud/data/hydroponic(),
+ ANTAG_HUD_CULT = new/datum/atom_hud/antag(),
+ ANTAG_HUD_REV = new/datum/atom_hud/antag(),
+ ANTAG_HUD_OPS = new/datum/atom_hud/antag(),
+ ANTAG_HUD_WIZ = new/datum/atom_hud/antag(),
+ ANTAG_HUD_SHADOW = new/datum/atom_hud/antag(),
+ ANTAG_HUD_TRAITOR = new/datum/atom_hud/antag/hidden(),
+ ANTAG_HUD_NINJA = new/datum/atom_hud/antag/hidden(),
+ ANTAG_HUD_CHANGELING = new/datum/atom_hud/antag/hidden(),
+ 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_EVENTMISC = new/datum/atom_hud/antag/hidden(),
+ ANTAG_HUD_BLOB = new/datum/atom_hud/antag/hidden()
+ ))
/datum/atom_hud
var/list/atom/hudatoms = list() //list of all atoms which display this hud
diff --git a/code/datums/mind.dm b/code/datums/mind.dm
index 29a1b29de97..62dabccc88b 100644
--- a/code/datums/mind.dm
+++ b/code/datums/mind.dm
@@ -85,6 +85,10 @@
original = null
return ..()
+/datum/mind/proc/get_display_key()
+ var/clientKey = current?.client?.get_display_key()
+ return clientKey ? clientKey : key
+
/datum/mind/proc/transfer_to(mob/living/new_character)
var/datum/atom_hud/antag/hud_to_transfer = antag_hud //we need this because leave_hud() will clear this list
var/mob/living/old_current = current
diff --git a/code/datums/progressbar.dm b/code/datums/progressbar.dm
index 4a812b40e4e..3efc5b1e094 100644
--- a/code/datums/progressbar.dm
+++ b/code/datums/progressbar.dm
@@ -14,9 +14,9 @@
EXCEPTION("Invalid target given")
if(goal_number)
goal = goal_number
- bar = image('icons/effects/progessbar.dmi', target, "prog_bar_0", HUD_LAYER)
+ bar = image('icons/effects/progessbar.dmi', target, "prog_bar_0", ABOVE_HUD_LAYER)
bar.alpha = 0
- bar.plane = HUD_PLANE
+ bar.plane = ABOVE_HUD_PLANE
bar.appearance_flags = APPEARANCE_UI_IGNORE_ALPHA
user = User
if(user)
diff --git a/code/datums/spells/ethereal_jaunt.dm b/code/datums/spells/ethereal_jaunt.dm
index 4c7c6b76b36..972b050007c 100644
--- a/code/datums/spells/ethereal_jaunt.dm
+++ b/code/datums/spells/ethereal_jaunt.dm
@@ -55,12 +55,17 @@
sleep(jaunt_in_time)
qdel(holder)
if(!QDELETED(target))
- if(mobloc.density)
+ if(!(target.Move(mobloc)))
for(var/turf/T in orange(7))
- if(T)
- if(target.Move(T))
- break
- target.canmove = 1
+ if(isspaceturf(T))
+ continue
+ if(T && target.Move(T))
+ target.canmove = TRUE
+ return
+ for(var/turf/space/S in orange(7)) //loop for space turfs in case there were no normal ones last loop
+ if(S && target.Move(S))
+ break
+ target.canmove = TRUE //if there are no valid tiles in a range of 7, just let them spawn wherever they are currently
/obj/effect/proc_holder/spell/targeted/ethereal_jaunt/proc/jaunt_steam(mobloc)
var/datum/effect_system/steam_spread/steam = new /datum/effect_system/steam_spread()
diff --git a/code/datums/spells/horsemask.dm b/code/datums/spells/horsemask.dm
index d5f686fb763..f22689067d8 100644
--- a/code/datums/spells/horsemask.dm
+++ b/code/datums/spells/horsemask.dm
@@ -30,7 +30,7 @@
var/obj/item/clothing/mask/horsehead/magichead = new /obj/item/clothing/mask/horsehead
magichead.flags |= NODROP | DROPDEL //curses!
magichead.flags_inv = null //so you can still see their face
- magichead.voicechange = 1 //NEEEEIIGHH
+ magichead.voicechange = TRUE //NEEEEIIGHH
target.visible_message( "[target]'s face lights up in fire, and after the event a horse's head takes its place!", \
"Your face burns up, and shortly after the fire you realise you have the face of a horse!")
if(!target.unEquip(target.wear_mask))
diff --git a/code/datums/spells/shapeshift.dm b/code/datums/spells/shapeshift.dm
index 1095457278f..41bf7f299d6 100644
--- a/code/datums/spells/shapeshift.dm
+++ b/code/datums/spells/shapeshift.dm
@@ -96,10 +96,10 @@
invocation_type = "none"
action_icon_state = "vampire_bats"
- shapeshift_type = /mob/living/simple_animal/hostile/scarybat/batswarm
- current_shapes = list(/mob/living/simple_animal/hostile/scarybat/batswarm)
+ shapeshift_type = /mob/living/simple_animal/hostile/scarybat/adminvampire
+ current_shapes = list(/mob/living/simple_animal/hostile/scarybat/adminvampire)
current_casters = list()
- possible_shapes = list(/mob/living/simple_animal/hostile/scarybat/batswarm)
+ possible_shapes = list(/mob/living/simple_animal/hostile/scarybat/adminvampire)
/obj/effect/proc_holder/spell/targeted/shapeshift/hellhound
name = "Lesser Hellhound Form"
diff --git a/code/datums/status_effects/buffs.dm b/code/datums/status_effects/buffs.dm
index 0494e14d647..54735988b9c 100644
--- a/code/datums/status_effects/buffs.dm
+++ b/code/datums/status_effects/buffs.dm
@@ -1,5 +1,58 @@
//Largely beneficial effects go here, even if they have drawbacks. An example is provided in Shadow Mend.
+/datum/status_effect/his_grace
+ id = "his_grace"
+ duration = -1
+ tick_interval = 4
+ alert_type = /obj/screen/alert/status_effect/his_grace
+ var/bloodlust = 0
+
+/obj/screen/alert/status_effect/his_grace
+ name = "His Grace"
+ desc = "His Grace hungers, and you must feed Him."
+ icon_state = "his_grace"
+ alerttooltipstyle = "hisgrace"
+
+/obj/screen/alert/status_effect/his_grace/MouseEntered(location, control, params)
+ desc = initial(desc)
+ var/datum/status_effect/his_grace/HG = attached_effect
+ desc += "
Current Bloodthirst: [HG.bloodlust]\
+
Becomes undroppable at [HIS_GRACE_FAMISHED]\
+
Will consume you at [HIS_GRACE_CONSUME_OWNER]"
+ ..()
+
+/datum/status_effect/his_grace/on_apply()
+ add_attack_logs(owner, owner, "gained His Grace's stun immunity", ATKLOG_ALL)
+ owner.add_stun_absorption("hisgrace", INFINITY, 3, null, "His Grace protects you from the stun!")
+ return ..()
+
+/datum/status_effect/his_grace/tick()
+ bloodlust = 0
+ var/graces = 0
+ var/list/held_items = list()
+ held_items += owner.l_hand
+ held_items += owner.r_hand
+ for(var/obj/item/his_grace/HG in held_items)
+ if(HG.bloodthirst > bloodlust)
+ bloodlust = HG.bloodthirst
+ if(HG.awakened)
+ graces++
+ if(!graces)
+ owner.apply_status_effect(STATUS_EFFECT_HISWRATH)
+ qdel(src)
+ return
+ var/grace_heal = bloodlust * 0.05
+ owner.adjustBruteLoss(-grace_heal)
+ owner.adjustFireLoss(-grace_heal)
+ owner.adjustToxLoss(-grace_heal)
+ owner.adjustOxyLoss(-(grace_heal * 2))
+ owner.adjustCloneLoss(-grace_heal)
+
+/datum/status_effect/his_grace/on_remove()
+ add_attack_logs(owner, owner, "lost His Grace's stun immunity", ATKLOG_ALL)
+ if(islist(owner.stun_absorption) && owner.stun_absorption["hisgrace"])
+ owner.stun_absorption -= "hisgrace"
+
/datum/status_effect/shadow_mend
id = "shadow_mend"
duration = 30
diff --git a/code/datums/status_effects/debuffs.dm b/code/datums/status_effects/debuffs.dm
index d8b5e4d9cbe..498bb042497 100644
--- a/code/datums/status_effects/debuffs.dm
+++ b/code/datums/status_effects/debuffs.dm
@@ -1,5 +1,28 @@
//OTHER DEBUFFS
+/datum/status_effect/his_wrath //does minor damage over time unless holding His Grace
+ id = "his_wrath"
+ duration = -1
+ tick_interval = 4
+ alert_type = /obj/screen/alert/status_effect/his_wrath
+
+/obj/screen/alert/status_effect/his_wrath
+ name = "His Wrath"
+ desc = "You fled from His Grace instead of feeding Him, and now you suffer."
+ icon_state = "his_grace"
+ alerttooltipstyle = "hisgrace"
+
+/datum/status_effect/his_wrath/tick()
+ var/list/held_items = list()
+ held_items += owner.l_hand
+ held_items += owner.r_hand
+ for(var/obj/item/his_grace/HG in held_items)
+ qdel(src)
+ return
+ owner.adjustBruteLoss(0.1)
+ owner.adjustFireLoss(0.1)
+ owner.adjustToxLoss(0.2)
+
/datum/status_effect/cultghost //is a cult ghost and can't use manifest runes
id = "cult_ghost"
duration = -1
diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm
index 163dd8ca170..2070e6558cd 100644
--- a/code/datums/supplypacks.dm
+++ b/code/datums/supplypacks.dm
@@ -193,14 +193,6 @@ GLOBAL_LIST_INIT(all_supply_groups, list(SUPPLY_EMERGENCY,SUPPLY_SECURITY,SUPPLY
containername = "special ops crate"
hidden = 1
-/datum/supply_packs/emergency/syndicate
- name = "ERROR_NULL_ENTRY"
- contains = list(/obj/item/storage/box/syndicate)
- cost = 140
- containertype = /obj/structure/closet/crate
- containername = "crate"
- hidden = 1
-
//////////////////////////////////////////////////////////////////////////////
//////////////////////////// Security ////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
@@ -228,6 +220,13 @@ GLOBAL_LIST_INIT(all_supply_groups, list(SUPPLY_EMERGENCY,SUPPLY_SECURITY,SUPPLY
contains = list(/obj/item/vending_refill/security)
containername = "SecTech supply crate"
+/datum/supply_packs/security/vending/clothingvendor
+ name = "Security Clothing Vendors Crate"
+ cost = 40
+ contains = list(/obj/item/vending_refill/secdrobe,
+ /obj/item/vending_refill/detdrobe)
+ containername = "security clothing vendor crate"
+
////// Armor: Basic
/datum/supply_packs/security/helmets
@@ -405,28 +404,6 @@ GLOBAL_LIST_INIT(all_supply_groups, list(SUPPLY_EMERGENCY,SUPPLY_SECURITY,SUPPLY
cost = 80
containername = "combat shotgun crate"
-/datum/supply_packs/security/armory/buckshotammo
- name = "Buckshot Ammo Crate"
- contains = list(/obj/item/ammo_box/shotgun/buck,
- /obj/item/storage/box/buck,
- /obj/item/storage/box/buck,
- /obj/item/storage/box/buck,
- /obj/item/storage/box/buck,
- /obj/item/storage/box/buck)
- cost = 45
- containername = "buckshot ammo crate"
-
-/datum/supply_packs/security/armory/slugammo
- name = "Slug Ammo Crate"
- contains = list(/obj/item/ammo_box/shotgun,
- /obj/item/storage/box/slug,
- /obj/item/storage/box/slug,
- /obj/item/storage/box/slug,
- /obj/item/storage/box/slug,
- /obj/item/storage/box/slug)
- cost = 45
- containername = "slug ammo crate"
-
/datum/supply_packs/security/armory/expenergy
name = "Energy Guns Crate"
contains = list(/obj/item/gun/energy/gun,
@@ -578,6 +555,13 @@ GLOBAL_LIST_INIT(all_supply_groups, list(SUPPLY_EMERGENCY,SUPPLY_SECURITY,SUPPLY
/obj/item/vending_refill/youtool)
containername = "engineering supply crate"
+/datum/supply_packs/engineering/vending/clothingvendor
+ name = "Engineering Clothing Vendors Crate"
+ cost = 20
+ contains = list(/obj/item/vending_refill/engidrobe,
+ /obj/item/vending_refill/atmosdrobe)
+ containername = "engineering clothing vendor crate"
+
/datum/supply_packs/engineering/powergamermitts
name = "Insulated Gloves Crate"
contains = list(/obj/item/clothing/gloves/color/yellow,
@@ -896,6 +880,14 @@ GLOBAL_LIST_INIT(all_supply_groups, list(SUPPLY_EMERGENCY,SUPPLY_SECURITY,SUPPLY
/obj/item/vending_refill/wallmed)
containername = "medical vending crate"
+/datum/supply_packs/medical/vending/clothingvendor
+ name = "Medical Clothing Vendors Crate"
+ cost = 20
+ contains = list(/obj/item/vending_refill/medidrobe,
+ /obj/item/vending_refill/chemdrobe,
+ /obj/item/vending_refill/virodrobe)
+ containername = "medical clothing vendors crate"
+
/datum/supply_packs/medical/bloodpacks
name = "Blood Pack Variety Crate"
contains = list(/obj/item/reagent_containers/iv_bag,
@@ -1043,6 +1035,14 @@ GLOBAL_LIST_INIT(all_supply_groups, list(SUPPLY_EMERGENCY,SUPPLY_SECURITY,SUPPLY
containertype = /obj/structure/largecrate
containername = "oil tank crate"
+/datum/supply_packs/science/vending/clothingvendor
+ name = "Science Clothing Vendors Crate"
+ cost = 20
+ contains = list(/obj/item/vending_refill/scidrobe,
+ /obj/item/vending_refill/robodrobe,
+ /obj/item/vending_refill/genedrobe,)
+ containername = "science clothing vendor crate"
+
//////////////////////////////////////////////////////////////////////////////
//////////////////////////// Organic /////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
@@ -1462,6 +1462,12 @@ GLOBAL_LIST_INIT(all_supply_groups, list(SUPPLY_EMERGENCY,SUPPLY_SECURITY,SUPPLY
containertype = /obj/structure/closet/crate/secure
containername = "shaft miner starter kit"
+/datum/supply_packs/misc/carpet
+ name = "Carpet Crate"
+ cost = 20
+ contains = list(/obj/item/stack/tile/carpet/twenty)
+ containername = "carpet crate"
+
///////////// Paper Work
@@ -1820,6 +1826,20 @@ GLOBAL_LIST_INIT(all_supply_groups, list(SUPPLY_EMERGENCY,SUPPLY_SECURITY,SUPPLY
cost = 15
containername = "boxing supply crate"
+/datum/supply_packs/misc/vending/clothingvendor
+ name = "Service Clothing Vendors Crate"
+ cost = 20
+ contains = list(/obj/item/vending_refill/bardrobe,
+ /obj/item/vending_refill/chefdrobe,
+ /obj/item/vending_refill/hydrodrobe)
+ containername = "service clothing vendor crate"
+
+/datum/supply_packs/misc/vending/clothingvendor/cargo
+ name = "Cargo Clothing Vendors Crate"
+ cost = 20
+ contains = list(/obj/item/vending_refill/cargodrobe)
+ containername = "cargo clothing vendor crate"
+
///////////// Station Goals
/datum/supply_packs/misc/station_goal
diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm
index aa1e74a911e..12e2f1f71e1 100644
--- a/code/datums/uplink_item.dm
+++ b/code/datums/uplink_item.dm
@@ -167,18 +167,19 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
//Clown
/datum/uplink_item/jobspecific/clowngrenade
name = "Banana Grenade"
- desc = "A grenade that explodes into HONK! brand banana peels that are genetically modified to be extra slippery and extrude caustic acid when stepped on"
+ desc = "A grenade that explodes into HONK! brand banana peels that are genetically modified to be extra slippery and extrude caustic acid when stepped on."
reference = "BG"
item = /obj/item/grenade/clown_grenade
cost = 5
job = list("Clown")
-/datum/uplink_item/jobspecific/clownmagboots
- name = "Clown Magboots"
- desc = "A pair of modified clown shoes fitted with an advanced magnetic traction system. Look and sound exactly like regular clown shoes unless closely inspected."
- reference = "CM"
- item = /obj/item/clothing/shoes/magboots/clown
+/datum/uplink_item/jobspecific/clownslippers
+ name = "Clown Acrobatic Shoes"
+ desc = "A pair of modified clown shoes fitted with a built-in propulsion system that allows the user to perform a short slip below anyone. Turning on the waddle dampeners removes the slowdown on the shoes."
+ reference = "CAS"
+ item = /obj/item/clothing/shoes/clown_shoes/slippers
cost = 3
+ surplus = 75
job = list("Clown")
/datum/uplink_item/jobspecific/trick_revolver
@@ -257,10 +258,13 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
job = list("Chaplain")
/datum/uplink_item/jobspecific/artistic_toolbox
- name = "Artistic Toolbox"
- desc = "An accursed toolbox that grants its followers extreme power at the cost of requiring repeated sacrifices to it. If sacrifices are not provided, it will turn on its follower."
- reference = "HGAT"
- item = /obj/item/storage/toolbox/green/memetic
+ name = "His Grace"
+ desc = "An incredibly dangerous weapon recovered from a station overcome by the grey tide. Once activated, He will thirst for blood and must be used to kill to sate that thirst. \
+ His Grace grants gradual regeneration and complete stun immunity to His wielder, but be wary: if He gets too hungry, He will become impossible to drop and eventually kill you if not fed. \
+ However, if left alone for long enough, He will fall back to slumber. \
+ To activate His Grace, simply unlatch Him."
+ reference = "HG"
+ item = /obj/item/his_grace
cost = 20
job = list("Chaplain")
surplus = 0 //No lucky chances from the crate; if you get this, this is ALL you're getting
@@ -1171,6 +1175,15 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
cost = 4
excludefrom = list(/datum/game_mode/nuclear)
+/datum/uplink_item/stealthy_tools/voice_modulator
+ name = "Chameleon Voice Modulator Mask"
+ desc = "A syndicate tactical mask equipped with chameleon technology and a sound modulator for disguising your voice. \
+ While the mask is active, your voice will sound unrecognizable to others"
+ reference = "CVMM"
+ item = /obj/item/clothing/mask/gas/voice_modulator/chameleon
+ cost = 1
+ excludefrom = list(/datum/game_mode/nuclear)
+
/datum/uplink_item/stealthy_tools/chameleon/nuke
reference = "NCHAM"
cost = 6
@@ -1524,7 +1537,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
/datum/uplink_item/implants/freedom
name = "Freedom Implant"
- desc = "An implant injected into the body and later activated manually to break out of any restraints. Can be activated up to 4 times."
+ desc = "An implant injected into the body and later activated manually to break out of any restraints or grabs. Can be activated up to 4 times."
reference = "FI"
item = /obj/item/implanter/freedom
cost = 5
diff --git a/code/datums/weather/weather_types/radiation_storm.dm b/code/datums/weather/weather_types/radiation_storm.dm
index 8eff5e412c7..eb46fe56bb2 100644
--- a/code/datums/weather/weather_types/radiation_storm.dm
+++ b/code/datums/weather/weather_types/radiation_storm.dm
@@ -32,7 +32,7 @@
/datum/weather/rad_storm/weather_act(mob/living/L)
- var/resist = L.getarmor(null, "rad")
+ var/resist = L.getarmor(null, RAD)
if(prob(40))
if(ishuman(L))
var/mob/living/carbon/human/H = L
diff --git a/code/defines/procs/announce.dm b/code/defines/procs/announce.dm
index e8d3abb7335..301ed685d46 100644
--- a/code/defines/procs/announce.dm
+++ b/code/defines/procs/announce.dm
@@ -44,12 +44,13 @@ GLOBAL_DATUM_INIT(event_announcement, /datum/announcement/priority/command/event
title = "Security Announcement"
announcement_type = "Security Announcement"
-/datum/announcement/proc/Announce(message as text, new_title = "", new_sound = null, do_newscast = newscast, msg_sanitized = 0, from, msg_language)
+/datum/announcement/proc/Announce(message as text, new_title = "", new_sound = null, do_newscast = newscast, msg_sanitized = 0, from, msg_language, new_sound2 = null)
if(!message)
return
var/message_title = new_title ? new_title : title
var/message_sound = new_sound ? sound(new_sound) : sound
+ var/message_sound2 = new_sound2 ? sound(new_sound2) : sound
if(!msg_sanitized)
message = trim_strip_html_properly(message, allow_lines = 1)
@@ -74,6 +75,7 @@ GLOBAL_DATUM_INIT(event_announcement, /datum/announcement/priority/command/event
NewsCast(message, message_title)
Sound(message_sound, combined_receivers[1] + combined_receivers[2])
+ Sound(message_sound2, combined_receivers[1] + combined_receivers[2])
Log(message, message_title)
/datum/announcement/proc/Get_Receivers(datum/language/message_language)
diff --git a/code/game/area/areas/depot-areas.dm b/code/game/area/areas/depot-areas.dm
index ec1ba64deec..eb5c0aaaeb9 100644
--- a/code/game/area/areas/depot-areas.dm
+++ b/code/game/area/areas/depot-areas.dm
@@ -147,13 +147,6 @@
detected_mech = TRUE
increase_alert("Hostile mecha detected: [E]")
-/area/syndicate_depot/core/proc/saw_pod(obj/spacepod/P)
- if(detected_pod)
- return
- detected_pod = TRUE
- if(!called_backup)
- increase_alert("Hostile spacepod detected: [P]")
-
/area/syndicate_depot/core/proc/saw_double_agent(mob/living/M)
if(detected_double_agent)
return
diff --git a/code/game/area/ss13_areas.dm b/code/game/area/ss13_areas.dm
index 3666ba2fdfc..5d887935865 100644
--- a/code/game/area/ss13_areas.dm
+++ b/code/game/area/ss13_areas.dm
@@ -1112,14 +1112,6 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
name = "\improper Chief Engineer's office"
icon_state = "engine_control"
-/area/engine/mechanic_workshop
- name = "\improper Mechanic Workshop"
- icon_state = "engine"
-
-/area/engine/mechanic_workshop/hanger
- name = "\improper Hanger Bay"
- icon_state = "engine"
-
/area/engine/supermatter
name = "\improper Supermatter Engine"
icon_state = "engine"
@@ -1488,10 +1480,6 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
name = "\improper Head of Security's Office"
icon_state = "sec_hos"
-/area/security/podbay
- name = "\improper Security Podbay"
- icon_state = "securitypodbay"
-
/area/security/detectives_office
name = "\improper Detective's Office"
icon_state = "detective"
@@ -1544,7 +1532,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
/area/security/vacantoffice2
name = "\improper Vacant Office"
icon_state = "security"
-
+
/area/security/permasolitary
name = "Solitary Confinement"
icon_state = "solitary"
diff --git a/code/game/atoms.dm b/code/game/atoms.dm
index d8dd3bb44c8..e815dd545ac 100644
--- a/code/game/atoms.dm
+++ b/code/game/atoms.dm
@@ -657,9 +657,6 @@
GLOBAL_LIST_EMPTY(blood_splatter_icons)
-/atom/proc/blood_splatter_index()
- return "\ref[initial(icon)]-[initial(icon_state)]"
-
//returns the mob's dna info as a list, to be inserted in an object's blood_DNA list
/mob/living/proc/get_blood_dna_list()
if(get_blood_id() != "blood")
@@ -726,56 +723,52 @@ GLOBAL_LIST_EMPTY(blood_splatter_icons)
return add_blood(blood_dna, bloodcolor)
//to add blood onto something, with blood dna info to include.
-/atom/proc/add_blood(list/blood_dna, color)
+/atom/proc/add_blood(list/blood_dna, b_color)
return FALSE
-/obj/add_blood(list/blood_dna, color)
+/obj/add_blood(list/blood_dna, b_color)
return transfer_blood_dna(blood_dna)
-/obj/item/add_blood(list/blood_dna, color)
- var/blood_count = !blood_DNA ? 0 : blood_DNA.len
+/obj/item/add_blood(list/blood_dna, b_color)
+ var/blood_count = !blood_DNA ? 0 : length(blood_DNA)
if(!..())
return FALSE
- if(!blood_count)//apply the blood-splatter overlay if it isn't already in there
- add_blood_overlay(color)
+ blood_color = b_color // update the blood color
+ if(!blood_count) //apply the blood-splatter overlay if it isn't already in there
+ add_blood_overlay()
return TRUE //we applied blood to the item
-/obj/item/clothing/gloves/add_blood(list/blood_dna, color)
+/obj/item/clothing/gloves/add_blood(list/blood_dna, b_color)
. = ..()
transfer_blood = rand(2, 4)
-/turf/add_blood(list/blood_dna, color)
+/turf/add_blood(list/blood_dna, b_color)
var/obj/effect/decal/cleanable/blood/splatter/B = locate() in src
if(!B)
B = new /obj/effect/decal/cleanable/blood/splatter(src)
B.transfer_blood_dna(blood_dna) //give blood info to the blood decal.
- B.basecolor = color
+ B.basecolor = b_color
return TRUE //we bloodied the floor
-/mob/living/carbon/human/add_blood(list/blood_dna, color)
+/mob/living/carbon/human/add_blood(list/blood_dna, b_color)
if(wear_suit)
- wear_suit.add_blood(blood_dna, color)
- wear_suit.blood_color = color
+ wear_suit.add_blood(blood_dna, b_color)
update_inv_wear_suit()
else if(w_uniform)
- w_uniform.add_blood(blood_dna, color)
- w_uniform.blood_color = color
+ w_uniform.add_blood(blood_dna, b_color)
update_inv_w_uniform()
if(head)
- head.add_blood(blood_dna, color)
- head.blood_color = color
+ head.add_blood(blood_dna, b_color)
update_inv_head()
if(glasses)
- glasses.add_blood(blood_dna, color)
- glasses.blood_color = color
+ glasses.add_blood(blood_dna, b_color)
update_inv_glasses()
if(gloves)
var/obj/item/clothing/gloves/G = gloves
- G.add_blood(blood_dna, color)
- G.blood_color = color
+ G.add_blood(blood_dna, b_color)
verbs += /mob/living/carbon/human/proc/bloody_doodle
else
- hand_blood_color = color
+ hand_blood_color = b_color
bloody_hands = rand(2, 4)
transfer_blood_dna(blood_dna)
verbs += /mob/living/carbon/human/proc/bloody_doodle
@@ -783,21 +776,13 @@ GLOBAL_LIST_EMPTY(blood_splatter_icons)
update_inv_gloves() //handles bloody hands overlays and updating
return TRUE
-/obj/item/proc/add_blood_overlay(color)
+/obj/item/proc/add_blood_overlay()
if(initial(icon) && initial(icon_state))
- //try to find a pre-processed blood-splatter. otherwise, make a new one
- var/index = blood_splatter_index()
- var/icon/blood_splatter_icon = GLOB.blood_splatter_icons[index]
- if(!blood_splatter_icon)
- blood_splatter_icon = icon(initial(icon), initial(icon_state), , 1) //we only want to apply blood-splatters to the initial icon_state for each object
- blood_splatter_icon.Blend("#fff", ICON_ADD) //fills the icon_state with white (except where it's transparent)
- blood_splatter_icon.Blend(icon('icons/effects/blood.dmi', "itemblood"), ICON_MULTIPLY) //adds blood and the remaining white areas become transparant
- blood_splatter_icon = fcopy_rsc(blood_splatter_icon)
- GLOB.blood_splatter_icons[index] = blood_splatter_icon
-
- blood_overlay = image(blood_splatter_icon)
- blood_overlay.color = color
- overlays += blood_overlay
+ var/list/params = GLOB.blood_splatter_icons["[blood_color]"]
+ if(!params)
+ params = layering_filter(icon = icon('icons/effects/blood.dmi', "itemblood"), color = blood_color, blend_mode = BLEND_INSET_OVERLAY)
+ GLOB.blood_splatter_icons["[blood_color]"] = params
+ add_filter("blood_splatter", 1, params)
/atom/proc/clean_blood(radiation_clean = FALSE)
germ_level = 0
@@ -828,8 +813,8 @@ GLOBAL_LIST_EMPTY(blood_splatter_icons)
/obj/item/clean_blood(radiation_clean = FALSE)
. = ..()
if(.)
- if(blood_overlay)
- overlays -= blood_overlay
+ if(initial(icon) && initial(icon_state))
+ remove_filter("blood_splatter")
/obj/item/clothing/gloves/clean_blood(radiation_clean = FALSE)
. = ..()
@@ -1153,3 +1138,15 @@ GLOBAL_LIST_EMPTY(blood_splatter_icons)
if(degrees)
appearance_flags |= PIXEL_SCALE
transform = M
+
+/*
+ Setter for the `density` variable.
+ Arguments:
+ * new_value - the new density you would want it to set.
+ Returns: Either null if identical to existing density, or the new density if different.
+*/
+/atom/proc/set_density(new_value)
+ if(density == new_value)
+ return
+ . = density
+ density = new_value
diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm
index 7232239d6f5..2eb8cf115a3 100644
--- a/code/game/atoms_movable.dm
+++ b/code/game/atoms_movable.dm
@@ -90,13 +90,11 @@
/atom/movable/proc/stop_pulling()
if(pulling)
- pulling.pulledby = null
var/mob/living/ex_pulled = pulling
+ pulling.pulledby = null
pulling = null
- pulledby = null
- if(isliving(ex_pulled))
- var/mob/living/L = ex_pulled
- L.update_canmove()// mob gets up if it was lyng down in a chokehold
+ if(!QDELETED(ex_pulled) && istype(ex_pulled))
+ ex_pulled.update_canmove()// mob gets up if it was lyng down in a chokehold
/atom/movable/proc/check_pulling()
if(pulling)
@@ -420,6 +418,7 @@
if(spin && !no_spin && !no_spin_thrown)
SpinAnimation(5, 1)
+ SEND_SIGNAL(src, COMSIG_MOVABLE_POST_THROW, TT, spin)
SSthrowing.processing[src] = TT
TT.tick()
diff --git a/code/game/data_huds.dm b/code/game/data_huds.dm
index 10e704fb314..0b9aeec9fb2 100644
--- a/code/game/data_huds.dm
+++ b/code/game/data_huds.dm
@@ -44,10 +44,12 @@
hud_icons = list(ID_HUD, IMPTRACK_HUD, IMPMINDSHIELD_HUD, IMPCHEM_HUD, WANTED_HUD)
/datum/atom_hud/data/diagnostic
- hud_icons = list (DIAG_HUD, DIAG_STAT_HUD, DIAG_BATT_HUD, DIAG_MECH_HUD, DIAG_BOT_HUD, DIAG_TRACK_HUD)
+
+/datum/atom_hud/data/diagnostic/basic
+ hud_icons = list(DIAG_HUD, DIAG_STAT_HUD, DIAG_BATT_HUD, DIAG_MECH_HUD, DIAG_BOT_HUD, DIAG_TRACK_HUD, DIAG_AIRLOCK_HUD)
/datum/atom_hud/data/diagnostic/advanced
- hud_icons = list (DIAG_HUD, DIAG_STAT_HUD, DIAG_BATT_HUD, DIAG_MECH_HUD, DIAG_BOT_HUD, DIAG_TRACK_HUD, DIAG_PATH_HUD)
+ hud_icons = list(DIAG_HUD, DIAG_STAT_HUD, DIAG_BATT_HUD, DIAG_MECH_HUD, DIAG_BOT_HUD, DIAG_TRACK_HUD, DIAG_AIRLOCK_HUD, DIAG_PATH_HUD)
/datum/atom_hud/data/bot_path
hud_icons = list(DIAG_PATH_HUD)
@@ -473,6 +475,16 @@
return
holder.icon_state = "hudweed[RoundPlantBar(weedlevel/10)]"
+/*~~~~~~~~~~~~
+ Airlocks!
+~~~~~~~~~~~~~*/
+/obj/machinery/door/airlock/proc/diag_hud_set_electrified()
+ var/image/holder = hud_list[DIAG_AIRLOCK_HUD]
+ if(isElectrified())
+ holder.icon_state = "electrified"
+ else
+ holder.icon_state = ""
+
/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
I'll just put this somewhere near the end...
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
diff --git a/code/game/dna/dna_modifier.dm b/code/game/dna/dna_modifier.dm
index 7e9b6c34634..050a105307e 100644
--- a/code/game/dna/dna_modifier.dm
+++ b/code/game/dna/dna_modifier.dm
@@ -156,7 +156,7 @@
to_chat(usr, "[src] is already occupied!")
return
if(usr.abiotic())
- to_chat(usr, "Subject cannot have abiotic items on.")
+ to_chat(usr, "Subject may not hold anything in their hands.")
return
if(usr.has_buckled_mobs()) //mob attached to us
to_chat(usr, "[usr] will not fit into [src] because [usr.p_they()] [usr.p_have()] a slime latched onto [usr.p_their()] head.")
@@ -194,7 +194,7 @@
if(!istype(L) || L.buckled)
return
if(L.abiotic())
- to_chat(user, "Subject cannot have abiotic items on.")
+ to_chat(user, "Subject may not hold anything in their hands.")
return
if(L.has_buckled_mobs()) //mob attached to us
to_chat(user, "[L] will not fit into [src] because [L.p_they()] [L.p_have()] a slime latched onto [L.p_their()] head.")
@@ -232,7 +232,7 @@
to_chat(user, "The scanner is already occupied!")
return
if(G.affecting.abiotic())
- to_chat(user, "Subject cannot have abiotic items on.")
+ to_chat(user, "Subject may not hold anything in their hands.")
return
if(G.affecting.has_buckled_mobs()) //mob attached to us
to_chat(user, "[G] will not fit into [src] because [G.affecting.p_they()] [G.affecting.p_have()] a slime latched onto [G.affecting.p_their()] head.")
@@ -315,7 +315,7 @@
if(HAS_TRAIT(occupant, TRAIT_GENELESS))
return TRUE
- var/radiation_protection = occupant.run_armor_check(null, "rad")
+ var/radiation_protection = occupant.run_armor_check(null, RAD)
if(radiation_protection > NEGATE_MUTATION_THRESHOLD)
return TRUE
return FALSE
diff --git a/code/game/dna/mutations/disabilities.dm b/code/game/dna/mutations/disabilities.dm
index bcb11eb1631..a03c686140a 100644
--- a/code/game/dna/mutations/disabilities.dm
+++ b/code/game/dna/mutations/disabilities.dm
@@ -140,12 +140,16 @@
/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.
+ if(ishuman(M))
+ var/mob/living/carbon/human/H = M
+ H.update_misc_effects()
/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.
+ if(ishuman(M))
+ var/mob/living/carbon/human/H = M
+ H.update_misc_effects()
/datum/mutation/disability/deaf
name = "Deafness"
diff --git a/code/game/dna/mutations/powers.dm b/code/game/dna/mutations/powers.dm
index 3d2f991acb6..20c37357c50 100644
--- a/code/game/dna/mutations/powers.dm
+++ b/code/game/dna/mutations/powers.dm
@@ -158,28 +158,6 @@
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.")
@@ -1181,3 +1159,58 @@
else
H.remoteview_target = null
H.reset_perspective()
+
+/datum/mutation/meson_vision
+ name = "Meson Vision"
+ activation_messages = list("More information seems to reach your eyes...")
+ deactivation_messages = list("The amount of information reaching your eyes fades...")
+ instability = GENE_INSTABILITY_MINOR
+ traits_to_add = list(TRAIT_MESON_VISION)
+
+/datum/mutation/meson_vision/New()
+ ..()
+ block = GLOB.mesonblock
+
+/datum/mutation/meson_vision/activate(mob/living/M)
+ ..()
+ M.update_sight()
+
+/datum/mutation/meson_vision/deactivate(mob/living/M)
+ ..()
+ M.update_sight()
+
+/datum/mutation/night_vision
+ name = "Night Vision"
+ activation_messages = list("Were the lights always that bright?")
+ deactivation_messages = list("The ambient light level returns to normal...")
+ instability = GENE_INSTABILITY_MODERATE
+ traits_to_add = list(TRAIT_NIGHT_VISION)
+
+/datum/mutation/night_vision/New()
+ ..()
+ block = GLOB.nightvisionblock
+
+/datum/mutation/night_vision/activate(mob/living/M)
+ ..()
+ M.update_sight()
+ if(ishuman(M))
+ var/mob/living/carbon/human/H = M
+ H.update_misc_effects()
+
+/datum/mutation/night_vision/deactivate(mob/living/M)
+ ..()
+ M.update_sight()
+ if(ishuman(M))
+ var/mob/living/carbon/human/H = M
+ H.update_misc_effects()
+
+/datum/mutation/flash_protection
+ name = "Flash Protection"
+ activation_messages = list("You stop noticing the glare from lights...")
+ deactivation_messages = list("Lights begin glaring again...")
+ instability = GENE_INSTABILITY_MINOR
+ traits_to_add = list(TRAIT_FLASH_PROTECTION)
+
+/datum/mutation/flash_protection/New()
+ ..()
+ block = GLOB.noflashblock
diff --git a/code/game/gamemodes/blob/blobs/blob_mobs.dm b/code/game/gamemodes/blob/blobs/blob_mobs.dm
index 14603c1681a..95bdf0b20e5 100644
--- a/code/game/gamemodes/blob/blobs/blob_mobs.dm
+++ b/code/game/gamemodes/blob/blobs/blob_mobs.dm
@@ -91,8 +91,8 @@
is_zombie = TRUE
if(H.wear_suit)
var/obj/item/clothing/suit/armor/A = H.wear_suit
- if(A.armor && A.armor.getRating("melee"))
- maxHealth += A.armor.getRating("melee") //That zombie's got armor, I want armor!
+ if(A.armor && A.armor.getRating(MELEE))
+ maxHealth += A.armor.getRating(MELEE) //That zombie's got armor, I want armor!
maxHealth += 40
health = maxHealth
name = "blob zombie"
diff --git a/code/game/gamemodes/blob/blobs/core.dm b/code/game/gamemodes/blob/blobs/core.dm
index b4a9bf3c3e8..659d0d1bec5 100644
--- a/code/game/gamemodes/blob/blobs/core.dm
+++ b/code/game/gamemodes/blob/blobs/core.dm
@@ -3,7 +3,7 @@
icon = 'icons/mob/blob.dmi'
icon_state = "blank_blob"
max_integrity = 400
- armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 75, "acid" = 90)
+ armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 75, ACID = 90)
fire_resist = 2
point_return = -1
var/overmind_get_delay = 0 // we don't want to constantly try to find an overmind, do it every 5 minutes
@@ -48,7 +48,7 @@
/obj/structure/blob/core/ex_act(severity)
var/damage = 50 - 10 * severity //remember, the core takes half brute damage, so this is 20/15/10 damage based on severity
- take_damage(damage, BRUTE, "bomb", 0)
+ take_damage(damage, BRUTE, BOMB, 0)
/obj/structure/blob/core/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir, overmind_reagent_trigger = 1)
. = ..()
diff --git a/code/game/gamemodes/blob/blobs/node.dm b/code/game/gamemodes/blob/blobs/node.dm
index 0023328b463..c5575827f5d 100644
--- a/code/game/gamemodes/blob/blobs/node.dm
+++ b/code/game/gamemodes/blob/blobs/node.dm
@@ -3,7 +3,7 @@
icon = 'icons/mob/blob.dmi'
icon_state = "blank_blob"
max_integrity = 200
- armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 65, "acid" = 90)
+ 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/Initialize(mapload)
diff --git a/code/game/gamemodes/blob/blobs/shield.dm b/code/game/gamemodes/blob/blobs/shield.dm
index 04e9f6d677f..9def25e832c 100644
--- a/code/game/gamemodes/blob/blobs/shield.dm
+++ b/code/game/gamemodes/blob/blobs/shield.dm
@@ -7,7 +7,7 @@
brute_resist = 0.25
explosion_block = 3
atmosblock = TRUE
- armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 90, "acid" = 90)
+ armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 90, ACID = 90)
/obj/structure/blob/shield/core
point_return = 0
diff --git a/code/game/gamemodes/blob/overmind.dm b/code/game/gamemodes/blob/overmind.dm
index e5da77c8196..02022121209 100644
--- a/code/game/gamemodes/blob/overmind.dm
+++ b/code/game/gamemodes/blob/overmind.dm
@@ -66,10 +66,10 @@
return
if(src.client)
- if(client.prefs.muted & MUTE_IC)
+ if(check_mute(client.ckey, MUTE_IC))
to_chat(src, "You cannot send IC messages (muted).")
return
- if(src.client.handle_spam_prevention(message,MUTE_IC))
+ if(src.client.handle_spam_prevention(message, MUTE_IC))
return
if(stat)
diff --git a/code/game/gamemodes/blob/powers.dm b/code/game/gamemodes/blob/powers.dm
index f7320a40c72..f02e7169124 100644
--- a/code/game/gamemodes/blob/powers.dm
+++ b/code/game/gamemodes/blob/powers.dm
@@ -237,7 +237,7 @@
blobber.AIStatus = AI_OFF
blobber.LoseTarget()
spawn()
- var/list/candidates = SSghost_spawns.poll_candidates("Do you want to play as a blobbernaut?", ROLE_BLOB, TRUE, 10 SECONDS, source = blobber)
+ var/list/candidates = SSghost_spawns.poll_candidates("Do you want to play as a blobbernaut?", ROLE_BLOB, TRUE, 10 SECONDS, source = blobber, role_cleanname = "blobbernaut")
if(length(candidates) && !QDELETED(blobber))
var/mob/C = pick(candidates)
if(C)
diff --git a/code/game/gamemodes/blob/theblob.dm b/code/game/gamemodes/blob/theblob.dm
index b1c5ffde619..103427d2089 100644
--- a/code/game/gamemodes/blob/theblob.dm
+++ b/code/game/gamemodes/blob/theblob.dm
@@ -8,7 +8,7 @@
opacity = 0
anchored = 1
max_integrity = 30
- armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 70)
+ armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 80, ACID = 70)
var/point_return = 0 //How many points the blob gets back when it removes a blob of that type. If less than 0, blob cannot be removed.
var/health_timestamp = 0
var/brute_resist = 0.5 //multiplies brute damage by this
@@ -144,7 +144,7 @@
L.blob_act(src)
/obj/structure/blob/zap_act(power, zap_flags)
- take_damage(power * 0.0025, BURN, "energy")
+ 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
diff --git a/code/game/gamemodes/changeling/changeling.dm b/code/game/gamemodes/changeling/changeling.dm
index e24b7876e2b..330a5e94257 100644
--- a/code/game/gamemodes/changeling/changeling.dm
+++ b/code/game/gamemodes/changeling/changeling.dm
@@ -11,7 +11,7 @@ GLOBAL_LIST_INIT(possible_changeling_IDs, list("Alpha","Beta","Gamma","Delta","E
name = "changeling"
config_tag = "changeling"
restricted_jobs = list("AI", "Cyborg")
- protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Blueshield", "Nanotrasen Representative", "Security Pod Pilot", "Magistrate", "Brig Physician", "Internal Affairs Agent", "Nanotrasen Navy Officer", "Special Operations Officer", "Syndicate Officer", "Solar Federation General")
+ protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Blueshield", "Nanotrasen Representative", "Magistrate", "Brig Physician", "Internal Affairs Agent", "Nanotrasen Navy Officer", "Special Operations Officer", "Syndicate Officer", "Solar Federation General")
protected_species = list("Machine")
required_players = 15
required_enemies = 1
diff --git a/code/game/gamemodes/changeling/powers/biodegrade.dm b/code/game/gamemodes/changeling/powers/biodegrade.dm
index 45ce670dfcc..20b83cb9a02 100644
--- a/code/game/gamemodes/changeling/powers/biodegrade.dm
+++ b/code/game/gamemodes/changeling/powers/biodegrade.dm
@@ -1,7 +1,7 @@
/datum/action/changeling/biodegrade
name = "Biodegrade"
desc = "Dissolves restraints or other objects preventing free movement. Costs 30 chemicals."
- helptext = "This is obvious to nearby people, and can destroy standard restraints and closets."
+ helptext = "This is obvious to nearby people, and can destroy standard restraints and closets, and break you out of grabs."
button_icon_state = "biodegrade"
chemical_cost = 30 //High cost to prevent spam
dna_cost = 2
@@ -9,7 +9,7 @@
/datum/action/changeling/biodegrade/sting_action(mob/living/carbon/human/user)
var/used = FALSE // only one form of shackles removed per use
- if(!user.restrained() && !user.legcuffed && !istype(user.loc, /obj/structure/closet) && !istype(user.loc, /obj/structure/spider/cocoon))
+ if(!user.restrained() && !user.legcuffed && !istype(user.loc, /obj/structure/closet) && !istype(user.loc, /obj/structure/spider/cocoon) && !user.grabbed_by)
to_chat(user, "We are already free!")
return FALSE
@@ -57,7 +57,15 @@
to_chat(user, "We secrete acidic enzymes from our skin and begin melting our cocoon...")
addtimer(CALLBACK(src, .proc/dissolve_cocoon, user, C), 2.5 SECONDS) //Very short because it's just webs
used = TRUE
-
+ for(var/obj/item/grab/G in user.grabbed_by)
+ var/mob/living/carbon/M = G.assailant
+ user.visible_message("[user] spits acid at [M]'s face and slips out of their grab!")
+ M.Stun(1) //Drops the grab
+ M.apply_damage(5, BURN, "head", M.run_armor_check("head", "melee"))
+ user.SetStunned(0) //This only triggers if they are grabbed, to have them break out of the grab, without the large stun time. If you use biodegrade as an antistun without being grabbed, it will not work
+ user.SetWeakened(0)
+ playsound(user.loc, 'sound/weapons/sear.ogg', 50, TRUE)
+ used = TRUE
if(used)
SSblackbox.record_feedback("nested tally", "changeling_powers", 1, list("[name]"))
return TRUE
diff --git a/code/game/gamemodes/changeling/powers/epinephrine.dm b/code/game/gamemodes/changeling/powers/epinephrine.dm
index ef22de10ce4..5d442caf60c 100644
--- a/code/game/gamemodes/changeling/powers/epinephrine.dm
+++ b/code/game/gamemodes/changeling/powers/epinephrine.dm
@@ -10,20 +10,19 @@
//Recover from stuns.
/datum/action/changeling/epinephrine/sting_action(mob/living/user)
-
if(user.lying)
to_chat(user, "We arise.")
else
to_chat(user, "Adrenaline rushes through us.")
user.SetSleeping(0)
- user.stat = 0
+ user.WakeUp()
user.SetParalysis(0)
user.SetStunned(0)
user.SetWeakened(0)
- user.lying = 0
+ user.lying = FALSE
user.update_canmove()
user.reagents.add_reagent("synaptizine", 20)
user.adjustStaminaLoss(-75)
SSblackbox.record_feedback("nested tally", "changeling_powers", 1, list("[name]"))
- return 1
+ return TRUE
diff --git a/code/game/gamemodes/changeling/powers/mutations.dm b/code/game/gamemodes/changeling/powers/mutations.dm
index 28437dd9022..f940b224cb8 100644
--- a/code/game/gamemodes/changeling/powers/mutations.dm
+++ b/code/game/gamemodes/changeling/powers/mutations.dm
@@ -426,7 +426,7 @@
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/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
+ 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()
..()
@@ -444,7 +444,7 @@
icon_state = "lingspacehelmet"
desc = "A covering of pressure and temperature-resistant organic tissue with a glass-like chitin front."
flags = BLOCKHAIR | STOPSPRESSUREDMAGE | NODROP | DROPDEL
- armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 90, "acid" = 90)
+ armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 90, ACID = 90)
/***************************************\
@@ -473,7 +473,7 @@
icon_state = "lingarmor"
flags = NODROP | DROPDEL
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
- armor = list("melee" = 40, "bullet" = 40, "laser" = 40, "energy" = 20, "bomb" = 10, "bio" = 4, "rad" = 0, "fire" = 90, "acid" = 90)
+ armor = list(MELEE = 40, BULLET = 40, LASER = 40, ENERGY = 20, BOMB = 10, BIO = 4, RAD = 0, FIRE = 90, ACID = 90)
flags_inv = HIDEJUMPSUIT
cold_protection = 0
heat_protection = 0
@@ -489,5 +489,5 @@
desc = "A tough, hard covering of black chitin with transparent chitin in front."
icon_state = "lingarmorhelmet"
flags = BLOCKHAIR | NODROP | DROPDEL
- armor = list("melee" = 40, "bullet" = 40, "laser" = 40, "energy" = 20, "bomb" = 10, "bio" = 4, "rad" = 0, "fire" = 90, "acid" = 90)
+ armor = list(MELEE = 40, BULLET = 40, LASER = 40, ENERGY = 20, BOMB = 10, BIO = 4, RAD = 0, FIRE = 90, ACID = 90)
flags_inv = HIDEEARS
diff --git a/code/game/gamemodes/changeling/powers/revive.dm b/code/game/gamemodes/changeling/powers/revive.dm
index c193dcedf90..526512f5a4a 100644
--- a/code/game/gamemodes/changeling/powers/revive.dm
+++ b/code/game/gamemodes/changeling/powers/revive.dm
@@ -8,6 +8,12 @@
//Revive from regenerative stasis
/datum/action/changeling/revive/sting_action(mob/living/carbon/user)
REMOVE_TRAIT(user, TRAIT_FAKEDEATH, "changeling")
+ for(var/obj/item/grab/G in user.grabbed_by)
+ var/mob/living/carbon/M = G.assailant
+ user.visible_message("[user] suddenly hits [M] in the face and slips out of their grab!")
+ M.Stun(1) //Drops the grab
+ M.apply_damage(5, BRUTE, "head", M.run_armor_check("head", "melee"))
+ playsound(user.loc, 'sound/weapons/punch1.ogg', 25, 1, -1)
user.revive()
user.updatehealth("revive sting")
user.update_blind_effects()
diff --git a/code/game/gamemodes/changeling/powers/tiny_prick.dm b/code/game/gamemodes/changeling/powers/tiny_prick.dm
index 14d93439510..09702c97d3c 100644
--- a/code/game/gamemodes/changeling/powers/tiny_prick.dm
+++ b/code/game/gamemodes/changeling/powers/tiny_prick.dm
@@ -66,60 +66,6 @@
add_attack_logs(user, target, "Unsuccessful sting (changeling)")
return 1
-/datum/action/changeling/sting/transformation
- name = "Transformation Sting"
- desc = "We silently sting a human, injecting a retrovirus that forces them to transform. Costs 50 chemicals."
- helptext = "The victim will transform much like a changeling would. The effects will be obvious to the victim, and the process will damage our genomes."
- button_icon_state = "sting_transform"
- sting_icon = "sting_transform"
- chemical_cost = 50
- dna_cost = 3
- genetic_damage = 100
- var/datum/dna/selected_dna = null
-
-/datum/action/changeling/sting/transformation/Trigger()
- var/mob/user = usr
- var/datum/changeling/changeling = user.mind.changeling
- if(changeling.chosen_sting)
- unset_sting(user)
- return
- selected_dna = changeling.select_dna("Select the target DNA: ", "Target DNA")
- if(!selected_dna)
- return
- if((NOTRANSSTING in selected_dna.species.species_traits) || selected_dna.species.is_small)
- to_chat(user, "The selected DNA is incompatible with our sting.")
- return
- ..()
-
-/datum/action/changeling/sting/transformation/can_sting(mob/user, mob/target)
- if(!..())
- return
- 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(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(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]!")
-
- if(iscarbon(target) && (target.status_flags & CANWEAKEN))
- var/mob/living/carbon/C = target
- C.do_jitter_animation(500)
-
- target.visible_message("[target] begins to violenty convulse!","You feel a tiny prick and a begin to uncontrollably convulse!")
-
- spawn(10)
- transform_dna(target,selected_dna)//target is always human so no problem here
- SSblackbox.record_feedback("nested tally", "changeling_powers", 1, list("[name]"))
- return TRUE
-
/datum/action/changeling/sting/extract_dna
name = "Extract DNA Sting"
desc = "We stealthily sting a target and extract their DNA. Costs 25 chemicals."
diff --git a/code/game/gamemodes/changeling/traitor_chan.dm b/code/game/gamemodes/changeling/traitor_chan.dm
index f315d79eb99..38dfbfab5d4 100644
--- a/code/game/gamemodes/changeling/traitor_chan.dm
+++ b/code/game/gamemodes/changeling/traitor_chan.dm
@@ -23,7 +23,7 @@
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 secondary_protected_species))
+ if((player.mind in possible_changelings) && (player.client.prefs.active_character.species in secondary_protected_species))
possible_changelings -= player.mind
if(possible_changelings.len > 0)
diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm
index 62ad86cb72f..96d8c7fff30 100644
--- a/code/game/gamemodes/cult/cult.dm
+++ b/code/game/gamemodes/cult/cult.dm
@@ -48,7 +48,7 @@ GLOBAL_LIST_EMPTY(all_cults)
/datum/game_mode/cult
name = "cult"
config_tag = "cult"
- restricted_jobs = list("Chaplain", "AI", "Cyborg", "Internal Affairs Agent", "Security Officer", "Warden", "Detective", "Security Pod Pilot", "Head of Security", "Captain", "Head of Personnel", "Blueshield", "Nanotrasen Representative", "Magistrate", "Brig Physician", "Nanotrasen Navy Officer", "Special Operations Officer", "Syndicate Officer", "Solar Federation General")
+ restricted_jobs = list("Chaplain", "AI", "Cyborg", "Internal Affairs Agent", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Blueshield", "Nanotrasen Representative", "Magistrate", "Brig Physician", "Nanotrasen Navy Officer", "Special Operations Officer", "Syndicate Officer", "Solar Federation General")
protected_jobs = list()
required_players = 30
required_enemies = 3
diff --git a/code/game/gamemodes/cult/cult_datums.dm b/code/game/gamemodes/cult/cult_datums.dm
index 67e9a78d879..fbbee18a94b 100644
--- a/code/game/gamemodes/cult/cult_datums.dm
+++ b/code/game/gamemodes/cult/cult_datums.dm
@@ -73,6 +73,9 @@
var/airlock_unruned_icon_file = 'icons/obj/doors/airlocks/cult/unruned/cult.dmi'
var/airlock_unruned_overlays_file = 'icons/obj/doors/airlocks/cult/unruned/cult-overlays.dmi'
+ /// Are cultist mirror shields active yet?
+ var/mirror_shields_active = FALSE
+
/datum/cult_info/fire
name = "Cult of Kha'Rin"
diff --git a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm
index 9b890787d7f..4480d04effa 100644
--- a/code/game/gamemodes/cult/cult_items.dm
+++ b/code/game/gamemodes/cult/cult_items.dm
@@ -99,7 +99,7 @@
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
hoodtype = /obj/item/clothing/head/hooded/culthood
allowed = list(/obj/item/tome, /obj/item/melee/cultblade)
- armor = list("melee" = 40, "bullet" = 30, "laser" = 40, "energy" = 20, "bomb" = 25, "bio" = 10, "rad" = 0, "fire" = 10, "acid" = 10)
+ armor = list(MELEE = 40, BULLET = 30, LASER = 40, ENERGY = 20, BOMB = 25, BIO = 10, RAD = 0, FIRE = 10, ACID = 10)
flags_inv = HIDEJUMPSUIT
magical = TRUE
@@ -113,7 +113,7 @@
desc = "A space worthy helmet used by the followers of a cult."
icon_state = "cult_helmet"
item_state = "cult_helmet"
- armor = list("melee" = 70, "bullet" = 50, "laser" = 30,"energy" = 15, "bomb" = 30, "bio" = 30, "rad" = 30, "fire" = 40, "acid" = 75)
+ armor = list(MELEE = 70, BULLET = 50, LASER = 30, ENERGY = 15, BOMB = 30, BIO = 30, RAD = 30, FIRE = 40, ACID = 75)
magical = TRUE
/obj/item/clothing/suit/space/cult
@@ -124,7 +124,7 @@
w_class = WEIGHT_CLASS_NORMAL
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)
+ armor = list(MELEE = 70, BULLET = 50, LASER = 30, ENERGY = 15, BOMB = 30, BIO = 30, RAD = 30, FIRE = 40, ACID = 75)
magical = TRUE
/obj/item/clothing/suit/hooded/cultrobes/cult_shield
@@ -133,7 +133,7 @@
icon_state = "cult_armour"
item_state = "cult_armour"
w_class = WEIGHT_CLASS_BULKY
- armor = list("melee" = 50, "bullet" = 40, "laser" = 50, "energy" = 30, "bomb" = 50, "bio" = 30, "rad" = 30, "fire" = 50, "acid" = 60)
+ armor = list(MELEE = 50, BULLET = 40, LASER = 50, ENERGY = 30, BOMB = 50, BIO = 30, RAD = 30, FIRE = 50, ACID = 60)
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
allowed = list(/obj/item/tome, /obj/item/melee/cultblade)
hoodtype = /obj/item/clothing/head/hooded/cult_hoodie
@@ -145,7 +145,7 @@
name = "empowered cultist hood"
desc = "An empowered garb which creates a powerful shield around the user."
icon_state = "cult_hoodalt"
- armor = list("melee" = 40, "bullet" = 30, "laser" = 40,"energy" = 20, "bomb" = 25, "bio" = 10, "rad" = 0, "fire" = 10, "acid" = 10)
+ armor = list(MELEE = 40, BULLET = 30, LASER = 40, ENERGY = 20, BOMB = 25, BIO = 10, RAD = 0, FIRE = 10, ACID = 10)
body_parts_covered = HEAD
flags = BLOCKHAIR
flags_inv = HIDEFACE
@@ -185,7 +185,7 @@
flags_inv = HIDEJUMPSUIT
allowed = list(/obj/item/tome, /obj/item/melee/cultblade)
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
- armor = list("melee" = -50, "bullet" = -50, "laser" = -50,"energy" = -50, "bomb" = -50, "bio" = -50, "rad" = -50, "fire" = 0, "acid" = 0)
+ armor = list(MELEE = -50, BULLET = -50, LASER = -50, ENERGY = -50, BOMB = -50, BIO = -50, RAD = -50, FIRE = 0, ACID = 0)
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Drask" = 'icons/mob/clothing/species/drask/suit.dmi',
@@ -218,7 +218,7 @@
flags = BLOCKHAIR
flags_inv = HIDEFACE
flags_cover = HEADCOVERSEYES
- armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
+ armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 0, ACID = 0)
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/head.dmi',
"Drask" = 'icons/mob/clothing/species/drask/head.dmi',
@@ -444,6 +444,11 @@
* The illusion has a 60% chance to be hostile and attack non-cultists, and a 40% chance to just run away from the user.
*/
/obj/item/shield/mirror/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
+ // Incase they get one by some magic
+ if(!SSticker.cultdat.mirror_shields_active)
+ to_chat(owner, "This shield is powerless! You must perform the required sacrifice to empower it!")
+ return
+
if(iscultist(owner) && !owner.holy_check()) // Cultist holding the shield
// Hit by a projectile
@@ -677,3 +682,109 @@
desc = "It's an orb of crystalized blood. Can be used to transfer blood between cultists."
var/blood = 50
+/obj/item/portal_amulet
+ name = "reality sunderer"
+ icon = 'icons/obj/cult.dmi'
+ icon_state = "amulet"
+ desc = "Some amulet made out of metal, bluespace crystals, and blood. Allows cultists to open portals over teleport runes, destroying the rune in the process."
+ w_class = WEIGHT_CLASS_SMALL
+
+
+/obj/item/portal_amulet/afterattack(atom/O, mob/user, proximity)
+ . = ..()
+ if(!iscultist(user))
+ if(!iscarbon(user))
+ return
+ var/mob/living/carbon/M = user
+ to_chat(M, "\"So, you want to explore space?\"")
+ to_chat(M, "Space flashes around you as you are moved somewhere else!")
+ M.Confused(10)
+ M.flash_eyes(override_blindness_check = TRUE)
+ M.EyeBlind(10)
+ do_teleport(M, get_turf(M), 5, asoundin = 'sound/magic/cult_spell.ogg')
+ qdel(src)
+ return
+
+ if(istype(O, /obj/effect/rune))
+ if(!istype(O, /obj/effect/rune/teleport))
+ to_chat(user, "[src] only works on teleport runes.")
+ return
+ if(!proximity)
+ to_chat(user, "You are too far away from the teleport rune.")
+ return
+ var/obj/effect/rune/teleport/R = O
+ attempt_portal(R, user)
+
+/obj/item/portal_amulet/proc/attempt_portal(obj/effect/rune/teleport/R, mob/user)
+ var/list/potential_runes = list()
+ var/list/teleport_names = list()
+ var/list/duplicate_rune_count = list()
+ var/turf/T = get_turf(src) //used to tell the other rune where we came from
+
+ for(var/I in GLOB.teleport_runes)
+ var/obj/effect/rune/teleport/target = I
+ var/result_key = target.listkey
+ if(target == R || !is_level_reachable(target.z))
+ continue
+ if(result_key in teleport_names)
+ duplicate_rune_count[result_key]++
+ result_key = "[result_key] ([duplicate_rune_count[result_key]])"
+ else
+ teleport_names += result_key
+ duplicate_rune_count[result_key] = 1
+ potential_runes[result_key] = target
+
+ if(!length(potential_runes))
+ to_chat(user, "There are no valid runes to teleport to!")
+ return
+
+ if(!is_level_reachable(user.z))
+ to_chat(user, "You are not in the right dimension!")
+ return
+
+ var/input_rune_key = input(user, "Choose a rune to make a portal to.", "Rune to make a portal to") as null|anything in potential_runes //we know what key they picked
+ var/obj/effect/rune/teleport/actual_selected_rune = potential_runes[input_rune_key] //what rune does that key correspond to?
+ if(QDELETED(R) || QDELETED(actual_selected_rune) || !Adjacent(user) || user.incapacitated())
+ return
+
+ if(is_mining_level(R.z) && !is_mining_level(actual_selected_rune.z))
+ actual_selected_rune.handle_portal("lava")
+ else if(!is_station_level(R.z) || istype(get_area(src), /area/space))
+ actual_selected_rune.handle_portal("space", T)
+ new /obj/effect/portal/cult(get_turf(R), get_turf(actual_selected_rune), src, 4 MINUTES)
+ to_chat(user, "You use the magic of the amulet to turn [R] into a portal.")
+ playsound(src, 'sound/magic/cult_spell.ogg', 100, TRUE)
+ qdel(R)
+ qdel(src)
+
+/obj/effect/portal/cult
+ name = "eldritch portal"
+ desc = "An evil portal made by dark magics. Suprisingly stable."
+ icon_state = "portal1"
+ failchance = 0
+ precision = FALSE
+ var/obj/effect/cult_portal_exit/exit = null
+
+/obj/effect/portal/cult/Initialize(mapload, target, creator, lifespan)
+ . = ..()
+ if(target)
+ exit = new /obj/effect/cult_portal_exit(target)
+
+/obj/effect/portal/cult/attackby(obj/I, mob/user, params)
+ if(istype(I, /obj/item/melee/cultblade/dagger) && iscultist(user) || istype(I, /obj/item/nullrod) && user.mind.isholy)
+ to_chat(user, "You close the portal with your [I].")
+ playsound(src, 'sound/magic/magic_missile.ogg', 100, TRUE)
+ qdel(src)
+ return
+ return ..()
+
+/obj/effect/portal/cult/Destroy()
+ QDEL_NULL(exit)
+ return ..()
+
+/obj/effect/cult_portal_exit
+ name = "eldritch rift"
+ desc = "An exit point for some cult portal. Be on guard, more things may come out of it"
+ icon = 'icons/obj/biomass.dmi'
+ icon_state = "rift"
+ color = "red"
diff --git a/code/game/gamemodes/cult/cult_structures.dm b/code/game/gamemodes/cult/cult_structures.dm
index 8eae3876082..a0f8cf0e1ae 100644
--- a/code/game/gamemodes/cult/cult_structures.dm
+++ b/code/game/gamemodes/cult/cult_structures.dm
@@ -86,8 +86,10 @@
to_chat(user, "The magic in [src] is weak, it will be ready to use again in [get_ETA()].")
return
- var/choice = show_radial_menu(user, src, choosable_items, require_near = TRUE)
- var/picked_type = choosable_items[choice]
+
+ var/list/pickable_items = get_choosable_items()
+ var/choice = show_radial_menu(user, src, pickable_items, require_near = TRUE)
+ var/picked_type = pickable_items[choice]
if(!QDELETED(src) && picked_type && Adjacent(user) && !user.incapacitated() && cooldowntime <= world.time)
cooldowntime = world.time + creation_delay
var/obj/O = new picked_type
@@ -95,6 +97,14 @@
O.forceMove(get_turf(src))
to_chat(user, replacetext("[creation_message]", "%ITEM%", "[O.name]"))
+/**
+ * Returns the items the cult can craft from this forge.
+ *
+ * Override on children for logic regarding game state.
+ */
+/obj/structure/cult/functional/proc/get_choosable_items()
+ return choosable_items.Copy() // Copied incase its modified on children
+
/**
* Returns the cooldown time in minutes and seconds
*/
@@ -159,8 +169,15 @@
selection_prompt = "You study the schematics etched on the forge..."
selection_title = "Forge"
creation_message = "You work the forge as dark knowledge guides your hands, creating a %ITEM%!"
- 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)
+ choosable_items = list("Shielded Robe" = /obj/item/clothing/suit/hooded/cultrobes/cult_shield, "Flagellant's Robe" = /obj/item/clothing/suit/hooded/cultrobes/flagellant_robe)
+
+/obj/structure/cult/functional/forge/get_choosable_items()
+ . = ..()
+ if(SSticker.cultdat.mirror_shields_active)
+ // Both lines here are needed. If you do it without, youll get issues.
+ . += "Mirror Shield"
+ .["Mirror Shield"] = /obj/item/shield/mirror
+
/obj/structure/cult/functional/forge/Initialize(mapload)
. = ..()
@@ -304,7 +321,7 @@ GLOBAL_LIST_INIT(blacklisted_pylon_turfs, typecacheof(list(
selection_title = "Archives"
creation_message = "You invoke the dark magic of the tomes creating a %ITEM%!"
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
+ "Veil Shifter" = /obj/item/cult_shift, "Reality sunderer" = /obj/item/portal_amulet) //Add void torch to veil shifter spawn
/obj/structure/cult/functional/archives/Initialize(mapload)
. = ..()
diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm
index 1f03e634a8c..4a9234ac49f 100644
--- a/code/game/gamemodes/cult/runes.dm
+++ b/code/game/gamemodes/cult/runes.dm
@@ -384,6 +384,9 @@ structure_check() searches for nearby cultist structures required for the invoca
for(var/M in invokers)
if(sacrifice_fulfilled)
to_chat(M, "\"Yes! This is the one I desire! You have done well.\"")
+ if(!SSticker.cultdat.mirror_shields_active) // Only show once
+ to_chat(M, "You are now able to construct mirror shields inside the daemon forge.")
+ SSticker.cultdat.mirror_shields_active = TRUE
else
if(ishuman(offering) && offering.mind.offstation_role && offering.mind.special_role != SPECIAL_ROLE_ERT) //If you try it on a ghost role, you get nothing
to_chat(M, "\"This soul is of no use to either of us.\"")
diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm
index 4e5372ffc2d..16f80d11d48 100644
--- a/code/game/gamemodes/game_mode.dm
+++ b/code/game/gamemodes/game_mode.dm
@@ -1,3 +1,6 @@
+#define NUKE_INTACT 0
+#define NUKE_CORE_MISSING 1
+#define NUKE_MISSING 2
/*
* GAMEMODES (by Rastaf0)
*
@@ -248,7 +251,7 @@
// Get a list of all the people who want to be the antagonist for this round, except those with incompatible species
for(var/mob/new_player/player in players)
if(!player.client.skip_antag)
- if((role in player.client.prefs.be_special) && !(player.client.prefs.species in protected_species))
+ if((role in player.client.prefs.be_special) && !(player.client.prefs.active_character.species in protected_species))
player_draft_log += "[player.key] had [roletext] enabled, so we are drafting them."
candidates += player.mind
players -= player
@@ -434,6 +437,15 @@
nukecode = bomb.r_code
return nukecode
+/proc/get_nuke_status()
+ var/nuke_status = NUKE_MISSING
+ for(var/obj/machinery/nuclearbomb/bomb in GLOB.machines)
+ if(is_station_level(bomb.z))
+ nuke_status = NUKE_CORE_MISSING
+ if(bomb.core)
+ nuke_status = NUKE_INTACT
+ return nuke_status
+
/datum/game_mode/proc/replace_jobbanned_player(mob/living/M, role_type)
var/list/mob/dead/observer/candidates = SSghost_spawns.poll_candidates("Do you want to play as a [role_type]?", role_type, FALSE, 10 SECONDS)
var/mob/dead/observer/theghost = null
@@ -451,7 +463,7 @@
var/jobtext = ""
if(ply.assigned_role)
jobtext = " the [ply.assigned_role]"
- var/text = "[ply.key] was [ply.name][jobtext] and"
+ var/text = "[ply.get_display_key()] was [ply.name][jobtext] and"
if(ply.current)
if(ply.current.stat == DEAD)
text += " died"
@@ -468,7 +480,7 @@
return text
/proc/printeventplayer(datum/mind/ply)
- var/text = "[ply.key] was [ply.name]"
+ var/text = "[ply.get_display_key()] was [ply.name]"
if(ply.special_role != SPECIAL_ROLE_EVENTMISC)
text += " the [ply.special_role]"
text += " and"
@@ -534,3 +546,7 @@
var/datum/atom_hud/antag/antaghud = GLOB.huds[ANTAG_HUD_EVENTMISC]
antaghud.leave_hud(mob_mind.current)
set_antag_hud(mob_mind.current, null)
+
+#undef NUKE_INTACT
+#undef NUKE_CORE_MISSING
+#undef NUKE_MISSING
diff --git a/code/game/gamemodes/intercept_report.dm b/code/game/gamemodes/intercept_report.dm
index aaf5dd1eea7..7b3fd4d52fc 100644
--- a/code/game/gamemodes/intercept_report.dm
+++ b/code/game/gamemodes/intercept_report.dm
@@ -110,7 +110,7 @@
/datum/intercept_text/proc/get_suspect()
var/list/dudes = list()
for(var/mob/living/carbon/human/man in GLOB.player_list)
- if(man.client && man.client.prefs.nanotrasen_relation == "Opposed")
+ if(man.client && man.client.prefs.active_character.nanotrasen_relation == "Opposed")
//don't include suspects who can't possibly be the antag based on their job (no suspecting the captain of being a damned dirty tator)
if(man.mind && man.mind.assigned_role)
if((man.mind.assigned_role in SSticker.mode.protected_jobs) || (man.mind.assigned_role in SSticker.mode.restricted_jobs))
diff --git a/code/game/gamemodes/malfunction/Malf_Modules.dm b/code/game/gamemodes/malfunction/Malf_Modules.dm
index e299f0c97c2..3b07125cb5a 100644
--- a/code/game/gamemodes/malfunction/Malf_Modules.dm
+++ b/code/game/gamemodes/malfunction/Malf_Modules.dm
@@ -248,7 +248,7 @@
/datum/action/innate/ai/nuke_station/proc/set_us_up_the_bomb()
to_chat(owner_AI, "Nuclear device armed.")
- GLOB.event_announcement.Announce("Hostile runtimes detected in all station systems, please deactivate your AI to prevent possible damage to its morality core.", "Anomaly Alert", new_sound = 'sound/AI/aimalf.ogg')
+ GLOB.event_announcement.Announce("Hostile runtimes detected in all station systems, please deactivate your AI to prevent possible damage to its morality core.", "Anomaly Alert", 'sound/AI/aimalf.ogg')
set_security_level("delta")
owner_AI.nuking = TRUE
var/obj/machinery/doomsday_device/DOOM = new /obj/machinery/doomsday_device(owner_AI)
@@ -280,7 +280,7 @@
if(SSshuttle.emergency.mode == SHUTTLE_STRANDED)
SSshuttle.emergency.mode = SHUTTLE_DOCKED
SSshuttle.emergency.timer = world.time
- GLOB.priority_announcement.Announce("Hostile environment resolved. You have 3 minutes to board the Emergency Shuttle.", "Priority Announcement", 'sound/AI/shuttledock.ogg')
+ GLOB.priority_announcement.Announce("Hostile environment resolved. You have 3 minutes to board the Emergency Shuttle.", "Priority Announcement", 'sound/AI/eshuttle_dock.ogg')
return ..()
/obj/machinery/doomsday_device/proc/start()
@@ -300,7 +300,7 @@
if(SSshuttle.emergency.mode == SHUTTLE_STRANDED)
SSshuttle.emergency.mode = SHUTTLE_DOCKED
SSshuttle.emergency.timer = world.time
- GLOB.priority_announcement.Announce("Hostile environment resolved. You have 3 minutes to board the Emergency Shuttle.", "Priority Announcement", 'sound/AI/shuttledock.ogg')
+ GLOB.priority_announcement.Announce("Hostile environment resolved. You have 3 minutes to board the Emergency Shuttle.", "Priority Announcement", 'sound/AI/eshuttle_dock.ogg')
qdel(src)
if(!timing)
STOP_PROCESSING(SSfastprocess, src)
@@ -786,3 +786,24 @@
/datum/AI_Module/large/cameracrack/upgrade(mob/living/silicon/ai/AI)
if(AI.builtInCamera)
QDEL_NULL(AI.builtInCamera)
+
+/datum/AI_Module/large/engi_upgrade
+ module_name = "Engineering Cyborg Emitter Upgrade"
+ mod_pick_name = "emitter"
+ description = "Downloads firmware that activates the built in emitter in all engineering cyborgs linked to you. Cyborgs built after this upgrade will have it pre-installed."
+ cost = 50 // IDK look into this
+ one_purchase = TRUE
+ upgrade = TRUE
+ unlock_text = "Firmware downloaded. Bugs removed. Built in emitters operating at 73% efficiency."
+ unlock_sound = 'sound/items/rped.ogg'
+
+/datum/AI_Module/large/engi_upgrade/upgrade(mob/living/silicon/ai/AI)
+ AI.purchased_modules += /obj/item/robot_module/engineering
+ log_game("[key_name(usr)] purchased emitters for all engineering cyborgs.")
+ message_admins("[key_name_admin(usr)] purchased emitters for all engineering cyborgs!")
+ for(var/mob/living/silicon/robot/R in AI.connected_robots)
+ if(!istype(R.module, /obj/item/robot_module/engineering))
+ continue
+ R.module.malfhacked = TRUE
+ R.module.rebuild_modules()
+ to_chat(R, "New firmware downloaded. Emitter is now online.")
diff --git a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm
index 08dbec69279..1c5db6ccfab 100644
--- a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm
+++ b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm
@@ -14,15 +14,15 @@
item_state = "armor"
blood_overlay_type = "armor"
origin_tech = "magnets=7;biotech=4;powerstorage=4;abductor=4"
- armor = list("melee" = 15, "bullet" = 15, "laser" = 15, "energy" = 15, "bomb" = 15, "bio" = 15, "rad" = 15, "fire" = 70, "acid" = 70)
+ armor = list(MELEE = 15, BULLET = 15, LASER = 15, ENERGY = 15, BOMB = 15, BIO = 15, RAD = 15, FIRE = 70, ACID = 70)
actions_types = list(/datum/action/item_action/hands_free/activate)
allowed = list(/obj/item/abductor, /obj/item/abductor_baton, /obj/item/melee/baton, /obj/item/gun/energy, /obj/item/restraints/handcuffs)
var/mode = VEST_STEALTH
var/stealth_active = 0
var/combat_cooldown = 10
var/datum/icon_snapshot/disguise
- var/stealth_armor = list("melee" = 15, "bullet" = 15, "laser" = 15, "energy" = 15, "bomb" = 15, "bio" = 15, "rad" = 15, "fire" = 70, "acid" = 70)
- var/combat_armor = list("melee" = 50, "bullet" = 50, "laser" = 50, "energy" = 50, "bomb" = 50, "bio" = 50, "rad" = 50, "fire" = 90, "acid" = 90)
+ var/stealth_armor = list(MELEE = 15, BULLET = 15, LASER = 15, ENERGY = 15, BOMB = 15, BIO = 15, RAD = 15, FIRE = 70, ACID = 70)
+ var/combat_armor = list(MELEE = 50, BULLET = 50, LASER = 50, ENERGY = 50, BOMB = 50, BIO = 50, RAD = 50, FIRE = 90, ACID = 90)
sprite_sheets = null
/obj/item/clothing/suit/armor/abductor/vest/Initialize(mapload)
diff --git a/code/game/gamemodes/miniantags/borer/borer.dm b/code/game/gamemodes/miniantags/borer/borer.dm
index b2f07c7e4e6..c39babad9f6 100644
--- a/code/game/gamemodes/miniantags/borer/borer.dm
+++ b/code/game/gamemodes/miniantags/borer/borer.dm
@@ -4,10 +4,10 @@
/mob/living/captive_brain/say(message)
if(client)
- if(client.prefs.muted & MUTE_IC)
+ if(check_mute(client.ckey, MUTE_IC))
to_chat(src, "You cannot speak in IC (muted).")
return
- if(client.handle_spam_prevention(message,MUTE_IC))
+ if(client.handle_spam_prevention(message, MUTE_IC))
return
if(istype(loc,/mob/living/simple_animal/borer))
diff --git a/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm b/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm
index bc82815d7f5..5f1efc143f9 100644
--- a/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm
+++ b/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm
@@ -372,10 +372,6 @@
to_chat(S, "This cryopod control computer should be preserved, it contains useful items and information about the inhabitants. Aborting.")
return FALSE
-/obj/structure/spacepoddoor/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
- to_chat(S, "Disrupting this energy field would overload us. Aborting.")
- return FALSE
-
/turf/simulated/wall/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
var/isonshuttle = istype(loc, /area/shuttle)
for(var/turf/T in range(1, src))
@@ -412,10 +408,6 @@
to_chat(S, "Attempting to dismantle this machine would result in an immediate counterattack. Aborting.")
return FALSE
-/obj/spacepod/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
- to_chat(S, "Destroying this vehicle would destroy us. Aborting.")
- return FALSE
-
/obj/machinery/clonepod/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
if(occupant)
to_chat(S, "Destroying this machine while it is occupied would result in biological and sentient resources to be harmed. Aborting.")
diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm
index 1ace6f6a836..6aef09163d3 100644
--- a/code/game/gamemodes/nuclear/nuclear.dm
+++ b/code/game/gamemodes/nuclear/nuclear.dm
@@ -279,14 +279,6 @@
synd_mob.equip_to_slot_or_del(U, slot_in_backpack)
if(synd_mob.dna.species)
-
- /*
- Incase anyone ever gets the burning desire to have nukeops with randomized apperances. -- Dave
- synd_mob.gender = pick(MALE, FEMALE) // Randomized appearances for the nukeops.
- var/datum/preferences/pref = new()
- A.randomize_appearance_for(synd_mob)
- */
-
var/race = synd_mob.dna.species.name
switch(race)
diff --git a/code/game/gamemodes/nuclear/nuclearbomb.dm b/code/game/gamemodes/nuclear/nuclearbomb.dm
index b03a5d10fdf..1c9f0a40e8e 100644
--- a/code/game/gamemodes/nuclear/nuclearbomb.dm
+++ b/code/game/gamemodes/nuclear/nuclearbomb.dm
@@ -495,7 +495,7 @@ GLOBAL_VAR(bomb_set)
desc = "Better keep this safe."
icon_state = "nucleardisk"
max_integrity = 250
- armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 30, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100)
+ armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 30, BIO = 0, RAD = 0, FIRE = 100, ACID = 100)
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
/obj/item/disk/nuclear/unrestricted
diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm
index e4d3aecd279..9dff5725b81 100644
--- a/code/game/gamemodes/objective.dm
+++ b/code/game/gamemodes/objective.dm
@@ -205,6 +205,15 @@ GLOBAL_LIST_INIT(potential_theft_objectives, (subtypesof(/datum/theft_objective)
/datum/objective/protect/mindslave //subytpe for mindslave implants
+/datum/objective/protect/mindslave/on_target_cryo()
+ if(owner?.current)
+ to_chat(owner.current, "
You notice that your master has entered cryogenic storage, and revert to your normal self, until they return again. You are no longer a mindslave!")
+ SEND_SOUND(owner.current, sound('sound/ambience/alarm4.ogg'))
+ owner.remove_antag_datum(/datum/antagonist/mindslave)
+ SSticker.mode.implanted.Remove(owner)
+ log_admin("[key_name(owner.current)]'s mindslave master has cryo'd, and is no longer a mindslave.")
+ message_admins("[key_name_admin(owner.current)]'s mindslave master has cryo'd, and is no longer a mindslave.") //Since they were on antag hud earlier, this feels important to log
+ qdel(src)
/datum/objective/hijack
martyr_compatible = 0 //Technically you won't get both anyway.
@@ -507,7 +516,7 @@ GLOBAL_LIST_INIT(potential_theft_objectives, (subtypesof(/datum/theft_objective)
if(SSticker.current_state == GAME_STATE_SETTING_UP)
for(var/mob/new_player/P in GLOB.player_list)
if(P.client && P.ready && P.mind != owner)
- if(P.client.prefs && (P.client.prefs.species == "Machine")) // Special check for species that can't be absorbed. No better solution.
+ if(P.client.prefs && (P.client.prefs.active_character.species == "Machine")) // Special check for species that can't be absorbed. No better solution.
continue
n_p++
else if(SSticker.current_state == GAME_STATE_PLAYING)
diff --git a/code/game/gamemodes/revolution/revolution.dm b/code/game/gamemodes/revolution/revolution.dm
index 93e385df6a9..eec522f577e 100644
--- a/code/game/gamemodes/revolution/revolution.dm
+++ b/code/game/gamemodes/revolution/revolution.dm
@@ -13,7 +13,7 @@
/datum/game_mode/revolution
name = "revolution"
config_tag = "revolution"
- restricted_jobs = list("Security Officer", "Warden", "Detective", "Internal Affairs Agent", "AI", "Cyborg","Captain", "Head of Personnel", "Head of Security", "Chief Engineer", "Research Director", "Chief Medical Officer", "Blueshield", "Nanotrasen Representative", "Security Pod Pilot", "Magistrate", "Brig Physician")
+ restricted_jobs = list("Security Officer", "Warden", "Detective", "Internal Affairs Agent", "AI", "Cyborg","Captain", "Head of Personnel", "Head of Security", "Chief Engineer", "Research Director", "Chief Medical Officer", "Blueshield", "Nanotrasen Representative", "Magistrate", "Brig Physician")
required_players = 20
required_enemies = 1
recommended_enemies = 3
@@ -220,7 +220,7 @@
if(SSshuttle.emergency.mode == SHUTTLE_STRANDED)
SSshuttle.emergency.mode = SHUTTLE_DOCKED
SSshuttle.emergency.timer = world.time
- GLOB.command_announcement.Announce("Hostile enviroment resolved. You have 3 minutes to board the Emergency Shuttle.", null, 'sound/AI/shuttledock.ogg')
+ GLOB.command_announcement.Announce("Hostile enviroment resolved. You have 3 minutes to board the Emergency Shuttle.", null, 'sound/AI/eshuttle_dock.ogg')
return ..()
if(finished != 0)
return TRUE
diff --git a/code/game/gamemodes/setupgame.dm b/code/game/gamemodes/setupgame.dm
index d749f8ef553..7315b52b062 100644
--- a/code/game/gamemodes/setupgame.dm
+++ b/code/game/gamemodes/setupgame.dm
@@ -40,7 +40,6 @@
GLOB.hulkblock = getAssignedBlock("HULK", numsToAssign, DNA_HARD_BOUNDS, good=1)
GLOB.teleblock = getAssignedBlock("TELE", numsToAssign, DNA_HARD_BOUNDS, good=1)
GLOB.fireblock = getAssignedBlock("FIRE", numsToAssign, DNA_HARDER_BOUNDS, good=1)
- GLOB.xrayblock = getAssignedBlock("XRAY", numsToAssign, DNA_HARDER_BOUNDS, good=1)
GLOB.clumsyblock = getAssignedBlock("CLUMSY", numsToAssign)
GLOB.fakeblock = getAssignedBlock("FAKE", numsToAssign)
GLOB.coughblock = getAssignedBlock("COUGH", numsToAssign)
@@ -49,6 +48,10 @@
GLOB.twitchblock = getAssignedBlock("TWITCH", numsToAssign)
GLOB.nervousblock = getAssignedBlock("NERVOUS", numsToAssign)
GLOB.wingdingsblock = getAssignedBlock("WINGDINGS", numsToAssign)
+ GLOB.mesonblock = getAssignedBlock("MESONS", numsToAssign, good=1)
+ GLOB.noflashblock = getAssignedBlock("NOFLASH", numsToAssign, DNA_HARDER_BOUNDS, good=1)
+ GLOB.nightvisionblock = getAssignedBlock("NIGHTVISION", numsToAssign, DNA_HARDER_BOUNDS, good=1)
+
// Bay muts
GLOB.breathlessblock = getAssignedBlock("BREATHLESS", numsToAssign, DNA_HARD_BOUNDS, good=1)
@@ -62,7 +65,6 @@
GLOB.noprintsblock = getAssignedBlock("NOPRINTS", numsToAssign, DNA_HARD_BOUNDS, good=1)
GLOB.shockimmunityblock = getAssignedBlock("SHOCKIMMUNITY", numsToAssign, good=1)
GLOB.smallsizeblock = getAssignedBlock("SMALLSIZE", numsToAssign, DNA_HARD_BOUNDS, good=1)
-
//
// Goon muts
/////////////////////////////////////////////
diff --git a/code/game/gamemodes/shadowling/shadowling.dm b/code/game/gamemodes/shadowling/shadowling.dm
index 2e2230fc419..b9a4eaf38a7 100644
--- a/code/game/gamemodes/shadowling/shadowling.dm
+++ b/code/game/gamemodes/shadowling/shadowling.dm
@@ -74,7 +74,7 @@ Made by Xhuis
required_enemies = 2
recommended_enemies = 2
restricted_jobs = list("AI", "Cyborg")
- protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Head of Personnel", "Captain", "Blueshield", "Nanotrasen Representative", "Security Pod Pilot", "Magistrate", "Brig Physician", "Internal Affairs Agent", "Nanotrasen Navy Officer", "Special Operations Officer", "Syndicate Officer", "Solar Federation General")
+ protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Head of Personnel", "Captain", "Blueshield", "Nanotrasen Representative", "Magistrate", "Brig Physician", "Internal Affairs Agent", "Nanotrasen Navy Officer", "Special Operations Officer", "Syndicate Officer", "Solar Federation General")
/datum/game_mode/shadowling/announce()
to_chat(world, "The current game mode is - Shadowling!")
diff --git a/code/game/gamemodes/shadowling/shadowling_abilities.dm b/code/game/gamemodes/shadowling/shadowling_abilities.dm
index 3b491765919..c764028ac41 100644
--- a/code/game/gamemodes/shadowling/shadowling_abilities.dm
+++ b/code/game/gamemodes/shadowling/shadowling_abilities.dm
@@ -418,7 +418,7 @@
qdel(B)
/datum/reagent/shadowling_blindness_smoke //Blinds non-shadowlings, heals shadowlings/thralls
- name = "odd black liquid"
+ name = "Odd black liquid"
id = "blindness_smoke"
description = "<::ERROR::> CANNOT ANALYZE REAGENT <::ERROR::>"
color = "#000000" //Complete black (RGB: 0, 0, 0)
diff --git a/code/game/gamemodes/steal_items.dm b/code/game/gamemodes/steal_items.dm
index 77e775939fc..9814eb3ff2e 100644
--- a/code/game/gamemodes/steal_items.dm
+++ b/code/game/gamemodes/steal_items.dm
@@ -74,8 +74,8 @@
return 0
/datum/theft_objective/defib
- name = "a compact defibrillator"
- typepath = /obj/item/defibrillator/compact
+ name = "the chief medical officer's advanced compact defibrillator"
+ typepath = /obj/item/defibrillator/compact/advanced
protected_jobs = list("Chief Medical Officer", "Paramedic")
location_override = "the Chief Medical Officer's Office"
diff --git a/code/game/gamemodes/traitor/traitor.dm b/code/game/gamemodes/traitor/traitor.dm
index bb062035028..e3f853f2f0b 100644
--- a/code/game/gamemodes/traitor/traitor.dm
+++ b/code/game/gamemodes/traitor/traitor.dm
@@ -11,7 +11,7 @@
name = "traitor"
config_tag = "traitor"
restricted_jobs = list("Cyborg")//They are part of the AI if he is traitor so are they, they use to get double chances
- protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Blueshield", "Nanotrasen Representative", "Security Pod Pilot", "Magistrate", "Internal Affairs Agent", "Brig Physician", "Nanotrasen Navy Officer", "Special Operations Officer", "Syndicate Officer", "Solar Federation General")
+ protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Blueshield", "Nanotrasen Representative", "Magistrate", "Internal Affairs Agent", "Brig Physician", "Nanotrasen Navy Officer", "Special Operations Officer", "Syndicate Officer", "Solar Federation General")
required_players = 0
required_enemies = 1
recommended_enemies = 4
diff --git a/code/game/gamemodes/vampire/traitor_vamp.dm b/code/game/gamemodes/vampire/traitor_vamp.dm
index 9eac23187ca..363829214a6 100644
--- a/code/game/gamemodes/vampire/traitor_vamp.dm
+++ b/code/game/gamemodes/vampire/traitor_vamp.dm
@@ -2,7 +2,7 @@
name = "traitor+vampire"
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", "Solar Federation General")
+ protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Blueshield", "Nanotrasen Representative", "Magistrate", "Chaplain", "Brig Physician", "Internal Affairs Agent", "Nanotrasen Navy Officer", "Special Operations Officer", "Solar Federation General")
restricted_jobs = list("Cyborg")
secondary_restricted_jobs = list("AI")
required_players = 10
@@ -24,7 +24,7 @@
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 secondary_protected_species))
+ if((player.mind in possible_vampires) && (player.client.prefs.active_character.species in secondary_protected_species))
possible_vampires -= player.mind
if(possible_vampires.len > 0)
diff --git a/code/game/gamemodes/vampire/vampire.dm b/code/game/gamemodes/vampire/vampire.dm
index 9085042fe6a..bce5a9753c8 100644
--- a/code/game/gamemodes/vampire/vampire.dm
+++ b/code/game/gamemodes/vampire/vampire.dm
@@ -9,7 +9,7 @@
name = "vampire"
config_tag = "vampire"
restricted_jobs = list("AI", "Cyborg")
- 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", "Syndicate Officer", "Solar Federation General")
+ protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Blueshield", "Nanotrasen Representative", "Magistrate", "Chaplain", "Brig Physician", "Internal Affairs Agent", "Nanotrasen Navy Officer", "Special Operations Officer", "Syndicate Officer", "Solar Federation General")
protected_species = list("Machine")
required_players = 15
required_enemies = 1
diff --git a/code/game/gamemodes/wizard/artefact.dm b/code/game/gamemodes/wizard/artefact.dm
index 259de282382..ddace2bf4ed 100644
--- a/code/game/gamemodes/wizard/artefact.dm
+++ b/code/game/gamemodes/wizard/artefact.dm
@@ -347,9 +347,9 @@ GLOBAL_LIST_EMPTY(multiverse)
/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)
+ user.client.prefs.active_character.copy_to(M)
else
- C.prefs.copy_to(M)
+ C.prefs.active_character.copy_to(M)
M.key = C.key
M.mind.name = user.real_name
to_chat(M, "You are an alternate version of [user.real_name] from another universe! Help [user.p_them()] accomplish [user.p_their()] goals at all costs.")
diff --git a/code/game/gamemodes/wizard/raginmages.dm b/code/game/gamemodes/wizard/raginmages.dm
index d50a6200764..88cd471b372 100644
--- a/code/game/gamemodes/wizard/raginmages.dm
+++ b/code/game/gamemodes/wizard/raginmages.dm
@@ -147,7 +147,7 @@
if(!G || !G.key)
return // Let's not steal someone's soul here
var/mob/living/carbon/human/new_character = new(pick(GLOB.latejoin))
- G.client.prefs.copy_to(new_character)
+ G.client.prefs.active_character.copy_to(new_character)
new_character.key = G.key
return new_character
diff --git a/code/game/gamemodes/wizard/soulstone.dm b/code/game/gamemodes/wizard/soulstone.dm
index 110bfec4a4e..6aa1e1ce742 100644
--- a/code/game/gamemodes/wizard/soulstone.dm
+++ b/code/game/gamemodes/wizard/soulstone.dm
@@ -83,6 +83,10 @@
if(!ishuman(M)) //If target is not a human
return ..()
+ if(!M.mind)
+ to_chat(user, "This being has no soul!")
+ return ..()
+
if(M.has_brain_worms()) //Borer stuff - RR
to_chat(user, "This being is corrupted by an alien intelligence and cannot be soul trapped.")
return ..()
@@ -430,9 +434,9 @@
if(!chosen_ghost) // Failing that, we grab a ghost
var/list/consenting_candidates
if(purified)
- consenting_candidates = SSghost_spawns.poll_candidates("Would you like to play as a Holy Shade?", ROLE_SENTIENT, FALSE, poll_time = 10 SECONDS, source = /mob/living/simple_animal/shade/holy)
+ consenting_candidates = SSghost_spawns.poll_candidates("Would you like to play as a Holy Shade?", ROLE_SENTIENT, FALSE, poll_time = 10 SECONDS, source = /mob/living/simple_animal/shade/holy, role_cleanname = "holy shade")
else
- consenting_candidates = SSghost_spawns.poll_candidates("Would you like to play as a Shade?", ROLE_SENTIENT, FALSE, poll_time = 10 SECONDS, source = /mob/living/simple_animal/shade)
+ consenting_candidates = SSghost_spawns.poll_candidates("Would you like to play as a Shade?", ROLE_SENTIENT, FALSE, poll_time = 10 SECONDS, source = /mob/living/simple_animal/shade, role_cleanname = "shade")
if(length(consenting_candidates))
chosen_ghost = pick(consenting_candidates)
if(!M)
diff --git a/code/game/gamemodes/wizard/spellbook.dm b/code/game/gamemodes/wizard/spellbook.dm
index 67ad3a2ebae..927b9472ad4 100644
--- a/code/game/gamemodes/wizard/spellbook.dm
+++ b/code/game/gamemodes/wizard/spellbook.dm
@@ -343,6 +343,21 @@
playsound(get_turf(user), 'sound/effects/ghost2.ogg', 50, 1)
return TRUE
+/datum/spellbook_entry/summon/slience_ghosts
+ name = "Silence Ghosts"
+ desc = "Tired of people talking behind your back, and spooking you? Why not silence them, and make the dead deader."
+ cost = 2
+ log_name = "SLG"
+ is_ragin_restricted = TRUE //Salt needs to flow here, to be honest
+
+/datum/spellbook_entry/summon/slience_ghosts/Buy(mob/living/carbon/human/user, obj/item/spellbook/book)
+ new /datum/event/wizard/ghost_mute()
+ active = TRUE
+ to_chat(user, "You have silenced all ghosts!")
+ playsound(get_turf(user), 'sound/effects/ghost.ogg', 50, 1)
+ message_admins("[key_name_admin(usr)] silenced all ghosts as a wizard! (Deadchat is now DISABLED)")
+ return TRUE
+
/datum/spellbook_entry/summon/guns
name = "Summon Guns"
desc = "Nothing could possibly go wrong with arming a crew of lunatics just itching for an excuse to kill you. There is a good chance that they will shoot each other first."
@@ -1029,7 +1044,7 @@
var/obj/item/clothing/mask/horsehead/magichead = new /obj/item/clothing/mask/horsehead
magichead.flags |= NODROP | DROPDEL //curses!
magichead.flags_inv = null //so you can still see their face
- magichead.voicechange = 1 //NEEEEIIGHH
+ magichead.voicechange = TRUE //NEEEEIIGHH
if(!user.unEquip(user.wear_mask))
qdel(user.wear_mask)
user.equip_to_slot_if_possible(magichead, slot_wear_mask, TRUE, TRUE)
diff --git a/code/game/jobs/access.dm b/code/game/jobs/access.dm
index d6d28c698e6..324e0929f19 100644
--- a/code/game/jobs/access.dm
+++ b/code/game/jobs/access.dm
@@ -133,9 +133,9 @@
ACCESS_HEADS, ACCESS_CAPTAIN, ACCESS_CARGO, ACCESS_MAILSORTING, ACCESS_CHAPEL_OFFICE, ACCESS_CE, ACCESS_CHEMISTRY, ACCESS_CLOWN, ACCESS_CMO,
ACCESS_COURT, ACCESS_CONSTRUCTION, ACCESS_CREMATORIUM, ACCESS_JANITOR, ACCESS_ENGINE, ACCESS_EVA, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_FORENSICS_LOCKERS,
ACCESS_GENETICS, ACCESS_GATEWAY, ACCESS_BRIG, ACCESS_HOP, ACCESS_HOS, ACCESS_HYDROPONICS, ACCESS_CHANGE_IDS, ACCESS_KEYCARD_AUTH, ACCESS_KITCHEN,
- ACCESS_LAWYER, ACCESS_LIBRARY, ACCESS_MAGISTRATE, ACCESS_MAINT_TUNNELS, ACCESS_HEADS_VAULT, ACCESS_MEDICAL, ACCESS_MECHANIC, ACCESS_MIME,
+ ACCESS_LAWYER, ACCESS_LIBRARY, ACCESS_MAGISTRATE, ACCESS_MAINT_TUNNELS, ACCESS_HEADS_VAULT, ACCESS_MEDICAL, ACCESS_MIME,
ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM, ACCESS_MORGUE, ACCESS_NETWORK, ACCESS_NTREP, ACCESS_PARAMEDIC, ACCESS_ALL_PERSONAL_LOCKERS,
- ACCESS_ENGINE_EQUIP, ACCESS_PSYCHIATRIST, ACCESS_QM, ACCESS_RD, ACCESS_RC_ANNOUNCE, ACCESS_ROBOTICS, ACCESS_TOX, ACCESS_RESEARCH, ACCESS_SECURITY, ACCESS_PILOT,
+ ACCESS_ENGINE_EQUIP, ACCESS_PSYCHIATRIST, ACCESS_QM, ACCESS_RD, ACCESS_RC_ANNOUNCE, ACCESS_ROBOTICS, ACCESS_TOX, ACCESS_RESEARCH, ACCESS_SECURITY,
ACCESS_SURGERY, ACCESS_TECH_STORAGE, ACCESS_TELEPORTER, ACCESS_THEATRE, ACCESS_TCOMSAT, ACCESS_TOX_STORAGE, ACCESS_VIROLOGY, ACCESS_WEAPONS, ACCESS_XENOBIOLOGY,
ACCESS_XENOARCH)
@@ -158,13 +158,13 @@
if(REGION_GENERAL) //station general
return list(ACCESS_KITCHEN, ACCESS_BAR, ACCESS_HYDROPONICS, ACCESS_JANITOR, ACCESS_CHAPEL_OFFICE, ACCESS_CREMATORIUM, ACCESS_LIBRARY, ACCESS_THEATRE, ACCESS_LAWYER, ACCESS_MAGISTRATE, ACCESS_CLOWN, ACCESS_MIME)
if(REGION_SECURITY) //security
- return list(ACCESS_SEC_DOORS, ACCESS_WEAPONS, ACCESS_SECURITY, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_FORENSICS_LOCKERS, ACCESS_COURT, ACCESS_PILOT, ACCESS_HOS)
+ return list(ACCESS_SEC_DOORS, ACCESS_WEAPONS, ACCESS_SECURITY, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_FORENSICS_LOCKERS, ACCESS_COURT, ACCESS_HOS)
if(REGION_MEDBAY) //medbay
return list(ACCESS_MEDICAL, ACCESS_GENETICS, ACCESS_MORGUE, ACCESS_CHEMISTRY, ACCESS_PSYCHIATRIST, ACCESS_VIROLOGY, ACCESS_SURGERY, ACCESS_CMO, ACCESS_PARAMEDIC)
if(REGION_RESEARCH) //research
return list(ACCESS_RESEARCH, ACCESS_TOX, ACCESS_TOX_STORAGE, ACCESS_GENETICS, ACCESS_ROBOTICS, ACCESS_XENOBIOLOGY, ACCESS_XENOARCH, ACCESS_MINISAT, ACCESS_RD, ACCESS_NETWORK)
if(REGION_ENGINEERING) //engineering and maintenance
- return list(ACCESS_CONSTRUCTION, ACCESS_MAINT_TUNNELS, ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_TECH_STORAGE, ACCESS_ATMOSPHERICS, ACCESS_MINISAT, ACCESS_CE, ACCESS_MECHANIC)
+ return list(ACCESS_CONSTRUCTION, ACCESS_MAINT_TUNNELS, ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_TECH_STORAGE, ACCESS_ATMOSPHERICS, ACCESS_MINISAT, ACCESS_CE)
if(REGION_SUPPLY) //supply
return list(ACCESS_MAILSORTING, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM, ACCESS_CARGO, ACCESS_QM)
if(REGION_COMMAND) //command
@@ -334,10 +334,6 @@
return "Nanotrasen Rep."
if(ACCESS_PARAMEDIC)
return "Paramedic"
- if(ACCESS_MECHANIC)
- return "Mechanic Workshop"
- if(ACCESS_PILOT)
- return "Security Pod Pilot"
if(ACCESS_MAGISTRATE)
return "Magistrate"
if(ACCESS_MINERAL_STOREROOM)
diff --git a/code/game/jobs/job/engineering.dm b/code/game/jobs/job/engineering.dm
index a3333e1dc82..b73a15314d8 100644
--- a/code/game/jobs/job/engineering.dm
+++ b/code/game/jobs/job/engineering.dm
@@ -12,11 +12,11 @@
access = list(ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_TECH_STORAGE, ACCESS_MAINT_TUNNELS,
ACCESS_TELEPORTER, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_ATMOSPHERICS, ACCESS_EMERGENCY_STORAGE, ACCESS_EVA,
ACCESS_HEADS, ACCESS_CONSTRUCTION, ACCESS_SEC_DOORS,
- ACCESS_CE, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_TCOMSAT, ACCESS_MINISAT, ACCESS_MECHANIC, ACCESS_MINERAL_STOREROOM)
+ ACCESS_CE, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_TCOMSAT, ACCESS_MINISAT, ACCESS_MINERAL_STOREROOM)
minimal_access = list(ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_TECH_STORAGE, ACCESS_MAINT_TUNNELS,
ACCESS_TELEPORTER, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_ATMOSPHERICS, ACCESS_EMERGENCY_STORAGE, ACCESS_EVA,
ACCESS_HEADS, ACCESS_CONSTRUCTION, ACCESS_SEC_DOORS,
- ACCESS_CE, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_TCOMSAT, ACCESS_MINISAT, ACCESS_MECHANIC, ACCESS_MINERAL_STOREROOM)
+ ACCESS_CE, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_TCOMSAT, ACCESS_MINISAT, ACCESS_MINERAL_STOREROOM)
minimal_player_age = 21
exp_requirements = 1200
exp_type = EXP_TYPE_ENGINEERING
@@ -117,37 +117,3 @@
dufflebag = /obj/item/storage/backpack/duffel/atmos
box = /obj/item/storage/box/engineer
-/datum/job/mechanic
- title = "Mechanic"
- flag = JOB_MECHANIC
- department_flag = JOBCAT_KARMA
- total_positions = 1
- spawn_positions = 1
- is_engineering = 1
- supervisors = "the chief engineer"
- department_head = list("Chief Engineer")
- selection_color = "#fff5cc"
- access = list(ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_TECH_STORAGE, ACCESS_MAINT_TUNNELS, ACCESS_MECHANIC, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_MINERAL_STOREROOM)
- minimal_access = list(ACCESS_MAINT_TUNNELS, ACCESS_EMERGENCY_STORAGE, ACCESS_MECHANIC, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_MINERAL_STOREROOM)
- outfit = /datum/outfit/job/mechanic
-
-/datum/outfit/job/mechanic
- name = "Mechanic"
- jobtype = /datum/job/mechanic
-
- uniform = /obj/item/clothing/under/rank/mechanic
- belt = /obj/item/storage/belt/utility/full
- shoes = /obj/item/clothing/shoes/workboots
- head = /obj/item/clothing/head/hardhat
- l_ear = /obj/item/radio/headset/headset_eng
- id = /obj/item/card/id/engineering
- r_pocket = /obj/item/t_scanner
- pda = /obj/item/pda/engineering
- backpack_contents = list(
- /obj/item/pod_paint_bucket = 1
- )
-
- backpack = /obj/item/storage/backpack/industrial
- satchel = /obj/item/storage/backpack/satchel_eng
- dufflebag = /obj/item/storage/backpack/duffel/engineering
- box = /obj/item/storage/box/engineer
diff --git a/code/game/jobs/job/job.dm b/code/game/jobs/job/job.dm
index c39e1ff555f..49e375d2123 100644
--- a/code/game/jobs/job/job.dm
+++ b/code/game/jobs/job/job.dm
@@ -123,7 +123,7 @@
var/list/prohibited_disabilities = list(DISABILITY_FLAG_BLIND, DISABILITY_FLAG_DEAF, DISABILITY_FLAG_MUTE, DISABILITY_FLAG_DIZZY)
for(var/i = 1, i < prohibited_disabilities.len, i++)
var/this_disability = prohibited_disabilities[i]
- if(C.prefs.disabilities & this_disability)
+ if(C.prefs.active_character.disabilities & this_disability)
return 1
return 0
@@ -173,9 +173,9 @@
if(box && H.dna.species.speciesbox)
box = H.dna.species.speciesbox
- if(allow_loadout && H.client && (H.client.prefs.loadout_gear && H.client.prefs.loadout_gear.len))
- for(var/gear in H.client.prefs.loadout_gear)
- var/datum/gear/G = GLOB.gear_datums[gear]
+ if(allow_loadout && H.client && length(H.client.prefs.active_character.loadout_gear))
+ for(var/gear in H.client.prefs.active_character.loadout_gear)
+ var/datum/gear/G = GLOB.gear_datums[text2path(gear) || gear]
if(G)
var/permitted = FALSE
@@ -185,16 +185,13 @@
else
permitted = TRUE
- if(G.whitelisted && (G.whitelisted != H.dna.species.name || !is_alien_whitelisted(H, G.whitelisted)))
- permitted = FALSE
-
if(!permitted)
- to_chat(H, "Your current job or whitelist status does not permit you to spawn with [gear]!")
+ to_chat(H, "Your current job or whitelist status does not permit you to spawn with [G.display_name]!")
continue
if(G.slot)
if(H.equip_to_slot_or_del(G.spawn_item(H), G.slot, TRUE))
- to_chat(H, "Equipping you with [gear]!")
+ to_chat(H, "Equipping you with [G.display_name]!")
else
gear_leftovers += G
else
@@ -212,12 +209,12 @@
if(gear_leftovers.len)
for(var/datum/gear/G in gear_leftovers)
- var/atom/placed_in = H.equip_or_collect(G.spawn_item(null, H.client.prefs.loadout_gear[G.display_name]))
+ var/atom/placed_in = H.equip_or_collect(G.spawn_item(null, H.client.prefs.active_character.loadout_gear[G.display_name]))
if(istype(placed_in))
if(isturf(placed_in))
to_chat(H, "Placing [G.display_name] on [placed_in]!")
else
- to_chat(H, "Placing [G.display_name] in [placed_in.name].")
+ to_chat(H, "Placing [G.display_name] in your [placed_in.name].")
continue
if(H.equip_to_appropriate_slot(G))
to_chat(H, "Placing [G.display_name] in your inventory!")
diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm
index a7a8b69edba..407a932c3b8 100644
--- a/code/game/jobs/job/security.dm
+++ b/code/game/jobs/job/security.dm
@@ -10,13 +10,13 @@
selection_color = "#ffdddd"
req_admin_notify = 1
access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_COURT,
- ACCESS_FORENSICS_LOCKERS, ACCESS_PILOT, ACCESS_MORGUE, ACCESS_MAINT_TUNNELS, ACCESS_ALL_PERSONAL_LOCKERS,
+ ACCESS_FORENSICS_LOCKERS, ACCESS_MORGUE, ACCESS_MAINT_TUNNELS, ACCESS_ALL_PERSONAL_LOCKERS,
ACCESS_RESEARCH, ACCESS_ENGINE, ACCESS_MINING, ACCESS_MEDICAL, ACCESS_CONSTRUCTION, ACCESS_MAILSORTING,
ACCESS_HEADS, ACCESS_HOS, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_WEAPONS)
minimal_access = list(ACCESS_EVA, ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_COURT,
ACCESS_FORENSICS_LOCKERS, ACCESS_MORGUE, ACCESS_MAINT_TUNNELS, ACCESS_ALL_PERSONAL_LOCKERS,
ACCESS_RESEARCH, ACCESS_ENGINE, ACCESS_MINING, ACCESS_MEDICAL, ACCESS_CONSTRUCTION, ACCESS_MAILSORTING,
- ACCESS_HEADS, ACCESS_HOS, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_PILOT, ACCESS_WEAPONS)
+ ACCESS_HEADS, ACCESS_HOS, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_WEAPONS)
minimal_player_age = 21
exp_requirements = 1200
exp_type = EXP_TYPE_SECURITY
@@ -222,40 +222,3 @@
backpack = /obj/item/storage/backpack/medic
satchel = /obj/item/storage/backpack/satchel_med
dufflebag = /obj/item/storage/backpack/duffel/medical
-
-
-/datum/job/pilot
- title = "Security Pod Pilot"
- flag = JOB_PILOT
- department_flag = JOBCAT_KARMA
- total_positions = 1
- spawn_positions = 1
- is_security = 1
- supervisors = "the head of security"
- department_head = list("Head of Security")
- selection_color = "#ffeeee"
- access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_COURT, ACCESS_MAINT_TUNNELS, ACCESS_MORGUE, ACCESS_WEAPONS, ACCESS_PILOT, ACCESS_EXTERNAL_AIRLOCKS)
- minimal_access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_COURT, ACCESS_MAINT_TUNNELS, ACCESS_WEAPONS, ACCESS_PILOT, ACCESS_EXTERNAL_AIRLOCKS)
- minimal_player_age = 7
- outfit = /datum/outfit/job/pilot
-
-/datum/outfit/job/pilot
- name = "Security Pod Pilot"
- jobtype = /datum/job/pilot
- uniform = /obj/item/clothing/under/rank/security/pod_pilot
- suit = /obj/item/clothing/suit/jacket/pilot
- gloves = /obj/item/clothing/gloves/color/black
- shoes = /obj/item/clothing/shoes/jackboots
- l_ear = /obj/item/radio/headset/headset_sec/alt
- id = /obj/item/card/id/security
- l_pocket = /obj/item/flash
- suit_store = /obj/item/gun/energy/gun/advtaser
- pda = /obj/item/pda/security
- backpack_contents = list(
- /obj/item/restraints/handcuffs = 1
- )
- implants = list(/obj/item/implant/mindshield)
- backpack = /obj/item/storage/backpack/security
- satchel = /obj/item/storage/backpack/satchel_sec
- dufflebag = /obj/item/storage/backpack/duffel/security
- box = /obj/item/storage/box/engineer
diff --git a/code/game/jobs/job/supervisor.dm b/code/game/jobs/job/supervisor.dm
index fa0fb892cae..46ed46f5ae2 100644
--- a/code/game/jobs/job/supervisor.dm
+++ b/code/game/jobs/job/supervisor.dm
@@ -194,16 +194,18 @@ GLOBAL_DATUM_INIT(captain_announcement, /datum/announcement/minor, new(do_newsca
/datum/job/judge
title = "Magistrate"
flag = JOB_JUDGE
- department_flag = JOBCAT_KARMA
+ department_flag = JOBCAT_ENGSEC
total_positions = 1
spawn_positions = 1
supervisors = "the Nanotrasen Supreme Court"
department_head = list("Captain")
selection_color = "#ddddff"
- req_admin_notify = 1
- is_legal = 1
+ req_admin_notify = TRUE
+ is_legal = TRUE
transfer_allowed = FALSE
minimal_player_age = 30
+ exp_requirements = 6000 // 100 hours baby
+ exp_type = EXP_TYPE_SECURITY
access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_COURT, ACCESS_FORENSICS_LOCKERS,
ACCESS_MEDICAL, ACCESS_ENGINE, ACCESS_CHANGE_IDS, ACCESS_EVA, ACCESS_HEADS,
ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_MAINT_TUNNELS, ACCESS_BAR, ACCESS_JANITOR, ACCESS_CONSTRUCTION, ACCESS_MORGUE,
diff --git a/code/game/jobs/jobs.dm b/code/game/jobs/jobs.dm
index e0e817f76ef..c15c59303b7 100644
--- a/code/game/jobs/jobs.dm
+++ b/code/game/jobs/jobs.dm
@@ -17,7 +17,6 @@ GLOBAL_LIST_INIT(engineering_positions, list(
"Chief Engineer",
"Station Engineer",
"Life Support Specialist",
- "Mechanic"
))
@@ -78,7 +77,6 @@ GLOBAL_LIST_INIT(security_positions, list(
"Detective",
"Security Officer",
"Brig Physician",
- "Security Pod Pilot",
"Magistrate"
))
@@ -98,10 +96,7 @@ GLOBAL_LIST_INIT(whitelisted_positions, list(
"Blueshield",
"Nanotrasen Representative",
"Barber",
- "Mechanic",
- "Brig Physician",
- "Magistrate",
- "Security Pod Pilot",
+ "Brig Physician"
))
diff --git a/code/game/machinery/Beacon.dm b/code/game/machinery/Beacon.dm
index 41612fb870b..4705c041775 100644
--- a/code/game/machinery/Beacon.dm
+++ b/code/game/machinery/Beacon.dm
@@ -4,7 +4,8 @@
name = "Bluespace Gigabeacon"
desc = "A device that draws power from bluespace and creates a permanent tracking beacon."
level = 1 // underfloor
- layer = 2.5
+ layer = WIRE_LAYER
+ plane = FLOOR_PLANE
anchored = 1
use_power = IDLE_POWER_USE
idle_power_usage = 0
@@ -26,7 +27,8 @@
Beacon.syndicate = syndicate
Beacon.area_bypass = area_bypass
Beacon.cc_beacon = cc_beacon
- hide(T.intact)
+ if(!T.transparent_floor)
+ hide(T.intact)
/obj/machinery/bluespace_beacon/proc/destroy_beacon()
QDEL_NULL(Beacon)
diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm
index 57062a6e806..1272a667baa 100644
--- a/code/game/machinery/Sleeper.dm
+++ b/code/game/machinery/Sleeper.dm
@@ -512,7 +512,7 @@
if(!istype(L) || L.buckled)
return
if(L.abiotic())
- to_chat(user, "Subject cannot have abiotic items on.")
+ to_chat(user, "Subject may not hold anything in their hands.")
return
if(L.has_buckled_mobs()) //mob attached to us
to_chat(user, "[L] will not fit into [src] because [L.p_they()] [L.p_have()] a slime latched onto [L.p_their()] head.")
diff --git a/code/game/machinery/adv_med.dm b/code/game/machinery/adv_med.dm
index 9b16d52383c..52857a071dc 100644
--- a/code/game/machinery/adv_med.dm
+++ b/code/game/machinery/adv_med.dm
@@ -67,7 +67,7 @@
return
var/mob/living/carbon/human/M = TYPECAST_YOUR_SHIT.affecting
if(M.abiotic())
- to_chat(user, "Subject cannot have abiotic items on.")
+ to_chat(user, "Subject may not hold anything in their hands.")
return
M.forceMove(src)
occupant = M
@@ -122,7 +122,7 @@
if(H.buckled)
return FALSE
if(H.abiotic())
- to_chat(user, "Subject cannot have abiotic items on.")
+ to_chat(user, "Subject may not hold anything in their hands.")
return FALSE
if(H.has_buckled_mobs()) //mob attached to us
to_chat(user, "[H] will not fit into [src] because [H.p_they()] [H.p_have()] a slime latched onto [H.p_their()] head.")
diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm
index 8a04c310e17..e390634bb34 100644
--- a/code/game/machinery/camera/camera.dm
+++ b/code/game/machinery/camera/camera.dm
@@ -9,7 +9,7 @@
layer = WALL_OBJ_LAYER
resistance_flags = FIRE_PROOF
damage_deflection = 12
- armor = list("melee" = 50, "bullet" = 20, "laser" = 20, "energy" = 20, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 90, "acid" = 50)
+ armor = list(MELEE = 50, BULLET = 20, LASER = 20, ENERGY = 20, BOMB = 0, BIO = 0, RAD = 0, FIRE = 90, ACID = 50)
var/datum/wires/camera/wires = null // Wires datum
max_integrity = 100
integrity_failure = 50
diff --git a/code/game/machinery/camera/camera_assembly.dm b/code/game/machinery/camera/camera_assembly.dm
index c7d95370613..a375e2d929b 100644
--- a/code/game/machinery/camera/camera_assembly.dm
+++ b/code/game/machinery/camera/camera_assembly.dm
@@ -13,8 +13,8 @@
w_class = WEIGHT_CLASS_SMALL
anchored = FALSE
materials = list(MAT_METAL=400, MAT_GLASS=250)
- // Motion, EMP-Proof, X-Ray
- var/list/obj/item/possible_upgrades = list(/obj/item/assembly/prox_sensor, /obj/item/stack/sheet/mineral/plasma, /obj/item/analyzer)
+ // Motion, EMP-Proof
+ var/list/obj/item/possible_upgrades = list(/obj/item/assembly/prox_sensor, /obj/item/stack/sheet/mineral/plasma)
var/list/upgrades = list()
var/state = ASSEMBLY_UNBUILT
diff --git a/code/game/machinery/camera/presets.dm b/code/game/machinery/camera/presets.dm
index 33c970639e5..4d21a0d91a1 100644
--- a/code/game/machinery/camera/presets.dm
+++ b/code/game/machinery/camera/presets.dm
@@ -25,7 +25,7 @@
// ALL UPGRADES
/obj/machinery/camera/all
- icon_state = "xraycamera" //mapping icon.
+ icon_state = "xraycam" //mapping icon.
/obj/machinery/camera/all/Initialize(mapload)
. = ..()
diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm
index e8d5cfcf437..e67e51813c4 100644
--- a/code/game/machinery/cloning.dm
+++ b/code/game/machinery/cloning.dm
@@ -48,7 +48,7 @@ GLOBAL_LIST_INIT(cloner_biomass_items, list(\
var/obj/effect/countdown/clonepod/countdown
var/list/brine_types = list("corazone", "perfluorodecalin", "epinephrine", "salglu_solution") //stops heart attacks, heart failure, shock, and keeps their O2 levels normal
- var/list/missing_organs
+ var/list/missing_organs = list()
var/organs_number = 0
light_color = LIGHT_COLOR_PURE_GREEN
@@ -100,6 +100,7 @@ GLOBAL_LIST_INIT(cloner_biomass_items, list(\
/obj/machinery/clonepod/Destroy()
if(connected)
connected.pods -= src
+ connected = null
if(clonemind)
UnregisterSignal(clonemind.current, COMSIG_LIVING_REVIVE)
UnregisterSignal(clonemind, COMSIG_MIND_TRANSER_TO)
@@ -337,9 +338,9 @@ GLOBAL_LIST_INIT(cloner_biomass_items, list(\
progress += (100 - MINIMUM_HEAL_LEVEL)
var/milestone = CLONE_INITIAL_DAMAGE / organs_number
// Doing this as a #define so that the value can change when evaluated multiple times
-#define INSTALLED (organs_number - LAZYLEN(missing_organs))
+#define INSTALLED (organs_number - length(missing_organs))
- while((progress / milestone) > INSTALLED && LAZYLEN(missing_organs))
+ while((progress / milestone) > INSTALLED && length(missing_organs))
var/obj/item/organ/I = pick_n_take(missing_organs)
I.safe_replace(occupant)
@@ -493,9 +494,7 @@ GLOBAL_LIST_INIT(cloner_biomass_items, list(\
clonemind = null
- for(var/i in missing_organs)
- qdel(i)
- missing_organs.Cut()
+ QDEL_LIST(missing_organs)
occupant.SetLoseBreath(0) // Stop friggin' dying, gosh damn
occupant.setOxyLoss(0)
for(var/datum/disease/critical/crit in occupant.viruses)
@@ -522,9 +521,7 @@ GLOBAL_LIST_INIT(cloner_biomass_items, list(\
message += "Is this what dying is like? Yes it is."
to_chat(occupant, "[message]")
SEND_SOUND(occupant, sound('sound/hallucinations/veryfar_noise.ogg', 0, 1, 50))
- for(var/i in missing_organs)
- qdel(i)
- missing_organs.Cut()
+ QDEL_LIST(missing_organs)
clonemind = null
spawn(40)
qdel(occupant)
@@ -576,10 +573,7 @@ GLOBAL_LIST_INIT(cloner_biomass_items, list(\
malfunction(go_easy = TRUE)
/obj/machinery/clonepod/proc/maim_clone(mob/living/carbon/human/H)
- LAZYINITLIST(missing_organs)
- for(var/i in missing_organs)
- qdel(i)
- missing_organs.Cut()
+ QDEL_LIST(missing_organs)
H.setCloneLoss(CLONE_INITIAL_DAMAGE, FALSE)
H.setBrainLoss(BRAIN_INITIAL_DAMAGE)
@@ -603,7 +597,7 @@ GLOBAL_LIST_INIT(cloner_biomass_items, list(\
I.forceMove(src)
missing_organs += I
- organs_number = LAZYLEN(missing_organs)
+ organs_number = length(missing_organs)
H.updatehealth()
/obj/machinery/clonepod/proc/check_brine()
diff --git a/code/game/machinery/computer/Operating.dm b/code/game/machinery/computer/Operating.dm
index bc004c28b1f..739b9bd5508 100644
--- a/code/game/machinery/computer/Operating.dm
+++ b/code/game/machinery/computer/Operating.dm
@@ -25,11 +25,9 @@
/obj/machinery/computer/operating/New()
..()
- for(dir in list(NORTH,EAST,SOUTH,WEST))
- table = locate(/obj/machinery/optable, get_step(src, dir))
- if(table)
- table.computer = src
- break
+ table = locate(/obj/machinery/optable, orange(1, src))
+ if(table)
+ table.computer = src
/obj/machinery/computer/operating/Destroy()
if(table)
diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm
index 391a137749a..a15712394f5 100644
--- a/code/game/machinery/computer/arcade.dm
+++ b/code/game/machinery/computer/arcade.dm
@@ -257,6 +257,7 @@
enemy_name = "Cuban Pete"
name = "Outbomb Cuban Pete"
+ add_hiddenprint(user)
updateUsrDialog()
// *** THE ORION TRAIL ** //
@@ -962,6 +963,7 @@
to_chat(user, "You override the cheat code menu and skip to Cheat #[rand(1, 50)]: Realism Mode.")
name = "The Orion Trail: Realism Edition"
desc = "Learn how our ancestors got to Orion, and try not to die in the process!"
+ add_hiddenprint(user)
newgame()
emagged = 1
diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm
index 78895d0d099..8cac7136b29 100644
--- a/code/game/machinery/computer/buildandrepair.dm
+++ b/code/game/machinery/computer/buildandrepair.dm
@@ -257,8 +257,8 @@
board_name = "RD Console"
desc = "Swipe a Scientist level ID or higher to reconfigure."
build_path = /obj/machinery/computer/rdconsole/core
- req_access = list(ACCESS_TOX) // This is for adjusting the type of computer we're building - in case something messes up the pre-existing robotics or mechanics consoles
- var/list/access_types = list("R&D Core", "Robotics", "E.X.P.E.R.I-MENTOR", "Mechanics", "Public")
+ req_access = list(ACCESS_TOX) // This is for adjusting the type of computer we're building - in case something messes up the pre-existing robotics console
+ var/list/access_types = list("R&D Core", "Robotics", "E.X.P.E.R.I-MENTOR", "Public")
/obj/item/circuitboard/rdconsole/robotics
board_name = "RD Console - Robotics"
@@ -268,10 +268,6 @@
board_name = "RD Console - E.X.P.E.R.I-MENTOR"
build_path = /obj/machinery/computer/rdconsole/experiment
-/obj/item/circuitboard/rdconsole/mechanics
- board_name = "RD Console - Mechanics"
- build_path = /obj/machinery/computer/rdconsole/mechanics
-
/obj/item/circuitboard/rdconsole/public
board_name = "RD Console - Public"
build_path = /obj/machinery/computer/rdconsole/public
@@ -281,10 +277,6 @@
board_name = "Exosuit Control Console"
build_path = /obj/machinery/computer/mecha
-/obj/item/circuitboard/pod_locater
- board_name = "Pod Location Console"
- build_path = /obj/machinery/computer/podtracker
-
/obj/item/circuitboard/rdservercontrol
board_name = "RD Server Control"
build_path = /obj/machinery/computer/rdservercontrol
@@ -426,9 +418,6 @@
if("E.X.P.E.R.I-MENTOR")
board_name = "RD Console - E.X.P.E.R.I-MENTOR"
build_path = /obj/machinery/computer/rdconsole/experiment
- if("Mechanics")
- board_name = "RD Console - Mechanics"
- build_path = /obj/machinery/computer/rdconsole/mechanics
if("Public")
board_name = "RD Console - Public"
build_path = /obj/machinery/computer/rdconsole/public
@@ -462,6 +451,17 @@
drop_computer_parts()
return ..() // will qdel the frame
+/obj/structure/computerframe/AltClick(mob/user)
+ if(user.incapacitated())
+ to_chat(user, "You can't do that right now!")
+ return
+ if(!Adjacent(user))
+ return
+ if(anchored)
+ to_chat(user, "The frame is anchored to the floor!")
+ return
+ setDir(turn(dir, 90))
+
/obj/structure/computerframe/obj_break(damage_flag)
deconstruct()
@@ -544,7 +544,8 @@
if(STATE_GLASS)
to_chat(user, "You connect the monitor.")
I.play_tool_sound(src)
- var/B = new circuit.build_path(loc)
+ var/obj/machinery/computer/B = new circuit.build_path(loc)
+ B.setDir(dir)
if(istype(circuit, /obj/item/circuitboard/supplycomp))
var/obj/machinery/computer/supplycomp/SC = B
var/obj/item/circuitboard/supplycomp/C = circuit
diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm
index 563fded5f1d..9d5b17e2d81 100644
--- a/code/game/machinery/computer/card.dm
+++ b/code/game/machinery/computer/card.dm
@@ -48,9 +48,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
/datum/job/judge,
/datum/job/blueshield,
/datum/job/nanotrasenrep,
- /datum/job/pilot,
/datum/job/brigdoc,
- /datum/job/mechanic,
/datum/job/barber,
/datum/job/chaplain
)
diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm
index 46da580a0d1..71e6155056f 100644
--- a/code/game/machinery/computer/communications.dm
+++ b/code/game/machinery/computer/communications.dm
@@ -456,11 +456,11 @@
return
if(seclevel2num(get_security_level()) >= SEC_LEVEL_RED) // There is a serious threat we gotta move no time to give them five minutes.
+ SSshuttle.emergency.canRecall = FALSE
SSshuttle.emergency.request(null, 0.5, null, " Automatic Crew Transfer", 1)
- SSshuttle.emergency.canRecall = FALSE
else
- SSshuttle.emergency.request(null, 1, null, " Automatic Crew Transfer", 0)
SSshuttle.emergency.canRecall = FALSE
+ SSshuttle.emergency.request(null, 1, null, " Automatic Crew Transfer", 0)
if(user)
log_game("[key_name(user)] has called the shuttle.")
message_admins("[key_name_admin(user)] has called the shuttle - [formatJumpTo(user)].", 1)
diff --git a/code/game/machinery/computer/computer.dm b/code/game/machinery/computer/computer.dm
index 1c394d261f6..95a9caae804 100644
--- a/code/game/machinery/computer/computer.dm
+++ b/code/game/machinery/computer/computer.dm
@@ -9,7 +9,7 @@
active_power_usage = 300
max_integrity = 200
integrity_failure = 100
- armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 40, "acid" = 20)
+ armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 40, ACID = 20)
var/obj/item/circuitboard/circuit = null //if circuit==null, computer can't disassembly
var/processing = 0
var/icon_keyboard = "generic_key"
@@ -119,10 +119,10 @@
switch(severity)
if(1)
if(prob(50))
- obj_break("energy")
+ obj_break(ENERGY)
if(2)
if(prob(10))
- obj_break("energy")
+ obj_break(ENERGY)
/obj/machinery/computer/deconstruct(disassembled = TRUE, mob/user)
on_deconstruction()
diff --git a/code/game/machinery/computer/message.dm b/code/game/machinery/computer/message.dm
index a7345522b25..d5d469ccdd1 100644
--- a/code/game/machinery/computer/message.dm
+++ b/code/game/machinery/computer/message.dm
@@ -34,6 +34,24 @@
light_color = LIGHT_COLOR_DARKGREEN
+/obj/machinery/computer/message_monitor/Initialize()
+ ..()
+ return INITIALIZE_HINT_LATELOAD // Give the message server time to initialize
+
+/obj/machinery/computer/message_monitor/LateInitialize()
+ //If the monitor isn't linked to a server, and there's a server available, default it to the first one in the list.
+ if(!linkedServer && length(GLOB.message_servers))
+ linkedServer = GLOB.message_servers[1]
+ RegisterSignal(linkedServer, COMSIG_PARENT_QDELETING, .proc/unlink_server)
+
+/obj/machinery/computer/message_monitor/proc/unlink_server()
+ SIGNAL_HANDLER
+ linkedServer = null
+
+/obj/machinery/computer/message_monitor/Destroy()
+ customrecepient = null
+ linkedServer = null
+ return ..()
/obj/machinery/computer/message_monitor/screwdriver_act(mob/user, obj/item/I)
if(emag) //Stops people from just unscrewing the monitor and putting it back to get the console working again.
@@ -71,14 +89,6 @@
..()
-/obj/machinery/computer/message_monitor/Initialize()
- ..()
- //Is the server isn't linked to a server, and there's a server available, default it to the first one in the list.
- if(!linkedServer)
- if(GLOB.message_servers && GLOB.message_servers.len > 0)
- linkedServer = GLOB.message_servers[1]
- return
-
/obj/machinery/computer/message_monitor/attack_hand(mob/user as mob)
if(..())
return
@@ -490,18 +500,18 @@
/obj/item/paper/monitorkey
- //..()
name = "Monitor Decryption Key"
var/obj/machinery/message_server/server = null
-/obj/item/paper/monitorkey/New()
+/obj/item/paper/monitorkey/Initialize(mapload)
..()
- spawn(10)
- if(GLOB.message_servers)
- for(var/obj/machinery/message_server/server in GLOB.message_servers)
- if(!isnull(server))
- if(!isnull(server.decryptkey))
- info = "Daily Key Reset
The new message monitor key is '[server.decryptkey]'.
Please keep this a secret and away from the clown.
If necessary, change the password to a more secure one."
- info_links = info
- overlays += "paper_words"
- break
+ return INITIALIZE_HINT_LATELOAD
+
+/obj/item/paper/monitorkey/LateInitialize()
+ for(var/obj/machinery/message_server/server in GLOB.message_servers)
+ if(!isnull(server))
+ if(!isnull(server.decryptkey))
+ info = "Daily Key Reset
The new message monitor key is '[server.decryptkey]'.
Please keep this a secret and away from the clown.
If necessary, change the password to a more secure one."
+ info_links = info
+ overlays += "paper_words"
+ break
diff --git a/code/game/machinery/computer/pod.dm b/code/game/machinery/computer/pod.dm
index 322031d9997..c8748b052d8 100644
--- a/code/game/machinery/computer/pod.dm
+++ b/code/game/machinery/computer/pod.dm
@@ -261,7 +261,7 @@
icon_state = "oldcomp"
icon_screen = "library"
icon_keyboard = null
- name = "DoorMex Control Computer"
+ name = "\improper DoorMex control computer"
circuit = /obj/item/circuitboard/olddoor
@@ -343,7 +343,7 @@
return
/obj/structure/deathsquad_tele
- name = "Mech Teleporter"
+ name = "mech teleporter"
density = 0
anchored = 1
icon = 'icons/obj/stationobjs.dmi'
diff --git a/code/game/machinery/computer/pod_tracking_console.dm b/code/game/machinery/computer/pod_tracking_console.dm
deleted file mode 100644
index e8072d9e1d7..00000000000
--- a/code/game/machinery/computer/pod_tracking_console.dm
+++ /dev/null
@@ -1,41 +0,0 @@
-/obj/machinery/computer/podtracker
- name = "pod tracking console"
- icon = 'icons/obj/computer.dmi'
- icon_keyboard = "tech_key"
- icon_screen = "rdcomp"
- light_color = LIGHT_COLOR_PURPLE
- req_access = list(ACCESS_ROBOTICS)
- circuit = /obj/item/circuitboard/pod_locater
-
-/obj/machinery/computer/podtracker/attack_ai(mob/user)
- return attack_hand(user)
-
-/obj/machinery/computer/podtracker/attack_hand(mob/user)
- ui_interact(user)
-
-/obj/machinery/computer/podtracker/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, "PodTracking", name, 400, 500, master_ui, state)
- ui.open()
-
-/obj/machinery/computer/podtracker/ui_data(mob/user)
- var/list/data = list()
- var/list/pods = list()
- for(var/obj/item/spacepod_equipment/misc/tracker/TR in GLOB.pod_trackers)
- 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)))
-
- data["pods"] = pods
- return data
diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm
index fbb6a0ad3c3..8de3cd73131 100644
--- a/code/game/machinery/constructable_frame.dm
+++ b/code/game/machinery/constructable_frame.dm
@@ -257,7 +257,21 @@ to destroy them and players will be able to make replacements.
"Robco Tool Maker" = /obj/machinery/vending/engineering,
"BODA" = /obj/machinery/vending/sovietsoda,
"SecTech" = /obj/machinery/vending/security,
- "CritterCare" = /obj/machinery/vending/crittercare)
+ "CritterCare" = /obj/machinery/vending/crittercare,
+ "SecDrobe" = /obj/machinery/vending/secdrobe,
+ "DetDrobe" = /obj/machinery/vending/detdrobe,
+ "MediDrobe" = /obj/machinery/vending/medidrobe,
+ "ViroDrobe" = /obj/machinery/vending/virodrobe,
+ "ChemDrobe" = /obj/machinery/vending/chemdrobe,
+ "GeneDrobe" = /obj/machinery/vending/genedrobe,
+ "SciDrobe" = /obj/machinery/vending/scidrobe,
+ "RoboDrobe" = /obj/machinery/vending/robodrobe,
+ "EngiDrobe" = /obj/machinery/vending/engidrobe,
+ "AtmosDrobe" = /obj/machinery/vending/atmosdrobe,
+ "CargoDrobe" = /obj/machinery/vending/cargodrobe,
+ "ChefDrobe" = /obj/machinery/vending/chefdrobe,
+ "BarDrobe" = /obj/machinery/vending/bardrobe,
+ "HydroDrobe" = /obj/machinery/vending/hydrodrobe)
/obj/item/circuitboard/vendor/screwdriver_act(mob/user, obj/item/I)
. = TRUE
@@ -696,18 +710,6 @@ to destroy them and players will be able to make replacements.
/obj/item/stock_parts/micro_laser = 1,
/obj/item/stack/sheet/glass = 1)
-/obj/item/circuitboard/podfab
- board_name = "Spacepod Fabricator"
- build_path = /obj/machinery/mecha_part_fabricator/spacepod
- board_type = "machine"
- origin_tech = "programming=2;engineering=2"
- req_components = list(
- /obj/item/stock_parts/matter_bin = 2,
- /obj/item/stock_parts/manipulator = 1,
- /obj/item/stock_parts/micro_laser = 1,
- /obj/item/stack/sheet/glass = 1)
-
-
/obj/item/circuitboard/clonepod
board_name = "Clone Pod"
build_path = /obj/machinery/clonepod
diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm
index 0ac01cb4f58..76f0de8b269 100644
--- a/code/game/machinery/cryopod.dm
+++ b/code/game/machinery/cryopod.dm
@@ -248,7 +248,6 @@
/obj/item/reagent_containers/hypospray/CMO,
/obj/item/clothing/accessory/medal/gold/captain,
/obj/item/clothing/gloves/color/black/krav_maga/sec,
- /obj/item/spacepod_key,
/obj/item/nullrod,
/obj/item/key,
/obj/item/door_remote,
diff --git a/code/game/machinery/defib_mount.dm b/code/game/machinery/defib_mount.dm
index 5aac39d12dd..fe333ebf4ef 100644
--- a/code/game/machinery/defib_mount.dm
+++ b/code/game/machinery/defib_mount.dm
@@ -34,8 +34,8 @@
if(building)
set_pixel_offsets_from_dir(30, -30, 30, -30)
-/obj/machinery/defibrillator_mount/loaded/New() //loaded subtype for mapping use
- ..()
+/obj/machinery/defibrillator_mount/loaded/Initialize(mapload) //loaded subtype for mapping use
+ . = ..()
defib = new/obj/item/defibrillator/loaded(src)
update_icon()
diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index 7b2890d97da..3b907a9046c 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -55,6 +55,7 @@ GLOBAL_LIST_EMPTY(airlock_overlays)
damage_deflection = AIRLOCK_DAMAGE_DEFLECTION_N
autoclose = TRUE
explosion_block = 1
+ hud_possible = list(DIAG_AIRLOCK_HUD)
assemblytype = /obj/structure/door_assembly
siemens_strength = 1
flags_2 = RAD_PROTECT_CONTENTS_2 | RAD_NO_CONTAMINATE_2
@@ -149,6 +150,10 @@ About the new airlock wires panel:
if(damage_deflection == AIRLOCK_DAMAGE_DEFLECTION_N && security_level > AIRLOCK_SECURITY_METAL)
damage_deflection = AIRLOCK_DAMAGE_DEFLECTION_R
update_icon()
+ prepare_huds()
+ for(var/datum/atom_hud/data/diagnostic/diag_hud in GLOB.huds)
+ diag_hud.add_to_hud(src)
+ diag_hud_set_electrified()
/obj/machinery/door/airlock/proc/update_other_id()
for(var/obj/machinery/door/airlock/A in GLOB.airlocks)
@@ -173,6 +178,8 @@ About the new airlock wires panel:
if(SSradio)
SSradio.remove_object(src, frequency)
radio_connection = null
+ for(var/datum/atom_hud/data/diagnostic/diag_hud in GLOB.huds)
+ diag_hud.remove_from_hud(src)
return ..()
/obj/machinery/door/airlock/handle_atom_del(atom/A)
@@ -292,6 +299,7 @@ About the new airlock wires panel:
electrified_timer = addtimer(CALLBACK(src, .proc/electrify, 0), duration SECONDS, TIMER_UNIQUE | TIMER_STOPPABLE)
if(feedback && message)
to_chat(user, message)
+ diag_hud_set_electrified()
// shock user with probability prb (if all connections & power are working)
// returns 1 if shocked, 0 otherwise
diff --git a/code/game/machinery/doors/airlock_types.dm b/code/game/machinery/doors/airlock_types.dm
index e23aa154d6d..870b8355fe8 100644
--- a/code/game/machinery/doors/airlock_types.dm
+++ b/code/game/machinery/doors/airlock_types.dm
@@ -605,7 +605,7 @@
desc = "An airlock hastily corrupted by blood magic, it is unusually brittle in this state."
normal_integrity = 150
damage_deflection = 5
- armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
+ armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 0, ACID = 0)
//////////////////////////////////
/*
diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm
index a2479c149a1..467b82b04a9 100644
--- a/code/game/machinery/doors/door.dm
+++ b/code/game/machinery/doors/door.dm
@@ -9,7 +9,7 @@
layer = OPEN_DOOR_LAYER
power_channel = ENVIRON
max_integrity = 350
- armor = list("melee" = 30, "bullet" = 30, "laser" = 20, "energy" = 20, "bomb" = 10, "bio" = 100, "rad" = 100, "fire" = 80, "acid" = 70)
+ armor = list(MELEE = 30, BULLET = 30, LASER = 20, ENERGY = 20, BOMB = 10, BIO = 100, RAD = 100, FIRE = 80, ACID = 70)
flags = PREVENT_CLICK_UNDER
damage_deflection = 10
var/closingLayer = CLOSED_DOOR_LAYER
diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm
index b19888ba907..4729f925a4f 100644
--- a/code/game/machinery/doors/firedoor.dm
+++ b/code/game/machinery/doors/firedoor.dm
@@ -21,7 +21,7 @@
closingLayer = CLOSED_FIREDOOR_LAYER
auto_close_time = 5 SECONDS
assemblytype = /obj/structure/firelock_frame
- armor = list("melee" = 30, "bullet" = 30, "laser" = 20, "energy" = 20, "bomb" = 10, "bio" = 100, "rad" = 100, "fire" = 95, "acid" = 70)
+ armor = list(MELEE = 30, BULLET = 30, LASER = 20, ENERGY = 20, BOMB = 10, BIO = 100, RAD = 100, FIRE = 95, ACID = 70)
/// How long does opening by hand take, in deciseconds.
var/manual_open_time = 5 SECONDS
var/can_crush = TRUE
diff --git a/code/game/machinery/doors/poddoor.dm b/code/game/machinery/doors/poddoor.dm
index cebd507a9ca..6364993f488 100644
--- a/code/game/machinery/doors/poddoor.dm
+++ b/code/game/machinery/doors/poddoor.dm
@@ -9,7 +9,7 @@
heat_proof = TRUE
safe = FALSE
max_integrity = 600
- armor = list("melee" = 50, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 50, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 70)
+ armor = list(MELEE = 50, BULLET = 100, LASER = 100, ENERGY = 100, BOMB = 50, BIO = 100, RAD = 100, FIRE = 100, ACID = 70)
resistance_flags = FIRE_PROOF
damage_deflection = 70
var/id_tag = 1.0
diff --git a/code/game/machinery/doors/spacepod.dm b/code/game/machinery/doors/spacepod.dm
deleted file mode 100644
index ae966070f22..00000000000
--- a/code/game/machinery/doors/spacepod.dm
+++ /dev/null
@@ -1,25 +0,0 @@
-/obj/structure/spacepoddoor
- name = "podlock"
- desc = "Why it no open!!!"
- icon = 'icons/effects/beam.dmi'
- icon_state = "n_beam"
- density = 0
- anchored = 1
- var/id = 1.0
-
-/obj/structure/spacepoddoor/Initialize()
- ..()
- air_update_turf(1)
-
-/obj/structure/spacepoddoor/CanAtmosPass(turf/T)
- return 0
-
-/obj/structure/spacepoddoor/Destroy()
- var/turf/T = get_turf(src)
- . = ..()
- T.air_update_turf(TRUE)
-
-/obj/structure/spacepoddoor/CanPass(atom/movable/A, turf/T)
- if(istype(A, /obj/spacepod))
- return ..()
- else return 0
diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm
index 13cf62ecf3f..3289767d82c 100644
--- a/code/game/machinery/doors/windowdoor.dm
+++ b/code/game/machinery/doors/windowdoor.dm
@@ -12,7 +12,7 @@
dir = EAST
max_integrity = 150 //If you change this, consider changing ../door/window/brigdoor/ max_integrity at the bottom of this .dm file
integrity_failure = 0
- armor = list("melee" = 20, "bullet" = 50, "laser" = 50, "energy" = 50, "bomb" = 10, "bio" = 100, "rad" = 100, "fire" = 70, "acid" = 100)
+ armor = list(MELEE = 20, BULLET = 50, LASER = 50, ENERGY = 50, BOMB = 10, BIO = 100, RAD = 100, FIRE = 70, ACID = 100)
var/obj/item/airlock_electronics/electronics
var/base_state = "left"
var/reinf = 0
diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm
index c4d5c4984b9..da287020804 100644
--- a/code/game/machinery/hologram.dm
+++ b/code/game/machinery/hologram.dm
@@ -43,7 +43,7 @@ GLOBAL_LIST_EMPTY(holopads)
use_power = IDLE_POWER_USE
idle_power_usage = 5
active_power_usage = 100
- layer = TURF_LAYER+0.1 //Preventing mice and drones from sneaking under them.
+ layer = HOLOPAD_LAYER //Preventing mice and drones from sneaking under them.
plane = FLOOR_PLANE
max_integrity = 300
armor = list(melee = 50, bullet = 20, laser = 20, energy = 20, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 0)
diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm
index 154f094d941..5ec606a0fd8 100644
--- a/code/game/machinery/machinery.dm
+++ b/code/game/machinery/machinery.dm
@@ -502,6 +502,7 @@ Class Procs:
"You apply some [O] at [src]'s damaged areas.")
else
return ..()
+
/obj/machinery/proc/exchange_parts(mob/user, obj/item/storage/part_replacer/W)
var/shouldplaysound = 0
if((flags & NODECONSTRUCT))
@@ -519,15 +520,23 @@ Class Procs:
break
for(var/obj/item/stock_parts/B in W.contents)
if(istype(B, P) && istype(A, P))
- if(B.rating > A.rating)
- W.remove_from_storage(B, src)
- W.handle_item_insertion(A, 1)
- component_parts -= A
- component_parts += B
- B.loc = null
- to_chat(user, "[A.name] replaced with [B.name].")
- shouldplaysound = 1
- break
+ //If it's cell - check: 1) Max charge is better? 2) Max charge same but current charge better? - If both NO -> next content
+ if(ispath(B.type, /obj/item/stock_parts/cell))
+ var/obj/item/stock_parts/cell/tA = A
+ var/obj/item/stock_parts/cell/tB = B
+ if(!(tB.maxcharge > tA.maxcharge) && !((tB.maxcharge == tA.maxcharge) && (tB.charge > tA.charge)))
+ continue
+ //If it's not cell and not better -> next content
+ else if(B.rating <= A.rating)
+ continue
+ W.remove_from_storage(B, src)
+ W.handle_item_insertion(A, 1)
+ component_parts -= A
+ component_parts += B
+ B.loc = null
+ to_chat(user, "[A.name] replaced with [B.name].")
+ shouldplaysound = 1
+ break
RefreshParts()
else
to_chat(user, display_parts(user))
@@ -637,7 +646,7 @@ Class Procs:
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")
+ take_damage(power * 0.0005, BURN, ENERGY)
if(prob(40))
emp_act(EMP_LIGHT)
power -= power * 0.0005
diff --git a/code/game/machinery/magnet.dm b/code/game/machinery/magnet.dm
index 7bd89ac6dae..1a5a5ced2ec 100644
--- a/code/game/machinery/magnet.dm
+++ b/code/game/machinery/magnet.dm
@@ -11,7 +11,7 @@
name = "Electromagnetic Generator"
desc = "A device that uses station power to create points of magnetic energy."
level = 1 // underfloor
- layer = 2.5
+ layer = WIRE_LAYER+0.001
anchored = 1
use_power = IDLE_POWER_USE
idle_power_usage = 50
@@ -32,7 +32,8 @@
/obj/machinery/magnetic_module/New()
..()
var/turf/T = loc
- hide(T.intact)
+ if(!T.transparent_floor)
+ hide(T.intact)
center = T
spawn(10) // must wait for map loading to finish
diff --git a/code/game/machinery/navbeacon.dm b/code/game/machinery/navbeacon.dm
index 48d87d0f330..f43e0033e23 100644
--- a/code/game/machinery/navbeacon.dm
+++ b/code/game/machinery/navbeacon.dm
@@ -8,7 +8,8 @@
name = "navigation beacon"
desc = "A radio beacon used for bot navigation."
level = 1 // underfloor
- layer = 2.5
+ layer = WIRE_LAYER
+ plane = FLOOR_PLANE
anchored = 1
max_integrity = 500
armor = list(melee = 70, bullet = 70, laser = 70, energy = 70, bomb = 0, bio = 0, rad = 0, fire = 80, acid = 80)
@@ -26,7 +27,8 @@
set_codes()
var/turf/T = loc
- hide(T.intact)
+ if(!T.transparent_floor)
+ hide(T.intact)
if(!codes || !codes.len)
log_runtime(EXCEPTION("Empty codes datum at ([x],[y],[z])"), src, list("codes_txt: '[codes_txt]'"))
if("patrol" in codes)
diff --git a/code/game/machinery/pipe/construction.dm b/code/game/machinery/pipe/construction.dm
index ac61c2cccc9..98eaf1ceb2e 100644
--- a/code/game/machinery/pipe/construction.dm
+++ b/code/game/machinery/pipe/construction.dm
@@ -337,12 +337,18 @@
fixdir()
var/pipe_dir = get_pipe_dir()
+ var/turf/T = get_turf(loc)
for(var/obj/machinery/atmospherics/M in src.loc)
if((M.initialize_directions & pipe_dir) && M.check_connect_types_construction(M,src)) // matches at least one direction on either type of pipe
to_chat(user, "There is already a pipe of the same type at this location.")
return 1
+ if(pipe_type in list(PIPE_SUPPLY_STRAIGHT, PIPE_SUPPLY_BENT, PIPE_SCRUBBERS_STRAIGHT, PIPE_SCRUBBERS_BENT, PIPE_HE_STRAIGHT, PIPE_HE_BENT, PIPE_SUPPLY_MANIFOLD, PIPE_SCRUBBERS_MANIFOLD, PIPE_SUPPLY_MANIFOLD4W, PIPE_SCRUBBERS_MANIFOLD4W, PIPE_UVENT, PIPE_SUPPLY_CAP, PIPE_SCRUBBERS_CAP, PIPE_PASV_VENT, PIPE_DP_VENT, PIPE_PASSIVE_GATE))
+ if(T.transparent_floor) //stops jank with transparent floors and pipes
+ to_chat(user, "You can only fix simple pipes and devices over glass floors!")
+ return 1
+
switch(pipe_type) //What kind of heartless person thought of doing this?
if(PIPE_SIMPLE_STRAIGHT, PIPE_SIMPLE_BENT)
var/obj/machinery/atmospherics/pipe/simple/P = new( src.loc )
diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm
index 1ca2c21fd90..d7b31167944 100644
--- a/code/game/machinery/portable_turret.dm
+++ b/code/game/machinery/portable_turret.dm
@@ -516,7 +516,7 @@ GLOBAL_LIST_EMPTY(turret_icons)
var/list/targets = list() //list of primary targets
var/list/secondarytargets = list() //targets that are least important
- var/static/things_to_scan = typecacheof(list(/obj/mecha, /obj/spacepod, /obj/vehicle, /mob/living))
+ var/static/things_to_scan = typecacheof(list(/obj/mecha, /obj/vehicle, /mob/living))
for(var/A in typecache_filter_list(view(scan_range, src), things_to_scan))
var/atom/AA = A
@@ -528,10 +528,6 @@ GLOBAL_LIST_EMPTY(turret_icons)
var/obj/mecha/ME = A
assess_and_assign(ME.occupant, targets, secondarytargets)
- if(istype(A, /obj/spacepod))
- var/obj/spacepod/SP = A
- assess_and_assign(SP.pilot, targets, secondarytargets)
-
if(istype(A, /obj/vehicle))
var/obj/vehicle/T = A
if(T.has_buckled_mobs())
diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm
index 6fa1e79e764..e5670281f82 100644
--- a/code/game/machinery/rechargestation.dm
+++ b/code/game/machinery/rechargestation.dm
@@ -168,6 +168,9 @@
use_power = IDLE_POWER_USE
return
+/obj/machinery/recharge_station/force_eject_occupant(mob/target)
+ go_out()
+
/obj/machinery/recharge_station/verb/move_eject()
set category = "Object"
set src in oview(1)
diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm
index 487ec245466..a0790a08cb1 100644
--- a/code/game/machinery/requests_console.dm
+++ b/code/game/machinery/requests_console.dm
@@ -20,7 +20,7 @@
#define RCS_SHIP_LOG 10 // View Shipping Label Log
//Radio list
-#define ENGI_ROLES list("Atmospherics","Mechanic","Engineering","Chief Engineer's Desk","Telecoms Admin")
+#define ENGI_ROLES list("Atmospherics","Engineering","Chief Engineer's Desk","Telecoms Admin")
#define SEC_ROLES list("Warden","Security","Brig Medbay","Head of Security's Desk")
#define MISC_ROLES list("Bar","Chapel","Kitchen","Hydroponics","Janitorial")
#define MED_ROLES list("Virology","Chief Medical Officer's Desk","Medbay")
@@ -43,7 +43,7 @@ GLOBAL_LIST_EMPTY(allRequestConsoles)
icon = 'icons/obj/terminals.dmi'
icon_state = "req_comp0"
max_integrity = 300
- armor = list("melee" = 70, "bullet" = 30, "laser" = 30, "energy" = 30, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 90, "acid" = 90)
+ armor = list(MELEE = 70, BULLET = 30, LASER = 30, ENERGY = 30, BOMB = 0, BIO = 0, RAD = 0, FIRE = 90, ACID = 90)
var/department = "Unknown" //The list of all departments on the station (Determined from this variable on each unit) Set this to the same thing if you want several consoles in one department
var/list/message_log = list() //List of all messages
var/departmentType = 0 //Bitflag. Zero is reply-only. Map currently uses raw numbers instead of defines.
diff --git a/code/game/machinery/spaceheater.dm b/code/game/machinery/spaceheater.dm
index bf79f2f4fb3..a1cbe639451 100644
--- a/code/game/machinery/spaceheater.dm
+++ b/code/game/machinery/spaceheater.dm
@@ -6,7 +6,7 @@
name = "space heater"
desc = "Made by Space Amish using traditional space techniques, this heater is guaranteed not to set the station on fire."
max_integrity = 250
- armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 100, "fire" = 80, "acid" = 10)
+ armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 100, RAD = 100, FIRE = 80, ACID = 10)
var/obj/item/stock_parts/cell/cell
var/on = 0
var/open = 0
diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm
index b732986dd51..0c6342592b3 100644
--- a/code/game/machinery/suit_storage_unit.dm
+++ b/code/game/machinery/suit_storage_unit.dm
@@ -89,6 +89,15 @@
/obj/machinery/suit_storage_unit/ce/secure
secure = TRUE
+/obj/machinery/suit_storage_unit/rd
+ name = "research director's suit storage unit"
+ suit_type = /obj/item/clothing/suit/space/hardsuit/rd
+ mask_type = /obj/item/clothing/mask/gas
+ req_access = list(ACCESS_RD)
+
+/obj/machinery/suit_storage_unit/rd/secure
+ secure = TRUE
+
/obj/machinery/suit_storage_unit/security
name = "security suit storage unit"
suit_type = /obj/item/clothing/suit/space/hardsuit/security
@@ -98,15 +107,12 @@
/obj/machinery/suit_storage_unit/security/secure
secure = TRUE
-/obj/machinery/suit_storage_unit/security/pod_pilot
- req_access = list(ACCESS_PILOT)
-
/obj/machinery/suit_storage_unit/security/hos
name = "Head of Security's suit storage unit"
suit_type = /obj/item/clothing/suit/space/hardsuit/security/hos
mask_type = /obj/item/clothing/mask/gas/sechailer/hos
req_access = list(ACCESS_HOS)
-
+
/obj/machinery/suit_storage_unit/security/hos/secure
secure = TRUE
@@ -284,11 +290,6 @@
/obj/machinery/suit_storage_unit/Destroy()
SStgui.close_uis(wires)
- QDEL_NULL(suit)
- QDEL_NULL(helmet)
- QDEL_NULL(mask)
- QDEL_NULL(boots)
- QDEL_NULL(storage)
QDEL_NULL(wires)
return ..()
@@ -321,6 +322,8 @@
if(shock(user, 100))
return
if(!is_operational())
+ if(user.a_intent != INTENT_HELP)
+ return ..()
if(panel_open)
to_chat(usr, "Close the maintenance panel first.")
else
diff --git a/code/game/machinery/tcomms/nttc.dm b/code/game/machinery/tcomms/nttc.dm
index 6d4e8824b33..1af0c00eacb 100644
--- a/code/game/machinery/tcomms/nttc.dm
+++ b/code/game/machinery/tcomms/nttc.dm
@@ -41,7 +41,6 @@
"Engine Technician" = "engradio",
"Life Support Specialist" = "engradio",
"Maintenance Technician" = "engradio",
- "Mechanic" = "engradio",
"Station Engineer" = "engradio",
// Central Command
"Emergency Response Team Engineer" = "dsquadradio", // I know this says deathsquad but the class for responseteam is neon green. No.
@@ -92,7 +91,6 @@
"Internal Affairs Agent" = "secradio",
"Magistrate" = "secradio",
"Security Officer" = "secradio",
- "Security Pod Pilot" = "secradio",
"Warden" = "secradio",
// Supply
"Quartermaster" = "supradio",
diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm
index 7ba07c026dd..d3a8fef1432 100644
--- a/code/game/machinery/teleporter.dm
+++ b/code/game/machinery/teleporter.dm
@@ -41,10 +41,7 @@
/obj/machinery/computer/teleporter/proc/link_power_station()
if(power_station)
return
- for(dir in list(NORTH,EAST,SOUTH,WEST))
- power_station = locate(/obj/machinery/teleport/station, get_step(src, dir))
- if(power_station)
- break
+ power_station = locate(/obj/machinery/teleport/station, orange(1, src))
return power_station
/obj/machinery/computer/teleporter/attackby(obj/item/I, mob/living/user, params)
@@ -371,7 +368,7 @@
if(!is_teleport_allowed(z) && !admin_usage)
to_chat(M, "You can't use this here.")
return
- if(power_station && power_station.engaged && !panel_open && !blockAI(M) && !istype(M, /obj/spacepod))
+ if(power_station && power_station.engaged && !panel_open && !blockAI(M))
if(!teleport(M) && isliving(M)) // the isliving(M) is needed to avoid triggering errors if a spark bumps the telehub
visible_message("[src] emits a loud buzz, as its teleport portal flickers and fails!")
playsound(loc, 'sound/machines/buzz-sigh.ogg', 50, FALSE)
diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm
index 5d979ff2044..80058ef6510 100644
--- a/code/game/machinery/vending.dm
+++ b/code/game/machinery/vending.dm
@@ -122,7 +122,7 @@
for(var/datum/data/vending_product/R in (product_records + coin_records + hidden_records))
var/obj/item/I = R.product_path
var/pp = replacetext(replacetext("[R.product_path]", "/obj/item/", ""), "/", "-")
- imagelist[pp] = "[icon2base64(icon(initial(I.icon), initial(I.icon_state)))]"
+ imagelist[pp] = "[icon2base64(icon(initial(I.icon), initial(I.icon_state), SOUTH, 1))]"
if(LAZYLEN(slogan_list))
// So not all machines speak at the exact same time.
// The first time this machine says something will be at slogantime + this random value,
@@ -1120,10 +1120,26 @@
ads_list = list("Probably not bad for you!","Don't believe the scientists!","It's good for you!","Don't quit, buy more!","Smoke!","Nicotine heaven.","Best cigarettes since 2150.","Award-winning cigs.")
vend_delay = 34
icon_state = "cigs"
- products = list(/obj/item/storage/fancy/cigarettes/cigpack_robust = 12, /obj/item/storage/fancy/cigarettes/cigpack_uplift = 6, /obj/item/storage/fancy/cigarettes/cigpack_random = 6, /obj/item/reagent_containers/food/pill/patch/nicotine = 10, /obj/item/storage/box/matches = 10,/obj/item/lighter/random = 4,/obj/item/storage/fancy/rollingpapers = 5)
+ products = list(
+ /obj/item/storage/fancy/cigarettes/cigpack_robust = 12,
+ /obj/item/storage/fancy/cigarettes/cigpack_uplift = 6,
+ /obj/item/storage/fancy/cigarettes/cigpack_midori = 6,
+ /obj/item/storage/fancy/cigarettes/cigpack_random = 6,
+ /obj/item/reagent_containers/food/pill/patch/nicotine = 10,
+ /obj/item/storage/box/matches = 10,
+ /obj/item/lighter/random = 4,
+ /obj/item/storage/fancy/rollingpapers = 5)
contraband = list(/obj/item/lighter/zippo = 4)
- premium = list(/obj/item/clothing/mask/cigarette/cigar/havana = 2, /obj/item/storage/fancy/cigarettes/cigpack_robustgold = 1)
- prices = list(/obj/item/storage/fancy/cigarettes/cigpack_robust = 60, /obj/item/storage/fancy/cigarettes/cigpack_uplift = 80, /obj/item/storage/fancy/cigarettes/cigpack_random = 120, /obj/item/reagent_containers/food/pill/patch/nicotine = 70, /obj/item/storage/box/matches = 10,/obj/item/lighter/random = 60, /obj/item/storage/fancy/rollingpapers = 20)
+ premium = list(/obj/item/clothing/mask/cigarette/cigar/havana = 2,
+ /obj/item/storage/fancy/cigarettes/cigpack_robustgold = 1)
+ prices = list(/obj/item/storage/fancy/cigarettes/cigpack_robust = 60,
+ /obj/item/storage/fancy/cigarettes/cigpack_uplift = 80,
+ /obj/item/storage/fancy/cigarettes/cigpack_midori = 100,
+ /obj/item/storage/fancy/cigarettes/cigpack_random = 120,
+ /obj/item/reagent_containers/food/pill/patch/nicotine = 70,
+ /obj/item/storage/box/matches = 10,
+ /obj/item/lighter/random = 60,
+ /obj/item/storage/fancy/rollingpapers = 20)
refill_canister = /obj/item/vending_refill/cigarette
/obj/machinery/vending/cigarette/free
@@ -1780,3 +1796,327 @@
/obj/machinery/vending/crittercare/free
prices = list()
+//Departmental clothing vendors
+
+/obj/machinery/vending/secdrobe
+ name = "\improper SecDrobe"
+ desc = "A vending machine for security and security-related clothing!"
+ icon_state = "secdrobe"
+ ads_list = list("Beat perps in style!", "It's red so you can't see the blood!", "You have the right to be fashionable!", "Now you can be the fashion police you always wanted to be!")
+ vend_reply = "Thank you for using the SecDrobe!"
+ products = list(/obj/item/clothing/under/rank/security = 4,
+ /obj/item/clothing/under/rank/security2 = 4,
+ /obj/item/clothing/under/rank/security/formal = 4,
+ /obj/item/clothing/under/rank/security/skirt = 4,
+ /obj/item/clothing/under/rank/security/corp = 4,
+ /obj/item/clothing/under/rank/dispatch = 4,
+ /obj/item/clothing/head/beret/sec = 4,
+ /obj/item/clothing/head/soft/sec = 4,
+ /obj/item/clothing/head/soft/sec/corp = 4,
+ /obj/item/clothing/suit/armor/secjacket = 4,
+ /obj/item/clothing/suit/jacket/secbomber = 2,
+ /obj/item/clothing/suit/hooded/wintercoat/security = 4,
+ /obj/item/clothing/gloves/color/black = 4,
+ /obj/item/clothing/accessory/armband/sec = 6,
+ /obj/item/clothing/shoes/laceup = 4,
+ /obj/item/clothing/shoes/jackboots = 4,
+ /obj/item/clothing/shoes/jackboots/jacksandals = 4,
+ /obj/item/storage/backpack/security = 2,
+ /obj/item/storage/backpack/satchel_sec = 2,
+ /obj/item/storage/backpack/duffel/security = 2)
+ premium = list(/obj/item/clothing/mask/gas/sechailer/swat = 2,
+ /obj/item/clothing/mask/balaclava = 1)
+ contraband = list(/obj/item/toy/figure/crew/secofficer = 1,
+ /obj/item/toy/figure/crew/hos = 1)
+ refill_canister = /obj/item/vending_refill/secdrobe
+
+/obj/machinery/vending/detdrobe
+ name = "\improper DetDrobe"
+ desc = "A machine for all your detective needs, as long as you only need clothes."
+ icon_state = "detdrobe"
+ ads_list = list("Apply your brilliant deductive methods in style!", "They already smell of cigarettes!")
+ vend_reply = "Thank you for using the DetDrobe!"
+ products = list(/obj/item/clothing/under/det = 2,
+ /obj/item/clothing/suit/storage/det_suit = 2,
+ /obj/item/clothing/suit/storage/det_suit/forensics/red = 1,
+ /obj/item/clothing/suit/storage/det_suit/forensics/blue = 1,
+ /obj/item/clothing/suit/armor/vest/det_suit = 1,
+ /obj/item/clothing/head/det_hat = 2,
+ /obj/item/clothing/accessory/waistcoat = 2,
+ /obj/item/clothing/shoes/laceup = 2,
+ /obj/item/clothing/shoes/brown = 2,
+ /obj/item/clothing/shoes/jackboots = 2,
+ /obj/item/clothing/head/fedora = 1,
+ /obj/item/clothing/head/fedora/brownfedora = 1,
+ /obj/item/clothing/head/fedora/whitefedora = 1,
+ /obj/item/clothing/gloves/color/black = 2,
+ /obj/item/clothing/gloves/color/latex = 2,
+ /obj/item/reagent_containers/food/drinks/flask/detflask = 2,
+ /obj/item/storage/fancy/cigarettes/dromedaryco = 5)
+ contraband = list(/obj/item/toy/figure/crew/detective = 1)
+ refill_canister = /obj/item/vending_refill/detdrobe
+
+/obj/machinery/vending/medidrobe
+ name = "\improper MediDrobe"
+ desc = "A vending machine rumoured to be capable of dispensing clothing for medical personnel."
+ icon_state = "medidrobe"
+ ads_list = list("Make those blood stains look fashionable!")
+ vend_reply = "Thank you for using the MediDrobe!"
+ products = list(/obj/item/clothing/under/rank/medical = 3,
+ /obj/item/clothing/under/rank/medical/skirt = 3,
+ /obj/item/clothing/under/rank/medical/blue = 3,
+ /obj/item/clothing/under/rank/medical/green = 3,
+ /obj/item/clothing/under/rank/medical/purple = 3,
+ /obj/item/clothing/under/rank/nurse = 3,
+ /obj/item/clothing/under/medigown = 3,
+ /obj/item/clothing/head/beret/med = 3,
+ /obj/item/clothing/head/surgery/blue = 3,
+ /obj/item/clothing/head/surgery/green = 3,
+ /obj/item/clothing/head/surgery/purple = 3,
+ /obj/item/clothing/head/nursehat = 3,
+ /obj/item/clothing/suit/hooded/wintercoat/medical = 3,
+ /obj/item/clothing/suit/storage/fr_jacket = 3,
+ /obj/item/clothing/suit/storage/labcoat = 3,
+ /obj/item/clothing/accessory/armband/med = 3,
+ /obj/item/clothing/accessory/armband/medgreen = 3,
+ /obj/item/clothing/shoes/laceup = 3,
+ /obj/item/clothing/shoes/white = 3,
+ /obj/item/clothing/shoes/sandal/white = 3,
+ /obj/item/storage/backpack/medic = 2,
+ /obj/item/storage/backpack/satchel_med = 2,
+ /obj/item/storage/backpack/duffel/medical = 2)
+ premium = list(/obj/item/clothing/gloves/color/latex/nitrile = 3)
+ contraband = list(/obj/item/toy/figure/crew/md = 1)
+ refill_canister = /obj/item/vending_refill/medidrobe
+
+/obj/machinery/vending/virodrobe
+ name = "\improper ViroDrobe"
+ desc = "An unsterilized machine for dispending virology related clothing."
+ icon_state = "virodrobe"
+ ads_list = list("Viruses getting you down? Nothing a change of clothes can't fix!", "Upgrade to sterilized clothing today!")
+ vend_reply = "Thank you for using the ViroDrobe!"
+ products = list(/obj/item/clothing/under/rank/virologist = 2,
+ /obj/item/clothing/under/rank/virologist/skirt = 2,
+ /obj/item/clothing/head/beret/med = 2,
+ /obj/item/clothing/suit/storage/labcoat/virologist = 2,
+ /obj/item/clothing/accessory/armband/med = 2,
+ /obj/item/clothing/mask/surgical = 2,
+ /obj/item/clothing/shoes/laceup = 2,
+ /obj/item/clothing/shoes/white = 2,
+ /obj/item/clothing/shoes/sandal/white = 2,
+ /obj/item/storage/backpack/virology = 2,
+ /obj/item/storage/backpack/satchel_vir = 2,
+ /obj/item/storage/backpack/duffel/virology = 2)
+ contraband = list(/obj/item/toy/figure/crew/virologist = 1)
+ refill_canister = /obj/item/vending_refill/virodrobe
+
+/obj/machinery/vending/chemdrobe
+ name = "\improper ChemDrobe"
+ desc = "A vending machine for dispensing chemistry related clothing."
+ icon_state = "chemdrobe"
+ ads_list = list("Our clothes are 0.5% more resistant to acid spills! Get yours now!")
+ vend_reply = "Thank you for using the ChemDrobe!"
+ products = list(/obj/item/clothing/under/rank/chemist = 2,
+ /obj/item/clothing/under/rank/chemist/skirt = 2,
+ /obj/item/clothing/head/beret/med = 2,
+ /obj/item/clothing/suit/storage/labcoat/chemist = 2,
+ /obj/item/clothing/accessory/armband/med = 2,
+ /obj/item/clothing/mask/gas = 2,
+ /obj/item/clothing/shoes/laceup = 2,
+ /obj/item/clothing/shoes/white = 2,
+ /obj/item/clothing/shoes/sandal/white = 2,
+ /obj/item/storage/bag/chemistry = 2,
+ /obj/item/storage/backpack/chemistry = 2,
+ /obj/item/storage/backpack/satchel_chem = 2,
+ /obj/item/storage/backpack/duffel/chemistry = 2)
+ contraband = list(/obj/item/toy/figure/crew/chemist = 1)
+ refill_canister = /obj/item/vending_refill/chemdrobe
+
+
+/obj/machinery/vending/genedrobe
+ name = "GeneDrobe"
+ desc = "A machine for dispensing clothing related to genetics."
+ icon_state = "genedrobe"
+ ads_list = "Perfect for the mad scientist in you!"
+ vend_reply = "Thank you for using the GeneDrobe!"
+
+ products = list(/obj/item/clothing/under/rank/geneticist = 3,
+ /obj/item/clothing/suit/storage/labcoat/genetics = 3,
+ /obj/item/clothing/shoes/laceup = 3,
+ /obj/item/clothing/shoes/white = 3,
+ /obj/item/clothing/shoes/sandal/white = 3,
+ /obj/item/storage/backpack/genetics = 2,
+ /obj/item/storage/backpack/satchel_gen = 2,
+ /obj/item/storage/backpack/duffel/genetics = 2,)
+ contraband = list(/obj/item/toy/figure/crew/geneticist = 1)
+ refill_canister = /obj/item/vending_refill/genedrobe
+
+/obj/machinery/vending/scidrobe
+ name = "SciDrobe"
+ desc = "A simple vending machine suitable to dispense well tailored science clothing. Endorsed by Space Cubans."
+ icon_state = "scidrobe"
+ ads_list = list("Longing for the smell of plasma burnt flesh?", "Buy your science clothing now!", "Made with 10% Auxetics, so you don't have to worry about losing your arm!")
+ vend_reply = "Thank you for using the SciDrobe!"
+ products = list(/obj/item/clothing/under/rank/scientist = 6,
+ /obj/item/clothing/under/rank/scientist/skirt = 3,
+ /obj/item/clothing/suit/hooded/wintercoat/science = 3,
+ /obj/item/clothing/suit/storage/labcoat/science = 3,
+ /obj/item/clothing/head/beret/sci = 3,
+ /obj/item/clothing/accessory/armband/science = 6,
+ /obj/item/clothing/shoes/laceup = 3,
+ /obj/item/clothing/shoes/white = 3,
+ /obj/item/clothing/shoes/sandal/white = 3,
+ /obj/item/storage/backpack/science = 2,
+ /obj/item/storage/backpack/satchel_tox = 2,
+ /obj/item/storage/backpack/duffel/science = 2,)
+ contraband = list(/obj/item/toy/figure/crew/rd = 1,
+ /obj/item/toy/figure/crew/scientist = 1)
+ refill_canister = /obj/item/vending_refill/scidrobe
+
+/obj/machinery/vending/robodrobe
+ name = "RoboDrobe"
+ desc = "A vending machine designed to dispense clothing known only to roboticists."
+ icon_state = "robodrobe"
+ ads_list = list("You turn me TRUE, use defines!","0110001101101100011011110111010001101000011001010111001101101000011001010111001001100101")
+ vend_reply = "Thank you for using the RoboDrobe!"
+ products = list(/obj/item/clothing/under/rank/roboticist = 3,
+ /obj/item/clothing/under/rank/roboticist/skirt = 3,
+ /obj/item/clothing/suit/storage/labcoat = 3,
+ /obj/item/clothing/head/soft/black = 3,
+ /obj/item/clothing/gloves/fingerless = 3,
+ /obj/item/clothing/shoes/laceup = 3,
+ /obj/item/clothing/shoes/white = 3,
+ /obj/item/clothing/shoes/black = 3)
+ contraband = list(/obj/item/toy/figure/crew/roboticist = 1)
+ refill_canister = /obj/item/vending_refill/robodrobe
+
+/obj/machinery/vending/engidrobe
+ name = "EngiDrobe"
+ desc = "A vending machine renowned for vending industrial grade clothing."
+ icon_state = "engidrobe"
+ ads_list = list("Guaranteed to protect your feet from industrial accidents!", "Afraid of radiation? Then wear yellow!")
+ vend_reply = "Thank you for using the SciDrobe!"
+ products = list(/obj/item/clothing/under/rank/engineer = 6,
+ /obj/item/clothing/under/rank/engineer/skirt = 3,
+ /obj/item/clothing/suit/hooded/wintercoat/engineering = 3,
+ /obj/item/clothing/suit/storage/hazardvest = 3,
+ /obj/item/clothing/head/beret/eng = 3,
+ /obj/item/clothing/head/hardhat = 2,
+ /obj/item/clothing/head/hardhat/white = 2,
+ /obj/item/clothing/head/hardhat/orange = 2,
+ /obj/item/clothing/head/hardhat/dblue = 2,
+ /obj/item/clothing/accessory/armband/engine = 6,
+ /obj/item/clothing/shoes/laceup = 3,
+ /obj/item/clothing/shoes/workboots = 3,
+ /obj/item/storage/backpack/industrial = 2,
+ /obj/item/storage/backpack/satchel_eng = 2,
+ /obj/item/storage/backpack/duffel/engineering = 2,
+ /obj/item/storage/belt/utility = 2)
+ premium = list(/obj/item/storage/belt/utility/chief = 2,
+ /obj/item/clothing/gloves/color/yellow = 2)
+ contraband = list(/obj/item/toy/figure/crew/ce = 1,
+ /obj/item/toy/figure/crew/engineer = 1)
+ refill_canister = /obj/item/vending_refill/engidrobe
+
+/obj/machinery/vending/atmosdrobe
+ name = "AtmosDrobe"
+ desc = "This relatively unknown vending machine delivers clothing for Atmospherics Technicians, an equally unknown job."
+ icon_state = "atmosdrobe"
+ ads_list = list("Guaranteed to protect your feet from atmospheric accidents!", "Get your inflammable clothing right here!")
+ vend_reply = "Thank you for using the AtmosDrobe!"
+ products = list(/obj/item/clothing/under/rank/atmospheric_technician = 6,
+ /obj/item/clothing/under/rank/atmospheric_technician/skirt = 3,
+ /obj/item/clothing/suit/hooded/wintercoat/engineering/atmos = 3,
+ /obj/item/clothing/suit/storage/hazardvest = 3,
+ /obj/item/clothing/head/beret/atmos = 3,
+ /obj/item/clothing/head/hardhat = 2,
+ /obj/item/clothing/head/hardhat/red = 2,
+ /obj/item/clothing/head/hardhat/white = 2,
+ /obj/item/clothing/head/hardhat/orange = 2,
+ /obj/item/clothing/head/hardhat/dblue = 2,
+ /obj/item/clothing/gloves/color/black = 3,
+ /obj/item/clothing/accessory/armband/engine = 3,
+ /obj/item/clothing/shoes/laceup = 3,
+ /obj/item/clothing/shoes/workboots = 3,
+ /obj/item/storage/backpack/industrial = 2,
+ /obj/item/storage/backpack/satchel_eng = 2,
+ /obj/item/storage/backpack/duffel/atmos = 2,
+ /obj/item/storage/belt/utility = 2)
+ premium = list(/obj/item/storage/belt/utility/chief = 2)
+ contraband = list(/obj/item/toy/figure/crew/atmos = 1)
+ refill_canister = /obj/item/vending_refill/atmosdrobe
+
+/obj/machinery/vending/cargodrobe
+ name = "CargoDrobe"
+ desc = "A highly advanced vending machine for buying cargo related clothing for free... most of the time."
+ icon_state = "cargodrobe"
+ ads_list = list("Upgraded Assistant Style! Pick yours today!", "These shorts are comfy and easy to wear, get yours now!")
+ vend_reply = "Thank you for using the CargoDrobe!"
+ products = list(/obj/item/clothing/under/rank/cargotech = 6,
+ /obj/item/clothing/under/rank/cargotech/skirt = 3,
+ /obj/item/clothing/suit/hooded/wintercoat/cargo = 3,
+ /obj/item/clothing/suit/storage/hazardvest = 3,
+ /obj/item/clothing/head/soft = 3,
+ /obj/item/clothing/head/hardhat/orange = 2,
+ /obj/item/clothing/gloves/fingerless = 6,
+ /obj/item/clothing/accessory/armband/cargo = 6,
+ /obj/item/clothing/shoes/black = 3,
+ /obj/item/clothing/shoes/workboots = 3)
+ contraband = list(/obj/item/toy/figure/crew/qm = 1,
+ /obj/item/toy/figure/crew/cargotech = 1)
+ refill_canister = /obj/item/vending_refill/cargodrobe
+
+/obj/machinery/vending/chefdrobe
+ name = "ChefDrobe"
+ desc = "This vending machine might not dispense meat, but it certainly dispenses chef related clothing."
+ icon_state = "chefdrobe"
+ ads_list = list("Our clothes are guaranteed to protect you from food splatters!", "Comfortable enough for a CQC practice!")
+ vend_reply = "Thank you for using the ChefDrobe!"
+ products = list(/obj/item/clothing/under/rank/chef = 2,
+ /obj/item/clothing/under/waiter = 2,
+ /obj/item/clothing/suit/chef = 2,
+ /obj/item/clothing/suit/chef/classic = 2,
+ /obj/item/clothing/head/chefhat = 2,
+ /obj/item/clothing/head/soft/mime = 2,
+ /obj/item/clothing/shoes/laceup = 2,
+ /obj/item/clothing/shoes/white = 2,
+ /obj/item/clothing/shoes/black = 2,
+ /obj/item/clothing/accessory/waistcoat = 2)
+ contraband = list(/obj/item/toy/figure/crew/chef = 1)
+ refill_canister = /obj/item/vending_refill/chefdrobe
+
+/obj/machinery/vending/bardrobe
+ name = "BarDrobe"
+ desc = "A stylish vendor to dispense the most stylish bar clothing!"
+ icon_state = "bardrobe"
+ ads_list = list("Guaranteed to prevent stains from spilled drinks!")
+ vend_reply = "Thank you for using the BarDrobe!"
+ products = list(/obj/item/clothing/under/rank/bartender = 2,
+ /obj/item/clothing/under/sl_suit = 2,
+ /obj/item/clothing/head/that = 2,
+ /obj/item/clothing/head/soft/black = 2,
+ /obj/item/clothing/suit/blacktrenchcoat = 2,
+ /obj/item/clothing/shoes/laceup = 2,
+ /obj/item/clothing/shoes/black = 2,
+ /obj/item/clothing/accessory/waistcoat = 2,
+ /obj/item/reagent_containers/glass/rag = 3)
+ contraband = list(/obj/item/toy/figure/crew/bartender = 1)
+ refill_canister = /obj/item/vending_refill/bardrobe
+
+/obj/machinery/vending/hydrodrobe
+ name = "HydroDrobe"
+ desc = "A machine with a catchy name. It dispenses botany related clothing and gear."
+ icon_state = "hydrobe"
+ ads_list = list("Do you love soil? Then buy our clothes!", "Get outfits to match your green thumb here!")
+ vend_reply = "Thank you for using the HydroDrobe!"
+ products = list(/obj/item/clothing/under/rank/hydroponics = 3,
+ /obj/item/reagent_containers/glass/bucket = 3,
+ /obj/item/clothing/suit/apron = 3,
+ /obj/item/clothing/suit/apron/overalls = 3,
+ /obj/item/clothing/mask/bandana/botany = 3,
+ /obj/item/clothing/accessory/armband/hydro = 3,
+ /obj/item/storage/backpack/botany = 2,
+ /obj/item/storage/backpack/satchel_hyd = 2,
+ /obj/item/storage/backpack/duffel/hydro = 2,)
+ contraband = list(/obj/item/toy/figure/crew/botanist = 1)
+ refill_canister = /obj/item/vending_refill/hydrodrobe
diff --git a/code/game/machinery/wishgranter.dm b/code/game/machinery/wishgranter.dm
index d762543f807..23f251efaff 100644
--- a/code/game/machinery/wishgranter.dm
+++ b/code/game/machinery/wishgranter.dm
@@ -42,11 +42,11 @@
user.mind.add_antag_datum(/datum/antagonist/wishgranter)
to_chat(user, "You have a very bad feeling about this.")
-
+
/obj/machinery/wish_granter/super
name = "super wish granter"
var/list/types = list()
-
+
/obj/machinery/wish_granter/super/attack_hand(mob/living/carbon/user)
. = ..()
@@ -60,9 +60,9 @@
if(is_special_character(user) || jobban_isbanned(user, ROLE_TRAITOR) || jobban_isbanned(user, ROLE_SYNDICATE))
to_chat(user, "Something instinctual makes you pull away.")
return TRUE
-
+
to_chat(user, "Your touch makes the Wish Granter stir. Are you really sure you want to do this?")
-
+
for(var/supname in GLOB.all_superheroes)
types += supname
@@ -85,6 +85,6 @@
playsound(src.loc, 'sound/effects/bamf.ogg', 50, 1)
visible_message("The wishgranter fades into mist..")
- add_attack_logs(null, user, "Became [GLOB.all_superheroes[wish]]")
+ add_attack_logs(user, user, "Became [GLOB.all_superheroes[wish]]")
notify_ghosts("[GLOB.all_superheroes[wish]] has appeared in [get_area(user)].", source = user)
qdel(src)
diff --git a/code/game/mecha/combat/honker.dm b/code/game/mecha/combat/honker.dm
index eb7bfad8942..4b04010cb08 100644
--- a/code/game/mecha/combat/honker.dm
+++ b/code/game/mecha/combat/honker.dm
@@ -7,7 +7,7 @@
max_integrity = 140
deflect_chance = 60
internal_damage_threshold = 60
- armor = list("melee" = -20, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100)
+ armor = list(MELEE = -20, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 100, ACID = 100)
max_temperature = 25000
infra_luminosity = 5
operation_req_access = list(ACCESS_CLOWN)
diff --git a/code/game/mecha/combat/marauder.dm b/code/game/mecha/combat/marauder.dm
index 4e719a32b9b..8575acaa9d2 100644
--- a/code/game/mecha/combat/marauder.dm
+++ b/code/game/mecha/combat/marauder.dm
@@ -6,7 +6,7 @@
step_in = 5
max_integrity = 500
deflect_chance = 25
- armor = list("melee" = 50, "bullet" = 55, "laser" = 40, "energy" = 30, "bomb" = 30, "bio" = 0, "rad" = 60, "fire" = 100, "acid" = 100)
+ armor = list(MELEE = 50, BULLET = 55, LASER = 40, ENERGY = 30, BOMB = 30, BIO = 0, RAD = 60, FIRE = 100, ACID = 100)
max_temperature = 60000
resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
infra_luminosity = 3
diff --git a/code/game/mecha/combat/phazon.dm b/code/game/mecha/combat/phazon.dm
index 2767af5416a..53fa849b83c 100644
--- a/code/game/mecha/combat/phazon.dm
+++ b/code/game/mecha/combat/phazon.dm
@@ -9,7 +9,7 @@
normal_step_energy_drain = 3
max_integrity = 200
deflect_chance = 30
- armor = list("melee" = 30, "bullet" = 30, "laser" = 30, "energy" = 30, "bomb" = 30, "bio" = 0, "rad" = 50, "fire" = 100, "acid" = 100)
+ armor = list(MELEE = 30, BULLET = 30, LASER = 30, ENERGY = 30, BOMB = 30, BIO = 0, RAD = 50, FIRE = 100, ACID = 100)
max_temperature = 25000
infra_luminosity = 3
wreckage = /obj/structure/mecha_wreckage/phazon
diff --git a/code/game/mecha/combat/reticence.dm b/code/game/mecha/combat/reticence.dm
index 78b3329697b..a6f9cb9d0be 100644
--- a/code/game/mecha/combat/reticence.dm
+++ b/code/game/mecha/combat/reticence.dm
@@ -7,7 +7,7 @@
dir_in = 1 //Facing North.
max_integrity = 150
deflect_chance = 30
- armor = list("melee" = 25, "bullet" = 20, "laser" = 30, "energy" = 15, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100)
+ armor = list(MELEE = 25, BULLET = 20, LASER = 30, ENERGY = 15, BOMB = 0, BIO = 0, RAD = 0, FIRE = 100, ACID = 100)
max_temperature = 15000
wreckage = /obj/structure/mecha_wreckage/reticence
operation_req_access = list(ACCESS_MIME)
diff --git a/code/game/mecha/equipment/tools/mining_tools.dm b/code/game/mecha/equipment/tools/mining_tools.dm
index 2248c37f518..08cf60fb967 100644
--- a/code/game/mecha/equipment/tools/mining_tools.dm
+++ b/code/game/mecha/equipment/tools/mining_tools.dm
@@ -106,12 +106,10 @@
if(ishuman(target))
var/mob/living/carbon/human/H = target
var/obj/item/organ/external/target_part = H.get_organ(ran_zone("chest"))
- H.apply_damage(10, BRUTE, "chest", H.run_armor_check(target_part, "melee"))
+ H.apply_damage(10, BRUTE, "chest", H.run_armor_check(target_part, MELEE))
//blood splatters
- blood_color = H.dna.species.blood_color
-
- new /obj/effect/temp_visual/dir_setting/bloodsplatter(H.drop_location(), splatter_dir, blood_color)
+ new /obj/effect/temp_visual/dir_setting/bloodsplatter(H.drop_location(), splatter_dir, H.dna.species.blood_color)
//organs go everywhere
if(target_part && prob(10 * drill_level))
diff --git a/code/game/mecha/equipment/tools/other_tools.dm b/code/game/mecha/equipment/tools/other_tools.dm
index f1b9b291245..517698b14ca 100644
--- a/code/game/mecha/equipment/tools/other_tools.dm
+++ b/code/game/mecha/equipment/tools/other_tools.dm
@@ -1,4 +1,4 @@
-// Teleporter, Wormhole generator, Gravitational catapult, Armor booster modules,
+// Teleporter, Gravitational catapult, Armor booster modules,
// Repair droid, Tesla Energy relay, Generators
////////////////////////////////////////////// TELEPORTER ///////////////////////////////////////////////
@@ -29,53 +29,6 @@
energy_drain = 1000
tele_precision = 1
-
-////////////////////////////////////////////// WORMHOLE GENERATOR //////////////////////////////////////////
-
-/obj/item/mecha_parts/mecha_equipment/wormhole_generator
- name = "mounted wormhole generator"
- desc = "An exosuit module that allows generating of small quasi-stable wormholes."
- icon_state = "mecha_wholegen"
- origin_tech = "bluespace=4;magnets=4;plasmatech=2"
- equip_cooldown = 50
- energy_drain = 300
- range = MECHA_RANGED
-
-/obj/item/mecha_parts/mecha_equipment/wormhole_generator/action(atom/target)
- if(!action_checks(target) || !is_teleport_allowed(loc.z))
- return
- var/list/theareas = get_areas_in_range(100, chassis)
- if(!theareas.len)
- return
- var/area/thearea = pick(theareas)
- var/list/L = list()
- var/turf/pos = get_turf(src)
- for(var/turf/T in get_area_turfs(thearea.type))
- if(!T.density && pos.z == T.z)
- var/clear = 1
- for(var/obj/O in T)
- if(O.density)
- clear = 0
- break
- if(clear)
- L+=T
- if(!L.len)
- return
- var/turf/target_turf = pick(L)
- if(!target_turf)
- return
- var/obj/effect/portal/P = new /obj/effect/portal(get_turf(target), target_turf)
- P.icon = 'icons/obj/objects.dmi'
- P.failchance = 0
- P.icon_state = "anom"
- P.name = "wormhole"
- message_admins("[key_name_admin(chassis.occupant, chassis.occupant.client)]([ADMIN_QUE(chassis.occupant,"?")]) ([ADMIN_FLW(chassis.occupant,"FLW")]) used a Wormhole Generator in ([loc.x],[loc.y],[loc.z] - JMP)",0,1)
- log_game("[key_name(chassis.occupant)] used a Wormhole Generator in ([loc.x],[loc.y],[loc.z])")
- src = null
- spawn(rand(150,300))
- qdel(P)
- return 1
-
/////////////////////////////////////// GRAVITATIONAL CATAPULT ///////////////////////////////////////////
/obj/item/mecha_parts/mecha_equipment/gravcatapult
@@ -148,7 +101,7 @@
//////////////////////////// ARMOR BOOSTER MODULES //////////////////////////////////////////////////////////
/obj/item/mecha_parts/mecha_equipment/anticcw_armor_booster //what is that noise? A BAWWW from TK mutants.
- name = "Armor Booster Module (Close Combat Weaponry)"
+ name = "armor booster module (Close combat weaponry)"
desc = "Boosts exosuit armor against armed melee attacks. Requires energy to operate."
icon_state = "mecha_abooster_ccw"
origin_tech = "materials=4;combat=4"
@@ -166,7 +119,7 @@
/obj/item/mecha_parts/mecha_equipment/antiproj_armor_booster
- name = "Armor Booster Module (Ranged Weaponry)"
+ name = "armor booster module (Ranged weaponry)"
desc = "Boosts exosuit armor against ranged attacks. Completely blocks taser shots. Requires energy to operate."
icon_state = "mecha_abooster_proj"
origin_tech = "materials=4;combat=3;engineering=3"
@@ -186,7 +139,7 @@
////////////////////////////////// REPAIR DROID //////////////////////////////////////////////////
/obj/item/mecha_parts/mecha_equipment/repair_droid
- name = "Repair Droid"
+ name = "repair droid"
desc = "Automated repair droid. Scans exosuit for damage and repairs it. Can fix almost all types of external or internal damage."
icon_state = "repair_droid"
origin_tech ="magnets=3;programming=3;engineering=4"
@@ -243,18 +196,20 @@
set_ready_state(1)
return
var/h_boost = health_boost
- var/repaired = 0
+ var/repaired = FALSE
if(chassis.internal_damage & MECHA_INT_SHORT_CIRCUIT)
- h_boost *= -2
+ h_boost = 0
+ chassis.take_damage(2, BURN) //short circuiting droids do damage
+ repaired = TRUE
else if(chassis.internal_damage && prob(15))
for(var/int_dam_flag in repairable_damage)
if(chassis.internal_damage & int_dam_flag)
chassis.clearInternalDamage(int_dam_flag)
- repaired = 1
+ repaired = TRUE
break
- if(h_boost<0 || chassis.obj_integrity < chassis.max_integrity)
+ if(chassis.obj_integrity < chassis.max_integrity && h_boost > 0)
chassis.obj_integrity += min(h_boost, chassis.max_integrity-chassis.obj_integrity)
- repaired = 1
+ repaired = TRUE
if(repaired)
if(!chassis.use_power(energy_drain))
STOP_PROCESSING(SSobj, src)
diff --git a/code/game/mecha/equipment/tools/work_tools.dm b/code/game/mecha/equipment/tools/work_tools.dm
index 96ee16ac81e..5f1e452c45d 100644
--- a/code/game/mecha/equipment/tools/work_tools.dm
+++ b/code/game/mecha/equipment/tools/work_tools.dm
@@ -193,7 +193,7 @@
/obj/item/mecha_parts/mecha_equipment/rcd
- name = "Mounted RCD"
+ name = "mounted RCD"
desc = "An exosuit-mounted Rapid Construction Device. (Can be attached to: Any exosuit)"
icon_state = "mecha_rcd"
origin_tech = "materials=4;bluespace=3;magnets=4;powerstorage=4;engineering=4"
diff --git a/code/game/mecha/equipment/weapons/weapons.dm b/code/game/mecha/equipment/weapons/weapons.dm
index 351aba3905b..f5a2c003929 100644
--- a/code/game/mecha/equipment/weapons/weapons.dm
+++ b/code/game/mecha/equipment/weapons/weapons.dm
@@ -64,12 +64,12 @@
return
/obj/item/mecha_parts/mecha_equipment/weapon/energy
- name = "General Energy Weapon"
+ name = "general energy weapon"
size = 2
/obj/item/mecha_parts/mecha_equipment/weapon/energy/laser
equip_cooldown = 8
- name = "CH-PS \"Firedart\" Laser"
+ name = "\improper CH-PS \"Firedart\" Laser"
icon_state = "mecha_laser"
origin_tech = "magnets=3;combat=3;engineering=3"
energy_drain = 30
@@ -78,7 +78,7 @@
harmful = TRUE
/obj/item/mecha_parts/mecha_equipment/weapon/energy/laser/disabler
- name = "CH-PD Disabler"
+ name = "\improper CH-PD Disabler"
origin_tech = "combat=3"
projectile = /obj/item/projectile/beam/disabler
projectiles_per_shot = 2
@@ -87,7 +87,7 @@
/obj/item/mecha_parts/mecha_equipment/weapon/energy/laser/heavy
equip_cooldown = 10
- name = "CH-LC \"Solaris\" Laser Cannon"
+ name = "\improper CH-LC \"Solaris\" Laser Cannon"
icon_state = "mecha_laser"
origin_tech = "magnets=4;combat=4;engineering=3"
energy_drain = 60
@@ -105,7 +105,7 @@
/obj/item/mecha_parts/mecha_equipment/weapon/energy/tesla
equip_cooldown = 35
- name = "P-X Tesla Cannon"
+ name = "\improper P-X Tesla Cannon"
desc = "A weapon for combat exosuits. Fires bolts of electricity similar to the experimental tesla engine"
icon_state = "mecha_laser"
origin_tech = "materials=4;engineering=4;combat=6;magnets=6"
@@ -116,7 +116,7 @@
/obj/item/mecha_parts/mecha_equipment/weapon/energy/xray
equip_cooldown = 35
- name = "S-1 X-Ray Projector"
+ name = "\improper S-1 X-Ray Projector"
desc = "A weapon for combat exosuits. Fires beams of X-Rays that pass through solid matter."
icon_state = "mecha_laser"
origin_tech = "materials=3;combat=5;magnets=2;syndicate=2"
@@ -126,13 +126,13 @@
harmful = TRUE
/obj/item/mecha_parts/mecha_equipment/weapon/energy/xray/triple
- name = "X-XR Triple-barrel X-Ray Stream Projector"
+ name = "\improper X-XR Triple-barrel X-Ray Stream Projector"
projectiles_per_shot = 3
projectile_delay = 1
/obj/item/mecha_parts/mecha_equipment/weapon/energy/immolator
equip_cooldown = 35
- name = "ZFI Immolation Beam Gun"
+ name = "\improper ZFI Immolation Beam Gun"
desc = "A weapon for combat exosuits. Fires beams of extreme heat that set targets on fire."
icon_state = "mecha_laser"
origin_tech = "materials=4;engineering=4;combat=6;magnets=6"
@@ -143,7 +143,7 @@
/obj/item/mecha_parts/mecha_equipment/weapon/energy/pulse
equip_cooldown = 30
- name = "eZ-13 mk2 Heavy pulse rifle"
+ name = "eZ-13 mk2 Heavy Pulse Rifle"
icon_state = "mecha_pulse"
energy_drain = 120
origin_tech = "materials=3;combat=6;powerstorage=4"
@@ -165,14 +165,14 @@
if(istype(firer, /mob))
add_attack_logs(firer, M, "Mecha-shot with [src]")
else
- add_attack_logs(null, M, "Mecha-shot with [src]")
+ add_attack_logs(src, M, "Mecha-shot with [src] (no firer)")
if(life <= 0)
qdel(src)
return
/obj/item/mecha_parts/mecha_equipment/weapon/energy/taser
- name = "PBT \"Pacifier\" Mounted Taser"
+ name = "\improper PBT \"Pacifier\" Mounted Taser"
icon_state = "mecha_taser"
origin_tech = "combat=3"
energy_drain = 20
@@ -182,7 +182,7 @@
size = 1
/obj/item/mecha_parts/mecha_equipment/weapon/honker
- name = "HoNkER BlAsT 5000"
+ name = "\improper HoNkER BlAsT 5000"
icon_state = "mecha_honker"
energy_drain = 200
equip_cooldown = 150
@@ -242,7 +242,7 @@
return
/obj/item/mecha_parts/mecha_equipment/weapon/ballistic
- name = "General Ballisic Weapon"
+ name = "general ballisic weapon"
size = 2
/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/action_checks(atom/target)
if(..())
@@ -272,7 +272,7 @@
return
/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/carbine
- name = "FNX-66 Carbine"
+ name = "\improper FNX-66 Carbine"
icon_state = "mecha_carbine"
origin_tech = "materials=4;combat=4"
equip_cooldown = 5
@@ -298,7 +298,7 @@
return 0
/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/scattershot
- name = "LBX AC 10 \"Scattershot\""
+ name = "\improper LBX AC 10 \"Scattershot\""
icon_state = "mecha_scatter"
origin_tech = "combat=4"
equip_cooldown = 20
@@ -311,7 +311,7 @@
harmful = TRUE
/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/lmg
- name = "Ultra AC 2"
+ name = "\improper Ultra AC 2"
icon_state = "mecha_uac2"
origin_tech = "combat=4"
equip_cooldown = 10
@@ -325,11 +325,11 @@
harmful = TRUE
/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/lmg/dual
- name = "XMG-9 Autocannon"
+ name = "\improper XMG-9 Autocannon"
projectiles_per_shot = 6
/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack
- name = "SRM-8 Light Missile Rack"
+ name = "\improper SRM-8 Light Missile Rack"
icon_state = "mecha_missilerack"
origin_tech = "combat=5;materials=4;engineering=4"
projectile = /obj/item/missile
@@ -361,7 +361,7 @@
return
/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/heavy
- name = "SRX-13 Heavy Missile Launcher"
+ name = "\improper SRX-13 Heavy Missile Launcher"
heavy_missile = 1
/obj/item/missile
@@ -383,7 +383,7 @@
return
/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/flashbang
- name = "SGL-6 Flashbang Launcher"
+ name = "\improper SGL-6 Flashbang Launcher"
icon_state = "mecha_grenadelnchr"
origin_tech = "combat=4;engineering=4"
projectile = /obj/item/grenade/flashbang
@@ -409,7 +409,7 @@
return
/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/flashbang/clusterbang//Because I am a heartless bastard -Sieve
- name = "SOB-3 Clusterbang Launcher"
+ name = "\improper SOB-3 Clusterbang Launcher"
desc = "A weapon for combat exosuits. Launches primed clusterbangs. You monster."
origin_tech = "combat=4;materials=4"
projectiles = 3
@@ -425,7 +425,7 @@
return//Extra bit of security
/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/banana_mortar
- name = "Banana Mortar"
+ name = "banana mortar"
icon_state = "mecha_bananamrtr"
projectile = /obj/item/grown/bananapeel
fire_sound = 'sound/items/bikehorn.ogg'
@@ -455,7 +455,7 @@
/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/mousetrap_mortar
- name = "Mousetrap Mortar"
+ name = "mousetrap mortar"
icon_state = "mecha_mousetrapmrtr"
projectile = /obj/item/assembly/mousetrap
fire_sound = 'sound/items/bikehorn.ogg'
@@ -485,7 +485,7 @@
return
/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/bola
- name = "PCMK-6 Bola Launcher"
+ name = "\improper PCMK-6 Bola Launcher"
icon_state = "mecha_bola"
origin_tech = "combat=4;engineering=4"
projectile = /obj/item/restraints/legcuffs/bola
diff --git a/code/game/mecha/mech_bay.dm b/code/game/mecha/mech_bay.dm
index 01d3fe3e4a1..aff160b8af5 100644
--- a/code/game/mecha/mech_bay.dm
+++ b/code/game/mecha/mech_bay.dm
@@ -1,5 +1,5 @@
/turf/simulated/floor/mech_bay_recharge_floor
- name = "Mech Bay Recharge Station"
+ name = "mech bay recharge station"
icon = 'icons/mecha/mech_bay.dmi'
icon_state = "recharge_floor"
@@ -10,7 +10,7 @@
temperature = TCMB
/obj/machinery/mech_bay_recharge_port
- name = "Mech Bay Power Port"
+ name = "mech bay power port"
density = 1
anchored = 1
dir = EAST
diff --git a/code/game/mecha/mech_fabricator.dm b/code/game/mecha/mech_fabricator.dm
index ac44916931e..b3375e2b0da 100644
--- a/code/game/mecha/mech_fabricator.dm
+++ b/code/game/mecha/mech_fabricator.dm
@@ -460,39 +460,6 @@
component_parts += new /obj/item/stack/sheet/glass(null)
RefreshParts()
-/**
- * # Spacepod Fabricator
- *
- * Spacepod variant of [/obj/machinery/mecha_part_fabricator].
- */
-/obj/machinery/mecha_part_fabricator/spacepod
- name = "spacepod fabricator"
- allowed_design_types = PODFAB
- req_access = list(ACCESS_MECHANIC)
-
-/obj/machinery/mecha_part_fabricator/spacepod/New()
- ..()
- QDEL_LIST(component_parts)
- component_parts = list()
- component_parts += new /obj/item/circuitboard/podfab(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/manipulator(null)
- component_parts += new /obj/item/stock_parts/micro_laser(null)
- component_parts += new /obj/item/stack/sheet/glass(null)
- RefreshParts()
-
-/obj/machinery/mecha_part_fabricator/spacepod/Initialize(mapload)
- . = ..()
- categories = list(
- "Pod_Weaponry",
- "Pod_Armor",
- "Pod_Cargo",
- "Pod_Parts",
- "Pod_Frame",
- "Misc"
- )
-
/**
* # Robotic Fabricator
*
diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm
index 00ddb73f497..a682c2f71de 100644
--- a/code/game/mecha/mecha.dm
+++ b/code/game/mecha/mecha.dm
@@ -481,9 +481,9 @@
if(. && obj_integrity > 0)
spark_system.start()
switch(damage_flag)
- if("fire")
+ if(FIRE)
check_for_internal_damage(list(MECHA_INT_FIRE,MECHA_INT_TEMP_CONTROL))
- if("melee")
+ if(MELEE)
check_for_internal_damage(list(MECHA_INT_TEMP_CONTROL,MECHA_INT_TANK_BREACH,MECHA_INT_CONTROL_LOST))
else
check_for_internal_damage(list(MECHA_INT_FIRE,MECHA_INT_TEMP_CONTROL,MECHA_INT_TANK_BREACH,MECHA_INT_CONTROL_LOST,MECHA_INT_SHORT_CIRCUIT))
@@ -497,13 +497,13 @@
return 0
var/booster_deflection_modifier = 1
var/booster_damage_modifier = 1
- if(damage_flag == "bullet" || damage_flag == "laser" || damage_flag == "energy")
+ if(damage_flag == BULLET || damage_flag == LASER || damage_flag == ENERGY)
for(var/obj/item/mecha_parts/mecha_equipment/antiproj_armor_booster/B in equipment)
if(B.projectile_react())
booster_deflection_modifier = B.deflect_coeff
booster_damage_modifier = B.damage_coeff
break
- else if(damage_flag == "melee")
+ else if(damage_flag == MELEE)
for(var/obj/item/mecha_parts/mecha_equipment/anticcw_armor_booster/B in equipment)
if(B.attack_react())
booster_deflection_modifier *= B.deflect_coeff
@@ -533,7 +533,7 @@
log_message("Attack by alien. Attacker - [user].", TRUE)
add_attack_logs(user, OCCUPANT_LOGGING, "Alien attacked mech [src]")
playsound(src.loc, 'sound/weapons/slash.ogg', 100, TRUE)
- attack_generic(user, 15, BRUTE, "melee", 0)
+ attack_generic(user, 15, BRUTE, MELEE, 0)
/obj/mecha/attack_animal(mob/living/simple_animal/user)
log_message("Attack by simple animal. Attacker - [user].")
@@ -551,7 +551,7 @@
animal_damage = min(animal_damage, 20*user.environment_smash)
if(animal_damage)
add_attack_logs(user, OCCUPANT_LOGGING, "Animal attacked mech [src]")
- attack_generic(user, animal_damage, user.melee_damage_type, "melee", play_soundeffect)
+ attack_generic(user, animal_damage, user.melee_damage_type, MELEE, play_soundeffect)
return TRUE
/obj/mecha/hulk_damage()
@@ -565,7 +565,7 @@
/obj/mecha/blob_act(obj/structure/blob/B)
log_message("Attack by blob. Attacker - [B].")
- take_damage(30, BRUTE, "melee", 0, get_dir(src, B))
+ take_damage(30, BRUTE, MELEE, 0, get_dir(src, B))
/obj/mecha/attack_tk()
return
@@ -643,7 +643,7 @@
/obj/mecha/emp_act(severity)
if(get_charge())
use_power((cell.charge/3)/(severity*2))
- take_damage(30 / severity, BURN, "energy", 1)
+ take_damage(30 / severity, BURN, ENERGY, 1)
log_message("EMP detected", 1)
check_for_internal_damage(list(MECHA_INT_FIRE, MECHA_INT_TEMP_CONTROL, MECHA_INT_CONTROL_LOST, MECHA_INT_SHORT_CIRCUIT), 1)
diff --git a/code/game/mecha/mecha_construction_paths.dm b/code/game/mecha/mecha_construction_paths.dm
index 13b5d6f1be2..dda33b8495d 100644
--- a/code/game/mecha/mecha_construction_paths.dm
+++ b/code/game/mecha/mecha_construction_paths.dm
@@ -767,13 +767,13 @@
/datum/construction/mecha/honker_chassis/spawn_result()
..("Honker")
var/obj/item/mecha_parts/chassis/const_holder = holder
- const_holder.construct = new /datum/construction/mecha/honker(const_holder)
+ const_holder.construct = new /datum/construction/reversible/mecha/honker(const_holder)
const_holder.density = 1
qdel(src)
return
-/datum/construction/mecha/honker
+/datum/construction/reversible/mecha/honker
result = "/obj/mecha/combat/honker"
steps = list(list("key"=/obj/item/bikehorn),//1
list("key"=/obj/item/clothing/shoes/clown_shoes),//2
@@ -788,10 +788,10 @@
list("key"=/obj/item/bikehorn),//11
)
-/datum/construction/mecha/honker/action(atom/used_atom,mob/user as mob)
+/datum/construction/reversible/mecha/honker/action(atom/used_atom,mob/user as mob)
return check_step(used_atom,user)
-/datum/construction/mecha/honker/custom_action(step, atom/used_atom, mob/user)
+/datum/construction/reversible/mecha/honker/custom_action(index, diff, atom/used_atom, mob/user)
if(!..())
return 0
@@ -800,7 +800,7 @@
user.visible_message("HONK!")
//TODO: better messages.
- switch(step)
+ switch(index)
if(10)
user.visible_message("[user] installs the central control module into the [holder].", "You install the central control module into the [holder].")
qdel(used_atom)
@@ -839,12 +839,12 @@
/datum/construction/mecha/reticence_chassis/spawn_result()
..("Reticence")
var/obj/item/mecha_parts/chassis/const_holder = holder
- const_holder.construct = new /datum/construction/mecha/reticence(const_holder)
+ const_holder.construct = new /datum/construction/reversible/mecha/reticence(const_holder)
const_holder.density = 1
qdel(src)
return
-/datum/construction/mecha/reticence
+/datum/construction/reversible/mecha/reticence
result = "/obj/mecha/combat/reticence"
steps = list(list("key"=/obj/effect/dummy/mecha_emote_step),//1
list("key"=/obj/item/clothing/suit/suspenders),//2
@@ -857,10 +857,10 @@
list("key"=/obj/item/circuitboard/mecha/reticence/main),//9
)
-/datum/construction/mecha/reticence/action(atom/used_atom,mob/user)
+/datum/construction/reversible/mecha/reticence/action(atom/used_atom,mob/user)
return check_step(used_atom,user)
-/datum/construction/mecha/reticence/custom_action(step, atom/used_atom, mob/user)
+/datum/construction/reversible/mecha/reticence/custom_action(index, diff, atom/used_atom, mob/user)
if(!..())
return 0
@@ -870,7 +870,7 @@
qdel(used_atom)
//TODO: better messages.
- switch(step)
+ switch(index)
if(9)
user.visible_message("[user] installs the central control module into the [holder].", "You install the central control module into the [holder].")
qdel(used_atom)
diff --git a/code/game/mecha/mecha_control_console.dm b/code/game/mecha/mecha_control_console.dm
index 5b7ebd1c478..27006ae33cb 100644
--- a/code/game/mecha/mecha_control_console.dm
+++ b/code/game/mecha/mecha_control_console.dm
@@ -69,7 +69,7 @@
return TRUE
/obj/item/mecha_parts/mecha_tracking
- name = "Exosuit tracking beacon"
+ name = "exosuit tracking beacon"
desc = "Device used to transmit exosuit data."
icon = 'icons/obj/device.dmi'
icon_state = "motion2"
@@ -174,7 +174,7 @@
ai_beacon = TRUE
/obj/item/storage/box/mechabeacons
- name = "Exosuit Tracking Beacons"
+ name = "exosuit tracking beacons"
/obj/item/storage/box/mechabeacons/New()
..()
diff --git a/code/game/mecha/mecha_parts.dm b/code/game/mecha/mecha_parts.dm
index 52b3a2263fa..d56ecae4290 100644
--- a/code/game/mecha/mecha_parts.dm
+++ b/code/game/mecha/mecha_parts.dm
@@ -12,7 +12,7 @@
/obj/item/mecha_parts/chassis
- name="Mecha Chassis"
+ name = "mecha chassis"
icon_state = "backbone"
var/datum/construction/construct
flags = CONDUCT
@@ -31,83 +31,83 @@
/////////// Ripley
/obj/item/mecha_parts/chassis/ripley
- name = "Ripley Chassis"
+ name = "\improper Ripley chassis"
/obj/item/mecha_parts/chassis/ripley/New()
..()
construct = new /datum/construction/mecha/ripley_chassis(src)
/obj/item/mecha_parts/part/ripley_torso
- name="Ripley Torso"
- desc="A torso part of Ripley APLU. Contains power unit, processing core and life support systems."
+ name = "\improper Ripley torso"
+ desc = "A torso part of Ripley APLU. Contains power unit, processing core and life support systems."
icon_state = "ripley_harness"
origin_tech = "programming=2;materials=2;biotech=2;engineering=2"
/obj/item/mecha_parts/part/ripley_left_arm
- name="Ripley Left Arm"
- desc="A Ripley APLU left arm. Data and power sockets are compatible with most exosuit tools."
+ name = "\improper Ripley left arm"
+ desc = "A Ripley APLU left arm. Data and power sockets are compatible with most exosuit tools."
icon_state = "ripley_l_arm"
/obj/item/mecha_parts/part/ripley_right_arm
- name="Ripley Right Arm"
- desc="A Ripley APLU right arm. Data and power sockets are compatible with most exosuit tools."
+ name = "\improper Ripley right arm"
+ desc = "A Ripley APLU right arm. Data and power sockets are compatible with most exosuit tools."
icon_state = "ripley_r_arm"
/obj/item/mecha_parts/part/ripley_left_leg
- name="Ripley Left Leg"
- desc="A Ripley APLU left leg. Contains somewhat complex servodrives and balance maintaining systems."
+ name = "\improper Ripley left leg"
+ desc = "A Ripley APLU left leg. Contains somewhat complex servodrives and balance maintaining systems."
icon_state = "ripley_l_leg"
/obj/item/mecha_parts/part/ripley_right_leg
- name="Ripley Right Leg"
- desc="A Ripley APLU right leg. Contains somewhat complex servodrives and balance maintaining systems."
+ name = "\improper Ripley right leg"
+ desc = "A Ripley APLU right leg. Contains somewhat complex servodrives and balance maintaining systems."
icon_state = "ripley_r_leg"
///////// Gygax
/obj/item/mecha_parts/chassis/gygax
- name = "Gygax Chassis"
+ name = "\improper Gygax chassis"
/obj/item/mecha_parts/chassis/gygax/New()
..()
construct = new /datum/construction/mecha/gygax_chassis(src)
/obj/item/mecha_parts/part/gygax_torso
- name="Gygax Torso"
- desc="A torso part of Gygax. Contains power unit, processing core and life support systems. Has an additional equipment slot."
+ name = "\improper Gygax torso"
+ desc = "A torso part of Gygax. Contains power unit, processing core and life support systems. Has an additional equipment slot."
icon_state = "gygax_harness"
origin_tech = "programming=2;materials=4;biotech=3;engineering=3"
/obj/item/mecha_parts/part/gygax_head
- name="Gygax Head"
- desc="A Gygax head. Houses advanced surveilance and targeting sensors."
+ name = "\improper Gygax head"
+ desc = "A Gygax head. Houses advanced surveilance and targeting sensors."
icon_state = "gygax_head"
origin_tech = "programming=2;materials=4;magnets=3;engineering=3"
/obj/item/mecha_parts/part/gygax_left_arm
- name="Gygax Left Arm"
- desc="A Gygax left arm. Data and power sockets are compatible with most exosuit tools and weapons."
+ name = "\improper Gygax left arm"
+ desc = "A Gygax left arm. Data and power sockets are compatible with most exosuit tools and weapons."
icon_state = "gygax_l_arm"
origin_tech = "programming=2;materials=4;engineering=3"
/obj/item/mecha_parts/part/gygax_right_arm
- name="Gygax Right Arm"
- desc="A Gygax right arm. Data and power sockets are compatible with most exosuit tools and weapons."
+ name = "\improper Gygax right arm"
+ desc = "A Gygax right arm. Data and power sockets are compatible with most exosuit tools and weapons."
icon_state = "gygax_r_arm"
origin_tech = "programming=2;materials=4;engineering=3"
/obj/item/mecha_parts/part/gygax_left_leg
- name="Gygax Left Leg"
+ name = "\improper Gygax left leg"
icon_state = "gygax_l_leg"
origin_tech = "programming=2;materials=4;engineering=3"
/obj/item/mecha_parts/part/gygax_right_leg
- name="Gygax Right Leg"
+ name = "\improper Gygax right leg"
icon_state = "gygax_r_leg"
origin_tech = "programming=2;materials=4;engineering=3"
/obj/item/mecha_parts/part/gygax_armour
- name="Gygax Armour Plates"
+ name = "\improper Gygax armour plates"
icon_state = "gygax_armour"
origin_tech = "materials=6;combat=4;engineering=4"
@@ -115,44 +115,44 @@
//////////// Durand
/obj/item/mecha_parts/chassis/durand
- name = "Durand Chassis"
+ name = "\improper Durand chassis"
/obj/item/mecha_parts/chassis/durand/New()
..()
construct = new /datum/construction/mecha/durand_chassis(src)
/obj/item/mecha_parts/part/durand_torso
- name="Durand Torso"
+ name = "\improper Durand torso"
icon_state = "durand_harness"
origin_tech = "programming=2;materials=3;biotech=3;engineering=3"
/obj/item/mecha_parts/part/durand_head
- name="Durand Head"
+ name = "\improper Durand head"
icon_state = "durand_head"
origin_tech = "programming=2;materials=3;magnets=3;engineering=3"
/obj/item/mecha_parts/part/durand_left_arm
- name="Durand Left Arm"
+ name = "\improper Durand left arm"
icon_state = "durand_l_arm"
origin_tech = "programming=2;materials=3;engineering=3"
/obj/item/mecha_parts/part/durand_right_arm
- name="Durand Right Arm"
+ name = "\improper Durand right arm"
icon_state = "durand_r_arm"
origin_tech = "programming=2;materials=3;engineering=3"
/obj/item/mecha_parts/part/durand_left_leg
- name="Durand Left Leg"
+ name = "\improper Durand left leg"
icon_state = "durand_l_leg"
origin_tech = "programming=2;materials=3;engineering=3"
/obj/item/mecha_parts/part/durand_right_leg
- name="Durand Right Leg"
+ name = "\improper Durand right leg"
icon_state = "durand_r_leg"
origin_tech = "programming=2;materials=3;engineering=3"
/obj/item/mecha_parts/part/durand_armor
- name="Durand Armour Plates"
+ name = "\improper Durand armour plates"
icon_state = "durand_armor"
origin_tech = "materials=5;combat=4;engineering=4"
@@ -161,7 +161,7 @@
////////// Firefighter
/obj/item/mecha_parts/chassis/firefighter
- name = "Firefighter Chassis"
+ name = "\improper Firefighter chassis"
/obj/item/mecha_parts/chassis/firefighter/New()
..()
@@ -170,41 +170,41 @@
////////// HONK
/obj/item/mecha_parts/chassis/honker
- name = "H.O.N.K Chassis"
+ name = "\improper H.O.N.K chassis"
/obj/item/mecha_parts/chassis/honker/New()
..()
construct = new /datum/construction/mecha/honker_chassis(src)
/obj/item/mecha_parts/part/honker_torso
- name="H.O.N.K Torso"
+ name = "\improper H.O.N.K torso"
icon_state = "honker_harness"
/obj/item/mecha_parts/part/honker_head
- name="H.O.N.K Head"
+ name = "\improper H.O.N.K head"
icon_state = "honker_head"
/obj/item/mecha_parts/part/honker_left_arm
- name="H.O.N.K Left Arm"
+ name = "\improper H.O.N.K left arm"
icon_state = "honker_l_arm"
/obj/item/mecha_parts/part/honker_right_arm
- name="H.O.N.K Right Arm"
+ name = "\improper H.O.N.K right arm"
icon_state = "honker_r_arm"
/obj/item/mecha_parts/part/honker_left_leg
- name="H.O.N.K Left Leg"
+ name = "\improper H.O.N.K left leg"
icon_state = "honker_l_leg"
/obj/item/mecha_parts/part/honker_right_leg
- name="H.O.N.K Right Leg"
+ name = "\improper H.O.N.K right leg"
icon_state = "honker_r_leg"
////////// Reticence
/obj/item/mecha_parts/chassis/reticence
- name = "Reticence Chassis"
+ name = "\improper Reticence chassis"
/obj/item/mecha_parts/chassis/reticence/New()
..()
@@ -218,42 +218,42 @@
emote = e
/obj/item/mecha_parts/chassis/reticence/hear_message(mob/living/M, msg)
- if(!istype(M) || !istype(construct, /datum/construction/mecha/reticence))
+ if(!istype(M) || !istype(construct, /datum/construction/reversible/mecha/reticence))
return
// is the current step the dummy emote object?
var/list/steps = construct.steps
- if(steps[steps.len]["key"] == /obj/effect/dummy/mecha_emote_step)
+ if(steps[construct.index]["key"] == /obj/effect/dummy/mecha_emote_step)
construct.action(new /obj/effect/dummy/mecha_emote_step(msg), M)
/obj/item/mecha_parts/part/reticence_torso
- name = "Reticence Torso"
+ name = "\improper Reticence torso"
icon_state = "reticence_harness"
/obj/item/mecha_parts/part/reticence_head
- name = "Reticence Head"
+ name = "\improper Reticence head"
icon_state = "reticence_head"
/obj/item/mecha_parts/part/reticence_left_arm
- name = "Reticence Left Arm"
+ name = "\improper Reticence left arm"
icon_state = "reticence_l_arm"
/obj/item/mecha_parts/part/reticence_right_arm
- name = "Reticence Right Arm"
+ name = "\improper Reticence right arm"
icon_state = "reticence_r_arm"
/obj/item/mecha_parts/part/reticence_left_leg
- name = "Reticence Left Leg"
+ name = "\improper Reticence left leg"
icon_state = "reticence_l_leg"
/obj/item/mecha_parts/part/reticence_right_leg
- name = "Reticence Right Leg"
+ name = "\improper Reticence right leg"
icon_state = "reticence_r_leg"
////////// Phazon
/obj/item/mecha_parts/chassis/phazon
- name = "Phazon Chassis"
+ name = "\improper Phazon chassis"
/obj/item/mecha_parts/chassis/phazon/New()
..()
@@ -265,81 +265,81 @@
to_chat(user, "The anomaly core socket only accepts bluespace anomaly cores!")
/obj/item/mecha_parts/part/phazon_torso
- name="Phazon Torso"
+ name = "\improper Phazon torso"
icon_state = "phazon_harness"
origin_tech = "programming=4;materials=4;bluespace=4;plasmatech=5"
/obj/item/mecha_parts/part/phazon_head
- name="Phazon Head"
+ name = "\improper Phazon head"
icon_state = "phazon_head"
origin_tech = "programming=3;materials=3;magnets=3"
/obj/item/mecha_parts/part/phazon_left_arm
- name="Phazon Left Arm"
+ name = "\improper Phazon left arm"
icon_state = "phazon_l_arm"
origin_tech = "materials=3;bluespace=3;magnets=3"
/obj/item/mecha_parts/part/phazon_right_arm
- name="Phazon Right Arm"
+ name = "\improper Phazon right arm"
icon_state = "phazon_r_arm"
origin_tech = "materials=3;bluespace=3;magnets=3"
/obj/item/mecha_parts/part/phazon_left_leg
- name="Phazon Left Leg"
+ name = "\improper Phazon left leg"
icon_state = "phazon_l_leg"
origin_tech = "materials=3;bluespace=3;magnets=3"
/obj/item/mecha_parts/part/phazon_right_leg
- name="Phazon Right Leg"
+ name = "\improper Phazon right leg"
icon_state = "phazon_r_leg"
origin_tech = "materials=3;bluespace=3;magnets=3"
/obj/item/mecha_parts/part/phazon_armor
- name="Phazon armor"
- desc="Phazon armor plates. They are layered with plasma to protect the pilot from the stress of phasing and have unusual properties."
+ name = "\improper Phazon armor"
+ desc = "Phazon armor plates. They are layered with plasma to protect the pilot from the stress of phasing and have unusual properties."
icon_state = "phazon_armor"
origin_tech = "materials=4;bluespace=4;plasmatech=5"
///////// Odysseus
/obj/item/mecha_parts/chassis/odysseus
- name = "Odysseus Chassis"
+ name = "\improper Odysseus Chassis"
/obj/item/mecha_parts/chassis/odysseus/New()
..()
construct = new /datum/construction/mecha/odysseus_chassis(src)
/obj/item/mecha_parts/part/odysseus_head
- name="Odysseus Head"
+ name = "\improper Odysseus head"
icon_state = "odysseus_head"
/obj/item/mecha_parts/part/odysseus_torso
- name="Odysseus Torso"
- desc="A torso part of Odysseus. Contains power unit, processing core and life support systems."
+ name = "\improper Odysseus torso"
+ desc = "A torso part of Odysseus. Contains power unit, processing core and life support systems."
icon_state = "odysseus_torso"
origin_tech = "programming=2;materials=2;biotech=2;engineering=2"
/obj/item/mecha_parts/part/odysseus_left_arm
- name="Odysseus Left Arm"
- desc="An Odysseus left arm. Data and power sockets are compatible with most exosuit tools."
+ name = "\improper Odysseus left arm"
+ desc = "An Odysseus left arm. Data and power sockets are compatible with most exosuit tools."
icon_state = "odysseus_l_arm"
/obj/item/mecha_parts/part/odysseus_right_arm
- name="Odysseus Right Arm"
- desc="An Odysseus right arm. Data and power sockets are compatible with most exosuit tools."
+ name = "\improper Odysseus right arm"
+ desc = "An Odysseus right arm. Data and power sockets are compatible with most exosuit tools."
icon_state = "odysseus_r_arm"
/obj/item/mecha_parts/part/odysseus_left_leg
- name="Odysseus Left Leg"
- desc="An Odysseus left leg. Contains somewhat complex servodrives and balance maintaining systems."
+ name = "\improper Odysseus left leg"
+ desc = "An Odysseus left leg. Contains somewhat complex servodrives and balance maintaining systems."
icon_state = "odysseus_l_leg"
/obj/item/mecha_parts/part/odysseus_right_leg
- name="Odysseus Right Leg"
- desc="A Odysseus right leg. Contains somewhat complex servodrives and balance maintaining systems."
+ name = "\improper Odysseus right leg"
+ desc = "A Odysseus right leg. Contains somewhat complex servodrives and balance maintaining systems."
icon_state = "odysseus_r_leg"
/*/obj/item/mecha_parts/part/odysseus_armour
- name="Odysseus Carapace"
+ name = "\improper Odysseus carapace"
icon_state = "odysseus_armour"
origin_tech = "materials=3;engineering=3")*/
diff --git a/code/game/mecha/paintkits.dm b/code/game/mecha/paintkits.dm
index aba926c6814..1aef8ebf061 100644
--- a/code/game/mecha/paintkits.dm
+++ b/code/game/mecha/paintkits.dm
@@ -11,7 +11,7 @@
var/list/allowed_types = list() //Types of mech that the kit will work on.
/obj/item/paintkit/titansfist
- name = "APLU \"Ripley\" customisation kit"
+ name = "\improper APLU \"Ripley\" customisation kit"
desc = "A kit containing all the needed tools and parts to turn an APLU \"Ripley\" into a Titan's Fist worker mech."
icon_state = "paintkit_2"
@@ -21,10 +21,8 @@
allowed_types = list("ripley","firefighter")
/obj/item/paintkit/mercenary
- name = "Mercenary APLU \"Ripley\" kit"
+ name = "\improper mercenary APLU \"Ripley\" kit"
desc = "A kit containing all the needed tools and parts to turn an APLU \"Ripley\" into an old Mercenaries APLU."
-
-
new_name = "APLU \"Strike the Earth!\""
new_desc = "Looks like an over worked, under maintained Ripley with some horrific damage."
new_icon = "earth"
diff --git a/code/game/mecha/working/ripley.dm b/code/game/mecha/working/ripley.dm
index 96f045ea9d3..34934baea86 100644
--- a/code/game/mecha/working/ripley.dm
+++ b/code/game/mecha/working/ripley.dm
@@ -10,7 +10,7 @@
max_integrity = 200
lights_power = 7
deflect_chance = 15
- armor = list("melee" = 40, "bullet" = 20, "laser" = 10, "energy" = 20, "bomb" = 40, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100)
+ armor = list(MELEE = 40, BULLET = 20, LASER = 10, ENERGY = 20, BOMB = 40, BIO = 0, RAD = 0, FIRE = 100, ACID = 100)
max_equip = 6
wreckage = /obj/structure/mecha_wreckage/ripley
var/list/cargo = new
@@ -70,7 +70,7 @@
max_integrity = 250
resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
lights_power = 7
- armor = list("melee" = 40, "bullet" = 30, "laser" = 30, "energy" = 30, "bomb" = 60, "bio" = 0, "rad" = 70, "fire" = 100, "acid" = 100)
+ armor = list(MELEE = 40, BULLET = 30, LASER = 30, ENERGY = 30, BOMB = 60, BIO = 0, RAD = 70, FIRE = 100, ACID = 100)
max_equip = 5 // More armor, less tools
wreckage = /obj/structure/mecha_wreckage/ripley/firefighter
@@ -85,7 +85,7 @@
max_temperature = 65000
max_integrity = 300
lights_power = 7
- armor = list("melee" = 40, "bullet" = 40, "laser" = 40, "energy" = 0, "bomb" = 70, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100)
+ armor = list(MELEE = 40, BULLET = 40, LASER = 40, ENERGY = 0, BOMB = 70, BIO = 0, RAD = 0, FIRE = 100, ACID = 100)
wreckage = /obj/structure/mecha_wreckage/ripley/deathripley
step_energy_drain = 0
normal_step_energy_drain = 0
diff --git a/code/game/objects/effects/decals/Cleanable/humans.dm b/code/game/objects/effects/decals/Cleanable/humans.dm
index f88a3cb630d..29ef7eb3ad5 100644
--- a/code/game/objects/effects/decals/Cleanable/humans.dm
+++ b/code/game/objects/effects/decals/Cleanable/humans.dm
@@ -84,7 +84,7 @@ GLOBAL_LIST_EMPTY(splatter_cache)
/obj/effect/decal/cleanable/blood/drip
name = "drips of blood"
- desc = "It's red."
+ desc = "A drop of blood in an ocean of mess."
gender = PLURAL
icon = 'icons/effects/drip.dmi'
icon_state = "1"
diff --git a/code/game/objects/effects/effect_system/effects_other.dm b/code/game/objects/effects/effect_system/effects_other.dm
index bb33bfe15fa..241234456a9 100644
--- a/code/game/objects/effects/effect_system/effects_other.dm
+++ b/code/game/objects/effects/effect_system/effects_other.dm
@@ -1,4 +1,4 @@
-/// Ion trails for spacepods and other space-flying things
+/// Ion trails for jetpacks, ion thrusters and other space-flying things
/obj/effect/particle_effect/ion_trails
name = "ion trails"
icon_state = "ion_trails"
diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm
index c4af2849947..a5c01d63ae4 100644
--- a/code/game/objects/effects/spawners/lootdrop.dm
+++ b/code/game/objects/effects/spawners/lootdrop.dm
@@ -144,6 +144,8 @@
/obj/item/stamp/chameleon = 2,
/obj/item/clothing/shoes/chameleon/noslip = 5,
/obj/item/clothing/mask/chameleon = 2,
+ /obj/item/clothing/mask/gas/voice_modulator = 2,
+ /obj/item/clothing/mask/gas/voice_modulator/chameleon = 2,
/obj/item/dnascrambler = 1,
/obj/item/storage/backpack/satchel_flat = 2,
/obj/item/storage/toolbox/syndicate = 2,
@@ -156,7 +158,7 @@
/obj/item/storage/secure/briefcase/syndie = 2,
/obj/item/storage/fancy/cigarettes/cigpack_syndicate = 2,
/obj/item/storage/pill_bottle/fakedeath = 2,
- "" = 68
+ "" = 64 // Reduce this number if you add things above. Make sure all the numbers in the list add to 100 EXACTLY
)
/obj/effect/spawner/lootdrop/crate_spawner // for ruins
diff --git a/code/game/objects/effects/spawners/random_spawners.dm b/code/game/objects/effects/spawners/random_spawners.dm
index acd1e54eef7..64708c0ff25 100644
--- a/code/game/objects/effects/spawners/random_spawners.dm
+++ b/code/game/objects/effects/spawners/random_spawners.dm
@@ -3,8 +3,7 @@
icon = 'icons/mob/screen_gen.dmi'
icon_state = "x2"
var/list/result = list(
- /turf/simulated/floor/plasteel = 1,
- /turf/simulated/floor/plating = 1,
+ /datum/nothing = 1,
/obj/effect/decal/cleanable/blood/splatter = 1,
/obj/effect/decal/cleanable/blood/oil = 1,
/obj/effect/decal/cleanable/fungus = 1)
@@ -37,25 +36,25 @@
/obj/effect/spawner/random_spawners/blood_maybe
name = "blood maybe"
result = list(
- /turf/simulated/floor/plating = 20,
+ /datum/nothing = 20,
/obj/effect/decal/cleanable/blood/splatter = 1)
/obj/effect/spawner/random_spawners/blood_often
name = "blood often"
result = list(
- /turf/simulated/floor/plating = 5,
+ /datum/nothing = 5,
/obj/effect/decal/cleanable/blood/splatter = 1)
/obj/effect/spawner/random_spawners/oil_maybe
name = "oil maybe"
result = list(
- /turf/simulated/floor/plating = 20,
+ /datum/nothing = 20,
/obj/effect/decal/cleanable/blood/oil = 1)
/obj/effect/spawner/random_spawners/oil_maybe
name = "oil often"
result = list(
- /turf/simulated/floor/plating = 5,
+ /datum/nothing = 5,
/obj/effect/decal/cleanable/blood/oil = 1)
/obj/effect/spawner/random_spawners/wall_rusted_probably
@@ -73,37 +72,37 @@
/obj/effect/spawner/random_spawners/cobweb_left_frequent
name = "cobweb left frequent"
result = list(
- /turf/simulated/floor/plating = 1,
+ /datum/nothing = 1,
/obj/effect/decal/cleanable/cobweb = 1)
/obj/effect/spawner/random_spawners/cobweb_right_frequent
name = "cobweb right frequent"
result = list(
- /turf/simulated/floor/plating = 1,
+ /datum/nothing = 1,
/obj/effect/decal/cleanable/cobweb2 = 1)
/obj/effect/spawner/random_spawners/cobweb_left_rare
name = "cobweb left rare"
result = list(
- /turf/simulated/floor/plating = 10,
+ /datum/nothing = 10,
/obj/effect/decal/cleanable/cobweb = 1)
/obj/effect/spawner/random_spawners/cobweb_right_rare
name = "cobweb right rare"
result = list(
- /turf/simulated/floor/plating = 10,
+ /datum/nothing = 10,
/obj/effect/decal/cleanable/cobweb2 = 1)
/obj/effect/spawner/random_spawners/dirt_frequent
name = "dirt frequent"
result = list(
- /turf/simulated/floor/plating = 1,
+ /datum/nothing = 1,
/obj/effect/decal/cleanable/dirt = 1)
/obj/effect/spawner/random_spawners/dirt_rare
name = "dirt rare"
result = list(
- /turf/simulated/floor/plating = 10,
+ /datum/nothing = 10,
/obj/effect/decal/cleanable/dirt = 1)
/obj/effect/spawner/random_spawners/fungus_maybe
@@ -307,9 +306,3 @@
name = "80pc vaultdoor 20pc wall"
result = list(/obj/machinery/door/airlock/hatch/syndicate/vault = 4,
/turf/simulated/wall/mineral/plastitanium/nodiagonal = 1)
-
-
-/obj/effect/spawner/random_spawners/syndicate/layout/spacepod
- name = "50pc loot spacepod"
- result = list(/obj/spacepod/syndi = 1,
- /obj/spacepod/syndi/unlocked = 1)
diff --git a/code/game/objects/effects/spawners/windowspawner.dm b/code/game/objects/effects/spawners/windowspawner.dm
index 1d498888588..3a91c4d4cc1 100644
--- a/code/game/objects/effects/spawners/windowspawner.dm
+++ b/code/game/objects/effects/spawners/windowspawner.dm
@@ -59,6 +59,12 @@
window_to_spawn_regular = /obj/structure/window/reinforced/tinted
window_to_spawn_full = /obj/structure/window/full/reinforced/tinted
+/obj/effect/spawner/window/reinforced/polarized
+ name = "electrochromic reinforced window spawner"
+ icon_state = "ewindow_spawner"
+ window_to_spawn_regular = /obj/structure/window/reinforced/polarized
+ window_to_spawn_full = /obj/structure/window/full/reinforced/polarized
+
/obj/effect/spawner/window/shuttle
name = "shuttle window spawner"
icon_state = "swindow_spawner"
diff --git a/code/game/objects/effects/spiders.dm b/code/game/objects/effects/spiders.dm
index 56140e7d2ea..7a2880d897e 100644
--- a/code/game/objects/effects/spiders.dm
+++ b/code/game/objects/effects/spiders.dm
@@ -16,7 +16,7 @@
/obj/structure/spider/run_obj_armor(damage_amount, damage_type, damage_flag = 0, attack_dir)
- if(damage_flag == "melee")
+ if(damage_flag == MELEE)
switch(damage_type)
if(BURN)
damage_amount *= 2
diff --git a/code/game/objects/effects/temporary_visuals/miscellaneous.dm b/code/game/objects/effects/temporary_visuals/miscellaneous.dm
index c6de27524c2..527578727a2 100644
--- a/code/game/objects/effects/temporary_visuals/miscellaneous.dm
+++ b/code/game/objects/effects/temporary_visuals/miscellaneous.dm
@@ -204,6 +204,11 @@
duration = 8
randomdir = FALSE
+/obj/effect/temp_visual/mummy_animation
+ icon = 'icons/mob/mob.dmi'
+ icon_state = "mummy_revive"
+ duration = 20
+
/obj/effect/temp_visual/heal //color is white by default, set to whatever is needed
name = "healing glow"
icon_state = "heal"
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index 2d014e9e6c2..03b5a57da18 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -5,8 +5,6 @@ GLOBAL_DATUM_INIT(fire_overlay, /image, image("icon" = 'icons/goonstation/effect
move_resist = null // Set in the Initialise depending on the item size. Unless it's overriden by a specific item
var/discrete = 0 // used in item_attack.dm to make an item not show an attack message to viewers
- var/image/blood_overlay = null //this saves our blood splatter overlay, which will be processed not to go over the edges of the sprite
- var/blood_overlay_color = null
var/item_state = null
var/lefthand_file = 'icons/mob/inhands/items_lefthand.dmi'
var/righthand_file = 'icons/mob/inhands/items_righthand.dmi'
@@ -117,6 +115,12 @@ GLOBAL_DATUM_INIT(fire_overlay, /image, image("icon" = 'icons/goonstation/effect
var/in_inventory = FALSE //is this item equipped into an inventory slot or hand of a mob?
var/tip_timer = 0
+ // item hover FX
+ /// Is this item inside a storage object?
+ var/in_storage = FALSE
+ /// Holder var for the item outline filter, null when no outline filter on the item.
+ var/outline_filter
+
/obj/item/New()
..()
for(var/path in actions_types)
@@ -131,6 +135,11 @@ GLOBAL_DATUM_INIT(fire_overlay, /image, image("icon" = 'icons/goonstation/effect
if(!move_resist)
determine_move_resist()
+/obj/item/Initialize(mapload)
+ . = ..()
+ if(istype(loc, /obj/item/storage)) //marks all items in storage as being such
+ in_storage = TRUE
+
/obj/item/proc/determine_move_resist()
switch(w_class)
if(WEIGHT_CLASS_TINY)
@@ -406,6 +415,7 @@ GLOBAL_DATUM_INIT(fire_overlay, /image, image("icon" = 'icons/goonstation/effect
if((flags & NODROP) && !(initial(flags) & NODROP)) //Remove NODROP is dropped
flags &= ~NODROP
in_inventory = FALSE
+ remove_outline()
SEND_SIGNAL(src, COMSIG_ITEM_DROPPED,user)
if(!silent)
playsound(src, drop_sound, DROP_SOUND_VOLUME, ignore_walls = FALSE)
@@ -418,10 +428,12 @@ GLOBAL_DATUM_INIT(fire_overlay, /image, image("icon" = 'icons/goonstation/effect
// 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)
+ in_storage = FALSE
return
// called when this item is added into a storage item, which is passed on as S. The loc variable is already set to the storage item.
/obj/item/proc/on_enter_storage(obj/item/storage/S as obj)
+ in_storage = TRUE
return
/**
@@ -691,14 +703,24 @@ GLOBAL_DATUM_INIT(fire_overlay, /image, image("icon" = 'icons/goonstation/effect
openToolTip(user, src, params, title = name, content = "[desc]", theme = "")
/obj/item/MouseEntered(location, control, params)
- if(in_inventory)
+ if(in_inventory || in_storage)
var/timedelay = 8
- var/user = usr
+ var/mob/user = usr
tip_timer = addtimer(CALLBACK(src, .proc/openTip, location, control, params, user), timedelay, TIMER_STOPPABLE)
+ if(QDELETED(src))
+ return
+ var/mob/living/L = user
+ if(!(user.client.prefs.toggles2 & PREFTOGGLE_2_SEE_ITEM_OUTLINES))
+ return
+ if(istype(L) && L.incapacitated(ignore_lying = TRUE))
+ apply_outline(L, COLOR_RED_GRAY) //if they're dead or handcuffed, let's show the outline as red to indicate that they can't interact with that right now
+ else
+ apply_outline(L) //if the player's alive and well we send the command with no color set, so it uses the theme's color
/obj/item/MouseExited()
deltimer(tip_timer) //delete any in-progress timer if the mouse is moved off the item before it finishes
closeToolTip(usr)
+ remove_outline()
/obj/item/MouseDrop_T(obj/item/I, mob/user)
if(!user || user.incapacitated(ignore_lying = TRUE) || src == I)
@@ -707,6 +729,41 @@ GLOBAL_DATUM_INIT(fire_overlay, /image, image("icon" = 'icons/goonstation/effect
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)
+ remove_outline() //get rid of the hover effect in case the mouse exit isn't called if someone drags and drops an item and somthing goes wrong
+
+/obj/item/proc/apply_outline(mob/user, outline_color = null)
+ if(!(in_inventory || in_storage) || QDELETED(src) || isobserver(user)) //cancel if the item isn't in an inventory, is being deleted, or if the person hovering is a ghost (so that people spectating you don't randomly make your items glow)
+ return
+ var/theme = lowertext(user.client.prefs.UI_style)
+ if(!outline_color) //if we weren't provided with a color, take the theme's color
+ switch(theme) //yeah it kinda has to be this way
+ if("midnight")
+ outline_color = COLOR_THEME_MIDNIGHT
+ if("plasmafire")
+ outline_color = COLOR_THEME_PLASMAFIRE
+ if("retro")
+ outline_color = COLOR_THEME_RETRO //just as garish as the rest of this theme
+ if("slimecore")
+ outline_color = COLOR_THEME_SLIMECORE
+ if("operative")
+ outline_color = COLOR_THEME_OPERATIVE
+ if("clockwork")
+ outline_color = COLOR_THEME_CLOCKWORK //if you want free gbp go fix the fact that clockwork's tooltip css is glass'
+ if("glass")
+ outline_color = COLOR_THEME_GLASS
+ else //this should never happen, hopefully
+ outline_color = COLOR_WHITE
+ if(color)
+ outline_color = COLOR_WHITE //if the item is recolored then the outline will be too, let's make the outline white so it becomes the same color instead of some ugly mix of the theme and the tint
+ if(outline_filter)
+ filters -= outline_filter
+ outline_filter = filter(type = "outline", size = 1, color = outline_color)
+ filters += outline_filter
+
+/obj/item/proc/remove_outline()
+ if(outline_filter)
+ filters -= outline_filter
+ outline_filter = null
// Returns a numeric value for sorting items used as parts in machines, so they can be replaced by the rped
/obj/item/proc/get_part_rating()
diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm
index 50ce47c4d58..7a1d9748b6d 100644
--- a/code/game/objects/items/crayons.dm
+++ b/code/game/objects/items/crayons.dm
@@ -28,7 +28,6 @@
/obj/item/toy/crayon/New()
..()
- name = "[colourName] crayon" //Makes crayons identifiable in things like grinders
drawtype = pick(pick(graffiti), pick(letters), "rune[rand(1, 8)]")
/obj/item/toy/crayon/attack_self(mob/living/user as mob)
@@ -122,31 +121,37 @@
/obj/item/toy/crayon/red
+ name = "red crayon"
icon_state = "crayonred"
colour = COLOR_RED
colourName = "red"
/obj/item/toy/crayon/orange
+ name = "orange crayon"
icon_state = "crayonorange"
colour = COLOR_ORANGE
colourName = "orange"
/obj/item/toy/crayon/yellow
+ name = "yellow crayon"
icon_state = "crayonyellow"
colour = COLOR_YELLOW
colourName = "yellow"
/obj/item/toy/crayon/green
+ name = "green crayon"
icon_state = "crayongreen"
colour = COLOR_GREEN
colourName = "green"
/obj/item/toy/crayon/blue
+ name = "blue crayon"
icon_state = "crayonblue"
colour = COLOR_BLUE
colourName = "blue"
/obj/item/toy/crayon/purple
+ name = "purple crayon"
icon_state = "crayonpurple"
colour = COLOR_PURPLE
colourName = "purple"
@@ -155,38 +160,47 @@
icon_state = pick(list("crayonred", "crayonorange", "crayonyellow", "crayongreen", "crayonblue", "crayonpurple"))
switch(icon_state)
if("crayonred")
+ name = "red crayon"
colour = COLOR_RED
colourName = "red"
if("crayonorange")
+ name = "orange crayon"
colour = COLOR_ORANGE
colourName = "orange"
if("crayonyellow")
+ name = "yellow crayon"
colour = COLOR_YELLOW
colourName = "yellow"
if("crayongreen")
+ name = "green crayon"
colour =COLOR_GREEN
colourName = "green"
if("crayonblue")
+ name = "blue crayon"
colour = COLOR_BLUE
colourName = "blue"
if("crayonpurple")
+ name = "purple crayon"
colour = COLOR_PURPLE
colourName = "purple"
..()
/obj/item/toy/crayon/black
+ name = "black crayon"
icon_state = "crayonblack"
colour = "#000000"
colourName = "black"
/obj/item/toy/crayon/white
+ name = "white crayon"
icon_state = "crayonwhite"
colour = "#FFFFFF"
colourName = "white"
/obj/item/toy/crayon/mime
- icon_state = "crayonmime"
+ name = "mime crayon"
desc = "A very sad-looking crayon."
+ icon_state = "crayonmime"
colour = "#FFFFFF"
colourName = "mime"
uses = 0
@@ -211,6 +225,7 @@
..()
/obj/item/toy/crayon/rainbow
+ name = "rainbow crayon"
icon_state = "crayonrainbow"
colour = "#FFF000"
colourName = "rainbow"
diff --git a/code/game/objects/items/devices/flash.dm b/code/game/objects/items/devices/flash.dm
index aa637dc0332..b04457ac866 100644
--- a/code/game/objects/items/devices/flash.dm
+++ b/code/game/objects/items/devices/flash.dm
@@ -118,7 +118,7 @@
else if(issilicon(M))
add_attack_logs(user, M, "Flashed with [src]")
if(M.flash_eyes(affect_silicon = 1))
- M.Weaken(rand(5,10))
+ M.Weaken(rand(4, 6))
user.visible_message("[user] overloads [M]'s sensors with [src]!", "You overload [M]'s sensors with [src]!")
return 1
user.visible_message("[user] fails to blind [M] with [src]!", "You fail to blind [M] with [src]!")
diff --git a/code/game/objects/items/devices/laserpointer.dm b/code/game/objects/items/devices/laserpointer.dm
index d8ea4209cb1..3ca4fe30764 100644
--- a/code/game/objects/items/devices/laserpointer.dm
+++ b/code/game/objects/items/devices/laserpointer.dm
@@ -71,8 +71,6 @@
laser_act(target, user, params)
/obj/item/laser_pointer/proc/laser_act(atom/target, mob/living/user, params)
- if( !(user in (viewers(7,target))) )
- return
if(!diode)
to_chat(user, "You point [src] at [target], but nothing happens!")
return
@@ -82,6 +80,9 @@
if(HAS_TRAIT(user, TRAIT_CHUNKYFINGERS))
to_chat(user, "Your fingers can't press the button!")
return
+ if(!(target in view(7, get_turf(src)))) // Use the turf as center so it won't use the potential xray of the user
+ to_chat(user, "There is something in the way!")
+ return
add_fingerprint(user)
diff --git a/code/game/objects/items/devices/megaphone.dm b/code/game/objects/items/devices/megaphone.dm
index ce8c6ca7191..ced5a810bf4 100644
--- a/code/game/objects/items/devices/megaphone.dm
+++ b/code/game/objects/items/devices/megaphone.dm
@@ -13,7 +13,7 @@
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!")
/obj/item/megaphone/attack_self(mob/living/user as mob)
- if(user.client && (user.client.prefs.muted & MUTE_IC))
+ if(check_mute(user.ckey, MUTE_IC))
to_chat(src, "You cannot speak in IC (muted).")
return
if(!ishuman(user))
diff --git a/code/game/objects/items/devices/painter/pipe_painter.dm b/code/game/objects/items/devices/painter/pipe_painter.dm
index 4ad7b16b293..17c383809aa 100644
--- a/code/game/objects/items/devices/painter/pipe_painter.dm
+++ b/code/game/objects/items/devices/painter/pipe_painter.dm
@@ -27,8 +27,8 @@
return
var/turf/T = get_turf(P)
- if(P.level < 2 && T.level == 1 && T.intact)
- to_chat(user, "You must remove the plating first.")
+ if(P.level < 2 && T.level == 1 && T.intact && !T.transparent_floor)
+ to_chat(user, "You must remove the flooring first.")
return
P.change_color(GLOB.pipe_colors[paint_setting])
diff --git a/code/game/objects/items/devices/traitordevices.dm b/code/game/objects/items/devices/traitordevices.dm
index ca9de14fe7c..0fcd8d524a7 100644
--- a/code/game/objects/items/devices/traitordevices.dm
+++ b/code/game/objects/items/devices/traitordevices.dm
@@ -170,7 +170,7 @@ effective or pretty fucking useless.
GLOB.active_jammers -= src
/obj/item/teleporter
- name = "\improper Syndicate teleporter"
+ name = "syndicate teleporter"
desc = "A strange syndicate version of a cult veil shifter. Warrenty voided if exposed to EMP."
icon = 'icons/obj/device.dmi'
icon_state = "syndi-tele"
@@ -208,24 +208,32 @@ effective or pretty fucking useless.
charges++
/obj/item/teleporter/emp_act(severity)
+ var/teleported_something = FALSE
if(prob(50 / severity))
if(istype(loc, /mob/living/carbon/human))
var/mob/living/carbon/human/user = loc
to_chat(user, "[src] buzzes and activates!")
attempt_teleport(user, TRUE)
- else
- visible_message("[src] activates and blinks out of existence!")
- do_sparks(2, 1, src)
- qdel(src)
+ else //Well, it either is on a floor / locker, and won't teleport someone, OR it's in someones bag. As such, we need to check the turf to see if people are there.
+ var/turf/teleport_turf = get_turf(src)
+ for(var/mob/living/user in teleport_turf)
+ if(!teleported_something)
+ teleport_turf.visible_message("[src] activates sporadically, teleporting everyone around it!")
+ teleported_something = TRUE
+ attempt_teleport(user, TRUE)
+ if(!teleported_something)
+ visible_message("[src] activates and blinks out of existence!")
+ do_sparks(2, 1, src)
+ qdel(src)
/obj/item/teleporter/proc/attempt_teleport(mob/user, EMP_D = FALSE)
dir_correction(user)
- if(!charges)
+ if(!charges && !EMP_D) //If it's empd, you are moving no matter what.
to_chat(user, "[src] is still recharging.")
return
- var/mob/living/carbon/C = user
- var/turf/mobloc = get_turf(C)
+ var/mob/living/M = user
+ var/turf/mobloc = get_turf(M)
var/list/turfs = new/list()
var/found_turf = FALSE
var/list/bagholding = user.search_contents_for(/obj/item/storage/backpack/holding)
@@ -233,7 +241,7 @@ effective or pretty fucking useless.
if(!is_teleport_allowed(T.z))
break
if(!(length(bagholding) && !flawless)) //Chaos if you have a bag of holding
- if(get_dir(C, T) != C.dir)
+ if(get_dir(M, T) != M.dir)
continue
if(T in range(user, inner_tp_range))
continue
@@ -247,13 +255,14 @@ effective or pretty fucking useless.
if(found_turf)
if(user.loc != mobloc) // No locker / mech / sleeper teleporting, that breaks stuff
- to_chat(C, "[src] will not work here!")
- charges--
+ to_chat(M, "[src] will not work here!")
+ if(charges > 0) //While we want EMP triggered teleports to drain charge, we also do not want it to go negative charge, as such we need this check here
+ charges--
var/turf/destination = pick(turfs)
if(tile_check(destination) || flawless) // Why is there so many bloody floor types
var/turf/fragging_location = destination
telefrag(fragging_location, user)
- C.forceMove(destination)
+ M.forceMove(destination)
playsound(mobloc, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
new/obj/effect/temp_visual/teleport_abductor/syndi_teleporter(mobloc)
playsound(destination, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
@@ -264,7 +273,7 @@ effective or pretty fucking useless.
else // Emp activated? Bag of holding? No saving throw for you
get_fragged(user, destination)
else
- to_chat(C, "[src] will not work here!")
+ to_chat(M, "[src] will not work here!")
/obj/item/teleporter/proc/tile_check(turf/T)
if(istype(T, /turf/simulated/floor) || istype(T, /turf/space))
@@ -294,8 +303,8 @@ effective or pretty fucking useless.
else
saving_throw = NORTH // just in case
- var/mob/living/carbon/C = user
- var/turf/mobloc = get_turf(C)
+ var/mob/living/M = user
+ var/turf/mobloc = get_turf(M)
var/list/turfs = list()
var/found_turf = FALSE
for(var/turf/T in range(destination, saving_throw_distance))
@@ -314,7 +323,7 @@ effective or pretty fucking useless.
var/turf/new_destination = pick(turfs)
var/turf/fragging_location = new_destination
telefrag(fragging_location, user)
- C.forceMove(new_destination)
+ M.forceMove(new_destination)
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)
@@ -332,11 +341,12 @@ effective or pretty fucking useless.
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/implant))
- continue
- if(!user.unEquip(W))
- qdel(W)
+ if(iscarbon(user)) //don't want cyborgs dropping their stuff
+ for(var/obj/item/W in user)
+ if(istype(W, /obj/item/implant))
+ continue
+ if(!user.unEquip(W))
+ qdel(W)
to_chat(user, "You teleport into the wall, the teleporter tries to save you, but--")
user.gib()
diff --git a/code/game/objects/items/devices/voice.dm b/code/game/objects/items/devices/voice.dm
index 43a95ae86d7..c18af96333d 100644
--- a/code/game/objects/items/devices/voice.dm
+++ b/code/game/objects/items/devices/voice.dm
@@ -1,6 +1,6 @@
/obj/item/voice_changer
name = "voice changer"
- desc = "A voice scrambling module."
+ desc = "A voice mimicking module."
icon = 'icons/obj/device.dmi'
icon_state = "voice_changer_off"
@@ -42,3 +42,9 @@
voice = sanitize(copytext(chosen_voice, 1, MAX_MESSAGE_LEN))
to_chat(user, "You are now mimicking [voice].")
+
+/obj/item/voice_changer/voice_modulator
+ name = "voice modulator"
+ desc = "A voice scrambling module."
+ voice = "Unknown"
+ actions_types = list(/datum/action/item_action/voice_changer/toggle)
diff --git a/code/game/objects/items/his_grace.dm b/code/game/objects/items/his_grace.dm
new file mode 100644
index 00000000000..e86d82fef36
--- /dev/null
+++ b/code/game/objects/items/his_grace.dm
@@ -0,0 +1,263 @@
+//His Grace is a very special weapon granted only to traitor chaplains.
+//When awakened, He thirsts for blood and begins ticking a "bloodthirst" counter.
+//The wielder of His Grace is immune to stuns and gradually heals.
+//If the wielder fails to feed His Grace in time, He will devour them and become incredibly aggressive.
+//Leaving His Grace alone for some time will reset His thirst and put Him to sleep.
+//Using His Grace effectively requires extreme speed and care.
+
+/obj/item/his_grace
+ name = "artistic toolbox"
+ desc = "A toolbox painted bright green. Looking at it makes you feel uneasy."
+ icon = 'icons/obj/storage.dmi'
+ icon_state = "green"
+ item_state = "artistic_toolbox"
+ lefthand_file = 'icons/mob/inhands/equipment/toolbox_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/equipment/toolbox_righthand.dmi'
+ w_class = WEIGHT_CLASS_GIGANTIC
+ force = 12
+ 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/awakened = FALSE
+ var/bloodthirst = HIS_GRACE_SATIATED
+ var/prev_bloodthirst = HIS_GRACE_SATIATED
+ var/force_bonus = 0
+ var/ascended = FALSE
+ var/victims_needed = 25
+ var/ascend_bonus = 15
+
+/obj/item/his_grace/Initialize(mapload)
+ . = ..()
+ START_PROCESSING(SSprocessing, src)
+ GLOB.poi_list |= src
+ RegisterSignal(src, COMSIG_MOVABLE_POST_THROW, .proc/move_gracefully)
+ update_icon()
+
+/obj/item/his_grace/Destroy()
+ STOP_PROCESSING(SSprocessing, src)
+ for(var/mob/living/L in src)
+ L.forceMove(get_turf(src))
+ GLOB.poi_list -= src
+ return ..()
+
+/obj/item/his_grace/update_icon()
+ icon_state = ascended ? "gold" : "green"
+ item_state = ascended ? "toolbox_gold" : "artistic_toolbox"
+ cut_overlays()
+ if(ascended)
+ add_overlay("triple_latch")
+ else if(awakened)
+ add_overlay("single_latch_open")
+ else
+ add_overlay("single_latch")
+
+/obj/item/his_grace/attack_self(mob/living/user)
+ if(!awakened)
+ INVOKE_ASYNC(src, .proc/awaken, user)
+
+/obj/item/his_grace/attack(mob/living/M, mob/user)
+ if(awakened && M.stat)
+ consume(M)
+ else
+ ..()
+
+/obj/item/his_grace/can_be_pulled(user, grab_state, force, show_message = FALSE) //you can't pull his grace
+ return FALSE
+
+/obj/item/his_grace/examine(mob/user)
+ . = ..()
+ if(awakened)
+ switch(bloodthirst)
+ if(HIS_GRACE_SATIATED to HIS_GRACE_PECKISH)
+ . += "[src] isn't very hungry. Not yet."
+ if(HIS_GRACE_PECKISH to HIS_GRACE_HUNGRY)
+ . += "[src] would like a snack."
+ if(HIS_GRACE_HUNGRY to HIS_GRACE_FAMISHED)
+ . += "[src] is quite hungry now."
+ if(HIS_GRACE_FAMISHED to HIS_GRACE_STARVING)
+ . += "[src] is openly salivating at the sight of you. Be careful."
+ if(HIS_GRACE_STARVING to HIS_GRACE_CONSUME_OWNER)
+ . += "You walk a fine line. [src] is very close to devouring you."
+ if(HIS_GRACE_CONSUME_OWNER to HIS_GRACE_FALL_ASLEEP)
+ . += "[src] is shaking violently and staring directly at you."
+ else
+ . += "[src] is latched closed."
+
+/obj/item/his_grace/relaymove(mob/living/user, direction) //Allows changelings, etc. to climb out of Him after they revive, provided He isn't active
+ if(!awakened)
+ user.forceMove(get_turf(src))
+ user.visible_message("[user] scrambles out of [src]!", "You climb out of [src]!")
+
+/obj/item/his_grace/process()
+ if(!bloodthirst)
+ drowse()
+ return
+ if(bloodthirst < HIS_GRACE_CONSUME_OWNER && !ascended)
+ adjust_bloodthirst(1 + FLOOR(length(contents) * 0.5, 1)) //Maybe adjust this?
+ else
+ adjust_bloodthirst(1) //don't cool off rapidly once we're at the point where His Grace consumes all.
+ var/mob/living/master = get_atom_on_turf(src, /mob/living)
+ var/list/held_items = list()
+ if(istype(master))
+ held_items += master.l_hand
+ held_items += master.r_hand
+ if(istype(master) && (src in held_items))
+ switch(bloodthirst)
+ if(HIS_GRACE_CONSUME_OWNER to HIS_GRACE_FALL_ASLEEP)
+ master.visible_message("[src] turns on [master]!", "[src] turns on you!")
+ do_attack_animation(master, null, src)
+ master.emote("scream")
+ master.remove_status_effect(STATUS_EFFECT_HISGRACE)
+ flags &= ~NODROP
+ master.Weaken(3)
+ master.adjustBruteLoss(1000)
+ playsound(master, 'sound/effects/splat.ogg', 100, FALSE)
+ else
+ master.apply_status_effect(STATUS_EFFECT_HISGRACE)
+ return
+ forceMove(get_turf(src)) //no you can't put His Grace in a locker you just have to deal with Him
+ if(bloodthirst < HIS_GRACE_CONSUME_OWNER)
+ return
+ if(bloodthirst >= HIS_GRACE_FALL_ASLEEP)
+ drowse()
+ return
+ var/list/targets = list()
+ for(var/mob/living/L in oview(2, src))
+ targets += L
+ if(!length(targets))
+ return
+ var/mob/living/L = pick(targets)
+ step_to(src, L)
+ if(Adjacent(L))
+ if(!L.stat)
+ L.visible_message("[src] lunges at [L]!", "[src] lunges at you!")
+ do_attack_animation(L, null, src)
+ playsound(L, 'sound/weapons/smash.ogg', 50, TRUE)
+ playsound(L, 'sound/misc/desceration-01.ogg', 50, TRUE)
+ L.adjustBruteLoss(force)
+ adjust_bloodthirst(-5) //Don't stop attacking they're right there!
+ else
+ consume(L)
+
+/obj/item/his_grace/proc/awaken(mob/user) //Good morning, Mr. Grace.
+ if(awakened)
+ return
+ awakened = TRUE
+ user.visible_message("[src] begins to rattle. He thirsts.", "You flick [src]'s latch up. You hope this is a good idea.")
+ name = "His Grace"
+ desc = "A bloodthirsty artifact created by a profane rite."
+ gender = MALE
+ adjust_bloodthirst(1)
+ force_bonus = HIS_GRACE_FORCE_BONUS * length(contents)
+ playsound(user, 'sound/effects/pope_entry.ogg', 100)
+ update_icon()
+ move_gracefully()
+
+/obj/item/his_grace/proc/move_gracefully()
+ SIGNAL_HANDLER
+
+ if(!awakened)
+ return
+ animate_rumble(src)
+
+/obj/item/his_grace/proc/drowse() //Good night, Mr. Grace.
+ if(!awakened || ascended)
+ return
+ var/turf/T = get_turf(src)
+ T.visible_message("[src] slowly stops rattling and falls still, His latch snapping shut.")
+ playsound(loc, 'sound/weapons/batonextend.ogg', 100, TRUE)
+ name = initial(name)
+ desc = initial(desc)
+ animate(src, transform = matrix())
+ gender = initial(gender)
+ force = initial(force)
+ force_bonus = initial(force_bonus)
+ awakened = FALSE
+ bloodthirst = 0
+ update_icon()
+
+/obj/item/his_grace/proc/consume(mob/living/meal) //Here's your dinner, Mr. Grace.
+ if(!meal)
+ return
+ var/victims = 0
+ meal.visible_message("[src] swings open and devours [meal]!", "[src] consumes you!")
+ meal.adjustBruteLoss(300)
+ playsound(meal, 'sound/misc/desceration-02.ogg', 75, TRUE)
+ playsound(src, 'sound/items/eatfood.ogg', 100, TRUE)
+ meal.forceMove(src)
+ force_bonus += HIS_GRACE_FORCE_BONUS
+ prev_bloodthirst = bloodthirst
+ if(prev_bloodthirst < HIS_GRACE_CONSUME_OWNER)
+ bloodthirst = max(length(contents), 1) //Never fully sated, and His hunger will only grow.
+ else
+ bloodthirst = HIS_GRACE_CONSUME_OWNER
+ for(var/mob/living/C in contents)
+ if(C.mind)
+ victims++
+ if(victims >= victims_needed)
+ ascend()
+ update_stats()
+
+/obj/item/his_grace/proc/adjust_bloodthirst(amt)
+ prev_bloodthirst = bloodthirst
+ if(prev_bloodthirst < HIS_GRACE_CONSUME_OWNER && !ascended)
+ bloodthirst = clamp(bloodthirst + amt, HIS_GRACE_SATIATED, HIS_GRACE_CONSUME_OWNER)
+ else if(!ascended)
+ bloodthirst = clamp(bloodthirst + amt, HIS_GRACE_CONSUME_OWNER, HIS_GRACE_FALL_ASLEEP)
+ update_stats()
+
+/obj/item/his_grace/proc/update_stats()
+ flags &= ~NODROP
+ var/mob/living/master = get_atom_on_turf(src, /mob/living)
+ switch(bloodthirst)
+ if(HIS_GRACE_CONSUME_OWNER to HIS_GRACE_FALL_ASLEEP)
+ if(HIS_GRACE_CONSUME_OWNER > prev_bloodthirst)
+ master.visible_message("[src] enters a frenzy!")
+ if(HIS_GRACE_STARVING to HIS_GRACE_CONSUME_OWNER)
+ flags |= NODROP
+ if(HIS_GRACE_STARVING > prev_bloodthirst)
+ master.visible_message("[src] is starving!", "[src]'s bloodlust overcomes you. [src] must be fed, or you will become His meal.\
+ [force_bonus < 15 ? " And still, His power grows.":""]")
+ force_bonus = max(force_bonus, 15)
+ if(HIS_GRACE_FAMISHED to HIS_GRACE_STARVING)
+ flags |= NODROP
+ if(HIS_GRACE_FAMISHED > prev_bloodthirst)
+ master.visible_message("[src] is very hungry!", "Spines sink into your hand. [src] must feed immediately.\
+ [force_bonus < 10 ? " His power grows.":""]")
+ force_bonus = max(force_bonus, 10)
+ if(prev_bloodthirst >= HIS_GRACE_STARVING)
+ master.visible_message("[src] is now only very hungry!", "Your bloodlust recedes.")
+ if(HIS_GRACE_HUNGRY to HIS_GRACE_FAMISHED)
+ if(HIS_GRACE_HUNGRY > prev_bloodthirst)
+ master.visible_message("[src] is getting hungry.", "You feel [src]'s hunger within you.\
+ [force_bonus < 5 ? " His power grows.":""]")
+ force_bonus = max(force_bonus, 5)
+ if(prev_bloodthirst >= HIS_GRACE_FAMISHED)
+ master.visible_message("[src] is now only somewhat hungry.", "[src]'s hunger recedes a little...")
+ if(HIS_GRACE_PECKISH to HIS_GRACE_HUNGRY)
+ if(HIS_GRACE_PECKISH > prev_bloodthirst)
+ master.visible_message("[src] is feeling snackish.", "[src] begins to hunger.")
+ if(prev_bloodthirst >= HIS_GRACE_HUNGRY)
+ master.visible_message("[src] is now only a little peckish.", "[src]'s hunger recedes somewhat...")
+ if(HIS_GRACE_SATIATED to HIS_GRACE_PECKISH)
+ if(prev_bloodthirst >= HIS_GRACE_PECKISH)
+ master.visible_message("[src] is satiated.", "[src]'s hunger recedes...")
+ force = initial(force) + force_bonus
+
+/obj/item/his_grace/proc/ascend()
+ if(ascended)
+ return
+ force_bonus += ascend_bonus
+ desc = "A legendary toolbox and a distant artifact from The Age of Three Powers. On its three latches engraved are the words \"The Sun\", \"The Moon\", and \"The Stars\". The entire toolbox has the words \"The World\" engraved into its sides."
+ icon_state = "his_grace_ascended"
+ item_state = "toolbox_gold"
+ ascended = TRUE
+ update_icon()
+ playsound(src, 'sound/effects/his_grace_ascend.ogg', 100)
+ var/mob/living/carbon/human/master = loc
+ if(istype(master))
+ master.visible_message("Gods will be watching.")
+ name = "[master]'s mythical toolbox of three powers"
+ master.update_inv_l_hand()
+ master.update_inv_r_hand()
diff --git a/code/game/objects/items/mountable_frames/buttons_switches.dm b/code/game/objects/items/mountable_frames/buttons_switches.dm
index 76e4f0ecfd4..30b77ea2f33 100644
--- a/code/game/objects/items/mountable_frames/buttons_switches.dm
+++ b/code/game/objects/items/mountable_frames/buttons_switches.dm
@@ -21,3 +21,11 @@
/obj/item/mounted/frame/light_switch/do_build(turf/on_wall, mob/user)
new /obj/machinery/light_switch(get_turf(user), get_dir(user, on_wall))
qdel(src)
+
+/obj/item/mounted/frame/light_switch/windowtint
+ name = "window tint control button frame"
+ desc = "Used for repairing or building window tint control buttons"
+
+/obj/item/mounted/frame/light_switch/windowtint/do_build(turf/on_wall, mob/user)
+ new /obj/machinery/button/windowtint(get_turf(user), get_dir(user, on_wall))
+ qdel(src)
diff --git a/code/game/objects/items/robot/robot_items.dm b/code/game/objects/items/robot/robot_items.dm
index f1487a09986..52877118b88 100644
--- a/code/game/objects/items/robot/robot_items.dm
+++ b/code/game/objects/items/robot/robot_items.dm
@@ -31,6 +31,115 @@
playsound(loc, 'sound/weapons/egloves.ogg', 50, 1, -1)
add_attack_logs(user, M, "Stunned with [src] ([uppertext(user.a_intent)])")
+#define CYBORG_HUGS 0
+#define CYBORG_HUG 1
+#define CYBORG_SHOCK 2
+#define CYBORG_CRUSH 3
+
+/obj/item/borg/cyborghug
+ name = "hugging module"
+ icon_state = "hugmodule"
+ desc = "For when a someone really needs a hug."
+ var/mode = CYBORG_HUGS //0 = Hugs 1 = "Hug" 2 = Shock 3 = CRUSH
+ var/ccooldown = 0
+ var/scooldown = 0
+ var/shockallowed = FALSE //Can it be a stunarm when emagged. Only PK borgs get this by default.
+
+/obj/item/borg/cyborghug/attack_self(mob/living/user)
+ if(isrobot(user))
+ var/mob/living/silicon/robot/P = user
+ if(P.emagged && shockallowed)
+ if(mode < CYBORG_CRUSH)
+ mode++
+ else
+ mode = CYBORG_HUGS
+ else if(mode < CYBORG_HUG)
+ mode++
+ else
+ mode = CYBORG_HUGS
+ switch(mode)
+ if(CYBORG_HUGS)
+ to_chat(user, "Power reset. Hugs!")
+ if(CYBORG_HUG)
+ to_chat(user, "Power increased!")
+ if(CYBORG_SHOCK)
+ to_chat(user, "BZZT. Electrifying arms...")
+ if(CYBORG_CRUSH)
+ to_chat(user, "ERROR: ARM ACTUATORS OVERLOADED.")
+
+/obj/item/borg/cyborghug/attack(mob/living/M, mob/living/silicon/robot/user, params)
+ if(M == user)
+ return
+ switch(mode)
+ if(CYBORG_HUGS)
+ if(M.health >= 0)
+ if(isanimal(M))
+ var/list/modifiers = params2list(params)
+ M.attack_hand(user, modifiers) //This enables borgs to get the floating heart icon and mob emote from simple_animal's that have petbonus == true.
+ return
+ if(user.zone_selected == BODY_ZONE_HEAD)
+ user.visible_message("[user] playfully boops [M] on the head!", "You playfully boop [M] on the head!")
+ user.do_attack_animation(M, ATTACK_EFFECT_BOOP)
+ playsound(loc, 'sound/weapons/tap.ogg', 50, TRUE, -1)
+ else if(ishuman(M))
+ if(user.lying)
+ user.visible_message("[user] shakes [M] trying to get [M.p_them()] up!", "You shake [M] trying to get [M.p_them()] up!")
+ else
+ user.visible_message("[user] hugs [M] to make [M.p_them()] feel better!", "You hug [M] to make [M.p_them()] feel better!")
+ if(M.resting)
+ M.resting = FALSE
+ M.update_canmove()
+ else
+ user.visible_message("[user] pets [M]!", "You pet [M]!")
+ playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, TRUE, -1)
+ if(CYBORG_HUG)
+ if(M.health >= 0)
+ if(ishuman(M))
+ if(M.lying)
+ user.visible_message("[user] shakes [M] trying to get [M.p_them()] up!", "You shake [M] trying to get [M.p_them()] up!")
+ else if(user.zone_selected == BODY_ZONE_HEAD)
+ user.visible_message("[user] bops [M] on the head!", "You bop [M] on the head!")
+ user.do_attack_animation(M, ATTACK_EFFECT_PUNCH)
+ else
+ user.visible_message("[user] hugs [M] in a firm bear-hug! [M] looks uncomfortable...", "You hug [M] firmly to make [M.p_them()] feel better! [M] looks uncomfortable...")
+ if(M.resting)
+ M.resting = FALSE
+ M.update_canmove()
+ else
+ user.visible_message("[user] bops [M] on the head!", "You bop [M] on the head!")
+ playsound(loc, 'sound/weapons/tap.ogg', 50, TRUE, -1)
+ if(CYBORG_SHOCK)
+ if(scooldown < world.time)
+ if(M.health >= 0)
+ if(ishuman(M))
+ M.electrocute_act(5, "[user]", flags = SHOCK_NOGLOVES)
+ user.visible_message("[user] electrocutes [M] with [user.p_their()] touch!", "You electrocute [M] with your touch!")
+ else
+ if(!isrobot(M))
+ M.adjustFireLoss(10)
+ user.visible_message("[user] shocks [M]!", "You shock [M]!")
+ else
+ user.visible_message("[user] shocks [M]. It does not seem to have an effect", "You shock [M] to no effect.")
+ playsound(loc, 'sound/effects/sparks2.ogg', 50, TRUE, -1)
+ user.cell.use(500)
+ scooldown = world.time + 20
+ if(CYBORG_CRUSH)
+ if(ccooldown < world.time)
+ if(M.health >= 0)
+ if(ishuman(M))
+ user.visible_message("[user] crushes [M] in [user.p_their()] grip!", "You crush [M] in your grip!")
+ else
+ user.visible_message("[user] crushes [M]!", "You crush [M]!")
+ playsound(loc, 'sound/weapons/smash.ogg', 50, TRUE, -1)
+ M.adjustBruteLoss(15)
+ user.cell.use(300)
+ ccooldown = world.time + 10
+
+#undef CYBORG_HUGS
+#undef CYBORG_HUG
+#undef CYBORG_SHOCK
+#undef CYBORG_CRUSH
+
/obj/item/borg/overdrive
name = "Overdrive"
icon = 'icons/obj/decals.dmi'
diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm
index a0bd2a3f708..3eafc1a4182 100644
--- a/code/game/objects/items/stacks/medical.dm
+++ b/code/game/objects/items/stacks/medical.dm
@@ -120,6 +120,7 @@
desc = "Some sterile gauze to wrap around bloody stumps."
icon_state = "gauze"
origin_tech = "biotech=2"
+ max_amount = 12
heal_brute = 10
stop_bleeding = 1800
@@ -169,6 +170,7 @@
singular_name = "advanced trauma kit"
desc = "An advanced trauma kit for severe injuries."
icon_state = "traumakit"
+ max_amount = 6
heal_brute = 25
stop_bleeding = 0
@@ -233,6 +235,7 @@
icon = 'icons/obj/hydroponics/harvest.dmi'
icon_state = "tea_aspera_leaves"
color = "#378C61"
+ max_amount = 6
stop_bleeding = 0
heal_brute = 12
drop_sound = 'sound/misc/moist_impact.ogg'
diff --git a/code/game/objects/items/stacks/rods.dm b/code/game/objects/items/stacks/rods.dm
index c736026bca8..adf6fa59869 100644
--- a/code/game/objects/items/stacks/rods.dm
+++ b/code/game/objects/items/stacks/rods.dm
@@ -1,6 +1,17 @@
GLOBAL_LIST_INIT(rod_recipes, list ( \
- new/datum/stack_recipe("grille", /obj/structure/grille, 2, time = 10, one_per_turf = 1, on_floor = 1), \
- new/datum/stack_recipe("table frame", /obj/structure/table_frame, 2, time = 10, one_per_turf = 1, on_floor = 1), \
+ new /datum/stack_recipe("grille", /obj/structure/grille, 2, time = 10, one_per_turf = 1, on_floor = 1), \
+ new /datum/stack_recipe("table frame", /obj/structure/table_frame, 2, time = 10, one_per_turf = 1, on_floor = 1), \
+ null,
+ new /datum/stack_recipe("railing", /obj/structure/railing, 3, time = 10, one_per_turf = 1, on_floor = 1), \
+ new /datum/stack_recipe("railing corner", /obj/structure/railing/corner, 3, time = 10, one_per_turf = 1, on_floor = 1), \
+ null,
+ new /datum/stack_recipe_list("chainlink fence", list( \
+ new /datum/stack_recipe("chainlink fence", /obj/structure/fence, 5, time = 10, one_per_turf = 1, on_floor = 1), \
+ new /datum/stack_recipe("chainlink fence post", /obj/structure/fence/post, 5, time = 10, one_per_turf = 1, on_floor = 1), \
+ new /datum/stack_recipe("chainlink fence corner", /obj/structure/fence/corner, 5, time = 10, one_per_turf = 1, on_floor = 1), \
+ new /datum/stack_recipe("chainlink fence door", /obj/structure/fence/door, 10, time = 10, one_per_turf = 1, on_floor = 1), \
+ new /datum/stack_recipe("chainlink fence end", /obj/structure/fence/end, 3, time = 10, one_per_turf = 1, on_floor = 1), \
+ )), \
))
/obj/item/stack/rods
diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm
index c9901c8b0fe..0a77949f26b 100644
--- a/code/game/objects/items/stacks/sheets/glass.dm
+++ b/code/game/objects/items/stacks/sheets/glass.dm
@@ -28,7 +28,7 @@ GLOBAL_LIST_INIT(glass_recipes, list ( \
singular_name = "glass sheet"
icon_state = "sheet-glass"
materials = list(MAT_GLASS=MINERAL_MATERIAL_AMOUNT)
- armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 100)
+ armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 50, ACID = 100)
resistance_flags = ACID_PROOF
origin_tech = "materials=1"
created_window = /obj/structure/window/basic
@@ -89,7 +89,10 @@ GLOBAL_LIST_INIT(reinforced_glass_recipes, list ( \
new/datum/stack_recipe/window("windoor frame", /obj/structure/windoor_assembly, 5, time = 0, on_floor = TRUE, window_checks = TRUE), \
null, \
new/datum/stack_recipe/window("directional reinforced window", /obj/structure/window/reinforced, time = 0, on_floor = TRUE, window_checks = TRUE), \
- new/datum/stack_recipe/window("fulltile reinforced window", /obj/structure/window/full/reinforced, 2, time = 0, on_floor = TRUE, window_checks = TRUE) \
+ new/datum/stack_recipe/window("fulltile reinforced window", /obj/structure/window/full/reinforced, 2, time = 0, on_floor = TRUE, window_checks = TRUE), \
+ null, \
+ new/datum/stack_recipe/window("directional electrochromic window", /obj/structure/window/reinforced/polarized, 2, time = 0, on_floor = TRUE, window_checks = TRUE), \
+ new/datum/stack_recipe/window("fulltile electrochromic window", /obj/structure/window/full/reinforced/polarized, 4, time = 0, on_floor = TRUE, window_checks = TRUE) \
))
/obj/item/stack/sheet/rglass
@@ -98,7 +101,7 @@ GLOBAL_LIST_INIT(reinforced_glass_recipes, list ( \
singular_name = "reinforced glass sheet"
icon_state = "sheet-rglass"
materials = list(MAT_METAL=MINERAL_MATERIAL_AMOUNT/2, MAT_GLASS=MINERAL_MATERIAL_AMOUNT)
- armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 70, "acid" = 100)
+ armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 70, ACID = 100)
resistance_flags = ACID_PROOF
origin_tech = "materials=2"
created_window = /obj/structure/window/reinforced
@@ -134,7 +137,7 @@ GLOBAL_LIST_INIT(pglass_recipes, list ( \
icon_state = "sheet-plasmaglass"
item_state = "sheet-rglass"
materials = list(MAT_GLASS=MINERAL_MATERIAL_AMOUNT*2)
- armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 75, "acid" = 100)
+ armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 75, ACID = 100)
resistance_flags = ACID_PROOF
origin_tech = "plasmatech=2;materials=2"
created_window = /obj/structure/window/plasmabasic
@@ -177,7 +180,7 @@ GLOBAL_LIST_INIT(prglass_recipes, list ( \
icon_state = "sheet-plasmarglass"
item_state = "sheet-rglass"
materials = list(MAT_METAL=MINERAL_MATERIAL_AMOUNT/2, MAT_GLASS=MINERAL_MATERIAL_AMOUNT*2)
- armor = list("melee" = 20, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 100)
+ armor = list(MELEE = 20, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 80, ACID = 100)
resistance_flags = ACID_PROOF
origin_tech = "plasmatech=2;materials=2"
created_window = /obj/structure/window/plasmareinforced
@@ -199,7 +202,7 @@ GLOBAL_LIST_INIT(titaniumglass_recipes, list(
icon_state = "sheet-titaniumglass"
item_state = "sheet-rglass"
materials = list(MAT_TITANIUM=MINERAL_MATERIAL_AMOUNT, MAT_GLASS=MINERAL_MATERIAL_AMOUNT)
- armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 100)
+ 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/titaniumglass
full_window = /obj/structure/window/full/shuttle
@@ -219,7 +222,7 @@ GLOBAL_LIST_INIT(plastitaniumglass_recipes, list(
icon_state = "sheet-plastitaniumglass"
item_state = "sheet-rglass"
materials = list(MAT_TITANIUM=MINERAL_MATERIAL_AMOUNT, MAT_PLASMA=MINERAL_MATERIAL_AMOUNT, MAT_GLASS=MINERAL_MATERIAL_AMOUNT)
- armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 100)
+ 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/full/plastitanium
diff --git a/code/game/objects/items/stacks/sheets/leather.dm b/code/game/objects/items/stacks/sheets/leather.dm
index 1be2e6b289d..9dbef33cd02 100644
--- a/code/game/objects/items/stacks/sheets/leather.dm
+++ b/code/game/objects/items/stacks/sheets/leather.dm
@@ -170,8 +170,8 @@ GLOBAL_LIST_INIT(sinew_recipes, list ( \
if(is_type_in_typecache(target, goliath_platable_armor_typecache))
var/obj/item/clothing/C = target
var/datum/armor/current_armor = C.armor
- if(current_armor.getRating("melee") < 60)
- C.armor = current_armor.setRating(melee_value = min(current_armor.getRating("melee") + 10, 60))
+ if(current_armor.getRating(MELEE) < 60)
+ C.armor = current_armor.setRating(melee_value = min(current_armor.getRating(MELEE) + 10, 60))
to_chat(user, "You strengthen [target], improving its resistance against melee attacks.")
use(1)
else
@@ -180,9 +180,9 @@ GLOBAL_LIST_INIT(sinew_recipes, list ( \
var/obj/mecha/working/ripley/D = target
if(D.hides < 3)
D.hides++
- D.armor = D.armor.setRating(melee_value = min(D.armor.getRating("melee") + 10, 70))
- D.armor = D.armor.setRating(bullet_value = min(D.armor.getRating("bullet") + 5, 50))
- D.armor = D.armor.setRating(laser_value = min(D.armor.getRating("laser") + 5, 50))
+ D.armor = D.armor.setRating(melee_value = min(D.armor.getRating(MELEE) + 10, 70))
+ D.armor = D.armor.setRating(bullet_value = min(D.armor.getRating(BULLET) + 5, 50))
+ D.armor = D.armor.setRating(laser_value = min(D.armor.getRating(LASER) + 5, 50))
to_chat(user, "You strengthen [target], improving its resistance against melee attacks.")
D.update_icon()
if(D.hides == 3)
diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm
index c617860643e..592c41a7bbc 100644
--- a/code/game/objects/items/stacks/sheets/sheet_types.dm
+++ b/code/game/objects/items/stacks/sheets/sheet_types.dm
@@ -92,6 +92,7 @@ GLOBAL_LIST_INIT(metal_recipes, list(
null,
new /datum/stack_recipe("mass driver button frame", /obj/item/mounted/frame/driver_button, 1, time = 50, one_per_turf = 0, on_floor = 1),
new /datum/stack_recipe("light switch frame", /obj/item/mounted/frame/light_switch, 1, time = 50, one_per_turf = 0, on_floor = 1),
+ new /datum/stack_recipe("window tint control button frame", /obj/item/mounted/frame/light_switch/windowtint, 1, time = 50, one_per_turf = 0, on_floor = 1),
null,
new /datum/stack_recipe("grenade casing", /obj/item/grenade/chem_grenade),
new /datum/stack_recipe("light fixture frame", /obj/item/mounted/frame/light_fixture, 2),
@@ -161,7 +162,7 @@ GLOBAL_LIST_INIT(plasteel_recipes, list(
icon_state = "sheet-plasteel"
item_state = "sheet-metal"
materials = list(MAT_METAL=2000, MAT_PLASMA=2000)
- armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 80)
+ armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 100, ACID = 80)
resistance_flags = FIRE_PROOF
throwforce = 10.0
flags = CONDUCT
@@ -219,7 +220,7 @@ GLOBAL_LIST_INIT(wood_recipes, list(
icon_state = "sheet-wood"
origin_tech = "materials=1;biotech=1"
resistance_flags = FLAMMABLE
- armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 0)
+ 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(loc, amount=null)
@@ -375,7 +376,7 @@ GLOBAL_LIST_INIT(cult_recipes, list ( \
new /datum/stack_recipe/cult("runed girder (used to make cult walls)", /obj/structure/girder/cult, 1, time = 10, one_per_turf = TRUE, on_floor = TRUE, no_cult_structure = TRUE), \
new /datum/stack_recipe/cult("pylon (heals nearby cultists)", /obj/structure/cult/functional/pylon, 4, time = 40, one_per_turf = TRUE, on_floor = TRUE, no_cult_structure = TRUE), \
new /datum/stack_recipe/cult("forge (crafts shielded robes, flagellant's robes, and mirror shields)", /obj/structure/cult/functional/forge, 3, time = 40, one_per_turf = TRUE, on_floor = TRUE, no_cult_structure = TRUE), \
- new /datum/stack_recipe/cult("archives (crafts zealot's blindfolds, shuttle curse orbs, and veil shifters)", /obj/structure/cult/functional/archives, 3, time = 40, one_per_turf = TRUE, on_floor = TRUE, no_cult_structure = TRUE), \
+ new /datum/stack_recipe/cult("archives (crafts zealot's blindfolds, shuttle curse orbs, veil shifters, and reality sunderers)", /obj/structure/cult/functional/archives, 3, time = 40, one_per_turf = TRUE, on_floor = TRUE, no_cult_structure = TRUE), \
new /datum/stack_recipe/cult("altar (crafts eldritch whetstones, construct shells, and flasks of unholy water)", /obj/structure/cult/functional/altar, 3, time = 40, one_per_turf = TRUE, on_floor = TRUE, no_cult_structure = TRUE),
))
diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm
index d148123be94..e0c9f4ee18c 100644
--- a/code/game/objects/items/stacks/tiles/tile_types.dm
+++ b/code/game/objects/items/stacks/tiles/tile_types.dm
@@ -88,6 +88,70 @@
/obj/item/stack/tile/carpet/black/twenty
amount = 20
+/obj/item/stack/tile/carpet/blue
+ name = "blue carpet"
+ icon_state = "tile-carpet-blue"
+ turf_type = /turf/simulated/floor/carpet/blue
+
+/obj/item/stack/tile/carpet/blue/twenty
+ amount = 20
+
+/obj/item/stack/tile/carpet/cyan
+ name = "cyan carpet"
+ icon_state = "tile-carpet-cyan"
+ turf_type = /turf/simulated/floor/carpet/cyan
+
+/obj/item/stack/tile/carpet/cyan/twenty
+ amount = 20
+
+/obj/item/stack/tile/carpet/green
+ name = "green carpet"
+ icon_state = "tile-carpet-green"
+ turf_type = /turf/simulated/floor/carpet/green
+
+/obj/item/stack/tile/carpet/green/twenty
+ amount = 20
+
+/obj/item/stack/tile/carpet/orange
+ name = "orange carpet"
+ icon_state = "tile-carpet-orange"
+ turf_type = /turf/simulated/floor/carpet/orange
+
+/obj/item/stack/tile/carpet/orange/twenty
+ amount = 20
+
+/obj/item/stack/tile/carpet/purple
+ name = "purple carpet"
+ icon_state = "tile-carpet-purple"
+ turf_type = /turf/simulated/floor/carpet/purple
+
+/obj/item/stack/tile/carpet/purple/twenty
+ amount = 20
+
+/obj/item/stack/tile/carpet/red
+ name = "red carpet"
+ icon_state = "tile-carpet-red"
+ turf_type = /turf/simulated/floor/carpet/red
+
+/obj/item/stack/tile/carpet/red/twenty
+ amount = 20
+
+/obj/item/stack/tile/carpet/royalblack
+ name = "royal black carpet"
+ icon_state = "tile-carpet-royalblack"
+ turf_type = /turf/simulated/floor/carpet/royalblack
+
+/obj/item/stack/tile/carpet/royalblack/twenty
+ amount = 20
+
+/obj/item/stack/tile/carpet/royalblue
+ name = "royal blue carpet"
+ icon_state = "tile-carpet-royalblue"
+ turf_type = /turf/simulated/floor/carpet/royalblue
+
+/obj/item/stack/tile/carpet/royalblue/twenty
+ amount = 20
+
//Plasteel
/obj/item/stack/tile/plasteel
name = "floor tiles"
@@ -103,7 +167,7 @@
flags = CONDUCT
turf_type = /turf/simulated/floor/plasteel
mineralType = "metal"
- armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 70)
+ armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 100, ACID = 70)
resistance_flags = FIRE_PROOF
/obj/item/stack/tile/plasteel/cyborg
diff --git a/code/game/objects/items/tools/crowbar.dm b/code/game/objects/items/tools/crowbar.dm
index 9374c68fdd5..899d54a1084 100644
--- a/code/game/objects/items/tools/crowbar.dm
+++ b/code/game/objects/items/tools/crowbar.dm
@@ -17,7 +17,7 @@
attack_verb = list("attacked", "bashed", "battered", "bludgeoned", "whacked")
toolspeed = 1
- armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 30)
+ armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 50, ACID = 30)
tool_behaviour = TOOL_CROWBAR
/obj/item/crowbar/red
diff --git a/code/game/objects/items/tools/screwdriver.dm b/code/game/objects/items/tools/screwdriver.dm
index c6b4aecd4f2..e67436e2ce3 100644
--- a/code/game/objects/items/tools/screwdriver.dm
+++ b/code/game/objects/items/tools/screwdriver.dm
@@ -16,7 +16,7 @@
hitsound = 'sound/weapons/bladeslice.ogg'
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)
+ 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
diff --git a/code/game/objects/items/tools/welder.dm b/code/game/objects/items/tools/welder.dm
index 6519703713a..475ccba1c34 100644
--- a/code/game/objects/items/tools/welder.dm
+++ b/code/game/objects/items/tools/welder.dm
@@ -14,7 +14,7 @@
throw_range = 5
hitsound = "swing_hit"
w_class = WEIGHT_CLASS_SMALL
- armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 30)
+ armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 100, ACID = 30)
resistance_flags = FIRE_PROOF
materials = list(MAT_METAL = 70, MAT_GLASS = 20)
origin_tech = "engineering=1;plasmatech=1"
diff --git a/code/game/objects/items/tools/wirecutters.dm b/code/game/objects/items/tools/wirecutters.dm
index 17f4167868a..bf8ccce706a 100644
--- a/code/game/objects/items/tools/wirecutters.dm
+++ b/code/game/objects/items/tools/wirecutters.dm
@@ -18,7 +18,7 @@
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)
+ armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 50, ACID = 30)
tool_behaviour = TOOL_WIRECUTTER
var/random_color = TRUE
diff --git a/code/game/objects/items/tools/wrench.dm b/code/game/objects/items/tools/wrench.dm
index d204ca683e6..dde5e8d7afc 100644
--- a/code/game/objects/items/tools/wrench.dm
+++ b/code/game/objects/items/tools/wrench.dm
@@ -16,7 +16,7 @@
origin_tech = "materials=1;engineering=1"
attack_verb = list("bashed", "battered", "bludgeoned", "whacked")
toolspeed = 1
- armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 30)
+ armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 50, ACID = 30)
tool_behaviour = TOOL_WRENCH
/obj/item/wrench/suicide_act(mob/user)
diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm
index 4b7ec1b350b..f2e006e24c8 100644
--- a/code/game/objects/items/toys.dm
+++ b/code/game/objects/items/toys.dm
@@ -1066,6 +1066,50 @@
w_class = WEIGHT_CLASS_SMALL
resistance_flags = FLAMMABLE
+/obj/item/toy/windup_toolbox
+ name = "windup toolbox"
+ desc = "A replica toolbox that rumbles when you turn the key."
+ icon = 'icons/obj/storage.dmi'
+ icon_state = "green"
+ item_state = "artistic_toolbox"
+ lefthand_file = 'icons/mob/inhands/equipment/toolbox_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/equipment/toolbox_righthand.dmi'
+ hitsound = 'sound/weapons/smash.ogg'
+ drop_sound = 'sound/items/handling/toolbox_drop.ogg'
+ pickup_sound = 'sound/items/handling/toolbox_pickup.ogg'
+ attack_verb = list("robusted")
+ var/active = FALSE
+
+/obj/item/toy/windup_toolbox/Initialize(mapload)
+ . = ..()
+ update_icon()
+
+/obj/item/toy/windup_toolbox/update_icon()
+ ..()
+ cut_overlays()
+ if(active)
+ add_overlay("single_latch_open")
+ else
+ add_overlay("single_latch")
+
+/obj/item/toy/windup_toolbox/attack_self(mob/user)
+ if(!active)
+ to_chat(user, "You wind up [src], it begins to rumble.")
+ active = TRUE
+ update_icon()
+ playsound(src, 'sound/effects/pope_entry.ogg', 100)
+ animate_rumble(src)
+ addtimer(CALLBACK(src, .proc/stopRumble), 60 SECONDS)
+ else
+ to_chat(user, "[src] is already active!")
+
+/obj/item/toy/windup_toolbox/proc/stopRumble()
+ active = FALSE
+ update_icon()
+ visible_message("[src] slowly stops rattling and falls still, its latch snapping shut.") //subtle difference
+ playsound(loc, 'sound/weapons/batonextend.ogg', 100, TRUE)
+ animate(src, transform = matrix())
+
/*
* Toy/fake flash
*/
diff --git a/code/game/objects/items/weapons/RCD.dm b/code/game/objects/items/weapons/RCD.dm
index c12809ca160..c86046c238e 100644
--- a/code/game/objects/items/weapons/RCD.dm
+++ b/code/game/objects/items/weapons/RCD.dm
@@ -27,7 +27,7 @@
usesound = 'sound/items/deconstruct.ogg'
flags_2 = NO_MAT_REDEMPTION_2
req_access = list(ACCESS_ENGINE)
- armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
+ armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 100, ACID = 50)
resistance_flags = FIRE_PROOF
/// The spark system used to create sparks when the user interacts with the RCD.
var/datum/effect_system/spark_spread/spark_system
diff --git a/code/game/objects/items/weapons/RSF.dm b/code/game/objects/items/weapons/RSF.dm
index ef0fd7b01c8..22b18892d7a 100644
--- a/code/game/objects/items/weapons/RSF.dm
+++ b/code/game/objects/items/weapons/RSF.dm
@@ -13,7 +13,7 @@ RSF
anchored = 0.0
var/matter = 0
var/mode = 1
- armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
+ armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 0, ACID = 0)
w_class = WEIGHT_CLASS_NORMAL
var/list/configured_items = list()
@@ -21,7 +21,6 @@ RSF
..()
desc = "A RSF. It currently holds [matter]/30 fabrication-units."
// configured_items[ID_NUMBER] = list("Human-readable name", price in energy, /type/path)
- configured_items[++configured_items.len] = list("Dosh", 50, /obj/item/stack/spacecash/c10)
configured_items[++configured_items.len] = list("Drinking Glass", 50, /obj/item/reagent_containers/food/drinks/drinkingglass)
configured_items[++configured_items.len] = list("Paper", 50, /obj/item/paper)
configured_items[++configured_items.len] = list("Pen", 50, /obj/item/pen)
diff --git a/code/game/objects/items/weapons/batons.dm b/code/game/objects/items/weapons/batons.dm
index 47ec7da88e9..e1f042c29f0 100644
--- a/code/game/objects/items/weapons/batons.dm
+++ b/code/game/objects/items/weapons/batons.dm
@@ -187,28 +187,5 @@
var/mob/living/carbon/human/H = user
H.update_inv_l_hand()
H.update_inv_r_hand()
- // Update blood splatter
- if(blood_overlay)
- cut_overlay(blood_overlay)
- qdel(blood_overlay)
- add_blood_overlay(blood_overlay_color)
playsound(loc, extend_sound, 50, TRUE)
add_fingerprint(user)
-
-/obj/item/melee/classic_baton/telescopic/blood_splatter_index()
- return "\ref[icon]-[icon_state]"
-
-/obj/item/melee/classic_baton/telescopic/add_blood_overlay(color)
- var/index = blood_splatter_index()
- var/icon/blood_splatter_icon = GLOB.blood_splatter_icons[index]
- if(!blood_splatter_icon)
- blood_splatter_icon = icon(icon, icon_state)
- blood_splatter_icon.Blend("#ffffff", ICON_ADD)
- blood_splatter_icon.Blend(icon('icons/effects/blood.dmi', "itemblood"), ICON_MULTIPLY)
- blood_splatter_icon = fcopy_rsc(blood_splatter_icon)
- GLOB.blood_splatter_icons[index] = blood_splatter_icon
-
- blood_overlay = image(blood_splatter_icon)
- blood_overlay.color = color
- blood_overlay_color = color
- add_overlay(blood_overlay)
diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm
index 69b64efef0d..59d9c7c9138 100644
--- a/code/game/objects/items/weapons/cards_ids.dm
+++ b/code/game/objects/items/weapons/cards_ids.dm
@@ -89,7 +89,7 @@
var/list/access = list()
var/registered_name = "Unknown" // The name registered_name on the card
slot_flags = SLOT_ID
- armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100)
+ armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 100, ACID = 100)
resistance_flags = FIRE_PROOF | ACID_PROOF
var/untrackable // Can not be tracked by AI's
@@ -734,7 +734,7 @@
registered_name = "HoS"
icon_state = "HoS"
access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_COURT,
- ACCESS_FORENSICS_LOCKERS, ACCESS_PILOT, ACCESS_MORGUE, ACCESS_MAINT_TUNNELS, ACCESS_ALL_PERSONAL_LOCKERS,
+ ACCESS_FORENSICS_LOCKERS, ACCESS_MORGUE, ACCESS_MAINT_TUNNELS, ACCESS_ALL_PERSONAL_LOCKERS,
ACCESS_RESEARCH, ACCESS_ENGINE, ACCESS_MINING, ACCESS_MEDICAL, ACCESS_CONSTRUCTION, ACCESS_MAILSORTING,
ACCESS_HEADS, ACCESS_HOS, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_WEAPONS)
@@ -762,7 +762,7 @@
access = list(ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_TECH_STORAGE, ACCESS_MAINT_TUNNELS,
ACCESS_TELEPORTER, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_ATMOSPHERICS, ACCESS_EMERGENCY_STORAGE, ACCESS_EVA,
ACCESS_HEADS, ACCESS_CONSTRUCTION, ACCESS_SEC_DOORS,
- ACCESS_CE, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_TCOMSAT, ACCESS_MINISAT, ACCESS_MECHANIC, ACCESS_MINERAL_STOREROOM)
+ ACCESS_CE, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_TCOMSAT, ACCESS_MINISAT, ACCESS_MINERAL_STOREROOM)
/obj/item/card/id/clown
name = "Pink ID"
diff --git a/code/game/objects/items/weapons/cigs.dm b/code/game/objects/items/weapons/cigs.dm
index cf19a910647..340ce0b64f8 100644
--- a/code/game/objects/items/weapons/cigs.dm
+++ b/code/game/objects/items/weapons/cigs.dm
@@ -170,6 +170,10 @@ LIGHTERS ARE IN LIGHTERS.DM
if(flavor_text)
var/turf/T = get_turf(src)
T.visible_message(flavor_text)
+ if(iscarbon(loc))
+ var/mob/living/carbon/C = loc
+ if(C.wear_mask == src) // Don't update if it's just in their hand
+ C.wear_mask_update(src)
set_light(2, 0.25, "#E38F46")
START_PROCESSING(SSobj, src)
@@ -262,6 +266,9 @@ LIGHTERS ARE IN LIGHTERS.DM
pixel_x = rand(-5, 5)
pixel_y = rand(-5, 5)
+/obj/item/clothing/mask/cigarette/rollie/nicotine
+ list_reagents = list("nicotine" = 40)
+
/obj/item/cigbutt/roach
name = "roach"
diff --git a/code/game/objects/items/weapons/defib.dm b/code/game/objects/items/weapons/defib.dm
index e76207ae85c..c24432f9644 100644
--- a/code/game/objects/items/weapons/defib.dm
+++ b/code/game/objects/items/weapons/defib.dm
@@ -3,6 +3,7 @@
/obj/item/defibrillator
name = "defibrillator"
desc = "A device that delivers powerful shocks to detachable paddles that resuscitate incapacitated patients."
+ icon = 'icons/obj/defib.dmi'
icon_state = "defibunit"
item_state = "defibunit"
slot_flags = SLOT_BACK
@@ -11,33 +12,33 @@
w_class = WEIGHT_CLASS_BULKY
origin_tech = "biotech=4"
actions_types = list(/datum/action/item_action/toggle_paddles)
- armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
+ armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 50, ACID = 50)
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/back.dmi'
)
var/paddles_on_defib = TRUE //if the paddles are on the defib (TRUE)
- var/safety = TRUE //if you can zap people with the defibs on harm mode
var/powered = FALSE //if there's a cell in the defib with enough power for a revive, blocks paddles from reviving otherwise
var/obj/item/twohanded/shockpaddles/paddles
var/obj/item/stock_parts/cell/high/cell = null
+ var/safety = TRUE //if you can zap people with the defibs on harm mode
var/combat = FALSE //can we revive through space suits?
+ var/heart_attack = FALSE //can it give instant heart attacks when zapped on harm intent with combat?
+ var/base_icon_state = "defibpaddles"
+ var/obj/item/twohanded/shockpaddles/paddle_type = /obj/item/twohanded/shockpaddles
/obj/item/defibrillator/get_cell()
return cell
-/obj/item/defibrillator/New() //starts without a cell for rnd
- ..()
- paddles = make_paddles()
+/obj/item/defibrillator/Initialize(mapload) //starts without a cell for rnd
+ . = ..()
+ paddles = new paddle_type(src)
update_icon()
- return
-/obj/item/defibrillator/loaded/New() //starts with hicap
- ..()
- paddles = make_paddles()
+/obj/item/defibrillator/loaded/Initialize(mapload) //starts with hicap
+ . = ..()
cell = new(src)
update_icon()
- return
/obj/item/defibrillator/update_icon()
update_power()
@@ -158,9 +159,6 @@
var/datum/action/A = X
A.UpdateButtonIcon()
-/obj/item/defibrillator/proc/make_paddles()
- return new /obj/item/twohanded/shockpaddles(src)
-
/obj/item/defibrillator/equipped(mob/user, slot)
..()
if(slot != slot_back)
@@ -214,38 +212,68 @@
/obj/item/defibrillator/compact
name = "compact defibrillator"
- desc = "A belt-equipped defibrillator that can be rapidly deployed."
+ desc = "A belt-mounted defibrillator that can be rapidly deployed."
icon_state = "defibcompact"
item_state = "defibcompact"
+ sprite_sheets = null //Because Vox had the belt defibrillator sprites in back.dm
w_class = WEIGHT_CLASS_NORMAL
slot_flags = SLOT_BELT
origin_tech = "biotech=5"
+/obj/item/defibrillator/compact/loaded/Initialize(mapload)
+ . = ..()
+ cell = new(src)
+ update_icon()
+
/obj/item/defibrillator/compact/item_action_slot_check(slot, mob/user)
if(slot == slot_belt)
return TRUE
-/obj/item/defibrillator/compact/loaded/New()
- ..()
- paddles = make_paddles()
- cell = new(src)
- update_icon()
- return
-
/obj/item/defibrillator/compact/combat
name = "combat defibrillator"
- desc = "A belt-equipped blood-red defibrillator that can be rapidly deployed. Does not have the restrictions or safeties of conventional defibrillators and can revive through space suits."
+ desc = "A belt-mounted blood-red defibrillator that can be rapidly deployed. Does not have the restrictions or safeties of conventional defibrillators and can revive through space suits."
+ icon_state = "defibcombat"
+ item_state = "defibcombat"
+ paddle_type = /obj/item/twohanded/shockpaddles/syndicate
combat = TRUE
safety = FALSE
-/obj/item/defibrillator/compact/combat/loaded/New()
- ..()
- paddles = make_paddles()
+/obj/item/defibrillator/compact/combat/loaded/Initialize(mapload)
+ . = ..()
cell = new(src)
update_icon()
- return
-/obj/item/defibrillator/compact/combat/attackby(obj/item/W, mob/user, params)
+/obj/item/defibrillator/compact/advanced
+ name = "advanced compact defibrillator"
+ desc = "A belt-mounted state-of-the-art defibrillator that can be rapidly deployed in all environments. Uses an experimental self-charging cell, meaning that it will (probably) never stop working. Can be used to defibrillate through space suits. It is impossible to damage."
+ icon_state = "defibnt"
+ item_state = "defibnt"
+ paddle_type = /obj/item/twohanded/shockpaddles/advanced
+ combat = TRUE
+ safety = TRUE
+ heart_attack = TRUE
+ resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF //Objective item, better not have it destroyed.
+
+ var/next_emp_message //to prevent spam from the emagging message on the advanced defibrillator
+
+/obj/item/defibrillator/compact/advanced/attackby(obj/item/W, mob/user, params)
+ if(W == paddles)
+ paddles.unwield()
+ toggle_paddles()
+ update_icon()
+
+/obj/item/defibrillator/compact/advanced/loaded/Initialize(mapload)
+ . = ..()
+ cell = new /obj/item/stock_parts/cell/bluespace/charging(src)
+ update_icon()
+
+/obj/item/defibrillator/compact/advanced/emp_act(severity)
+ if(world.time > next_emp_message)
+ atom_say("Warning: Electromagnetic pulse detected. Integrated shielding prevented all potential hardware damage.")
+ playsound(src, 'sound/machines/defib_saftyon.ogg', 50)
+ next_emp_message = world.time + 5 SECONDS
+
+/obj/item/defibrillator/compact/advanced/attackby(obj/item/W, mob/user, params)
if(W == paddles)
paddles.unwield()
toggle_paddles()
@@ -257,6 +285,7 @@
/obj/item/twohanded/shockpaddles
name = "defibrillator paddles"
desc = "A pair of plastic-gripped paddles with flat metal surfaces that are used to deliver powerful electric shocks."
+ icon = 'icons/obj/defib.dmi'
icon_state = "defibpaddles"
item_state = "defibpaddles"
force = 0
@@ -268,6 +297,7 @@
var/revivecost = 1000
var/cooldown = FALSE
var/busy = FALSE
+ var/base_icon_state = "defibpaddles"
var/obj/item/defibrillator/defib
/obj/item/twohanded/shockpaddles/New(mainunit)
@@ -280,10 +310,10 @@
return
/obj/item/twohanded/shockpaddles/update_icon()
- icon_state = "defibpaddles[wielded]"
- item_state = "defibpaddles[wielded]"
+ icon_state = "[base_icon_state][wielded]"
+ item_state = "[base_icon_state][wielded]"
if(cooldown)
- icon_state = "defibpaddles[wielded]_cooldown"
+ icon_state = "[base_icon_state][wielded]_cooldown"
/obj/item/twohanded/shockpaddles/suicide_act(mob/user)
user.visible_message("[user] is putting the live paddles on [user.p_their()] chest! It looks like [user.p_theyre()] trying to commit suicide.")
@@ -336,7 +366,7 @@
to_chat(user, "[defib] is recharging.")
return
if(!ishuman(M))
- to_chat(user, "The instructions on [defib] don't mention how to revive that...")
+ to_chat(user, "The instructions on [defib] don't mention how to defibrillate that...")
return
else
if(user.a_intent == INTENT_HARM && !defib.safety)
@@ -347,7 +377,7 @@
H.Weaken(5)
playsound(get_turf(src), 'sound/machines/defib_zap.ogg', 50, 1, -1)
H.emote("gasp")
- if(!H.undergoing_cardiac_arrest() && (prob(10) || defib.combat)) // Your heart explodes.
+ if(!H.undergoing_cardiac_arrest() && (prob(10) || (defib.combat && !defib.heart_attack) || prob(10) && (defib.combat && defib.heart_attack))) // Your heart explodes.
H.set_heartattack(TRUE)
SEND_SIGNAL(H, COMSIG_LIVING_MINOR_SHOCK, 100)
add_attack_logs(user, M, "Stunned with [src]")
@@ -470,7 +500,8 @@
/obj/item/borg_defib
name = "defibrillator paddles"
- desc = "A pair of mounted paddles with flat metal surfaces that are used to deliver powerful electric shocks."
+ desc = "A pair of paddles with flat metal surfaces that are used to deliver powerful electric shocks."
+ icon = 'icons/obj/defib.dmi'
icon_state = "defibpaddles0"
item_state = "defibpaddles0"
force = 0
@@ -590,3 +621,17 @@
playsound(get_turf(src), 'sound/machines/defib_failed.ogg', 50, 0)
busy = FALSE
update_icon()
+
+/obj/item/twohanded/shockpaddles/syndicate
+ name = "combat defibrillator paddles"
+ desc = "A pair of high-tech paddles with flat plasteel surfaces to revive deceased operatives (unless they exploded). They possess both the ability to penetrate armor and to deliver powerful or disabling shocks offensively."
+ icon_state = "syndiepaddles0"
+ item_state = "syndiepaddles0"
+ base_icon_state = "syndiepaddles"
+
+/obj/item/twohanded/shockpaddles/advanced
+ name = "advanced defibrillator paddles"
+ desc = "A pair of high-tech paddles with flat plasteel surfaces that are used to deliver powerful electric shocks. They possess the ability to penetrate armor to deliver shock."
+ icon_state = "ntpaddles0"
+ item_state = "ntpaddles0"
+ base_icon_state = "ntpaddles"
diff --git a/code/game/objects/items/weapons/dna_injector.dm b/code/game/objects/items/weapons/dna_injector.dm
index 46d347e0db7..02b53d2ff56 100644
--- a/code/game/objects/items/weapons/dna_injector.dm
+++ b/code/game/objects/items/weapons/dna_injector.dm
@@ -170,28 +170,6 @@
block = GLOB.hulkblock
..()
-/obj/item/dnainjector/xraymut
- name = "DNA-Injector (Xray)"
- desc = "Finally you can see what the Captain does."
- datatype = DNA2_BUF_SE
- value = 0xFFF
- forcedmutation = TRUE
-
-/obj/item/dnainjector/xraymut/Initialize()
- block = GLOB.xrayblock
- ..()
-
-/obj/item/dnainjector/antixray
- name = "DNA-Injector (Anti-Xray)"
- desc = "It will make you see harder."
- datatype = DNA2_BUF_SE
- value = 0x001
- forcedmutation = TRUE
-
-/obj/item/dnainjector/antixray/Initialize()
- block = GLOB.xrayblock
- ..()
-
/obj/item/dnainjector/firemut
name = "DNA-Injector (Fire)"
desc = "Gives you fire."
diff --git a/code/game/objects/items/weapons/grenades/flashbang.dm b/code/game/objects/items/weapons/grenades/flashbang.dm
index 8122814353b..b139fc7db01 100644
--- a/code/game/objects/items/weapons/grenades/flashbang.dm
+++ b/code/game/objects/items/weapons/grenades/flashbang.dm
@@ -20,7 +20,7 @@
// Blob damage
for(var/obj/structure/blob/B in hear(range + 1, T))
var/damage = round(30 / (get_dist(B, T) + 1))
- B.take_damage(damage, BURN, "melee", FALSE)
+ B.take_damage(damage, BURN, MELEE, FALSE)
// Stunning & damaging mechanic
bang(T, src, range)
diff --git a/code/game/objects/items/weapons/grenades/frag.dm b/code/game/objects/items/weapons/grenades/frag.dm
index 5b2e836bf81..f08186986f9 100644
--- a/code/game/objects/items/weapons/grenades/frag.dm
+++ b/code/game/objects/items/weapons/grenades/frag.dm
@@ -26,7 +26,7 @@
/obj/item/grenade/frag/proc/embed_shrapnel(mob/living/carbon/human/H, amount)
for(var/i = 0, i < amount, i++)
- if(prob(embed_prob - H.getarmor(null, "bomb")))
+ if(prob(embed_prob - H.getarmor(null, BOMB)))
var/obj/item/embedded/S = new embedded_type(src)
H.hitby(S, skipcatch = 1)
S.throwforce = 1
diff --git a/code/game/objects/items/weapons/grenades/smokebomb.dm b/code/game/objects/items/weapons/grenades/smokebomb.dm
index 53061e5fa61..3cafa295680 100644
--- a/code/game/objects/items/weapons/grenades/smokebomb.dm
+++ b/code/game/objects/items/weapons/grenades/smokebomb.dm
@@ -31,7 +31,7 @@
for(var/obj/structure/blob/B in view(8,src))
var/damage = round(30/(get_dist(B,src)+1))
- B.take_damage(damage, BURN, "melee", 0)
+ B.take_damage(damage, BURN, MELEE, 0)
sleep(80)
qdel(src)
return
diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm
index d8abb853e9f..207533ce6d8 100644
--- a/code/game/objects/items/weapons/handcuffs.dm
+++ b/code/game/objects/items/weapons/handcuffs.dm
@@ -13,7 +13,7 @@
materials = list(MAT_METAL=500)
origin_tech = "engineering=3;combat=3"
breakouttime = 600 //Deciseconds = 60s = 1 minutes
- armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
+ armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 50, ACID = 50)
var/cuffsound = 'sound/weapons/handcuffs.ogg'
var/trashtype = null //For disposable cuffs
var/ignoresClumsy = FALSE
diff --git a/code/game/objects/items/weapons/holy_weapons.dm b/code/game/objects/items/weapons/holy_weapons.dm
index 0f30d33d7b4..2b73367cd69 100644
--- a/code/game/objects/items/weapons/holy_weapons.dm
+++ b/code/game/objects/items/weapons/holy_weapons.dm
@@ -266,9 +266,11 @@
possessed = TRUE
- var/list/mob/dead/observer/candidates = SSghost_spawns.poll_candidates("Do you want to play as the spirit of [user.real_name]'s blade?", ROLE_PAI, FALSE, 10 SECONDS, source = src)
+ var/list/mob/dead/observer/candidates = SSghost_spawns.poll_candidates("Do you want to play as the spirit of [user.real_name]'s blade?", ROLE_PAI, FALSE, 10 SECONDS, source = src, role_cleanname = "possessed blade")
var/mob/dead/observer/theghost = null
+ if(QDELETED(src))
+ return
if(length(candidates))
theghost = pick(candidates)
var/mob/living/simple_animal/shade/sword/S = new(src)
diff --git a/code/game/objects/items/weapons/implants/implant_freedom.dm b/code/game/objects/items/weapons/implants/implant_freedom.dm
index 62e71479884..6706be167b5 100644
--- a/code/game/objects/items/weapons/implants/implant_freedom.dm
+++ b/code/game/objects/items/weapons/implants/implant_freedom.dm
@@ -13,6 +13,15 @@
if(iscarbon(imp_in))
var/mob/living/carbon/C_imp_in = imp_in
C_imp_in.uncuff()
+ for(var/obj/item/grab/G in C_imp_in.grabbed_by)
+ var/mob/living/carbon/M = G.assailant
+ C_imp_in.visible_message("[C_imp_in] suddenly shocks [M] from their wrists and slips out of their grab!")
+ M.Stun(1) //Drops the grab
+ M.apply_damage(2, BURN, "r_hand", M.run_armor_check("r_hand", "energy"))
+ M.apply_damage(2, BURN, "l_hand", M.run_armor_check("l_hand", "energy"))
+ C_imp_in.SetStunned(0) //This only triggers if they are grabbed, to have them break out of the grab, without the large stun time.
+ C_imp_in.SetWeakened(0)
+ playsound(C_imp_in.loc, "sound/weapons/Egloves.ogg", 75, 1)
if(!uses)
qdel(src)
diff --git a/code/game/objects/items/weapons/kitchen.dm b/code/game/objects/items/weapons/kitchen.dm
index 0cf57c7b7a4..82334c986a0 100644
--- a/code/game/objects/items/weapons/kitchen.dm
+++ b/code/game/objects/items/weapons/kitchen.dm
@@ -31,7 +31,7 @@
flags = CONDUCT
attack_verb = list("attacked", "stabbed", "poked")
hitsound = 'sound/weapons/bladeslice.ogg'
- armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 30)
+ armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 50, ACID = 30)
sharp = 0
var/max_contents = 1
@@ -114,7 +114,7 @@
materials = list(MAT_METAL=12000)
attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
sharp = TRUE
- armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
+ armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 50, ACID = 50)
var/bayonet = FALSE //Can this be attached to a gun?
/obj/item/kitchen/knife/suicide_act(mob/user)
@@ -198,7 +198,7 @@
materials = list()
origin_tech = "biotech=3;combat=2"
attack_verb = list("shanked", "shivved")
- armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
+ armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 0, ACID = 0)
/*
diff --git a/code/game/objects/items/weapons/melee/energy.dm b/code/game/objects/items/weapons/melee/energy.dm
index 1034ae3ffb4..88195072d3e 100644
--- a/code/game/objects/items/weapons/melee/energy.dm
+++ b/code/game/objects/items/weapons/melee/energy.dm
@@ -12,7 +12,7 @@
hitsound = 'sound/weapons/blade1.ogg' // Probably more appropriate than the previous hitsound. -- Dave
usesound = 'sound/weapons/blade1.ogg'
max_integrity = 200
- armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 30)
+ armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 100, ACID = 30)
resistance_flags = FIRE_PROOF
toolspeed = 1
light_power = 2
diff --git a/code/game/objects/items/weapons/pneumaticCannon.dm b/code/game/objects/items/weapons/pneumaticCannon.dm
index 379c7403894..66a71ee99a4 100644
--- a/code/game/objects/items/weapons/pneumaticCannon.dm
+++ b/code/game/objects/items/weapons/pneumaticCannon.dm
@@ -9,7 +9,7 @@
item_state = "bulldog"
lefthand_file = 'icons/mob/inhands/guns_lefthand.dmi'
righthand_file = 'icons/mob/inhands/guns_righthand.dmi'
- armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 60, "acid" = 50)
+ 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/internals/tank = null //The gas tank that is drawn from to fire things
diff --git a/code/game/objects/items/weapons/powerfist.dm b/code/game/objects/items/weapons/powerfist.dm
index fe1f549e8ef..9ff9da516cc 100644
--- a/code/game/objects/items/weapons/powerfist.dm
+++ b/code/game/objects/items/weapons/powerfist.dm
@@ -9,7 +9,7 @@
throwforce = 10
throw_range = 7
w_class = WEIGHT_CLASS_NORMAL
- armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 40)
+ armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 100, ACID = 40)
resistance_flags = FIRE_PROOF
origin_tech = "combat=5;powerstorage=3;syndicate=3"
var/click_delay = 1.5
diff --git a/code/game/objects/items/weapons/rpd.dm b/code/game/objects/items/weapons/rpd.dm
index 258caf8b424..da12eb8d534 100644
--- a/code/game/objects/items/weapons/rpd.dm
+++ b/code/game/objects/items/weapons/rpd.dm
@@ -23,7 +23,7 @@
throw_range = 5
w_class = WEIGHT_CLASS_NORMAL
materials = list(MAT_METAL = 75000, MAT_GLASS = 37500)
- armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
+ armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 100, ACID = 50)
resistance_flags = FIRE_PROOF
origin_tech = "engineering=4;materials=2"
var/datum/effect_system/spark_spread/spark_system
diff --git a/code/game/objects/items/weapons/shards.dm b/code/game/objects/items/weapons/shards.dm
index 234685f3fe9..9e949b8b2ce 100644
--- a/code/game/objects/items/weapons/shards.dm
+++ b/code/game/objects/items/weapons/shards.dm
@@ -12,7 +12,7 @@
materials = list(MAT_GLASS = MINERAL_MATERIAL_AMOUNT)
attack_verb = list("stabbed", "slashed", "sliced", "cut")
hitsound = 'sound/weapons/bladeslice.ogg'
- armor = list("melee" = 100, "bullet" = 0, "laser" = 0, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 100)
+ armor = list(MELEE = 100, BULLET = 0, LASER = 0, ENERGY = 100, BOMB = 0, BIO = 0, RAD = 0, FIRE = 50, ACID = 100)
max_integrity = 40
resistance_flags = ACID_PROOF
sharp = TRUE
diff --git a/code/game/objects/items/weapons/shields.dm b/code/game/objects/items/weapons/shields.dm
index 86789ca3791..0053054ac85 100644
--- a/code/game/objects/items/weapons/shields.dm
+++ b/code/game/objects/items/weapons/shields.dm
@@ -1,7 +1,7 @@
/obj/item/shield
name = "shield"
block_chance = 50
- armor = list("melee" = 50, "bullet" = 50, "laser" = 50, "energy" = 0, "bomb" = 30, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 70)
+ armor = list(MELEE = 50, BULLET = 50, LASER = 50, ENERGY = 0, BOMB = 30, BIO = 0, RAD = 0, FIRE = 80, ACID = 70)
/obj/item/shield/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
if(attack_type == THROWN_PROJECTILE_ATTACK)
diff --git a/code/game/objects/items/weapons/storage/artistic_toolbox.dm b/code/game/objects/items/weapons/storage/artistic_toolbox.dm
deleted file mode 100644
index 3fbaa1d468d..00000000000
--- a/code/game/objects/items/weapons/storage/artistic_toolbox.dm
+++ /dev/null
@@ -1,223 +0,0 @@
-/obj/item/storage/toolbox/green
- name = "artistic toolbox"
- desc = "A metal container designed to hold various tools. This variety holds art supplies."
- icon_state = "green"
- item_state = "artistic_toolbox"
-
-/obj/item/storage/toolbox/green/memetic
- name = "artistic toolbox"
- desc = "His Grace."
- force = 5
- throwforce = 10
- origin_tech = "combat=4;engineering=4;syndicate=2"
- actions_types = list(/datum/action/item_action/toggle)
- var/list/servantlinks = list()
- var/hunger = 0
- var/hunger_message_level = 0
- var/mob/living/carbon/human/original_owner = null
- var/activated = FALSE
-
-/obj/item/storage/toolbox/green/memetic/ui_action_click(mob/user)
- if(user.HasDisease(new /datum/disease/memetic_madness(0)))
- var/obj/item/storage/toolbox/green/memetic/M = user.get_active_hand()
- if(istype(M))
- to_chat(user, "His Grace [flags & NODROP ? "releases from" : "binds to"] your hand!")
- flags ^= NODROP
- else if(!activated && loc == user)
- if(link_user(user))
- to_chat(user, "Call to His Grace again if you wish it bound to your hand!")
- else
- to_chat(user, "You can't seem to understand what this does.")
-
-
-/obj/item/storage/toolbox/green/memetic/attack_hand(mob/living/carbon/user)
- if(!activated && loc == user)
- link_user(user)
- return
- ..()
-
-/obj/item/storage/toolbox/green/memetic/proc/link_user(mob/living/carbon/user)
- if(ishuman(user) && !user.HasDisease(new /datum/disease/memetic_madness(0)))
- activated = TRUE
- user.ForceContractDisease(new /datum/disease/memetic_madness(0))
- for(var/datum/disease/memetic_madness/DD in user.viruses)
- DD.progenitor = src
- servantlinks.Add(DD)
- break
- force += 4
- throwforce += 4
- SEND_SOUND(user, sound('sound/goonstation/effects/screech.ogg'))
- shake_camera(user, 20, 1)
- var/acount = 0
- var/amax = rand(10, 15)
- var/up_and_down
- var/asize = 1
- while(acount <= amax)
- up_and_down += "a"
- if(acount > (amax * 0.5))
- asize--
- else
- asize++
- acount++
- to_chat(user, "[up_and_down]")
- to_chat(user, "His Grace accepts thee, spread His will! All who look close to the Enlightened may share His gifts.")
- original_owner = user
- return TRUE
- return FALSE
-
-/obj/item/storage/toolbox/green/memetic/attackby(obj/item/I, mob/user)
- if(activated)
- if(istype(I, /obj/item/grab))
- var/obj/item/grab/G = I
- var/mob/living/victim = G.affecting
- if(!user.HasDisease(new /datum/disease/memetic_madness(0)))
- to_chat(user, "You can't seem to find the latch to open this.")
- return
- if(!victim)
- return
- if(!victim.stat && !victim.restrained() && !victim.IsWeakened())
- to_chat(user, "They're moving too much to feed to His Grace!")
- return
- user.visible_message("[user] is trying to feed [victim] to [src]!")
- if(!do_mob(user, victim, 30))
- return
-
- user.visible_message("[user] has fed [victim] to [src]!")
-
- consume(victim)
- qdel(G)
-
- to_chat(user, "You have done well...")
- force += 5
- throwforce += 5
- return
-
- return ..()
-
-/obj/item/storage/toolbox/green/memetic/proc/consume(mob/living/L)
- if(!L)
- return
- hunger = 0
- hunger_message_level = 0
- playsound(loc, 'sound/goonstation/misc/burp_alien.ogg', 50, 0)
-
- if(L != original_owner)
- var/list/equipped_items = L.get_equipped_items(TRUE)
- if(L.l_hand)
- equipped_items += L.l_hand
- if(L.r_hand)
- equipped_items += L.r_hand
- if(equipped_items.len)
- var/obj/item/storage/box/B = new(src)
- B.name = "Box-'[L.real_name]'"
- for(var/obj/item/SI in equipped_items)
- L.unEquip(SI, TRUE)
- SI.forceMove(B)
- equipped_items.Cut()
-
- L.forceMove(src)
-
- L.emote("scream")
- L.death()
- L.ghostize()
- if(L == original_owner)
- L.unEquip(src, TRUE)
- qdel(L)
- var/obj/item/storage/toolbox/green/fake_toolbox = new(get_turf(src))
- fake_toolbox.desc = "It looks a lot duller than it used to."
- qdel(src)
- else
- qdel(L)
-
-/obj/item/storage/toolbox/green/memetic/Destroy()
- for(var/datum/disease/memetic_madness/D in servantlinks)
- D.cure()
-
- servantlinks.Cut()
- servantlinks = null
- original_owner = null
- visible_message("[src] screams!")
- playsound(loc, 'sound/goonstation/effects/screech.ogg', 100, 1)
- return ..()
-
-/datum/disease/memetic_madness
- name = "Memetic Kill Agent"
- max_stages = 4
- stage_prob = 8
- spread_text = "Non-Contagious"
- spread_flags = SPECIAL
- cure_text = "Unknown"
- viable_mobtypes = list(/mob/living/carbon/human)
- severity = BIOHAZARD
- disease_flags = CAN_CARRY
- spread_flags = NON_CONTAGIOUS
- virus_heal_resistant = TRUE
- var/obj/item/storage/toolbox/green/memetic/progenitor = null
-
-/datum/disease/memetic_madness/Destroy()
- if(progenitor)
- progenitor.servantlinks.Remove(src)
- progenitor = null
- if(affected_mob)
- affected_mob.status_flags |= CANSTUN | CANWEAKEN | CANPARALYSE
- return ..()
-
-/datum/disease/memetic_madness/stage_act()
- ..()
- if(!progenitor) //if someone admin spawns this, cure it right away; this should only ever be given directly from the toolbox itself.
- cure()
- return
- if(progenitor in affected_mob.contents)
- affected_mob.adjustOxyLoss(-5)
- affected_mob.adjustBruteLoss(-12)
- affected_mob.adjustFireLoss(-12)
- affected_mob.adjustToxLoss(-5)
- affected_mob.setStaminaLoss(0)
- var/status = CANSTUN | CANWEAKEN | CANPARALYSE
- affected_mob.status_flags &= ~status
- affected_mob.AdjustDizzy(-10)
- affected_mob.AdjustDrowsy(-10)
- affected_mob.SetSleeping(0)
- affected_mob.SetSlowed(0)
- affected_mob.SetConfused(0)
- stage = 1
- switch(progenitor.hunger)
- if(10 to 60)
- if(progenitor.hunger_message_level < 1)
- progenitor.hunger_message_level = 1
- to_chat(affected_mob, "Feed Me the unclean ones...They will be purified...")
- if(61 to 120)
- if(progenitor.hunger_message_level < 2)
- progenitor.hunger_message_level = 2
- to_chat(affected_mob, "I hunger for the flesh of the impure...")
- if(121 to 210)
- if(prob(10) && progenitor.hunger_message_level < 3)
- progenitor.hunger_message_level = 3
- to_chat(affected_mob, "The hunger of your Master grows with every passing moment. Feed Me at once.")
- if(211 to 399)
- if(progenitor.hunger_message_level < 4)
- progenitor.hunger_message_level = 4
- to_chat(affected_mob, "His Grace starves in your hands. Feed Me the unclean or suffer.")
- if(400 to INFINITY)
- affected_mob.visible_message("[progenitor] consumes [affected_mob] whole!")
- progenitor.consume(affected_mob)
- return
-
- progenitor.hunger += min(max((progenitor.force / 10), 1), 10)
-
- else
- affected_mob.status_flags |= CANSTUN | CANWEAKEN | CANPARALYSE
-
- if(stage == 4)
- if(get_dist(get_turf(progenitor), get_turf(affected_mob)) <= 7)
- stage = 1
- return
- if(prob(4))
- to_chat(affected_mob, "You are too far from His Grace...")
- affected_mob.adjustToxLoss(5)
- else if(prob(6))
- to_chat(affected_mob, "You feel weak.")
- affected_mob.adjustBruteLoss(5)
-
- if(ismob(progenitor.loc))
- progenitor.hunger++
diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm
index cd0997481b6..1976d443ecd 100644
--- a/code/game/objects/items/weapons/storage/backpack.dm
+++ b/code/game/objects/items/weapons/storage/backpack.dm
@@ -60,7 +60,7 @@
resistance_flags = FIRE_PROOF
flags_2 = NO_MAT_REDEMPTION_2
cant_hold = list(/obj/item/storage/backpack/holding)
- armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 60, "acid" = 50)
+ armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 60, ACID = 50)
/obj/item/storage/backpack/holding/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/storage/backpack/holding))
diff --git a/code/game/objects/items/weapons/storage/bags.dm b/code/game/objects/items/weapons/storage/bags.dm
index c89fd8aeb0d..0894c00cf2e 100644
--- a/code/game/objects/items/weapons/storage/bags.dm
+++ b/code/game/objects/items/weapons/storage/bags.dm
@@ -371,6 +371,7 @@
icon = 'icons/obj/food/containers.dmi'
icon_state = "tray"
desc = "A metal tray to lay food on."
+ storage_slots = 8
force = 5
throwforce = 10
throw_speed = 3
diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm
index 9fb4684f3ff..27ce01bca9e 100644
--- a/code/game/objects/items/weapons/storage/belt.dm
+++ b/code/game/objects/items/weapons/storage/belt.dm
@@ -231,8 +231,7 @@
/obj/item/holosign_creator/security,
/obj/item/melee/classic_baton/telescopic,
/obj/item/restraints/legcuffs/bola,
- /obj/item/clothing/mask/gas/sechailer,
- /obj/item/spacepod_key)
+ /obj/item/clothing/mask/gas/sechailer)
/obj/item/storage/belt/security/sec/populate_contents()
new /obj/item/flashlight/seclite(src)
@@ -716,7 +715,6 @@
new /obj/item/stack/cable_coil(src)
new /obj/item/restraints/handcuffs(src)
- new /obj/item/dnainjector/xraymut(src)
new /obj/item/dnainjector/firemut(src)
new /obj/item/dnainjector/telemut(src)
new /obj/item/dnainjector/hulkmut(src)
diff --git a/code/game/objects/items/weapons/storage/fancy.dm b/code/game/objects/items/weapons/storage/fancy.dm
index 8cc8f5729f2..416a29c7e74 100644
--- a/code/game/objects/items/weapons/storage/fancy.dm
+++ b/code/game/objects/items/weapons/storage/fancy.dm
@@ -293,6 +293,7 @@
desc = "You can't understand the runes, but the packet smells funny."
icon_state = "midoripacket"
item_state = "midoripacket"
+ cigarette_type = /obj/item/clothing/mask/cigarette/rollie/nicotine
/obj/item/storage/fancy/cigarettes/cigpack_shadyjims
name ="\improper Shady Jim's Super Slims"
diff --git a/code/game/objects/items/weapons/storage/toolbox.dm b/code/game/objects/items/weapons/storage/toolbox.dm
index db3e97b4154..6e52acb93df 100644
--- a/code/game/objects/items/weapons/storage/toolbox.dm
+++ b/code/game/objects/items/weapons/storage/toolbox.dm
@@ -132,3 +132,24 @@
new /obj/item/stack/cable_coil(src, 30, paramcolor = pickedcolor)
new /obj/item/wirecutters(src)
new /obj/item/multitool(src)
+
+/obj/item/storage/toolbox/artistic
+ name = "artistic toolbox"
+ desc = "A toolbox painted bright green. Why anyone would store art supplies in a toolbox is beyond you, but it has plenty of extra space."
+ icon_state = "green"
+ item_state = "artistic_toolbox"
+ w_class = WEIGHT_CLASS_GIGANTIC //Holds more than a regular toolbox!
+ max_combined_w_class = 20
+ storage_slots = 10
+
+/obj/item/storage/toolbox/artistic/populate_contents()
+ new /obj/item/storage/fancy/crayons(src)
+ new /obj/item/crowbar(src)
+ new /obj/item/stack/cable_coil(src)
+ new /obj/item/stack/cable_coil/yellow(src)
+ new /obj/item/stack/cable_coil/blue(src)
+ new /obj/item/stack/cable_coil/green(src)
+ new /obj/item/stack/cable_coil/pink(src)
+ new /obj/item/stack/cable_coil/orange(src)
+ new /obj/item/stack/cable_coil/cyan(src)
+ new /obj/item/stack/cable_coil/white(src)
diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm
index b76b78de12d..8d4b92b6154 100644
--- a/code/game/objects/items/weapons/stunbaton.dm
+++ b/code/game/objects/items/weapons/stunbaton.dm
@@ -9,7 +9,7 @@
throwforce = 7
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)
+ 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
/// Is the baton currently turned on
@@ -158,7 +158,7 @@
deductcharge(hitcost)
return
- if(isrobot(M)) // Can't stunbaton borgs
+ if(issilicon(M)) // Can't stunbaton borgs and AIs
return ..()
if(!isliving(M))
diff --git a/code/game/objects/items/weapons/tanks/tanks.dm b/code/game/objects/items/weapons/tanks/tanks.dm
index df6c3a4c988..62bd83dd263 100644
--- a/code/game/objects/items/weapons/tanks/tanks.dm
+++ b/code/game/objects/items/weapons/tanks/tanks.dm
@@ -10,7 +10,7 @@
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)
+ 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 = ONE_ATMOSPHERE
diff --git a/code/game/objects/items/weapons/tanks/watertank.dm b/code/game/objects/items/weapons/tanks/watertank.dm
index f2145970843..5c7b397d2b7 100644
--- a/code/game/objects/items/weapons/tanks/watertank.dm
+++ b/code/game/objects/items/weapons/tanks/watertank.dm
@@ -10,7 +10,7 @@
slowdown = 1
actions_types = list(/datum/action/item_action/toggle_mister)
max_integrity = 200
- armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 30)
+ armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 100, ACID = 30)
resistance_flags = FIRE_PROOF
var/obj/item/noz
diff --git a/code/game/objects/items/weapons/teleportation.dm b/code/game/objects/items/weapons/teleportation.dm
index 33aeddeaab0..491dd65ec97 100644
--- a/code/game/objects/items/weapons/teleportation.dm
+++ b/code/game/objects/items/weapons/teleportation.dm
@@ -22,7 +22,7 @@
throw_speed = 4
throw_range = 20
materials = list(MAT_METAL=400)
- armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 30, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100)
+ armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 30, BIO = 0, RAD = 0, FIRE = 100, ACID = 100)
origin_tech = "magnets=3;bluespace=2"
/obj/item/locator/attack_self(mob/user as mob)
@@ -105,7 +105,7 @@ Frequency:
throw_range = 5
materials = list(MAT_METAL=10000)
origin_tech = "magnets=3;bluespace=4"
- armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 30, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100)
+ armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 30, BIO = 0, RAD = 0, FIRE = 100, ACID = 100)
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
var/active_portals = 0
diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm
index 4d76f796c7e..7fc97eda5cd 100644
--- a/code/game/objects/items/weapons/twohanded.dm
+++ b/code/game/objects/items/weapons/twohanded.dm
@@ -92,6 +92,11 @@
user.put_in_inactive_hand(O)
return TRUE
+/obj/item/twohanded/mob_can_equip(mob/M, slot) //Unwields twohanded items when they're attempted to be equipped to another slot
+ if(wielded)
+ unwield(M)
+ return ..()
+
/obj/item/twohanded/dropped(mob/user)
..()
//handles unwielding a twohanded weapon when dropped as well as clearing up the offhand
@@ -192,7 +197,7 @@
hitsound = 'sound/weapons/bladeslice.ogg'
usesound = 'sound/items/crowbar.ogg'
max_integrity = 200
- armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 30)
+ 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/fireaxe/update_icon() //Currently only here to fuck with the on-mob icons.
@@ -278,7 +283,7 @@
block_chance = 75
sharp_when_wielded = TRUE // only sharp when wielded
max_integrity = 200
- armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 70)
+ armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 100, ACID = 70)
resistance_flags = FIRE_PROOF
light_power = 2
needs_permit = TRUE
@@ -394,7 +399,7 @@
no_spin_thrown = TRUE
var/obj/item/grenade/explosive = null
max_integrity = 200
- armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 30)
+ armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 50, ACID = 30)
needs_permit = TRUE
var/icon_prefix = "spearglass"
@@ -647,7 +652,7 @@
throwforce = 15
throw_range = 1
w_class = WEIGHT_CLASS_HUGE
- armor = list("melee" = 50, "bullet" = 50, "laser" = 50, "energy" = 0, "bomb" = 50, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100)
+ armor = list(MELEE = 50, BULLET = 50, LASER = 50, ENERGY = 0, BOMB = 50, BIO = 0, RAD = 0, FIRE = 100, ACID = 100)
resistance_flags = FIRE_PROOF | ACID_PROOF
var/charged = 2
origin_tech = "combat=4;bluespace=4;plasmatech=7"
diff --git a/code/game/objects/items/weapons/vending_items.dm b/code/game/objects/items/weapons/vending_items.dm
index c4d4d5090e5..b971d9c1926 100644
--- a/code/game/objects/items/weapons/vending_items.dm
+++ b/code/game/objects/items/weapons/vending_items.dm
@@ -13,7 +13,7 @@
throw_speed = 1
throw_range = 7
w_class = WEIGHT_CLASS_BULKY
- armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 70, "acid" = 30)
+ armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 70, ACID = 30)
// Built automatically from the corresponding vending machine.
// If null, considered to be full. Otherwise, is list(/typepath = amount).
@@ -152,3 +152,61 @@
/obj/item/vending_refill/robotics
machine_name = "Robotech Deluxe"
icon_state = "refill_engi"
+
+//Departmental clothing vendors
+
+/obj/item/vending_refill/secdrobe
+ machine_name = "SecDrobe"
+ icon_state = "refill_clothes"
+
+/obj/item/vending_refill/detdrobe
+ machine_name = "DetDrobe"
+ icon_state = "refill_clothes"
+
+/obj/item/vending_refill/medidrobe
+ machine_name = "MediDrobe"
+ icon_state = "refill_clothes"
+
+/obj/item/vending_refill/virodrobe
+ machine_name = "ViroDrobe"
+ icon_state = "refill_clothes"
+
+/obj/item/vending_refill/chemdrobe
+ machine_name = "ChemDrobe"
+ icon_state = "refill_clothes"
+
+/obj/item/vending_refill/genedrobe
+ machine_name = "GeneDrobe"
+ icon_state = "refill_clothes"
+
+/obj/item/vending_refill/scidrobe
+ machine_name = "SciDrobe"
+ icon_state = "refill_clothes"
+
+/obj/item/vending_refill/robodrobe
+ machine_name = "RoboDrobe"
+ icon_state = "refill_clothes"
+
+/obj/item/vending_refill/engidrobe
+ machine_name = "EngiDrobe"
+ icon_state = "refill_clothes"
+
+/obj/item/vending_refill/atmosdrobe
+ machine_name = "AtmosDrobe"
+ icon_state = "refill_clothes"
+
+/obj/item/vending_refill/cargodrobe
+ machine_name = "CargoDrobe"
+ icon_state = "refill_clothes"
+
+/obj/item/vending_refill/chefdrobe
+ machine_name = "ChefDrobe"
+ icon_state = "refill_clothes"
+
+/obj/item/vending_refill/bardrobe
+ machine_name = "BarDrobe"
+ icon_state = "refill_clothes"
+
+/obj/item/vending_refill/hydrodrobe
+ machine_name = "HydroDrobe"
+ icon_state = "refill_clothes"
diff --git a/code/game/objects/items/weapons/weaponry.dm b/code/game/objects/items/weapons/weaponry.dm
index e79851a8d0c..1e6a2bf4618 100644
--- a/code/game/objects/items/weapons/weaponry.dm
+++ b/code/game/objects/items/weapons/weaponry.dm
@@ -13,7 +13,7 @@
throw_range = 15
attack_verb = list("banned")
max_integrity = 200
- armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 70)
+ armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 100, ACID = 70)
resistance_flags = FIRE_PROOF
/obj/item/banhammer/suicide_act(mob/user)
@@ -57,7 +57,7 @@
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
block_chance = 50
max_integrity = 200
- armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
+ armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 100, ACID = 50)
resistance_flags = FIRE_PROOF
/obj/item/claymore/suicide_act(mob/user)
@@ -84,7 +84,7 @@
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
block_chance = 50
max_integrity = 200
- armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
+ armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 100, ACID = 50)
resistance_flags = FIRE_PROOF
needs_permit = TRUE
diff --git a/code/game/objects/obj_defense.dm b/code/game/objects/obj_defense.dm
index b796740a60b..c6a66c2d40e 100644
--- a/code/game/objects/obj_defense.dm
+++ b/code/game/objects/obj_defense.dm
@@ -21,7 +21,7 @@
///returns the damage value of the attack after processing the obj's various armor protections
/obj/proc/run_obj_armor(damage_amount, damage_type, damage_flag = 0, attack_dir, armour_penetration = 0)
- if(damage_flag == "melee" && damage_amount < damage_deflection)
+ if(damage_flag == MELEE && damage_amount < damage_deflection)
return 0
switch(damage_type)
if(BRUTE)
@@ -48,7 +48,7 @@
/obj/hitby(atom/movable/AM, skipcatch, hitpush, blocked, datum/thrownthing/throwingdatum)
..()
- take_damage(AM.throwforce, BRUTE, "melee", 1, get_dir(src, AM))
+ take_damage(AM.throwforce, BRUTE, MELEE, 1, get_dir(src, AM))
/obj/ex_act(severity)
if(QDELETED(src))
@@ -57,11 +57,11 @@
return
switch(severity)
if(1)
- take_damage(INFINITY, BRUTE, "bomb", 0)
+ take_damage(INFINITY, BRUTE, BOMB, 0)
if(2)
- take_damage(rand(100, 250), BRUTE, "bomb", 0)
+ take_damage(rand(100, 250), BRUTE, BOMB, 0)
if(3)
- take_damage(rand(10, 90), BRUTE, "bomb", 0)
+ take_damage(rand(10, 90), BRUTE, BOMB, 0)
/obj/bullet_act(obj/item/projectile/P)
. = ..()
@@ -83,16 +83,16 @@
user.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
else
playsound(src, 'sound/effects/bang.ogg', 50, 1)
- take_damage(hulk_damage(), BRUTE, "melee", 0, get_dir(src, user))
+ take_damage(hulk_damage(), BRUTE, MELEE, 0, get_dir(src, user))
return TRUE
return FALSE
/obj/blob_act(obj/structure/blob/B)
if(isturf(loc))
var/turf/T = loc
- if(T.intact && level == 1) //the blob doesn't destroy thing below the floor
+ if((T.intact && level == 1) || T.transparent_floor) //the blob doesn't destroy thing below the floor
return
- take_damage(400, BRUTE, "melee", 0, get_dir(src, B))
+ take_damage(400, BRUTE, MELEE, 0, get_dir(src, B))
/obj/proc/attack_generic(mob/user, damage_amount = 0, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, armor_penetration = 0) //used by attack_alien, attack_animal, and attack_slime
user.do_attack_animation(src)
@@ -100,7 +100,7 @@
return take_damage(damage_amount, damage_type, damage_flag, sound_effect, get_dir(src, user), armor_penetration)
/obj/attack_alien(mob/living/carbon/alien/humanoid/user)
- if(attack_generic(user, 60, BRUTE, "melee", 0))
+ if(attack_generic(user, 60, BRUTE, MELEE, 0))
playsound(loc, 'sound/weapons/slash.ogg', 100, TRUE)
/obj/attack_animal(mob/living/simple_animal/M)
@@ -112,9 +112,9 @@
if(M.environment_smash)
play_soundeffect = 0
if(M.obj_damage)
- . = attack_generic(M, M.obj_damage, M.melee_damage_type, "melee", play_soundeffect, M.armour_penetration)
+ . = attack_generic(M, M.obj_damage, M.melee_damage_type, MELEE, play_soundeffect, M.armour_penetration)
else
- . = attack_generic(M, rand(M.melee_damage_lower,M.melee_damage_upper), M.melee_damage_type, "melee", play_soundeffect, M.armour_penetration)
+ . = attack_generic(M, rand(M.melee_damage_lower,M.melee_damage_upper), M.melee_damage_type, MELEE, play_soundeffect, M.armour_penetration)
if(. && !play_soundeffect)
playsound(src, 'sound/effects/meteorimpact.ogg', 100, TRUE)
@@ -132,7 +132,7 @@
/obj/attack_slime(mob/living/simple_animal/slime/user)
if(!user.is_adult)
return
- attack_generic(user, rand(10, 15), BRUTE, "melee", 1)
+ attack_generic(user, rand(10, 15), BRUTE, MELEE, 1)
/obj/mech_melee_attack(obj/mecha/M)
M.do_attack_animation(src)
@@ -153,7 +153,7 @@
else
return 0
M.visible_message("[M.name] hits [src]!", "You hit [src]!")
- return take_damage(M.force*3, mech_damtype, "melee", play_soundeffect, get_dir(src, M)) // multiplied by 3 so we can hit objs hard but not be overpowered against mobs.
+ return take_damage(M.force*3, mech_damtype, MELEE, play_soundeffect, get_dir(src, M)) // multiplied by 3 so we can hit objs hard but not be overpowered against mobs.
/obj/singularity_act()
ex_act(EXPLODE_DEVASTATE)
@@ -183,7 +183,7 @@ GLOBAL_DATUM_INIT(acid_overlay, /mutable_appearance, mutable_appearance('icons/e
if(!(resistance_flags & ACID_PROOF))
if(prob(33))
playsound(loc, 'sound/items/welder.ogg', 150, TRUE)
- take_damage(min(1 + round(sqrt(acid_level) * 0.3), 300), BURN, "acid", 0)
+ take_damage(min(1 + round(sqrt(acid_level) * 0.3), 300), BURN, ACID, 0)
acid_level = max(acid_level - (5 + 3 * round(sqrt(acid_level))), 0)
if(!acid_level)
@@ -199,11 +199,11 @@ GLOBAL_DATUM_INIT(acid_overlay, /mutable_appearance, mutable_appearance('icons/e
/obj/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume, global_overlay = TRUE)
if(isturf(loc))
var/turf/T = loc
- if(T.intact && level == 1) //fire can't damage things hidden below the floor.
+ if((T.intact && level == 1) || T.transparent_floor) //fire can't damage things hidden below the floor.
return
..()
if(exposed_temperature && !(resistance_flags & FIRE_PROOF))
- take_damage(clamp(0.02 * exposed_temperature, 0, 20), BURN, "fire", 0)
+ take_damage(clamp(0.02 * exposed_temperature, 0, 20), BURN, FIRE, 0)
if(!(resistance_flags & ON_FIRE) && (resistance_flags & FLAMMABLE) && !(resistance_flags & FIRE_PROOF))
resistance_flags |= ON_FIRE
SSfires.processing[src] = src
@@ -253,9 +253,9 @@ GLOBAL_DATUM_INIT(acid_overlay, /mutable_appearance, mutable_appearance('icons/e
///what happens when the obj's integrity reaches zero.
/obj/proc/obj_destruction(damage_flag)
- if(damage_flag == "acid")
+ if(damage_flag == ACID)
acid_melt()
- else if(damage_flag == "fire")
+ else if(damage_flag == FIRE)
burn()
else
deconstruct(FALSE)
diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm
index 4d58c90a095..96caf288d2d 100644
--- a/code/game/objects/structures.dm
+++ b/code/game/objects/structures.dm
@@ -21,7 +21,7 @@
/obj/structure/Initialize(mapload)
if(!armor)
- armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
+ armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 50, ACID = 50)
return ..()
/obj/structure/Destroy()
@@ -59,30 +59,31 @@
/obj/structure/proc/do_climb(mob/living/user)
if(!can_touch(user) || !climbable)
- return
+ return FALSE
var/blocking_object = density_check()
if(blocking_object)
to_chat(user, "You cannot climb [src], as it is blocked by \a [blocking_object]!")
- return
+ return FALSE
var/turf/T = src.loc
- if(!T || !istype(T)) return
+ if(!T || !istype(T)) return FALSE
usr.visible_message("[user] starts climbing onto \the [src]!")
climber = user
if(!do_after(user, 50, target = src))
climber = null
- return
+ return FALSE
if(!can_touch(user) || !climbable)
climber = null
- return
+ return FALSE
usr.loc = get_turf(src)
if(get_turf(user) == get_turf(src))
usr.visible_message("[user] climbs onto \the [src]!")
climber = null
+ return TRUE
/obj/structure/proc/structure_shaken()
@@ -170,6 +171,6 @@
/obj/structure/zap_act(power, zap_flags)
if(zap_flags & ZAP_OBJ_DAMAGE)
- take_damage(power / 8000, BURN, "energy")
+ take_damage(power / 8000, BURN, ENERGY)
power -= power / 2000 //walls take a lot out of ya
. = ..()
diff --git a/code/game/objects/structures/aliens.dm b/code/game/objects/structures/aliens.dm
index 4661ff125cc..34eda470895 100644
--- a/code/game/objects/structures/aliens.dm
+++ b/code/game/objects/structures/aliens.dm
@@ -16,7 +16,7 @@
max_integrity = 100
/obj/structure/alien/run_obj_armor(damage_amount, damage_type, damage_flag = 0, attack_dir)
- if(damage_flag == "melee")
+ if(damage_flag == MELEE)
switch(damage_type)
if(BRUTE)
damage_amount *= 0.25
diff --git a/code/game/objects/structures/barsign.dm b/code/game/objects/structures/barsign.dm
index 357a5c0db51..f2253daaa2f 100644
--- a/code/game/objects/structures/barsign.dm
+++ b/code/game/objects/structures/barsign.dm
@@ -6,7 +6,7 @@
req_access = list(ACCESS_BAR)
max_integrity = 500
integrity_failure = 250
- armor = list("melee" = 20, "bullet" = 20, "laser" = 20, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
+ 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/state = 0
diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm
index 8a979bd18a7..49e9b4e2f48 100644
--- a/code/game/objects/structures/crates_lockers/closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets.dm
@@ -6,7 +6,7 @@
density = 1
max_integrity = 200
integrity_failure = 50
- armor = list("melee" = 20, "bullet" = 10, "laser" = 10, "energy" = 0, "bomb" = 10, "bio" = 0, "rad" = 0, "fire" = 70, "acid" = 60)
+ armor = list(MELEE = 20, BULLET = 10, LASER = 10, ENERGY = 0, BOMB = 10, BIO = 0, RAD = 0, FIRE = 70, ACID = 60)
var/icon_closed = "closed"
var/icon_opened = "open"
var/opened = FALSE
diff --git a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm
index 0345dca3b7f..fdeeab78878 100644
--- a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm
+++ b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm
@@ -75,7 +75,7 @@
if(istype(W, /obj/item/pen))
var/decalselection = input("Please select a decal") as null|anything in list("Atmospherics", "Bartender", "Barber", "Blueshield", "Brig Physician", "Captain",
"Cargo", "Chief Engineer", "Chaplain", "Chef", "Chemist", "Civilian", "Clown", "CMO", "Coroner", "Detective", "Engineering", "Genetics", "HOP",
- "HOS", "Hydroponics", "Internal Affairs Agent", "Janitor", "Magistrate", "Mechanic", "Medical", "Mime", "Mining", "NT Representative", "Paramedic", "Pod Pilot",
+ "HOS", "Hydroponics", "Internal Affairs Agent", "Janitor", "Magistrate", "Medical", "Mime", "Mining", "NT Representative", "Paramedic",
"Prisoner", "Research Director", "Security", "Syndicate", "Therapist", "Virology", "Warden", "Xenobiology")
if(!decalselection)
return
diff --git a/code/game/objects/structures/crates_lockers/closets/fireaxe.dm b/code/game/objects/structures/crates_lockers/closets/fireaxe.dm
index 91a335ed918..d8a2cb5b04b 100644
--- a/code/game/objects/structures/crates_lockers/closets/fireaxe.dm
+++ b/code/game/objects/structures/crates_lockers/closets/fireaxe.dm
@@ -2,19 +2,23 @@
/obj/structure/closet/fireaxecabinet
name = "fire axe cabinet"
desc = "There is small label that reads \"For Emergency use only\" along with details for safe use of the axe. As if."
- var/obj/item/twohanded/fireaxe/fireaxe = new/obj/item/twohanded/fireaxe
+ var/obj/item/twohanded/fireaxe/fireaxe
icon_state = "fireaxe1000"
icon_closed = "fireaxe1000"
icon_opened = "fireaxe1100"
anchored = TRUE
density = FALSE
- armor = list("melee" = 50, "bullet" = 20, "laser" = 0, "energy" = 100, "bomb" = 10, "bio" = 100, "rad" = 100, "fire" = 90, "acid" = 50)
+ armor = list(MELEE = 50, BULLET = 20, LASER = 0, ENERGY = 100, BOMB = 10, BIO = 100, RAD = 100, FIRE = 90, ACID = 50)
var/localopened = FALSE //Setting this to keep it from behaviouring like a normal closet and obstructing movement in the map. -Agouri
opened = TRUE
var/hitstaken = FALSE
locked = TRUE
var/smashed = FALSE
+/obj/structure/closet/fireaxecabinet/populate_contents()
+ fireaxe = new/obj/item/twohanded/fireaxe(src)
+ update_icon() // So its initial icon doesn't show it without the fireaxe
+
/obj/structure/closet/fireaxecabinet/examine(mob/user)
. = ..()
. += "Use a multitool to lock/unlock it."
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 a56c63937e3..555124cbb47 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
@@ -182,7 +182,7 @@
new /obj/item/clothing/shoes/brown (src)
new /obj/item/radio/headset/heads/cmo(src)
new /obj/item/clothing/gloves/color/latex/nitrile(src)
- new /obj/item/defibrillator/compact/loaded(src)
+ new /obj/item/defibrillator/compact/advanced/loaded(src)
new /obj/item/handheld_defibrillator(src)
new /obj/item/storage/belt/medical(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 2bf2b03b4a2..0e740548289 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
@@ -9,7 +9,7 @@
broken = 0
can_be_emaged = TRUE
max_integrity = 250
- armor = list("melee" = 30, "bullet" = 50, "laser" = 50, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 80)
+ armor = list(MELEE = 30, BULLET = 50, LASER = 50, ENERGY = 100, BOMB = 0, BIO = 0, RAD = 0, FIRE = 80, ACID = 80)
damage_deflection = 20
icon_closed = "secure"
var/icon_locked = "secure1"
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 d39836154b3..d8d3111fbe8 100644
--- a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm
@@ -51,10 +51,6 @@
if("delete")
qdel(src)
- //If you want to re-add fire, just add "fire" = 15 to the pick list.
- /*if("fire")
- new /obj/structure/closet/firecloset(src.loc)
- qdel(src)*/
/obj/structure/closet/emcloset/legacy/populate_contents()
new /obj/item/tank/internals/oxygen(src)
diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm
index f86c37229c6..b5149bdecbb 100644
--- a/code/game/objects/structures/crates_lockers/crates.dm
+++ b/code/game/objects/structures/crates_lockers/crates.dm
@@ -169,7 +169,7 @@
var/sparks = "securecratesparks"
var/emag = "securecrateemag"
max_integrity = 500
- armor = list("melee" = 30, "bullet" = 50, "laser" = 50, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 80)
+ armor = list(MELEE = 30, BULLET = 50, LASER = 50, ENERGY = 100, BOMB = 0, BIO = 0, RAD = 0, FIRE = 80, ACID = 80)
damage_deflection = 25
var/tamperproof = FALSE
broken = FALSE
diff --git a/code/game/objects/structures/displaycase.dm b/code/game/objects/structures/displaycase.dm
index 31929110264..04819b9203e 100644
--- a/code/game/objects/structures/displaycase.dm
+++ b/code/game/objects/structures/displaycase.dm
@@ -6,7 +6,7 @@
density = TRUE
anchored = TRUE
resistance_flags = ACID_PROOF
- armor = list("melee" = 30, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 10, "bio" = 0, "rad" = 0, "fire" = 70, "acid" = 100)
+ armor = list(MELEE = 30, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 10, BIO = 0, RAD = 0, FIRE = 70, ACID = 100)
max_integrity = 200
integrity_failure = 50
var/obj/item/showpiece = null
diff --git a/code/game/objects/structures/extinguisher.dm b/code/game/objects/structures/extinguisher.dm
index 712378c612e..5b129d485ee 100644
--- a/code/game/objects/structures/extinguisher.dm
+++ b/code/game/objects/structures/extinguisher.dm
@@ -26,9 +26,9 @@
if(NO_EXTINGUISHER)
return
if(MINI_EXTINGUISHER)
- has_extinguisher = new/obj/item/extinguisher/mini
+ has_extinguisher = new /obj/item/extinguisher/mini(src)
else
- has_extinguisher = new/obj/item/extinguisher
+ has_extinguisher = new /obj/item/extinguisher(src)
/obj/structure/extinguisher_cabinet/examine(mob/user)
. = ..()
diff --git a/code/game/objects/structures/false_walls.dm b/code/game/objects/structures/false_walls.dm
index c52338b9e7d..5ee5518af11 100644
--- a/code/game/objects/structures/false_walls.dm
+++ b/code/game/objects/structures/false_walls.dm
@@ -94,9 +94,9 @@
if(density)
smooth = SMOOTH_FALSE
clear_smooth_overlays()
- icon_state = "fwall_opening"
+ flick("fwall_opening", src)
else
- icon_state = "fwall_closing"
+ flick("fwall_closing", src)
/obj/structure/falsewall/update_icon()
if(density)
@@ -297,6 +297,7 @@
/obj/structure/falsewall/sandstone
name = "sandstone wall"
desc = "A wall with sandstone plating."
+ icon = 'icons/turf/walls/sandstone_wall.dmi'
icon_state = "sandstone"
mineral = /obj/item/stack/sheet/mineral/sandstone
walltype = /turf/simulated/wall/mineral/sandstone
diff --git a/code/game/objects/structures/fence.dm b/code/game/objects/structures/fence.dm
new file mode 100644
index 00000000000..103ae32b58c
--- /dev/null
+++ b/code/game/objects/structures/fence.dm
@@ -0,0 +1,223 @@
+//Chain link fences
+//Sprites ported from /VG/
+
+#define CUT_TIME 100
+#define CLIMB_TIME 150
+#define FULL_CUT_TIME 300
+
+#define NO_HOLE 0 //section is intact
+#define MEDIUM_HOLE 1 //medium hole in the section - can climb through
+#define LARGE_HOLE 2 //large hole in the section - can walk through
+#define MAX_HOLE_SIZE LARGE_HOLE
+#define HOLE_REPAIR (hole_size * 2) //How many rods to fix these sections
+
+/obj/structure/fence
+ name = "fence"
+ desc = "A chain link fence. Not as effective as a wall, but generally it keeps people out."
+ density = TRUE
+ anchored = TRUE
+
+ icon = 'icons/obj/fence.dmi'
+ icon_state = "straight"
+
+ var/cuttable = TRUE
+ var/hole_size = NO_HOLE
+ var/invulnerable = FALSE
+ var/shock_cooldown = FALSE
+
+/obj/structure/fence/Initialize()
+ . = ..()
+ update_cut_status()
+
+/obj/structure/fence/examine(mob/user)
+ . = ..()
+ switch(hole_size)
+ if(MEDIUM_HOLE)
+ . += "There is a large hole in \the [src]."
+ if(LARGE_HOLE)
+ . += "\The [src] has been completely cut through."
+
+/obj/structure/fence/end
+ icon_state = "end"
+ cuttable = FALSE
+
+/obj/structure/fence/corner
+ icon_state = "corner"
+ cuttable = FALSE
+
+/obj/structure/fence/post
+ icon_state = "post"
+ cuttable = FALSE
+
+/obj/structure/fence/cut/medium
+ icon_state = "straight_cut2"
+ hole_size = MEDIUM_HOLE
+ climbable = TRUE
+
+/obj/structure/fence/cut/large
+ icon_state = "straight_cut3"
+ hole_size = LARGE_HOLE
+
+/obj/structure/fence/CanPass(atom/movable/mover, turf/target)
+ if(istype(mover) && mover.checkpass(PASSFENCE))
+ return TRUE
+ if(istype(mover, /obj/item/projectile))
+ return TRUE
+ if(!density)
+ return TRUE
+ return FALSE
+
+/*
+ Shock user with probability prb (if all connections & power are working)
+ Returns TRUE if shocked, FALSE otherwise
+ Totally not stolen from code\game\objects\structures\grille.dm
+*/
+/obj/structure/fence/proc/shock(mob/user, prb)
+ if(!prob(prb))
+ return FALSE
+ if(!in_range(src, user)) //To prevent TK and mech users from getting shocked
+ return FALSE
+ var/turf/T = get_turf(src)
+ var/obj/structure/cable/C = T.get_cable_node()
+ if(C)
+ if(electrocute_mob(user, C, src, 1, TRUE))
+ do_sparks(3, 1, src)
+ return TRUE
+ return FALSE
+
+/obj/structure/fence/wirecutter_act(mob/living/user, obj/item/W)
+ . = TRUE
+ if(shock(user, 100))
+ return
+ if(invulnerable)
+ to_chat(user, "This fence is too strong to cut through!")
+ return
+ if(!cuttable)
+ user.visible_message("[user] starts dismantling [src] with [W].",\
+ "You start dismantling [src] with [W].")
+ if(W.use_tool(src, user, FULL_CUT_TIME, volume = W.tool_volume))
+ user.visible_message("[user] completely dismantles [src].",\
+ "You completely dismantle [src].")
+ qdel(src)
+ return
+ var/current_stage = hole_size
+ user.visible_message("[user] starts cutting through [src] with [W].",\
+ "You start cutting through [src] with [W].")
+ if(W.use_tool(src, user, CUT_TIME * W.toolspeed, volume = W.tool_volume))
+ if(current_stage == hole_size)
+ switch(hole_size)
+ if(NO_HOLE)
+ user.visible_message("[user] cuts into [src] some more.",\
+ "You could probably fit yourself through that hole now. Although climbing through would be much faster if you made it even bigger.")
+ hole_size = MEDIUM_HOLE
+ if(MEDIUM_HOLE)
+ user.visible_message("[user] completely cuts through [src].",\
+ "The hole in [src] is now big enough to walk through.")
+ hole_size = LARGE_HOLE
+ if(LARGE_HOLE)
+ user.visible_message("[user] completely dismantles [src].",\
+ "You completely take apart [src].")
+ qdel(src)
+ return
+ update_cut_status()
+
+/obj/structure/fence/attackby(obj/item/C, mob/user)
+ if(shock(user, 90))
+ return
+ if(istype(C, /obj/item/stack/rods))
+ if(hole_size == NO_HOLE)
+ return
+ var/obj/item/stack/rods/R = C
+ if(R.get_amount() < HOLE_REPAIR)
+ to_chat(user, "You need [HOLE_REPAIR] rods to fix this fence!")
+ return
+ to_chat(user, "You begin repairing the fence...")
+ if(do_after(user, 3 SECONDS * C.toolspeed, target = src) && hole_size != NO_HOLE && R.use(HOLE_REPAIR))
+ playsound(src, C.usesound, 80, 1)
+ hole_size = NO_HOLE
+ obj_integrity = max_integrity
+ to_chat(user, "You repair the fence.")
+ update_cut_status()
+ return
+ . = ..()
+
+/obj/structure/fence/Bumped(atom/user)
+ if(!ismob(user))
+ return
+ if(shock_cooldown)
+ return
+ shock(user, 70)
+ shock_cooldown = TRUE // We do not want bump shock spam!
+ addtimer(CALLBACK(src, .proc/shock_cooldown), 1 SECONDS, TIMER_UNIQUE | TIMER_OVERRIDE)
+
+/obj/structure/fence/proc/shock_cooldown()
+ shock_cooldown = FALSE
+
+/obj/structure/fence/attack_animal(mob/user)
+ . = ..()
+ if(. && !QDELETED(src) && !shock(user, 70))
+ take_damage(rand(5,10), BRUTE, "melee", 1)
+
+/obj/structure/fence/proc/update_cut_status()
+ if(!cuttable)
+ return
+ var/new_density = TRUE
+ switch(hole_size)
+ if(NO_HOLE)
+ icon_state = initial(icon_state)
+ climbable = FALSE
+ if(MEDIUM_HOLE)
+ icon_state = "straight_cut2"
+ climbable = TRUE
+ if(LARGE_HOLE)
+ icon_state = "straight_cut3"
+ new_density = FALSE
+ climbable = FALSE
+ set_density(new_density)
+
+//FENCE DOORS
+
+/obj/structure/fence/door
+ name = "fence door"
+ desc = "Not very useful without a real lock."
+ icon_state = "door_closed"
+ cuttable = FALSE
+ var/open = FALSE
+
+/obj/structure/fence/door/Initialize()
+ . = ..()
+ update_door_status()
+
+/obj/structure/fence/door/opened
+ icon_state = "door_opened"
+ open = TRUE
+ density = TRUE
+
+/obj/structure/fence/door/attack_hand(mob/user, list/modifiers)
+ shock(user, 70)
+ if(can_open(user))
+ toggle(user)
+ return TRUE
+
+/obj/structure/fence/door/proc/toggle(mob/user)
+ open = !open
+ visible_message("\The [user] [open ? "opens" : "closes"] \the [src].")
+ update_door_status()
+ playsound(src, 'sound/machines/door_open.ogg', 100, TRUE)
+
+/obj/structure/fence/door/proc/update_door_status()
+ set_density(!open)
+ icon_state = open ? "door_opened" : "door_closed"
+
+/obj/structure/fence/door/proc/can_open(mob/user)
+ return TRUE
+
+#undef CUT_TIME
+#undef CLIMB_TIME
+#undef FULL_CUT_TIME
+
+#undef NO_HOLE
+#undef MEDIUM_HOLE
+#undef LARGE_HOLE
+#undef MAX_HOLE_SIZE
+#undef HOLE_REPAIR
diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm
index 635529d5bd7..d8b572b3d3d 100644
--- a/code/game/objects/structures/grille.dm
+++ b/code/game/objects/structures/grille.dm
@@ -10,7 +10,7 @@
pressure_resistance = 5*ONE_ATMOSPHERE
layer = BELOW_OBJ_LAYER
level = 3
- armor = list("melee" = 50, "bullet" = 70, "laser" = 70, "energy" = 100, "bomb" = 10, "bio" = 100, "rad" = 100, "fire" = 0, "acid" = 0)
+ armor = list(MELEE = 50, BULLET = 70, LASER = 70, ENERGY = 100, BOMB = 10, BIO = 100, RAD = 100, FIRE = 0, ACID = 0)
max_integrity = 50
integrity_failure = 20
var/rods_type = /obj/item/stack/rods
@@ -69,7 +69,7 @@
/obj/structure/grille/attack_animal(mob/user)
. = ..()
if(. && !QDELETED(src) && !shock(user, 70))
- take_damage(rand(5,10), BRUTE, "melee", 1)
+ take_damage(rand(5,10), BRUTE, MELEE, 1)
/obj/structure/grille/hulk_damage()
return 60
@@ -88,14 +88,14 @@
user.do_attack_animation(src, ATTACK_EFFECT_KICK)
user.visible_message("[user] hits [src].")
if(!shock(user, 70))
- take_damage(rand(5,10), BRUTE, "melee", 1)
+ take_damage(rand(5,10), BRUTE, MELEE, 1)
/obj/structure/grille/attack_alien(mob/living/user)
user.do_attack_animation(src)
user.changeNext_move(CLICK_CD_MELEE)
user.visible_message("[user] mangles [src].")
if(!shock(user, 70))
- take_damage(20, BRUTE, "melee", 1)
+ take_damage(20, BRUTE, MELEE, 1)
/obj/structure/grille/CanPass(atom/movable/mover, turf/target, height=0)
if(height==0)
diff --git a/code/game/objects/structures/holosign.dm b/code/game/objects/structures/holosign.dm
index 211dec106b3..13b5ba64140 100644
--- a/code/game/objects/structures/holosign.dm
+++ b/code/game/objects/structures/holosign.dm
@@ -6,7 +6,7 @@
icon = 'icons/effects/effects.dmi'
anchored = TRUE
max_integrity = 1
- armor = list("melee" = 0, "bullet" = 50, "laser" = 50, "energy" = 50, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 20, "acid" = 20)
+ 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/Initialize(mapload, source_projector)
@@ -27,7 +27,7 @@
return
user.do_attack_animation(src)
user.changeNext_move(CLICK_CD_MELEE)
- take_damage(5 , BRUTE, "melee", 1)
+ take_damage(5 , BRUTE, MELEE, 1)
/obj/structure/holosign/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0)
switch(damage_type)
@@ -97,11 +97,11 @@
allow_walk = FALSE
/obj/structure/holosign/barrier/cyborg/bullet_act(obj/item/projectile/P)
- take_damage((P.damage / 5) , BRUTE, "melee", 1) //Doesn't really matter what damage flag it is.
+ take_damage((P.damage / 5) , BRUTE, MELEE, 1) //Doesn't really matter what damage flag it is.
if(istype(P, /obj/item/projectile/energy/electrode))
- take_damage(10, BRUTE, "melee", 1) //Tasers aren't harmful.
+ take_damage(10, BRUTE, MELEE, 1) //Tasers aren't harmful.
if(istype(P, /obj/item/projectile/beam/disabler))
- take_damage(5, BRUTE, "melee", 1) //Disablers aren't harmful.
+ take_damage(5, BRUTE, MELEE, 1) //Disablers aren't harmful.
/obj/structure/holosign/barrier/cyborg/hacked
name = "Charged Energy Field"
@@ -110,7 +110,7 @@
var/shockcd = 0
/obj/structure/holosign/barrier/cyborg/hacked/bullet_act(obj/item/projectile/P)
- take_damage(P.damage, BRUTE, "melee", 1) //Yeah no this doesn't get projectile resistance.
+ take_damage(P.damage, BRUTE, MELEE, 1) //Yeah no this doesn't get projectile resistance.
/obj/structure/holosign/barrier/cyborg/hacked/proc/cooldown()
shockcd = FALSE
diff --git a/code/game/objects/structures/lattice.dm b/code/game/objects/structures/lattice.dm
index 6dde2bcc132..f43c3c2c1c9 100644
--- a/code/game/objects/structures/lattice.dm
+++ b/code/game/objects/structures/lattice.dm
@@ -5,7 +5,7 @@
icon_state = "lattice"
density = FALSE
anchored = TRUE
- armor = list("melee" = 50, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 50)
+ armor = list(MELEE = 50, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 80, ACID = 50)
max_integrity = 50
layer = LATTICE_LAYER //under pipes
plane = FLOOR_PLANE
diff --git a/code/game/objects/structures/mineral_doors.dm b/code/game/objects/structures/mineral_doors.dm
index bde75bb489d..c04f10b6f04 100644
--- a/code/game/objects/structures/mineral_doors.dm
+++ b/code/game/objects/structures/mineral_doors.dm
@@ -8,7 +8,7 @@
icon = 'icons/obj/doors/mineral_doors.dmi'
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)
+ 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
diff --git a/code/game/objects/structures/railings.dm b/code/game/objects/structures/railings.dm
new file mode 100644
index 00000000000..82eb1335d10
--- /dev/null
+++ b/code/game/objects/structures/railings.dm
@@ -0,0 +1,161 @@
+/obj/structure/railing
+ name = "railing"
+ desc = "Basic railing meant to protect idiots like you from falling."
+ icon = 'icons/obj/fence.dmi'
+ icon_state = "railing"
+ density = TRUE
+ anchored = TRUE
+ pass_flags = LETPASSTHROW
+ climbable = TRUE
+ layer = ABOVE_MOB_LAYER
+ var/currently_climbed = FALSE
+ var/mover_dir = null
+
+/obj/structure/railing/corner //aesthetic corner sharp edges hurt oof ouch
+ icon_state = "railing_corner"
+ density = FALSE
+ climbable = FALSE
+
+/obj/structure/railing/attackby(obj/item/I, mob/living/user, params)
+ ..()
+ add_fingerprint(user)
+
+/obj/structure/railing/welder_act(mob/living/user, obj/item/I)
+ if(user.intent != INTENT_HELP)
+ return
+ if(obj_integrity >= max_integrity)
+ to_chat(user, "[src] is already in good condition!")
+ return
+ if(!I.tool_start_check(user, amount = 0))
+ return
+ to_chat(user, "You begin repairing [src]...")
+ if(I.use_tool(src, user, 40, volume = 50))
+ obj_integrity = max_integrity
+ to_chat(user, "You repair [src].")
+
+/obj/structure/railing/wirecutter_act(mob/living/user, obj/item/I)
+ if(anchored)
+ return
+ to_chat(user, "You cut apart the railing.")
+ I.play_tool_sound(src, 100)
+ deconstruct()
+ return TRUE
+
+/obj/structure/railing/deconstruct(disassembled)
+ if(!(flags & NODECONSTRUCT))
+ var/obj/item/stack/rods/rod = new /obj/item/stack/rods(drop_location(), 3)
+ transfer_fingerprints_to(rod)
+ return ..()
+
+///Implements behaviour that makes it possible to unanchor the railing.
+/obj/structure/railing/wrench_act(mob/living/user, obj/item/I)
+ if(flags & NODECONSTRUCT)
+ return
+ to_chat(user, "You begin to [anchored ? "unfasten the railing from":"fasten the railing to"] the floor...")
+ if(I.use_tool(src, user, volume = 75, extra_checks = CALLBACK(src, .proc/check_anchored, anchored)))
+ anchored = !anchored
+ to_chat(user, "You [anchored ? "fasten the railing to":"unfasten the railing from"] the floor.")
+ return TRUE
+
+/obj/structure/railing/corner/CanPass()
+ return TRUE
+
+/obj/structure/railing/corner/CheckExit()
+ return TRUE
+
+/obj/structure/railing/CanPass(atom/movable/mover, turf/target)
+ if(istype(mover) && mover.checkpass(PASSFENCE))
+ return TRUE
+ if(istype(mover, /obj/item/projectile))
+ return TRUE
+ if(ismob(mover))
+ var/mob/M = mover
+ if(M.flying)
+ return TRUE
+ if(mover.throwing)
+ return TRUE
+ mover_dir = get_dir(loc, target)
+ //Due to how the other check is done, it would always return density for ordinal directions no matter what
+ if(ordinal_direction_check())
+ return FALSE
+ if(mover_dir != dir)
+ return density
+ return FALSE
+
+/obj/structure/railing/CheckExit(atom/movable/O, target)
+ var/mob/living/M = O
+ if(istype(O) && O.checkpass(PASSFENCE))
+ return TRUE
+ if(istype(O, /obj/item/projectile))
+ return TRUE
+ if(ismob(O))
+ if(M.flying || M.floating)
+ return TRUE
+ if(O.throwing)
+ return TRUE
+ if(O.move_force >= MOVE_FORCE_EXTREMELY_STRONG)
+ return TRUE
+ if(currently_climbed)
+ return TRUE
+ mover_dir = get_dir(O.loc, target)
+ if(mover_dir == dir)
+ return FALSE
+ if(ordinal_direction_check())
+ return FALSE
+ return TRUE
+
+// Checks if the direction the mob is trying to move towards would be blocked by a corner railing
+/obj/structure/railing/proc/ordinal_direction_check()
+ switch(dir)
+ if(5)
+ if(mover_dir == 1 || mover_dir == 4)
+ return TRUE
+ if(6)
+ if(mover_dir == 2 || mover_dir == 4)
+ return TRUE
+ if(9)
+ if(mover_dir == 1 || mover_dir == 8)
+ return TRUE
+ if(10)
+ if(mover_dir == 2 || mover_dir == 8)
+ return TRUE
+ return FALSE
+
+/obj/structure/railing/do_climb(mob/living/user)
+ var/initial_mob_loc = get_turf(user)
+ . = ..()
+ if(.)
+ currently_climbed = TRUE
+ if(initial_mob_loc != get_turf(src)) // If we are on the railing, we want to move in the same dir as the railing. Otherwise we get put on the railing
+ currently_climbed = FALSE
+ return
+ user.Move(get_step(user, dir), TRUE)
+ currently_climbed = FALSE
+
+/obj/structure/railing/proc/can_be_rotated(mob/user)
+ if(anchored)
+ to_chat(user, "[src] cannot be rotated while it is fastened to the floor!")
+ return FALSE
+
+ var/target_dir = turn(dir, -45)
+
+ if(!valid_window_location(loc, target_dir)) //Expanded to include rails, as well!
+ to_chat(user, "[src] cannot be rotated in that direction!")
+ return FALSE
+ return TRUE
+
+/obj/structure/railing/proc/check_anchored(checked_anchored)
+ if(anchored == checked_anchored)
+ return TRUE
+
+/obj/structure/railing/proc/after_rotation(mob/user)
+ add_fingerprint(user)
+
+/obj/structure/railing/AltClick(mob/user)
+ if(user.incapacitated())
+ to_chat(user, "You can't do that right now!")
+ return
+ if(!Adjacent(user))
+ return
+ if(can_be_rotated(user))
+ setDir(turn(dir, 45))
diff --git a/code/game/objects/structures/safe.dm b/code/game/objects/structures/safe.dm
index 4266d6ef254..36f33388f50 100644
--- a/code/game/objects/structures/safe.dm
+++ b/code/game/objects/structures/safe.dm
@@ -175,6 +175,8 @@ GLOBAL_LIST_EMPTY(safes)
/obj/structure/safe/attackby(obj/item/I, mob/user, params)
if(open)
+ if(I.flags && ABSTRACT)
+ return
if(broken && istype(I, /obj/item/safe_internals) && do_after(user, 2 SECONDS, target = src))
to_chat(user, "You replace the broken mechanism.")
qdel(I)
@@ -368,7 +370,8 @@ GLOBAL_LIST_EMPTY(safes)
/obj/structure/safe/floor/Initialize()
. = ..()
var/turf/T = loc
- hide(T.intact)
+ if(!T.transparent_floor)
+ hide(T.intact)
/obj/structure/safe/floor/hide(intact)
invisibility = intact ? INVISIBILITY_MAXIMUM : 0
diff --git a/code/game/objects/structures/signs.dm b/code/game/objects/structures/signs.dm
index 896ed8e5134..e54e58bd893 100644
--- a/code/game/objects/structures/signs.dm
+++ b/code/game/objects/structures/signs.dm
@@ -5,7 +5,7 @@
density = 0
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)
+ 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)
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 1a162c250fa..8c0dd7ef830 100644
--- a/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm
+++ b/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm
@@ -4,6 +4,7 @@
item_chair = null
anchored = FALSE
movable = TRUE
+ buildstackamount = 15
var/move_delay = null
@@ -75,7 +76,7 @@
if(!has_buckled_mobs())
return
var/mob/living/buckled_mob = buckled_mobs[1]
- if(istype(A, /obj/machinery/door))
+ if(istype(A, /obj/machinery/door) || istype(A, /obj/machinery/gateway))
A.Bumped(buckled_mob)
if(propelled)
diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm
index f6562d44c1f..2810e9d21e3 100644
--- a/code/game/objects/structures/tables_racks.dm
+++ b/code/game/objects/structures/tables_racks.dm
@@ -389,7 +389,7 @@
canSmoothWith = null
max_integrity = 70
resistance_flags = ACID_PROOF
- armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 100)
+ 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/Initialize(mapload)
@@ -530,7 +530,7 @@
canSmoothWith = list(/obj/structure/table/reinforced, /obj/structure/table)
max_integrity = 200
integrity_failure = 50
- armor = list("melee" = 10, "bullet" = 30, "laser" = 30, "energy" = 100, "bomb" = 20, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 70)
+ armor = list(MELEE = 10, BULLET = 30, LASER = 30, ENERGY = 100, BOMB = 20, BIO = 0, RAD = 0, FIRE = 80, ACID = 70)
/obj/structure/table/reinforced/deconstruction_hints(mob/user)
if(deconstruction_ready)
@@ -708,7 +708,7 @@
user.do_attack_animation(src, ATTACK_EFFECT_KICK)
user.visible_message("[user] kicks [src].", \
"You kick [src].")
- take_damage(rand(4,8), BRUTE, "melee", 1)
+ take_damage(rand(4,8), BRUTE, MELEE, 1)
/obj/structure/rack/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0)
switch(damage_type)
diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm
index a2d13ad8afb..3da55a8f17e 100644
--- a/code/game/objects/structures/window.dm
+++ b/code/game/objects/structures/window.dm
@@ -11,7 +11,7 @@
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)
+ 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
@@ -27,6 +27,8 @@
var/real_explosion_block //ignore this, just use explosion_block
var/breaksound = "shatter"
var/hitsound = 'sound/effects/Glasshit.ogg'
+ /// Used to restore colours from polarised glass
+ var/old_color
/obj/structure/window/examine(mob/user)
. = ..()
@@ -69,6 +71,17 @@
air_update_turf(TRUE)
+/obj/structure/window/proc/toggle_polarization()
+ if(opacity)
+ if(!old_color)
+ old_color = "#FFFFFF"
+ animate(src, color = old_color, time = 0.5 SECONDS)
+ set_opacity(FALSE)
+ else
+ old_color = color
+ animate(src, color = "#222222", time = 0.5 SECONDS)
+ set_opacity(TRUE)
+
/obj/structure/window/narsie_act()
color = NARSIE_WINDOW_COLOUR
@@ -474,7 +487,7 @@
icon_state = "rwindow"
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)
+ 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
@@ -495,16 +508,9 @@
/obj/structure/window/reinforced/polarized
name = "electrochromic window"
desc = "Adjusts its tint with voltage. Might take a few good hits to shatter it."
+ glass_amount = 2
var/id
-/obj/structure/window/reinforced/polarized/proc/toggle()
- if(opacity)
- animate(src, color="#FFFFFF", time=5)
- set_opacity(0)
- else
- animate(src, color="#222222", time=5)
- set_opacity(1)
-
/obj/machinery/button/windowtint
name = "window tint control"
icon = 'icons/obj/power.dmi'
@@ -514,12 +520,35 @@
var/id = 0
var/active = 0
+/obj/machinery/button/windowtint/Initialize(mapload, w_dir = null)
+ . = ..()
+ switch(w_dir)
+ if(NORTH)
+ pixel_y = 25
+ if(SOUTH)
+ pixel_y = -25
+ if(EAST)
+ pixel_x = 25
+ if(WEST)
+ pixel_x = -25
+
/obj/machinery/button/windowtint/attack_hand(mob/user)
if(..())
- return 1
+ return TRUE
toggle_tint()
+/obj/machinery/button/windowtint/wrench_act(mob/user, obj/item/I)
+ . = TRUE
+ if(!I.tool_use_check(user, 0))
+ return
+ user.visible_message("[user] starts unwrenching [src] from the wall...", "You are unwrenching [src] from the wall...", "You hear ratcheting.")
+ if(!I.use_tool(src, user, 50, volume = I.tool_volume))
+ return
+ WRENCH_UNANCHOR_WALL_MESSAGE
+ new /obj/item/mounted/frame/light_switch/windowtint(get_turf(src))
+ qdel(src)
+
/obj/machinery/button/windowtint/proc/toggle_tint()
use_power(5)
@@ -528,9 +557,11 @@
for(var/obj/structure/window/reinforced/polarized/W in range(src,range))
if(W.id == src.id || !W.id)
- spawn(0)
- W.toggle()
- return
+ W.toggle_polarization()
+
+ for(var/obj/structure/window/full/reinforced/polarized/W in range(src, range))
+ if(W.id == id || !W.id)
+ W.toggle_polarization()
/obj/machinery/button/windowtint/power_change()
..()
@@ -550,7 +581,7 @@
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)
+ 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()
@@ -566,7 +597,7 @@
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)
+ 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
@@ -589,7 +620,7 @@
icon_state = "window"
max_integrity = 50
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)
+ canSmoothWith = list(/obj/structure/window/full/basic, /obj/structure/window/full/reinforced, /obj/structure/window/full/reinforced/polarized, /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"
@@ -602,9 +633,9 @@
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, /turf/simulated/wall/indestructible/fakeglass)
+ canSmoothWith = list(/obj/structure/window/full/basic, /obj/structure/window/full/reinforced, /obj/structure/window/full/reinforced/polarized, /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)
+ 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
@@ -616,11 +647,11 @@
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)
+ canSmoothWith = list(/obj/structure/window/full/basic, /obj/structure/window/full/reinforced, /obj/structure/window/full/reinforced/polarized, /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)
+ 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)
@@ -632,15 +663,21 @@
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, /turf/simulated/wall/indestructible/fakeglass)
+ canSmoothWith = list(/obj/structure/window/full/basic, /obj/structure/window/full/reinforced, /obj/structure/window/full/reinforced/polarized, /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)
+ 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
+/obj/structure/window/full/reinforced/polarized
+ name = "electrochromic window"
+ desc = "Adjusts its tint with voltage. Might take a few good hits to shatter it."
+ glass_amount = 4
+ var/id
+
/obj/structure/window/full/reinforced/tinted
name = "tinted window"
desc = "It looks rather strong and opaque. Might take a few good hits to shatter it."
@@ -662,7 +699,7 @@
reinf = TRUE
heat_resistance = 1600
explosion_block = 3
- armor = list("melee" = 50, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 50, "bio" = 100, "rad" = 100, "fire" = 80, "acid" = 100)
+ armor = list(MELEE = 50, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 50, BIO = 100, RAD = 100, FIRE = 80, ACID = 100)
smooth = SMOOTH_TRUE
canSmoothWith = null
glass_type = /obj/item/stack/sheet/titaniumglass
@@ -681,7 +718,7 @@
max_integrity = 100
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)
+ 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
@@ -696,7 +733,7 @@
icon_state = "clockwork_window_single"
resistance_flags = FIRE_PROOF | ACID_PROOF
max_integrity = 80
- armor = list("melee" = 60, "bullet" = 25, "laser" = 0, "energy" = 0, "bomb" = 25, "bio" = 100, "rad" = 100, "fire" = 80, "acid" = 100)
+ armor = list(MELEE = 60, BULLET = 25, LASER = 0, ENERGY = 0, BOMB = 25, BIO = 100, RAD = 100, FIRE = 80, ACID = 100)
explosion_block = 2 //fancy AND hard to destroy. the most useful combination.
glass_type = /obj/item/stack/tile/brass
reinf = FALSE
diff --git a/code/game/turfs/simulated/floor.dm b/code/game/turfs/simulated/floor.dm
index 24fcba648f2..8f8e94362b7 100644
--- a/code/game/turfs/simulated/floor.dm
+++ b/code/game/turfs/simulated/floor.dm
@@ -27,6 +27,7 @@ GLOBAL_LIST_INIT(icons_to_ignore_at_floor_init, list("damaged1","damaged2","dama
var/list/broken_states = list("damaged1", "damaged2", "damaged3", "damaged4", "damaged5")
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/keep_dir = TRUE //When false, resets dir to default on changeturf()
var/footstep = FOOTSTEP_FLOOR
var/barefootstep = FOOTSTEP_HARD_BAREFOOT
@@ -124,11 +125,18 @@ GLOBAL_LIST_INIT(icons_to_ignore_at_floor_init, list("damaged1","damaged2","dama
var/turf/simulated/floor/W = ..()
+ var/obj/machinery/atmospherics/R
+
if(keep_icon)
W.icon_regular_floor = old_icon
W.icon_plating = old_plating
+ if(W.keep_dir)
W.dir = old_dir
-
+ if(W.transparent_floor)
+ for(R in W)
+ R.update_icon()
+ for(R in W)
+ R.update_underlays()
W.update_icon()
return W
diff --git a/code/game/turfs/simulated/floor/fancy_floor.dm b/code/game/turfs/simulated/floor/fancy_floor.dm
index 0b8938fc204..86a1e119dad 100644
--- a/code/game/turfs/simulated/floor/fancy_floor.dm
+++ b/code/game/turfs/simulated/floor/fancy_floor.dm
@@ -68,6 +68,9 @@
playsound(src, 'sound/effects/shovel_dig.ogg', 50, 1)
make_plating()
+
+//Carpets
+
/turf/simulated/floor/carpet
name = "carpet"
icon = 'icons/turf/floors/carpet.dmi'
@@ -112,6 +115,48 @@
floor_tile = /obj/item/stack/tile/carpet/black
canSmoothWith = list(/turf/simulated/floor/carpet/black)
+/turf/simulated/floor/carpet/blue
+ icon = 'icons/turf/floors/carpet_blue.dmi'
+ floor_tile = /obj/item/stack/tile/carpet/blue
+ canSmoothWith = list(/turf/simulated/floor/carpet/blue)
+
+/turf/simulated/floor/carpet/cyan
+ icon = 'icons/turf/floors/carpet_cyan.dmi'
+ floor_tile = /obj/item/stack/tile/carpet/cyan
+ canSmoothWith = list(/turf/simulated/floor/carpet/cyan)
+
+/turf/simulated/floor/carpet/green
+ icon = 'icons/turf/floors/carpet_green.dmi'
+ floor_tile = /obj/item/stack/tile/carpet/green
+ canSmoothWith = list(/turf/simulated/floor/carpet/green)
+
+/turf/simulated/floor/carpet/orange
+ icon = 'icons/turf/floors/carpet_orange.dmi'
+ floor_tile = /obj/item/stack/tile/carpet/orange
+ canSmoothWith = list(/turf/simulated/floor/carpet/orange)
+
+/turf/simulated/floor/carpet/purple
+ icon = 'icons/turf/floors/carpet_purple.dmi'
+ floor_tile = /obj/item/stack/tile/carpet/purple
+ canSmoothWith = list(/turf/simulated/floor/carpet/purple)
+
+/turf/simulated/floor/carpet/red
+ icon = 'icons/turf/floors/carpet_red.dmi'
+ floor_tile = /obj/item/stack/tile/carpet/red
+ canSmoothWith = list(/turf/simulated/floor/carpet/red)
+
+/turf/simulated/floor/carpet/royalblack
+ icon = 'icons/turf/floors/carpet_royalblack.dmi'
+ floor_tile = /obj/item/stack/tile/carpet/royalblack
+ canSmoothWith = list(/turf/simulated/floor/carpet/royalblack)
+
+/turf/simulated/floor/carpet/royalblue
+ icon = 'icons/turf/floors/carpet_royalblue.dmi'
+ floor_tile = /obj/item/stack/tile/carpet/royalblue
+ canSmoothWith = list(/turf/simulated/floor/carpet/royalblue)
+
+//End of carpets
+
/turf/simulated/floor/fakespace
icon = 'icons/turf/space.dmi'
icon_state = "0"
diff --git a/code/game/turfs/simulated/floor/lava.dm b/code/game/turfs/simulated/floor/lava.dm
index 29485f4a808..4d5a64e95b7 100644
--- a/code/game/turfs/simulated/floor/lava.dm
+++ b/code/game/turfs/simulated/floor/lava.dm
@@ -81,7 +81,7 @@
O.resistance_flags |= FLAMMABLE //Even fireproof things burn up in lava
if(O.resistance_flags & FIRE_PROOF)
O.resistance_flags &= ~FIRE_PROOF
- if(O.armor.getRating("fire") > 50) //obj with 100% fire armor still get slowly burned away.
+ if(O.armor.getRating(FIRE) > 50) //obj with 100% fire armor still get slowly burned away.
O.armor = O.armor.setRating(fire_value = 50)
O.fire_act(10000, 1000)
diff --git a/code/game/turfs/simulated/floor/plating.dm b/code/game/turfs/simulated/floor/plating.dm
index d0805cf5099..ad26fa8919e 100644
--- a/code/game/turfs/simulated/floor/plating.dm
+++ b/code/game/turfs/simulated/floor/plating.dm
@@ -70,6 +70,35 @@
to_chat(user, "This section is too damaged to support a tile! Use a welder to fix the damage.")
return TRUE
+ else if(is_glass_sheet(C))
+ if(broken || burnt)
+ to_chat(user, "Repair the plating first!")
+ return TRUE
+ var/obj/item/stack/sheet/R = C
+ if(R.get_amount() < 2)
+ to_chat(user, "You need two sheets to build a [C.name] floor!")
+ return TRUE
+ to_chat(user, "You begin swapping the plating for [C]...")
+ if(do_after(user, 3 SECONDS * C.toolspeed, target = src))
+ if(R.get_amount() >= 2 && !transparent_floor)
+ if(istype(C, /obj/item/stack/sheet/plasmaglass)) //So, what type of glass floor do we want today?
+ ChangeTurf(/turf/simulated/floor/transparent/glass/plasma)
+ else if(istype(C, /obj/item/stack/sheet/plasmarglass))
+ ChangeTurf(/turf/simulated/floor/transparent/glass/reinforced/plasma)
+ else if(istype(C, /obj/item/stack/sheet/glass))
+ ChangeTurf(/turf/simulated/floor/transparent/glass)
+ else if(istype(C, /obj/item/stack/sheet/rglass))
+ ChangeTurf(/turf/simulated/floor/transparent/glass/reinforced)
+ else if(istype(C, /obj/item/stack/sheet/titaniumglass))
+ ChangeTurf(/turf/simulated/floor/transparent/glass/titanium)
+ else if(istype(C, /obj/item/stack/sheet/plastitaniumglass))
+ ChangeTurf(/turf/simulated/floor/transparent/glass/titanium/plasma)
+ playsound(src, C.usesound, 80, TRUE)
+ R.use(2)
+ to_chat(user, "You swap the plating for [C].")
+ new /obj/item/stack/sheet/metal(src, 2)
+ return TRUE
+
/turf/simulated/floor/plating/screwdriver_act(mob/user, obj/item/I)
. = TRUE
if(!I.tool_use_check(user, 0))
diff --git a/code/game/turfs/simulated/floor/transparent.dm b/code/game/turfs/simulated/floor/transparent.dm
new file mode 100644
index 00000000000..81030c4d294
--- /dev/null
+++ b/code/game/turfs/simulated/floor/transparent.dm
@@ -0,0 +1,112 @@
+/turf/simulated/floor/transparent/glass
+ name = "glass floor"
+ desc = "Don't jump on it... Or do, I'm not your mom."
+ icon = 'icons/turf/floors/glass.dmi'
+ icon_state = "unsmooth"
+ baseturf = /turf/space
+ smooth = SMOOTH_TRUE
+ canSmoothWith = list(/turf/simulated/floor/transparent/glass, /turf/simulated/floor/transparent/glass/reinforced, /turf/simulated/floor/transparent/glass/plasma, /turf/simulated/floor/transparent/glass/reinforced/plasma)
+ footstep = FOOTSTEP_GLASS
+ barefootstep = FOOTSTEP_GLASS_BAREFOOT
+ clawfootstep = FOOTSTEP_GLASS_BAREFOOT
+ heavyfootstep = FOOTSTEP_GLASS_BAREFOOT
+ light_power = 0.25
+ light_range = 2
+ layer = TRANSPARENT_TURF_LAYER
+ keep_dir = FALSE
+ intact = FALSE
+ transparent_floor = TRUE
+ heat_capacity = 800
+
+/turf/simulated/floor/transparent/glass/Initialize(mapload)
+ . = ..()
+ var/image/I = image('icons/turf/space.dmi', src, SPACE_ICON_STATE)
+ I.plane = PLANE_SPACE
+ underlays += I
+ dir = SOUTH //dirs that are not 2/south cause smoothing jank
+ icon_state = "" //Prevents default icon appearing behind the glass
+
+/turf/simulated/floor/transparent/glass/welder_act(mob/user, obj/item/I)
+ if(!broken && !burnt)
+ return
+ if(!I.tool_use_check(user, 0))
+ return
+ if(I.use_tool(src, user, volume = I.tool_volume))
+ to_chat(user, "You fix some cracks in the glass.")
+ overlays -= current_overlay
+ current_overlay = null
+ burnt = FALSE
+ broken = FALSE
+ update_icon()
+
+/turf/simulated/floor/transparent/glass/crowbar_act(mob/user, obj/item/I)
+ if(!I || !user)
+ return
+ var/obj/item/stack/R = user.get_inactive_hand()
+ if(istype(R, /obj/item/stack/sheet/metal))
+ if(R.get_amount() < 2) //not enough metal in the stack
+ to_chat(user, "You also need to hold two sheets of metal to dismantle [src]!")
+ return
+ else
+ to_chat(user, "You begin replacing [src]...")
+ playsound(src, I.usesound, 80, TRUE)
+ if(do_after(user, 3 SECONDS * I.toolspeed, target = src))
+ if(R.get_amount() < 2 || !transparent_floor)
+ return
+ else //not holding metal at all
+ to_chat(user, "You also need to hold two sheets of metal to dismantle \the [src]!")
+ return
+ switch(type) //What material is returned? Depends on the turf
+ if(/turf/simulated/floor/transparent/glass/reinforced)
+ new /obj/item/stack/sheet/rglass(src, 2)
+ if(/turf/simulated/floor/transparent/glass)
+ new /obj/item/stack/sheet/glass(src, 2)
+ if(/turf/simulated/floor/transparent/glass/plasma)
+ new /obj/item/stack/sheet/plasmaglass(src, 2)
+ if(/turf/simulated/floor/transparent/glass/reinforced/plasma)
+ new /obj/item/stack/sheet/plasmarglass(src, 2)
+ if(/turf/simulated/floor/transparent/glass/titanium)
+ new /obj/item/stack/sheet/titaniumglass(src, 2)
+ if(/turf/simulated/floor/transparent/glass/titanium/plasma)
+ new /obj/item/stack/sheet/plastitaniumglass(src, 2)
+ R.use(2)
+ playsound(src, 'sound/items/deconstruct.ogg', 80, TRUE)
+ ChangeTurf(/turf/simulated/floor/plating)
+
+
+/turf/simulated/floor/transparent/glass/reinforced
+ name = "reinforced glass floor"
+ desc = "Jump on it, it can cope. Promise..."
+ icon = 'icons/turf/floors/reinf_glass.dmi'
+ thermal_conductivity = 0.035
+ heat_capacity = 1600
+
+/turf/simulated/floor/transparent/glass/reinforced/acid_act(acidpwr, acid_volume)
+ acidpwr = min(acidpwr, 50)
+ . = ..()
+
+/turf/simulated/floor/transparent/glass/plasma
+ name = "plasma glass floor"
+ desc = "Wait, was space always that color?"
+ icon = 'icons/turf/floors/plasmaglass.dmi'
+ thermal_conductivity = 0.030
+ heat_capacity = 32000
+
+/turf/simulated/floor/transparent/glass/reinforced/plasma
+ name = "reinforced plasma glass floor"
+ desc = "For when you REALLY don't want your floor choice to suffocate everyone."
+ icon = 'icons/turf/floors/reinf_plasmaglass.dmi'
+ thermal_conductivity = 0.025
+ heat_capacity = 325000
+
+/turf/simulated/floor/transparent/glass/titanium
+ name = "titanium glass floor"
+ desc = "Stylish AND strong!"
+ icon = 'icons/turf/floors/titaniumglass.dmi'
+ canSmoothWith = list(/turf/simulated/floor/transparent/glass/titanium, /turf/simulated/floor/transparent/glass/titanium/plasma)
+ thermal_conductivity = 0.025
+ heat_capacity = 1600
+
+/turf/simulated/floor/transparent/glass/titanium/plasma
+ name = "plastitanium glass floor"
+ icon = 'icons/turf/floors/plastitaniumglass.dmi'
diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm
index 938e2f8a851..a602a49d6e2 100644
--- a/code/game/turfs/turf.dm
+++ b/code/game/turfs/turf.dm
@@ -6,6 +6,7 @@
var/intact = TRUE
var/turf/baseturf = /turf/space
var/slowdown = 0 //negative for faster, positive for slower
+ var/transparent_floor = FALSE //used to check if pipes should be visible under the turf or not
///Properties for open tiles (/floor)
/// All the gas vars, on the turf, are meant to be utilized for initializing a gas datum and setting its first gas values; the turf vars are never further modified at runtime; it is never directly used for calculations by the atmospherics system.
@@ -283,10 +284,10 @@
var/asleep = 0
var/ab = 0
var/atemp = 0
+
var/turf_count = 0
- for(var/direction in GLOB.cardinal)//Only use cardinals to cut down on lag
- var/turf/T = get_step(src, direction)
+ for(var/turf/T in atmos_adjacent_turfs)
if(istype(T, /turf/space))//Counted as no air
turf_count++//Considered a valid turf for air calcs
continue
diff --git a/code/game/verbs/ooc.dm b/code/game/verbs/ooc.dm
index 458f06e9c19..162e1ebd26e 100644
--- a/code/game/verbs/ooc.dm
+++ b/code/game/verbs/ooc.dm
@@ -25,7 +25,7 @@ GLOBAL_VAR_INIT(admin_ooc_colour, "#b82e00")
if(!GLOB.dooc_enabled && (mob.stat == DEAD))
to_chat(usr, "OOC for dead mobs has been turned off.")
return
- if(prefs.muted & MUTE_OOC)
+ if(check_mute(ckey, MUTE_OOC))
to_chat(src, "You cannot use OOC (muted).")
return
@@ -181,7 +181,7 @@ GLOBAL_VAR_INIT(admin_ooc_colour, "#b82e00")
if(!GLOB.dooc_enabled && (mob.stat == DEAD))
to_chat(usr, "LOOC for dead mobs has been turned off.")
return
- if(prefs.muted & MUTE_OOC)
+ if(check_mute(ckey, MUTE_OOC))
to_chat(src, "You cannot use LOOC (muted).")
return
diff --git a/code/game/verbs/switch_server.dm b/code/game/verbs/switch_server.dm
new file mode 100644
index 00000000000..6fc07b8f684
--- /dev/null
+++ b/code/game/verbs/switch_server.dm
@@ -0,0 +1,49 @@
+/client/verb/switch_server()
+ set name = "Switch Server"
+ set desc = "Switch to a different Paradise server"
+ set category = "OOC"
+
+ // First get our peers
+ var/datum/db_query/dbq1 = SSdbcore.NewQuery({"
+ SELECT server_id, key_name, key_value FROM instance_data_cache WHERE server_id IN
+ (SELECT server_id FROM instance_data_cache WHERE
+ key_name='heartbeat' AND last_updated BETWEEN NOW() - INTERVAL 60 SECOND AND NOW())
+ AND key_name IN ("playercount", "server_port", "server_name")"})
+ if(!dbq1.warn_execute())
+ qdel(dbq1)
+ return
+
+ var/servers_outer = list()
+ while(dbq1.NextRow())
+ if(!servers_outer[dbq1.item[1]])
+ servers_outer[dbq1.item[1]] = list()
+
+ servers_outer[dbq1.item[1]][dbq1.item[2]] = dbq1.item[3] // This should assoc load our data
+
+ // Format the server names into an assoc list of K: name V: port
+ var/list/formatted_servers = list()
+ for(var/server in servers_outer)
+ var/server_data = servers_outer[server]
+ formatted_servers["[server_data["server_name"]] - ([server_data["playercount"]] playing)"] = text2num(server_data["server_port"])
+
+ if(length(formatted_servers) == 1)
+ to_chat(usr, "You are already connected to the one online instance!")
+ return
+
+ var/selected_server = input(usr, "Select a server", "Server hop") as anything in formatted_servers
+ if(!selected_server)
+ return // Should never happen
+
+ if(formatted_servers[selected_server] == world.port)
+ to_chat(usr, "You are already connected to this instance!")
+ return
+
+ // Now we reconnect them
+ to_chat(usr, "Now connecting you to: [selected_server]")
+
+ if(watchlisted) // I mean why not
+ message_admins("[key_name_admin(usr)] is on the watchlist and just jumped to [selected_server]")
+
+ // Formulate a connection URL
+ var/target = "byond://[world.internet_address]:[formatted_servers[selected_server]]"
+ src << link(target)
diff --git a/code/game/verbs/webmap.dm b/code/game/verbs/webmap.dm
new file mode 100644
index 00000000000..714b501e808
--- /dev/null
+++ b/code/game/verbs/webmap.dm
@@ -0,0 +1,12 @@
+/client/verb/webmap()
+ set name = "webmap"
+ set hidden = TRUE
+
+ if(!SSmapping.map_datum.webmap_url)
+ to_chat(usr, "The current map has no defined webmap. Please file an issue report.")
+ return
+
+ if(alert(usr, "Do you want to open this map's Webmap in your browser?", "Webmap", "Yes", "No") != "Yes")
+ return
+
+ usr << link(SSmapping.map_datum.webmap_url)
diff --git a/code/game/world.dm b/code/game/world.dm
index a2c5dfa746a..e8d048c2d4e 100644
--- a/code/game/world.dm
+++ b/code/game/world.dm
@@ -22,11 +22,15 @@ GLOBAL_LIST_INIT(map_transition_config, list(CC_TRANSITION_CONFIG))
//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"
- GLOB.configuration.load_configuration()
+ GLOB.configuration.load_configuration() // Load up the base config.toml
+ // Load up overrides for this specific instance, based on port
+ // If this instance is listening on port 6666, the server will look for config/overrides_6666.toml
+ GLOB.configuration.load_overrides()
// 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!
SSdbcore.SetRoundID() // Set the round ID here
+ SSinstancing.seed_data() // Set us up in the DB
// Setup all log paths and stamp them with startups, including round IDs
SetupLogs()
diff --git a/code/modules/admin/IsBanned.dm b/code/modules/admin/IsBanned.dm
index aadb658470f..9e04eb3c8ba 100644
--- a/code/modules/admin/IsBanned.dm
+++ b/code/modules/admin/IsBanned.dm
@@ -27,6 +27,12 @@
if(A && (A.rights & R_ADMIN))
admin = 1
+ // Lets see if they are logged in on another paradise server
+ if(SSdbcore.IsConnected())
+ var/other_server_login = SSinstancing.check_player(ckey)
+ if(other_server_login)
+ return list("reason"="duplicate login", "desc"="\nReason: You are already logged in on server '[other_server_login]'. Please contact the server host if you believe this is an error.")
+
//Guest Checking
if(GLOB.configuration.general.guest_ban && IsGuestKey(key))
log_adminwarn("Failed Login: [key] [computer_id] [address] - Guests not allowed")
diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index 85d4be92516..794ca47df46 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -13,12 +13,8 @@ GLOBAL_VAR_INIT(nologevent, 0)
if(!GLOB.nologevent)
var/rendered = "ATTACK: "
for(var/client/C in GLOB.admins)
- if(R_ADMIN & C.holder.rights)
- if(C.prefs.atklog == ATKLOG_NONE)
- continue
- var/msg = rendered
- if(C.prefs.atklog <= loglevel)
- to_chat(C, msg)
+ if((C.holder.rights & R_ADMIN) && (C.prefs?.atklog <= loglevel))
+ to_chat(C, rendered)
/**
* Sends a message to the staff able to see admin tickets
@@ -122,7 +118,6 @@ GLOBAL_VAR_INIT(nologevent, 0)
if(M.ckey)
body += "Kick | "
- body += "Warn | "
body += "Ban | "
body += "Jobban | "
body += "Appearance Ban | "
@@ -131,7 +126,7 @@ GLOBAL_VAR_INIT(nologevent, 0)
if(GLOB.configuration.url.forum_playerinfo_url)
body += "WebInfo | "
if(M.client)
- if(check_watchlist(M.client.ckey))
+ if(M.client.watchlisted)
body += "Remove from Watchlist | "
body += "Edit Watchlist Reason "
else
@@ -141,14 +136,13 @@ GLOBAL_VAR_INIT(nologevent, 0)
body += "\ Send back to Lobby | "
body += "\ Erase Flavor Text | "
body += "\ Use Random Name | "
- var/muted = M.client.prefs.muted
body += {"
Mute:
- \[IC |
- OOC |
- PRAY |
- ADMINHELP |
- DEADCHAT\]
- (toggle all)
+ \[IC |
+ OOC |
+ PRAY |
+ ADMINHELP |
+ DEADCHAT]
+ (toggle all)
"}
var/jumptoeye = ""
@@ -626,43 +620,88 @@ GLOBAL_VAR_INIT(nologevent, 0)
////////////////////////////////////////////////////////////////////////////////////////////////ADMIN HELPER PROCS
-/proc/is_special_character(mob/M as mob) // returns 1 for specail characters and 2 for heroes of gamemode
- if(!SSticker || !SSticker.mode)
- return 0
+/**
+ * A proc that return whether the mob is a "Special Character" aka Antagonist
+ *
+ * Arguments:
+ * * M - the mob you're checking
+ */
+/proc/is_special_character(mob/M)
+ if(!SSticker.mode)
+ return FALSE
if(!istype(M))
- return 0
- if((M.mind in SSticker.mode.head_revolutionaries) || (M.mind in SSticker.mode.revolutionaries))
- if(SSticker.mode.config_tag == "revolution")
- return 2
- return 1
- if(M.mind in SSticker.mode.cult)
- if(SSticker.mode.config_tag == "cult")
- return 2
- return 1
- if(M.mind in SSticker.mode.syndicates)
- if(SSticker.mode.config_tag == "nuclear")
- return 2
- return 1
- if(M.mind in SSticker.mode.wizards)
- if(SSticker.mode.config_tag == "wizard")
- return 2
- return 1
- if(M.mind in SSticker.mode.changelings)
- if(SSticker.mode.config_tag == "changeling")
- return 2
- return 1
- if(M.mind in SSticker.mode.abductors)
- if(SSticker.mode.config_tag == "abduction")
- return 2
- return 1
+ return FALSE
if(isrobot(M))
var/mob/living/silicon/robot/R = M
if(R.emagged)
- return 1
- if(M.mind&&M.mind.special_role)//If they have a mind and special role, they are some type of traitor or antagonist.
- return 1
+ return TRUE
+ if(M.mind?.special_role)//If they have a mind and special role, they are some type of traitor or antagonist.
+ return TRUE
+ return FALSE
- return 0
+/**
+ * A proc that return an array of capitalized strings containing name of the antag types they are
+ *
+ * Arguments:
+ * * M - the mob you're checking
+ */
+/proc/get_antag_type_strings_list(mob/M) // return an array of all the antag types they are with name
+ var/list/antag_list = list()
+
+ if(!SSticker.mode || !istype(M) || !M.mind)
+ return FALSE
+
+ if(M.mind in SSticker.mode.head_revolutionaries)
+ antag_list += "Head Rev"
+ if(M.mind in SSticker.mode.revolutionaries)
+ antag_list += "Revolutionary"
+ if(M.mind in SSticker.mode.cult)
+ antag_list += "Cultist"
+ if(M.mind in SSticker.mode.syndicates)
+ antag_list += "Nuclear Operative"
+ if(M.mind in SSticker.mode.wizards)
+ antag_list += "Wizard"
+ if(M.mind in SSticker.mode.changelings)
+ antag_list += "Changeling"
+ if(M.mind in SSticker.mode.abductors)
+ antag_list += "Abductor"
+ if(M.mind in SSticker.mode.vampires)
+ antag_list += "Vampire"
+ if(M.mind in SSticker.mode.vampire_enthralled)
+ antag_list += "Vampire Thrall"
+ if(M.mind in SSticker.mode.shadows)
+ antag_list += "Shadowling"
+ if(M.mind in SSticker.mode.shadowling_thralls)
+ antag_list += "Shadowling Thrall"
+ if(M.mind.has_antag_datum(/datum/antagonist/traitor))
+ antag_list += "Traitor"
+ if(M.mind.has_antag_datum(/datum/antagonist/mindslave))
+ antag_list += "Mindslave"
+ if(isrobot(M))
+ var/mob/living/silicon/robot/R = M
+ if(R.emagged)
+ antag_list += "Emagged Borg"
+ if(!length(antag_list) && M.mind.special_role) // Snowflake check. If none of the above but still special, then other antag. Technically not accurate.
+ antag_list += "Other Antag(s)"
+ return antag_list
+
+/**
+ * A proc that return a string containing all the singled out antags . Empty string if not antag
+ *
+ * Usually, you'd return a FALSE, but since this is consumed by javascript you're in
+ * for a world of hurt if you pass a byond FALSE which get converted into a fucking string anyway and pass for TRUE in check. Fuck.
+ * It always append "(May be other antag)"
+ * Arguments:
+ * * M - the mob you're checking
+ * *
+ */
+/proc/get_antag_type_truncated_plaintext_string(mob/M as mob)
+ var/list/antag_list = get_antag_type_strings_list(M)
+
+ if(length(antag_list))
+ return antag_list.Join(" & ") + " " + "(May be other antag)"
+
+ return ""
/datum/admins/proc/spawn_atom(object as text)
set category = "Debug"
diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm
index de44ccd4788..c4b14311986 100644
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -45,6 +45,7 @@ GLOBAL_LIST_INIT(admin_verbs_admin, list(
/datum/admins/proc/toggleemoji, /*toggles using emoji in ooc for everyone*/
/client/proc/game_panel, /*game panel, allows to change game-mode etc*/
/client/proc/cmd_admin_say, /*admin-only ooc chat*/
+ /client/proc/gsay, /*cross-server asay*/
/datum/admins/proc/PlayerNotes,
/client/proc/cmd_mentor_say,
/datum/admins/proc/show_player_notes,
@@ -67,7 +68,8 @@ GLOBAL_LIST_INIT(admin_verbs_admin, list(
/client/proc/toggle_mentor_chat,
/client/proc/toggle_advanced_interaction, /*toggle admin ability to interact with not only machines, but also atoms such as buttons and doors*/
/client/proc/list_ssds_afks,
- /client/proc/ccbdb_lookup_ckey
+ /client/proc/ccbdb_lookup_ckey,
+ /client/proc/view_instances
))
GLOBAL_LIST_INIT(admin_verbs_ban, list(
/client/proc/ban_panel,
@@ -362,17 +364,20 @@ GLOBAL_LIST_INIT(admin_verbs_ticket, list(
if(!check_rights(R_ADMIN))
return
+ if(!isliving(mob))
+ return
- if(mob)
- if(mob.invisibility == INVISIBILITY_OBSERVER)
- mob.invisibility = initial(mob.invisibility)
- to_chat(mob, "Invisimin off. Invisibility reset.")
- mob.add_to_all_human_data_huds()
- //TODO: Make some kind of indication for the badmin that they are currently invisible
- else
- mob.invisibility = INVISIBILITY_OBSERVER
- to_chat(mob, "Invisimin on. You are now as invisible as a ghost.")
- mob.remove_from_all_data_huds()
+ if(mob.invisibility == INVISIBILITY_OBSERVER)
+ mob.invisibility = initial(mob.invisibility)
+ mob.add_to_all_human_data_huds()
+ to_chat(mob, "Invisimin off. Invisibility reset.")
+ log_admin("[key_name(mob)] has turned Invisimin OFF")
+ else
+ mob.invisibility = INVISIBILITY_OBSERVER
+ mob.remove_from_all_data_huds()
+ to_chat(mob, "Invisimin on. You are now as invisible as a ghost.")
+ log_admin("[key_name(mob)] has turned Invisimin ON")
+ SSblackbox.record_feedback("tally", "admin_verb", 1, "Invisimin")
/client/proc/player_panel_new()
set name = "Player Panel"
@@ -492,51 +497,6 @@ GLOBAL_LIST_INIT(admin_verbs_ticket, list(
log_admin("[key_name(usr)] has turned BB mode [holder.fakekey ? "ON" : "OFF"]")
SSblackbox.record_feedback("tally", "admin_verb", 1, "Big Brother Mode")
-#define MAX_WARNS 3
-#define AUTOBANTIME 10
-
-/client/proc/warn(warned_ckey)
- if(!check_rights(R_ADMIN))
- return
-
- if(!warned_ckey || !istext(warned_ckey)) return
- if(warned_ckey in GLOB.admin_datums)
- to_chat(usr, "Error: warn(): You can't warn admins.")
- return
-
- var/datum/preferences/D
- var/client/C = GLOB.directory[warned_ckey]
- if(C) D = C.prefs
- else D = GLOB.preferences_datums[warned_ckey]
-
- if(!D)
- to_chat(src, "Error: warn(): No such ckey found.")
- return
-
- if(++D.warns >= MAX_WARNS) //uh ohhhh...you'reee iiiiin trouuuubble O:)
- if(C)
- message_admins("[key_name_admin(src)] has warned [key_name_admin(C)] resulting in a [AUTOBANTIME] minute ban")
- log_admin("[key_name(src)] has warned [key_name(C)] resulting in a [AUTOBANTIME] minute ban")
- to_chat(C, "You have been autobanned due to a warning by [ckey].
This is a temporary ban, it will be removed in [AUTOBANTIME] minutes.")
- qdel(C)
- else
- message_admins("[key_name_admin(src)] has warned [warned_ckey] resulting in a [AUTOBANTIME] minute ban")
- log_admin("[key_name(src)] has warned [warned_ckey] resulting in a [AUTOBANTIME] minute ban")
- AddBan(warned_ckey, D.last_id, "Autobanning due to too many formal warnings", ckey, 1, AUTOBANTIME)
- else
- if(C)
- to_chat(C, "You have been formally warned by an administrator.
Further warnings will result in an autoban.")
- message_admins("[key_name_admin(src)] has warned [key_name_admin(C)]. They have [MAX_WARNS-D.warns] strikes remaining.")
- log_admin("[key_name(src)] has warned [key_name(C)]. They have [MAX_WARNS-D.warns] strikes remaining.")
- else
- message_admins("[key_name_admin(src)] has warned [warned_ckey] (DC). They have [MAX_WARNS-D.warns] strikes remaining.")
- log_admin("[key_name(src)] has warned [warned_ckey] (DC). They have [MAX_WARNS-D.warns] strikes remaining.")
-
- SSblackbox.record_feedback("tally", "admin_verb", 1, "Warning") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-
-#undef MAX_WARNS
-#undef AUTOBANTIME
-
/client/proc/drop_bomb() // Some admin dickery that can probably be done better -- TLE
set category = "Event"
set name = "Drop Bomb"
@@ -712,6 +672,10 @@ GLOBAL_LIST_INIT(admin_verbs_ticket, list(
to_chat(src, "Error while re-adminning, admin rank ([rank]) does not exist.")
return
+ // Do a little check here
+ if(GLOB.configuration.system.is_production && (GLOB.admin_ranks[rank] & R_ADMIN) && prefs._2fa_status == _2FA_DISABLED) // If they are an admin and their 2FA is disabled
+ to_chat(src,"You do not have 2FA enabled. Admin verbs will be unavailable until you have enabled 2FA.") // Very fucking obvious
+ return
D = new(rank, GLOB.admin_ranks[rank], ckey)
else
if(!SSdbcore.IsConnected())
@@ -742,8 +706,13 @@ GLOBAL_LIST_INIT(admin_verbs_ticket, list(
if(istext(flags))
flags = text2num(flags)
+ var/client/check_client = GLOB.directory[ckey]
+ // Do a little check here
+ if(GLOB.configuration.system.is_production && (flags & R_ADMIN) && check_client.prefs._2fa_status == _2FA_DISABLED) // If they are an admin and their 2FA is disabled
+ to_chat(src,"You do not have 2FA enabled. Admin verbs will be unavailable until you have enabled 2FA.") // Very fucking obvious
+ qdel(admin_read)
+ return
D = new(admin_rank, flags, ckey)
-
qdel(admin_read)
var/client/C = GLOB.directory[ckey]
diff --git a/code/modules/admin/create_mob.dm b/code/modules/admin/create_mob.dm
index 6740a3d59b7..5ffa2ec7eba 100644
--- a/code/modules/admin/create_mob.dm
+++ b/code/modules/admin/create_mob.dm
@@ -1,9 +1,11 @@
GLOBAL_VAR(create_mob_html)
+
/datum/admins/proc/create_mob(mob/user)
if(!GLOB.create_mob_html)
var/mobjs = null
mobjs = jointext(typesof(/mob), ";")
GLOB.create_mob_html = file2text('html/create_object.html')
+ GLOB.create_mob_html = replacetext(GLOB.create_mob_html, "$ATOM$", "Mob")
GLOB.create_mob_html = replacetext(GLOB.create_mob_html, "null /* object types */", "\"[mobjs]\"")
user << browse(replacetext(GLOB.create_mob_html, "/* ref src */", UID()), "window=create_mob;size=425x475")
diff --git a/code/modules/admin/create_object.dm b/code/modules/admin/create_object.dm
index 99706d19950..2d20265ff8f 100644
--- a/code/modules/admin/create_object.dm
+++ b/code/modules/admin/create_object.dm
@@ -6,6 +6,7 @@ GLOBAL_LIST_INIT(create_object_forms, list(/obj, /obj/structure, /obj/machinery,
var/objectjs = null
objectjs = jointext(typesof(/obj), ";")
GLOB.create_object_html = file2text('html/create_object.html')
+ GLOB.create_object_html = replacetext(GLOB.create_object_html, "$ATOM$", "Object")
GLOB.create_object_html = replacetext(GLOB.create_object_html, "null /* object types */", "\"[objectjs]\"")
user << browse(replacetext(GLOB.create_object_html, "/* ref src */", UID()), "window=create_object;size=425x475")
@@ -17,6 +18,7 @@ GLOBAL_LIST_INIT(create_object_forms, list(/obj, /obj/structure, /obj/machinery,
if(!html_form)
var/objectjs = jointext(typesof(path), ";")
html_form = file2text('html/create_object.html')
+ html_form = replacetext(html_form, "$ATOM$", "Object")
html_form = replacetext(html_form, "null /* object types */", "\"[objectjs]\"")
GLOB.create_object_forms[path] = html_form
diff --git a/code/modules/admin/create_turf.dm b/code/modules/admin/create_turf.dm
index 9ef3b465194..593f40fc005 100644
--- a/code/modules/admin/create_turf.dm
+++ b/code/modules/admin/create_turf.dm
@@ -1,9 +1,11 @@
GLOBAL_VAR(create_turf_html)
+
/datum/admins/proc/create_turf(mob/user)
if(!GLOB.create_turf_html)
var/turfjs = null
turfjs = jointext(typesof(/turf), ";")
GLOB.create_turf_html = file2text('html/create_object.html')
+ GLOB.create_turf_html = replacetext(GLOB.create_turf_html, "$ATOM$", "Turf")
GLOB.create_turf_html = replacetext(GLOB.create_turf_html, "null /* object types */", "\"[turfjs]\"")
user << browse(replacetext(GLOB.create_turf_html, "/* ref src */", UID()), "window=create_turf;size=425x475")
diff --git a/code/modules/admin/db_ban/functions.dm b/code/modules/admin/db_ban/functions.dm
index d16b61ae690..999ba84b5e6 100644
--- a/code/modules/admin/db_ban/functions.dm
+++ b/code/modules/admin/db_ban/functions.dm
@@ -146,8 +146,8 @@
qdel(adm_query)
var/datum/db_query/query_insert = SSdbcore.NewQuery({"
- INSERT INTO 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)
+ INSERT INTO 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`, `server_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, :server_id)
"}, list(
// Get ready for parameters
"serverip" = serverip,
@@ -164,7 +164,8 @@
"a_ip" = a_ip,
"who" = who,
"adminwho" = adminwho,
- "roundid" = GLOB.round_id
+ "roundid" = GLOB.round_id,
+ "server_id" = GLOB.configuration.system.instance_id
))
if(!query_insert.warn_execute())
qdel(query_insert)
diff --git a/code/modules/admin/holder2.dm b/code/modules/admin/holder2.dm
index 5d8196a8d88..8cbd56311dc 100644
--- a/code/modules/admin/holder2.dm
+++ b/code/modules/admin/holder2.dm
@@ -95,6 +95,24 @@ you will have to do something like if(client.holder.rights & R_ADMIN) yourself.
to_chat(user, "Error: You are not an admin.")
return 0
+// Basically the above proc but checks at a /client level
+/proc/check_rights_client(rights_required, show_msg = TRUE, client/C)
+ if(C)
+ if(rights_required)
+ if(C.holder)
+ if(rights_required & C.holder.rights)
+ return TRUE
+ else
+ if(show_msg)
+ to_chat(C, "Error: You do not have sufficient rights to do that. You require one of the following flags:[rights2text(rights_required," ")].")
+ else
+ if(C.holder)
+ return TRUE
+ else
+ if(show_msg)
+ to_chat(C, "Error: You are not an admin.")
+ return FALSE
+
//probably a bit iffy - will hopefully figure out a better solution
/proc/check_if_greater_rights_than(client/other)
if(usr && usr.client)
diff --git a/code/modules/admin/mute.dm b/code/modules/admin/mute.dm
new file mode 100644
index 00000000000..cab33a4edda
--- /dev/null
+++ b/code/modules/admin/mute.dm
@@ -0,0 +1,32 @@
+/// Associative list of people who are muted via admin mutes
+GLOBAL_LIST_EMPTY(admin_mutes_assoc)
+
+/proc/check_mute(ckey, muteflag)
+ if(isnull(GLOB.admin_mutes_assoc[ckey]))
+ return FALSE
+
+ if(GLOB.admin_mutes_assoc[ckey] & muteflag)
+ return TRUE
+ return FALSE
+
+/proc/toggle_mute(ckey, muteflag)
+ if(isnull(GLOB.admin_mutes_assoc[ckey]))
+ GLOB.admin_mutes_assoc[ckey] = 0
+
+ if(GLOB.admin_mutes_assoc[ckey] & muteflag)
+ GLOB.admin_mutes_assoc[ckey] &= ~muteflag
+ else
+ GLOB.admin_mutes_assoc[ckey] |= muteflag
+
+/proc/force_add_mute(ckey, muteflag)
+ if(isnull(GLOB.admin_mutes_assoc[ckey]))
+ GLOB.admin_mutes_assoc[ckey] = 0
+
+ GLOB.admin_mutes_assoc[ckey] |= muteflag
+
+/proc/force_remove_mute(ckey, muteflag)
+ if(isnull(GLOB.admin_mutes_assoc[ckey]))
+ GLOB.admin_mutes_assoc[ckey] = 0
+
+ GLOB.admin_mutes_assoc[ckey] &= ~muteflag
+
diff --git a/code/modules/admin/player_panel.dm b/code/modules/admin/player_panel.dm
index 20aa1307328..7fe431e737d 100644
--- a/code/modules/admin/player_panel.dm
+++ b/code/modules/admin/player_panel.dm
@@ -65,7 +65,7 @@
}
- function expand(id,job,name,real_name,image,key,ip,antagonist,mobUID,client_ckey,eyeUID){
+ function expand(id,job,name,real_name,image,key,ip,antagonists,mobUID,client_ckey,eyeUID){
clearAll();
@@ -89,8 +89,8 @@
if(eyeUID)
body += "|EYE"
body += "
"
- if(antagonist > 0)
- body += "Antagonist";
+ if(antagonists)
+ body += ""+antagonists+"";
body += "";
@@ -227,7 +227,7 @@
var/color = "#e6e6e6"
if(i%2 == 0)
color = "#f2f2f2"
- var/is_antagonist = is_special_character(M)
+ var/antagonist_string = get_antag_type_truncated_plaintext_string(M)
var/M_job = ""
@@ -305,7 +305,7 @@
[server] - [players] player[players == 1 ? "" : "s"] online.")
+ to_chat(usr, "Offline instances are not reported")
diff --git a/code/modules/admin/watchlist.dm b/code/modules/admin/watchlist.dm
index 89288bd13ab..6b98a6050cf 100644
--- a/code/modules/admin/watchlist.dm
+++ b/code/modules/admin/watchlist.dm
@@ -16,8 +16,21 @@
qdel(query_watchfind)
return
else
+ qdel(query_watchfind)
target_ckey = new_ckey
- if(check_watchlist(target_ckey))
+
+ var/already_watched = FALSE
+ var/datum/db_query/query_watch = SSdbcore.NewQuery("SELECT reason FROM watch WHERE ckey=:target_ckey", list(
+ "target_ckey" = target_ckey
+ ))
+ if(!query_watch.warn_execute())
+ qdel(query_watch)
+ return
+ if(query_watch.NextRow())
+ already_watched = TRUE
+ qdel(query_watch)
+
+ if(already_watched)
to_chat(usr, "[target_ckey] is already on the watchlist.")
return
var/reason = input(usr,"Please state the reason","Reason") as message|null
@@ -132,18 +145,3 @@
output += "" // Table within a table for alignment, also allows you to easily add more colomns.
+ html += "
|
|
| "
dat += "Name: "
- dat += "[real_name]"
+ dat += "[active_character.real_name]"
dat += "(Randomize)"
- dat += "(Always Randomize) " + dat += "(Always Randomize) " dat += " | "
dat += " " + dat += "Slot [default_slot][active_character.from_db ? "" : " (empty)"] " dat += "Load slot - " - dat += "Save slot - " - dat += "Reload slot" - if(saved) - dat += " - Clear slot" + dat += "Save slot" + if(active_character.from_db) + dat += "- Clear slot" dat += " |
| "
@@ -283,81 +178,83 @@ GLOBAL_LIST_INIT(special_role_times, list( //minimum age (in days) for accounts
dat += "You are banned from using custom names and appearances. \
You can continue to adjust your characters, but you will be randomised once you join the game.\
" - dat += "Gender: [gender == MALE ? "Male" : (gender == FEMALE ? "Female" : "Genderless")]" + dat += "Gender: [active_character.gender == MALE ? "Male" : (active_character.gender == FEMALE ? "Female" : "Genderless")]" dat += " " - dat += "Age: [age] " + dat += "Age: [active_character.age] " dat += "Body: (®) " - dat += "Species: [species] " - if(species == "Vox") - dat += "N2 Tank: [speciesprefs ? "Large N2 Tank" : "Specialized N2 Tank"] " - if(species == "Grey") + dat += "Species: [active_character.species] " + if(active_character.species == "Vox") // Purge these bastards + dat += "N2 Tank: [active_character.speciesprefs ? "Large N2 Tank" : "Specialized N2 Tank"] " + if(active_character.species == "Grey") dat += "Wingdings: Set in disabilities " - dat += "Voice Translator: [speciesprefs ? "Yes" : "No"] " - dat += "Secondary Language: [language] " + dat += "Voice Translator: [active_character.speciesprefs ? "Yes" : "No"] " + dat += "Secondary Language: [active_character.language] " if(S.autohiss_basic_map) - dat += "Auto-accent: [autohiss_mode == AUTOHISS_FULL ? "Full" : (autohiss_mode == AUTOHISS_BASIC ? "Basic" : "Off")] " - dat += "Blood Type: [b_type] " + dat += "Auto-accent: [active_character.autohiss_mode == AUTOHISS_FULL ? "Full" : (active_character.autohiss_mode == AUTOHISS_BASIC ? "Basic" : "Off")] " + dat += "Blood Type: [active_character.b_type] " if(S.bodyflags & (HAS_SKIN_TONE|HAS_ICON_SKIN_TONE)) - dat += "Skin Tone: [S.bodyflags & HAS_ICON_SKIN_TONE ? "[s_tone]" : "[-s_tone + 35]/220"] " + dat += "Skin Tone: [S.bodyflags & HAS_ICON_SKIN_TONE ? "[active_character.s_tone]" : "[-active_character.s_tone + 35]/220"] " dat += "Disabilities: \[Set\] " - dat += "Nanotrasen Relation: [nanotrasen_relation] " + dat += "Nanotrasen Relation: [active_character.nanotrasen_relation] " dat += "Set Flavor Text " - if(length(flavor_text) <= 40) - if(!length(flavor_text)) dat += "\[...\] " - else dat += "[flavor_text] " - else dat += "[TextPreview(flavor_text)]... " + if(length(active_character.flavor_text) <= 40) + if(!length(active_character.flavor_text)) + dat += "\[...\] " + else + dat += "[active_character.flavor_text] " + else dat += "[TextPreview(active_character.flavor_text)]... " dat += " Hair & Accessories" if(S.bodyflags & HAS_HEAD_ACCESSORY) //Species that have head accessories. var/headaccessoryname = "Head Accessory: " - if(species == "Unathi") + if(active_character.species == "Unathi") headaccessoryname = "Horns: " dat += "[headaccessoryname]" - dat += "[ha_style] " - dat += "Color [color_square(hacc_colour)]" + dat += "[active_character.ha_style] " + dat += "Color [color_square(active_character.hacc_colour)] " if(S.bodyflags & HAS_HEAD_MARKINGS) //Species with head markings. dat += "Head Markings: " - dat += "[m_styles["head"]]" - dat += "Color [color_square(m_colours["head"])] " + dat += "[active_character.m_styles["head"]]" + dat += "Color [color_square(active_character.m_colours["head"])] " if(S.bodyflags & HAS_BODY_MARKINGS) //Species with body markings/tattoos. dat += "Body Markings: " - dat += "[m_styles["body"]]" - dat += "Color [color_square(m_colours["body"])] " + dat += "[active_character.m_styles["body"]]" + dat += "Color [color_square(active_character.m_colours["body"])] " if(S.bodyflags & HAS_TAIL_MARKINGS) //Species with tail markings. dat += "Tail Markings: " - dat += "[m_styles["tail"]]" - dat += "Color [color_square(m_colours["tail"])] " + dat += "[active_character.m_styles["tail"]]" + dat += "Color [color_square(active_character.m_colours["tail"])] " dat += "Hair: " - dat += "[h_style]" - dat += "Color [color_square(h_colour)]" - var/datum/sprite_accessory/temp_hair_style = GLOB.hair_styles_public_list[h_style] + dat += "[active_character.h_style]" + dat += "Color [color_square(active_character.h_colour)]" + var/datum/sprite_accessory/temp_hair_style = GLOB.hair_styles_public_list[active_character.h_style] if(temp_hair_style && temp_hair_style.secondary_theme && !temp_hair_style.no_sec_colour) - dat += " Color #2 [color_square(h_sec_colour)]" + dat += " Color #2 [color_square(active_character.h_sec_colour)]" dat += " " dat += "Facial Hair: " - dat += "[f_style ? "[f_style]" : "Shaved"]" - dat += "Color [color_square(f_colour)]" - var/datum/sprite_accessory/temp_facial_hair_style = GLOB.facial_hair_styles_list[f_style] + dat += "[active_character.f_style ? "[active_character.f_style]" : "Shaved"]" + dat += "Color [color_square(active_character.f_colour)]" + var/datum/sprite_accessory/temp_facial_hair_style = GLOB.facial_hair_styles_list[active_character.f_style] if(temp_facial_hair_style && temp_facial_hair_style.secondary_theme && !temp_facial_hair_style.no_sec_colour) - dat += " Color #2 [color_square(f_sec_colour)]" + dat += " Color #2 [color_square(active_character.f_sec_colour)]" dat += " " if(!(S.bodyflags & ALL_RPARTS)) dat += "Eyes: " - dat += "Color [color_square(e_colour)] " + dat += "Color [color_square(active_character.e_colour)] " - if((S.bodyflags & HAS_SKIN_COLOR) || GLOB.body_accessory_by_species[species] || check_rights(R_ADMIN, 0, user)) //admins can always fuck with this, because they are admins + if((S.bodyflags & HAS_SKIN_COLOR) || GLOB.body_accessory_by_species[active_character.species] || check_rights(R_ADMIN, 0, user)) //admins can always fuck with this, because they are admins dat += "Body Color: " - dat += "Color [color_square(s_colour)] " + dat += "Color [color_square(active_character.s_colour)] " - if(GLOB.body_accessory_by_species[species] || check_rights(R_ADMIN, 0, user)) + if(GLOB.body_accessory_by_species[active_character.species] || check_rights(R_ADMIN, 0, user)) dat += "Body Accessory: " - dat += "[body_accessory ? "[body_accessory]" : "None"] " + dat += "[active_character.body_accessory ? "[active_character.body_accessory]" : "None"] " dat += " | "
dat += "Occupation Choices" @@ -370,15 +267,15 @@ GLOBAL_LIST_INIT(special_role_times, list( //minimum age (in days) for accounts dat += "Limbs" if(S.bodyflags & HAS_ALT_HEADS) //Species with alt heads. dat += "Alternate Head: " - dat += "[alt_head]" + dat += "[active_character.alt_head] " dat += "Limbs and Parts: Adjust " - if(species != "Slime People" && species != "Machine") + if(active_character.species != "Slime People" && active_character.species != "Machine") dat += "Internal Organs: Adjust " //display limbs below var/ind = 0 - for(var/name in organ_data) - var/status = organ_data[name] + for(var/name in active_character.organ_data) + var/status = active_character.organ_data[name] var/organ_name = null switch(name) if("chest") @@ -423,8 +320,8 @@ GLOBAL_LIST_INIT(special_role_times, list( //minimum age (in days) for accounts switch(status) if("cyborg") var/datum/robolimb/R - if(rlimb_data[name] && GLOB.all_robolimbs[rlimb_data[name]]) - R = GLOB.all_robolimbs[rlimb_data[name]] + if(active_character.rlimb_data[name] && GLOB.all_robolimbs[active_character.rlimb_data[name]]) + R = GLOB.all_robolimbs[active_character.rlimb_data[name]] else R = GLOB.basic_robolimb dat += "\t[R.company] [organ_name] prosthesis" @@ -437,12 +334,12 @@ GLOBAL_LIST_INIT(special_role_times, list( //minimum age (in days) for accounts dat += " Clothing" if(S.clothing_flags & HAS_UNDERWEAR) - dat += "Underwear: [underwear]" + dat += "Underwear: [active_character.underwear] " if(S.clothing_flags & HAS_UNDERSHIRT) - dat += "Undershirt: [undershirt] " + dat += "Undershirt: [active_character.undershirt] " if(S.clothing_flags & HAS_SOCKS) - dat += "Socks: [socks] " - dat += "Backpack Type: [backbag] " + dat += "Socks: [active_character.socks] " + dat += "Backpack Type: [active_character.backbag] " dat += " |
| [G.display_name] | " else - dat += "||||||
| [G.display_name] | " + dat += "||||||
| [G.display_name] | " dat += "[G.cost] | "
if(G.allowed_roles)
dat += "Restrictions: "
@@ -568,7 +455,7 @@ GLOBAL_LIST_INIT(special_role_times, list( //minimum age (in days) for accounts
if(ticked)
. += "| "
for(var/datum/gear_tweak/tweak in G.gear_tweaks)
- . += " [tweak.get_contents(get_tweak_metadata(G, tweak))]"
+ . += " [tweak.get_contents(active_character.get_tweak_metadata(G, tweak))]"
. += " | | |||
" // Table within a table for alignment, also allows you to easily add more colomns.
- html += "
|
|
| [seed.variant ? seed.variant : "None"] | " + dat += "Edit | " + if(seed.variant) + dat += "Remove | " + dat += "
| Name | Lifespan | Endurance | Maturation | Production | Yield | Potency | Stock |
| Name | Variant | Lifespan | Endurance | Maturation | Production | Yield | Potency | Stock |
| [O.name] | [O.lifespan] | [O.endurance] | [O.maturation] | " + dat += "|||||
| [O.name] | [O.variant] | [O.lifespan] | [O.endurance] | [O.maturation] | " dat += "[O.production] | [O.yield] | [O.potency] | " dat += "Vend ([O.amount] left) |
| Name: | -[candidate.name] | +[candidate.pai_name] |
|---|---|---|
| What you plan to call yourself. Suggestions: Any character name you would choose for a station character OR an AI. | @@ -215,7 +197,7 @@ GLOBAL_DATUM_INIT(paiController, /datum/paiController, new) // Global handler fo||
| OOC Comments: | -[candidate.comments] | +[candidate.ooc_comments] |
| Anything you'd like to address specifically to the player reading this in an OOC manner. \"I prefer more serious RP.\", \"I'm still learning the interface!\", etc. Feel free to leave this blank if you want. | @@ -230,7 +212,7 @@ GLOBAL_DATUM_INIT(paiController, /datum/paiController, new) // Global handler fo||
| - Load Personality + Reload Personality |
Displaying available AI personalities from central database... If there are no entries, or if a suitable entry is not listed, check again later as more personalities may be added.
" - for(var/datum/paiCandidate/c in available) + for(var/datum/pai_save/c in available) dat += {"| Name: | -[c.name] | +[c.pai_name] |
|---|---|---|
| Description: | @@ -342,11 +323,11 @@ GLOBAL_DATUM_INIT(paiController, /datum/paiController, new) // Global handler fo||
| OOC Comments: | -[c.comments] | +[c.ooc_comments] |
| Download [c.name] + | Download [c.pai_name] |
Setup Character
[real_name]