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 eb0deeb93e2..166c543b3bb 100644
--- a/SQL/paradise_schema.sql
+++ b/SQL/paradise_schema.sql
@@ -599,6 +599,20 @@ CREATE TABLE `2fa_secrets` (
PRIMARY KEY (`ckey`) USING BTREE
) 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`
--
diff --git a/SQL/updates/25-26.sql b/SQL/updates/25-26.sql
index c1e3834ab8d..93e6fc3db04 100644
--- a/SQL/updates/25-26.sql
+++ b/SQL/updates/25-26.sql
@@ -1,11 +1,13 @@
-# Updates DB from 25 to 26 -AffectedArc07
-# Adds a new table for instance data caching, and server_id fields on other tables
-# NOTE: If this line makes it into the final PR I will be upset with myself
+# Updates DB from 25-25, -AffectedArc07
+# Adds a pAI saves table to the DB
-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(50) 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;
+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/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm
index 422dcb38598..c93a660eeb3 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"
@@ -7090,6 +6264,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 +6966,9 @@
/obj/machinery/newscaster{
pixel_y = 32
},
+/obj/structure/sign/nosmoking_2{
+ pixel_x = 32
+ },
/turf/simulated/floor/plasteel,
/area/janitor)
"ayp" = (
@@ -8150,10 +7332,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 +7890,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 +8426,8 @@
/obj/machinery/light_switch{
pixel_y = -26
},
+/obj/item/reagent_containers/glass/bucket,
+/obj/structure/janitorialcart,
/turf/simulated/floor/plasteel{
icon_state = "whitegreen"
},
@@ -10291,16 +9480,16 @@
/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"
},
+/mob/living/simple_animal/bot/mulebot{
+ home_destination = "QM #2";
+ suffix = "#2"
+ },
/turf/simulated/floor/plasteel,
/area/quartermaster/storage)
"aDW" = (
@@ -12966,7 +12155,7 @@
id = "engsm";
name = "Radiation Shutters Control";
pixel_y = 24;
- req_access_txt = "10; 24"
+ req_access_txt = "24"
},
/obj/structure/cable/yellow{
d1 = 4;
@@ -14159,16 +13348,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"
},
+/mob/living/simple_animal/bot/mulebot{
+ home_destination = "QM #4";
+ suffix = "#4"
+ },
/turf/simulated/floor/plasteel,
/area/quartermaster/storage)
"aLW" = (
@@ -14325,11 +13514,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"
@@ -15521,10 +14710,10 @@
/turf/simulated/floor/plasteel,
/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,
+/mob/living/simple_animal/mouse,
/turf/simulated/floor/plasteel,
/area/security/permabrig)
"aPd" = (
@@ -19278,8 +18467,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" = (
@@ -32818,11 +32007,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"
@@ -41561,7 +40750,7 @@
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/engineering/glass{
name = "Engineering";
- req_access_txt = "24; 10"
+ req_access_txt = "32"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -42013,13 +41202,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"
@@ -44420,7 +43609,6 @@
},
/area/turret_protected/aisat)
"bTD" = (
-/mob/living/simple_animal/bot/secbot/pingsky,
/obj/structure/cable{
d1 = 2;
d2 = 8;
@@ -44435,6 +43623,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"
},
@@ -44806,11 +43995,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"
},
@@ -44946,7 +44135,7 @@
},
/obj/machinery/door/airlock/engineering/glass{
name = "Engineering Break Room";
- req_access_txt = "24; 10"
+ req_access_txt = "32"
},
/obj/machinery/door/firedoor,
/obj/structure/disposalpipe/segment{
@@ -45477,7 +44666,6 @@
},
/area/hallway/primary/starboard)
"bVp" = (
-/mob/living/simple_animal/bot/secbot/beepsky,
/obj/item/radio/beacon,
/obj/structure/cable{
d1 = 1;
@@ -45494,6 +44682,7 @@
codes_txt = "patrol;next_patrol=hall12";
location = "hall11"
},
+/mob/living/simple_animal/bot/secbot/beepsky,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralfull"
@@ -51227,12 +50416,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" = (
@@ -78178,7 +77367,6 @@
},
/area/medical/genetics)
"dnR" = (
-/mob/living/carbon/human/monkey,
/obj/structure/window/reinforced{
dir = 1
},
@@ -78188,6 +77376,7 @@
/obj/structure/window/reinforced{
dir = 8
},
+/mob/living/carbon/human/monkey,
/turf/simulated/floor/grass,
/area/medical/genetics)
"dnT" = (
@@ -80093,7 +79282,6 @@
},
/area/medical/genetics)
"drZ" = (
-/mob/living/carbon/human/monkey,
/obj/structure/window/reinforced,
/obj/structure/window/reinforced{
dir = 4
@@ -80101,6 +79289,7 @@
/obj/structure/window/reinforced{
dir = 8
},
+/mob/living/carbon/human/monkey,
/turf/simulated/floor/grass,
/area/medical/genetics)
"dsb" = (
@@ -80121,7 +79310,6 @@
},
/area/medical/medbay)
"dsd" = (
-/mob/living/simple_animal/pet/cat/Runtime,
/obj/machinery/light{
dir = 8
},
@@ -80133,6 +79321,7 @@
name = "kitty basket"
},
/obj/structure/disposalpipe/segment,
+/mob/living/simple_animal/pet/cat/Runtime,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -88931,13 +88120,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"
@@ -88956,13 +88145,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"
@@ -90721,9 +89910,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"
@@ -91380,13 +90569,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"
},
@@ -94519,9 +93708,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"
@@ -95274,11 +94463,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" = (
@@ -95358,6 +94547,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;
@@ -95631,7 +94833,7 @@
dir = 8;
location = "Janitor"
},
-/turf/simulated/wall,
+/turf/simulated/floor/plating,
/area/janitor)
"gpX" = (
/obj/effect/landmark{
@@ -96300,7 +95502,7 @@
/obj/structure/plasticflaps{
opacity = 1
},
-/turf/simulated/wall,
+/turf/simulated/floor/plating,
/area/toxins/misc_lab)
"iiM" = (
/obj/structure/window/reinforced{
@@ -97429,10 +96631,9 @@
/area/security/interrogation)
"mfl" = (
/obj/effect/decal/warning_stripes/east,
-/obj/machinery/atmospherics/unary/portables_connector{
+/obj/machinery/atmospherics/unary/thermomachine/freezer{
dir = 4
},
-/obj/machinery/atmospherics/unary/thermomachine/freezer,
/turf/simulated/floor/plasteel,
/area/atmos)
"mft" = (
@@ -101191,9 +100392,6 @@
},
/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
@@ -101202,6 +100400,9 @@
codes_txt = "patrol;next_patrol=Armory_South";
location = "Armory_North"
},
+/mob/living/simple_animal/bot/secbot/armsky{
+ auto_patrol = 1
+ },
/turf/simulated/floor/plasteel,
/area/security/securearmoury)
"xoq" = (
@@ -143459,14 +142660,14 @@ afM
ajZ
ahg
ajZ
-ahi
+ajZ
ajZ
ajZ
cMP
ajZ
ajZ
ajZ
-ahi
+ajZ
ahg
ajZ
ajZ
@@ -143716,18 +142917,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
@@ -143971,19 +143172,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
@@ -144228,18 +143429,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
@@ -144485,19 +143686,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
@@ -144742,20 +143943,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
@@ -144999,19 +144200,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
@@ -145256,19 +144457,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
@@ -145513,19 +144714,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
@@ -145770,19 +144971,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
@@ -146027,19 +145228,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
@@ -146284,19 +145485,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
@@ -146541,19 +145742,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
@@ -146798,19 +145999,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
@@ -147055,19 +146256,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
@@ -147312,19 +146513,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
@@ -147569,19 +146770,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
@@ -147829,12 +147030,12 @@ abj
aaa
aaa
aaa
-ahM
-aiz
-agL
-agL
-aiw
-ahM
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
aaa
aaa
aaa
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index ae063f30423..ad41c5fb5fd 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -664,8 +664,7 @@
dir = 4
},
/turf/simulated/floor/plasteel{
- dir = 9;
- icon_state = "warndark"
+ icon_state = "dark"
},
/area/security/permabrig)
"add" = (
@@ -673,8 +672,7 @@
dir = 8
},
/turf/simulated/floor/plasteel{
- dir = 5;
- icon_state = "warndark"
+ icon_state = "dark"
},
/area/security/permabrig)
"ade" = (
@@ -682,8 +680,7 @@
dir = 1
},
/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "warndark"
+ icon_state = "dark"
},
/area/security/permabrig)
"adf" = (
@@ -863,8 +860,7 @@
dir = 4
},
/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "warndark"
+ icon_state = "dark"
},
/area/security/permabrig)
"ady" = (
@@ -877,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,16 +43750,6 @@
/area/toxins/xenobiology{
name = "\improper Secure Lab"
})
-"bPL" = (
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/security/podbay)
"bPO" = (
/obj/structure/foodcart,
/turf/simulated/floor/plasteel{
@@ -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..470e24beb65 100644
--- a/_maps/map_files/cyberiad/cyberiad.dmm
+++ b/_maps/map_files/cyberiad/cyberiad.dmm
@@ -1061,17 +1061,6 @@
icon_state = "dark"
},
/area/security/hos)
-"aeE" = (
-/obj/machinery/firealarm{
- dir = 8;
- pixel_x = -24
- },
-/obj/effect/decal/warning_stripes/east,
-/obj/structure/rack,
-/obj/item/tank/internals/oxygen,
-/obj/item/tank/jetpack/oxygen,
-/turf/simulated/floor/plasteel,
-/area/security/podbay)
"aeF" = (
/obj/machinery/door/airlock/external{
id_tag = "laborcamp_home";
@@ -1308,11 +1297,6 @@
},
/turf/simulated/floor/carpet,
/area/security/hos)
-"aeX" = (
-/obj/effect/decal/warning_stripes/east,
-/obj/machinery/suit_storage_unit/security/pod_pilot,
-/turf/simulated/floor/plasteel,
-/area/security/podbay)
"aeY" = (
/obj/effect/spawner/window/reinforced,
/obj/structure/cable{
@@ -1585,14 +1569,6 @@
icon_state = "red"
},
/area/security/main)
-"afL" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 10
- },
-/turf/simulated/floor/plasteel{
- icon_state = "rampbottom"
- },
-/area/security/podbay)
"afM" = (
/obj/structure/table/wood,
/obj/item/flashlight/lamp/green{
@@ -1601,9 +1577,6 @@
pixel_y = 8
},
/obj/item/stamp/hos,
-/obj/item/spacepod_key{
- id = 100000
- },
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 4
},
@@ -1611,14 +1584,6 @@
/obj/item/pen/multi,
/turf/simulated/floor/carpet,
/area/security/hos)
-"afN" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 6
- },
-/turf/simulated/floor/plasteel{
- icon_state = "rampbottom"
- },
-/area/security/podbay)
"afO" = (
/turf/simulated/floor/plating/airless,
/area/space/nearstation)
@@ -2162,7 +2127,6 @@
/obj/structure/table,
/obj/effect/decal/warning_stripes/red/hollow,
/obj/item/storage/toolbox/mechanical,
-/obj/item/lock_buster,
/obj/machinery/light{
dir = 1;
on = 1
@@ -2304,26 +2268,6 @@
},
/turf/simulated/floor/plasteel,
/area/security/seceqstorage)
-"aia" = (
-/obj/structure/reagent_dispensers/fueltank,
-/obj/effect/decal/warning_stripes/yellow/hollow,
-/obj/effect/decal/warning_stripes/northeastcorner,
-/obj/machinery/light_switch{
- pixel_x = -25
- },
-/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 4
- },
-/turf/simulated/floor/plasteel,
-/area/security/podbay)
-"aic" = (
-/obj/effect/decal/warning_stripes/north,
-/obj/machinery/space_heater,
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
- dir = 8
- },
-/turf/simulated/floor/plasteel,
-/area/security/podbay)
"aid" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -2820,17 +2764,16 @@
d2 = 8;
icon_state = "1-8"
},
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/obj/structure/disposalpipe/segment{
dir = 8;
icon_state = "pipe-c"
},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 9
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 9
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -2854,9 +2797,6 @@
icon_state = "barber"
},
/area/security/permabrig)
-"ajb" = (
-/turf/simulated/wall/r_wall,
-/area/security/podbay)
"ajc" = (
/obj/structure/table,
/turf/simulated/floor/plasteel{
@@ -3001,63 +2941,6 @@
icon_state = "vault"
},
/area/security/securearmoury)
-"ajs" = (
-/obj/structure/table,
-/obj/machinery/cell_charger,
-/obj/item/storage/toolbox/mechanical{
- pixel_y = 10
- },
-/obj/item/stock_parts/cell/high/plus,
-/obj/effect/decal/warning_stripes/east,
-/obj/item/clothing/glasses/welding,
-/obj/item/radio/intercom/department/security{
- pixel_x = -28
- },
-/turf/simulated/floor/plasteel,
-/area/security/podbay)
-"ajt" = (
-/obj/machinery/alarm{
- pixel_y = 23
- },
-/turf/simulated/floor/engine,
-/area/security/podbay)
-"aju" = (
-/obj/machinery/camera{
- c_tag = "Brig Podbay"
- },
-/obj/machinery/door_control{
- desc = "A remote control-switch for the pod doors.";
- id = "secpodbay";
- name = "Pod Door Control";
- pixel_y = 24;
- req_access_txt = "71"
- },
-/turf/simulated/floor/engine,
-/area/security/podbay)
-"ajv" = (
-/obj/machinery/light{
- dir = 1;
- on = 1
- },
-/obj/machinery/status_display{
- layer = 4;
- pixel_y = 32
- },
-/turf/simulated/floor/engine,
-/area/security/podbay)
-"ajw" = (
-/turf/simulated/floor/engine,
-/area/security/podbay)
-"ajx" = (
-/obj/structure/spacepoddoor{
- luminosity = 3
- },
-/turf/simulated/floor/engine,
-/area/security/podbay)
-"ajy" = (
-/obj/effect/decal/warning_stripes/east,
-/turf/simulated/floor/engine/vacuum,
-/area/security/podbay)
"ajJ" = (
/obj/structure/sign/poster/official/random{
pixel_y = 32
@@ -3301,24 +3184,6 @@
icon_state = "darkredcorners"
},
/area/security/brig)
-"akc" = (
-/obj/structure/table/reinforced,
-/obj/item/clothing/suit/jacket/pilot,
-/obj/item/clothing/head/beret/sec,
-/obj/machinery/light_switch{
- pixel_x = -25
- },
-/obj/item/spacepod_key{
- id = 100000
- },
-/obj/item/gps,
-/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/security/podbay)
"akd" = (
/obj/structure/cable{
d1 = 4;
@@ -3481,12 +3346,6 @@
icon_state = "dark"
},
/area/security/brig)
-"ako" = (
-/obj/spacepod/sec{
- req_access_txt = "71"
- },
-/turf/simulated/floor/engine,
-/area/security/podbay)
"aks" = (
/obj/structure/cable{
d1 = 1;
@@ -3555,22 +3414,6 @@
icon_state = "darkred"
},
/area/security/brig)
-"aky" = (
-/obj/machinery/portable_atmospherics/canister/oxygen,
-/obj/effect/decal/warning_stripes/blue/hollow,
-/obj/effect/decal/warning_stripes/east,
-/turf/simulated/floor/plasteel,
-/area/security/podbay)
-"akz" = (
-/obj/structure/spacepoddoor{
- luminosity = 3
- },
-/obj/machinery/door/poddoor/multi_tile/four_tile_ver{
- id_tag = "secpodbay";
- req_access_txt = "71"
- },
-/turf/simulated/floor/engine,
-/area/security/podbay)
"akB" = (
/turf/simulated/wall/r_wall,
/area/security/range)
@@ -4094,10 +3937,6 @@
icon_state = "darkred"
},
/area/security/brig)
-"als" = (
-/obj/effect/spawner/window/reinforced,
-/turf/simulated/floor/plating,
-/area/security/podbay)
"alt" = (
/obj/effect/spawner/window/reinforced,
/obj/structure/cable,
@@ -4186,18 +4025,6 @@
icon_state = "dark"
},
/area/security/hos)
-"alI" = (
-/obj/structure/grille,
-/turf/simulated/floor/plating/airless,
-/area/security/podbay)
-"alJ" = (
-/obj/structure/grille,
-/obj/structure/sign/securearea{
- desc = "A warning sign which reads 'KEEP CLEAR OF DOCKING AREA'.";
- name = "KEEP CLEAR: DOCKING AREA"
- },
-/turf/simulated/floor/plating/airless,
-/area/security/podbay)
"alK" = (
/obj/effect/spawner/window/reinforced,
/obj/structure/cable,
@@ -4484,21 +4311,6 @@
icon_state = "red"
},
/area/security/main)
-"amg" = (
-/obj/machinery/light,
-/obj/structure/table/reinforced,
-/obj/item/folder/red,
-/obj/item/pen,
-/obj/item/radio/intercom/department/security{
- pixel_y = -28
- },
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
- dir = 1
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/security/podbay)
"amh" = (
/obj/structure/grille/broken,
/obj/structure/lattice,
@@ -4615,10 +4427,6 @@
},
/turf/simulated/floor/plating,
/area/maintenance/fsmaint)
-"amx" = (
-/obj/effect/decal/cleanable/fungus,
-/turf/simulated/wall/r_wall,
-/area/security/podbay)
"amy" = (
/obj/structure/cable{
d1 = 1;
@@ -4831,18 +4639,6 @@
icon_state = "redfull"
},
/area/security/main)
-"amR" = (
-/obj/machinery/computer/security{
- network = list("SS13","Research Outpost","Mining Outpost")
- },
-/obj/machinery/camera{
- c_tag = "Brig Pod Pilot's Office";
- dir = 8
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/security/podbay)
"amS" = (
/obj/machinery/hologram/holopad,
/turf/simulated/floor/carpet,
@@ -4878,10 +4674,6 @@
/obj/structure/lattice/catwalk,
/turf/space,
/area/solar/auxport)
-"amV" = (
-/obj/structure/sign/nosmoking_2,
-/turf/simulated/wall/r_wall,
-/area/security/podbay)
"amW" = (
/obj/structure/lattice,
/obj/structure/grille,
@@ -6563,14 +6355,6 @@
/obj/effect/spawner/lootdrop/maintenance,
/turf/simulated/floor/plating,
/area/maintenance/fsmaint)
-"aqa" = (
-/obj/effect/decal/warning_stripes/north,
-/obj/machinery/hologram/holopad,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/turf/simulated/floor/plasteel,
-/area/security/podbay)
"aqb" = (
/obj/item/storage/secure/safe{
pixel_y = 25
@@ -6585,11 +6369,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel,
/area/security/range)
-"aqe" = (
-/obj/structure/grille,
-/obj/structure/sign/securearea,
-/turf/simulated/floor/plating/airless,
-/area/security/podbay)
"aqn" = (
/obj/item/flag/sec,
/turf/simulated/floor/plating,
@@ -6803,28 +6582,6 @@
"aqI" = (
/turf/simulated/wall/r_wall,
/area/security/brig)
-"aqJ" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/security/glass{
- name = "Security Pods";
- req_access_txt = "71"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/security/podbay)
-"aqK" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/security/glass{
- name = "Security Pods";
- req_access_txt = "71"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/security/podbay)
"aqL" = (
/obj/effect/landmark{
name = "carpspawn"
@@ -7378,21 +7135,6 @@
icon_state = "redcorner"
},
/area/security/processing)
-"arG" = (
-/obj/structure/cable{
- d1 = 2;
- d2 = 4;
- icon_state = "2-4";
- tag = ""
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 4;
- initialize_directions = 11
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/security/podbay)
"arH" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
@@ -7402,34 +7144,6 @@
icon_state = "red"
},
/area/security/permabrig)
-"arI" = (
-/obj/structure/closet/secure_closet/security,
-/obj/structure/cable{
- d2 = 8;
- icon_state = "0-8"
- },
-/obj/item/spacepod_equipment/weaponry/laser,
-/obj/machinery/power/apc{
- dir = 4;
- name = "east bump";
- pixel_x = 24
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/security/podbay)
-"arJ" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8";
- tag = ""
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/security/podbay)
"arK" = (
/obj/machinery/power/apc{
dir = 8;
@@ -7585,22 +7299,6 @@
/obj/effect/spawner/random_barrier/obstruction,
/turf/simulated/floor/plating,
/area/maintenance/fsmaint)
-"asd" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/security/brig)
"ase" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -8000,75 +7698,6 @@
icon_state = "darkred"
},
/area/security/permabrig)
-"asF" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/security/glass{
- name = "Security Pods";
- req_access_txt = "71"
- },
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/security/podbay)
-"asG" = (
-/obj/machinery/hologram/holopad,
-/obj/structure/cable{
- d1 = 1;
- d2 = 8;
- icon_state = "1-8"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 9
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/security/podbay)
-"asH" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/security/podbay)
-"asI" = (
-/obj/structure/chair/office/dark{
- dir = 4
- },
-/obj/effect/landmark/start{
- name = "Security Pod Pilot"
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 4;
- initialize_directions = 11
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/security/podbay)
"asL" = (
/obj/structure/cable{
d1 = 4;
@@ -8687,37 +8316,6 @@
},
/turf/simulated/floor/plating,
/area/maintenance/fsmaint)
-"atU" = (
-/obj/structure/table/reinforced,
-/obj/item/flashlight,
-/obj/item/radio{
- pixel_y = 6
- },
-/obj/machinery/alarm{
- dir = 1;
- pixel_y = -22
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/security/podbay)
-"atV" = (
-/obj/item/twohanded/required/kirbyplants,
-/obj/machinery/firealarm{
- dir = 8;
- pixel_x = -24
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/security/podbay)
-"atW" = (
-/obj/structure/table/reinforced,
-/obj/item/book/manual/security_space_law,
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/security/podbay)
"atX" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 4
@@ -23895,38 +23493,6 @@
icon_state = "bluecorner"
},
/area/hallway/primary/fore)
-"baG" = (
-/obj/structure/rack{
- dir = 8;
- layer = 2.9
- },
-/obj/item/tank/internals/emergency_oxygen/engi,
-/obj/item/tank/internals/emergency_oxygen/engi,
-/obj/item/clothing/mask/gas,
-/obj/item/clothing/mask/gas{
- pixel_x = -3;
- pixel_y = -3
- },
-/obj/structure/extinguisher_cabinet{
- pixel_x = -5;
- pixel_y = 30
- },
-/obj/effect/decal/warning_stripes/east,
-/turf/simulated/floor/plasteel,
-/area/escapepodbay)
-"baH" = (
-/obj/machinery/camera{
- c_tag = "Departure Lounge Podbay"
- },
-/obj/machinery/door_control{
- desc = "A remote control-switch for the pod doors.";
- id = "escapepodbay";
- name = "Pod Door Control";
- pixel_y = 24;
- req_access_txt = "13"
- },
-/turf/simulated/floor/engine,
-/area/escapepodbay)
"baI" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock{
@@ -23985,19 +23551,6 @@
},
/turf/simulated/floor/wood,
/area/crew_quarters/bar)
-"baN" = (
-/obj/structure/table,
-/obj/item/storage/toolbox/mechanical,
-/obj/item/crowbar/red,
-/turf/simulated/floor/plasteel,
-/area/escapepodbay)
-"baO" = (
-/obj/structure/table,
-/obj/item/storage/belt/utility,
-/obj/item/stock_parts/cell,
-/obj/item/flashlight,
-/turf/simulated/floor/plasteel,
-/area/escapepodbay)
"baP" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -24007,18 +23560,6 @@
},
/turf/simulated/floor/plating,
/area/maintenance/fsmaint2)
-"baQ" = (
-/obj/machinery/alarm{
- pixel_y = 25
- },
-/turf/simulated/floor/engine,
-/area/escapepodbay)
-"baR" = (
-/obj/machinery/light{
- dir = 1
- },
-/turf/simulated/floor/engine,
-/area/escapepodbay)
"baS" = (
/obj/structure/disposalpipe/segment{
dir = 2;
@@ -24032,19 +23573,6 @@
},
/turf/simulated/floor/plating,
/area/maintenance/fsmaint2)
-"baT" = (
-/turf/simulated/floor/engine,
-/area/escapepodbay)
-"baU" = (
-/obj/structure/spacepoddoor{
- luminosity = 3
- },
-/turf/simulated/floor/engine,
-/area/escapepodbay)
-"baV" = (
-/obj/effect/decal/warning_stripes/east,
-/turf/simulated/floor/engine/vacuum,
-/area/escapepodbay)
"bba" = (
/obj/effect/landmark{
name = "Observer-Start"
@@ -24722,10 +24250,6 @@
},
/turf/simulated/floor/plating,
/area/maintenance/fsmaint2)
-"bcl" = (
-/obj/machinery/hologram/holopad,
-/turf/simulated/floor/plasteel,
-/area/escapepodbay)
"bcm" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -24937,13 +24461,6 @@
},
/turf/simulated/floor/plasteel,
/area/hallway/secondary/entry)
-"bcH" = (
-/turf/simulated/floor/plasteel,
-/area/escapepodbay)
-"bcI" = (
-/obj/effect/decal/warning_stripes/east,
-/turf/simulated/floor/plasteel,
-/area/escapepodbay)
"bcM" = (
/obj/structure/extinguisher_cabinet{
pixel_x = -5;
@@ -26760,23 +26277,6 @@
icon_state = "darkbluecorners"
},
/area/chapel/main)
-"bgc" = (
-/obj/machinery/firealarm{
- dir = 1;
- pixel_y = -24
- },
-/turf/simulated/floor/engine,
-/area/escapepodbay)
-"bgd" = (
-/obj/structure/spacepoddoor{
- luminosity = 3
- },
-/obj/machinery/door/poddoor/multi_tile/four_tile_ver{
- id_tag = "escapepodbay";
- req_one_access_txt = "13"
- },
-/turf/simulated/floor/engine,
-/area/escapepodbay)
"bgf" = (
/obj/structure/table/wood,
/obj/item/candle,
@@ -26833,10 +26333,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel,
/area/hallway/secondary/entry)
-"bgm" = (
-/obj/machinery/light,
-/turf/simulated/floor/engine,
-/area/escapepodbay)
"bgn" = (
/obj/machinery/door/firedoor,
/obj/machinery/light{
@@ -27721,9 +27217,6 @@
icon_state = "hydrofloor"
},
/area/hydroponics)
-"big" = (
-/turf/simulated/wall,
-/area/escapepodbay)
"bih" = (
/obj/machinery/alarm{
dir = 4;
@@ -41058,13 +40551,13 @@
/turf/simulated/floor/plasteel,
/area/hallway/secondary/exit)
"bLp" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 1;
- initialize_directions = 11
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 10;
+ initialize_directions = 10
+ },
/turf/simulated/floor/plasteel,
/area/hallway/secondary/exit)
"bLq" = (
@@ -41085,12 +40578,8 @@
icon_state = "2-4";
tag = ""
},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 10;
- initialize_directions = 10
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
},
/turf/simulated/floor/plasteel,
/area/hallway/secondary/exit)
@@ -42289,8 +41778,6 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel,
/area/hallway/secondary/exit)
"bNx" = (
@@ -43343,17 +42830,6 @@
"bPt" = (
/turf/simulated/wall/r_wall,
/area/medical/research)
-"bPu" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2";
- tag = ""
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/plasteel,
-/area/hallway/secondary/exit)
"bPw" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 4
@@ -45466,16 +44942,6 @@
/obj/machinery/vending/cigarette,
/turf/simulated/floor/plasteel,
/area/hallway/primary/central/sw)
-"bTm" = (
-/obj/structure/table,
-/obj/item/pod_parts/core,
-/obj/item/circuitboard/mecha/pod,
-/obj/item/clothing/glasses/welding{
- pixel_y = 12
- },
-/obj/item/gps,
-/turf/simulated/floor/plasteel,
-/area/engine/mechanic_workshop)
"bTq" = (
/turf/simulated/floor/plating,
/area/quartermaster/storage)
@@ -46259,19 +45725,12 @@
/turf/simulated/floor/plasteel,
/area/hallway/secondary/exit)
"bUT" = (
-/obj/structure/cable{
- d1 = 2;
- d2 = 8;
- icon_state = "2-8"
- },
/obj/structure/cable{
d1 = 1;
- d2 = 2;
- icon_state = "1-2";
- tag = ""
+ d2 = 8;
+ icon_state = "1-8"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/light,
/turf/simulated/floor/plasteel,
/area/hallway/secondary/exit)
"bUU" = (
@@ -46630,21 +46089,6 @@
},
/turf/simulated/floor/plasteel,
/area/quartermaster/office)
-"bVI" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/public/glass{
- name = "Escape Pod Bay"
- },
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2";
- tag = ""
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/plasteel,
-/area/escapepodbay)
"bVJ" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -47248,19 +46692,6 @@
},
/turf/space,
/area/space)
-"bWR" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2";
- tag = ""
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/plasteel{
- icon_state = "ramptop"
- },
-/area/escapepodbay)
"bWS" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/poddoor/shutters{
@@ -48077,32 +47508,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plating,
/area/maintenance/asmaint2)
-"bYo" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/turf/simulated/floor/plasteel,
-/area/escapepodbay)
-"bYp" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 8;
- icon_state = "1-8";
- tag = ""
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 5
- },
-/turf/simulated/floor/plasteel,
-/area/escapepodbay)
-"bYq" = (
-/obj/effect/decal/warning_stripes/east,
-/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 8
- },
-/turf/simulated/floor/plasteel,
-/area/escapepodbay)
"bYr" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 1
@@ -49793,12 +49198,6 @@
},
/turf/simulated/floor/plating,
/area/maintenance/asmaint2)
-"cbb" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
- dir = 1
- },
-/turf/simulated/floor/plasteel,
-/area/escapepodbay)
"cbc" = (
/obj/machinery/light_switch{
pixel_x = 27
@@ -50817,11 +50216,6 @@
},
/turf/simulated/floor/plasteel,
/area/janitor)
-"ccP" = (
-/obj/machinery/portable_atmospherics/canister/oxygen,
-/obj/effect/decal/warning_stripes/yellow/hollow,
-/turf/simulated/floor/plasteel,
-/area/escapepodbay)
"ccQ" = (
/turf/simulated/floor/plasteel{
dir = 8;
@@ -50837,16 +50231,6 @@
/obj/item/grenade/chem_grenade/cleaner,
/turf/simulated/floor/plasteel,
/area/janitor)
-"ccS" = (
-/obj/structure/closet/emcloset,
-/obj/item/clothing/mask/breath,
-/obj/item/tank/internals/emergency_oxygen,
-/obj/item/tank/internals/emergency_oxygen,
-/obj/item/clothing/mask/breath,
-/obj/effect/decal/warning_stripes/yellow/hollow,
-/obj/effect/decal/warning_stripes/east,
-/turf/simulated/floor/plasteel,
-/area/escapepodbay)
"ccT" = (
/obj/machinery/r_n_d/server/robotics,
/obj/machinery/atmospherics/pipe/simple/heat_exchanging{
@@ -51960,12 +51344,11 @@
/area/janitor)
"cfq" = (
/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 1
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 1;
- initialize_directions = 11
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
},
/turf/simulated/floor/plasteel,
/area/hallway/primary/central/sw)
@@ -53533,8 +52916,6 @@
icon_state = "2-4";
tag = ""
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel,
/area/hallway/primary/central/sw)
"ciz" = (
@@ -54242,7 +53623,6 @@
/obj/machinery/door/airlock/maintenance{
req_access_txt = "12"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/disposalpipe/segment,
/obj/structure/cable{
d1 = 1;
@@ -54250,7 +53630,6 @@
icon_state = "1-2";
tag = ""
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plating,
/area/maintenance/apmaint)
"cjE" = (
@@ -54591,9 +53970,8 @@
icon_state = "1-2";
tag = ""
},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 8;
- initialize_directions = 11
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 5
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 8;
@@ -55153,7 +54531,6 @@
icon_state = "1-2";
tag = ""
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel,
/area/quartermaster/miningdock)
@@ -55207,8 +54584,6 @@
icon_state = "1-2";
tag = ""
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plating,
/area/maintenance/apmaint)
"clz" = (
@@ -56344,12 +55719,6 @@
icon_state = "4-8";
tag = ""
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
/turf/simulated/floor/plasteel,
/area/quartermaster/miningdock)
"cnU" = (
@@ -56363,13 +55732,12 @@
icon_state = "1-4";
tag = ""
},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 5
- },
/obj/effect/landmark/start{
name = "Shaft Miner"
},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 9
+ },
/turf/simulated/floor/plasteel,
/area/quartermaster/miningdock)
"cnV" = (
@@ -56391,18 +55759,12 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8";
tag = ""
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
/turf/simulated/floor/plating,
/area/maintenance/apmaint)
"cnY" = (
@@ -56532,24 +55894,15 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8";
tag = ""
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
/turf/simulated/floor/plating,
/area/maintenance/apmaint)
"coh" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 10
- },
/obj/effect/landmark{
name = "xeno_spawn";
pixel_x = -1
@@ -56564,9 +55917,6 @@
dir = 2;
icon_state = "pipe-c"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 10
- },
/turf/simulated/floor/plating,
/area/maintenance/apmaint)
"coi" = (
@@ -56743,7 +56093,6 @@
},
/area/medical/research)
"coE" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/cable{
d1 = 1;
d2 = 4;
@@ -56759,7 +56108,6 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plating,
/area/maintenance/apmaint)
"coF" = (
@@ -56773,8 +56121,6 @@
icon_state = "1-2";
tag = ""
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plating,
/area/maintenance/apmaint)
"coG" = (
@@ -57872,51 +57218,23 @@
name = "Toxins Launch Room"
})
"cqr" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/obj/structure/disposalpipe/segment{
dir = 1;
icon_state = "pipe-c"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
/obj/structure/cable{
d1 = 1;
d2 = 4;
icon_state = "1-4";
tag = ""
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
/turf/simulated/floor/plating,
/area/maintenance/apmaint)
"cqs" = (
/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable{
- d2 = 4;
- icon_state = "0-4"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 5
- },
-/obj/machinery/power/apc{
- name = "south bump";
- pixel_y = -24
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 5
- },
/turf/simulated/floor/plating,
/area/maintenance/apmaint)
"cqt" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
/obj/structure/cable{
d1 = 4;
d2 = 8;
@@ -57928,9 +57246,6 @@
name = "HoP Office";
sortType = 15
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
/turf/simulated/floor/plating,
/area/maintenance/apmaint)
"cqu" = (
@@ -57938,27 +57253,13 @@
dir = 2;
icon_state = "pipe-c"
},
-/obj/structure/cable{
- d1 = 2;
- d2 = 8;
- icon_state = "2-8";
- tag = ""
- },
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2";
- tag = ""
- },
/obj/machinery/light/small{
dir = 4
},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 4;
- initialize_directions = 11
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
},
/turf/simulated/floor/plating,
/area/maintenance/apmaint)
@@ -58998,19 +58299,6 @@
/area/toxins/launch{
name = "Toxins Launch Room"
})
-"cso" = (
-/obj/machinery/light/small{
- dir = 1
- },
-/obj/structure/chair/stool,
-/turf/simulated/floor/plating,
-/area/maintenance/apmaint)
-"csp" = (
-/obj/effect/landmark{
- name = "blobstart"
- },
-/turf/simulated/floor/plating,
-/area/maintenance/apmaint)
"csq" = (
/obj/structure/chair{
dir = 4
@@ -59571,18 +58859,6 @@
icon_state = "white"
},
/area/medical/virology)
-"cti" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2";
- tag = ""
- },
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/plating,
-/area/maintenance/apmaint)
"ctj" = (
/obj/structure/cable{
d1 = 1;
@@ -59957,9 +59233,6 @@
/area/toxins/launch{
name = "Toxins Launch Room"
})
-"ctR" = (
-/turf/simulated/wall/r_wall,
-/area/blueshield)
"ctS" = (
/obj/structure/cable{
d1 = 1;
@@ -59974,14 +59247,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel,
/area/hallway/primary/aft)
-"ctT" = (
-/obj/machinery/door/window/southleft{
- name = "Assembly Line Delivery";
- req_access_txt = "32"
- },
-/obj/effect/decal/warning_stripes/yellow,
-/turf/simulated/floor/plasteel,
-/area/assembly/assembly_line)
"ctU" = (
/obj/structure/cable{
d1 = 4;
@@ -59999,16 +59264,6 @@
/obj/structure/grille,
/turf/simulated/floor/plating,
/area/maintenance/apmaint)
-"ctW" = (
-/obj/structure/rack{
- dir = 1
- },
-/obj/effect/spawner/lootdrop/maintenance{
- lootcount = 2;
- name = "2maintenance loot spawner"
- },
-/turf/simulated/floor/plating,
-/area/maintenance/apmaint)
"ctX" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -60757,14 +60012,13 @@
/turf/simulated/floor/plating,
/area/maintenance/apmaint)
"cvo" = (
-/turf/simulated/wall,
-/area/maintenance/consarea)
+/obj/effect/turf_decal/loading_area,
+/obj/effect/spawner/random_spawners/blood_often,
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
"cvp" = (
/turf/simulated/wall/r_wall,
/area/maintenance/apmaint)
-"cvq" = (
-/turf/simulated/wall/r_wall,
-/area/storage/tech)
"cvr" = (
/obj/machinery/door/poddoor{
id_tag = "toxinsdriver";
@@ -61416,58 +60670,36 @@
/turf/simulated/floor/plating,
/area/maintenance/apmaint)
"cwA" = (
-/obj/structure/table,
-/obj/machinery/light/small{
- dir = 1
- },
-/obj/item/stack/sheet/metal{
- amount = 2
- },
-/turf/simulated/floor/plating,
+/turf/simulated/wall/r_wall/rust,
/area/maintenance/apmaint)
"cwB" = (
-/obj/structure/chair{
- dir = 8
- },
-/turf/simulated/floor/plating,
-/area/maintenance/apmaint)
-"cwC" = (
-/obj/structure/sign/poster/contraband/random{
- pixel_y = 32
+/obj/machinery/light/small{
+ dir = 1
},
/turf/simulated/floor/plating,
/area/maintenance/apmaint)
"cwD" = (
-/obj/structure/chair{
- dir = 4
- },
-/turf/simulated/floor/plating,
-/area/maintenance/apmaint)
-"cwE" = (
-/obj/structure/table,
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/machinery/light/small{
- dir = 1
- },
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/spawner/random_spawners/cobweb_left_rare,
/turf/simulated/floor/plating,
/area/maintenance/apmaint)
"cwF" = (
-/turf/simulated/floor/plasteel,
-/area/maintenance/consarea)
-"cwG" = (
-/obj/structure/table,
-/obj/machinery/light{
- dir = 1
+/obj/structure/closet/wardrobe/pjs,
+/obj/effect/spawner/random_spawners/blood_often,
+/obj/effect/spawner/lootdrop/maintenance{
+ lootcount = 8;
+ name = "8maintenance loot spawner"
},
/turf/simulated/floor/plating,
-/area/maintenance/consarea)
-"cwH" = (
-/obj/item/screwdriver,
-/turf/simulated/floor/plating,
-/area/maintenance/consarea)
+/area/maintenance/apmaint)
"cwI" = (
+/obj/machinery/light/small{
+ dir = 1
+ },
+/obj/machinery/vending/sovietsoda,
+/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
-/area/maintenance/consarea)
+/area/maintenance/apmaint)
"cwJ" = (
/obj/structure/disposalpipe/segment,
/obj/structure/extinguisher_cabinet{
@@ -62243,19 +61475,23 @@
/turf/simulated/floor/plasteel,
/area/engine/equipmentstorage)
"cyi" = (
-/obj/item/crowbar,
+/obj/machinery/washing_machine,
+/obj/structure/sign/poster/contraband/communist_state{
+ pixel_y = 32
+ },
+/obj/effect/spawner/random_spawners/cobweb_left_rare,
/turf/simulated/floor/plating,
-/area/maintenance/consarea)
+/area/maintenance/apmaint)
"cyj" = (
-/obj/effect/spawner/window/reinforced,
+/obj/machinery/washing_machine,
/turf/simulated/floor/plating,
-/area/maintenance/consarea)
+/area/maintenance/apmaint)
"cyk" = (
/obj/item/stack/sheet/metal{
amount = 10
},
/turf/simulated/floor/plating,
-/area/maintenance/consarea)
+/area/maintenance/apmaint)
"cyl" = (
/obj/structure/cable{
d1 = 1;
@@ -63058,10 +62294,6 @@
},
/turf/simulated/floor/plating,
/area/maintenance/asmaint2)
-"czM" = (
-/obj/structure/girder,
-/turf/simulated/floor/plating,
-/area/maintenance/consarea)
"czN" = (
/obj/machinery/light/small{
dir = 8
@@ -63519,16 +62751,6 @@
/obj/item/card/id,
/turf/simulated/floor/plating,
/area/maintenance/genetics)
-"cAF" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2";
- tag = ""
- },
-/obj/effect/decal/warning_stripes/south,
-/turf/simulated/floor/plating,
-/area/maintenance/apmaint)
"cAG" = (
/obj/machinery/door/airlock/maintenance{
req_access_txt = "12"
@@ -63547,24 +62769,6 @@
},
/turf/simulated/floor/plating,
/area/maintenance/asmaint2)
-"cAH" = (
-/obj/structure/disposalpipe/segment,
-/obj/structure/cable{
- d1 = 2;
- d2 = 8;
- icon_state = "2-8";
- tag = ""
- },
-/obj/structure/cable{
- d1 = 1;
- d2 = 8;
- icon_state = "1-8";
- tag = ""
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/plating,
-/area/maintenance/apmaint)
"cAI" = (
/obj/machinery/atmospherics/pipe/simple/visible/universal,
/obj/structure/disposalpipe/segment{
@@ -63742,8 +62946,20 @@
/turf/simulated/floor/plating,
/area/maintenance/asmaint2)
"cBf" = (
-/obj/machinery/light/small{
- dir = 8
+/obj/item/poster/random_official,
+/obj/item/poster/random_official{
+ pixel_x = 3;
+ pixel_y = 3
+ },
+/obj/item/poster/random_official{
+ pixel_y = 4
+ },
+/obj/structure/rack{
+ dir = 1
+ },
+/obj/effect/spawner/lootdrop/maintenance{
+ lootcount = 8;
+ name = "8maintenance loot spawner"
},
/turf/simulated/floor/plating,
/area/maintenance/apmaint)
@@ -63765,9 +62981,12 @@
/turf/simulated/floor/engine,
/area/maintenance/incinerator)
"cBh" = (
-/obj/item/wrench,
-/turf/simulated/floor/plating,
-/area/maintenance/consarea)
+/obj/structure/table_frame/wood,
+/obj/item/stack/sheet/wood{
+ amount = 2
+ },
+/turf/simulated/floor/transparent/glass/reinforced,
+/area/maintenance/apmaint)
"cBi" = (
/obj/machinery/door/poddoor{
id_tag = "disvent";
@@ -63839,9 +63058,7 @@
},
/area/maintenance/incinerator)
"cBo" = (
-/obj/machinery/light/small{
- dir = 4
- },
+/obj/machinery/hydroponics/soil,
/turf/simulated/floor/plating,
/area/maintenance/apmaint)
"cBp" = (
@@ -64419,7 +63636,6 @@
autoclose = 0;
frequency = 1449;
heat_proof = 1;
- icon_state = "door_locked";
id_tag = "incinerator_airlock_exterior";
locked = 1;
name = "Mixing Room Exterior Airlock";
@@ -64439,7 +63655,6 @@
autoclose = 0;
frequency = 1449;
heat_proof = 1;
- icon_state = "door_locked";
id_tag = "incinerator_airlock_interior";
locked = 1;
name = "Mixing Room Interior Airlock";
@@ -64462,12 +63677,6 @@
icon_state = "floorgrime"
},
/area/maintenance/incinerator)
-"cCA" = (
-/obj/item/stack/sheet/glass{
- amount = 10
- },
-/turf/simulated/floor/plating,
-/area/maintenance/consarea)
"cCB" = (
/obj/effect/landmark{
name = "xeno_spawn";
@@ -64519,24 +63728,6 @@
},
/turf/simulated/floor/plating,
/area/maintenance/apmaint)
-"cCG" = (
-/obj/structure/cable{
- d1 = 2;
- d2 = 4;
- icon_state = "2-4";
- tag = ""
- },
-/turf/simulated/floor/plating,
-/area/maintenance/consarea)
-"cCH" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8";
- tag = ""
- },
-/turf/simulated/floor/plating,
-/area/maintenance/apmaint)
"cCI" = (
/obj/structure/cable{
d1 = 4;
@@ -65193,7 +64384,11 @@
/turf/simulated/floor/engine,
/area/maintenance/incinerator)
"cDQ" = (
-/obj/structure/closet/toolcloset,
+/obj/machinery/light/small,
+/obj/structure/chair/sofa/left{
+ dir = 1;
+ name = "tatty old sofa"
+ },
/turf/simulated/floor/plating,
/area/maintenance/apmaint)
"cDR" = (
@@ -65209,15 +64404,18 @@
},
/area/construction)
"cDS" = (
-/obj/machinery/light,
-/turf/simulated/floor/plating,
-/area/maintenance/consarea)
-"cDT" = (
-/obj/item/stack/rods{
- amount = 8
+/obj/structure/chair{
+ dir = 1
},
/turf/simulated/floor/plating,
-/area/maintenance/consarea)
+/area/maintenance/apmaint)
+"cDT" = (
+/obj/structure/sign/poster/contraband/rebels_unite{
+ pixel_y = -32
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
"cDU" = (
/obj/machinery/atmospherics/binary/pump{
dir = 4;
@@ -65289,14 +64487,9 @@
},
/area/construction)
"cEb" = (
-/obj/structure/cable,
-/obj/machinery/power/apc{
- dir = 4;
- name = "east bump";
- pixel_x = 24
- },
+/obj/structure/dresser,
/turf/simulated/floor/plating,
-/area/maintenance/consarea)
+/area/maintenance/apmaint)
"cEc" = (
/obj/structure/cable{
d1 = 1;
@@ -65502,17 +64695,30 @@
},
/area/toxins/misc_lab)
"cEv" = (
-/obj/machinery/light{
+/obj/structure/sign/poster/contraband/random{
+ pixel_y = 32
+ },
+/obj/effect/spawner/random_spawners/blood_often,
+/turf/simulated/floor/wood{
+ icon_state = "wood-broken"
+ },
+/area/maintenance/aft)
+"cEw" = (
+/obj/structure/rack{
dir = 1
},
-/turf/simulated/floor/engine,
-/area/engine/mechanic_workshop)
-"cEw" = (
-/obj/machinery/camera{
- c_tag = "Mechanic's Workshop West"
+/obj/item/reagent_containers/food/drinks/bottle/whiskey{
+ pixel_x = -3;
+ pixel_y = -3
},
-/turf/simulated/floor/engine,
-/area/engine/mechanic_workshop)
+/obj/item/reagent_containers/food/drinks/bottle/whiskey,
+/obj/item/reagent_containers/food/drinks/bottle/whiskey{
+ pixel_x = 3;
+ pixel_y = 3
+ },
+/obj/effect/spawner/random_spawners/cobweb_left_rare,
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
"cEx" = (
/obj/effect/spawner/random_spawners/fungus_probably,
/turf/simulated/wall,
@@ -65570,127 +64776,37 @@
},
/area/toxins/xenobiology)
"cEI" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on,
-/turf/simulated/floor/engine,
-/area/engine/mechanic_workshop)
-"cEJ" = (
-/obj/structure/sign/securearea{
- desc = "A warning sign which reads 'EXTERNAL AIRLOCK'";
- icon_state = "space";
- layer = 4;
- name = "EXTERNAL AIRLOCK";
- pixel_y = 32
- },
-/obj/machinery/mecha_part_fabricator/spacepod,
-/obj/effect/decal/warning_stripes/yellow/hollow,
-/obj/effect/decal/warning_stripes/west,
-/turf/simulated/floor/plasteel,
-/area/engine/mechanic_workshop)
-"cEK" = (
-/obj/machinery/light{
- dir = 1
- },
-/obj/machinery/computer/podtracker,
-/obj/effect/decal/warning_stripes/east,
-/turf/simulated/floor/plasteel,
-/area/engine/mechanic_workshop)
-"cEL" = (
-/obj/machinery/requests_console{
- department = "Mechanic";
- departmentType = 2;
- name = "Mechanic's Workshop Requests Console";
- pixel_y = 30
- },
-/obj/structure/disposalpipe/trunk,
-/obj/machinery/disposal,
-/turf/simulated/floor/plasteel,
-/area/engine/mechanic_workshop)
-"cEM" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8";
- tag = ""
- },
-/obj/machinery/camera{
- c_tag = "Mechanic's Workshop East"
- },
-/obj/machinery/space_heater,
-/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "vault"
- },
-/area/engine/mechanic_workshop)
-"cEN" = (
-/obj/structure/cable{
- d2 = 4;
- icon_state = "0-4"
- },
-/obj/structure/reagent_dispensers/fueltank,
-/obj/machinery/power/apc{
- dir = 1;
- name = "north bump";
- pixel_y = 24
- },
-/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "vault"
- },
-/area/engine/mechanic_workshop)
-"cEO" = (
-/obj/effect/spawner/window/reinforced,
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8";
- tag = ""
+/obj/structure/table/reinforced,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/spawner/lootdrop/maintenance{
+ lootcount = 2;
+ name = "2maintenance loot spawner"
},
/turf/simulated/floor/plating,
-/area/engine/mechanic_workshop)
-"cEP" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8";
- tag = ""
+/area/maintenance/aft)
+"cEJ" = (
+/obj/structure/chair/stool/bar,
+/mob/living/simple_animal/mouse,
+/turf/simulated/floor/wood{
+ icon_state = "wood-broken"
},
-/obj/structure/closet/emcloset,
-/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "vault"
+/area/maintenance/aft)
+"cEK" = (
+/turf/simulated/floor/wood,
+/area/maintenance/aft)
+"cEL" = (
+/obj/structure/table/wood/poker,
+/obj/structure/sign/poster/contraband/random{
+ pixel_y = 32
},
-/area/engine/mechanic_workshop)
-"cEQ" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8";
- tag = ""
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
+"cEM" = (
+/obj/machinery/light/small{
+ dir = 1
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "yellowcorner"
- },
-/area/hallway/primary/aft)
-"cER" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8";
- tag = ""
- },
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
- },
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "yellowcorner"
- },
-/area/hallway/primary/aft)
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
"cES" = (
/obj/item/clothing/mask/cigarette,
/turf/simulated/floor/plating/airless,
@@ -65699,65 +64815,10 @@
/obj/machinery/light/small,
/turf/simulated/floor/plating/airless,
/area/toxins/test_area)
-"cEV" = (
-/obj/machinery/light{
- dir = 1
- },
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8";
- tag = ""
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "yellowcorner"
- },
-/area/hallway/primary/aft)
-"cEW" = (
-/turf/simulated/wall/r_wall,
-/area/engine/mechanic_workshop)
-"cEX" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8";
- tag = ""
- },
-/obj/machinery/status_display{
- layer = 4;
- pixel_y = 32
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "yellowcorner"
- },
-/area/hallway/primary/aft)
"cEY" = (
-/turf/simulated/wall,
-/area/engine/mechanic_workshop)
-"cEZ" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8";
- tag = ""
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/unary/vent_pump/on,
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "yellowcorner"
- },
-/area/hallway/primary/aft)
+/obj/structure/falsewall/reinforced,
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
"cFa" = (
/turf/simulated/wall/r_wall,
/area/hallway/primary/aft)
@@ -65779,18 +64840,12 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plating,
/area/maintenance/asmaint2)
-"cFd" = (
-/obj/structure/sign/securearea{
- desc = "A warning sign which reads 'KEEP CLEAR OF DOCKING AREA'.";
- name = "KEEP CLEAR: DOCKING AREA"
- },
-/turf/simulated/wall/r_wall,
-/area/engine/mechanic_workshop)
"cFe" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/maintenance{
- name = "Alternate Construction Area";
- req_access_txt = "12"
+/obj/effect/decal/cleanable/dirt,
+/obj/item/cultivator,
+/obj/structure/sink{
+ dir = 4;
+ pixel_x = 12
},
/turf/simulated/floor/plating,
/area/maintenance/apmaint)
@@ -65799,29 +64854,15 @@
dir = 8;
icon_state = "pipe-j2"
},
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "yellowcorner"
- },
-/area/hallway/primary/aft)
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
"cFg" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 8;
- icon_state = "1-8";
- tag = ""
- },
-/obj/structure/disposalpipe/junction{
+/obj/structure/disposalpipe/segment{
dir = 1;
- icon_state = "pipe-y"
+ icon_state = "pipe-c"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "yellowcorner"
- },
-/area/hallway/primary/aft)
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
"cFh" = (
/obj/machinery/atmospherics/unary/portables_connector{
dir = 4
@@ -65839,11 +64880,9 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "yellowcorner"
- },
-/area/hallway/primary/aft)
+/obj/structure/girder,
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
"cFj" = (
/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
dir = 9;
@@ -65855,26 +64894,18 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/light{
+/obj/machinery/light/small{
dir = 1
},
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "yellowcorner"
- },
-/area/hallway/primary/aft)
+/obj/structure/closet/firecloset,
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
"cFl" = (
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/camera{
- c_tag = "Aft Primary Hallway 3"
- },
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "yellowcorner"
- },
-/area/hallway/primary/aft)
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
"cFm" = (
/obj/structure/table,
/obj/item/multitool,
@@ -65897,12 +64928,13 @@
layer = 4;
pixel_y = 32
},
-/obj/machinery/atmospherics/unary/vent_pump/on,
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "yellowcorner"
+/obj/machinery/door/airlock/maintenance{
+ locked = 1;
+ name = "Assembly Line Maintenance";
+ req_access_txt = "32"
},
-/area/hallway/primary/aft)
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
"cFp" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -66162,105 +65194,47 @@
},
/area/toxins/misc_lab)
"cFK" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
+/turf/simulated/floor/wood{
+ icon_state = "wood-broken"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/turf/simulated/floor/engine,
-/area/engine/mechanic_workshop)
+/area/maintenance/aft)
"cFL" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 6
+/obj/structure/table/reinforced,
+/obj/item/phone{
+ attack_verb = list("bounced a check off","checked-out","tipped");
+ desc = "Also known as a cash register, or, more commonly, \"robbery magnet\". It's old and rusty, clearly non-functional and decorative only.";
+ icon = 'icons/obj/machines/pos.dmi';
+ icon_state = "pos";
+ name = "point of sale"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 5
- },
-/turf/simulated/floor/engine,
-/area/engine/mechanic_workshop)
+/turf/simulated/floor/wood,
+/area/maintenance/aft)
"cFM" = (
-/obj/effect/decal/warning_stripes/west,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/turf/simulated/floor/plasteel,
-/area/engine/mechanic_workshop)
+/obj/structure/table/wood/poker,
+/obj/item/deck/cards,
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
"cFN" = (
-/obj/machinery/door/poddoor{
- density = 0;
- icon_state = "open";
- id_tag = "mechpod";
- name = "Mechanic's Workshop Inner Door";
- opacity = 0
+/obj/structure/table/wood/poker,
+/turf/simulated/floor/wood{
+ broken = 1;
+ icon_state = "wood-broken"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/turf/simulated/floor/engine,
-/area/engine/mechanic_workshop)
-"cFO" = (
-/obj/machinery/hologram/holopad,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/effect/decal/warning_stripes/east,
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 1;
- initialize_directions = 11
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/turf/simulated/floor/plasteel,
-/area/engine/mechanic_workshop)
+/area/maintenance/aft)
"cFP" = (
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
+/obj/structure/table/wood/poker,
+/obj/effect/spawner/lootdrop/maintenance{
+ lootcount = 2;
+ name = "2maintenance loot spawner"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
+/turf/simulated/floor/wood{
+ icon_state = "wood-broken5"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/turf/simulated/floor/plasteel,
-/area/engine/mechanic_workshop)
+/area/maintenance/aft)
"cFQ" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/engine/mechanic_workshop)
-"cFR" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/engine/mechanic_workshop)
+/obj/effect/spawner/random_spawners/blood_maybe,
+/turf/simulated/floor/wood,
+/area/maintenance/aft)
"cFS" = (
/obj/structure/disposalpipe/segment{
dir = 8;
@@ -66277,19 +65251,12 @@
},
/area/toxins/misc_lab)
"cFT" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8";
- tag = ""
- },
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/maintenance{
- name = "Alternate Construction Area";
req_access_txt = "12"
},
/turf/simulated/floor/plating,
-/area/maintenance/consarea)
+/area/maintenance/apmaint)
"cFU" = (
/obj/structure/window/reinforced,
/obj/structure/table/reinforced,
@@ -66309,17 +65276,14 @@
icon_state = "vault"
},
/area/toxins/misc_lab)
-"cFV" = (
-/obj/effect/decal/warning_stripes/west,
-/turf/simulated/floor/engine/vacuum,
-/area/engine/mechanic_workshop)
-"cFW" = (
-/obj/structure/spacepoddoor,
-/turf/simulated/floor/engine,
-/area/engine/mechanic_workshop)
"cFX" = (
-/turf/simulated/floor/engine,
-/area/engine/mechanic_workshop)
+/obj/machinery/light/small{
+ dir = 1
+ },
+/turf/simulated/floor/wood{
+ icon_state = "wood-broken3"
+ },
+/area/maintenance/aft)
"cFY" = (
/obj/structure/window/reinforced,
/obj/structure/window/reinforced{
@@ -66366,29 +65330,6 @@
icon_state = "vault"
},
/area/toxins/misc_lab)
-"cGb" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 1;
- initialize_directions = 11
- },
-/turf/simulated/floor/plasteel,
-/area/hallway/primary/aft)
-"cGc" = (
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/turf/simulated/floor/plasteel,
-/area/hallway/primary/aft)
"cGd" = (
/obj/structure/window/reinforced,
/obj/structure/table/reinforced,
@@ -66398,13 +65339,6 @@
icon_state = "vault"
},
/area/toxins/misc_lab)
-"cGe" = (
-/obj/machinery/light{
- dir = 1;
- on = 1
- },
-/turf/simulated/floor/engine,
-/area/engine/mechanic_workshop)
"cGf" = (
/obj/structure/cable{
d1 = 1;
@@ -66412,39 +65346,12 @@
icon_state = "1-2";
tag = ""
},
-/obj/effect/decal/warning_stripes/yellow,
-/turf/simulated/floor/engine,
-/area/engine/mechanic_workshop)
-"cGg" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 1;
- initialize_directions = 11
+/obj/machinery/light/small{
+ dir = 4;
+ pixel_y = 8
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/turf/simulated/floor/plasteel,
-/area/hallway/primary/aft)
-"cGh" = (
-/obj/structure/rack{
- dir = 1
- },
-/obj/item/extinguisher,
-/obj/item/storage/belt/utility,
-/obj/item/storage/toolbox/electrical,
-/obj/item/storage/toolbox/mechanical{
- pixel_x = -2;
- pixel_y = -1
- },
-/obj/item/radio{
- pixel_y = 6
- },
-/obj/machinery/firealarm{
- dir = 1;
- pixel_y = -24
- },
-/turf/simulated/floor/plasteel,
-/area/engine/mechanic_workshop)
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
"cGi" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -66455,24 +65362,13 @@
/turf/simulated/floor/plasteel,
/area/hallway/primary/aft)
"cGj" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- icon_state = "yellowcorner"
- },
-/area/hallway/primary/aft)
+/obj/structure/closet/emcloset,
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
"cGk" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 1;
- initialize_directions = 11
- },
-/turf/simulated/floor/plasteel,
-/area/hallway/primary/aft)
+/obj/structure/grille,
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
"cGl" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -66483,18 +65379,14 @@
},
/turf/simulated/floor/plasteel,
/area/hallway/primary/aft)
-"cGm" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
-/turf/simulated/floor/plasteel,
-/area/hallway/primary/aft)
"cGn" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
+/obj/machinery/door/airlock/maintenance{
+ locked = 1;
+ name = "Assembly Line Maintenance";
+ req_access_txt = "32"
},
-/turf/simulated/floor/plasteel,
-/area/hallway/primary/aft)
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
"cGo" = (
/obj/structure/cable{
d1 = 1;
@@ -66668,60 +65560,35 @@
},
/area/toxins/xenobiology)
"cGC" = (
-/obj/machinery/alarm{
- dir = 1;
- pixel_y = -22
- },
-/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 1
- },
-/turf/simulated/floor/engine,
-/area/engine/mechanic_workshop)
+/obj/effect/spawner/random_spawners/blood_often,
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
"cGD" = (
-/obj/effect/decal/warning_stripes/southwest,
-/turf/simulated/floor/plasteel,
-/area/engine/mechanic_workshop)
+/turf/simulated/floor/wood{
+ broken = 1;
+ icon_state = "wood-broken"
+ },
+/area/maintenance/aft)
"cGE" = (
-/obj/effect/decal/warning_stripes/southeast,
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
- dir = 1
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/wood{
+ icon_state = "wood-broken6"
},
-/turf/simulated/floor/plasteel,
-/area/engine/mechanic_workshop)
-"cGF" = (
-/obj/effect/decal/warning_stripes/south,
-/turf/simulated/floor/plasteel,
-/area/engine/mechanic_workshop)
+/area/maintenance/aft)
"cGG" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
+/obj/item/chair/stool{
+ dir = 8
},
-/area/engine/mechanic_workshop)
-"cGH" = (
-/obj/machinery/door/firedoor,
-/obj/structure/table/reinforced,
-/obj/machinery/door/window/westright{
- name = "Mechanic's Desk";
- req_access = null;
- req_access_txt = "70"
+/obj/effect/spawner/lootdrop/maintenance{
+ lootcount = 8;
+ name = "8maintenance loot spawner"
},
-/obj/machinery/cell_charger,
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/engine/mechanic_workshop)
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
"cGI" = (
-/obj/structure/chair/office/light{
- dir = 4
- },
-/obj/effect/landmark/start{
- name = "Mechanic"
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/engine/mechanic_workshop)
+/obj/machinery/slot_machine,
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
"cGJ" = (
/obj/machinery/atmospherics/unary/portables_connector{
dir = 4
@@ -66754,19 +65621,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/wood,
/area/medical/psych)
-"cGM" = (
-/obj/structure/cable{
- d1 = 2;
- d2 = 4;
- icon_state = "2-4";
- tag = ""
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/plasteel{
- icon_state = "yellowcorner"
- },
-/area/hallway/primary/aft)
"cGN" = (
/obj/machinery/meter,
/obj/machinery/atmospherics/pipe/manifold/hidden/yellow{
@@ -66774,32 +65628,6 @@
},
/turf/simulated/wall,
/area/engine/controlroom)
-"cGO" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8";
- tag = ""
- },
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
- dir = 1
- },
-/turf/simulated/floor/plasteel{
- icon_state = "yellowcorner"
- },
-/area/hallway/primary/aft)
-"cGP" = (
-/obj/structure/cable{
- d1 = 2;
- d2 = 8;
- icon_state = "2-8";
- tag = ""
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/plasteel{
- icon_state = "yellowcorner"
- },
-/area/hallway/primary/aft)
"cGQ" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/cable{
@@ -66850,10 +65678,10 @@
},
/area/gateway)
"cGU" = (
+/obj/effect/decal/warning_stripes/yellow,
/obj/structure/plasticflaps{
opacity = 1
},
-/obj/effect/decal/warning_stripes/yellow/hollow,
/turf/simulated/floor/plasteel,
/area/assembly/assembly_line)
"cGV" = (
@@ -66868,12 +65696,6 @@
icon_state = "dark"
},
/area/gateway)
-"cGW" = (
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/plasteel{
- icon_state = "yellowcorner"
- },
-/area/hallway/primary/aft)
"cGX" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -66965,14 +65787,6 @@
icon_state = "neutralfull"
},
/area/engine/chiefs_office)
-"cHc" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
- dir = 1
- },
-/turf/simulated/floor/plasteel{
- icon_state = "yellowcorner"
- },
-/area/hallway/primary/aft)
"cHd" = (
/obj/structure/closet,
/turf/simulated/floor/plating,
@@ -67198,23 +66012,17 @@
},
/area/toxins/xenobiology)
"cHB" = (
-/obj/machinery/door/poddoor{
- density = 0;
- icon_state = "open";
- id_tag = "mechpod";
- name = "Mechanic's Workshop Inner Door";
- opacity = 0
+/obj/effect/spawner/random_spawners/blood_maybe,
+/turf/simulated/floor/wood{
+ icon_state = "wood-broken3"
},
-/turf/simulated/floor/engine,
-/area/engine/mechanic_workshop)
+/area/maintenance/aft)
"cHC" = (
-/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 1
+/obj/item/chair/stool{
+ dir = 8
},
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/engine/mechanic_workshop)
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
"cHD" = (
/turf/simulated/floor/plasteel,
/area/hallway/primary/aft)
@@ -67225,29 +66033,11 @@
icon_state = "1-2";
tag = ""
},
-/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/maintenance{
req_access_txt = "12"
},
/turf/simulated/floor/plating,
/area/maintenance/apmaint)
-"cHF" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2";
- tag = ""
- },
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/maintenance{
- icon_state = "door_locked";
- locked = 1;
- name = "Assembly Line Maintenance";
- req_access_txt = "32"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/plating,
-/area/assembly/assembly_line)
"cHG" = (
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
@@ -67258,17 +66048,14 @@
},
/turf/simulated/floor/plasteel,
/area/hallway/primary/aft)
-"cHI" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/turf/simulated/floor/plasteel,
-/area/hallway/primary/aft)
"cHJ" = (
/obj/structure/disposalpipe/segment{
dir = 8;
icon_state = "pipe-c"
},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/hallway/primary/aft)
"cHK" = (
@@ -67363,17 +66150,9 @@
/area/engine/break_room)
"cHR" = (
/obj/structure/disposalpipe/segment,
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2";
- tag = ""
- },
/obj/machinery/door/airlock/maintenance{
req_access_txt = "12"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plating,
/area/maintenance/apmaint)
"cHS" = (
@@ -67774,10 +66553,6 @@
icon_state = "white"
},
/area/toxins/misc_lab)
-"cIG" = (
-/obj/machinery/light,
-/turf/simulated/floor/engine,
-/area/engine/mechanic_workshop)
"cIH" = (
/obj/structure/table/reinforced,
/obj/item/taperecorder,
@@ -67789,32 +66564,14 @@
icon_state = "white"
},
/area/toxins/misc_lab)
-"cII" = (
-/obj/structure/spacepoddoor,
-/obj/machinery/door/poddoor/multi_tile/three_tile_ver{
- id_tag = "mechpodbayouter";
- req_access_txt = "70"
- },
-/turf/simulated/floor/engine,
-/area/engine/mechanic_workshop)
"cIJ" = (
-/obj/structure/spacepoddoor,
-/obj/machinery/door/poddoor/multi_tile/three_tile_ver{
- id_tag = "mechpodbay";
- req_access_txt = "70"
- },
-/turf/simulated/floor/engine,
-/area/engine/mechanic_workshop)
+/turf/simulated/wall/rust,
+/area/maintenance/aft)
"cIK" = (
-/obj/machinery/door_control{
- desc = "A remote control-switch for the pod doors.";
- id = "mechpodbay";
- name = "Pod Door Control";
- pixel_y = -24;
- req_access_txt = "70"
+/turf/simulated/floor/wood{
+ icon_state = "wood-broken7"
},
-/turf/simulated/floor/engine,
-/area/engine/mechanic_workshop)
+/area/maintenance/aft)
"cIL" = (
/obj/structure/closet/l3closet/scientist,
/obj/effect/decal/warning_stripes/southeast,
@@ -67822,16 +66579,6 @@
icon_state = "white"
},
/area/toxins/xenobiology)
-"cIM" = (
-/obj/machinery/door_control{
- desc = "A remote control-switch for the pod doors.";
- id = "mechpodbayouter";
- name = "Pod Door Control";
- pixel_y = -24;
- req_access_txt = "70"
- },
-/turf/simulated/floor/engine,
-/area/engine/mechanic_workshop)
"cIN" = (
/obj/structure/cable{
d1 = 1;
@@ -67873,14 +66620,13 @@
/turf/simulated/floor/plating,
/area/maintenance/aft)
"cIQ" = (
+/obj/effect/decal/cleanable/dirt,
/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2";
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8";
tag = ""
},
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel,
/area/assembly/assembly_line)
"cIR" = (
@@ -67890,6 +66636,9 @@
name = "Engineering Main";
sortType = 4
},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/hallway/primary/aft)
"cIS" = (
@@ -68052,17 +66801,6 @@
icon_state = "white"
},
/area/toxins/xenobiology)
-"cJf" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 4;
- icon_state = "1-4";
- tag = ""
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/plasteel,
-/area/assembly/assembly_line)
"cJg" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/unary/vent_pump/on{
@@ -68085,36 +66823,6 @@
},
/turf/simulated/floor/plasteel,
/area/assembly/assembly_line)
-"cJj" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/engineering/glass{
- icon_state = "door_locked";
- locked = 1;
- name = "Assembly Line (KEEP OUT)";
- req_access_txt = "32"
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/turf/simulated/floor/plasteel,
-/area/assembly/assembly_line)
-"cJk" = (
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/turf/simulated/floor/plasteel,
-/area/hallway/primary/aft)
-"cJl" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "yellowcorner"
- },
-/area/hallway/primary/aft)
"cJm" = (
/obj/structure/cable{
d1 = 1;
@@ -68129,16 +66837,6 @@
},
/turf/simulated/floor/plasteel,
/area/hallway/primary/aft)
-"cJn" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 4;
- icon_state = "1-4";
- tag = ""
- },
-/obj/effect/decal/warning_stripes/north,
-/turf/simulated/floor/plating,
-/area/maintenance/aft)
"cJo" = (
/obj/structure/cable{
d2 = 2;
@@ -68464,10 +67162,6 @@
/obj/machinery/atmospherics/pipe/simple/insulated,
/turf/simulated/floor/engine,
/area/toxins/misc_lab)
-"cJS" = (
-/obj/structure/grille,
-/turf/simulated/floor/plating/airless,
-/area/engine/mechanic_workshop)
"cJT" = (
/obj/machinery/door/poddoor{
density = 0;
@@ -68486,61 +67180,13 @@
},
/turf/simulated/floor/engine,
/area/toxins/misc_lab)
-"cJU" = (
-/obj/structure/grille,
-/obj/structure/sign/securearea{
- desc = "A warning sign which reads 'KEEP CLEAR OF DOCKING AREA'.";
- name = "KEEP CLEAR: DOCKING AREA"
- },
-/turf/simulated/floor/plating/airless,
-/area/engine/mechanic_workshop)
"cJV" = (
-/turf/simulated/floor/plasteel,
-/area/engine/mechanic_workshop)
-"cJW" = (
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/item/twohanded/required/kirbyplants,
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/engine/mechanic_workshop)
-"cJX" = (
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/engine/mechanic_workshop)
-"cJY" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/engineering/glass{
- name = "Mechanic Workshop";
- req_access_txt = "70"
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/engine/mechanic_workshop)
+/obj/item/chair/stool,
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
"cJZ" = (
/turf/simulated/wall,
/area/hallway/primary/aft)
-"cKa" = (
-/obj/machinery/door/airlock/maintenance{
- name = "Mechanic Workshop Maintenance";
- req_access = null;
- req_access_txt = "70"
- },
-/turf/simulated/floor/plating,
-/area/maintenance/aft)
"cKb" = (
/turf/simulated/wall,
/area/assembly/assembly_line)
@@ -68561,18 +67207,12 @@
/turf/simulated/floor/plating,
/area/maintenance/asmaint)
"cKd" = (
-/obj/structure/table,
-/obj/item/paper_bin{
- pixel_x = 1;
- pixel_y = 9
+/obj/machinery/slot_machine,
+/obj/structure/sign/poster/contraband/random{
+ pixel_y = -32
},
-/obj/item/folder/yellow,
-/obj/item/pen,
-/obj/item/book/manual/sop_engineering,
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/engine/mechanic_workshop)
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
"cKe" = (
/obj/effect/spawner/window/reinforced,
/obj/structure/disposalpipe/segment,
@@ -68921,9 +67561,10 @@
/turf/simulated/floor/plating,
/area/maintenance/aft)
"cKK" = (
+/obj/item/pen,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/unary/vent_scrubber/on{
- dir = 1
+ dir = 8
},
/turf/simulated/floor/plasteel,
/area/assembly/assembly_line)
@@ -69177,6 +67818,10 @@
d2 = 8;
icon_state = "4-8"
},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 6
+ },
+/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
/area/maintenance/aft)
"cLn" = (
@@ -69191,23 +67836,15 @@
/obj/effect/decal/warning_stripes/north,
/turf/simulated/floor/plating,
/area/assembly/assembly_line)
-"cLo" = (
+"cLp" = (
/obj/structure/cable{
d1 = 2;
d2 = 8;
icon_state = "2-8";
tag = ""
},
-/turf/simulated/floor/plating,
-/area/maintenance/aft)
-"cLp" = (
-/obj/machinery/light/small{
- dir = 1
- },
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 10
},
/turf/simulated/floor/plating,
/area/maintenance/aft)
@@ -69221,60 +67858,6 @@
icon_state = "white"
},
/area/assembly/assembly_line)
-"cLr" = (
-/obj/machinery/door_control{
- id = "mechpod";
- name = "Mechanic's Inner Door Control";
- pixel_y = -24;
- req_access_txt = "70"
- },
-/obj/structure/table,
-/obj/item/stack/sheet/metal{
- amount = 50
- },
-/obj/item/stack/sheet/glass{
- amount = 50
- },
-/obj/item/stack/rods{
- amount = 50
- },
-/obj/item/stack/sheet/mineral/plasma{
- amount = 30
- },
-/turf/simulated/floor/plasteel,
-/area/engine/mechanic_workshop)
-"cLs" = (
-/obj/machinery/light_switch{
- name = "light switch ";
- pixel_y = -22
- },
-/turf/simulated/floor/plasteel{
- dir = 5;
- icon_state = "dark"
- },
-/area/engine/mechanic_workshop)
-"cLt" = (
-/obj/machinery/alarm{
- dir = 1;
- pixel_y = -22
- },
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/machinery/vending/coffee,
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/engine/mechanic_workshop)
-"cLu" = (
-/obj/item/radio/intercom{
- pixel_y = -28
- },
-/obj/machinery/computer/rdconsole/mechanics,
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/engine/mechanic_workshop)
"cLv" = (
/obj/effect/decal/warning_stripes/north,
/turf/simulated/floor/plasteel{
@@ -69298,14 +67881,8 @@
/turf/simulated/floor/plasteel,
/area/assembly/assembly_line)
"cLy" = (
-/obj/structure/rack{
- dir = 8;
- layer = 2.9
- },
-/obj/effect/spawner/lootdrop/maintenance{
- lootcount = 2;
- name = "2maintenance loot spawner"
- },
+/obj/effect/decal/cleanable/dirt,
+/mob/living/simple_animal/mouse,
/turf/simulated/floor/plating,
/area/maintenance/aft)
"cLz" = (
@@ -69370,11 +67947,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel,
/area/assembly/assembly_line)
-"cLI" = (
-/obj/item/stack/cable_coil,
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel,
-/area/assembly/assembly_line)
"cLJ" = (
/obj/structure/closet/fireaxecabinet{
pixel_y = -32
@@ -69398,6 +67970,9 @@
dir = 1;
icon_state = "pipe-c"
},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "yellowcorner"
@@ -69666,22 +68241,14 @@
/obj/item/stack/sheet/cardboard,
/turf/simulated/floor/plating,
/area/maintenance/asmaint2)
-"cMq" = (
+"cMr" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2";
tag = ""
},
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/maintenance{
- req_access_txt = "12"
- },
-/turf/simulated/floor/plating,
-/area/maintenance/aft)
-"cMr" = (
-/obj/structure/table,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plating,
/area/maintenance/aft)
"cMs" = (
@@ -70287,11 +68854,6 @@
"cNG" = (
/turf/simulated/floor/plating,
/area/assembly/assembly_line)
-"cNH" = (
-/obj/item/pen,
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel,
-/area/assembly/assembly_line)
"cNI" = (
/obj/structure/cable{
d1 = 4;
@@ -70410,6 +68972,15 @@
tag = ""
},
/obj/structure/disposalpipe/segment,
+/obj/machinery/door/airlock/maintenance{
+ req_access_txt = "12"
+ },
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2";
+ tag = ""
+ },
/turf/simulated/floor/plasteel{
icon_state = "yellowcorner"
},
@@ -70420,12 +68991,7 @@
dir = 1;
icon_state = "pipe-c"
},
-/obj/structure/cable{
- d1 = 1;
- d2 = 8;
- icon_state = "1-8";
- tag = ""
- },
+/obj/machinery/vending/coffee,
/turf/simulated/floor/plasteel{
icon_state = "yellowcorner"
},
@@ -70614,7 +69180,9 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/mob/living/simple_animal/mouse,
+/obj/machinery/door/airlock/maintenance{
+ req_access_txt = "12"
+ },
/turf/simulated/floor/plating,
/area/maintenance/aft)
"cOr" = (
@@ -70624,20 +69192,6 @@
icon_state = "white"
},
/area/assembly/assembly_line)
-"cOs" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2";
- tag = ""
- },
-/obj/machinery/door/airlock/maintenance{
- req_access_txt = "12"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/plating,
-/area/maintenance/aft)
"cOt" = (
/obj/machinery/door/poddoor{
density = 0;
@@ -70686,10 +69240,6 @@
},
/turf/simulated/floor/engine,
/area/toxins/test_chamber)
-"cOw" = (
-/obj/effect/spawner/window/reinforced,
-/turf/simulated/wall,
-/area/maintenance/aft)
"cOx" = (
/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
@@ -70795,23 +69345,22 @@
/turf/simulated/floor/plasteel,
/area/atmos/distribution)
"cOK" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2";
- tag = ""
- },
/obj/machinery/navbeacon{
codes_txt = "patrol;next_patrol=AIE";
location = "AftH"
},
+/obj/structure/disposalpipe/segment,
/obj/structure/cable{
- d1 = 2;
- d2 = 4;
- icon_state = "2-4";
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8";
tag = ""
},
-/obj/structure/disposalpipe/segment,
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
/turf/simulated/floor/plasteel,
/area/hallway/primary/aft)
"cOL" = (
@@ -71004,9 +69553,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/light/small{
- dir = 1
- },
+/obj/structure/girder,
/turf/simulated/floor/plating,
/area/maintenance/aft)
"cPi" = (
@@ -71048,6 +69595,7 @@
icon_state = "1-8";
tag = ""
},
+/obj/structure/closet/firecloset,
/turf/simulated/floor/plating,
/area/maintenance/aft)
"cPm" = (
@@ -72325,6 +70873,7 @@
dir = 10;
initialize_directions = 10
},
+/obj/structure/girder,
/turf/simulated/floor/plating,
/area/maintenance/aft)
"cRJ" = (
@@ -73021,6 +71570,7 @@
icon_state = "4-8";
tag = ""
},
+/obj/structure/closet/emcloset,
/turf/simulated/floor/plating,
/area/maintenance/aft)
"cTd" = (
@@ -73519,11 +72069,9 @@
},
/obj/machinery/door/airlock/external{
frequency = 1379;
- icon_state = "door_locked";
id_tag = "robotics_solar_outer";
locked = 1;
name = "Engineering External Access";
- req_access = null;
req_access_txt = "10;13"
},
/turf/simulated/floor/plating,
@@ -73567,11 +72115,9 @@
},
/obj/machinery/door/airlock/external{
frequency = 1379;
- icon_state = "door_locked";
id_tag = "robotics_solar_inner";
locked = 1;
name = "Engineering External Access";
- req_access = null;
req_access_txt = "13"
},
/turf/simulated/floor/plating,
@@ -73755,7 +72301,6 @@
pixel_y = 4
},
/obj/item/megaphone,
-/obj/item/lock_buster,
/mob/living/simple_animal/parrot/Poly,
/turf/simulated/floor/plasteel{
dir = 8;
@@ -76239,10 +74784,6 @@
icon_state = "dark"
},
/area/ai_monitored/storage/eva)
-"dat" = (
-/obj/effect/spawner/window/reinforced,
-/turf/simulated/floor/plating,
-/area/escapepodbay)
"dau" = (
/obj/machinery/power/terminal{
dir = 1
@@ -76315,18 +74856,6 @@
},
/turf/simulated/floor/plating,
/area/maintenance/asmaint)
-"daC" = (
-/obj/structure/grille,
-/turf/simulated/floor/plating/airless,
-/area/escapepodbay)
-"daD" = (
-/obj/structure/grille,
-/obj/structure/sign/securearea{
- desc = "A warning sign which reads 'KEEP CLEAR OF DOCKING AREA'.";
- name = "KEEP CLEAR: DOCKING AREA"
- },
-/turf/simulated/floor/plating/airless,
-/area/escapepodbay)
"daE" = (
/obj/structure/cable{
d1 = 4;
@@ -76525,18 +75054,6 @@
},
/turf/simulated/floor/plasteel,
/area/atmos)
-"daZ" = (
-/obj/machinery/power/apc{
- dir = 8;
- name = "Escape Podbay APC";
- pixel_x = -25
- },
-/obj/structure/cable{
- d2 = 4;
- icon_state = "0-4"
- },
-/turf/simulated/floor/plasteel,
-/area/escapepodbay)
"dba" = (
/obj/structure/lattice,
/obj/machinery/atmospherics/pipe/simple/visible/yellow{
@@ -76637,25 +75154,6 @@
},
/turf/simulated/floor/plating,
/area/maintenance/genetics)
-"dbo" = (
-/obj/machinery/light_switch{
- pixel_x = -23
- },
-/turf/simulated/floor/plasteel,
-/area/escapepodbay)
-"dbp" = (
-/obj/machinery/door/airlock/maintenance{
- req_access_txt = "12"
- },
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2";
- tag = ""
- },
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/plating,
-/area/maintenance/aft)
"dbq" = (
/obj/structure/cable{
d1 = 1;
@@ -76795,14 +75293,6 @@
},
/turf/simulated/floor/plating,
/area/maintenance/asmaint)
-"dbH" = (
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/effect/decal/warning_stripes/yellow/hollow,
-/obj/structure/reagent_dispensers/watertank,
-/turf/simulated/floor/plasteel,
-/area/escapepodbay)
"dbJ" = (
/obj/machinery/power/terminal{
dir = 1
@@ -83886,6 +82376,10 @@
},
/turf/simulated/floor/bluegrid,
/area/tcommsat/chamber)
+"dUD" = (
+/obj/item/chair,
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
"dVs" = (
/obj/effect/spawner/window/reinforced,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -83909,6 +82403,17 @@
icon_state = "dark"
},
/area/engine/engineering)
+"efn" = (
+/obj/structure/safe,
+/obj/item/soap/homemade,
+/obj/item/key/janitor{
+ name = "spare key";
+ pixel_y = 7
+ },
+/obj/item/bikehorn/rubberducky,
+/obj/item/clothing/head/crown,
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
"egO" = (
/obj/machinery/meter,
/obj/machinery/atmospherics/pipe/simple/visible{
@@ -83969,6 +82474,18 @@
},
/turf/simulated/floor/plating,
/area/engine/supermatter)
+"eIi" = (
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
"eJr" = (
/obj/effect/decal/warning_stripes/west,
/obj/structure/cable/yellow{
@@ -83994,6 +82511,10 @@
},
/turf/simulated/wall,
/area/maintenance/fsmaint)
+"eLB" = (
+/obj/item/seeds/potato,
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
"eMw" = (
/obj/structure/cable{
d1 = 4;
@@ -84030,6 +82551,10 @@
},
/turf/simulated/floor/plating,
/area/engine/supermatter)
+"eSr" = (
+/obj/item/stack/cable_coil,
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
"eTE" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/wall,
@@ -84039,6 +82564,15 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plating,
/area/crew_quarters/dorms)
+"fbx" = (
+/obj/structure/disposalpipe/segment,
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
+"fcH" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/hydroponics/soil,
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
"fdg" = (
/obj/structure/reflector/single{
anchored = 1;
@@ -84048,6 +82582,18 @@
icon_state = "dark"
},
/area/engine/engineering)
+"fea" = (
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4";
+ tag = ""
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 5
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
"fes" = (
/obj/structure/chair{
dir = 4
@@ -84069,6 +82615,23 @@
},
/turf/simulated/floor/plasteel,
/area/crew_quarters/dorms)
+"fjj" = (
+/obj/machinery/atmospherics/binary/valve,
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
+"fmi" = (
+/obj/effect/spawner/lootdrop/maintenance{
+ lootcount = 3;
+ name = "3maintenance loot spawner"
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
+"fmN" = (
+/obj/machinery/computer/account_database{
+ dir = 4
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
"fqV" = (
/obj/effect/decal/warning_stripes/north,
/obj/machinery/atmospherics/pipe/simple/visible/cyan{
@@ -84100,6 +82663,16 @@
icon_state = "dark"
},
/area/engine/engineering)
+"fIO" = (
+/obj/effect/spawner/window/reinforced,
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8";
+ tag = ""
+ },
+/turf/simulated/floor/plating,
+/area/assembly/assembly_line)
"fKd" = (
/obj/effect/spawner/window/reinforced/plasma,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
@@ -84107,6 +82680,31 @@
},
/turf/simulated/floor/plating,
/area/engine/engineering)
+"fKf" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/engineering/glass{
+ locked = 1;
+ name = "Assembly Line (KEEP OUT)";
+ req_access_txt = "32"
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel,
+/area/assembly/assembly_line)
+"fLH" = (
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/light/small,
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
"fPU" = (
/obj/effect/decal/warning_stripes/west,
/obj/machinery/atmospherics/pipe/simple/visible{
@@ -84115,6 +82713,13 @@
/obj/machinery/meter,
/turf/simulated/floor/engine,
/area/engine/engineering)
+"fQq" = (
+/obj/effect/turf_decal/loading_area{
+ dir = 8
+ },
+/obj/effect/spawner/random_spawners/cobweb_right_frequent,
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
"fRL" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/item/radio/intercom{
@@ -84122,12 +82727,32 @@
},
/turf/simulated/floor/plasteel,
/area/crew_quarters/dorms)
+"fVJ" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/light/small{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
"fWP" = (
/obj/machinery/atmospherics/pipe/simple/visible/red{
dir = 4
},
/turf/simulated/floor/engine,
/area/engine/engineering)
+"fXL" = (
+/obj/machinery/light/small{
+ dir = 8
+ },
+/obj/machinery/atmospherics/unary/tank/air{
+ dir = 4
+ },
+/obj/effect/decal/warning_stripes/north,
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
"fYe" = (
/obj/machinery/light,
/turf/simulated/floor/plasteel{
@@ -84157,6 +82782,12 @@
},
/turf/simulated/floor/plasteel,
/area/crew_quarters/dorms)
+"gjo" = (
+/obj/structure/reagent_dispensers/beerkeg/nuke{
+ name = "Nanotrasen-brand nuclear fizz-sion explosive"
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
"gmW" = (
/obj/machinery/power/emitter{
anchored = 1;
@@ -84169,6 +82800,48 @@
},
/turf/simulated/floor/plating,
/area/engine/engineering)
+"gqA" = (
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2";
+ tag = ""
+ },
+/obj/structure/cable{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8";
+ tag = ""
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 10
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
+"gyA" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8";
+ tag = ""
+ },
+/obj/machinery/power/apc{
+ dir = 1;
+ name = "north bump";
+ pixel_y = 24
+ },
+/obj/structure/cable{
+ d2 = 4;
+ icon_state = "0-4"
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
"gAm" = (
/obj/structure/cable/yellow{
d1 = 2;
@@ -84184,6 +82857,15 @@
icon_state = "dark"
},
/area/engine/engineering)
+"gAJ" = (
+/obj/structure/cable{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4";
+ tag = ""
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
"gCE" = (
/obj/structure/cable{
d1 = 1;
@@ -84255,6 +82937,19 @@
},
/turf/simulated/floor/plating,
/area/toxins/mixing)
+"gSd" = (
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8";
+ tag = ""
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/grille,
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
"gSS" = (
/obj/machinery/atmospherics/pipe/simple/visible/yellow{
dir = 9
@@ -84272,6 +82967,11 @@
/obj/machinery/atmospherics/pipe/simple/visible/cyan,
/turf/simulated/floor/engine,
/area/engine/engineering)
+"heB" = (
+/turf/simulated/floor/wood{
+ icon_state = "wood-broken5"
+ },
+/area/maintenance/aft)
"hsy" = (
/obj/machinery/atmospherics/pipe/simple/insulated{
dir = 4
@@ -84293,6 +82993,18 @@
},
/turf/simulated/floor/plating,
/area/toxins/mixing)
+"hum" = (
+/obj/machinery/door/airlock/vault{
+ locked = 1;
+ name = "abandoned vault";
+ req_access_txt = "32"
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
+"hvi" = (
+/obj/effect/decal/warning_stripes/southeastcorner,
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
"hxf" = (
/obj/machinery/door/airlock/engineering/glass{
name = "Laser Room";
@@ -84316,6 +83028,13 @@
},
/turf/simulated/floor/bluegrid,
/area/tcommsat/chamber)
+"hAA" = (
+/obj/machinery/door/airlock/maintenance{
+ req_access_txt = "12"
+ },
+/obj/effect/decal/cleanable/blood/oil,
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
"hNT" = (
/obj/effect/decal/warning_stripes/southeast,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -84338,6 +83057,14 @@
},
/turf/simulated/floor/engine,
/area/engine/engineering)
+"hSm" = (
+/obj/structure/table/wood,
+/obj/effect/spawner/lootdrop/maintenance{
+ lootcount = 2;
+ name = "2maintenance loot spawner"
+ },
+/turf/simulated/floor/transparent/glass/reinforced,
+/area/maintenance/apmaint)
"idF" = (
/obj/effect/decal/warning_stripes/south,
/obj/machinery/atmospherics/trinary/filter/flipped{
@@ -84346,6 +83073,9 @@
},
/turf/simulated/floor/engine,
/area/engine/engineering)
+"iez" = (
+/turf/simulated/wall/rust,
+/area/maintenance/apmaint)
"ieI" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/binary/pump{
@@ -84398,6 +83128,10 @@
},
/turf/simulated/floor/plating,
/area/engine/engineering)
+"iui" = (
+/obj/effect/decal/warning_stripes/northeastcorner,
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
"ivi" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
@@ -84475,6 +83209,11 @@
/obj/machinery/atmospherics/pipe/simple/visible/green,
/turf/simulated/floor/engine,
/area/engine/engineering)
+"iYO" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light/small,
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
"iZs" = (
/obj/effect/spawner/window/reinforced,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -84498,6 +83237,15 @@
},
/turf/simulated/floor/plating,
/area/engine/engineering)
+"jfb" = (
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/effect/spawner/random_barrier/possibly_welded_airlock,
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
"jnm" = (
/obj/structure/cable{
d1 = 1;
@@ -84542,6 +83290,21 @@
},
/turf/simulated/floor/plating,
/area/engine/engineering)
+"jDJ" = (
+/obj/structure/rack{
+ dir = 1
+ },
+/obj/item/reagent_containers/food/drinks/bottle/whiskey{
+ pixel_x = -3;
+ pixel_y = -3
+ },
+/obj/item/reagent_containers/food/drinks/bottle/whiskey,
+/obj/item/reagent_containers/food/drinks/bottle/whiskey{
+ pixel_x = 3;
+ pixel_y = 3
+ },
+/turf/simulated/floor/wood,
+/area/maintenance/aft)
"jMw" = (
/obj/machinery/door/airlock/titanium,
/turf/simulated/floor/mineral/titanium,
@@ -84553,6 +83316,12 @@
},
/turf/simulated/floor/plasteel,
/area/crew_quarters/dorms)
+"jQG" = (
+/obj/item/stack/sheet/wood{
+ amount = 4
+ },
+/turf/simulated/floor/transparent/glass/reinforced,
+/area/maintenance/apmaint)
"jRV" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 9
@@ -84590,6 +83359,16 @@
},
/turf/simulated/floor/engine,
/area/engine/supermatter)
+"jZu" = (
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2";
+ tag = ""
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
"kbU" = (
/obj/machinery/door/airlock/external{
frequency = 1379;
@@ -84625,6 +83404,31 @@
},
/turf/simulated/floor/plasteel,
/area/crew_quarters/dorms)
+"klK" = (
+/obj/structure/table_frame/wood,
+/obj/item/stack/sheet/wood{
+ amount = 2
+ },
+/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+ pixel_x = -5;
+ pixel_y = 7
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
+"kmw" = (
+/obj/effect/decal/warning_stripes/west,
+/obj/effect/spawner/random_spawners/blood_often,
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
+"krB" = (
+/obj/machinery/light/small{
+ dir = 1
+ },
+/obj/structure/chair/sofa/right{
+ name = "tatty old sofa"
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
"kwt" = (
/obj/machinery/door/poddoor{
density = 0;
@@ -84646,6 +83450,13 @@
},
/turf/simulated/floor/plating,
/area/bridge)
+"kIa" = (
+/obj/structure/rack{
+ dir = 4
+ },
+/obj/effect/spawner/lootdrop/maintenance,
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
"kIR" = (
/obj/structure/lattice/catwalk,
/obj/machinery/atmospherics/pipe/simple/hidden/yellow,
@@ -84712,6 +83523,18 @@
},
/turf/simulated/wall/r_wall,
/area/engine/supermatter)
+"kXY" = (
+/obj/structure/closet/crate{
+ icon_state = "crateopen";
+ name = "Silver Crate";
+ opened = 1
+ },
+/obj/item/paper{
+ info = "I.O.U. some shinies - Mr V. Ox"
+ },
+/mob/living/simple_animal/hostile/scarybat,
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
"kYw" = (
/obj/structure/cable{
d1 = 4;
@@ -84764,6 +83587,15 @@
},
/turf/simulated/floor/engine,
/area/engine/supermatter)
+"lxs" = (
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/structure/girder,
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
"lzm" = (
/obj/machinery/light/small{
dir = 8
@@ -84803,12 +83635,34 @@
},
/turf/simulated/floor/plasteel,
/area/atmos)
+"lMw" = (
+/obj/effect/decal/warning_stripes/east,
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
+"lPK" = (
+/obj/structure/table,
+/obj/structure/bedsheetbin{
+ pixel_x = -1;
+ pixel_y = 2
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
"lQS" = (
/obj/structure/shuttle/engine/propulsion/burst{
dir = 8
},
/turf/simulated/wall/mineral/titanium,
/area/shuttle/pod_3)
+"lUC" = (
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8";
+ tag = ""
+ },
+/turf/simulated/wall,
+/area/hallway/primary/aft)
"lVr" = (
/obj/machinery/atmospherics/pipe/simple/visible/supply{
dir = 10
@@ -84830,6 +83684,24 @@
/obj/machinery/atmospherics/pipe/simple/visible/cyan,
/turf/simulated/floor/engine,
/area/engine/engineering)
+"mar" = (
+/obj/structure/chair/sofa/left{
+ name = "tatty old sofa"
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
+"meF" = (
+/obj/machinery/light/small{
+ dir = 4;
+ pixel_y = 8
+ },
+/obj/effect/spawner/lootdrop/maintenance{
+ lootcount = 3;
+ name = "3maintenance loot spawner"
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
"mkE" = (
/obj/machinery/atmospherics/pipe/simple/hidden/yellow,
/obj/machinery/atmospherics/unary/vent_scrubber/on{
@@ -84915,10 +83787,20 @@
},
/turf/simulated/wall/r_wall,
/area/maintenance/fsmaint)
+"nhn" = (
+/obj/structure/sign/poster/contraband/random{
+ pixel_x = 32
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
"nic" = (
/obj/effect/spawner/window/reinforced/plasma,
/turf/simulated/floor/plating,
/area/engine/supermatter)
+"nps" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/universal,
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
"nqX" = (
/obj/structure/table,
/obj/item/paper{
@@ -84988,6 +83870,13 @@
},
/turf/simulated/floor/plating,
/area/engine/engineering)
+"nQG" = (
+/obj/machinery/atmospherics/pipe/simple/visible{
+ dir = 9
+ },
+/obj/effect/decal/warning_stripes/southeast,
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
"nSi" = (
/obj/effect/decal/warning_stripes/southwest,
/obj/structure/closet/crate/can,
@@ -85021,9 +83910,32 @@
},
/turf/simulated/floor/plasteel,
/area/crew_quarters/dorms)
+"ocN" = (
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/machinery/light/small{
+ dir = 1
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
"omz" = (
/turf/simulated/wall/r_wall,
/area/engine/supermatter)
+"orF" = (
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/structure/grille,
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
"oyv" = (
/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel{
@@ -85037,6 +83949,11 @@
},
/turf/simulated/floor/engine,
/area/engine/engineering)
+"oBH" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/bed,
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
"oBR" = (
/obj/structure/reflector/double{
anchored = 1
@@ -85096,6 +84013,20 @@
/obj/effect/decal/warning_stripes/southwest,
/turf/simulated/floor/engine,
/area/engine/engineering)
+"pgF" = (
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/light/small{
+ dir = 1
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
"phw" = (
/obj/machinery/power/supermatter_crystal/engine,
/turf/simulated/floor/engine,
@@ -85116,6 +84047,16 @@
},
/turf/simulated/floor/plating,
/area/engine/supermatter)
+"pow" = (
+/obj/structure/cable{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4";
+ tag = ""
+ },
+/obj/effect/spawner/random_barrier/obstruction,
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
"pwU" = (
/obj/effect/landmark/battle_mob_point,
/turf/simulated/floor/engine,
@@ -85157,6 +84098,11 @@
},
/turf/simulated/floor/plasteel,
/area/engine/equipmentstorage)
+"pNz" = (
+/obj/effect/decal/warning_stripes/northwestcorner,
+/obj/effect/spawner/random_spawners/blood_often,
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
"pOj" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 6
@@ -85193,6 +84139,20 @@
},
/turf/space,
/area/space/nearstation)
+"pZQ" = (
+/obj/structure/closet/crate{
+ icon_state = "crateopen";
+ name = "Gold Crate";
+ opened = 1
+ },
+/obj/effect/decal/cleanable/cobweb,
+/obj/item/storage/belt/fannypack/yellow,
+/obj/effect/spawner/lootdrop/maintenance{
+ lootcount = 8;
+ name = "8maintenance loot spawner"
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
"qcg" = (
/obj/structure/cable{
d1 = 4;
@@ -85204,6 +84164,28 @@
},
/turf/simulated/floor/engine,
/area/engine/engineering)
+"qdn" = (
+/obj/effect/spawner/window/reinforced,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/turf/simulated/floor/plating,
+/area/assembly/assembly_line)
+"qhK" = (
+/obj/structure/chair/sofa/right{
+ dir = 1;
+ name = "tatty old sofa"
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
+"qjC" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/grille,
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
"qmX" = (
/obj/effect/decal/warning_stripes/east,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
@@ -85240,6 +84222,22 @@
icon_state = "dark"
},
/area/engine/engineering)
+"qrr" = (
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8";
+ tag = ""
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/structure/girder,
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
"qsT" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 9
@@ -85252,6 +84250,10 @@
},
/turf/simulated/wall/r_wall,
/area/engine/engineering)
+"qxh" = (
+/obj/structure/girder,
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
"qCB" = (
/obj/effect/decal/warning_stripes/west,
/obj/structure/cable/yellow{
@@ -85272,6 +84274,22 @@
},
/turf/simulated/floor/plasteel,
/area/crew_quarters/dorms)
+"qGn" = (
+/obj/machinery/atmospherics/unary/tank/air{
+ dir = 4
+ },
+/obj/effect/decal/warning_stripes/south,
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
+"qHe" = (
+/obj/machinery/light/small{
+ dir = 1
+ },
+/obj/machinery/mineral/mint{
+ input_dir = 4
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
"qIn" = (
/obj/structure/table,
/obj/item/stack/sheet/metal/fifty,
@@ -85279,6 +84297,17 @@
icon_state = "dark"
},
/area/engine/engineering)
+"qJc" = (
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
"qOo" = (
/obj/structure/chair{
dir = 4
@@ -85335,6 +84364,13 @@
},
/turf/simulated/floor/plasteel,
/area/atmos)
+"rEx" = (
+/obj/item/chair{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
"rFd" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel,
@@ -85343,6 +84379,15 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/wall,
/area/crew_quarters/dorms)
+"rNJ" = (
+/obj/effect/decal/warning_stripes/southwestcorner,
+/obj/effect/spawner/random_spawners/blood_often,
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
+"rNN" = (
+/obj/effect/spawner/random_spawners/grille_maybe,
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
"rTy" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
@@ -85384,6 +84429,14 @@
},
/turf/simulated/floor/engine,
/area/engine/engineering)
+"rZE" = (
+/mob/living/simple_animal/mouse,
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
+"saD" = (
+/obj/effect/spawner/random_barrier/wall_probably,
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
"scM" = (
/obj/effect/decal/warning_stripes/southwestcorner,
/obj/structure/cable/yellow{
@@ -85418,6 +84471,24 @@
icon_state = "dark"
},
/area/engine/engineering)
+"swy" = (
+/obj/structure/disposalpipe/segment,
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
+"sAz" = (
+/obj/machinery/light/small,
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
+"sFz" = (
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
+/obj/effect/spawner/random_spawners/oil_maybe,
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
"sHt" = (
/turf/simulated/floor/engine,
/area/holodeck/alphadeck)
@@ -85455,6 +84526,11 @@
},
/turf/simulated/floor/plasteel,
/area/crew_quarters/dorms)
+"sZe" = (
+/obj/effect/decal/cleanable/cobweb2,
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
"sZP" = (
/obj/machinery/power/emitter{
anchored = 1;
@@ -85507,12 +84583,29 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/wall/r_wall,
/area/engine/engineering)
+"tAm" = (
+/obj/machinery/meter,
+/obj/machinery/atmospherics/pipe/manifold/visible{
+ dir = 4;
+ initialize_directions = 11
+ },
+/obj/effect/decal/warning_stripes/northeast,
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
"tDn" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
/area/engine/engineering)
+"tDB" = (
+/obj/effect/spawner/random_spawners/blood_maybe,
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
+"tGO" = (
+/obj/structure/girder,
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
"tPd" = (
/obj/machinery/embedded_controller/radio/airlock/airlock_controller{
id_tag = "engineering_east_airlock";
@@ -85545,6 +84638,11 @@
/obj/item/geiger_counter,
/turf/simulated/floor/engine,
/area/engine/engineering)
+"ubb" = (
+/obj/structure/chair,
+/obj/effect/mob_spawn/human/skeleton,
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
"ubz" = (
/obj/structure/table,
/obj/item/rpd,
@@ -85552,6 +84650,13 @@
icon_state = "dark"
},
/area/engine/engineering)
+"ubQ" = (
+/obj/machinery/light/small,
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/wood{
+ icon_state = "wood-broken5"
+ },
+/area/maintenance/aft)
"ufc" = (
/obj/structure/cable{
d2 = 4;
@@ -85585,6 +84690,16 @@
},
/turf/space,
/area/space/nearstation)
+"uPT" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/turf/simulated/floor/plating,
+/area/assembly/assembly_line)
+"uTp" = (
+/obj/effect/spawner/random_barrier/obstruction,
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
"uTu" = (
/obj/structure/window/plasmareinforced{
dir = 8
@@ -85750,6 +84865,15 @@
icon_state = "dark"
},
/area/engine/engineering)
+"war" = (
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
+/turf/simulated/floor/plasteel,
+/area/hallway/primary/aft)
"wbr" = (
/obj/structure/cable{
d1 = 2;
@@ -85774,6 +84898,10 @@
},
/turf/simulated/floor/engine,
/area/engine/supermatter)
+"wlv" = (
+/obj/effect/spawner/random_barrier/possibly_welded_airlock,
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
"wnU" = (
/obj/machinery/alarm{
dir = 4;
@@ -85783,6 +84911,17 @@
icon_state = "dark"
},
/area/engine/engineering)
+"wyI" = (
+/obj/item/stack/cable_coil,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8";
+ tag = ""
+ },
+/turf/simulated/floor/plasteel,
+/area/assembly/assembly_line)
"wEY" = (
/obj/structure/cable{
d1 = 4;
@@ -85868,6 +85007,10 @@
icon_state = "dark"
},
/area/engine/engineering)
+"xvQ" = (
+/obj/effect/spawner/random_spawners/cobweb_left_frequent,
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
"xwz" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -85900,6 +85043,10 @@
},
/turf/simulated/floor/engine,
/area/engine/engineering)
+"xKx" = (
+/obj/structure/closet/emcloset,
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
"xOn" = (
/obj/effect/decal/warning_stripes/northeastcorner,
/obj/machinery/atmospherics/pipe/simple/visible/yellow,
@@ -85927,6 +85074,19 @@
},
/turf/simulated/floor/engine,
/area/engine/engineering)
+"xWX" = (
+/mob/living/simple_animal/hostile/scarybat,
+/turf/simulated/floor/plating,
+/area/maintenance/apmaint)
+"ycV" = (
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8";
+ tag = ""
+ },
+/turf/simulated/floor/plasteel,
+/area/hallway/primary/aft)
"ykt" = (
/obj/machinery/door/airlock/maintenance{
name = "Atmospherics Maintenance";
@@ -103339,10 +102499,10 @@ cAX
cCy
cAX
cwx
-aaa
-aaa
-aaa
-aaa
+aab
+amh
+aab
+amh
aab
aaa
cNM
@@ -103852,11 +103012,11 @@ czQ
cBa
cCt
cDL
-cFd
+cwx
+aaa
aaa
aaa
aaa
-cJU
aab
aab
cNF
@@ -104109,11 +103269,11 @@ czJ
cBb
cCz
cDX
-cEW
-cFV
-cFV
-cFV
-cJS
+cwx
+aaa
+aaa
+aaa
+aaa
ayi
aab
cpz
@@ -104366,11 +103526,11 @@ czK
cBc
cCB
cDZ
-cEW
-cFW
-cFW
-cII
-cEW
+cwx
+aaa
+aaa
+aaa
+aaa
aaa
aab
cNM
@@ -104623,11 +103783,11 @@ czK
cBd
czJ
cBb
-cEW
-cFX
-cFX
-cFX
-cEW
+cwx
+aaa
+aaa
+aaa
+aaa
ayi
aab
aaa
@@ -104880,11 +104040,11 @@ czR
cBn
cCD
cDO
-cEW
-cGe
-cFX
-cIG
-cEW
+cwx
+aaa
+aaa
+aaa
+aaa
ayi
aab
aaa
@@ -105130,18 +104290,18 @@ aaa
aab
cng
coL
-coL
+cqs
cwx
cwy
cwx
cwx
cCC
cwx
-cEW
-cFX
-cFX
-cFX
-cEW
+cwx
+cOx
+cOx
+cOx
+cOx
cLi
cLi
cLi
@@ -105393,17 +104553,17 @@ csu
csu
csu
cCE
-cAF
+csu
cHE
+cMv
cGf
-cGf
-cGf
-cMq
-cJn
-cLi
-cNA
-cNB
-cMr
+cMv
+cMv
+cNN
+cNC
+kIa
+fXL
+qGn
cLi
aaa
aaa
@@ -105644,23 +104804,23 @@ aaa
aab
cng
ctU
-cgQ
-cwz
-cyg
+coL
+tGO
+meF
+coL
+cqs
+coL
coL
cgQ
-csk
-cqB
-cEY
-cFW
-cFW
+cLi
+cLi
cIJ
-cEY
+cLi
cLm
-dbh
-cNB
-cNB
-cPu
+nps
+fjj
+tAm
+nQG
cOx
aaa
aaa
@@ -105901,22 +105061,22 @@ aaa
aab
cgQ
ctU
-cgQ
-cgQ
-cgQ
-cqF
-cgQ
-cgQ
-cgQ
-cEY
+coL
+cvp
+cwA
+cvp
+cvp
+cwA
+cwA
+cvp
cEw
-cFX
-cIM
-cEY
-cLm
-cLi
-cNC
+jDJ
cNB
+cLi
+qJc
+cNB
+cNB
+cPu
cND
cLi
aaa
@@ -106158,21 +105318,21 @@ aaa
aab
cgQ
ctV
-cgQ
-coL
-coL
coL
+cvp
+pZQ
+cwz
cBf
-coL
-cqz
+oBH
+fmN
cEY
cEv
-cFX
+cEK
cIK
-cEY
-cLm
cLi
+qJc
cLi
+cIJ
cLi
cLi
cLi
@@ -106415,21 +105575,21 @@ aaa
aab
cgQ
ctU
-cgQ
+ctN
cwA
+cqs
+cqs
+xWX
coL
-coL
-cng
-cng
+fmi
cvp
-cEW
cEI
cFL
cGC
-cEY
+cLi
cLp
cMr
-cND
+fea
cLi
aaa
aaa
@@ -106671,23 +105831,23 @@ bYP
aab
aab
cgQ
-ctU
-cgQ
-cwB
-cwB
+ocN
coL
-cng
-aaa
-aaa
-cEW
+cvp
+cwB
+ubb
+gjo
+cqs
+sAz
+cwA
cFX
cFK
-cFX
-cKa
-cLo
-cMv
-cNN
-cOw
+heB
+cLi
+cLi
+cLi
+pgF
+cOx
aab
aab
aaa
@@ -106929,21 +106089,21 @@ aaa
aab
cgQ
ctU
-cgQ
-cwC
coL
+cvp
+efn
coL
-cng
-aaa
-aaa
-cEW
-cHB
+klK
+eSr
+coL
+cvp
+cNB
cFN
cHB
-cEY
-cEY
-cEY
-cLm
+cGI
+cLi
+cGk
+qJc
cOx
aaa
aab
@@ -107186,21 +106346,21 @@ cam
aab
cgQ
ctU
-cqF
-coL
-coL
-coL
-cng
-aaa
-aaa
-cEW
+cqs
+cwA
+sZe
+hvi
+lMw
+iui
+kXY
+cvp
cEJ
cFM
cGD
cJV
-bTm
-cEY
-cLm
+cLi
+cNB
+qJc
cLi
aaa
aaa
@@ -107442,22 +106602,22 @@ cnm
cam
cgQ
cgQ
-ctU
+jfb
cgQ
-cwC
-coL
-coL
-cng
-aaa
-aaa
-cEW
+cvp
+cwA
+cvp
+hum
+cwA
+cvp
+cvp
cEL
cFP
-cGF
-cJV
-cLr
-cEY
-cLm
+cNB
+ubQ
+cLi
+cNB
+orF
cLi
aaa
aab
@@ -107697,24 +106857,24 @@ cfb
cnG
cnl
cam
-coL
+xvQ
coL
ctU
-cgQ
-cwD
-cwD
coL
-cng
-aaa
-aaa
-cEW
+cqF
+cwD
+rNJ
+kmw
+pNz
+coL
+cqF
cEK
-cFO
+cNB
cGE
-cJV
-cGh
-cEY
-cLm
+cNB
+dbh
+cNB
+qJc
cOx
aaa
aaa
@@ -107957,21 +107117,21 @@ cam
cqA
csk
ctU
-cgQ
-cwE
-cqB
coL
-cng
-cng
-cvp
-cEW
-cEN
-cFR
-cJX
-cJW
-cLt
-cEY
-cLm
+cqF
+coL
+fcH
+cqs
+cBo
+coL
+cqF
+cNB
+cNB
+cZw
+cNB
+dbh
+cNB
+qJc
cOx
aaa
aab
@@ -108214,21 +107374,21 @@ cam
cqB
csl
ctU
+ctN
cgQ
-cwB
-cwB
-coL
+krB
+eLB
cBo
coL
cDQ
-cEY
+cgQ
cEM
cFQ
cGG
cHC
-cLs
-cEY
-cLm
+cLi
+cNB
+eIi
cLi
aab
aab
@@ -108471,21 +107631,21 @@ cam
cgQ
cgQ
ctU
-cvo
-cvo
-cvo
-cvo
-cvo
+coL
+cgQ
+mar
+coL
+coL
cFe
-cvo
-cEY
-cEP
-cFR
+qhK
+cgQ
+cZw
+cNB
cGI
cKd
-cLu
-cEY
-cLm
+cLi
+cNA
+fLH
cLi
aaa
aaa
@@ -108728,21 +107888,21 @@ cam
cqE
csm
ctU
-cvo
-cwF
-cwF
-cvo
-cwI
-cwF
-cwF
-cEY
-cEO
-cJY
-cGH
-cEY
-cEY
-cEY
-cLm
+coL
+iez
+cgQ
+saD
+wlv
+iez
+cgQ
+cgQ
+dbh
+dbh
+cLi
+cLi
+cIJ
+qxh
+qJc
cOx
aaa
aaa
@@ -108984,22 +108144,22 @@ cam
coP
cqG
cgQ
-ctU
-cvo
-cwF
+lxs
+coL
+cgQ
cyi
-cwI
-cwI
-cCA
+coL
+coL
+coL
cwF
-cvo
-cER
-cGc
-cnA
-cJZ
+iez
+cZw
+cNB
+cNB
+cNB
cLy
-cLi
-cLm
+cNB
+qJc
cOx
cOx
cQy
@@ -109242,21 +108402,21 @@ cgQ
cgQ
cgQ
ctU
-cvo
-cvo
+coL
+cgQ
cwI
-czM
-cwI
-cwI
-cwF
-cvo
-cEQ
-cGb
-cGM
-cOs
-cIP
-cIP
-cKJ
+coL
+rEx
+coL
+cvm
+cgQ
+cNB
+cZw
+cNB
+cNB
+gAJ
+jZu
+gqA
cIP
cIP
cOq
@@ -109495,31 +108655,31 @@ ciw
bYM
cnX
cnn
-coS
+pow
cqH
csu
-coR
-cvo
-cwG
-cwI
-cwI
-cwI
-cwI
+sFz
+coL
+cgQ
+lPK
+coL
+hSm
+cBh
cDS
-cvo
-cEQ
-cGi
-cMV
+cgQ
+cEM
+cZw
cKb
-cKf
-cKf
-cKf
-cKf
+cKb
+fIO
+cKb
+qdn
cKb
cKb
cRC
cRC
cUc
+rZE
cRG
cNB
cLi
@@ -109753,30 +108913,30 @@ bYM
cnX
cnp
coR
+uTp
+cgQ
cgQ
cgQ
cgQ
-cvo
-cvo
cyj
-cvo
+coL
cBh
-cwI
+jQG
cDT
-cvo
-cEV
-cGg
-cGO
+iez
+cNB
+cNB
cKb
cJx
-cLI
-cNG
+wyI
cNG
+uPT
cOz
cLq
cRK
cRC
cRC
+cNB
cRG
cWn
cOx
@@ -110010,32 +109170,32 @@ bYM
coh
coE
cqs
+coL
cgQ
-cso
-csk
+qHe
cvo
-cwH
-cwI
-cwI
-cwI
-cwI
-cwI
-cvo
-cEZ
+ctN
+tDB
+cqs
+coL
+dUD
+cvm
+cgQ
+cNB
cGk
-cGP
-cHF
+cNK
+cJx
cIQ
-cJf
+cJx
cKK
-cNH
cJx
cLv
cRE
cSS
cKb
+cEM
cRG
-cNB
+rNN
cOx
aaa
aab
@@ -110267,20 +109427,19 @@ bYM
cgQ
cnq
cqr
-cqF
-csp
-cqz
-cvo
-cwI
+coL
+cgQ
+fQq
+fmi
+tGO
cyk
-czM
-cwI
-cCG
+tGO
+nhn
+tDB
cEb
-cvo
-cEX
+cgQ
+cZw
cGj
-cJZ
cKb
cLx
cMt
@@ -110291,7 +109450,8 @@ cLv
cRE
cTd
cKb
-cRG
+rNN
+qrr
cNB
cLi
aab
@@ -110523,22 +109683,21 @@ cgQ
ckp
cgQ
cgQ
-cnX
-cgQ
+gyA
coL
-ctW
-cvo
-cvo
-cvo
-cvo
-cvo
+iez
+cgQ
+cgQ
+cgQ
+cgQ
+iez
+cgQ
cFT
-cvo
-cvo
-cEQ
-cGj
+cgQ
+cgQ
+cZw
+cNB
cGU
-ctT
cLz
cMt
cMC
@@ -110548,8 +109707,9 @@ cOr
cOV
cKb
cKb
-cRG
cNB
+qrr
+rNN
cLi
cLi
cLi
@@ -110781,20 +109941,19 @@ cgQ
cgQ
cns
cqt
-cgQ
-cgQ
-cgQ
-cgQ
coL
+coL
+cyg
+coL
+xKx
cyp
czN
-cyg
-cCH
coL
-cqF
-cEQ
-cGj
-cJZ
+coL
+coL
+hAA
+cZw
+cNB
cKb
cLB
cMt
@@ -110805,11 +109964,12 @@ cKb
cKb
cKb
cUh
+rNN
cRI
dsU
jSI
cUX
-cZw
+iYO
dar
dbt
ddG
@@ -111038,20 +110198,19 @@ cly
cly
coF
cqu
-cly
-cti
-cti
-cti
-cly
-cly
-cti
-cly
-cAH
-cly
+swy
+swy
+swy
+swy
+swy
+swy
+swy
+swy
+swy
+swy
cHR
cFg
-cGm
-cnA
+cZw
cKb
cLA
cMt
@@ -111059,6 +110218,7 @@ cJx
cNZ
cLf
cKb
+cNB
cPb
dsG
dsG
@@ -111297,18 +110457,17 @@ cgS
cgS
cgS
cgS
-ctR
-cvp
+cgS
+cgQ
cng
cng
cng
cng
cng
-cvp
-cFa
+cgQ
+cgQ
cFf
-cGl
-cGW
+fbx
cKe
cLC
cMt
@@ -111316,6 +110475,7 @@ cJx
cNZ
cLd
cKb
+cNB
cPj
cSU
cSU
@@ -111554,7 +110714,7 @@ clR
coY
cqR
csy
-ctR
+cgS
aaa
aaa
aaa
@@ -111562,10 +110722,9 @@ aaa
aaa
aaa
aaa
-cFa
+cLi
cFk
-cGi
-cnA
+cNB
cKf
cLD
cMw
@@ -111573,6 +110732,7 @@ cME
cMx
cLf
cKb
+cNB
cPj
cSU
cUk
@@ -111811,7 +110971,7 @@ ckt
coX
cqI
csx
-ctR
+cgS
aaa
cwP
cyr
@@ -111819,10 +110979,9 @@ cyr
cyr
cCM
aaa
-cFa
+cLi
cFi
-cGi
-cnA
+cNB
cKb
cLE
cMz
@@ -111830,6 +110989,7 @@ cJx
cJx
cLn
cKb
+cNB
cPj
cSU
cUj
@@ -112068,7 +111228,7 @@ coM
cpf
cqJ
csz
-ctR
+cgS
aaa
cwU
cyt
@@ -112076,10 +111236,9 @@ czT
cBr
cwU
aaa
-cFa
+cLi
cFl
-cGi
-cnA
+cZw
cKb
cKb
cMD
@@ -112087,7 +111246,8 @@ cNG
cNG
cLf
cKb
-cPj
+cNB
+gSd
cSU
dsI
pxP
@@ -112325,7 +111485,7 @@ coH
ckt
cqK
clR
-ctR
+cgS
aaa
cwQ
cys
@@ -112333,10 +111493,9 @@ czS
cBq
cCN
aaa
-cFa
-cFi
-cGi
-cnA
+cLi
+qjC
+cZw
cKf
cLD
cJx
@@ -112344,6 +111503,7 @@ cNG
cOG
cOE
cKb
+cNB
cPj
cSU
dsH
@@ -112582,18 +111742,17 @@ coT
cjc
cqL
cmg
-ctR
-cvq
+cgS
+cvx
cwV
cyv
czV
cBk
cwV
-cvq
-cvq
-cFi
-cGi
-cnA
+cvx
+cvx
+cFl
+cNB
cKf
cLG
cMx
@@ -112601,6 +111760,7 @@ cJx
cJx
cOQ
cKb
+cEM
cPh
cSU
dsK
@@ -112848,9 +112008,8 @@ cBl
cCO
cEd
cvx
-cFi
-cGg
-cHc
+cFl
+cNB
cKf
cLF
cJg
@@ -112858,6 +112017,7 @@ cJx
cJx
cLD
cKb
+cNB
cPj
cSU
dsK
@@ -113105,9 +112265,8 @@ cAj
cAJ
cDW
cvx
-cFk
-cGi
-cnA
+fVJ
+cNB
cKb
cJx
cJi
@@ -113115,6 +112274,7 @@ cJx
cJx
cPv
cKb
+cNB
cPj
cSU
dsL
@@ -113362,9 +112522,8 @@ cBs
cwO
cEe
cvx
-cFi
-cGi
-cnA
+cFl
+cGk
cKb
cJx
cJh
@@ -113372,6 +112531,7 @@ cJx
cJx
cNG
cKb
+cGk
cPj
cSU
dsK
@@ -113619,9 +112779,8 @@ cBu
cwO
cEe
cvx
-cFi
-cGi
-cnA
+cFl
+cZw
cKb
cLH
cJi
@@ -113629,6 +112788,7 @@ cNw
cNG
cNG
cKb
+cNB
cPj
cSU
dsK
@@ -113878,14 +113038,14 @@ cvx
cvx
cFo
cGn
-cnA
cKb
cKb
-cJj
+fKf
cNK
cMU
cNK
cKb
+cNB
cPj
cRR
cFC
@@ -114138,11 +113298,11 @@ cGl
cHG
cKk
cLL
-cJl
cMG
cMG
cPL
cJZ
+cNB
cPj
cRR
cUu
@@ -114395,11 +113555,11 @@ cGi
cHD
cHH
cIR
-cJk
cHG
cHG
+war
cNS
-dbp
+dsG
cPl
cRR
cQE
@@ -114652,10 +113812,10 @@ cGp
cHg
cHL
cHJ
-cHI
cHD
cHD
-cMV
+ycV
+lUC
cJZ
cRR
cRR
@@ -114908,8 +114068,8 @@ ctj
cGo
ctS
cHK
-cIS
cJm
+cIS
cKL
cOK
cNT
@@ -122014,7 +121174,7 @@ aoS
apW
aih
aqX
-asd
+aqW
atg
ame
avq
@@ -122271,7 +121431,7 @@ aih
aih
aih
aqX
-asd
+aqW
akE
amw
avq
@@ -122519,18 +121679,18 @@ aaa
aaa
aaa
aaa
+aaa
+aaa
+aaa
+aaa
+aaa
aab
-ajb
-ajs
-aeE
-aeX
-aky
-aia
-ajb
-ajb
-asF
-ajb
-ajb
+aab
+aqI
+aqI
+aqI
+aqI
+atG
awl
arR
awl
@@ -122777,17 +121937,17 @@ aaa
aaa
aaa
aaa
-ajb
-ajt
-ajw
-ajw
-ajw
-aqa
-als
-akc
-asH
-atV
-ajb
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aab
+aab
+atG
apZ
avq
atr
@@ -123034,17 +122194,17 @@ aaa
aaa
aaa
aaa
-ajb
-ajv
-ajw
-ako
-ajw
-afL
-aqJ
-arG
-asG
-atU
-ajb
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aab
+atG
apY
arS
aqc
@@ -123291,17 +122451,17 @@ aaa
aaa
aaa
aaa
-ajb
-aju
-ajw
-ajw
-ajw
-afN
-aqK
-arJ
-asI
-amg
-ajb
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+atG
aqc
aqc
aqc
@@ -123548,17 +122708,17 @@ aaa
aaa
aaa
aaa
-ajb
-ajw
-ajw
-ajw
-ajw
-aic
-als
-arI
-amR
-atW
-ajb
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+atG
aqb
aCh
ats
@@ -123805,17 +122965,17 @@ aaa
aaa
aaa
aaa
-ajb
-ajx
-ajx
-ajx
-akz
-ajb
-ajb
-ajb
-amV
-ajb
-amx
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+atG
apY
arT
aqc
@@ -124062,16 +123222,16 @@ aaa
aaa
aaa
aaa
-alI
-ajy
-ajy
-ajy
-ajy
-alI
-aab
-aab
-aab
-aab
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
atG
aqc
aqc
@@ -124319,12 +123479,12 @@ aaa
aaa
aaa
aaa
-alJ
aaa
aaa
aaa
aaa
-aqe
+aaa
+aaa
aaa
aaa
aaa
@@ -135695,12 +134855,12 @@ cZk
cZk
cZk
daa
-big
-big
-big
-big
-cjA
aYS
+bGH
+bGH
+bGH
+bGH
+bGH
aaa
dbP
cgs
@@ -135952,13 +135112,13 @@ bxX
bSa
bmm
cYk
-dat
-baN
-daZ
-dbo
-bcH
aYS
aaa
+aaa
+aaa
+aaa
+aaa
+aaa
dbP
cgy
cia
@@ -136205,17 +135365,17 @@ bjR
cYd
bLr
bNw
-bPu
-bPu
-bPu
+cWA
+cWA
+cWA
bUT
-bVI
-bWR
-bYp
-cbb
-dbH
aYS
aaa
+aaa
+aaa
+aaa
+aaa
+aaa
dbZ
cgy
cia
@@ -136466,13 +135626,13 @@ boD
bSc
bmm
dak
-dat
-baO
-bYo
-bcl
-ccP
aYS
aaa
+aaa
+aaa
+aaa
+aaa
+aaa
dbX
cgy
cib
@@ -136723,13 +135883,13 @@ cZm
cZm
cZm
bmm
-big
-baG
-bYq
-bcI
-ccS
aYS
aaa
+aaa
+aaa
+aaa
+aaa
+aaa
dbX
cgs
cgs
@@ -136981,11 +136141,11 @@ bAK
bjR
dam
aYS
-baT
-baT
-baT
-baT
-aYS
+aaa
+aaa
+aaa
+aaa
+aaa
aaa
dca
dcc
@@ -137238,11 +136398,11 @@ cZI
cZn
bmm
aYS
-baQ
-baT
-baT
-bgc
-aYS
+aaa
+aaa
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -137495,11 +136655,11 @@ cZH
bmm
dan
aYS
-baR
-baT
-baT
-bgm
-aYS
+aaa
+aaa
+aaa
+aaa
+aaa
aaa
xWg
qUv
@@ -137752,11 +136912,11 @@ cZJ
cZK
daq
aYS
-baH
-baT
-baT
-baT
-aYS
+aaa
+aaa
+aaa
+aaa
+aaa
aaa
pZO
uDK
@@ -138009,11 +137169,11 @@ bEG
bEG
bEG
aYS
-baT
-baT
-baT
-baT
-aYS
+aaa
+aaa
+aaa
+aaa
+aaa
aaa
xWg
nMi
@@ -138265,12 +137425,12 @@ bjR
aaa
aaa
aaa
-aYS
-baU
-baU
-baU
-bgd
-aYS
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
aaa
pZO
uDK
@@ -138522,12 +137682,12 @@ bjR
aaa
aaa
aaa
-daC
-baV
-baV
-baV
-baV
-daC
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
aaa
xWg
nMi
@@ -138779,12 +137939,12 @@ bjR
aaa
aaa
aaa
-daD
aaa
aaa
aaa
aaa
-daD
+aaa
+aaa
aaa
uxy
xWg
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/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..029d15f4895 100644
--- a/code/__DEFINES/job.dm
+++ b/code/__DEFINES/job.dm
@@ -58,7 +58,7 @@
#define JOB_NANO (1<<0)
#define JOB_BLUESHIELD (1<<1)
#define JOB_BARBER (1<<3)
-#define JOB_MECHANIC (1<<4)
+// #define JOB_MECHANIC (1<<4) // AA07 2021-10-02 - Removed: Kept for history sake
#define JOB_BRIGDOC (1<<5)
#define JOB_JUDGE (1<<6)
-#define JOB_PILOT (1<<7)
+// #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/__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..6d3f119af47 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",
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/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/subsystem/discord.dm b/code/controllers/subsystem/discord.dm
index 11a2a481073..f3d42a94b51 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)
@@ -75,6 +77,27 @@ SUBSYSTEM_DEF(discord)
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 = 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/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/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/mind.dm b/code/datums/mind.dm
index 29a1b29de97..1fbb7a34f59 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/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..5aeb241d26a 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 ////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
diff --git a/code/game/area/areas/depot-areas.dm b/code/game/area/areas/depot-areas.dm
index ec1ba64deec..eb5c0aaaeb9 100644
--- a/code/game/area/areas/depot-areas.dm
+++ b/code/game/area/areas/depot-areas.dm
@@ -147,13 +147,6 @@
detected_mech = TRUE
increase_alert("Hostile mecha detected: [E]")
-/area/syndicate_depot/core/proc/saw_pod(obj/spacepod/P)
- if(detected_pod)
- return
- detected_pod = TRUE
- if(!called_backup)
- increase_alert("Hostile spacepod detected: [P]")
-
/area/syndicate_depot/core/proc/saw_double_agent(mob/living/M)
if(detected_double_agent)
return
diff --git a/code/game/area/ss13_areas.dm b/code/game/area/ss13_areas.dm
index 3666ba2fdfc..5d887935865 100644
--- a/code/game/area/ss13_areas.dm
+++ b/code/game/area/ss13_areas.dm
@@ -1112,14 +1112,6 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
name = "\improper Chief Engineer's office"
icon_state = "engine_control"
-/area/engine/mechanic_workshop
- name = "\improper Mechanic Workshop"
- icon_state = "engine"
-
-/area/engine/mechanic_workshop/hanger
- name = "\improper Hanger Bay"
- icon_state = "engine"
-
/area/engine/supermatter
name = "\improper Supermatter Engine"
icon_state = "engine"
@@ -1488,10 +1480,6 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
name = "\improper Head of Security's Office"
icon_state = "sec_hos"
-/area/security/podbay
- name = "\improper Security Podbay"
- icon_state = "securitypodbay"
-
/area/security/detectives_office
name = "\improper Detective's Office"
icon_state = "detective"
@@ -1544,7 +1532,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
/area/security/vacantoffice2
name = "\improper Vacant Office"
icon_state = "security"
-
+
/area/security/permasolitary
name = "Solitary Confinement"
icon_state = "solitary"
diff --git a/code/game/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/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/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/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/jobs.dm b/code/game/jobs/jobs.dm
index e0e817f76ef..5fd46e11434 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,8 @@ GLOBAL_LIST_INIT(whitelisted_positions, list(
"Blueshield",
"Nanotrasen Representative",
"Barber",
- "Mechanic",
"Brig Physician",
- "Magistrate",
- "Security Pod Pilot",
+ "Magistrate"
))
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 47ad4480dce..3b907a9046c 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -178,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)
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/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/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..23ba37eb433 100644
--- a/code/game/machinery/suit_storage_unit.dm
+++ b/code/game/machinery/suit_storage_unit.dm
@@ -98,15 +98,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
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/other_tools.dm b/code/game/mecha/equipment/tools/other_tools.dm
index f1b9b291245..af5c3039ad6 100644
--- a/code/game/mecha/equipment/tools/other_tools.dm
+++ b/code/game/mecha/equipment/tools/other_tools.dm
@@ -148,7 +148,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 +166,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 +186,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"
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/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/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/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..6e54adb0c60 100644
--- a/code/game/objects/items/weapons/cigs.dm
+++ b/code/game/objects/items/weapons/cigs.dm
@@ -262,6 +262,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/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/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm
index 7fc97eda5cd..f1edd8903a7 100644
--- a/code/game/objects/items/weapons/twohanded.dm
+++ b/code/game/objects/items/weapons/twohanded.dm
@@ -183,6 +183,7 @@
*/
/obj/item/twohanded/fireaxe // DEM AXES MAN, marker -Agouri
icon_state = "fireaxe0"
+ item_state = "fireaxe0"
name = "fire axe"
desc = "Truly, the weapon of a madman. Who would think to fight fire with an axe?"
force = 5
diff --git a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm
index 0345dca3b7f..fdeeab78878 100644
--- a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm
+++ b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm
@@ -75,7 +75,7 @@
if(istype(W, /obj/item/pen))
var/decalselection = input("Please select a decal") as null|anything in list("Atmospherics", "Bartender", "Barber", "Blueshield", "Brig Physician", "Captain",
"Cargo", "Chief Engineer", "Chaplain", "Chef", "Chemist", "Civilian", "Clown", "CMO", "Coroner", "Detective", "Engineering", "Genetics", "HOP",
- "HOS", "Hydroponics", "Internal Affairs Agent", "Janitor", "Magistrate", "Mechanic", "Medical", "Mime", "Mining", "NT Representative", "Paramedic", "Pod Pilot",
+ "HOS", "Hydroponics", "Internal Affairs Agent", "Janitor", "Magistrate", "Medical", "Mime", "Mining", "NT Representative", "Paramedic",
"Prisoner", "Research Director", "Security", "Syndicate", "Therapist", "Virology", "Warden", "Xenobiology")
if(!decalselection)
return
diff --git a/code/game/objects/structures/crates_lockers/closets/fireaxe.dm b/code/game/objects/structures/crates_lockers/closets/fireaxe.dm
index 4eda067ca51..d8a2cb5b04b 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"
@@ -15,6 +15,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/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/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/modules/admin/admin.dm b/code/modules/admin/admin.dm
index 5b0ea16350c..b98e584f465 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -624,43 +624,89 @@ 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 b2d554d7324..019ccedade9 100644
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -363,17 +363,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"
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 @@
| [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] |