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 63363f5a351..177bfd0b335 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -465,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
@@ -502,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.
@@ -526,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/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/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm
index ebade5fe4fa..193eadb153b 100644
--- a/_maps/map_files/Delta/delta.dmm
+++ b/_maps/map_files/Delta/delta.dmm
@@ -684,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
@@ -969,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
@@ -984,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,
@@ -1022,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
@@ -1127,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
@@ -1145,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,
@@ -1222,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"
@@ -1242,95 +1091,6 @@
/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,
@@ -1340,87 +1100,6 @@
/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 = "secpodbay";
- 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/firealarm{
- dir = 4;
- pixel_x = 28
- },
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
- dir = 1
- },
-/obj/machinery/computer/security{
- dir = 8;
- network = list("SS13","Research Outpost","Mining Outpost")
- },
-/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
@@ -1462,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
@@ -1477,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 = "secpodbay";
- 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,
@@ -1599,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{
@@ -1671,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
@@ -1697,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,
@@ -1769,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{
@@ -1784,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" = (
@@ -1810,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"
@@ -1883,151 +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"
- },
-/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,
@@ -2052,34 +1387,8 @@
/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/arrival/station)
"akB" = (
-/turf/simulated/wall,
-/area/engine/mechanic_workshop)
-"akC" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
- dir = 1
- },
-/obj/machinery/computer/podtracker{
- dir = 4
- },
-/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{
@@ -2087,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";
@@ -2113,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,
@@ -2147,104 +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"
- },
-/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/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{
- dir = 1
- },
-/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
@@ -2319,21 +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"
- },
-/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;
@@ -2377,14 +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"
- },
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
dir = 5;
@@ -2455,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{
@@ -2482,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" = (
@@ -2494,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" = (
@@ -2503,14 +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"
- },
/obj/effect/decal/warning_stripes/yellow,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -2518,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"
@@ -3974,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,
@@ -6710,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"
@@ -7090,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" = (
@@ -7787,6 +6969,9 @@
/obj/machinery/newscaster{
pixel_y = 32
},
+/obj/structure/sign/nosmoking_2{
+ pixel_x = 32
+ },
/turf/simulated/floor/plasteel,
/area/janitor)
"ayp" = (
@@ -8150,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" = (
@@ -8707,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)
@@ -9239,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"
},
@@ -9748,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" = (
@@ -10286,21 +9478,21 @@
/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" = (
-/mob/living/simple_animal/bot/mulebot{
- home_destination = "QM #2";
- suffix = "#2"
- },
+/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"
+ },
/turf/simulated/floor/plasteel,
/area/quartermaster/storage)
"aDW" = (
@@ -10964,12 +10156,12 @@
/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" = (
@@ -11747,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;
@@ -11766,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,
@@ -12068,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;
@@ -12190,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" = (
@@ -12376,13 +11563,16 @@
"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{
@@ -12391,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,
@@ -12964,7 +12159,7 @@
id = "engsm";
name = "Radiation Shutters Control";
pixel_y = 24;
- req_access_txt = "10"
+ req_access_txt = "24"
},
/obj/structure/cable/yellow{
d1 = 4;
@@ -13030,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,
@@ -13160,6 +12359,11 @@
},
/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" = (
@@ -13656,11 +12860,10 @@
},
/obj/structure/table,
/obj/machinery/computer/library/public,
-/turf/simulated/floor/plasteel,
-/area/security/permabrig)
-"aKS" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "red"
+ },
/area/security/permabrig)
"aKT" = (
/obj/structure/cable{
@@ -13686,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{
@@ -13926,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" = (
@@ -14147,16 +13358,16 @@
/turf/simulated/wall,
/area/crew_quarters/bar/atrium)
"aLV" = (
-/mob/living/simple_animal/bot/mulebot{
- home_destination = "QM #4";
- suffix = "#4"
- },
+/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"
+ },
/turf/simulated/floor/plasteel,
/area/quartermaster/storage)
"aLW" = (
@@ -14313,11 +13524,11 @@
},
/area/crew_quarters/bar)
"aMj" = (
-/mob/living/carbon/human/monkey/punpun,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 8
},
+/mob/living/carbon/human/monkey/punpun,
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "dark"
@@ -14352,9 +13563,13 @@
},
/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{
@@ -14362,9 +13577,14 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/structure/chair/stool,
+/obj/structure/chair/stool{
+ dir = 4
+ },
/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,
@@ -14503,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"
@@ -14866,7 +14091,10 @@
/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{
@@ -14880,24 +14108,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 6
},
-/turf/simulated/floor/plasteel,
-/area/security/permabrig)
-"aNF" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/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{
- dir = 1;
- icon_state = "redcorner"
+ dir = 8;
+ icon_state = "neutralfull"
},
/area/security/permabrig)
"aNG" = (
@@ -14906,14 +14119,16 @@
d2 = 8;
icon_state = "4-8"
},
-/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,
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "neutralfull"
+ },
/area/security/permabrig)
"aNI" = (
/obj/structure/cable{
@@ -14933,36 +14148,10 @@
},
/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"
+/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"
- },
-/turf/simulated/floor/plating,
/area/security/permabrig)
"aNL" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -14976,7 +14165,10 @@
d2 = 8;
icon_state = "4-8"
},
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "neutralfull"
+ },
/area/security/permabrig)
"aNM" = (
/obj/structure/cable{
@@ -14991,8 +14183,8 @@
dir = 4
},
/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "redcorner"
+ dir = 8;
+ icon_state = "neutralfull"
},
/area/security/permabrig)
"aNN" = (
@@ -15001,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{
@@ -15034,7 +14239,6 @@
name = "EXTERNAL AIRLOCK";
pixel_x = -32
},
-/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "vault"
@@ -15419,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" = (
@@ -15477,16 +14681,23 @@
/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{
@@ -15497,40 +14708,48 @@
/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" = (
/mob/living/simple_animal/mouse,
-/obj/effect/decal/cleanable/dirt,
/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{
@@ -15571,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";
@@ -15711,9 +14940,9 @@
},
/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{
@@ -15801,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{
@@ -16080,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" = (
@@ -16224,23 +15460,31 @@
/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{
@@ -16250,26 +15494,41 @@
},
/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{
@@ -16965,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;
@@ -16990,57 +16246,55 @@
},
/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{
@@ -17063,13 +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{
dir = 1
},
-/turf/simulated/floor/plating,
+/turf/simulated/floor/plasteel{
+ dir = 6;
+ icon_state = "red"
+ },
/area/security/permabrig)
"aSt" = (
/obj/effect/spawner/window/reinforced,
@@ -17211,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"
@@ -17459,7 +16717,10 @@
},
/obj/effect/decal/warning_stripes/yellow/hollow,
/obj/machinery/hologram/holopad,
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ dir = 0;
+ icon_state = "red"
+ },
/area/security/permabrig)
"aTc" = (
/obj/structure/cable{
@@ -17726,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" = (
@@ -17983,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"
@@ -17993,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" = (
@@ -18015,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"
@@ -18422,13 +17698,9 @@
},
/area/quartermaster/office)
"aUQ" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/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;
@@ -18618,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,
@@ -18649,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
},
@@ -18670,7 +17947,10 @@
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{
@@ -18678,7 +17958,6 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 6
},
@@ -18720,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{
@@ -18735,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"
@@ -18948,29 +18229,24 @@
},
/area/atmos)
"aVN" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/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"
- },
-/obj/machinery/atmospherics/pipe/simple/visible/green{
- dir = 4
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 1
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -19265,8 +18541,8 @@
},
/area/quartermaster/office)
"aWu" = (
-/mob/living/simple_animal/pet/sloth/paperwork,
/obj/effect/decal/warning_stripes/south,
+/mob/living/simple_animal/pet/sloth/paperwork,
/turf/simulated/floor/plasteel,
/area/quartermaster/storage)
"aWv" = (
@@ -19496,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{
@@ -19519,18 +18796,19 @@
id = "Cell 1";
pixel_x = -22
},
-/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "red"
},
/area/security/permabrig)
"aWN" = (
-/obj/effect/decal/cleanable/dirt,
/obj/machinery/newscaster{
pixel_y = -32
},
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ dir = 0;
+ icon_state = "red"
+ },
/area/security/permabrig)
"aWO" = (
/obj/structure/table,
@@ -19549,7 +18827,10 @@
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{
@@ -19782,6 +19063,7 @@
dir = 4
},
/obj/machinery/meter,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
@@ -19827,12 +19109,6 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "neutralfull"
- },
-/area/atmos)
-"aXs" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
@@ -19843,7 +19119,7 @@
icon_state = "neutralfull"
},
/area/atmos)
-"aXt" = (
+"aXs" = (
/obj/machinery/atmospherics/pipe/simple/visible/cyan{
dir = 6;
initialize_directions = 6
@@ -19983,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"
@@ -20024,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" = (
@@ -20052,13 +19331,9 @@
},
/area/quartermaster/office)
"aXN" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/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;
@@ -20258,25 +19533,33 @@
},
/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" = (
@@ -20492,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"
@@ -20849,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,
@@ -21006,11 +20297,6 @@
},
/area/security/permabrig)
"aZH" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
/obj/structure/cable{
d1 = 2;
d2 = 4;
@@ -21021,11 +20307,6 @@
},
/area/security/permabrig)
"aZI" = (
-/obj/structure/cable{
- d1 = 2;
- d2 = 8;
- icon_state = "2-8"
- },
/obj/structure/cable{
d1 = 4;
d2 = 8;
@@ -21033,6 +20314,11 @@
},
/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"
},
@@ -21044,12 +20330,9 @@
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"
@@ -21377,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;
@@ -21436,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"
@@ -21453,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
@@ -21647,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"
@@ -21671,7 +20943,6 @@
/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
},
@@ -21988,16 +21259,12 @@
},
/area/security/permabrig)
"bbs" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
+/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" = (
@@ -22266,14 +21533,13 @@
/turf/simulated/floor/plasteel,
/area/atmos)
"bbV" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
/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"
@@ -22432,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" = (
@@ -22682,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" = (
@@ -22720,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" = (
@@ -23415,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" = (
@@ -23620,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"
@@ -23722,8 +22992,15 @@
/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" = (
@@ -24220,7 +23497,7 @@
/area/atmos)
"bgg" = (
/obj/machinery/atmospherics/pipe/simple/visible/cyan{
- dir = 5
+ dir = 4
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -24254,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"
@@ -24714,6 +23994,7 @@
icon_state = "0-2"
},
/obj/machinery/power/apc{
+ cell_type = 25000;
dir = 1;
name = "north bump";
pixel_y = 24
@@ -25697,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"
@@ -26595,21 +25881,21 @@
/area/atmos)
"bkK" = (
/obj/structure/cable{
- d1 = 4;
+ d1 = 1;
d2 = 8;
- icon_state = "4-8"
+ 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,
@@ -26627,12 +25913,13 @@
},
/area/atmos)
"bkP" = (
-/obj/machinery/atmospherics/binary/valve{
- name = "SM coolant loop"
- },
/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"
@@ -26729,7 +26016,7 @@
},
/area/security/permabrig)
"blf" = (
-/obj/structure/foodcart,
+/obj/machinery/smartfridge/foodcart,
/obj/effect/decal/warning_stripes/yellow,
/obj/machinery/firealarm{
dir = 1;
@@ -27114,7 +26401,10 @@
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,
@@ -29472,15 +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"
@@ -29549,15 +28839,15 @@
/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"
@@ -30244,11 +29534,11 @@
d2 = 2;
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"
@@ -32194,13 +31484,18 @@
d2 = 8;
icon_state = "2-8"
},
-/obj/structure/plasticflaps{
- opacity = 1
- },
/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" = (
@@ -32792,11 +32087,11 @@
/turf/simulated/floor/plating,
/area/engine/break_room)
"bwV" = (
-/mob/living/simple_animal/bot/floorbot,
/obj/structure/sign/poster/official/help_others{
pixel_x = -32
},
/obj/structure/table/reinforced,
+/mob/living/simple_animal/bot/floorbot,
/turf/simulated/floor/plasteel{
dir = 9;
icon_state = "yellow"
@@ -35303,10 +34598,10 @@
d2 = 2;
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" = (
@@ -41378,10 +40673,10 @@
/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" = (
@@ -41535,7 +40830,7 @@
/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,
@@ -41987,13 +41282,13 @@
/turf/simulated/wall,
/area/turret_protected/ai_upload)
"bOU" = (
-/mob/living/simple_animal/pet/dog/fox/Renault,
/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;
icon_state = "dark"
@@ -42661,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"
},
@@ -44395,7 +43689,6 @@
},
/area/turret_protected/aisat)
"bTD" = (
-/mob/living/simple_animal/bot/secbot/pingsky,
/obj/structure/cable{
d1 = 2;
d2 = 8;
@@ -44410,6 +43703,7 @@
},
/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"
},
@@ -44781,11 +44075,11 @@
},
/area/engine/break_room)
"bUg" = (
-/mob/living/simple_animal/parrot/Poly,
/obj/structure/filingcabinet/chestdrawer,
/obj/machinery/light{
dir = 8
},
+/mob/living/simple_animal/parrot/Poly,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -44921,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{
@@ -45008,32 +44302,32 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/machinery/navbeacon{
- codes_txt = "patrol;next_patrol=engi2";
- location = "engi1"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
},
/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"
@@ -45084,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"
@@ -45133,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)
@@ -45266,13 +44559,13 @@
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"
@@ -45287,13 +44580,13 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 8
},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+ dir = 8
+ },
/obj/machinery/navbeacon{
codes_txt = "patrol;next_patrol=hall11";
location = "hall10"
},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 8
- },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
@@ -45453,11 +44746,6 @@
},
/area/hallway/primary/starboard)
"bVp" = (
-/mob/living/simple_animal/bot/secbot/beepsky,
-/obj/machinery/navbeacon{
- codes_txt = "patrol;next_patrol=hall12";
- location = "hall11"
- },
/obj/item/radio/beacon,
/obj/structure/cable{
d1 = 1;
@@ -45470,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"
@@ -51203,12 +50496,12 @@
/turf/simulated/floor/carpet,
/area/crew_quarters/heads/hop)
"ciE" = (
-/mob/living/simple_animal/pet/dog/corgi/Ian,
/obj/structure/bed/dogbed/ian,
/obj/machinery/alarm{
dir = 8;
pixel_x = 24
},
+/mob/living/simple_animal/pet/dog/corgi/Ian,
/turf/simulated/floor/wood,
/area/crew_quarters/heads/hop)
"ciF" = (
@@ -53653,6 +52946,7 @@
/turf/simulated/floor/plasteel,
/area/maintenance/starboard2)
"cnS" = (
+/obj/effect/decal/warning_stripes/yellow,
/obj/structure/plasticflaps{
opacity = 1
},
@@ -53660,7 +52954,6 @@
codes_txt = "delivery;dir=1";
location = "Security"
},
-/obj/effect/decal/warning_stripes/yellow,
/turf/simulated/floor/plasteel,
/area/security/range)
"cnT" = (
@@ -61568,12 +60861,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" = (
@@ -62675,13 +61970,13 @@
/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"
@@ -62752,15 +62047,15 @@
tag = "90Curve"
},
/obj/machinery/atmospherics/unary/vent_scrubber/on,
-/obj/machinery/navbeacon{
- codes_txt = "patrol;next_patrol=hall10";
- location = "hall9"
- },
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
+/obj/machinery/navbeacon{
+ codes_txt = "patrol;next_patrol=hall10";
+ location = "hall9"
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
@@ -65222,7 +64517,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" = (
@@ -66182,14 +65484,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,
@@ -68228,7 +67528,7 @@
},
/area/maintenance/port)
"cTj" = (
-/obj/structure/closet/secure_closet/engineering_welding,
+/obj/structure/closet/toolcloset,
/turf/simulated/floor/plating,
/area/maintenance/electrical)
"cTk" = (
@@ -75150,11 +74450,12 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 1;
- initialize_directions = 11
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ 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"
},
@@ -75171,10 +74472,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
- },
+/obj/structure/table/reinforced,
+/obj/effect/decal/warning_stripes/northwest,
+/obj/item/book/manual/experimentor,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -75191,9 +74491,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/obj/structure/disposalpipe/segment{
- 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"
},
@@ -75226,7 +74528,8 @@
dir = 4
},
/obj/structure/disposalpipe/segment{
- dir = 4
+ dir = 4;
+ icon_state = "pipe-c"
},
/turf/simulated/floor/plasteel{
icon_state = "white"
@@ -75238,19 +74541,16 @@
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/disposalpipe/segment{
- 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"
},
@@ -75278,40 +74578,24 @@
},
/area/toxins/xenobiology)
"dhT" = (
-/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/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
/area/toxins/explab)
"dhU" = (
-/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
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -75971,11 +75255,12 @@
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;
@@ -76072,10 +75357,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"
@@ -76083,8 +75367,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"
@@ -76106,12 +75394,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"
@@ -76119,18 +75404,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/effect/decal/warning_stripes/yellow/hollow,
-/obj/machinery/computer/rdconsole/experiment{
- dir = 1
- },
/turf/simulated/floor/plasteel{
icon_state = "whitepurplecorner"
},
@@ -76140,20 +75424,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"
},
@@ -76694,10 +75978,10 @@
"dkx" = (
/obj/machinery/light,
/obj/effect/decal/warning_stripes/yellow/hollow,
-/obj/structure/disposalpipe/trunk{
- dir = 1
- },
-/obj/machinery/disposal,
+/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"
@@ -76742,30 +76026,29 @@
/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/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" = (
@@ -77288,10 +76571,6 @@
/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" = (
@@ -77816,7 +77095,6 @@
},
/area/maintenance/port)
"dnc" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/r_n_d/experimentor,
/turf/simulated/floor/engine,
/area/toxins/explab)
@@ -78156,7 +77434,6 @@
},
/area/medical/genetics)
"dnR" = (
-/mob/living/carbon/human/monkey,
/obj/structure/window/reinforced{
dir = 1
},
@@ -78166,6 +77443,7 @@
/obj/structure/window/reinforced{
dir = 8
},
+/mob/living/carbon/human/monkey,
/turf/simulated/floor/grass,
/area/medical/genetics)
"dnT" = (
@@ -78488,7 +77766,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)
@@ -80071,7 +79349,6 @@
},
/area/medical/genetics)
"drZ" = (
-/mob/living/carbon/human/monkey,
/obj/structure/window/reinforced,
/obj/structure/window/reinforced{
dir = 4
@@ -80079,6 +79356,7 @@
/obj/structure/window/reinforced{
dir = 8
},
+/mob/living/carbon/human/monkey,
/turf/simulated/floor/grass,
/area/medical/genetics)
"dsb" = (
@@ -80099,7 +79377,6 @@
},
/area/medical/medbay)
"dsd" = (
-/mob/living/simple_animal/pet/cat/Runtime,
/obj/machinery/light{
dir = 8
},
@@ -80111,6 +79388,7 @@
name = "kitty basket"
},
/obj/structure/disposalpipe/segment,
+/mob/living/simple_animal/pet/cat/Runtime,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -83490,12 +82768,14 @@
/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" = (
@@ -88907,13 +88187,13 @@
},
/area/medical/virology)
"dLi" = (
-/mob/living/carbon/human/monkey,
/obj/machinery/light/small{
dir = 1
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/mob/living/carbon/human/monkey,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "whitegreencorner"
@@ -88932,13 +88212,13 @@
},
/area/medical/virology)
"dLk" = (
-/mob/living/carbon/human/monkey,
/obj/machinery/light/small{
dir = 1
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/mob/living/carbon/human/monkey,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "whitegreencorner"
@@ -89154,10 +88434,6 @@
/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"
@@ -89178,6 +88454,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"
@@ -90697,9 +89977,9 @@
},
/area/medical/surgery2)
"dPo" = (
-/mob/living/carbon/human/monkey,
/obj/structure/bed/roller,
/obj/effect/decal/warning_stripes/yellow/hollow,
+/mob/living/carbon/human/monkey,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "whitegreencorner"
@@ -91356,13 +90636,13 @@
},
/area/hallway/secondary/exit)
"dQG" = (
-/mob/living/carbon/human/monkey,
/obj/effect/landmark{
name = "revenantspawn"
},
/obj/effect/decal/warning_stripes/yellow,
/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"
},
@@ -94495,9 +93775,9 @@
/turf/simulated/floor/plasteel,
/area/medical/research)
"dYE" = (
-/mob/living/carbon/human/monkey,
/obj/structure/bed/roller,
/obj/effect/decal/warning_stripes/yellow/hollow,
+/mob/living/carbon/human/monkey,
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "whitegreencorner"
@@ -94931,10 +94211,19 @@
/turf/simulated/floor/plasteel,
/area/security/securearmoury)
"esK" = (
-/obj/effect/spawner/window/reinforced/plasma,
/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" = (
@@ -95012,7 +94301,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,
@@ -95227,7 +94519,10 @@
/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{
@@ -95241,10 +94536,11 @@
/turf/space,
/area/shuttle/gamma/station)
"fjv" = (
-/mob/living/simple_animal/pet/dog/pug,
/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" = (
@@ -95324,6 +94620,19 @@
},
/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;
@@ -95544,7 +94853,10 @@
/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,
@@ -95588,6 +94900,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"
@@ -95876,6 +95199,10 @@
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
@@ -95885,12 +95212,17 @@
},
/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,
@@ -95964,6 +95296,13 @@
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
@@ -96080,6 +95419,20 @@
"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{
@@ -96182,6 +95535,36 @@
icon_state = "showroomfloor"
},
/area/medical/surgery1)
+"hWz" = (
+/obj/effect/spawner/window/reinforced,
+/obj/structure/cable{
+ 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 = "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
@@ -96236,6 +95619,16 @@
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
@@ -96251,9 +95644,21 @@
/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{
@@ -96262,7 +95667,10 @@
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,
@@ -96383,6 +95791,10 @@
icon_state = "whiteblue"
},
/area/medical/surgery2)
+"iLr" = (
+/obj/item/relic,
+/turf/simulated/floor/engine,
+/area/toxins/explab)
"iLL" = (
/obj/structure/cable{
d1 = 4;
@@ -96426,9 +95838,11 @@
/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{
@@ -96619,6 +96033,21 @@
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;
@@ -96712,6 +96141,15 @@
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{
@@ -96794,6 +96232,15 @@
},
/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/cable{
d1 = 1;
@@ -96973,7 +96420,10 @@
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,
@@ -97281,6 +96731,12 @@
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";
@@ -97348,6 +96804,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{
@@ -97519,14 +96982,16 @@
/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/cable{
@@ -97586,6 +97051,15 @@
icon_state = "whitepurple"
},
/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,
@@ -97776,7 +97250,10 @@
"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{
@@ -97853,7 +97330,10 @@
/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{
@@ -97867,7 +97347,6 @@
},
/area/security/warden)
"njE" = (
-/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small{
dir = 1
},
@@ -97910,7 +97389,10 @@
/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{
@@ -97971,7 +97453,10 @@
/obj/machinery/computer/security/telescreen/entertainment{
pixel_y = 32
},
-/turf/simulated/floor/plating,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "red"
+ },
/area/security/permabrig)
"nFN" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -98004,14 +97489,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" = (
@@ -98122,6 +97611,19 @@
/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
@@ -98159,7 +97661,6 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/effect/decal/cleanable/dirt,
/obj/machinery/camera{
c_tag = "Perma-Brig General Population West";
dir = 4;
@@ -98169,7 +97670,10 @@
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{
@@ -98380,6 +97884,22 @@
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;
@@ -98498,6 +98018,13 @@
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
@@ -98728,11 +98255,13 @@
/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"
},
-/turf/simulated/floor/plating,
/area/security/permabrig)
"qfH" = (
/obj/structure/cable{
@@ -98792,7 +98321,10 @@
"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,
@@ -98905,7 +98437,13 @@
/obj/machinery/meter{
layer = 3.31
},
-/obj/effect/spawner/window/reinforced/plasma,
+/obj/structure/window/plasmareinforced{
+ dir = 4
+ },
+/obj/structure/window/plasmareinforced{
+ dir = 8
+ },
+/obj/structure/grille,
/turf/simulated/floor/plating,
/area/toxins/mixing)
"qWs" = (
@@ -99000,8 +98538,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" = (
@@ -99014,8 +98558,8 @@
},
/obj/item/seeds/carrot,
/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "redcorner"
+ dir = 9;
+ icon_state = "red"
},
/area/security/permabrig)
"reH" = (
@@ -99340,14 +98884,16 @@
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,
@@ -99384,6 +98930,13 @@
/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;
@@ -99514,7 +99067,10 @@
"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,
@@ -99570,6 +99126,21 @@
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
@@ -99727,7 +99298,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,
@@ -99738,6 +99312,16 @@
"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;
@@ -99798,10 +99382,11 @@
},
/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{
@@ -99840,7 +99425,6 @@
/area/security/processing)
"tFK" = (
/obj/item/soap/nanotrasen,
-/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small{
dir = 4
},
@@ -99848,7 +99432,9 @@
/obj/machinery/shower{
pixel_y = 22
},
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ icon_state = "freezerfloor"
+ },
/area/security/permabrig)
"tFO" = (
/obj/structure/cable{
@@ -99947,6 +99533,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";
@@ -100201,6 +99795,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
@@ -100251,7 +99859,6 @@
/area/medical/surgery2)
"uUu" = (
/obj/effect/decal/cleanable/cobweb,
-/obj/effect/decal/cleanable/dirt,
/obj/structure/toilet{
pixel_y = 8
},
@@ -100260,7 +99867,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{
@@ -100382,7 +99989,10 @@
d2 = 2;
icon_state = "1-2"
},
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "redcorner"
+ },
/area/security/permabrig)
"viE" = (
/obj/machinery/power/apc{
@@ -100435,6 +100045,12 @@
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,
@@ -100771,6 +100387,16 @@
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{
@@ -100951,30 +100577,34 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ dir = 0;
+ icon_state = "red"
+ },
/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" = (
@@ -101011,16 +100641,16 @@
},
/area/medical/research)
"xom" = (
-/mob/living/simple_animal/bot/secbot/armsky{
- auto_patrol = 1
- },
/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"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 6
+/mob/living/simple_animal/bot/secbot/armsky{
+ auto_patrol = 1
},
/turf/simulated/floor/plasteel,
/area/security/securearmoury)
@@ -123342,7 +122972,7 @@ bLP
cJR
cLD
cMV
-cOB
+cLD
cQx
cLD
cJR
@@ -123853,7 +123483,7 @@ bXU
cFT
cHk
cIx
-cJT
+haY
cLF
cMX
cOC
@@ -125334,9 +124964,9 @@ aMG
aOb
aPH
aQV
-aPF
+aSD
aSc
-aSI
+aVF
aXj
aYz
bam
@@ -125849,10 +125479,10 @@ aOg
aPy
aQX
aSD
-aUc
-aVF
+aPF
+aSI
aXl
-ban
+aVO
ban
bbP
ban
@@ -126367,9 +125997,9 @@ veH
aVI
aXn
aYD
+cOB
bap
-bap
-bap
+cOB
beK
aXq
bhk
@@ -127910,7 +127540,7 @@ aVM
aXq
aYI
bhp
-bhp
+mfl
bhp
beO
aXn
@@ -128167,11 +127797,11 @@ aVN
aXr
aYJ
bau
-bau
+oZY
bau
aXG
aXr
-bau
+sGz
biV
bkK
bmH
@@ -128420,17 +128050,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
@@ -128678,12 +128308,12 @@ aRg
aSD
aTZ
aVF
-aXt
-aYK
-baw
-aYK
-aYK
-aYK
+bgg
+bkL
+bgg
+aTZ
+ban
+tiC
bgg
ban
ban
@@ -128938,7 +128568,7 @@ aVP
aXu
aYL
aXu
-bbW
+hlY
bbW
beP
bgh
@@ -130810,10 +130440,10 @@ deQ
dga
djf
djn
-ddi
-dng
+wil
+seQ
fjv
-dng
+vnM
ddi
cYc
cXU
@@ -131067,7 +130697,7 @@ deR
dgb
dhK
djo
-dkD
+ddi
dlO
dnc
doB
@@ -131583,7 +131213,7 @@ dhM
djs
dkF
dng
-dng
+iLr
dng
ddi
cQY
@@ -133126,7 +132756,7 @@ djv
dkI
esK
qWp
-esK
+uza
dkI
dkI
dkI
@@ -135161,7 +134791,7 @@ drn
cGt
cHx
cXU
-cYA
+iiv
vYC
mzQ
viE
@@ -137912,7 +137542,7 @@ aBb
axb
axc
axb
-axb
+gpU
axb
axb
aDF
@@ -143279,14 +142909,14 @@ afM
ajZ
ahg
ajZ
-ahi
+ajZ
ajZ
ajZ
cMP
ajZ
ajZ
ajZ
-ahi
+ajZ
ahg
ajZ
ajZ
@@ -143536,18 +143166,18 @@ afN
agn
agH
aiT
-ahT
+aiT
aiT
aiT
aiT
aiT
aiT
akb
-aiL
-agB
-aeb
+aiT
+fuR
+aiT
alK
-aeb
+aiT
ajH
amB
amL
@@ -143791,19 +143421,19 @@ 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
@@ -144048,18 +143678,18 @@ 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
@@ -144305,19 +143935,19 @@ 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
@@ -144562,20 +144192,20 @@ 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
@@ -144819,19 +144449,19 @@ 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
@@ -145076,19 +144706,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
@@ -145333,19 +144963,19 @@ 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
@@ -145590,19 +145220,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
@@ -145847,19 +145477,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
@@ -146104,19 +145734,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
@@ -146361,19 +145991,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
@@ -146618,19 +146248,19 @@ 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
@@ -146875,19 +146505,19 @@ acp
abj
abj
abj
-agK
-ahe
-ahe
-ahe
-ahe
-ahe
-ahe
-ahe
-ahe
-ahe
-ahe
-ahe
-agK
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+akB
alQ
amG
ajL
@@ -147132,19 +146762,19 @@ acp
aaa
abj
abj
-agK
-ahe
-ahl
-ahL
-ahe
-ahe
-ahe
-ahe
-ahe
-akj
-akI
-ahe
-agK
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+akB
axm
amh
amh
@@ -147389,19 +147019,19 @@ acp
abj
abj
abj
-agK
-agK
-agK
-agK
-aiy
-aiy
-aiy
-aiu
-agK
-agK
-agK
-agK
-agK
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+akB
abj
acF
acF
@@ -147649,12 +147279,12 @@ abj
aaa
aaa
aaa
-ahM
-aiz
-agL
-agL
-aiw
-ahM
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -152325,7 +151955,7 @@ rTE
pcv
aZE
bbo
-bcU
+bcV
bex
bhc
uKI
@@ -152828,7 +152458,7 @@ aaa
abj
ygH
ygH
-aqq
+ygH
yez
mhu
mhu
@@ -153083,17 +152713,17 @@ acF
abj
mkp
aaa
-aqq
-tFK
-qeU
-abQ
-aKS
ygH
+tFK
+kju
+aYk
+qeU
+aJJ
aSh
aTF
aVk
aWK
-aYk
+aJJ
aZH
bbr
bcX
@@ -153343,17 +152973,17 @@ abj
ygH
aJx
nli
-abQ
+bbs
aPv
-ygH
+hWz
aSi
aTG
nHs
rbw
aYl
aZI
-bbs
-aml
+bbv
+jBp
beA
bfW
bLB
@@ -153600,14 +153230,14 @@ aaa
ygH
uUu
kju
-abQ
aKU
-ygH
+tOv
+hLa
aSj
aTH
aVl
aWL
-aYk
+aJA
aZJ
bbt
bdi
@@ -153859,11 +153489,11 @@ xDn
aJx
iUc
aOX
+oaB
+fcg
ygH
ygH
ygH
-aqq
-ygH
ygH
bOc
bbt
@@ -154115,9 +153745,9 @@ aml
kOC
ofZ
aND
-abQ
+jLu
aQx
-aQB
+pxj
aJx
aVm
aWM
@@ -154370,7 +154000,7 @@ qJC
ygH
ygH
ipD
-abQ
+aPe
aNE
aPb
aQy
@@ -154621,24 +154251,24 @@ aaa
aaa
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
@@ -154880,13 +154510,13 @@ aaa
abj
ygH
xda
-aGU
+mtL
aIl
aJx
aKR
aMq
aNG
-abQ
+hZR
aSn
aWN
aJx
@@ -155140,12 +154770,12 @@ feV
aGV
aIm
aJJ
-aKS
aKU
-aNF
+aPe
+aNG
aOY
aQB
-aPe
+lMo
aJx
aVm
aWP
@@ -155398,7 +155028,7 @@ rZK
aIn
aKT
aSp
-aSp
+aPj
aNI
aOZ
aQC
@@ -155655,11 +155285,11 @@ eCs
aIo
aJA
aKU
-aKS
-aNJ
-aPa
+aPe
+aNM
aQD
-aKU
+aQD
+lMo
aJx
aVq
aWO
@@ -155913,9 +155543,9 @@ aIp
aJx
aKV
fFd
-aNK
-abQ
-aKU
+aNL
+aPe
+aPe
aTb
aJx
aJx
@@ -156167,12 +155797,12 @@ ygH
tge
eQg
nbE
-aqq
+ygH
njE
eNI
aNL
-aKS
-aKS
+aPe
+aPe
aSr
aJx
aVr
@@ -156426,11 +156056,11 @@ pWQ
ygH
ygH
tvq
-aKU
+aPe
aNM
-aKS
aPe
aPe
+lMo
aTK
aVs
baS
@@ -156438,7 +156068,7 @@ aYq
aZM
bbv
bdd
-aqq
+ygH
aaa
bhh
biG
@@ -156939,12 +156569,12 @@ aaa
aaa
pWQ
qqW
-aKU
+aPe
aJC
aNO
aPe
aQH
-aPj
+aMv
aMv
aMv
aMv
@@ -157196,7 +156826,7 @@ aaa
aaa
ygH
ggp
-aKU
+aqq
hch
aNP
aPf
@@ -158484,7 +158114,7 @@ aaa
aKW
aMv
aMv
-aPj
+aMv
aMv
aMv
aTQ
@@ -158493,7 +158123,7 @@ aWX
aMv
bad
bbH
-aqq
+ygH
abj
aaa
abj
@@ -159002,8 +158632,8 @@ aaa
aaa
aMv
aMv
-aPj
-aPj
+aMv
+aMv
aMv
bda
bbE
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index ae063f30423..ce9bba6d8ad 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,8 +873,7 @@
dir = 8
},
/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "warndark"
+ icon_state = "dark"
},
/area/security/permabrig)
"adz" = (
@@ -945,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;
@@ -968,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
@@ -1085,12 +1058,6 @@
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";
@@ -1101,8 +1068,7 @@
/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{
@@ -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"
},
@@ -2433,15 +2343,6 @@
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{
@@ -2550,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;
@@ -3073,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
@@ -3283,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{
@@ -3687,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
@@ -4258,20 +4111,6 @@
/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)
@@ -4392,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"
@@ -4854,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;
@@ -4889,41 +4697,6 @@
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,
@@ -5308,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;
@@ -5357,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"
@@ -5387,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"
@@ -5629,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,
@@ -6081,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{
@@ -6305,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"
@@ -6702,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;
@@ -7687,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
@@ -7773,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
@@ -8205,9 +7920,6 @@
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,
@@ -8733,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
@@ -9133,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{
@@ -9501,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";
@@ -9831,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;
@@ -10822,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;
@@ -11285,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,
@@ -11369,21 +11027,6 @@
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;
@@ -11889,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"
@@ -11898,6 +11540,7 @@
id_tag = "Secure Gate";
name = "brig shutters"
},
+/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
/area/security/brig)
"aAH" = (
@@ -12270,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;
@@ -12594,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"
@@ -12603,6 +12235,7 @@
id_tag = "Secure Gate";
name = "brig shutters"
},
+/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
/area/security/brig)
"aCs" = (
@@ -12727,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" = (
@@ -17260,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"
@@ -20994,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
},
@@ -22302,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"
@@ -22899,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" = (
@@ -23573,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"
},
@@ -23951,9 +23581,6 @@
name = "Arrivals"
})
"baL" = (
-/obj/machinery/newscaster{
- pixel_y = -32
- },
/obj/machinery/light,
/obj/machinery/camera{
c_tag = "Courtroom - Gallery";
@@ -24634,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;
@@ -24668,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"
@@ -27707,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)
@@ -28282,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)
@@ -28822,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{
@@ -28968,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;
@@ -30089,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
@@ -30237,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" = (
@@ -31788,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
},
@@ -32800,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
@@ -32862,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{
@@ -33325,7 +32852,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 6
},
-/obj/machinery/computer/teleporter,
+/obj/machinery/computer/sm_monitor,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -33976,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"
},
@@ -34247,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";
@@ -35332,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;
@@ -36252,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;
@@ -36400,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
},
@@ -36634,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,
@@ -36645,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{
@@ -39309,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;
@@ -39321,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{
@@ -40467,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" = (
@@ -40556,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"
@@ -40582,6 +40078,9 @@
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"
@@ -40599,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"
@@ -40615,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" = (
@@ -41391,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
@@ -41504,9 +41004,6 @@
},
/area/atmos)
"bJU" = (
-/obj/machinery/atmospherics/pipe/simple/visible/purple{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
@@ -41523,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
},
@@ -41546,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
},
@@ -41567,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" = (
@@ -42309,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"
@@ -42323,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
},
@@ -42491,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
@@ -42503,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{
@@ -42525,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,
@@ -43358,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"
@@ -43408,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
@@ -44269,18 +43750,8 @@
/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,
+/obj/machinery/smartfridge/foodcart,
/turf/simulated/floor/plasteel{
icon_state = "showroomfloor"
},
@@ -44660,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;
@@ -44701,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" = (
@@ -45210,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;
@@ -45843,34 +45295,6 @@
icon_state = "whiteblue"
},
/area/medical/paramedic)
-"bTf" = (
-/obj/machinery/light{
- dir = 4
- },
-/obj/machinery/computer/security{
- dir = 8;
- network = list("SS13","Research Outpost","Mining Outpost")
- },
-/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,
@@ -46143,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{
@@ -46171,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;
@@ -46508,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
@@ -46546,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;
@@ -46567,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{
@@ -46616,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
},
@@ -46707,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"
@@ -49199,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;
@@ -50714,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,
@@ -50794,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;
@@ -50835,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;
@@ -51140,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;
@@ -56221,7 +55502,6 @@
dir = 4;
network = list("SS13","Medbay")
},
-/obj/structure/filingcabinet/filingcabinet,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "whiteblue"
@@ -62813,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
@@ -66950,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"
@@ -69772,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,
@@ -69784,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{
@@ -69929,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;
@@ -70090,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
@@ -70275,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{
@@ -70657,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{
@@ -70679,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
@@ -70691,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"
@@ -70792,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{
@@ -71082,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
@@ -71092,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{
@@ -71116,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
@@ -71152,11 +70409,6 @@
name = "\improper Departure Lounge"
})
"cTT" = (
-/obj/structure/cable/yellow{
- d1 = 2;
- d2 = 8;
- icon_state = "2-8"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
@@ -71333,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{
@@ -71375,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"
@@ -71447,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,
@@ -71522,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"
},
@@ -71529,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;
@@ -72260,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
@@ -75551,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{
@@ -75606,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,
@@ -75696,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"
},
@@ -75747,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{
@@ -75790,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;
@@ -75870,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{
@@ -75920,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;
@@ -75945,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;
@@ -75965,11 +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/manifold/hidden/scrubbers{
dir = 4
},
@@ -76022,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,
@@ -76190,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
},
@@ -76239,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;
@@ -76263,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;
@@ -76339,42 +75323,9 @@
/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"
})
@@ -76396,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;
@@ -76455,34 +75394,10 @@
/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{
dir = 1
@@ -77289,15 +76204,6 @@
},
/turf/simulated/floor/plasteel,
/area/engine/engineering)
-"eNd" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- dir = 5;
- icon_state = "vault"
- },
-/area/engine/mechanic_workshop)
"ePy" = (
/obj/structure/chair/comfy/beige,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -77420,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
@@ -77517,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{
@@ -77688,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;
@@ -78322,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{
@@ -78458,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;
@@ -78715,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;
@@ -78813,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,
@@ -78897,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
@@ -78939,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" = (
@@ -79433,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,
@@ -79478,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,
@@ -79629,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
@@ -79678,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;
@@ -80034,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
@@ -80497,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;
@@ -80663,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
@@ -80832,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;
@@ -80871,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{
@@ -81184,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"
@@ -81257,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,
@@ -81338,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{
@@ -81400,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
},
@@ -81645,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
@@ -81855,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
@@ -82266,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
@@ -82393,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"
@@ -82596,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
@@ -83154,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;
@@ -83203,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
},
@@ -83346,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;
@@ -83373,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{
@@ -92110,7 +90932,7 @@ aaa
aaa
aaa
aaa
-ibR
+aaa
aaa
aaa
aaa
@@ -92366,10 +91188,10 @@ aaa
aaa
aaa
aaa
-kmF
-fwO
-kmF
-abq
+aaa
+hIZ
+aaa
+aaa
aaa
aaa
aaa
@@ -92624,11 +91446,11 @@ aaa
aaa
aaa
kmF
-bOx
+bUO
kmF
abq
-abq
-abq
+aaa
+aaa
aaa
aaa
aaa
@@ -92881,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
@@ -93137,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
@@ -93394,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
@@ -93651,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
@@ -93908,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
@@ -94165,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
@@ -94422,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
@@ -94679,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
@@ -94940,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
@@ -95196,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
@@ -95451,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
@@ -95709,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
@@ -111616,7 +110438,7 @@ aNA
aNq
aVD
aNC
-aNC
+bTH
aMk
beH
bcX
@@ -114410,7 +113232,7 @@ ugy
akU
als
amQ
-amF
+aoe
apC
apC
apC
@@ -115170,13 +113992,13 @@ aaa
aaa
aaa
aaa
+aaa
+abq
+abq
+abq
+abq
abq
abq
-aaa
-aaa
-aaa
-aaa
-aaa
abq
abq
alP
@@ -115427,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
@@ -115684,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
@@ -115942,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
@@ -116199,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
@@ -116455,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
@@ -116712,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
@@ -116969,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
@@ -117227,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
@@ -117484,14 +116306,14 @@ aaa
aaa
aaa
aaa
-aeM
aaa
aaa
aaa
aaa
-aeM
aaa
-abq
+aaa
+aaa
+aaa
aaa
abq
abq
@@ -123972,7 +122794,7 @@ bxI
bCN
bEM
bGw
-bIe
+bIf
bJT
bLU
bOQ
@@ -124743,9 +123565,9 @@ buz
bCM
bCM
bCM
-bzL
+dgr
bJV
-bNa
+gbT
bCM
bQz
bCM
@@ -125503,9 +124325,9 @@ bck
aIu
rDF
bqO
-bnC
+bqO
dfB
-dgL
+foM
foM
aZo
bqT
@@ -125759,10 +124581,10 @@ bfr
hIG
aFR
uaQ
-bli
+bpn
sFz
-dfA
-iZY
+bpn
+bpn
bvt
iRu
bqU
@@ -126014,11 +124836,11 @@ aFR
aFR
aFR
aFR
-uaQ
-pSk
-uDi
-vmY
-blj
+aFR
+bjN
+bjN
+bjN
+bjN
dgO
bjN
rPb
@@ -126271,12 +125093,12 @@ bfz
pUc
pUc
kKa
-anq
-deW
-dfg
-eNd
-bsZ
-anq
+aaa
+aaa
+aaa
+aaa
+aaa
+bnt
bnt
cZS
bxf
@@ -126528,12 +125350,12 @@ aKT
bfz
pUc
rYj
-anq
-avP
-dfh
-eNd
-dfI
-anq
+aaa
+aaa
+aaa
+aaa
+aaa
+bnt
bvu
bly
bxg
@@ -126785,12 +125607,12 @@ aKT
tgE
pUc
kKa
-anq
-dfa
-dfg
-dfq
-bta
-anq
+aaa
+aaa
+aaa
+aaa
+aaa
+bnt
bsG
bza
fxB
@@ -127042,12 +125864,12 @@ aKT
bfz
pUc
rYj
-anq
-anq
-pPA
-dfx
-dfK
-anq
+aaa
+aaa
+aaa
+aaa
+aaa
+bnt
bvv
bvk
bAt
@@ -127300,11 +126122,11 @@ xLf
qtt
vmT
qtt
-anq
-dfj
-dfu
-dfJ
-anq
+aaa
+aaa
+aaa
+aaa
+aaa
bsI
bwr
aWC
@@ -127557,11 +126379,11 @@ bfz
wxE
wxE
gyy
-anq
-pRy
-aoN
-btc
-anq
+aaa
+aaa
+aaa
+aaa
+aaa
bsJ
bwv
aaa
@@ -127814,11 +126636,11 @@ tgE
wxE
wxE
qtt
-anq
-dfk
-aoN
-aoN
-anq
+aaa
+aaa
+aaa
+aaa
+aaa
bsJ
bwv
aaa
@@ -128071,11 +126893,11 @@ bfz
wxE
wxE
gyy
-anq
-dfk
-aoN
-dgK
-anq
+aaa
+aaa
+aaa
+aaa
+aaa
bsK
bwy
bxj
@@ -128328,11 +127150,11 @@ xLf
vfv
vfv
qtt
-anq
-dfl
-dfl
-azD
-anq
+aaa
+aaa
+aaa
+aaa
+aaa
wAP
bwF
bsN
@@ -128585,11 +127407,11 @@ vmT
vfv
vfv
gyy
-anq
-abq
-abq
-abq
-anq
+aaa
+aaa
+aaa
+aaa
+aaa
bIu
bwL
abq
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 bf46b1dc4a1..d0a78eba5d1 100644
--- a/_maps/map_files/cyberiad/cyberiad.dmm
+++ b/_maps/map_files/cyberiad/cyberiad.dmm
@@ -8,7 +8,7 @@
/area/space/nearstation)
"aac" = (
/obj/machinery/alarm{
- pixel_y = 22
+ pixel_y = 24
},
/obj/structure/table,
/obj/item/radio/electropack,
@@ -180,11 +180,6 @@
/obj/item/target,
/obj/item/target,
/obj/item/target,
-/obj/structure/cable{
- d2 = 2;
- icon_state = "0-2";
- pixel_y = 1
- },
/turf/simulated/floor/plasteel,
/area/security/range)
"acD" = (
@@ -229,8 +224,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/turf/simulated/floor/plating,
/area/security/prisonershuttle)
@@ -244,13 +238,12 @@
/obj/effect/decal/warning_stripes/west,
/obj/machinery/alarm{
dir = 4;
- pixel_x = -22
+ pixel_x = -24
},
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -345,8 +338,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel,
/area/security/prisonershuttle)
@@ -386,8 +378,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/turf/simulated/floor/plasteel{
icon_state = "floorgrime"
@@ -430,7 +421,7 @@
/obj/machinery/recharger,
/obj/machinery/alarm{
dir = 4;
- pixel_x = -22
+ pixel_x = -24
},
/turf/simulated/floor/plating,
/area/security/range)
@@ -490,8 +481,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 2;
@@ -534,8 +524,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,
@@ -620,8 +609,7 @@
/area/security/range)
"adH" = (
/obj/machinery/light{
- dir = 1;
- on = 1
+ dir = 1
},
/obj/machinery/suit_storage_unit/security/hos,
/turf/simulated/floor/plasteel{
@@ -654,8 +642,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
@@ -665,14 +652,15 @@
},
/area/security/prisonershuttle)
"adM" = (
-/obj/machinery/computer/prisoner{
- req_access = null;
- req_access_txt = "2"
- },
/obj/machinery/alarm{
dir = 8;
pixel_x = 24
},
+/obj/machinery/computer/prisoner{
+ dir = 8;
+ req_access = null;
+ req_access_txt = "2"
+ },
/turf/simulated/floor/plasteel,
/area/security/prisonershuttle)
"adN" = (
@@ -683,8 +671,7 @@
/area/security/permabrig)
"adO" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 10;
- initialize_directions = 10
+ dir = 10
},
/turf/simulated/floor/plasteel{
icon_state = "floorgrime"
@@ -694,8 +681,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,
@@ -705,12 +691,6 @@
/area/security/armoury)
"adQ" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2";
- tag = ""
- },
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/security/glass{
name = "Firing Range";
@@ -723,8 +703,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/security/glass{
@@ -734,7 +713,9 @@
/turf/simulated/floor/plasteel,
/area/security/range)
"adX" = (
-/obj/structure/chair/stool,
+/obj/structure/chair/stool{
+ dir = 8
+ },
/obj/structure/cable{
d1 = 1;
d2 = 4;
@@ -749,8 +730,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -782,14 +762,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/hologram/holopad,
/turf/simulated/floor/plasteel,
@@ -798,21 +776,21 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel,
/area/security/prisonershuttle)
"aed" = (
-/obj/machinery/computer/secure_data,
/obj/machinery/light/small{
- dir = 4;
- pixel_y = 8
+ dir = 4
},
/obj/machinery/firealarm{
dir = 4;
pixel_x = 24
},
+/obj/machinery/computer/secure_data{
+ dir = 8
+ },
/turf/simulated/floor/plasteel,
/area/security/prisonershuttle)
"aee" = (
@@ -852,8 +830,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/turf/simulated/floor/plating,
/area/security/medbay)
@@ -861,20 +838,17 @@
/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/door/firedoor,
/obj/machinery/door/airlock/security/glass{
@@ -888,7 +862,6 @@
},
/area/security/armoury)
"aej" = (
-/obj/structure/closet/secure_closet/security,
/obj/structure/window/reinforced{
dir = 8
},
@@ -898,6 +871,7 @@
name = "Security Requests Console";
pixel_y = 30
},
+/obj/machinery/vending/secdrobe,
/turf/simulated/floor/plasteel{
dir = 9;
icon_state = "red"
@@ -922,8 +896,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
dir = 1;
@@ -934,8 +907,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
@@ -971,8 +943,7 @@
/obj/structure/bed,
/obj/item/bedsheet/blue,
/obj/machinery/light{
- dir = 1;
- on = 1
+ dir = 1
},
/obj/structure/cable{
d1 = 1;
@@ -1014,7 +985,9 @@
},
/area/security/armoury)
"aey" = (
-/obj/machinery/computer/brigcells,
+/obj/machinery/computer/brigcells{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 9;
icon_state = "darkred"
@@ -1038,12 +1011,10 @@
/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;
- initialize_directions = 10
+ dir = 10
},
/turf/simulated/floor/plasteel,
/area/security/main)
@@ -1053,25 +1024,16 @@
/turf/simulated/floor/carpet,
/area/security/hos)
"aeD" = (
-/obj/machinery/computer/secure_data,
/obj/item/radio/intercom/department/security{
pixel_x = 25
},
+/obj/machinery/computer/secure_data{
+ dir = 8
+ },
/turf/simulated/floor/plasteel{
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";
@@ -1091,8 +1053,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 4;
- icon_state = "1-4";
- tag = "90Curve"
+ icon_state = "1-4"
},
/turf/simulated/floor/plasteel,
/area/security/prisonershuttle)
@@ -1150,8 +1111,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/disposalpipe/segment{
dir = 2;
@@ -1216,8 +1176,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{
@@ -1228,11 +1187,10 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/sink{
- pixel_y = 32
+ pixel_y = 25
},
/turf/simulated/floor/plasteel{
dir = 1;
@@ -1245,7 +1203,8 @@
dir = 8
},
/obj/machinery/light_switch{
- pixel_x = -25
+ dir = 4;
+ pixel_x = -24
},
/obj/machinery/firealarm{
dir = 8;
@@ -1257,16 +1216,17 @@
},
/area/security/warden)
"aeV" = (
-/obj/machinery/computer/security{
- network = list("SS13","Research Outpost","Mining Outpost")
- },
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/item/radio/intercom{
- pixel_x = 25
+ pixel_x = 28
+ },
+/obj/machinery/computer/security{
+ dir = 8;
+ network = list("SS13","Research Outpost","Mining Outpost")
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -1276,8 +1236,7 @@
/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{
@@ -1308,11 +1267,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{
@@ -1334,7 +1288,7 @@
/area/security/prisonershuttle)
"afa" = (
/obj/item/radio/intercom{
- pixel_y = -27
+ pixel_y = -28
},
/obj/structure/table,
/obj/item/clothing/under/color/orange/prison,
@@ -1370,14 +1324,14 @@
/area/security/prisonershuttle)
"afd" = (
/obj/structure/table/glass,
-/obj/machinery/computer/med_data/laptop,
/obj/machinery/alarm{
dir = 4;
- pixel_x = -22
+ pixel_x = -24
},
/obj/machinery/light{
dir = 8
},
+/obj/machinery/computer/med_data/laptop,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "whiteblue"
@@ -1534,8 +1488,7 @@
/area/security/medbay)
"afu" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 10;
- initialize_directions = 10
+ dir = 10
},
/obj/structure/cable{
d1 = 1;
@@ -1561,13 +1514,14 @@
},
/area/security/medbay)
"afx" = (
-/obj/structure/closet/wardrobe/red,
/obj/machinery/light_switch{
- pixel_y = -25
+ dir = 1;
+ pixel_y = -24
},
-/obj/item/clothing/suit/tracksuit/red,
+/obj/structure/closet/secure_closet/security,
/turf/simulated/floor/plasteel{
- icon_state = "redcorner"
+ dir = 6;
+ icon_state = "red"
},
/area/security/main)
"afJ" = (
@@ -1585,14 +1539,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{
@@ -1601,9 +1547,6 @@
pixel_y = 8
},
/obj/item/stamp/hos,
-/obj/item/spacepod_key{
- id = 100000
- },
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 4
},
@@ -1611,14 +1554,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)
@@ -1726,8 +1661,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 4;
- icon_state = "1-4";
- tag = "90Curve"
+ icon_state = "1-4"
},
/turf/simulated/floor/plasteel,
/area/security/prisonlockers)
@@ -1750,8 +1684,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
@@ -1783,8 +1716,7 @@
/area/security/brig)
"agp" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 4;
- initialize_directions = 11
+ dir = 4
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 4
@@ -1878,8 +1810,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,
@@ -1902,8 +1833,7 @@
pixel_y = 24
},
/obj/machinery/light{
- dir = 1;
- on = 1
+ dir = 1
},
/obj/structure/disposalpipe/segment{
dir = 4
@@ -1926,8 +1856,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,
@@ -1993,8 +1922,7 @@
"agT" = (
/obj/structure/cable{
d2 = 2;
- icon_state = "0-2";
- pixel_y = 1
+ icon_state = "0-2"
},
/obj/machinery/power/apc{
dir = 1;
@@ -2052,14 +1980,18 @@
/turf/simulated/floor/plasteel,
/area/security/seceqstorage)
"agY" = (
-/obj/structure/chair/stool,
+/obj/structure/chair/stool{
+ dir = 1
+ },
/obj/machinery/atmospherics/unary/vent_pump/on,
/turf/simulated/floor/plasteel{
icon_state = "redfull"
},
/area/security/main)
"ahe" = (
-/obj/structure/chair/stool,
+/obj/structure/chair/stool{
+ dir = 1
+ },
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 4
},
@@ -2071,8 +2003,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
@@ -2097,7 +2028,7 @@
dir = 4
},
/obj/machinery/alarm{
- pixel_y = 23
+ pixel_y = 24
},
/turf/simulated/floor/plasteel{
dir = 4;
@@ -2124,8 +2055,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
dir = 4;
@@ -2145,8 +2075,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,
@@ -2162,13 +2091,11 @@
/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
+ dir = 1
},
/obj/item/radio/intercom{
- pixel_y = 25
+ pixel_y = 28
},
/obj/item/storage/box/chemimp{
pixel_x = 4;
@@ -2201,7 +2128,7 @@
/area/security/medbay)
"ahQ" = (
/obj/machinery/alarm{
- pixel_y = 23
+ pixel_y = 24
},
/obj/machinery/camera{
c_tag = "Brig Main Hall East 1"
@@ -2304,26 +2231,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
@@ -2506,8 +2413,7 @@
"ait" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 1;
- initialize_directions = 11
+ dir = 1
},
/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel{
@@ -2519,8 +2425,7 @@
dir = 1
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 1;
- initialize_directions = 11
+ dir = 1
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -2551,7 +2456,7 @@
/area/security/armoury)
"aix" = (
/obj/item/radio/intercom{
- pixel_y = 25
+ pixel_y = 28
},
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/turf/simulated/floor/plasteel,
@@ -2570,8 +2475,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
@@ -2666,8 +2570,7 @@
dir = 1
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 1;
- initialize_directions = 11
+ dir = 1
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -2690,8 +2593,7 @@
/area/security/brig)
"aiS" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 1;
- initialize_directions = 11
+ dir = 1
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 1
@@ -2738,7 +2640,8 @@
dir = 4
},
/obj/machinery/light_switch{
- pixel_y = -25
+ dir = 1;
+ pixel_y = -24
},
/obj/machinery/light,
/turf/simulated/floor/plasteel{
@@ -2820,24 +2723,23 @@
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"
},
/area/security/brig)
"aja" = (
/obj/machinery/light_switch{
- pixel_y = 25
+ pixel_y = 24
},
/obj/structure/table,
/obj/machinery/light{
@@ -2854,9 +2756,6 @@
icon_state = "barber"
},
/area/security/permabrig)
-"ajb" = (
-/turf/simulated/wall/r_wall,
-/area/security/podbay)
"ajc" = (
/obj/structure/table,
/turf/simulated/floor/plasteel{
@@ -2896,11 +2795,11 @@
},
/area/security/permabrig)
"aji" = (
-/obj/machinery/computer/library/public,
/obj/structure/table,
/obj/machinery/newscaster{
pixel_y = 32
},
+/obj/machinery/computer/library/public,
/turf/simulated/floor/plasteel{
icon_state = "floorgrime"
},
@@ -2943,8 +2842,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -2954,8 +2852,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/ai_status_display{
pixel_y = -32
@@ -3001,63 +2898,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
@@ -3096,14 +2936,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{
icon_state = "darkred"
@@ -3113,8 +2951,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/door/firedoor,
/turf/simulated/floor/plasteel{
@@ -3125,14 +2962,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 = "90Curve"
+ icon_state = "1-4"
},
/turf/simulated/floor/plasteel{
icon_state = "darkred"
@@ -3146,8 +2981,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
icon_state = "darkred"
@@ -3157,20 +2991,17 @@
/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"
+ icon_state = "1-4"
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/turf/simulated/floor/plasteel{
icon_state = "darkred"
@@ -3183,8 +3014,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
icon_state = "darkredcorners"
@@ -3197,14 +3027,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 = "90Curve"
+ icon_state = "1-4"
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -3221,8 +3049,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -3284,8 +3111,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/structure/cable{
d1 = 4;
@@ -3301,24 +3127,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;
@@ -3409,7 +3217,6 @@
icon_state = "pipe-c"
},
/obj/structure/extinguisher_cabinet{
- pixel_x = -5;
pixel_y = -30
},
/turf/simulated/floor/plasteel{
@@ -3432,8 +3239,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/structure/cable{
d1 = 4;
@@ -3472,8 +3278,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,
@@ -3481,12 +3286,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;
@@ -3529,7 +3328,8 @@
/obj/structure/table,
/obj/item/taperecorder,
/obj/machinery/light_switch{
- pixel_x = -25
+ dir = 4;
+ pixel_x = -24
},
/obj/item/radio/intercom/department/security{
pixel_y = 28
@@ -3547,30 +3347,13 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/turf/simulated/floor/plasteel{
dir = 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)
@@ -3613,13 +3396,14 @@
},
/obj/structure/cable{
d2 = 2;
- icon_state = "0-2";
- pixel_y = 1
+ icon_state = "0-2"
},
/turf/simulated/floor/plasteel,
/area/security/main)
"akG" = (
-/obj/structure/chair/stool,
+/obj/structure/chair/stool{
+ dir = 1
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "barber"
@@ -3629,8 +3413,7 @@
/obj/effect/spawner/window/reinforced,
/obj/structure/cable{
d2 = 2;
- icon_state = "0-2";
- pixel_y = 1
+ icon_state = "0-2"
},
/turf/simulated/floor/plating,
/area/security/hos)
@@ -3657,7 +3440,7 @@
/area/security/hos)
"akK" = (
/obj/machinery/alarm{
- pixel_y = 23
+ pixel_y = 24
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -3673,8 +3456,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/turf/simulated/floor/plasteel,
/area/security/permabrig)
@@ -3682,11 +3464,11 @@
/obj/machinery/newscaster{
pixel_y = 30
},
+/obj/structure/closet/secure_closet/hos,
+/obj/item/reagent_containers/food/drinks/flask/barflask,
/obj/machinery/computer/security/telescreen/entertainment{
pixel_x = 32
},
-/obj/structure/closet/secure_closet/hos,
-/obj/item/reagent_containers/food/drinks/flask/barflask,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -3696,8 +3478,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/door/poddoor{
density = 0;
@@ -3712,8 +3493,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -3731,8 +3511,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/turf/simulated/floor/plasteel{
dir = 9;
@@ -3741,8 +3520,7 @@
/area/security/permabrig)
"akU" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/obj/structure/cable{
d1 = 1;
@@ -3751,8 +3529,7 @@
},
/obj/machinery/hologram/holopad,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -3786,8 +3563,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 4;
- icon_state = "1-4";
- tag = "90Curve"
+ icon_state = "1-4"
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -3799,14 +3575,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 = "90Curve"
+ icon_state = "1-4"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel{
@@ -3826,8 +3600,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 2;
@@ -3843,8 +3616,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/structure/cable{
d1 = 4;
@@ -3948,7 +3720,8 @@
/area/security/armoury)
"alj" = (
/obj/machinery/light_switch{
- pixel_x = -25
+ dir = 4;
+ pixel_x = -24
},
/obj/structure/cable{
d1 = 2;
@@ -3974,8 +3747,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 1;
@@ -3990,14 +3762,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{
icon_state = "dark"
@@ -4019,8 +3789,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -4054,7 +3823,7 @@
/obj/item/storage/fancy/cigarettes/cigpack_robust,
/obj/machinery/alarm{
dir = 4;
- pixel_x = -22
+ pixel_x = -24
},
/obj/machinery/light{
dir = 8
@@ -4094,10 +3863,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,
@@ -4137,13 +3902,11 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d2 = 2;
- icon_state = "0-2";
- pixel_y = 1
+ icon_state = "0-2"
},
/turf/simulated/floor/plating,
/area/security/hos)
@@ -4186,18 +3949,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,
@@ -4229,7 +3980,8 @@
icon_state = "4-8"
},
/obj/machinery/light_switch{
- pixel_y = -25
+ dir = 1;
+ pixel_y = -24
},
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 1
@@ -4286,8 +4038,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -4301,8 +4052,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -4317,7 +4067,6 @@
"alS" = (
/obj/structure/closet,
/obj/item/radio/intercom{
- dir = 0;
pixel_x = -28
},
/turf/simulated/floor/plasteel{
@@ -4328,20 +4077,17 @@
/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/door/firedoor,
/obj/machinery/door/airlock/security/glass{
@@ -4366,8 +4112,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/security/glass{
@@ -4438,8 +4183,7 @@
pixel_y = 30
},
/obj/machinery/light{
- dir = 1;
- on = 1
+ dir = 1
},
/turf/simulated/floor/plasteel{
dir = 1;
@@ -4449,7 +4193,7 @@
"amd" = (
/obj/structure/closet/secure_closet/security,
/obj/machinery/alarm{
- pixel_y = 23
+ pixel_y = 24
},
/turf/simulated/floor/plasteel{
dir = 1;
@@ -4470,35 +4214,20 @@
opacity = 0
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"amf" = (
-/obj/structure/closet/secure_closet/security,
/obj/structure/window/reinforced{
dir = 4
},
/obj/item/radio/intercom{
- pixel_y = 25
+ pixel_y = 28
},
+/obj/machinery/vending/secdrobe,
/turf/simulated/floor/plasteel{
dir = 5;
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,
@@ -4508,8 +4237,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
dir = 10;
@@ -4534,8 +4262,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/camera{
c_tag = "Brig Briefing Room East";
@@ -4550,8 +4277,7 @@
/obj/effect/spawner/window/reinforced,
/obj/structure/cable{
d2 = 2;
- icon_state = "0-2";
- pixel_y = 1
+ icon_state = "0-2"
},
/turf/simulated/floor/plating,
/area/security/main)
@@ -4581,15 +4307,16 @@
name = "Head of Security Requests Console";
pixel_x = 30
},
-/obj/machinery/computer/brigcells,
+/obj/machinery/computer/brigcells{
+ dir = 8
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
/area/security/hos)
"amu" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 10;
- initialize_directions = 10
+ dir = 10
},
/turf/simulated/floor/carpet,
/area/security/hos)
@@ -4614,17 +4341,12 @@
opacity = 0
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint)
-"amx" = (
-/obj/effect/decal/cleanable/fungus,
-/turf/simulated/wall/r_wall,
-/area/security/podbay)
+/area/maintenance/fore)
"amy" = (
/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,
@@ -4642,11 +4364,10 @@
/obj/structure/table,
/obj/machinery/recharger,
/obj/machinery/alarm{
- pixel_y = 23
+ pixel_y = 24
},
/obj/machinery/light{
- dir = 1;
- on = 1
+ dir = 1
},
/obj/machinery/camera{
c_tag = "Brig Warden's Office"
@@ -4660,8 +4381,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -4682,13 +4402,14 @@
/obj/effect/spawner/window/reinforced,
/obj/structure/cable{
d2 = 2;
- icon_state = "0-2";
- pixel_y = 1
+ icon_state = "0-2"
},
/turf/simulated/floor/plating,
/area/security/warden)
"amE" = (
-/obj/machinery/computer/prisoner,
+/obj/machinery/computer/prisoner{
+ dir = 8
+ },
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "darkred"
@@ -4758,14 +4479,14 @@
pixel_y = 28
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"amL" = (
/obj/machinery/shower{
dir = 8
},
/obj/structure/curtain/open/shower,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"amM" = (
/turf/simulated/floor/plasteel{
dir = 4;
@@ -4776,14 +4497,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/hologram/holopad,
/turf/simulated/floor/plasteel{
@@ -4808,8 +4527,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/structure/cable{
d1 = 1;
@@ -4831,18 +4549,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,
@@ -4856,8 +4562,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{
@@ -4878,10 +4583,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,
@@ -4891,7 +4592,7 @@
/obj/structure/reagent_dispensers/watertank,
/obj/item/reagent_containers/glass/bucket,
/obj/structure/sink/kitchen{
- pixel_y = 28
+ pixel_y = 25
},
/turf/simulated/floor/plasteel{
dir = 1;
@@ -4949,8 +4650,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
icon_state = "floorgrime"
@@ -4967,7 +4667,8 @@
"ani" = (
/obj/structure/closet/secure_closet/brig,
/obj/machinery/light_switch{
- pixel_x = -25
+ dir = 4;
+ pixel_x = -24
},
/turf/simulated/floor/plasteel,
/area/security/prisonlockers)
@@ -5008,8 +4709,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
dir = 10;
@@ -5024,7 +4724,6 @@
/turf/simulated/floor/plating,
/area/security/permabrig)
"anq" = (
-/obj/effect/spawner/window/reinforced,
/obj/machinery/door/poddoor{
density = 0;
icon_state = "open";
@@ -5033,8 +4732,14 @@
opacity = 0
},
/obj/structure/cable{
- d2 = 2;
- icon_state = "0-2"
+ d2 = 4;
+ icon_state = "0-4"
+ },
+/obj/effect/spawner/window/reinforced,
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
},
/turf/simulated/floor/plating,
/area/security/permabrig)
@@ -5043,6 +4748,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
},
+/obj/structure/cable{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
/turf/simulated/floor/plating,
/area/security/permabrig)
"ans" = (
@@ -5057,6 +4767,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 6
},
+/obj/structure/cable{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
+ },
/turf/simulated/floor/plating,
/area/security/permabrig)
"anu" = (
@@ -5078,8 +4793,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{
@@ -5099,8 +4813,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door/poddoor{
density = 0;
@@ -5126,15 +4839,13 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 1;
- initialize_directions = 11
+ dir = 1
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -5200,8 +4911,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/machinery/door/window/brigdoor{
dir = 8;
@@ -5223,8 +4933,7 @@
/area/security/warden)
"anF" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 4;
- initialize_directions = 11
+ dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel,
@@ -5233,8 +4942,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/lattice/catwalk,
/turf/space,
@@ -5278,8 +4986,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/security/glass{
@@ -5290,10 +4997,14 @@
/area/security/seceqstorage)
"anL" = (
/obj/machinery/hologram/holopad,
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ icon_state = "redfull"
+ },
/area/security/main)
"anM" = (
-/obj/structure/chair/stool,
+/obj/structure/chair/stool{
+ dir = 1
+ },
/turf/simulated/floor/plasteel{
icon_state = "redfull"
},
@@ -5308,8 +5019,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel,
/area/security/main)
@@ -5321,7 +5031,7 @@
},
/obj/machinery/alarm{
dir = 4;
- pixel_x = -25
+ pixel_x = -24
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 6
@@ -5344,8 +5054,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/security/glass{
@@ -5385,8 +5094,7 @@
},
/obj/item/book/manual/sop_security,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 1;
- initialize_directions = 11
+ dir = 1
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel,
@@ -5398,8 +5106,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/landmark/start{
name = "Security Officer"
@@ -5451,8 +5158,7 @@
pixel_x = -28
},
/obj/machinery/light{
- dir = 1;
- in_use = 1
+ dir = 1
},
/turf/simulated/floor/plasteel{
icon_state = "cult"
@@ -5470,7 +5176,7 @@
"aoc" = (
/obj/machinery/alarm{
dir = 4;
- pixel_x = -22
+ pixel_x = -24
},
/obj/machinery/light{
dir = 8
@@ -5500,8 +5206,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable,
/turf/simulated/floor/plating,
@@ -5539,22 +5244,6 @@
icon_state = "white"
},
/area/security/medbay)
-"aoj" = (
-/obj/effect/spawner/window/reinforced,
-/obj/structure/cable{
- d2 = 2;
- icon_state = "0-2";
- pixel_y = 1
- },
-/obj/machinery/door/poddoor{
- density = 0;
- icon_state = "open";
- id_tag = "Secure Gate";
- name = "Security Blast Door";
- opacity = 0
- },
-/turf/simulated/floor/plating,
-/area/security/lobby)
"aok" = (
/obj/structure/table,
/obj/item/book/manual/security_space_law,
@@ -5570,7 +5259,9 @@
},
/area/security/evidence)
"aom" = (
-/obj/machinery/computer/brigcells,
+/obj/machinery/computer/brigcells{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 9;
icon_state = "darkred"
@@ -5602,7 +5293,8 @@
icon_state = "1-2"
},
/obj/machinery/light_switch{
- pixel_x = -25
+ dir = 4;
+ pixel_x = -24
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel{
@@ -5625,8 +5317,7 @@
"aoq" = (
/obj/structure/cable{
d2 = 2;
- icon_state = "0-2";
- pixel_y = 1
+ icon_state = "0-2"
},
/obj/machinery/door/poddoor{
density = 0;
@@ -5671,14 +5362,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/hologram/holopad,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -5717,7 +5406,9 @@
},
/area/security/prison/cell_block/A)
"aox" = (
-/obj/machinery/computer/secure_data,
+/obj/machinery/computer/secure_data{
+ dir = 8
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "darkred"
@@ -5727,13 +5418,11 @@
/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/manifold/hidden/scrubbers{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/turf/simulated/floor/plasteel,
/area/security/seceqstorage)
@@ -5777,8 +5466,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/security/glass{
@@ -5836,6 +5524,9 @@
d2 = 4;
icon_state = "1-4"
},
+/obj/effect/decal/warning_stripes/red/partial{
+ dir = 1
+ },
/turf/simulated/floor/plasteel,
/area/security/main)
"aoI" = (
@@ -5856,14 +5547,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/lattice/catwalk,
/turf/space,
@@ -5872,8 +5561,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/structure/cable{
d1 = 1;
@@ -5938,19 +5626,16 @@
/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/scrubbers,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 4;
- initialize_directions = 11
+ dir = 4
},
/turf/simulated/floor/plasteel{
dir = 1;
@@ -5971,7 +5656,9 @@
/obj/machinery/light{
dir = 4
},
-/obj/machinery/computer/card/minor/hos,
+/obj/machinery/computer/card/minor/hos{
+ dir = 8
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -5980,8 +5667,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,
@@ -6048,8 +5734,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,
@@ -6070,8 +5755,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,
@@ -6090,7 +5774,7 @@
/obj/structure/closet,
/obj/machinery/alarm{
dir = 4;
- pixel_x = -22
+ pixel_x = -24
},
/obj/machinery/light/small{
dir = 8
@@ -6165,6 +5849,7 @@
/area/security/warden)
"apk" = (
/obj/machinery/computer/security{
+ dir = 8;
network = list("SS13","Research Outpost","Mining Outpost")
},
/turf/simulated/floor/plasteel{
@@ -6176,14 +5861,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/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -6198,20 +5881,17 @@
/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;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/lattice/catwalk,
/turf/space,
@@ -6266,14 +5946,12 @@
icon_state = "2-8"
},
/obj/machinery/atmospherics/unary/vent_pump/on,
-/turf/simulated/floor/plasteel{
- icon_state = "bcarpet05"
- },
+/turf/simulated/floor/carpet/cyan,
/area/security/prison/cell_block/A)
"apA" = (
/obj/machinery/vending/wallmed{
name = "Emergency NanoMed";
- pixel_x = -27
+ pixel_x = -28
},
/obj/structure/table/reinforced,
/obj/item/stack/medical/bruise_pack/advanced,
@@ -6359,25 +6037,21 @@
},
/area/security/evidence)
"apH" = (
-/obj/structure/closet/secure_closet/security,
-/obj/structure/window/reinforced{
- dir = 8
- },
-/turf/simulated/floor/plasteel{
- dir = 10;
- icon_state = "red"
+/obj/effect/decal/warning_stripes/red/partial{
+ dir = 1
},
+/turf/simulated/floor/plasteel,
/area/security/main)
"apI" = (
-/obj/structure/closet/redcorp,
/obj/machinery/firealarm{
dir = 1;
pixel_y = -24
},
/obj/machinery/light,
+/obj/structure/closet/secure_closet/security,
/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "redcorner"
+ dir = 10;
+ icon_state = "red"
},
/area/security/main)
"apJ" = (
@@ -6392,16 +6066,6 @@
icon_state = "dark"
},
/area/security/evidence)
-"apL" = (
-/obj/structure/closet/secure_closet/security,
-/obj/structure/window/reinforced{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- dir = 6;
- icon_state = "red"
- },
-/area/security/main)
"apM" = (
/obj/structure/table,
/obj/item/storage/fancy/donut_box,
@@ -6412,8 +6076,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,
@@ -6447,19 +6110,16 @@
/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;
- icon_state = "0-2";
- pixel_y = 1
+ icon_state = "0-2"
},
/turf/simulated/floor/plating,
/area/security/main)
@@ -6520,7 +6180,8 @@
},
/obj/machinery/disposal,
/obj/machinery/light_switch{
- pixel_y = -25
+ dir = 1;
+ pixel_y = -24
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -6530,14 +6191,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,
@@ -6555,45 +6214,32 @@
dir = 4
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"apZ" = (
/obj/item/storage/secure/safe{
pixel_y = 25
},
/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)
+/area/maintenance/fore)
"aqb" = (
/obj/item/storage/secure/safe{
pixel_y = 25
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"aqc" = (
/obj/effect/spawner/random_spawners/wall_rusted_maybe,
/turf/simulated/wall,
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"aqd" = (
/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,
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"aqp" = (
/obj/structure/lattice,
/obj/structure/grille{
@@ -6605,17 +6251,16 @@
"aqq" = (
/obj/item/soap,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"aqr" = (
/obj/structure/toilet{
dir = 8
},
/obj/machinery/light/small{
- dir = 4;
- pixel_y = 8
+ dir = 4
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"aqs" = (
/obj/machinery/hydroponics/constructable,
/obj/machinery/ai_status_display{
@@ -6675,8 +6320,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/security{
@@ -6709,19 +6353,16 @@
/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;
- icon_state = "0-2";
- pixel_y = 1
+ icon_state = "0-2"
},
/turf/simulated/floor/plating,
/area/security/main)
@@ -6742,14 +6383,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/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -6771,13 +6410,13 @@
dir = 6;
icon_state = "whitered"
},
-/area/maintenance/genetics)
+/area/maintenance/asmaint)
"aqF" = (
/obj/item/reagent_containers/glass/beaker/large,
/obj/item/reagent_containers/dropper,
/obj/item/reagent_containers/dropper/precision,
/turf/simulated/floor/plating,
-/area/maintenance/genetics)
+/area/maintenance/asmaint)
"aqG" = (
/turf/simulated/wall,
/area/security/hos)
@@ -6785,8 +6424,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{
@@ -6803,28 +6441,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"
@@ -6876,8 +6492,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door/poddoor{
density = 0;
@@ -6901,16 +6516,19 @@
/turf/simulated/floor/plating,
/area/security/permabrig)
"aqR" = (
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "redcorner"
+ },
+/area/security/armoury)
+"aqS" = (
+/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/wall/r_wall,
-/area/security/permabrig)
-"aqS" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plating,
/area/security/permabrig)
"aqT" = (
@@ -6935,15 +6553,12 @@
/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 = "bcarpet05"
- },
+/turf/simulated/floor/carpet/cyan,
/area/security/prison/cell_block/A)
"aqV" = (
/obj/effect/spawner/window/reinforced,
@@ -6980,7 +6595,9 @@
},
/area/security/brig)
"aqY" = (
-/obj/structure/chair/stool,
+/obj/structure/chair/stool{
+ dir = 8
+ },
/turf/simulated/floor/plasteel{
icon_state = "cult"
},
@@ -7016,18 +6633,6 @@
/turf/space,
/area/solar/auxport)
"arc" = (
-/obj/effect/spawner/window/reinforced,
-/obj/structure/cable{
- d2 = 2;
- icon_state = "0-2";
- pixel_y = 1
- },
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2";
- tag = ""
- },
/obj/machinery/door/poddoor{
density = 0;
icon_state = "open";
@@ -7035,14 +6640,23 @@
name = "Security Blast Door";
opacity = 0
},
+/obj/structure/cable{
+ d2 = 2;
+ icon_state = "0-2"
+ },
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
/area/security/lobby)
"ari" = (
/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,
@@ -7070,6 +6684,7 @@
/area/security/lobby)
"arl" = (
/obj/machinery/computer/security{
+ dir = 4;
network = list("SS13","Research Outpost","Mining Outpost")
},
/turf/simulated/floor/plasteel{
@@ -7078,17 +6693,9 @@
},
/area/security/lobby)
"arm" = (
-/obj/effect/spawner/window/reinforced,
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2";
- tag = ""
- },
/obj/structure/cable{
d2 = 2;
- icon_state = "0-2";
- pixel_y = 1
+ icon_state = "0-2"
},
/obj/machinery/door/poddoor{
density = 0;
@@ -7097,6 +6704,12 @@
name = "Security Blast Door";
opacity = 0
},
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
/area/security/lobby)
"arn" = (
@@ -7152,8 +6765,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/machinery/door/poddoor{
density = 0;
@@ -7196,8 +6808,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
dir = 4;
@@ -7222,8 +6833,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/machinery/door/poddoor{
density = 0;
@@ -7264,8 +6874,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 1;
@@ -7289,8 +6898,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
@@ -7345,8 +6953,7 @@
/area/security/brig)
"arD" = (
/obj/machinery/light{
- dir = 1;
- on = 1
+ dir = 1
},
/turf/simulated/floor/plasteel{
dir = 1;
@@ -7358,8 +6965,8 @@
dir = 1
},
/obj/machinery/light_switch{
- pixel_x = 25;
- pixel_y = -7
+ dir = 8;
+ pixel_x = 24
},
/turf/simulated/floor/plasteel{
dir = 4;
@@ -7370,29 +6977,13 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/turf/simulated/floor/plasteel{
dir = 4;
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
@@ -7402,34 +6993,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;
@@ -7444,8 +7007,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -7455,14 +7017,12 @@
/obj/structure/cable{
d1 = 1;
d2 = 4;
- icon_state = "1-4";
- tag = ""
+ icon_state = "1-4"
},
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/structure/lattice/catwalk,
/turf/space,
@@ -7471,20 +7031,17 @@
/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"
},
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/structure/lattice/catwalk,
/turf/space,
@@ -7533,7 +7090,7 @@
"arR" = (
/obj/effect/decal/cleanable/dirt,
/turf/simulated/wall,
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"arS" = (
/obj/item/toy/pet_rock,
/obj/machinery/door_control{
@@ -7544,7 +7101,7 @@
specialfunctions = 4
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"arT" = (
/obj/item/toy/plushie/deer,
/obj/machinery/door_control{
@@ -7555,7 +7112,7 @@
specialfunctions = 4
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"arU" = (
/obj/structure/cable{
d2 = 4;
@@ -7584,23 +7141,7 @@
"asc" = (
/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)
+/area/maintenance/fore)
"ase" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -7615,7 +7156,7 @@
"asf" = (
/obj/effect/spawner/random_barrier/possibly_welded_airlock,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"asg" = (
/obj/structure/cable{
d2 = 4;
@@ -7635,8 +7176,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/manifold/hidden/scrubbers,
@@ -7653,8 +7193,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/item/seeds/wheat/rice,
/obj/item/seeds/wheat/rice,
@@ -7672,8 +7211,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/manifold/hidden/scrubbers,
@@ -7691,8 +7229,7 @@
"asm" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 1;
- initialize_directions = 11
+ dir = 1
},
/obj/structure/disposalpipe/segment{
dir = 4
@@ -7749,8 +7286,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
@@ -7770,24 +7306,22 @@
/turf/simulated/floor/plasteel,
/area/security/permabrig)
"ass" = (
-/obj/machinery/computer/area_atmos/area,
/obj/item/radio/intercom/department/security{
pixel_x = -28
},
+/obj/machinery/computer/area_atmos/area,
/turf/simulated/floor/plasteel,
/area/security/permabrig)
"ast" = (
/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
@@ -7803,13 +7337,13 @@
},
/area/security/brig)
"asu" = (
+/obj/structure/window/reinforced{
+ dir = 4
+ },
/obj/machinery/computer/prisoner{
req_access = null;
req_access_txt = "2"
},
-/obj/structure/window/reinforced{
- dir = 4
- },
/turf/simulated/floor/plasteel,
/area/security/permabrig)
"asv" = (
@@ -7871,7 +7405,6 @@
dir = 4
},
/obj/item/radio/intercom{
- dir = 0;
pixel_y = -28
},
/turf/simulated/floor/plasteel{
@@ -7883,8 +7416,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door_control{
id = "Prison Cell 1 Lockdown";
@@ -7931,6 +7463,11 @@
},
/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/plating,
/area/security/permabrig)
"asC" = (
@@ -7939,8 +7476,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel{
@@ -7965,8 +7501,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/obj/structure/cable{
d1 = 2;
@@ -7991,8 +7526,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{
@@ -8000,93 +7534,21 @@
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;
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;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/obj/structure/lattice/catwalk,
/turf/space,
@@ -8095,14 +7557,12 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/obj/structure/lattice/catwalk,
/turf/space,
@@ -8112,6 +7572,7 @@
/area/lawoffice)
"asO" = (
/obj/machinery/computer/prisoner{
+ dir = 4;
req_access = null;
req_access_txt = "2"
},
@@ -8133,7 +7594,7 @@
},
/obj/machinery/alarm{
dir = 4;
- pixel_x = -25
+ pixel_x = -24
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -8146,7 +7607,9 @@
},
/area/security/lobby)
"asX" = (
-/obj/machinery/computer/secure_data,
+/obj/machinery/computer/secure_data{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 10;
icon_state = "darkred"
@@ -8155,7 +7618,6 @@
"asY" = (
/obj/structure/chair/office/dark,
/obj/item/radio/intercom{
- dir = 0;
pixel_x = -28;
pixel_y = -28
},
@@ -8220,18 +7682,14 @@
d2 = 2;
icon_state = "1-2"
},
-/turf/simulated/floor/plasteel{
- icon_state = "bcarpet05"
- },
+/turf/simulated/floor/carpet/cyan,
/area/security/prison/cell_block/A)
"atb" = (
/obj/structure/closet/secure_closet/brig{
id = "Cell 1";
name = "Cell 1 Locker"
},
-/turf/simulated/floor/plasteel{
- icon_state = "bcarpet05"
- },
+/turf/simulated/floor/carpet/cyan,
/area/security/prison/cell_block/A)
"atc" = (
/obj/machinery/firealarm{
@@ -8281,13 +7739,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/atmospherics/pipe/manifold/hidden/supply{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -8350,8 +7806,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/turf/simulated/floor/plasteel,
/area/security/processing)
@@ -8366,14 +7821,12 @@
dir = 1
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 1;
- initialize_directions = 11
+ dir = 1
},
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel,
/area/security/processing)
@@ -8387,8 +7840,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -8425,18 +7877,18 @@
name = "Room 1"
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"ats" = (
/obj/machinery/door/airlock{
id_tag = "secmaintdorm2";
name = "Room 2"
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"att" = (
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"atu" = (
/obj/machinery/atmospherics/unary/portables_connector{
dir = 8
@@ -8445,7 +7897,7 @@
filled = 0.1
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"atv" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/turf/simulated/floor/plasteel,
@@ -8455,7 +7907,7 @@
dir = 6
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"atx" = (
/obj/structure/cable{
d1 = 4;
@@ -8482,37 +7934,24 @@
icon_state = "darkredcorners"
},
/area/security/brig)
-"atz" = (
-/obj/structure/cable{
- d1 = 2;
- d2 = 8;
- icon_state = "2-8";
- tag = ""
- },
-/turf/simulated/floor/plasteel{
- icon_state = "floorgrime"
- },
-/area/security/permabrig)
"atA" = (
/obj/machinery/hydroponics/constructable{
desc = "These are connected with an irrigation tube. You see a little pipe connecting the trays.";
name = "Prison hydroponics tray";
using_irrigation = 1
},
+/obj/item/seeds/corn,
+/obj/item/seeds/corn,
/obj/structure/cable{
d1 = 1;
- d2 = 4;
- icon_state = "1-4";
- tag = "90Curve"
+ d2 = 2;
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 2;
- d2 = 4;
- icon_state = "2-4";
- tag = ""
+ d2 = 8;
+ icon_state = "2-8"
},
-/obj/item/seeds/corn,
-/obj/item/seeds/corn,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "green"
@@ -8532,8 +7971,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -8548,7 +7986,6 @@
},
/obj/machinery/light,
/obj/item/radio/intercom{
- dir = 0;
pixel_y = -28
},
/turf/simulated/floor/plasteel{
@@ -8574,8 +8011,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -8594,7 +8030,7 @@
/area/solar/auxport)
"atG" = (
/turf/simulated/wall/r_wall,
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"atH" = (
/obj/machinery/light{
dir = 4
@@ -8618,7 +8054,9 @@
/turf/simulated/floor/plating,
/area/security/prisonershuttle)
"atO" = (
-/obj/structure/chair/stool,
+/obj/structure/chair/stool{
+ dir = 8
+ },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel{
icon_state = "floorgrime"
@@ -8651,8 +8089,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/structure/cable{
d1 = 4;
@@ -8686,45 +8123,13 @@
pixel_x = 32
},
/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)
+/area/maintenance/fore)
"atX" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 4
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 4;
- initialize_directions = 11
+ dir = 4
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -8739,7 +8144,8 @@
},
/obj/item/clothing/glasses/sunglasses,
/obj/machinery/light_switch{
- pixel_x = -25
+ dir = 4;
+ pixel_x = -24
},
/turf/simulated/floor/plasteel,
/area/security/range)
@@ -8756,8 +8162,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/turf/simulated/floor/plasteel,
/area/security/permabrig)
@@ -8784,8 +8189,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
icon_state = "redfull"
@@ -8795,14 +8199,12 @@
/obj/structure/cable{
d1 = 1;
d2 = 4;
- icon_state = "1-4";
- tag = "90Curve"
+ icon_state = "1-4"
},
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
@@ -8815,8 +8217,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/status_display{
layer = 4;
@@ -8837,8 +8238,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/door/poddoor{
density = 0;
@@ -8856,13 +8256,7 @@
/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 = "4-8"
},
/obj/structure/cable{
d1 = 2;
@@ -8870,8 +8264,7 @@
icon_state = "2-4"
},
/obj/machinery/light{
- dir = 1;
- on = 1
+ dir = 1
},
/turf/simulated/floor/plasteel{
dir = 1;
@@ -8882,8 +8275,7 @@
/obj/effect/spawner/window/reinforced,
/obj/structure/cable{
d2 = 2;
- icon_state = "0-2";
- pixel_y = 1
+ icon_state = "0-2"
},
/turf/simulated/floor/plating,
/area/security/seceqstorage)
@@ -8891,8 +8283,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/structure/cable{
@@ -8901,6 +8292,11 @@
icon_state = "2-4"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -8909,8 +8305,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 2;
@@ -8927,19 +8322,22 @@
/area/security/permabrig)
"aul" = (
/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8";
- tag = ""
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
},
/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,
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -8958,8 +8356,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/unary/vent_scrubber/on{
@@ -8999,7 +8396,7 @@
c_tag = "Security Pod"
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"auq" = (
/turf/simulated/wall/mineral/titanium,
/area/shuttle/pod_3)
@@ -9030,18 +8427,16 @@
"auA" = (
/obj/machinery/door/airlock/external{
frequency = 1450;
- icon_state = "door_locked";
id_tag = "dorms_maint_inner";
locked = 1;
name = "External Access";
- req_access = null;
req_access_txt = "13"
},
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 6
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"auB" = (
/obj/machinery/light{
dir = 1
@@ -9052,7 +8447,6 @@
/turf/simulated/floor/plating,
/area/security/prisonershuttle)
"auD" = (
-/obj/effect/spawner/window/reinforced,
/obj/structure/cable{
d2 = 4;
icon_state = "0-4"
@@ -9069,6 +8463,7 @@
name = "Security Blast Door";
opacity = 0
},
+/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
/area/security/lobby)
"auE" = (
@@ -9084,7 +8479,6 @@
},
/area/security/lobby)
"auG" = (
-/obj/effect/spawner/window/reinforced,
/obj/structure/cable{
d2 = 4;
icon_state = "0-4"
@@ -9101,19 +8495,14 @@
name = "Security Blast Door";
opacity = 0
},
+/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
/area/security/lobby)
"auH" = (
-/obj/effect/spawner/window/reinforced,
/obj/structure/cable{
d2 = 8;
icon_state = "0-8"
},
-/obj/structure/cable{
- d1 = 1;
- d2 = 8;
- icon_state = "1-8"
- },
/obj/machinery/door/poddoor{
density = 0;
icon_state = "open";
@@ -9121,6 +8510,12 @@
name = "Security Blast Door";
opacity = 0
},
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
+/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
/area/security/lobby)
"auI" = (
@@ -9153,8 +8548,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/turf/simulated/floor/plasteel{
icon_state = "redfull"
@@ -9164,7 +8558,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"auL" = (
/obj/item/twohanded/required/kirbyplants,
/turf/simulated/floor/plasteel{
@@ -9202,8 +8596,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/obj/machinery/door/window/brigdoor{
dir = 1;
@@ -9314,8 +8707,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 1;
@@ -9324,7 +8716,8 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/light_switch{
- pixel_x = -25
+ dir = 4;
+ pixel_x = -24
},
/obj/machinery/light{
dir = 8
@@ -9383,20 +8776,20 @@
/turf/simulated/floor/plasteel,
/area/security/processing)
"auX" = (
-/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"
},
-/turf/simulated/floor/plasteel,
-/area/security/processing)
+/obj/structure/cable,
+/obj/effect/spawner/window/reinforced,
+/turf/simulated/floor/plating,
+/area/security/hos)
"auY" = (
/obj/structure/table,
/obj/machinery/light_switch{
- pixel_y = -25
+ dir = 1;
+ pixel_y = -24
},
/obj/item/hand_labeler,
/obj/machinery/light/small,
@@ -9410,12 +8803,12 @@
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"ava" = (
/turf/simulated/floor/plasteel{
icon_state = "floorgrime"
},
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"avb" = (
/obj/machinery/light/small{
dir = 1
@@ -9423,13 +8816,13 @@
/turf/simulated/floor/plasteel{
icon_state = "floorgrime"
},
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"avc" = (
/obj/item/toy/figure/crew/secofficer,
/turf/simulated/floor/plasteel{
icon_state = "floorgrime"
},
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"avd" = (
/turf/simulated/floor/plasteel{
dir = 1;
@@ -9450,10 +8843,9 @@
/area/security/permabrig)
"avf" = (
/obj/structure/cable{
- d1 = 1;
- d2 = 4;
- icon_state = "1-4";
- tag = "90Curve"
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel,
/area/security/permabrig)
@@ -9463,15 +8855,19 @@
name = "Prison hydroponics tray";
using_irrigation = 1
},
+/obj/item/seeds/chili,
+/obj/item/seeds/chili,
+/obj/item/seeds/chili,
/obj/structure/cable{
d1 = 1;
- d2 = 8;
- icon_state = "1-8";
- tag = ""
+ d2 = 4;
+ icon_state = "1-4"
+ },
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
},
-/obj/item/seeds/chili,
-/obj/item/seeds/chili,
-/obj/item/seeds/chili,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "green"
@@ -9481,8 +8877,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/smartfridge/drying_rack,
/turf/simulated/floor/plasteel,
@@ -9491,8 +8886,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
icon_state = "floorgrime"
@@ -9502,8 +8896,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
@@ -9516,12 +8909,13 @@
},
/area/security/permabrig)
"avk" = (
-/obj/structure/chair/stool,
+/obj/structure/chair/stool{
+ dir = 1
+ },
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel,
/area/security/permabrig)
@@ -9535,8 +8929,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
@@ -9560,8 +8953,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
@@ -9584,8 +8976,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
@@ -9600,14 +8991,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 = "90Curve"
+ icon_state = "1-4"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -9622,7 +9011,7 @@
/area/security/permabrig)
"avp" = (
/obj/item/radio/intercom{
- pixel_y = 25
+ pixel_y = 28
},
/obj/structure/chair/comfy/shuttle{
dir = 4
@@ -9631,13 +9020,12 @@
/area/shuttle/pod_3)
"avq" = (
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"avr" = (
/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
@@ -9655,7 +9043,7 @@
name = "Escape Pod"
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"avt" = (
/obj/docking_port/mobile/pod{
dir = 4;
@@ -9687,8 +9075,7 @@
/obj/effect/spawner/window/reinforced,
/obj/structure/cable{
d2 = 2;
- icon_state = "0-2";
- pixel_y = 1
+ icon_state = "0-2"
},
/obj/machinery/door/poddoor/shutters{
density = 0;
@@ -9713,8 +9100,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
@@ -9740,14 +9126,12 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -9807,8 +9191,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
icon_state = "darkred"
@@ -9819,8 +9202,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
/turf/simulated/floor/plasteel{
@@ -9837,8 +9219,7 @@
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 1;
- initialize_directions = 11
+ dir = 1
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -9848,8 +9229,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/manifold/hidden/scrubbers,
@@ -10038,19 +9418,16 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 1;
d2 = 4;
- icon_state = "1-4";
- tag = "90Curve"
+ icon_state = "1-4"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/turf/simulated/floor/plasteel{
dir = 1;
@@ -10062,14 +9439,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"
},
/turf/simulated/floor/plasteel,
/area/security/processing)
@@ -10100,8 +9475,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/structure/cable{
d2 = 8;
@@ -10129,8 +9503,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
dir = 4;
@@ -10141,14 +9514,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,
/area/security/processing)
@@ -10164,27 +9535,24 @@
},
/obj/structure/cable{
d2 = 2;
- icon_state = "0-2";
- pixel_y = 1
+ icon_state = "0-2"
},
/obj/structure/lattice/catwalk,
/turf/space,
/area/solar/auxport)
"awl" = (
/turf/simulated/wall,
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"awn" = (
/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/simple/hidden/supply{
dir = 4
@@ -10197,8 +9565,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
@@ -10224,14 +9591,12 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 9
@@ -10257,17 +9622,19 @@
/obj/structure/closet,
/obj/effect/spawner/lootdrop/maintenance,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"awE" = (
/obj/structure/table,
/obj/item/toy/figure/griffin,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"awF" = (
-/obj/structure/chair/stool,
+/obj/structure/chair/stool{
+ dir = 4
+ },
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"awG" = (
/turf/simulated/floor/plasteel{
icon_state = "grimy"
@@ -10277,7 +9644,7 @@
/obj/structure/table,
/obj/item/dice/d20,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"awI" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -10286,8 +9653,7 @@
/area/security/lobby)
"awJ" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/obj/structure/cable{
d1 = 2;
@@ -10414,8 +9780,9 @@
network = list("Prison","SS13")
},
/obj/machinery/light_switch{
+ dir = 1;
pixel_x = -5;
- pixel_y = -25
+ pixel_y = -24
},
/turf/simulated/floor/plasteel,
/area/security/permabrig)
@@ -10430,14 +9797,14 @@
/obj/machinery/portable_atmospherics/canister/sleeping_agent,
/obj/machinery/alarm{
dir = 1;
- pixel_y = -22
+ pixel_y = -24
},
/turf/simulated/floor/plating,
/area/security/permabrig)
"awZ" = (
/obj/machinery/alarm{
dir = 8;
- pixel_x = 25
+ pixel_x = 24
},
/turf/simulated/floor/plasteel{
dir = 1;
@@ -10448,8 +9815,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door_control{
id = "Prison Lockdown 2";
@@ -10502,8 +9868,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,
@@ -10533,24 +9898,22 @@
id_tag = "dorms_pump"
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"axg" = (
/obj/machinery/door/airlock/external{
frequency = 1450;
- icon_state = "door_locked";
id_tag = "dorms_maint_inner";
locked = 1;
name = "External Access";
- req_access = null;
req_access_txt = "13"
},
/obj/machinery/atmospherics/pipe/manifold/hidden,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"axh" = (
/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"axn" = (
/obj/structure/lattice,
/obj/item/stack/cable_coil,
@@ -10560,15 +9923,11 @@
/obj/structure/bookcase,
/obj/item/book/manual/sop_engineering,
/obj/item/book/manual/sop_medical,
-/obj/item/book/manual/sop_science{
- pixel_y = -14
- },
/obj/item/book/manual/sop_security,
/obj/item/book/manual/sop_service,
/obj/item/book/manual/sop_supply,
/obj/item/book/manual/sop_general,
/obj/item/book/manual/sop_legal,
-/obj/item/book/manual/sop_command,
/obj/machinery/requests_console{
department = "Internal Affairs Office";
name = "Internal Affairs Requests Console";
@@ -10585,8 +9944,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/lattice/catwalk,
/turf/space,
@@ -10664,8 +10022,7 @@
dir = 10
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 4;
- initialize_directions = 11
+ dir = 4
},
/turf/simulated/floor/plasteel,
/area/security/lobby)
@@ -10735,8 +10092,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
@@ -10761,8 +10117,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 2;
@@ -10786,8 +10141,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/light,
@@ -10809,8 +10163,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
@@ -10826,8 +10179,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{
@@ -10854,19 +10206,16 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/obj/machinery/hologram/holopad,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 4;
- initialize_directions = 11
+ dir = 4
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 4
@@ -10890,7 +10239,6 @@
/area/security/processing)
"axQ" = (
/obj/item/radio/intercom{
- dir = 0;
pixel_y = -28
},
/turf/simulated/floor/plasteel{
@@ -10901,8 +10249,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
icon_state = "redcorner"
@@ -10912,8 +10259,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -10944,15 +10290,14 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel,
/area/security/processing)
"axV" = (
/obj/machinery/portable_atmospherics/canister/air,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"axW" = (
/obj/structure/rack{
dir = 1
@@ -10962,7 +10307,7 @@
},
/obj/item/reagent_containers/food/drinks/mug/sec,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"axX" = (
/obj/structure/sign/poster/contraband/random{
pixel_y = 32
@@ -10973,7 +10318,7 @@
/obj/effect/spawner/lootdrop/maintenance,
/obj/item/storage/fancy/donut_box,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"axY" = (
/obj/machinery/light/small{
dir = 1
@@ -10981,7 +10326,7 @@
/obj/structure/table,
/obj/item/taperecorder,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"axZ" = (
/turf/simulated/floor/plasteel{
dir = 1;
@@ -10992,38 +10337,38 @@
/obj/effect/decal/cleanable/dirt,
/obj/effect/spawner/random_spawners/wall_rusted_maybe,
/turf/simulated/wall,
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"ayb" = (
/obj/structure/reagent_dispensers/fueltank,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"ayc" = (
/obj/structure/reagent_dispensers/watertank,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"ayd" = (
/obj/structure/rack{
dir = 1
},
/obj/effect/spawner/lootdrop/maintenance,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"aye" = (
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
icon_state = "floorgrime"
},
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"ayf" = (
/obj/structure/table,
/obj/item/toy/figure/crew/hos,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"ayg" = (
/obj/structure/table,
/obj/item/toy/figure/owl,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"ayh" = (
/obj/docking_port/stationary{
dir = 8;
@@ -11199,8 +10544,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door/poddoor{
density = 0;
@@ -11251,8 +10595,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/lattice/catwalk,
/turf/space,
@@ -11404,15 +10747,12 @@
/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
},
-/turf/simulated/floor/plasteel{
- icon_state = "bcarpet05"
- },
+/turf/simulated/floor/carpet/cyan,
/area/security/prison/cell_block/A)
"ayS" = (
/obj/machinery/light/small{
@@ -11429,9 +10769,7 @@
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 4
},
-/turf/simulated/floor/plasteel{
- icon_state = "bcarpet05"
- },
+/turf/simulated/floor/carpet/cyan,
/area/security/prison/cell_block/A)
"ayT" = (
/obj/machinery/door/poddoor{
@@ -11445,14 +10783,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;
@@ -11531,8 +10867,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,
@@ -11555,7 +10890,9 @@
/turf/simulated/floor/plating,
/area/security/processing)
"ayZ" = (
-/obj/machinery/computer/shuttle/labor,
+/obj/machinery/computer/shuttle/labor{
+ dir = 8
+ },
/turf/simulated/floor/plasteel,
/area/security/prisonershuttle)
"aza" = (
@@ -11610,7 +10947,7 @@
dir = 8
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"azm" = (
/obj/structure/rack{
dir = 1
@@ -11622,13 +10959,15 @@
/obj/item/clothing/head/hardhat/red,
/obj/item/clothing/glasses/meson,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"azn" = (
-/obj/structure/chair/stool,
+/obj/structure/chair/stool{
+ dir = 1
+ },
/turf/simulated/floor/plasteel{
icon_state = "floorgrime"
},
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"azo" = (
/obj/item/clothing/mask/gas/clown_hat,
/turf/space,
@@ -11651,8 +10990,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/closet/wardrobe/pjs,
/turf/simulated/floor/plasteel,
@@ -11679,8 +11017,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
dir = 9;
@@ -11691,8 +11028,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 4;
- icon_state = "1-4";
- tag = ""
+ icon_state = "1-4"
},
/obj/structure/table,
/obj/item/storage/box/bodybags,
@@ -11709,8 +11045,7 @@
/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/supply{
@@ -11731,8 +11066,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/obj/structure/cable/yellow{
d1 = 1;
@@ -11751,8 +11085,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/obj/machinery/firealarm{
dir = 4;
@@ -11774,8 +11107,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
@@ -11789,8 +11121,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
icon_state = "cult"
@@ -11910,8 +11241,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,
@@ -11925,7 +11255,7 @@
dir = 8
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"azM" = (
/obj/machinery/atmospherics/binary/pump{
dir = 8;
@@ -11935,7 +11265,7 @@
dir = 1
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"azN" = (
/obj/structure/closet/secure_closet/brig{
id = "Cell 2";
@@ -11973,13 +11303,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/manifold/hidden/scrubbers{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -11994,21 +11322,21 @@
},
/area/security/lobby)
"azS" = (
-/obj/structure/chair/stool/bar,
+/obj/structure/chair/stool/bar{
+ dir = 4
+ },
/turf/simulated/floor/wood,
/area/maintenance/abandonedbar)
"azT" = (
/obj/machinery/door/airlock/external{
frequency = 1450;
- icon_state = "door_locked";
id_tag = "dorms_maint_outer";
locked = 1;
name = "External Access";
- req_access = null;
req_access_txt = "13"
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"azU" = (
/obj/structure/sign/securearea{
desc = "A warning sign which reads 'HIGH VOLTAGE'";
@@ -12026,14 +11354,12 @@
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/turf/simulated/floor/plating,
/area/security/prisonershuttle)
@@ -12091,9 +11417,11 @@
name = "blobstart"
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"aAb" = (
-/obj/structure/chair/stool/bar,
+/obj/structure/chair/stool/bar{
+ dir = 4
+ },
/turf/simulated/floor/wood{
broken = 1;
icon_state = "wood-broken"
@@ -12105,7 +11433,7 @@
icon_state = "brokengrille"
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"aAd" = (
/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
@@ -12120,18 +11448,15 @@
"aAl" = (
/obj/machinery/door/airlock/external{
frequency = 1379;
- icon_state = "door_locked";
id_tag = "solar_tool_outer";
locked = 1;
name = "Engineering External Access";
- req_access = null;
req_access_txt = "10;13"
},
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plating,
/area/maintenance/auxsolarport)
@@ -12175,8 +11500,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 4;
- icon_state = "1-4";
- tag = "90Curve"
+ icon_state = "1-4"
},
/turf/simulated/floor/plasteel{
icon_state = "floorgrime"
@@ -12187,8 +11511,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/door/poddoor{
density = 0;
@@ -12210,8 +11533,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/turf/simulated/floor/plasteel{
dir = 10;
@@ -12224,7 +11546,7 @@
/obj/item/clothing/glasses/sunglasses/blindfold,
/obj/machinery/alarm{
dir = 4;
- pixel_x = -22
+ pixel_x = -24
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -12274,7 +11596,8 @@
/area/security/interrogation)
"aAC" = (
/obj/machinery/light_switch{
- pixel_y = -25
+ dir = 1;
+ pixel_y = -24
},
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
@@ -12290,31 +11613,18 @@
},
/area/lawoffice)
"aAE" = (
-/obj/structure/rack{
- dir = 8;
- layer = 2.9
- },
-/obj/item/storage/briefcase{
- pixel_x = -2;
- pixel_y = -5
- },
-/obj/item/storage/briefcase{
- pixel_x = 3
- },
-/obj/item/storage/secure/briefcase{
- pixel_x = 5;
- pixel_y = -5
- },
/obj/machinery/light{
dir = 8
},
/obj/machinery/light_switch{
- pixel_x = -25
+ dir = 4;
+ pixel_x = -24
},
/obj/machinery/firealarm{
dir = 1;
pixel_y = -24
},
+/obj/structure/closet/secure_closet/iaa,
/turf/simulated/floor/plasteel{
icon_state = "cult"
},
@@ -12348,7 +11658,7 @@
/obj/item/pen,
/obj/machinery/alarm{
dir = 8;
- pixel_x = 25
+ pixel_x = 24
},
/obj/item/paper_bin/nanotrasen,
/turf/simulated/floor/plasteel{
@@ -12357,23 +11667,24 @@
/area/lawoffice)
"aAJ" = (
/obj/machinery/atmospherics/pipe/simple/hidden{
- dir = 10;
- initialize_directions = 10
+ dir = 10
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"aAK" = (
/obj/machinery/atmospherics/binary/valve/open{
dir = 4
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"aAL" = (
/obj/machinery/firealarm{
dir = 1;
pixel_y = -24
},
-/obj/structure/chair/stool/bar,
+/obj/structure/chair/stool/bar{
+ dir = 4
+ },
/turf/simulated/floor/wood,
/area/maintenance/abandonedbar)
"aAM" = (
@@ -12398,8 +11709,7 @@
pixel_y = -7
},
/obj/item/radio/intercom{
- pixel_x = 28;
- pixel_y = 5
+ pixel_x = 28
},
/turf/simulated/floor/carpet,
/area/magistrateoffice)
@@ -12431,9 +11741,11 @@
/turf/simulated/floor/plating,
/area/security/prison/cell_block/A)
"aAQ" = (
-/obj/structure/chair/stool,
+/obj/structure/chair/stool{
+ dir = 8
+ },
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"aAR" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 1
@@ -12466,8 +11778,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
@@ -12490,28 +11801,23 @@
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/obj/structure/cable{
d1 = 1;
d2 = 4;
- icon_state = "1-4";
- tag = "90Curve"
+ icon_state = "1-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;
- initialize_directions = 11
+ dir = 8
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -12521,7 +11827,7 @@
"aAY" = (
/obj/effect/landmark/burnturf,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aAZ" = (
/obj/structure/cable/yellow{
d1 = 2;
@@ -12529,8 +11835,7 @@
icon_state = "2-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 10;
- initialize_directions = 10
+ dir = 10
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 9
@@ -12544,8 +11849,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/structure/cable{
d1 = 1;
@@ -12577,7 +11881,6 @@
},
/obj/machinery/door/firedoor,
/obj/item/radio/intercom{
- dir = 0;
pixel_y = -28
},
/turf/simulated/floor/plasteel{
@@ -12586,8 +11889,7 @@
/area/security/prison/cell_block/A)
"aBb" = (
/obj/machinery/light/small{
- dir = 4;
- pixel_y = 8
+ dir = 4
},
/turf/simulated/floor/plating,
/area/security/prison/cell_block/A)
@@ -12677,13 +11979,13 @@
/obj/machinery/space_heater,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"aBr" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"aBs" = (
/turf/simulated/wall,
/area/security/interrogation)
@@ -12692,24 +11994,24 @@
dir = 4
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"aBu" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"aBv" = (
/obj/machinery/atmospherics/pipe/simple/hidden/universal,
/turf/simulated/wall,
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"aBw" = (
/obj/machinery/light/small{
dir = 8
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"aBx" = (
/obj/machinery/access_button{
command = "cycle_exterior";
@@ -12731,7 +12033,7 @@
dir = 10
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"aBA" = (
/obj/effect/spawner/window/reinforced,
/obj/structure/cable{
@@ -12741,8 +12043,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plating,
/area/security/prisonershuttle)
@@ -12757,8 +12058,7 @@
"aBE" = (
/obj/effect/spawner/window/reinforced,
/obj/machinery/atmospherics/pipe/simple/hidden{
- dir = 10;
- initialize_directions = 10
+ dir = 10
},
/turf/simulated/floor/plating,
/area/maintenance/auxsolarport)
@@ -12785,8 +12085,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plating,
/area/maintenance/auxsolarport)
@@ -12867,7 +12166,7 @@
req_access_txt = "12;24"
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"aBS" = (
/obj/effect/decal/warning_stripes/northeast,
/turf/simulated/floor/plasteel{
@@ -12974,17 +12273,17 @@
},
/area/magistrateoffice)
"aCe" = (
-/obj/machinery/computer/prisoner{
- req_access = null;
- req_access_txt = "2"
- },
/obj/machinery/status_display{
layer = 4;
pixel_y = 32
},
/obj/machinery/alarm{
dir = 4;
- pixel_x = -25
+ pixel_x = -24
+ },
+/obj/machinery/computer/prisoner{
+ req_access = null;
+ req_access_txt = "2"
},
/turf/simulated/floor/plasteel{
icon_state = "cult"
@@ -12995,10 +12294,10 @@
/area/magistrateoffice)
"aCg" = (
/obj/structure/table/wood,
-/obj/machinery/computer/secure_data/laptop,
/obj/machinery/light{
dir = 1
},
+/obj/machinery/computer/secure_data/laptop,
/turf/simulated/floor/plasteel{
icon_state = "cult"
},
@@ -13006,7 +12305,7 @@
"aCh" = (
/obj/effect/spawner/lootdrop/maintenance,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"aCi" = (
/obj/structure/table/reinforced,
/obj/item/book/manual/security_space_law,
@@ -13040,8 +12339,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/carpet,
@@ -13063,8 +12361,7 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 4;
- initialize_directions = 11
+ dir = 4
},
/mob/living/simple_animal/bot/secbot/beepsky,
/turf/simulated/floor/plasteel,
@@ -13074,16 +12371,12 @@
id = "Cell 2";
pixel_y = -26
},
-/turf/simulated/floor/plasteel{
- icon_state = "bcarpet05"
- },
+/turf/simulated/floor/carpet/cyan,
/area/security/prison/cell_block/A)
"aCq" = (
/obj/structure/bed,
/obj/item/bedsheet,
-/turf/simulated/floor/plasteel{
- icon_state = "bcarpet05"
- },
+/turf/simulated/floor/carpet/cyan,
/area/security/prison/cell_block/A)
"aCr" = (
/obj/machinery/power/treadmill{
@@ -13113,12 +12406,10 @@
/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
+ dir = 8
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel{
@@ -13127,13 +12418,12 @@
},
/area/security/prison/cell_block/A)
"aCu" = (
-/obj/machinery/computer/med_data,
/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{
dir = 6;
icon_state = "green"
@@ -13189,12 +12479,12 @@
tag_interior_door = "bar_maint_inner"
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aCz" = (
/obj/structure/table,
/obj/effect/spawner/lootdrop/maintenance,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"aCB" = (
/obj/docking_port/stationary{
dir = 4;
@@ -13214,18 +12504,15 @@
"aCD" = (
/obj/machinery/door/airlock/external{
frequency = 1379;
- icon_state = "door_locked";
id_tag = "solar_tool_inner";
locked = 1;
name = "Engineering External Access";
- req_access = null;
req_access_txt = "13"
},
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plating,
/area/maintenance/auxsolarport)
@@ -13250,7 +12537,8 @@
/obj/effect/decal/warning_stripes/west,
/obj/machinery/light/small,
/obj/machinery/light_switch{
- pixel_x = -25
+ dir = 4;
+ pixel_x = -24
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -13277,13 +12565,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/atmospherics/pipe/manifold/hidden/supply{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/turf/simulated/floor/plasteel,
/area/hallway/primary/fore)
@@ -13503,8 +12789,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 2;
@@ -13537,7 +12822,8 @@
dir = 4
},
/obj/machinery/light_switch{
- pixel_x = 25
+ dir = 8;
+ pixel_x = 24
},
/obj/machinery/camera{
c_tag = "Brig Cell Block A South";
@@ -13552,13 +12838,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/alarm{
dir = 4;
- pixel_x = -22
+ pixel_x = -24
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel{
@@ -13576,19 +12861,19 @@
dir = 8
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"aDq" = (
/obj/machinery/space_heater,
/obj/structure/sign/poster/contraband/random{
pixel_x = -32
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aDr" = (
/obj/structure/rack,
/obj/item/poster/random_contraband,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aDs" = (
/turf/simulated/floor/plating,
/area/maintenance/abandonedbar)
@@ -13604,14 +12889,14 @@
/turf/simulated/floor/plating,
/area/maintenance/abandonedbar)
"aDu" = (
-/obj/machinery/power/solar_control{
- id = "auxsolareast";
- name = "Fore Port Solar Control"
- },
/obj/structure/cable{
d2 = 4;
icon_state = "0-4"
},
+/obj/machinery/power/solar_control{
+ id = "auxsolareast";
+ name = "Fore Port Solar Control"
+ },
/turf/simulated/floor/plating,
/area/maintenance/auxsolarport)
"aDv" = (
@@ -13649,14 +12934,12 @@
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plating,
/area/maintenance/auxsolarport)
@@ -13751,16 +13034,13 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door/airlock/external{
frequency = 1379;
- icon_state = "door_locked";
id_tag = "solar_chapel_outer";
locked = 1;
name = "Engineering External Access";
- req_access = null;
req_access_txt = "10;13"
},
/turf/simulated/floor/plating,
@@ -13812,8 +13092,7 @@
pixel_x = 25
},
/obj/machinery/atmospherics/pipe/simple/hidden{
- dir = 10;
- initialize_directions = 10
+ dir = 10
},
/turf/simulated/floor/plating,
/area/maintenance/fpmaint2)
@@ -13821,8 +13100,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
icon_state = "cult"
@@ -13881,8 +13159,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/carpet,
/area/magistrateoffice)
@@ -13896,8 +13173,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/hologram/holopad,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -13934,8 +13210,7 @@
"aEn" = (
/obj/structure/chair/office/dark,
/obj/machinery/light{
- dir = 1;
- on = 1
+ dir = 1
},
/obj/effect/landmark/start{
name = "Detective"
@@ -13965,13 +13240,13 @@
/turf/simulated/floor/carpet,
/area/security/detectives_office)
"aEp" = (
-/obj/machinery/computer/security/wooden_tv{
- network = list("SS13","Research Outpost","Mining Outpost")
- },
/obj/item/radio/intercom{
dir = 8;
pixel_x = 28
},
+/obj/machinery/computer/security/wooden_tv{
+ network = list("SS13","Research Outpost","Mining Outpost")
+ },
/turf/simulated/floor/carpet,
/area/security/detectives_office)
"aEq" = (
@@ -14027,7 +13302,7 @@
dir = 4
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"aEt" = (
/obj/machinery/door/airlock/maintenance{
name = "Security Maintenance";
@@ -14051,7 +13326,7 @@
dir = 4
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"aEu" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 1
@@ -14064,27 +13339,27 @@
icon_state = "pipe-c"
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"aEv" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 9
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"aEw" = (
/obj/item/storage/toolbox/emergency,
/obj/structure/table,
/obj/machinery/light/small,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"aEx" = (
/obj/item/storage/fancy/crayons,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aEy" = (
/obj/item/poster/random_contraband,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aEz" = (
/obj/structure/table/wood,
/obj/structure/mirror{
@@ -14105,7 +13380,9 @@
},
/area/security/detectives_office)
"aEC" = (
-/obj/structure/chair/stool,
+/obj/structure/chair/stool{
+ dir = 1
+ },
/turf/simulated/floor/plating,
/area/maintenance/auxsolarport)
"aED" = (
@@ -14123,8 +13400,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 4;
- icon_state = "1-4";
- tag = ""
+ icon_state = "1-4"
},
/turf/simulated/floor/plating,
/area/maintenance/auxsolarport)
@@ -14163,7 +13439,7 @@
"aEI" = (
/obj/structure/chair/comfy/black,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"aEJ" = (
/turf/simulated/floor/wood,
/area/maintenance/fpmaint2)
@@ -14213,8 +13489,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/airlock_sensor{
id_tag = "solar_chapel_sensor";
@@ -14237,7 +13512,9 @@
/turf/simulated/floor/plating,
/area/maintenance/auxsolarstarboard)
"aES" = (
-/obj/structure/chair/stool,
+/obj/structure/chair/stool{
+ dir = 8
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "whitecorner"
@@ -14286,7 +13563,8 @@
"aEZ" = (
/obj/machinery/light,
/obj/machinery/light_switch{
- pixel_y = -25
+ dir = 1;
+ pixel_y = -24
},
/turf/simulated/floor/plating,
/area/maintenance/abandonedbar)
@@ -14364,7 +13642,8 @@
/area/security/interrogation)
"aFo" = (
/obj/machinery/light_switch{
- pixel_x = -25
+ dir = 4;
+ pixel_x = -24
},
/obj/item/twohanded/required/kirbyplants,
/obj/machinery/firealarm{
@@ -14476,8 +13755,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/disposalpipe/segment{
dir = 4
@@ -14590,7 +13868,7 @@
"aFH" = (
/obj/structure/grille,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"aFI" = (
/turf/simulated/wall,
/area/crew_quarters/arcade)
@@ -14610,16 +13888,16 @@
},
/obj/effect/spawner/lootdrop/maintenance,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aFN" = (
/obj/item/toy/crayon/random,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aFO" = (
/obj/item/toy/crayon/spraycan,
/obj/structure/table,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aFP" = (
/turf/simulated/floor/plasteel{
dir = 10;
@@ -14700,11 +13978,9 @@
"aFY" = (
/obj/machinery/door/airlock/external{
frequency = 1379;
- icon_state = "door_locked";
id_tag = "eva_outer";
locked = 1;
name = "EVA External Access";
- req_access = null;
req_access_txt = "13"
},
/turf/simulated/floor/plating/airless,
@@ -14713,16 +13989,13 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door/airlock/external{
frequency = 1379;
- icon_state = "door_locked";
id_tag = "solar_chapel_inner";
locked = 1;
name = "Engineering External Access";
- req_access = null;
req_access_txt = "13"
},
/obj/machinery/atmospherics/pipe/simple/hidden,
@@ -14777,7 +14050,9 @@
/turf/simulated/floor/carpet,
/area/maintenance/fpmaint)
"aGl" = (
-/obj/structure/chair/stool,
+/obj/structure/chair/stool{
+ dir = 4
+ },
/turf/simulated/floor/wood{
icon_state = "wood-broken"
},
@@ -14858,8 +14133,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/carpet,
/area/security/detectives_office)
@@ -14872,8 +14146,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 2;
@@ -14886,8 +14159,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/camera{
c_tag = "Brig Detective's Office"
@@ -14900,17 +14172,12 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/carpet,
/area/security/detectives_office)
"aGC" = (
-/obj/structure/closet/secure_closet{
- anchored = 1;
- name = "Evidence Storage";
- req_access_txt = "4"
- },
+/obj/machinery/vending/detdrobe,
/turf/simulated/floor/plasteel{
icon_state = "grimy"
},
@@ -14919,19 +14186,18 @@
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/turf/simulated/floor/plasteel{
icon_state = "grimy"
},
/area/security/detectives_office)
"aGE" = (
-/obj/machinery/computer/med_data,
/obj/machinery/status_display{
layer = 4;
pixel_y = 32
},
+/obj/machinery/computer/med_data,
/turf/simulated/floor/plasteel{
icon_state = "grimy"
},
@@ -14956,13 +14222,13 @@
},
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"aGH" = (
/obj/machinery/light/small{
dir = 4
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"aGI" = (
/obj/structure/table/reinforced,
/obj/structure/mirror{
@@ -14992,7 +14258,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"aGL" = (
/obj/structure/chair/barber{
dir = 8
@@ -15053,14 +14319,12 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/obj/machinery/access_button{
command = "cycle_interior";
@@ -15080,10 +14344,6 @@
/turf/simulated/wall/r_wall,
/area/maintenance/auxsolarstarboard)
"aGU" = (
-/obj/machinery/power/solar_control{
- id = "auxsolareast";
- name = "Fore Starboard Solar Control"
- },
/obj/structure/cable{
d2 = 4;
icon_state = "0-4"
@@ -15095,20 +14355,22 @@
name = "EXTERNAL AIRLOCK";
pixel_y = 32
},
+/obj/machinery/power/solar_control{
+ id = "auxsolareast";
+ name = "Fore Starboard Solar Control"
+ },
/turf/simulated/floor/plating,
/area/maintenance/auxsolarstarboard)
"aGV" = (
/obj/structure/cable{
d1 = 1;
d2 = 4;
- icon_state = "1-4";
- tag = ""
+ icon_state = "1-4"
},
/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,
@@ -15122,10 +14384,10 @@
/area/maintenance/auxsolarstarboard)
"aGX" = (
/turf/simulated/wall,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aGY" = (
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aGZ" = (
/obj/structure/table,
/obj/random/plushie,
@@ -15146,31 +14408,33 @@
/obj/structure/rack,
/obj/effect/spawner/lootdrop/maintenance,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aHc" = (
/obj/structure/rack,
/obj/item/tank/internals/emergency_oxygen/engi,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aHd" = (
/obj/item/toy/crayon/white,
/obj/machinery/light/small{
dir = 8
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aHe" = (
/obj/structure/sign/poster/contraband/random{
pixel_x = 32
},
-/obj/structure/chair/stool,
+/obj/structure/chair/stool{
+ dir = 8
+ },
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aHf" = (
/obj/structure/table,
/obj/item/poster/random_contraband,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aHg" = (
/obj/structure/sign/securearea{
desc = "A warning sign which reads 'HIGH VOLTAGE'";
@@ -15181,7 +14445,6 @@
/area/maintenance/fpmaint2)
"aHh" = (
/obj/machinery/door/airlock/engineering{
- icon_state = "door_closed";
name = "Fore Port Solar Access";
req_access_txt = "10"
},
@@ -15201,7 +14464,9 @@
/turf/simulated/floor/wood,
/area/maintenance/fpmaint2)
"aHk" = (
-/obj/structure/chair/stool,
+/obj/structure/chair/stool{
+ dir = 1
+ },
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
icon_state = "grimy"
@@ -15232,18 +14497,12 @@
req_access_txt = "12"
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"aHq" = (
-/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,
-/area/hallway/primary/fore)
+/obj/structure/cable,
+/obj/effect/spawner/window/reinforced,
+/turf/simulated/floor/plating,
+/area/security/hos)
"aHr" = (
/obj/structure/table,
/obj/item/melee/baseball_bat,
@@ -15323,8 +14582,7 @@
dir = 8
},
/obj/machinery/light{
- dir = 1;
- in_use = 1
+ dir = 1
},
/obj/machinery/firealarm{
pixel_y = 24
@@ -15387,8 +14645,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 4;
- icon_state = "1-4";
- tag = ""
+ icon_state = "1-4"
},
/turf/simulated/floor/plating,
/area/maintenance/auxsolarstarboard)
@@ -15404,15 +14661,16 @@
/turf/simulated/floor/plating,
/area/maintenance/auxsolarstarboard)
"aHK" = (
-/obj/structure/chair/stool,
+/obj/structure/chair/stool{
+ dir = 1
+ },
/turf/simulated/floor/plating,
/area/maintenance/auxsolarstarboard)
"aHL" = (
/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,
@@ -15426,15 +14684,15 @@
"aHN" = (
/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aHO" = (
/obj/structure/reagent_dispensers/watertank,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aHP" = (
/obj/effect/decal/cleanable/fungus,
/turf/simulated/wall,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aHQ" = (
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
@@ -15531,7 +14789,7 @@
},
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"aIe" = (
/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
@@ -15557,7 +14815,7 @@
dir = 4
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"aIh" = (
/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
@@ -15568,7 +14826,7 @@
},
/obj/item/storage/box/evidence,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"aIj" = (
/obj/structure/table/reinforced,
/obj/machinery/computer/security/telescreen/entertainment{
@@ -15597,11 +14855,9 @@
"aIm" = (
/obj/machinery/door/airlock/external{
frequency = 1379;
- icon_state = "door_locked";
id_tag = "eva_inner";
locked = 1;
name = "EVA Internal Access";
- req_access = null;
req_access_txt = "13"
},
/obj/machinery/atmospherics/pipe/simple/hidden,
@@ -15633,28 +14889,25 @@
},
/obj/machinery/alarm{
dir = 4;
- pixel_x = -22
+ pixel_x = -24
},
/turf/simulated/floor/carpet/arcade,
/area/crew_quarters/arcade)
"aIq" = (
/obj/effect/decal/cleanable/fungus,
/turf/simulated/wall,
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"aIr" = (
/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
+ dir = 4
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 4;
- initialize_directions = 11
+ dir = 4
},
/turf/simulated/floor/plasteel,
/area/hallway/primary/fore)
@@ -15670,8 +14923,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/turf/simulated/floor/carpet/arcade,
/area/crew_quarters/arcade)
@@ -15691,7 +14943,7 @@
/obj/structure/rack,
/obj/item/tank/internals/air,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aIw" = (
/obj/machinery/camera{
c_tag = "Fore Port Solar Access"
@@ -15725,8 +14977,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/structure/cable{
d1 = 2;
@@ -15764,22 +15015,20 @@
/obj/structure/closet/wardrobe/mixed,
/obj/item/clothing/shoes/jackboots,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aIE" = (
/obj/effect/spawner/window,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aIF" = (
/turf/simulated/wall/r_wall,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aIG" = (
/obj/machinery/door/airlock/external{
frequency = 1379;
- icon_state = "door_locked";
id_tag = "arrivals_outer";
locked = 1;
name = "Engineering External Access";
- req_access = null;
req_access_txt = "10;13"
},
/turf/simulated/floor/plating,
@@ -15866,7 +15115,9 @@
/turf/simulated/floor/plating,
/area/maintenance/fpmaint)
"aIU" = (
-/obj/structure/chair/stool,
+/obj/structure/chair/stool{
+ dir = 1
+ },
/turf/simulated/floor/wood,
/area/maintenance/fpmaint)
"aIV" = (
@@ -15900,7 +15151,7 @@
req_access_txt = "12"
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"aIZ" = (
/obj/structure/cable{
d1 = 1;
@@ -15989,8 +15240,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
@@ -16020,8 +15270,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/turf/simulated/floor/plasteel{
icon_state = "grimy"
@@ -16030,7 +15279,8 @@
"aJl" = (
/obj/machinery/vending/cigarette/free,
/obj/machinery/light_switch{
- pixel_y = -25
+ dir = 1;
+ pixel_y = -24
},
/turf/simulated/floor/plasteel{
icon_state = "grimy"
@@ -16059,7 +15309,12 @@
"aJn" = (
/obj/machinery/alarm{
dir = 1;
- pixel_y = -22
+ pixel_y = -24
+ },
+/obj/structure/closet/secure_closet{
+ anchored = 1;
+ name = "Evidence Storage";
+ req_access_txt = "4"
},
/turf/simulated/floor/plasteel{
icon_state = "grimy"
@@ -16082,7 +15337,7 @@
},
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"aJq" = (
/obj/structure/table,
/obj/item/paper_bin{
@@ -16091,7 +15346,7 @@
},
/obj/item/pen,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"aJr" = (
/obj/structure/table/reinforced,
/obj/item/razor,
@@ -16141,25 +15396,32 @@
/turf/simulated/floor/carpet/arcade,
/area/crew_quarters/arcade)
"aJw" = (
-/obj/machinery/computer/arcade/orion_trail,
+/obj/machinery/computer/arcade/orion_trail{
+ dir = 8
+ },
/turf/simulated/floor/carpet/arcade,
/area/crew_quarters/arcade)
"aJx" = (
-/obj/structure/chair/stool,
+/obj/structure/chair/stool{
+ dir = 4
+ },
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/carpet/arcade,
/area/crew_quarters/arcade)
"aJy" = (
-/obj/structure/chair/stool,
+/obj/structure/chair/stool{
+ dir = 8
+ },
/turf/simulated/floor/carpet/arcade,
/area/crew_quarters/arcade)
"aJz" = (
-/obj/machinery/computer/arcade/battle,
+/obj/machinery/computer/arcade/battle{
+ dir = 4
+ },
/turf/simulated/floor/carpet/arcade,
/area/crew_quarters/arcade)
"aJA" = (
@@ -16172,24 +15434,20 @@
"aJC" = (
/obj/machinery/door/airlock/external{
frequency = 1450;
- icon_state = "door_locked";
id_tag = "bar_maint_outer";
locked = 1;
name = "External Access";
- req_access = null;
req_access_txt = "13"
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aJD" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door/airlock/engineering{
- icon_state = "door_closed";
name = "Fore Starboard Solar Access";
req_access_txt = "10"
},
@@ -16200,7 +15458,7 @@
pixel_x = -32
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aJF" = (
/obj/structure/cable{
d1 = 1;
@@ -16220,11 +15478,9 @@
"aJG" = (
/obj/machinery/door/airlock/external{
frequency = 1379;
- icon_state = "door_locked";
id_tag = "eva_inner";
locked = 1;
name = "EVA Internal Access";
- req_access = null;
req_access_txt = "13"
},
/turf/simulated/floor/plating,
@@ -16240,13 +15496,12 @@
"aJI" = (
/obj/structure/closet/emcloset,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aJJ" = (
/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
@@ -16256,21 +15511,21 @@
"aJK" = (
/obj/effect/decal/cleanable/cobweb2,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aJL" = (
/obj/machinery/slot_machine,
/obj/item/coin/iron,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aJM" = (
/obj/structure/closet/firecloset,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aJN" = (
/obj/effect/decal/cleanable/cobweb,
/obj/item/coin/gold,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aJO" = (
/obj/item/twohanded/garrote/improvised,
/turf/simulated/floor/plating,
@@ -16307,7 +15562,9 @@
},
/area/maintenance/fpmaint)
"aJX" = (
-/obj/structure/chair/stool,
+/obj/structure/chair/stool{
+ dir = 1
+ },
/turf/simulated/floor/plating,
/area/maintenance/fpmaint2)
"aJY" = (
@@ -16358,19 +15615,16 @@
/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/manifold/hidden/scrubbers{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/turf/simulated/floor/plasteel,
/area/hallway/primary/fore)
@@ -16431,8 +15685,7 @@
/area/lawoffice)
"aKt" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 10;
- initialize_directions = 10
+ dir = 10
},
/turf/simulated/floor/plasteel{
dir = 4;
@@ -16537,7 +15790,7 @@
/obj/structure/table,
/obj/item/hand_labeler,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"aKF" = (
/obj/structure/table/reinforced,
/obj/item/paper_bin{
@@ -16582,7 +15835,7 @@
dir = 4
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"aKI" = (
/obj/structure/chair/comfy/black{
dir = 1
@@ -16605,8 +15858,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/carpet/arcade,
/area/crew_quarters/arcade)
@@ -16639,11 +15891,11 @@
/obj/machinery/meter,
/obj/machinery/atmospherics/pipe/simple/visible/cyan,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aKQ" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/camera{
- c_tag = "Clown's Office";
+ c_tag = "Holodeck West";
dir = 4
},
/turf/simulated/floor/plasteel,
@@ -16656,22 +15908,20 @@
name = "8maintenance loot spawner"
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aKS" = (
/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/fsmaint2)
+/area/maintenance/fsmaint)
"aKT" = (
/obj/machinery/power/apc{
dir = 1;
@@ -16683,12 +15933,12 @@
icon_state = "0-4"
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aKU" = (
/obj/structure/table,
/obj/item/pen,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aKV" = (
/obj/structure/table,
/obj/item/paper_bin{
@@ -16696,7 +15946,7 @@
pixel_y = 7
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aKW" = (
/obj/machinery/atmospherics/unary/portables_connector{
dir = 4
@@ -16706,18 +15956,18 @@
"aKX" = (
/obj/structure/chair/stool,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aKY" = (
/obj/structure/closet,
/obj/item/coin/iron,
/obj/effect/spawner/lootdrop/maintenance,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aKZ" = (
/obj/item/coin/gold,
/obj/item/coin/iron,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aLb" = (
/obj/machinery/status_display{
layer = 4;
@@ -16735,7 +15985,7 @@
/obj/structure/closet,
/obj/effect/spawner/lootdrop/maintenance,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aLd" = (
/turf/simulated/wall/r_wall,
/area/hallway/secondary/entry)
@@ -16776,8 +16026,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/machinery/atmospherics/pipe/simple/visible/purple{
dir = 6
@@ -16788,8 +16037,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
@@ -16812,8 +16060,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 4;
- icon_state = "1-4";
- tag = "90Curve"
+ icon_state = "1-4"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -16833,8 +16080,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plating,
/area/maintenance/fpmaint2)
@@ -16851,8 +16097,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 2;
@@ -16863,8 +16108,7 @@
dir = 10
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 10;
- initialize_directions = 10
+ dir = 10
},
/obj/machinery/atmospherics/pipe/simple/visible/purple{
dir = 9
@@ -16896,14 +16140,13 @@
/turf/simulated/floor/plating,
/area/maintenance/fpmaint2)
"aLs" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2";
- tag = ""
+/obj/structure/chair/stool{
+ dir = 1
},
-/turf/simulated/floor/plating,
-/area/maintenance/fpmaint2)
+/turf/simulated/floor/plasteel{
+ icon_state = "floorgrime"
+ },
+/area/security/permabrig)
"aLt" = (
/obj/machinery/light/small{
dir = 1
@@ -16911,14 +16154,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/fpmaint2)
@@ -16926,8 +16167,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,
@@ -16937,8 +16177,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,
@@ -16946,8 +16185,7 @@
"aLw" = (
/obj/effect/spawner/window/reinforced,
/obj/machinery/atmospherics/pipe/simple/hidden{
- dir = 10;
- initialize_directions = 10
+ dir = 10
},
/turf/simulated/floor/plating,
/area/maintenance/fpmaint2)
@@ -16955,19 +16193,16 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plating,
/area/maintenance/fpmaint2)
"aLy" = (
/obj/machinery/door/airlock/external{
frequency = 1379;
- icon_state = "door_locked";
id_tag = "arrivals_inner";
locked = 1;
name = "Engineering External Access";
- req_access = null;
req_access_txt = "13"
},
/turf/simulated/floor/plating,
@@ -16975,11 +16210,9 @@
"aLz" = (
/obj/machinery/door/airlock/external{
frequency = 1379;
- icon_state = "door_locked";
id_tag = "engineering_east_inner";
locked = 1;
name = "Engineering External Access";
- req_access = null;
req_access_txt = "10;13"
},
/turf/simulated/floor/plating,
@@ -16990,7 +16223,7 @@
"aLB" = (
/obj/structure/rack,
/turf/simulated/floor/plating,
-/area/maintenance/fpmaint)
+/area/maintenance/fpmaint2)
"aLC" = (
/obj/item/reagent_containers/food/snacks/dough{
desc = "A piece of dough. It looks moldy and is hard as a rock. Hope you're not planning on turning this into a pizza..";
@@ -17149,8 +16382,7 @@
dir = 4
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 1;
- initialize_directions = 11
+ dir = 1
},
/turf/simulated/floor/plasteel{
dir = 1;
@@ -17164,8 +16396,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/turf/simulated/floor/plasteel{
dir = 1;
@@ -17182,8 +16413,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
dir = 1;
@@ -17219,8 +16449,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
@@ -17229,13 +16458,12 @@
dir = 4
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aMc" = (
/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
@@ -17244,7 +16472,7 @@
dir = 6
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aMd" = (
/obj/effect/decal/warning_stripes/north,
/turf/simulated/floor/plasteel,
@@ -17253,12 +16481,10 @@
/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;
- initialize_directions = 10
+ dir = 10
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 9
@@ -17268,15 +16494,13 @@
"aMf" = (
/obj/machinery/door/airlock/external{
frequency = 1450;
- icon_state = "door_locked";
id_tag = "bar_maint_inner";
locked = 1;
name = "External Access";
- req_access = null;
req_access_txt = "13"
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aMg" = (
/obj/machinery/door/airlock/engineering{
name = "Electrical Maintenance";
@@ -17285,8 +16509,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
@@ -17308,7 +16531,7 @@
name = "3maintenance loot spawner"
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aMj" = (
/obj/structure/table,
/obj/effect/spawner/lootdrop/maintenance{
@@ -17316,21 +16539,27 @@
name = "2maintenance loot spawner"
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"aMk" = (
/obj/structure/cable{
- d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "0-2"
},
+/obj/machinery/door/poddoor{
+ density = 0;
+ icon_state = "open";
+ id_tag = "Secure Gate";
+ name = "Security Blast Door";
+ opacity = 0
+ },
+/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/security/lobby)
"aMl" = (
/obj/structure/table,
/obj/item/reagent_containers/food/snacks/donut,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aMm" = (
/obj/structure/table/reinforced,
/obj/item/razor,
@@ -17346,12 +16575,12 @@
req_access_txt = "12"
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aMo" = (
/obj/structure/table,
/obj/effect/spawner/lootdrop/maintenance,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aMp" = (
/obj/item/radio/intercom{
dir = 4;
@@ -17418,7 +16647,7 @@
/area/maintenance/fpmaint2)
"aMz" = (
/turf/simulated/wall/rust,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aMA" = (
/turf/simulated/wall,
/area/maintenance/fpmaint)
@@ -17458,8 +16687,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,
@@ -17473,20 +16701,23 @@
},
/area/hallway/primary/fore)
"aMH" = (
-/obj/structure/chair/stool,
+/obj/structure/chair/stool{
+ dir = 4
+ },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
},
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/carpet/arcade,
/area/crew_quarters/arcade)
"aMI" = (
-/obj/structure/chair/stool,
+/obj/structure/chair/stool{
+ dir = 8
+ },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/effect/landmark/start{
name = "Civilian"
@@ -17496,7 +16727,8 @@
"aMJ" = (
/obj/machinery/vending/snack,
/obj/machinery/light_switch{
- pixel_x = 25
+ dir = 8;
+ pixel_x = 24
},
/turf/simulated/floor/carpet/arcade,
/area/crew_quarters/arcade)
@@ -17509,16 +16741,21 @@
},
/obj/structure/closet/emcloset,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aML" = (
/obj/machinery/atmospherics/pipe/simple/hidden/universal,
/obj/effect/spawner/random_barrier/obstruction,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aMM" = (
/obj/machinery/atmospherics/pipe/simple/visible/yellow{
dir = 5
},
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -17530,8 +16767,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
@@ -17658,7 +16894,7 @@
req_access_txt = "13"
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aNg" = (
/obj/structure/sign/securearea{
desc = "A warning sign which reads 'EXTERNAL AIRLOCK'";
@@ -17674,7 +16910,7 @@
filled = 0.1
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aNh" = (
/obj/structure/rack,
/obj/effect/spawner/lootdrop/maintenance{
@@ -17682,21 +16918,20 @@
name = "2maintenance loot spawner"
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aNi" = (
/mob/living/simple_animal/mouse,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aNj" = (
/obj/structure/table,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aNk" = (
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/obj/structure/extinguisher_cabinet{
pixel_x = 27
@@ -17711,8 +16946,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/carpet,
/area/crew_quarters/courtroom)
@@ -17724,14 +16958,13 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/landmark/burnturf,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aNo" = (
/turf/simulated/floor/mech_bay_recharge_floor,
/area/maintenance/electrical)
@@ -17744,11 +16977,11 @@
/turf/simulated/floor/plating,
/area/maintenance/electrical)
"aNq" = (
-/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/bluegrid,
/area/maintenance/electrical)
"aNr" = (
@@ -17865,25 +17098,17 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel,
/area/crew_quarters/courtroom)
"aNH" = (
-/obj/structure/grille,
-/obj/structure/window/basic,
-/obj/structure/window/basic{
- dir = 1
- },
-/obj/structure/window/basic{
+/obj/structure/chair/stool{
dir = 8
},
-/obj/structure/window/basic{
- dir = 4
- },
+/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
-/area/maintenance/fpmaint2)
+/area/maintenance/fore)
"aNI" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 9
@@ -17900,8 +17125,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
dir = 4;
@@ -17915,7 +17139,7 @@
/obj/structure/disposalpipe/segment,
/obj/machinery/alarm{
dir = 4;
- pixel_x = -22
+ pixel_x = -24
},
/obj/machinery/camera{
c_tag = "Fore Primary Hallway South";
@@ -17928,9 +17152,7 @@
/area/hallway/primary/fore)
"aNL" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on,
-/turf/simulated/floor/plasteel{
- icon_state = "neutralcorner"
- },
+/turf/simulated/floor/plasteel,
/area/crew_quarters/dorms)
"aNM" = (
/obj/structure/disposalpipe/junction{
@@ -17969,21 +17191,18 @@
/area/crew_quarters/courtroom)
"aNQ" = (
/obj/machinery/atmospherics/unary/vent_pump/on,
-/turf/simulated/floor/plasteel{
- icon_state = "neutralcorner"
- },
+/turf/simulated/floor/plasteel,
/area/crew_quarters/dorms)
"aNR" = (
/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,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aNS" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/public/glass{
@@ -18022,9 +17241,11 @@
icon_state = "4-8"
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"aNV" = (
-/obj/structure/chair/stool,
+/obj/structure/chair/stool{
+ dir = 4
+ },
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 8
},
@@ -18049,11 +17270,12 @@
icon_state = "2-8"
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"aNX" = (
/obj/machinery/disposal,
/obj/machinery/light_switch{
- pixel_x = -23
+ dir = 4;
+ pixel_x = -24
},
/obj/structure/disposalpipe/trunk{
dir = 4
@@ -18113,8 +17335,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/disposalpipe/segment{
dir = 4;
@@ -18157,13 +17378,12 @@
"aOi" = (
/obj/item/clothing/head/naziofficer,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aOj" = (
/obj/structure/cable{
d1 = 1;
d2 = 4;
- icon_state = "1-4";
- tag = "90Curve"
+ icon_state = "1-4"
},
/turf/simulated/floor/plating,
/area/maintenance/fpmaint2)
@@ -18171,13 +17391,12 @@
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aOl" = (
/obj/effect/spawner/window/reinforced,
/obj/machinery/door/poddoor{
@@ -18197,17 +17416,16 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/turf/simulated/floor/plating,
-/area/maintenance/fpmaint)
+/area/maintenance/fpmaint2)
"aOn" = (
/obj/machinery/light/small,
/turf/simulated/floor/plasteel{
icon_state = "floorgrime"
},
-/area/maintenance/fpmaint)
+/area/maintenance/fpmaint2)
"aOo" = (
/obj/item/reagent_containers/food/snacks/dough{
desc = "A piece of dough. It looks moldy and is hard as a rock. Hope you're not planning on turning this into a pizza..";
@@ -18289,8 +17507,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/turf/simulated/floor/carpet,
/area/crew_quarters/courtroom)
@@ -18322,29 +17539,27 @@
"aOC" = (
/obj/machinery/light/small,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aOE" = (
/obj/structure/cable{
d1 = 1;
d2 = 4;
- icon_state = "1-4";
- tag = ""
+ icon_state = "1-4"
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aOF" = (
/obj/structure/reagent_dispensers/fueltank,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aOG" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aOH" = (
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
@@ -18356,8 +17571,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,
@@ -18368,7 +17582,7 @@
/obj/item/storage/toolbox/electrical,
/obj/item/multitool,
/obj/item/radio/intercom{
- pixel_x = 25
+ pixel_x = 28
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel,
@@ -18380,8 +17594,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
@@ -18410,8 +17623,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/door/poddoor/shutters{
density = 0;
@@ -18473,22 +17685,19 @@
"aOX" = (
/obj/structure/lattice,
/obj/structure/closet,
+/obj/effect/spawner/lootdrop/maintenance{
+ lootcount = 8;
+ name = "8maintenance loot spawner"
+ },
/turf/space,
/area/space/nearstation)
"aOY" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
+/obj/structure/chair/stool{
dir = 1
},
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/structure/window/reinforced{
- dir = 4
- },
+/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
-/area/maintenance/fpmaint2)
+/area/maintenance/fore)
"aOZ" = (
/obj/machinery/atmospherics/unary/tank/air{
dir = 8
@@ -18515,14 +17724,14 @@
dir = 4
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"aPc" = (
/obj/effect/decal/cleanable/fungus,
/turf/simulated/wall,
/area/maintenance/fpmaint2)
"aPd" = (
/obj/machinery/light_switch{
- pixel_y = 27
+ pixel_y = 24
},
/turf/simulated/floor/plasteel{
dir = 4;
@@ -18534,8 +17743,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/public/glass{
@@ -18578,8 +17786,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
@@ -18601,30 +17808,23 @@
/area/maintenance/fpmaint)
"aPk" = (
/obj/structure/chair/stool,
-/turf/simulated/floor/plasteel{
- icon_state = "neutralcorner"
- },
+/turf/simulated/floor/plasteel,
/area/crew_quarters/dorms)
"aPm" = (
/turf/simulated/floor/plasteel,
/area/crew_quarters/dorms)
"aPn" = (
/obj/structure/reagent_dispensers/water_cooler,
-/turf/simulated/floor/plasteel{
- icon_state = "neutralcorner"
- },
+/turf/simulated/floor/plasteel,
/area/crew_quarters/dorms)
"aPs" = (
/obj/effect/landmark/burnturf,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aPt" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2";
- tag = ""
+/obj/structure/chair/stool{
+ dir = 8
},
/turf/simulated/floor/plating,
/area/maintenance/fpmaint)
@@ -18650,7 +17850,7 @@
"aPx" = (
/obj/machinery/alarm{
dir = 4;
- pixel_x = -25
+ pixel_x = -24
},
/turf/simulated/floor/wood,
/area/crew_quarters/courtroom)
@@ -18666,8 +17866,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 4;
- icon_state = "1-4";
- tag = "90Curve"
+ icon_state = "1-4"
},
/turf/simulated/floor/wood,
/area/crew_quarters/courtroom)
@@ -18733,7 +17932,7 @@
},
/obj/machinery/alarm{
dir = 1;
- pixel_y = -22
+ pixel_y = -24
},
/turf/simulated/floor/plasteel{
dir = 0;
@@ -18784,7 +17983,7 @@
opacity = 0
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aPL" = (
/obj/effect/landmark{
name = "JoinLateCryo"
@@ -18829,7 +18028,7 @@
icon_state = "1-2"
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"aPQ" = (
/obj/effect/decal/warning_stripes/north,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -18852,8 +18051,7 @@
"aPS" = (
/obj/structure/cable{
d2 = 2;
- icon_state = "0-2";
- pixel_y = 1
+ icon_state = "0-2"
},
/obj/machinery/power/apc{
dir = 1;
@@ -18865,7 +18063,7 @@
/area/maintenance/electrical)
"aPT" = (
/obj/machinery/alarm{
- pixel_y = 23
+ pixel_y = 24
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -18881,7 +18079,7 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"aPW" = (
/obj/structure/mirror{
icon_state = "mirror_broke";
@@ -19054,8 +18252,7 @@
pixel_y = 32
},
/obj/machinery/light{
- dir = 1;
- on = 1
+ dir = 1
},
/obj/structure/table,
/obj/item/stack/tape_roll,
@@ -19151,8 +18348,7 @@
"aQA" = (
/obj/machinery/vending/snack,
/obj/machinery/light{
- dir = 1;
- in_use = 1
+ dir = 1
},
/turf/simulated/floor/plasteel{
dir = 1;
@@ -19180,22 +18376,19 @@
name = "2maintenance loot spawner"
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aQD" = (
/obj/machinery/hologram/holopad,
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 4;
- initialize_directions = 11
+ dir = 4
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 4;
- initialize_directions = 11
+ dir = 4
},
/turf/simulated/floor/plasteel,
/area/hallway/primary/fore)
@@ -19214,8 +18407,7 @@
pixel_y = 32
},
/obj/machinery/light{
- dir = 1;
- in_use = 1
+ dir = 1
},
/turf/simulated/floor/plasteel{
dir = 1;
@@ -19232,24 +18424,24 @@
"aQI" = (
/obj/effect/spawner/lootdrop/maintenance,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aQJ" = (
/obj/machinery/portable_atmospherics/canister/air,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aQL" = (
/obj/structure/girder,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aQM" = (
/obj/structure/janitorialcart,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aQN" = (
/obj/structure/table/glass,
/obj/item/pen,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aQO" = (
/obj/structure/table/glass,
/obj/item/paper_bin{
@@ -19257,16 +18449,13 @@
pixel_y = 7
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aQP" = (
-/obj/structure/cable{
- d1 = 2;
- d2 = 4;
- icon_state = "2-4";
- tag = ""
+/obj/structure/chair/stool{
+ dir = 4
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fpmaint)
"aQQ" = (
/obj/structure/disposalpipe/segment{
dir = 8;
@@ -19275,8 +18464,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
@@ -19293,8 +18481,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plating,
/area/maintenance/electrical)
@@ -19310,14 +18497,12 @@
/obj/structure/cable{
d1 = 1;
d2 = 4;
- icon_state = "1-4";
- tag = ""
+ icon_state = "1-4"
},
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/obj/effect/landmark{
name = "blobstart"
@@ -19328,8 +18513,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/hologram/holopad,
/turf/simulated/floor/plating,
@@ -19363,7 +18547,9 @@
/turf/space,
/area/space)
"aQY" = (
-/obj/structure/chair/stool,
+/obj/structure/chair/stool{
+ dir = 4
+ },
/turf/simulated/floor/plating,
/area/maintenance/electrical)
"aQZ" = (
@@ -19377,7 +18563,7 @@
/area/crew_quarters/sleep)
"aRa" = (
/obj/item/radio/intercom{
- pixel_y = 25
+ pixel_y = 28
},
/obj/machinery/light{
dir = 1
@@ -19390,11 +18576,9 @@
"aRb" = (
/obj/machinery/door/airlock/external{
frequency = 1379;
- icon_state = "door_locked";
id_tag = "sol_outer";
locked = 1;
- name = "Arrivals External Access";
- req_access = null
+ name = "Arrivals External Access"
},
/obj/machinery/access_button{
command = "cycle_exterior";
@@ -19482,8 +18666,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plating,
/area/maintenance/fpmaint2)
@@ -19604,8 +18787,7 @@
dir = 1
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 1;
- initialize_directions = 11
+ dir = 1
},
/turf/simulated/floor/plating,
/area/maintenance/fpmaint)
@@ -19613,12 +18795,10 @@
/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;
- initialize_directions = 11
+ dir = 1
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 1
@@ -19630,7 +18810,7 @@
dir = 1
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aRw" = (
/turf/simulated/wall/r_wall,
/area/ai_monitored/storage/eva)
@@ -19650,8 +18830,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 = 5
@@ -19672,8 +18851,7 @@
/area/maintenance/fpmaint2)
"aRC" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 10;
- initialize_directions = 10
+ dir = 10
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
@@ -19684,14 +18862,13 @@
/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/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aRE" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -19711,14 +18888,13 @@
/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/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aRH" = (
/obj/structure/cable{
d1 = 1;
@@ -19736,8 +18912,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
@@ -19748,7 +18923,7 @@
pixel_y = 24
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aRJ" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
@@ -19759,14 +18934,14 @@
icon_state = "2-8"
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aRK" = (
/obj/structure/table,
/obj/effect/spawner/lootdrop/maintenance,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aRL" = (
/obj/structure/cable{
d2 = 4;
@@ -19865,7 +19040,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aRZ" = (
/obj/structure/table,
/obj/machinery/cell_charger,
@@ -19881,8 +19056,7 @@
"aSb" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/turf/simulated/floor/plasteel,
/area/hallway/primary/fore)
@@ -19918,7 +19092,7 @@
dir = 4
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aSh" = (
/obj/effect/landmark{
name = "JoinLateCryo"
@@ -19937,11 +19111,10 @@
dir = 10
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 10;
- initialize_directions = 10
+ dir = 10
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aSj" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -19968,8 +19141,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
icon_state = "caution"
@@ -20072,8 +19244,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
icon_state = "caution"
@@ -20088,8 +19259,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel,
/area/crew_quarters/dorms)
@@ -20097,14 +19267,12 @@
/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{
dir = 8;
@@ -20118,8 +19286,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,
@@ -20167,8 +19334,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
icon_state = "arrival"
@@ -20184,8 +19350,7 @@
dir = 1
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 1;
- initialize_directions = 11
+ dir = 1
},
/turf/simulated/floor/plating,
/area/maintenance/fpmaint2)
@@ -20195,8 +19360,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
@@ -20215,7 +19379,7 @@
"aSP" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"aSQ" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
@@ -20227,18 +19391,14 @@
"aSR" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 4;
- initialize_directions = 11
- },
-/turf/simulated/floor/plasteel{
- icon_state = "neutralcorner"
+ dir = 4
},
+/turf/simulated/floor/plasteel,
/area/crew_quarters/dorms)
"aSS" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 4;
- initialize_directions = 11
+ dir = 4
},
/turf/simulated/floor/plasteel,
/area/hallway/primary/fore)
@@ -20321,8 +19481,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door/poddoor{
density = 0;
@@ -20333,7 +19492,7 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aTf" = (
/obj/effect/spawner/random_spawners/grille_maybe,
/turf/simulated/floor/plating,
@@ -20341,7 +19500,7 @@
"aTg" = (
/obj/structure/grille/broken,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aTh" = (
/obj/effect/spawner/random_spawners/grille_often,
/turf/simulated/floor/plating,
@@ -20364,8 +19523,7 @@
"aTk" = (
/obj/structure/cable{
d2 = 2;
- icon_state = "0-2";
- pixel_y = 1
+ icon_state = "0-2"
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
@@ -20383,7 +19541,8 @@
icon_state = "0-4"
},
/obj/machinery/light_switch{
- pixel_y = -25
+ dir = 1;
+ pixel_y = -24
},
/turf/simulated/floor/plating,
/area/maintenance/electrical)
@@ -20422,13 +19581,12 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aTs" = (
/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"
@@ -20437,7 +19595,7 @@
dir = 4
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aTt" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -20490,8 +19648,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
@@ -20692,7 +19849,6 @@
/obj/structure/disposalpipe/trunk,
/obj/machinery/disposal,
/obj/structure/extinguisher_cabinet{
- pixel_x = -5;
pixel_y = 30
},
/turf/simulated/floor/plasteel{
@@ -20744,17 +19900,16 @@
/area/medical/reception)
"aTX" = (
/obj/machinery/atmospherics/pipe/simple/visible/cyan{
- dir = 6;
- initialize_directions = 6
+ dir = 6
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aTY" = (
/obj/structure/chair/comfy/teal{
dir = 8
},
/obj/machinery/alarm{
- pixel_y = 25
+ pixel_y = 24
},
/turf/simulated/floor/plasteel{
icon_state = "whitebluefull"
@@ -20765,13 +19920,13 @@
/obj/effect/decal/cleanable/cobweb,
/obj/effect/spawner/lootdrop/maintenance,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aUa" = (
/obj/machinery/atmospherics/unary/tank/air{
dir = 8
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aUb" = (
/obj/structure/closet,
/obj/effect/spawner/lootdrop/maintenance{
@@ -20779,7 +19934,7 @@
name = "2maintenance loot spawner"
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aUc" = (
/obj/machinery/door/poddoor{
density = 0;
@@ -20789,7 +19944,7 @@
opacity = 0
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aUd" = (
/obj/structure/window/reinforced{
dir = 8
@@ -20806,7 +19961,7 @@
},
/obj/effect/spawner/lootdrop/maintenance,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aUf" = (
/turf/simulated/wall/rust,
/area/maintenance/electrical)
@@ -20829,6 +19984,7 @@
icon_state = "0-8"
},
/obj/machinery/computer/monitor{
+ dir = 1;
name = "Backup Power Monitoring Console"
},
/turf/simulated/floor/plating,
@@ -20837,8 +19993,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/wall,
/area/maintenance/electrical)
@@ -20883,12 +20038,10 @@
/area/hallway/secondary/entry)
"aUp" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/turf/simulated/floor/plasteel,
/area/hallway/primary/fore)
@@ -20911,7 +20064,6 @@
})
"aUs" = (
/obj/structure/extinguisher_cabinet{
- pixel_x = -5;
pixel_y = 30
},
/turf/simulated/floor/plasteel,
@@ -20933,7 +20085,7 @@
dir = 1
},
/obj/structure/sink{
- pixel_y = 30
+ pixel_y = 25
},
/turf/simulated/floor/plasteel,
/area/hallway/secondary/construction{
@@ -20961,7 +20113,7 @@
/area/maintenance/fpmaint2)
"aUz" = (
/obj/structure/sink{
- pixel_y = 30
+ pixel_y = 25
},
/turf/simulated/floor/plasteel,
/area/hallway/secondary/construction{
@@ -21074,22 +20226,20 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/turf/simulated/floor/plasteel,
/area/crew_quarters/dorms)
"aUN" = (
/obj/machinery/alarm{
- pixel_y = 23
+ pixel_y = 24
},
/turf/simulated/floor/plasteel,
/area/hallway/primary/central/ne)
"aUO" = (
/obj/item/twohanded/required/kirbyplants,
/obj/machinery/light{
- dir = 1;
- in_use = 1
+ dir = 1
},
/obj/machinery/camera{
c_tag = "Medbay Lobby West"
@@ -21106,8 +20256,7 @@
},
/obj/machinery/vending/wallmed{
name = "Emergency NanoMed";
- pixel_x = -5;
- pixel_y = 30
+ pixel_y = 28
},
/obj/structure/table,
/obj/item/folder/white,
@@ -21120,12 +20269,11 @@
/area/crew_quarters/toilet)
"aUR" = (
/obj/machinery/atmospherics/pipe/manifold/visible/cyan{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/obj/machinery/meter,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aUS" = (
/turf/simulated/wall,
/area/crew_quarters/bar)
@@ -21141,7 +20289,7 @@
/obj/effect/spawner/lootdrop/maintenance,
/obj/structure/chair/stool,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aUV" = (
/obj/machinery/light{
dir = 8
@@ -21152,7 +20300,7 @@
"aUW" = (
/obj/machinery/space_heater,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aUX" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -21207,8 +20355,7 @@
})
"aVf" = (
/obj/machinery/atmospherics/pipe/simple/hidden{
- dir = 10;
- initialize_directions = 10
+ dir = 10
},
/obj/machinery/access_button{
command = "cycle_interior";
@@ -21229,8 +20376,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,
@@ -21273,7 +20419,7 @@
dir = 1
},
/obj/machinery/alarm{
- pixel_y = 23
+ pixel_y = 24
},
/obj/structure/cable{
d1 = 2;
@@ -21324,7 +20470,9 @@
},
/area/crew_quarters/dorms)
"aVq" = (
-/obj/structure/chair/stool,
+/obj/structure/chair/stool{
+ dir = 8
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "caution"
@@ -21370,12 +20518,10 @@
/area/crew_quarters/dorms)
"aVu" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/turf/simulated/floor/plasteel,
/area/crew_quarters/dorms)
@@ -21396,7 +20542,7 @@
dir = 4
},
/obj/machinery/camera{
- c_tag = "Dormitory East";
+ c_tag = "Dormitories East";
dir = 8
},
/turf/simulated/floor/plasteel{
@@ -21406,8 +20552,7 @@
"aVx" = (
/obj/item/twohanded/required/kirbyplants,
/obj/machinery/light{
- dir = 1;
- in_use = 1
+ dir = 1
},
/obj/structure/closet/walllocker/emerglocker/north,
/turf/simulated/floor/plasteel{
@@ -21448,13 +20593,12 @@
dir = 1
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aVB" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door_control{
id = "maint2";
@@ -21470,7 +20614,7 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aVC" = (
/obj/structure/urinal{
pixel_y = 32
@@ -21492,8 +20636,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plating,
/area/maintenance/fpmaint)
@@ -21510,14 +20653,12 @@
/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/plating,
/area/maintenance/fpmaint)
@@ -21531,12 +20672,10 @@
/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
+ dir = 1
},
/turf/simulated/floor/plating,
/area/maintenance/fpmaint)
@@ -21565,8 +20704,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plating,
/area/maintenance/fpmaint)
@@ -21595,7 +20733,7 @@
"aVJ" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aVK" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -21606,12 +20744,10 @@
/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
+ dir = 1
},
/obj/structure/cable{
d1 = 2;
@@ -21637,7 +20773,7 @@
"aVN" = (
/obj/machinery/atmospherics/binary/valve,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aVO" = (
/obj/effect/decal/warning_stripes/west,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -21649,8 +20785,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/obj/structure/grille/broken,
/obj/structure/window/basic{
@@ -21659,7 +20794,7 @@
/obj/structure/window/basic,
/obj/effect/landmark/burnturf,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aVQ" = (
/obj/machinery/door/poddoor{
density = 0;
@@ -21669,7 +20804,7 @@
opacity = 0
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aVR" = (
/obj/effect/decal/warning_stripes/east,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -21685,7 +20820,8 @@
"aVU" = (
/obj/machinery/light,
/obj/machinery/light_switch{
- pixel_y = -25
+ dir = 1;
+ pixel_y = -24
},
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 4
@@ -21711,7 +20847,7 @@
dir = 6
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aWc" = (
/obj/machinery/power/apc{
dir = 1;
@@ -21746,11 +20882,9 @@
},
/obj/machinery/door/airlock/external{
frequency = 1379;
- icon_state = "door_locked";
id_tag = "sol_inner";
locked = 1;
- name = "Arrivals External Access";
- req_access = null
+ name = "Arrivals External Access"
},
/turf/simulated/floor/plating,
/area/hallway/secondary/entry)
@@ -21770,23 +20904,22 @@
/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{
dir = 4
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aWh" = (
-/obj/machinery/computer/secure_data,
/obj/machinery/requests_console{
department = "Security";
departmentType = 5;
name = "Security Requests Console";
pixel_y = 30
},
+/obj/machinery/computer/secure_data,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "red"
@@ -21847,7 +20980,7 @@
"aWn" = (
/obj/structure/table,
/obj/machinery/alarm{
- pixel_y = 23
+ pixel_y = 24
},
/obj/item/t_scanner,
/turf/simulated/floor/plasteel,
@@ -21855,7 +20988,7 @@
"aWo" = (
/obj/structure/table,
/obj/item/radio/intercom{
- pixel_y = 25
+ pixel_y = 28
},
/obj/item/assembly/signaler,
/obj/item/assembly/signaler,
@@ -21880,7 +21013,7 @@
"aWq" = (
/obj/structure/table,
/obj/machinery/light_switch{
- pixel_y = 28
+ pixel_y = 24
},
/obj/machinery/cell_charger,
/obj/item/stock_parts/cell/high,
@@ -21952,8 +21085,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/structure/disposalpipe/segment{
dir = 4;
@@ -21963,11 +21095,10 @@
dir = 1
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 1;
- initialize_directions = 11
+ dir = 1
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aWB" = (
/obj/structure/chair{
dir = 4
@@ -21998,7 +21129,9 @@
/turf/simulated/floor/carpet,
/area/crew_quarters/dorms)
"aWF" = (
-/obj/structure/chair/stool,
+/obj/structure/chair/stool{
+ dir = 8
+ },
/turf/simulated/floor/wood,
/area/crew_quarters/dorms)
"aWG" = (
@@ -22064,8 +21197,7 @@
"aWN" = (
/obj/structure/cable{
d2 = 2;
- icon_state = "0-2";
- pixel_y = 1
+ icon_state = "0-2"
},
/obj/machinery/power/apc{
dir = 1;
@@ -22079,14 +21211,12 @@
/obj/item/stack/packageWrap,
/obj/item/reagent_scanner/adv,
/obj/machinery/light{
- dir = 1;
- in_use = 1
+ dir = 1
},
/obj/machinery/camera{
c_tag = "Medbay Chemistry North"
},
/obj/structure/extinguisher_cabinet{
- pixel_x = -5;
pixel_y = 30
},
/turf/simulated/floor/plasteel{
@@ -22095,7 +21225,9 @@
},
/area/medical/chemistry)
"aWP" = (
-/obj/structure/chair/stool,
+/obj/structure/chair/stool{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "caution"
@@ -22151,7 +21283,7 @@
amount = 10
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aWW" = (
/obj/structure/window/reinforced{
dir = 4
@@ -22183,13 +21315,12 @@
dir = 4
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aXa" = (
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/obj/structure/cable{
d1 = 2;
@@ -22204,22 +21335,19 @@
dir = 1
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 1;
- initialize_directions = 11
+ dir = 1
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aXb" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aXc" = (
/obj/machinery/crema_switch{
pixel_y = -25
@@ -22248,7 +21376,7 @@
/turf/simulated/floor/plasteel{
icon_state = "cult"
},
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aXe" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -22310,7 +21438,7 @@
/area/chapel/office)
"aXk" = (
/obj/machinery/alarm{
- pixel_y = 25
+ pixel_y = 24
},
/turf/simulated/floor/plasteel{
icon_state = "cult"
@@ -22369,10 +21497,10 @@
/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/arrival/station)
"aXt" = (
-/obj/machinery/computer/arcade,
/obj/machinery/light{
dir = 1
},
+/obj/machinery/computer/arcade,
/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/arrival/station)
"aXu" = (
@@ -22457,14 +21585,12 @@
/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";
- tag = ""
+ icon_state = "1-4"
},
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 1
@@ -22642,37 +21768,33 @@
icon_state = "2-4"
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aXX" = (
/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,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aXY" = (
/obj/effect/spawner/window/reinforced,
/obj/structure/cable,
/obj/structure/cable{
d1 = 1;
d2 = 4;
- icon_state = "1-4";
- tag = "90Curve"
+ icon_state = "1-4"
},
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/turf/simulated/floor/plating,
/area/maintenance/fpmaint)
@@ -22698,12 +21820,11 @@
/turf/simulated/floor/plating,
/area/maintenance/fpmaint)
"aYc" = (
-/obj/machinery/door/firedoor,
-/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "bluecorner"
+/obj/structure/chair/stool{
+ dir = 1
},
-/area/hallway/primary/fore)
+/turf/simulated/floor/plating,
+/area/maintenance/fpmaint)
"aYd" = (
/obj/structure/disposalpipe/segment{
dir = 8;
@@ -22749,8 +21870,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
@@ -22769,7 +21889,8 @@
/obj/item/scalpel,
/obj/item/autopsy_scanner,
/obj/machinery/light_switch{
- pixel_x = -23
+ dir = 4;
+ pixel_x = -24
},
/obj/machinery/status_display{
layer = 4;
@@ -22809,8 +21930,8 @@
dir = 8
},
/obj/machinery/light_switch{
- pixel_x = -22;
- pixel_y = 9
+ dir = 4;
+ pixel_x = -24
},
/turf/simulated/floor/plasteel{
dir = 1;
@@ -22832,8 +21953,7 @@
c_tag = "Medbay Coroner"
},
/obj/machinery/light{
- dir = 1;
- in_use = 1
+ dir = 1
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -22860,7 +21980,7 @@
/area/medical/morgue)
"aYr" = (
/obj/item/radio/intercom{
- pixel_y = 25
+ pixel_y = 28
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
@@ -22872,7 +21992,8 @@
"aYs" = (
/obj/machinery/cryopod/right,
/obj/machinery/light_switch{
- pixel_y = -25
+ dir = 1;
+ pixel_y = -24
},
/turf/simulated/floor/plasteel{
dir = 4;
@@ -22880,12 +22001,6 @@
},
/area/crew_quarters/sleep)
"aYt" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2";
- tag = ""
- },
/obj/structure/table/reinforced,
/obj/item/clipboard,
/obj/item/folder/yellow,
@@ -22896,6 +22011,7 @@
/obj/item/pen/multi,
/obj/item/paper_bin/nanotrasen,
/obj/item/paper/tcommskey,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
@@ -22919,8 +22035,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/light,
/turf/simulated/floor/plasteel{
@@ -22929,8 +22044,7 @@
/area/crew_quarters/sleep)
"aYw" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 10;
- initialize_directions = 10
+ dir = 10
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 6
@@ -22989,17 +22103,17 @@
},
/area/chapel/main)
"aYC" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/plasteel,
-/area/hallway/primary/fore)
-"aYE" = (
-/obj/machinery/door/firedoor,
-/turf/simulated/floor/plasteel{
- icon_state = "bluecorner"
+/obj/structure/chair/stool{
+ dir = 8
},
-/area/hallway/primary/fore)
+/turf/simulated/floor/plating,
+/area/maintenance/fsmaint)
+"aYE" = (
+/obj/structure/chair/stool{
+ dir = 4
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/fsmaint)
"aYF" = (
/obj/structure/closet/coffin,
/turf/simulated/floor/plasteel{
@@ -23016,9 +22130,6 @@
},
/area/chapel/main)
"aYI" = (
-/obj/machinery/computer/cryopod{
- pixel_x = 32
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 9
},
@@ -23030,13 +22141,16 @@
/obj/machinery/light{
dir = 4
},
+/obj/machinery/computer/cryopod{
+ pixel_x = 32
+ },
/turf/simulated/floor/plasteel{
icon_state = "whitegreenfull"
},
/area/crew_quarters/sleep)
"aYJ" = (
/obj/machinery/alarm{
- pixel_y = 23
+ pixel_y = 24
},
/obj/machinery/atmospherics/unary/vent_pump/on,
/turf/simulated/floor/carpet,
@@ -23045,8 +22159,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/structure/disposalpipe/segment{
dir = 4
@@ -23054,11 +22167,10 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aYL" = (
/obj/machinery/light{
- dir = 1;
- on = 1
+ dir = 1
},
/obj/structure/chair/comfy/shuttle,
/turf/simulated/floor/mineral/titanium/blue,
@@ -23074,11 +22186,10 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aYP" = (
/turf/simulated/wall,
/area/chapel/main)
@@ -23087,8 +22198,23 @@
/turf/simulated/floor/plating,
/area/chapel/main)
"aYR" = (
-/turf/simulated/wall/r_wall,
-/area/chapel/main)
+/obj/structure/cable{
+ d2 = 8;
+ icon_state = "0-8"
+ },
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/effect/spawner/window/reinforced,
+/turf/simulated/floor/plating,
+/area/hallway/primary/port)
"aYS" = (
/turf/simulated/wall/r_wall,
/area/escapepodbay)
@@ -23111,20 +22237,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/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aYX" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/disposalpipe/segment{
dir = 4
@@ -23132,17 +22256,15 @@
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aYY" = (
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/obj/structure/disposalpipe/segment{
dir = 8;
@@ -23151,7 +22273,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aYZ" = (
/obj/effect/landmark{
name = "JoinLate"
@@ -23197,14 +22319,13 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aZe" = (
/obj/structure/table,
/obj/machinery/light{
@@ -23233,13 +22354,17 @@
/area/security/checkpoint2)
"aZg" = (
/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2";
- tag = ""
+ d2 = 8;
+ icon_state = "0-8"
},
-/turf/simulated/floor/plasteel,
-/area/storage/primary)
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/effect/spawner/window/reinforced,
+/turf/simulated/floor/plating,
+/area/hallway/primary/port)
"aZh" = (
/obj/machinery/recharger{
pixel_y = 4
@@ -23328,7 +22453,8 @@
known_by = list("captain")
},
/obj/machinery/light_switch{
- pixel_y = -23
+ dir = 1;
+ pixel_y = -24
},
/obj/item/clothing/head/bearpelt,
/obj/item/folder/documents,
@@ -23386,6 +22512,7 @@
/obj/machinery/door/airlock/public/glass{
name = "Central Access"
},
+/obj/machinery/door/firedoor,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "bluecorner"
@@ -23415,7 +22542,9 @@
/turf/simulated/floor/plasteel,
/area/crew_quarters/dorms)
"aZB" = (
-/obj/machinery/computer/card/minor/ce,
+/obj/machinery/computer/card/minor/ce{
+ dir = 8
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
@@ -23446,8 +22575,7 @@
/obj/effect/decal/warning_stripes/southeastcorner,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 4;
- initialize_directions = 11
+ dir = 4
},
/turf/simulated/floor/plasteel{
icon_state = "darkbluecorners"
@@ -23552,7 +22680,7 @@
icon_state = "1-2"
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aZR" = (
/turf/simulated/floor/plasteel{
icon_state = "grimy"
@@ -23596,12 +22724,11 @@
/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/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"aZY" = (
/obj/machinery/camera{
c_tag = "Security Checkpoint";
@@ -23609,7 +22736,7 @@
},
/obj/machinery/alarm{
dir = 4;
- pixel_x = -22
+ pixel_x = -24
},
/turf/simulated/floor/plasteel{
dir = 10;
@@ -23658,8 +22785,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,
@@ -23716,8 +22842,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/machinery/atmospherics/unary/vent_pump/on,
/turf/simulated/floor/plasteel{
@@ -23749,7 +22874,7 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"baq" = (
/obj/effect/decal/warning_stripes/northwestcorner,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -23798,7 +22923,7 @@
/area/library)
"bav" = (
/obj/item/radio/intercom{
- pixel_y = 25
+ pixel_y = 28
},
/obj/structure/table/wood,
/obj/item/dice/d20,
@@ -23809,8 +22934,7 @@
"baw" = (
/obj/effect/decal/warning_stripes/north,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 1;
- initialize_directions = 11
+ dir = 1
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -23885,48 +23009,18 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/door/firedoor,
/turf/simulated/floor/plasteel,
/area/hallway/primary/fore)
"baF" = (
/obj/machinery/door/airlock/public/glass{
name = "Central Access"
},
+/obj/machinery/door/firedoor,
/turf/simulated/floor/plasteel{
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{
@@ -23971,7 +23065,7 @@
dir = 4
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"baM" = (
/obj/structure/window/reinforced,
/obj/structure/disposalpipe/segment{
@@ -23985,19 +23079,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
@@ -24006,19 +23087,7 @@
dir = 4
},
/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)
+/area/maintenance/fsmaint)
"baS" = (
/obj/structure/disposalpipe/segment{
dir = 2;
@@ -24031,20 +23100,7 @@
dir = 4
},
/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)
+/area/maintenance/fsmaint)
"bba" = (
/obj/effect/landmark{
name = "Observer-Start"
@@ -24055,8 +23111,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/disposalpipe/segment{
dir = 4
@@ -24069,33 +23124,30 @@
dir = 4
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"bbc" = (
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/structure/disposalpipe/segment{
dir = 4;
icon_state = "pipe-c"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 1;
- initialize_directions = 11
+ dir = 1
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 1
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"bbd" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/disposalpipe/junction{
dir = 4;
@@ -24109,13 +23161,12 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"bbe" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/disposalpipe/segment{
dir = 4
@@ -24127,10 +23178,9 @@
dir = 4
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"bbf" = (
/obj/machinery/door/airlock/vault{
- icon_state = "door_locked";
locked = 1;
req_access_txt = "53"
},
@@ -24168,8 +23218,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/disposalpipe/segment{
dir = 4
@@ -24181,11 +23230,11 @@
dir = 4
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"bbi" = (
/obj/machinery/vending/cola,
/obj/machinery/camera{
- c_tag = "Dormitories North-West"
+ c_tag = "Dormitories West"
},
/turf/simulated/floor/plasteel{
dir = 4;
@@ -24247,7 +23296,6 @@
/turf/simulated/wall/r_wall,
/area/security/nuke_storage)
"bbr" = (
-/obj/machinery/door/firedoor,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "bluecorner"
@@ -24257,8 +23305,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/disposalpipe/junction{
dir = 4
@@ -24266,24 +23313,21 @@
/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;
- initialize_directions = 11
+ dir = 1
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 1
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"bbt" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/turf/simulated/floor/plasteel,
/area/crew_quarters/dorms)
@@ -24320,8 +23364,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/disposalpipe/sortjunction{
dir = 4;
@@ -24335,7 +23378,7 @@
dir = 4
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"bbA" = (
/obj/structure/table/wood,
/obj/item/flashlight/lamp/green,
@@ -24363,8 +23406,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/disposalpipe/segment{
dir = 4
@@ -24372,13 +23414,12 @@
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"bbD" = (
/obj/effect/landmark/start{
name = "Mime"
@@ -24407,13 +23448,12 @@
},
/obj/effect/spawner/random_spawners/grille_often,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"bbF" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door/poddoor{
density = 0;
@@ -24424,7 +23464,7 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"bbG" = (
/obj/effect/decal/remains/human,
/turf/simulated/floor/plating,
@@ -24441,8 +23481,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
@@ -24451,7 +23490,7 @@
dir = 4
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"bbJ" = (
/obj/item/reagent_containers/food/snacks/grown/banana,
/obj/item/storage/backpack/duffel/clown,
@@ -24478,11 +23517,7 @@
/obj/machinery/portable_atmospherics/canister/nitrogen{
anchored = 1
},
-/turf/simulated/floor/engine{
- name = "n2 floor";
- nitrogen = 100000;
- oxygen = 0
- },
+/turf/simulated/floor/engine/n2,
/area/atmos)
"bbN" = (
/obj/effect/decal/warning_stripes/northeast,
@@ -24543,8 +23578,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
@@ -24553,7 +23587,7 @@
dir = 4
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"bbV" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -24561,35 +23595,31 @@
/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/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"bbX" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 1;
- initialize_directions = 11
+ dir = 1
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 1
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"bbY" = (
/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
@@ -24598,11 +23628,10 @@
dir = 4
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"bbZ" = (
/obj/machinery/light{
- dir = 1;
- on = 1
+ dir = 1
},
/turf/simulated/floor/plasteel{
dir = 4;
@@ -24626,8 +23655,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/disposalpipe/sortjunction{
dir = 4;
@@ -24642,7 +23670,7 @@
dir = 4
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"bcc" = (
/obj/structure/window/reinforced,
/obj/machinery/vending/cigarette,
@@ -24686,7 +23714,7 @@
dir = 4
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"bch" = (
/obj/structure/chair/office/dark,
/obj/machinery/camera{
@@ -24721,11 +23749,7 @@
dir = 4
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
-"bcl" = (
-/obj/machinery/hologram/holopad,
-/turf/simulated/floor/plasteel,
-/area/escapepodbay)
+/area/maintenance/fsmaint)
"bcm" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -24737,7 +23761,7 @@
dir = 4
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"bcn" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -24788,30 +23812,26 @@
/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"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 4;
- initialize_directions = 11
+ dir = 4
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 4;
- initialize_directions = 11
+ dir = 4
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"bcu" = (
/obj/structure/table/wood,
/obj/item/pen,
/obj/item/reagent_containers/food/drinks/bottle/holywater,
/obj/machinery/light{
- dir = 1;
- on = 1
+ dir = 1
},
/turf/simulated/floor/carpet/black,
/area/chapel/office)
@@ -24834,7 +23854,7 @@
/area/maintenance/fpmaint)
"bcw" = (
/obj/machinery/alarm{
- pixel_y = 25
+ pixel_y = 24
},
/obj/machinery/camera{
c_tag = "Chapel Chaplain's Office"
@@ -24850,8 +23870,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
dir = 1;
@@ -24868,14 +23887,13 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"bcB" = (
/obj/structure/table/wood,
/obj/item/paper_bin{
@@ -24884,7 +23902,7 @@
},
/obj/item/storage/fancy/crayons,
/obj/machinery/light_switch{
- pixel_y = 25
+ pixel_y = 24
},
/turf/simulated/floor/plasteel{
icon_state = "grimy"
@@ -24892,7 +23910,6 @@
/area/chapel/office)
"bcC" = (
/obj/structure/extinguisher_cabinet{
- pixel_x = -5;
pixel_y = 30
},
/turf/simulated/floor/plasteel{
@@ -24937,16 +23954,8 @@
},
/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;
pixel_y = 30
},
/turf/simulated/floor/plasteel,
@@ -25029,10 +24038,12 @@
/turf/simulated/floor/plasteel,
/area/storage/primary)
"bcU" = (
+/obj/structure/chair/stool/bar{
+ dir = 1
+ },
/obj/machinery/computer/security/telescreen/entertainment{
pixel_x = -32
},
-/obj/structure/chair/stool/bar,
/turf/simulated/floor/wood,
/area/crew_quarters/bar)
"bcV" = (
@@ -25106,8 +24117,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
dir = 1;
@@ -25126,8 +24136,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
@@ -25144,10 +24153,11 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
+ },
+/obj/structure/chair/stool{
+ dir = 1
},
-/obj/structure/chair/stool,
/turf/simulated/floor/plasteel,
/area/crew_quarters/dorms)
"bdg" = (
@@ -25171,12 +24181,13 @@
/obj/structure/sign/securearea{
pixel_x = 32
},
-/obj/machinery/door/firedoor,
/obj/effect/decal/warning_stripes/yellow,
/turf/simulated/floor/plasteel,
/area/bridge)
"bdj" = (
-/obj/structure/chair/stool,
+/obj/structure/chair/stool{
+ dir = 1
+ },
/turf/simulated/floor/plasteel,
/area/crew_quarters/dorms)
"bdk" = (
@@ -25190,7 +24201,9 @@
d2 = 8;
icon_state = "2-8"
},
-/obj/structure/chair/stool,
+/obj/structure/chair/stool{
+ dir = 1
+ },
/turf/simulated/floor/plasteel,
/area/crew_quarters/dorms)
"bdm" = (
@@ -25220,7 +24233,7 @@
/obj/item/flashlight/lamp/bananalamp,
/obj/item/reagent_containers/food/snacks/pie,
/obj/machinery/alarm{
- pixel_y = 23
+ pixel_y = 24
},
/turf/simulated/floor/wood,
/area/clownoffice)
@@ -25247,7 +24260,8 @@
/obj/structure/table/wood,
/obj/item/reagent_containers/spray/waterflower,
/obj/machinery/light_switch{
- pixel_y = -25
+ dir = 1;
+ pixel_y = -24
},
/obj/machinery/camera{
c_tag = "Mime's Office";
@@ -25263,7 +24277,7 @@
/obj/structure/statue/tranquillite/mime,
/obj/machinery/alarm{
dir = 1;
- pixel_y = -22
+ pixel_y = -24
},
/turf/simulated/floor/plasteel{
dir = 4;
@@ -25405,11 +24419,7 @@
/obj/machinery/portable_atmospherics/canister/air{
anchored = 1
},
-/turf/simulated/floor/engine{
- name = "air floor";
- nitrogen = 10580;
- oxygen = 2644
- },
+/turf/simulated/floor/engine/air,
/area/atmos)
"bdH" = (
/obj/effect/landmark/start{
@@ -25437,9 +24447,9 @@
dir = 1
},
/obj/item/radio/intercom{
- pixel_y = 25
+ pixel_y = 28
},
-/obj/structure/closet/chefcloset,
+/obj/machinery/vending/chefdrobe,
/turf/simulated/floor/plasteel{
icon_state = "showroomfloor"
},
@@ -25448,8 +24458,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
@@ -25496,8 +24505,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
@@ -25517,7 +24525,6 @@
/obj/structure/sign/securearea{
pixel_x = -32
},
-/obj/machinery/door/firedoor,
/obj/effect/decal/warning_stripes/yellow,
/turf/simulated/floor/plasteel,
/area/bridge)
@@ -25531,8 +24538,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
icon_state = "neutralcorner"
@@ -25543,8 +24549,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -25573,8 +24578,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel,
@@ -25595,8 +24599,7 @@
/obj/structure/table,
/obj/structure/cable{
d2 = 2;
- icon_state = "0-2";
- pixel_y = 1
+ icon_state = "0-2"
},
/obj/machinery/reagentgrinder,
/obj/machinery/power/apc{
@@ -25613,8 +24616,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 2;
@@ -25646,8 +24648,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 2;
@@ -25665,22 +24666,19 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/sign/chinese{
pixel_x = -32;
pixel_y = -32
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 1;
- initialize_directions = 11
+ dir = 1
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -25700,8 +24698,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel,
/area/crew_quarters/dorms)
@@ -25710,8 +24707,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 2;
@@ -25761,8 +24757,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -25788,7 +24783,7 @@
pixel_y = 5
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"bem" = (
/obj/structure/table/wood,
/obj/item/folder/yellow,
@@ -25844,13 +24839,16 @@
/turf/simulated/floor/carpet/black,
/area/chapel/office)
"beu" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/plasteel,
-/area/hallway/primary/central/north)
+/obj/machinery/firealarm{
+ dir = 8;
+ pixel_x = -24
+ },
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "browncorner"
+ },
+/area/hallway/primary/central/nw)
"bev" = (
-/obj/machinery/door/firedoor,
/turf/simulated/floor/plasteel{
icon_state = "bluecorner"
},
@@ -25871,8 +24869,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plating,
/area/maintenance/fpmaint)
@@ -25902,7 +24899,8 @@
dir = 4
},
/obj/machinery/light_switch{
- pixel_x = 25
+ dir = 8;
+ pixel_x = 24
},
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 1
@@ -25930,7 +24928,7 @@
/area/crew_quarters/bar)
"beI" = (
/obj/item/radio/intercom{
- pixel_y = -30
+ pixel_y = -28
},
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 4
@@ -25943,17 +24941,18 @@
icon_state = "pipe-c"
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"beK" = (
-/obj/effect/spawner/window/reinforced,
/obj/structure/cable{
d2 = 4;
icon_state = "0-4"
},
/obj/structure/cable{
+ d1 = 4;
d2 = 8;
- icon_state = "0-8"
+ icon_state = "4-8"
},
+/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
/area/hallway/primary/port)
"beL" = (
@@ -25973,18 +24972,23 @@
icon_state = "pipe-c"
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"beN" = (
-/obj/effect/spawner/window/reinforced,
/obj/structure/cable{
d2 = 4;
icon_state = "0-4"
},
/obj/structure/cable{
- d2 = 8;
- icon_state = "0-8"
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
},
-/obj/structure/cable,
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
/area/hallway/primary/port)
"beO" = (
@@ -26048,8 +25052,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/obj/structure/disposalpipe/segment{
dir = 1;
@@ -26067,8 +25070,7 @@
dir = 4
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 1;
- initialize_directions = 11
+ dir = 1
},
/obj/structure/disposalpipe/segment{
dir = 4
@@ -26110,7 +25112,8 @@
dir = 4
},
/obj/machinery/light_switch{
- pixel_y = -25
+ dir = 1;
+ pixel_y = -24
},
/obj/structure/disposalpipe/segment{
dir = 4
@@ -26161,9 +25164,11 @@
},
/area/crew_quarters/dorms)
"bfc" = (
-/obj/machinery/door/firedoor,
+/obj/structure/chair/stool{
+ dir = 8
+ },
/turf/simulated/floor/plasteel,
-/area/hallway/primary/port)
+/area/crew_quarters/locker)
"bfd" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -26194,8 +25199,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,
@@ -26223,7 +25227,7 @@
pixel_y = -28
},
/obj/machinery/camera{
- c_tag = "Dormitory Center";
+ c_tag = "Dormitories Center";
dir = 1
},
/obj/structure/disposalpipe/segment{
@@ -26259,7 +25263,9 @@
pixel_y = 30
},
/obj/structure/table/reinforced,
-/obj/machinery/chem_dispenser/beer,
+/obj/machinery/chem_dispenser/beer{
+ pixel_y = 8
+ },
/turf/simulated/floor/plasteel{
icon_state = "grimy"
},
@@ -26284,8 +25290,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/disposalpipe/segment{
dir = 4
@@ -26293,7 +25298,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"bfo" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -26338,8 +25343,7 @@
dir = 1
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 1;
- initialize_directions = 11
+ dir = 1
},
/obj/structure/cable{
d1 = 2;
@@ -26372,11 +25376,9 @@
"bfu" = (
/obj/machinery/door/airlock/external{
frequency = 1379;
- icon_state = "door_locked";
id_tag = "ai_outer";
locked = 1;
name = "MiniSat External Access";
- req_access = null;
req_access_txt = "75;13"
},
/turf/simulated/floor/plating,
@@ -26391,8 +25393,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 4;
- icon_state = "1-4";
- tag = "90Curve"
+ icon_state = "1-4"
},
/obj/structure/disposalpipe/segment{
dir = 4
@@ -26410,20 +25411,19 @@
/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/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"bfx" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/machinery/alarm{
dir = 1;
- pixel_y = -22
+ pixel_y = -24
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -26483,7 +25483,7 @@
"bfB" = (
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"bfC" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -26494,14 +25494,13 @@
/area/crew_quarters/kitchen)
"bfD" = (
/obj/item/radio/intercom{
- pixel_y = 25
+ pixel_y = 28
},
/obj/structure/closet/secure_closet/hydroponics,
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
icon_state = "hydrofloor"
@@ -26513,21 +25512,6 @@
icon_state = "showroomfloor"
},
/area/crew_quarters/kitchen)
-"bfF" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8";
- tag = ""
- },
-/obj/structure/closet/secure_closet/hydroponics,
-/obj/machinery/atmospherics/binary/pump{
- dir = 1
- },
-/turf/simulated/floor/plasteel{
- icon_state = "hydrofloor"
- },
-/area/hydroponics)
"bfG" = (
/obj/structure/disposalpipe/sortjunction{
dir = 4;
@@ -26537,19 +25521,17 @@
/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,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"bfH" = (
/obj/machinery/hydroponics/soil,
/turf/simulated/floor/grass,
@@ -26566,10 +25548,10 @@
icon_state = "1-2"
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"bfJ" = (
/obj/item/radio/intercom{
- pixel_y = 25
+ pixel_y = 28
},
/obj/machinery/hydroponics/soil,
/turf/simulated/floor/grass,
@@ -26578,8 +25560,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door/poddoor{
density = 0;
@@ -26590,7 +25571,7 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"bfL" = (
/obj/structure/table,
/obj/item/reagent_containers/spray/plantbgone{
@@ -26627,8 +25608,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/turf/simulated/floor/plasteel{
icon_state = "hydrofloor"
@@ -26641,45 +25621,41 @@
/obj/structure/cable{
d1 = 1;
d2 = 4;
- icon_state = "1-4";
- tag = ""
+ icon_state = "1-4"
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"bfP" = (
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"bfQ" = (
/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/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"bfR" = (
/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,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"bfS" = (
/obj/effect/decal/warning_stripes/north,
/turf/simulated/floor/plasteel{
@@ -26717,7 +25693,7 @@
pixel_y = -3
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"bfX" = (
/obj/structure/cable{
d2 = 2;
@@ -26760,23 +25736,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,
@@ -26833,12 +25792,7 @@
/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{
dir = 1
},
@@ -26854,6 +25808,7 @@
dir = 4;
pixel_y = 39
},
+/obj/machinery/door/firedoor,
/turf/simulated/floor/plasteel,
/area/hallway/secondary/entry)
"bgq" = (
@@ -26916,7 +25871,7 @@
"bgw" = (
/obj/item/radio/intercom{
dir = 1;
- pixel_y = 25
+ pixel_y = 28
},
/obj/structure/cable{
d1 = 4;
@@ -26993,7 +25948,6 @@
dir = 8
},
/obj/item/radio/intercom{
- dir = 0;
pixel_x = -28
},
/obj/effect/decal/warning_stripes/west,
@@ -27137,7 +26091,7 @@
/area/hallway/primary/central/north)
"bgV" = (
/obj/item/radio/intercom{
- pixel_y = 25
+ pixel_y = 28
},
/obj/machinery/door/firedoor,
/turf/simulated/floor/plasteel{
@@ -27152,15 +26106,13 @@
/area/hallway/primary/central/north)
"bgX" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
dir = 1;
@@ -27265,7 +26217,7 @@
/obj/item/clothing/suit/hooded/hoodie/nt,
/obj/structure/table,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"bhm" = (
/turf/simulated/floor/carpet,
/area/hallway/secondary/entry)
@@ -27284,19 +26236,18 @@
icon_state = "1-2"
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"bhp" = (
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/structure/window/reinforced{
dir = 8
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"bhq" = (
/turf/simulated/floor/plasteel,
/area/hallway/primary/central/ne)
@@ -27330,8 +26281,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,
@@ -27348,13 +26298,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/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"bhv" = (
/obj/structure/chair/comfy/beige{
dir = 8
@@ -27374,8 +26323,7 @@
dir = 4
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 4;
- initialize_directions = 11
+ dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/wood,
@@ -27383,11 +26331,9 @@
"bhy" = (
/obj/machinery/door/airlock/external{
frequency = 1379;
- icon_state = "door_locked";
id_tag = "ai_inner";
locked = 1;
name = "MiniSat External Access";
- req_access = null;
req_access_txt = "75;13"
},
/obj/machinery/atmospherics/pipe/simple/hidden{
@@ -27401,7 +26347,7 @@
},
/obj/machinery/alarm{
dir = 4;
- pixel_x = -22
+ pixel_x = -24
},
/turf/simulated/floor/plasteel{
icon_state = "floorgrime"
@@ -27425,8 +26371,7 @@
/area/chapel/main)
"bhD" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 4;
- initialize_directions = 11
+ dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel{
@@ -27594,18 +26539,9 @@
},
/area/hydroponics)
"bhS" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/public/glass{
- name = "Primary Tool Storage"
- },
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2";
- tag = ""
- },
+/obj/machinery/atmospherics/unary/vent_scrubber/on,
/turf/simulated/floor/plasteel,
-/area/storage/primary)
+/area/hallway/primary/starboard/west)
"bhT" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/public/glass{
@@ -27637,13 +26573,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/manifold/hidden/scrubbers{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/turf/simulated/floor/plasteel{
icon_state = "showroomfloor"
@@ -27661,6 +26595,7 @@
/obj/structure/window/reinforced{
dir = 8
},
+/obj/machinery/vending/hydrodrobe,
/turf/simulated/floor/plasteel{
icon_state = "hydrofloor"
},
@@ -27701,8 +26636,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{
@@ -27713,21 +26647,17 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/closet/secure_closet/hydroponics,
/turf/simulated/floor/plasteel{
icon_state = "hydrofloor"
},
/area/hydroponics)
-"big" = (
-/turf/simulated/wall,
-/area/escapepodbay)
"bih" = (
/obj/machinery/alarm{
dir = 4;
- pixel_x = -22
+ pixel_x = -24
},
/obj/machinery/light{
dir = 8
@@ -27738,7 +26668,7 @@
"bii" = (
/obj/machinery/vending/cigarette,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"bij" = (
/obj/structure/chair/office/dark{
dir = 4
@@ -27764,7 +26694,7 @@
dir = 4
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"bip" = (
/obj/machinery/light/small{
dir = 8
@@ -27772,8 +26702,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 4;
- icon_state = "1-4";
- tag = "90Curve"
+ icon_state = "1-4"
},
/obj/structure/disposalpipe/segment{
dir = 1;
@@ -27786,13 +26715,12 @@
dir = 5
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"biq" = (
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/obj/structure/disposalpipe/segment{
dir = 2;
@@ -27828,7 +26756,7 @@
dir = 4
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"bis" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -27906,14 +26834,12 @@
},
/area/hallway/secondary/entry)
"biB" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2";
- tag = ""
+/obj/structure/disposalpipe/segment{
+ dir = 4
},
+/obj/machinery/atmospherics/unary/vent_scrubber/on,
/turf/simulated/floor/plasteel,
-/area/hallway/primary/port)
+/area/hallway/primary/starboard/east)
"biC" = (
/obj/structure/cable{
d1 = 1;
@@ -28036,8 +26962,7 @@
},
/obj/effect/decal/warning_stripes/white/hollow,
/obj/machinery/light{
- dir = 1;
- on = 1
+ dir = 1
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -28114,8 +27039,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
@@ -28139,12 +27063,10 @@
/obj/structure/cable{
d1 = 1;
d2 = 4;
- icon_state = "1-4";
- tag = ""
+ icon_state = "1-4"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
@@ -28159,8 +27081,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
dir = 1;
@@ -28185,15 +27106,13 @@
/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/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 10;
- initialize_directions = 10
+ dir = 10
},
/turf/simulated/floor/plasteel{
icon_state = "showroomfloor"
@@ -28218,7 +27137,8 @@
pixel_y = 2
},
/obj/machinery/light_switch{
- pixel_x = -25
+ dir = 4;
+ pixel_x = -24
},
/turf/simulated/floor/plasteel{
icon_state = "grimy"
@@ -28247,7 +27167,7 @@
/area/turret_protected/aisat_interior)
"bjc" = (
/obj/machinery/alarm{
- pixel_y = 23
+ pixel_y = 24
},
/obj/structure/closet/secure_closet/bar{
req_access_txt = "25"
@@ -28287,7 +27207,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"bjh" = (
/obj/machinery/door/airlock/maintenance{
req_access_txt = "12"
@@ -28306,15 +27226,14 @@
/turf/simulated/floor/plasteel,
/area/atmos)
"bjj" = (
-/obj/structure/closet/gmcloset{
- name = "formal wardrobe"
- },
/obj/machinery/light/small{
dir = 4
},
/obj/machinery/light_switch{
- pixel_x = 27
+ dir = 8;
+ pixel_x = 24
},
+/obj/machinery/vending/bardrobe,
/turf/simulated/floor/wood,
/area/crew_quarters/bar)
"bjk" = (
@@ -28323,7 +27242,7 @@
icon_state = "pipe-c"
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"bjl" = (
/obj/effect/decal/cleanable/fungus,
/turf/simulated/wall,
@@ -28336,13 +27255,12 @@
dir = 1
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"bjo" = (
/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,
@@ -28351,7 +27269,7 @@
sortType = 19
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"bjp" = (
/obj/machinery/door/morgue{
name = "Confession Booth (Chaplain)";
@@ -28420,7 +27338,7 @@
dir = 1
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"bjx" = (
/mob/living/simple_animal/cow{
name = "Betsy"
@@ -28437,8 +27355,7 @@
/area/clownoffice)
"bjA" = (
/obj/machinery/light{
- dir = 1;
- in_use = 1
+ dir = 1
},
/obj/machinery/status_display{
layer = 4;
@@ -28469,21 +27386,21 @@
"bjI" = (
/obj/item/twohanded/required/kirbyplants,
/obj/machinery/light_switch{
- pixel_y = 25
+ pixel_y = 24
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
/area/chapel/main)
"bjK" = (
-/obj/machinery/computer/security/telescreen/entertainment{
- pixel_x = 32
- },
/obj/structure/table/wood,
/obj/item/ashtray/bronze{
pixel_x = -1;
pixel_y = 1
},
+/obj/machinery/computer/security/telescreen/entertainment{
+ pixel_x = 32
+ },
/turf/simulated/floor/carpet,
/area/crew_quarters/bar)
"bjL" = (
@@ -28500,7 +27417,7 @@
/obj/structure/table,
/obj/item/clothing/under/mime,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"bjN" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -28550,15 +27467,14 @@
dir = 4
},
/obj/structure/extinguisher_cabinet{
- pixel_x = -24
+ pixel_x = -27
},
/obj/effect/decal/warning_stripes/west,
/turf/simulated/floor/plasteel,
/area/hallway/secondary/entry)
"bjV" = (
/obj/structure/extinguisher_cabinet{
- pixel_x = -5;
- pixel_y = -31
+ pixel_y = -30
},
/obj/machinery/light,
/obj/structure/disposalpipe/segment{
@@ -28592,19 +27508,17 @@
/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/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"bjY" = (
/obj/structure/extinguisher_cabinet{
- pixel_x = 5;
- pixel_y = -32
+ pixel_y = -30
},
/obj/structure/disposalpipe/segment{
dir = 4
@@ -28683,7 +27597,7 @@
},
/obj/machinery/alarm{
dir = 1;
- pixel_y = -22
+ pixel_y = -24
},
/turf/simulated/floor/plasteel,
/area/hallway/primary/port)
@@ -28716,8 +27630,7 @@
dir = 10
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 10;
- initialize_directions = 10
+ dir = 10
},
/turf/simulated/floor/plasteel{
icon_state = "hydrofloor"
@@ -28761,30 +27674,25 @@
/turf/simulated/floor/wood,
/area/library)
"bko" = (
-/obj/machinery/door/firedoor,
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel,
/area/hallway/primary/port)
"bkp" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/turf/simulated/floor/wood,
/area/library)
"bkq" = (
-/obj/machinery/door/firedoor,
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/sign/directions/cargo{
pixel_y = -39
@@ -28814,9 +27722,9 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
+/obj/machinery/door/firedoor,
/turf/simulated/floor/plasteel,
/area/hallway/primary/central/nw)
"bkt" = (
@@ -28825,13 +27733,12 @@
dir = 4
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"bku" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel,
/area/hallway/primary/central/nw)
@@ -28839,8 +27746,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -28851,14 +27757,12 @@
/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;
@@ -28874,8 +27778,7 @@
/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'";
@@ -28892,8 +27795,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -28904,8 +27806,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/door/firedoor,
/turf/simulated/floor/plasteel{
@@ -28918,8 +27819,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -28927,7 +27827,6 @@
},
/area/hallway/primary/central/north)
"bkC" = (
-/obj/machinery/door/firedoor,
/obj/structure/sign/directions/engineering{
pixel_y = -39
},
@@ -28949,7 +27848,7 @@
dir = 4
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"bkE" = (
/obj/structure/sign/securearea{
desc = "A warning sign which reads 'HIGH VOLTAGE'";
@@ -28960,8 +27859,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -28972,8 +27870,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -28994,8 +27891,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/turf/simulated/floor/plasteel,
/area/hallway/primary/central/ne)
@@ -29047,7 +27943,7 @@
dir = 4
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"bkO" = (
/obj/structure/table/reinforced,
/turf/simulated/floor/plasteel{
@@ -29068,7 +27964,6 @@
/turf/simulated/floor/wood,
/area/library)
"bkR" = (
-/obj/machinery/door/firedoor,
/obj/effect/decal/warning_stripes/yellow,
/obj/machinery/door/poddoor{
density = 0;
@@ -29149,7 +28044,8 @@
"bkY" = (
/obj/machinery/hydroponics/soil,
/obj/machinery/light_switch{
- pixel_x = 27
+ dir = 8;
+ pixel_x = 24
},
/turf/simulated/floor/grass,
/area/hydroponics)
@@ -29236,12 +28132,10 @@
/area/hallway/secondary/entry)
"blh" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -29304,25 +28198,23 @@
},
/obj/structure/window/reinforced/tinted,
/obj/structure/window/reinforced/tinted{
- dir = 4;
- tag = ""
+ dir = 4
},
/obj/structure/window/reinforced/tinted{
- dir = 8;
- tag = ""
+ dir = 8
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
/area/chapel/main)
"blr" = (
-/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/machinery/door/firedoor,
/turf/simulated/floor/plasteel,
/area/hallway/secondary/entry)
"bls" = (
@@ -29396,7 +28288,6 @@
/turf/simulated/floor/plasteel,
/area/hallway/secondary/entry)
"blF" = (
-/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
@@ -29412,8 +28303,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plating,
/area/maintenance/fpmaint2)
@@ -29583,8 +28473,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plating,
/area/bridge)
@@ -29629,8 +28518,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/structure/cable{
d1 = 2;
@@ -29661,8 +28549,7 @@
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 1;
- initialize_directions = 11
+ dir = 1
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 1
@@ -29683,7 +28570,7 @@
dir = 4
},
/obj/machinery/light_switch{
- pixel_y = 25
+ pixel_y = 24
},
/turf/simulated/floor/plasteel{
icon_state = "cafeteria"
@@ -29758,7 +28645,9 @@
},
/area/hallway/secondary/entry)
"bmp" = (
-/obj/structure/chair/stool,
+/obj/structure/chair/sofa/pew/left{
+ dir = 1
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "chapel"
@@ -29768,7 +28657,9 @@
/turf/simulated/floor/wood,
/area/crew_quarters/bar)
"bmr" = (
-/obj/structure/chair/stool/bar,
+/obj/structure/chair/stool/bar{
+ dir = 1
+ },
/turf/simulated/floor/wood,
/area/crew_quarters/bar)
"bms" = (
@@ -29788,7 +28679,7 @@
/area/hallway/primary/port)
"bmt" = (
/obj/structure/sink/kitchen{
- pixel_y = 28
+ pixel_y = 25
},
/obj/structure/disposalpipe/segment{
dir = 4
@@ -29852,7 +28743,6 @@
/turf/simulated/floor/plating,
/area/crew_quarters/kitchen)
"bmz" = (
-/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
@@ -29886,6 +28776,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/machinery/door/firedoor,
/turf/simulated/floor/plasteel,
/area/hallway/primary/central/nw)
"bmD" = (
@@ -29907,7 +28798,8 @@
"bmF" = (
/obj/structure/cult/archives,
/obj/machinery/light_switch{
- pixel_y = -25
+ dir = 1;
+ pixel_y = -24
},
/turf/simulated/floor/plasteel{
icon_state = "cult"
@@ -29927,7 +28819,7 @@
"bmH" = (
/obj/structure/grille,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"bmI" = (
/obj/structure/chair/comfy/black{
dir = 4
@@ -29968,8 +28860,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/obj/structure/cable{
d1 = 4;
@@ -30007,14 +28898,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"
},
/turf/simulated/floor/plasteel{
dir = 1;
@@ -30026,8 +28915,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/turf/simulated/floor/plasteel{
dir = 1;
@@ -30045,8 +28933,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -30116,8 +29003,7 @@
dir = 4
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 1;
- initialize_directions = 11
+ dir = 1
},
/turf/simulated/floor/plasteel{
icon_state = "L2"
@@ -30294,7 +29180,7 @@
/obj/item/clothing/mask/breath,
/obj/item/clothing/mask/breath,
/obj/machinery/light_switch{
- pixel_y = 28
+ pixel_y = 24
},
/turf/simulated/floor/plating,
/area/storage/emergency2)
@@ -30317,7 +29203,7 @@
/area/storage/emergency2)
"bnA" = (
/obj/machinery/light_switch{
- pixel_y = 28
+ pixel_y = 24
},
/turf/simulated/floor/plasteel,
/area/crew_quarters/locker)
@@ -30385,8 +29271,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
@@ -30441,13 +29326,12 @@
/turf/simulated/floor/plasteel,
/area/bridge)
"bnV" = (
-/obj/machinery/computer/monitor{
- name = "Bridge Power Monitoring Computer"
- },
/obj/structure/cable{
d2 = 2;
- icon_state = "0-2";
- pixel_y = 1
+ icon_state = "0-2"
+ },
+/obj/machinery/computer/monitor{
+ name = "Bridge Power Monitoring Computer"
},
/turf/simulated/floor/plasteel{
dir = 6;
@@ -30495,7 +29379,7 @@
/area/bridge)
"bob" = (
/obj/machinery/alarm{
- pixel_y = 25
+ pixel_y = 24
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -30564,8 +29448,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
icon_state = "cafeteria"
@@ -30609,7 +29492,7 @@
c_tag = "Kitchen"
},
/obj/item/radio/intercom{
- pixel_y = 25
+ pixel_y = 28
},
/obj/machinery/kitchen_machine/candy_maker,
/turf/simulated/floor/plasteel{
@@ -30733,8 +29616,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -30823,12 +29705,10 @@
"boM" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 4;
- initialize_directions = 11
+ dir = 4
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 4;
- initialize_directions = 11
+ dir = 4
},
/turf/simulated/floor/carpet,
/area/crew_quarters/bar)
@@ -30861,11 +29741,11 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/light_switch{
- pixel_x = 27
+ dir = 8;
+ pixel_x = 24
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -30891,6 +29771,7 @@
/area/crew_quarters/kitchen)
"boT" = (
/obj/machinery/firealarm{
+ dir = 1;
pixel_y = -24
},
/turf/simulated/floor/plasteel,
@@ -30946,7 +29827,6 @@
"bpa" = (
/obj/structure/closet/wardrobe/mixed,
/obj/item/radio/intercom{
- dir = 0;
pixel_x = -28
},
/turf/simulated/floor/plasteel,
@@ -30954,7 +29834,7 @@
"bpb" = (
/obj/machinery/alarm{
dir = 4;
- pixel_x = -22
+ pixel_x = -24
},
/obj/structure/table,
/obj/item/storage/box/lights/mixed,
@@ -30999,17 +29879,12 @@
/turf/simulated/floor/plasteel,
/area/hallway/primary/port)
"bph" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/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/manifold/hidden/scrubbers,
/turf/simulated/floor/plasteel,
-/area/hallway/primary/port)
+/area/hallway/primary/starboard/west)
"bpi" = (
/obj/machinery/portable_atmospherics/canister/air,
/obj/effect/decal/warning_stripes/white/hollow,
@@ -31022,7 +29897,7 @@
},
/obj/machinery/alarm{
dir = 1;
- pixel_y = -22
+ pixel_y = -24
},
/turf/simulated/floor/plasteel,
/area/hallway/primary/port)
@@ -31035,8 +29910,7 @@
/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,
@@ -31069,14 +29943,12 @@
/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/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -31108,8 +29980,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
@@ -31123,8 +29994,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
dir = 4;
@@ -31157,8 +30027,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 = 1
@@ -31204,8 +30073,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
dir = 4;
@@ -31216,8 +30084,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
@@ -31236,8 +30103,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
@@ -31285,18 +30151,17 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"bpF" = (
/obj/machinery/alarm{
dir = 1;
- pixel_y = -22
+ pixel_y = -24
},
/turf/simulated/floor/plasteel,
/area/hallway/secondary/entry)
@@ -31342,7 +30207,7 @@
},
/area/chapel/main)
"bpL" = (
-/obj/structure/foodcart,
+/obj/machinery/smartfridge/foodcart,
/turf/simulated/floor/plasteel{
icon_state = "cafeteria"
},
@@ -31405,8 +30270,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/turf/simulated/floor/carpet,
/area/crew_quarters/mrchangs)
@@ -31490,13 +30354,14 @@
/area/library)
"bqd" = (
/obj/structure/table/wood,
-/obj/machinery/computer/library/checkout,
/obj/machinery/light/small{
dir = 4
},
/obj/machinery/light_switch{
- pixel_x = 27
+ dir = 8;
+ pixel_x = 24
},
+/obj/machinery/computer/library/checkout,
/turf/simulated/floor/wood,
/area/library)
"bqe" = (
@@ -31513,13 +30378,14 @@
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 10;
- initialize_directions = 10
+ dir = 10
},
/turf/simulated/floor/plasteel,
/area/hallway/secondary/entry)
"bqg" = (
-/obj/structure/chair/stool,
+/obj/structure/chair/sofa/pew/right{
+ dir = 1
+ },
/turf/simulated/floor/plasteel{
icon_state = "chapel"
},
@@ -31547,7 +30413,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"bqk" = (
/obj/structure/chair/wood/wings{
dir = 8
@@ -31581,8 +30447,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/wood,
/area/crew_quarters/mrchangs)
@@ -31626,8 +30491,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plating,
/area/maintenance/fpmaint2)
@@ -31639,7 +30503,9 @@
/turf/simulated/floor/plasteel,
/area/crew_quarters/locker)
"bqv" = (
-/obj/structure/chair/stool,
+/obj/structure/chair/stool{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/crew_quarters/locker)
"bqw" = (
@@ -31693,8 +30559,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,
@@ -31724,7 +30589,7 @@
/area/civilian/pet_store)
"bqG" = (
/obj/structure/extinguisher_cabinet{
- pixel_x = -24
+ pixel_x = -27
},
/turf/simulated/floor/plasteel,
/area/storage/tools)
@@ -31787,22 +30652,22 @@
},
/area/bridge)
"bqP" = (
-/obj/machinery/computer/secure_data,
/obj/machinery/alarm{
- pixel_y = 26
+ pixel_y = 24
},
+/obj/machinery/computer/secure_data,
/turf/simulated/floor/plasteel{
dir = 6;
icon_state = "red"
},
/area/bridge)
"bqQ" = (
-/obj/machinery/computer/security{
- network = list("SS13","Research Outpost","Mining Outpost","Telecomms")
- },
/obj/machinery/camera{
c_tag = "Bridge West"
},
+/obj/machinery/computer/security{
+ network = list("SS13","Research Outpost","Mining Outpost","Telecomms")
+ },
/turf/simulated/floor/plasteel{
dir = 0;
icon_state = "red"
@@ -31845,8 +30710,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel,
/area/bridge)
@@ -31918,7 +30782,7 @@
"brf" = (
/obj/machinery/alarm{
dir = 4;
- pixel_x = -22
+ pixel_x = -24
},
/obj/machinery/camera{
c_tag = "Bar West";
@@ -31953,8 +30817,7 @@
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 6
@@ -32072,8 +30935,8 @@
/turf/simulated/floor/wood,
/area/library)
"brx" = (
-/obj/machinery/computer/library/public,
/obj/structure/table/wood,
+/obj/machinery/computer/library/public,
/turf/simulated/floor/wood,
/area/library)
"bry" = (
@@ -32084,8 +30947,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 4;
- icon_state = "1-4";
- tag = ""
+ icon_state = "1-4"
},
/turf/simulated/floor/plating,
/area/storage/emergency2)
@@ -32098,7 +30960,7 @@
/area/library)
"brB" = (
/obj/item/radio/intercom{
- pixel_x = 25
+ pixel_x = 28
},
/obj/machinery/libraryscanner,
/turf/simulated/floor/wood,
@@ -32122,7 +30984,7 @@
"brE" = (
/obj/machinery/alarm{
dir = 8;
- pixel_x = 25
+ pixel_x = 24
},
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 8
@@ -32161,8 +31023,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -32204,7 +31065,9 @@
},
/area/bridge)
"brT" = (
-/obj/structure/chair/stool,
+/obj/structure/chair/stool{
+ dir = 8
+ },
/turf/simulated/floor/wood,
/area/crew_quarters/bar)
"brU" = (
@@ -32235,8 +31098,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,
@@ -32356,7 +31218,7 @@
"bsm" = (
/obj/machinery/alarm{
dir = 4;
- pixel_x = -22
+ pixel_x = -24
},
/turf/simulated/floor/plasteel,
/area/storage/tools)
@@ -32375,7 +31237,6 @@
name = "HIGH VOLTAGE";
pixel_y = 32
},
-/obj/machinery/door/firedoor,
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "blue"
@@ -32388,8 +31249,7 @@
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 4;
- initialize_directions = 11
+ dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel,
@@ -32413,9 +31273,9 @@
/obj/effect/spawner/window/reinforced,
/obj/structure/cable{
d2 = 2;
- icon_state = "0-2";
- pixel_y = 1
+ icon_state = "0-2"
},
+/obj/machinery/door/firedoor,
/turf/simulated/floor/plating,
/area/bridge)
"bsv" = (
@@ -32445,14 +31305,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"
},
/turf/simulated/floor/plasteel,
/area/bridge)
@@ -32460,8 +31318,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/landmark{
name = "Marauder Entry"
@@ -32476,14 +31333,12 @@
/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"
},
/turf/simulated/floor/plasteel,
/area/bridge)
@@ -32494,8 +31349,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
dir = 1;
@@ -32506,8 +31360,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel,
/area/bridge)
@@ -32521,8 +31374,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/structure/chair{
dir = 1
@@ -32542,7 +31394,6 @@
name = "HIGH VOLTAGE";
pixel_y = 32
},
-/obj/machinery/door/firedoor,
/turf/simulated/floor/plasteel{
dir = 9;
icon_state = "blue"
@@ -32565,6 +31416,7 @@
/area/hallway/primary/central/ne)
"bsM" = (
/obj/machinery/light_switch{
+ dir = 4;
pixel_x = -24
},
/obj/machinery/atmospherics/unary/vent_scrubber/on{
@@ -32622,8 +31474,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/table,
/obj/item/book/manual/sop_service,
@@ -32658,7 +31509,7 @@
/area/crew_quarters/kitchen)
"bsW" = (
/obj/machinery/light_switch{
- pixel_y = 28
+ pixel_y = 24
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
@@ -32728,7 +31579,7 @@
"btd" = (
/obj/item/twohanded/required/kirbyplants,
/obj/machinery/alarm{
- pixel_y = 25
+ pixel_y = 24
},
/turf/simulated/floor/plasteel,
/area/hallway/secondary/exit)
@@ -32902,8 +31753,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 4;
- icon_state = "1-4";
- tag = ""
+ icon_state = "1-4"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -32925,8 +31775,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
@@ -33052,8 +31901,7 @@
dir = 10
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 10;
- initialize_directions = 10
+ dir = 10
},
/turf/simulated/floor/wood,
/area/library)
@@ -33151,8 +31999,7 @@
"bum" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 4;
- initialize_directions = 11
+ dir = 4
},
/turf/simulated/floor/plasteel,
/area/hallway/primary/central/nw)
@@ -33169,8 +32016,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,
@@ -33204,8 +32050,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/table,
/obj/item/kitchen/knife,
@@ -33258,8 +32103,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/ai_status_display{
pixel_x = -32;
@@ -33274,14 +32118,18 @@
},
/area/chapel/main)
"buA" = (
-/obj/structure/chair/stool,
+/obj/structure/chair/sofa/pew/right{
+ dir = 1
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "chapel"
},
/area/chapel/main)
"buB" = (
-/obj/structure/chair/stool,
+/obj/structure/chair/sofa/pew/left{
+ dir = 1
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "chapel"
@@ -33315,8 +32163,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
@@ -33385,8 +32232,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/carpet,
/area/crew_quarters/mrchangs)
@@ -33401,8 +32247,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -33454,7 +32299,7 @@
"buU" = (
/obj/machinery/alarm{
dir = 8;
- pixel_x = 25
+ pixel_x = 24
},
/turf/simulated/floor/plasteel{
dir = 4;
@@ -33465,8 +32310,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/carpet,
/area/library)
@@ -33474,8 +32318,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/disposalpipe/segment{
dir = 8;
@@ -33493,8 +32336,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/turf/simulated/floor/carpet,
/area/chapel/main)
@@ -33502,8 +32344,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/public/glass{
@@ -33526,7 +32367,7 @@
/area/security/vacantoffice)
"bvc" = (
/obj/machinery/alarm{
- pixel_y = 23
+ pixel_y = 24
},
/turf/simulated/floor/wood,
/area/security/vacantoffice)
@@ -33550,8 +32391,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/sign/poster/random{
pixel_y = 32
@@ -33576,8 +32416,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel,
/area/hallway/primary/starboard/east)
@@ -33585,8 +32424,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/disposalpipe/segment{
dir = 4
@@ -33608,7 +32446,8 @@
/area/hallway/secondary/entry)
"bvm" = (
/obj/machinery/light_switch{
- pixel_x = -28
+ dir = 4;
+ pixel_x = -24
},
/obj/machinery/light{
dir = 8
@@ -33699,8 +32538,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 4;
- icon_state = "1-4";
- tag = ""
+ icon_state = "1-4"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel,
@@ -33709,8 +32547,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,
@@ -33719,8 +32556,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/item/radio/beacon,
/obj/effect/landmark{
@@ -33731,8 +32567,7 @@
"bvD" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/turf/simulated/floor/plasteel,
/area/hallway/primary/central/ne)
@@ -33816,8 +32651,7 @@
"bvO" = (
/obj/structure/cable{
d2 = 2;
- icon_state = "0-2";
- pixel_y = 1
+ icon_state = "0-2"
},
/obj/machinery/power/apc{
dir = 8;
@@ -33835,10 +32669,7 @@
},
/area/hallway/secondary/exit)
"bvQ" = (
-/obj/machinery/door/firedoor{
- dir = 8;
- name = "Firelock West"
- },
+/obj/machinery/door/firedoor,
/obj/machinery/door/window{
base_state = "right";
dir = 8;
@@ -33854,8 +32685,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
dir = 4;
@@ -33887,12 +32717,10 @@
icon_state = "2-4"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/turf/simulated/floor/plasteel,
/area/crew_quarters/locker)
@@ -34020,8 +32848,7 @@
dir = 10
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 10;
- initialize_directions = 10
+ dir = 10
},
/turf/simulated/floor/plasteel,
/area/crew_quarters/locker)
@@ -34035,7 +32862,6 @@
/turf/simulated/floor/plasteel,
/area/bridge/meeting_room)
"bwf" = (
-/obj/machinery/door/firedoor,
/turf/simulated/floor/plasteel{
dir = 10;
icon_state = "blue"
@@ -34044,6 +32870,7 @@
"bwg" = (
/obj/effect/spawner/window/reinforced,
/obj/structure/cable,
+/obj/machinery/door/firedoor,
/turf/simulated/floor/plating,
/area/bridge)
"bwh" = (
@@ -34158,8 +32985,7 @@
/area/hydroponics)
"bwt" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plating,
@@ -34210,12 +33036,10 @@
/area/storage/tools)
"bwB" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/turf/simulated/floor/plasteel,
/area/hallway/primary/central/nw)
@@ -34233,8 +33057,7 @@
/area/hallway/secondary/exit)
"bwF" = (
/obj/machinery/light{
- dir = 1;
- in_use = 1
+ dir = 1
},
/obj/machinery/door/firedoor,
/turf/simulated/floor/plasteel{
@@ -34245,8 +33068,7 @@
"bwK" = (
/obj/machinery/meter,
/obj/machinery/atmospherics/pipe/manifold/visible{
- dir = 4;
- initialize_directions = 11
+ dir = 4
},
/obj/effect/decal/warning_stripes/northeast,
/turf/simulated/floor/plating,
@@ -34274,7 +33096,6 @@
/turf/simulated/floor/wood,
/area/security/vacantoffice)
"bwN" = (
-/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
@@ -34314,10 +33135,8 @@
/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/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -34342,14 +33161,12 @@
/obj/structure/cable{
d1 = 1;
d2 = 4;
- icon_state = "1-4";
- tag = ""
+ icon_state = "1-4"
},
/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
@@ -34357,6 +33174,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/machinery/door/firedoor,
/turf/simulated/floor/plasteel,
/area/bridge)
"bwT" = (
@@ -34369,8 +33187,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
@@ -34384,8 +33201,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/door/airlock/command/glass{
name = "Bridge";
@@ -34403,8 +33219,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/warning_stripes/northeastcorner,
/obj/effect/decal/warning_stripes/southeastcorner,
@@ -34425,13 +33240,12 @@
/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,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"bwY" = (
/obj/machinery/power/apc{
dir = 4;
@@ -34542,15 +33356,13 @@
/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
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 1;
- initialize_directions = 11
+ dir = 1
},
/turf/simulated/floor/plasteel,
/area/bridge)
@@ -34571,12 +33383,12 @@
/area/turret_protected/ai_upload)
"bxr" = (
/obj/structure/extinguisher_cabinet{
- pixel_x = 5;
- pixel_y = -32
+ pixel_y = -30
},
/obj/machinery/light_switch{
+ dir = 1;
pixel_x = -5;
- pixel_y = -25
+ pixel_y = -24
},
/obj/machinery/light,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -34602,7 +33414,7 @@
c_tag = "AI Upload Chamber"
},
/obj/machinery/light_switch{
- pixel_y = 27
+ pixel_y = 24
},
/turf/simulated/floor/bluegrid,
/area/turret_protected/ai_upload)
@@ -34631,13 +33443,14 @@
},
/area/bridge)
"bxx" = (
-/obj/machinery/computer/arcade,
+/obj/machinery/computer/arcade{
+ dir = 4
+ },
/turf/simulated/floor/wood,
/area/crew_quarters/bar)
"bxy" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 4;
- initialize_directions = 11
+ dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 9
@@ -34681,15 +33494,13 @@
/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
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 1;
- initialize_directions = 11
+ dir = 1
},
/turf/simulated/floor/plasteel{
dir = 0;
@@ -34839,7 +33650,8 @@
},
/obj/item/reagent_containers/glass/bucket,
/obj/machinery/light_switch{
- pixel_x = 27
+ dir = 8;
+ pixel_x = 24
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -34933,7 +33745,7 @@
},
/obj/machinery/alarm{
dir = 1;
- pixel_y = -22
+ pixel_y = -24
},
/turf/simulated/floor/wood,
/area/library)
@@ -34960,8 +33772,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
@@ -34983,8 +33794,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/disposalpipe/segment{
dir = 4
@@ -35001,20 +33811,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/disposalpipe/segment{
dir = 4;
@@ -35024,8 +33831,7 @@
dir = 1
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 1;
- initialize_directions = 11
+ dir = 1
},
/turf/simulated/floor/plasteel,
/area/bridge)
@@ -35040,13 +33846,11 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/door/firedoor,
/obj/effect/decal/warning_stripes/yellow,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -35081,6 +33885,7 @@
"byi" = (
/obj/structure/table/wood,
/obj/machinery/firealarm{
+ dir = 1;
pixel_y = -24
},
/turf/simulated/floor/wood,
@@ -35095,7 +33900,9 @@
/turf/simulated/floor/wood,
/area/security/vacantoffice)
"byk" = (
-/obj/structure/chair/stool,
+/obj/structure/chair/stool{
+ dir = 8
+ },
/obj/effect/decal/warning_stripes/northwest,
/turf/simulated/floor/plasteel,
/area/quartermaster/office)
@@ -35142,8 +33949,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/door/airlock/command/glass{
name = "Bridge";
@@ -35164,7 +33970,6 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
@@ -35196,14 +34001,12 @@
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-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 = 4
@@ -35211,6 +34014,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/machinery/door/firedoor,
/turf/simulated/floor/plasteel,
/area/bridge)
"byu" = (
@@ -35239,8 +34043,7 @@
/area/quartermaster/storage)
"byx" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 4;
- initialize_directions = 11
+ dir = 4
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 4
@@ -35341,11 +34144,10 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/light_switch{
- pixel_y = 27
+ pixel_y = 24
},
/turf/simulated/floor/wood,
/area/bridge/meeting_room)
@@ -35393,14 +34195,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/structure/disposalpipe/sortjunction{
dir = 2;
@@ -35416,14 +34216,12 @@
/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{
dir = 4
@@ -35441,11 +34239,10 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/light_switch{
- pixel_y = 27
+ pixel_y = 24
},
/turf/simulated/floor/wood,
/area/crew_quarters/captain)
@@ -35456,8 +34253,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/public/glass{
@@ -35469,8 +34265,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/computer/security/telescreen/entertainment{
pixel_y = 32
@@ -35484,8 +34279,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/carpet,
/area/crew_quarters/captain)
@@ -35509,21 +34303,20 @@
/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/carpet,
/area/crew_quarters/captain)
"byZ" = (
/obj/machinery/light,
/obj/machinery/light_switch{
- pixel_y = -25
+ dir = 1;
+ pixel_y = -24
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -35546,6 +34339,9 @@
dir = 4;
pixel_y = -32
},
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 1
+ },
/turf/simulated/floor/plasteel,
/area/hallway/primary/starboard/east)
"bzd" = (
@@ -35585,7 +34381,7 @@
/area/hallway/primary/starboard/west)
"bzi" = (
/obj/item/radio/intercom{
- pixel_y = 25
+ pixel_y = 28
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -35645,8 +34441,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/carpet,
@@ -35701,12 +34496,6 @@
name = "Escape Shuttle Cell";
req_access_txt = "63"
},
-/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{
@@ -35770,8 +34559,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/warning_stripes/southeastcorner,
/turf/simulated/floor/plasteel{
@@ -35822,7 +34610,7 @@
/obj/item/storage/box,
/obj/item/storage/box,
/obj/item/radio/intercom{
- pixel_y = 25
+ pixel_y = 28
},
/turf/simulated/floor/plasteel{
dir = 1;
@@ -35943,20 +34731,13 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
/area/turret_protected/ai_upload)
"bzX" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8";
- tag = ""
- },
/obj/machinery/vending/cigarette,
/turf/simulated/floor/wood,
/area/crew_quarters/captain)
@@ -35992,8 +34773,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/carpet,
/area/crew_quarters/captain)
@@ -36003,8 +34783,7 @@
dir = 10
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 4;
- initialize_directions = 11
+ dir = 4
},
/turf/simulated/floor/plasteel,
/area/crew_quarters/locker)
@@ -36012,7 +34791,6 @@
/turf/simulated/floor/plasteel,
/area/hallway/primary/central/east)
"bAg" = (
-/obj/machinery/door/firedoor,
/obj/structure/sign/directions/evac{
dir = 4;
pixel_y = 25
@@ -36031,6 +34809,7 @@
/obj/machinery/door/airlock/public/glass{
name = "Central Access"
},
+/obj/machinery/door/firedoor,
/turf/simulated/floor/plasteel,
/area/hallway/primary/starboard/west)
"bAi" = (
@@ -36048,8 +34827,7 @@
pixel_x = -24
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plating,
@@ -36061,7 +34839,7 @@
/obj/structure/disposalpipe/segment,
/obj/machinery/alarm{
dir = 4;
- pixel_x = -22
+ pixel_x = -24
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -36097,8 +34875,9 @@
/area/hallway/primary/starboard/west)
"bAp" = (
/obj/item/radio/intercom{
- pixel_y = 25
+ pixel_y = 28
},
+/obj/machinery/atmospherics/unary/vent_scrubber/on,
/turf/simulated/floor/plasteel,
/area/hallway/primary/starboard/west)
"bAq" = (
@@ -36189,7 +34968,6 @@
},
/area/hallway/primary/central/nw)
"bAA" = (
-/obj/machinery/door/firedoor,
/turf/simulated/floor/plasteel{
dir = 6;
icon_state = "blue"
@@ -36209,8 +34987,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,
@@ -36223,8 +35000,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/highsecurity{
@@ -36259,8 +35035,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -36301,8 +35076,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,
@@ -36341,8 +35115,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/camera{
c_tag = "Starboard Primary Hallway 4";
@@ -36456,7 +35229,6 @@
/area/quartermaster/storage)
"bBk" = (
/obj/item/radio/intercom{
- dir = 0;
pixel_x = -28
},
/obj/structure/cable{
@@ -36528,12 +35300,10 @@
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/turf/simulated/floor/plasteel,
/area/hallway/secondary/entry)
@@ -36570,7 +35340,7 @@
"bBy" = (
/obj/machinery/alarm{
dir = 4;
- pixel_x = -22
+ pixel_x = -24
},
/obj/machinery/porta_turret{
dir = 4
@@ -36583,8 +35353,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/bluegrid,
/area/turret_protected/ai_upload)
@@ -36603,7 +35372,9 @@
},
/area/turret_protected/ai_upload)
"bBC" = (
-/obj/machinery/computer/arcade,
+/obj/machinery/computer/arcade{
+ dir = 4
+ },
/turf/simulated/floor/wood,
/area/crew_quarters/captain)
"bBD" = (
@@ -36695,7 +35466,7 @@
/area/medical/reception)
"bBN" = (
/obj/machinery/light_switch{
- pixel_y = 28
+ pixel_y = 24
},
/turf/simulated/floor/plasteel{
icon_state = "freezerfloor"
@@ -36836,7 +35607,7 @@
"bCv" = (
/obj/machinery/alarm{
dir = 4;
- pixel_x = -22
+ pixel_x = -24
},
/obj/structure/cable{
d1 = 1;
@@ -36850,8 +35621,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{
@@ -36876,8 +35646,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,
@@ -36894,8 +35663,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/disposalpipe/segment,
/obj/machinery/door/firedoor,
@@ -36911,7 +35679,7 @@
/area/crew_quarters/captain)
"bCB" = (
/obj/item/radio/intercom{
- pixel_y = -30
+ pixel_y = -28
},
/obj/machinery/light/small,
/obj/structure/chair/wood/wings{
@@ -36938,7 +35706,7 @@
"bCF" = (
/obj/machinery/alarm{
dir = 4;
- pixel_x = -22
+ pixel_x = -24
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -36973,18 +35741,22 @@
/turf/simulated/floor/bluegrid,
/area/turret_protected/ai_upload)
"bCK" = (
-/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)
"bCL" = (
-/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)
"bCM" = (
@@ -36999,8 +35771,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,
@@ -37051,8 +35822,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/carpet,
/area/crew_quarters/captain)
@@ -37076,7 +35846,7 @@
},
/obj/machinery/vending/wallmed{
name = "Emergency NanoMed";
- pixel_x = -25
+ pixel_x = -28
},
/obj/item/roller,
/turf/simulated/floor/plasteel{
@@ -37094,8 +35864,7 @@
/obj/structure/disposalpipe/segment,
/obj/structure/cable{
d2 = 2;
- icon_state = "0-2";
- pixel_y = 1
+ icon_state = "0-2"
},
/obj/machinery/power/apc{
dir = 8;
@@ -37136,10 +35905,10 @@
/area/medical/reception)
"bDd" = (
/obj/machinery/vending/coffee,
+/obj/machinery/light,
/obj/machinery/computer/mob_healer_terminal{
pixel_y = -32
},
-/obj/machinery/light,
/turf/simulated/floor/plasteel{
icon_state = "whiteblue"
},
@@ -37280,8 +36049,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/warning_stripes/southeastcorner,
/obj/effect/decal/warning_stripes/northeastcorner,
@@ -37466,14 +36234,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/disposalpipe/segment{
dir = 4;
@@ -37511,8 +36277,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
@@ -37575,14 +36340,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 4;
- icon_state = "1-4";
- tag = ""
- },
-/obj/structure/cable{
- d1 = 2;
- d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "1-4"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -37681,8 +36439,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/wood,
/area/crew_quarters/captain)
@@ -37710,8 +36467,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door/firedoor,
/turf/simulated/floor/plasteel{
@@ -37887,13 +36643,11 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 4;
- initialize_directions = 11
+ dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/wood,
@@ -37938,16 +36692,9 @@
/turf/simulated/floor/wood,
/area/crew_quarters/captain)
"bFh" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 8;
- icon_state = "1-8";
- tag = ""
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/turf/simulated/floor/wood,
/area/crew_quarters/captain)
@@ -37970,14 +36717,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/junction{
dir = 2;
@@ -37994,6 +36739,7 @@
icon_state = "1-2"
},
/obj/machinery/light_switch{
+ dir = 4;
pixel_x = -24
},
/obj/effect/decal/cleanable/dirt,
@@ -38010,8 +36756,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/disposalpipe/segment{
dir = 4
@@ -38027,6 +36772,7 @@
dir = 4;
pixel_y = 39
},
+/obj/machinery/atmospherics/unary/vent_scrubber/on,
/turf/simulated/floor/plasteel,
/area/hallway/primary/starboard/east)
"bFo" = (
@@ -38036,8 +36782,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/disposalpipe/segment{
dir = 4
@@ -38064,13 +36809,12 @@
/area/quartermaster/storage)
"bFr" = (
/obj/machinery/alarm{
- pixel_y = 25
+ pixel_y = 24
},
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/disposalpipe/segment{
dir = 4
@@ -38079,14 +36823,12 @@
/area/hallway/primary/starboard/east)
"bFs" = (
/obj/structure/extinguisher_cabinet{
- pixel_x = -5;
pixel_y = 30
},
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/disposalpipe/segment{
dir = 4
@@ -38122,8 +36864,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/disposalpipe/segment{
dir = 4
@@ -38160,7 +36901,7 @@
/area/quartermaster/office)
"bFz" = (
/obj/item/radio/intercom{
- pixel_y = 25
+ pixel_y = 28
},
/obj/structure/disposalpipe/segment{
dir = 4
@@ -38203,10 +36944,10 @@
},
/area/engine/gravitygenerator)
"bFF" = (
+/obj/machinery/slot_machine,
/obj/machinery/computer/security/telescreen/entertainment{
pixel_y = -32
},
-/obj/machinery/slot_machine,
/turf/simulated/floor/wood,
/area/bridge/meeting_room)
"bFG" = (
@@ -38230,7 +36971,7 @@
"bFI" = (
/obj/machinery/alarm{
dir = 1;
- pixel_y = -22
+ pixel_y = -24
},
/turf/simulated/floor/wood,
/area/bridge/meeting_room)
@@ -38245,7 +36986,9 @@
/turf/simulated/floor/grass,
/area/hydroponics)
"bFK" = (
-/obj/machinery/computer/communications,
+/obj/machinery/computer/communications{
+ dir = 8
+ },
/turf/simulated/floor/wood,
/area/crew_quarters/captain)
"bFL" = (
@@ -38264,19 +37007,16 @@
icon_state = "1-4"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/turf/simulated/floor/plasteel,
/area/hallway/secondary/entry)
"bFN" = (
/obj/machinery/light{
- dir = 1;
- on = 1
+ dir = 1
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -38339,8 +37079,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -38442,16 +37181,14 @@
dir = 10
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 10;
- initialize_directions = 10
+ dir = 10
},
/turf/simulated/floor/plating,
/area/maintenance/port)
"bGc" = (
/obj/structure/cable{
d2 = 2;
- icon_state = "0-2";
- pixel_y = 1
+ icon_state = "0-2"
},
/obj/machinery/power/apc{
dir = 8;
@@ -38627,10 +37364,10 @@
/turf/simulated/floor/plasteel,
/area/hallway/primary/central/south)
"bGu" = (
-/obj/machinery/computer/rdconsole/robotics,
/obj/machinery/alarm{
- pixel_y = 25
+ pixel_y = 24
},
+/obj/machinery/computer/rdconsole/robotics,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -38806,8 +37543,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/warning_stripes/northeastcorner,
/turf/simulated/floor/plasteel,
@@ -38931,8 +37667,7 @@
/area/quartermaster/storage)
"bGZ" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel,
@@ -39019,8 +37754,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -39062,12 +37796,10 @@
/area/quartermaster/office)
"bHo" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/turf/simulated/floor/plasteel,
/area/hallway/primary/central/east)
@@ -39097,15 +37829,12 @@
/turf/simulated/floor/plasteel,
/area/hallway/primary/central/sw)
"bHr" = (
-/obj/machinery/door/firedoor,
-/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{
+ dir = 1
},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
/turf/simulated/floor/plasteel,
-/area/hallway/primary/central/east)
+/area/hallway/primary/starboard/east)
"bHs" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -39135,6 +37864,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/machinery/door/firedoor,
/turf/simulated/floor/plasteel,
/area/hallway/primary/starboard/west)
"bHv" = (
@@ -39146,7 +37876,9 @@
/turf/simulated/floor/plating,
/area/maintenance/port)
"bHw" = (
-/obj/machinery/computer/card,
+/obj/machinery/computer/card{
+ dir = 8
+ },
/turf/simulated/floor/wood,
/area/crew_quarters/captain)
"bHx" = (
@@ -39178,8 +37910,7 @@
dir = 1
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 1;
- initialize_directions = 11
+ dir = 1
},
/turf/simulated/floor/plasteel,
/area/hallway/primary/starboard/west)
@@ -39193,8 +37924,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/disposalpipe/sortjunction{
dir = 2;
@@ -39205,8 +37935,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 4;
- icon_state = "1-4";
- tag = ""
+ icon_state = "1-4"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
@@ -39297,7 +38026,7 @@
"bHL" = (
/obj/machinery/alarm{
dir = 1;
- pixel_y = -25
+ pixel_y = -24
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -39346,8 +38075,7 @@
dir = 1
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 1;
- initialize_directions = 11
+ dir = 1
},
/turf/simulated/floor/plasteel,
/area/hallway/primary/starboard/east)
@@ -39395,8 +38123,7 @@
dir = 4
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 4;
- initialize_directions = 11
+ dir = 4
},
/turf/simulated/floor/plasteel,
/area/hallway/secondary/exit)
@@ -39426,7 +38153,6 @@
name = "RADIOACTIVE AREA"
},
/obj/effect/spawner/window/reinforced,
-/obj/structure/disposalpipe/segment,
/obj/machinery/door/poddoor{
density = 0;
icon_state = "open";
@@ -39492,7 +38218,8 @@
/area/maintenance/port)
"bIf" = (
/obj/machinery/light_switch{
- pixel_x = -23
+ dir = 4;
+ pixel_x = -24
},
/turf/simulated/floor/plasteel,
/area/assembly/chargebay)
@@ -39508,7 +38235,6 @@
/turf/simulated/floor/plasteel,
/area/assembly/chargebay)
"bIh" = (
-/obj/machinery/computer/crew,
/obj/structure/window/reinforced{
dir = 1
},
@@ -39520,6 +38246,7 @@
name = "Quarantine Lockdown";
opacity = 0
},
+/obj/machinery/computer/crew,
/turf/simulated/floor/plasteel{
dir = 9;
icon_state = "whiteblue"
@@ -39587,10 +38314,10 @@
},
/area/assembly/robotics)
"bIo" = (
+/obj/machinery/photocopier,
/obj/machinery/computer/guestpass{
pixel_y = 30
},
-/obj/machinery/photocopier,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -39809,7 +38536,7 @@
/turf/simulated/floor/plasteel,
/area/hallway/primary/central/east)
"bIS" = (
-/obj/structure/closet/secure_closet/cargotech,
+/obj/machinery/vending/cargodrobe,
/turf/simulated/floor/plasteel,
/area/quartermaster/storage)
"bIT" = (
@@ -39865,7 +38592,7 @@
/obj/structure/table,
/obj/machinery/cell_charger,
/obj/item/radio/intercom{
- pixel_y = 25
+ pixel_y = 28
},
/turf/simulated/floor/plasteel,
/area/quartermaster/storage)
@@ -39904,8 +38631,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -39916,8 +38642,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 2;
@@ -39942,8 +38667,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel,
/area/hallway/primary/starboard/west)
@@ -39955,8 +38679,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel,
/area/hallway/primary/starboard/west)
@@ -39978,8 +38701,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/obj/structure/disposalpipe/sortjunction{
dir = 2;
@@ -39993,8 +38715,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/door/firedoor,
/turf/simulated/floor/plasteel,
@@ -40201,8 +38922,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/turf/simulated/floor/plasteel{
icon_state = "whitebluefull"
@@ -40216,7 +38936,7 @@
"bJE" = (
/obj/machinery/alarm{
dir = 4;
- pixel_x = -22
+ pixel_x = -24
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -40265,19 +38985,19 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 4;
- initialize_directions = 11
+ dir = 4
},
/turf/simulated/floor/wood,
/area/bridge/meeting_room)
"bJJ" = (
-/obj/machinery/computer/crew,
+/obj/machinery/computer/crew{
+ dir = 8
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -40361,7 +39081,7 @@
dir = 8
},
/obj/machinery/alarm{
- pixel_y = 25
+ pixel_y = 24
},
/turf/simulated/floor/plasteel{
dir = 4;
@@ -40412,7 +39132,7 @@
/turf/simulated/floor/wood,
/area/crew_quarters/bar)
"bJW" = (
-/obj/structure/closet/wardrobe/chemistry_white,
+/obj/machinery/vending/chemdrobe,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "whiteyellow"
@@ -40449,9 +39169,9 @@
/area/medical/reception)
"bJZ" = (
/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
},
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
@@ -40609,7 +39329,7 @@
"bKo" = (
/obj/machinery/alarm{
dir = 4;
- pixel_x = -22
+ pixel_x = -24
},
/obj/machinery/r_n_d/destructive_analyzer,
/obj/effect/decal/warning_stripes/northwest,
@@ -40625,7 +39345,7 @@
"bKq" = (
/obj/machinery/alarm{
dir = 1;
- pixel_y = -22
+ pixel_y = -24
},
/turf/simulated/floor/plasteel{
icon_state = "freezerfloor"
@@ -40713,7 +39433,9 @@
pixel_y = 4;
req_access_txt = "12"
},
-/obj/structure/chair/stool,
+/obj/structure/chair/stool{
+ dir = 8
+ },
/turf/simulated/floor/plating,
/area/maintenance/disposal)
"bKE" = (
@@ -40784,8 +39506,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/disposalpipe/segment,
/obj/machinery/firealarm{
@@ -40872,8 +39593,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -40943,8 +39663,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/disposalpipe/segment,
/obj/machinery/door/firedoor,
@@ -41029,8 +39748,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,
@@ -41048,23 +39766,20 @@
"bLo" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/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
+ },
/turf/simulated/floor/plasteel,
/area/hallway/secondary/exit)
"bLq" = (
@@ -41082,15 +39797,10 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
-/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)
@@ -41126,7 +39836,9 @@
name = "Quarantine Lockdown";
opacity = 0
},
-/obj/machinery/computer/med_data,
+/obj/machinery/computer/med_data{
+ dir = 8
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "whiteblue"
@@ -41171,8 +39883,7 @@
"bLx" = (
/obj/machinery/hologram/holopad,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 10;
- initialize_directions = 10
+ dir = 10
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 6
@@ -41235,11 +39946,6 @@
/area/assembly/chargebay)
"bLF" = (
/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"
},
@@ -41250,13 +39956,12 @@
},
/obj/effect/decal/cleanable/blood/oil/streak,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"bLH" = (
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/structure/disposalpipe/segment{
dir = 4
@@ -41325,11 +40030,13 @@
/turf/simulated/floor/plating,
/area/maintenance/port)
"bLP" = (
-/obj/machinery/computer/mech_bay_power_console,
/obj/structure/cable{
d2 = 2;
icon_state = "0-2"
},
+/obj/machinery/computer/mech_bay_power_console{
+ dir = 4
+ },
/turf/simulated/floor/bluegrid,
/area/assembly/chargebay)
"bLQ" = (
@@ -41337,7 +40044,7 @@
/obj/machinery/reagentgrinder,
/obj/machinery/alarm{
dir = 8;
- pixel_x = 25
+ pixel_x = 24
},
/turf/simulated/floor/plasteel{
dir = 4;
@@ -41357,8 +40064,7 @@
},
/obj/item/storage/firstaid/brute,
/obj/machinery/light{
- dir = 1;
- in_use = 1
+ dir = 1
},
/obj/machinery/firealarm{
pixel_y = 24
@@ -41418,10 +40124,11 @@
/obj/item/storage/firstaid/o2,
/obj/structure/table,
/obj/machinery/light_switch{
- pixel_x = -23
+ dir = 4;
+ pixel_x = -24
},
/obj/item/radio/intercom{
- pixel_y = 25
+ pixel_y = 28
},
/turf/simulated/floor/plasteel{
icon_state = "whitebluefull"
@@ -41535,8 +40242,7 @@
dir = 4
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 4;
- initialize_directions = 11
+ dir = 4
},
/turf/simulated/floor/plating,
/area/maintenance/port)
@@ -41554,8 +40260,10 @@
/obj/machinery/light{
dir = 8
},
-/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)
"bMk" = (
@@ -41572,8 +40280,7 @@
"bMm" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 4;
- initialize_directions = 11
+ dir = 4
},
/turf/simulated/floor/plasteel,
/area/hallway/primary/central/west)
@@ -41595,7 +40302,7 @@
dir = 1
},
/obj/machinery/firealarm{
- pixel_y = 27
+ pixel_y = 24
},
/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel,
@@ -41616,8 +40323,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
icon_state = "bluecorner"
@@ -41660,8 +40366,7 @@
"bMC" = (
/obj/structure/cable{
d2 = 2;
- icon_state = "0-2";
- pixel_y = 1
+ icon_state = "0-2"
},
/obj/machinery/power/apc{
dir = 1;
@@ -41685,8 +40390,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,
@@ -41701,8 +40405,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/light{
dir = 4
@@ -41742,16 +40445,13 @@
/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;
- initialize_directions = 11
+ dir = 8
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/turf/simulated/floor/wood,
/area/crew_quarters/captain)
@@ -41783,8 +40483,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/requests_console{
announcementConsole = 1;
@@ -41808,8 +40507,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
@@ -41823,8 +40521,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{
@@ -41837,14 +40534,12 @@
/obj/structure/cable{
d1 = 1;
d2 = 4;
- icon_state = "1-4";
- tag = ""
+ icon_state = "1-4"
},
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -41858,18 +40553,16 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
- },
-/obj/machinery/computer/security/telescreen/entertainment{
- pixel_x = 32
+ icon_state = "2-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 10;
- initialize_directions = 10
+ dir = 10
+ },
+/obj/machinery/computer/security/telescreen/entertainment{
+ pixel_x = 32
},
/turf/simulated/floor/wood,
/area/crew_quarters/captain)
@@ -41881,8 +40574,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -41893,8 +40585,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/disposalpipe/segment{
dir = 4
@@ -41905,8 +40596,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 4;
- icon_state = "1-4";
- tag = ""
+ icon_state = "1-4"
},
/obj/structure/disposalpipe/segment{
dir = 1;
@@ -41918,8 +40608,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/disposalpipe/segment{
dir = 4
@@ -41952,7 +40641,7 @@
},
/obj/item/storage/firstaid/regular,
/obj/machinery/alarm{
- pixel_y = 25
+ pixel_y = 24
},
/obj/machinery/camera{
c_tag = "Medbay Medicine Storage"
@@ -41983,8 +40672,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/structure/disposalpipe/segment{
dir = 1;
@@ -41993,8 +40681,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/disposalpipe/segment{
dir = 2;
@@ -42009,8 +40696,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -42043,8 +40729,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/disposalpipe/segment{
dir = 4
@@ -42076,8 +40761,7 @@
dir = 10
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 10;
- initialize_directions = 10
+ dir = 10
},
/turf/simulated/floor/plasteel{
icon_state = "white"
@@ -42169,8 +40853,7 @@
dir = 4
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 4;
- initialize_directions = 11
+ dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel{
@@ -42240,7 +40923,7 @@
dir = 4
},
/obj/machinery/firealarm{
- dir = 8;
+ dir = 4;
pixel_x = 24
},
/turf/simulated/floor/plasteel{
@@ -42283,21 +40966,18 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/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" = (
/obj/machinery/light,
/obj/machinery/alarm{
dir = 1;
- pixel_y = -22
+ pixel_y = -24
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -42328,7 +41008,8 @@
/area/medical/chemistry)
"bNB" = (
/obj/machinery/light_switch{
- pixel_x = 30
+ dir = 8;
+ pixel_x = 24
},
/obj/machinery/camera{
c_tag = "Disposals";
@@ -42383,11 +41064,6 @@
/area/maintenance/disposal)
"bNG" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel{
icon_state = "white"
@@ -42427,8 +41103,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/structure/closet/secure_closet/medical1,
/obj/machinery/ai_status_display{
@@ -42449,7 +41124,7 @@
icon_state = "2-4"
},
/obj/item/radio/intercom{
- pixel_y = 25
+ pixel_y = 28
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 6
@@ -42547,7 +41222,7 @@
},
/obj/machinery/vending/wallmed{
name = "Emergency NanoMed";
- pixel_y = -32
+ pixel_y = -28
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -42572,8 +41247,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,
@@ -42586,8 +41260,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plating,
/area/maintenance/maintcentral)
@@ -42660,14 +41333,12 @@
/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,
/area/hallway/primary/central/west)
@@ -42675,8 +41346,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plating,
/area/maintenance/maintcentral)
@@ -42735,8 +41405,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/turf/simulated/floor/plating,
/area/maintenance/maintcentral)
@@ -42764,8 +41433,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/disposalpipe/segment,
/obj/machinery/camera{
@@ -42787,9 +41455,11 @@
},
/area/engine/gravitygenerator)
"bOt" = (
-/obj/machinery/computer/supplycomp/public,
/obj/item/radio/intercom{
- pixel_y = 25
+ pixel_y = 28
+ },
+/obj/machinery/computer/supplycomp/public{
+ dir = 4
},
/turf/simulated/floor/plasteel,
/area/quartermaster/office)
@@ -42829,8 +41499,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,
@@ -42840,8 +41509,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door/airlock/command{
id_tag = null;
@@ -42856,20 +41524,17 @@
/area/crew_quarters/captain)
"bOz" = (
/obj/structure/disposalpipe/segment,
-/obj/structure/extinguisher_cabinet{
- pixel_x = -27;
- pixel_y = 1
- },
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
+ },
+/obj/structure/extinguisher_cabinet{
+ pixel_x = -27
},
/turf/simulated/floor/plasteel,
/area/hallway/primary/central/se)
"bOA" = (
-/obj/machinery/computer/secure_data,
/obj/machinery/flasher_button{
id = "hopflash";
pixel_x = 6;
@@ -42897,6 +41562,9 @@
pixel_x = -22;
pixel_y = 4
},
+/obj/machinery/computer/secure_data{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 9;
icon_state = "blue"
@@ -42904,12 +41572,10 @@
/area/crew_quarters/heads)
"bOB" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 4;
- initialize_directions = 11
+ dir = 4
},
/turf/simulated/floor/plasteel{
icon_state = "whitebluefull"
@@ -42955,11 +41621,6 @@
},
/area/medical/reception)
"bOG" = (
-/obj/structure/cable{
- d1 = 2;
- d2 = 4;
- icon_state = "2-4"
- },
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/turf/simulated/floor/plasteel{
icon_state = "white"
@@ -42970,8 +41631,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d2 = 4;
@@ -43023,8 +41683,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d2 = 4;
@@ -43034,8 +41693,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/turf/simulated/floor/plating,
/area/engine/gravitygenerator)
@@ -43044,8 +41702,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
@@ -43091,7 +41748,7 @@
/obj/item/storage/firstaid/toxin,
/obj/structure/table,
/obj/structure/extinguisher_cabinet{
- pixel_x = 25
+ pixel_x = 27
},
/turf/simulated/floor/plasteel{
icon_state = "whitebluefull"
@@ -43124,8 +41781,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{
@@ -43194,7 +41850,7 @@
"bPf" = (
/obj/structure/closet/secure_closet/paramedic,
/obj/machinery/firealarm{
- dir = 8;
+ dir = 4;
pixel_x = 24
},
/turf/simulated/floor/plasteel{
@@ -43245,7 +41901,7 @@
opacity = 0
},
/turf/simulated/floor/plasteel{
- dir = 1;
+ dir = 4;
icon_state = "whiteblue"
},
/area/medical/reception)
@@ -43331,8 +41987,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plating,
/area/storage/emergency2)
@@ -43343,17 +41998,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
@@ -43365,8 +42009,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"
@@ -43374,7 +42017,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"bPy" = (
/obj/structure/table,
/obj/item/assembly/prox_sensor{
@@ -43423,8 +42066,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
icon_state = "white"
@@ -43439,13 +42081,15 @@
/obj/structure/cable,
/obj/machinery/alarm{
dir = 1;
- pixel_y = -25
+ pixel_y = -24
},
/obj/structure/closet,
/turf/simulated/floor/plating,
/area/maintenance/disposal)
"bPD" = (
-/obj/structure/chair/stool,
+/obj/structure/chair/stool{
+ dir = 1
+ },
/obj/effect/landmark/start{
name = "Scientist"
},
@@ -43517,14 +42161,12 @@
"bPK" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 10;
- initialize_directions = 10
+ dir = 10
},
/obj/structure/cable{
- d1 = 2;
- d2 = 8;
- icon_state = "2-8";
- tag = ""
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
},
/obj/structure/disposalpipe/junction{
dir = 2;
@@ -43607,7 +42249,6 @@
"bPX" = (
/obj/structure/closet/emcloset,
/obj/structure/extinguisher_cabinet{
- pixel_x = 5;
pixel_y = 30
},
/turf/simulated/floor/plasteel,
@@ -43634,12 +42275,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
},
-/obj/structure/cable{
- d1 = 1;
- d2 = 4;
- icon_state = "1-4";
- tag = "90Curve"
- },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -43747,13 +42382,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/manifold/hidden/scrubbers{
- dir = 4;
- initialize_directions = 11
+ dir = 4
},
/turf/simulated/floor/plasteel,
/area/quartermaster/office)
@@ -43804,8 +42437,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/disposalpipe/segment,
/obj/machinery/door/firedoor,
@@ -43820,7 +42452,8 @@
/area/crew_quarters/heads)
"bQq" = (
/obj/machinery/light_switch{
- pixel_x = -23
+ dir = 4;
+ pixel_x = -24
},
/obj/machinery/light{
dir = 8
@@ -43871,8 +42504,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
@@ -43964,8 +42596,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/turf/simulated/floor/plasteel{
icon_state = "whitebluefull"
@@ -43999,8 +42630,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel{
@@ -44020,8 +42650,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/structure/disposalpipe/junction{
icon_state = "pipe-y"
@@ -44046,8 +42675,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/obj/machinery/power/apc{
name = "south bump";
@@ -44100,8 +42728,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,
@@ -44112,8 +42739,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/disposalpipe/segment{
dir = 8;
@@ -44123,8 +42749,7 @@
/area/assembly/chargebay)
"bQO" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 4;
- initialize_directions = 11
+ dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel,
@@ -44211,7 +42836,8 @@
"bQW" = (
/obj/effect/decal/warning_stripes/south,
/obj/machinery/light_switch{
- pixel_x = -23
+ dir = 4;
+ pixel_x = -24
},
/obj/machinery/camera{
c_tag = "Medbay Chemistry South";
@@ -44221,8 +42847,10 @@
/turf/simulated/floor/plasteel,
/area/medical/chemistry)
"bQX" = (
-/turf/simulated/floor/plating,
-/area/maintenance/genetics)
+/turf/simulated/floor/plasteel{
+ icon_state = "floorgrime"
+ },
+/area/maintenance/fpmaint2)
"bQY" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -44298,8 +42926,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -44314,8 +42941,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
@@ -44325,8 +42951,7 @@
"bRg" = (
/obj/structure/cable{
d2 = 2;
- icon_state = "0-2";
- pixel_y = 1
+ icon_state = "0-2"
},
/obj/machinery/power/apc{
dir = 4;
@@ -44342,8 +42967,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -44385,8 +43009,7 @@
"bRl" = (
/obj/effect/decal/warning_stripes/east,
/obj/structure/window/reinforced/tinted{
- dir = 4;
- tag = ""
+ dir = 4
},
/obj/structure/table,
/obj/item/mmi,
@@ -44468,8 +43091,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -44486,8 +43108,7 @@
dir = 4
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 1;
- initialize_directions = 11
+ dir = 1
},
/turf/simulated/floor/plasteel,
/area/assembly/robotics)
@@ -44505,7 +43126,9 @@
},
/area/medical/medbay2)
"bRy" = (
-/obj/structure/chair/stool,
+/obj/structure/chair/stool{
+ dir = 8
+ },
/obj/effect/landmark/start{
name = "Roboticist"
},
@@ -44547,7 +43170,8 @@
pixel_y = 3
},
/obj/machinery/light_switch{
- pixel_y = -25
+ dir = 1;
+ pixel_y = -24
},
/obj/structure/table/glass,
/turf/simulated/floor/plasteel{
@@ -44604,19 +43228,23 @@
/area/quartermaster/storage)
"bRL" = (
/obj/machinery/light_switch{
- pixel_x = 27
+ dir = 8;
+ pixel_x = 24
},
/turf/simulated/floor/plasteel,
/area/quartermaster/storage)
"bRM" = (
/obj/machinery/autolathe,
/obj/machinery/light_switch{
- pixel_x = -27
+ dir = 4;
+ pixel_x = -24
},
/turf/simulated/floor/plasteel,
/area/quartermaster/office)
"bRN" = (
-/obj/machinery/computer/supplycomp,
+/obj/machinery/computer/supplycomp{
+ dir = 8
+ },
/turf/simulated/floor/plasteel,
/area/quartermaster/office)
"bRO" = (
@@ -44626,12 +43254,10 @@
icon_state = "pipe-c"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 4;
- initialize_directions = 11
+ dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 10;
- initialize_directions = 10
+ dir = 10
},
/turf/simulated/floor/plasteel{
icon_state = "white"
@@ -44673,8 +43299,7 @@
"bRT" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/turf/simulated/floor/plasteel{
icon_state = "white"
@@ -44733,8 +43358,7 @@
/obj/effect/spawner/window/reinforced,
/obj/structure/cable{
d2 = 2;
- icon_state = "0-2";
- pixel_y = 1
+ icon_state = "0-2"
},
/obj/machinery/door/poddoor/shutters{
density = 0;
@@ -44753,7 +43377,9 @@
/turf/simulated/floor/plasteel,
/area/hallway/secondary/exit)
"bSd" = (
-/obj/machinery/computer/card,
+/obj/machinery/computer/card{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 10;
icon_state = "blue"
@@ -44796,8 +43422,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel,
/area/engine/gravitygenerator)
@@ -44820,10 +43445,6 @@
/turf/simulated/floor/plasteel,
/area/quartermaster/storage)
"bSk" = (
-/obj/machinery/power/smes{
- charge = 5e+006
- },
-/obj/structure/cable,
/obj/structure/cable{
d2 = 8;
icon_state = "0-8"
@@ -44832,20 +43453,21 @@
dir = 4;
pixel_x = 28
},
+/obj/machinery/power/smes{
+ charge = 5e+006
+ },
/turf/simulated/floor/plasteel,
/area/engine/gravitygenerator)
"bSl" = (
/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/plasteel,
/area/engine/gravitygenerator)
@@ -44857,8 +43479,7 @@
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 1;
- initialize_directions = 11
+ dir = 1
},
/turf/simulated/floor/plasteel,
/area/quartermaster/storage)
@@ -44890,16 +43511,13 @@
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 4;
- initialize_directions = 11
+ dir = 4
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 4;
- initialize_directions = 11
+ dir = 4
},
/turf/simulated/floor/plasteel,
/area/quartermaster/office)
@@ -45055,7 +43673,7 @@
"bSC" = (
/obj/machinery/atmospherics/unary/thermomachine/freezer,
/obj/machinery/alarm{
- pixel_y = 25
+ pixel_y = 24
},
/obj/machinery/camera{
c_tag = "Medbay Cloning"
@@ -45067,13 +43685,13 @@
"bSD" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/light_switch{
- pixel_x = 27
+ dir = 8;
+ pixel_x = 24
},
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
icon_state = "freezerfloor"
@@ -45116,8 +43734,7 @@
/area/medical/genetics)
"bSH" = (
/obj/machinery/light{
- dir = 1;
- in_use = 1
+ dir = 1
},
/turf/simulated/floor/plasteel{
dir = 1
@@ -45226,7 +43843,7 @@
dir = 8
},
/obj/machinery/firealarm{
- pixel_y = 27
+ pixel_y = 24
},
/obj/machinery/light{
dir = 1
@@ -45383,15 +44000,13 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/disposalpipe/segment,
/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,
@@ -45421,8 +44036,7 @@
/area/toxins/lab)
"bTh" = (
/obj/machinery/light{
- dir = 1;
- in_use = 1
+ dir = 1
},
/obj/machinery/firealarm{
pixel_y = 24
@@ -45436,8 +44050,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{
@@ -45466,16 +44079,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)
@@ -45557,12 +44160,11 @@
/obj/item/bedsheet/captain,
/obj/machinery/alarm{
dir = 4;
- pixel_x = -22
+ pixel_x = -24
},
/turf/simulated/floor/carpet,
/area/crew_quarters/captain/bedroom)
"bTC" = (
-/obj/effect/spawner/window/reinforced,
/obj/structure/sign/securearea{
desc = "A warning sign which reads 'HIGH VOLTAGE'";
icon_state = "shock";
@@ -45573,7 +44175,6 @@
d2 = 4;
icon_state = "0-4"
},
-/obj/structure/cable,
/obj/machinery/door/poddoor/shutters{
density = 0;
dir = 8;
@@ -45582,14 +44183,19 @@
name = "Privacy Shutters";
opacity = 0
},
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
+/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
/area/crew_quarters/heads)
"bTD" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/carpet,
/area/crew_quarters/heads)
@@ -45598,8 +44204,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel,
/area/crew_quarters/heads)
@@ -45610,8 +44215,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,
@@ -45623,8 +44227,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/sign/poster/random{
pixel_x = -32
@@ -45635,8 +44238,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door_control{
id = "paramedic";
@@ -45660,7 +44262,8 @@
req_access_txt = "66"
},
/obj/machinery/light_switch{
- pixel_x = -23;
+ dir = 4;
+ pixel_x = -24;
pixel_y = -8
},
/obj/machinery/atmospherics/unary/vent_pump/on{
@@ -45678,8 +44281,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/pdapainter,
/turf/simulated/floor/carpet,
@@ -45722,7 +44324,8 @@
/area/teleporter)
"bTP" = (
/obj/machinery/light_switch{
- pixel_y = -23
+ dir = 1;
+ pixel_y = -24
},
/obj/machinery/camera{
c_tag = "Gravity Generator Room South";
@@ -45749,7 +44352,7 @@
/area/teleporter)
"bTS" = (
/obj/item/radio/intercom{
- pixel_y = 25
+ pixel_y = 28
},
/obj/structure/closet/crate,
/obj/item/crowbar,
@@ -45758,6 +44361,11 @@
"bTT" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/unary/vent_pump/on,
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -45773,7 +44381,7 @@
c_tag = "Teleporter Room"
},
/obj/machinery/alarm{
- pixel_y = 23
+ pixel_y = 24
},
/turf/simulated/floor/plasteel,
/area/teleporter)
@@ -45793,8 +44401,7 @@
"bTY" = (
/obj/machinery/disposal,
/obj/machinery/light{
- dir = 1;
- in_use = 1
+ dir = 1
},
/obj/structure/disposalpipe/trunk,
/obj/machinery/firealarm{
@@ -45809,7 +44416,9 @@
/turf/simulated/floor/plating,
/area/medical/genetics_cloning)
"bUa" = (
-/obj/machinery/atmospherics/pipe/simple/hidden,
+/obj/machinery/atmospherics/pipe/simple/hidden{
+ dir = 5
+ },
/turf/simulated/floor/plasteel{
icon_state = "freezerfloor"
},
@@ -45819,18 +44428,17 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/item/radio/intercom{
- pixel_x = 29;
- pixel_y = -1
+ pixel_x = 28
},
/turf/simulated/floor/plasteel{
icon_state = "freezerfloor"
},
/area/medical/genetics_cloning)
"bUc" = (
+/obj/machinery/atmospherics/unary/vent_scrubber/on,
/turf/simulated/floor/plasteel{
icon_state = "freezerfloor"
},
@@ -45889,12 +44497,10 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 10;
- initialize_directions = 10
+ dir = 10
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel{
@@ -45905,8 +44511,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/disposalpipe/sortjunction{
dir = 2;
@@ -45939,8 +44544,7 @@
dir = 10
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 10;
- initialize_directions = 10
+ dir = 10
},
/turf/simulated/floor/plasteel,
/area/quartermaster/office)
@@ -45971,8 +44575,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/sign/poster/official/random{
pixel_x = 32
@@ -46004,8 +44607,7 @@
pixel_y = 32
},
/obj/machinery/light{
- dir = 1;
- in_use = 1
+ dir = 1
},
/obj/structure/table/tray,
/obj/item/scalpel,
@@ -46015,12 +44617,10 @@
/area/medical/surgery1)
"bUv" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 4;
- initialize_directions = 11
+ dir = 4
},
/turf/simulated/floor/plasteel,
/area/engine/gravitygenerator)
@@ -46033,7 +44633,7 @@
"bUx" = (
/obj/structure/reagent_dispensers/watertank,
/turf/simulated/floor/plating,
-/area/maintenance/genetics)
+/area/maintenance/asmaint)
"bUy" = (
/obj/machinery/alarm{
dir = 8;
@@ -46046,8 +44646,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
@@ -46071,7 +44670,7 @@
pixel_x = -5
},
/turf/simulated/floor/plasteel{
- dir = 10;
+ dir = 0;
icon_state = "blue"
},
/area/medical/cmostore)
@@ -46114,10 +44713,10 @@
/turf/simulated/wall,
/area/quartermaster/office)
"bUF" = (
+/obj/machinery/light,
/obj/machinery/computer/operating{
name = "Robotics Operating Computer"
},
-/obj/machinery/light,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -46131,13 +44730,12 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel,
/area/hallway/primary/central/se)
"bUH" = (
-/obj/structure/closet/wardrobe/robotics_black,
+/obj/machinery/vending/robodrobe,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -46148,13 +44746,13 @@
},
/area/medical/genetics)
"bUJ" = (
-/obj/structure/closet/wardrobe/genetics_white,
/obj/machinery/camera{
c_tag = "Medbay Genetics"
},
/obj/structure/extinguisher_cabinet{
- pixel_x = 25
+ pixel_x = 27
},
+/obj/machinery/vending/genedrobe,
/turf/simulated/floor/plasteel{
icon_state = "whitepurplecorner"
},
@@ -46169,8 +44767,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/warning_stripes/yellow/partial{
dir = 8
@@ -46238,8 +44835,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,
@@ -46251,27 +44847,19 @@
/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,
/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" = (
@@ -46280,8 +44868,7 @@
/area/quartermaster/office)
"bUV" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 6
@@ -46309,12 +44896,10 @@
/area/quartermaster/office)
"bUY" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 4;
- initialize_directions = 11
+ dir = 4
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 4;
- initialize_directions = 11
+ dir = 4
},
/turf/simulated/floor/plasteel,
/area/hallway/primary/central/sw)
@@ -46357,14 +44942,12 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 4;
- initialize_directions = 11
+ dir = 4
},
/turf/simulated/floor/plasteel,
/area/crew_quarters/heads)
@@ -46373,14 +44956,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,
@@ -46423,12 +45004,8 @@
layer = 4;
pixel_y = 32
},
-/obj/structure/rack,
-/obj/item/circuitboard/aicore{
- pixel_x = -2;
- pixel_y = 4
- },
/obj/effect/decal/warning_stripes/west,
+/obj/machinery/suit_storage_unit/rd/secure,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -46449,8 +45026,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door/airlock/command{
name = "Teleport Access";
@@ -46479,8 +45055,7 @@
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 4;
- initialize_directions = 11
+ dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel,
@@ -46500,13 +45075,12 @@
/obj/structure/disposalpipe/segment,
/obj/machinery/alarm{
dir = 4;
- pixel_x = -22
+ pixel_x = -24
},
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel,
/area/hallway/primary/central/se)
@@ -46514,8 +45088,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/item/radio/intercom{
pixel_x = 28
@@ -46561,8 +45134,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
@@ -46571,12 +45143,11 @@
/area/assembly/chargebay)
"bVD" = (
/obj/structure/window/reinforced/tinted{
- dir = 4;
- tag = ""
+ dir = 4
},
/obj/structure/sink{
dir = 4;
- pixel_x = 4
+ pixel_x = 5
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -46609,8 +45180,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door/airlock/research/glass{
name = "Research and Development";
@@ -46630,21 +45200,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{
@@ -46669,8 +45224,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/photocopier,
/turf/simulated/floor/carpet,
@@ -46679,15 +45233,13 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/disposalpipe/segment,
/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,
@@ -46697,24 +45249,22 @@
/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,
/area/engine/gravitygenerator)
"bVP" = (
-/obj/structure/extinguisher_cabinet{
- pixel_x = -27;
- pixel_y = 1
- },
/obj/structure/table,
/obj/item/radio/beacon,
/obj/machinery/status_display{
layer = 4;
pixel_y = 32
},
+/obj/structure/extinguisher_cabinet{
+ pixel_x = -27
+ },
/turf/simulated/floor/plasteel,
/area/teleporter)
"bVQ" = (
@@ -46723,7 +45273,7 @@
frequency = 1450;
master_tag = "dorms_maint";
name = "interior access button";
- pixel_x = 25;
+ pixel_x = 9;
pixel_y = -25;
req_access_txt = "13"
},
@@ -46731,16 +45281,16 @@
dir = 5
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"bVR" = (
/obj/machinery/light_switch{
- pixel_x = 27
+ dir = 8;
+ pixel_x = 24
},
/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,
@@ -46749,8 +45299,7 @@
"bVS" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/turf/simulated/floor/plasteel,
/area/hallway/primary/central/se)
@@ -46759,8 +45308,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -46774,8 +45322,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/disposalpipe/segment{
dir = 2;
@@ -46805,8 +45352,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/disposalpipe/segment{
dir = 4
@@ -46817,8 +45363,7 @@
/area/medical/genetics)
"bVW" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 10;
- initialize_directions = 10
+ dir = 10
},
/obj/structure/cable{
d1 = 4;
@@ -46837,8 +45382,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/structure/cable{
d1 = 4;
@@ -46893,8 +45437,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/sign/securearea{
desc = "A warning sign which reads 'KEEP CLEAR: EMERGENCY ENTRANCE'.";
@@ -46924,7 +45467,8 @@
/area/medical/genetics_cloning)
"bWe" = (
/obj/machinery/light_switch{
- pixel_x = -23
+ dir = 4;
+ pixel_x = -24
},
/obj/structure/closet/secure_closet/roboticist,
/turf/simulated/floor/plasteel{
@@ -46954,8 +45498,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
@@ -46972,16 +45515,13 @@
/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;
- initialize_directions = 11
+ dir = 8
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/turf/simulated/floor/plasteel{
icon_state = "white"
@@ -47002,8 +45542,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
@@ -47028,8 +45567,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/noticeboard{
pixel_y = 28
@@ -47048,8 +45586,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
@@ -47066,8 +45603,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 9
@@ -47102,8 +45638,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -47175,7 +45710,12 @@
},
/area/medical/genetics_cloning)
"bWC" = (
-/obj/machinery/computer/cloning,
+/obj/machinery/atmospherics/pipe/simple/hidden{
+ dir = 5
+ },
+/obj/machinery/computer/cloning{
+ dir = 1
+ },
/turf/simulated/floor/plasteel{
icon_state = "freezerfloor"
},
@@ -47200,7 +45740,7 @@
req_one_access_txt = "5;32"
},
/obj/machinery/atmospherics/unary/portables_connector{
- dir = 1
+ dir = 8
},
/turf/simulated/floor/plasteel{
icon_state = "freezerfloor"
@@ -47209,6 +45749,9 @@
"bWF" = (
/obj/machinery/clonepod/biomass,
/obj/machinery/light,
+/obj/machinery/atmospherics/pipe/simple/hidden{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "freezerfloor"
},
@@ -47248,19 +45791,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{
@@ -47284,16 +45814,18 @@
/turf/simulated/floor/plasteel,
/area/hallway/primary/central/sw)
"bWT" = (
-/obj/machinery/computer/arcade,
/obj/machinery/status_display{
layer = 4;
pixel_y = 32
},
+/obj/machinery/computer/arcade,
/turf/simulated/floor/plasteel,
/area/engine/break_room)
"bWU" = (
/obj/machinery/light,
-/obj/machinery/computer/merch,
+/obj/machinery/computer/merch{
+ dir = 8
+ },
/turf/simulated/floor/plasteel,
/area/quartermaster/office)
"bWV" = (
@@ -47306,7 +45838,7 @@
/obj/structure/table,
/obj/machinery/alarm{
dir = 4;
- pixel_x = -22
+ pixel_x = -24
},
/obj/item/storage/belt/utility,
/turf/simulated/floor/plasteel,
@@ -47355,20 +45887,24 @@
/turf/simulated/floor/plasteel,
/area/crew_quarters/heads)
"bXb" = (
-/obj/machinery/computer/security/mining,
/obj/machinery/keycard_auth{
pixel_x = -24
},
+/obj/machinery/computer/security/mining{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 9;
icon_state = "blue"
},
/area/crew_quarters/heads)
"bXc" = (
-/obj/machinery/computer/message_monitor,
/obj/machinery/light/small{
dir = 8
},
+/obj/machinery/computer/message_monitor{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -47389,8 +45925,7 @@
"bXf" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 4;
- initialize_directions = 11
+ dir = 4
},
/turf/simulated/floor/plasteel,
/area/quartermaster/storage)
@@ -47412,12 +45947,10 @@
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/turf/simulated/floor/plasteel,
/area/quartermaster/office)
@@ -47428,8 +45961,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,
@@ -47449,8 +45981,7 @@
dir = 4
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 1;
- initialize_directions = 11
+ dir = 1
},
/turf/simulated/floor/plasteel,
/area/quartermaster/office)
@@ -47489,13 +46020,11 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 4;
- initialize_directions = 11
+ dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel,
@@ -47503,8 +46032,7 @@
"bXr" = (
/obj/structure/cable{
d2 = 2;
- icon_state = "0-2";
- pixel_y = 1
+ icon_state = "0-2"
},
/obj/machinery/power/apc{
dir = 1;
@@ -47525,7 +46053,7 @@
/area/medical/genetics)
"bXt" = (
/obj/item/radio/intercom{
- pixel_y = 25
+ pixel_y = 28
},
/obj/machinery/atmospherics/unary/vent_pump/on,
/turf/simulated/floor/plasteel{
@@ -47541,8 +46069,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,
@@ -47566,8 +46093,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/chair/stool,
/obj/machinery/atmospherics/unary/vent_pump/on{
@@ -47591,8 +46117,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/bluespace_beacon,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -47605,8 +46130,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
@@ -47631,8 +46155,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
@@ -47655,6 +46178,7 @@
/area/medical/sleeper)
"bXF" = (
/obj/machinery/light_switch{
+ dir = 4;
pixel_x = -21
},
/obj/machinery/sleeper{
@@ -47791,7 +46315,7 @@
/obj/structure/disposalpipe/segment,
/obj/machinery/vending/wallmed{
name = "Emergency NanoMed";
- pixel_x = -25
+ pixel_x = -28
},
/turf/simulated/floor/plasteel{
dir = 1;
@@ -47804,9 +46328,7 @@
},
/area/medical/genetics)
"bXR" = (
-/obj/structure/closet/walllocker/emerglocker/north{
- pixel_x = 32
- },
+/obj/structure/closet/walllocker/emerglocker/east,
/turf/simulated/floor/plasteel{
icon_state = "whitebluecorner"
},
@@ -47827,8 +46349,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/structure/cable{
d2 = 2;
@@ -47858,7 +46379,7 @@
/obj/item/roller,
/obj/machinery/alarm{
dir = 4;
- pixel_x = -25
+ pixel_x = -24
},
/obj/machinery/light{
dir = 8
@@ -47882,8 +46403,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
@@ -47899,8 +46419,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
@@ -47914,14 +46433,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"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
@@ -47929,12 +46446,10 @@
/area/teleporter)
"bYa" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 4;
- initialize_directions = 11
+ dir = 4
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 4;
- initialize_directions = 11
+ dir = 4
},
/turf/simulated/floor/plasteel,
/area/hallway/primary/central/se)
@@ -47942,15 +46457,13 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/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{
dir = 4
@@ -47967,8 +46480,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/warning_stripes/southeastcorner,
/turf/simulated/floor/plasteel,
@@ -47994,20 +46506,12 @@
icon_state = "whitebluecorner"
},
/area/medical/medbay2)
-"bYg" = (
-/obj/machinery/atmospherics/pipe/simple/hidden,
-/obj/machinery/atmospherics/unary/vent_scrubber/on,
-/turf/simulated/floor/plasteel{
- icon_state = "freezerfloor"
- },
-/area/medical/genetics_cloning)
"bYh" = (
/obj/effect/spawner/window/reinforced,
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d2 = 8;
@@ -48020,13 +46524,11 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/structure/cable{
d2 = 2;
- icon_state = "0-2";
- pixel_y = 1
+ icon_state = "0-2"
},
/turf/simulated/floor/plating,
/area/crew_quarters/hor)
@@ -48038,7 +46540,8 @@
/obj/item/storage/box/beakers,
/obj/item/reagent_containers/spray/cleaner,
/obj/machinery/light_switch{
- pixel_x = 27
+ dir = 8;
+ pixel_x = 24
},
/turf/simulated/floor/plasteel{
dir = 4;
@@ -48062,8 +46565,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,
@@ -48077,32 +46579,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
@@ -48172,8 +46648,10 @@
/obj/machinery/ai_status_display{
pixel_y = 32
},
-/obj/machinery/computer/card/minor/rd,
/obj/effect/decal/warning_stripes/east,
+/obj/machinery/computer/card/minor/rd{
+ dir = 8
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -48182,6 +46660,10 @@
/obj/structure/rack,
/obj/item/aicard,
/obj/effect/decal/warning_stripes/west,
+/obj/item/circuitboard/aicore{
+ pixel_x = -2;
+ pixel_y = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -48227,8 +46709,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,
@@ -48251,14 +46732,14 @@
dir = 1;
icon_state = "pipe-c"
},
-/obj/machinery/computer/guestpass{
- pixel_y = -28
- },
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
+/obj/machinery/computer/guestpass{
+ pixel_y = -28
+ },
/turf/simulated/floor/plasteel{
icon_state = "browncorner"
},
@@ -48340,15 +46821,14 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/plasticflaps{
opacity = 1
},
/obj/effect/decal/warning_stripes/yellow/hollow,
/turf/simulated/floor/plasteel,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"bYR" = (
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
@@ -48407,8 +46887,7 @@
/area/crew_quarters/heads)
"bYW" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel,
@@ -48426,23 +46905,21 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/computer/guestpass/hop{
pixel_x = 28
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel,
/area/crew_quarters/heads)
"bYZ" = (
/obj/structure/cable{
d1 = 1;
d2 = 4;
- icon_state = "1-4";
- tag = ""
+ icon_state = "1-4"
},
/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel{
@@ -48467,8 +46944,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{
@@ -48489,8 +46965,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 = 5
@@ -48506,16 +46981,13 @@
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 4;
- initialize_directions = 11
+ dir = 4
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 4;
- initialize_directions = 11
+ dir = 4
},
/turf/simulated/floor/plasteel,
/area/engine/gravitygenerator)
@@ -48523,8 +46995,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/firealarm{
pixel_y = 24
@@ -48571,8 +47042,7 @@
"bZl" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 4;
- initialize_directions = 11
+ dir = 4
},
/obj/structure/cable{
d1 = 1;
@@ -48610,6 +47080,7 @@
icon_state = "pipe-c"
},
/obj/effect/decal/warning_stripes/blue/partial,
+/obj/machinery/atmospherics/unary/vent_scrubber/on,
/turf/simulated/floor/plasteel{
icon_state = "freezerfloor"
},
@@ -48648,6 +47119,9 @@
icon_state = "1-2"
},
/obj/effect/decal/warning_stripes/blue/partial,
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "freezerfloor"
},
@@ -48656,8 +47130,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/sign/securearea{
pixel_x = -32
@@ -48673,6 +47146,9 @@
/area/hallway/primary/central/se)
"bZu" = (
/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -48684,7 +47160,6 @@
},
/area/medical/cryo)
"bZw" = (
-/obj/machinery/computer/card/minor/cmo,
/obj/machinery/camera{
c_tag = "Medbay Chief Medical Officer's Office";
dir = 4
@@ -48694,8 +47169,10 @@
pixel_y = 5
},
/obj/item/radio/intercom{
- pixel_x = -32;
- pixel_y = -8
+ pixel_x = -28
+ },
+/obj/machinery/computer/card/minor/cmo{
+ dir = 4
},
/turf/simulated/floor/plasteel{
dir = 9;
@@ -48704,8 +47181,7 @@
/area/medical/cmo)
"bZx" = (
/obj/machinery/light{
- dir = 1;
- in_use = 1
+ dir = 1
},
/obj/structure/cable{
d1 = 1;
@@ -48745,7 +47221,7 @@
},
/obj/machinery/light_switch{
pixel_x = -10;
- pixel_y = 28
+ pixel_y = 24
},
/turf/simulated/floor/plasteel{
dir = 5;
@@ -48766,8 +47242,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,
@@ -48776,8 +47251,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 1;
@@ -48818,8 +47292,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
@@ -48838,8 +47311,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/disposalpipe/sortjunction{
dir = 8;
@@ -48860,8 +47332,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/disposalpipe/segment{
dir = 4
@@ -48884,8 +47355,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/disposalpipe/segment{
dir = 4
@@ -48902,8 +47372,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/disposalpipe/segment{
dir = 4
@@ -48920,14 +47389,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/disposalpipe/junction{
dir = 8;
@@ -48946,8 +47413,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 2;
@@ -48970,8 +47436,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 1;
@@ -48993,8 +47458,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 1;
@@ -49019,8 +47483,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
@@ -49039,21 +47502,18 @@
/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
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 1;
- initialize_directions = 11
+ dir = 1
},
/turf/simulated/floor/plasteel{
icon_state = "white"
@@ -49066,8 +47526,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/disposalpipe/junction{
dir = 8
@@ -49101,19 +47560,19 @@
},
/area/medical/reception)
"bZS" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 1
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
},
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/atmospherics/pipe/manifold/hidden,
/obj/effect/landmark/start{
name = "Medical Doctor"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/hidden,
/turf/simulated/floor/plasteel{
icon_state = "freezerfloor"
},
@@ -49151,18 +47610,15 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d2 = 2;
- icon_state = "0-2";
- pixel_y = 1
+ icon_state = "0-2"
},
/turf/simulated/floor/plating,
/area/crew_quarters/hor)
"bZV" = (
-/obj/machinery/computer/aifixer,
/obj/machinery/requests_console{
announcementConsole = 1;
department = "Research Director's Desk";
@@ -49171,6 +47627,9 @@
pixel_x = -2;
pixel_y = 30
},
+/obj/machinery/computer/aifixer{
+ dir = 8
+ },
/turf/simulated/floor/plasteel{
icon_state = "cafeteria"
},
@@ -49190,16 +47649,14 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/hidden{
- dir = 5
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
/turf/simulated/floor/plasteel{
icon_state = "freezerfloor"
},
@@ -49212,19 +47669,13 @@
dir = 8;
icon_state = "pipe-c"
},
-/obj/machinery/atmospherics/pipe/simple/hidden{
- dir = 10;
- initialize_directions = 10
- },
/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;
- initialize_directions = 10
+ dir = 10
},
/turf/simulated/floor/plasteel{
icon_state = "freezerfloor"
@@ -49235,8 +47686,8 @@
/turf/simulated/floor/plating,
/area/maintenance/asmaint2)
"caa" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 1
},
/obj/structure/disposalpipe/sortjunction{
dir = 8;
@@ -49244,21 +47695,15 @@
name = "Genetics";
sortType = 23
},
-/obj/machinery/atmospherics/pipe/simple/hidden{
- dir = 4
- },
/obj/machinery/hologram/holopad,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
/turf/simulated/floor/plasteel{
icon_state = "freezerfloor"
},
/area/medical/genetics_cloning)
"cab" = (
/obj/machinery/light{
- dir = 1;
- in_use = 1
+ dir = 1
},
/turf/simulated/floor/plasteel{
icon_state = "white"
@@ -49266,7 +47711,7 @@
/area/medical/research)
"cad" = (
/obj/item/radio/intercom{
- pixel_y = 25
+ pixel_y = 28
},
/turf/simulated/floor/plasteel{
icon_state = "white"
@@ -49287,7 +47732,6 @@
/area/medical/research)
"cal" = (
/obj/structure/extinguisher_cabinet{
- pixel_x = -5;
pixel_y = 30
},
/turf/simulated/floor/plasteel{
@@ -49413,13 +47857,11 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/hologram/holopad,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel{
@@ -49470,20 +47912,20 @@
/obj/structure/cable{
d1 = 1;
d2 = 4;
- icon_state = "1-4";
- tag = "90Curve"
+ icon_state = "1-4"
},
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/obj/structure/disposalpipe/segment{
dir = 4;
icon_state = "pipe-c"
},
-/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 4
+ },
/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
/turf/simulated/floor/plasteel{
icon_state = "white"
@@ -49496,8 +47938,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
@@ -49513,14 +47954,10 @@
/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 = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
dir = 4;
@@ -49529,14 +47966,10 @@
/area/medical/sleeper)
"caI" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/disposalpipe/segment{
dir = 8;
@@ -49548,16 +47981,12 @@
/area/medical/sleeper)
"caJ" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
+ dir = 9
},
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
@@ -49569,14 +47998,10 @@
/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 = ""
+ icon_state = "4-8"
},
/obj/structure/extinguisher_cabinet{
pixel_y = -30
@@ -49586,14 +48011,10 @@
},
/area/medical/cryo)
"caL" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/manifold4w/hidden,
/turf/simulated/floor/plasteel{
@@ -49601,17 +48022,10 @@
},
/area/medical/cryo)
"caM" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 9
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 6
@@ -49631,18 +48045,13 @@
},
/area/medical/cryo)
"caO" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 9
- },
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden{
- dir = 10;
- initialize_directions = 10
+ dir = 10
},
/turf/simulated/floor/plasteel{
icon_state = "freezerfloor"
@@ -49674,7 +48083,9 @@
},
/area/medical/medbay2)
"caR" = (
-/obj/machinery/computer/crew,
+/obj/machinery/computer/crew{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "darkblue"
@@ -49724,8 +48135,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
dir = 4;
@@ -49745,8 +48155,10 @@
},
/area/medical/genetics)
"caX" = (
-/obj/machinery/computer/scan_consolenew,
/obj/structure/window/reinforced,
+/obj/machinery/computer/scan_consolenew{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "whitepurplefull"
@@ -49760,7 +48172,6 @@
name = "Geneticist"
},
/turf/simulated/floor/plasteel{
- dir = 6;
icon_state = "whitepurple"
},
/area/medical/genetics)
@@ -49774,16 +48185,14 @@
/obj/structure/cable,
/obj/structure/cable,
/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "whitepurplefull"
+ icon_state = "whitepurple"
},
/area/medical/genetics)
"cba" = (
/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
@@ -49793,15 +48202,10 @@
},
/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
+ dir = 8;
+ pixel_x = 24
},
/obj/machinery/light{
dir = 4
@@ -49809,8 +48213,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -49823,7 +48226,7 @@
"cbe" = (
/obj/machinery/alarm{
dir = 1;
- pixel_y = -22
+ pixel_y = -24
},
/turf/simulated/floor/bluegrid,
/area/server)
@@ -49832,7 +48235,8 @@
/area/toxins/server)
"cbg" = (
/obj/machinery/light_switch{
- pixel_y = -25
+ dir = 1;
+ pixel_y = -24
},
/obj/machinery/camera{
c_tag = "Messaging Server";
@@ -49855,7 +48259,7 @@
},
/obj/machinery/alarm{
dir = 4;
- pixel_x = -22
+ pixel_x = -24
},
/obj/structure/closet/radiation,
/obj/machinery/light,
@@ -49867,7 +48271,8 @@
"cbi" = (
/obj/structure/closet/radiation,
/obj/machinery/light_switch{
- pixel_x = 27
+ dir = 8;
+ pixel_x = 24
},
/obj/machinery/light,
/obj/machinery/atmospherics/unary/vent_pump/on{
@@ -49885,15 +48290,16 @@
},
/area/medical/research)
"cbl" = (
-/obj/machinery/computer/teleporter,
+/obj/machinery/computer/teleporter{
+ dir = 1
+ },
/turf/simulated/floor/plating,
/area/teleporter)
"cbm" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/disposalpipe/sortjunction{
dir = 8;
@@ -49914,14 +48320,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{
dir = 4;
@@ -49942,7 +48346,9 @@
},
/area/crew_quarters/hor)
"cbq" = (
-/obj/machinery/computer/robotics,
+/obj/machinery/computer/robotics{
+ dir = 8
+ },
/turf/simulated/floor/plasteel{
icon_state = "cafeteria"
},
@@ -49972,8 +48378,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/obj/effect/decal/warning_stripes/east,
/turf/simulated/floor/plasteel,
@@ -50205,8 +48610,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/turf/simulated/floor/plasteel{
icon_state = "freezerfloor"
@@ -50236,12 +48640,9 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
- },
-/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 1
+ icon_state = "4-8"
},
+/obj/machinery/atmospherics/pipe/simple/hidden,
/turf/simulated/floor/plasteel{
icon_state = "freezerfloor"
},
@@ -50262,8 +48663,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/turf/simulated/floor/plasteel{
icon_state = "freezerfloor"
@@ -50276,18 +48676,15 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/hidden,
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
@@ -50300,13 +48697,15 @@
/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"
},
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 1
+ },
/turf/simulated/floor/plasteel{
icon_state = "freezerfloor"
},
@@ -50315,8 +48714,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/structure/cable{
d1 = 4;
@@ -50337,8 +48735,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/scrubbers{
@@ -50355,12 +48752,10 @@
/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
+ dir = 1
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 1
@@ -50373,8 +48768,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/disposalpipe/segment{
dir = 4
@@ -50393,8 +48787,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/disposalpipe/segment{
dir = 1;
@@ -50410,8 +48803,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/disposalpipe/segment{
dir = 4
@@ -50446,13 +48838,19 @@
},
/area/medical/surgery1)
"ccl" = (
-/obj/machinery/door/firedoor,
-/turf/simulated/floor/plasteel,
-/area/hallway/primary/central/south)
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 1
+ },
+/turf/simulated/floor/plasteel{
+ dir = 0;
+ icon_state = "blue"
+ },
+/area/hallway/primary/starboard/west)
"ccm" = (
/obj/machinery/door/airlock/public/glass{
name = "Central Access"
},
+/obj/machinery/door/firedoor,
/turf/simulated/floor/plasteel,
/area/hallway/primary/central/se)
"ccn" = (
@@ -50471,14 +48869,12 @@
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/structure/disposalpipe/segment{
dir = 2;
@@ -50488,12 +48884,10 @@
name = "Scientist"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 4;
- initialize_directions = 11
+ dir = 4
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 4;
- initialize_directions = 11
+ dir = 4
},
/turf/simulated/floor/plasteel{
icon_state = "white"
@@ -50516,13 +48910,13 @@
},
/area/medical/sleeper)
"ccr" = (
+/obj/structure/table/glass,
/obj/machinery/computer/security/telescreen{
desc = "Used for watching the RD's goons from the safety of his office.";
name = "Research Monitor";
network = list("Research","MiniSat","RD");
pixel_y = 2
},
-/obj/structure/table/glass,
/turf/simulated/floor/plasteel{
icon_state = "cafeteria"
},
@@ -50562,7 +48956,7 @@
},
/obj/machinery/alarm{
dir = 1;
- pixel_y = -22
+ pixel_y = -24
},
/obj/machinery/bodyscanner,
/turf/simulated/floor/plasteel{
@@ -50577,11 +48971,12 @@
dir = 1
},
/obj/machinery/light_switch{
- pixel_x = -23
+ dir = 4;
+ pixel_x = -24
},
/obj/machinery/alarm{
dir = 1;
- pixel_y = -22
+ pixel_y = -24
},
/turf/simulated/floor/plasteel{
icon_state = "freezerfloor"
@@ -50597,8 +48992,7 @@
},
/obj/machinery/vending/wallmed{
name = "Emergency NanoMed";
- pixel_x = -5;
- pixel_y = -30
+ pixel_y = -28
},
/turf/simulated/floor/plasteel{
icon_state = "freezerfloor"
@@ -50633,7 +49027,7 @@
/obj/machinery/light,
/obj/item/reagent_containers/spray/cleaner,
/obj/item/radio/intercom{
- pixel_y = -25
+ pixel_y = -28
},
/turf/simulated/floor/plasteel{
icon_state = "freezerfloor"
@@ -50790,14 +49184,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,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -50805,7 +49197,7 @@
/area/maintenance/asmaint2)
"ccN" = (
/obj/machinery/alarm{
- pixel_y = 23
+ pixel_y = 24
},
/obj/structure/closet/l3closet/janitor,
/turf/simulated/floor/plasteel,
@@ -50813,15 +49205,10 @@
"ccO" = (
/obj/structure/closet/jcloset,
/obj/item/radio/intercom{
- pixel_y = 25
+ pixel_y = 28
},
/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;
@@ -50837,16 +49224,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{
@@ -50855,21 +49232,17 @@
/turf/simulated/floor/bluegrid/telecomms/server,
/area/toxins/server_coldroom)
"ccU" = (
-/obj/effect/spawner/window/reinforced,
/obj/structure/sign/securearea{
desc = "A warning sign which reads 'SERVER ROOM'.";
name = "SERVER ROOM";
pixel_y = 32
},
-/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{
- dir = 8
- },
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
+/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
/area/toxins/server)
"ccV" = (
@@ -50878,7 +49251,7 @@
icon_state = "0-4"
},
/obj/machinery/atmospherics/pipe/simple/heat_exchanging{
- dir = 4
+ dir = 10
},
/obj/machinery/power/apc{
dir = 1;
@@ -50897,21 +49270,24 @@
d2 = 8;
icon_state = "0-8"
},
-/obj/machinery/atmospherics/unary/portables_connector,
-/obj/machinery/portable_atmospherics/canister/nitrogen,
/obj/machinery/power/apc{
dir = 1;
name = "north bump";
pixel_y = 24
},
+/obj/structure/chair/office/light{
+ dir = 4
+ },
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+ dir = 8
+ },
/turf/simulated/floor/plasteel/dark,
/area/toxins/server)
"ccX" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/disposalpipe/segment,
/obj/machinery/door/firedoor,
@@ -50966,9 +49342,11 @@
},
/area/engine/gravitygenerator)
"cdb" = (
-/obj/machinery/atmospherics/unary/thermomachine/freezer/on/server,
/obj/item/radio/intercom{
- pixel_y = 25
+ pixel_y = 28
+ },
+/obj/machinery/computer/message_monitor{
+ dir = 8
},
/turf/simulated/floor/plasteel/dark,
/area/toxins/server)
@@ -50976,8 +49354,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/disposalpipe/segment,
/obj/machinery/camera{
@@ -50990,8 +49367,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/turf/simulated/floor/plasteel{
dir = 9;
@@ -51002,8 +49378,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/structure/reagent_dispensers/spacecleanertank{
pixel_y = 30
@@ -51015,8 +49390,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/obj/structure/cable{
d2 = 8;
@@ -51025,7 +49399,9 @@
/turf/simulated/floor/plating,
/area/crew_quarters/hor)
"cdg" = (
-/obj/machinery/computer/mecha,
+/obj/machinery/computer/mecha{
+ dir = 8
+ },
/turf/simulated/floor/plasteel{
icon_state = "cafeteria"
},
@@ -51095,8 +49471,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/disposalpipe/segment{
dir = 4
@@ -51169,8 +49544,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,
@@ -51237,6 +49611,7 @@
/obj/machinery/door/airlock/public/glass{
name = "Central Access"
},
+/obj/machinery/door/firedoor,
/turf/simulated/floor/plasteel,
/area/hallway/primary/central/sw)
"cdK" = (
@@ -51247,14 +49622,12 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 4;
- initialize_directions = 11
+ dir = 4
},
/turf/simulated/floor/plasteel{
icon_state = "white"
@@ -51284,8 +49657,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,
@@ -51308,8 +49680,7 @@
"cdS" = (
/obj/structure/cable{
d2 = 2;
- icon_state = "0-2";
- pixel_y = 1
+ icon_state = "0-2"
},
/obj/machinery/power/apc{
dir = 1;
@@ -51328,7 +49699,6 @@
/obj/machinery/light{
dir = 1
},
-/obj/machinery/door/firedoor,
/turf/simulated/floor/plasteel,
/area/hallway/primary/central/sw)
"cdV" = (
@@ -51341,12 +49711,11 @@
/obj/effect/decal/cleanable/blood,
/obj/effect/decal/remains,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cdX" = (
/obj/structure/sign/securearea{
pixel_y = 32
},
-/obj/machinery/door/firedoor,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "blue"
@@ -51365,8 +49734,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/disposalpipe/segment{
dir = 1;
@@ -51383,23 +49751,23 @@
/obj/item/clothing/suit/storage/paramedic,
/obj/effect/spawner/random_spawners/blood_maybe,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"ceb" = (
/obj/effect/spawner/random_spawners/blood_maybe,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cec" = (
/obj/machinery/light/small{
dir = 1
},
/obj/effect/spawner/random_spawners/blood_maybe,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"ced" = (
/obj/structure/closet/emcloset,
/obj/effect/spawner/random_spawners/cobweb_left_frequent,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cee" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/medical/glass{
@@ -51449,7 +49817,8 @@
},
/obj/structure/disposalpipe/segment,
/obj/machinery/light_switch{
- pixel_x = -23
+ dir = 4;
+ pixel_x = -24
},
/turf/simulated/floor/plasteel{
dir = 1;
@@ -51487,12 +49856,11 @@
},
/area/medical/cmo)
"cem" = (
-/obj/structure/table/glass,
-/obj/item/clothing/glasses/hud/health,
/obj/machinery/firealarm{
dir = 4;
pixel_x = 24
},
+/obj/machinery/suit_storage_unit/cmo,
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "darkblue"
@@ -51511,31 +49879,30 @@
/area/medical/cmo)
"ceo" = (
/obj/structure/sink{
- pixel_y = 30
+ pixel_y = 25
},
/turf/simulated/floor/plating,
-/area/maintenance/genetics)
+/area/maintenance/asmaint)
"cep" = (
-/turf/simulated/wall/r_wall,
-/area/maintenance/genetics)
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
"ceq" = (
/obj/structure/closet/secure_closet/personal/patient,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
-/area/maintenance/genetics)
+/area/maintenance/asmaint)
"cer" = (
/obj/structure/bed,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
-/area/maintenance/genetics)
+/area/maintenance/asmaint)
"ces" = (
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/structure/cable{
d2 = 2;
- icon_state = "0-2";
- pixel_y = 1
+ icon_state = "0-2"
},
/obj/machinery/power/apc{
dir = 1;
@@ -51558,7 +49925,7 @@
dir = 4
},
/obj/item/radio/intercom{
- pixel_y = 25
+ pixel_y = 28
},
/turf/simulated/floor/plasteel,
/area/hallway/primary/central/south)
@@ -51616,7 +49983,7 @@
/area/hallway/primary/central/south)
"ceC" = (
/obj/machinery/alarm{
- pixel_y = 23
+ pixel_y = 24
},
/turf/simulated/floor/plasteel,
/area/hallway/primary/central/south)
@@ -51645,8 +50012,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,
@@ -51669,7 +50035,7 @@
req_access_txt = "5"
},
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"ceI" = (
/obj/machinery/atmospherics/pipe/simple/heat_exchanging{
dir = 4
@@ -51681,19 +50047,16 @@
/obj/structure/cable{
d1 = 1;
d2 = 4;
- icon_state = "1-4";
- tag = ""
- },
-/obj/machinery/atmospherics/pipe/simple/hidden{
- dir = 10;
- initialize_directions = 10
+ icon_state = "1-4"
},
/obj/structure/cable{
d1 = 1;
d2 = 8;
icon_state = "1-8"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+ dir = 8
+ },
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel/dark,
/area/toxins/server)
@@ -51704,9 +50067,9 @@
/turf/simulated/floor/plasteel,
/area/toxins/storage)
"ceL" = (
-/obj/machinery/computer/area_atmos,
/obj/effect/decal/warning_stripes/yellow/hollow,
/obj/effect/decal/cleanable/dirt,
+/obj/machinery/computer/area_atmos,
/turf/simulated/floor/plasteel,
/area/toxins/storage)
"ceM" = (
@@ -51723,8 +50086,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -51740,7 +50102,8 @@
/area/crew_quarters/hor)
"ceP" = (
/obj/machinery/light_switch{
- pixel_x = 27
+ dir = 8;
+ pixel_x = 24
},
/turf/simulated/floor/wood,
/area/ntrep)
@@ -51760,12 +50123,6 @@
},
/area/crew_quarters/hor)
"ceT" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8";
- tag = ""
- },
/obj/structure/disposalpipe/segment{
dir = 4
},
@@ -51823,15 +50180,16 @@
/turf/simulated/floor/plasteel,
/area/quartermaster/qm)
"cff" = (
-/obj/machinery/computer/security/mining,
/obj/item/radio/intercom{
- dir = 0;
pixel_x = -28
},
/obj/machinery/camera{
c_tag = "Mining Dock";
dir = 4
},
+/obj/machinery/computer/security/mining{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/quartermaster/miningdock)
"cfg" = (
@@ -51857,8 +50215,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/item/radio/intercom{
dir = 1;
@@ -51879,20 +50236,17 @@
/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/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/structure/disposalpipe/segment{
dir = 4;
@@ -51904,8 +50258,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel,
/area/hallway/primary/central/sw)
@@ -51922,7 +50275,6 @@
/obj/machinery/light{
dir = 4
},
-/obj/machinery/door/firedoor,
/turf/simulated/floor/plasteel{
icon_state = "yellowcorner"
},
@@ -51931,8 +50283,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/landmark/start{
name = "Janitor"
@@ -51964,8 +50315,7 @@
dir = 1
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 1;
- initialize_directions = 11
+ dir = 1
},
/turf/simulated/floor/plasteel,
/area/hallway/primary/central/sw)
@@ -51973,13 +50323,12 @@
/obj/item/clothing/head/soft/blue,
/obj/effect/decal/cleanable/blood,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cfs" = (
/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
@@ -51990,22 +50339,20 @@
/turf/simulated/floor/plasteel,
/area/hallway/primary/central/sw)
"cft" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
+/obj/structure/extinguisher_cabinet{
+ pixel_y = -30
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 1
},
/turf/simulated/floor/plasteel,
-/area/hallway/primary/central/sw)
+/area/hallway/primary/starboard/west)
"cfu" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 1
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 1;
- initialize_directions = 11
+ dir = 1
},
/turf/simulated/floor/plasteel,
/area/hallway/primary/central/sw)
@@ -52028,22 +50375,16 @@
},
/area/medical/surgery1)
"cfx" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 1
},
/turf/simulated/floor/plasteel,
-/area/hallway/primary/central/south)
+/area/hallway/primary/starboard/east)
"cfy" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
+/turf/simulated/floor/plasteel{
+ icon_state = "purplecorner"
},
-/obj/machinery/door/firedoor,
-/turf/simulated/floor/plasteel,
-/area/hallway/primary/central/south)
+/area/hallway/primary/starboard/east)
"cfz" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -52051,6 +50392,7 @@
/obj/machinery/door/airlock/public/glass{
name = "Central Access"
},
+/obj/machinery/door/firedoor,
/turf/simulated/floor/plasteel,
/area/hallway/primary/central/se)
"cfA" = (
@@ -52067,13 +50409,11 @@
/area/medical/surgery1)
"cfB" = (
/obj/structure/extinguisher_cabinet{
- pixel_x = 5;
- pixel_y = -32
+ pixel_y = -30
},
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/door/firedoor,
/turf/simulated/floor/plasteel,
/area/hallway/primary/central/se)
"cfC" = (
@@ -52086,7 +50426,7 @@
pixel_y = 6
},
/obj/machinery/alarm{
- pixel_y = 25
+ pixel_y = 24
},
/obj/item/stack/medical/bruise_pack/advanced,
/obj/item/reagent_containers/iv_bag/salglu,
@@ -52197,8 +50537,7 @@
pixel_y = 6
},
/obj/machinery/light{
- dir = 1;
- in_use = 1
+ dir = 1
},
/obj/machinery/status_display{
layer = 4;
@@ -52272,8 +50611,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/disposalpipe/segment{
dir = 4
@@ -52317,8 +50655,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/disposalpipe/segment{
dir = 2;
@@ -52338,6 +50675,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/machinery/door/firedoor,
/turf/simulated/floor/plasteel,
/area/hallway/primary/central/sw)
"cfU" = (
@@ -52347,8 +50685,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 1;
@@ -52371,14 +50708,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 = 4;
@@ -52396,6 +50731,7 @@
pixel_x = 32
},
/obj/item/paper_bin/nanotrasen,
+/obj/item/clothing/glasses/hud/health,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "darkblue"
@@ -52414,21 +50750,21 @@
"cfY" = (
/obj/machinery/vending/wallmed{
name = "Emergency NanoMed";
- pixel_x = -25
+ pixel_x = -28
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
-/area/maintenance/genetics)
+/area/maintenance/asmaint)
"cfZ" = (
/obj/machinery/light/small{
dir = 4
},
/turf/simulated/floor/plating,
-/area/maintenance/genetics)
+/area/maintenance/asmaint)
"cga" = (
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
-/area/maintenance/genetics)
+/area/maintenance/asmaint)
"cgb" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -52447,34 +50783,39 @@
/turf/simulated/floor/bluegrid/telecomms/server,
/area/toxins/server_coldroom)
"cgd" = (
-/obj/effect/spawner/window/reinforced,
/obj/structure/sign/securearea{
desc = "A warning sign which reads 'SERVER ROOM'.";
name = "SERVER ROOM";
pixel_y = -32
},
+/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{
+ dir = 8
+ },
+/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
/area/toxins/server)
"cge" = (
/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,
/turf/simulated/floor/plasteel,
/area/hallway/primary/central/south)
"cgf" = (
-/obj/machinery/computer/rdservercontrol,
/obj/machinery/light_switch{
- pixel_y = -23
+ dir = 1;
+ pixel_y = -24
},
+/obj/machinery/atmospherics/pipe/manifold/hidden,
/turf/simulated/floor/plasteel/dark,
/area/toxins/server)
"cgg" = (
-/obj/machinery/computer/message_monitor,
+/obj/machinery/atmospherics/unary/thermomachine/freezer/on/server{
+ dir = 8
+ },
/turf/simulated/floor/plasteel/dark,
/area/toxins/server)
"cgh" = (
@@ -52482,8 +50823,7 @@
dir = 4
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 1;
- initialize_directions = 11
+ dir = 1
},
/turf/simulated/floor/plasteel,
/area/hallway/primary/central/south)
@@ -52491,15 +50831,13 @@
/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
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 1;
- initialize_directions = 11
+ dir = 1
},
/turf/simulated/floor/plasteel,
/area/hallway/primary/central/south)
@@ -52553,7 +50891,6 @@
/turf/simulated/floor/plasteel,
/area/hallway/primary/central/south)
"cgo" = (
-/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
@@ -52572,6 +50909,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/machinery/door/firedoor,
/turf/simulated/floor/plasteel,
/area/hallway/primary/central/se)
"cgq" = (
@@ -52644,8 +50982,7 @@
dir = 1
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 1;
- initialize_directions = 11
+ dir = 1
},
/turf/simulated/floor/plasteel,
/area/hallway/primary/central/se)
@@ -52666,8 +51003,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/disposalpipe/segment{
dir = 8;
@@ -52725,7 +51061,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 5
},
-/obj/machinery/atmospherics/unary/vent_scrubber/on,
/turf/simulated/floor/plasteel{
icon_state = "freezerfloor"
},
@@ -52756,7 +51091,6 @@
/obj/effect/landmark/start{
name = "Medical Doctor"
},
-/obj/machinery/atmospherics/unary/vent_pump/on,
/turf/simulated/floor/plasteel{
icon_state = "freezerfloor"
},
@@ -52774,6 +51108,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 6
+ },
/turf/simulated/floor/plasteel/dark/telecomms,
/area/toxins/server_coldroom)
"cgU" = (
@@ -52808,7 +51145,8 @@
/area/ntrep)
"cgX" = (
/obj/machinery/light_switch{
- pixel_y = -23
+ dir = 1;
+ pixel_y = -24
},
/obj/structure/reagent_dispensers/watertank,
/turf/simulated/floor/plasteel,
@@ -52863,14 +51201,14 @@
/area/toxins/server)
"chb" = (
/obj/machinery/atmospherics/pipe/simple/heat_exchanging{
- dir = 10
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 6
+ dir = 9
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
/turf/simulated/floor/plasteel/dark/telecomms,
/area/toxins/server_coldroom)
"chc" = (
@@ -52882,15 +51220,13 @@
},
/obj/structure/grille/broken,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"chf" = (
/turf/simulated/wall,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"chg" = (
-/obj/structure/chair/office/light,
-/obj/machinery/atmospherics/pipe/manifold/hidden,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
+/obj/machinery/atmospherics/pipe/simple/hidden{
+ dir = 6
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -52917,8 +51253,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
dir = 1;
@@ -52950,8 +51285,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel{
@@ -52987,8 +51321,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel{
@@ -53024,8 +51357,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/landmark/start{
name = "Medical Doctor"
@@ -53043,13 +51375,11 @@
/area/medical/surgery1)
"chv" = (
/obj/machinery/hologram/holopad,
-/obj/machinery/atmospherics/pipe/simple/hidden{
- dir = 5
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 4;
- initialize_directions = 11
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 9
},
/turf/simulated/floor/plasteel/dark,
/area/toxins/server)
@@ -53061,10 +51391,8 @@
/obj/machinery/light/small{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/hidden{
- dir = 9
- },
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
+/obj/machinery/portable_atmospherics/canister/nitrogen,
+/obj/machinery/atmospherics/unary/portables_connector{
dir = 8
},
/turf/simulated/floor/plasteel/dark,
@@ -53082,8 +51410,7 @@
},
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -53115,8 +51442,6 @@
/area/medical/cmo)
"chA" = (
/obj/structure/closet/secure_closet/CMO,
-/obj/item/clothing/mask/gas,
-/obj/item/storage/briefcase,
/turf/simulated/floor/plasteel{
icon_state = "darkblue"
},
@@ -53160,7 +51485,7 @@
"chE" = (
/obj/machinery/alarm{
dir = 1;
- pixel_y = -22
+ pixel_y = -24
},
/obj/machinery/photocopier,
/turf/simulated/floor/plasteel{
@@ -53178,7 +51503,7 @@
pixel_y = 3
},
/turf/simulated/floor/plating,
-/area/maintenance/genetics)
+/area/maintenance/asmaint)
"chG" = (
/obj/structure/table/glass,
/obj/effect/decal/cleanable/dirt,
@@ -53187,7 +51512,7 @@
dir = 6;
icon_state = "whitered"
},
-/area/maintenance/genetics)
+/area/maintenance/asmaint)
"chH" = (
/obj/machinery/alarm{
dir = 8;
@@ -53208,7 +51533,7 @@
},
/obj/structure/reagent_dispensers/fueltank,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"chK" = (
/obj/machinery/optable,
/turf/simulated/floor/plasteel{
@@ -53221,7 +51546,7 @@
},
/obj/machinery/alarm{
dir = 4;
- pixel_x = -23
+ pixel_x = -24
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -53231,7 +51556,7 @@
"chM" = (
/obj/machinery/alarm{
dir = 4;
- pixel_x = -22
+ pixel_x = -24
},
/turf/simulated/floor/plasteel{
dir = 5;
@@ -53242,8 +51567,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/disposalpipe/segment{
dir = 4
@@ -53251,8 +51575,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -53269,14 +51592,12 @@
/obj/structure/cable{
d1 = 1;
d2 = 4;
- icon_state = "1-4";
- tag = ""
+ icon_state = "1-4"
},
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/disposalpipe/sortjunction{
dir = 1;
@@ -53284,12 +51605,10 @@
sortType = 13
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/turf/simulated/floor/plasteel{
icon_state = "white"
@@ -53299,8 +51618,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/structure/disposalpipe/segment{
dir = 2;
@@ -53320,8 +51638,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/disposalpipe/segment{
dir = 4
@@ -53410,8 +51727,7 @@
dir = 6
},
/obj/machinery/light{
- dir = 1;
- in_use = 1
+ dir = 1
},
/turf/simulated/floor/plasteel{
icon_state = "white"
@@ -53489,8 +51805,7 @@
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 4;
- initialize_directions = 11
+ dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel,
@@ -53530,8 +51845,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,
@@ -53575,16 +51889,13 @@
/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/firedoor,
/obj/structure/disposalpipe/segment{
dir = 4
},
@@ -53604,7 +51915,9 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/machinery/computer/operating,
+/obj/machinery/computer/operating{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "darkblue"
@@ -53659,7 +51972,9 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/machinery/computer/operating,
+/obj/machinery/computer/operating{
+ dir = 8
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "darkblue"
@@ -53689,14 +52004,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/disposalpipe/segment{
dir = 4
@@ -53709,10 +52022,8 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
-/obj/machinery/door/firedoor,
/obj/structure/disposalpipe/segment{
dir = 4
},
@@ -53722,6 +52033,7 @@
/obj/machinery/door/airlock/public/glass{
name = "Central Access"
},
+/obj/machinery/door/firedoor,
/turf/simulated/floor/plasteel{
icon_state = "yellowcorner"
},
@@ -53730,8 +52042,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/door/airlock/public/glass{
name = "Central Access"
@@ -53739,6 +52050,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/machinery/door/firedoor,
/turf/simulated/floor/plasteel,
/area/hallway/primary/central/sw)
"ciP" = (
@@ -53764,14 +52076,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/disposalpipe/junction{
dir = 1;
@@ -53786,7 +52096,7 @@
},
/obj/machinery/alarm{
dir = 8;
- pixel_x = 25
+ pixel_x = 24
},
/turf/simulated/floor/plasteel{
icon_state = "whitebluecorner"
@@ -53801,7 +52111,7 @@
},
/obj/machinery/vending/wallmed{
name = "Emergency NanoMed";
- pixel_x = -25
+ pixel_x = -28
},
/obj/structure/disposalpipe/segment,
/obj/machinery/door/firedoor,
@@ -53892,28 +52202,26 @@
/area/medical/cmo)
"ciY" = (
/turf/simulated/wall,
-/area/maintenance/genetics)
+/area/maintenance/asmaint)
"ciZ" = (
/obj/structure/barricade/wooden,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
-/area/maintenance/genetics)
+/area/maintenance/asmaint)
"cja" = (
/obj/effect/spawner/random_barrier/obstruction,
/turf/simulated/floor/plating,
-/area/maintenance/genetics)
+/area/maintenance/asmaint)
"cjb" = (
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/disposalpipe/segment{
dir = 4
@@ -53939,11 +52247,11 @@
/obj/item/folder,
/obj/item/pen/multi/fountain,
/obj/item/stamp/rep,
-/turf/simulated/floor/carpet,
+/turf/simulated/floor/carpet/royalblack,
/area/ntrep)
"cjf" = (
/obj/structure/table/wood,
-/turf/simulated/floor/carpet,
+/turf/simulated/floor/carpet/royalblack,
/area/ntrep)
"cjg" = (
/obj/machinery/door/window{
@@ -53961,8 +52269,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 1
@@ -53973,20 +52280,17 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/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,
@@ -54020,8 +52324,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/item/radio/intercom{
pixel_y = -28
@@ -54036,8 +52339,7 @@
/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,
@@ -54047,8 +52349,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/light,
/turf/simulated/floor/plasteel,
@@ -54057,8 +52358,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel,
/area/hallway/primary/central/se)
@@ -54070,13 +52370,12 @@
dir = 4
},
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cjr" = (
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/turf/simulated/floor/plasteel,
/area/hallway/primary/central/se)
@@ -54090,7 +52389,7 @@
pixel_x = -32
},
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cjt" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 4
@@ -54111,19 +52410,7 @@
},
/area/medical/sleeper)
"cjv" = (
-/obj/structure/closet/wardrobe/medic_white,
-/obj/item/clothing/head/surgery/blue,
-/obj/item/clothing/head/surgery/blue,
-/obj/item/clothing/head/surgery/green,
-/obj/item/clothing/head/surgery/green,
-/obj/item/clothing/head/surgery/purple,
-/obj/item/clothing/head/surgery/purple,
-/obj/item/clothing/suit/storage/fr_jacket,
-/obj/item/clothing/suit/storage/fr_jacket,
-/obj/item/clothing/suit/storage/fr_jacket,
-/obj/item/clothing/under/rank/medical/blue,
-/obj/item/clothing/under/rank/medical/green,
-/obj/item/clothing/under/rank/medical/purple,
+/obj/machinery/vending/medidrobe,
/turf/simulated/floor/plasteel{
icon_state = "cafeteria"
},
@@ -54150,8 +52437,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
@@ -54185,8 +52471,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 2;
@@ -54231,8 +52516,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -54242,15 +52526,12 @@
/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;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plating,
/area/maintenance/apmaint)
"cjE" = (
@@ -54287,8 +52568,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/machinery/door_control{
id = "cmoofficedoor";
@@ -54310,6 +52590,9 @@
/obj/machinery/atmospherics/pipe/simple/heat_exchanging{
dir = 4
},
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+ dir = 1
+ },
/turf/simulated/floor/bluegrid/telecomms/server,
/area/toxins/server_coldroom)
"cjI" = (
@@ -54318,8 +52601,7 @@
network = list("Telepad","Research","SS13")
},
/obj/machinery/light{
- dir = 1;
- on = 1
+ dir = 1
},
/obj/structure/sign/nosmoking_2{
pixel_y = 32
@@ -54328,32 +52610,34 @@
/area/toxins/explab_chamber)
"cjJ" = (
/obj/machinery/atmospherics/pipe/simple/heat_exchanging{
- dir = 9
+ dir = 4
},
/obj/machinery/firealarm{
dir = 1;
pixel_y = -24
},
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
- dir = 1
- },
/turf/simulated/floor/plasteel/dark/telecomms,
/area/toxins/server_coldroom)
"cjK" = (
/obj/machinery/alarm{
dir = 1;
- pixel_y = -22
+ pixel_y = -24
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden{
+ dir = 4
},
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
},
+/obj/machinery/computer/rdservercontrol{
+ dir = 1
+ },
/turf/simulated/floor/plasteel/dark,
/area/toxins/server)
"cjL" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 4;
- initialize_directions = 11
+ dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel,
@@ -54373,7 +52657,8 @@
"cjO" = (
/obj/structure/cable,
/obj/machinery/light_switch{
- pixel_y = -23
+ dir = 1;
+ pixel_y = -24
},
/obj/structure/disposalpipe/segment{
dir = 1;
@@ -54447,14 +52732,16 @@
},
/area/crew_quarters/hor)
"cjT" = (
+/obj/structure/disposalpipe/segment,
/obj/structure/cable{
- d1 = 2;
- d2 = 4;
- icon_state = "2-4";
- tag = ""
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
},
-/turf/simulated/floor/plating,
-/area/maintenance/asmaint2)
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/medical/chemistry)
"cjU" = (
/obj/structure/disposalpipe/segment{
dir = 4;
@@ -54498,8 +52785,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/turf/simulated/floor/plating,
/area/maintenance/asmaint2)
@@ -54588,16 +52874,13 @@
/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/supply{
+ dir = 5
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/turf/simulated/floor/plasteel,
/area/quartermaster/miningdock)
@@ -54608,8 +52891,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 = 9
@@ -54630,13 +52912,12 @@
},
/area/medical/surgery2)
"ckt" = (
-/turf/simulated/floor/plasteel{
- icon_state = "bcarpet05"
- },
+/turf/simulated/floor/carpet/blue,
/area/blueshield)
"cku" = (
/obj/machinery/light_switch{
- pixel_x = 27
+ dir = 8;
+ pixel_x = 24
},
/turf/simulated/floor/wood,
/area/blueshield)
@@ -54644,7 +52925,7 @@
/turf/simulated/floor/wood,
/area/ntrep)
"ckw" = (
-/turf/simulated/floor/carpet,
+/turf/simulated/floor/carpet/royalblack,
/area/ntrep)
"ckx" = (
/obj/structure/disposalpipe/segment{
@@ -54742,7 +53023,9 @@
},
/area/medical/medbreak)
"ckF" = (
-/obj/structure/chair/stool,
+/obj/structure/chair/stool{
+ dir = 4
+ },
/obj/machinery/power/apc{
dir = 1;
name = "north bump";
@@ -54805,24 +53088,21 @@
/area/blueshield)
"ckJ" = (
/obj/structure/sink{
- pixel_y = 30
+ pixel_y = 25
},
/obj/structure/closet/secure_closet/personal/patient,
/turf/simulated/floor/plating,
-/area/maintenance/genetics)
-"ckK" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2";
- tag = ""
- },
-/turf/simulated/floor/plating,
/area/maintenance/asmaint)
+"ckK" = (
+/obj/machinery/atmospherics/pipe/simple/heat_exchanging{
+ dir = 6
+ },
+/turf/space,
+/area/space)
"ckL" = (
/obj/structure/bed,
/turf/simulated/floor/plating,
-/area/maintenance/genetics)
+/area/maintenance/asmaint)
"ckM" = (
/obj/item/flag/nt,
/obj/structure/sign/poster/random{
@@ -54862,14 +53142,12 @@
/turf/simulated/floor/plasteel,
/area/janitor)
"ckQ" = (
-/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel,
/area/hallway/primary/central/south)
"ckR" = (
/obj/structure/disposalpipe/segment,
-/obj/machinery/door/firedoor,
/turf/simulated/floor/plasteel,
/area/hallway/primary/central/south)
"ckS" = (
@@ -54879,7 +53157,7 @@
icon_state = "1-2"
},
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"ckT" = (
/obj/machinery/door/airlock/maintenance{
req_access_txt = "12"
@@ -54887,13 +53165,12 @@
/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,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"ckU" = (
/obj/machinery/camera{
c_tag = "Medbay Surgery West";
@@ -54945,12 +53222,10 @@
"ckZ" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 4;
- initialize_directions = 11
+ dir = 4
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -54963,8 +53238,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,
@@ -54972,8 +53246,8 @@
/area/maintenance/asmaint2)
"clb" = (
/obj/structure/table/glass,
-/obj/machinery/computer/med_data/laptop,
/obj/machinery/atmospherics/unary/vent_scrubber/on,
+/obj/machinery/computer/med_data/laptop,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "darkblue"
@@ -55040,8 +53314,7 @@
"clh" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/obj/structure/cable{
d1 = 1;
@@ -55049,7 +53322,7 @@
icon_state = "1-2"
},
/obj/structure/extinguisher_cabinet{
- pixel_x = -30
+ pixel_x = -27
},
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
@@ -55058,12 +53331,13 @@
},
/area/medical/medbay2)
"cli" = (
-/obj/structure/chair/stool,
+/obj/structure/chair/stool{
+ dir = 1
+ },
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/turf/simulated/floor/plasteel{
icon_state = "cafeteria"
@@ -55083,7 +53357,7 @@
/obj/machinery/washing_machine,
/obj/machinery/alarm{
dir = 8;
- pixel_x = 25
+ pixel_x = 24
},
/turf/simulated/floor/plasteel{
icon_state = "cafeteria"
@@ -55108,8 +53382,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -55150,10 +53423,8 @@
/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,
/area/quartermaster/miningdock)
@@ -55173,7 +53444,8 @@
"clv" = (
/obj/structure/closet,
/obj/machinery/light_switch{
- pixel_x = -27
+ dir = 4;
+ pixel_x = -24
},
/turf/simulated/floor/plasteel,
/area/quartermaster/qm)
@@ -55204,11 +53476,8 @@
/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,
/turf/simulated/floor/plating,
/area/maintenance/apmaint)
"clz" = (
@@ -55275,6 +53544,7 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/door/firedoor,
/turf/simulated/floor/plasteel,
/area/hallway/primary/aft)
"clO" = (
@@ -55282,6 +53552,7 @@
/obj/machinery/door/airlock/public/glass{
name = "Central Access"
},
+/obj/machinery/door/firedoor,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "cautioncorner"
@@ -55305,24 +53576,21 @@
/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/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"clT" = (
/obj/structure/cable{
d2 = 2;
- icon_state = "0-2";
- pixel_y = 1
+ icon_state = "0-2"
},
/obj/machinery/power/apc{
dir = 8;
@@ -55337,7 +53605,7 @@
"clU" = (
/obj/item/radio/intercom{
dir = 1;
- pixel_y = 25
+ pixel_y = 28
},
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 8
@@ -55346,8 +53614,7 @@
/area/toxins/explab_chamber)
"clV" = (
/obj/item/radio/intercom{
- pixel_x = 29;
- pixel_y = -1
+ pixel_x = 28
},
/turf/simulated/floor/wood,
/area/blueshield)
@@ -55364,7 +53631,7 @@
"clX" = (
/obj/machinery/alarm{
dir = 4;
- pixel_x = -22
+ pixel_x = -24
},
/obj/machinery/light/small{
dir = 8
@@ -55438,7 +53705,7 @@
dir = 8;
icon_state = "whitered"
},
-/area/maintenance/genetics)
+/area/maintenance/asmaint)
"cme" = (
/obj/machinery/firealarm{
dir = 1;
@@ -55451,7 +53718,7 @@
/obj/machinery/iv_drip,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
-/area/maintenance/genetics)
+/area/maintenance/asmaint)
"cmg" = (
/obj/structure/closet{
icon_closed = "cabinet_closed";
@@ -55475,8 +53742,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -55486,6 +53752,9 @@
},
/area/medical/research)
"cmj" = (
+/obj/structure/chair/office/dark{
+ dir = 4
+ },
/obj/machinery/computer/security/telescreen{
desc = "Used for watching the singularity chamber.";
dir = 8;
@@ -55494,17 +53763,13 @@
network = list("Singularity");
pixel_y = 30
},
-/obj/structure/chair/office/dark{
- dir = 4
- },
/turf/simulated/floor/plasteel,
/area/engine/controlroom)
"cmk" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/light/small{
dir = 1
@@ -55576,8 +53841,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/disposalpipe/junction{
icon_state = "pipe-y"
@@ -55588,12 +53852,10 @@
/area/medical/medbay2)
"cmr" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/obj/structure/cable{
d1 = 1;
@@ -55624,8 +53886,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/disposalpipe/segment{
dir = 2;
@@ -55640,7 +53901,7 @@
req_access_txt = "12"
},
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cmu" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -55665,18 +53926,19 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
icon_state = "cafeteria"
},
/area/medical/medbreak)
"cmw" = (
-/obj/machinery/computer/crew,
/obj/machinery/light{
dir = 4
},
+/obj/machinery/computer/crew{
+ dir = 8
+ },
/turf/simulated/floor/plasteel{
icon_state = "cafeteria"
},
@@ -55685,8 +53947,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
@@ -55714,13 +53975,12 @@
pixel_x = -32
},
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cmB" = (
/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
@@ -55749,8 +54009,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 9
@@ -55773,18 +54032,16 @@
location = "Engineering"
},
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cmJ" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cmK" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/plasteel{
- icon_state = "bcarpet05"
- },
+/turf/simulated/floor/carpet/blue,
/area/blueshield)
"cmL" = (
/turf/simulated/floor/plasteel{
@@ -55794,7 +54051,7 @@
"cmM" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/carpet,
+/turf/simulated/floor/carpet/royalblack,
/area/ntrep)
"cmN" = (
/obj/structure/table,
@@ -55814,11 +54071,13 @@
name = "\improper Virology Lobby"
})
"cmO" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/plasteel,
-/area/hallway/primary/aft)
+/obj/machinery/atmospherics/pipe/simple/visible{
+ dir = 9
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/toxins/mixing)
"cmP" = (
/obj/machinery/portable_atmospherics/canister/carbon_dioxide,
/obj/effect/decal/warning_stripes/yellow,
@@ -55826,19 +54085,24 @@
/turf/simulated/floor/plasteel,
/area/toxins/storage)
"cmQ" = (
-/obj/structure/disposalpipe/segment,
-/obj/machinery/door/firedoor,
-/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "cautioncorner"
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
},
-/area/hallway/primary/aft)
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/unary/portables_connector{
+ dir = 1
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/toxins/mixing)
"cmR" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/disposalpipe/segment{
dir = 4
@@ -55860,8 +54124,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/disposalpipe/segment{
dir = 4
@@ -55875,8 +54138,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 8
@@ -55892,7 +54154,7 @@
"cmW" = (
/obj/item/radio/intercom{
dir = 1;
- pixel_y = 25
+ pixel_y = 28
},
/obj/structure/reagent_dispensers/watertank,
/turf/simulated/floor/plasteel{
@@ -55905,8 +54167,7 @@
/obj/item/extinguisher,
/obj/item/clothing/mask/gas,
/obj/machinery/light{
- dir = 1;
- in_use = 1
+ dir = 1
},
/obj/item/grenade/chem_grenade/firefighting,
/turf/simulated/floor/plasteel{
@@ -55927,7 +54188,7 @@
/area/toxins/mixing)
"cmZ" = (
/obj/machinery/alarm{
- pixel_y = 25
+ pixel_y = 24
},
/obj/effect/decal/warning_stripes/southwestcorner,
/obj/machinery/portable_atmospherics/canister,
@@ -55956,45 +54217,33 @@
icon_state = "whitepurple"
},
/area/toxins/mixing)
-"cnc" = (
-/obj/structure/grille,
-/obj/structure/window/plasmareinforced{
- dir = 8
- },
-/obj/structure/window/plasmareinforced,
-/obj/structure/window/plasmareinforced{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/insulated,
-/obj/machinery/meter,
-/turf/simulated/floor/plating,
-/area/toxins/mixing)
"cnd" = (
-/obj/structure/grille,
/obj/structure/window/plasmareinforced,
/obj/structure/window/plasmareinforced{
dir = 1
},
+/obj/structure/grille,
/turf/simulated/floor/plating,
/area/toxins/mixing)
"cne" = (
-/obj/structure/grille,
-/obj/structure/window/plasmareinforced{
- dir = 4
+/obj/machinery/atmospherics/pipe/simple/insulated,
+/obj/machinery/meter{
+ layer = 3.3
},
/obj/structure/window/plasmareinforced,
/obj/structure/window/plasmareinforced{
dir = 1
},
-/obj/machinery/atmospherics/pipe/simple/insulated,
-/obj/machinery/meter,
+/obj/structure/window/plasmareinforced{
+ dir = 8
+ },
+/obj/structure/grille,
/turf/simulated/floor/plating,
/area/toxins/mixing)
"cnf" = (
/obj/machinery/meter,
/obj/machinery/atmospherics/pipe/manifold/visible{
- dir = 4;
- initialize_directions = 11
+ dir = 4
},
/turf/simulated/floor/plasteel{
icon_state = "white"
@@ -56041,8 +54290,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/turf/simulated/floor/plating,
/area/maintenance/apmaint)
@@ -56050,8 +54298,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/structure/disposalpipe/segment{
dir = 2;
@@ -56064,8 +54311,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/disposalpipe/segment{
dir = 8;
@@ -56095,15 +54341,14 @@
/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/engine,
/area/toxins/explab_chamber)
"cnu" = (
/obj/structure/chair/office/dark,
-/turf/simulated/floor/carpet,
+/turf/simulated/floor/carpet/royalblack,
/area/ntrep)
"cnv" = (
/obj/item/cigbutt,
@@ -56157,11 +54402,10 @@
/area/hallway/primary/aft)
"cnB" = (
/obj/machinery/light{
- dir = 1;
- on = 1
+ dir = 1
},
/obj/item/radio/intercom{
- pixel_y = 25
+ pixel_y = 28
},
/turf/simulated/floor/plasteel{
dir = 1;
@@ -56173,8 +54417,7 @@
"cnC" = (
/obj/structure/cable{
d2 = 2;
- icon_state = "0-2";
- pixel_y = 1
+ icon_state = "0-2"
},
/obj/machinery/power/apc{
dir = 8;
@@ -56182,7 +54425,7 @@
pixel_x = -24
},
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cnD" = (
/obj/machinery/status_display{
layer = 4;
@@ -56207,8 +54450,7 @@
pixel_y = 32
},
/obj/machinery/light{
- dir = 1;
- on = 1
+ dir = 1
},
/turf/simulated/floor/plasteel{
dir = 1;
@@ -56290,7 +54532,8 @@
dir = 1
},
/obj/machinery/light_switch{
- pixel_y = -27
+ dir = 1;
+ pixel_y = -24
},
/turf/simulated/floor/plasteel{
icon_state = "cafeteria"
@@ -56309,13 +54552,17 @@
},
/area/medical/medbreak)
"cnQ" = (
-/obj/machinery/computer/med_data,
+/obj/machinery/computer/med_data{
+ dir = 8
+ },
/turf/simulated/floor/plasteel{
icon_state = "cafeteria"
},
/area/medical/medbreak)
"cnR" = (
-/obj/structure/chair/stool,
+/obj/structure/chair/stool{
+ dir = 4
+ },
/obj/item/radio/intercom{
pixel_y = -28
},
@@ -56341,14 +54588,7 @@
/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
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel,
/area/quartermaster/miningdock)
@@ -56360,22 +54600,20 @@
/obj/structure/cable{
d1 = 1;
d2 = 4;
- icon_state = "1-4";
- tag = ""
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 5
+ icon_state = "1-4"
},
/obj/effect/landmark/start{
name = "Shaft Miner"
},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 9
+ },
/turf/simulated/floor/plasteel,
/area/quartermaster/miningdock)
"cnV" = (
/obj/effect/spawner/random_spawners/oil_maybe,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cnW" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -56391,17 +54629,10 @@
/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
+ icon_state = "4-8"
},
/turf/simulated/floor/plating,
/area/maintenance/apmaint)
@@ -56532,24 +54763,14 @@
/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
+ icon_state = "4-8"
},
/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
@@ -56557,20 +54778,16 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/structure/disposalpipe/segment{
dir = 2;
icon_state = "pipe-c"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 10
- },
/turf/simulated/floor/plating,
/area/maintenance/apmaint)
"coi" = (
-/obj/effect/spawner/window/reinforced,
+/obj/effect/spawner/window/reinforced/plasma,
/obj/machinery/door/poddoor{
density = 0;
icon_state = "open";
@@ -56590,9 +54807,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/turf/simulated/floor/plasteel{
- icon_state = "bcarpet05"
- },
+/turf/simulated/floor/carpet/blue,
/area/blueshield)
"col" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
@@ -56606,15 +54821,13 @@
dir = 9
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/plasteel{
- icon_state = "bcarpet05"
- },
+/turf/simulated/floor/carpet/blue,
/area/blueshield)
"con" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/turf/simulated/floor/carpet,
+/turf/simulated/floor/carpet/royalblack,
/area/ntrep)
"coo" = (
/obj/machinery/hologram/holopad,
@@ -56622,12 +54835,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
},
-/turf/simulated/floor/carpet,
+/turf/simulated/floor/carpet/royalblack,
/area/ntrep)
"cop" = (
/obj/item/radio/intercom{
- pixel_x = 29;
- pixel_y = -1
+ pixel_x = 28
},
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 8
@@ -56665,8 +54877,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{
@@ -56682,7 +54893,8 @@
/area/toxins/explab_chamber)
"cox" = (
/obj/machinery/light_switch{
- pixel_y = -23
+ dir = 1;
+ pixel_y = -24
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -56709,8 +54921,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 4;
- initialize_directions = 11
+ dir = 4
},
/turf/simulated/floor/plasteel,
/area/toxins/storage)
@@ -56724,7 +54935,7 @@
/area/toxins/storage)
"coC" = (
/obj/structure/extinguisher_cabinet{
- pixel_x = -24
+ pixel_x = -27
},
/turf/simulated/floor/plasteel{
dir = 5;
@@ -56743,12 +54954,10 @@
},
/area/medical/research)
"coE" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/cable{
d1 = 1;
d2 = 4;
- icon_state = "1-4";
- tag = ""
+ icon_state = "1-4"
},
/obj/structure/disposalpipe/segment{
dir = 1;
@@ -56759,7 +54968,6 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plating,
/area/maintenance/apmaint)
"coF" = (
@@ -56770,17 +54978,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,
/turf/simulated/floor/plating,
/area/maintenance/apmaint)
"coG" = (
/obj/structure/chair{
dir = 4
},
+/obj/machinery/alarm{
+ pixel_y = 24
+ },
+/obj/machinery/driver_button{
+ id_tag = "toxinsdriver";
+ pixel_y = 22;
+ range = 18
+ },
/obj/machinery/computer/security/telescreen{
desc = "Used for watching the test chamber.";
layer = 4;
@@ -56788,14 +55001,6 @@
network = list("Toxins");
pixel_x = 32
},
-/obj/machinery/alarm{
- pixel_y = 31
- },
-/obj/machinery/driver_button{
- id_tag = "toxinsdriver";
- pixel_y = 22;
- range = 18
- },
/turf/simulated/floor/plasteel,
/area/toxins/launch{
name = "Toxins Launch Room"
@@ -56804,32 +55009,8 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/turf/simulated/floor/plasteel{
- icon_state = "bcarpet05"
- },
+/turf/simulated/floor/carpet/blue,
/area/blueshield)
-"coI" = (
-/obj/structure/grille,
-/obj/structure/window/plasmareinforced{
- dir = 4
- },
-/obj/structure/window/plasmareinforced{
- dir = 8
- },
-/obj/structure/window/plasmareinforced{
- dir = 1
- },
-/obj/machinery/door/poddoor{
- density = 0;
- icon_state = "open";
- id_tag = "Biohazard";
- name = "Biohazard Shutter";
- opacity = 0
- },
-/turf/simulated/floor/plating,
-/area/toxins/launch{
- name = "Toxins Launch Room"
- })
"coJ" = (
/obj/effect/decal/warning_stripes/southwest,
/turf/simulated/floor/plasteel/airless,
@@ -56845,9 +55026,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
},
-/turf/simulated/floor/plasteel{
- icon_state = "bcarpet05"
- },
+/turf/simulated/floor/carpet/blue,
/area/blueshield)
"coP" = (
/obj/structure/table/glass,
@@ -56870,8 +55049,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/turf/simulated/floor/plating,
/area/maintenance/apmaint)
@@ -56889,7 +55067,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/turf/simulated/floor/carpet,
+/turf/simulated/floor/carpet/royalblack,
/area/ntrep)
"coV" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
@@ -56901,7 +55079,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 9
},
-/turf/simulated/floor/carpet,
+/turf/simulated/floor/carpet/royalblack,
/area/ntrep)
"coX" = (
/obj/structure/table/wood,
@@ -56913,9 +55091,7 @@
pixel_x = 7;
pixel_y = 4
},
-/turf/simulated/floor/plasteel{
- icon_state = "bcarpet05"
- },
+/turf/simulated/floor/carpet/blue,
/area/blueshield)
"coY" = (
/obj/machinery/keycard_auth{
@@ -56941,8 +55117,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
icon_state = "whitegreencorner"
@@ -56952,8 +55127,7 @@
})
"cpa" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 1;
- initialize_directions = 11
+ dir = 1
},
/obj/structure/disposalpipe/segment{
dir = 4
@@ -56984,8 +55158,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/ai_status_display{
pixel_y = -32;
@@ -57010,8 +55183,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 1;
@@ -57037,8 +55209,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/door/firedoor,
/turf/simulated/floor/plasteel{
@@ -57060,8 +55231,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/firealarm{
dir = 1;
@@ -57083,26 +55253,21 @@
},
/obj/item/paper/blueshield,
/obj/item/book/manual/sop_command,
-/turf/simulated/floor/plasteel{
- icon_state = "bcarpet05"
- },
+/turf/simulated/floor/carpet/blue,
/area/blueshield)
"cpg" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 4;
- initialize_directions = 11
+ dir = 4
},
/turf/simulated/floor/plasteel,
/area/hallway/primary/aft)
"cph" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 4;
- initialize_directions = 11
+ dir = 4
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 4;
- initialize_directions = 11
+ dir = 4
},
/obj/structure/cable{
d1 = 1;
@@ -57136,19 +55301,18 @@
"cpj" = (
/obj/structure/sign/lifestar,
/turf/simulated/wall,
-/area/maintenance/genetics)
+/area/maintenance/asmaint)
"cpk" = (
/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"
},
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cpl" = (
/obj/structure/cable,
/obj/structure/table,
@@ -57171,7 +55335,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cpn" = (
/obj/structure/sink{
dir = 4;
@@ -57209,8 +55373,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door/firedoor,
/obj/machinery/door/poddoor{
@@ -57237,7 +55400,7 @@
"cps" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cpt" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -57253,12 +55416,10 @@
"cpu" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/turf/simulated/floor/plasteel{
icon_state = "white"
@@ -57319,14 +55480,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/lattice/catwalk,
/turf/space,
@@ -57334,7 +55493,8 @@
"cpA" = (
/obj/effect/decal/warning_stripes/southwestcorner,
/obj/machinery/light_switch{
- pixel_x = 27
+ dir = 8;
+ pixel_x = 24
},
/obj/structure/sink{
dir = 4;
@@ -57352,8 +55512,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/warning_stripes/south,
/turf/simulated/floor/plasteel{
@@ -57392,20 +55551,19 @@
"cpE" = (
/obj/machinery/light/small,
/turf/simulated/floor/plating,
-/area/maintenance/genetics)
+/area/maintenance/asmaint)
"cpF" = (
/obj/effect/spawner/lootdrop/maintenance{
lootcount = 2;
name = "2maintenance loot spawner"
},
/turf/simulated/floor/plating,
-/area/maintenance/genetics)
+/area/maintenance/asmaint)
"cpG" = (
/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/supply{
@@ -57427,14 +55585,14 @@
name = "2maintenance loot spawner"
},
/turf/simulated/floor/plating,
-/area/maintenance/genetics)
+/area/maintenance/asmaint)
"cpI" = (
/obj/structure/rack{
dir = 1
},
/obj/effect/spawner/lootdrop/maintenance,
/turf/simulated/floor/plating,
-/area/maintenance/genetics)
+/area/maintenance/asmaint)
"cpJ" = (
/obj/item/twohanded/required/kirbyplants,
/turf/simulated/floor/plasteel{
@@ -57463,7 +55621,7 @@
"cpM" = (
/obj/machinery/smartfridge/secure/chemistry/virology/preloaded,
/turf/simulated/floor/plasteel{
- dir = 1;
+ dir = 9;
icon_state = "whitegreen"
},
/area/medical/virology)
@@ -57476,7 +55634,7 @@
pixel_x = 24
},
/turf/simulated/floor/plasteel{
- dir = 1;
+ dir = 5;
icon_state = "whitegreen"
},
/area/medical/virology)
@@ -57495,14 +55653,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/medical{
autoclose = 0;
frequency = 1379;
- icon_state = "door_locked";
id_tag = "viro_lab_airlock_exterior";
locked = 1;
name = "Virology Lab External Airlock";
@@ -57555,14 +55711,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/manifold4w/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
@@ -57597,8 +55751,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
@@ -57638,8 +55791,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
@@ -57654,8 +55806,7 @@
dir = 4
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 1;
- initialize_directions = 11
+ dir = 1
},
/turf/simulated/floor/plasteel{
icon_state = "white"
@@ -57718,8 +55869,7 @@
/area/toxins/mixing)
"cqg" = (
/obj/machinery/light{
- dir = 1;
- in_use = 1
+ dir = 1
},
/obj/machinery/status_display{
layer = 4;
@@ -57740,21 +55890,23 @@
"cqi" = (
/obj/machinery/door_control{
id = "ToxinsVenting";
+ layer = 3.3;
name = "Toxin Venting Control";
pixel_x = -8;
pixel_y = 26
},
/obj/machinery/ignition_switch{
id = "toxinsigniter";
+ layer = 3.3;
pixel_x = 6;
pixel_y = 25
},
+/obj/effect/decal/warning_stripes/north,
/obj/machinery/computer/general_air_control{
frequency = 1222;
name = "Bomb Mix Monitor";
sensors = list("burn_sensor" = "Burn Mix")
},
-/obj/effect/decal/warning_stripes/north,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -57764,8 +55916,8 @@
c_tag = "Research Toxins Mixing East";
network = list("Research","SS13")
},
-/obj/machinery/atmospherics/unary/portables_connector{
- dir = 1
+/obj/machinery/atmospherics/pipe/manifold/visible{
+ dir = 8
},
/turf/simulated/floor/plasteel{
icon_state = "white"
@@ -57778,8 +55930,7 @@
/area/toxins/mixing)
"cql" = (
/obj/machinery/light{
- dir = 1;
- in_use = 1
+ dir = 1
},
/obj/machinery/atmospherics/unary/thermomachine/freezer,
/obj/effect/decal/warning_stripes/northwestcorner,
@@ -57821,8 +55972,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/holosign/surgery{
id = "surgery1"
@@ -57842,7 +55992,8 @@
dir = 8
},
/obj/machinery/light_switch{
- pixel_x = -23
+ dir = 4;
+ pixel_x = -24
},
/obj/structure/cable{
d2 = 2;
@@ -57872,65 +56023,32 @@
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
+ icon_state = "1-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;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/disposalpipe/sortjunction{
dir = 8;
name = "HoP Office";
sortType = 15
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
/turf/simulated/floor/plating,
/area/maintenance/apmaint)
"cqu" = (
@@ -57938,27 +56056,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)
@@ -57966,8 +56070,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,
@@ -57988,8 +56091,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/holosign/surgery{
id = "surgery2"
@@ -58019,34 +56121,13 @@
/obj/structure/table,
/turf/simulated/floor/plating,
/area/maintenance/apmaint)
-"cqC" = (
-/obj/structure/grille,
-/obj/structure/window/plasmareinforced{
- dir = 4
- },
-/obj/structure/window/plasmareinforced{
- dir = 8
- },
-/obj/machinery/door/poddoor{
- density = 0;
- icon_state = "open";
- id_tag = "Biohazard";
- name = "Biohazard Shutter";
- opacity = 0
- },
-/turf/simulated/floor/plating,
-/area/toxins/launch{
- name = "Toxins Launch Room"
- })
"cqD" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8";
- tag = ""
+/obj/effect/spawner/lootdrop/maintenance{
+ lootcount = 2;
+ name = "2maintenance loot spawner"
},
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/apmaint)
"cqE" = (
/obj/structure/sink{
dir = 8;
@@ -58075,8 +56156,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/light/small{
dir = 8
@@ -58090,23 +56170,17 @@
/obj/effect/landmark/start{
name = "Blueshield"
},
-/turf/simulated/floor/plasteel{
- icon_state = "bcarpet05"
- },
+/turf/simulated/floor/carpet/blue,
/area/blueshield)
"cqJ" = (
/obj/structure/table/wood,
-/turf/simulated/floor/plasteel{
- icon_state = "bcarpet05"
- },
+/turf/simulated/floor/carpet/blue,
/area/blueshield)
"cqK" = (
/obj/structure/chair/comfy/black{
dir = 8
},
-/turf/simulated/floor/plasteel{
- icon_state = "bcarpet05"
- },
+/turf/simulated/floor/carpet/blue,
/area/blueshield)
"cqL" = (
/obj/item/flag/nt,
@@ -58125,22 +56199,15 @@
/obj/structure/chair/comfy/black{
dir = 4
},
-/turf/simulated/floor/carpet,
+/turf/simulated/floor/carpet/royalblack,
/area/ntrep)
"cqP" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/light/small,
-/obj/structure/cable{
- d1 = 2;
- d2 = 8;
- icon_state = "2-8";
- tag = ""
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
@@ -58148,7 +56215,7 @@
dir = 4
},
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cqQ" = (
/obj/structure/chair/office/dark{
dir = 8
@@ -58156,7 +56223,7 @@
/obj/effect/landmark/start{
name = "Nanotrasen Representative"
},
-/turf/simulated/floor/carpet,
+/turf/simulated/floor/carpet/royalblack,
/area/ntrep)
"cqR" = (
/obj/machinery/requests_console{
@@ -58176,7 +56243,7 @@
},
/obj/item/paper/ntrep,
/obj/item/paper_bin/nanotrasen,
-/turf/simulated/floor/carpet,
+/turf/simulated/floor/carpet/royalblack,
/area/ntrep)
"cqT" = (
/obj/machinery/requests_console{
@@ -58192,8 +56259,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 = 5
@@ -58202,19 +56268,17 @@
dir = 5
},
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cqV" = (
/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/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -58223,13 +56287,12 @@
dir = 4
},
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cqW" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/landmark{
name = "blobstart"
@@ -58241,13 +56304,12 @@
dir = 4
},
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cqX" = (
/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
@@ -58256,39 +56318,36 @@
dir = 4
},
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cqY" = (
/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/machinery/atmospherics/pipe/manifold/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cqZ" = (
-/obj/structure/cable{
- d1 = 2;
- d2 = 8;
- icon_state = "2-8";
- tag = ""
- },
/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"
+ },
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cra" = (
/obj/structure/cable{
d1 = 2;
@@ -58301,42 +56360,48 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/cable{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
+ },
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"crb" = (
/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;
- initialize_directions = 10
+ dir = 10
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
},
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"crc" = (
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"crd" = (
/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2";
- tag = ""
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
},
-/turf/simulated/wall,
-/area/engine/controlroom)
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+ dir = 8
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "yellowcorner"
+ },
+/area/hallway/primary/aft)
"cre" = (
/obj/effect/landmark/start{
name = "Medical Doctor"
@@ -58365,8 +56430,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,
@@ -58386,8 +56450,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,
@@ -58396,7 +56459,8 @@
/area/toxins/storage)
"crj" = (
/obj/machinery/light_switch{
- pixel_y = -23
+ dir = 1;
+ pixel_y = -24
},
/obj/structure/cable{
d2 = 4;
@@ -58420,12 +56484,12 @@
dir = 8
},
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"crl" = (
/obj/effect/spawner/lootdrop/maintenance,
/obj/effect/spawner/random_spawners/cobweb_right_frequent,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"crm" = (
/obj/structure/table/glass,
/obj/item/storage/box/syringes,
@@ -58452,8 +56516,7 @@
"cro" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel{
@@ -58471,7 +56534,8 @@
pixel_y = 32
},
/turf/simulated/floor/plasteel{
- icon_state = "white"
+ dir = 1;
+ icon_state = "whitegreen"
},
/area/medical/virology)
"crq" = (
@@ -58551,11 +56615,11 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/light_switch{
- pixel_x = -23
+ dir = 4;
+ pixel_x = -24
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -58571,7 +56635,7 @@
},
/obj/structure/sink{
dir = 4;
- pixel_x = 10
+ pixel_x = 12
},
/obj/effect/decal/warning_stripes/northeast,
/turf/simulated/floor/plasteel{
@@ -58615,11 +56679,10 @@
/obj/structure/closet/l3closet,
/obj/item/clothing/mask/gas,
/obj/machinery/light{
- dir = 1;
- in_use = 1
+ dir = 1
},
/obj/item/radio/intercom{
- pixel_y = 25
+ pixel_y = 28
},
/turf/simulated/floor/plasteel{
dir = 1;
@@ -58706,8 +56769,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
@@ -58727,7 +56789,8 @@
/area/toxins/explab)
"crP" = (
/obj/machinery/light_switch{
- pixel_x = 27
+ dir = 8;
+ pixel_x = 24
},
/turf/simulated/floor/plasteel{
icon_state = "white"
@@ -58764,8 +56827,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
@@ -58789,13 +56851,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/manifold/hidden/scrubbers{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/turf/simulated/floor/plasteel,
/area/hallway/primary/aft)
@@ -58812,8 +56872,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 4;
- icon_state = "1-4";
- tag = ""
+ icon_state = "1-4"
},
/obj/machinery/firealarm{
dir = 1;
@@ -58825,15 +56884,13 @@
},
/area/toxins/mixing)
"crX" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2";
- tag = ""
+/obj/structure/disposalpipe/segment,
+/obj/machinery/door/firedoor,
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "cautioncorner"
},
-/obj/structure/grille/broken,
-/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/hallway/primary/aft)
"crY" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
@@ -58844,11 +56901,12 @@
/area/medical/ward)
"crZ" = (
/obj/machinery/light_switch{
- pixel_x = 27
+ dir = 8;
+ pixel_x = 24
},
/obj/machinery/alarm{
dir = 1;
- pixel_y = -22
+ pixel_y = -24
},
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 8
@@ -58888,11 +56946,10 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/extinguisher_cabinet{
- pixel_x = -24
+ pixel_x = -27
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -58907,14 +56964,14 @@
/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/mixing)
"csf" = (
+/obj/machinery/atmospherics/unary/vent_scrubber/on,
/obj/machinery/computer/security/telescreen{
desc = "Used for watching the E.X.P.E.R.I-MENTOR chamber.";
layer = 4;
@@ -58922,7 +56979,6 @@
network = list("Telepad");
pixel_y = 32
},
-/obj/machinery/atmospherics/unary/vent_scrubber/on,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -58931,8 +56987,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
icon_state = "white"
@@ -58945,8 +57000,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
icon_state = "white"
@@ -58998,23 +57052,11 @@
/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
},
+/obj/effect/decal/warning_stripes/southwestcorner,
/obj/machinery/computer/security/telescreen{
desc = "Used for watching the test chamber.";
layer = 4;
@@ -59022,20 +57064,11 @@
network = list("Toxins");
pixel_x = 32
},
-/obj/effect/decal/warning_stripes/southwestcorner,
/turf/simulated/floor/plasteel,
/area/toxins/launch{
name = "Toxins Launch Room"
})
"csr" = (
-/obj/structure/grille,
-/obj/structure/window/plasmareinforced{
- dir = 4
- },
-/obj/structure/window/plasmareinforced{
- dir = 8
- },
-/obj/structure/window/plasmareinforced,
/obj/machinery/door/poddoor{
density = 0;
icon_state = "open";
@@ -59043,6 +57076,7 @@
name = "Biohazard Shutter";
opacity = 0
},
+/obj/effect/spawner/window/reinforced/plasma,
/turf/simulated/floor/plating,
/area/toxins/launch{
name = "Toxins Launch Room"
@@ -59059,8 +57093,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plating,
/area/maintenance/apmaint)
@@ -59082,7 +57115,6 @@
pixel_y = -24;
req_access_txt = "67"
},
-/obj/machinery/computer/crew,
/obj/machinery/door_control{
id = "blueshieldofficedoor";
name = "Office Door";
@@ -59091,6 +57123,9 @@
pixel_y = -24;
req_access_txt = "67"
},
+/obj/machinery/computer/crew{
+ dir = 1
+ },
/turf/simulated/floor/wood,
/area/blueshield)
"csy" = (
@@ -59133,8 +57168,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,
@@ -59148,7 +57182,6 @@
pixel_y = -24;
req_access_txt = "73"
},
-/obj/machinery/computer/secure_data,
/obj/machinery/door_control{
id = "ntrepofficedoor";
name = "Office Door";
@@ -59157,6 +57190,9 @@
pixel_y = -24;
req_access_txt = "73"
},
+/obj/machinery/computer/secure_data{
+ dir = 1
+ },
/turf/simulated/floor/wood,
/area/ntrep)
"csD" = (
@@ -59192,8 +57228,7 @@
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 4;
- initialize_directions = 11
+ dir = 4
},
/turf/simulated/floor/plasteel{
icon_state = "white"
@@ -59218,8 +57253,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/light,
/obj/machinery/atmospherics/unary/vent_scrubber/on{
@@ -59233,7 +57267,7 @@
/obj/structure/table,
/obj/effect/spawner/lootdrop/maintenance,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"csL" = (
/turf/simulated/floor/plating,
/area/maintenance/asmaint)
@@ -59241,8 +57275,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
icon_state = "whitepurple"
@@ -59271,22 +57304,24 @@
/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"
},
/turf/simulated/floor/plasteel{
icon_state = "white"
},
/area/toxins/mixing)
"csQ" = (
-/obj/structure/cable,
+/obj/structure/cable{
+ d2 = 2;
+ icon_state = "0-2"
+ },
/obj/machinery/computer/monitor{
+ dir = 8;
name = "Grid Power Monitoring Computer"
},
/turf/simulated/floor/plasteel{
@@ -59299,8 +57334,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/window/plasmareinforced{
dir = 4
@@ -59319,7 +57353,7 @@
/obj/item/storage/box/monkeycubes/farwacubes,
/obj/machinery/alarm{
dir = 4;
- pixel_x = -22
+ pixel_x = -24
},
/obj/machinery/light{
dir = 8
@@ -59333,8 +57367,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 = 1
@@ -59352,13 +57385,12 @@
name = "2maintenance loot spawner"
},
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"csV" = (
/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{
@@ -59367,8 +57399,7 @@
/area/toxins/mixing)
"csW" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 1;
- initialize_directions = 11
+ dir = 1
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 1
@@ -59439,8 +57470,7 @@
/area/medical/virology)
"ctb" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 1;
- initialize_directions = 11
+ dir = 1
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 1
@@ -59482,12 +57512,10 @@
/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
+ dir = 4
},
/obj/effect/decal/warning_stripes/north,
/turf/simulated/floor/plasteel{
@@ -59495,17 +57523,10 @@
},
/area/medical/virology)
"ctf" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2";
- tag = ""
- },
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/medical{
autoclose = 0;
frequency = 1379;
- icon_state = "door_locked";
id_tag = "viro_lab_airlock_interior";
locked = 1;
name = "Virology Lab Internal Airlock";
@@ -59529,8 +57550,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
icon_state = "white"
@@ -59546,8 +57566,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{
@@ -59561,8 +57580,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
@@ -59571,29 +57589,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;
- 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,
-/area/hallway/primary/aft)
"ctk" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -59604,10 +57599,12 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "blue"
},
-/turf/simulated/floor/plasteel,
/area/medical/cmostore)
"ctl" = (
/obj/structure/sign/poster/random{
@@ -59629,8 +57626,7 @@
/area/medical/cmostore)
"ctn" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 10;
- initialize_directions = 10
+ dir = 10
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -59665,34 +57661,36 @@
"ctq" = (
/obj/structure/reagent_dispensers/fueltank,
/turf/simulated/floor/plating,
-/area/maintenance/genetics)
+/area/maintenance/asmaint)
"ctr" = (
/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/plating,
-/area/maintenance/genetics)
+/area/maintenance/asmaint)
"cts" = (
-/obj/effect/spawner/window/reinforced,
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plating,
-/area/maintenance/genetics)
+/area/maintenance/aft)
"ctt" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
-/obj/machinery/light/small{
- dir = 8
- },
-/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/door/firedoor,
+/turf/simulated/floor/plasteel,
+/area/hallway/primary/aft)
"ctu" = (
/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
@@ -59707,8 +57705,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
icon_state = "white"
@@ -59718,14 +57715,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/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel{
@@ -59736,14 +57731,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/hologram/holopad,
/turf/simulated/floor/plasteel{
@@ -59762,8 +57755,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 4;
- icon_state = "1-4";
- tag = ""
+ icon_state = "1-4"
},
/obj/machinery/light{
dir = 8
@@ -59778,8 +57770,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/turf/simulated/floor/plasteel{
icon_state = "white"
@@ -59814,8 +57805,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/effect/decal/cleanable/cobweb2,
/turf/simulated/floor/plating,
@@ -59824,8 +57814,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 4;
- icon_state = "1-4";
- tag = ""
+ icon_state = "1-4"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -59867,8 +57856,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,
@@ -59913,17 +57901,6 @@
name = "Toxins Launch Room"
})
"ctP" = (
-/obj/structure/grille,
-/obj/structure/window/plasmareinforced{
- dir = 4
- },
-/obj/structure/window/plasmareinforced{
- dir = 8
- },
-/obj/structure/window/plasmareinforced,
-/obj/structure/window/plasmareinforced{
- dir = 1
- },
/obj/machinery/door/poddoor{
density = 0;
icon_state = "open";
@@ -59932,6 +57909,7 @@
opacity = 0
},
/obj/item/radio/intercom,
+/obj/effect/spawner/window/reinforced/plasma,
/turf/simulated/floor/plating,
/area/toxins/launch{
name = "Toxins Launch Room"
@@ -59957,31 +57935,6 @@
/area/toxins/launch{
name = "Toxins Launch Room"
})
-"ctR" = (
-/turf/simulated/wall/r_wall,
-/area/blueshield)
-"ctS" = (
-/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,
-/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;
@@ -59999,16 +57952,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
@@ -60033,7 +57976,7 @@
"ctZ" = (
/obj/structure/girder,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cua" = (
/obj/machinery/status_display{
layer = 4;
@@ -60055,11 +57998,11 @@
},
/obj/effect/spawner/lootdrop/maintenance,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cuc" = (
/obj/effect/decal/cleanable/fungus,
/turf/simulated/wall,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cud" = (
/obj/structure/table/glass,
/obj/item/paper_bin{
@@ -60069,7 +58012,7 @@
/obj/item/pen,
/obj/item/radio/intercom{
dir = 1;
- pixel_x = -25
+ pixel_x = -28
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -60087,8 +58030,7 @@
"cuf" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/turf/simulated/floor/plasteel{
icon_state = "whitegreenfull"
@@ -60104,7 +58046,7 @@
pixel_y = -28
},
/turf/simulated/floor/plasteel{
- icon_state = "white"
+ icon_state = "whitegreen"
},
/area/medical/virology)
"cuh" = (
@@ -60118,9 +58060,17 @@
/area/medical/virology)
"cui" = (
/obj/machinery/light_switch{
- pixel_x = 27
+ dir = 8;
+ pixel_x = 24
+ },
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/machinery/computer/security/engineering{
+ dir = 8
},
-/obj/machinery/computer/security/engineering,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "caution"
@@ -60161,7 +58111,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel{
- icon_state = "white"
+ icon_state = "whitegreen"
},
/area/medical/virology)
"cun" = (
@@ -60200,7 +58150,7 @@
/obj/item/storage/box/syringes,
/obj/machinery/alarm{
dir = 1;
- pixel_y = -25
+ pixel_y = -24
},
/obj/machinery/light,
/turf/simulated/floor/plasteel{
@@ -60235,9 +58185,8 @@
"cus" = (
/obj/structure/closet/l3closet,
/obj/item/clothing/mask/gas,
-/obj/machinery/atmospherics/unary/vent_pump{
- dir = 8;
- on = 1
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 8
},
/obj/effect/decal/warning_stripes/southeast,
/turf/simulated/floor/plasteel{
@@ -60257,16 +58206,11 @@
/turf/simulated/floor/plasteel,
/area/engine/controlroom)
"cuu" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2";
- tag = ""
+/obj/machinery/door/firedoor,
+/turf/simulated/floor/plasteel{
+ icon_state = "yellowcorner"
},
-/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance,
-/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/hallway/primary/aft)
"cuv" = (
/turf/simulated/floor/plasteel{
icon_state = "whitebluecorner"
@@ -60275,7 +58219,7 @@
"cuw" = (
/obj/structure/closet/radiation,
/turf/simulated/floor/plasteel{
- dir = 1;
+ dir = 9;
icon_state = "blue"
},
/area/medical/cmostore)
@@ -60313,7 +58257,7 @@
/area/medical/cmostore)
"cuB" = (
/obj/machinery/alarm{
- pixel_y = 25
+ pixel_y = 24
},
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/turf/simulated/floor/plasteel{
@@ -60334,28 +58278,26 @@
icon_state = "0-4"
},
/turf/simulated/floor/plating,
-/area/maintenance/genetics)
+/area/maintenance/asmaint)
"cuD" = (
/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/plating,
-/area/maintenance/genetics)
+/area/maintenance/asmaint)
"cuE" = (
/obj/structure/grille/broken,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cuF" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 6
@@ -60393,7 +58335,7 @@
"cuJ" = (
/obj/machinery/alarm{
dir = 4;
- pixel_x = -22
+ pixel_x = -24
},
/obj/structure/table,
/obj/item/paper_bin{
@@ -60426,8 +58368,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
@@ -60441,8 +58382,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
@@ -60458,8 +58398,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{
@@ -60473,8 +58412,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
@@ -60507,8 +58445,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
@@ -60524,8 +58461,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/firealarm{
dir = 1;
@@ -60543,7 +58479,8 @@
/area/toxins/explab)
"cuT" = (
/obj/machinery/light_switch{
- pixel_y = -23
+ dir = 1;
+ pixel_y = -24
},
/obj/structure/table,
/obj/item/storage/toolbox/mechanical,
@@ -60564,8 +58501,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
@@ -60587,8 +58523,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -60605,12 +58540,10 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/visible{
- dir = 6;
- level = 1
+ dir = 6
},
/turf/simulated/floor/plating,
/area/maintenance/asmaint2)
@@ -60757,14 +58690,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";
@@ -60830,8 +58762,7 @@
},
/obj/structure/cable{
d2 = 2;
- icon_state = "0-2";
- pixel_y = 1
+ icon_state = "0-2"
},
/obj/structure/rack{
dir = 8;
@@ -60861,7 +58792,7 @@
dir = 1
},
/obj/machinery/alarm{
- pixel_y = 23
+ pixel_y = 24
},
/turf/simulated/floor/plating,
/area/storage/tech)
@@ -60927,12 +58858,10 @@
"cvH" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 4;
- initialize_directions = 11
+ dir = 4
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 4;
- initialize_directions = 11
+ dir = 4
},
/turf/simulated/floor/plasteel{
icon_state = "white"
@@ -60945,20 +58874,21 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
-/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel,
/area/hallway/primary/aft)
"cvK" = (
-/obj/machinery/door/firedoor,
-/turf/simulated/floor/plasteel{
- icon_state = "yellowcorner"
+/obj/effect/spawner/window/reinforced,
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
},
-/area/hallway/primary/aft)
+/turf/simulated/floor/plating,
+/area/construction)
"cvL" = (
/obj/structure/disposalpipe/segment{
dir = 1;
@@ -60983,6 +58913,11 @@
/obj/structure/disposalpipe/trunk{
dir = 8
},
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "caution"
@@ -60992,11 +58927,15 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
-/turf/simulated/wall,
-/area/construction)
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/asmaint2)
"cvO" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/medical/glass{
@@ -61015,18 +58954,14 @@
/turf/simulated/wall,
/area/medical/virology)
"cvQ" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/medical/glass{
- id_tag = null;
- name = "Isolation B";
- req_access_txt = "39"
+/obj/effect/spawner/lootdrop/maintenance,
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
-/area/medical/virology)
+/turf/simulated/floor/plating,
+/area/maintenance/asmaint2)
"cvR" = (
/obj/structure/closet/secure_closet/psychiatrist,
/obj/item/clipboard{
@@ -61101,10 +59036,12 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "bluefull"
},
-/turf/simulated/floor/plasteel,
/area/medical/cmostore)
"cvY" = (
/turf/simulated/floor/plasteel{
@@ -61115,7 +59052,7 @@
"cvZ" = (
/obj/machinery/atmospherics/pipe/simple/hidden/universal,
/turf/simulated/wall/r_wall,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cwa" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -61152,15 +59089,14 @@
/area/medical/virology)
"cwd" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/turf/simulated/floor/plasteel{
- icon_state = "white"
+ dir = 9;
+ icon_state = "whitegreen"
},
/area/medical/virology)
"cwe" = (
@@ -61249,8 +59185,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/disposalpipe/segment{
dir = 2;
@@ -61267,23 +59202,6 @@
icon_state = "white"
},
/area/toxins/explab)
-"cwn" = (
-/obj/structure/rack{
- dir = 8;
- layer = 2.9
- },
-/obj/item/clothing/shoes/magboots,
-/obj/item/clothing/suit/space/hardsuit/medical,
-/obj/item/clothing/mask/gas,
-/obj/machinery/door/window/westright{
- name = "Emergency Hardsuits";
- req_access_txt = "40"
- },
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "blue"
- },
-/area/medical/cmostore)
"cwo" = (
/obj/machinery/door/poddoor{
density = 0;
@@ -61326,7 +59244,8 @@
/area/toxins/explab)
"cwr" = (
/obj/machinery/light_switch{
- pixel_x = -23
+ dir = 4;
+ pixel_x = -24
},
/obj/structure/table,
/obj/item/storage/box/pillbottles{
@@ -61342,18 +59261,7 @@
},
/area/medical/cmostore)
"cws" = (
-/obj/structure/rack{
- dir = 8;
- layer = 2.9
- },
-/obj/item/clothing/shoes/magboots,
-/obj/item/clothing/suit/space/hardsuit/medical,
-/obj/item/clothing/mask/gas,
-/obj/machinery/door/window/westleft{
- name = "Emergency Hardsuits";
- req_access_txt = "40"
- },
-/obj/structure/window/reinforced,
+/obj/machinery/suit_storage_unit/cmo/secure/sec_storage,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "blue"
@@ -61391,17 +59299,17 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 1;
d2 = 4;
- icon_state = "1-4";
- tag = ""
+ icon_state = "1-4"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+ dir = 8
+ },
/turf/simulated/floor/plasteel,
/area/hallway/primary/aft)
"cwx" = (
@@ -61416,67 +59324,41 @@
/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{
+/obj/structure/closet/wardrobe/pjs,
+/obj/effect/spawner/random_spawners/blood_often,
+/obj/effect/spawner/lootdrop/maintenance,
+/turf/simulated/floor/plating,
+/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)
-"cwH" = (
-/obj/item/screwdriver,
-/turf/simulated/floor/plating,
-/area/maintenance/consarea)
-"cwI" = (
-/turf/simulated/floor/plating,
-/area/maintenance/consarea)
+/area/maintenance/apmaint)
"cwJ" = (
/obj/structure/disposalpipe/segment,
-/obj/structure/extinguisher_cabinet{
- pixel_x = -27;
- pixel_y = 1
- },
/obj/machinery/light{
dir = 8
},
+/obj/structure/extinguisher_cabinet{
+ pixel_x = -27
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "cautioncorner"
@@ -61487,8 +59369,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/manifold/visible{
dir = 8
@@ -61499,8 +59380,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,
@@ -61515,33 +59395,34 @@
/turf/simulated/floor/plating,
/area/storage/tech)
"cwP" = (
-/obj/structure/cable{
- d2 = 2;
- icon_state = "0-2";
- pixel_y = 1
- },
/obj/structure/cable{
d2 = 4;
icon_state = "0-4"
},
+/obj/structure/cable{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
/area/storage/tech)
"cwQ" = (
/obj/structure/cable{
- d2 = 4;
- icon_state = "0-4"
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
+ },
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
},
/obj/structure/cable{
d2 = 8;
icon_state = "0-8"
},
/obj/effect/spawner/window/reinforced,
-/obj/structure/cable{
- d2 = 2;
- icon_state = "0-2";
- pixel_y = 1
- },
/turf/simulated/floor/plating,
/area/storage/tech)
"cwR" = (
@@ -61550,21 +59431,12 @@
/area/engine/controlroom)
"cwS" = (
/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2";
- tag = ""
- },
-/obj/structure/cable{
- d1 = 1;
+ d1 = 2;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "2-8"
},
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/construction)
+/turf/simulated/floor/plating/airless,
+/area/space)
"cwT" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -61582,8 +59454,9 @@
icon_state = "0-4"
},
/obj/structure/cable{
+ d1 = 4;
d2 = 8;
- icon_state = "0-8"
+ icon_state = "4-8"
},
/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
@@ -61600,8 +59473,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plating,
/area/storage/tech)
@@ -61613,12 +59485,10 @@
},
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/turf/simulated/floor/plasteel{
dir = 1;
@@ -61633,7 +59503,7 @@
dir = 4
},
/turf/simulated/floor/plating,
-/area/maintenance/genetics)
+/area/maintenance/asmaint)
"cxa" = (
/obj/machinery/light/small,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -61643,7 +59513,7 @@
dir = 4
},
/turf/simulated/floor/plating,
-/area/maintenance/genetics)
+/area/maintenance/asmaint)
"cxb" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
@@ -61652,21 +59522,20 @@
dir = 10
},
/turf/simulated/floor/plating,
-/area/maintenance/genetics)
+/area/maintenance/asmaint)
"cxc" = (
/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{
name = "E.X.P.E.R.I-MENTOR Lab Maintenance";
req_access_txt = "47"
},
/turf/simulated/floor/plating,
-/area/maintenance/genetics)
+/area/maintenance/asmaint)
"cxd" = (
/obj/structure/chair{
dir = 8
@@ -61674,8 +59543,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel,
/area/engine/controlroom)
@@ -61693,12 +59561,16 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/turf/simulated/floor/plasteel,
/area/engine/controlroom)
"cxg" = (
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/obj/machinery/computer/general_air_control{
frequency = 1441;
name = "Tank Monitor";
@@ -61727,8 +59599,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/disposalpipe/segment{
dir = 4
@@ -61743,15 +59614,15 @@
},
/area/medical/medbay2)
"cxk" = (
-/obj/structure/cable{
- d2 = 4;
- icon_state = "0-4"
- },
/obj/machinery/power/apc{
dir = 8;
name = "west bump";
pixel_x = -24
},
+/obj/structure/cable{
+ d2 = 2;
+ icon_state = "0-2"
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -61761,18 +59632,15 @@
dir = 4
},
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cxm" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/construction)
+/turf/simulated/floor/plating/airless,
+/area/space/nearstation)
"cxn" = (
/obj/machinery/atmospherics/unary/tank/air{
dir = 8
@@ -61780,7 +59648,7 @@
/obj/effect/decal/warning_stripes/northeast,
/obj/effect/spawner/random_spawners/cobweb_right_frequent,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cxo" = (
/obj/item/radio/intercom{
pixel_x = 28
@@ -61795,7 +59663,7 @@
/obj/effect/decal/warning_stripes/north,
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cxq" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -61807,6 +59675,11 @@
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 8
},
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel,
/area/engine/controlroom)
"cxs" = (
@@ -61828,10 +59701,10 @@
},
/area/medical/virology)
"cxu" = (
-/obj/structure/closet/wardrobe/virology_white,
/obj/machinery/light{
dir = 4
},
+/obj/machinery/vending/virodrobe,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "whitegreen"
@@ -61841,12 +59714,16 @@
/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
},
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
/turf/simulated/floor/plasteel,
/area/engine/controlroom)
"cxw" = (
@@ -61859,7 +59736,7 @@
"cxx" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/firealarm{
- dir = 8;
+ dir = 4;
pixel_x = 24
},
/turf/simulated/floor/plasteel{
@@ -61873,7 +59750,7 @@
/obj/item/flashlight/lamp/green,
/obj/machinery/alarm{
dir = 4;
- pixel_x = -23
+ pixel_x = -24
},
/turf/simulated/floor/carpet,
/area/medical/psych)
@@ -61885,12 +59762,6 @@
/obj/machinery/light{
dir = 4
},
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2";
- tag = ""
- },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -61906,31 +59777,24 @@
/area/medical/psych)
"cxC" = (
/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2";
- tag = ""
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
},
/obj/machinery/computer/general_air_control{
+ dir = 8;
frequency = 1443;
level = 3;
name = "Distribution and Waste Monitor";
sensors = list("mair_in_meter" = "Mixed Air In", "air_sensor" = "Mixed Air Supply Tank", "mair_out_meter" = "Mixed Air Out", "dloop_atm_meter" = "Distribution Loop", "wloop_atm_meter" = "Waste Loop")
},
-/obj/structure/cable{
- d1 = 2;
- d2 = 8;
- icon_state = "2-8";
- tag = ""
- },
/turf/simulated/floor/plasteel,
/area/atmos/control)
"cxD" = (
/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
@@ -61939,7 +59803,7 @@
dir = 4
},
/turf/simulated/floor/plating,
-/area/maintenance/genetics)
+/area/maintenance/asmaint)
"cxE" = (
/obj/machinery/atmospherics/binary/valve{
dir = 4
@@ -61947,7 +59811,7 @@
/obj/effect/decal/warning_stripes/south,
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cxF" = (
/obj/structure/bed,
/obj/machinery/status_display{
@@ -61982,21 +59846,18 @@
icon_state = "2-4"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/turf/simulated/floor/plating,
-/area/maintenance/genetics)
+/area/maintenance/asmaint)
"cxK" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/sign/securearea{
pixel_y = 32
@@ -62008,7 +59869,7 @@
dir = 4
},
/turf/simulated/floor/plating,
-/area/maintenance/genetics)
+/area/maintenance/asmaint)
"cxL" = (
/obj/structure/table,
/obj/item/storage/box/donkpockets,
@@ -62026,23 +59887,8 @@
/turf/simulated/wall,
/area/toxins/xenobiology)
"cxO" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8";
- tag = ""
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/turf/simulated/floor/plating,
-/area/maintenance/genetics)
+/turf/simulated/wall/r_wall,
+/area/maintenance/aft)
"cxP" = (
/obj/structure/chair/stool,
/turf/simulated/floor/plasteel{
@@ -62053,14 +59899,12 @@
/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{
dir = 1;
@@ -62073,13 +59917,12 @@
dir = 4
},
/turf/simulated/floor/plating,
-/area/maintenance/genetics)
+/area/maintenance/asmaint)
"cxR" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/light/small{
dir = 1
@@ -62094,7 +59937,7 @@
dir = 4
},
/turf/simulated/floor/plating,
-/area/maintenance/genetics)
+/area/maintenance/asmaint)
"cxS" = (
/obj/effect/decal/cleanable/fungus,
/turf/simulated/wall,
@@ -62103,8 +59946,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/disposalpipe/segment{
dir = 4
@@ -62139,12 +59981,10 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/light{
- dir = 1;
- in_use = 1
+ dir = 1
},
/obj/structure/disposalpipe/segment{
dir = 4
@@ -62243,25 +60083,28 @@
/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;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/binary/valve,
/turf/simulated/floor/plating,
@@ -62283,7 +60126,7 @@
},
/obj/structure/closet/emcloset,
/obj/machinery/alarm{
- pixel_y = 23
+ pixel_y = 24
},
/obj/machinery/atmospherics/pipe/simple/visible{
dir = 4
@@ -62306,8 +60149,8 @@
dir = 1
},
/obj/effect/spawner/lootdrop/maintenance{
- lootcount = 3;
- name = "3maintenance loot spawner"
+ lootcount = 2;
+ name = "2maintenance loot spawner"
},
/turf/simulated/floor/plating,
/area/maintenance/apmaint)
@@ -62318,12 +60161,12 @@
/turf/simulated/floor/plating,
/area/storage/tech)
"cyr" = (
-/obj/structure/cable{
- d2 = 2;
- icon_state = "0-2";
- pixel_y = 1
- },
/obj/structure/cable,
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
/area/storage/tech)
@@ -62334,8 +60177,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel,
/area/storage/tech)
@@ -62382,8 +60224,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/item/circuitboard/circuit_imprinter{
pixel_x = -4;
@@ -62392,8 +60233,8 @@
/turf/simulated/floor/plating,
/area/storage/tech)
"cyx" = (
-/obj/machinery/computer/guestpass,
/obj/structure/table,
+/obj/machinery/computer/guestpass,
/turf/simulated/floor/plasteel,
/area/engine/controlroom)
"cyy" = (
@@ -62415,6 +60256,11 @@
/obj/structure/chair/office/dark{
dir = 4
},
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel,
/area/engine/controlroom)
"cyA" = (
@@ -62436,12 +60282,10 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/light{
- dir = 1;
- in_use = 1
+ dir = 1
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -62457,14 +60301,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/disposalpipe/junction{
dir = 1;
@@ -62487,19 +60329,17 @@
req_access_txt = "5"
},
/turf/simulated/floor/plating,
-/area/maintenance/genetics)
+/area/maintenance/asmaint)
"cyF" = (
/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/machinery/atmospherics/pipe/simple/visible/universal,
/turf/simulated/floor/plating,
@@ -62507,6 +60347,16 @@
"cyG" = (
/obj/structure/table,
/obj/item/t_scanner,
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "caution"
@@ -62516,6 +60366,11 @@
/obj/machinery/light{
dir = 8
},
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -62524,25 +60379,25 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 9
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 4;
- initialize_directions = 11
+ dir = 4
},
/turf/simulated/floor/plating,
/area/maintenance/asmaint2)
"cyJ" = (
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cyK" = (
/obj/structure/table/wood,
-/obj/machinery/computer/med_data/laptop,
+/obj/machinery/computer/med_data/laptop{
+ dir = 1
+ },
/turf/simulated/floor/carpet,
/area/medical/psych)
"cyL" = (
@@ -62572,7 +60427,7 @@
name = "3maintenance loot spawner"
},
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cyO" = (
/obj/structure/lattice/catwalk,
/turf/space,
@@ -62580,26 +60435,28 @@
"cyP" = (
/obj/effect/spawner/random_barrier/obstruction,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cyQ" = (
/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
+ },
+/obj/machinery/computer/atmos_alert{
+ dir = 8
},
-/obj/machinery/computer/atmos_alert,
/turf/simulated/floor/plasteel,
/area/atmos/control)
"cyR" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8";
- tag = ""
+/obj/structure/disposalpipe/segment{
+ dir = 1;
+ icon_state = "pipe-c"
},
-/turf/simulated/floor/plating,
-/area/maintenance/asmaint2)
+/turf/simulated/floor/plasteel,
+/area/hallway/primary/aft)
"cyS" = (
/obj/machinery/door/airlock/atmos{
name = "Atmospherics Maintenance";
@@ -62607,7 +60464,7 @@
},
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cyT" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/research{
@@ -62703,13 +60560,12 @@
"czb" = (
/obj/item/instrument/saxophone,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"czc" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/mob/living/simple_animal/mouse,
/turf/simulated/floor/plating,
@@ -62718,18 +60574,16 @@
/obj/structure/cable{
d1 = 1;
d2 = 4;
- icon_state = "1-4";
- tag = ""
+ icon_state = "1-4"
},
/obj/structure/grille/broken,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cze" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/remains/robot,
/turf/simulated/floor/plating,
@@ -62737,7 +60591,7 @@
"czf" = (
/obj/effect/spawner/random_spawners/grille_often,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"czg" = (
/obj/structure/table,
/obj/effect/spawner/lootdrop/maintenance,
@@ -62746,11 +60600,11 @@
},
/obj/effect/spawner/random_spawners/cobweb_right_frequent,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"czh" = (
/obj/structure/chair,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"czi" = (
/obj/structure/table/reinforced,
/obj/structure/window/reinforced{
@@ -62762,14 +60616,14 @@
name = "3maintenance loot spawner"
},
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"czj" = (
/obj/structure/chair,
/obj/machinery/light{
dir = 1
},
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"czk" = (
/obj/structure/closet/crate,
/obj/item/coin/silver,
@@ -62778,24 +60632,22 @@
/obj/item/poster/random_contraband,
/obj/item/poster/random_contraband,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"czl" = (
/obj/effect/decal/cleanable/cobweb2,
/obj/effect/spawner/random_barrier/obstruction,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"czm" = (
/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/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -62806,8 +60658,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/landmark{
name = "xeno_spawn";
@@ -62821,7 +60672,7 @@
"czo" = (
/obj/item/tank/internals/oxygen,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"czp" = (
/obj/structure/table/reinforced,
/obj/effect/spawner/lootdrop/maintenance{
@@ -62829,26 +60680,26 @@
name = "2maintenance loot spawner"
},
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"czq" = (
/turf/simulated/floor/plasteel,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"czr" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/spawner/random_spawners/blood_maybe,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"czs" = (
/obj/effect/decal/cleanable/ash,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"czt" = (
/obj/structure/reagent_dispensers/watertank,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "caution"
},
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"czu" = (
/obj/structure/rack,
/obj/item/storage/belt/utility,
@@ -62856,13 +60707,12 @@
dir = 4;
icon_state = "caution"
},
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"czv" = (
/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
@@ -62873,8 +60723,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/landmark{
name = "blobstart"
@@ -62892,8 +60741,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/disposalpipe/segment{
dir = 4
@@ -62910,8 +60758,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 = 5
@@ -62925,18 +60772,15 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 4;
- initialize_directions = 11
+ dir = 4
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 4
@@ -62948,8 +60792,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
@@ -62984,12 +60827,6 @@
c_tag = "Engineering Construction Area";
dir = 8
},
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2";
- tag = ""
- },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -63024,7 +60861,7 @@
/area/maintenance/incinerator)
"czI" = (
/obj/structure/sink{
- pixel_y = 32
+ pixel_y = 25
},
/obj/machinery/light{
dir = 1
@@ -63053,15 +60890,10 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/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
@@ -63093,8 +60925,7 @@
"czR" = (
/obj/structure/cable{
d2 = 2;
- icon_state = "0-2";
- pixel_y = 1
+ icon_state = "0-2"
},
/obj/machinery/power/apc{
dir = 4;
@@ -63109,14 +60940,12 @@
/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";
- tag = ""
+ icon_state = "1-4"
},
/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel,
@@ -63147,8 +60976,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plating,
/area/storage/tech)
@@ -63156,8 +60984,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{
@@ -63169,7 +60996,7 @@
"czW" = (
/obj/machinery/alarm{
dir = 4;
- pixel_x = -22
+ pixel_x = -24
},
/obj/structure/sink{
dir = 8;
@@ -63196,7 +61023,7 @@
dir = 6
},
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"czY" = (
/obj/machinery/door/poddoor{
density = 0;
@@ -63216,7 +61043,7 @@
dir = 4
},
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"czZ" = (
/obj/effect/decal/warning_stripes/west,
/obj/structure/cable{
@@ -63226,12 +61053,10 @@
},
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 4;
- initialize_directions = 11
+ dir = 4
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 4;
- initialize_directions = 11
+ dir = 4
},
/turf/simulated/floor/plasteel{
icon_state = "white"
@@ -63240,18 +61065,17 @@
"cAa" = (
/obj/effect/spawner/random_spawners/blood_maybe,
/turf/simulated/floor/plating,
-/area/maintenance/genetics)
+/area/maintenance/asmaint)
"cAb" = (
/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,
/turf/simulated/floor/plating,
-/area/maintenance/genetics)
+/area/maintenance/asmaint)
"cAc" = (
/obj/structure/rack,
/obj/effect/spawner/lootdrop/maintenance{
@@ -63259,15 +61083,15 @@
name = "3maintenance loot spawner"
},
/turf/simulated/floor/plating,
-/area/maintenance/genetics)
+/area/maintenance/asmaint)
"cAd" = (
/obj/item/flashlight,
/turf/simulated/floor/plating,
-/area/maintenance/genetics)
+/area/maintenance/asmaint)
"cAe" = (
-/obj/machinery/meter,
+/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
-/area/maintenance/genetics)
+/area/maintenance/aft)
"cAf" = (
/obj/machinery/door/firedoor,
/turf/simulated/floor/plasteel{
@@ -63275,7 +61099,9 @@
},
/area/toxins/xenobiology)
"cAg" = (
-/obj/machinery/computer/atmos_alert,
+/obj/machinery/computer/atmos_alert{
+ dir = 1
+ },
/turf/simulated/floor/plasteel{
dir = 6;
icon_state = "caution"
@@ -63283,6 +61109,7 @@
/area/engine/controlroom)
"cAh" = (
/obj/machinery/computer/general_air_control{
+ dir = 1;
frequency = 1443;
level = 3;
name = "Distribution and Waste Monitor";
@@ -63294,8 +61121,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door/firedoor,
/obj/structure/disposalpipe/segment,
@@ -63313,13 +61139,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/atmospherics/pipe/manifold/hidden/supply{
- dir = 4;
- initialize_directions = 11
+ dir = 4
},
/turf/simulated/floor/plasteel,
/area/hallway/primary/aft)
@@ -63337,8 +61161,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
@@ -63347,7 +61170,7 @@
dir = 4
},
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cAn" = (
/obj/machinery/atmospherics/unary/vent_pump/on,
/turf/simulated/floor/plasteel{
@@ -63355,16 +61178,12 @@
},
/area/construction)
"cAo" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2";
- tag = ""
- },
+/obj/machinery/vending/coffee,
/turf/simulated/floor/plasteel{
- icon_state = "dark"
+ dir = 1;
+ icon_state = "yellowcorner"
},
-/area/construction)
+/area/hallway/primary/aft)
"cAp" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/turf/simulated/floor/plasteel{
@@ -63402,8 +61221,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
@@ -63411,8 +61229,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
@@ -63429,13 +61246,11 @@
icon_state = "1-4"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -63445,11 +61260,11 @@
"cAu" = (
/obj/effect/spawner/random_spawners/grille_maybe,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cAv" = (
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cAw" = (
/obj/structure/table/reinforced,
/obj/structure/window/reinforced{
@@ -63465,7 +61280,7 @@
name = "2maintenance loot spawner"
},
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cAx" = (
/obj/structure/table/reinforced,
/obj/structure/window/reinforced,
@@ -63476,7 +61291,7 @@
name = "2maintenance loot spawner"
},
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cAy" = (
/obj/structure/table/reinforced,
/obj/item/shard{
@@ -63489,27 +61304,27 @@
name = "2maintenance loot spawner"
},
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cAz" = (
/obj/effect/spawner/random_barrier/possibly_welded_airlock,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cAA" = (
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "caution"
},
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cAB" = (
/obj/structure/reagent_dispensers/watertank,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cAC" = (
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "caution"
},
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cAD" = (
/obj/structure/sign/securearea,
/turf/simulated/wall/r_wall,
@@ -63518,17 +61333,7 @@
/obj/structure/closet,
/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)
+/area/maintenance/asmaint)
"cAG" = (
/obj/machinery/door/airlock/maintenance{
req_access_txt = "12"
@@ -63536,8 +61341,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
@@ -63547,24 +61351,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{
@@ -63572,7 +61358,7 @@
icon_state = "pipe-c"
},
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cAJ" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 1
@@ -63597,14 +61383,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,
@@ -63736,14 +61520,25 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/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 = 2;
+ name = "2maintenance loot spawner"
},
/turf/simulated/floor/plating,
/area/maintenance/apmaint)
@@ -63765,9 +61560,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";
@@ -63828,25 +61626,24 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/light_switch{
- pixel_x = 27
+ dir = 8;
+ pixel_x = 24
},
/turf/simulated/floor/plasteel{
icon_state = "floorgrime"
},
/area/maintenance/incinerator)
"cBo" = (
-/obj/machinery/light/small{
- dir = 4
- },
+/obj/machinery/hydroponics/soil,
/turf/simulated/floor/plating,
/area/maintenance/apmaint)
"cBp" = (
/obj/machinery/light_switch{
- pixel_x = 27
+ dir = 8;
+ pixel_x = 24
},
/turf/simulated/floor/plating,
/area/storage/tech)
@@ -63854,8 +61651,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel,
/area/storage/tech)
@@ -63958,8 +61754,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"
@@ -63988,8 +61783,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door/poddoor{
density = 0;
@@ -64031,7 +61825,7 @@
/obj/structure/disposalpipe/segment,
/obj/machinery/alarm{
dir = 4;
- pixel_x = -22
+ pixel_x = -24
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -64040,8 +61834,7 @@
/area/hallway/primary/aft)
"cBF" = (
/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
- dir = 6;
- level = 2
+ dir = 6
},
/turf/simulated/wall,
/area/engine/controlroom)
@@ -64052,34 +61845,32 @@
dir = 4
},
/turf/simulated/floor/plating,
-/area/maintenance/genetics)
+/area/maintenance/asmaint)
"cBH" = (
/obj/structure/table,
/obj/effect/spawner/lootdrop/maintenance,
/obj/effect/decal/cleanable/cobweb2,
/turf/simulated/floor/plating,
-/area/maintenance/genetics)
+/area/maintenance/asmaint)
"cBI" = (
/obj/structure/table,
/obj/item/clothing/under/color/grey,
/obj/machinery/light/small{
- dir = 4;
- pixel_y = 8
+ dir = 4
},
/turf/simulated/floor/plating,
-/area/maintenance/genetics)
+/area/maintenance/asmaint)
"cBJ" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 1;
- initialize_directions = 11
+ dir = 1
},
/turf/simulated/floor/plasteel,
/area/engine/controlroom)
"cBK" = (
/obj/effect/spawner/random_spawners/fungus_maybe,
/turf/simulated/wall/r_wall,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cBL" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -64093,17 +61884,17 @@
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cBN" = (
/obj/structure/reagent_dispensers/fueltank,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cBO" = (
/obj/item/shard{
icon_state = "medium"
},
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cBP" = (
/turf/simulated/wall/r_wall,
/area/maintenance/asmaint)
@@ -64123,7 +61914,7 @@
dir = 1
},
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cBU" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -64141,7 +61932,7 @@
/turf/simulated/floor/plasteel{
icon_state = "caution"
},
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cBW" = (
/obj/structure/table,
/obj/item/storage/toolbox/mechanical{
@@ -64152,13 +61943,13 @@
/turf/simulated/floor/plasteel{
icon_state = "caution"
},
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cBX" = (
/obj/structure/reagent_dispensers/fueltank,
/turf/simulated/floor/plasteel{
icon_state = "caution"
},
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cBY" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -64198,30 +61989,30 @@
},
/area/toxins/misc_lab)
"cCd" = (
-/obj/structure/closet/bombcloset,
/obj/machinery/light_switch{
- pixel_x = -23
+ dir = 4;
+ pixel_x = -24
},
+/obj/structure/closet/bombcloset,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
/area/toxins/misc_lab)
"cCe" = (
-/obj/structure/closet/secure_closet/scientist,
/obj/machinery/light{
- dir = 1;
- on = 1
+ dir = 1
},
+/obj/machinery/vending/scidrobe,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
/area/toxins/misc_lab)
"cCf" = (
-/obj/structure/closet/secure_closet/scientist,
/obj/machinery/camera{
c_tag = "Research Test Lab West";
network = list("Research","SS13")
},
+/obj/structure/closet/secure_closet/scientist,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -64229,8 +62020,7 @@
"cCg" = (
/obj/structure/cable{
d2 = 2;
- icon_state = "0-2";
- pixel_y = 1
+ icon_state = "0-2"
},
/obj/machinery/disposal,
/obj/structure/disposalpipe/trunk,
@@ -64263,8 +62053,7 @@
/obj/structure/reagent_dispensers/watertank,
/obj/effect/decal/warning_stripes/yellow,
/obj/machinery/light{
- dir = 1;
- on = 1
+ dir = 1
},
/obj/machinery/status_display{
layer = 4;
@@ -64297,8 +62086,7 @@
/area/toxins/misc_lab)
"cCl" = (
/obj/machinery/light{
- dir = 1;
- on = 1
+ dir = 1
},
/obj/structure/disaster_counter/scichem{
pixel_y = 32
@@ -64312,7 +62100,7 @@
/obj/machinery/chem_master,
/obj/item/radio/intercom{
dir = 1;
- pixel_y = 25
+ pixel_y = 28
},
/turf/simulated/floor/plasteel{
dir = 5;
@@ -64333,51 +62121,44 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
- },
-/obj/structure/cable{
- d1 = 1;
- d2 = 4;
- icon_state = "1-4";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plating,
/area/maintenance/asmaint2)
"cCp" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8";
- tag = ""
+/obj/machinery/door/airlock/maintenance{
+ req_access_txt = "12"
},
-/turf/simulated/wall/r_wall,
-/area/maintenance/asmaint2)
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/structure/disposalpipe/segment,
+/turf/simulated/floor/plating,
+/area/maintenance/aft2)
"cCq" = (
/turf/simulated/floor/engine,
/area/maintenance/incinerator)
"cCr" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8";
- tag = ""
+/obj/structure/disposalpipe/segment,
+/obj/machinery/light,
+/obj/structure/table,
+/obj/item/storage/toolbox/mechanical,
+/turf/simulated/floor/plasteel{
+ icon_state = "yellowcorner"
},
-/obj/structure/closet/emcloset,
-/turf/simulated/floor/plating,
-/area/maintenance/asmaint2)
+/area/hallway/primary/aft)
"cCs" = (
/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8";
- tag = ""
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
},
/turf/simulated/floor/plating/airless,
/area/space/nearstation)
@@ -64391,8 +62172,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/turf/simulated/floor/plating/airless,
/area/toxins/test_area)
@@ -64403,8 +62183,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plating/airless,
/area/toxins/test_area)
@@ -64419,7 +62198,6 @@
autoclose = 0;
frequency = 1449;
heat_proof = 1;
- icon_state = "door_locked";
id_tag = "incinerator_airlock_exterior";
locked = 1;
name = "Mixing Room Exterior Airlock";
@@ -64439,7 +62217,6 @@
autoclose = 0;
frequency = 1449;
heat_proof = 1;
- icon_state = "door_locked";
id_tag = "incinerator_airlock_interior";
locked = 1;
name = "Mixing Room Interior Airlock";
@@ -64462,12 +62239,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";
@@ -64483,8 +62254,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{
@@ -64497,8 +62267,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 4;
- icon_state = "1-4";
- tag = ""
+ icon_state = "1-4"
},
/turf/simulated/floor/plasteel{
icon_state = "floorgrime"
@@ -64508,32 +62277,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 = ""
- },
-/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 = ""
+ icon_state = "2-8"
},
/turf/simulated/floor/plating,
/area/maintenance/apmaint)
@@ -64541,8 +62290,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{
@@ -64596,21 +62344,30 @@
d2 = 4;
icon_state = "0-4"
},
-/obj/structure/cable,
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
/area/storage/tech)
"cCN" = (
/obj/structure/cable{
- d2 = 4;
- icon_state = "0-4"
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
},
/obj/structure/cable{
d2 = 8;
icon_state = "0-8"
},
/obj/effect/spawner/window/reinforced,
-/obj/structure/cable,
/turf/simulated/floor/plating,
/area/storage/tech)
"cCO" = (
@@ -64624,12 +62381,6 @@
/turf/simulated/floor/plating,
/area/storage/tech)
"cCP" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2";
- tag = ""
- },
/obj/machinery/alarm{
dir = 8;
pixel_x = 24
@@ -64650,8 +62401,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
@@ -64670,8 +62420,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
@@ -64687,23 +62436,19 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 1;
d2 = 4;
- icon_state = "1-4";
- tag = ""
+ icon_state = "1-4"
},
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/turf/simulated/floor/plasteel{
icon_state = "white"
@@ -64713,8 +62458,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
@@ -64734,8 +62478,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{
@@ -64756,8 +62499,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{
@@ -64771,8 +62513,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
@@ -64798,8 +62539,7 @@
/area/engine/controlroom)
"cDb" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 1;
- initialize_directions = 11
+ dir = 1
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -64810,7 +62550,8 @@
/area/toxins/misc_lab)
"cDc" = (
/obj/machinery/light_switch{
- pixel_x = -23
+ dir = 4;
+ pixel_x = -24
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -64820,15 +62561,13 @@
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/obj/structure/disposalpipe/segment,
/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
@@ -64860,18 +62599,15 @@
/obj/item/healthanalyzer,
/obj/effect/spawner/lootdrop/maintenance,
/turf/simulated/floor/plating,
-/area/maintenance/genetics)
+/area/maintenance/asmaint)
"cDh" = (
/obj/structure/table,
/obj/item/pda,
/turf/simulated/floor/plating,
-/area/maintenance/genetics)
+/area/maintenance/asmaint)
"cDi" = (
-/obj/machinery/light_switch{
- pixel_y = 27
- },
/obj/machinery/alarm{
- pixel_y = 23
+ pixel_y = 24
},
/turf/simulated/floor/plasteel{
dir = 1;
@@ -64892,7 +62628,7 @@
},
/obj/item/radio/intercom{
dir = 1;
- pixel_y = 25
+ pixel_y = 28
},
/obj/machinery/atmospherics/binary/volume_pump/on{
dir = 8;
@@ -64908,8 +62644,7 @@
},
/obj/structure/cable{
d2 = 2;
- icon_state = "0-2";
- pixel_y = 1
+ icon_state = "0-2"
},
/obj/machinery/power/apc{
dir = 1;
@@ -64922,20 +62657,20 @@
"cDm" = (
/obj/effect/spawner/random_spawners/fungus_maybe,
/turf/simulated/wall,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cDn" = (
/obj/effect/spawner/random_barrier/floor_probably,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cDo" = (
/obj/structure/table,
/obj/effect/spawner/lootdrop/maintenance,
/turf/simulated/floor/plating,
-/area/maintenance/genetics)
+/area/maintenance/asmaint)
"cDp" = (
/obj/item/lipstick/jade,
/turf/simulated/floor/plating,
-/area/maintenance/genetics)
+/area/maintenance/asmaint)
"cDq" = (
/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
@@ -64953,8 +62688,7 @@
/area/toxins/misc_lab)
"cDs" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 10;
- initialize_directions = 10
+ dir = 10
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -64981,8 +62715,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{
@@ -65062,8 +62795,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{
@@ -65086,7 +62818,7 @@
/obj/machinery/hologram/holopad,
/obj/machinery/vending/wallmed{
name = "Emergency NanoMed";
- pixel_y = -32
+ pixel_y = -28
},
/obj/machinery/atmospherics/pipe/simple/hidden/universal{
dir = 4
@@ -65117,15 +62849,16 @@
},
/area/toxins/misc_lab)
"cDI" = (
-/obj/machinery/computer/drone_control,
+/obj/machinery/computer/drone_control{
+ dir = 1
+ },
/turf/simulated/floor/plasteel,
/area/engine/controlroom)
"cDJ" = (
/obj/structure/cable{
d1 = 1;
d2 = 4;
- icon_state = "1-4";
- tag = ""
+ icon_state = "1-4"
},
/turf/simulated/floor/plating/airless,
/area/toxins/test_area)
@@ -65154,8 +62887,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plating/airless,
/area/toxins/test_area)
@@ -65180,20 +62912,17 @@
},
/area/maintenance/incinerator)
"cDP" = (
-/obj/machinery/atmospherics/unary/vent_pump{
- dir = 4;
- external_pressure_bound = 0;
- icon_state = "in";
- initialize_directions = 1;
- internal_pressure_bound = 4000;
- on = 1;
- pressure_checks = 2;
- pump_direction = 0
+/obj/machinery/atmospherics/unary/passive_vent{
+ dir = 4
},
/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" = (
@@ -65209,15 +62938,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;
@@ -65289,21 +63021,10 @@
},
/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;
- d2 = 2;
- icon_state = "1-2";
- tag = ""
- },
/obj/machinery/light{
dir = 4
},
@@ -65343,7 +63064,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cEg" = (
/obj/structure/cable,
/obj/machinery/power/apc{
@@ -65378,12 +63099,10 @@
/area/hallway/primary/aft)
"cEj" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/turf/simulated/floor/plasteel,
/area/engine/controlroom)
@@ -65400,7 +63119,7 @@
"cEl" = (
/obj/machinery/alarm{
dir = 1;
- pixel_y = -22
+ pixel_y = -24
},
/obj/structure/disposalpipe/segment{
dir = 4
@@ -65418,8 +63137,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/disposalpipe/segment{
dir = 1;
@@ -65427,12 +63145,10 @@
},
/obj/effect/decal/warning_stripes/south,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 4;
- initialize_directions = 11
+ dir = 4
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/turf/simulated/floor/plasteel{
icon_state = "white"
@@ -65465,13 +63181,13 @@
dir = 1
},
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cEq" = (
/obj/structure/rack,
/obj/effect/spawner/lootdrop/maintenance,
/obj/effect/decal/cleanable/cobweb2,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cEr" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -65502,64 +63218,77 @@
},
/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/aft2)
+"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/aft2)
"cEx" = (
/obj/effect/spawner/random_spawners/fungus_probably,
/turf/simulated/wall,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cEy" = (
/obj/machinery/light/small{
dir = 8
},
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cEz" = (
/obj/structure/table,
/obj/item/poster/random_contraband,
/obj/effect/spawner/lootdrop/maintenance,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cEA" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/table,
/obj/item/clothing/gloves/color/black,
/obj/effect/spawner/lootdrop/maintenance,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cEB" = (
/obj/structure/table,
/obj/item/pen/fancy,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cEC" = (
/obj/structure/grille,
/obj/structure/barricade/wooden,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cED" = (
/obj/item/flag/med,
/turf/simulated/floor/plating,
-/area/maintenance/genetics)
+/area/maintenance/asmaint)
"cEE" = (
/obj/structure/table,
/obj/item/roller,
/turf/simulated/floor/plating,
-/area/maintenance/genetics)
+/area/maintenance/asmaint)
"cEF" = (
/obj/structure/table,
/obj/item/poster/random_contraband,
/turf/simulated/floor/plating,
-/area/maintenance/genetics)
+/area/maintenance/asmaint)
"cEG" = (
/obj/structure/barricade/wooden,
/turf/simulated/floor/plating,
@@ -65570,127 +63299,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/aft2)
+"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/aft2)
+"cEK" = (
+/turf/simulated/floor/wood,
+/area/maintenance/aft2)
+"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/aft2)
+"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/aft2)
"cES" = (
/obj/item/clothing/mask/cigarette,
/turf/simulated/floor/plating/airless,
@@ -65699,65 +63338,6 @@
/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)
"cFa" = (
/turf/simulated/wall/r_wall,
/area/hallway/primary/aft)
@@ -65772,25 +63352,18 @@
/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,
/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)
@@ -65799,29 +63372,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/aft2)
"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/aft2)
"cFh" = (
/obj/machinery/atmospherics/unary/portables_connector{
dir = 4
@@ -65839,15 +63398,12 @@
/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/aft2)
"cFj" = (
/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
- dir = 9;
- level = 2
+ dir = 9
},
/turf/simulated/wall,
/area/engine/controlroom)
@@ -65855,26 +63411,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/aft2)
"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/aft2)
"cFm" = (
/obj/structure/table,
/obj/item/multitool,
@@ -65897,12 +63445,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/aft2)
"cFp" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -65911,12 +63460,12 @@
dir = 4
},
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cFq" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/spawner/random_spawners/grille_maybe,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cFr" = (
/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel{
@@ -65928,7 +63477,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/effect/spawner/random_spawners/oil_maybe,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cFt" = (
/obj/structure/disposalpipe/segment{
dir = 2;
@@ -65953,21 +63502,15 @@
/turf/simulated/floor/plasteel,
/area/engine/controlroom)
"cFv" = (
-/obj/machinery/light/small{
- dir = 4;
- pixel_y = 8
+/obj/machinery/alarm{
+ dir = 1;
+ pixel_y = -24
},
-/turf/simulated/floor/plating,
-/area/maintenance/genetics)
-"cFw" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2";
- tag = ""
+/obj/item/twohanded/required/kirbyplants,
+/turf/simulated/floor/plasteel{
+ icon_state = "yellowcorner"
},
-/turf/simulated/wall/r_wall,
-/area/atmos/control)
+/area/hallway/primary/aft)
"cFx" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
@@ -66011,19 +63554,10 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cFB" = (
/turf/simulated/floor/carpet,
/area/medical/psych)
-"cFC" = (
-/obj/effect/spawner/window/reinforced,
-/obj/structure/cable{
- d2 = 2;
- icon_state = "0-2";
- pixel_y = 1
- },
-/turf/simulated/floor/plating,
-/area/engine/chiefs_office)
"cFD" = (
/obj/machinery/access_button{
command = "cycle_exterior";
@@ -66036,14 +63570,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/research{
autoclose = 0;
frequency = 1379;
- icon_state = "door_locked";
id_tag = "xeno_airlock_exterior";
locked = 1;
name = "Xenobiology External Airlock";
@@ -66059,8 +63591,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 = 1
@@ -66078,8 +63609,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/visible/purple{
dir = 4
@@ -66096,8 +63626,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/visible/purple{
dir = 6
@@ -66114,8 +63643,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 4;
- icon_state = "1-4";
- tag = ""
+ icon_state = "1-4"
},
/obj/machinery/requests_console{
department = "Science";
@@ -66142,8 +63670,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/firealarm{
dir = 1;
@@ -66162,105 +63689,44 @@
},
/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/aft2)
"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/aft2)
"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/aft2)
"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/aft2)
"cFP" = (
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
+/obj/structure/table/wood/poker,
+/obj/effect/spawner/lootdrop/maintenance,
+/turf/simulated/floor/wood{
+ icon_state = "wood-broken5"
},
-/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)
+/area/maintenance/aft2)
"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/aft2)
"cFS" = (
/obj/structure/disposalpipe/segment{
dir = 8;
@@ -66269,27 +63735,19 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
icon_state = "white"
},
/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,
@@ -66309,17 +63767,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/aft2)
"cFY" = (
/obj/structure/window/reinforced,
/obj/structure/window/reinforced{
@@ -66366,29 +63821,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,
@@ -66398,120 +63830,57 @@
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;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
-/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/aft2)
"cGi" = (
-/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)
-"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)
-"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)
-"cGl" = (
/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
+/turf/simulated/wall/r_wall,
+/area/engine/chiefs_office)
+"cGj" = (
+/obj/structure/closet/emcloset,
+/turf/simulated/floor/plating,
+/area/maintenance/aft2)
+"cGk" = (
+/obj/structure/grille,
+/turf/simulated/floor/plating,
+/area/maintenance/aft2)
+"cGl" = (
+/obj/effect/spawner/window/reinforced,
+/obj/structure/cable{
+ d2 = 2;
+ icon_state = "0-2"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/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)
+/turf/simulated/floor/plating,
+/area/engine/chiefs_office)
"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/aft2)
"cGo" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 4;
- initialize_directions = 11
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 4
- },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel,
/area/hallway/primary/aft)
"cGp" = (
@@ -66519,12 +63888,6 @@
dir = 2;
icon_state = "pipe-j2"
},
-/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)
"cGq" = (
@@ -66654,13 +64017,11 @@
/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/manifold/hidden/supply{
- dir = 4;
- initialize_directions = 11
+ dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel{
@@ -66668,60 +64029,32 @@
},
/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/aft2)
"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/aft2)
"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/aft2)
"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/machinery/cell_charger,
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/engine/mechanic_workshop)
+/obj/effect/spawner/lootdrop/maintenance,
+/turf/simulated/floor/plating,
+/area/maintenance/aft2)
"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/aft2)
"cGJ" = (
/obj/machinery/atmospherics/unary/portables_connector{
dir = 4
@@ -66744,29 +64077,11 @@
name = "Psych Office";
req_access_txt = "64"
},
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/disposalpipe/segment,
/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{
@@ -66774,32 +64089,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{
@@ -66830,7 +64119,8 @@
/obj/structure/table,
/obj/item/camera,
/obj/machinery/light_switch{
- pixel_x = 25
+ dir = 8;
+ pixel_x = 24
},
/turf/simulated/floor/plasteel{
icon_state = "floorgrime"
@@ -66850,10 +64140,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" = (
@@ -66861,19 +64151,12 @@
/obj/effect/decal/warning_stripes/white/hollow,
/obj/effect/decal/warning_stripes/northeast,
/obj/item/radio/intercom{
- dir = 0;
pixel_x = -28
},
/turf/simulated/floor/plasteel{
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{
@@ -66898,6 +64181,7 @@
d2 = 8;
icon_state = "4-8"
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
@@ -66911,14 +64195,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 = "90Curve"
+ icon_state = "1-4"
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -66929,14 +64211,12 @@
/obj/structure/cable{
d1 = 1;
d2 = 4;
- icon_state = "1-4";
- tag = ""
+ icon_state = "1-4"
},
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/structure/cable{
d2 = 4;
@@ -66954,29 +64234,23 @@
layer = 4;
pixel_x = 32
},
-/obj/machinery/computer/station_alert,
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
+/obj/machinery/computer/station_alert{
+ dir = 8
+ },
/turf/simulated/floor/plasteel{
dir = 8;
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,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cHe" = (
/obj/structure/closet/secure_closet/personal,
/obj/item/reagent_containers/food/snacks/meat,
@@ -66999,11 +64273,11 @@
/obj/item/kitchen/knife,
/obj/effect/decal/cleanable/cobweb2,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cHf" = (
/obj/machinery/space_heater,
/turf/simulated/floor/plating,
-/area/maintenance/genetics)
+/area/maintenance/asmaint)
"cHg" = (
/obj/structure/disposalpipe/sortjunction{
dir = 2;
@@ -67146,8 +64420,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/turf/simulated/floor/plasteel{
icon_state = "white"
@@ -67168,6 +64441,9 @@
/obj/structure/chair/office/dark{
dir = 1
},
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/atmos/control)
"cHz" = (
@@ -67188,8 +64464,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,
@@ -67198,23 +64473,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/aft2)
"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/aft2)
"cHD" = (
/turf/simulated/floor/plasteel,
/area/hallway/primary/aft)
@@ -67222,32 +64491,13 @@
/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{
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,
@@ -67258,19 +64508,18 @@
},
/turf/simulated/floor/plasteel,
/area/hallway/primary/aft)
-"cHI" = (
+"cHJ" = (
+/obj/structure/disposalpipe/sortjunction{
+ dir = 8;
+ icon_state = "pipe-j2s";
+ name = "Eng Chief Engineer's Office";
+ sortType = 5
+ },
/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"
- },
-/turf/simulated/floor/plasteel,
-/area/hallway/primary/aft)
"cHK" = (
/obj/structure/disposalpipe/segment{
dir = 2;
@@ -67279,25 +64528,21 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/landmark/start{
name = "Civilian"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
/turf/simulated/floor/plasteel,
/area/hallway/primary/aft)
"cHL" = (
-/obj/structure/disposalpipe/sortjunction{
- dir = 2;
- icon_state = "pipe-j2s";
- name = "Eng Chief Engineer's Office";
- sortType = 5
+/obj/structure/disposalpipe/segment{
+ dir = 1;
+ icon_state = "pipe-c"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -67363,17 +64608,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" = (
@@ -67382,12 +64619,15 @@
/turf/simulated/floor/plasteel,
/area/engine/break_room)
"cHT" = (
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
+/obj/effect/spawner/window/reinforced,
+/obj/structure/cable,
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
},
-/turf/simulated/floor/plasteel,
-/area/engine/break_room)
+/turf/simulated/floor/plating,
+/area/engine/engineering)
"cHU" = (
/obj/structure/sign/securearea,
/obj/structure/disposalpipe/segment{
@@ -67403,8 +64643,7 @@
dir = 4
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 1;
- initialize_directions = 11
+ dir = 1
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -67432,40 +64671,41 @@
/turf/simulated/floor/plasteel,
/area/engine/break_room)
"cHY" = (
+/obj/machinery/alarm{
+ pixel_y = 24
+ },
/obj/machinery/computer/general_air_control{
+ dir = 4;
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/alarm{
- pixel_y = 23
- },
/turf/simulated/floor/plasteel,
/area/atmos/control)
"cHZ" = (
/obj/machinery/kitchen_machine/grill,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cIa" = (
/obj/machinery/cooker/deepfryer,
/obj/machinery/light/small{
dir = 1
},
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cIb" = (
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/simulated/wall/r_wall,
-/area/maintenance/genetics)
+/area/maintenance/asmaint)
"cIc" = (
/obj/structure/disposalpipe/segment{
dir = 4;
icon_state = "pipe-c"
},
/turf/simulated/floor/plating,
-/area/maintenance/genetics)
+/area/maintenance/asmaint)
"cId" = (
/obj/structure/chair{
dir = 1
@@ -67480,6 +64720,10 @@
d2 = 8;
icon_state = "4-8"
},
+/obj/structure/disposalpipe/segment{
+ dir = 8;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
@@ -67525,8 +64769,7 @@
dir = 10
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 10;
- initialize_directions = 10
+ dir = 10
},
/turf/simulated/floor/plasteel,
/area/engine/break_room)
@@ -67548,27 +64791,27 @@
/turf/simulated/floor/wood{
icon_state = "wood-broken7"
},
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cIk" = (
/obj/machinery/slot_machine,
/turf/simulated/floor/wood,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cIl" = (
/obj/structure/chair/stool,
/turf/simulated/floor/wood{
icon_state = "wood-broken3"
},
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cIm" = (
/turf/simulated/floor/wood,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cIn" = (
/obj/machinery/vending/cigarette,
/obj/machinery/light/small{
dir = 1
},
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cIo" = (
/obj/structure/table/wood,
/obj/item/ashtray/bronze{
@@ -67576,32 +64819,34 @@
pixel_y = 1
},
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cIp" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on,
+/obj/machinery/atmospherics/pipe/manifold/hidden/cyan{
+ dir = 1
+ },
/turf/simulated/floor/plasteel,
/area/atmos/control)
"cIq" = (
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
-/area/maintenance/genetics)
+/area/maintenance/asmaint)
"cIr" = (
/obj/structure/chair/stool,
/turf/simulated/floor/plating,
-/area/maintenance/genetics)
+/area/maintenance/asmaint)
"cIs" = (
/obj/structure/bed,
/obj/effect/decal/cleanable/cobweb2,
/turf/simulated/floor/plating,
-/area/maintenance/genetics)
+/area/maintenance/asmaint)
"cIt" = (
/obj/machinery/chem_master,
/turf/simulated/floor/plating,
-/area/maintenance/genetics)
+/area/maintenance/asmaint)
"cIu" = (
/obj/machinery/constructable_frame/machine_frame,
/turf/simulated/floor/plating,
-/area/maintenance/genetics)
+/area/maintenance/asmaint)
"cIv" = (
/obj/structure/cable{
d1 = 2;
@@ -67611,12 +64856,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cIw" = (
/obj/effect/spawner/window/reinforced,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable,
/obj/structure/cable{
d1 = 1;
@@ -67641,8 +64883,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/disposalpipe/segment{
dir = 4
@@ -67655,8 +64896,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/machinery/door/airlock/command{
id_tag = "cmoofficedoor";
@@ -67669,9 +64909,6 @@
/area/medical/cmo)
"cIy" = (
/obj/effect/spawner/window/reinforced,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable{
d2 = 8;
icon_state = "0-8"
@@ -67683,7 +64920,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cIA" = (
/obj/structure/extinguisher_cabinet{
pixel_x = 27
@@ -67691,8 +64928,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/machinery/status_display{
layer = 4;
@@ -67720,8 +64956,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 4;
- icon_state = "1-4";
- tag = ""
+ icon_state = "1-4"
},
/obj/structure/closet/firecloset,
/obj/machinery/camera{
@@ -67774,10 +65009,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,
@@ -67789,32 +65020,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/aft2)
"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/aft2)
"cIL" = (
/obj/structure/closet/l3closet/scientist,
/obj/effect/decal/warning_stripes/southeast,
@@ -67822,27 +65035,15 @@
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;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/warning_stripes/south,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 4;
- initialize_directions = 11
+ dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel{
@@ -67865,22 +65066,19 @@
/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/plating,
-/area/maintenance/aft)
+/area/maintenance/aft2)
"cIQ" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2";
- tag = ""
- },
/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel,
/area/assembly/assembly_line)
"cIR" = (
@@ -67890,16 +65088,17 @@
name = "Engineering Main";
sortType = 4
},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/hallway/primary/aft)
"cIS" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel,
/area/hallway/primary/aft)
@@ -67921,8 +65120,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/disposalpipe/trunk{
dir = 8
@@ -67946,21 +65144,13 @@
/obj/structure/chair/comfy/black{
dir = 8
},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 8;
- initialize_directions = 11
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 5
- },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel,
/area/engine/break_room)
"cIY" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
+/obj/machinery/atmospherics/unary/portables_connector{
+ dir = 1
},
/turf/simulated/floor/plasteel,
/area/atmos/control)
@@ -67970,7 +65160,6 @@
},
/area/hallway/primary/central/ne)
"cJa" = (
-/obj/effect/spawner/window/reinforced,
/obj/machinery/door/poddoor{
density = 0;
icon_state = "open";
@@ -67978,22 +65167,11 @@
name = "Atmos Blast Door";
opacity = 0
},
-/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/atmos/control)
"cJb" = (
-/obj/machinery/atmospherics/unary/portables_connector,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 10
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 4
- },
+/obj/machinery/atmospherics/pipe/simple/hidden/universal,
/turf/simulated/floor/plasteel,
/area/atmos/control)
"cJc" = (
@@ -68005,13 +65183,12 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cJd" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/light/small{
dir = 8
@@ -68019,13 +65196,12 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plating,
-/area/maintenance/genetics)
+/area/maintenance/asmaint)
"cJe" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/access_button{
command = "cycle_interior";
@@ -68040,7 +65216,6 @@
/obj/machinery/door/airlock/research{
autoclose = 0;
frequency = 1379;
- icon_state = "door_locked";
id_tag = "xeno_airlock_interior";
locked = 1;
name = "Xenobiology Internal Airlock";
@@ -68052,17 +65227,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{
@@ -68085,65 +65249,25 @@
},
/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;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 8;
+ icon_state = "pipe-c"
},
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 4;
- initialize_directions = 11
+ dir = 4
},
/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;
- icon_state = "0-2";
- pixel_y = 1
+ icon_state = "0-2"
},
/obj/structure/rack{
dir = 8;
@@ -68169,13 +65293,18 @@
/turf/simulated/floor/plasteel,
/area/engine/break_room)
"cJp" = (
-/obj/machinery/computer/atmoscontrol,
+/obj/machinery/computer/atmoscontrol{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/atmos/control)
"cJq" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 5
+ },
/turf/simulated/floor/plasteel,
/area/engine/break_room)
"cJr" = (
@@ -68191,19 +65320,19 @@
/turf/simulated/floor/wood{
icon_state = "wood-broken6"
},
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cJt" = (
/turf/simulated/floor/carpet,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cJu" = (
/obj/effect/spawner/random_spawners/blood_maybe,
/turf/simulated/floor/carpet,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cJv" = (
/turf/simulated/floor/wood{
icon_state = "wood-broken"
},
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cJw" = (
/obj/structure/table,
/obj/structure/window/reinforced{
@@ -68214,7 +65343,7 @@
pixel_y = 6
},
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cJx" = (
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel,
@@ -68235,12 +65364,15 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/atmos/control)
"cJz" = (
/obj/machinery/chem_heater,
/turf/simulated/floor/plating,
-/area/maintenance/genetics)
+/area/maintenance/asmaint)
"cJA" = (
/obj/structure/cable{
d1 = 2;
@@ -68251,7 +65383,7 @@
/obj/item/paper/pamphlet,
/obj/machinery/alarm{
dir = 4;
- pixel_x = -22
+ pixel_x = -24
},
/obj/item/stack/tape_roll,
/obj/machinery/camera/motion{
@@ -68267,7 +65399,9 @@
dir = 8;
pixel_x = -24
},
-/obj/machinery/computer/sm_monitor,
+/obj/machinery/computer/sm_monitor{
+ dir = 1
+ },
/turf/simulated/floor/plasteel,
/area/engine/engineering)
"cJC" = (
@@ -68275,8 +65409,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel,
/area/engine/engineering)
@@ -68284,28 +65417,18 @@
/obj/structure/cable{
d1 = 1;
d2 = 4;
- icon_state = "1-4";
- tag = ""
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
- dir = 9;
- level = 2
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
+ icon_state = "1-4"
},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 1
},
/turf/simulated/floor/plasteel,
/area/atmos/control)
"cJE" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/cyan{
- level = 2
- },
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 5
+ dir = 4
},
/turf/simulated/floor/plasteel,
/area/atmos/control)
@@ -68313,8 +65436,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/door/airlock/maintenance{
name = "Atmospherics Maintenance";
@@ -68327,25 +65449,23 @@
dir = 4
},
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cJG" = (
/obj/machinery/light/small,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cJH" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/hologram/holopad,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 1
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 1;
- initialize_directions = 11
+ dir = 1
},
/turf/simulated/floor/plasteel,
/area/atmos/control)
@@ -68370,8 +65490,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/effect/decal/warning_stripes/southeast,
/turf/simulated/floor/plasteel,
@@ -68392,7 +65511,8 @@
},
/obj/structure/closet/secure_closet/atmos_personal,
/obj/machinery/light_switch{
- pixel_x = -25
+ dir = 4;
+ pixel_x = -24
},
/obj/effect/decal/warning_stripes/northwest,
/turf/simulated/floor/plasteel,
@@ -68401,25 +65521,22 @@
/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"
+ icon_state = "1-4"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cJO" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door/poddoor{
density = 0;
@@ -68453,21 +65570,10 @@
name = "Biohazard Shutter";
opacity = 0
},
-/obj/structure/grille,
-/obj/structure/window/plasmareinforced,
-/obj/structure/window/plasmareinforced{
- dir = 4
- },
-/obj/structure/window/plasmareinforced{
- dir = 1
- },
/obj/machinery/atmospherics/pipe/simple/insulated,
+/obj/effect/spawner/window/reinforced/plasma,
/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;
@@ -68476,71 +65582,16 @@
name = "Biohazard Shutter";
opacity = 0
},
-/obj/structure/grille,
-/obj/structure/window/plasmareinforced,
-/obj/structure/window/plasmareinforced{
- dir = 8
- },
-/obj/structure/window/plasmareinforced{
- dir = 1
- },
+/obj/effect/spawner/window/reinforced/plasma,
/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/aft2)
"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)
@@ -68548,31 +65599,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
+ dir = 1
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"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/aft2)
"cKe" = (
/obj/effect/spawner/window/reinforced,
/obj/structure/disposalpipe/segment,
@@ -68586,8 +65629,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
@@ -68597,13 +65639,12 @@
dir = 4
},
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cKh" = (
/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
@@ -68612,7 +65653,7 @@
dir = 4
},
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cKi" = (
/obj/effect/spawner/random_spawners/oil_maybe,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -68622,7 +65663,7 @@
dir = 4
},
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cKj" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -68632,7 +65673,7 @@
dir = 4
},
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cKk" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/light{
@@ -68652,34 +65693,31 @@
dir = 4
},
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cKm" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 4
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 4;
- initialize_directions = 11
+ dir = 4
},
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cKn" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 1;
- initialize_directions = 11
+ dir = 1
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 1
},
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cKo" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/spawner/random_spawners/blood_maybe,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -68698,14 +65736,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/unary/vent_scrubber/on{
dir = 4
@@ -68719,6 +65755,9 @@
/obj/structure/disposalpipe/trunk{
dir = 8
},
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 6
+ },
/turf/simulated/floor/plasteel,
/area/atmos/control)
"cKs" = (
@@ -68735,8 +65774,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,
@@ -68752,7 +65790,7 @@
},
/obj/machinery/light_switch{
pixel_x = -6;
- pixel_y = 26
+ pixel_y = 24
},
/obj/effect/decal/warning_stripes/northeastcorner,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -68767,13 +65805,13 @@
/obj/structure/table/wood/fancy,
/obj/item/candle,
/turf/simulated/floor/carpet,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cKv" = (
/obj/structure/chair/wood/wings{
dir = 4
},
/turf/simulated/floor/wood,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cKw" = (
/obj/structure/chair/wood/wings{
dir = 8
@@ -68781,7 +65819,7 @@
/turf/simulated/floor/wood{
icon_state = "wood-broken7"
},
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cKx" = (
/obj/machinery/requests_console{
department = "Science";
@@ -68823,27 +65861,32 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
-/obj/machinery/computer/security/engineering,
/obj/machinery/requests_console{
department = "Atmospherics";
departmentType = 3;
name = "Atmospherics Requests Console";
pixel_x = 30
},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 10
+ },
+/obj/machinery/computer/security/engineering{
+ dir = 8
+ },
/turf/simulated/floor/plasteel,
/area/atmos/control)
"cKA" = (
/obj/item/kitchen/utensil/fork,
/turf/simulated/floor/carpet,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cKB" = (
/obj/structure/table,
/obj/item/poster/random_contraband,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cKC" = (
/obj/structure/table,
/obj/structure/window/reinforced{
@@ -68859,43 +65902,40 @@
pixel_y = 4
},
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cKD" = (
/obj/structure/table,
/obj/structure/window/reinforced,
/obj/item/storage/fancy/candle_box/full,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cKE" = (
/obj/effect/decal/cleanable/fungus,
/turf/simulated/wall,
-/area/maintenance/genetics)
+/area/maintenance/asmaint)
"cKF" = (
/obj/structure/rack,
/obj/effect/spawner/lootdrop/maintenance,
/turf/simulated/floor/plating,
-/area/maintenance/genetics)
+/area/maintenance/asmaint)
"cKG" = (
/obj/structure/closet/secure_closet/reagents,
/turf/simulated/floor/plating,
-/area/maintenance/genetics)
+/area/maintenance/asmaint)
"cKI" = (
/obj/structure/cable{
d1 = 1;
d2 = 4;
- icon_state = "1-4";
- tag = ""
+ icon_state = "1-4"
},
/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/manifold/hidden/scrubbers{
- dir = 4;
- initialize_directions = 11
+ dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel{
@@ -68907,23 +65947,22 @@
/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,
/turf/simulated/floor/plating,
-/area/maintenance/aft)
+/area/maintenance/aft2)
"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)
@@ -68931,13 +65970,15 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
},
+/obj/structure/disposalpipe/segment{
+ dir = 2;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plasteel,
/area/hallway/primary/aft)
"cKM" = (
@@ -68945,17 +65986,17 @@
/turf/simulated/floor/wood{
icon_state = "wood-broken"
},
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cKN" = (
/obj/machinery/light/small{
dir = 8
},
/turf/simulated/floor/wood,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cKO" = (
/obj/effect/spawner/lootdrop/maintenance,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cKP" = (
/obj/structure/disposalpipe/trunk{
dir = 4
@@ -68982,7 +66023,7 @@
/turf/simulated/floor/wood{
icon_state = "wood-broken3"
},
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cKT" = (
/obj/machinery/disposal,
/obj/structure/disposalpipe/trunk{
@@ -68994,8 +66035,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/warning_stripes/southeast,
/turf/simulated/floor/plasteel,
@@ -69004,11 +66044,11 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/light_switch{
- pixel_x = -23;
+ dir = 4;
+ pixel_x = -24;
pixel_y = 7
},
/obj/structure/rack{
@@ -69068,8 +66108,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/newscaster{
pixel_y = 34
@@ -69100,8 +66139,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/disposalpipe/trunk{
dir = 8
@@ -69141,7 +66179,7 @@
/area/maintenance/asmaint2)
"cLi" = (
/turf/simulated/wall,
-/area/maintenance/aft)
+/area/maintenance/aft2)
"cLj" = (
/obj/machinery/camera{
c_tag = "Research Test Chamber";
@@ -69153,8 +66191,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/engine{
icon_state = "stage_stairs";
@@ -69177,8 +66214,12 @@
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)
+/area/maintenance/aft2)
"cLn" = (
/obj/machinery/conveyor{
dir = 4;
@@ -69191,26 +66232,17 @@
/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 = ""
+ icon_state = "2-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 10
},
/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"
- },
-/turf/simulated/floor/plating,
-/area/maintenance/aft)
+/area/maintenance/aft2)
"cLq" = (
/obj/structure/table,
/obj/structure/sign/poster/contraband/random{
@@ -69221,60 +66253,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{
@@ -69298,16 +66276,10 @@
/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)
+/area/maintenance/aft2)
"cLz" = (
/obj/effect/decal/warning_stripes/yellow/partial,
/obj/effect/decal/warning_stripes/arrow,
@@ -69365,16 +66337,12 @@
"cLH" = (
/obj/structure/closet/crate,
/obj/machinery/light_switch{
- pixel_x = 27
+ dir = 8;
+ pixel_x = 24
},
/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
@@ -69398,6 +66366,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"
@@ -69417,32 +66388,30 @@
dir = 4
},
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cLO" = (
/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/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cLP" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/light/small,
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cLQ" = (
/obj/structure/table/reinforced,
/obj/machinery/door_control{
@@ -69457,8 +66426,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,
@@ -69472,8 +66440,10 @@
/turf/simulated/floor/plasteel,
/area/toxins/xenobiology)
"cLS" = (
-/obj/machinery/computer/security/engineering,
/obj/effect/decal/warning_stripes/northeast,
+/obj/machinery/computer/security/engineering{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/atmos)
"cLT" = (
@@ -69492,7 +66462,7 @@
dir = 5
},
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cLV" = (
/obj/machinery/portable_atmospherics/canister/toxins,
/turf/simulated/floor/engine/plasma,
@@ -69501,8 +66471,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/structure/disposalpipe/segment{
dir = 2;
@@ -69512,7 +66481,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cLX" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -69521,21 +66490,20 @@
dir = 4
},
/turf/simulated/floor/plasteel,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cLY" = (
/obj/item/stack/sheet/wood,
/turf/simulated/floor/wood{
icon_state = "wood-broken5"
},
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cLZ" = (
/obj/structure/chair/wood/wings{
dir = 8
},
/turf/simulated/floor/wood,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cMa" = (
-/obj/machinery/atmospherics/unary/portables_connector,
/obj/machinery/door_control{
id = "atmos";
name = "Atmospherics Lockdown";
@@ -69546,9 +66514,12 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
+/obj/machinery/atmospherics/unary/portables_connector{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel,
/area/atmos/control)
"cMb" = (
@@ -69558,26 +66529,26 @@
/turf/simulated/floor/wood{
icon_state = "wood-broken7"
},
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cMc" = (
/obj/effect/spawner/random_spawners/blood_maybe,
/turf/simulated/floor/wood,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cMd" = (
/obj/structure/chair/wood{
dir = 8
},
/turf/simulated/floor/carpet,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cMe" = (
/obj/structure/table/wood/fancy,
/obj/item/trash/candle,
/turf/simulated/floor/carpet,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cMf" = (
/obj/machinery/door/airlock/maintenance,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cMg" = (
/obj/effect/landmark{
name = "revenantspawn"
@@ -69592,7 +66563,7 @@
name = "2maintenance loot spawner"
},
/turf/simulated/floor/plating,
-/area/maintenance/genetics)
+/area/maintenance/asmaint)
"cMi" = (
/obj/machinery/door/airlock/maintenance,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -69602,7 +66573,7 @@
dir = 4
},
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cMj" = (
/obj/machinery/light{
dir = 8
@@ -69610,8 +66581,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/item/radio/intercom{
pixel_x = -28
@@ -69660,30 +66630,21 @@
dir = 4
},
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cMp" = (
/obj/structure/table,
/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"
+ icon_state = "1-2"
},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plating,
-/area/maintenance/aft)
-"cMr" = (
-/obj/structure/table,
-/obj/effect/spawner/lootdrop/maintenance,
-/turf/simulated/floor/plating,
-/area/maintenance/aft)
+/area/maintenance/aft2)
"cMs" = (
/obj/effect/decal/cleanable/fungus,
/turf/simulated/wall/r_wall,
@@ -69692,8 +66653,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,
@@ -69702,8 +66662,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/engine,
/area/toxins/test_chamber)
@@ -69711,17 +66670,15 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plating,
-/area/maintenance/aft)
+/area/maintenance/aft2)
"cMw" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/item/paper,
/obj/effect/decal/cleanable/dirt,
@@ -69741,8 +66698,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plating,
/area/assembly/assembly_line)
@@ -69755,25 +66711,22 @@
dir = 4
},
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cMB" = (
/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;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/lattice/catwalk,
/turf/space,
@@ -69810,7 +66763,7 @@
dir = 4
},
/turf/simulated/floor/plasteel,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cMG" = (
/turf/simulated/floor/plasteel{
dir = 1;
@@ -69826,7 +66779,7 @@
dir = 4
},
/turf/simulated/floor/plasteel,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cMI" = (
/obj/structure/window/reinforced{
dir = 4
@@ -69834,8 +66787,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/disposal,
/obj/structure/disposalpipe/trunk,
@@ -69850,8 +66802,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door_control{
id = "xenobio4";
@@ -69864,7 +66815,7 @@
/area/toxins/xenobiology)
"cMK" = (
/obj/machinery/alarm{
- pixel_y = 26
+ pixel_y = 24
},
/turf/simulated/floor/plasteel,
/area/hallway/primary/starboard/west)
@@ -69876,7 +66827,10 @@
},
/area/hallway/primary/aft)
"cMN" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/universal{
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/turf/simulated/floor/plasteel,
@@ -69885,8 +66839,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
@@ -69900,14 +66853,12 @@
/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";
- tag = ""
+ icon_state = "1-4"
},
/turf/simulated/floor/plasteel{
icon_state = "white"
@@ -69935,14 +66886,12 @@
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/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,
@@ -69960,29 +66909,16 @@
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel,
/area/assembly/assembly_line)
-"cMV" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8";
- tag = ""
- },
-/turf/simulated/floor/plasteel{
- icon_state = "yellowcorner"
- },
-/area/hallway/primary/aft)
"cMW" = (
/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,
@@ -70017,14 +66953,13 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cNc" = (
/obj/machinery/light,
/obj/structure/closet,
@@ -70034,7 +66969,7 @@
"cNd" = (
/obj/structure/barricade/wooden,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cNe" = (
/obj/structure/disposalpipe/segment,
/obj/structure/grille,
@@ -70043,7 +66978,7 @@
max_integrity = 1e+007
},
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cNf" = (
/obj/structure/grille,
/obj/structure/window/reinforced{
@@ -70051,15 +66986,15 @@
max_integrity = 1e+007
},
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cNg" = (
/obj/structure/sign/barsign,
/turf/simulated/wall,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cNh" = (
/obj/effect/decal/cleanable/vomit,
/turf/simulated/floor/plating,
-/area/maintenance/genetics)
+/area/maintenance/asmaint)
"cNi" = (
/obj/structure/cable{
d1 = 4;
@@ -70086,8 +67021,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door_control{
id = "xenobio6";
@@ -70127,11 +67061,10 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/turf/simulated/floor/plating,
-/area/maintenance/genetics)
+/area/maintenance/asmaint)
"cNq" = (
/obj/structure/cable{
d1 = 4;
@@ -70144,8 +67077,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
@@ -70158,12 +67090,10 @@
/obj/structure/cable{
d1 = 1;
d2 = 4;
- icon_state = "1-4";
- tag = ""
+ icon_state = "1-4"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel{
@@ -70238,8 +67168,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/sparker{
id = "testigniter";
@@ -70251,19 +67180,19 @@
"cNA" = (
/obj/structure/closet/firecloset,
/turf/simulated/floor/plating,
-/area/maintenance/aft)
+/area/maintenance/aft2)
"cNB" = (
/turf/simulated/floor/plating,
-/area/maintenance/aft)
+/area/maintenance/aft2)
"cNC" = (
/obj/structure/closet,
/obj/effect/spawner/lootdrop/maintenance,
/turf/simulated/floor/plating,
-/area/maintenance/aft)
+/area/maintenance/aft2)
"cND" = (
/obj/structure/table,
/turf/simulated/floor/plating,
-/area/maintenance/aft)
+/area/maintenance/aft2)
"cNE" = (
/obj/machinery/atmospherics/pipe/simple/visible/yellow{
dir = 10
@@ -70287,23 +67216,16 @@
"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;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/cable{
d1 = 1;
@@ -70331,14 +67253,12 @@
/area/assembly/assembly_line)
"cNL" = (
/obj/machinery/light{
- dir = 1;
- in_use = 1
+ dir = 1
},
/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
@@ -70364,11 +67284,10 @@
/obj/structure/cable{
d1 = 1;
d2 = 4;
- icon_state = "1-4";
- tag = ""
+ icon_state = "1-4"
},
/turf/simulated/floor/plating,
-/area/maintenance/aft)
+/area/maintenance/aft2)
"cNO" = (
/obj/effect/landmark/start{
name = "Station Engineer"
@@ -70397,8 +67316,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plating,
/area/maintenance/asmaint2)
@@ -70406,8 +67324,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
@@ -70415,27 +67332,29 @@
},
/area/hallway/primary/aft)
"cNT" = (
-/obj/machinery/light,
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
- },
/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 = "yellowcorner"
},
/area/hallway/primary/aft)
"cNU" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+ dir = 1
},
-/turf/simulated/wall,
-/area/engine/break_room)
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "dark"
+ },
+/area/engine/engineering)
"cNV" = (
/obj/machinery/atmospherics/unary/vent_pump/on,
/turf/simulated/floor/plasteel{
@@ -70453,7 +67372,8 @@
/area/engine/engineering)
"cNX" = (
/obj/machinery/light_switch{
- pixel_x = -27
+ dir = 4;
+ pixel_x = -24
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -70462,7 +67382,7 @@
"cNY" = (
/obj/machinery/atmospherics/pipe/simple/visible/universal,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cNZ" = (
/obj/machinery/constructable_frame/machine_frame,
/obj/effect/decal/cleanable/dirt,
@@ -70477,36 +67397,26 @@
},
/area/engine/engineering)
"cOc" = (
-/obj/machinery/alarm{
- dir = 1;
- pixel_y = -22
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/item/twohanded/required/kirbyplants,
/turf/simulated/floor/plasteel{
- icon_state = "yellowcorner"
+ icon_state = "dark"
},
-/area/hallway/primary/aft)
+/area/engine/engineering)
"cOe" = (
-/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,
/turf/simulated/floor/plasteel,
/area/engine/break_room)
"cOf" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/light,
/obj/structure/table,
/obj/machinery/firealarm{
@@ -70535,6 +67445,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
},
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -70546,7 +67461,7 @@
icon_state = "1-4"
},
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cOk" = (
/obj/machinery/camera{
c_tag = "Atmospherics East";
@@ -70571,11 +67486,10 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plating,
-/area/maintenance/genetics)
+/area/maintenance/asmaint)
"cOn" = (
/obj/structure/table,
/obj/item/storage/box/syringes,
@@ -70609,14 +67523,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/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)
+/area/maintenance/aft2)
"cOr" = (
/obj/structure/table,
/obj/effect/decal/warning_stripes/north,
@@ -70624,20 +67539,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;
@@ -70649,8 +67550,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{
@@ -70665,8 +67565,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/turf/simulated/floor/engine,
/area/toxins/test_chamber)
@@ -70677,8 +67576,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 4;
- icon_state = "1-4";
- tag = ""
+ icon_state = "1-4"
},
/obj/item/radio/intercom{
dir = 1;
@@ -70686,14 +67584,10 @@
},
/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,
-/area/maintenance/aft)
+/area/maintenance/aft2)
"cOy" = (
/obj/structure/sign/securearea,
/obj/effect/spawner/window/reinforced,
@@ -70788,8 +67682,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,
@@ -70798,8 +67691,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=AIE";
@@ -70808,8 +67700,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
@@ -70818,8 +67709,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/wall,
/area/engine/break_room)
@@ -70827,15 +67717,14 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/disposalpipe/segment,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cON" = (
/obj/effect/landmark/start{
name = "Station Engineer"
@@ -70912,12 +67801,11 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/alarm{
dir = 4;
- pixel_x = -23
+ pixel_x = -24
},
/obj/structure/sink{
dir = 8;
@@ -70926,7 +67814,7 @@
},
/obj/item/radio/intercom{
dir = 1;
- pixel_y = 25
+ pixel_y = 28
},
/turf/simulated/floor/plasteel,
/area/engine/break_room)
@@ -70949,35 +67837,39 @@
icon_state = "2-4"
},
/turf/simulated/floor/plating,
-/area/maintenance/genetics)
+/area/maintenance/asmaint)
"cPb" = (
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/structure/disposalpipe/segment{
dir = 4;
icon_state = "pipe-c"
},
/turf/simulated/floor/plating,
-/area/maintenance/aft)
+/area/maintenance/aft2)
"cPc" = (
/obj/structure/closet/firecloset,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cPd" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2";
- tag = ""
+/obj/machinery/atmospherics/pipe/simple/heat_exchanging{
+ dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/obj/structure/lattice,
+/obj/machinery/access_button{
+ command = "cycle_exterior";
+ frequency = 1379;
+ master_tag = "engineering_east_airlock";
+ name = "interior access button";
+ pixel_x = -22;
+ pixel_y = 20;
+ req_access_txt = "10;13"
+ },
+/turf/space,
+/area/space/nearstation)
"cPe" = (
/obj/structure/cable{
d1 = 4;
@@ -70986,52 +67878,49 @@
},
/obj/effect/spawner/random_spawners/grille_often,
/turf/simulated/floor/plating,
-/area/maintenance/genetics)
+/area/maintenance/asmaint)
"cPf" = (
/obj/structure/disposalpipe/segment{
dir = 8;
icon_state = "pipe-c"
},
/turf/simulated/floor/plating,
-/area/maintenance/genetics)
+/area/maintenance/asmaint)
"cPh" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/light/small{
- dir = 1
- },
+/obj/structure/girder,
/turf/simulated/floor/plating,
-/area/maintenance/aft)
+/area/maintenance/aft2)
"cPi" = (
+/obj/effect/decal/warning_stripes/east,
/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/effect/decal/warning_stripes/east,
/turf/simulated/floor/plasteel,
/area/atmos)
"cPj" = (
/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/plating,
-/area/maintenance/aft)
+/area/maintenance/aft2)
"cPk" = (
/obj/effect/decal/warning_stripes/east,
/obj/machinery/field/generator,
@@ -71045,11 +67934,10 @@
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/turf/simulated/floor/plating,
-/area/maintenance/aft)
+/area/maintenance/aft2)
"cPm" = (
/obj/effect/spawner/window/reinforced,
/obj/structure/disposalpipe/segment{
@@ -71072,14 +67960,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,
@@ -71107,8 +67993,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
icon_state = "white"
@@ -71116,8 +68001,10 @@
/area/toxins/xenobiology)
"cPq" = (
/obj/machinery/light_switch{
- pixel_x = 27
+ dir = 8;
+ pixel_x = 24
},
+/obj/machinery/vending/engidrobe,
/turf/simulated/floor/plasteel,
/area/engine/equipmentstorage)
"cPr" = (
@@ -71162,7 +68049,7 @@
"cPu" = (
/obj/structure/chair,
/turf/simulated/floor/plating,
-/area/maintenance/aft)
+/area/maintenance/aft2)
"cPv" = (
/obj/structure/table,
/obj/item/radio/intercom{
@@ -71207,7 +68094,7 @@
/obj/structure/table/reinforced,
/obj/machinery/alarm{
dir = 1;
- pixel_y = -22
+ pixel_y = -24
},
/obj/item/clothing/mask/gas,
/obj/machinery/atmospherics/pipe/simple/hidden/purple,
@@ -71236,8 +68123,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/binary/valve/digital{
color = "";
@@ -71266,8 +68152,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/lattice/catwalk,
/turf/space,
@@ -71303,30 +68188,24 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/turf/simulated/floor/plasteel{
icon_state = "white"
},
/area/toxins/xenobiology)
"cPL" = (
-/obj/machinery/vending/coffee,
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "yellowcorner"
- },
-/area/hallway/primary/aft)
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plasteel,
+/area/maintenance/turbine)
"cPM" = (
/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
+ dir = 8
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel,
@@ -71338,7 +68217,6 @@
/turf/simulated/floor/plasteel,
/area/engine/equipmentstorage)
"cPO" = (
-/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
@@ -71366,12 +68244,10 @@
/area/atmos)
"cPS" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 4;
- initialize_directions = 11
+ dir = 4
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/turf/simulated/floor/plasteel,
/area/atmos)
@@ -71401,8 +68277,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,
@@ -71439,8 +68314,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/lattice/catwalk,
/turf/space,
@@ -71461,7 +68335,7 @@
name = "Waste Loop"
},
/obj/machinery/light_switch{
- pixel_y = 27
+ pixel_y = 24
},
/obj/machinery/atmospherics/pipe/manifold/visible/purple{
dir = 8
@@ -71487,11 +68361,10 @@
/area/atmos/distribution)
"cQi" = (
/obj/machinery/atmospherics/pipe/simple/visible/cyan{
- dir = 10;
- initialize_directions = 10
+ dir = 10
},
/obj/machinery/alarm{
- pixel_y = 23
+ pixel_y = 24
},
/turf/simulated/floor/plasteel,
/area/atmos/distribution)
@@ -71570,7 +68443,7 @@
},
/area/toxins/xenobiology)
"cQt" = (
-/obj/structure/table/reinforced,
+/obj/structure/table,
/obj/item/scalpel,
/obj/item/hemostat,
/turf/simulated/floor/plasteel{
@@ -71614,7 +68487,7 @@
/area/toxins/xenobiology)
"cQy" = (
/turf/simulated/wall/r_wall,
-/area/maintenance/aft)
+/area/maintenance/aft2)
"cQz" = (
/obj/structure/chair{
dir = 4
@@ -71622,8 +68495,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
icon_state = "white"
@@ -71667,7 +68539,7 @@
},
/obj/machinery/vending/wallmed{
name = "Emergency NanoMed";
- pixel_y = -32
+ pixel_y = -28
},
/turf/simulated/floor/plasteel{
icon_state = "white"
@@ -71785,8 +68657,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,
@@ -71864,7 +68735,7 @@
pixel_y = 16
},
/turf/simulated/floor/plasteel{
- dir = 10;
+ dir = 8;
icon_state = "blue"
},
/area/medical/cmostore)
@@ -71872,15 +68743,13 @@
/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
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 1;
- initialize_directions = 11
+ dir = 1
},
/turf/simulated/floor/plasteel,
/area/atmos)
@@ -71892,8 +68761,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
@@ -71929,8 +68797,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
@@ -71944,8 +68811,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/visible/purple{
dir = 9
@@ -71964,8 +68830,7 @@
/area/atmos)
"cRa" = (
/obj/machinery/atmospherics/pipe/manifold/visible/cyan{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/obj/machinery/meter,
/turf/simulated/floor/plasteel,
@@ -71988,8 +68853,7 @@
opacity = 0
},
/obj/machinery/atmospherics/pipe/simple/visible/cyan{
- dir = 10;
- initialize_directions = 10
+ dir = 10
},
/turf/simulated/floor/plating,
/area/atmos/distribution)
@@ -72007,20 +68871,17 @@
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/obj/structure/cable{
d1 = 1;
d2 = 4;
- icon_state = "1-4";
- tag = ""
+ icon_state = "1-4"
},
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/lattice/catwalk,
/turf/space,
@@ -72039,15 +68900,14 @@
frequency = 1379;
master_tag = "engineering_east_airlock";
name = "interior access button";
- pixel_x = -20;
+ pixel_x = -22;
pixel_y = -20;
req_access_txt = "10;13"
},
/obj/structure/cable{
d1 = 1;
d2 = 4;
- icon_state = "1-4";
- tag = "90Curve"
+ icon_state = "1-4"
},
/turf/simulated/floor/plasteel,
/area/engine/engineering)
@@ -72055,6 +68915,11 @@
/obj/machinery/atmospherics/pipe/simple/visible/yellow{
dir = 4
},
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -72071,8 +68936,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
@@ -72086,8 +68950,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
@@ -72098,8 +68961,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/obj/machinery/atmospherics/pipe/simple/visible/green{
dir = 5
@@ -72227,7 +69089,7 @@
"cRB" = (
/obj/effect/decal/cleanable/fungus,
/turf/simulated/wall/r_wall,
-/area/maintenance/aft)
+/area/maintenance/aft2)
"cRC" = (
/obj/effect/decal/cleanable/fungus,
/turf/simulated/wall,
@@ -72256,8 +69118,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 = 5
@@ -72266,13 +69127,12 @@
dir = 5
},
/turf/simulated/floor/plating,
-/area/maintenance/aft)
+/area/maintenance/aft2)
"cRG" = (
/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
@@ -72281,7 +69141,7 @@
dir = 4
},
/turf/simulated/floor/plating,
-/area/maintenance/aft)
+/area/maintenance/aft2)
"cRH" = (
/obj/structure/chair{
dir = 4
@@ -72289,14 +69149,12 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/obj/effect/landmark/start{
name = "Scientist"
@@ -72309,24 +69167,22 @@
/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
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 10;
- initialize_directions = 10
+ dir = 10
},
+/obj/structure/girder,
/turf/simulated/floor/plating,
-/area/maintenance/aft)
+/area/maintenance/aft2)
"cRJ" = (
/obj/effect/spawner/window/reinforced,
/obj/structure/cable{
@@ -72386,7 +69242,6 @@
/obj/effect/decal/warning_stripes/white/hollow,
/obj/item/multitool,
/obj/item/radio/intercom{
- dir = 0;
pixel_x = 28
},
/turf/simulated/floor/plasteel{
@@ -72397,19 +69252,16 @@
/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;
- initialize_directions = 11
+ dir = 8
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/turf/simulated/floor/plasteel,
/area/engine/equipmentstorage)
@@ -72426,13 +69278,6 @@
},
/turf/simulated/floor/plasteel,
/area/engine/equipmentstorage)
-"cRQ" = (
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/turf/simulated/floor/plasteel,
-/area/engine/equipmentstorage)
"cRR" = (
/turf/simulated/wall/r_wall,
/area/engine/chiefs_office)
@@ -72483,8 +69328,7 @@
/area/engine/equipmentstorage)
"cRV" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 4;
- initialize_directions = 11
+ dir = 4
},
/turf/simulated/floor/plasteel,
/area/engine/equipmentstorage)
@@ -72492,8 +69336,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/light/small{
dir = 8
@@ -72502,7 +69345,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cRX" = (
/turf/simulated/floor/plasteel,
/area/engine/equipmentstorage)
@@ -72525,8 +69368,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,
@@ -72535,14 +69377,12 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
@@ -72608,14 +69448,12 @@
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/obj/structure/cable{
d1 = 1;
d2 = 4;
- icon_state = "1-4";
- tag = ""
+ icon_state = "1-4"
},
/obj/structure/lattice/catwalk,
/turf/space,
@@ -72635,7 +69473,9 @@
dir = 4
},
/obj/structure/grille,
-/obj/machinery/meter,
+/obj/machinery/meter{
+ layer = 2.9
+ },
/turf/simulated/wall/r_wall,
/area/atmos)
"cSo" = (
@@ -72681,11 +69521,7 @@
/obj/machinery/camera{
c_tag = "Atmospherics Waste Tank"
},
-/turf/simulated/floor/engine{
- name = "vacuum floor";
- nitrogen = 0.01;
- oxygen = 0.01
- },
+/turf/simulated/floor/engine/vacuum,
/area/atmos)
"cSt" = (
/obj/machinery/hologram/holopad,
@@ -72696,23 +69532,15 @@
},
/area/engine/chiefs_office)
"cSu" = (
-/obj/machinery/atmospherics/unary/vent_pump{
+/obj/machinery/atmospherics/unary/vent_pump/siphon/on{
dir = 8;
external_pressure_bound = 0;
frequency = 1441;
- icon_state = "in";
id_tag = "waste_out";
- initialize_directions = 1;
internal_pressure_bound = 4000;
- on = 1;
- pressure_checks = 2;
- pump_direction = 0
- },
-/turf/simulated/floor/engine{
- name = "vacuum floor";
- nitrogen = 0.01;
- oxygen = 0.01
+ pressure_checks = 2
},
+/turf/simulated/floor/engine/vacuum,
/area/atmos)
"cSv" = (
/obj/effect/decal/warning_stripes/northwest,
@@ -72725,11 +69553,7 @@
/turf/simulated/floor/engine,
/area/engine/engineering)
"cSw" = (
-/turf/simulated/floor/engine{
- name = "vacuum floor";
- nitrogen = 0.01;
- oxygen = 0.01
- },
+/turf/simulated/floor/engine/vacuum,
/area/atmos)
"cSx" = (
/obj/structure/cable{
@@ -72806,8 +69630,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 4;
- icon_state = "1-4";
- tag = ""
+ icon_state = "1-4"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -72865,8 +69688,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel,
/area/engine/equipmentstorage)
@@ -72874,12 +69696,6 @@
/obj/structure/table,
/obj/machinery/cell_charger,
/obj/item/stock_parts/cell/high,
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8";
- tag = ""
- },
/obj/structure/sign/poster/official/random{
pixel_x = 32
},
@@ -72952,35 +69768,24 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/carpet,
/area/crew_quarters/mrchangs)
"cSY" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8";
- tag = ""
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
},
/turf/simulated/floor/plasteel,
/area/engine/equipmentstorage)
"cSZ" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8";
- tag = ""
- },
-/obj/machinery/computer/atmos_alert,
/obj/effect/decal/warning_stripes/east,
/obj/machinery/atmospherics/pipe/simple/visible/universal{
dir = 4
},
+/obj/machinery/computer/atmos_alert{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/atmos)
"cTa" = (
@@ -73000,8 +69805,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/obj/structure/cable{
d2 = 4;
@@ -73013,18 +69817,19 @@
pixel_y = 24
},
/turf/simulated/floor/plating,
-/area/maintenance/aft)
+/area/maintenance/aft2)
"cTc" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
+/obj/structure/closet/emcloset,
/turf/simulated/floor/plating,
-/area/maintenance/aft)
+/area/maintenance/aft2)
"cTd" = (
/obj/machinery/computer/operating{
+ dir = 1;
icon_state = "operatingb";
name = "Robotics Operating Computer";
stat = 1
@@ -73033,14 +69838,11 @@
icon_state = "white"
},
/area/assembly/assembly_line)
-"cTe" = (
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/plasteel,
-/area/engine/equipmentstorage)
"cTf" = (
/obj/machinery/newscaster{
pixel_y = 30
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
@@ -73075,29 +69877,11 @@
},
/area/engine/chiefs_office)
"cTj" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8";
- tag = ""
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/turf/simulated/wall/r_wall,
/area/atmos)
-"cTk" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8";
- tag = ""
- },
-/obj/machinery/atmospherics/pipe/simple/visible/purple{
- dir = 4
- },
-/turf/simulated/floor/plasteel,
-/area/atmos)
"cTl" = (
/obj/item/radio/intercom{
dir = 8;
@@ -73125,17 +69909,7 @@
/turf/simulated/floor/plasteel,
/area/atmos/distribution)
"cTo" = (
-/obj/structure/grille,
-/obj/structure/window/plasmareinforced{
- dir = 4
- },
-/obj/structure/window/plasmareinforced{
- dir = 8
- },
-/obj/structure/window/plasmareinforced,
-/obj/structure/window/plasmareinforced{
- dir = 1
- },
+/obj/effect/spawner/window/reinforced/plasma,
/turf/simulated/floor/plating,
/area/atmos)
"cTp" = (
@@ -73185,6 +69959,7 @@
/area/engine/engineering)
"cTu" = (
/obj/machinery/computer/general_air_control/large_tank_control{
+ dir = 8;
frequency = 1441;
input_tag = "waste_in";
name = "Gas Mix Tank Control";
@@ -73202,21 +69977,13 @@
id_tag = "waste_sensor";
output = 63
},
-/turf/simulated/floor/engine{
- name = "vacuum floor";
- nitrogen = 0.01;
- oxygen = 0.01
- },
+/turf/simulated/floor/engine/vacuum,
/area/atmos)
"cTw" = (
/obj/machinery/light/small{
dir = 4
},
-/turf/simulated/floor/engine{
- name = "vacuum floor";
- nitrogen = 0.01;
- oxygen = 0.01
- },
+/turf/simulated/floor/engine/vacuum,
/area/atmos)
"cTx" = (
/obj/effect/decal/warning_stripes/southwestcorner,
@@ -73239,7 +70006,7 @@
/obj/structure/rack,
/obj/effect/spawner/lootdrop/maintenance,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cTD" = (
/obj/structure/cable{
d1 = 1;
@@ -73302,6 +70069,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"
@@ -73329,14 +70099,12 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/turf/simulated/floor/plasteel{
icon_state = "white"
@@ -73351,14 +70119,15 @@
dir = 10
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 10;
- initialize_directions = 10
+ dir = 10
},
/obj/structure/cable{
d1 = 1;
d2 = 4;
- icon_state = "1-4";
- tag = "90Curve"
+ icon_state = "1-4"
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -73368,8 +70137,7 @@
"cTN" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/turf/simulated/floor/plasteel,
/area/engine/equipmentstorage)
@@ -73389,14 +70157,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{
dir = 4
@@ -73407,7 +70173,7 @@
/obj/effect/spawner/random_spawners/blood_maybe,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cTR" = (
/obj/machinery/access_button{
command = "cycle_exterior";
@@ -73429,8 +70195,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/table,
/obj/item/clothing/gloves/color/black,
@@ -73446,7 +70211,7 @@
"cTU" = (
/obj/effect/landmark/damageturf,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cTV" = (
/obj/machinery/atmospherics/binary/pump{
dir = 4
@@ -73457,7 +70222,7 @@
pixel_x = -24
},
/obj/machinery/light_switch{
- pixel_y = 27
+ pixel_y = 24
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel,
@@ -73486,8 +70251,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/unary/vent_pump/high_volume{
dir = 4;
@@ -73514,16 +70278,13 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/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,
@@ -73532,14 +70293,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
@@ -73559,19 +70318,16 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 4
},
/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,
@@ -73579,19 +70335,17 @@
"cUc" = (
/obj/effect/decal/cleanable/cobweb2,
/turf/simulated/floor/plating,
-/area/maintenance/aft)
+/area/maintenance/aft2)
"cUd" = (
/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";
- tag = ""
+ icon_state = "1-4"
},
/turf/simulated/floor/plating,
/area/maintenance/portsolar)
@@ -73599,8 +70353,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/turf/simulated/floor/plating,
/area/maintenance/portsolar)
@@ -73608,11 +70361,10 @@
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/turf/simulated/floor/plating,
-/area/maintenance/aft)
+/area/maintenance/aft2)
"cUg" = (
/obj/machinery/door/airlock/engineering{
name = "Aft Port Solar Access";
@@ -73621,8 +70373,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plating,
/area/maintenance/portsolar)
@@ -73633,7 +70384,7 @@
name = "2maintenance loot spawner"
},
/turf/simulated/floor/plating,
-/area/maintenance/aft)
+/area/maintenance/aft2)
"cUi" = (
/obj/structure/chair/wood,
/turf/simulated/floor/carpet,
@@ -73658,7 +70409,7 @@
/area/engine/engineering)
"cUk" = (
/obj/item/radio/intercom{
- pixel_y = 25
+ pixel_y = 28
},
/obj/structure/table,
/obj/item/book/manual/engineering_hacking{
@@ -73672,8 +70423,7 @@
"cUl" = (
/obj/effect/decal/warning_stripes/west,
/obj/machinery/atmospherics/pipe/manifold/visible/cyan{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/obj/machinery/meter,
/obj/machinery/light{
@@ -73683,12 +70433,6 @@
/area/engine/engineering)
"cUm" = (
/obj/structure/reagent_dispensers/fueltank,
-/obj/structure/cable{
- d1 = 2;
- d2 = 8;
- icon_state = "2-8";
- tag = ""
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
@@ -73710,20 +70454,13 @@
},
/area/crew_quarters/toilet)
"cUs" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8";
- tag = ""
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/turf/simulated/floor/plasteel,
/area/engine/equipmentstorage)
@@ -73736,13 +70473,6 @@
pixel_y = 24
},
/obj/structure/table/reinforced,
-/obj/item/rcd,
-/obj/item/rcd_ammo,
-/obj/item/rcd_ammo,
-/obj/item/rcd_ammo,
-/obj/item/rcd_ammo,
-/obj/item/rcd_ammo,
-/obj/item/rcd_ammo,
/obj/item/stock_parts/cell/high{
charge = 100;
maxcharge = 15000
@@ -73755,7 +70485,6 @@
pixel_y = 4
},
/obj/item/megaphone,
-/obj/item/lock_buster,
/mob/living/simple_animal/parrot/Poly,
/turf/simulated/floor/plasteel{
dir = 8;
@@ -73767,6 +70496,7 @@
/turf/simulated/floor/plasteel,
/area/engine/equipmentstorage)
"cUw" = (
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
@@ -73779,7 +70509,9 @@
/turf/simulated/wall/r_wall,
/area/atmos)
"cUy" = (
-/obj/machinery/computer/atmos_alert,
+/obj/machinery/computer/atmos_alert{
+ dir = 8
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
@@ -73801,36 +70533,33 @@
dir = 4
},
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cUC" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/disposalpipe/segment{
dir = 1;
icon_state = "pipe-c"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cUG" = (
/obj/structure/disposalpipe/segment{
dir = 2;
icon_state = "pipe-c"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 10;
- initialize_directions = 10
+ dir = 10
},
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cUM" = (
/obj/structure/rack,
/obj/item/wrench,
@@ -73858,8 +70587,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door_control{
id = "xenobio5";
@@ -73896,32 +70624,20 @@
"cUV" = (
/obj/structure/lattice,
/obj/machinery/atmospherics/pipe/simple/hidden/green{
- dir = 4;
- level = 2
+ dir = 4
},
/turf/space,
/area/space/nearstation)
"cUW" = (
-/obj/machinery/atmospherics/unary/outlet_injector{
+/obj/machinery/atmospherics/unary/outlet_injector/on{
dir = 8;
frequency = 1441;
- icon_state = "on";
- id = "waste_in";
- on = 1;
- pixel_y = 1
- },
-/turf/simulated/floor/engine{
- name = "vacuum floor";
- nitrogen = 0.01;
- oxygen = 0.01
+ id = "waste_in"
},
+/turf/simulated/floor/engine/vacuum,
/area/atmos)
"cUX" = (
/obj/effect/decal/cleanable/dirt,
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
},
@@ -73931,11 +70647,10 @@
/obj/structure/cable{
d1 = 1;
d2 = 4;
- icon_state = "1-4";
- tag = ""
+ icon_state = "1-4"
},
/turf/simulated/floor/plating,
-/area/maintenance/aft)
+/area/maintenance/aft2)
"cUZ" = (
/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel{
@@ -73952,8 +70667,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/disposalpipe/segment{
dir = 4
@@ -73965,7 +70679,7 @@
dir = 4
},
/turf/simulated/floor/plasteel,
-/area/maintenance/aft)
+/area/maintenance/aft2)
"cVd" = (
/turf/simulated/floor/plating,
/area/maintenance/portsolar)
@@ -73990,8 +70704,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
icon_state = "white"
@@ -74013,9 +70726,12 @@
},
/area/toxins/xenobiology)
"cVh" = (
-/obj/machinery/computer/security/engineering,
/obj/machinery/light_switch{
- pixel_x = -27
+ dir = 4;
+ pixel_x = -24
+ },
+/obj/machinery/computer/security/engineering{
+ dir = 4
},
/turf/simulated/floor/plasteel,
/area/engine/engineering)
@@ -74032,8 +70748,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/obj/structure/disposalpipe/segment{
dir = 4
@@ -74047,17 +70762,17 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel,
/area/engine/engineering)
"cVl" = (
+/obj/structure/cable,
/obj/machinery/power/solar_control{
+ dir = 4;
id = "portsolar";
name = "Aft Port Solar Control"
},
-/obj/structure/cable,
/turf/simulated/floor/plating,
/area/maintenance/portsolar)
"cVm" = (
@@ -74090,13 +70805,12 @@
pixel_y = -32
},
/turf/simulated/floor/plating,
-/area/maintenance/aft)
+/area/maintenance/aft2)
"cVo" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/disposalpipe/segment{
dir = 4
@@ -74207,8 +70921,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel,
/area/engine/engineering)
@@ -74237,8 +70950,7 @@
dir = 10
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 10;
- initialize_directions = 10
+ dir = 10
},
/turf/simulated/floor/plasteel,
/area/engine/engineering)
@@ -74270,8 +70982,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel,
/area/atmos)
@@ -74297,8 +71008,7 @@
"cVL" = (
/obj/effect/spawner/window/reinforced,
/obj/machinery/atmospherics/pipe/simple/visible/cyan{
- dir = 6;
- initialize_directions = 6
+ dir = 6
},
/obj/structure/sign/nosmoking_2,
/turf/simulated/floor/plating,
@@ -74330,8 +71040,7 @@
"cVP" = (
/obj/machinery/atmospherics/pipe/simple/visible/green,
/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
- dir = 4;
- level = 2
+ dir = 4
},
/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
@@ -74353,8 +71062,7 @@
opacity = 0
},
/obj/machinery/atmospherics/pipe/manifold/visible/cyan{
- dir = 4;
- initialize_directions = 11
+ dir = 4
},
/turf/simulated/floor/plating,
/area/atmos/distribution)
@@ -74387,9 +71095,6 @@
/area/engine/supermatter)
"cVU" = (
/obj/effect/spawner/window/reinforced,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable{
d2 = 4;
icon_state = "0-4"
@@ -74401,9 +71106,6 @@
/turf/simulated/floor/grass,
/area/hallway/secondary/exit)
"cWf" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/command/glass{
id_tag = "ceofficedoor";
@@ -74461,9 +71163,6 @@
req_access_txt = "10";
req_one_access_txt = null
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel,
@@ -74471,19 +71170,19 @@
"cWk" = (
/obj/effect/decal/cleanable/fungus,
/turf/simulated/wall,
-/area/maintenance/aft)
+/area/maintenance/aft2)
"cWl" = (
/obj/structure/reagent_dispensers/watertank,
/turf/simulated/floor/plating,
-/area/maintenance/aft)
+/area/maintenance/aft2)
"cWm" = (
/obj/structure/reagent_dispensers/fueltank,
/turf/simulated/floor/plating,
-/area/maintenance/aft)
+/area/maintenance/aft2)
"cWn" = (
/obj/effect/spawner/lootdrop/maintenance,
/turf/simulated/floor/plating,
-/area/maintenance/aft)
+/area/maintenance/aft2)
"cWo" = (
/obj/structure/table/wood,
/obj/machinery/bottler,
@@ -74529,10 +71228,10 @@
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cWr" = (
/obj/structure/extinguisher_cabinet{
- pixel_y = 27
+ pixel_y = 30
},
/turf/simulated/floor/plasteel{
icon_state = "white"
@@ -74549,7 +71248,7 @@
},
/obj/effect/decal/warning_stripes/yellow/hollow,
/turf/simulated/floor/plasteel,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"cWv" = (
/obj/structure/table,
/obj/item/toy/plushie/octopus,
@@ -74600,21 +71299,21 @@
/obj/item/radio/intercom{
pixel_x = -28
},
-/obj/machinery/computer/monitor{
- name = "Grid Power Monitoring Computer"
- },
/obj/structure/cable{
d2 = 4;
icon_state = "0-4"
},
+/obj/machinery/computer/monitor{
+ dir = 4;
+ name = "Grid Power Monitoring Computer"
+ },
/turf/simulated/floor/plasteel,
/area/engine/engineering)
"cWA" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel,
/area/hallway/secondary/exit)
@@ -74662,12 +71361,10 @@
},
/area/engine/engineering)
"cWJ" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel,
/area/engine/equipmentstorage)
@@ -74675,14 +71372,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
- },
-/obj/structure/cable{
- d1 = 2;
- d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-8"
},
/turf/simulated/floor/plasteel,
/area/engine/equipmentstorage)
@@ -74699,14 +71389,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,
/area/engine/equipmentstorage)
@@ -74722,12 +71410,10 @@
/area/engine/engineering)
"cWN" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/turf/simulated/floor/plasteel,
/area/engine/engineering)
@@ -74741,8 +71427,7 @@
/obj/structure/flora/tree/palm,
/obj/item/clothing/head/soft/rainbow,
/obj/machinery/light/small{
- dir = 4;
- pixel_y = 8
+ dir = 4
},
/turf/simulated/floor/beach/sand,
/area/hallway/secondary/exit)
@@ -74761,12 +71446,6 @@
/turf/simulated/floor/plasteel,
/area/engine/engineering)
"cWT" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8";
- tag = ""
- },
/obj/machinery/atmospherics/binary/volume_pump/on{
dir = 4;
name = "External to Filter"
@@ -74777,14 +71456,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
- },
-/obj/structure/cable{
- d1 = 1;
- d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/visible/purple{
dir = 4
@@ -74793,8 +71465,7 @@
/area/atmos)
"cWV" = (
/obj/machinery/atmospherics/pipe/simple/visible/cyan{
- dir = 6;
- initialize_directions = 6
+ dir = 6
},
/obj/machinery/firealarm{
pixel_y = 24
@@ -74803,8 +71474,7 @@
/area/atmos)
"cWW" = (
/obj/machinery/atmospherics/pipe/manifold/visible/cyan{
- dir = 4;
- initialize_directions = 11
+ dir = 4
},
/obj/machinery/meter,
/turf/simulated/floor/plasteel,
@@ -74868,17 +71538,13 @@
},
/area/atmos)
"cXe" = (
-/obj/machinery/atmospherics/unary/vent_pump{
+/obj/machinery/atmospherics/unary/vent_pump/siphon/on{
dir = 8;
external_pressure_bound = 0;
frequency = 1441;
- icon_state = "in";
id_tag = "n2o_out";
- initialize_directions = 1;
internal_pressure_bound = 4000;
- on = 1;
- pressure_checks = 2;
- pump_direction = 0
+ pressure_checks = 2
},
/turf/simulated/floor/engine/n20,
/area/atmos)
@@ -74919,8 +71585,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/warning_stripes/southeastcorner,
/turf/simulated/floor/plasteel,
@@ -74948,7 +71613,7 @@
},
/obj/machinery/alarm{
dir = 4;
- pixel_x = -22
+ pixel_x = -24
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -74965,8 +71630,7 @@
"cXq" = (
/obj/structure/cable{
d2 = 2;
- icon_state = "0-2";
- pixel_y = 1
+ icon_state = "0-2"
},
/obj/machinery/power/apc{
dir = 4;
@@ -74983,7 +71647,7 @@
icon_state = "pipe-c"
},
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cXs" = (
/obj/machinery/status_display{
layer = 4;
@@ -74998,14 +71662,12 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/cable{
d1 = 1;
d2 = 4;
- icon_state = "1-4";
- tag = ""
+ icon_state = "1-4"
},
/obj/structure/cable{
d1 = 1;
@@ -75023,8 +71685,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/disposalpipe/segment{
dir = 4
@@ -75034,7 +71695,9 @@
},
/area/toxins/xenobiology)
"cXw" = (
-/obj/machinery/computer/station_alert,
+/obj/machinery/computer/station_alert{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/engine/engineering)
"cXx" = (
@@ -75059,8 +71722,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/disposalpipe/segment{
dir = 8;
@@ -75074,14 +71736,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"
},
/turf/simulated/floor/plasteel{
icon_state = "white"
@@ -75091,22 +71751,12 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/turf/simulated/floor/plasteel{
icon_state = "white"
},
/area/toxins/xenobiology)
-"cXD" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2";
- tag = ""
- },
-/turf/simulated/floor/plasteel,
-/area/engine/engineering)
"cXF" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
@@ -75121,7 +71771,9 @@
pixel_x = -28
},
/obj/machinery/disposal,
-/obj/structure/disposalpipe/trunk,
+/obj/structure/disposalpipe/trunk{
+ dir = 4
+ },
/obj/machinery/firealarm{
dir = 1;
pixel_y = -24
@@ -75150,7 +71802,7 @@
dir = 1;
icon_state = "bot"
},
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"cXL" = (
/obj/machinery/firealarm{
dir = 8;
@@ -75217,8 +71869,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel,
/area/engine/engineering)
@@ -75234,8 +71885,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
@@ -75289,6 +71939,7 @@
/area/atmos)
"cYc" = (
/obj/machinery/computer/general_air_control/large_tank_control{
+ dir = 8;
frequency = 1441;
input_tag = "n2o_in";
name = "Nitrous Oxide Supply Control";
@@ -75303,8 +71954,7 @@
"cYd" = (
/obj/structure/chair,
/obj/machinery/light{
- dir = 1;
- on = 1
+ dir = 1
},
/turf/simulated/floor/plasteel{
dir = 1;
@@ -75344,11 +71994,11 @@
"cYi" = (
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cYj" = (
/obj/structure/chair/stool,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cYk" = (
/obj/structure/cable{
d1 = 4;
@@ -75361,11 +72011,10 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"cYm" = (
/obj/effect/decal/warning_stripes/yellow/hollow,
/obj/machinery/hologram/holopad,
@@ -75375,8 +72024,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/obj/effect/decal/warning_stripes/east,
/turf/simulated/floor/plasteel,
@@ -75448,14 +72096,12 @@
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel,
/area/engine/engineering)
@@ -75522,25 +72168,12 @@
"cYH" = (
/obj/item/twohanded/required/kirbyplants,
/obj/item/radio/intercom{
- dir = 0;
pixel_x = -28
},
/turf/simulated/floor/plasteel{
icon_state = "floorgrime"
},
/area/storage/office)
-"cYI" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/simulated/wall/r_wall,
-/area/engine/chiefs_office)
-"cYJ" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/simulated/wall,
-/area/engine/engineering)
"cYK" = (
/obj/structure/table,
/obj/item/toner{
@@ -75557,13 +72190,6 @@
icon_state = "floorgrime"
},
/area/storage/office)
-"cYL" = (
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
- },
-/turf/simulated/wall/r_wall,
-/area/engine/chiefs_office)
"cYM" = (
/obj/effect/spawner/window/reinforced,
/obj/structure/cable,
@@ -75575,7 +72201,7 @@
/obj/effect/decal/warning_stripes/white/hollow,
/obj/machinery/alarm{
dir = 4;
- pixel_x = -22
+ pixel_x = -24
},
/obj/machinery/light,
/obj/machinery/light{
@@ -75602,8 +72228,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/computer/security/telescreen/entertainment{
pixel_x = 32
@@ -75616,13 +72241,6 @@
/obj/effect/spawner/window/reinforced/plasma,
/turf/simulated/floor/plating,
/area/engine/engineering)
-"cYR" = (
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
- },
-/turf/simulated/wall,
-/area/engine/engineering)
"cYS" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -75640,12 +72258,6 @@
/turf/simulated/floor/plasteel,
/area/atmos)
"cYU" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2";
- tag = ""
- },
/obj/structure/sign/securearea{
desc = "A warning sign which reads 'HIGH VOLTAGE'";
icon_state = "shock";
@@ -75694,8 +72306,7 @@
/area/atmos)
"cZc" = (
/obj/machinery/atmospherics/pipe/manifold/visible{
- dir = 4;
- initialize_directions = 11
+ dir = 4
},
/turf/simulated/floor/plasteel,
/area/atmos)
@@ -75740,13 +72351,10 @@
/turf/space,
/area/space/nearstation)
"cZi" = (
-/obj/machinery/atmospherics/unary/outlet_injector{
+/obj/machinery/atmospherics/unary/outlet_injector/on{
dir = 8;
frequency = 1441;
- icon_state = "on";
- id = "n2o_in";
- on = 1;
- pixel_y = 1
+ id = "n2o_in"
},
/turf/simulated/floor/engine/n20,
/area/atmos)
@@ -75757,8 +72365,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
icon_state = "bluecorner"
@@ -75871,7 +72478,7 @@
"cZw" = (
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
-/area/maintenance/aft)
+/area/maintenance/aft2)
"cZy" = (
/obj/machinery/door/window/southright{
name = "Containment Pen";
@@ -76023,8 +72630,7 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/turf/simulated/floor/engine,
/area/engine/engineering)
@@ -76111,12 +72717,6 @@
/turf/simulated/floor/plasteel,
/area/hallway/secondary/exit)
"dab" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 8;
- icon_state = "1-8";
- tag = ""
- },
/obj/machinery/power/port_gen/pacman,
/obj/effect/decal/warning_stripes/north,
/turf/simulated/floor/plasteel{
@@ -76130,6 +72730,11 @@
icon_state = "2-4"
},
/obj/effect/decal/warning_stripes/northwest,
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -76144,7 +72749,7 @@
"dae" = (
/obj/structure/door_assembly/door_assembly_mai,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"daf" = (
/obj/structure/table/reinforced,
/obj/item/book/manual/evaguide,
@@ -76239,10 +72844,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
@@ -76285,7 +72886,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"daA" = (
/obj/structure/cable{
d1 = 4;
@@ -76299,7 +72900,7 @@
dir = 4
},
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"daB" = (
/obj/structure/cable{
d1 = 2;
@@ -76314,19 +72915,7 @@
dir = 5
},
/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)
+/area/maintenance/aft)
"daE" = (
/obj/structure/cable{
d1 = 4;
@@ -76341,13 +72930,12 @@
dir = 4
},
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"daF" = (
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/structure/disposalpipe/segment{
dir = 2;
@@ -76357,7 +72945,7 @@
dir = 10
},
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"daG" = (
/turf/simulated/floor/plating,
/area/engine/engineering)
@@ -76366,7 +72954,7 @@
/obj/machinery/cell_charger,
/obj/item/stock_parts/cell/high,
/turf/simulated/floor/plasteel{
- dir = 5;
+ dir = 6;
icon_state = "blue"
},
/area/medical/cmostore)
@@ -76374,7 +72962,7 @@
/obj/structure/table,
/obj/machinery/alarm{
dir = 1;
- pixel_y = -22
+ pixel_y = -24
},
/obj/item/storage/firstaid/o2{
layer = 2.8;
@@ -76383,7 +72971,7 @@
},
/obj/item/storage/firstaid,
/turf/simulated/floor/plasteel{
- dir = 6;
+ dir = 0;
icon_state = "blue"
},
/area/medical/cmostore)
@@ -76391,21 +72979,19 @@
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/structure/disposalpipe/segment{
dir = 4;
icon_state = "pipe-c"
},
/turf/simulated/floor/plating,
-/area/maintenance/genetics)
+/area/maintenance/asmaint)
"daK" = (
/obj/structure/closet/crate,
/obj/item/stack/sheet/metal{
@@ -76425,7 +73011,8 @@
},
/obj/effect/decal/warning_stripes/west,
/obj/machinery/light_switch{
- pixel_x = 27
+ dir = 8;
+ pixel_x = 24
},
/obj/item/stack/sheet/mineral/plasma{
amount = 30
@@ -76467,8 +73054,7 @@
/area/atmos)
"daS" = (
/obj/machinery/light/small{
- dir = 4;
- pixel_y = 8
+ dir = 4
},
/turf/simulated/floor/plating,
/area/maintenance/asmaint2)
@@ -76488,18 +73074,16 @@
/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;
- initialize_directions = 10
+ dir = 10
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
},
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"daV" = (
/obj/machinery/atmospherics/unary/thermomachine/freezer{
dir = 8
@@ -76518,25 +73102,13 @@
/obj/structure/closet/crate,
/obj/effect/spawner/lootdrop/maintenance,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"daY" = (
/obj/machinery/atmospherics/pipe/manifold/visible/yellow{
dir = 8
},
/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{
@@ -76549,17 +73121,13 @@
/turf/simulated/floor/engine/plasma,
/area/atmos)
"dbc" = (
-/obj/machinery/atmospherics/unary/vent_pump{
+/obj/machinery/atmospherics/unary/vent_pump/siphon/on{
dir = 8;
external_pressure_bound = 0;
frequency = 1441;
- icon_state = "in";
id_tag = "tox_out";
- initialize_directions = 1;
internal_pressure_bound = 4000;
- on = 1;
- pressure_checks = 2;
- pump_direction = 0
+ pressure_checks = 2
},
/turf/simulated/floor/engine/plasma,
/area/atmos)
@@ -76571,19 +73139,18 @@
dir = 5
},
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"dbe" = (
/obj/structure/disposalpipe/segment,
/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,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"dbf" = (
/obj/machinery/light/small{
dir = 8
@@ -76601,7 +73168,7 @@
req_access_txt = "12"
},
/turf/simulated/floor/plating,
-/area/maintenance/aft)
+/area/maintenance/aft2)
"dbi" = (
/obj/structure/closet/crate,
/obj/item/clothing/under/color/lightpurple,
@@ -76619,7 +73186,7 @@
icon_state = "2-4"
},
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"dbm" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
@@ -76629,46 +73196,25 @@
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/obj/structure/disposalpipe/segment{
dir = 4
},
/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)
+/area/maintenance/asmaint)
"dbq" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/disposalpipe/segment{
dir = 8;
icon_state = "pipe-c"
},
/turf/simulated/floor/plating,
-/area/maintenance/genetics)
+/area/maintenance/asmaint)
"dbr" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel,
@@ -76686,9 +73232,6 @@
/area/storage/secure)
"dbv" = (
/obj/machinery/portable_atmospherics/canister/oxygen,
-/obj/machinery/light_switch{
- pixel_y = -25
- },
/obj/effect/decal/warning_stripes/white/hollow,
/obj/structure/cable{
d1 = 1;
@@ -76704,7 +73247,7 @@
dir = 4
},
/turf/simulated/floor/plating,
-/area/maintenance/genetics)
+/area/maintenance/asmaint)
"dbx" = (
/obj/machinery/power/apc{
name = "south bump";
@@ -76723,8 +73266,7 @@
},
/obj/structure/cable{
d2 = 2;
- icon_state = "0-2";
- pixel_y = 1
+ icon_state = "0-2"
},
/obj/machinery/light/small{
dir = 8
@@ -76735,8 +73277,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 = 5
@@ -76745,20 +73286,19 @@
dir = 5
},
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"dbA" = (
/obj/structure/sign/nosmoking_2{
pixel_y = 32
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 10;
- initialize_directions = 10
+ dir = 10
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
},
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"dbC" = (
/obj/machinery/light/small{
dir = 1
@@ -76770,17 +73310,16 @@
dir = 4
},
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"dbD" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/spawner/random_spawners/grille_often,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"dbE" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -76794,15 +73333,7 @@
dir = 4
},
/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)
+/area/maintenance/aft)
"dbJ" = (
/obj/machinery/power/terminal{
dir = 1
@@ -76828,8 +73359,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/reagent_dispensers/watertank/high,
/turf/simulated/floor/plasteel,
@@ -76837,12 +73367,11 @@
"dbM" = (
/obj/effect/spawner/window,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"dbN" = (
/obj/machinery/meter,
/obj/machinery/atmospherics/pipe/manifold/visible{
- dir = 4;
- initialize_directions = 11
+ dir = 4
},
/turf/simulated/floor/plasteel,
/area/atmos)
@@ -76861,7 +73390,8 @@
},
/obj/effect/decal/warning_stripes/white/hollow,
/obj/machinery/light_switch{
- pixel_y = -25
+ dir = 1;
+ pixel_y = -24
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -76923,7 +73453,7 @@
dir = 5
},
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"dbZ" = (
/obj/structure/lattice,
/obj/machinery/atmospherics/pipe/simple/insulated{
@@ -76958,7 +73488,7 @@
dir = 10
},
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"dce" = (
/obj/structure/disposalpipe/segment{
dir = 2;
@@ -76973,7 +73503,7 @@
dir = 4
},
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"dcf" = (
/obj/structure/girder,
/turf/simulated/floor/plasteel{
@@ -76985,11 +73515,10 @@
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"dch" = (
/obj/structure/cable{
d1 = 4;
@@ -76998,11 +73527,11 @@
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"dci" = (
/obj/machinery/door/airlock/maintenance,
/turf/simulated/floor/plating,
-/area/maintenance/genetics)
+/area/maintenance/asmaint)
"dcj" = (
/turf/simulated/floor/plasteel,
/area/engine/break_room)
@@ -77028,8 +73557,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plating,
/area/maintenance/starboardsolar)
@@ -77037,20 +73565,23 @@
/obj/structure/cable{
d1 = 1;
d2 = 4;
- icon_state = "1-4";
- tag = ""
+ icon_state = "1-4"
},
/obj/machinery/atmospherics/pipe/simple/visible/yellow{
dir = 10
},
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plating,
/area/maintenance/storage)
"dcp" = (
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/structure/cable{
d1 = 4;
@@ -77060,7 +73591,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"dcq" = (
/turf/simulated/wall/r_wall,
/area/maintenance/storage)
@@ -77077,7 +73608,7 @@
pixel_y = -32
},
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"dct" = (
/obj/machinery/portable_atmospherics/scrubber,
/obj/machinery/light{
@@ -77110,8 +73641,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,
@@ -77127,7 +73657,7 @@
},
/obj/machinery/alarm{
dir = 8;
- pixel_x = 25
+ pixel_x = 24
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel,
@@ -77148,8 +73678,7 @@
/area/maintenance/turbine)
"dcA" = (
/obj/machinery/atmospherics/pipe/manifold/visible{
- dir = 4;
- initialize_directions = 11
+ dir = 4
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel,
@@ -77173,7 +73702,7 @@
},
/obj/effect/decal/warning_stripes/northwest,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"dcE" = (
/obj/structure/chair/comfy/black{
dir = 8
@@ -77242,8 +73771,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/portable_atmospherics/scrubber,
/turf/simulated/floor/plasteel,
@@ -77292,20 +73820,15 @@
/turf/space,
/area/space/nearstation)
"dcT" = (
-/obj/machinery/atmospherics/unary/outlet_injector{
+/obj/machinery/atmospherics/unary/outlet_injector/on{
dir = 8;
frequency = 1441;
- icon_state = "on";
- id = "tox_in";
- on = 1;
- pixel_y = 1
+ id = "tox_in"
},
/turf/simulated/floor/engine/plasma,
/area/atmos)
"dcV" = (
-/obj/machinery/atmospherics/unary/portables_connector{
- dir = 4
- },
+/obj/machinery/atmospherics/unary/portables_connector,
/obj/machinery/portable_atmospherics/canister/oxygen,
/obj/structure/sign/nosmoking_2{
pixel_x = -32
@@ -77350,8 +73873,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/disposalpipe/segment{
dir = 1;
@@ -77378,18 +73900,16 @@
},
/obj/item/pen,
/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/visible{
+ dir = 5
+ },
/turf/simulated/floor/plasteel,
/area/maintenance/turbine)
"ddg" = (
/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel,
-/area/maintenance/turbine)
-"ddh" = (
-/obj/machinery/atmospherics/pipe/manifold/visible{
- dir = 8
+/obj/machinery/atmospherics/binary/pump{
+ dir = 4
},
-/obj/machinery/meter,
-/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel,
/area/maintenance/turbine)
"ddi" = (
@@ -77411,8 +73931,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/binary/valve{
dir = 4
@@ -77422,8 +73941,7 @@
/area/maintenance/turbine)
"ddl" = (
/obj/machinery/atmospherics/pipe/manifold/visible{
- dir = 4;
- initialize_directions = 11
+ dir = 4
},
/obj/machinery/meter,
/obj/machinery/light{
@@ -77440,7 +73958,7 @@
/obj/structure/reagent_dispensers/fueltank,
/obj/item/storage/toolbox/emergency,
/obj/item/radio/intercom{
- pixel_y = -30
+ pixel_y = -28
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel,
@@ -77457,10 +73975,11 @@
/area/maintenance/turbine)
"ddp" = (
/obj/machinery/atmospherics/pipe/simple/visible/purple,
+/obj/effect/decal/cleanable/dirt,
/obj/machinery/computer/turbine_computer{
+ dir = 1;
id = "incineratorturbine"
},
-/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel,
/area/maintenance/turbine)
"ddq" = (
@@ -77476,8 +73995,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel,
/area/atmos)
@@ -77499,7 +74017,7 @@
},
/obj/effect/decal/warning_stripes/southwest,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"ddv" = (
/obj/machinery/atmospherics/pipe/simple/visible,
/obj/machinery/door_control{
@@ -77526,7 +74044,7 @@
/obj/machinery/portable_atmospherics/canister/air,
/obj/effect/decal/warning_stripes/southeast,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"ddx" = (
/obj/machinery/camera{
c_tag = "Atmospherics Central";
@@ -77538,8 +74056,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,
@@ -77577,8 +74094,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/lattice/catwalk,
/turf/space,
@@ -77606,8 +74122,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/lattice/catwalk,
/turf/space,
@@ -77628,7 +74143,7 @@
icon_state = "pipe-c"
},
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"ddI" = (
/obj/structure/table,
/obj/item/folder,
@@ -77678,14 +74193,12 @@
/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";
- tag = ""
+ icon_state = "1-4"
},
/obj/structure/lattice/catwalk,
/turf/space,
@@ -77694,20 +74207,17 @@
/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";
- tag = ""
+ icon_state = "1-4"
},
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/lattice/catwalk,
/turf/space,
@@ -77720,20 +74230,6 @@
/obj/structure/lattice/catwalk,
/turf/space,
/area/solar/starboard)
-"ddS" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/structure/cable{
- d1 = 2;
- d2 = 8;
- icon_state = "2-8";
- tag = ""
- },
-/turf/simulated/floor/engine,
-/area/engine/engineering)
"ddT" = (
/obj/structure/cable{
d2 = 4;
@@ -77746,36 +74242,17 @@
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/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 = ""
- },
-/obj/structure/lattice/catwalk,
-/turf/space,
-/area/solar/starboard)
-"ddV" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 8;
- icon_state = "1-8";
- tag = ""
- },
-/obj/structure/cable{
- d1 = 2;
- d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/lattice/catwalk,
/turf/space,
@@ -77842,8 +74319,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/structure/lattice/catwalk,
/turf/space,
@@ -77852,20 +74328,17 @@
/obj/structure/cable{
d1 = 1;
d2 = 4;
- icon_state = "1-4";
- tag = ""
+ icon_state = "1-4"
},
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/lattice/catwalk,
/turf/space,
@@ -77881,8 +74354,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel,
/area/atmos)
@@ -77915,17 +74387,13 @@
/turf/simulated/floor/engine/co2,
/area/atmos)
"den" = (
-/obj/machinery/atmospherics/unary/vent_pump{
+/obj/machinery/atmospherics/unary/vent_pump/siphon/on{
dir = 8;
external_pressure_bound = 0;
frequency = 1441;
- icon_state = "in";
id_tag = "co2_out";
- initialize_directions = 1;
internal_pressure_bound = 4000;
- on = 1;
- pressure_checks = 2;
- pump_direction = 0
+ pressure_checks = 2
},
/turf/simulated/floor/engine/co2,
/area/atmos)
@@ -77940,17 +74408,16 @@
icon_state = "4-8"
},
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"dep" = (
/obj/machinery/door/airlock/maintenance,
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plating,
-/area/maintenance/genetics)
+/area/maintenance/asmaint)
"deq" = (
/obj/machinery/computer/guestpass,
/turf/simulated/wall,
@@ -77958,7 +74425,7 @@
"der" = (
/obj/structure/table,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"det" = (
/obj/structure/cable{
d1 = 2;
@@ -77993,8 +74460,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/disposalpipe/segment,
/obj/effect/decal/cleanable/dirt,
@@ -78082,8 +74548,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/obj/machinery/atmospherics/pipe/simple/visible/purple{
dir = 4
@@ -78113,8 +74578,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel,
/area/atmos)
@@ -78156,8 +74620,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/door/airlock/maintenance{
name = "Atmospherics Maintenance";
@@ -78182,14 +74645,12 @@
/obj/structure/cable{
d1 = 1;
d2 = 4;
- icon_state = "1-4";
- tag = ""
+ icon_state = "1-4"
},
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/turf/simulated/floor/plating,
/area/maintenance/starboardsolar)
@@ -78217,8 +74678,7 @@
/area/maintenance/storage)
"deQ" = (
/obj/machinery/atmospherics/pipe/simple/visible/cyan{
- dir = 6;
- initialize_directions = 6
+ dir = 6
},
/turf/simulated/floor/plasteel,
/area/atmos)
@@ -78246,7 +74706,7 @@
/obj/structure/chair/stool,
/obj/effect/decal/cleanable/cobweb2,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"deU" = (
/obj/machinery/atmospherics/pipe/simple/visible/yellow{
dir = 9
@@ -78255,6 +74715,7 @@
/area/atmos)
"deV" = (
/obj/machinery/computer/general_air_control/large_tank_control{
+ dir = 8;
frequency = 1441;
input_tag = "co2_in";
name = "Carbon Dioxide Supply Control";
@@ -78307,8 +74768,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 4;
- icon_state = "2-4";
- tag = ""
+ icon_state = "2-4"
},
/turf/simulated/floor/plating,
/area/maintenance/starboardsolar)
@@ -78378,8 +74838,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
- icon_state = "2-8";
- tag = ""
+ icon_state = "2-8"
},
/obj/machinery/access_button{
command = "cycle_interior";
@@ -78396,15 +74855,13 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plating,
/area/maintenance/starboardsolar)
"dfm" = (
/obj/machinery/door/airlock/external{
frequency = 1379;
- icon_state = "door_locked";
id_tag = "atmospherics_south_outer";
locked = 1;
name = "Atmospherics External Access";
@@ -78413,14 +74870,15 @@
/turf/simulated/floor/plating,
/area/maintenance/storage)
"dfn" = (
-/obj/machinery/power/solar_control{
- id = "starboardsolar";
- name = "Aft Starboard Solar Control"
- },
/obj/structure/cable{
d2 = 4;
icon_state = "0-4"
},
+/obj/machinery/power/solar_control{
+ dir = 1;
+ id = "starboardsolar";
+ name = "Aft Starboard Solar Control"
+ },
/turf/simulated/floor/plating,
/area/maintenance/starboardsolar)
"dfo" = (
@@ -78493,16 +74951,13 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door/airlock/external{
frequency = 1379;
- icon_state = "door_locked";
id_tag = "solar_xeno_inner";
locked = 1;
name = "Engineering External Access";
- req_access = null;
req_access_txt = "13"
},
/obj/machinery/atmospherics/pipe/simple/hidden,
@@ -78512,8 +74967,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/embedded_controller/radio/airlock/airlock_controller{
id_tag = "solar_xeno_airlock";
@@ -78541,7 +74995,9 @@
/turf/simulated/wall/r_wall,
/area/maintenance/storage)
"dfy" = (
-/obj/structure/chair/stool,
+/obj/structure/chair/stool{
+ dir = 8
+ },
/turf/simulated/floor/plasteel,
/area/atmos)
"dfA" = (
@@ -78563,7 +75019,7 @@
"dfC" = (
/obj/item/radio/intercom{
dir = 1;
- pixel_y = 25
+ pixel_y = 28
},
/turf/simulated/floor/plasteel{
dir = 1;
@@ -78633,8 +75089,7 @@
/area/atmos)
"dfK" = (
/obj/machinery/atmospherics/pipe/simple/visible/cyan{
- dir = 10;
- initialize_directions = 10
+ dir = 10
},
/turf/simulated/floor/plasteel,
/area/atmos)
@@ -78642,13 +75097,13 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/mob/living/simple_animal/mouse,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"dfM" = (
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"dfN" = (
/obj/machinery/atmospherics/pipe/simple/visible/green{
dir = 4
@@ -78659,13 +75114,10 @@
},
/area/atmos)
"dfO" = (
-/obj/machinery/atmospherics/unary/outlet_injector{
+/obj/machinery/atmospherics/unary/outlet_injector/on{
dir = 8;
frequency = 1441;
- icon_state = "on";
- id = "co2_in";
- on = 1;
- pixel_y = 1
+ id = "co2_in"
},
/turf/simulated/floor/engine/co2,
/area/atmos)
@@ -78675,8 +75127,8 @@
/area/maintenance/asmaint2)
"dfQ" = (
/obj/machinery/light_switch{
- name = "light switch ";
- pixel_y = -22
+ dir = 1;
+ pixel_y = -24
},
/turf/simulated/floor/plasteel{
dir = 10;
@@ -78695,16 +75147,13 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door/airlock/external{
frequency = 1379;
- icon_state = "door_locked";
id_tag = "solar_xeno_outer";
locked = 1;
name = "Engineering External Access";
- req_access = null;
req_access_txt = "10;13"
},
/turf/simulated/floor/plating,
@@ -78716,25 +75165,12 @@
},
/area/maintenance/storage)
"dfU" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced/tinted{
- dir = 8;
- tag = ""
- },
-/obj/structure/window/reinforced/tinted{
- dir = 1
- },
-/obj/structure/window/reinforced/tinted{
- dir = 4;
- tag = ""
- },
-/obj/structure/window/reinforced/tinted,
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
+/obj/effect/spawner/window/reinforced/tinted,
/turf/simulated/floor/plating,
/area/maintenance/asmaint2)
"dgb" = (
@@ -78761,7 +75197,7 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"dgf" = (
/obj/machinery/door/airlock/maintenance,
/turf/simulated/floor/plating,
@@ -78800,7 +75236,7 @@
id_tag = "dorms_pump"
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"dgl" = (
/obj/machinery/light{
dir = 1
@@ -78811,15 +75247,15 @@
"dgm" = (
/obj/structure/closet/emcloset,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"dgn" = (
/obj/structure/sign/biohazard,
/turf/simulated/wall,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"dgo" = (
/obj/structure/disposalpipe/segment,
/turf/simulated/wall,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"dgp" = (
/obj/machinery/door/airlock/external{
name = "Escape Pod"
@@ -78856,8 +75292,7 @@
/area/atmos)
"dgt" = (
/obj/machinery/atmospherics/pipe/manifold/visible/cyan{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/obj/machinery/meter,
/turf/simulated/floor/plasteel,
@@ -79007,23 +75442,23 @@
/obj/effect/spawner/lootdrop/maintenance,
/obj/item/roller,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"dgY" = (
/obj/structure/rack,
/obj/effect/spawner/lootdrop/maintenance,
/obj/item/reagent_containers/food/snacks/donkpocket,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"dgZ" = (
/obj/item/c_tube,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"dha" = (
/obj/structure/mopbucket,
/obj/item/caution,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"dhc" = (
/obj/structure/lattice,
/obj/structure/lattice,
@@ -79050,7 +75485,7 @@
/obj/item/toy/minimeteor,
/obj/item/poster/random_contraband,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"dho" = (
/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{
dir = 8
@@ -79059,7 +75494,8 @@
/area/engine/engineering)
"dhp" = (
/obj/machinery/light_switch{
- pixel_y = -25
+ dir = 1;
+ pixel_y = -24
},
/obj/structure/table/wood,
/obj/item/reagent_containers/food/condiment/peppermill{
@@ -79125,8 +75561,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
@@ -79179,14 +75614,15 @@
/turf/simulated/floor/plating,
/area/turret_protected/aisat_interior)
"dhA" = (
+/obj/machinery/atmospherics/pipe/simple/visible/green,
/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,
/turf/simulated/floor/plasteel{
icon_state = "red"
},
@@ -79208,6 +75644,7 @@
/area/atmos)
"dhD" = (
/obj/machinery/computer/general_air_control/large_tank_control{
+ dir = 1;
frequency = 1441;
input_tag = "o2_in";
name = "Oxygen Supply Control";
@@ -79237,6 +75674,7 @@
/area/atmos)
"dhG" = (
/obj/machinery/computer/general_air_control/large_tank_control{
+ dir = 1;
frequency = 1443;
input_tag = "air_in";
name = "Mixed Air Supply Control";
@@ -79302,7 +75740,7 @@
"dhN" = (
/obj/machinery/alarm{
dir = 1;
- pixel_y = -22
+ pixel_y = -24
},
/turf/simulated/floor/plasteel{
icon_state = "freezerfloor"
@@ -79325,11 +75763,11 @@
/obj/structure/grille/broken,
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"dhQ" = (
/obj/structure/grille,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"dhR" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -79347,7 +75785,7 @@
/area/crew_quarters/toilet)
"dhV" = (
/obj/structure/sink/kitchen{
- pixel_y = 28
+ pixel_y = 25
},
/turf/simulated/floor/plasteel{
icon_state = "showroomfloor"
@@ -79359,7 +75797,7 @@
pixel_x = -1
},
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"dhZ" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 8
@@ -79412,7 +75850,7 @@
dir = 1;
icon_state = "bot"
},
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"dii" = (
/obj/machinery/atmospherics/pipe/simple/visible/yellow{
dir = 4
@@ -79492,13 +75930,13 @@
"diq" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/wall,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"dir" = (
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/simulated/wall,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"dis" = (
/obj/machinery/portable_atmospherics/scrubber,
/turf/simulated/floor/plating,
@@ -79557,7 +75995,7 @@
"dix" = (
/obj/item/twohanded/required/kirbyplants,
/obj/machinery/alarm{
- pixel_y = 23
+ pixel_y = 24
},
/obj/machinery/light{
dir = 1
@@ -79601,8 +76039,7 @@
req_access_txt = "75"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel{
@@ -79626,7 +76063,7 @@
/obj/item/screwdriver,
/obj/item/radio,
/obj/machinery/light_switch{
- pixel_y = 27
+ pixel_y = 24
},
/turf/simulated/floor/plasteel{
dir = 5;
@@ -79636,8 +76073,7 @@
"diE" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 4;
- initialize_directions = 11
+ dir = 4
},
/obj/effect/landmark/start{
name = "Cyborg"
@@ -79656,7 +76092,6 @@
/area/turret_protected/aisat_interior)
"diG" = (
/obj/structure/extinguisher_cabinet{
- pixel_x = -5;
pixel_y = 30
},
/turf/simulated/floor/plasteel{
@@ -79715,8 +76150,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,
@@ -79846,13 +76280,15 @@
/area/crew_quarters/bar)
"dji" = (
/obj/item/radio/intercom{
- pixel_y = 25
+ pixel_y = 28
},
/obj/machinery/camera{
c_tag = "Bar North"
},
/obj/structure/table/reinforced,
-/obj/machinery/chem_dispenser/soda,
+/obj/machinery/chem_dispenser/soda{
+ pixel_y = 8
+ },
/turf/simulated/floor/plasteel{
icon_state = "grimy"
},
@@ -79879,8 +76315,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -79891,12 +76326,12 @@
/obj/structure/table,
/obj/item/cartridge/medical,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"djm" = (
/obj/structure/closet/firecloset,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"djn" = (
/obj/structure/closet/secure_closet/freezer/meat,
/turf/simulated/floor/plasteel{
@@ -79980,7 +76415,7 @@
dir = 8
},
/obj/machinery/alarm{
- pixel_y = 22
+ pixel_y = 24
},
/obj/machinery/camera{
c_tag = "Hydroponics Pasture"
@@ -80007,27 +76442,17 @@
},
/obj/item/latexballon,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"djA" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced/tinted{
- dir = 8;
- tag = ""
- },
-/obj/structure/window/reinforced/tinted{
- dir = 1
- },
-/obj/structure/window/reinforced/tinted{
- dir = 4;
- tag = ""
- },
-/obj/structure/window/reinforced/tinted,
+/obj/effect/spawner/window/reinforced/tinted,
/turf/simulated/floor/plating,
/area/maintenance/asmaint2)
"djB" = (
/obj/machinery/atmospherics/pipe/simple/visible,
/obj/structure/grille,
-/obj/machinery/meter,
+/obj/machinery/meter{
+ layer = 2.9
+ },
/turf/simulated/wall/r_wall,
/area/atmos)
"djC" = (
@@ -80044,8 +76469,7 @@
icon_state = "2-4"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/cable{
@@ -80069,13 +76493,11 @@
/obj/structure/cable{
d1 = 1;
d2 = 4;
- icon_state = "1-4";
- tag = ""
+ icon_state = "1-4"
},
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 4;
- initialize_directions = 11
+ dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel{
@@ -80102,8 +76524,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
@@ -80131,8 +76552,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,
@@ -80147,26 +76567,20 @@
},
/turf/simulated/wall,
/area/maintenance/turbine)
-"djL" = (
-/obj/machinery/door/firedoor,
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "blue"
- },
-/area/hallway/primary/central/nw)
"djM" = (
/obj/item/shard,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"djN" = (
/obj/structure/disposalpipe/segment,
/obj/item/cigbutt/roach,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"djO" = (
/obj/machinery/door/airlock/public/glass{
name = "Central Access"
},
+/obj/machinery/door/firedoor,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "bluecorner"
@@ -80202,6 +76616,7 @@
/obj/structure/grille,
/obj/machinery/meter{
id = "mair_in_meter";
+ layer = 2.9;
name = "Mixed Air Tank In"
},
/turf/simulated/wall/r_wall,
@@ -80217,6 +76632,7 @@
/obj/structure/grille,
/obj/machinery/meter{
id = "mair_out_meter";
+ layer = 2.9;
name = "Mixed Air Tank Out"
},
/turf/simulated/wall/r_wall,
@@ -80229,8 +76645,7 @@
},
/obj/structure/cable{
d2 = 2;
- icon_state = "0-2";
- pixel_y = 1
+ icon_state = "0-2"
},
/turf/simulated/floor/plasteel,
/area/hallway/primary/central/nw)
@@ -80239,7 +76654,6 @@
c_tag = "Central Hallway North-West"
},
/obj/structure/extinguisher_cabinet{
- pixel_x = 5;
pixel_y = 30
},
/turf/simulated/floor/plasteel{
@@ -80258,7 +76672,7 @@
icon_state = "pipe-c"
},
/turf/simulated/wall,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"djZ" = (
/obj/machinery/light{
dir = 1
@@ -80277,8 +76691,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,
@@ -80295,7 +76708,7 @@
/area/turret_protected/aisat_interior)
"dkd" = (
/obj/machinery/light_switch{
- pixel_y = 27
+ pixel_y = 24
},
/turf/simulated/floor/plasteel{
dir = 4;
@@ -80305,8 +76718,7 @@
"dke" = (
/obj/effect/decal/warning_stripes/north,
/obj/machinery/light/small{
- dir = 4;
- pixel_y = 8
+ dir = 4
},
/obj/item/radio/intercom{
dir = 4;
@@ -80329,17 +76741,14 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/hologram/holopad,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 4;
- initialize_directions = 11
+ dir = 4
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/turf/simulated/floor/plasteel{
dir = 5;
@@ -80373,53 +76782,34 @@
frequency = 1441;
id_tag = "n2_sensor"
},
-/turf/simulated/floor/engine{
- name = "n2 floor";
- nitrogen = 100000;
- oxygen = 0
- },
+/turf/simulated/floor/engine/n2,
/area/atmos)
"dki" = (
-/obj/machinery/atmospherics/unary/outlet_injector{
+/obj/machinery/atmospherics/unary/outlet_injector/on{
dir = 1;
frequency = 1441;
- icon_state = "on";
- id = "n2_in";
- on = 1;
- volume_rate = 200
- },
-/turf/simulated/floor/engine{
- name = "n2 floor";
- nitrogen = 100000;
- oxygen = 0
+ id = "n2_in"
},
+/turf/simulated/floor/engine/n2,
/area/atmos)
"dkj" = (
/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
/area/maintenance/turbine)
"dkk" = (
-/obj/machinery/atmospherics/unary/vent_pump{
+/obj/machinery/atmospherics/unary/vent_pump/siphon/on{
dir = 1;
external_pressure_bound = 0;
frequency = 1441;
- icon_state = "in";
id_tag = "n2_out";
- initialize_directions = 1;
internal_pressure_bound = 4000;
- on = 1;
- pressure_checks = 2;
- pump_direction = 0
- },
-/turf/simulated/floor/engine{
- name = "n2 floor";
- nitrogen = 100000;
- oxygen = 0
+ pressure_checks = 2
},
+/turf/simulated/floor/engine/n2,
/area/atmos)
"dkl" = (
/obj/item/radio/intercom{
- pixel_y = 25
+ pixel_y = 28
},
/obj/machinery/door/firedoor,
/turf/simulated/floor/plasteel,
@@ -80444,8 +76834,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
dir = 4;
@@ -80460,12 +76849,10 @@
/turf/simulated/floor/engine/o2,
/area/atmos)
"dkq" = (
-/obj/machinery/atmospherics/unary/outlet_injector{
+/obj/machinery/atmospherics/unary/outlet_injector/on{
dir = 1;
frequency = 1441;
- icon_state = "on";
- id = "o2_in";
- on = 1
+ id = "o2_in"
},
/turf/simulated/floor/engine/o2,
/area/atmos)
@@ -80473,19 +76860,15 @@
/obj/machinery/portable_atmospherics/canister,
/obj/effect/decal/cleanable/cobweb,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"dks" = (
-/obj/machinery/atmospherics/unary/vent_pump{
+/obj/machinery/atmospherics/unary/vent_pump/siphon/on{
dir = 1;
external_pressure_bound = 0;
frequency = 1441;
- icon_state = "in";
id_tag = "o2_out";
- initialize_directions = 1;
internal_pressure_bound = 4000;
- on = 1;
- pressure_checks = 2;
- pump_direction = 0
+ pressure_checks = 2
},
/turf/simulated/floor/engine/o2,
/area/atmos)
@@ -80493,55 +76876,37 @@
/obj/structure/disposalpipe/segment,
/obj/effect/decal/cleanable/fungus,
/turf/simulated/wall,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"dku" = (
/obj/machinery/air_sensor{
frequency = 1443;
id_tag = "air_sensor";
output = 7
},
-/turf/simulated/floor/engine{
- name = "air floor";
- nitrogen = 10580;
- oxygen = 2644
- },
+/turf/simulated/floor/engine/air,
/area/atmos)
"dkv" = (
/mob/living/simple_animal/mouse,
/turf/simulated/floor/plating,
/area/maintenance/asmaint2)
"dkw" = (
-/obj/machinery/atmospherics/unary/outlet_injector{
+/obj/machinery/atmospherics/unary/outlet_injector/on{
dir = 1;
- frequency = 1441;
- icon_state = "on";
- id = "o2_in";
- on = 1;
- volume_rate = 200
- },
-/turf/simulated/floor/engine{
- name = "air floor";
- nitrogen = 10580;
- oxygen = 2644
+ frequency = 1443;
+ id = "air_in"
},
+/turf/simulated/floor/engine/air,
/area/atmos)
"dkx" = (
-/obj/machinery/atmospherics/unary/vent_pump/high_volume{
+/obj/machinery/atmospherics/unary/vent_pump/siphon/on{
dir = 1;
external_pressure_bound = 0;
frequency = 1443;
- icon_state = "in";
id_tag = "air_out";
internal_pressure_bound = 2000;
- on = 1;
- pressure_checks = 2;
- pump_direction = 0
- },
-/turf/simulated/floor/engine{
- name = "air floor";
- nitrogen = 10580;
- oxygen = 2644
+ pressure_checks = 2
},
+/turf/simulated/floor/engine/air,
/area/atmos)
"dky" = (
/obj/machinery/camera{
@@ -80604,8 +76969,7 @@
/area/maintenance/asmaint2)
"dkH" = (
/obj/machinery/light/small{
- dir = 4;
- pixel_y = 8
+ dir = 4
},
/obj/machinery/turretid/stun{
control_area = "\improper AI Satellite Service";
@@ -80689,15 +77053,13 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/obj/machinery/ai_slipper{
icon_state = "motion0"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 1;
- initialize_directions = 11
+ dir = 1
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/turf/simulated/floor/plasteel{
@@ -80714,18 +77076,14 @@
/turf/simulated/floor/carpet,
/area/crew_quarters/bar)
"dkO" = (
-/turf/simulated/floor/engine{
- name = "n2 floor";
- nitrogen = 100000;
- oxygen = 0
- },
+/turf/simulated/floor/engine/n2,
/area/atmos)
"dkP" = (
/obj/machinery/atmospherics/unary/portables_connector{
dir = 4
},
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"dkQ" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/manifold/visible{
@@ -80733,11 +77091,11 @@
},
/obj/machinery/meter,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"dkR" = (
/obj/machinery/alarm{
dir = 4;
- pixel_x = -22
+ pixel_x = -24
},
/obj/machinery/light/small{
dir = 8
@@ -80753,7 +77111,7 @@
dir = 4
},
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"dkT" = (
/turf/simulated/floor/engine/o2,
/area/atmos)
@@ -80762,8 +77120,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 = 4
@@ -80779,11 +77136,7 @@
name = "\improper AI Satellite Atmospherics"
})
"dkV" = (
-/turf/simulated/floor/engine{
- name = "air floor";
- nitrogen = 10580;
- oxygen = 2644
- },
+/turf/simulated/floor/engine/air,
/area/atmos)
"dkW" = (
/obj/machinery/door/firedoor,
@@ -80794,8 +77147,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
@@ -80814,8 +77166,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
@@ -80824,8 +77175,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 4;
- icon_state = "1-4";
- tag = ""
+ icon_state = "1-4"
},
/turf/simulated/floor/plasteel{
dir = 5;
@@ -80838,14 +77188,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;
@@ -80868,20 +77216,18 @@
dir = 4
},
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"dla" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 4;
- initialize_directions = 11
+ dir = 4
},
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"dlb" = (
/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
@@ -80903,8 +77249,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
@@ -80923,14 +77268,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/ai_slipper{
icon_state = "motion0"
@@ -80939,8 +77282,7 @@
dir = 4
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 4;
- initialize_directions = 11
+ dir = 4
},
/turf/simulated/floor/plasteel{
dir = 5;
@@ -80966,15 +77308,13 @@
"dlh" = (
/obj/machinery/door/airlock/external{
frequency = 1450;
- icon_state = "door_locked";
id_tag = "south_maint_outer";
locked = 1;
name = "External Access";
- req_access = null;
req_access_txt = "13"
},
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"dli" = (
/obj/structure/disposalpipe/segment,
/obj/structure/rack,
@@ -80996,8 +77336,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
@@ -81026,8 +77365,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
@@ -81045,7 +77383,7 @@
dir = 9
},
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"dlq" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel{
@@ -81061,7 +77399,7 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"dls" = (
/mob/living/simple_animal/bot/floorbot{
on = 0
@@ -81076,8 +77414,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/turretid/stun{
control_area = "\improper AI Satellite Hallway";
@@ -81106,11 +77443,7 @@
/area/turret_protected/aisat_interior)
"dlv" = (
/obj/machinery/light/small,
-/turf/simulated/floor/engine{
- name = "n2 floor";
- nitrogen = 100000;
- oxygen = 0
- },
+/turf/simulated/floor/engine/n2,
/area/atmos)
"dlw" = (
/obj/machinery/light/small,
@@ -81118,24 +77451,18 @@
/area/atmos)
"dlx" = (
/obj/machinery/light/small,
-/turf/simulated/floor/engine{
- name = "air floor";
- nitrogen = 10580;
- oxygen = 2644
- },
+/turf/simulated/floor/engine/air,
/area/atmos)
"dly" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door/airlock/public/glass{
autoclose = 0;
frequency = 1449;
heat_proof = 1;
- icon_state = "door_locked";
id_tag = "gas_turbine_interior";
locked = 1;
name = "Turbine Interior Airlock";
@@ -81153,7 +77480,7 @@
icon_state = "pipe-c"
},
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"dlB" = (
/obj/structure/chair{
dir = 8
@@ -81185,8 +77512,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{
@@ -81200,17 +77526,17 @@
/obj/structure/disposalpipe/segment,
/obj/machinery/light/small,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"dlN" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/universal,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"dlO" = (
/obj/structure/chair/stool,
/obj/effect/spawner/lootdrop/maintenance,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"dlP" = (
/obj/structure/disposalpipe/segment,
/obj/effect/landmark{
@@ -81225,7 +77551,7 @@
},
/obj/machinery/portable_atmospherics/canister/air,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"dlR" = (
/mob/living/simple_animal/bot/cleanbot{
on = 0
@@ -81260,8 +77586,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,
@@ -81316,8 +77641,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/turf/simulated/floor/engine,
/area/maintenance/turbine)
@@ -81347,7 +77671,7 @@
/obj/item/clipboard,
/obj/machinery/light/small,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"dmd" = (
/obj/machinery/door/airlock/maintenance_hatch{
name = "MiniSat Maintenance";
@@ -81356,8 +77680,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/plating,
@@ -81374,8 +77697,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,
@@ -81390,8 +77712,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/plating,
@@ -81402,14 +77723,12 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door/airlock/public/glass{
autoclose = 0;
frequency = 1449;
heat_proof = 1;
- icon_state = "door_locked";
id_tag = "gas_turbine_exterior";
locked = 1;
name = "Turbine Exterior Airlock";
@@ -81423,7 +77742,7 @@
icon_state = "pipe-c"
},
/turf/simulated/wall/r_wall,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"dmk" = (
/obj/structure/sign/securearea{
pixel_x = 32
@@ -81443,7 +77762,7 @@
on = 1
},
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"dmm" = (
/obj/structure/disposalpipe/segment{
dir = 8;
@@ -81451,7 +77770,7 @@
},
/obj/structure/closet/emcloset,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"dmn" = (
/obj/effect/decal/warning_stripes/west,
/obj/effect/spawner/lootdrop/maintenance,
@@ -81477,13 +77796,12 @@
name = "2maintenance loot spawner"
},
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"dms" = (
/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
@@ -81501,7 +77819,7 @@
/obj/effect/spawner/window/reinforced,
/obj/machinery/atmospherics/pipe/simple/visible/purple,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"dmu" = (
/obj/structure/disposalpipe/segment,
/turf/simulated/wall/r_wall,
@@ -81515,8 +77833,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
@@ -81540,8 +77857,7 @@
dir = 1
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 1;
- initialize_directions = 11
+ dir = 1
},
/turf/simulated/floor/plasteel,
/area/hallway/primary/port)
@@ -81554,13 +77870,8 @@
/turf/simulated/floor/engine,
/area/maintenance/turbine)
"dmz" = (
-/obj/machinery/atmospherics/unary/vent_pump{
- dir = 1;
- external_pressure_bound = 0;
- initialize_directions = 1;
- internal_pressure_bound = 4000;
- pressure_checks = 2;
- pump_direction = 0
+/obj/machinery/atmospherics/unary/passive_vent{
+ dir = 1
},
/obj/structure/sign/vacuum{
pixel_y = -30
@@ -81571,8 +77882,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/igniter{
id = "gasturbine"
@@ -81616,8 +77926,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/structure/sign/securearea{
pixel_x = -32
@@ -81659,8 +77968,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/hologram/holopad,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -81684,15 +77992,16 @@
/turf/simulated/floor/plating/airless,
/area/space/nearstation)
"dmO" = (
-/obj/structure/cable{
- d2 = 2;
- icon_state = "0-2"
- },
/obj/structure/cable,
/obj/machinery/power/compressor{
comp_id = "incineratorturbine";
dir = 1
},
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/engine,
/area/maintenance/turbine)
"dmP" = (
@@ -81712,8 +78021,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 9
@@ -81730,8 +78038,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
@@ -81743,7 +78050,7 @@
"dmS" = (
/obj/machinery/alarm{
dir = 4;
- pixel_x = -22
+ pixel_x = -24
},
/obj/machinery/camera/motion{
c_tag = "AI Satellite Hallway";
@@ -81761,8 +78068,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,
@@ -81789,8 +78095,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/item/radio/intercom/locked/ai_private{
broadcasting = 1;
@@ -81827,8 +78132,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,
@@ -81872,12 +78176,10 @@
/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;
- initialize_directions = 11
+ dir = 8
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel{
@@ -81890,7 +78192,7 @@
dir = 1
},
/turf/simulated/floor/plating/airless,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"dnh" = (
/obj/machinery/light/small{
dir = 1
@@ -81920,13 +78222,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/atmospherics/pipe/manifold/hidden/supply{
- dir = 4;
- initialize_directions = 11
+ dir = 4
},
/turf/simulated/floor/plasteel{
dir = 5;
@@ -81953,8 +78253,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/door/airlock/command/glass{
name = "AI Core";
@@ -81992,8 +78291,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/ai_slipper{
icon_state = "motion0"
@@ -82023,14 +78321,12 @@
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-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/scrubbers{
@@ -82058,8 +78354,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
@@ -82077,8 +78372,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{
@@ -82090,8 +78384,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/ai_slipper{
icon_state = "motion0"
@@ -82116,8 +78409,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
@@ -82131,14 +78423,12 @@
/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;
@@ -82207,7 +78497,7 @@
dir = 6
},
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"dnK" = (
/obj/machinery/disposal,
/obj/structure/disposalpipe/trunk{
@@ -82239,7 +78529,7 @@
tag_interior_door = "south_maint_inner"
},
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"dnM" = (
/obj/structure/table/wood,
/obj/item/taperecorder,
@@ -82264,22 +78554,20 @@
"dnO" = (
/obj/machinery/door/airlock/external{
frequency = 1450;
- icon_state = "door_locked";
id_tag = "south_maint_inner";
locked = 1;
name = "External Access";
- req_access = null;
req_access_txt = "13"
},
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 4
},
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"dnP" = (
/obj/machinery/atmospherics/pipe/simple/hidden,
/turf/simulated/floor/plating,
-/area/maintenance/asmaint)
+/area/maintenance/aft)
"dnQ" = (
/obj/machinery/access_button{
command = "cycle_interior";
@@ -82299,11 +78587,9 @@
"dnR" = (
/obj/machinery/door/airlock/external{
frequency = 1450;
- icon_state = "door_locked";
id_tag = "sci_inner";
locked = 1;
name = "External Access";
- req_access = null;
req_access_txt = "13"
},
/obj/machinery/atmospherics/pipe/simple/hidden,
@@ -82441,16 +78727,15 @@
"dof" = (
/obj/effect/spawner/window/reinforced,
/obj/machinery/atmospherics/pipe/simple/hidden{
- dir = 10;
- initialize_directions = 10
+ dir = 10
},
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"dog" = (
/obj/effect/spawner/window/reinforced,
/obj/machinery/atmospherics/pipe/simple/hidden,
/turf/simulated/floor/plating,
-/area/maintenance/fsmaint2)
+/area/maintenance/fsmaint)
"doh" = (
/obj/structure/cable{
d2 = 2;
@@ -82465,14 +78750,14 @@
},
/area/solar/starboard)
"doi" = (
-/obj/machinery/computer/card,
/obj/item/radio/intercom{
dir = 1;
- pixel_y = 25
+ pixel_y = 28
},
/obj/machinery/light{
dir = 1
},
+/obj/machinery/computer/card,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "red"
@@ -82480,7 +78765,8 @@
/area/security/checkpoint2)
"doj" = (
/obj/machinery/light_switch{
- pixel_x = 27
+ dir = 8;
+ pixel_x = 24
},
/turf/simulated/floor/plasteel{
dir = 5;
@@ -82524,11 +78810,9 @@
"dom" = (
/obj/machinery/door/airlock/external{
frequency = 1450;
- icon_state = "door_locked";
id_tag = "sci_outer";
locked = 1;
name = "External Access";
- req_access = null;
req_access_txt = "13"
},
/turf/simulated/floor/plating,
@@ -82539,7 +78823,6 @@
},
/obj/machinery/door/airlock/external{
frequency = 1379;
- icon_state = "door_locked";
id_tag = "atmospherics_south_inner";
locked = 1;
name = "Atmospherics External Access";
@@ -82588,8 +78871,7 @@
/area/maintenance/storage)
"dot" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/cyan{
- dir = 4;
- level = 2
+ dir = 4
},
/turf/simulated/wall,
/area/engine/controlroom)
@@ -82654,7 +78936,7 @@
/area/turret_protected/aisat_interior)
"doI" = (
/obj/item/radio/intercom{
- pixel_y = 25
+ pixel_y = 28
},
/obj/structure/chair/comfy/shuttle{
dir = 4
@@ -82691,10 +78973,12 @@
/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/pod_4)
"doN" = (
-/obj/machinery/computer/station_alert,
/obj/machinery/alarm{
dir = 4;
- pixel_x = -22
+ pixel_x = -24
+ },
+/obj/machinery/computer/station_alert{
+ dir = 4
},
/turf/simulated/floor/plasteel{
dir = 5;
@@ -82705,8 +78989,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
@@ -82723,8 +79006,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
@@ -82737,7 +79019,9 @@
},
/area/turret_protected/aisat_interior)
"dpb" = (
-/obj/machinery/computer/teleporter,
+/obj/machinery/computer/teleporter{
+ dir = 8
+ },
/turf/simulated/floor/plating,
/area/turret_protected/aisat_interior)
"dpd" = (
@@ -82757,8 +79041,7 @@
/area/turret_protected/aisat_interior)
"dpg" = (
/obj/machinery/light/small{
- dir = 4;
- pixel_y = 8
+ dir = 4
},
/obj/machinery/teleport/station,
/turf/simulated/floor/plating,
@@ -82874,21 +79157,17 @@
name = "\improper AI Satellite Atmospherics"
})
"dpF" = (
-/obj/structure/cable{
- d2 = 4;
- icon_state = "0-4"
- },
-/obj/machinery/computer/monitor{
- name = "Grid Power Monitoring Computer"
- },
/obj/structure/extinguisher_cabinet{
- pixel_x = -5;
pixel_y = 30
},
/obj/structure/cable{
d2 = 2;
icon_state = "0-2"
},
+/obj/machinery/computer/monitor{
+ dir = 8;
+ name = "Grid Power Monitoring Computer"
+ },
/turf/simulated/floor/plating,
/area/aisat/entrance{
name = "\improper AI Satellite Atmospherics"
@@ -82896,7 +79175,6 @@
"dpK" = (
/obj/machinery/cryopod/robot,
/obj/structure/extinguisher_cabinet{
- pixel_x = -5;
pixel_y = 30
},
/turf/simulated/floor/plating,
@@ -82929,7 +79207,7 @@
},
/obj/machinery/alarm{
dir = 4;
- pixel_x = -22
+ pixel_x = -24
},
/obj/machinery/space_heater,
/obj/machinery/camera{
@@ -82964,8 +79242,7 @@
})
"dpV" = (
/obj/machinery/light/small{
- dir = 4;
- pixel_y = 8
+ dir = 4
},
/obj/machinery/alarm{
dir = 8;
@@ -83190,7 +79467,7 @@
/area/turret_protected/ai)
"drq" = (
/obj/machinery/alarm{
- pixel_y = 22
+ pixel_y = 24
},
/obj/structure/chair{
dir = 8
@@ -83262,8 +79539,7 @@
/area/turret_protected/ai)
"drK" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 10;
- initialize_directions = 10
+ dir = 10
},
/turf/simulated/floor/plasteel{
dir = 5;
@@ -83293,8 +79569,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 4;
- icon_state = "1-4";
- tag = "90Curve"
+ icon_state = "1-4"
},
/obj/machinery/door/window/southright{
dir = 1;
@@ -83430,8 +79705,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 4;
- icon_state = "1-4";
- tag = "90Curve"
+ icon_state = "1-4"
},
/turf/simulated/floor/plasteel{
dir = 5;
@@ -83452,8 +79726,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/wall,
/area/turret_protected/ai)
@@ -83476,7 +79749,7 @@
"dsh" = (
/obj/machinery/alarm{
dir = 1;
- pixel_y = -22
+ pixel_y = -24
},
/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel{
@@ -83505,8 +79778,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/machinery/light/small{
dir = 8
@@ -83519,8 +79791,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,
@@ -83550,8 +79821,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,
@@ -83563,12 +79833,11 @@
/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/aft)
+/area/maintenance/aft2)
"dsH" = (
/obj/machinery/disposal,
/obj/structure/disposalpipe/trunk,
@@ -83588,8 +79857,7 @@
},
/obj/structure/cable{
d2 = 2;
- icon_state = "0-2";
- pixel_y = 1
+ icon_state = "0-2"
},
/turf/simulated/floor/plasteel,
/area/engine/engineering)
@@ -83603,7 +79871,7 @@
},
/obj/item/radio/intercom{
dir = 1;
- pixel_y = 25
+ pixel_y = 28
},
/obj/machinery/portable_atmospherics/canister/oxygen,
/turf/simulated/floor/plasteel,
@@ -83625,12 +79893,11 @@
/obj/structure/cable{
d1 = 1;
d2 = 8;
- icon_state = "1-8";
- tag = ""
+ icon_state = "1-8"
},
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
-/area/maintenance/aft)
+/area/maintenance/aft2)
"dsP" = (
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
@@ -83654,27 +79921,15 @@
/area/engine/chiefs_office)
"dsU" = (
/obj/effect/decal/cleanable/blood/oil,
-/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/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plating,
-/area/maintenance/aft)
-"dsW" = (
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
- },
-/turf/simulated/floor/plating,
-/area/maintenance/aft)
+/area/maintenance/aft2)
"dsY" = (
/obj/structure/chair,
/turf/simulated/floor/plasteel,
@@ -83707,10 +79962,10 @@
/obj/machinery/atmospherics/pipe/simple/visible/universal{
dir = 4
},
-/obj/structure/closet/wardrobe/atmospherics_yellow,
/obj/machinery/light{
dir = 8
},
+/obj/machinery/vending/atmosdrobe,
/turf/simulated/floor/plasteel,
/area/atmos)
"dtk" = (
@@ -83754,7 +80009,7 @@
"dtq" = (
/obj/machinery/alarm{
dir = 1;
- pixel_y = -22
+ pixel_y = -24
},
/obj/structure/table,
/obj/item/storage/belt/utility,
@@ -83845,14 +80100,19 @@
icon_state = "dark"
},
/area/engine/engineering)
+"dwg" = (
+/obj/machinery/computer/arcade/orion_trail{
+ dir = 4
+ },
+/turf/simulated/floor/carpet/arcade,
+/area/crew_quarters/arcade)
"dEP" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/turf/simulated/wall/r_wall,
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
"dLF" = (
-/obj/machinery/door/firedoor,
/obj/effect/decal/warning_stripes/yellow,
/obj/machinery/door/poddoor{
density = 0;
@@ -83870,8 +80130,7 @@
"dQp" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/turf/simulated/floor/plasteel,
/area/engine/engineering)
@@ -83881,11 +80140,14 @@
dir = 4
},
/obj/machinery/light{
- dir = 1;
- in_use = 1
+ dir = 1
},
/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{
@@ -83909,6 +80171,21 @@
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,
+/obj/effect/spawner/lootdrop/maintenance{
+ lootcount = 3;
+ name = "3maintenance loot spawner"
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
"egO" = (
/obj/machinery/meter,
/obj/machinery/atmospherics/pipe/simple/visible{
@@ -83916,6 +80193,21 @@
},
/turf/simulated/wall/r_wall,
/area/engine/supermatter)
+"eil" = (
+/obj/machinery/atmospherics/pipe/simple/insulated,
+/obj/machinery/meter{
+ layer = 3.3
+ },
+/obj/structure/window/plasmareinforced,
+/obj/structure/window/plasmareinforced{
+ dir = 1
+ },
+/obj/structure/window/plasmareinforced{
+ dir = 4
+ },
+/obj/structure/grille,
+/turf/simulated/floor/plating,
+/area/toxins/mixing)
"ejU" = (
/turf/space,
/area/space/nearstation)
@@ -83969,6 +80261,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/aft2)
"eJr" = (
/obj/effect/decal/warning_stripes/west,
/obj/structure/cable/yellow{
@@ -83982,8 +80286,7 @@
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/manifold/visible/cyan{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/obj/machinery/meter,
/turf/simulated/floor/engine,
@@ -83993,7 +80296,11 @@
dir = 6
},
/turf/simulated/wall,
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
+"eLB" = (
+/obj/item/seeds/potato,
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
"eMw" = (
/obj/structure/cable{
d1 = 4;
@@ -84030,6 +80337,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,
@@ -84039,6 +80350,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/aft2)
+"fcH" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/hydroponics/soil,
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
"fdg" = (
/obj/structure/reflector/single{
anchored = 1;
@@ -84048,6 +80368,17 @@
icon_state = "dark"
},
/area/engine/engineering)
+"fea" = (
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 5
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/aft2)
"fes" = (
/obj/structure/chair{
dir = 4
@@ -84065,15 +80396,32 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/light_switch{
- pixel_x = -27
+ dir = 4;
+ pixel_x = -24
},
/turf/simulated/floor/plasteel,
/area/crew_quarters/dorms)
+"fjj" = (
+/obj/machinery/atmospherics/binary/valve,
+/turf/simulated/floor/plating,
+/area/maintenance/aft2)
+"fmi" = (
+/obj/effect/spawner/lootdrop/maintenance{
+ lootcount = 3;
+ name = "3maintenance loot spawner"
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
+"fmN" = (
+/obj/machinery/computer/arcade/battle{
+ dir = 8
+ },
+/turf/simulated/floor/carpet/arcade,
+/area/crew_quarters/arcade)
"fqV" = (
/obj/effect/decal/warning_stripes/north,
/obj/machinery/atmospherics/pipe/simple/visible/cyan{
- dir = 6;
- initialize_directions = 6
+ dir = 6
},
/turf/simulated/floor/engine,
/area/engine/engineering)
@@ -84100,6 +80448,15 @@
icon_state = "dark"
},
/area/engine/engineering)
+"fIO" = (
+/obj/effect/spawner/window/reinforced,
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/plating,
+/area/assembly/assembly_line)
"fKd" = (
/obj/effect/spawner/window/reinforced/plasma,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
@@ -84107,6 +80464,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/aft2)
"fPU" = (
/obj/effect/decal/warning_stripes/west,
/obj/machinery/atmospherics/pipe/simple/visible{
@@ -84115,6 +80497,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{
@@ -84122,12 +80511,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/aft2)
"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/aft2)
"fYe" = (
/obj/machinery/light,
/turf/simulated/floor/plasteel{
@@ -84157,6 +80566,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;
@@ -84169,6 +80584,45 @@
},
/turf/simulated/floor/plating,
/area/engine/engineering)
+"gqA" = (
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/structure/cable{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 10
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/aft2)
+"gyA" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/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;
@@ -84184,6 +80638,14 @@
icon_state = "dark"
},
/area/engine/engineering)
+"gAJ" = (
+/obj/structure/cable{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/aft2)
"gCE" = (
/obj/structure/cable{
d1 = 1;
@@ -84238,9 +80700,6 @@
/turf/simulated/floor/plating/airless,
/area/engine/engineering)
"gMZ" = (
-/obj/machinery/atmospherics/pipe/simple/insulated{
- dir = 6
- },
/obj/machinery/door/poddoor{
density = 0;
icon_state = "open";
@@ -84248,13 +80707,24 @@
name = "Biohazard Shutter";
opacity = 0
},
-/obj/structure/grille,
-/obj/structure/window/plasmareinforced,
-/obj/structure/window/plasmareinforced{
- dir = 1
+/obj/machinery/atmospherics/binary/valve{
+ layer = 3.3
},
+/obj/effect/spawner/window/reinforced/plasma,
/turf/simulated/floor/plating,
/area/toxins/mixing)
+"gSd" = (
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/grille,
+/turf/simulated/floor/plating,
+/area/maintenance/aft2)
"gSS" = (
/obj/machinery/atmospherics/pipe/simple/visible/yellow{
dir = 9
@@ -84272,10 +80742,12 @@
/obj/machinery/atmospherics/pipe/simple/visible/cyan,
/turf/simulated/floor/engine,
/area/engine/engineering)
-"hsy" = (
-/obj/machinery/atmospherics/pipe/simple/insulated{
- dir = 4
+"heB" = (
+/turf/simulated/floor/wood{
+ icon_state = "wood-broken5"
},
+/area/maintenance/aft2)
+"hsy" = (
/obj/machinery/door/poddoor{
density = 0;
icon_state = "open";
@@ -84283,16 +80755,21 @@
name = "Biohazard Shutter";
opacity = 0
},
-/obj/structure/grille,
-/obj/structure/window/plasmareinforced{
- dir = 4
- },
-/obj/structure/window/plasmareinforced,
-/obj/structure/window/plasmareinforced{
- dir = 1
- },
+/obj/effect/spawner/window/reinforced/plasma,
/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";
@@ -84316,6 +80793,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,
@@ -84338,6 +80822,11 @@
},
/turf/simulated/floor/engine,
/area/engine/engineering)
+"hSm" = (
+/obj/structure/table/wood,
+/obj/effect/spawner/lootdrop/maintenance,
+/turf/simulated/floor/transparent/glass/reinforced,
+/area/maintenance/apmaint)
"idF" = (
/obj/effect/decal/warning_stripes/south,
/obj/machinery/atmospherics/trinary/filter/flipped{
@@ -84346,6 +80835,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{
@@ -84381,8 +80873,7 @@
anchored = 1
},
/obj/machinery/atmospherics/pipe/manifold/visible/supply{
- dir = 4;
- initialize_directions = 11
+ dir = 4
},
/obj/structure/cable/yellow{
d2 = 4;
@@ -84398,18 +80889,30 @@
},
/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
},
/turf/simulated/wall/r_wall,
/area/engine/engineering)
-"izn" = (
-/obj/machinery/atmospherics/unary/passive_vent{
- dir = 1
+"ivo" = (
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 4
},
-/turf/simulated/floor/plating/airless,
-/area/space/nearstation)
+/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"
+ },
+/area/medical/medbay2)
"iBS" = (
/obj/effect/decal/warning_stripes/northeast,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -84425,7 +80928,10 @@
/turf/simulated/floor/plating,
/area/engine/engineering)
"iJf" = (
-/obj/machinery/atmospherics/pipe/simple/insulated,
+/obj/machinery/atmospherics/binary/pump{
+ layer = 3.3;
+ name = "Cooling loop return"
+ },
/obj/machinery/door/poddoor{
density = 0;
icon_state = "open";
@@ -84433,24 +80939,9 @@
name = "Biohazard Shutter";
opacity = 0
},
-/obj/structure/grille,
-/obj/structure/window/plasmareinforced{
- dir = 8
- },
-/obj/structure/window/plasmareinforced,
-/obj/structure/window/plasmareinforced{
- dir = 1
- },
+/obj/effect/spawner/window/reinforced/plasma,
/turf/simulated/floor/plating,
/area/toxins/mixing)
-"iNz" = (
-/obj/machinery/atmospherics/pipe/simple/insulated{
- dir = 4
- },
-/turf/simulated/wall/r_wall,
-/area/toxins/launch{
- name = "Toxins Launch Room"
- })
"iRc" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 8
@@ -84475,6 +80966,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/aft2)
"iZs" = (
/obj/effect/spawner/window/reinforced,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -84498,6 +80994,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;
@@ -84542,6 +81047,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/aft2)
"jMw" = (
/obj/machinery/door/airlock/titanium,
/turf/simulated/floor/mineral/titanium,
@@ -84553,6 +81073,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
@@ -84563,17 +81089,15 @@
/turf/simulated/floor/plasteel,
/area/crew_quarters/dorms)
"jSI" = (
-/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,
/turf/simulated/floor/plating,
-/area/maintenance/aft)
+/area/maintenance/aft2)
"jUZ" = (
/obj/structure/window/plasmareinforced{
dir = 4
@@ -84590,14 +81114,21 @@
},
/turf/simulated/floor/engine,
/area/engine/supermatter)
+"jZu" = (
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plating,
+/area/maintenance/aft2)
"kbU" = (
/obj/machinery/door/airlock/external{
frequency = 1379;
- icon_state = "door_locked";
id_tag = "engineering_east_outer";
locked = 1;
name = "Engineering External Access";
- req_access = null;
req_access_txt = "10;13"
},
/turf/simulated/floor/plating,
@@ -84611,9 +81142,7 @@
"kiu" = (
/obj/structure/table/wood,
/obj/item/deck/cards,
-/turf/simulated/floor/plasteel{
- icon_state = "neutralcorner"
- },
+/turf/simulated/floor/plasteel,
/area/crew_quarters/dorms)
"kjI" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -84625,6 +81154,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;
@@ -84641,11 +81195,17 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/turf/simulated/floor/plating,
/area/bridge)
+"kIa" = (
+/obj/structure/rack{
+ dir = 4
+ },
+/obj/effect/spawner/lootdrop/maintenance,
+/turf/simulated/floor/plating,
+/area/maintenance/aft2)
"kIR" = (
/obj/structure/lattice/catwalk,
/obj/machinery/atmospherics/pipe/simple/hidden/yellow,
@@ -84682,7 +81242,7 @@
},
/obj/machinery/alarm{
dir = 4;
- pixel_x = -22
+ pixel_x = -24
},
/turf/simulated/floor/engine,
/area/engine/engineering)
@@ -84694,7 +81254,7 @@
/area/crew_quarters/dorms)
"kOE" = (
/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{
- dir = 4
+ dir = 1
},
/obj/structure/lattice,
/turf/space,
@@ -84712,6 +81272,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;
@@ -84723,6 +81295,15 @@
},
/turf/simulated/floor/engine,
/area/engine/engineering)
+"leB" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "freezerfloor"
+ },
+/area/medical/cryo)
"lkw" = (
/obj/machinery/light{
dir = 8
@@ -84755,8 +81336,7 @@
anchored = 1
},
/obj/machinery/atmospherics/pipe/manifold/visible/scrubbers{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/obj/structure/cable/yellow{
d2 = 8;
@@ -84764,6 +81344,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
@@ -84796,19 +81385,42 @@
"lLC" = (
/obj/machinery/alarm{
dir = 4;
- pixel_x = -22
+ pixel_x = -24
},
/obj/effect/decal/warning_stripes/yellow/partial{
dir = 1
},
/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"
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "yellowcorner"
+ },
+/area/hallway/primary/aft)
"lVr" = (
/obj/machinery/atmospherics/pipe/simple/visible/supply{
dir = 10
@@ -84830,6 +81442,21 @@
/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,
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
"mkE" = (
/obj/machinery/atmospherics/pipe/simple/hidden/yellow,
/obj/machinery/atmospherics/unary/vent_scrubber/on{
@@ -84914,11 +81541,21 @@
dir = 10
},
/turf/simulated/wall/r_wall,
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
+"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/aft2)
"nqX" = (
/obj/structure/table,
/obj/item/paper{
@@ -84988,6 +81625,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/aft2)
"nSi" = (
/obj/effect/decal/warning_stripes/southwest,
/obj/structure/closet/crate/can,
@@ -85021,14 +81665,35 @@
},
/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/aft2)
"oyv" = (
/obj/machinery/hologram/holopad,
-/turf/simulated/floor/plasteel{
- icon_state = "neutralcorner"
- },
+/turf/simulated/floor/plasteel,
/area/crew_quarters/dorms)
"oAS" = (
/obj/effect/decal/warning_stripes/south,
@@ -85037,6 +81702,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
@@ -85065,8 +81735,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
@@ -85096,6 +81765,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/aft2)
"phw" = (
/obj/machinery/power/supermatter_crystal/engine,
/turf/simulated/floor/engine,
@@ -85116,6 +81799,15 @@
},
/turf/simulated/floor/plating,
/area/engine/supermatter)
+"pow" = (
+/obj/structure/cable{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
+/obj/effect/spawner/random_barrier/obstruction,
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
"pwU" = (
/obj/effect/landmark/battle_mob_point,
/turf/simulated/floor/engine,
@@ -85132,12 +81824,12 @@
/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{
- dir = 4
+ dir = 1;
+ icon_state = "pipe-c"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -85146,17 +81838,21 @@
dir = 4
},
/turf/simulated/floor/plating,
-/area/maintenance/aft)
+/area/maintenance/aft2)
"pMd" = (
/obj/structure/closet/secure_closet/engineering_personal,
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- tag = ""
+ icon_state = "4-8"
},
/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
@@ -85193,6 +81889,17 @@
},
/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,
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
"qcg" = (
/obj/structure/cable{
d1 = 4;
@@ -85204,11 +81911,32 @@
},
/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/aft2)
"qmX" = (
/obj/effect/decal/warning_stripes/east,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 8;
- initialize_directions = 11
+ dir = 8
},
/turf/simulated/floor/engine,
/area/engine/engineering)
@@ -85240,6 +81968,21 @@
icon_state = "dark"
},
/area/engine/engineering)
+"qrr" = (
+/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/girder,
+/turf/simulated/floor/plating,
+/area/maintenance/aft2)
"qsT" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 9
@@ -85252,6 +81995,10 @@
},
/turf/simulated/wall/r_wall,
/area/engine/engineering)
+"qxh" = (
+/obj/structure/girder,
+/turf/simulated/floor/plating,
+/area/maintenance/aft2)
"qCB" = (
/obj/effect/decal/warning_stripes/west,
/obj/structure/cable/yellow{
@@ -85272,6 +82019,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/aft2)
+"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,
@@ -85279,6 +82042,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/aft2)
"qOo" = (
/obj/structure/chair{
dir = 4
@@ -85323,18 +82097,34 @@
},
/turf/simulated/floor/engine,
/area/engine/engineering)
+"rym" = (
+/obj/structure/window/reinforced,
+/obj/machinery/computer/scan_consolenew{
+ dir = 8
+ },
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "whitepurplefull"
+ },
+/area/medical/genetics)
"rzU" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
- icon_state = "1-2";
- tag = ""
+ icon_state = "1-2"
},
/obj/effect/decal/warning_stripes/yellow/partial{
dir = 4
},
/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,
@@ -85343,12 +82133,21 @@
/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/aft2)
"rTy" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
},
/obj/machinery/alarm{
- pixel_y = 22
+ pixel_y = 24
},
/turf/simulated/floor/bluegrid,
/area/tcommsat/chamber)
@@ -85356,8 +82155,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,
@@ -85384,6 +82182,14 @@
},
/turf/simulated/floor/engine,
/area/engine/engineering)
+"rZE" = (
+/mob/living/simple_animal/mouse,
+/turf/simulated/floor/plating,
+/area/maintenance/aft2)
+"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{
@@ -85418,6 +82224,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)
@@ -85435,6 +82259,11 @@
icon_state = "1-4"
},
/obj/effect/decal/warning_stripes/west,
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -85449,12 +82278,16 @@
/obj/machinery/alarm{
pixel_y = 24
},
-/obj/machinery/atmospherics/unary/vent_pump{
- dir = 8;
- on = 1
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 8
},
/turf/simulated/floor/plasteel,
/area/crew_quarters/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;
@@ -85507,12 +82340,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/aft2)
"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";
@@ -85545,6 +82395,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,
@@ -85552,6 +82407,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/aft2)
"ufc" = (
/obj/structure/cable{
d2 = 4;
@@ -85585,6 +82447,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
@@ -85680,13 +82552,6 @@
},
/turf/simulated/floor/plating,
/area/engine/supermatter)
-"vup" = (
-/obj/machinery/atmospherics/pipe/simple/insulated{
- dir = 10
- },
-/obj/structure/lattice,
-/turf/space,
-/area/space/nearstation)
"vBs" = (
/obj/machinery/atmospherics/pipe/simple/visible/yellow{
dir = 10
@@ -85707,11 +82572,10 @@
dir = 4
},
/obj/machinery/camera{
- c_tag = "Holodeck";
+ c_tag = "Holodeck East";
dir = 1
},
/obj/item/radio/intercom{
- name = "Station Intercom (General)";
pixel_y = -28
},
/obj/machinery/light/small,
@@ -85727,7 +82591,15 @@
dir = 4
},
/turf/simulated/wall,
-/area/maintenance/fsmaint)
+/area/maintenance/fore)
+"vVZ" = (
+/obj/machinery/atmospherics/pipe/manifold/hidden{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "freezerfloor"
+ },
+/area/medical/genetics_cloning)
"vWF" = (
/obj/structure/cable/yellow{
d1 = 4;
@@ -85765,7 +82637,9 @@
/turf/simulated/floor/plasteel/dark,
/area/tcommsat/chamber)
"whv" = (
-/obj/machinery/computer/HolodeckControl,
+/obj/machinery/computer/HolodeckControl{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/crew_quarters/dorms)
"wiS" = (
@@ -85774,15 +82648,29 @@
},
/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;
- pixel_x = -22
+ pixel_x = -24
},
/turf/simulated/floor/plasteel{
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"
+ },
+/turf/simulated/floor/plasteel,
+/area/assembly/assembly_line)
"wEY" = (
/obj/structure/cable{
d1 = 4;
@@ -85836,7 +82724,7 @@
dir = 1
},
/obj/machinery/firealarm{
- pixel_y = 27
+ pixel_y = 24
},
/turf/simulated/floor/plasteel,
/area/crew_quarters/dorms)
@@ -85868,6 +82756,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
@@ -85885,10 +82777,8 @@
/turf/simulated/floor/plasteel,
/area/crew_quarters/dorms)
"xAw" = (
-/obj/machinery/atmospherics/pipe/manifold/visible{
- dir = 8
- },
/obj/structure/lattice,
+/obj/machinery/atmospherics/pipe/simple/visible,
/turf/space,
/area/space/nearstation)
"xGn" = (
@@ -85900,6 +82790,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,
@@ -85907,9 +82801,7 @@
/area/engine/engineering)
"xVt" = (
/obj/item/twohanded/required/kirbyplants,
-/turf/simulated/floor/plasteel{
- icon_state = "neutralcorner"
- },
+/turf/simulated/floor/plasteel,
/area/crew_quarters/dorms)
"xWg" = (
/obj/machinery/atmospherics/pipe/simple/heat_exchanging{
@@ -85927,6 +82819,10 @@
},
/turf/simulated/floor/engine,
/area/engine/engineering)
+"xWX" = (
+/mob/living/simple_animal/hostile/scarybat,
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
"ykt" = (
/obj/machinery/door/airlock/maintenance{
name = "Atmospherics Maintenance";
@@ -85943,6 +82839,11 @@
/obj/machinery/atmospherics/pipe/simple/visible/yellow{
dir = 4
},
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plating,
/area/maintenance/storage)
"ylS" = (
@@ -101748,9 +98649,9 @@ aVe
bdu
bgM
beP
-bfc
+bgz
blF
-bfc
+bgz
blK
bnv
bnw
@@ -102506,7 +99407,7 @@ aLu
aLr
aGn
aGn
-aOY
+aII
aGn
aGn
aRB
@@ -103276,7 +100177,7 @@ aHl
aLx
aGn
aGn
-aNH
+aII
aGn
aGn
aGn
@@ -103288,9 +100189,9 @@ aWl
aYi
bag
bdK
-aZg
-bhS
-biB
+aXN
+bhT
+biC
blH
bpc
blM
@@ -103339,10 +100240,10 @@ cAX
cCy
cAX
cwx
-aaa
-aaa
-aaa
-aaa
+aab
+amh
+aab
+amh
aab
aaa
cNM
@@ -103852,11 +100753,11 @@ czQ
cBa
cCt
cDL
-cFd
+cwx
+aaa
aaa
aaa
aaa
-cJU
aab
aab
cNF
@@ -104109,11 +101010,11 @@ czJ
cBb
cCz
cDX
-cEW
-cFV
-cFV
-cFV
-cJS
+cwx
+aaa
+aaa
+aaa
+aaa
ayi
aab
cpz
@@ -104366,11 +101267,11 @@ czK
cBc
cCB
cDZ
-cEW
-cFW
-cFW
-cII
-cEW
+cwx
+aaa
+aaa
+aaa
+aaa
aaa
aab
cNM
@@ -104581,8 +101482,8 @@ bkg
blM
bnF
bpd
-bqv
-bqv
+bfc
+bfc
bwa
bng
blM
@@ -104623,11 +101524,11 @@ czK
cBd
czJ
cBb
-cEW
-cFX
-cFX
-cFX
-cEW
+cwx
+aaa
+aaa
+aaa
+aaa
ayi
aab
aaa
@@ -104880,11 +101781,11 @@ czR
cBn
cCD
cDO
-cEW
-cGe
-cFX
-cIG
-cEW
+cwx
+aaa
+aaa
+aaa
+aaa
ayi
aab
aaa
@@ -105058,7 +101959,7 @@ abN
abN
aqs
anf
-atz
+anf
avf
awO
abN
@@ -105072,12 +101973,12 @@ aaa
aaa
aaa
aaa
-aMA
-aPi
+aGn
+aHS
aOm
-aPt
-aLs
-aLs
+aIx
+aIx
+aIx
aRk
aSr
aSr
@@ -105130,18 +102031,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
@@ -105329,10 +102230,10 @@ aaa
aaa
aaa
aaa
-aMA
-aMQ
-aPi
-aPi
+aGn
+bQX
+aHS
+aHS
aHS
aMA
bcv
@@ -105393,17 +102294,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
@@ -105585,12 +102486,12 @@ abN
aab
aaa
aaa
-aMA
-aMA
-aMQ
+aGn
+aGn
+bQX
aOn
-aMA
-aMA
+aGn
+aGn
aMA
aRl
aSu
@@ -105644,23 +102545,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
@@ -105842,11 +102743,11 @@ abN
aSu
aSu
aab
-aMA
+aGn
aLB
-aMQ
-aPi
-aMA
+bQX
+aHS
+aGn
aaa
aQg
aRn
@@ -105901,22 +102802,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
@@ -106158,21 +103059,21 @@ aaa
aab
cgQ
ctV
-cgQ
-coL
-coL
coL
+cvp
+pZQ
+cwz
cBf
+oBH
coL
-cqz
-cEY
+cvp
cEv
-cFX
+cEK
cIK
-cEY
-cLm
cLi
+qJc
cLi
+cIJ
cLi
cLi
cLi
@@ -106415,21 +103316,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
@@ -106596,7 +103497,7 @@ aaa
aab
abN
ajf
-akL
+aLs
anf
aqM
abN
@@ -106671,23 +103572,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
@@ -106853,7 +103754,7 @@ aaa
aaa
abN
aji
-akL
+aLs
ado
abN
abN
@@ -106929,21 +103830,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
@@ -107144,10 +104045,10 @@ aWv
aZo
bbq
bcY
-beN
+aYR
bgA
blO
-bph
+bkl
bPr
brz
bsD
@@ -107186,21 +104087,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
@@ -107401,7 +104302,7 @@ aXR
aZq
aUE
aaa
-beK
+aZg
bgA
biJ
bkk
@@ -107442,22 +104343,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
@@ -107658,7 +104559,7 @@ aUE
aUE
aUE
aab
-beK
+aZg
bgA
biJ
bkg
@@ -107697,24 +104598,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
@@ -107957,21 +104858,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
@@ -108214,21 +105115,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
@@ -108471,21 +105372,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
@@ -108728,21 +105629,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
@@ -108924,7 +105825,7 @@ aCG
axb
aEQ
aGl
-aGm
+aQP
aPi
aKc
aLJ
@@ -108984,22 +105885,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
@@ -109168,8 +106069,8 @@ alE
abN
abN
anq
-aqR
-aqR
+abN
+abN
auh
avI
axc
@@ -109242,21 +106143,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
@@ -109439,7 +106340,7 @@ axb
aFc
aGo
aHu
-aGm
+aYc
aKf
aLL
aMY
@@ -109495,31 +106396,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
@@ -109694,8 +106595,8 @@ aBQ
aCH
axb
aET
-aGm
-aGm
+aPt
+aPt
aIV
aKc
aLK
@@ -109715,7 +106616,7 @@ aSA
aSA
aSA
aSA
-bfc
+bgz
bmz
bko
blK
@@ -109753,30 +106654,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
@@ -110010,32 +106911,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
@@ -110229,8 +107130,8 @@ bam
cGT
aUF
din
-djL
-bmB
+bgP
+bmV
bkq
blZ
bnS
@@ -110267,20 +107168,19 @@ bYM
cgQ
cnq
cqr
-cqF
-csp
-cqz
-cvo
-cwI
+coL
+cgQ
+fQq
+cqD
+tGO
cyk
-czM
-cwI
-cCG
+tGO
+nhn
+tDB
cEb
-cvo
-cEX
+cgQ
+cZw
cGj
-cJZ
cKb
cLx
cMt
@@ -110291,7 +107191,8 @@ cLv
cRE
cTd
cKb
-cRG
+rNN
+qrr
cNB
cLi
aab
@@ -110490,7 +107391,7 @@ bgP
bmV
bku
dnN
-bnO
+beu
bnO
bun
bnO
@@ -110523,22 +107424,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
@@ -110548,8 +107448,9 @@ cOr
cOV
cKb
cKb
-cRG
cNB
+qrr
+rNN
cLi
cLi
cLi
@@ -110781,20 +107682,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
@@ -110805,11 +107705,12 @@ cKb
cKb
cKb
cUh
+rNN
cRI
dsU
jSI
cUX
-cZw
+iYO
dar
dbt
ddG
@@ -111038,20 +107939,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
@@ -111059,12 +107959,13 @@ cJx
cNZ
cLf
cKb
+cNB
cPb
dsG
dsG
dsO
-dsW
-cNB
+fbx
+fbx
pzr
cZw
dar
@@ -111297,18 +108198,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
@@ -111316,6 +108216,7 @@ cJx
cNZ
cLd
cKb
+cNB
cPj
cSU
cSU
@@ -111554,7 +108455,7 @@ clR
coY
cqR
csy
-ctR
+cgS
aaa
aaa
aaa
@@ -111562,10 +108463,9 @@ aaa
aaa
aaa
aaa
-cFa
+cLi
cFk
-cGi
-cnA
+cNB
cKf
cLD
cMw
@@ -111573,6 +108473,7 @@ cME
cMx
cLf
cKb
+cNB
cPj
cSU
cUk
@@ -111811,7 +108712,7 @@ ckt
coX
cqI
csx
-ctR
+cgS
aaa
cwP
cyr
@@ -111819,10 +108720,9 @@ cyr
cyr
cCM
aaa
-cFa
+cLi
cFi
-cGi
-cnA
+cNB
cKb
cLE
cMz
@@ -111830,12 +108730,13 @@ cJx
cJx
cLn
cKb
+cNB
cPj
cSU
cUj
cVi
cWy
-cXD
+pxP
cVk
dtp
dar
@@ -112068,7 +108969,7 @@ coM
cpf
cqJ
csz
-ctR
+cgS
aaa
cwU
cyt
@@ -112076,10 +108977,9 @@ czT
cBr
cwU
aaa
-cFa
+cLi
cFl
-cGi
-cnA
+cZw
cKb
cKb
cMD
@@ -112087,7 +108987,8 @@ cNG
cNG
cLf
cKb
-cPj
+cNB
+gSd
cSU
dsI
pxP
@@ -112315,7 +109216,7 @@ bWY
bYS
bMG
cdU
-cft
+cfm
ciC
cgV
ciD
@@ -112325,7 +109226,7 @@ coH
ckt
cqK
clR
-ctR
+cgS
aaa
cwQ
cys
@@ -112333,10 +109234,9 @@ czS
cBq
cCN
aaa
-cFa
-cFi
-cGi
-cnA
+cLi
+qjC
+cZw
cKf
cLD
cJx
@@ -112344,6 +109244,7 @@ cNG
cOG
cOE
cKb
+cNB
cPj
cSU
dsH
@@ -112352,16 +109253,16 @@ dsP
dsP
cVs
cJC
-cXD
+pxP
cXS
cYv
-cXD
+pxP
cRg
aLz
dcl
tPd
kbU
-djb
+cPd
djb
djb
dib
@@ -112582,18 +109483,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
@@ -112601,6 +109501,7 @@ cJx
cJx
cOQ
cKb
+cEM
cPh
cSU
dsK
@@ -112829,7 +109730,7 @@ bXa
bVv
bMG
cdX
-cfx
+cgj
ciM
cgW
cgW
@@ -112848,9 +109749,8 @@ cBl
cCO
cEd
cvx
-cFi
-cGg
-cHc
+cFl
+cNB
cKf
cLF
cJg
@@ -112858,6 +109758,7 @@ cJx
cJx
cLD
cKb
+cNB
cPj
cSU
dsK
@@ -113105,9 +110006,8 @@ cAj
cAJ
cDW
cvx
-cFk
-cGi
-cnA
+fVJ
+cNB
cKb
cJx
cJi
@@ -113115,6 +110015,7 @@ cJx
cJx
cPv
cKb
+cNB
cPj
cSU
dsL
@@ -113279,7 +110180,7 @@ arD
ase
ajT
aDv
-aoj
+aMk
arc
arc
auD
@@ -113362,9 +110263,8 @@ cBs
cwO
cEe
cvx
-cFi
-cGi
-cnA
+cFl
+cGk
cKb
cJx
cJh
@@ -113372,6 +110272,7 @@ cJx
cJx
cNG
cKb
+cGk
cPj
cSU
dsK
@@ -113619,9 +110520,8 @@ cBu
cwO
cEe
cvx
-cFi
-cGi
-cnA
+cFl
+cZw
cKb
cLH
cJi
@@ -113629,6 +110529,7 @@ cNw
cNG
cNG
cKb
+cNB
cPj
cSU
dsK
@@ -113878,17 +110779,17 @@ cvx
cvx
cFo
cGn
-cnA
cKb
cKb
-cJj
+fKf
cNK
cMU
cNK
cKb
+cNB
cPj
cRR
-cFC
+cGl
cRJ
cHk
cRR
@@ -114134,22 +111035,22 @@ cAL
cDY
cvx
cFt
-cGl
+cHG
cHG
cKk
cLL
-cJl
cMG
cMG
-cPL
-cJZ
+cMG
+cAo
+cLi
cPj
cRR
cUu
cRM
cWD
cXG
-cYL
+cRR
cVj
cXx
cVj
@@ -114295,7 +111196,7 @@ ahS
aik
aiz
ajk
-anW
+aqR
alh
agt
amA
@@ -114307,7 +111208,7 @@ agM
ash
ajX
auc
-aoj
+aMk
arm
arm
auH
@@ -114391,15 +111292,15 @@ cvx
cvx
cvx
cFr
-cGi
+cHD
cHD
cHH
cIR
-cJk
+cHG
cHG
cHG
cNS
-dbp
+cCp
cPl
cRR
cQE
@@ -114593,7 +111494,7 @@ atc
aST
bdF
aSN
-aYc
+aSN
aZx
bbr
dcb
@@ -114632,16 +111533,16 @@ cgl
cjk
ckR
clO
-cmQ
+ckO
ckO
cpi
ckO
ckO
csI
cua
-cmQ
-cwJ
ckO
+cwJ
+crX
czA
cpi
cAN
@@ -114652,10 +111553,10 @@ cGp
cHg
cHL
cHJ
-cHI
+cHG
+cyR
cHD
-cHD
-cMV
+lUC
cJZ
cRR
cRR
@@ -114837,12 +111738,12 @@ aCJ
aDl
aEh
aFx
-aHq
+aAU
aIr
aKg
-aHq
-aHq
-aHq
+aAU
+aAU
+aAU
aAU
aQD
aRE
@@ -114850,9 +111751,9 @@ aSb
aSS
aUp
aVT
-aYC
+aVT
baE
-beu
+bhd
bhd
bhd
biI
@@ -114889,32 +111790,32 @@ cgk
cjj
ckQ
clN
-cmO
+coq
coq
cpg
cqv
crU
-ctj
-ctS
+cvJ
+cGo
cvJ
cww
-crU
+ctt
czz
cAk
cAM
-ctj
-ctj
-ctj
+cvJ
+cvJ
+cvJ
+cGo
cGo
-ctS
cHK
-cIS
cJm
+cIS
cKL
cOK
cNT
-cJZ
-cRR
+cCr
+cGi
cTf
cUw
cGY
@@ -114926,7 +111827,7 @@ cXx
cYm
cYQ
cNW
-ddS
+cVq
deB
dfr
cVN
@@ -115107,7 +112008,7 @@ aSc
aHT
aUq
aHT
-aYE
+aHT
baF
bev
bhh
@@ -115144,18 +112045,18 @@ bFC
cey
cgm
cfv
-ccl
+cdN
ciN
cfn
clZ
cnA
-cMV
+lUC
crV
ctl
cue
-cvK
-cMV
-crV
+cnA
+crd
+cuu
cnA
cHD
cHD
@@ -115168,9 +112069,9 @@ cHO
cHD
cHD
cnA
-cMV
-cOc
-cJZ
+lUC
+cnA
+cFv
cRR
cTi
cUy
@@ -115426,15 +112327,15 @@ cLT
cML
cHQ
cOL
-cNU
+cHQ
cFa
cRR
cTg
-cFC
+cGl
cHa
cHk
cRR
-cYI
+cRR
cZP
cXx
cVj
@@ -115663,7 +112564,7 @@ ccO
cfp
cmc
chc
-cqD
+cts
csD
csD
cut
@@ -115691,7 +112592,7 @@ cUt
pMd
cWB
cXL
-cYJ
+cZM
cWM
cXJ
cVj
@@ -115920,7 +112821,7 @@ ccN
cfo
cma
chc
-cqD
+cts
csD
csN
cuk
@@ -116177,7 +113078,7 @@ ccR
cmT
cmb
chc
-cqD
+cts
csD
csO
ctY
@@ -116197,15 +113098,15 @@ dcj
dcj
dcj
dcj
-cHT
+dcj
bHY
-cTe
+cRX
cPO
-cTe
-cRQ
+cRX
+cRS
cWJ
cPO
-cYR
+cZM
cVj
cXx
cVj
@@ -116434,7 +113335,7 @@ clP
cmR
cme
chc
-cqD
+cts
csD
csG
ctY
@@ -116940,16 +113841,16 @@ bXw
bXl
bZa
bSi
-ccl
-cfx
-cfy
+cdN
+cgj
+cfv
chc
cde
cmU
cgX
chc
cqP
-crd
+csD
csQ
cui
cvM
@@ -117127,7 +114028,7 @@ adQ
aek
aeA
aoJ
-aoJ
+apH
apI
anA
ahk
@@ -117211,7 +114112,7 @@ csD
csD
cvI
cvI
-cxz
+cvK
cxz
cvI
cvI
@@ -117233,15 +114134,15 @@ cQP
cRV
cSY
cUs
-cYM
+cHT
dac
vaH
uZx
sJK
cOi
-cVu
+cNU
cRh
-ePY
+cOc
cYQ
ePY
cTs
@@ -117385,7 +114286,7 @@ aej
aez
anL
aoE
-apH
+apJ
aqA
ahj
aiP
@@ -117454,7 +114355,7 @@ bXy
bXl
bZc
bSi
-bEn
+bFO
cgo
cfB
chf
@@ -117716,15 +114617,15 @@ cgI
cjn
ckT
clS
-cPd
-cPd
-cPd
+cJc
+cJc
+cJc
cqY
cmt
-csL
-csL
+cep
+cep
cvI
-cxm
+cyD
cyD
cyD
cAn
@@ -117975,13 +114876,13 @@ chf
chf
chf
chf
-csL
+cep
cqX
chf
csU
cub
cvI
-cxm
+cyD
cyD
cyD
cyD
@@ -118156,7 +115057,7 @@ amf
aez
ahe
aoF
-apL
+apJ
anx
ago
aiR
@@ -118232,13 +115133,13 @@ chf
cea
ceb
chf
-csL
+cep
cqX
cuc
chf
cuc
cvI
-cxm
+cyD
cyD
cyD
cAp
@@ -118259,7 +115160,7 @@ cSb
cTh
cSd
cOF
-cTk
+deJ
dfF
qoT
dcq
@@ -118489,20 +115390,20 @@ chf
cdW
ceb
cmt
-csL
+cep
cqZ
-crX
-ctt
-cuu
-cvN
-cwS
+cuE
+cEy
+daX
+cvI
+cyD
cxA
czD
-cAo
-cAo
+cyD
+cyD
cCP
cEc
-cFw
+cGK
cxC
cyQ
cKz
@@ -118747,10 +115648,10 @@ cec
cfr
chf
chf
-cFp
-csL
-csL
-csL
+cqZ
+cep
+cep
+cep
cvI
cvI
cvI
@@ -119193,7 +116094,7 @@ auE
axt
arF
atn
-auX
+axT
awC
axU
azc
@@ -119494,7 +116395,7 @@ bsN
aUS
aUS
bAg
-bHr
+bHs
bkC
bEp
bEp
@@ -119515,28 +116416,28 @@ chf
chf
chf
ced
-csL
-csL
-csL
-cqD
-csL
+cep
+cep
+cep
+cts
+cep
chf
cmt
chf
chf
chf
crl
-csL
+cep
ctZ
cuE
cKO
cxl
ctZ
-csL
-csL
-csL
+cep
+cep
+cep
cAm
-csL
+cep
cOT
cPZ
cPZ
@@ -119778,7 +116679,7 @@ ckS
crc
csK
chf
-csL
+cep
cnV
dgm
cQk
@@ -119786,7 +116687,7 @@ cQk
cQk
cQk
cQk
-cBP
+cxO
chf
cuc
chf
@@ -120007,9 +116908,9 @@ byD
bmq
bmq
aUS
-bAi
-bHt
-bAi
+bAk
+bHy
+bAk
bEp
aTS
bBM
@@ -120035,7 +116936,7 @@ chf
chf
chf
chf
-csL
+cep
cKO
cQk
cQk
@@ -120047,10 +116948,10 @@ cvZ
dcD
ddu
chf
-csL
-csL
+cep
+cep
cAm
-csL
+cep
cOT
cDk
cOA
@@ -120468,8 +117369,8 @@ alC
amp
amP
anV
-aof
-aoQ
+auX
+aHq
anA
ahQ
aiV
@@ -120562,7 +117463,7 @@ cxn
ddw
chf
czg
-csL
+cep
cAm
dfM
cOT
@@ -121076,7 +117977,7 @@ cFx
cxF
cQk
cTB
-csL
+cep
cKh
cLN
cOT
@@ -121333,7 +118234,7 @@ cFy
cxG
cQk
cKO
-csL
+cep
cjq
cLO
cOT
@@ -121520,7 +118421,7 @@ aGP
aIs
aJw
aKK
-aJz
+fmN
aOc
aPf
aQv
@@ -121549,9 +118450,9 @@ bmq
bmq
bzo
bze
-bAk
-bHy
-bDb
+bhS
+bph
+ccl
bEp
aUO
bDf
@@ -121777,7 +118678,7 @@ aGZ
aIs
aJz
aKK
-aJw
+dwg
aOf
aPf
aQv
@@ -121841,13 +118742,13 @@ cpM
crt
ctb
cum
-cvQ
+cvO
cwd
cxt
cGw
cyV
cQk
-csL
+cep
cKi
cLO
cBK
@@ -122014,7 +118915,7 @@ aoS
apW
aih
aqX
-asd
+aqW
atg
ame
avq
@@ -122104,10 +119005,10 @@ cxs
cxH
cyU
cQk
-csL
+cep
cjq
cLO
-cBP
+cxO
cQp
cQZ
cSn
@@ -122271,7 +119172,7 @@ aih
aih
aih
aqX
-asd
+aqW
akE
amw
avq
@@ -122361,10 +119262,10 @@ cFz
cxP
cyX
cQk
-csL
+cep
cjq
cLO
-cBP
+cxO
cQp
cQZ
cSu
@@ -122519,18 +119420,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
@@ -122621,7 +119522,7 @@ cQk
cKO
cjq
cLP
-cBP
+cxO
cQp
cQZ
cSs
@@ -122777,17 +119678,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
@@ -122878,7 +119779,7 @@ cQk
ctZ
cjq
cLO
-cBP
+cxO
cQp
cQZ
cSw
@@ -123034,17 +119935,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
@@ -123135,7 +120036,7 @@ cQk
czo
cjq
cLO
-cBP
+cxO
cQp
cQZ
cQZ
@@ -123291,17 +120192,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
@@ -123321,8 +120222,8 @@ rFd
jPN
nCT
fho
-bbw
-bbw
+aWY
+aWY
aSR
aVu
aWY
@@ -123389,10 +120290,10 @@ cxx
cGy
cza
cQk
-csL
+cep
cKl
cLO
-cBP
+cxO
cNE
cPw
cPw
@@ -123548,17 +120449,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
@@ -123578,9 +120479,9 @@ qOo
qOo
jRV
aPm
-aTb
-aTb
-aTb
+aPm
+aPm
+aPm
aVt
aWX
aZH
@@ -123613,7 +120514,7 @@ aWI
bDl
bDl
bJZ
-bDl
+cjT
bTT
bPK
bQY
@@ -123649,25 +120550,25 @@ cQk
cyJ
cKj
cLO
-cBP
-cBP
-cBP
-cBQ
-cBQ
-cBQ
-cBP
-cBP
-cBQ
-cBQ
-cBQ
-cBP
-cBP
-cBQ
-cBQ
-cBQ
-cBP
-cBP
-cBP
+cxO
+cxO
+cxO
+cAe
+cAe
+cAe
+cxO
+cxO
+cAe
+cAe
+cAe
+cxO
+cxO
+cAe
+cAe
+cAe
+cxO
+cxO
+cxO
dgS
dhL
cXm
@@ -123805,24 +120706,24 @@ 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
aEI
awH
ayg
-awF
+aOY
eJA
iZs
iZs
@@ -123836,8 +120737,8 @@ eYG
eYG
dVs
aPk
-aTb
-aTb
+aPm
+aPm
aVt
aXf
aXf
@@ -123899,11 +120800,11 @@ cQk
cQk
cQk
cPc
-csL
+cep
cyJ
cyJ
-csL
-csL
+cep
+cep
cKn
cLW
cNb
@@ -123915,21 +120816,21 @@ cNb
cRW
cNb
cUC
-cPd
-cPd
-cPd
-cPd
-cPd
+cJc
+cJc
+cJc
+cJc
+cJc
daz
dbd
-cBP
-csL
+cxO
+cep
cTB
dgT
cTV
cYg
dcz
-dcz
+cPL
ddg
ddo
dgS
@@ -124062,23 +120963,23 @@ 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
arR
avb
aAQ
-awF
+aNH
aye
vUG
sHt
@@ -124094,7 +120995,7 @@ sHt
aOh
kiu
oyv
-aTb
+aPm
aVv
aXf
aXf
@@ -124164,13 +121065,13 @@ cmJ
cKm
cLU
cnV
-csL
-csL
-csL
-csL
-csL
+cep
+cep
+cep
+cep
+cep
ctZ
-csL
+cep
cUA
cEx
dae
@@ -124181,13 +121082,13 @@ cYl
daU
dbz
cOj
-csL
+cep
dgT
cTX
cYy
dcA
dda
-ddh
+cYy
ddp
dll
dlI
@@ -124319,12 +121220,12 @@ aaa
aaa
aaa
aaa
-alJ
aaa
aaa
aaa
aaa
-aqe
+aaa
+aaa
aaa
aaa
aaa
@@ -124350,7 +121251,7 @@ sHt
sHt
aOh
xVt
-aTb
+aPm
aNQ
aVz
aXf
@@ -124394,7 +121295,7 @@ bZJ
cbV
bWa
bWa
-bZv
+leB
bZv
ccD
cDf
@@ -124417,27 +121318,27 @@ crD
crD
chf
chf
-cBQ
-cBQ
+cAe
+cAe
cMi
-cBQ
+cAe
cDm
cMf
chf
-csL
+cep
ctZ
ctZ
-csL
+cep
cUA
chf
-csL
+cep
cBN
dbM
cuc
cuc
chf
dbC
-cNq
+cts
dcs
dgT
dcH
@@ -124607,7 +121508,7 @@ sHt
sHt
aOh
aPn
-aTb
+aPm
aNL
aVw
aXf
@@ -124674,16 +121575,16 @@ cxy
cyK
chf
czh
-csL
+cep
cAv
cLX
-csL
+cep
chf
-csL
+cep
cEx
-csL
-csL
-csL
+cep
+cep
+cep
cxl
cUA
cyJ
@@ -124695,7 +121596,7 @@ cTB
chf
dbA
dcp
-cPd
+cJc
dcw
dcG
dcQ
@@ -124908,7 +121809,7 @@ bZP
cbW
bWA
bWA
-bWA
+ivo
caQ
ccE
cei
@@ -124949,10 +121850,10 @@ cWq
cWq
cWq
daB
-ckK
+ckS
dbD
crc
-csL
+cep
dgT
cVH
dcu
@@ -125192,10 +122093,10 @@ czp
cAw
cMo
cBM
-cBQ
+cAe
cyJ
cEy
-csL
+cep
chf
cAu
chf
@@ -125449,12 +122350,12 @@ czr
cAy
cMA
cBT
-cBQ
-csL
+cAe
+cep
cEA
-csL
+cep
cMf
-csL
+cep
chf
cIk
cJs
@@ -125662,8 +122563,8 @@ beb
beb
beb
bAp
-bHy
-bCZ
+bph
+cft
bEu
aYq
aZT
@@ -125705,11 +122606,11 @@ chf
cyJ
cAx
cFp
-csL
+cep
chf
-csL
+cep
cEz
-csL
+cep
chf
cyJ
cyP
@@ -125717,23 +122618,23 @@ cIj
cIm
cKu
cKM
-csL
+cep
cNd
daA
-csL
-csL
+cep
+cep
dgm
chf
dhk
dhY
-csL
+cep
djl
dir
dkr
dkP
dkP
-csL
-cBP
+cep
+cxO
aab
aaa
aab
@@ -125931,7 +122832,7 @@ aZT
aZT
bWd
bSC
-bYg
+bUa
bZX
ccb
bWD
@@ -125955,20 +122856,20 @@ ctn
cBy
cvW
bUA
-cBP
+cxO
cyN
-csL
+cep
czl
czs
cAz
cFp
-csL
+cep
cDn
-csL
+cep
cyJ
cFq
chf
-csL
+cep
cyP
cIm
cJu
@@ -125982,16 +122883,16 @@ dbY
cTB
dgn
dgX
-csL
-csL
-csL
+cep
+cep
+cep
djY
dgo
dkQ
dlp
dlM
dmi
-cBP
+cxO
aab
aab
aaa
@@ -126188,7 +123089,7 @@ bOX
bQF
bWd
bSB
-bUa
+vVZ
bZS
cbZ
bWC
@@ -126212,7 +123113,7 @@ ctm
cuy
cvV
cSQ
-cBP
+cxO
cyN
cyN
chf
@@ -126233,22 +123134,22 @@ cJt
cIj
cIj
cDn
-csL
+cep
cyJ
dbE
-csL
+cep
chf
dgY
-csL
+cep
chf
-csL
+cep
djM
chf
dkZ
-csL
-csL
+cep
+cep
dfM
-cBP
+cxO
aaa
aaa
aaa
@@ -126419,7 +123320,7 @@ aGX
bcg
bfQ
beb
-bfF
+bif
bjW
beb
bkU
@@ -126469,7 +123370,7 @@ ctp
cBz
cvY
daI
-cBP
+cxO
chf
chf
chf
@@ -126482,7 +123383,7 @@ cEp
cEC
cFs
cyJ
-csL
+cep
chf
cIo
cJv
@@ -126490,7 +123391,7 @@ cKA
cJt
cMc
cNf
-csL
+cep
cyJ
dce
cYi
@@ -126503,9 +123404,9 @@ cYi
dgo
dkS
dlA
-csL
+cep
dfM
-cBQ
+cAe
aaa
aaa
aaa
@@ -126722,11 +123623,11 @@ ciY
cwY
cqM
cqM
-cwn
+cws
cws
cRu
daH
-cBP
+cxO
cmA
czb
chf
@@ -126742,12 +123643,12 @@ cyJ
cHd
chf
cIn
-csL
+cep
cIj
cKS
cMb
cNf
-csL
+cep
cyJ
dcd
dfL
@@ -126919,7 +123820,7 @@ aIB
aGT
aKT
aGY
-aKX
+aYC
aGY
aHP
aVA
@@ -126967,10 +123868,10 @@ bWi
bZB
caX
bWi
-cep
-cep
-cep
-cep
+cBP
+cBP
+cBP
+cBP
ciY
ciY
ciY
@@ -126993,7 +123894,7 @@ cLX
cBX
chf
csK
-csL
+cep
cFs
cyJ
chf
@@ -127004,22 +123905,22 @@ cKC
cJt
cMe
cNg
-csL
-csL
+cep
+cep
dch
-csL
+cep
cJG
chf
dhQ
chf
chf
-csL
+cep
chf
-csL
+cep
dfM
dlO
dmr
-cBQ
+cAe
aaa
aaa
aaa
@@ -127175,8 +124076,8 @@ aHI
aIA
aJD
aKS
-aMk
-aMk
+aZQ
+aZQ
aOE
aGX
aQL
@@ -127231,18 +124132,18 @@ ciY
ckJ
cmd
cga
-bQX
+csL
ciY
cwY
-bQX
+csL
bUx
ctq
cuC
-csL
-csL
+cep
+cep
ceb
ceb
-csL
+cep
chf
chf
chf
@@ -127250,12 +124151,12 @@ cMF
chf
chf
cEq
-csL
-csL
+cep
+cep
csK
chf
cHZ
-csL
+cep
cYj
cKB
cJu
@@ -127276,7 +124177,7 @@ cYi
ddH
cXr
dmm
-cBP
+cxO
aaa
aaa
aaa
@@ -127532,8 +124433,8 @@ dgo
cYi
cYi
dmc
-cBP
-cBP
+cxO
+cxO
aaa
aaa
aaa
@@ -127751,28 +124652,28 @@ cpF
cxD
cAa
cfZ
-bQX
-bQX
-bQX
-bQX
-bQX
-bQX
-bQX
-bQX
+csL
+csL
+csL
+csL
+csL
+csL
+csL
+csL
csL
csL
cNi
cDo
ciY
cED
-bQX
+csL
chf
cHe
-csL
-csL
+cep
+cep
cTQ
cTQ
-csL
+cep
cJv
chf
cPa
@@ -127781,7 +124682,7 @@ ciY
chf
chf
dha
-csL
+cep
dfM
djz
chf
@@ -127789,7 +124690,7 @@ cBN
dnJ
dnP
dlQ
-cBP
+cxO
aaa
aaa
aaa
@@ -127993,7 +124894,7 @@ bVZ
bXv
bYk
bZB
-caX
+rym
bWi
clp
clp
@@ -128006,20 +124907,20 @@ cpR
cpR
cpR
cxD
-bQX
-cep
-cep
-cep
-cts
-cts
-cts
-cep
-cep
-cep
+csL
+cBP
+cBP
+cBP
+cBQ
+cBQ
+cBQ
+cBP
+cBP
+cBP
cBP
csL
cNq
-bQX
+csL
ciY
cga
cga
@@ -128041,12 +124942,12 @@ cuQ
cEG
dhR
bGH
-cBP
-cBP
+cxO
+cxO
dnO
-cBP
-cBP
-cBP
+cxO
+cxO
+cxO
aab
aaa
aaa
@@ -128263,8 +125164,8 @@ cuJ
cwj
cpR
cxD
-bQX
-cep
+csL
+cBP
aab
aab
aaa
@@ -128273,7 +125174,7 @@ aaa
aaa
aaa
aaa
-cep
+cBP
cBG
cNp
cOm
@@ -128299,9 +125200,9 @@ dcI
dcW
bGH
aaa
-cBQ
+cAe
dnL
-cBQ
+cAe
aaa
aaa
aaa
@@ -128520,8 +125421,8 @@ cuL
cpl
cpR
cxD
-bQX
-cep
+csL
+cBP
aab
aab
aab
@@ -128530,15 +125431,15 @@ aaa
aaa
aaa
aaa
-cep
+cBP
cBH
cDg
-bQX
-bQX
-bQX
-cFv
-bQX
-bQX
+csL
+csL
+csL
+cfZ
+csL
+csL
cIc
cIq
cIq
@@ -128548,7 +125449,7 @@ cIq
cIq
cPf
cDo
-cep
+cBP
bGH
bGH
bGH
@@ -128556,9 +125457,9 @@ dia
dcW
bZZ
aaa
-cBQ
-csL
-cBQ
+cAe
+cep
+cAe
aaa
aaa
aaa
@@ -128777,8 +125678,8 @@ cuK
cwq
cpR
cxK
-bQX
-cep
+csL
+cBP
aaa
aab
aab
@@ -128786,8 +125687,8 @@ aab
aaa
aaa
aaa
-cep
-cep
+cBP
+cBP
ciY
ciY
ciY
@@ -128804,8 +125705,8 @@ ciY
ciY
ciY
dci
-cep
-cep
+cBP
+cBP
aaa
aaa
bZZ
@@ -128813,9 +125714,9 @@ dia
dcW
bZZ
aaa
-cBQ
+cAe
dlh
-cBQ
+cAe
aaa
aaa
aaa
@@ -129034,8 +125935,8 @@ cuM
cwl
cxc
cxQ
-bQX
-cep
+csL
+cBP
aaa
aaa
aab
@@ -129043,25 +125944,25 @@ aab
aab
aaa
aaa
-cep
-bQX
-bQX
-bQX
+cBP
+csL
+csL
+csL
cDp
ciY
cEF
-bQX
-bQX
+csL
+csL
bUx
cIb
-bQX
-bQX
-bQX
-bQX
-bQX
-bQX
-bQX
-cep
+csL
+csL
+csL
+csL
+csL
+csL
+csL
+cBP
aaa
aaa
aaa
@@ -129290,9 +126191,9 @@ ctw
cuK
cvT
cpR
-cxO
+cxT
cAc
-cts
+cBQ
aaa
aaa
aaa
@@ -129300,25 +126201,25 @@ aab
aab
aab
aaa
-cep
+cBP
cAE
cBI
cDh
-bQX
+csL
ciY
cEE
-cFv
-bQX
+cfZ
+csL
cHf
cIb
cIr
cpE
cKE
ciY
-bQX
+csL
cNh
-cFv
-cep
+cfZ
+cBP
aaa
aaa
aaa
@@ -129517,7 +126418,7 @@ bAX
bau
bau
bFn
-bHI
+bHr
bzc
bEA
bEA
@@ -129547,35 +126448,35 @@ ctB
cuO
crL
cpR
-cxO
-cAe
-cts
+cxT
+cxi
+cBQ
aaa
aaa
aaa
aaa
aab
-cep
-cep
-cep
-cep
-cep
-cep
-cep
-cep
-cep
-cep
-cep
-cep
+cBP
+cBP
+cBP
+cBP
+cBP
+cBP
+cBP
+cBP
+cBP
+cBP
+cBP
+cBP
cIb
cIs
-bQX
+csL
cKF
ciY
cMh
cKF
-cep
-cep
+cBP
+cBP
aab
aab
aab
@@ -129806,7 +126707,7 @@ cwm
cpR
cxR
cAd
-cts
+cBQ
aaa
aaa
aaa
@@ -129831,7 +126732,7 @@ ciY
ciY
ciY
ciY
-cep
+cBP
aaa
aaa
aaa
@@ -130061,9 +126962,9 @@ crL
cuS
cpR
cxI
-cxO
+cxT
cpH
-cep
+cBP
aaa
aaa
aaa
@@ -130085,9 +126986,9 @@ cIb
cIu
cJz
cKG
-bQX
-bQX
-cep
+csL
+csL
+cBP
aaa
aaa
aaa
@@ -130259,7 +127160,7 @@ aGY
aJE
aGY
aGY
-aKX
+aYE
aGY
aGY
aGX
@@ -130318,9 +127219,9 @@ ctu
cuR
cpR
cpH
-cxO
-cep
-cep
+cxT
+cBP
+cBP
aaa
aaa
aaa
@@ -130341,10 +127242,10 @@ cJK
cIb
cIt
cIr
-bQX
-bQX
+csL
+csL
aqF
-cep
+cBP
aaa
aaa
aaa
@@ -130575,8 +127476,8 @@ ctv
cuX
bIi
cpI
-cxO
-cep
+cxT
+cBP
aaa
aaa
aaa
@@ -130596,12 +127497,12 @@ cTJ
cVe
cWi
cIb
-cep
-cep
-cep
-cep
-cep
-cep
+cBP
+cBP
+cBP
+cBP
+cBP
+cBP
ddF
aaa
aaa
@@ -131029,17 +127930,17 @@ aGX
aGX
aHP
aJK
-aKX
+aYC
aGY
aGY
aGY
aGX
-aQP
-aMk
-aMk
-aMk
-aMk
-aMk
+aXW
+aZQ
+aZQ
+aZQ
+aZQ
+aZQ
aXa
aZd
bcA
@@ -132857,9 +129758,9 @@ boJ
boJ
bya
aYQ
-aSI
-bHI
-bwv
+biB
+bHr
+cfx
bDq
bGK
bIt
@@ -133373,7 +130274,7 @@ boJ
aYQ
aSI
bHI
-bwv
+cfy
bEM
bGK
bIv
@@ -133659,7 +130560,7 @@ cgs
cuP
cwu
bGG
-cyR
+dia
cAP
cCg
cDC
@@ -133916,7 +130817,7 @@ cgs
cuQ
cuQ
bGG
-cyR
+dia
cAP
aac
cDw
@@ -134430,7 +131331,7 @@ cgs
bGG
cuQ
cxZ
-cyR
+dia
cAP
cCb
cDw
@@ -134668,7 +131569,7 @@ cZp
cZp
cZT
bEG
-cjT
+cBD
cBe
cba
ccM
@@ -134687,7 +131588,7 @@ cgs
cgs
cgs
cya
-cyR
+dia
cAP
cCc
cDw
@@ -134892,7 +131793,7 @@ aaa
aGX
aGX
aGX
-aIF
+aGX
aYP
aYF
baC
@@ -134905,9 +131806,9 @@ aYP
bjL
blq
blI
-aYR
+aYP
aYQ
-aYR
+aYP
bEF
bmm
bAZ
@@ -134944,7 +131845,7 @@ ctI
cvc
cgs
ctF
-cyR
+dia
cAP
cCi
cDw
@@ -135150,21 +132051,21 @@ aaa
aab
aab
aab
-aYR
-aYR
-aYR
-aYR
+aYP
+aYP
+aYP
+aYP
aXl
-aYR
+aYP
aYQ
aYQ
-aYR
-aYR
-aYR
-aYR
-aYR
+aYP
+aYP
+aYP
+aYP
+aYP
aab
-bEG
+bEF
bsP
buH
bBd
@@ -135201,7 +132102,7 @@ cto
cve
cgs
bGG
-cyR
+dia
cAP
cCk
cBC
@@ -135421,7 +132322,7 @@ aab
aaa
aaa
aab
-bEG
+bEF
bsO
bmm
bBc
@@ -135678,7 +132579,7 @@ aab
aaa
aab
aab
-bEG
+bEF
bta
bmm
bBc
@@ -135695,12 +132596,12 @@ cZk
cZk
cZk
daa
-big
-big
-big
-big
-cjA
aYS
+bGH
+bGH
+bGH
+bGH
+bGH
aaa
dbP
cgs
@@ -135952,19 +132853,19 @@ bxX
bSa
bmm
cYk
-dat
-baN
-daZ
-dbo
-bcH
aYS
aaa
+aaa
+aaa
+aaa
+aaa
+aaa
dbP
cgy
cia
cia
clx
-cnc
+cne
cqf
crJ
cse
@@ -135972,7 +132873,7 @@ csc
cvf
cgs
bGG
-cyR
+dia
cAP
cCl
cDF
@@ -136205,17 +133106,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
@@ -136229,7 +133130,7 @@ crB
cuW
cgs
bGG
-cyR
+dia
cAP
cCn
cDH
@@ -136466,19 +133367,19 @@ boD
bSc
bmm
dak
-dat
-baO
-bYo
-bcl
-ccP
aYS
aaa
+aaa
+aaa
+aaa
+aaa
+aaa
dbX
cgy
cib
cjX
cnE
-cne
+eil
cqh
crJ
cse
@@ -136486,7 +133387,7 @@ ctE
cvg
cgs
bGG
-cyR
+dia
cAP
cAP
bGH
@@ -136723,13 +133624,13 @@ cZm
cZm
cZm
bmm
-big
-baG
-bYq
-bcI
-ccS
aYS
aaa
+aaa
+aaa
+aaa
+aaa
+aaa
dbX
cgs
cgs
@@ -136743,7 +133644,7 @@ cqk
cvi
cgs
bGG
-cyR
+dia
bGG
bGG
cBD
@@ -136981,11 +133882,11 @@ bAK
bjR
dam
aYS
-baT
-baT
-baT
-baT
-aYS
+aaa
+aaa
+aaa
+aaa
+aaa
aaa
dca
dcc
@@ -136994,14 +133895,14 @@ duq
xAw
iJf
cqj
-crI
+cmQ
csh
clu
cuZ
cgs
cxV
czL
-cBe
+cvN
cCo
cjY
bGG
@@ -137238,19 +134139,19 @@ cZI
cZn
bmm
aYS
-baQ
-baT
-baT
-bgc
-aYS
+aaa
+aaa
+aaa
+aaa
+aaa
aaa
aaa
aaa
uxy
-aaa
+ckK
kOE
gMZ
-cqe
+cmO
crI
csg
cqk
@@ -137258,8 +134159,8 @@ cva
cgs
cym
bGG
-cAU
-cCr
+cvQ
+djr
bGH
bGH
bGH
@@ -137495,17 +134396,17 @@ cZH
bmm
dan
aYS
-baR
-baT
-baT
-bgm
-aYS
+aaa
+aaa
+aaa
+aaa
+aaa
aaa
xWg
qUv
nMi
-xWg
-djc
+uxy
+aab
hsy
cqm
crN
@@ -137515,8 +134416,8 @@ cvb
cgs
bZZ
bZZ
-bZZ
-cCp
+ddK
+bGH
bGH
aab
aaa
@@ -137752,18 +134653,18 @@ cZJ
cZK
daq
aYS
-baH
-baT
-baT
-baT
-aYS
+aaa
+aaa
+aaa
+aaa
+aaa
aaa
pZO
uDK
xWg
nMi
aab
-iNz
+cgE
cgE
crS
cgE
@@ -137772,7 +134673,7 @@ cgE
cgE
aaa
aaa
-aaa
+cwS
cCs
aab
aab
@@ -138009,18 +134910,18 @@ bEG
bEG
bEG
aYS
-baT
-baT
-baT
-baT
-aYS
+aaa
+aaa
+aaa
+aaa
+aaa
aaa
xWg
nMi
pZO
uDK
afO
-iNz
+cgE
cqp
crQ
csn
@@ -138030,7 +134931,7 @@ cgE
aaa
aaa
aaa
-cCs
+cxm
aaa
aab
aaa
@@ -138076,7 +134977,7 @@ aaa
amh
aaa
doh
-ddV
+deb
doG
aab
doh
@@ -138265,19 +135166,19 @@ bjR
aaa
aaa
aaa
-aYS
-baU
-baU
-baU
-bgd
-aYS
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
aaa
pZO
uDK
xWg
nMi
afO
-iNz
+cgE
cqq
crT
crw
@@ -138287,7 +135188,7 @@ cgE
aaa
aaa
aaa
-cCs
+cxm
aaa
aaa
aaa
@@ -138522,19 +135423,19 @@ bjR
aaa
aaa
aaa
-daC
-baV
-baV
-baV
-baV
-daC
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
aaa
xWg
nMi
pZO
uDK
afO
-iNz
+cgE
coG
cqx
csq
@@ -138544,7 +135445,7 @@ cgE
aaa
aaa
aaa
-cCs
+cxm
aaa
aaa
aaa
@@ -138779,21 +135680,21 @@ bjR
aaa
aaa
aaa
-daD
aaa
aaa
aaa
aaa
-daD
+aaa
+aaa
aaa
uxy
xWg
uDK
uxy
afO
-iNz
-coI
-cqC
+cgE
+csr
+csr
csr
cgE
cvr
@@ -138801,7 +135702,7 @@ cgE
aaa
aaa
aaa
-cCs
+cxm
aaa
aaa
aaa
@@ -139048,8 +135949,8 @@ uxy
uxy
uxy
afO
-vup
-izn
+aab
+aab
aab
aab
aab
@@ -139058,7 +135959,7 @@ aaa
aaa
aaa
aaa
-cCs
+cxm
aaa
aaa
aaa
@@ -139315,7 +136216,7 @@ aaa
aaa
aaa
aaa
-cCs
+cxm
aaa
aaa
aaa
@@ -139572,7 +136473,7 @@ aaa
aaa
aaa
aaa
-cCs
+cxm
aaa
aaa
aaa
@@ -139829,7 +136730,7 @@ aaa
aaa
aaa
aaa
-cCs
+cxm
aaa
aaa
aaa
@@ -140086,7 +136987,7 @@ aaa
aaa
aaa
aaa
-cCs
+cxm
aaa
aaa
aaa
@@ -140343,7 +137244,7 @@ aab
aaa
aaa
aaa
-cCs
+cxm
aaa
aaa
aaa
@@ -140600,7 +137501,7 @@ aaa
aaa
aaa
aaa
-cCs
+cxm
aaa
aaa
aaa
@@ -140857,7 +137758,7 @@ aaa
aaa
aaa
aaa
-cCs
+cxm
aaa
aaa
aaa
@@ -141114,7 +138015,7 @@ aaa
aaa
aaa
aaa
-cCs
+cxm
aaa
aaa
aaa
@@ -141371,7 +138272,7 @@ aaa
aaa
aaa
aaa
-cCs
+cxm
aaa
aaa
aaa
@@ -141628,7 +138529,7 @@ aaa
aaa
aaa
aaa
-cCs
+cxm
aaa
aaa
aaa
@@ -141885,7 +138786,7 @@ aaa
aaa
aaa
aaa
-cCs
+cxm
aaa
aaa
aaa
@@ -142142,7 +139043,7 @@ aaa
aaa
aaa
aaa
-cCs
+cxm
aaa
aaa
aaa
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/footstep.dm b/code/__DEFINES/footstep.dm
index bda71aa4443..65b96577386 100644
--- a/code/__DEFINES/footstep.dm
+++ b/code/__DEFINES/footstep.dm
@@ -181,7 +181,7 @@ GLOBAL_LIST_INIT(clawfootstep, list(
'sound/effects/footstep/lava3.ogg'), 100, 0),
FOOTSTEP_MEAT = list(list(
'sound/effects/meatslap.ogg'), 100, 0),
- FOOTSTEP_GLASS = list(list(
+ FOOTSTEP_GLASS_BAREFOOT = list(list(
'sound/effects/footstep/glassbarefoot1.ogg',
'sound/effects/footstep/glassbarefoot2.ogg',
'sound/effects/footstep/glassbarefoot3.ogg'), 100, 1),
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/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/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/__HELPERS/global_lists.dm b/code/__HELPERS/global_lists.dm
index 2171422a5aa..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)
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/unsorted.dm b/code/__HELPERS/unsorted.dm
index 1e2c6dd05e1..399f669761e 100644
--- a/code/__HELPERS/unsorted.dm
+++ b/code/__HELPERS/unsorted.dm
@@ -1777,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",
@@ -2063,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/_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/_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/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 9a6a83ccbf6..a7623dfacc4 100644
--- a/code/controllers/configuration/sections/system_configuration.dm
+++ b/code/controllers/configuration/sections/system_configuration.dm
@@ -18,6 +18,10 @@
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
@@ -31,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/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/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/metrics.dm b/code/controllers/subsystem/metrics.dm
index 95055f99216..181f24cfb08 100644
--- a/code/controllers/subsystem/metrics.dm
+++ b/code/controllers/subsystem/metrics.dm
@@ -28,6 +28,7 @@ SUBSYSTEM_DEF(metrics)
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 28f69ba1795..5bb1d0eb69f 100644
--- a/code/controllers/subsystem/ticker.dm
+++ b/code/controllers/subsystem/ticker.dm
@@ -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 0185aa5931b..a93d7e443c8 100644
--- a/code/controllers/subsystem/vote.dm
+++ b/code/controllers/subsystem/vote.dm
@@ -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/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/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/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/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/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/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/supplypacks.dm b/code/datums/supplypacks.dm
index 748e84921d2..68a31f59238 100644
--- a/code/datums/supplypacks.dm
+++ b/code/datums/supplypacks.dm
@@ -55,10 +55,6 @@ GLOBAL_LIST_INIT(all_supply_groups, list(SUPPLY_EMERGENCY,SUPPLY_SECURITY,SUPPLY
var/list/announce_beacons = list() // Particular beacons that we'll notify the relevant department when we reach
var/special = FALSE //Event/Station Goals/Admin enabled packs
var/special_enabled = FALSE
- /// The number of times one can order a cargo crate, before it becomes restricted. -1 for infinite
- var/order_limit = -1
- /// Number of times a crate has been ordered in a shift
- var/times_ordered = 0
/// List of names for being done in TGUI
var/list/ui_manifest = list()
@@ -197,15 +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
- order_limit = 5
-
//////////////////////////////////////////////////////////////////////////////
//////////////////////////// Security ////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
@@ -1469,6 +1456,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
diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm
index 4e59d8ad6dd..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
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 f5d509094b2..4899ae47dce 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"
@@ -1489,10 +1481,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"
diff --git a/code/game/atoms.dm b/code/game/atoms.dm
index e46086d9b2b..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)
. = ..()
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/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/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/game_mode.dm b/code/game/gamemodes/game_mode.dm
index fe0fe6447ba..16f80d11d48 100644
--- a/code/game/gamemodes/game_mode.dm
+++ b/code/game/gamemodes/game_mode.dm
@@ -463,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"
@@ -480,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"
diff --git a/code/game/gamemodes/malfunction/Malf_Modules.dm b/code/game/gamemodes/malfunction/Malf_Modules.dm
index 4f0552cbefa..3b07125cb5a 100644
--- a/code/game/gamemodes/malfunction/Malf_Modules.dm
+++ b/code/game/gamemodes/malfunction/Malf_Modules.dm
@@ -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/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/objective.dm b/code/game/gamemodes/objective.dm
index 47c41d841fe..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.
diff --git a/code/game/gamemodes/revolution/revolution.dm b/code/game/gamemodes/revolution/revolution.dm
index 39b883fed33..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
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/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 eea069b3f15..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
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/soulstone.dm b/code/game/gamemodes/wizard/soulstone.dm
index a6183c88abc..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 ..()
diff --git a/code/game/gamemodes/wizard/spellbook.dm b/code/game/gamemodes/wizard/spellbook.dm
index 0eef296334d..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."
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 7922cb721f7..49e375d2123 100644
--- a/code/game/jobs/job/job.dm
+++ b/code/game/jobs/job/job.dm
@@ -175,7 +175,7 @@
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[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
@@ -217,7 +214,7 @@
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..0d9e7fba744 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,
@@ -261,7 +263,7 @@ GLOBAL_DATUM_INIT(captain_announcement, /datum/announcement/minor, new(do_newsca
uniform = /obj/item/clothing/under/rank/internalaffairs
suit = /obj/item/clothing/suit/storage/internalaffairs
shoes = /obj/item/clothing/shoes/brown
- l_ear = /obj/item/radio/headset/headset_iaa
+ l_ear = /obj/item/radio/headset/headset_iaa/alt
glasses = /obj/item/clothing/glasses/hud/security/sunglasses/read_only
id = /obj/item/card/id/security
l_pocket = /obj/item/laser_pointer
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/cloning.dm b/code/game/machinery/cloning.dm
index 79785006452..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
@@ -338,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)
@@ -494,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)
@@ -523,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)
@@ -577,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)
@@ -604,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/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 1e6efe52565..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
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/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 4ae74e8be58..8de3cd73131 100644
--- a/code/game/machinery/constructable_frame.dm
+++ b/code/game/machinery/constructable_frame.dm
@@ -710,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/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/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/machinery.dm b/code/game/machinery/machinery.dm
index 86764dddef1..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))
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 6330d036926..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")
diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm
index 333baa9aa8d..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
@@ -316,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 08ac71634c4..d3a8fef1432 100644
--- a/code/game/machinery/teleporter.dm
+++ b/code/game/machinery/teleporter.dm
@@ -368,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 2ad4f98e4e7..80058ef6510 100644
--- a/code/game/machinery/vending.dm
+++ b/code/game/machinery/vending.dm
@@ -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
@@ -1798,7 +1814,7 @@
/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/pilot = 2,
+ /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,
diff --git a/code/game/mecha/equipment/tools/mining_tools.dm b/code/game/mecha/equipment/tools/mining_tools.dm
index 9226f2e8c07..08cf60fb967 100644
--- a/code/game/mecha/equipment/tools/mining_tools.dm
+++ b/code/game/mecha/equipment/tools/mining_tools.dm
@@ -109,9 +109,7 @@
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 2b04b105535..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"
@@ -172,7 +172,7 @@
/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_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 5800175ee3c..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()
..()
@@ -226,34 +226,34 @@
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/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/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 20f43f6eea2..3a91c4d4cc1 100644
--- a/code/game/objects/effects/spawners/windowspawner.dm
+++ b/code/game/objects/effects/spawners/windowspawner.dm
@@ -61,7 +61,7 @@
/obj/effect/spawner/window/reinforced/polarized
name = "electrochromic reinforced window spawner"
- icon_state = "pwindow_spawner"
+ icon_state = "ewindow_spawner"
window_to_spawn_regular = /obj/structure/window/reinforced/polarized
window_to_spawn_full = /obj/structure/window/full/reinforced/polarized
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index 1a6edd1dd45..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'
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/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/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm
index 03d89af52af..3f380ce9341 100644
--- a/code/game/objects/items/devices/radio/headset.dm
+++ b/code/game/objects/items/devices/radio/headset.dm
@@ -133,12 +133,18 @@
ks1type = /obj/item/encryptionkey/headset_med
/obj/item/radio/headset/headset_iaa
+ name = "internal affairs radio headset"
+ desc = "This is used by your elite legal team."
+ icon_state = "sec_headset"
+ item_state = "sec_headset"
+ ks2type = /obj/item/encryptionkey/headset_iaa
+
+/obj/item/radio/headset/headset_iaa/alt
name = "internal affairs bowman headset"
desc = "This is used by your elite legal team. Protects ears from flashbangs."
flags = EARBANGPROTECT
icon_state = "sec_headset_alt"
item_state = "sec_headset_alt"
- ks2type = /obj/item/encryptionkey/headset_iaa
/obj/item/radio/headset/headset_eng
name = "engineering radio headset"
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/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm
index 720b164e7d6..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"
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 96f96ad5ee9..59d9c7c9138 100644
--- a/code/game/objects/items/weapons/cards_ids.dm
+++ b/code/game/objects/items/weapons/cards_ids.dm
@@ -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/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 972ab8ed7bd..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)
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/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm
index b858e7758b9..8d4b92b6154 100644
--- a/code/game/objects/items/weapons/stunbaton.dm
+++ b/code/game/objects/items/weapons/stunbaton.dm
@@ -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/structures/crates_lockers/closets/cardboardbox.dm b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm
index 240a2fa3c26..d641c501d10 100644
--- a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm
+++ b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm
@@ -74,7 +74,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 3504211a134..7d71a456abf 100644
--- a/code/game/objects/structures/crates_lockers/closets/fireaxe.dm
+++ b/code/game/objects/structures/crates_lockers/closets/fireaxe.dm
@@ -2,7 +2,7 @@
/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"
@@ -16,6 +16,10 @@
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/job_closets.dm b/code/game/objects/structures/crates_lockers/closets/job_closets.dm
index 5ed75a726e4..505ae16b3f7 100644
--- a/code/game/objects/structures/crates_lockers/closets/job_closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets/job_closets.dm
@@ -113,8 +113,6 @@
open_door_sprite = "generic_door"
/obj/structure/closet/lawcloset/populate_contents()
- new /obj/item/storage/box/tapes(src)
- new /obj/item/book/manual/faxes(src)
new /obj/item/clothing/under/lawyer/female(src)
new /obj/item/clothing/under/lawyer/black(src)
new /obj/item/clothing/under/lawyer/red(src)
@@ -124,10 +122,6 @@
new /obj/item/clothing/suit/storage/lawyer/purpjacket(src)
new /obj/item/clothing/shoes/brown(src)
new /obj/item/clothing/shoes/black(src)
- new /obj/item/clothing/glasses/sunglasses/big(src)
- new /obj/item/clothing/glasses/sunglasses/big(src)
- new /obj/item/clothing/accessory/lawyers_badge(src)
- new /obj/item/clothing/accessory/lawyers_badge(src)
//Paramedic
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
index 69daeb27b83..a7ad03ee204 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
@@ -37,6 +37,7 @@
new /obj/item/organ/internal/eyes/cybernetic/meson(src)
new /obj/item/clothing/accessory/medal/engineering(src)
new /obj/item/holosign_creator/atmos(src)
+ new /obj/item/rcd/preloaded(src)
/obj/structure/closet/secure_closet/engineering_electrical
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 69fd45dca1c..632e0ade1b2 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
@@ -121,6 +121,7 @@
new /obj/item/clothing/suit/straight_jacket(src)
new /obj/item/reagent_containers/syringe(src)
new /obj/item/reagent_containers/glass/bottle/ether(src)
+ new /obj/item/clipboard(src)
new /obj/item/storage/fancy/cigarettes/cigpack_med(src)
new /obj/item/storage/fancy/cigarettes/cigpack_med(src)
new /obj/item/storage/fancy/cigarettes/cigpack_med(src)
@@ -170,6 +171,8 @@
new /obj/item/door_remote/chief_medical_officer(src)
new /obj/item/reagent_containers/food/drinks/mug/cmo(src)
new /obj/item/clothing/accessory/medal/medical(src)
+ new /obj/item/storage/briefcase(src)
+ new /obj/item/clothing/mask/gas(src)
/obj/structure/closet/secure_closet/animal
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
index 238beaf5283..f6a392074c5 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
@@ -110,6 +110,7 @@
new /obj/item/reagent_containers/food/drinks/mug/hos(src)
new /obj/item/organ/internal/cyberimp/eyes/hud/security(src)
new /obj/item/clothing/accessory/medal/security(src)
+ new /obj/item/reagent_containers/food/drinks/flask/barflask(src)
/obj/structure/closet/secure_closet/warden
name = "warden's locker"
@@ -367,8 +368,33 @@
new /obj/item/clothing/under/rank/centcom/magistrate(src)
new /obj/item/clothing/suit/judgerobe(src)
new /obj/item/clothing/head/powdered_wig(src)
+ new /obj/item/clothing/head/justice_wig(src)
+ new /obj/item/radio/headset/heads/magistrate(src)
new /obj/item/gavelblock(src)
new /obj/item/gavelhammer(src)
- new /obj/item/clothing/head/justice_wig(src)
new /obj/item/clothing/accessory/medal/legal(src)
new /obj/item/clothing/accessory/lawyers_badge(src)
+
+/obj/structure/closet/secure_closet/iaa
+ name = "internal affairs locker"
+ req_access = list(ACCESS_LAWYER)
+ icon_state = "iaasecure1"
+ icon_closed = "iaasecure"
+ icon_locked = "iaasecure1"
+ icon_opened = "iaasecureopen"
+ icon_broken = "iaasecurebroken"
+ icon_off = "iaasecureoff"
+
+/obj/structure/closet/secure_closet/iaa/populate_contents()
+ new /obj/item/book/manual/faxes(src)
+ new /obj/item/storage/box/tapes(src)
+ new /obj/item/storage/secure/briefcase(src)
+ new /obj/item/storage/briefcase(src)
+ new /obj/item/storage/briefcase(src)
+ new /obj/item/radio/headset/headset_iaa(src)
+ new /obj/item/clothing/under/rank/internalaffairs(src)
+ new /obj/item/clothing/suit/storage/internalaffairs(src)
+ new /obj/item/clothing/glasses/sunglasses/big(src)
+ new /obj/item/clothing/glasses/sunglasses/big(src)
+ new /obj/item/clothing/accessory/lawyers_badge(src)
+ new /obj/item/clothing/accessory/lawyers_badge(src)
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/foodcart.dm b/code/game/objects/structures/foodcart.dm
deleted file mode 100644
index 0253ad66952..00000000000
--- a/code/game/objects/structures/foodcart.dm
+++ /dev/null
@@ -1,180 +0,0 @@
-/obj/structure/foodcart
- name = "food cart"
- desc = "A cart for transporting food and drinks."
- icon = 'icons/obj/foodcart.dmi'
- icon_state = "cart"
- face_while_pulling = FALSE
- anchored = 0
- density = 1
- //Food slots
- var/list/food_slots[6]
- //var/obj/item/reagent_containers/food/snacks/food1 = null
- //var/obj/item/reagent_containers/food/snacks/food2 = null
- //var/obj/item/reagent_containers/food/snacks/food3 = null
- //var/obj/item/reagent_containers/food/snacks/food4 = null
- //var/obj/item/reagent_containers/food/snacks/food5 = null
- //var/obj/item/reagent_containers/food/snacks/food6 = null
- //Drink slots
- var/list/drink_slots[6]
- //var/obj/item/reagent_containers/food/drinks/drink1 = null
- //var/obj/item/reagent_containers/food/drinks/drink2 = null
- //var/obj/item/reagent_containers/food/drinks/drink3 = null
- //var/obj/item/reagent_containers/food/drinks/drink4 = null
- //var/obj/item/reagent_containers/food/drinks/drink5 = null
- //var/obj/item/reagent_containers/food/drinks/drink6 = null
-
-/obj/structure/foodcart/proc/put_in_cart(obj/item/I, mob/user)
- user.drop_item()
- I.loc = src
- updateUsrDialog()
- to_chat(user, "You put [I] into [src].")
- return
-
-/obj/structure/foodcart/attackby(obj/item/I, mob/user, params)
- var/fail_msg = "There are no open spaces for this in [src]."
- if(!I.is_robot_module())
- if(istype(I, /obj/item/reagent_containers/food/snacks))
- var/success = 0
- for(var/s=1,s<=6,s++)
- if(!food_slots[s])
- put_in_cart(I, user)
- food_slots[s]=I
- update_icon()
- success = 1
- break
- if(!success)
- to_chat(user, fail_msg)
- else if(istype(I, /obj/item/reagent_containers/food/drinks))
- var/success = 0
- for(var/s=1,s<=6,s++)
- if(!drink_slots[s])
- put_in_cart(I, user)
- drink_slots[s]=I
- update_icon()
- success = 1
- break
- if(!success)
- to_chat(user, fail_msg)
- else if(istype(I, /obj/item/wrench))
- if(!anchored && !isinspace())
- playsound(src.loc, I.usesound, 50, 1)
- user.visible_message( \
- "[user] tightens \the [src]'s casters.", \
- " You have tightened \the [src]'s casters.", \
- "You hear ratchet.")
- anchored = 1
- else if(anchored)
- playsound(src.loc, I.usesound, 50, 1)
- user.visible_message( \
- "[user] loosens \the [src]'s casters.", \
- " You have loosened \the [src]'s casters.", \
- "You hear ratchet.")
- anchored = 0
- else
- to_chat(usr, "You cannot interface your modules [src]!")
-
-/obj/structure/foodcart/attack_hand(mob/user)
- user.set_machine(src)
- var/dat
- if(food_slots[1])
- dat += "[food_slots[1]]
"
- if(food_slots[2])
- dat += "[food_slots[2]]
"
- if(food_slots[3])
- dat += "[food_slots[3]]
"
- if(food_slots[4])
- dat += "[food_slots[4]]
"
- if(food_slots[5])
- dat += "[food_slots[5]]
"
- if(food_slots[6])
- dat += "[food_slots[6]]
"
- if(drink_slots[1])
- dat += "[drink_slots[1]]
"
- if(drink_slots[2])
- dat += "[drink_slots[2]]
"
- if(drink_slots[3])
- dat += "[drink_slots[3]]
"
- if(drink_slots[4])
- dat += "[drink_slots[4]]
"
- if(drink_slots[5])
- dat += "[drink_slots[5]]
"
- if(drink_slots[6])
- dat += "[drink_slots[6]]
"
- var/datum/browser/popup = new(user, "foodcart", name, 240, 160)
- popup.set_content(dat)
- popup.open()
-
-/obj/structure/foodcart/Topic(href, href_list)
- if(!in_range(src, usr))
- return
- if(!isliving(usr))
- return
- var/mob/living/user = usr
- if(href_list["f1"])
- if(food_slots[1])
- user.put_in_hands(food_slots[1])
- to_chat(user, "You take [food_slots[1]] from [src].")
- food_slots[1] = null
- if(href_list["f2"])
- if(food_slots[2])
- user.put_in_hands(food_slots[2])
- to_chat(user, "You take [food_slots[2]] from [src].")
- food_slots[2] = null
- if(href_list["f3"])
- if(food_slots[3])
- user.put_in_hands(food_slots[3])
- to_chat(user, "You take [food_slots[3]] from [src].")
- food_slots[3] = null
- if(href_list["f4"])
- if(food_slots[4])
- user.put_in_hands(food_slots[4])
- to_chat(user, "You take [food_slots[4]] from [src].")
- food_slots[4] = null
- if(href_list["f5"])
- if(food_slots[5])
- user.put_in_hands(food_slots[5])
- to_chat(user, "You take [food_slots[5]] from [src].")
- food_slots[5] = null
- if(href_list["f6"])
- if(food_slots[6])
- user.put_in_hands(food_slots[6])
- to_chat(user, "You take [food_slots[6]] from [src].")
- food_slots[6] = null
- if(href_list["d1"])
- if(drink_slots[1])
- user.put_in_hands(drink_slots[1])
- to_chat(user, "You take [drink_slots[1]] from [src].")
- drink_slots[1] = null
- if(href_list["d2"])
- if(drink_slots[2])
- user.put_in_hands(drink_slots[2])
- to_chat(user, "You take [drink_slots[2]] from [src].")
- drink_slots[2] = null
- if(href_list["d3"])
- if(drink_slots[3])
- user.put_in_hands(drink_slots[3])
- to_chat(user, "You take [drink_slots[3]] from [src].")
- drink_slots[3] = null
- if(href_list["d4"])
- if(drink_slots[4])
- user.put_in_hands(drink_slots[4])
- to_chat(user, "You take [drink_slots[4]] from [src].")
- drink_slots[4] = null
- if(href_list["d5"])
- if(drink_slots[5])
- user.put_in_hands(drink_slots[5])
- to_chat(user, "You take [drink_slots[5]] from [src].")
- drink_slots[5] = null
- if(href_list["d6"])
- if(drink_slots[6])
- user.put_in_hands(drink_slots[6])
- to_chat(user, "You take [drink_slots[6]] from [src].")
- drink_slots[6] = null
-
- update_icon() //Not really needed without overlays, but keeping just in case
- updateUsrDialog()
-
-/obj/structure/foodcart/deconstruct(disassembled = TRUE)
- if(!(flags & NODECONSTRUCT))
- new /obj/item/stack/sheet/metal(loc, 4)
- qdel(src)
diff --git a/code/game/objects/structures/safe.dm b/code/game/objects/structures/safe.dm
index c373a28936c..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)
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 bf96754610d..8c0dd7ef830 100644
--- a/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm
+++ b/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm
@@ -76,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/window.dm b/code/game/objects/structures/window.dm
index 36ba6b944d6..3da55a8f17e 100644
--- a/code/game/objects/structures/window.dm
+++ b/code/game/objects/structures/window.dm
@@ -508,6 +508,7 @@
/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/machinery/button/windowtint
@@ -674,8 +675,9 @@
/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."
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/turf.dm b/code/game/turfs/turf.dm
index 8c64a8456bf..a602a49d6e2 100644
--- a/code/game/turfs/turf.dm
+++ b/code/game/turfs/turf.dm
@@ -284,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/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/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 5b0ea16350c..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
@@ -624,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 42fd45f3ce7..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"
@@ -701,8 +706,9 @@ 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) && prefs._2fa_status == _2FA_DISABLED) // If they are an admin and their 2FA is disabled
+ 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
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/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/antagonists/traitor/contractor/datums/objective_contract.dm b/code/modules/antagonists/traitor/contractor/datums/objective_contract.dm
index 171c1662cf9..a4a5edd4be0 100644
--- a/code/modules/antagonists/traitor/contractor/datums/objective_contract.dm
+++ b/code/modules/antagonists/traitor/contractor/datums/objective_contract.dm
@@ -25,7 +25,6 @@
"Locker Toilets",
"Maintenance Bar",
"Medical Secondary Storage",
- "Mechanic Workshop",
"Port Emergency Storage",
"Psych Room",
"Toxins Launch Room",
diff --git a/code/modules/arcade/mob_hunt/mob_type_datums.dm b/code/modules/arcade/mob_hunt/mob_type_datums.dm
index c042a9c7cfc..9d94b5f51f6 100644
--- a/code/modules/arcade/mob_hunt/mob_type_datums.dm
+++ b/code/modules/arcade/mob_hunt/mob_type_datums.dm
@@ -206,9 +206,7 @@
immunity = list(TYPE_GROUND)
area_blacklist = list(/area/maintenance)
area_whitelist = list(/area/hallway,
- /area/escapepodbay,
- /area/engine/mechanic_workshop,
- /area/security/podbay)
+ /area/escapepodbay)
/datum/mob_type/bluespace
name = "Bluespace"
diff --git a/code/modules/awaymissions/mission_code/wildwest.dm b/code/modules/awaymissions/mission_code/wildwest.dm
index 511fbb92294..f63d1a8c8d4 100644
--- a/code/modules/awaymissions/mission_code/wildwest.dm
+++ b/code/modules/awaymissions/mission_code/wildwest.dm
@@ -213,9 +213,6 @@
to_chat(user, "The communicator buzzes, and you hear the voice again: 'Oh really now?' You hear a clicking sound. 'Team, get back here. We have trouble'. Then the line goes dead.")
for(var/thing in GLOB.landmarks_list)
var/obj/effect/landmark/L = thing
- if(L.name == "wildwest_syndipod")
- var/obj/spacepod/syndi/P = new /obj/spacepod/syndi(get_turf(L))
- P.name = "Syndi Recon Pod"
if(L.name == "wildwest_syndibackup")
var/mob/living/simple_animal/hostile/syndicate/ranged/space/R = new /mob/living/simple_animal/hostile/syndicate/ranged/space(get_turf(L))
R.name = "Syndi Recon Team"
diff --git a/code/modules/client/client_defines.dm b/code/modules/client/client_defines.dm
index 583d59476eb..7c011962c08 100644
--- a/code/modules/client/client_defines.dm
+++ b/code/modules/client/client_defines.dm
@@ -114,10 +114,19 @@
/// Is the client watchlisted
var/watchlisted = FALSE
+ /// Client's pAI save
+ var/datum/pai_save/pai_save
+
+ /// List of the clients CUIs
+ var/list/datum/custom_user_item/cui_entries = list()
+
/client/vv_edit_var(var_name, var_value)
switch(var_name)
// I know we will never be in a world where admins are editing client vars to let people bypass TOS
// But guess what, if I have the ability to overengineer something, I am going to do it
if("tos_consent")
return FALSE
+ // Dont fuck with this
+ if("cui_entries")
+ return FALSE
return ..()
diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm
index 202e43e770c..6f8d489baf6 100644
--- a/code/modules/client/client_procs.dm
+++ b/code/modules/client/client_procs.dm
@@ -147,14 +147,8 @@
karma_purchase(karma,5,"job","Brig Physician")
if("3")
karma_purchase(karma,30,"job","Nanotrasen Representative")
- if("5")
+ if("4")
karma_purchase(karma,30,"job","Blueshield")
- if("6")
- karma_purchase(karma,30,"job","Mechanic")
- if("7")
- karma_purchase(karma,45,"job","Magistrate")
- if("9")
- karma_purchase(karma,30,"job","Security Pod Pilot")
return
if(href_list["KarmaBuy2"])
var/karma=verify_karma()
@@ -202,6 +196,11 @@
..() //redirect to hsrc.Topic()
+
+/client/proc/get_display_key()
+ var/fakekey = src?.holder?.fakekey
+ return fakekey ? fakekey : key
+
/client/proc/is_content_unlocked()
if(!prefs.unlock_content)
to_chat(src, "Become a BYOND member to access member-perks and features, as well as support the engine that makes this game possible. Click here to find out more.")
@@ -286,6 +285,8 @@
log_client_to_db(tdata) // Make sure our client exists in the DB
+ pai_save = new(src)
+
// This is where we load all of the clients stuff from the DB
if(SSdbcore.IsConnected())
// Load in all our client data from the DB
@@ -326,12 +327,16 @@
if(length(related_accounts_cid))
log_admin("[key_name(src)] Alts by CID: [jointext(related_accounts_cid, " ")]")
+ // This sleeps so it has to go here. Dont fucking move it.
+ SSinstancing.update_playercache(ckey)
+
// This has to go here to avoid issues
// If you sleep past this point, you will get SSinput errors as well as goonchat errors
// DO NOT STUFF RANDOM SQL QUERIES BELOW THIS POINT WITHOUT USING `INVOKE_ASYNC()` OR SIMILAR
// YOU WILL BREAK STUFF. SERIOUSLY. -aa07
GLOB.clients += src
+
spawn() // Goonchat does some non-instant checks in start()
chatOutput.start()
@@ -447,7 +452,9 @@
GLOB.admins -= src
GLOB.directory -= ckey
GLOB.clients -= src
+ SSinstancing.update_playercache() // Clear us out
QDEL_NULL(chatOutput)
+ QDEL_NULL(pai_save)
if(movingmob)
movingmob.client_mobs_in_contents -= mob
UNSETEMPTY(movingmob.client_mobs_in_contents)
diff --git a/code/modules/client/login_processing/40-pai_save.dm b/code/modules/client/login_processing/40-pai_save.dm
new file mode 100644
index 00000000000..4c21c0201a8
--- /dev/null
+++ b/code/modules/client/login_processing/40-pai_save.dm
@@ -0,0 +1,8 @@
+/datum/client_login_processor/pai_save
+ priority = 40
+
+/datum/client_login_processor/pai_save/get_query(client/C)
+ return C.pai_save.get_query()
+
+/datum/client_login_processor/pai_save/process_result(datum/db_query/Q, client/C)
+ C.pai_save.load_data(Q)
diff --git a/code/modules/client/login_processing/45-cuis.dm b/code/modules/client/login_processing/45-cuis.dm
new file mode 100644
index 00000000000..88bfca44638
--- /dev/null
+++ b/code/modules/client/login_processing/45-cuis.dm
@@ -0,0 +1,20 @@
+/datum/client_login_processor/cuis
+ priority = 45
+
+/datum/client_login_processor/cuis/get_query(client/C)
+ var/datum/db_query/query = SSdbcore.NewQuery("SELECT cuiRealName, cuiPath, cuiItemName, cuiDescription, cuiJobMask FROM customuseritems WHERE cuiCKey=:ckey", list(
+ "ckey" = C.ckey
+ ))
+ return query
+
+/datum/client_login_processor/cuis/process_result(datum/db_query/Q, client/C)
+ while(Q.NextRow())
+ var/datum/custom_user_item/cui = new()
+ cui.characer_name = Q.item[1]
+ cui.object_typepath = text2path(Q.item[2])
+ cui.item_name_override = Q.item[3]
+ cui.item_desc_override = Q.item[4]
+ cui.raw_job_mask = Q.item[5]
+
+ if(cui.parse_info(C.ckey))
+ C.cui_entries += cui
diff --git a/code/modules/client/preference/character.dm b/code/modules/client/preference/character.dm
index 32de91e9866..9a98c853d1b 100644
--- a/code/modules/client/preference/character.dm
+++ b/code/modules/client/preference/character.dm
@@ -115,7 +115,7 @@
if(!isemptylist(player_alt_titles))
playertitlelist = list2params(player_alt_titles)
if(!isemptylist(loadout_gear))
- gearlist = list2params(loadout_gear)
+ gearlist = json_encode(loadout_gear)
var/datum/db_query/firstquery = SSdbcore.NewQuery("SELECT slot FROM characters WHERE ckey=:ckey ORDER BY slot", list(
"ckey" = C.ckey
@@ -438,7 +438,7 @@
//socks
socks = query.item[49]
body_accessory = query.item[50]
- loadout_gear = params2list(query.item[51])
+ loadout_gear = query.item[51]
autohiss_mode = text2num(query.item[52])
//Sanitize
@@ -507,6 +507,7 @@
socks = sanitize_text(socks, initial(socks))
body_accessory = sanitize_text(body_accessory, initial(body_accessory))
+ loadout_gear = sanitize_json(loadout_gear)
if(!player_alt_titles)
player_alt_titles = new()
@@ -1379,29 +1380,6 @@
clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY)
else if(job_karma_high)
switch(job_karma_high)
- if(JOB_MECHANIC)
- clothes_s = new /icon(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)
- clothes_s.Blend(new /icon('icons/mob/clothing/head.dmi', "hardhat0_yellow"), ICON_OVERLAY)
- switch(backbag)
- if(2)
- clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "engiepack"), ICON_OVERLAY)
- if(3)
- clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-eng"), ICON_OVERLAY)
- if(4)
- clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY)
- if(JOB_PILOT)
- clothes_s = new /icon(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)
- switch(backbag)
- if(2)
- clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "securitypack"), ICON_OVERLAY)
- if(3)
- clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-sec"), ICON_OVERLAY)
- if(4)
- clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY)
if(JOB_BRIGDOC)
clothes_s = new /icon(uniform_dmi, "medical_s")
clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "white"), ICON_UNDERLAY)
@@ -1480,11 +1458,11 @@
-/datum/character_save/proc/get_gear_metadata(datum/gear/G)
- . = loadout_gear[G.display_name]
+/datum/character_save/proc/get_gear_metadata(datum/gear/G) // NYI
+ . = loadout_gear[G.type]
if(!.)
. = list()
- loadout_gear[G.display_name] = .
+ loadout_gear[G.type] = .
/datum/character_save/proc/get_tweak_metadata(datum/gear/G, datum/gear_tweak/tweak)
var/list/metadata = get_gear_metadata(G)
diff --git a/code/modules/client/preference/link_processing.dm b/code/modules/client/preference/link_processing.dm
index 6a7e5144718..fe4f9574128 100644
--- a/code/modules/client/preference/link_processing.dm
+++ b/code/modules/client/preference/link_processing.dm
@@ -96,29 +96,17 @@
if(href_list["preference"] == "gear")
if(href_list["toggle_gear"])
- var/datum/gear/TG = GLOB.gear_datums[href_list["toggle_gear"]]
- if(TG.display_name in active_character.loadout_gear)
- active_character.loadout_gear -= TG.display_name
+ var/datum/gear/TG = GLOB.gear_datums[text2path(href_list["toggle_gear"])]
+ if(TG && (TG.type in active_character.loadout_gear))
+ active_character.loadout_gear -= TG.type
else
if(TG.donator_tier && user.client.donator_level < TG.donator_tier)
to_chat(user, "That gear is only available at a higher donation tier than you are on.")
return
- var/total_cost = 0
- var/list/type_blacklist = list()
- for(var/gear_name in active_character.loadout_gear)
- var/datum/gear/G = GLOB.gear_datums[gear_name]
- if(istype(G))
- if(!G.subtype_cost_overlap)
- if(G.subtype_path in type_blacklist)
- continue
- type_blacklist += G.subtype_path
- total_cost += G.cost
+ build_loadout(TG)
- if((total_cost + TG.cost) <= max_gear_slots)
- active_character.loadout_gear += TG.display_name
-
- else if(href_list["gear"] && href_list["tweak"])
- var/datum/gear/gear = GLOB.gear_datums[href_list["gear"]]
+ else if(href_list["gear"] && href_list["tweak"]) // NYI
+ var/datum/gear/gear = GLOB.gear_datums[text2path(href_list["gear"])]
var/datum/gear_tweak/tweak = locate(href_list["tweak"])
if(!tweak || !istype(gear) || !(tweak in gear.gear_tweaks))
return
diff --git a/code/modules/client/preference/loadout/loadout.dm b/code/modules/client/preference/loadout/loadout.dm
index f1f0e2082de..eff55feedee 100644
--- a/code/modules/client/preference/loadout/loadout.dm
+++ b/code/modules/client/preference/loadout/loadout.dm
@@ -10,17 +10,27 @@ GLOBAL_LIST_EMPTY(gear_datums)
..()
/datum/gear
- var/display_name //Name/index. Must be unique.
- var/description //Description of this gear. If left blank will default to the description of the pathed item.
- var/path //Path to item.
- var/cost = 1 //Number of points used. Items in general cost 1 point, storage/armor/gloves/special use costs 2 points.
- var/slot //Slot to equip to.
- var/list/allowed_roles //Roles that can spawn with this item.
- var/whitelisted //Term to check the whitelist for..
+ /// Displayed name of the item listing.
+ var/display_name
+ /// Description of the item listing. If left blank will default to the description of the pathed item.
+ var/description
+ /// Typepath of the item.
+ var/path
+ /// Loadout points cost to select the item listing.
+ var/cost = 1
+ /// Slot to equip the item to.
+ var/slot
+ /// List of job roles which can spawn with the item.
+ var/list/allowed_roles
+ /// Loadout category of the item listing.
var/sort_category = "General"
- var/list/gear_tweaks = list() //List of datums which will alter the item after it has been spawned.
- var/subtype_path = /datum/gear //for skipping organizational subtypes (optional)
- var/subtype_cost_overlap = TRUE //if subtypes can take points at the same time
+ /// List of datums which will alter the item after it has been spawned. (NYI)
+ var/list/gear_tweaks = list()
+ /// Set on empty category datums to skip them being added to the list. (/datum/gear/accessory, /datum/gear/suit/coat/job, etc.)
+ var/main_typepath = /datum/gear
+ /// Does selecting a second item with the same `main_typepath` cost loadout points.
+ var/subtype_selection_cost = TRUE
+ /// Patreon donator tier needed to select this item listing.
var/donator_tier = 0
/datum/gear/New()
diff --git a/code/modules/client/preference/loadout/loadout_accessories.dm b/code/modules/client/preference/loadout/loadout_accessories.dm
index 98485d1f6c4..ba5e8626a0e 100644
--- a/code/modules/client/preference/loadout/loadout_accessories.dm
+++ b/code/modules/client/preference/loadout/loadout_accessories.dm
@@ -1,203 +1,215 @@
+/*
+######################################################################################
+## ##
+## IMPORTANT README ##
+## ##
+## Changing any /datum/gear typepaths --WILL-- break people's loadouts. ##
+## The typepaths are stored directly in the `characters.gear` column of the DB. ##
+## Please inform the server host if you wish to modify any of these. ##
+## ##
+######################################################################################
+*/
+
+
/datum/gear/accessory
- subtype_path = /datum/gear/accessory
+ main_typepath = /datum/gear/accessory
slot = slot_tie
sort_category = "Accessories"
/datum/gear/accessory/scarf
- display_name = "scarf"
+ display_name = "Scarf"
path = /obj/item/clothing/accessory/scarf
/datum/gear/accessory/scarf/red
- display_name = "scarf, red"
+ display_name = "Scarf, red"
path = /obj/item/clothing/accessory/scarf/red
/datum/gear/accessory/scarf/green
- display_name = "scarf, green"
+ display_name = "Scarf, green"
path = /obj/item/clothing/accessory/scarf/green
/datum/gear/accessory/scarf/darkblue
- display_name = "scarf, dark blue"
+ display_name = "Scarf, dark blue"
path = /obj/item/clothing/accessory/scarf/darkblue
/datum/gear/accessory/scarf/purple
- display_name = "scarf, purple"
+ display_name = "Scarf, purple"
path = /obj/item/clothing/accessory/scarf/purple
/datum/gear/accessory/scarf/yellow
- display_name = "scarf, yellow"
+ display_name = "Scarf, yellow"
path = /obj/item/clothing/accessory/scarf/yellow
/datum/gear/accessory/scarf/orange
- display_name = "scarf, orange"
+ display_name = "Scarf, orange"
path = /obj/item/clothing/accessory/scarf/orange
/datum/gear/accessory/scarf/lightblue
- display_name = "scarf, light blue"
+ display_name = "Scarf, light blue"
path = /obj/item/clothing/accessory/scarf/lightblue
/datum/gear/accessory/scarf/white
- display_name = "scarf, white"
+ display_name = "Scarf, white"
path = /obj/item/clothing/accessory/scarf/white
/datum/gear/accessory/scarf/black
- display_name = "scarf, black"
+ display_name = "Scarf, black"
path = /obj/item/clothing/accessory/scarf/black
/datum/gear/accessory/scarf/zebra
- display_name = "scarf, zebra"
+ display_name = "Scarf, zebra"
path = /obj/item/clothing/accessory/scarf/zebra
/datum/gear/accessory/scarf/christmas
- display_name = "scarf, christmas"
+ display_name = "Scarf, christmas"
path = /obj/item/clothing/accessory/scarf/christmas
/datum/gear/accessory/scarf/stripedred
- display_name = "scarf, striped red"
+ display_name = "Scarf, striped red"
path = /obj/item/clothing/accessory/stripedredscarf
/datum/gear/accessory/scarf/stripedgreen
- display_name = "scarf, striped green"
+ display_name = "Scarf, striped green"
path = /obj/item/clothing/accessory/stripedgreenscarf
/datum/gear/accessory/scarf/stripedblue
- display_name = "scarf, striped blue"
+ display_name = "Scarf, striped blue"
path = /obj/item/clothing/accessory/stripedbluescarf
/datum/gear/accessory/holobadge
- display_name = "holobadge, pin"
+ display_name = "Holobadge, pin"
path = /obj/item/clothing/accessory/holobadge
- allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer", "Security Pod Pilot")
+ allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer")
/datum/gear/accessory/holobadge_n
- display_name = "holobadge, cord"
+ display_name = "Holobadge, cord"
path = /obj/item/clothing/accessory/holobadge/cord
- allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer", "Security Pod Pilot")
+ allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer")
/datum/gear/accessory/tieblue
- display_name = "tie, blue"
+ display_name = "Tie, blue"
path = /obj/item/clothing/accessory/blue
/datum/gear/accessory/tiered
- display_name = "tie, red"
+ display_name = "Tie, red"
path = /obj/item/clothing/accessory/red
/datum/gear/accessory/tieblack
- display_name = "tie, black"
+ display_name = "Tie, black"
path = /obj/item/clothing/accessory/black
/datum/gear/accessory/tiehorrible
- display_name = "tie, vomit green"
+ display_name = "Tie, vomit green"
path = /obj/item/clothing/accessory/horrible
/datum/gear/accessory/stethoscope
- display_name = "stethoscope"
+ display_name = "Stethoscope"
path = /obj/item/clothing/accessory/stethoscope
allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Paramedic", "Brig Physician")
/datum/gear/accessory/cowboyshirt
- display_name = "cowboy shirt, black"
+ display_name = "Cowboy shirt, black"
path = /obj/item/clothing/accessory/cowboyshirt
/datum/gear/accessory/cowboyshirt/short_sleeved
- display_name = "cowboy shirt, short sleeved black"
+ display_name = "Cowboy shirt, short sleeved black"
path = /obj/item/clothing/accessory/cowboyshirt/short_sleeved
/datum/gear/accessory/cowboyshirt/white
- display_name = "cowboy shirt, white"
+ display_name = "Cowboy shirt, white"
path = /obj/item/clothing/accessory/cowboyshirt/white
/datum/gear/accessory/cowboyshirt/white/short_sleeved
- display_name = "cowboy shirt, short sleeved white"
+ display_name = "Cowboy shirt, short sleeved white"
path = /obj/item/clothing/accessory/cowboyshirt/white/short_sleeved
/datum/gear/accessory/cowboyshirt/pink
- display_name = "cowboy shirt, pink"
+ display_name = "Cowboy shirt, pink"
path = /obj/item/clothing/accessory/cowboyshirt/pink
/datum/gear/accessory/cowboyshirt/pink/short_sleeved
- display_name = "cowboy shirt, short sleeved pink"
+ display_name = "Cowboy shirt, short sleeved pink"
path = /obj/item/clothing/accessory/cowboyshirt/pink/short_sleeved
/datum/gear/accessory/cowboyshirt/red
- display_name = "cowboy shirt, red"
+ display_name = "Cowboy shirt, red"
path = /obj/item/clothing/accessory/cowboyshirt/red
/datum/gear/accessory/cowboyshirt/red/short_sleeved
- display_name = "cowboy shirt, short sleeved red"
+ display_name = "Cowboy shirt, short sleeved red"
path = /obj/item/clothing/accessory/cowboyshirt/red/short_sleeved
/datum/gear/accessory/cowboyshirt/navy
- display_name = "cowboy shirt, navy"
+ display_name = "Cowboy shirt, navy"
path = /obj/item/clothing/accessory/cowboyshirt/navy
/datum/gear/accessory/cowboyshirt/navy/short_sleeved
- display_name = "cowboy shirt, short sleeved navy"
+ display_name = "Cowboy shirt, short sleeved navy"
path = /obj/item/clothing/accessory/cowboyshirt/navy/short_sleeved
/datum/gear/accessory/locket
- display_name = "gold locket"
+ display_name = "Gold locket"
path = /obj/item/clothing/accessory/necklace/locket
/datum/gear/accessory/necklace
- display_name = "simple necklace"
+ display_name = "Simple necklace"
path = /obj/item/clothing/accessory/necklace
/datum/gear/accessory/corset
- display_name = "corset, black"
+ display_name = "Corset, black"
path = /obj/item/clothing/accessory/corset
/datum/gear/accessory/corsetred
- display_name = "corset, red"
+ display_name = "Corset, red"
path = /obj/item/clothing/accessory/corset/red
/datum/gear/accessory/corsetblue
- display_name = "corset, blue"
+ display_name = "Corset, blue"
path = /obj/item/clothing/accessory/corset/blue
-
/datum/gear/accessory/armband_red
- display_name = "armband"
+ display_name = "Armband"
path = /obj/item/clothing/accessory/armband
/datum/gear/accessory/armband_civ
- display_name = "armband, blue-yellow"
+ display_name = "Armband, blue-yellow"
path = /obj/item/clothing/accessory/armband/yb
/datum/gear/accessory/armband_job
- subtype_path = /datum/gear/accessory/armband_job
- subtype_cost_overlap = FALSE
+ main_typepath = /datum/gear/accessory/armband_job
+ subtype_selection_cost = FALSE
/datum/gear/accessory/armband_job/sec
- display_name = " armband, security"
+ display_name = "Armband, security"
path = /obj/item/clothing/accessory/armband/sec
- allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer", "Brig Physician", "Security Pod Pilot")
+ allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer", "Brig Physician")
/datum/gear/accessory/armband_job/cargo
- display_name = "cargo armband"
+ display_name = "Armband, cargo"
path = /obj/item/clothing/accessory/armband/cargo
allowed_roles = list("Quartermaster","Cargo Technician", "Shaft Miner")
/datum/gear/accessory/armband_job/medical
- display_name = "armband, medical"
+ display_name = "Armband, medical"
path = /obj/item/clothing/accessory/armband/med
allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Coroner", "Paramedic", "Brig Physician")
/datum/gear/accessory/armband_job/emt
- display_name = "armband, EMT"
+ display_name = "Armband, EMT"
path = /obj/item/clothing/accessory/armband/medgreen
allowed_roles = list("Paramedic", "Brig Physician")
/datum/gear/accessory/armband_job/engineering
- display_name = "armband, engineering"
+ display_name = "Armband, engineering"
path = /obj/item/clothing/accessory/armband/engine
allowed_roles = list("Chief Engineer","Station Engineer", "Life Support Specialist")
/datum/gear/accessory/armband_job/hydro
- display_name = "armband, hydroponics"
+ display_name = "Armband, hydroponics"
path = /obj/item/clothing/accessory/armband/hydro
allowed_roles = list("Botanist")
/datum/gear/accessory/armband_job/sci
- display_name = "armband, science"
+ display_name = "Armband, science"
path = /obj/item/clothing/accessory/armband/science
allowed_roles = list("Research Director","Scientist", "Roboticist")
diff --git a/code/modules/client/preference/loadout/loadout_cosmetics.dm b/code/modules/client/preference/loadout/loadout_cosmetics.dm
index 0375de2de53..2f30bd90ac5 100644
--- a/code/modules/client/preference/loadout/loadout_cosmetics.dm
+++ b/code/modules/client/preference/loadout/loadout_cosmetics.dm
@@ -1,24 +1,37 @@
+/*
+######################################################################################
+## ##
+## IMPORTANT README ##
+## ##
+## Changing any /datum/gear typepaths --WILL-- break people's loadouts. ##
+## The typepaths are stored directly in the `characters.gear` column of the DB. ##
+## Please inform the server host if you wish to modify any of these. ##
+## ##
+######################################################################################
+*/
+
+
/datum/gear/lipstick
- display_name = "lipstick, red"
+ display_name = "Lipstick, red"
path = /obj/item/lipstick
sort_category = "Cosmetics"
/datum/gear/lipstick/black
- display_name = "lipstick, black"
+ display_name = "Lipstick, black"
path = /obj/item/lipstick/black
/datum/gear/lipstick/jade
- display_name = "lipstick, jade"
+ display_name = "Lipstick, jade"
path = /obj/item/lipstick/jade
/datum/gear/lipstick/purple
- display_name = "lipstick, purple"
+ display_name = "Lipstick, purple"
path = /obj/item/lipstick/purple
/datum/gear/lipstick/blue
- display_name = "lipstick, blue"
+ display_name = "Lipstick, blue"
path = /obj/item/lipstick/blue
/datum/gear/lipstick/lime
- display_name = "lipstick, lime"
+ display_name = "Lipstick, lime"
path = /obj/item/lipstick/lime
diff --git a/code/modules/client/preference/loadout/loadout_donor.dm b/code/modules/client/preference/loadout/loadout_donor.dm
index cc84053806b..aad1a4f22b6 100644
--- a/code/modules/client/preference/loadout/loadout_donor.dm
+++ b/code/modules/client/preference/loadout/loadout_donor.dm
@@ -1,7 +1,20 @@
+/*
+######################################################################################
+## ##
+## IMPORTANT README ##
+## ##
+## Changing any /datum/gear typepaths --WILL-- break people's loadouts. ##
+## The typepaths are stored directly in the `characters.gear` column of the DB. ##
+## Please inform the server host if you wish to modify any of these. ##
+## ##
+######################################################################################
+*/
+
+
/datum/gear/donor
donator_tier = 2
sort_category = "Donor"
- subtype_path = /datum/gear/donor
+ main_typepath = /datum/gear/donor
/datum/gear/donor/furgloves
display_name = "Fur Gloves"
diff --git a/code/modules/client/preference/loadout/loadout_general.dm b/code/modules/client/preference/loadout/loadout_general.dm
index 7278ef38cc7..56c28df62fe 100644
--- a/code/modules/client/preference/loadout/loadout_general.dm
+++ b/code/modules/client/preference/loadout/loadout_general.dm
@@ -1,136 +1,149 @@
+/*
+######################################################################################
+## ##
+## IMPORTANT README ##
+## ##
+## Changing any /datum/gear typepaths --WILL-- break people's loadouts. ##
+## The typepaths are stored directly in the `characters.gear` column of the DB. ##
+## Please inform the server host if you wish to modify any of these. ##
+## ##
+######################################################################################
+*/
+
+
/datum/gear/dice
- display_name = "a d20"
+ display_name = "D20"
path = /obj/item/dice/d20
/datum/gear/uplift
- display_name = "a pack of Uplifts"
+ display_name = "Pack of Uplifts"
path = /obj/item/storage/fancy/cigarettes/cigpack_uplift
/datum/gear/robust
- display_name = "a pack of Robusts"
+ display_name = "Pack of Robusts"
path = /obj/item/storage/fancy/cigarettes/cigpack_robust
/datum/gear/carp
- display_name = "a pack of Carps"
+ display_name = "Pack of Carps"
path = /obj/item/storage/fancy/cigarettes/cigpack_carp
/datum/gear/midori
- display_name = "a pack of Midoris"
+ display_name = "Pack of Midoris"
path = /obj/item/storage/fancy/cigarettes/cigpack_midori
/datum/gear/smokingpipe
- display_name = "smoking pipe"
+ display_name = "Smoking pipe"
path = /obj/item/clothing/mask/cigarette/pipe
cost = 2
/datum/gear/lighter
- display_name = "a cheap lighter"
+ display_name = "Cheap lighter"
path = /obj/item/lighter
/datum/gear/matches
- display_name = "a box of matches"
+ display_name = "Box of matches"
path = /obj/item/storage/box/matches
/datum/gear/candlebox
- display_name = "a box candles"
+ display_name = "Box of candles"
description = "For setting the mood or for occult rituals."
path = /obj/item/storage/fancy/candle_box/full
/datum/gear/rock
- display_name = "a pet rock"
+ display_name = "Pet rock"
path = /obj/item/toy/pet_rock
/datum/gear/camera
- display_name = "a camera"
+ display_name = "Camera"
path = /obj/item/camera
/datum/gear/redfoxplushie
- display_name = "a red fox plushie"
+ display_name = "Red fox plushie"
path = /obj/item/toy/plushie/red_fox
/datum/gear/blackcatplushie
- display_name = "a black cat plushie"
+ display_name = "Black cat plushie"
path = /obj/item/toy/plushie/black_cat
/datum/gear/voxplushie
- display_name = "a vox plushie"
+ display_name = "Vox plushie"
path = /obj/item/toy/plushie/voxplushie
/datum/gear/lizardplushie
- display_name = "a lizard plushie"
+ display_name = "Lizard plushie"
path = /obj/item/toy/plushie/lizardplushie
/datum/gear/deerplushie
- display_name = "a deer plushie"
+ display_name = "Deer plushie"
path = /obj/item/toy/plushie/deer
/datum/gear/carpplushie
- display_name = "a carp plushie"
+ display_name = "Carp plushie"
path = /obj/item/toy/carpplushie
/datum/gear/sechud
- display_name = "a classic security HUD"
+ display_name = "Classic security HUD"
path = /obj/item/clothing/glasses/hud/security
- allowed_roles = list("Head of Security", "Warden", "Security Officer", "Security Pod Pilot", "Internal Affairs Agent","Magistrate")
+ allowed_roles = list("Head of Security", "Warden", "Security Officer", "Internal Affairs Agent","Magistrate")
/datum/gear/cryaonbox
- display_name = "a box of crayons"
+ display_name = "Box of crayons"
path = /obj/item/storage/fancy/crayons
/datum/gear/cane
- display_name = "a walking cane"
+ display_name = "Walking cane"
path = /obj/item/cane
/datum/gear/cards
- display_name = "a deck of standard cards"
+ display_name = "Deck of standard cards"
path = /obj/item/deck/cards
/datum/gear/doublecards
- display_name = "a double deck of standard cards"
+ display_name = "Double deck of standard cards"
path = /obj/item/deck/doublecards
/datum/gear/tarot
- display_name = "a deck of tarot cards"
+ display_name = "Deck of tarot cards"
path = /obj/item/deck/tarot
/datum/gear/headphones
- display_name = "a pair of headphones"
+ display_name = "Headphones"
path = /obj/item/clothing/ears/headphones
/datum/gear/fannypack
- display_name = "a fannypack"
+ display_name = "Fannypack"
path = /obj/item/storage/belt/fannypack
/datum/gear/blackbandana
- display_name = "bandana, black"
+ display_name = "Bandana, black"
path = /obj/item/clothing/mask/bandana/black
/datum/gear/purplebandana
- display_name = "bandana, purple"
+ display_name = "Bandana, purple"
path = /obj/item/clothing/mask/bandana/purple
/datum/gear/orangebandana
- display_name = "bandana, orange"
+ display_name = "Bandana, orange"
path = /obj/item/clothing/mask/bandana/orange
/datum/gear/greenbandana
- display_name = "bandana, green"
+ display_name = "Bandana, green"
path = /obj/item/clothing/mask/bandana/green
/datum/gear/bluebandana
- display_name = "bandana, blue"
+ display_name = "Bandana, blue"
path = /obj/item/clothing/mask/bandana/blue
/datum/gear/redbandana
- display_name = "bandana, red"
+ display_name = "Bandana, red"
path = /obj/item/clothing/mask/bandana/red
/datum/gear/goldbandana
- display_name = "bandana, gold"
+ display_name = "Bandana, gold"
path = /obj/item/clothing/mask/bandana/gold
/datum/gear/skullbandana
- display_name = "bandana, skull"
+ display_name = "Bandana, skull"
path = /obj/item/clothing/mask/bandana/skull
/datum/gear/mob_hunt_game
@@ -143,54 +156,54 @@
//////////////////////
/datum/gear/mug
- display_name = "random coffee mug"
+ display_name = "Coffee mug, random"
description = "A randomly colored coffee mug. You'll need to supply your own beverage though."
path = /obj/item/reagent_containers/food/drinks/mug
sort_category = "Mugs"
/datum/gear/novelty_mug
- display_name = "novelty coffee mug"
+ display_name = "Coffee mug, novelty"
description = "A random novelty coffee mug. You'll need to supply your own beverage though."
path = /obj/item/reagent_containers/food/drinks/mug/novelty
cost = 2
sort_category = "Mugs"
/datum/gear/mug/flask
- display_name = "flask"
+ display_name = "Flask"
description = "A flask for drink transportation. You'll need to supply your own beverage though."
path = /obj/item/reagent_containers/food/drinks/flask/barflask
/datum/gear/mug/department
- subtype_path = /datum/gear/mug/department
+ main_typepath = /datum/gear/mug/department
sort_category = "Mugs"
- subtype_cost_overlap = FALSE
+ subtype_selection_cost = FALSE
/datum/gear/mug/department/eng
- display_name = "engineer coffee mug"
+ display_name = "Coffee mug, engineering"
description = "An engineer's coffee mug, emblazoned in the colors of the Engineering department."
- allowed_roles = list("Chief Engineer", "Station Engineer", "Mechanic", "Life Support Specialist")
+ allowed_roles = list("Chief Engineer", "Station Engineer", "Life Support Specialist")
path = /obj/item/reagent_containers/food/drinks/mug/eng
/datum/gear/mug/department/med
- display_name = "doctor coffee mug"
+ display_name = "Coffee mug, medical"
description = "A doctor's coffee mug, emblazoned in the colors of the Medical department."
allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Chemist", "Psychiatrist", "Paramedic", "Virologist", "Coroner")
path = /obj/item/reagent_containers/food/drinks/mug/med
/datum/gear/mug/department/sci
- display_name = "scientist coffee mug"
+ display_name = "Coffee mug, science"
description = "A scientist's coffee mug, emblazoned in the colors of the Science department."
allowed_roles = list("Research Director", "Scientist", "Roboticist")
path = /obj/item/reagent_containers/food/drinks/mug/sci
/datum/gear/mug/department/sec
- display_name = "officer coffee mug"
+ display_name = "Coffee mug, security"
description = "An officer's coffee mug, emblazoned in the colors of the Security department."
- allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer", "Security Pod Pilot", "Brig Physician", "Internal Affairs Agent")
+ allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer", "Brig Physician", "Internal Affairs Agent")
path = /obj/item/reagent_containers/food/drinks/mug/sec
/datum/gear/mug/department/serv
- display_name = "crewmember coffee mug"
+ display_name = "Coffee mug, service"
description = "A crewmember's coffee mug, emblazoned in the colors of the Service department."
path = /obj/item/reagent_containers/food/drinks/mug/serv
diff --git a/code/modules/client/preference/loadout/loadout_glasses.dm b/code/modules/client/preference/loadout/loadout_glasses.dm
index a84af914c49..bab9b9d63b0 100644
--- a/code/modules/client/preference/loadout/loadout_glasses.dm
+++ b/code/modules/client/preference/loadout/loadout_glasses.dm
@@ -1,10 +1,23 @@
+/*
+######################################################################################
+## ##
+## IMPORTANT README ##
+## ##
+## Changing any /datum/gear typepaths --WILL-- break people's loadouts. ##
+## The typepaths are stored directly in the `characters.gear` column of the DB. ##
+## Please inform the server host if you wish to modify any of these. ##
+## ##
+######################################################################################
+*/
+
+
/datum/gear/glasses
- subtype_path = /datum/gear/glasses
+ main_typepath = /datum/gear/glasses
slot = slot_glasses
sort_category = "Glasses"
/datum/gear/glasses/sunglasses
- display_name = "cheap sunglasses"
+ display_name = "Cheap sunglasses"
path = /obj/item/clothing/glasses/sunglasses_fake
/datum/gear/glasses/eyepatch
diff --git a/code/modules/client/preference/loadout/loadout_gloves.dm b/code/modules/client/preference/loadout/loadout_gloves.dm
index fece3456e56..2104ecff292 100644
--- a/code/modules/client/preference/loadout/loadout_gloves.dm
+++ b/code/modules/client/preference/loadout/loadout_gloves.dm
@@ -1,5 +1,18 @@
+/*
+######################################################################################
+## ##
+## IMPORTANT README ##
+## ##
+## Changing any /datum/gear typepaths --WILL-- break people's loadouts. ##
+## The typepaths are stored directly in the `characters.gear` column of the DB. ##
+## Please inform the server host if you wish to modify any of these. ##
+## ##
+######################################################################################
+*/
+
+
/datum/gear/gloves
- subtype_path = /datum/gear/gloves
+ main_typepath = /datum/gear/gloves
slot = slot_gloves
sort_category = "Gloves"
diff --git a/code/modules/client/preference/loadout/loadout_hat.dm b/code/modules/client/preference/loadout/loadout_hat.dm
index d5890a2cefc..f6aa86060f2 100644
--- a/code/modules/client/preference/loadout/loadout_hat.dm
+++ b/code/modules/client/preference/loadout/loadout_hat.dm
@@ -1,184 +1,197 @@
+/*
+######################################################################################
+## ##
+## IMPORTANT README ##
+## ##
+## Changing any /datum/gear typepaths --WILL-- break people's loadouts. ##
+## The typepaths are stored directly in the `characters.gear` column of the DB. ##
+## Please inform the server host if you wish to modify any of these. ##
+## ##
+######################################################################################
+*/
+
+
/datum/gear/hat
- subtype_path = /datum/gear/hat
+ main_typepath = /datum/gear/hat
slot = slot_head
sort_category = "Headwear"
/datum/gear/hat/hhat_yellow
- display_name = "hardhat, yellow"
+ display_name = "Hardhat, yellow"
path = /obj/item/clothing/head/hardhat
- allowed_roles = list("Chief Engineer", "Station Engineer", "Mechanic", "Life Support Specialist")
+ allowed_roles = list("Chief Engineer", "Station Engineer", "Life Support Specialist")
/datum/gear/hat/hhat_orange
- display_name = "hardhat, orange"
+ display_name = "Hardhat, orange"
path = /obj/item/clothing/head/hardhat/orange
- allowed_roles = list("Chief Engineer", "Station Engineer", "Mechanic", "Life Support Specialist")
+ allowed_roles = list("Chief Engineer", "Station Engineer", "Life Support Specialist")
/datum/gear/hat/hhat_blue
- display_name = "hardhat, blue"
+ display_name = "Hardhat, blue"
path = /obj/item/clothing/head/hardhat/dblue
- allowed_roles = list("Chief Engineer", "Station Engineer", "Mechanic", "Life Support Specialist")
+ allowed_roles = list("Chief Engineer", "Station Engineer", "Life Support Specialist")
/datum/gear/hat/that
- display_name = "top hat"
+ display_name = "Top hat"
path = /obj/item/clothing/head/that
/datum/gear/hat/flatcap
- display_name = "flat cap"
+ display_name = "Flat cap"
path = /obj/item/clothing/head/flatcap
/datum/gear/hat/witch
- display_name = "witch hat"
+ display_name = "Witch hat"
path = /obj/item/clothing/head/wizard/marisa/fake
/datum/gear/hat/piratecaphat
- display_name = "pirate captian hat"
+ display_name = "Pirate captian hat"
path = /obj/item/clothing/head/pirate
/datum/gear/hat/fez
- display_name = "fez"
+ display_name = "Fez"
path = /obj/item/clothing/head/fez
/datum/gear/hat/rasta
- display_name = "rasta hat"
+ display_name = "Rasta hat"
path = /obj/item/clothing/head/beanie/rasta
/datum/gear/hat/bfedora
- display_name = "fedora, black"
+ display_name = "Fedora, black"
path = /obj/item/clothing/head/fedora
/datum/gear/hat/wfedora
- display_name = "fedora, white"
+ display_name = "Fedora, white"
path = /obj/item/clothing/head/fedora/whitefedora
/datum/gear/hat/brfedora
- display_name = "fedora, brown"
+ display_name = "Fedora, brown"
path = /obj/item/clothing/head/fedora/brownfedora
/datum/gear/hat/capcsec
- display_name = "security corporate cap"
+ display_name = "Security cap, corporate"
path = /obj/item/clothing/head/soft/sec/corp
- allowed_roles = list("Head of Security", "Warden", "Security Officer", "Security Pod Pilot")
+ allowed_roles = list("Head of Security", "Warden", "Security Officer")
/datum/gear/hat/capsec
- display_name = "security cap"
+ display_name = "Security cap"
path = /obj/item/clothing/head/soft/sec
- allowed_roles = list("Head of Security", "Warden", "Security Officer", "Security Pod Pilot")
+ allowed_roles = list("Head of Security", "Warden", "Security Officer")
/datum/gear/hat/capred
- display_name = "cap, red"
+ display_name = "Cap, red"
path = /obj/item/clothing/head/soft/red
/datum/gear/hat/capblue
- display_name = "cap, blue"
+ display_name = "Cap, blue"
path = /obj/item/clothing/head/soft/blue
/datum/gear/hat/capgreen
- display_name = "cap, green"
+ display_name = "Cap, green"
path = /obj/item/clothing/head/soft/green
/datum/gear/hat/capblack
- display_name = "cap, black"
+ display_name = "Cap, black"
path = /obj/item/clothing/head/soft/black
/datum/gear/hat/cappurple
- display_name = "cap, purple"
+ display_name = "Cap, purple"
path = /obj/item/clothing/head/soft/purple
/datum/gear/hat/capwhite
- display_name = "cap, white"
+ display_name = "Cap, white"
path = /obj/item/clothing/head/soft/mime
/datum/gear/hat/caporange
- display_name = "cap, orange"
+ display_name = "Cap, orange"
path = /obj/item/clothing/head/soft/orange
/datum/gear/hat/capgrey
- display_name = "cap, grey"
+ display_name = "Cap, grey"
path = /obj/item/clothing/head/soft/grey
/datum/gear/hat/capyellow
- display_name = "cap, yellow"
+ display_name = "Cap, yellow"
path = /obj/item/clothing/head/soft/yellow
/datum/gear/hat/cowboyhat
- display_name = "cowboy hat, brown"
+ display_name = "Cowboy hat, brown"
path = /obj/item/clothing/head/cowboyhat
/datum/gear/hat/cowboyhat/tan
- display_name = "cowboy hat, tan"
+ display_name = "Cowboy hat, tan"
path = /obj/item/clothing/head/cowboyhat/tan
/datum/gear/hat/cowboyhat/black
- display_name = "cowboy hat, black"
+ display_name = "Cowboy hat, black"
path = /obj/item/clothing/head/cowboyhat/black
/datum/gear/hat/cowboyhat/white
- display_name = "cowboy hat, white"
+ display_name = "Cowboy hat, white"
path = /obj/item/clothing/head/cowboyhat/white
/datum/gear/hat/cowboyhat/pink
- display_name = "cowboy hat, pink"
+ display_name = "Cowboy hat, pink"
path = /obj/item/clothing/head/cowboyhat/pink
/datum/gear/hat/beret_purple
- display_name = "beret, purple"
+ display_name = "Beret, purple"
path = /obj/item/clothing/head/beret/purple_normal
/datum/gear/hat/beret_black
- display_name = "beret, black"
+ display_name = "Beret, black"
path = /obj/item/clothing/head/beret/black
/datum/gear/hat/beret_blue
- display_name = "beret, blue"
+ display_name = "Beret, blue"
path = /obj/item/clothing/head/beret/blue
/datum/gear/hat/beret_red
- display_name = "beret, red"
+ display_name = "Beret, red"
path = /obj/item/clothing/head/beret
/datum/gear/hat/beret_job
- subtype_path = /datum/gear/hat/beret_job
- subtype_cost_overlap = FALSE
+ main_typepath = /datum/gear/hat/beret_job
+ subtype_selection_cost = FALSE
/datum/gear/hat/beret_job/sec
- display_name = "security beret"
+ display_name = "Beret, security"
path = /obj/item/clothing/head/beret/sec
- allowed_roles = list("Head of Security", "Warden", "Security Officer", "Security Pod Pilot")
+ allowed_roles = list("Head of Security", "Warden", "Security Officer")
/datum/gear/hat/beret_job/sci
- display_name = "science beret"
+ display_name = "Beret, science"
path = /obj/item/clothing/head/beret/sci
allowed_roles = list("Research Director", "Scientist")
/datum/gear/hat/beret_job/med
- display_name = "medical beret"
+ display_name = "Beret, medical"
path = /obj/item/clothing/head/beret/med
allowed_roles = list("Chief Medical Officer", "Medical Doctor" , "Virologist", "Brig Physician" , "Coroner")
/datum/gear/hat/beret_job/eng
- display_name = "engineering beret"
+ display_name = "Beret, engineering"
path = /obj/item/clothing/head/beret/eng
allowed_roles = list("Chief Engineer", "Station Engineer")
/datum/gear/hat/beret_job/atmos
- display_name = "atmospherics beret"
+ display_name = "Beret, atmospherics"
path = /obj/item/clothing/head/beret/atmos
allowed_roles = list("Chief Engineer", "Life Support Specialist")
/datum/gear/hat/surgicalcap_purple
- display_name = "surgical cap, purple"
+ display_name = "Surgical cap, purple"
path = /obj/item/clothing/head/surgery/purple
allowed_roles = list("Chief Medical Officer", "Medical Doctor")
/datum/gear/hat/surgicalcap_green
- display_name = "surgical cap, green"
+ display_name = "Surgical cap, green"
path = /obj/item/clothing/head/surgery/green
allowed_roles = list("Chief Medical Officer", "Medical Doctor")
/datum/gear/hat/flowerpin
- display_name = "hair flower"
+ display_name = "Hair flower"
path = /obj/item/clothing/head/hairflower
/datum/gear/hat/capsolgov
- display_name = "cap, Sol Gov"
+ display_name = "Cap, Sol Gov"
path = /obj/item/clothing/head/soft/solgov
diff --git a/code/modules/client/preference/loadout/loadout_racial.dm b/code/modules/client/preference/loadout/loadout_racial.dm
index 78d38cf87b5..e9e95bc54ae 100644
--- a/code/modules/client/preference/loadout/loadout_racial.dm
+++ b/code/modules/client/preference/loadout/loadout_racial.dm
@@ -1,47 +1,60 @@
+/*
+######################################################################################
+## ##
+## IMPORTANT README ##
+## ##
+## Changing any /datum/gear typepaths --WILL-- break people's loadouts. ##
+## The typepaths are stored directly in the `characters.gear` column of the DB. ##
+## Please inform the server host if you wish to modify any of these. ##
+## ##
+######################################################################################
+*/
+
+
/datum/gear/racial
sort_category = "Racial"
- subtype_path = /datum/gear/racial
+ main_typepath = /datum/gear/racial
cost = 1
/datum/gear/racial/taj
- display_name = "embroidered veil"
+ display_name = "Embroidered veil"
description = "A common traditional nano-fiber veil worn by many Tajaran, It is rare and offensive to see it on other races."
path = /obj/item/clothing/glasses/tajblind
slot = slot_glasses
/datum/gear/racial/taj/sec
- display_name = "sleek veil"
+ display_name = "Sleek veil"
description = "A common traditional nano-fiber veil worn by many Tajaran, It is rare and offensive to see it on other races. This one has an in-built security HUD."
path = /obj/item/clothing/glasses/hud/security/tajblind
- allowed_roles = list("Head of Security", "Warden", "Security Officer", "Security Pod Pilot", "Internal Affairs Agent", "Magistrate")
+ allowed_roles = list("Head of Security", "Warden", "Security Officer", "Internal Affairs Agent", "Magistrate")
cost = 2
/datum/gear/racial/taj/med
- display_name = "lightweight veil"
+ display_name = "Lightweight veil"
description = "A common traditional nano-fiber veil worn by many Tajaran, It is rare and offensive to see it on other races. This one has an in-built medical HUD."
path = /obj/item/clothing/glasses/hud/health/tajblind
allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Chemist", "Psychiatrist", "Paramedic", "Virologist", "Brig Physician" , "Coroner")
cost = 2
/datum/gear/racial/taj/sci
- display_name = "hi-tech veil"
+ display_name = "Hi-tech veil"
description = "A common traditional nano-fiber veil worn by many Tajaran, It is rare and offensive to see it on other races."
path = /obj/item/clothing/glasses/tajblind/sci
cost = 2
/datum/gear/racial/taj/eng
- display_name = "industrial veil"
+ display_name = "Industrial veil"
description = "A common traditional nano-fiber veil worn by many Tajaran, It is rare and offensive to see it on other races."
path = /obj/item/clothing/glasses/tajblind/eng
cost = 2
/datum/gear/racial/taj/cargo
- display_name = "khaki veil"
+ display_name = "Khaki veil"
description = "A common traditional nano-fiber veil worn by many Tajaran, It is rare and offensive to see it on other races. It is light and comfy!"
path = /obj/item/clothing/glasses/tajblind/cargo
cost = 2
/datum/gear/racial/footwraps
- display_name = "cloth footwraps"
+ display_name = "Cloth footwraps"
path = /obj/item/clothing/shoes/footwraps
slot = slot_shoes
diff --git a/code/modules/client/preference/loadout/loadout_shoes.dm b/code/modules/client/preference/loadout/loadout_shoes.dm
index dbc7f970a33..e7f969c2311 100644
--- a/code/modules/client/preference/loadout/loadout_shoes.dm
+++ b/code/modules/client/preference/loadout/loadout_shoes.dm
@@ -1,54 +1,67 @@
+/*
+######################################################################################
+## ##
+## IMPORTANT README ##
+## ##
+## Changing any /datum/gear typepaths --WILL-- break people's loadouts. ##
+## The typepaths are stored directly in the `characters.gear` column of the DB. ##
+## Please inform the server host if you wish to modify any of these. ##
+## ##
+######################################################################################
+*/
+
+
/datum/gear/shoes
- subtype_path = /datum/gear/shoes
+ main_typepath = /datum/gear/shoes
slot = slot_shoes
sort_category = "Shoes"
/datum/gear/shoes/sandals
- display_name = "sandals, wooden"
+ display_name = "Sandals, wooden"
path = /obj/item/clothing/shoes/sandal
/datum/gear/shoes/winterboots
- display_name = "winter boots"
+ display_name = "Winter boots"
path = /obj/item/clothing/shoes/winterboots
/datum/gear/shoes/workboots
- display_name = "work boots"
+ display_name = "Work boots"
path = /obj/item/clothing/shoes/workboots
/datum/gear/shoes/fancysandals
- display_name = "sandals, fancy"
+ display_name = "Sandals, fancy"
path = /obj/item/clothing/shoes/sandal/fancy
/datum/gear/shoes/dressshoes
- display_name = "dress shoes"
+ display_name = "Dress shoes"
path = /obj/item/clothing/shoes/centcom
/datum/gear/shoes/cowboyboots
- display_name = "cowboy boots, brown"
+ display_name = "Cowboy boots, brown"
path = /obj/item/clothing/shoes/cowboy
/datum/gear/shoes/cowboyboots_black
- display_name = "cowboy boots, black"
+ display_name = "Cowboy boots, black"
path = /obj/item/clothing/shoes/cowboy/black
/datum/gear/shoes/cowboyboots/white
- display_name = "cowboy boots, white"
+ display_name = "Cowboy boots, white"
path = /obj/item/clothing/shoes/cowboy/white
/datum/gear/shoes/cowboyboots/pink
- display_name = "cowboy boots, pink"
+ display_name = "Cowboy boots, pink"
path = /obj/item/clothing/shoes/cowboy/pink
/datum/gear/shoes/jackboots
- display_name = "jackboots"
+ display_name = "Jackboots"
path = /obj/item/clothing/shoes/jackboots
/datum/gear/shoes/jacksandals
- display_name = "jacksandals"
+ display_name = "Jacksandals"
path = /obj/item/clothing/shoes/jackboots/jacksandals
/datum/gear/shoes/laceup
- display_name = "laceup shoes"
+ display_name = "Laceup shoes"
path = /obj/item/clothing/shoes/laceup
/datum/gear/shoes/blackshoes
diff --git a/code/modules/client/preference/loadout/loadout_suit.dm b/code/modules/client/preference/loadout/loadout_suit.dm
index 0f84bbfa58d..4f9298c6ac9 100644
--- a/code/modules/client/preference/loadout/loadout_suit.dm
+++ b/code/modules/client/preference/loadout/loadout_suit.dm
@@ -1,227 +1,238 @@
+/*
+######################################################################################
+## ##
+## IMPORTANT README ##
+## ##
+## Changing any /datum/gear typepaths --WILL-- break people's loadouts. ##
+## The typepaths are stored directly in the `characters.gear` column of the DB. ##
+## Please inform the server host if you wish to modify any of these. ##
+## ##
+######################################################################################
+*/
+
+
/datum/gear/suit
- subtype_path = /datum/gear/suit
+ main_typepath = /datum/gear/suit
slot = slot_wear_suit
sort_category = "External Wear"
//WINTER COATS
/datum/gear/suit/coat
- subtype_path = /datum/gear/suit/coat
+ main_typepath = /datum/gear/suit/coat
/datum/gear/suit/coat/grey
- display_name = "winter coat"
+ display_name = "Winter coat"
path = /obj/item/clothing/suit/hooded/wintercoat
/datum/gear/suit/coat/job
- subtype_path = /datum/gear/suit/coat/job
- subtype_cost_overlap = FALSE
+ main_typepath = /datum/gear/suit/coat/job
+ subtype_selection_cost = FALSE
/datum/gear/suit/coat/job/sec
- display_name = "winter coat, security"
+ display_name = "Winter coat, security"
path = /obj/item/clothing/suit/hooded/wintercoat/security
- allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer", "Security Pod Pilot")
+ allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer")
/datum/gear/suit/coat/job/captain
- display_name = "winter coat, captain"
+ display_name = "Winter coat, captain"
path = /obj/item/clothing/suit/hooded/wintercoat/captain
allowed_roles = list("Captain")
/datum/gear/suit/coat/job/med
- display_name = "winter coat, medical"
+ display_name = "Winter coat, medical"
path = /obj/item/clothing/suit/hooded/wintercoat/medical
allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Chemist", "Psychiatrist", "Paramedic", "Virologist", "Brig Physician" , "Coroner")
/datum/gear/suit/coat/job/sci
- display_name = "winter coat, science"
+ display_name = "Winter coat, science"
path = /obj/item/clothing/suit/hooded/wintercoat/science
allowed_roles = list("Scientist", "Research Director")
/datum/gear/suit/coat/job/engi
- display_name = "winter coat, engineering"
+ display_name = "Winter coat, engineering"
path = /obj/item/clothing/suit/hooded/wintercoat/engineering
- allowed_roles = list("Chief Engineer", "Station Engineer", "Mechanic")
+ allowed_roles = list("Chief Engineer", "Station Engineer")
/datum/gear/suit/coat/job/atmos
- display_name = "winter coat, atmospherics"
+ display_name = "Winter coat, atmospherics"
path = /obj/item/clothing/suit/hooded/wintercoat/engineering/atmos
allowed_roles = list("Chief Engineer", "Life Support Specialist")
/datum/gear/suit/coat/job/hydro
- display_name = "winter coat, hydroponics"
+ display_name = "Winter coat, hydroponics"
path = /obj/item/clothing/suit/hooded/wintercoat/hydro
allowed_roles = list("Botanist")
/datum/gear/suit/coat/job/cargo
- display_name = "winter coat, cargo"
+ display_name = "Winter coat, cargo"
path = /obj/item/clothing/suit/hooded/wintercoat/cargo
allowed_roles = list("Quartermaster", "Cargo Technician")
/datum/gear/suit/coat/job/miner
- display_name = "winter coat, miner"
+ display_name = "Winter coat, mining"
path = /obj/item/clothing/suit/hooded/wintercoat/miner
allowed_roles = list("Shaft Miner")
//LABCOATS
/datum/gear/suit/labcoat_emt
- display_name = "labcoat, paramedic"
+ display_name = "Labcoat, paramedic"
path = /obj/item/clothing/suit/storage/labcoat/emt
allowed_roles = list("Chief Medical Officer", "Paramedic")
//JACKETS
/datum/gear/suit/leather_jacket
- display_name = "leather jacket"
+ display_name = "Leather jacket"
path = /obj/item/clothing/suit/jacket/leather
/datum/gear/suit/motojacket
- display_name = "leather motorcycle jacket"
+ display_name = "Leather motorcycle jacket"
path = /obj/item/clothing/suit/jacket/motojacket
/datum/gear/suit/br_tcoat
- display_name = "trenchcoat, brown"
+ display_name = "Trenchcoat, brown"
path = /obj/item/clothing/suit/browntrenchcoat
/datum/gear/suit/bl_tcoat
- display_name = "trenchcoat, black"
+ display_name = "Trenchcoat, black"
path = /obj/item/clothing/suit/blacktrenchcoat
/datum/gear/suit/bomber_jacket
- display_name = "bomber jacket"
+ display_name = "Bomber jacket"
path = /obj/item/clothing/suit/jacket
/datum/gear/suit/ol_miljacket
- display_name = "military jacket, olive"
+ display_name = "Military jacket, olive"
path = /obj/item/clothing/suit/jacket/miljacket
/datum/gear/suit/nv_miljacket
- display_name = "military jacket, navy"
+ display_name = "Military jacket, navy"
path = /obj/item/clothing/suit/jacket/miljacket/navy
/datum/gear/suit/ds_miljacket
- display_name = "military jacket, desert"
+ display_name = "Military jacket, desert"
path = /obj/item/clothing/suit/jacket/miljacket/desert
/datum/gear/suit/wh_miljacket
- display_name = "military jacket, white"
+ display_name = "Military jacket, white"
path = /obj/item/clothing/suit/jacket/miljacket/white
/datum/gear/suit/secjacket
- display_name = "security jacket"
+ display_name = "Security jacket"
path = /obj/item/clothing/suit/armor/secjacket
- allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer", "Security Pod Pilot")
+ allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer")
/datum/gear/suit/secbomberjacket
- display_name = "security bomber jacket"
- path = /obj/item/clothing/suit/jacket/pilot
- allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer", "Security Pod Pilot")
+ display_name = "Security bomber jacket"
+ path = /obj/item/clothing/suit/jacket/secbomber
+ allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer")
/datum/gear/suit/ianshirt
display_name = "Ian Shirt"
path = /obj/item/clothing/suit/ianshirt
/datum/gear/suit/poncho
- display_name = "poncho, classic"
+ display_name = "Poncho, classic"
path = /obj/item/clothing/suit/poncho
/datum/gear/suit/grponcho
- display_name = "poncho, green"
+ display_name = "Poncho, green"
path = /obj/item/clothing/suit/poncho/green
/datum/gear/suit/rdponcho
- display_name = "poncho, red"
+ display_name = "Poncho, red"
path = /obj/item/clothing/suit/poncho/red
/datum/gear/suit/tphoodie
- display_name = "hoodie, Tharsis Polytech"
+ display_name = "Hoodie, Tharsis Polytech"
path = /obj/item/clothing/suit/hooded/hoodie/tp
/datum/gear/suit/nthoodie
- display_name = "hoodie, Nanotrasen"
+ display_name = "Hoodie, Nanotrasen"
path = /obj/item/clothing/suit/hooded/hoodie/nt
/datum/gear/suit/lamhoodie
- display_name = "hoodie, Lunar Academy of Medicine"
+ display_name = "Hoodie, Lunar Academy of Medicine"
path = /obj/item/clothing/suit/hooded/hoodie/lam
/datum/gear/suit/cuthoodie
- display_name = "hoodie, Canaan University of Technology"
+ display_name = "Hoodie, Canaan University of Technology"
path = /obj/item/clothing/suit/hooded/hoodie/cut
/datum/gear/suit/mithoodie
- display_name = "hoodie, Martian Institute of Technology"
+ display_name = "Hoodie, Martian Institute of Technology"
path = /obj/item/clothing/suit/hooded/hoodie/mit
/datum/gear/suit/bluehoodie
- display_name = "hoodie, blue"
+ display_name = "Hoodie, blue"
path = /obj/item/clothing/suit/hooded/hoodie/blue
/datum/gear/suit/blackhoodie
- display_name = "hoodie, black"
+ display_name = "Hoodie, black"
path = /obj/item/clothing/suit/hooded/hoodie
//SUITS!
/datum/gear/suit/blacksuit
- display_name = "suit jacket, black"
+ display_name = "Suit jacket, black"
path = /obj/item/clothing/suit/storage/lawyer/blackjacket
/datum/gear/suit/bluesuit
- display_name = "suit jacket, blue"
+ display_name = "Suit jacket, blue"
path = /obj/item/clothing/suit/storage/lawyer/bluejacket
/datum/gear/suit/purplesuit
- display_name = "suit jacket, purple"
+ display_name = "Suit jacket, purple"
path = /obj/item/clothing/suit/storage/lawyer/purpjacket
//Mantles!
/datum/gear/suit/mantle
- display_name = "mantle"
+ display_name = "Mantle"
path = /obj/item/clothing/suit/mantle
/datum/gear/suit/old_scarf
- display_name = "old scarf"
+ display_name = "Old scarf"
path = /obj/item/clothing/suit/mantle/old
/datum/gear/suit/regal_shawl
- display_name = "regal shawl"
+ display_name = "Regal shawl"
path = /obj/item/clothing/suit/mantle/regal
/datum/gear/suit/mantle/job
- subtype_path = /datum/gear/suit/mantle/job
- subtype_cost_overlap = FALSE
+ main_typepath = /datum/gear/suit/mantle/job
+ subtype_selection_cost = FALSE
/datum/gear/suit/mantle/job/captain
- display_name = "mantle, captain"
+ display_name = "Mantle, captain"
path = /obj/item/clothing/suit/mantle/armor/captain
allowed_roles = list("Captain")
/datum/gear/suit/mantle/job/ce
- display_name = "mantle, chief engineer"
+ display_name = "Mantle, chief engineer"
path = /obj/item/clothing/suit/mantle/chief_engineer
allowed_roles = list("Chief Engineer")
/datum/gear/suit/mantle/job/cmo
- display_name = "mantle, chief medical officer"
+ display_name = "Mantle, chief medical officer"
path = /obj/item/clothing/suit/mantle/labcoat/chief_medical_officer
allowed_roles = list("Chief Medical Officer")
/datum/gear/suit/mantle/job/hos
- display_name = "mantle, head of security"
+ display_name = "Mantle, head of security"
path = /obj/item/clothing/suit/mantle/armor
allowed_roles = list("Head of Security")
/datum/gear/suit/mantle/job/hop
- display_name = "mantle, head of personnel"
+ display_name = "Mantle, head of personnel"
path = /obj/item/clothing/suit/mantle/armor/head_of_personnel
allowed_roles = list("Head of Personnel")
/datum/gear/suit/mantle/job/rd
- display_name = "mantle, research director"
+ display_name = "Mantle, research director"
path = /obj/item/clothing/suit/mantle/labcoat
allowed_roles = list("Research Director")
//Robes!
/datum/gear/suit/witch
- display_name = "witch robes"
+ display_name = "Witch robes"
path = /obj/item/clothing/suit/wizrobe/marisa/fake
-
-
diff --git a/code/modules/client/preference/loadout/loadout_uniform.dm b/code/modules/client/preference/loadout/loadout_uniform.dm
index e188431f719..30d912aedc1 100644
--- a/code/modules/client/preference/loadout/loadout_uniform.dm
+++ b/code/modules/client/preference/loadout/loadout_uniform.dm
@@ -1,96 +1,105 @@
+/*
+######################################################################################
+## ##
+## IMPORTANT README ##
+## ##
+## Changing any /datum/gear typepaths --WILL-- break people's loadouts. ##
+## The typepaths are stored directly in the `characters.gear` column of the DB. ##
+## Please inform the server host if you wish to modify any of these. ##
+## ##
+######################################################################################
+*/
+
+
// Uniform slot
/datum/gear/uniform
- subtype_path = /datum/gear/uniform
+ main_typepath = /datum/gear/uniform
slot = slot_w_uniform
sort_category = "Uniforms and Casual Dress"
/datum/gear/uniform/suit
- subtype_path = /datum/gear/uniform/suit
+ main_typepath = /datum/gear/uniform/suit
//there's a lot more colors than I thought there were @_@
/datum/gear/uniform/suit/jumpsuitblack
- display_name = "jumpsuit, black"
+ display_name = "Jumpsuit, black"
path = /obj/item/clothing/under/color/black
/datum/gear/uniform/suit/jumpsuitblue
- display_name = "jumpsuit, blue"
+ display_name = "Jumpsuit, blue"
path = /obj/item/clothing/under/color/blue
/datum/gear/uniform/suit/jumpsuitgreen
- display_name = "jumpsuit, green"
+ display_name = "Jumpsuit, green"
path = /obj/item/clothing/under/color/green
/datum/gear/uniform/suit/jumpsuitgrey
- display_name = "jumpsuit, grey"
+ display_name = "Jumpsuit, grey"
path = /obj/item/clothing/under/color/grey
/datum/gear/uniform/suit/jumpsuitorange
- display_name = "jumpsuit, orange"
+ display_name = "Jumpsuit, orange"
path = /obj/item/clothing/under/color/orange
/datum/gear/uniform/suit/jumpsuitpink
- display_name = "jumpsuit, pink"
+ display_name = "Jumpsuit, pink"
path = /obj/item/clothing/under/color/pink
/datum/gear/uniform/suit/jumpsuitred
- display_name = "jumpsuit, red"
+ display_name = "Jumpsuit, red"
path = /obj/item/clothing/under/color/red
/datum/gear/uniform/suit/jumpsuitwhite
- display_name = "jumpsuit, white"
+ display_name = "Jumpsuit, white"
path = /obj/item/clothing/under/color/white
/datum/gear/uniform/suit/jumpsuityellow
- display_name = "jumpsuit, yellow"
+ display_name = "Jumpsuit, yellow"
path = /obj/item/clothing/under/color/yellow
/datum/gear/uniform/suit/jumpsuitlightblue
- display_name = "jumpsuit, lightblue"
+ display_name = "Jumpsuit, lightblue"
path = /obj/item/clothing/under/color/lightblue
/datum/gear/uniform/suit/jumpsuitaqua
- display_name = "jumpsuit, aqua"
+ display_name = "Jumpsuit, aqua"
path = /obj/item/clothing/under/color/aqua
/datum/gear/uniform/suit/jumpsuitpurple
- display_name = "jumpsuit, purple"
+ display_name = "Jumpsuit, purple"
path = /obj/item/clothing/under/color/purple
/datum/gear/uniform/suit/jumpsuitlightpurple
- display_name = "jumpsuit, lightpurple"
+ display_name = "Jumpsuit, lightpurple"
path = /obj/item/clothing/under/color/lightpurple
/datum/gear/uniform/suit/jumpsuitlightgreen
- display_name = "jumpsuit, lightgreen"
+ display_name = "Jumpsuit, lightgreen"
path = /obj/item/clothing/under/color/lightgreen
-/datum/gear/uniform/suit/jumpsuitlightblue
- display_name = "jumpsuit, lightblue"
- path = /obj/item/clothing/under/color/lightblue
-
/datum/gear/uniform/suit/jumpsuitlightbrown
- display_name = "jumpsuit, lightbrown"
+ display_name = "Jumpsuit, lightbrown"
path = /obj/item/clothing/under/color/lightbrown
/datum/gear/uniform/suit/jumpsuitbrown
- display_name = "jumpsuit, brown"
+ display_name = "Jumpsuit, brown"
path = /obj/item/clothing/under/color/brown
/datum/gear/uniform/suit/jumpsuityellowgreen
- display_name = "jumpsuit, yellowgreen"
+ display_name = "Jumpsuit, yellowgreen"
path = /obj/item/clothing/under/color/yellowgreen
/datum/gear/uniform/suit/jumpsuitdarkblue
- display_name = "jumpsuit, darkblue"
+ display_name = "Jumpsuit, darkblue"
path = /obj/item/clothing/under/color/darkblue
/datum/gear/uniform/suit/jumpsuitlightred
- display_name = "jumpsuit, lightred"
+ display_name = "Jumpsuit, lightred"
path = /obj/item/clothing/under/color/lightred
/datum/gear/uniform/suit/jumpsuitdarkred
- display_name = "jumpsuit, darkred"
+ display_name = "Jumpsuit, darkred"
path = /obj/item/clothing/under/color/darkred
/datum/gear/uniform/suit/soviet
@@ -98,229 +107,229 @@
path = /obj/item/clothing/under/soviet
/datum/gear/uniform/suit/kilt
- display_name = "a kilt"
+ display_name = "Kilt"
path = /obj/item/clothing/under/kilt
/datum/gear/uniform/skirt
- subtype_path = /datum/gear/uniform/skirt
+ main_typepath = /datum/gear/uniform/skirt
/datum/gear/uniform/skirt/blue
- display_name = "plaid skirt, blue"
+ display_name = "Plaid skirt, blue"
path = /obj/item/clothing/under/dress/plaid_blue
/datum/gear/uniform/skirt/purple
- display_name = "plaid skirt, purple"
+ display_name = "Plaid skirt, purple"
path = /obj/item/clothing/under/dress/plaid_purple
/datum/gear/uniform/skirt/red
- display_name = "plaid skirt, red"
+ display_name = "Plaid skirt, red"
path = /obj/item/clothing/under/dress/plaid_red
/datum/gear/uniform/skirt/black
- display_name = "skirt, black"
+ display_name = "Skirt, black"
path = /obj/item/clothing/under/blackskirt
/datum/gear/uniform/skirt/job
- subtype_path = /datum/gear/uniform/skirt/job
- subtype_cost_overlap = FALSE
+ main_typepath = /datum/gear/uniform/skirt/job
+ subtype_selection_cost = FALSE
/datum/gear/uniform/skirt/job/ce
- display_name = "skirt, ce"
+ display_name = "Skirt, ce"
path = /obj/item/clothing/under/rank/chief_engineer/skirt
allowed_roles = list("Chief Engineer")
/datum/gear/uniform/skirt/job/atmos
- display_name = "skirt, atmos"
+ display_name = "Skirt, atmos"
path = /obj/item/clothing/under/rank/atmospheric_technician/skirt
allowed_roles = list("Chief Engineer","Life Support Specialist")
/datum/gear/uniform/skirt/job/eng
- display_name = "skirt, engineer"
+ display_name = "Skirt, engineer"
path = /obj/item/clothing/under/rank/engineer/skirt
allowed_roles = list("Chief Engineer","Station Engineer")
/datum/gear/uniform/skirt/job/roboticist
- display_name = "skirt, roboticist"
+ display_name = "Skirt, roboticist"
path = /obj/item/clothing/under/rank/roboticist/skirt
allowed_roles = list("Research Director","Roboticist")
/datum/gear/uniform/skirt/job/cmo
- display_name = "skirt, cmo"
+ display_name = "Skirt, cmo"
path = /obj/item/clothing/under/rank/chief_medical_officer/skirt
allowed_roles = list("Chief Medical Officer")
/datum/gear/uniform/skirt/job/chem
- display_name = "skirt, chemist"
+ display_name = "Skirt, chemist"
path = /obj/item/clothing/under/rank/chemist/skirt
allowed_roles = list("Chief Medical Officer","Chemist")
/datum/gear/uniform/skirt/job/viro
- display_name = "skirt, virologist"
+ display_name = "Skirt, virologist"
path = /obj/item/clothing/under/rank/virologist/skirt
allowed_roles = list("Virologist")
/datum/gear/uniform/skirt/job/med
- display_name = "skirt, medical"
+ display_name = "Skirt, medical"
path = /obj/item/clothing/under/rank/medical/skirt
allowed_roles = list("Chief Medical Officer","Medical Doctor","Psychiatrist","Paramedic","Coroner")
/datum/gear/uniform/skirt/job/phys
- display_name = "skirt, physician"
+ display_name = "Skirt, physician"
path = /obj/item/clothing/under/rank/security/brigphys/skirt
allowed_roles = list("Brig Physician")
/datum/gear/uniform/skirt/job/sci
- display_name = "skirt, scientist"
+ display_name = "Skirt, scientist"
path = /obj/item/clothing/under/rank/scientist/skirt
allowed_roles = list("Research Director","Scientist")
/datum/gear/uniform/skirt/job/cargo
- display_name = "skirt, cargo"
+ display_name = "Skirt, cargo"
path = /obj/item/clothing/under/rank/cargotech/skirt
allowed_roles = list("Quartermaster","Cargo Technician")
/datum/gear/uniform/skirt/job/qm
- display_name = "skirt, QM"
+ display_name = "Skirt, QM"
path = /obj/item/clothing/under/rank/cargo/skirt
allowed_roles = list("Quartermaster")
/datum/gear/uniform/skirt/job/warden
- display_name = "skirt, warden"
+ display_name = "Skirt, warden"
path = /obj/item/clothing/under/rank/warden/skirt
allowed_roles = list("Head of Security", "Warden")
/datum/gear/uniform/skirt/job/security
- display_name = "skirt, security"
+ display_name = "Skirt, security"
path = /obj/item/clothing/under/rank/security/skirt
allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer")
/datum/gear/uniform/skirt/job/head_of_security
- display_name = "skirt, hos"
+ display_name = "Skirt, hos"
path = /obj/item/clothing/under/rank/head_of_security/skirt
allowed_roles = list("Head of Security")
/datum/gear/uniform/skirt/job/ntrep
- display_name = "skirt, nt rep"
+ display_name = "Skirt, nt rep"
path = /obj/item/clothing/under/rank/ntrep/skirt
allowed_roles = list("Nanotrasen Representative")
/datum/gear/uniform/skirt/job/blueshield
- display_name = "skirt, blueshield"
+ display_name = "Skirt, blueshield"
path = /obj/item/clothing/under/rank/blueshield/skirt
allowed_roles = list("Blueshield")
/datum/gear/uniform/medical
- subtype_path = /datum/gear/uniform/medical
+ main_typepath = /datum/gear/uniform/medical
/datum/gear/uniform/medical/pscrubs
- display_name = "medical scrubs, purple"
+ display_name = "Medical scrubs, purple"
path = /obj/item/clothing/under/rank/medical/purple
allowed_roles = list("Chief Medical Officer", "Medical Doctor")
/datum/gear/uniform/medical/gscrubs
- display_name = "medical scrubs, green"
+ display_name = "Medical scrubs, green"
path = /obj/item/clothing/under/rank/medical/green
allowed_roles = list("Chief Medical Officer", "Medical Doctor")
/datum/gear/uniform/sec
- subtype_path = /datum/gear/uniform/sec
+ main_typepath = /datum/gear/uniform/sec
/datum/gear/uniform/sec/formal
- display_name = "security uniform, formal"
+ display_name = "Security uniform, formal"
path = /obj/item/clothing/under/rank/security/formal
- allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer", "Security Pod Pilot")
+ allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer")
/datum/gear/uniform/sec/secorporate
- display_name = "security uniform, corporate"
+ display_name = "Security uniform, corporate"
path = /obj/item/clothing/under/rank/security/corp
- allowed_roles = list("Head of Security", "Warden", "Security Officer", "Security Pod Pilot")
+ allowed_roles = list("Head of Security", "Warden", "Security Officer")
/datum/gear/uniform/sec/dispatch
- display_name = "security uniform, dispatch"
+ display_name = "Security uniform, dispatch"
path = /obj/item/clothing/under/rank/dispatch
- allowed_roles = list("Head of Security", "Warden", "Security Officer", "Security Pod Pilot")
+ allowed_roles = list("Head of Security", "Warden", "Security Officer")
/datum/gear/uniform/sec/casual
- display_name = "security uniform, casual"
+ display_name = "Security uniform, casual"
path = /obj/item/clothing/under/rank/security2
- allowed_roles = list("Head of Security", "Warden", "Security Officer", "Detective", "Security Pod Pilot")
+ allowed_roles = list("Head of Security", "Warden", "Security Officer", "Detective")
/datum/gear/uniform/shorts
- subtype_path = /datum/gear/uniform/shorts
+ main_typepath = /datum/gear/uniform/shorts
/datum/gear/uniform/shorts/red
- display_name = "shorts, red"
+ display_name = "Shorts, red"
path = /obj/item/clothing/under/shorts/red
/datum/gear/uniform/shorts/green
- display_name = "shorts, green"
+ display_name = "Shorts, green"
path = /obj/item/clothing/under/shorts/green
/datum/gear/uniform/shorts/blue
- display_name = "shorts, blue"
+ display_name = "Shorts, blue"
path = /obj/item/clothing/under/shorts/blue
/datum/gear/uniform/shorts/black
- display_name = "shorts, black"
+ display_name = "Shorts, black"
path = /obj/item/clothing/under/shorts/black
/datum/gear/uniform/shorts/grey
- display_name = "shorts, grey"
+ display_name = "Shorts, grey"
path = /obj/item/clothing/under/shorts/grey
/datum/gear/uniform/pants
- subtype_path = /datum/gear/uniform/pants
+ main_typepath = /datum/gear/uniform/pants
/datum/gear/uniform/pants/jeans
- display_name = "jeans, classic"
+ display_name = "Jeans, classic"
path = /obj/item/clothing/under/pants/classicjeans
/datum/gear/uniform/pants/mjeans
- display_name = "jeans, mustang"
+ display_name = "Jeans, mustang"
path = /obj/item/clothing/under/pants/mustangjeans
/datum/gear/uniform/pants/bljeans
- display_name = "jeans, black"
+ display_name = "Jeans, black"
path = /obj/item/clothing/under/pants/blackjeans
/datum/gear/uniform/pants/yfjeans
- display_name = "jeans, Young Folks"
+ display_name = "Jeans, Young Folks"
path = /obj/item/clothing/under/pants/youngfolksjeans
/datum/gear/uniform/pants/whitepants
- display_name = "pants, white"
+ display_name = "Pants, white"
path = /obj/item/clothing/under/pants/white
/datum/gear/uniform/pants/redpants
- display_name = "pants, red"
+ display_name = "Pants, red"
path = /obj/item/clothing/under/pants/red
/datum/gear/uniform/pants/blackpants
- display_name = "pants, black"
+ display_name = "Pants, black"
path = /obj/item/clothing/under/pants/black
/datum/gear/uniform/pants/tanpants
- display_name = "pants, tan"
+ display_name = "Pants, tan"
path = /obj/item/clothing/under/pants/tan
/datum/gear/uniform/pants/bluepants
- display_name = "pants, blue"
+ display_name = "Pants, blue"
path = /obj/item/clothing/under/pants/blue
/datum/gear/uniform/pants/trackpants
- display_name = "trackpants"
+ display_name = "Trackpants"
path = /obj/item/clothing/under/pants/track
/datum/gear/uniform/pants/khakipants
- display_name = "pants, khaki"
+ display_name = "Pants, khaki"
path = /obj/item/clothing/under/pants/khaki
/datum/gear/uniform/pants/caopants
- display_name = "pants, camo"
+ display_name = "Pants, camo"
path = /obj/item/clothing/under/pants/camo
/datum/gear/uniform/suit/tacticool
- display_name = "tacticool turtleneck"
+ display_name = "Tacticool turtleneck"
description = "A sleek black turtleneck paired with some khakis (WARNING DOES NOT HAVE SUIT SENSORS)"
path = /obj/item/clothing/under/syndicate/tacticool
diff --git a/code/modules/client/preference/preferences.dm b/code/modules/client/preference/preferences.dm
index e88dfae2e32..9b2bb14e554 100644
--- a/code/modules/client/preference/preferences.dm
+++ b/code/modules/client/preference/preferences.dm
@@ -413,19 +413,9 @@ GLOBAL_LIST_INIT(special_role_times, list( //minimum age (in days) for accounts
dat += "| [G.display_name] | " else - dat += "||||||
| [G.display_name] | " + dat += "||||||
| [G.display_name] | " dat += "[G.cost] | "
if(G.allowed_roles)
dat += "Restrictions: "
@@ -465,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(active_character.get_tweak_metadata(G, tweak))]"
+ . += " [tweak.get_contents(active_character.get_tweak_metadata(G, tweak))]"
. += " | | |||
| 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] |